From 0a5ab4320969089fdc7979b70bb0f43bc2c0af06 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 13:46:22 +0200 Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids --- rsc/inc/vclrsc.hxx | 6 +- rsc/source/parser/rscicpx.cxx | 10 +- rsc/source/parser/rscinit.cxx | 2 + svtools/inc/fileview.hxx | 4 +- svtools/inc/svtools/headbar.hxx | 8 +- svtools/inc/svtools/roadmapwizard.hxx | 4 +- svtools/inc/tabbar.hxx | 10 +- svtools/inc/taskbar.hxx | 6 +- svtools/source/contnr/fileview.cxx | 6 +- svtools/source/contnr/templwin.cxx | 6 +- svtools/source/control/headbar.cxx | 26 ++- svtools/source/control/inettbc.cxx | 3 +- svtools/source/control/tabbar.cxx | 25 ++- svtools/source/control/taskstat.cxx | 6 +- svtools/source/dialogs/addresstemplate.cxx | 3 +- svtools/source/dialogs/filedlg2.cxx | 75 +++++--- svtools/source/dialogs/roadmapwizard.cxx | 8 +- svtools/source/dialogs/wizardmachine.cxx | 6 +- svtools/source/misc/helpagentwindow.cxx | 3 +- toolkit/inc/layout/layout.hxx | 21 +-- toolkit/source/awt/vclxdialog.cxx | 3 + toolkit/source/awt/vclxwindow.cxx | 27 +-- toolkit/source/layout/vcl/wrapper.cxx | 44 +++-- tools/inc/tools/rc.h | 1 + tools/inc/tools/rc.hxx | 3 + tools/inc/tools/resmgr.hxx | 9 +- tools/source/rc/resmgr.cxx | 159 +++++++++-------- vcl/inc/vcl/btndlg.hxx | 4 +- vcl/inc/vcl/help.hxx | 8 +- vcl/inc/vcl/menu.hxx | 4 +- vcl/inc/vcl/smartid.hxx | 87 ---------- vcl/inc/vcl/status.hxx | 10 +- vcl/inc/vcl/tabctrl.hxx | 11 +- vcl/inc/vcl/toolbox.h | 2 +- vcl/inc/vcl/toolbox.hxx | 10 +- vcl/inc/vcl/window.h | 7 +- vcl/inc/vcl/window.hxx | 15 +- vcl/prj/d.lst | 1 - vcl/source/app/help.cxx | 14 +- vcl/source/control/tabctrl.cxx | 47 +++-- vcl/source/helper/makefile.mk | 1 - vcl/source/helper/smartid.cxx | 264 ----------------------------- vcl/source/window/btndlg.cxx | 11 +- vcl/source/window/menu.cxx | 41 +++-- vcl/source/window/msgbox.cxx | 5 +- vcl/source/window/printdlg.cxx | 24 +-- vcl/source/window/status.cxx | 29 ++-- vcl/source/window/toolbox.cxx | 14 +- vcl/source/window/toolbox2.cxx | 24 ++- vcl/source/window/window.cxx | 84 +++------ vcl/source/window/window2.cxx | 104 ++---------- 51 files changed, 404 insertions(+), 901 deletions(-) delete mode 100755 vcl/inc/vcl/smartid.hxx delete mode 100755 vcl/source/helper/smartid.cxx diff --git a/rsc/inc/vclrsc.hxx b/rsc/inc/vclrsc.hxx index 19677171dcb2..d4084f2bc239 100644 --- a/rsc/inc/vclrsc.hxx +++ b/rsc/inc/vclrsc.hxx @@ -162,9 +162,11 @@ typedef sal_Int64 WinBits; // - Help-Types - // -------------- +#if 0 // from vcl/inc/help.hxx -#define OOO_HELP_INDEX ((ULONG)0xFFFFFFFF) -#define OOO_HELP_HELPONHELP ((ULONG)0xFFFFFFFE) +#define OOO_HELP_INDEX ".help:index" +#define OOO_HELP_HELPONHELP ".help:helponhelp" +#endif // -------------- // - FieldTypes - diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 625417769f45..2d0f9a4edbeb 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -297,7 +297,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, InsWinBit( pClassWindow, "DialogControl", nTabControlId ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassWindow->SetVariable( nId, &aIdLong ); + pClassWindow->SetVariable( nId, &aString, NULL, 0, WINDOW_HELPID ); nRsc_XYMAPMODEId = nId = aNmTb.Put( "_XYMapMode", VARNAME ); @@ -325,7 +325,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, nId = aNmTb.Put( "ExtraLong", VARNAME ); pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_EXTRALONG ); nId = aNmTb.Put( "UniqueId", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, NULL, 0, WINDOW_UNIQUEID ); + pClassWindow->SetVariable( nId, &aString, NULL, 0, WINDOW_UNIQUEID ); // BorderStyle RscEnum* pBorderStyleEnum = new RscEnum( pHS->getID( "WindowBorderStyle" ), RSC_NOTYPE ); @@ -1201,7 +1201,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, pClassMenuItem->SetVariable( nId, &aLangString, NULL, 0, RSC_MENUITEM_HELPTEXT ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassMenuItem->SetVariable( nId, &aIdLong, NULL, 0, + pClassMenuItem->SetVariable( nId, &aString, NULL, 0, RSC_MENUITEM_HELPID ); nId = aNmTb.Put( "AccelKey", VARNAME ); pClassMenuItem->SetVariable( nId, pClassKeyCode, NULL, 0, @@ -1276,7 +1276,7 @@ RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper, nId = aNmTb.Put( "DefButton", VARNAME ); pClassMessBox->SetVariable( nId, pMessDefButton ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassMessBox->SetVariable( nId, &aIdLong ); + pClassMessBox->SetVariable( nId, &aString ); nId = aNmTb.Put( "SysModal", VARNAME ); pClassMessBox->SetVariable( nId, &aBool ); nId = aNmTb.Put( "Title", VARNAME ); @@ -2015,7 +2015,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId ); } nId = aNmTb.Put( "HelpID", VARNAME ); - pClassToolBoxItem->SetVariable( nId, &aIdLong, NULL, 0, + pClassToolBoxItem->SetVariable( nId, &aString, NULL, 0, RSC_TOOLBOXITEM_HELPID ); nId = aNmTb.Put( "Text", VARNAME ); pClassToolBoxItem->SetVariable( nId, &aLangString, NULL, 0, diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index a763b92f0bb1..54a56a3840d2 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -210,9 +210,11 @@ void RscTypCont::Init() aNmTb.Put( "TRUE", BOOLEAN, (long)TRUE ); aNmTb.Put( "FALSE", BOOLEAN, (long)FALSE ); + #if 0 /* Vordefinierte HilfeId's */ aNmTb.Put( "HELP_INDEX", NUMBER, OOO_HELP_INDEX ); aNmTb.Put( "HELP_HELPONHELP", NUMBER, OOO_HELP_HELPONHELP ); + #endif aNmTb.Put( "XSCALE", XSCALE , (long)0 ); aNmTb.Put( "YSCALE", YSCALE , (long)0 ); diff --git a/svtools/inc/fileview.hxx b/svtools/inc/fileview.hxx index 74476541dcd8..db704a0e6784 100644 --- a/svtools/inc/fileview.hxx +++ b/svtools/inc/fileview.hxx @@ -104,8 +104,8 @@ public: sal_Bool GetParentURL( String& _rParentURL ) const; sal_Bool CreateNewFolder( const String& rNewFolder ); - void SetHelpId( sal_uInt32 nHelpId ); - sal_uInt32 GetHelpId( ) const; + void SetHelpId( const rtl::OString& rHelpId ); + const rtl::OString& GetHelpId( ) const; void SetSizePixel( const Size& rNewSize ); using Window::SetPosSizePixel; virtual void SetPosSizePixel( const Point& rNewPos, const Size& rNewSize ); diff --git a/svtools/inc/svtools/headbar.hxx b/svtools/inc/svtools/headbar.hxx index 1ef7687cfb1d..c225a95d1f55 100644 --- a/svtools/inc/svtools/headbar.hxx +++ b/svtools/inc/svtools/headbar.hxx @@ -360,15 +360,15 @@ public: void SetHelpText( USHORT nItemId, const XubString& rText ); XubString GetHelpText( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( USHORT nItemId, const rtl::OString& nHelpId ); + rtl::OString GetHelpId( USHORT nItemId ) const; Size CalcWindowSizePixel() const; inline void SetHelpText( const String& rText ) { Window::SetHelpText( rText ); } inline const String& GetHelpText() const { return Window::GetHelpText(); } - inline void SetHelpId( ULONG nId ) { Window::SetHelpId( nId ); } - inline ULONG GetHelpId() const { return Window::GetHelpId(); } + inline void SetHelpId( const rtl::OString& rId ) { Window::SetHelpId( rId ); } + inline const rtl::OString& GetHelpId() const { return Window::GetHelpId(); } inline void SetStartDragHdl( const Link& rLink ) { maStartDragHdl = rLink; } inline const Link& GetStartDragHdl() const { return maStartDragHdl; } diff --git a/svtools/inc/svtools/roadmapwizard.hxx b/svtools/inc/svtools/roadmapwizard.hxx index 49a0f441c49c..957620a645c7 100644 --- a/svtools/inc/svtools/roadmapwizard.hxx +++ b/svtools/inc/svtools/roadmapwizard.hxx @@ -85,8 +85,8 @@ namespace svt void SetRoadmapBitmap( const BitmapEx& _rBitmap ); const BitmapEx& GetRoadmapBitmap( ) const; - void SetRoadmapSmartHelpId( const SmartId& _rId, SmartIdUpdateMode _aMode = SMART_SET_SMART ); - SmartId GetRoadmapSmartHelpId() const; + void SetRoadmapHelpId( const rtl::OString& _rId ); + const rtl::OString& GetRoadmapHelpId() const; void SetRoadmapInteractive( sal_Bool _bInteractive ); sal_Bool IsRoadmapInteractive(); diff --git a/svtools/inc/tabbar.hxx b/svtools/inc/tabbar.hxx index cf89d4426726..5816499d1b87 100644 --- a/svtools/inc/tabbar.hxx +++ b/svtools/inc/tabbar.hxx @@ -511,8 +511,8 @@ public: XubString GetPageText( USHORT nPageId ) const; void SetHelpText( USHORT nPageId, const XubString& rText ); XubString GetHelpText( USHORT nPageId ) const; - void SetHelpId( USHORT nPageId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nPageId ) const; + void SetHelpId( USHORT nPageId, const rtl::OString& nHelpId ); + rtl::OString GetHelpId( USHORT nPageId ) const; long GetSplitSize() const { return mnSplitSize; } long GetMinSize() const; @@ -521,9 +521,9 @@ public: { Window::SetHelpText( rText ); } XubString GetHelpText() const { return Window::GetHelpText(); }; - void SetHelpId( ULONG nId ) - { Window::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { Window::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return Window::GetHelpId(); } void SetStyle( WinBits nStyle ); diff --git a/svtools/inc/taskbar.hxx b/svtools/inc/taskbar.hxx index 46853fa07c03..d4a6699e2d5e 100644 --- a/svtools/inc/taskbar.hxx +++ b/svtools/inc/taskbar.hxx @@ -268,7 +268,7 @@ private: Image maImage; XubString maQuickHelpText; XubString maHelpText; - ULONG mnHelpId; + rtl::OString maHelpId; USHORT mnFlags; public: @@ -289,8 +289,8 @@ public: const XubString& GetQuickHelpText() const { return maQuickHelpText; } void SetHelpText( const XubString& rStr ) { maHelpText = rStr; } const XubString& GetHelpText() const { return maHelpText; } - void SetHelpId( ULONG nHelpId ) { mnHelpId = nHelpId; } - ULONG GetHelpId() const { return mnHelpId; } + void SetHelpId( const rtl::OString& rHelpId ) { maHelpId = rHelpId; } + const rtl::OString& GetHelpId() const { return maHelpId; } void SetFlags( USHORT nFlags ) { mnFlags = nFlags; } USHORT GetFlags() const { return mnFlags; } diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 8538e344bdc1..9c6474283279 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -1324,16 +1324,16 @@ sal_Bool SvtFileView::GetParentURL( String& rParentURL ) const // ----------------------------------------------------------------------- -sal_uInt32 SvtFileView::GetHelpId( ) const +const rtl::OString& SvtFileView::GetHelpId( ) const { return mpImp->mpView->GetHelpId( ); } // ----------------------------------------------------------------------- -void SvtFileView::SetHelpId( sal_uInt32 nHelpId ) +void SvtFileView::SetHelpId( const rtl::OString& rHelpId ) { - mpImp->mpView->SetHelpId( nHelpId ); + mpImp->mpView->SetHelpId( rHelpId ); } // ----------------------------------------------------------------------- diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 47b5ab9aa4b9..578150967727 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -346,7 +346,8 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) : aDummyHeaderBar.Show(); aIconCtrl.SetAccessibleName( String( RTL_CONSTASCII_USTRINGPARAM("Groups") ) ); - aIconCtrl.SetHelpId( HID_TEMPLATEDLG_ICONCTRL ); + // FIMXE: HELPID + aIconCtrl.SetHelpId( "" /*HID_TEMPLATEDLG_ICONCTRL*/ ); aIconCtrl.SetChoiceWithCursor( TRUE ); aIconCtrl.SetSelectionMode( SINGLE_SELECTION ); aIconCtrl.Show(); @@ -609,7 +610,8 @@ SvtFileViewWindow_Impl::SvtFileViewWindow_Impl( SvtTemplateWindow* pParent ) : { aFileView.SetStyle( aFileView.GetStyle() | WB_DIALOGCONTROL | WB_TABSTOP ); - aFileView.SetHelpId( HID_TEMPLATEDLG_FILEVIEW ); + // FIXME: HELPID + aFileView.SetHelpId( "" /*HID_TEMPLATEDLG_FILEVIEW*/ ); aFileView.Show(); aFileView.SetPosPixel( Point( 0, 0 ) ); aFileView.EnableAutoResize(); diff --git a/svtools/source/control/headbar.cxx b/svtools/source/control/headbar.cxx index 1ae223bebf06..7b1f2ad87108 100644 --- a/svtools/source/control/headbar.cxx +++ b/svtools/source/control/headbar.cxx @@ -53,7 +53,7 @@ struct ImplHeadItem USHORT mnId; HeaderBarItemBits mnBits; long mnSize; - ULONG mnHelpId; + rtl::OString maHelpId; Image maImage; XubString maOutText; XubString maText; @@ -1132,13 +1132,13 @@ void HeaderBar::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - ULONG nHelpId = GetHelpId( nItemId ); - if ( nHelpId ) + rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + if ( aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); if ( pHelp ) - pHelp->Start( nHelpId, this ); + pHelp->Start( aHelpId, this ); return; } } @@ -1266,7 +1266,6 @@ void HeaderBar::InsertItem( USHORT nItemId, const XubString& rText, pItem->mnId = nItemId; pItem->mnBits = nBits; pItem->mnSize = nSize; - pItem->mnHelpId = 0; pItem->maText = rText; pItem->mpUserData = 0; mpItemList->Insert( pItem, nPos ); @@ -1291,7 +1290,6 @@ void HeaderBar::InsertItem( USHORT nItemId, pItem->mnId = nItemId; pItem->mnBits = nBits; pItem->mnSize = nSize; - pItem->mnHelpId = 0; pItem->maImage = rImage; pItem->maText = rText; pItem->mpUserData = 0; @@ -1563,11 +1561,11 @@ XubString HeaderBar::GetHelpText( USHORT nItemId ) const if ( nPos != HEADERBAR_ITEM_NOTFOUND ) { ImplHeadItem* pItem = mpItemList->GetObject( nPos ); - if ( !pItem->maHelpText.Len() && pItem->mnHelpId ) + if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() ) { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this ); + pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; @@ -1578,22 +1576,22 @@ XubString HeaderBar::GetHelpText( USHORT nItemId ) const // ----------------------------------------------------------------------- -void HeaderBar::SetHelpId( USHORT nItemId, ULONG nHelpId ) +void HeaderBar::SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ) { USHORT nPos = GetItemPos( nItemId ); if ( nPos != HEADERBAR_ITEM_NOTFOUND ) - mpItemList->GetObject( nPos )->mnHelpId = nHelpId; + mpItemList->GetObject( nPos )->maHelpId = rHelpId; } // ----------------------------------------------------------------------- -ULONG HeaderBar::GetHelpId( USHORT nItemId ) const +rtl::OString HeaderBar::GetHelpId( USHORT nItemId ) const { USHORT nPos = GetItemPos( nItemId ); + rtl::OString aRet; if ( nPos != HEADERBAR_ITEM_NOTFOUND ) - return mpItemList->GetObject( nPos )->mnHelpId; - else - return 0; + aRet = mpItemList->GetObject( nPos )->maHelpId; + return aRet; } // ----------------------------------------------------------------------- diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 02a578629039..85325911114f 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -858,7 +858,8 @@ SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart void SvtURLBox::ImplInit() { pImp = new SvtURLBox_Impl(); - SetHelpId( SID_OPENURL ); + // FIXME: HELPID + SetHelpId( ""/*SID_OPENURL*/ ); EnableAutocomplete( FALSE ); SetText( String() ); diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index c4896ba8b812..f49ae2e432a6 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -58,7 +58,7 @@ struct ImplTabBarItem XubString maHelpText; Rectangle maRect; long mnWidth; - ULONG mnHelpId; + rtl::OString maHelpId; BOOL mbShort; BOOL mbSelect; BOOL mbEnable; @@ -70,7 +70,6 @@ struct ImplTabBarItem mnId = nItemId; mnBits = nPageBits; mnWidth = 0; - mnHelpId = 0; mbShort = FALSE; mbSelect = FALSE; mbEnable = TRUE; @@ -1338,13 +1337,13 @@ void TabBar::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - ULONG nHelpId = GetHelpId( nItemId ); - if ( nHelpId ) + rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + if ( aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); if ( pHelp ) - pHelp->Start( nHelpId, this ); + pHelp->Start( aHelpId, this ); return; } } @@ -2309,11 +2308,11 @@ XubString TabBar::GetHelpText( USHORT nPageId ) const if ( nPos != TABBAR_PAGE_NOTFOUND ) { ImplTabBarItem* pItem = mpItemList->GetObject( nPos ); - if ( !pItem->maHelpText.Len() && pItem->mnHelpId ) + if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() ) { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this ); + pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; @@ -2324,22 +2323,22 @@ XubString TabBar::GetHelpText( USHORT nPageId ) const // ----------------------------------------------------------------------- -void TabBar::SetHelpId( USHORT nPageId, ULONG nHelpId ) +void TabBar::SetHelpId( USHORT nPageId, const rtl::OString& rHelpId ) { USHORT nPos = GetPagePos( nPageId ); if ( nPos != TABBAR_PAGE_NOTFOUND ) - mpItemList->GetObject( nPos )->mnHelpId = nHelpId; + mpItemList->GetObject( nPos )->maHelpId = rHelpId; } // ----------------------------------------------------------------------- -ULONG TabBar::GetHelpId( USHORT nPageId ) const +rtl::OString TabBar::GetHelpId( USHORT nPageId ) const { USHORT nPos = GetPagePos( nPageId ); + rtl::OString aRet; if ( nPos != TABBAR_PAGE_NOTFOUND ) - return mpItemList->GetObject( nPos )->mnHelpId; - else - return 0; + aRet = mpItemList->GetObject( nPos )->maHelpId; + return aRet; } // ----------------------------------------------------------------------- diff --git a/svtools/source/control/taskstat.cxx b/svtools/source/control/taskstat.cxx index 2fdab63be37f..ba5e8d53b8b2 100644 --- a/svtools/source/control/taskstat.cxx +++ b/svtools/source/control/taskstat.cxx @@ -517,13 +517,13 @@ void TaskStatusBar::RequestHelp( const HelpEvent& rHEvt ) { if ( pItem ) { - ULONG nHelpId = pItem->maItem.GetHelpId(); - if ( nHelpId ) + rtl::OUString aHelpId( rtl::OStringToOUString( pItem->maItem.GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + if ( aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); if ( pHelp ) - pHelp->Start( nHelpId, this ); + pHelp->Start( aHelpId, this ); return; } } diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 2849ddb71d10..82b8cd2c5c04 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -609,7 +609,8 @@ void AssignmentPersistentData::Commit() m_pImpl->pFields[row * 2 + column]->SetDropDownLineCount(15); m_pImpl->pFields[row * 2 + column]->SetSelectHdl(LINK(this, AddressBookSourceDialog, OnFieldSelect)); - m_pImpl->pFields[row * 2 + column]->SetHelpId(HID_ADDRTEMPL_FIELD_ASSIGNMENT); + // FIXME: HELPID + m_pImpl->pFields[row * 2 + column]->SetHelpId( "" /*HID_ADDRTEMPL_FIELD_ASSIGNMENT*/); } } diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index b0e77d658931..1f6af3f36660 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -68,9 +68,9 @@ DECLARE_LIST( UniStringList, UniString* ) // #define STD_BTN_WIDTH 90 // #define STD_BTN_HEIGHT 35 -#define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, nHelpId ) \ +#define INITCONTROL( p, ControlClass, nBits, aPos, aSize, aTitel, rHelpId ) \ p = new ControlClass( GetPathDialog(), WinBits( nBits ) ); \ - p->SetHelpId( nHelpId ); \ + p->SetHelpId( rHelpId ); \ p->SetPosSizePixel( aPos, aSize ); \ p->SetText( aTitel ); \ p->Show(); @@ -132,7 +132,8 @@ ImpPathDialog::ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, BOOL bCreat pNewDirBtn->Enable( bCreateDir ); } - pDlg->SetHelpId( HID_FILEDLG_PATHDLG ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*HID_FILEDLG_PATHDLG*/ ); lang::Locale aLocale = Application::GetSettings().GetLocale(); xCollator = ::vcl::unohelper::CreateCollator(); @@ -173,29 +174,35 @@ void ImpPathDialog::InitControls() long nH = 0; UniString aEmptyStr; + // FIXME: HELPID INITCONTROL( pDirTitel, FixedText, 0, - aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DIR ) ), HID_FILEDLG_DIR ); + aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DIR ) ), ""/*HID_FILEDLG_DIR*/ ); aPnt.Y() += aFTSiz.Height() + a3Siz.Height(); - INITCONTROL( pEdit, Edit, WB_BORDER, aPnt, aEDSiz, aPath.GetFull(), HID_FILEDLG_EDIT ); + // FIXME: HELPID + INITCONTROL( pEdit, Edit, WB_BORDER, aPnt, aEDSiz, aPath.GetFull(), ""/*HID_FILEDLG_EDIT*/ ); aPnt.Y() += aEDSiz.Height() + a3Siz.Height(); #ifndef UNX long nLbH2 = pDlg->LogicToPixel( Size( 0, 60 ), MAP_APPFONT ).Height(); + // FIXME: HELPID INITCONTROL( pDirList, KbdListBox, WB_AUTOHSCROLL | WB_BORDER, - aPnt, Size( aEDSiz.Width(), nLbH1 ), aEmptyStr, HID_FILEDLG_DIRS ); + aPnt, Size( aEDSiz.Width(), nLbH1 ), aEmptyStr, ""/*HID_FILEDLG_DIRS*/ ); aPnt.Y() += nLbH1 + a6Siz.Height(); + // FIXME: HELPID INITCONTROL( pDriveTitle, FixedText, 0, - aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DRIVES ) ), HID_FILEDLG_DRIVE ); + aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DRIVES ) ), ""/*HID_FILEDLG_DRIVE*/ ); aPnt.Y() += aFTSiz.Height() + a3Siz.Height(); + // FIXME: HELPID INITCONTROL( pDriveList, ListBox, WB_DROPDOWN, - aPnt, Size( aEDSiz.Width(), nLbH2 ), aEmptyStr, HID_FILEDLG_DRIVES ); + aPnt, Size( aEDSiz.Width(), nLbH2 ), aEmptyStr, ""/*HID_FILEDLG_DRIVES*/ ); nH = aPnt.Y() + aEDSiz.Height() + a6Siz.Height(); #else long nNewH = nLbH1 + 3 * a3Siz.Height() + aFTSiz.Height() + aEDSiz.Height(); + // FIXME: HELPID INITCONTROL( pDirList, KbdListBox, WB_AUTOHSCROLL | WB_BORDER, - aPnt, Size( aEDSiz.Width(), nNewH ), aEmptyStr, HID_FILEDLG_DIRS ); + aPnt, Size( aEDSiz.Width(), nNewH ), aEmptyStr, ""/*HID_FILEDLG_DIRS*/ ); nH = aPnt.Y() + nNewH + a6Siz.Height(); pDriveTitle = NULL; pDriveList = NULL; @@ -226,17 +233,19 @@ void ImpPathDialog::InitControls() aPnt.X() = 2 * a6Siz.Width() + aEDSiz.Width(); aPnt.Y() = a6Siz.Height(); INITCONTROL( pOkBtn, PushButton, WB_DEFBUTTON, - aPnt, aBtnSiz, aOkStr, 0 ); + aPnt, aBtnSiz, aOkStr, "" ); aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); INITCONTROL( pCancelBtn, CancelButton, 0, - aPnt, aBtnSiz, aCancelStr, 0 ); + aPnt, aBtnSiz, aCancelStr, "" ); aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); + // FIXME: HELPID INITCONTROL( pNewDirBtn, PushButton, WB_DEFBUTTON, - aPnt, aBtnSiz, aNewDirStr, HID_FILEDLG_NEWDIR ); + aPnt, aBtnSiz, aNewDirStr, ""/*HID_FILEDLG_NEWDIR*/ ); #if defined(UNX) || defined(OS2) aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); + // FIXME: HELPID INITCONTROL( pHomeBtn, PushButton, WB_DEFBUTTON, - aPnt, aBtnSiz, aHomeDirStr, HID_FILEDLG_HOME ); + aPnt, aBtnSiz, aHomeDirStr, ""/*HID_FILEDLG_HOME*/ ); #else pHomeBtn = NULL; #endif @@ -714,7 +723,8 @@ ImpFileDialog::ImpFileDialog( PathDialog* pDlg, WinBits nWinBits, RESOURCE_TYPE if ( nType == WINDOW_FILEDIALOG ) InitControls(); - pDlg->SetHelpId( HID_FILEDLG_OPENDLG ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*HID_FILEDLG_OPENDLG*/ ); } @@ -742,36 +752,47 @@ void ImpFileDialog::InitControls() const int nW = 160; const int nH = 48; // Um den Dialog in eine akzeptable Form zu bringen + // FIXME: HELPID INITCONTROL( pFileTitel, FixedText, 0, - Point(10, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_FILE ) ), HID_FILEDLG_FILE ); + Point(10, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_FILE ) ), ""/*HID_FILEDLG_FILE*/ ); + // FIXME: HELPID INITCONTROL( pEdit, Edit, WB_BORDER, - Point(10, 31), Size(nW, 20), aEmptyStr, HID_FILEDLG_EDIT ); // aMask() + Point(10, 31), Size(nW, 20), aEmptyStr, ""/*HID_FILEDLG_EDIT*/ ); // aMask() + // FIXME: HELPID INITCONTROL( pFileList, ListBox, WB_SORT | WB_AUTOHSCROLL | WB_BORDER, - Point(10, 58), Size(nW, 180-nH), aEmptyStr, HID_FILEDLG_FILES ); + Point(10, 58), Size(nW, 180-nH), aEmptyStr, ""/*HID_FILEDLG_FILES*/ ); + // FIXME: HELPID INITCONTROL( pDirTitel, FixedText, 0, - Point(nW+20, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DIR ) ), HID_FILEDLG_DIR ); + Point(nW+20, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DIR ) ), ""/*HID_FILEDLG_DIR*/ ); + // FIXME: HELPID INITCONTROL( pDirPath, FixedInfo, WB_PATHELLIPSIS, - Point(nW+20, 33), Size(nW, 20), aPath.GetFull(), HID_FILEDLG_PATH ); + Point(nW+20, 33), Size(nW, 20), aPath.GetFull(), ""/*HID_FILEDLG_PATH*/ ); + // FIXME: HELPID INITCONTROL( pDirList, KbdListBox, WB_AUTOHSCROLL | WB_BORDER, - Point(nW+20, 58), Size(nW, 180-nH ), aEmptyStr, HID_FILEDLG_DIRS ); + Point(nW+20, 58), Size(nW, 180-nH ), aEmptyStr, ""/*HID_FILEDLG_DIRS*/ ); + // FIXME: HELPID INITCONTROL( pTypeTitel, FixedText, 0, - Point(10, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_TYPE ) ), HID_FILEDLG_TYPE ); + Point(10, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_TYPE ) ), ""/*HID_FILEDLG_TYPE*/ ); #ifndef UNX + // FIXME: HELPID INITCONTROL( pTypeList, ListBox, WB_DROPDOWN, - Point(10, 265-nH ), Size(nW, 100 ), aEmptyStr, HID_FILEDLG_TYPES ); + Point(10, 265-nH ), Size(nW, 100 ), aEmptyStr, ""/*HID_FILEDLG_TYPES*/ ); + // FIXME: HELPID INITCONTROL( pDriveTitle, FixedText, 0, - Point(nW+20, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DRIVES ) ), HID_FILEDLG_DRIVE ); + Point(nW+20, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DRIVES ) ), ""/*HID_FILEDLG_DRIVE*/ ); + // FIXME: HELPID INITCONTROL( pDriveList, ListBox, WB_DROPDOWN, - Point(nW+20, 265-nH ), Size(nW, 100 ), aEmptyStr, HID_FILEDLG_DRIVES ); + Point(nW+20, 265-nH ), Size(nW, 100 ), aEmptyStr, ""/*HID_FILEDLG_DRIVES*/ ); pNewDirBtn = NULL; pHomeBtn = NULL; #else + // FIXME: HELPID INITCONTROL( pTypeList, ListBox, WB_DROPDOWN, - Point(10, 265-nH ), Size(2*nW+20, 100 ), aEmptyStr, HID_FILEDLG_TYPES ); + Point(10, 265-nH ), Size(2*nW+20, 100 ), aEmptyStr, ""/*HID_FILEDLG_TYPES*/ ); pDriveTitle = NULL; pDriveList = NULL; @@ -782,10 +803,10 @@ void ImpFileDialog::InitControls() const long nButtonStartX = 2*nW+20+15; INITCONTROL( pOkBtn, PushButton, WB_DEFBUTTON, Point(nButtonStartX, 10), Size(STD_BTN_WIDTH, STD_BTN_HEIGHT), - Button::GetStandardText( BUTTON_OK ), 0 ); + Button::GetStandardText( BUTTON_OK ), "" ); INITCONTROL( pCancelBtn, CancelButton, 0, Point(nButtonStartX, 45 ), Size(STD_BTN_WIDTH, STD_BTN_HEIGHT), - Button::GetStandardText( BUTTON_CANCEL ), 0 ); + Button::GetStandardText( BUTTON_CANCEL ), "" ); pLoadBtn = 0; diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 2c71e60e8101..4898ed5d5f86 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -225,15 +225,15 @@ namespace svt } //-------------------------------------------------------------------- - void RoadmapWizard::SetRoadmapSmartHelpId( const SmartId& _rId, SmartIdUpdateMode _aMode ) + void RoadmapWizard::SetRoadmapHelpId( const rtl::OString& _rId ) { - m_pImpl->pRoadmap->SetSmartHelpId( _rId, _aMode ); + m_pImpl->pRoadmap->SetHelpId( _rId ); } //-------------------------------------------------------------------- - SmartId RoadmapWizard::GetRoadmapSmartHelpId() const + const rtl::OString& RoadmapWizard::GetRoadmapHelpId() const { - return m_pImpl->pRoadmap->GetSmartHelpId(); + return m_pImpl->pRoadmap->GetHelpId(); } //-------------------------------------------------------------------- diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 6a09f85036fd..24c68a9cdb00 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -177,7 +177,8 @@ namespace svt if (_nButtonFlags & WZB_PREVIOUS) { m_pPrevPage = new PushButton(this, WB_TABSTOP); - m_pPrevPage->SetSmartHelpId( SmartId(HID_WIZARD_PREVIOUS) ); + // FIXME: HELPID + m_pPrevPage->SetHelpId( "" /*HID_WIZARD_PREVIOUS*/ ); m_pPrevPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); m_pPrevPage->SetText(String(SvtResId(STR_WIZDLG_PREVIOUS))); m_pPrevPage->Show(); @@ -194,7 +195,8 @@ namespace svt if (_nButtonFlags & WZB_NEXT) { m_pNextPage = new PushButton(this, WB_TABSTOP); - m_pNextPage->SetSmartHelpId( SmartId(HID_WIZARD_NEXT) ); + // FIXME: HELPID + m_pNextPage->SetHelpId( "" /*HID_WIZARD_NEXT*/ ); m_pNextPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); m_pNextPage->SetText(String(SvtResId(STR_WIZDLG_NEXT))); m_pNextPage->Show(); diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx index 55800a213a2e..930d3412c632 100644 --- a/svtools/source/misc/helpagentwindow.cxx +++ b/svtools/source/misc/helpagentwindow.cxx @@ -109,7 +109,8 @@ namespace svt AlwaysEnableInput( TRUE, TRUE ); // unique id for the testtool - SetUniqueId( HID_HELPAGENT_WINDOW ); + // FIXME: HELPID + SetUniqueId( ""/*HID_HELPAGENT_WINDOW*/ ); } //-------------------------------------------------------------------- diff --git a/toolkit/inc/layout/layout.hxx b/toolkit/inc/layout/layout.hxx index 78c7ea29272a..5d013e8a74c4 100644 --- a/toolkit/inc/layout/layout.hxx +++ b/toolkit/inc/layout/layout.hxx @@ -40,7 +40,6 @@ #include #include #include -#include #include class Button; @@ -162,10 +161,8 @@ public: String GetText() const; void SetStyle( WinBits style ); void SetUpdateMode( bool mode ); - void SetHelpId( sal_uIntPtr id ); - sal_uIntPtr GetHelpId() const; - void SetSmartHelpId( SmartId const&, SmartIdUpdateMode mode=SMART_SET_SMART ); - SmartId GetSmartHelpId() const; + void SetHelpId( const rtl::OString& id ); + const rtl::OString& GetHelpId() const; void EnterWait (); void LeaveWait (); bool IsWait () const; @@ -582,20 +579,20 @@ public: #define DECL_MESSAGE_BOX_CTORS(Name)\ public:\ Name##Box (::Window *parent, char const* message,\ - char const* yes=0, char const* no=0, sal_uIntPtr help_id=0,\ + char const* yes=0, char const* no=0, const rtl::OString& help_id=rtl::OString(),\ char const* xml_file="message-box.xml", char const* id="message-box");\ Name##Box (::Window *parent, rtl::OUString const& message,\ rtl::OUString yes=String (),\ rtl::OUString no=String (),\ - sal_uIntPtr help_id=0,\ + const rtl::OString& help_id=rtl::OString(),\ char const* xml_file="message-box.xml", char const* id="message-box");\ Name##Box (::Window *parent, WinBits, char const* message,\ - char const* yes=0, char const* no=0, sal_uIntPtr help_id=0,\ + char const* yes=0, char const* no=0, const rtl::OString& help_id=rtl::OString(),\ char const* xml_file="message-box.xml", char const* id="message-box");\ Name##Box (::Window *parent, WinBits, rtl::OUString const& message,\ rtl::OUString yes=String (),\ rtl::OUString no=String (),\ - sal_uIntPtr help_id=0,\ + const rtl::OString& help_id=rtl::OString(),\ char const* xml_file="message-box.xml", char const* id="message-box")\ class TOOLKIT_DLLPUBLIC MessageBox : public Dialog @@ -616,10 +613,10 @@ protected: YesButton yesButton; void bits_init (WinBits bits, rtl::OUString const& message, - rtl::OUString yes, rtl::OUString, sal_uIntPtr help_id); + rtl::OUString yes, rtl::OUString, const rtl::OString& help_id); void init (rtl::OUString const& message, - rtl::OUString const& yes, rtl::OUString const& no, sal_uIntPtr help_id); - void init (char const* message, char const* yes, char const* no, sal_uIntPtr help_id); + rtl::OUString const& yes, rtl::OUString const& no, const rtl::OString& help_id); + void init (char const* message, char const* yes, char const* no, const rtl::OString& help_id); }; #define CLASS_MESSAGE_BOX(Name)\ diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx index 43861c3ed347..dd4b4e740ab1 100644 --- a/toolkit/source/awt/vclxdialog.cxx +++ b/toolkit/source/awt/vclxdialog.cxx @@ -208,11 +208,14 @@ void VCLXDialog::setTitle( const ::rtl::OUString& Title ) throw(::com::sun::star void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeException) { + // no more numerical help id + #if 0 ::vos::OGuard aGuard( GetMutex() ); Window* pWindow = GetWindow(); if ( pWindow ) pWindow->SetHelpId( id ); + #endif } ::rtl::OUString VCLXDialog::getTitle() throw(::com::sun::star::uno::RuntimeException) diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 248571819067..69371342a9a7 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1708,17 +1708,7 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: ::rtl::OUString aURL; if ( Value >>= aURL ) { - String aHelpURL( aURL ); - String aPattern( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - if ( aHelpURL.CompareIgnoreCaseToAscii( aPattern, aPattern.Len() ) == COMPARE_EQUAL ) - { - String aID = aHelpURL.Copy( aPattern.Len() ); - pWindow->SetHelpId( aID.ToInt32() ); - } - else - { - pWindow->SetSmartHelpId( SmartId( aHelpURL ) ); - } + pWindow->SetHelpId( rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ) ); } } break; @@ -2189,19 +2179,8 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: break; case BASEPROPERTY_HELPURL: { - SmartId aSmartId = GetWindow()->GetSmartHelpId(); - if( aSmartId.HasString() ) - { - String aStrHelpId = aSmartId.GetStr(); - aProp <<= ::rtl::OUString( aStrHelpId ); - } - else - { - ::rtl::OUStringBuffer aURL; - aURL.appendAscii( "HID:" ); - aURL.append( (sal_Int32) GetWindow()->GetHelpId() ); - aProp <<= aURL.makeStringAndClear(); - } + rtl::OUString aHelpId( rtl::OStringToOUString( GetWindow()->GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + aProp <<= ::rtl::OUString( aHelpId ); } break; case BASEPROPERTY_FONTDESCRIPTOR: diff --git a/toolkit/source/layout/vcl/wrapper.cxx b/toolkit/source/layout/vcl/wrapper.cxx index a8133250eb58..3b23ee92636b 100644 --- a/toolkit/source/layout/vcl/wrapper.cxx +++ b/toolkit/source/layout/vcl/wrapper.cxx @@ -304,13 +304,17 @@ void Window::setRes (ResId const& res) { return Resource::ReadStringRes (); } + rtl::OString ReadByteStringRes() + { + return Resource::ReadByteStringRes(); + } }; Resource_open_up r (res); #endif /* !RESOURCE_PUBLISH_PROTECTED */ - if (sal_uInt32 help_id = (sal_uInt32)r.GetLongRes (static_cast (r.GetClassRes ()) + 12)) - SetHelpId (help_id); sal_uInt32 mask = r.ReadLongRes (); + if (mask & WINDOW_HELPID) + SetHelpId (r.ReadByteStringRes()); if ( mask & WINDOW_TEXT ) SetText( r.ReadStringRes ()); } @@ -366,26 +370,16 @@ VCLXWindow* Window::GetVCLXWindow() const return GetWindow()->GetParent(); } -void Window::SetHelpId( sal_uIntPtr id ) +void Window::SetHelpId( const rtl::OString& id ) { GetWindow()->SetHelpId( id ); } -sal_uIntPtr Window::GetHelpId() const +const rtl::OString& Window::GetHelpId() const { return GetWindow()->GetHelpId(); } -void Window::SetSmartHelpId( SmartId const& id, SmartIdUpdateMode mode ) -{ - GetWindow()->SetSmartHelpId( id, mode ); -} - -SmartId Window::GetSmartHelpId() const -{ - return GetWindow()->GetSmartHelpId(); -} - void Window::EnterWait () { GetWindow()->EnterWait (); @@ -866,7 +860,7 @@ void Dialog::Initialize (SfxChildWinInfo*) , yesButton (this, "BTN_YES") MessageBox::MessageBox (::Window *parent, char const* message, - char const* yes, char const* no, sal_uIntPtr help_id, + char const* yes, char const* no, const rtl::OString& help_id, char const* xml_file, char const* id) : MESSAGE_BOX_MEMBER_INIT { @@ -876,7 +870,7 @@ MessageBox::MessageBox (::Window *parent, char const* message, } MessageBox::MessageBox (::Window *parent, OUString const& message, - OUString yes, OUString no, sal_uIntPtr help_id, + OUString yes, OUString no, const rtl::OString& help_id, char const* xml_file, char const* id) : MESSAGE_BOX_MEMBER_INIT { @@ -890,7 +884,7 @@ MessageBox::MessageBox (::Window *parent, OUString const& message, #endif /* !__GNUC__ */ MessageBox::MessageBox (::Window *parent, WinBits bits, char const* message, - char const* yes, char const* no, sal_uIntPtr help_id, + char const* yes, char const* no, const rtl::OString& help_id, char const* xml_file, char const* id) : MESSAGE_BOX_MEMBER_INIT { @@ -903,7 +897,7 @@ MessageBox::MessageBox (::Window *parent, WinBits bits, char const* message, } MessageBox::MessageBox (::Window *parent, WinBits bits, OUString const& message, - OUString yes, OUString no, sal_uIntPtr help_id, + OUString yes, OUString no, const rtl::OString& help_id, char const* xml_file, char const* id) : MESSAGE_BOX_MEMBER_INIT { @@ -916,7 +910,7 @@ MessageBox::MessageBox (::Window *parent, WinBits bits, OUString const& message, } void MessageBox::bits_init (WinBits bits, OUString const& message, - OUString yes, OUString no, sal_uIntPtr help_id) + OUString yes, OUString no, const rtl::OString& help_id) { if ( bits & ( WB_OK_CANCEL | WB_OK )) yes = Button::GetStandardText ( BUTTON_OK ); @@ -941,12 +935,12 @@ void MessageBox::bits_init (WinBits bits, OUString const& message, init (message, yes, no, help_id); } -void MessageBox::init (char const* message, char const* yes, char const* no, sal_uIntPtr help_id) +void MessageBox::init (char const* message, char const* yes, char const* no, const rtl::OString& help_id) { init ( OUString::createFromAscii (message), OUString::createFromAscii (yes), OUString::createFromAscii (no), help_id); } -void MessageBox::init (OUString const& message, OUString const& yes, OUString const& no, sal_uIntPtr help_id) +void MessageBox::init (OUString const& message, OUString const& yes, OUString const& no, const rtl::OString& help_id) { imageError.Hide (); imageInfo.Hide (); @@ -974,28 +968,28 @@ void MessageBox::init (OUString const& message, OUString const& yes, OUString co #undef MESSAGE_BOX_IMPL #define MESSAGE_BOX_IMPL(Name)\ Name##Box::Name##Box (::Window *parent, char const* message,\ - char const* yes, char const* no, sal_uIntPtr help_id,\ + char const* yes, char const* no, const rtl::OString& help_id,\ char const* xml_file, char const* id)\ : MessageBox (parent, message, yes, no, help_id, xml_file, id)\ {\ image##Name.Show ();\ }\ Name##Box::Name##Box (::Window *parent, OUString const& message,\ - OUString yes, OUString no, sal_uIntPtr help_id,\ + OUString yes, OUString no, const rtl::OString& help_id,\ char const* xml_file, char const* id)\ : MessageBox (parent, message, yes, no, help_id, xml_file, id)\ {\ image##Name.Show ();\ }\ Name##Box::Name##Box (::Window *parent, WinBits bits, char const* message,\ - char const* yes, char const* no, sal_uIntPtr help_id,\ + char const* yes, char const* no, const rtl::OString& help_id,\ char const* xml_file, char const* id)\ : MessageBox (parent, bits, message, yes, no, help_id, xml_file, id)\ {\ image##Name.Show ();\ }\ Name##Box::Name##Box (::Window *parent, WinBits bits, OUString const& message,\ - OUString yes, OUString no, sal_uIntPtr help_id,\ + OUString yes, OUString no, const rtl::OString& help_id,\ char const* xml_file, char const* id)\ : MessageBox (parent, bits, message, yes, no, help_id, xml_file, id)\ {\ diff --git a/tools/inc/tools/rc.h b/tools/inc/tools/rc.h index bd499717a3a4..e11aed2937fd 100644 --- a/tools/inc/tools/rc.h +++ b/tools/inc/tools/rc.h @@ -50,6 +50,7 @@ typedef short RSWND_STYLE; #define WINDOW_EXTRALONG 0x0800 #define WINDOW_UNIQUEID 0x1000 #define WINDOW_BORDER_STYLE 0x2000 +#define WINDOW_HELPID 0x4000 // Definition der Struktur die alle "WorkWindow"-Resourcen haben #define WORKWIN_SHOWNORMAL 0 diff --git a/tools/inc/tools/rc.hxx b/tools/inc/tools/rc.hxx index 4bf1827a1ab6..15e077c3c62c 100644 --- a/tools/inc/tools/rc.hxx +++ b/tools/inc/tools/rc.hxx @@ -87,6 +87,9 @@ class TOOLS_DLLPUBLIC Resource // read a string from resource data and increment pointer UniString ReadStringRes() { return m_pResMgr->ReadString(); } + // read a byte string from resource data and increment pointer + rtl::OString ReadByteStringRes() + { return m_pResMgr->ReadByteString(); } // Gibt die Resource frei (this-Zeiger fuer Fehlerueberpruefung) // free the resource from m_pResMgr's stack (pass this ptr for validation) diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx index b19524139078..93442701d939 100644 --- a/tools/inc/tools/resmgr.hxx +++ b/tools/inc/tools/resmgr.hxx @@ -181,8 +181,10 @@ public: static sal_uInt32 GetObjSize( RSHEADER_TYPE* pHT ) { return( pHT->GetGlobOff() ); } - // Liefert einen String aus der Resource + // returns a string and its length out of the resource static sal_uInt32 GetString( UniString& rStr, const BYTE* pStr ); + // returns a byte string and its length out of the resource + static sal_uInt32 GetByteString( rtl::OString& rStr, const BYTE* pStr ); // Groesse eines Strings in der Resource static sal_uInt32 GetStringSize( sal_uInt32 nLen ) @@ -209,9 +211,10 @@ public: INT16 ReadShort(); INT32 ReadLong(); UniString ReadString(); + rtl::OString ReadByteString(); - // generate auto help id for current resource stack - ULONG GetAutoHelpId(); + // generate auto help id for current resource stack + rtl::OString GetAutoHelpId(); static void SetReadStringHook( ResHookProc pProc ); static ResHookProc GetReadStringHook(); diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index daeaf8e4c3a5..df8506bb090b 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -46,6 +46,7 @@ #include #include #include +#include #include #include #include @@ -1370,6 +1371,13 @@ sal_uInt32 ResMgr::GetString( UniString& rStr, const BYTE* pStr ) return nRet; } +sal_uInt32 ResMgr::GetByteString( rtl::OString& rStr, const BYTE* pStr ) +{ + sal_uInt32 nRet = GetStringSize( pStr ); + rStr = rtl::OString( (const sal_Char*)pStr, nRet ); + return nRet; +} + // ------------------------------------------------------------------ sal_uInt32 ResMgr::GetStringSize( const BYTE* pStr ) @@ -1765,90 +1773,93 @@ UniString ResMgr::ReadString() return aRet; } +rtl::OString ResMgr::ReadByteString() +{ + osl::Guard aGuard( getResMgrMutex() ); + + if( pFallbackResMgr ) + return pFallbackResMgr->ReadByteString(); + + rtl::OString aRet; + + const ImpRCStack& rTop = aStack[nCurStack]; + if( (rTop.Flags & RC_NOTFOUND) ) + { + #if OSL_DEBUG_LEVEL > 0 + aRet = OString( "" ); + #endif + } + else + Increment( GetByteString( aRet, (const BYTE*)GetClass() ) ); + + return aRet; +} + // ----------------------------------------------------------------------- -ULONG ResMgr::GetAutoHelpId() +rtl::OString ResMgr::GetAutoHelpId() { osl::Guard aGuard( getResMgrMutex() ); if( pFallbackResMgr ) return pFallbackResMgr->GetAutoHelpId(); - DBG_ASSERT( nCurStack, "resource stack empty in Auto help id generation" ); - if( nCurStack < 1 || nCurStack > 2 ) - return 0; - - const ImpRCStack *pRC = StackTop( nCurStack==1 ? 0 : 1 ); - - DBG_ASSERT( pRC->pResource, "MM hat gesagt, dass der immer einen hat" ); - ULONG nGID = pRC->pResource->GetId(); - - if( !nGID || nGID > 32767 ) - return 0; - - ULONG nHID = 0; - - // GGGg gggg::gggg gggg::ggLL LLLl::llll llll - switch( pRC->pResource->GetRT() ) { // maximal 7 - case RSC_DOCKINGWINDOW: - nHID += 0x20000000L; - case RSC_WORKWIN: - nHID += 0x20000000L; - case RSC_MODELESSDIALOG: - nHID += 0x20000000L; - case RSC_FLOATINGWINDOW: - nHID += 0x20000000L; - case RSC_MODALDIALOG: - nHID += 0x20000000L; - case RSC_TABPAGE: - nHID += 0x20000000L; - - if( nCurStack == 2 ) { - pRC = StackTop(); - ULONG nLID = pRC->pResource->GetId(); - - if( !nLID || nLID > 511 ) - return 0; - - switch( pRC->pResource->GetRT() ) { // maximal 32 - case RSC_TABCONTROL: nHID |= 0x0000; break; - case RSC_RADIOBUTTON: nHID |= 0x0200; break; - case RSC_CHECKBOX: nHID |= 0x0400; break; - case RSC_TRISTATEBOX: nHID |= 0x0600; break; - case RSC_EDIT: nHID |= 0x0800; break; - case RSC_MULTILINEEDIT: nHID |= 0x0A00; break; - case RSC_MULTILISTBOX: nHID |= 0x0C00; break; - case RSC_LISTBOX: nHID |= 0x0E00; break; - case RSC_COMBOBOX: nHID |= 0x1000; break; - case RSC_PUSHBUTTON: nHID |= 0x1200; break; - case RSC_SPINFIELD: nHID |= 0x1400; break; - case RSC_PATTERNFIELD: nHID |= 0x1600; break; - case RSC_NUMERICFIELD: nHID |= 0x1800; break; - case RSC_METRICFIELD: nHID |= 0x1A00; break; - case RSC_CURRENCYFIELD: nHID |= 0x1C00; break; - case RSC_DATEFIELD: nHID |= 0x1E00; break; - case RSC_TIMEFIELD: nHID |= 0x2000; break; - case RSC_IMAGERADIOBUTTON: nHID |= 0x2200; break; - case RSC_NUMERICBOX: nHID |= 0x2400; break; - case RSC_METRICBOX: nHID |= 0x2600; break; - case RSC_CURRENCYBOX: nHID |= 0x2800; break; - case RSC_DATEBOX: nHID |= 0x2A00; break; - case RSC_TIMEBOX: nHID |= 0x2C00; break; - case RSC_IMAGEBUTTON: nHID |= 0x2E00; break; - case RSC_MENUBUTTON: nHID |= 0x3000; break; - case RSC_MOREBUTTON: nHID |= 0x3200; break; - default: - return 0; - } // of switch - nHID |= nLID; - } // of if - break; + OSL_ENSURE( nCurStack, "resource stack empty in Auto help id generation" ); + if( nCurStack < 1 ) + return rtl::OString(); + + // prepare HID, start with resource prefix + rtl::OStringBuffer aHID( 32 ); + aHID.append( rtl::OUStringToOString( pImpRes->aPrefix, RTL_TEXTENCODING_UTF8 ) ); + aHID.append( ':' ); + + // append type + const ImpRCStack *pRC = StackTop(); + OSL_ENSURE( pRC, "missing resource stack level" ); + + switch( pRC->pResource->GetRT() ) { // maximal 32 + case RSC_TABCONTROL: aHID.append( "TabControl" ); break; + case RSC_RADIOBUTTON: aHID.append( "RadioButton" ); break; + case RSC_CHECKBOX: aHID.append( "CheckBox" ); break; + case RSC_TRISTATEBOX: aHID.append( "TristateBox" ); break; + case RSC_EDIT: aHID.append( "Edit" ); break; + case RSC_MULTILINEEDIT: aHID.append( "MultilineEdit" ); break; + case RSC_MULTILISTBOX: aHID.append( "MultiListBox" ); break; + case RSC_LISTBOX: aHID.append( "ListBox" ); break; + case RSC_COMBOBOX: aHID.append( "Combobox" ); break; + case RSC_PUSHBUTTON: aHID.append( "PushButton" ); break; + case RSC_SPINFIELD: aHID.append( "SpinField" ); break; + case RSC_PATTERNFIELD: aHID.append( "PatternField" ); break; + case RSC_NUMERICFIELD: aHID.append( "NumericField" ); break; + case RSC_METRICFIELD: aHID.append( "MetricField" ); break; + case RSC_CURRENCYFIELD: aHID.append( "CurrencyField" ); break; + case RSC_DATEFIELD: aHID.append( "DateField" ); break; + case RSC_TIMEFIELD: aHID.append( "TimeField" ); break; + case RSC_IMAGERADIOBUTTON: aHID.append( "ImageRadioButton" ); break; + case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break; + case RSC_METRICBOX: aHID.append( "MetricBox" ); break; + case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break; + case RSC_DATEBOX: aHID.append( "DateBox" ); break; + case RSC_TIMEBOX: aHID.append( "TimeBox" ); break; + case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break; + case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break; + case RSC_MOREBUTTON: aHID.append( "MoreButton" ); break; default: - return 0; - } // of switch - nHID |= nGID << 14; + ; + } + + // append resource id hierarchy + for( int nOff = nCurStack-1; nOff >= 0; nOff-- ) + { + aHID.append( ':' ); + pRC = StackTop( nOff ); + + OSL_ENSURE( pRC->pResource, "missing resource in resource stack level !" ); + if( pRC->pResource ) + aHID.append( sal_Int32( pRC->pResource->GetId() ) ); + } - return nHID; + return aHID.makeStringAndClear(); } // ----------------------------------------------------------------------- diff --git a/vcl/inc/vcl/btndlg.hxx b/vcl/inc/vcl/btndlg.hxx index dbeb8350a0d4..3186ba5f6399 100644 --- a/vcl/inc/vcl/btndlg.hxx +++ b/vcl/inc/vcl/btndlg.hxx @@ -104,8 +104,8 @@ public: XubString GetButtonText( USHORT nId ) const; void SetButtonHelpText( USHORT nId, const XubString& rText ); XubString GetButtonHelpText( USHORT nId ) const; - void SetButtonHelpId( USHORT nId, ULONG nHelpId ); - ULONG GetButtonHelpId( USHORT nId ) const; + void SetButtonHelpId( USHORT nId, const rtl::OString& rHelpId ); + rtl::OString GetButtonHelpId( USHORT nId ) const; void SetFocusButton( USHORT nId = BUTTONDIALOG_BUTTON_NOTFOUND ) { mnFocusButtonId = nId; } USHORT GetFocusButton() const { return mnFocusButtonId; } diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx index 4bca986812ed..c0e9c6bacf50 100644 --- a/vcl/inc/vcl/help.hxx +++ b/vcl/inc/vcl/help.hxx @@ -51,8 +51,8 @@ class Window; #define QUICKHELP_BIDI_RTL ((USHORT)0x8000) // By changes you must also change: rsc/vclrsc.hxx -#define OOO_HELP_INDEX ((ULONG)0xFFFFFFFF) -#define OOO_HELP_HELPONHELP ((ULONG)0xFFFFFFFE) +#define OOO_HELP_INDEX ".help:index" +#define OOO_HELP_HELPONHELP ".help:helponhelp" // -------- // - Help - @@ -70,10 +70,8 @@ public: void SetHelpFile( const String& rFileName ) { maHelpFile = rFileName; } const String& GetHelpFile() const { return maHelpFile; } - virtual BOOL Start( ULONG nHelpId, const Window* pWindow ); virtual BOOL Start( const XubString& rKeyWord, const Window* pWindow ); - virtual void OpenHelpAgent( ULONG nHelpId ); - virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow ); + virtual void OpenHelpAgent( const String& rHelpId ); virtual XubString GetHelpText( const String& aHelpURL, const Window* pWindow ); static void EnableContextHelp(); diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx index c0cc3b5b51d6..6279c0634797 100644 --- a/vcl/inc/vcl/menu.hxx +++ b/vcl/inc/vcl/menu.hxx @@ -290,8 +290,8 @@ public: void SetHelpCommand( USHORT nItemId, const XubString& rString ); const XubString& GetHelpCommand( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ); + rtl::OString GetHelpId( USHORT nItemId ) const; void SetActivateHdl( const Link& rLink ) { aActivateHdl = rLink; } const Link& GetActivateHdl() const { return aActivateHdl; } diff --git a/vcl/inc/vcl/smartid.hxx b/vcl/inc/vcl/smartid.hxx deleted file mode 100755 index 2cc5f347b2cb..000000000000 --- a/vcl/inc/vcl/smartid.hxx +++ /dev/null @@ -1,87 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SMARTID_HXX_ -#define _SMARTID_HXX_ - -#include -#include - -/// SMART_SET_SMART only sets the Ids that are defined in the SmartId -/// the other types set whatever is given. This can also be used to reset an Id -enum SmartIdUpdateMode { SMART_SET_SMART, SMART_SET_NUM, SMART_SET_STR, SMART_SET_ALL }; - -struct ImplSmartIdData; - -/* - -SmartId is a substitute for Numeric HelpIds. They can handle Numeric and String HelpIds and offer commonly needed operators. - -Matching Ids: -if part of an Id is not set (HasNumeric HasString is False) then this part will never match to anything. Not even unset values - -*/ -class VCL_DLLPUBLIC SmartId -{ -private: - ImplSmartIdData* mpData; - SAL_DLLPRIVATE ImplSmartIdData* GetSmartIdData(); - -public: - explicit SmartId( const String& rId ); - explicit SmartId( ULONG nId ); - SmartId( const String& rId, ULONG nId ); - - SmartId(); - - SmartId( const SmartId& rId ); - SmartId& operator = ( const SmartId& rId ); - - ~SmartId(); - - void UpdateId( const SmartId& rId, SmartIdUpdateMode aMode = SMART_SET_SMART ); - - BOOL HasNumeric() const; - BOOL HasString() const; - BOOL HasAny() const; - ULONG GetNum() const; - String GetStr() const; - - String GetText() const; /// return String for UI usage - - BOOL Matches( const String &rId )const; - BOOL Matches( const ULONG nId ) const; -/// In case both Ids have both values set only the StringId is used for Matching - BOOL Matches( const SmartId &rId ) const; - - BOOL Equals( const SmartId &rId ) const; - - BOOL operator == ( const SmartId& rRight ) const; - BOOL operator < ( const SmartId& rRight ) const; -}; - -#endif diff --git a/vcl/inc/vcl/status.hxx b/vcl/inc/vcl/status.hxx index 810ecf230960..907d08272cbb 100644 --- a/vcl/inc/vcl/status.hxx +++ b/vcl/inc/vcl/status.hxx @@ -183,8 +183,8 @@ public: using Window::GetQuickHelpText; const XubString& GetQuickHelpText( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ); + rtl::OString GetHelpId( USHORT nItemId ) const; void SetBottomBorder( BOOL bBottomBorder = TRUE ); BOOL IsBottomBorder() const { return mbBottomBorder; } @@ -205,9 +205,9 @@ public: const XubString& GetHelpText() const { return Window::GetHelpText(); } - void SetHelpId( ULONG nId ) - { Window::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { Window::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return Window::GetHelpId(); } Size CalcWindowSizePixel() const; diff --git a/vcl/inc/vcl/tabctrl.hxx b/vcl/inc/vcl/tabctrl.hxx index 4c63b12f15fe..ad702ac4dc54 100644 --- a/vcl/inc/vcl/tabctrl.hxx +++ b/vcl/inc/vcl/tabctrl.hxx @@ -70,7 +70,6 @@ private: BOOL mbRestoreUnqId; BOOL mbSingleLine; BOOL mbScroll; - BOOL mbRestoreSmartId; BOOL mbSmallInvalidate; BOOL mbExtraSpace; Link maActivateHdl; @@ -177,8 +176,8 @@ public: void SetHelpText( USHORT nPageId, const XubString& rText ); const XubString& GetHelpText( USHORT nPageId ) const; - void SetHelpId( USHORT nPageId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nPageId ) const; + void SetHelpId( USHORT nPageId, const rtl::OString& rHelpId ); + rtl::OString GetHelpId( USHORT nPageId ) const; void SetPageImage( USHORT nPageId, const Image& rImage ); const Image* GetPageImage( USHORT nPageId ) const; @@ -188,9 +187,9 @@ public: const XubString& GetHelpText() const { return Control::GetHelpText(); } - void SetHelpId( ULONG nId ) - { Control::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { Control::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return Control::GetHelpId(); } void SetActivatePageHdl( const Link& rLink ) { maActivateHdl = rLink; } diff --git a/vcl/inc/vcl/toolbox.h b/vcl/inc/vcl/toolbox.h index 33e4e8d2e013..7cdeb0b17a5a 100644 --- a/vcl/inc/vcl/toolbox.h +++ b/vcl/inc/vcl/toolbox.h @@ -68,7 +68,7 @@ struct ImplToolItem XubString maQuickHelpText; XubString maHelpText; String maCommandStr; - ULONG mnHelpId; + rtl::OString maHelpId; Rectangle maRect; Rectangle maCalcRect; // the overall horizontal item size, including one or more of [image size + textlength + dropdown arrow] diff --git a/vcl/inc/vcl/toolbox.hxx b/vcl/inc/vcl/toolbox.hxx index 5cc102842dc3..aa7ddd886bbb 100644 --- a/vcl/inc/vcl/toolbox.hxx +++ b/vcl/inc/vcl/toolbox.hxx @@ -511,8 +511,8 @@ public: void SetHelpText( USHORT nItemId, const XubString& rText ); const XubString& GetHelpText( USHORT nItemId ) const; - void SetHelpId( USHORT nItemId, ULONG nHelpId ); - ULONG GetHelpId( USHORT nItemId ) const; + void SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ); + rtl::OString GetHelpId( USHORT nItemId ) const; // window size according to current alignment, floating state and number of lines Size CalcWindowSizePixel() const; @@ -569,9 +569,9 @@ public: const XubString& GetHelpText() const { return DockingWindow::GetHelpText(); } - void SetHelpId( ULONG nId ) - { DockingWindow::SetHelpId( nId ); } - ULONG GetHelpId() const + void SetHelpId( const rtl::OString& rId ) + { DockingWindow::SetHelpId( rId ); } + const rtl::OString& GetHelpId() const { return DockingWindow::GetHelpId(); } void SetClickHdl( const Link& rLink ) { maClickHdl = rLink; } diff --git a/vcl/inc/vcl/window.h b/vcl/inc/vcl/window.h index 9d917a09b6de..13b906991077 100644 --- a/vcl/inc/vcl/window.h +++ b/vcl/inc/vcl/window.h @@ -57,7 +57,6 @@ class Cursor; class ImplDevFontList; class ImplFontCache; class SalControlHandle; -class SmartId; class VCLXWindow; class SalFrame; class SalObject; @@ -122,8 +121,6 @@ struct ImplWinData BOOL mbMouseOver; // tracks mouse over for native widget paint effect SalControlHandle* mpSalControlHandle; // native data for NWF BOOL mbEnableNativeWidget; // toggle native widget rendering - SmartId* mpSmartHelpId; - SmartId* mpSmartUniqueId; ::std::list< Window* > maTopWindowChildren; }; @@ -256,8 +253,8 @@ public: long mnY; long mnAbsScreenX; Point maPos; - ULONG mnHelpId; - ULONG mnUniqId; + rtl::OString maHelpId; + rtl::OString maUniqId; XubString maHelpText; XubString maQuickHelpText; InputContext maInputContext; diff --git a/vcl/inc/vcl/window.hxx b/vcl/inc/vcl/window.hxx index 3d1cc91ee468..0152ef3d919f 100644 --- a/vcl/inc/vcl/window.hxx +++ b/vcl/inc/vcl/window.hxx @@ -50,7 +50,6 @@ #include #include #include -#include class VirtualDevice; struct ImplDelData; @@ -951,16 +950,12 @@ public: void SetQuickHelpText( const XubString& rHelpText ); const XubString& GetQuickHelpText() const; - void SetHelpId( ULONG nHelpId ); /// deprecated - ULONG GetHelpId() const; /// deprecated - void SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode = SMART_SET_SMART ); - SmartId GetSmartHelpId() const; + void SetHelpId( const rtl::OString& ); + const rtl::OString& GetHelpId() const; - void SetUniqueId( ULONG nUniqueId ); /// deprecated - ULONG GetUniqueId() const; /// deprecated - void SetSmartUniqueId( const SmartId& aId, SmartIdUpdateMode aMode = SMART_SET_SMART ); - SmartId GetSmartUniqueId() const; - SmartId GetSmartUniqueOrHelpId() const; + void SetUniqueId( const rtl::OString& ); + const rtl::OString& GetUniqueId() const; + const rtl::OString& GetUniqueOrHelpId() const; Window* FindWindow( const Point& rPos ) const; diff --git a/vcl/prj/d.lst b/vcl/prj/d.lst index 8345b155ce58..a5803df239c9 100644 --- a/vcl/prj/d.lst +++ b/vcl/prj/d.lst @@ -144,7 +144,6 @@ mkdir: %_DEST%\inc%_EXT%\vcl ..\inc\vcl\pdfextoutdevdata.hxx %_DEST%\inc%_EXT%\vcl\pdfextoutdevdata.hxx ..\inc\vcl\pngread.hxx %_DEST%\inc%_EXT%\vcl\pngread.hxx ..\inc\vcl\pngwrite.hxx %_DEST%\inc%_EXT%\vcl\pngwrite.hxx -..\inc\vcl\smartid.hxx %_DEST%\inc%_EXT%\vcl\smartid.hxx ..\inc\vcl\configsettings.hxx %_DEST%\inc%_EXT%\vcl\configsettings.hxx ..\inc\vcl\ImageListProvider.hxx %_DEST%\inc%_EXT%\vcl\ImageListProvider.hxx ..\inc\vcl\fontmanager.hxx %_DEST%\inc%_EXT%\vcl\fontmanager.hxx diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index b4ab10887fcd..97be0ae9e2d4 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -62,12 +62,7 @@ Help::~Help() // ----------------------------------------------------------------------- -BOOL Help::Start( ULONG, const Window* ) -{ - return FALSE; -} - -void Help::OpenHelpAgent( ULONG ) +void Help::OpenHelpAgent( const String& ) { } @@ -80,13 +75,6 @@ BOOL Help::Start( const XubString&, const Window* ) // ----------------------------------------------------------------------- -XubString Help::GetHelpText( ULONG, const Window* ) -{ - return ImplGetSVEmptyStr(); -} - -// ----------------------------------------------------------------------- - XubString Help::GetHelpText( const String&, const Window* ) { return ImplGetSVEmptyStr(); diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index 89fbe6d3db78..3353c1b41d85 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -42,7 +42,6 @@ #include "vcl/controldata.hxx" #include "vcl/sound.hxx" #include "vcl/lstbox.hxx" -#include "vcl/smartid.hxx" #include "vcl/window.h" @@ -59,7 +58,7 @@ struct ImplTabItem String maText; String maFormatText; String maHelpText; - ULONG mnHelpId; + rtl::OString maHelpId; Rectangle maRect; USHORT mnLine; bool mbFullVisible; @@ -67,7 +66,7 @@ struct ImplTabItem Image maTabImage; ImplTabItem() - : mnId( 0 ), mnTabPageResId( 0 ), mpTabPage( NULL ), mnHelpId( 0 ), + : mnId( 0 ), mnTabPageResId( 0 ), mpTabPage( NULL ), mnLine( 0 ), mbFullVisible( FALSE ), mbEnabled( true ) {} }; @@ -151,7 +150,6 @@ void TabControl::ImplInit( Window* pParent, WinBits nStyle ) mbRestoreUnqId = FALSE; mbSingleLine = FALSE; mbScroll = FALSE; - mbRestoreSmartId = FALSE; mbSmallInvalidate = FALSE; mbExtraSpace = FALSE; mpTabCtrlData = new ImplTabCtrlData; @@ -705,11 +703,9 @@ void TabControl::ImplChangeTabPage( USHORT nId, USHORT nOldId ) if ( pOldPage ) { if ( mbRestoreHelpId ) - pCtrlParent->SetHelpId( 0 ); + pCtrlParent->SetHelpId( rtl::OString() ); if ( mbRestoreUnqId ) - pCtrlParent->SetUniqueId( 0 ); - if( mbRestoreSmartId ) - pCtrlParent->SetSmartHelpId( SmartId() ); + pCtrlParent->SetUniqueId( rtl::OString() ); pOldPage->DeactivatePage(); } @@ -719,21 +715,16 @@ void TabControl::ImplChangeTabPage( USHORT nId, USHORT nOldId ) // activate page here so the conbtrols can be switched // also set the help id of the parent window to that of the tab page - if ( !GetHelpId() ) + if ( !GetHelpId().getLength() ) { mbRestoreHelpId = TRUE; pCtrlParent->SetHelpId( pPage->GetHelpId() ); } - if ( !pCtrlParent->GetUniqueId() ) + if ( !pCtrlParent->GetUniqueId().getLength() ) { mbRestoreUnqId = TRUE; pCtrlParent->SetUniqueId( pPage->GetUniqueId() ); } - if( ! GetSmartHelpId().HasAny() ) - { - mbRestoreSmartId = TRUE; - pCtrlParent->SetSmartHelpId( pPage->GetSmartHelpId() ); - } pPage->ActivatePage(); @@ -1490,13 +1481,13 @@ void TabControl::RequestHelp( const HelpEvent& rHEvt ) } else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { - ULONG nHelpId = GetHelpId( nItemId ); - if ( nHelpId ) + rtl::OUString aHelpId( rtl::OStringToOUString( GetHelpId( nItemId ), RTL_TEXTENCODING_UTF8 ) ); + if ( aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); if ( pHelp ) - pHelp->Start( nHelpId, this ); + pHelp->Start( aHelpId, this ); return; } } @@ -1578,7 +1569,7 @@ void TabControl::Command( const CommandEvent& rCEvt ) aMenu.InsertItem( it->mnId, it->maText, MIB_CHECKABLE | MIB_RADIOCHECK ); if ( it->mnId == mnCurPageId ) aMenu.CheckItem( it->mnId ); - aMenu.SetHelpId( it->mnId, it->mnHelpId ); + aMenu.SetHelpId( it->mnId, it->maHelpId ); } USHORT nId = aMenu.Execute( this, aMenuPos ); @@ -1830,7 +1821,6 @@ void TabControl::InsertPage( USHORT nPageId, const XubString& rText, pItem->mnId = nPageId; pItem->mpTabPage = NULL; pItem->mnTabPageResId = 0; - pItem->mnHelpId = 0; pItem->maText = rText; pItem->mbFullVisible = FALSE; @@ -2158,11 +2148,11 @@ const XubString& TabControl::GetHelpText( USHORT nPageId ) const if ( pItem ) { - if ( !pItem->maHelpText.Len() && pItem->mnHelpId ) + if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() ) { Help* pHelp = Application::GetHelp(); if ( pHelp ) - pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this ); + pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return pItem->maHelpText; @@ -2173,24 +2163,25 @@ const XubString& TabControl::GetHelpText( USHORT nPageId ) const // ----------------------------------------------------------------------- -void TabControl::SetHelpId( USHORT nPageId, ULONG nHelpId ) +void TabControl::SetHelpId( USHORT nPageId, const rtl::OString& rHelpId ) { ImplTabItem* pItem = ImplGetItem( nPageId ); if ( pItem ) - pItem->mnHelpId = nHelpId; + pItem->maHelpId = rHelpId; } // ----------------------------------------------------------------------- -ULONG TabControl::GetHelpId( USHORT nPageId ) const +rtl::OString TabControl::GetHelpId( USHORT nPageId ) const { + rtl::OString aRet; ImplTabItem* pItem = ImplGetItem( nPageId ); if ( pItem ) - return pItem->mnHelpId; - else - return 0; + aRet = pItem->maHelpId; + + return aRet; } // ----------------------------------------------------------------------- diff --git a/vcl/source/helper/makefile.mk b/vcl/source/helper/makefile.mk index e708bdec9eaa..1a417417dbe4 100644 --- a/vcl/source/helper/makefile.mk +++ b/vcl/source/helper/makefile.mk @@ -46,7 +46,6 @@ SLOFILES=\ $(SLO)$/canvastools.obj \ $(SLO)$/xconnection.obj \ $(SLO)$/threadex.obj \ - $(SLO)$/smartid.obj \ $(SLO)$/lazydelete.obj # --- Targets ------------------------------------------------------ diff --git a/vcl/source/helper/smartid.cxx b/vcl/source/helper/smartid.cxx deleted file mode 100755 index c367aeb2bce5..000000000000 --- a/vcl/source/helper/smartid.cxx +++ /dev/null @@ -1,264 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_vcl.hxx" -#include - -struct ImplSmartIdData -{ - String aUId; - ULONG nUId; - BOOL bHasStringId; - BOOL bHasNumericId; -}; - - -ImplSmartIdData* SmartId::GetSmartIdData() -{ - if ( !mpData ) - { - mpData = new ImplSmartIdData; -// mpData->aUId = ""; - mpData->nUId = 0; - mpData->bHasStringId = FALSE; - mpData->bHasNumericId = FALSE; - } - return mpData; -} - - -SmartId::SmartId( const String& rId ) -: mpData( NULL ) -{ - GetSmartIdData()->aUId = rId; - GetSmartIdData()->bHasStringId = TRUE; -} - -SmartId::SmartId( ULONG nId ) -: mpData( NULL ) -{ - GetSmartIdData()->nUId = nId; - GetSmartIdData()->bHasNumericId = TRUE; -} - -SmartId::SmartId( const String& rId, ULONG nId ) -: mpData( NULL ) -{ - GetSmartIdData()->aUId = rId; - GetSmartIdData()->bHasStringId = TRUE; - GetSmartIdData()->nUId = nId; - GetSmartIdData()->bHasNumericId = TRUE; -} - -SmartId::SmartId() -: mpData( NULL ) -{} - -SmartId::SmartId( const SmartId& rId ) -: mpData( NULL ) -{ - if ( rId.mpData ) - { - GetSmartIdData(); - mpData->aUId = rId.mpData->aUId; - mpData->bHasStringId = rId.mpData->bHasStringId; - mpData->nUId = rId.mpData->nUId; - mpData->bHasNumericId = rId.mpData->bHasNumericId; - } -} - -SmartId& SmartId::operator = ( const SmartId& rId ) -{ - if ( rId.mpData ) - GetSmartIdData(); - else - { - delete mpData; - mpData = NULL; - } - if ( mpData && rId.mpData ) - { - mpData->aUId = rId.mpData->aUId; - mpData->bHasStringId = rId.mpData->bHasStringId; - mpData->nUId = rId.mpData->nUId; - mpData->bHasNumericId = rId.mpData->bHasNumericId; - } - return *this; -} - -SmartId::~SmartId() -{ - if ( mpData ) - delete mpData; -#ifdef DBG_UTIL - if ( mpData ) - mpData = (ImplSmartIdData*)0xDeadBeef; -#endif -} - -void SmartId::UpdateId( const SmartId& rId, SmartIdUpdateMode aMode ) -{ - // Check if ImplData is needed - if ( aMode != SMART_SET_SMART || ( rId.HasString() || rId.HasNumeric() ) ) - GetSmartIdData(); - - if ( aMode == SMART_SET_STR || aMode == SMART_SET_ALL || ( aMode == SMART_SET_SMART && rId.HasString() ) ) - { - GetSmartIdData()->aUId = rId.GetStr(); - GetSmartIdData()->bHasStringId = rId.HasString(); - } - if ( aMode == SMART_SET_NUM || aMode == SMART_SET_ALL || ( aMode == SMART_SET_SMART && rId.HasNumeric() ) ) - { - GetSmartIdData()->nUId = rId.GetNum(); - GetSmartIdData()->bHasNumericId = rId.HasNumeric(); - } - - // remove ImplData when no IDs are set. This is Important because Implementation of Equals() Matches and HasAny relies on it - if ( mpData && !mpData->bHasStringId && !mpData->bHasNumericId ) - { - delete mpData; - mpData = NULL; - } -} - -BOOL SmartId::HasNumeric() const -{ - if ( !mpData ) - return FALSE; - else - return mpData->bHasNumericId; -} - -BOOL SmartId::HasString() const -{ - if ( !mpData ) - return FALSE; - else - return mpData->bHasStringId; -} - -BOOL SmartId::HasAny() const -{ - return mpData != NULL; -} - -ULONG SmartId::GetNum() const -{ - if ( !mpData ) - return 0; - else - return mpData->nUId; -} - -String SmartId::GetStr() const -{ - if ( !mpData ) - return String(); - else - return mpData->aUId; -} - - -String SmartId::GetText() const // return String for UI usage -{ - String aRes; - if ( HasNumeric() ) - aRes = String::CreateFromInt64( GetNum() ); - if ( HasString() ) - { - if ( HasNumeric() ) - aRes.AppendAscii( "/" ); - aRes.Append( GetStr() ); - } - return aRes; -} - -BOOL SmartId::Matches( const String &rId )const -{ - if ( HasString() ) - return GetStr().EqualsIgnoreCaseAscii( rId ); - else - return FALSE; -} - -BOOL SmartId::Matches( const ULONG nId ) const -{ - if ( HasNumeric() ) - return GetNum() == nId; - else - return FALSE; -} - -/****************************************************************************** -If Both Ids have nither Strings nor Numbers they don't match -If both Ids have Strings the result of Matching these is returned. -Numbers are then Ignored. -Else Matching Numbers is attempted. -******************************************************************************/ -BOOL SmartId::Matches( const SmartId &rId ) const -{ - if ( !mpData || !rId.mpData ) - return FALSE; - else if ( HasString() && rId.HasString() ) - return Matches( rId.GetStr() ); - else - return rId.HasNumeric() && Matches( rId.GetNum() ); -} - -BOOL SmartId::Equals( const SmartId &rId ) const -{ - if ( mpData && rId.mpData ) - return mpData->aUId.EqualsIgnoreCaseAscii( rId.mpData->aUId ) - && mpData->bHasStringId == rId.mpData->bHasStringId - && mpData->nUId == rId.mpData->nUId - && mpData->bHasNumericId == rId.mpData->bHasNumericId; - else if ( !mpData && !rId.mpData ) - return TRUE; - else - return FALSE; -} - -BOOL SmartId::operator == ( const SmartId& rRight ) const -{ - return Equals( rRight ); -} - -BOOL SmartId::operator < ( const SmartId& rRight ) const -{ - if ( HasString() && rRight.HasString() && GetStr() != rRight.GetStr() ) - return GetStr() < rRight.GetStr(); - else if ( HasNumeric() && rRight.HasNumeric() && GetNum() != rRight.GetNum() ) - return GetNum() < rRight.GetNum(); - else - { // Sort Strings to Front - if ( HasString() ) - return rRight.HasString() && rRight.HasNumeric(); - else - return rRight.HasString() || (!HasNumeric() && rRight.HasNumeric()); - } -} diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx index e835fe749ed1..9a0452027737 100644 --- a/vcl/source/window/btndlg.cxx +++ b/vcl/source/window/btndlg.cxx @@ -530,22 +530,19 @@ XubString ButtonDialog::GetButtonHelpText( USHORT nId ) const // ----------------------------------------------------------------------- -void ButtonDialog::SetButtonHelpId( USHORT nId, ULONG nHelpId ) +void ButtonDialog::SetButtonHelpId( USHORT nId, const rtl::OString& rHelpId ) { ImplBtnDlgItem* pItem = ImplGetItem( nId ); if ( pItem ) - pItem->mpPushButton->SetHelpId( nHelpId ); + pItem->mpPushButton->SetHelpId( rHelpId ); } // ----------------------------------------------------------------------- -ULONG ButtonDialog::GetButtonHelpId( USHORT nId ) const +rtl::OString ButtonDialog::GetButtonHelpId( USHORT nId ) const { ImplBtnDlgItem* pItem = ImplGetItem( nId ); - if ( pItem ) - return pItem->mpPushButton->GetHelpId(); - else - return 0; + return pItem ? rtl::OString( pItem->mpPushButton->GetHelpId() ) : rtl::OString(); } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index ddfb1125d0d7..38741f7cc1af 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -156,7 +156,7 @@ struct MenuItemData XubString aTipHelpText; // TipHelp-String (eg, expanded filenames) XubString aCommandStr; // CommandString XubString aHelpCommandStr; // Help command string (to reference external help) - ULONG nHelpId; // Help-Id + rtl::OString aHelpId; // Help-Id ULONG nUserValue; // User value Image aImage; // Image KeyCode aAccelKey; // Accelerator-Key @@ -251,7 +251,6 @@ MenuItemData* MenuItemList::Insert( USHORT nId, MenuItemType eType, pData->nBits = nBits; pData->pSubMenu = NULL; pData->pAutoSubMenu = NULL; - pData->nHelpId = 0; pData->nUserValue = 0; pData->bChecked = FALSE; pData->bEnabled = TRUE; @@ -283,7 +282,6 @@ void MenuItemList::InsertSeparator( USHORT nPos ) pData->nBits = 0; pData->pSubMenu = NULL; pData->pAutoSubMenu = NULL; - pData->nHelpId = 0; pData->nUserValue = 0; pData->bChecked = FALSE; pData->bEnabled = TRUE; @@ -843,14 +841,14 @@ static BOOL ImplHandleHelpEvent( Window* pMenuWindow, Menu* pMenu, USHORT nHighl // Ist eine ID vorhanden, dann Hilfe mit der ID aufrufen, sonst // den Hilfe-Index String aCommand = pMenu->GetItemCommand( nId ); - ULONG nHelpId = pMenu->GetHelpId( nId ); + rtl::OString aHelpId( pMenu->GetHelpId( nId ) ); + if( ! aHelpId.getLength() ) + aHelpId = OOO_HELP_INDEX; if ( aCommand.Len() ) pHelp->Start( aCommand, NULL ); - else if ( nHelpId ) - pHelp->Start( nHelpId, NULL ); else - pHelp->Start( OOO_HELP_INDEX, NULL ); + pHelp->Start( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); } bDone = TRUE; } @@ -1282,15 +1280,14 @@ void Menu::InsertItem( const ResId& rResId, USHORT nPos ) SetHelpText( nItemId, aHelpText ); } - ULONG nHelpId = 0; if ( nObjMask & RSC_MENUITEM_HELPID ) { - nHelpId = ReadLongRes(); + rtl::OString aHelpId( ReadByteStringRes() ); if ( !bSep ) - SetHelpId( nItemId, nHelpId ); + SetHelpId( nItemId, aHelpId ); } - if( !bSep /* && SvHelpSettings::HelpText( aHelpText, nHelpId ) */ ) + if( !bSep ) SetHelpText( nItemId, aHelpText ); if ( nObjMask & RSC_MENUITEM_KEYCODE ) @@ -1415,7 +1412,7 @@ void ImplCopyItem( Menu* pThis, const Menu& rMenu, USHORT nPos, USHORT nNewPos, pThis->CheckItem( nId, TRUE ); if ( !rMenu.IsItemEnabled( nId ) ) pThis->EnableItem( nId, FALSE ); - pThis->SetHelpId( nId, pData->nHelpId ); + pThis->SetHelpId( nId, pData->aHelpId ); pThis->SetHelpText( nId, pData->aHelpText ); pThis->SetAccelKey( nId, pData->aAccelKey ); pThis->SetItemCommand( nId, pData->aCommandStr ); @@ -1991,7 +1988,7 @@ const XubString& Menu::ImplGetHelpText( USHORT nItemId ) const if ( pData ) { if ( !pData->aHelpText.Len() && - (( pData->nHelpId ) || ( pData->aCommandStr.Len() ))) + (( pData->aHelpId.getLength() ) || ( pData->aCommandStr.Len() ))) { Help* pHelp = Application::GetHelp(); if ( pHelp ) @@ -1999,8 +1996,8 @@ const XubString& Menu::ImplGetHelpText( USHORT nItemId ) const if ( pData->aCommandStr.Len() ) pData->aHelpText = pHelp->GetHelpText( pData->aCommandStr, NULL ); - if( !pData->aHelpText.Len() && pData->nHelpId ) - pData->aHelpText = pHelp->GetHelpText( pData->nHelpId, NULL ); + if( !pData->aHelpText.Len() && pData->aHelpId.getLength() ) + pData->aHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pData->aHelpId, RTL_TEXTENCODING_UTF8 ), NULL ); } } @@ -2033,22 +2030,24 @@ const XubString& Menu::GetTipHelpText( USHORT nItemId ) const return ImplGetSVEmptyStr(); } -void Menu::SetHelpId( USHORT nItemId, ULONG nHelpId ) +void Menu::SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ) { MenuItemData* pData = pItemList->GetData( nItemId ); if ( pData ) - pData->nHelpId = nHelpId; + pData->aHelpId = rHelpId; } -ULONG Menu::GetHelpId( USHORT nItemId ) const +rtl::OString Menu::GetHelpId( USHORT nItemId ) const { + rtl::OString aRet; + MenuItemData* pData = pItemList->GetData( nItemId ); if ( pData ) - return pData->nHelpId; - else - return 0; + aRet = pData->aHelpId; + + return aRet; } Menu& Menu::operator=( const Menu& rMenu ) diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index 7f7a65cd7fb9..d21d881b38f0 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -196,10 +196,9 @@ MessBox::MessBox( Window* pParent, const ResId& rResId ) : USHORT nLoButtons = ReadShortRes(); USHORT nHiDefButton = ReadShortRes(); USHORT nLoDefButton = ReadShortRes(); - USHORT nHiHelpId = ReadShortRes(); - USHORT nLoHelpId = ReadShortRes(); + rtl::OString aHelpId( ReadByteStringRes() ); /* USHORT bSysModal = */ ReadShortRes(); - SetHelpId( ((ULONG)nHiHelpId << 16) + nLoHelpId ); + SetHelpId( aHelpId ); WinBits nBits = (((ULONG)nHiButtons << 16) + nLoButtons) | (((ULONG)nHiDefButton << 16) + nLoDefButton); ImplInit( pParent, nBits | WB_MOVEABLE | WB_HORZ | WB_CENTER ); diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index 35077b1cff0e..50bd0744dc3f 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -46,7 +46,7 @@ #include "unotools/localedatawrapper.hxx" -#include "rtl/ustrbuf.hxx" +#include "rtl/strbuf.hxx" #include "com/sun/star/lang/XMultiServiceFactory.hpp" #include "com/sun/star/container/XNameAccess.hpp" @@ -61,8 +61,8 @@ using namespace com::sun::star::container; using namespace com::sun::star::beans; #define HELPID_PREFIX ".HelpId:vcl:PrintDialog" -#define SMHID2( a, b ) SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX ":" a ":" b ) ), HID_PRINTDLG ) ) -#define SMHID1( a ) SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX ":" a ) ), HID_PRINTDLG ) ) +#define SMHID2( a, b ) SetHelpId( rtl::OString( HELPID_PREFIX ":" a ":" b ) ) +#define SMHID1( a ) SetHelpId( rtl::OString( HELPID_PREFIX ":" a ) ) PrintDialog::PrintPreviewWindow::PrintPreviewWindow( Window* i_pParent, const ResId& i_rId ) : Window( i_pParent, i_rId ) @@ -1125,24 +1125,24 @@ bool PrintDialog::isSingleJobs() static void setSmartId( Window* i_pWindow, const char* i_pType, sal_Int32 i_nId = -1, const rtl::OUString& i_rPropName = rtl::OUString() ) { - rtl::OUStringBuffer aBuf( 256 ); - aBuf.appendAscii( HELPID_PREFIX ); + rtl::OStringBuffer aBuf( 256 ); + aBuf.append( HELPID_PREFIX ); if( i_rPropName.getLength() ) { - aBuf.append( sal_Unicode( ':' ) ); - aBuf.append( i_rPropName ); + aBuf.append( ':' ); + aBuf.append( rtl::OUStringToOString( i_rPropName, RTL_TEXTENCODING_UTF8 ) ); } if( i_pType ) { - aBuf.append( sal_Unicode( ':' ) ); - aBuf.appendAscii( i_pType ); + aBuf.append( ':' ); + aBuf.append( i_pType ); } if( i_nId >= 0 ) { - aBuf.append( sal_Unicode( ':' ) ); + aBuf.append( ':' ); aBuf.append( i_nId ); } - i_pWindow->SetSmartHelpId( SmartId( aBuf.makeStringAndClear(), HID_PRINTDLG ) ); + i_pWindow->SetHelpId( aBuf.makeStringAndClear() ); } static void setHelpText( Window* /*i_pWindow*/, const Sequence< rtl::OUString >& /*i_rHelpTexts*/, sal_Int32 /*i_nIndex*/ ) @@ -2128,7 +2128,7 @@ IMPL_LINK( PrintDialog, ClickHdl, Button*, pButton ) if( pHelp ) { // FIXME: find out proper help URL and use here - pHelp->Start( HID_PRINTDLG, GetParent() ); + pHelp->Start( rtl::OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ), GetParent() ); } } else if( pButton == &maForwardBtn ) diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index c139ae1ffb30..1fbfcd7344d7 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -89,7 +89,7 @@ struct ImplStatusItem XubString maText; XubString maHelpText; XubString maQuickHelpText; - ULONG mnHelpId; + rtl::OString maHelpId; void* mpUserData; BOOL mbVisible; XubString maAccessibleName; @@ -904,9 +904,9 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt ) else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { String aCommand = GetItemCommand( nItemId ); - ULONG nHelpId = GetHelpId( nItemId ); + rtl::OString aHelpId( GetHelpId( nItemId ) ); - if ( aCommand.Len() || nHelpId ) + if ( aCommand.Len() || aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); @@ -914,8 +914,8 @@ void StatusBar::RequestHelp( const HelpEvent& rHEvt ) { if ( aCommand.Len() ) pHelp->Start( aCommand, this ); - else if ( nHelpId ) - pHelp->Start( nHelpId, this ); + else if ( aHelpId.getLength() ) + pHelp->Start( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return; } @@ -1031,7 +1031,6 @@ void StatusBar::InsertItem( USHORT nItemId, ULONG nWidth, pItem->mnBits = nBits; pItem->mnWidth = (long)nWidth+nFudge+STATUSBAR_OFFSET; pItem->mnOffset = nOffset; - pItem->mnHelpId = 0; pItem->mpUserData = 0; pItem->mbVisible = TRUE; @@ -1473,15 +1472,15 @@ const XubString& StatusBar::GetHelpText( USHORT nItemId ) const if ( nPos != STATUSBAR_ITEM_NOTFOUND ) { ImplStatusItem* pItem = mpItemList->GetObject( nPos ); - if ( !pItem->maHelpText.Len() && ( pItem->mnHelpId || pItem->maCommand.Len() )) + if ( !pItem->maHelpText.Len() && ( pItem->maHelpId.getLength() || pItem->maCommand.Len() )) { Help* pHelp = Application::GetHelp(); if ( pHelp ) { if ( pItem->maCommand.Len() ) pItem->maHelpText = pHelp->GetHelpText( pItem->maCommand, this ); - if ( !pItem->maHelpText.Len() && pItem->mnHelpId ) - pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this ); + if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() ) + pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } } @@ -1518,24 +1517,24 @@ const XubString& StatusBar::GetQuickHelpText( USHORT nItemId ) const // ----------------------------------------------------------------------- -void StatusBar::SetHelpId( USHORT nItemId, ULONG nHelpId ) +void StatusBar::SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ) { USHORT nPos = GetItemPos( nItemId ); if ( nPos != STATUSBAR_ITEM_NOTFOUND ) - mpItemList->GetObject( nPos )->mnHelpId = nHelpId; + mpItemList->GetObject( nPos )->maHelpId = rHelpId; } // ----------------------------------------------------------------------- -ULONG StatusBar::GetHelpId( USHORT nItemId ) const +rtl::OString StatusBar::GetHelpId( USHORT nItemId ) const { USHORT nPos = GetItemPos( nItemId ); + rtl::OString aRet; if ( nPos != STATUSBAR_ITEM_NOTFOUND ) - return mpItemList->GetObject( nPos )->mnHelpId; - else - return 0; + aRet = mpItemList->GetObject( nPos )->maHelpId; + return aRet; } // ----------------------------------------------------------------------- diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 9ad0b8734437..561e03c83a7c 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4821,15 +4821,15 @@ const XubString& ToolBox::ImplGetHelpText( USHORT nItemId ) const if ( pItem ) { - if ( !pItem->maHelpText.Len() && ( pItem->mnHelpId || pItem->maCommandStr.Len() )) + if ( !pItem->maHelpText.Len() && ( pItem->maHelpId.getLength() || pItem->maCommandStr.Len() )) { Help* pHelp = Application::GetHelp(); if ( pHelp ) { if ( pItem->maCommandStr.Len() ) pItem->maHelpText = pHelp->GetHelpText( pItem->maCommandStr, this ); - if ( !pItem->maHelpText.Len() && pItem->mnHelpId ) - pItem->maHelpText = pHelp->GetHelpText( pItem->mnHelpId, this ); + if ( !pItem->maHelpText.Len() && pItem->maHelpId.getLength() ) + pItem->maHelpText = pHelp->GetHelpText( rtl::OStringToOUString( pItem->maHelpId, RTL_TEXTENCODING_UTF8 ), this ); } } @@ -4895,9 +4895,9 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) else if ( rHEvt.GetMode() & HELPMODE_EXTENDED ) { String aCommand = GetItemCommand( nItemId ); - ULONG nHelpId = GetHelpId( nItemId ); + rtl::OString aHelpId( GetHelpId( nItemId ) ); - if ( aCommand.Len() || nHelpId ) + if ( aCommand.Len() || aHelpId.getLength() ) { // Wenn eine Hilfe existiert, dann ausloesen Help* pHelp = Application::GetHelp(); @@ -4905,8 +4905,8 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) { if ( aCommand.Len() ) pHelp->Start( aCommand, this ); - else if ( nHelpId ) - pHelp->Start( nHelpId, this ); + else if ( aHelpId.getLength() ) + pHelp->Start( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ), this ); } return; } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 334cdd2d0a64..c9b8a6ab0f08 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -99,7 +99,6 @@ ImplToolItem::ImplToolItem() mnId = 0; mpWindow = NULL; mpUserData = NULL; - mnHelpId = 0; meType = TOOLBOXITEM_BUTTON; mnBits = 0; meState = STATE_NOCHECK; @@ -124,7 +123,6 @@ ImplToolItem::ImplToolItem( USHORT nItemId, const Image& rImage, mnId = nItemId; mpWindow = NULL; mpUserData = NULL; - mnHelpId = 0; meType = TOOLBOXITEM_BUTTON; mnBits = nItemBits; meState = STATE_NOCHECK; @@ -149,7 +147,6 @@ ImplToolItem::ImplToolItem( USHORT nItemId, const XubString& rText, mnId = nItemId; mpWindow = NULL; mpUserData = NULL; - mnHelpId = 0; meType = TOOLBOXITEM_BUTTON; mnBits = nItemBits; meState = STATE_NOCHECK; @@ -175,7 +172,6 @@ ImplToolItem::ImplToolItem( USHORT nItemId, const Image& rImage, mnId = nItemId; mpWindow = NULL; mpUserData = NULL; - mnHelpId = 0; meType = TOOLBOXITEM_BUTTON; mnBits = nItemBits; meState = STATE_NOCHECK; @@ -204,7 +200,7 @@ ImplToolItem::ImplToolItem( const ImplToolItem& rItem ) : maQuickHelpText ( rItem.maQuickHelpText ), maHelpText ( rItem.maHelpText ), maCommandStr ( rItem.maCommandStr ), - mnHelpId ( rItem.mnHelpId ), + maHelpId ( rItem.maHelpId ), maRect ( rItem.maRect ), maCalcRect ( rItem.maCalcRect ), maItemSize ( rItem.maItemSize ), @@ -243,7 +239,7 @@ ImplToolItem& ImplToolItem::operator=( const ImplToolItem& rItem ) maQuickHelpText = rItem.maQuickHelpText; maHelpText = rItem.maHelpText; maCommandStr = rItem.maCommandStr; - mnHelpId = rItem.mnHelpId; + maHelpId = rItem.maHelpId; maRect = rItem.maRect; maCalcRect = rItem.maCalcRect; mnSepSize = rItem.mnSepSize; @@ -595,7 +591,7 @@ void ToolBox::InsertItem( const ResId& rResId, USHORT nPos ) aItem.mnBits = (ToolBoxItemBits)ReadLongRes(); if( nObjMask & RSC_TOOLBOXITEM_HELPID ) - aItem.mnHelpId = ReadLongRes(); + aItem.maHelpId = ReadByteStringRes(); if ( nObjMask & RSC_TOOLBOXITEM_TEXT ) { @@ -1923,24 +1919,26 @@ const XubString& ToolBox::GetHelpText( USHORT nItemId ) const // ----------------------------------------------------------------------- -void ToolBox::SetHelpId( USHORT nItemId, ULONG nHelpId ) +void ToolBox::SetHelpId( USHORT nItemId, const rtl::OString& rHelpId ) { ImplToolItem* pItem = ImplGetItem( nItemId ); if ( pItem ) - pItem->mnHelpId = nHelpId; + pItem->maHelpId = rHelpId; } // ----------------------------------------------------------------------- -ULONG ToolBox::GetHelpId( USHORT nItemId ) const +rtl::OString ToolBox::GetHelpId( USHORT nItemId ) const { + rtl::OString aRet; + ImplToolItem* pItem = ImplGetItem( nItemId ); if ( pItem ) - return pItem->mnHelpId; - else - return 0; + aRet = pItem->maHelpId; + + return aRet; } // ----------------------------------------------------------------------- diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index b47aa50a2e72..babf30015ef1 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -612,8 +612,6 @@ void Window::ImplInitWindowData( WindowType nType ) mpWindowImpl->mnX = 0; // X-Position to Parent mpWindowImpl->mnY = 0; // Y-Position to Parent mpWindowImpl->mnAbsScreenX = 0; // absolute X-position on screen, used for RTL window positioning - mpWindowImpl->mnHelpId = 0; // help id - mpWindowImpl->mnUniqId = 0; // unique id mpWindowImpl->mpChildClipRegion = NULL; // Child-Clip-Region when ClipChildren mpWindowImpl->mpPaintRegion = NULL; // Paint-ClipRegion mpWindowImpl->mnStyle = 0; // style (init in ImplInitWindow) @@ -1179,20 +1177,14 @@ void Window::ImplCallMove() // ----------------------------------------------------------------------- -static ULONG ImplAutoHelpID( ResMgr* pResMgr ) +static rtl::OString ImplAutoHelpID( ResMgr* pResMgr ) { - if ( !Application::IsAutoHelpIdEnabled() ) - return 0; - - ULONG nHID = 0; + rtl::OString aRet; - DBG_ASSERT( pResMgr, "No res mgr for auto help id" ); - if( ! pResMgr ) - return 0; + if( pResMgr && Application::IsAutoHelpIdEnabled() ) + aRet = pResMgr->GetAutoHelpId(); - nHID = pResMgr->GetAutoHelpId(); - - return nHID; + return aRet; } // ----------------------------------------------------------------------- @@ -1212,22 +1204,21 @@ WinBits Window::ImplInitRes( const ResId& rResId ) void Window::ImplLoadRes( const ResId& rResId ) { - // newer move this line after IncrementRes - char* pRes = (char*)GetClassRes(); - pRes += 12; - sal_uInt32 nHelpId = (sal_uInt32)GetLongRes( (void*)pRes ); - if ( !nHelpId ) - nHelpId = ImplAutoHelpID( rResId.GetResMgr() ); - SetHelpId( nHelpId ); - ULONG nObjMask = ReadLongRes(); // ResourceStyle ULONG nRSStyle = ReadLongRes(); // WinBits ReadLongRes(); + + // HelpId - ReadLongRes(); + rtl::OString aHelpId; + if( nObjMask & WINDOW_HELPID ) + aHelpId = ReadByteStringRes(); + if( ! aHelpId.getLength() ) + aHelpId = ImplAutoHelpID( rResId.GetResMgr() ); + SetHelpId( aHelpId ); BOOL bPos = FALSE; BOOL bSize = FALSE; @@ -1294,7 +1285,7 @@ void Window::ImplLoadRes( const ResId& rResId ) if ( nObjMask & WINDOW_EXTRALONG ) SetData( (void*)ReadLongRes() ); if ( nObjMask & WINDOW_UNIQUEID ) - SetUniqueId( (ULONG)ReadLongRes() ); + SetUniqueId( ReadByteStringRes() ); if ( nObjMask & WINDOW_BORDER_STYLE ) { @@ -1323,8 +1314,6 @@ ImplWinData* Window::ImplGetWinData() const mpWindowImpl->mpWinData->mbMouseOver = FALSE; mpWindowImpl->mpWinData->mbEnableNativeWidget = (pNoNWF && *pNoNWF) ? FALSE : TRUE; // TRUE: try to draw this control with native theme API mpWindowImpl->mpWinData->mpSalControlHandle = NULL; - mpWindowImpl->mpWinData->mpSmartHelpId = NULL; - mpWindowImpl->mpWinData->mpSmartUniqueId = NULL; } return mpWindowImpl->mpWinData; @@ -4726,11 +4715,6 @@ Window::~Window() delete mpWindowImpl->mpWinData->mpSalControlHandle; mpWindowImpl->mpWinData->mpSalControlHandle = NULL; - if ( mpWindowImpl->mpWinData->mpSmartHelpId ) - delete mpWindowImpl->mpWinData->mpSmartHelpId; - if ( mpWindowImpl->mpWinData->mpSmartUniqueId ) - delete mpWindowImpl->mpWinData->mpSmartUniqueId; - delete mpWindowImpl->mpWinData; } @@ -4971,29 +4955,18 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) } else { - SmartId aSmartId = GetSmartHelpId(); - - ULONG nNumHelpId = 0; - String aStrHelpId; - if( aSmartId.HasString() ) - aStrHelpId = aSmartId.GetStr(); - if( aSmartId.HasNumeric() ) - nNumHelpId = aSmartId.GetNum(); - - if ( !nNumHelpId && aStrHelpId.Len() == 0 && ImplGetParent() ) + String aStrHelpId( rtl::OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); + if ( aStrHelpId.Len() == 0 && ImplGetParent() ) ImplGetParent()->RequestHelp( rHEvt ); else { - if ( !nNumHelpId && aStrHelpId.Len() == 0 ) - nNumHelpId = OOO_HELP_INDEX; - Help* pHelp = Application::GetHelp(); if ( pHelp ) { if( aStrHelpId.Len() > 0 ) pHelp->Start( aStrHelpId, this ); else - pHelp->Start( nNumHelpId, this ); + pHelp->Start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OOO_HELP_INDEX ) ), this ); } } } @@ -8122,32 +8095,22 @@ const XubString& Window::GetHelpText() const { DBG_CHKTHIS( Window, ImplDbgCheckWindow ); - SmartId aSmartId = GetSmartHelpId(); - - ULONG nNumHelpId = 0; - String aStrHelpId; - if( aSmartId.HasString() ) - aStrHelpId = aSmartId.GetStr(); - if( aSmartId.HasNumeric() ) - nNumHelpId = aSmartId.GetNum(); + String aStrHelpId( rtl::OStringToOUString( GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); bool bStrHelpId = (aStrHelpId.Len() > 0); - if ( !mpWindowImpl->maHelpText.Len() && (nNumHelpId || bStrHelpId) ) + if ( !mpWindowImpl->maHelpText.Len() && bStrHelpId ) { if ( !IsDialog() && (mpWindowImpl->mnType != WINDOW_TABPAGE) && (mpWindowImpl->mnType != WINDOW_FLOATINGWINDOW) ) { Help* pHelp = Application::GetHelp(); if ( pHelp ) { - if( bStrHelpId ) - ((Window*)this)->mpWindowImpl->maHelpText = pHelp->GetHelpText( aStrHelpId, this ); - else - ((Window*)this)->mpWindowImpl->maHelpText = pHelp->GetHelpText( nNumHelpId, this ); + ((Window*)this)->mpWindowImpl->maHelpText = pHelp->GetHelpText( aStrHelpId, this ); mpWindowImpl->mbHelpTextDynamic = FALSE; } } } - else if( mpWindowImpl->mbHelpTextDynamic && (nNumHelpId || bStrHelpId) ) + else if( mpWindowImpl->mbHelpTextDynamic && bStrHelpId ) { static const char* pEnv = getenv( "HELP_DEBUG" ); if( pEnv && *pEnv ) @@ -8155,10 +8118,7 @@ const XubString& Window::GetHelpText() const rtl::OUStringBuffer aTxt( 64+mpWindowImpl->maHelpText.Len() ); aTxt.append( mpWindowImpl->maHelpText ); aTxt.appendAscii( "\n------------------\n" ); - if( bStrHelpId ) - aTxt.append( rtl::OUString( aStrHelpId ) ); - else - aTxt.append( sal_Int32( nNumHelpId ) ); + aTxt.append( rtl::OUString( aStrHelpId ) ); mpWindowImpl->maHelpText = aTxt.makeStringAndClear(); } mpWindowImpl->mbHelpTextDynamic = FALSE; diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx index 02b2713b01cc..e5b58a8b6f3c 100644 --- a/vcl/source/window/window2.cxx +++ b/vcl/source/window/window2.cxx @@ -1442,115 +1442,31 @@ Window* Window::ImplGetTopmostFrameWindow() return pTopmostParent->mpWindowImpl->mpFrameWindow; } -// making these Methods out of line to be able to change them lateron without complete rebuild -// TODO: Set the SmartId in here and remove mpWindowImpl->mnHelpId -void Window::SetHelpId( ULONG nHelpId ) +void Window::SetHelpId( const rtl::OString& rHelpId ) { - SetSmartHelpId(SmartId(nHelpId)); + mpWindowImpl->maHelpId = rHelpId; } -ULONG Window::GetHelpId() const +const rtl::OString& Window::GetHelpId() const { - return mpWindowImpl->mnHelpId; + return mpWindowImpl->maHelpId; } -void Window::SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode ) +void Window::SetUniqueId( const rtl::OString& rUniqueId ) { - // create SmartId if required - if ( (aMode == SMART_SET_STR) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasString() ) ) - { - if ( !ImplGetWinData()->mpSmartHelpId ) - ImplGetWinData()->mpSmartHelpId = new SmartId(); - } - - // if we have a SmartId (eather from earlier call or just created) fill with new values - if ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartHelpId ) - ImplGetWinData()->mpSmartHelpId->UpdateId( aId, aMode ); - - if ( (aMode == SMART_SET_NUM) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasNumeric() ) ) - { - mpWindowImpl->mnHelpId = aId.GetNum(); - } -} - -SmartId Window::GetSmartHelpId() const -{ - if ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartHelpId ) - { - if ( mpWindowImpl->mnHelpId || mpWindowImpl->mpWinData->mpSmartHelpId->HasNumeric() ) - mpWindowImpl->mpWinData->mpSmartHelpId->UpdateId( SmartId( mpWindowImpl->mnHelpId ), SMART_SET_NUM ); - return *mpWindowImpl->mpWinData->mpSmartHelpId; - } - else - { - if ( mpWindowImpl->mnHelpId ) - return SmartId( mpWindowImpl->mnHelpId ); - else - return SmartId(); - } -} - - -// making these Methods out of line to be able to change them lateron without complete rebuild -// TODO: Set the SmartId in here and remove mpWindowImpl->mnUniqId -void Window::SetUniqueId( ULONG nUniqueId ) { mpWindowImpl->mnUniqId = nUniqueId; } -ULONG Window::GetUniqueId() const { return mpWindowImpl->mnUniqId; } - - -void Window::SetSmartUniqueId( const SmartId& aId, SmartIdUpdateMode aMode ) -{ - // create SmartId if required - if ( (aMode == SMART_SET_STR) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasString() ) ) - { - if ( !ImplGetWinData()->mpSmartUniqueId ) - ImplGetWinData()->mpSmartUniqueId = new SmartId(); - } - - // if we have a SmartId (eather from earlier call or just created) fill with new values - if ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartUniqueId ) - ImplGetWinData()->mpSmartUniqueId->UpdateId( aId, aMode ); - - if ( (aMode == SMART_SET_NUM) || (aMode == SMART_SET_ALL) || ( (aMode == SMART_SET_SMART) && aId.HasNumeric() ) ) - mpWindowImpl->mnUniqId = aId.GetNum(); + mpWindowImpl->maUniqId = rUniqueId; } -SmartId Window::GetSmartUniqueId() const +const rtl::OString& Window::GetUniqueId() const { - if ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartUniqueId ) - { - if ( mpWindowImpl->mnUniqId || mpWindowImpl->mpWinData->mpSmartUniqueId->HasNumeric() ) - mpWindowImpl->mpWinData->mpSmartUniqueId->UpdateId( SmartId( mpWindowImpl->mnUniqId ), SMART_SET_NUM ); - return *mpWindowImpl->mpWinData->mpSmartUniqueId; - } - else - { - if ( mpWindowImpl->mnUniqId ) - return SmartId( mpWindowImpl->mnUniqId ); - else - return SmartId(); - } + return mpWindowImpl->maUniqId; } -SmartId Window::GetSmartUniqueOrHelpId() const +const rtl::OString& Window::GetUniqueOrHelpId() const { - if ( ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartHelpId ) || mpWindowImpl->mnHelpId ) - { - if ( ( mpWindowImpl->mpWinData && mpWindowImpl->mpWinData->mpSmartUniqueId ) || mpWindowImpl->mnUniqId ) - { - SmartId aTemp = GetSmartHelpId(); - aTemp.UpdateId( GetSmartUniqueId() ); - return aTemp; - } - else - return GetSmartHelpId(); - } - else - return GetSmartUniqueId(); + return mpWindowImpl->maUniqId.getLength() ? mpWindowImpl->maUniqId : mpWindowImpl->maHelpId; } - - - // --------- old inline methods --------------- Window* Window::ImplGetWindow() -- cgit From 50c6c0aaebeda0f131e35da61729479180184192 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 13:46:22 +0200 Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids --- avmedia/source/framework/mediacontrol.cxx | 36 ++++++--- avmedia/source/framework/mediaplayer.cxx | 3 +- avmedia/source/viewer/mediawindow_impl.cxx | 3 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 18 +++-- .../source/deployment/gui/dp_gui_extlistbox.cxx | 3 +- desktop/source/deployment/gui/license_dialog.cxx | 3 +- desktop/source/migration/wizard.cxx | 12 ++- editeng/source/editeng/editview.cxx | 6 +- editeng/source/misc/svxacorr.cxx | 3 +- formula/inc/formula/formdata.hxx | 7 +- formula/inc/formula/formula.hxx | 14 ++-- formula/source/ui/dlg/formula.cxx | 93 ++++++++++++++-------- formula/source/ui/dlg/funcpage.cxx | 10 ++- formula/source/ui/dlg/funcpage.hxx | 3 +- formula/source/ui/dlg/funcutl.cxx | 6 +- formula/source/ui/dlg/parawin.cxx | 10 ++- fpicker/source/office/OfficeControlAccess.cxx | 17 ++-- fpicker/source/office/iodlg.cxx | 74 +++++++++++------ framework/source/layoutmanager/layoutmanager.cxx | 4 +- framework/source/services/backingcomp.cxx | 3 +- framework/source/services/backingwindow.cxx | 18 ++--- .../source/uielement/macrosmenucontroller.cxx | 6 +- framework/source/uielement/menubarmanager.cxx | 4 +- framework/source/uielement/statusbarmanager.cxx | 3 +- framework/source/uielement/statusbarwrapper.cxx | 3 +- framework/source/uielement/toolbarmanager.cxx | 16 ++-- framework/source/uielement/toolbarmerger.cxx | 4 +- .../source/uielement/toolbarsmenucontroller.cxx | 3 +- sfx2/inc/sfx2/passwd.hxx | 2 +- sfx2/inc/sfxhelp.hxx | 12 ++- sfx2/source/appl/appserv.cxx | 6 +- sfx2/source/appl/newhelp.cxx | 57 ++++++++----- sfx2/source/appl/sfxhelp.cxx | 24 +++++- sfx2/source/dialog/about.cxx | 3 +- sfx2/source/dialog/basedlgs.cxx | 30 +++---- sfx2/source/dialog/dockwin.cxx | 17 ++-- sfx2/source/dialog/filedlghelper.cxx | 3 +- sfx2/source/dialog/navigat.cxx | 3 +- sfx2/source/dialog/tabdlg.cxx | 12 ++- sfx2/source/dialog/templdlg.cxx | 21 +++-- sfx2/source/doc/docvor.cxx | 5 +- sfx2/source/doc/new.cxx | 3 +- sfx2/source/doc/querytemplate.cxx | 3 +- sfx2/source/menu/mnumgr.cxx | 6 +- sfx2/source/menu/virtmenu.cxx | 3 +- sfx2/source/toolbox/tbxitem.cxx | 3 +- sfx2/source/view/frame2.cxx | 3 +- svx/inc/svx/simptabl.hxx | 3 +- svx/source/dialog/ctredlin.cxx | 15 ++-- svx/source/dialog/dlgctl3d.cxx | 9 ++- svx/source/fmcomp/fmgridif.cxx | 4 +- svx/source/fmcomp/gridctrl.cxx | 21 +++-- svx/source/form/datanavi.cxx | 3 +- svx/source/form/filtnav.cxx | 6 +- svx/source/form/fmPropBrw.cxx | 3 +- svx/source/form/fmexpl.cxx | 3 +- svx/source/form/navigatortree.cxx | 3 +- svx/source/form/tabwin.cxx | 6 +- svx/source/form/tbxform.cxx | 3 +- svx/source/gallery2/galbrws1.cxx | 6 +- svx/source/gallery2/galbrws2.cxx | 6 +- svx/source/gallery2/galctrl.cxx | 12 ++- svx/source/stbctrls/insctrl.cxx | 3 +- svx/source/stbctrls/pszctrl.cxx | 3 +- svx/source/stbctrls/xmlsecctrl.cxx | 3 +- svx/source/tbxctrls/extrusioncontrols.cxx | 36 ++++++--- svx/source/tbxctrls/fillctrl.cxx | 6 +- svx/source/tbxctrls/fontworkgallery.cxx | 24 ++++-- svx/source/tbxctrls/grafctrl.cxx | 5 +- svx/source/tbxctrls/linectrl.cxx | 6 +- svx/source/tbxctrls/tbcontrl.cxx | 12 ++- .../chinese_dictionarydialog.cxx | 18 +++-- .../chinese_translationdialog.cxx | 9 ++- 73 files changed, 540 insertions(+), 289 deletions(-) diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index a71b5268abd7..781f2b7d290d 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -94,10 +94,12 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, ""/*HID_AVMEDIA_TOOLBOXITEM_OPEN*/ ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, implGetImage( AVMEDIA_IMG_INSERT ), String( AVMEDIA_RESID( AVMEDIA_STR_INSERT ) ) ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, HID_AVMEDIA_TOOLBOXITEM_INSERT ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, ""/*HID_AVMEDIA_TOOLBOXITEM_INSERT*/ ); maPlayToolBox.InsertSeparator(); } @@ -117,18 +119,22 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : } maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, implGetImage( AVMEDIA_IMG_PLAY ), String( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ), TIB_CHECKABLE ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, HID_AVMEDIA_TOOLBOXITEM_PLAY ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, ""/*HID_AVMEDIA_TOOLBOXITEM_PLAY*/ ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, implGetImage( AVMEDIA_IMG_PAUSE ), String( AVMEDIA_RESID( AVMEDIA_STR_PAUSE ) ), TIB_CHECKABLE ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, HID_AVMEDIA_TOOLBOXITEM_PAUSE ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, ""/*HID_AVMEDIA_TOOLBOXITEM_PAUSE*/ ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_STOP, implGetImage( AVMEDIA_IMG_STOP ), String( AVMEDIA_RESID( AVMEDIA_STR_STOP ) ), TIB_CHECKABLE ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, HID_AVMEDIA_TOOLBOXITEM_STOP ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, ""/*HID_AVMEDIA_TOOLBOXITEM_STOP*/ ); maPlayToolBox.InsertSeparator(); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, implGetImage( AVMEDIA_IMG_ENDLESS ), String( AVMEDIA_RESID( AVMEDIA_STR_ENDLESS ) ) ); - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, HID_AVMEDIA_TOOLBOXITEM_LOOP ); + // FIXME: HELPID + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, ""/*HID_AVMEDIA_TOOLBOXITEM_LOOP*/ ); if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle ) maPlayToolBox.InsertSeparator(); @@ -141,7 +147,8 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maTimeSlider.SetSlideHdl( LINK( this, MediaControl, implTimeHdl ) ); maTimeSlider.SetEndSlideHdl( LINK( this, MediaControl, implTimeEndHdl ) ); maTimeSlider.SetRange( Range( 0, AVMEDIA_TIME_RANGE ) ); - maTimeSlider.SetHelpId( HID_AVMEDIA_TIMESLIDER ); + // FIXME: HELPID + maTimeSlider.SetHelpId( ""/*HID_AVMEDIA_TIMESLIDER*/ ); maTimeSlider.SetUpdateMode( true ); maTimeSlider.SetSizePixel( Size( 128, maPlayToolBox.GetSizePixel().Height() ) ); maTimeSlider.Show(); @@ -151,7 +158,8 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maTimeEdit.SetUpdateMode( true ); maTimeEdit.SetSizePixel( Size( maTimeEdit.GetTextWidth( aTimeText ) + 8, maPlayToolBox.GetSizePixel().Height() ) ); maTimeEdit.SetControlBackground( Application::GetSettings().GetStyleSettings().GetWindowColor() ); - maTimeEdit.SetHelpId( HID_AVMEDIA_TIMEEDIT ); + // FIXME: HELPID + maTimeEdit.SetHelpId( ""/*HID_AVMEDIA_TIMEEDIT*/ ); maTimeEdit.Disable(); maTimeEdit.Show(); maMinSize.Width() += maTimeEdit.GetSizePixel().Width(); @@ -160,7 +168,8 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maMuteToolBox.InsertSeparator(); maMuteToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, implGetImage( AVMEDIA_IMG_MUTE ), String( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) ); - maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, HID_AVMEDIA_TOOLBOXITEM_MUTE ); + // FIXME: HELPID + maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, ""/*HID_AVMEDIA_TOOLBOXITEM_MUTE*/ ); maMuteToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) ); maMuteToolBox.SetSizePixel( maMuteToolBox.CalcWindowSizePixel() ); @@ -171,7 +180,8 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maVolumeSlider.SetEndSlideHdl( LINK( this, MediaControl, implVolumeEndHdl ) ); maVolumeSlider.SetRange( Range( AVMEDIA_DB_RANGE, 0 ) ); maVolumeSlider.SetUpdateMode( true ); - maVolumeSlider.SetHelpId( HID_AVMEDIA_VOLUMESLIDER ); + // FIXME: HELPID + maVolumeSlider.SetHelpId( ""/*HID_AVMEDIA_VOLUMESLIDER*/ ); maVolumeSlider.SetSizePixel( Size( 48, maPlayToolBox.GetSizePixel().Height() ) ); maVolumeSlider.Show(); maMinSize.Width() += maVolumeSlider.GetSizePixel().Width(); @@ -182,10 +192,12 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_200 ) ), AVMEDIA_ZOOMLEVEL_200 ); mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_FIT ) ), AVMEDIA_ZOOMLEVEL_FIT ); mpZoomListBox->SetSelectHdl( LINK( this, MediaControl, implZoomSelectHdl ) ); - mpZoomListBox->SetHelpId( HID_AVMEDIA_ZOOMLISTBOX ); + // FIXME: HELPID + mpZoomListBox->SetHelpId( ""/*HID_AVMEDIA_ZOOMLISTBOX*/ ); maZoomToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_ZOOM, String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM ) ) ); - maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, HID_AVMEDIA_ZOOMLISTBOX ); + // FIXME: HELPID + maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, ""/*HID_AVMEDIA_ZOOMLISTBOX*/ ); maZoomToolBox.SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, mpZoomListBox ); maZoomToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) ); diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index caab783c6a7c..c66f88817fe3 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -124,7 +124,8 @@ void MediaFloater::ToggleFloatingMode() Window* pWindow = mpMediaWindow->getWindow(); if( pWindow ) - pWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); + // FIXME: HELPID + pWindow->SetHelpId( ""/*HID_AVMEDIA_PLAYERWINDOW*/ ); mpMediaWindow->show(); } diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 553eea6196c1..14d174beec80 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -179,7 +179,8 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo mpEmptyBmpEx( NULL ), mpAudioBmpEx( NULL ) { - maChildWindow.SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); + // FIXME: HELPID + maChildWindow.SetHelpId( ""/*HID_AVMEDIA_PLAYERWINDOW*/ ); maChildWindow.Hide(); if( mpMediaWindowControl ) diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 2d0733dfbae3..fa61c437e1ba 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -183,10 +183,14 @@ ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl( ExtMgrDialog* pParent, TheExtensionMan m_pEnableBtn = new PushButton( this, WB_TABSTOP ); m_pRemoveBtn = new PushButton( this, WB_TABSTOP ); - SetHelpId( HID_EXTENSION_MANAGER_LISTBOX ); - m_pOptionsBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_OPTIONS ); - m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE ); - m_pRemoveBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_REMOVE ); + // FIXME: HELPID + SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX*/ ); + // FIXME: HELPID + m_pOptionsBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_OPTIONS*/ ); + // FIXME: HELPID + m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_DISABLE*/ ); + // FIXME: HELPID + m_pRemoveBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_REMOVE*/ ); m_pOptionsBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, HandleOptionsBtn ) ); m_pEnableBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, HandleEnableBtn ) ); @@ -294,12 +298,14 @@ void ExtBoxWithBtns_Impl::SetButtonStatus( const TEntry_Impl pEntry ) if ( ( pEntry->m_eState == REGISTERED ) || ( pEntry->m_eState == NOT_AVAILABLE ) ) { m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) ); - m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE ); + // FIXME: HELPID + m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_DISABLE*/ ); } else { m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) ); - m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_ENABLE ); + // FIXME: HELPID + m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_ENABLE*/ ); } if ( ( pEntry->m_eState == NOT_AVAILABLE ) || pEntry->m_bMissingDeps ) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 2e02a90f59fd..3e5db094d032 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -186,7 +186,8 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan m_pScrollBar( NULL ), m_pManager( pManager ) { - SetHelpId( HID_EXTENSION_MANAGER_LISTBOX ); + // FIXME: HELPID + SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX*/ ); m_pScrollBar = new ScrollBar( this, WB_VERT ); m_pScrollBar->SetScrollHdl( LINK( this, ExtensionBox_Impl, ScrollHdl ) ); diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 50992eb07a97..9e837f235db1 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -221,7 +221,8 @@ LicenseDialogImpl::LicenseDialogImpl( FreeResource(); - m_acceptButton.SetUniqueId(UID_BTN_LICENSE_ACCEPT); + // FIXME: HELPID + m_acceptButton.SetUniqueId(""/*UID_BTN_LICENSE_ACCEPT*/); m_fiArrow1.Show(true); m_fiArrow2.Show(false); m_mlLicense.SetText(sLicenseText); diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx index 48ee2abc71ca..3169386db192 100644 --- a/desktop/source/migration/wizard.cxx +++ b/desktop/source/migration/wizard.cxx @@ -191,10 +191,14 @@ FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAccep SetPageSizePixel(LogicToPixel(aTPSize, MAP_APPFONT)); //set help id - m_pPrevPage->SetHelpId(HID_FIRSTSTART_PREV); - m_pNextPage->SetHelpId(HID_FIRSTSTART_NEXT); - m_pCancel->SetHelpId(HID_FIRSTSTART_CANCEL); - m_pFinish->SetHelpId(HID_FIRSTSTART_FINISH); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_FIRSTSTART_PREV*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_FIRSTSTART_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_FIRSTSTART_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_FIRSTSTART_FINISH*/); // m_pHelp->SetUniqueId(UID_FIRSTSTART_HELP); m_pHelp->Hide(); m_pHelp->Disable(); diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 766023a0038c..35c51b82d1fe 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1083,9 +1083,11 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) String aParaStr( EditResId( RID_STR_PARAGRAPH ) ); aParaStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpPara ); aPopupMenu.InsertItem( MN_WORDLANGUAGE, aWordStr ); - aPopupMenu.SetHelpId( MN_WORDLANGUAGE, HID_EDITENG_SPELLER_WORDLANGUAGE ); + // FIXME: HELPID + aPopupMenu.SetHelpId( MN_WORDLANGUAGE, ""/*HID_EDITENG_SPELLER_WORDLANGUAGE*/ ); aPopupMenu.InsertItem( MN_PARALANGUAGE, aParaStr ); - aPopupMenu.SetHelpId( MN_PARALANGUAGE, HID_EDITENG_SPELLER_PARALANGUAGE ); + // FIXME: HELPID + aPopupMenu.SetHelpId( MN_PARALANGUAGE, ""/*HID_EDITENG_SPELLER_PARALANGUAGE*/ ); } // ## Create mnemonics here diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 64343517c69f..3e875e0b0fdc 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1416,7 +1416,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, if( nHelpId ) { nHelpId += HID_AUTOCORR_HELP_START - 1; - Application::GetHelp()->OpenHelpAgent( nHelpId ); + // FIXME: HELPID + Application::GetHelp()->OpenHelpAgent( String()/*nHelpId*/ ); } } diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx index da211d4f7449..780f95f8fdb5 100644 --- a/formula/inc/formula/formdata.hxx +++ b/formula/inc/formula/formdata.hxx @@ -53,7 +53,7 @@ public: inline USHORT GetEdFocus() const { return nEdFocus; } inline const String& GetUndoStr() const { return aUndoStr; } inline BOOL GetMatrixFlag()const{ return bMatrix;} - inline ULONG GetUniqueId()const { return nUniqueId;} + inline rtl::OString GetUniqueId()const { return aUniqueId;} inline const Selection& GetSelection()const { return aSelection;} inline void SetMode( USHORT nNew ) { nMode = nNew; } @@ -64,7 +64,7 @@ public: inline void SetEdFocus( USHORT nNew ) { nEdFocus = nNew; } inline void SetUndoStr( const String& rNew ) { aUndoStr = rNew; } inline void SetMatrixFlag(BOOL bNew) { bMatrix=bNew;} - inline void SetUniqueId(ULONG nNew) { nUniqueId=nNew;} + inline void SetUniqueId(const rtl::OString nNew) { aUniqueId=nNew;} inline void SetSelection(const Selection& aSel) { aSelection=aSel;} protected: void Reset(); @@ -81,7 +81,8 @@ private: USHORT nEdFocus; String aUndoStr; BOOL bMatrix; - ULONG nUniqueId; + // FIXME: HELPID + rtl::OString aUniqueId; Selection aSelection; }; diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx index d88d1fe62057..0039b66b4ae2 100644 --- a/formula/inc/formula/formula.hxx +++ b/formula/inc/formula/formula.hxx @@ -80,8 +80,10 @@ protected: ::std::pair RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( BOOL bForced = FALSE ); - ULONG FindFocusWin(Window *pWin); - void SetFocusWin(Window *pWin,ULONG nUniqueId); + // FIXME: HELPID + rtl::OString FindFocusWin(Window *pWin); + // FIXME: HELPID + void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId); void HighlightFunctionParas(const String& aFormula); void SetMeText(const String& _sText); @@ -129,12 +131,14 @@ protected: ::std::pair RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( BOOL bForced = FALSE ); - ULONG FindFocusWin(Window *pWin); - void SetFocusWin(Window *pWin,ULONG nUniqueId); + // FIXME: HELPID + rtl::OString FindFocusWin(Window *pWin); + // FIXME: HELPID + void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId); void HighlightFunctionParas(const String& aFormula); void SetMeText(const String& _sText); - FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate); + FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate); void Update(); BOOL CheckMatrix(String& aFormula /*IN/OUT*/); String GetMeText() const; diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index f1a97171fa11..8255aae371da 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -143,7 +143,7 @@ namespace formula void PreNotify( NotifyEvent& rNEvt ); RefEdit* GetCurrRefEdit(); - ULONG FindFocusWin(Window *pWin); + rtl::OString FindFocusWin(Window *pWin); const FormulaHelper& GetFormulaHelper() const; uno::Reference< sheet::XFormulaOpCodeMapper > GetFormulaOpCodeMapper() const; @@ -226,11 +226,15 @@ namespace formula FormulaHelper m_aFormulaHelper; - SmartId m_aSmartEditHelpId; + // FIXME: HELPID + rtl::OString m_aEditHelpId; - ULONG nOldHelp; - ULONG nOldUnique; - ULONG nActivWinId; + // FIXME: HELPID + rtl::OString aOldHelp; + // FIXME: HELPID + rtl::OString aOldUnique; + // FIXME: HELPID + rtl::OString aActivWinId; BOOL bIsShutDown; @@ -300,7 +304,6 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aTxtOk ( aBtnEnd.GetText() ), m_aFormulaHelper(_pFunctionMgr), // - nActivWinId (0), bIsShutDown (FALSE), nEdFocus (0), pFuncDesc (NULL), @@ -314,8 +317,8 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aRefBtn.Hide(); pMEdit = aMEFormula.GetEdit(); - m_aSmartEditHelpId = pMEdit->GetSmartHelpId(); - pMEdit->SetSmartUniqueId(m_aSmartEditHelpId); + m_aEditHelpId = pMEdit->GetHelpId(); + pMEdit->SetUniqueId( m_aEditHelpId ); bEditFlag=FALSE; bStructUpdate=TRUE; @@ -331,8 +334,10 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aTabCtrl.SetTabPage( TP_FUNCTION, pFuncPage); aTabCtrl.SetTabPage( TP_STRUCT, pStructPage); - nOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1" - nOldUnique = pParent->GetUniqueId(); + // FIXME: HELPID + aOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1" + // FIXME: HELPID + aOldUnique = pParent->GetUniqueId(); aFtResult.Show( _bSupportResult ); aWndResult.Show( _bSupportResult ); @@ -408,27 +413,30 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) Window* pWin=rNEvt.GetWindow(); if(pWin!=NULL) { - nActivWinId = pWin->GetUniqueId(); - if(nActivWinId==0) + aActivWinId = pWin->GetUniqueId(); + // FIXME: HELPID + if(aActivWinId.getLength()==0) { Window* pParent=pWin->GetParent(); while(pParent!=NULL) { - nActivWinId=pParent->GetUniqueId(); + aActivWinId=pParent->GetUniqueId(); - if(nActivWinId!=0) break; + // FIXME: HELPID + if(aActivWinId.getLength()!=0) break; pParent=pParent->GetParent(); } } - if(nActivWinId!=0) + // FIXME: HELPID + if(aActivWinId!=0) { FormEditData* pData = m_pHelper->getFormEditData(); if (pData && !aTimer.IsActive()) // wird nicht ueber Close zerstoert; { - pData->SetUniqueId(nActivWinId); + pData->SetUniqueId(aActivWinId); } } } @@ -825,8 +833,10 @@ void FormulaDlg_Impl::FillListboxes() aNewTitle = aTitle1; // HelpId fuer 1. Seite ist die aus der Resource - m_pParent->SetHelpId( nOldHelp ); - m_pParent->SetUniqueId( nOldUnique ); + // FIXME: HELPID + m_pParent->SetHelpId( aOldHelp ); + // FIXME: HELPID + m_pParent->SetUniqueId( aOldUnique ); } // ----------------------------------------------------------------------------- void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) @@ -862,9 +872,12 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) aFtEditName.SetText( pFuncDesc->getFunctionName() ); aFtEditName.Show(); pParaWin->Show(); + // FIXME: HELPID + #if 0 const long nHelpId = pFuncDesc->getHelpId(); if ( nHelpId ) pMEdit->SetSmartHelpId(SmartId(nHelpId)); + #endif } xub_StrLen nOldStart, nOldEnd; @@ -920,7 +933,8 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) else { aFtEditName.SetText(String()); - pMEdit->SetSmartHelpId(m_aSmartEditHelpId); + // FIXME: HELPID + pMEdit->SetHelpId( m_aEditHelpId ); } // Test, ob vorne/hinten noch mehr Funktionen sind @@ -1790,20 +1804,21 @@ BOOL FormulaDlg_Impl::UpdateParaWin(Selection& _rSelection) } return pTheRefEdit == NULL; } -ULONG FormulaDlg_Impl::FindFocusWin(Window *pWin) +rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin) { - ULONG nUniqueId=0; + rtl::OString aUniqueId; if(pWin->HasFocus()) { - nUniqueId=pWin->GetUniqueId(); - if(nUniqueId==0) + // FIXME: HELPID + aUniqueId=pWin->GetUniqueId(); + if(aUniqueId.getLength()==0) { Window* pParent=pWin->GetParent(); while(pParent!=NULL) { - nUniqueId=pParent->GetUniqueId(); + aUniqueId=pParent->GetUniqueId(); - if(nUniqueId!=0) break; + if(aUniqueId.getLength()!=0) break; pParent=pParent->GetParent(); } @@ -1816,11 +1831,11 @@ ULONG FormulaDlg_Impl::FindFocusWin(Window *pWin) for(USHORT i=0;iGetChild(i); - nUniqueId=FindFocusWin(pChild); - if(nUniqueId>0) break; + aUniqueId=FindFocusWin(pChild); + if(aUniqueId.getLength()>0) break; } } - return nUniqueId; + return aUniqueId; } void FormulaDlg_Impl::SetEdSelection() @@ -1925,13 +1940,15 @@ void FormulaModalDialog::RefInputDoneAfter( BOOL bForced ) m_pImpl->RefInputDoneAfter( bForced ); } -ULONG FormulaModalDialog::FindFocusWin(Window *pWin) +rtl::OString FormulaModalDialog::FindFocusWin(Window *pWin) { + // FIXME: HELPID return m_pImpl->FindFocusWin( pWin ); } -void FormulaModalDialog::SetFocusWin(Window *pWin,ULONG nUniqueId) +void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { + // FIXME: HELPID if(pWin->GetUniqueId()==nUniqueId) { pWin->GrabFocus(); @@ -2007,10 +2024,13 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, ,_pHelper,_pFunctionMgr,_pDlg)) { FreeResource(); + // FIXME: HELPID + #if 0 if(GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId SetHelpId(GetUniqueId()); //fuer einen ModelessDialog entfernt und //in eine UniqueId gewandelt wird, machen //wir das an dieser Stelle rueckgaengig. + #endif SetText(m_pImpl->aTitle1); } @@ -2080,13 +2100,15 @@ void FormulaDlg::RefInputDoneAfter( BOOL bForced ) m_pImpl->RefInputDoneAfter( bForced ); } -ULONG FormulaDlg::FindFocusWin(Window *pWin) +rtl::OString FormulaDlg::FindFocusWin(Window *pWin) { + // FIXME: HELPID return m_pImpl->FindFocusWin( pWin ); } -void FormulaDlg::SetFocusWin(Window *pWin,ULONG nUniqueId) +void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { + // FIXME: HELPID if(pWin->GetUniqueId()==nUniqueId) { pWin->GrabFocus(); @@ -2156,7 +2178,8 @@ IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG ) if (pData) // wird nicht ueber Close zerstoert; { m_pImpl->m_pHelper->setReferenceInput(pData); - ULONG nUniqueId=pData->GetUniqueId(); + // FIXME: HELPID + rtl::OString nUniqueId(pData->GetUniqueId()); SetFocusWin(this,nUniqueId); } return 0; @@ -2182,7 +2205,7 @@ void FormEditData::Reset() nOffset = 0; nEdFocus = 0; bMatrix =FALSE; - nUniqueId=0; + aUniqueId=rtl::OString(); aSelection.Min()=0; aSelection.Max()=0; aUndoStr.Erase(); @@ -2211,7 +2234,7 @@ const FormEditData& FormEditData::operator=( const FormEditData& r ) nEdFocus = r.nEdFocus; aUndoStr = r.aUndoStr; bMatrix = r.bMatrix ; - nUniqueId = r.nUniqueId; + aUniqueId = r.aUniqueId; aSelection = r.aSelection; return *this; } diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index 3633afa29316..a66b4b2137af 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -102,8 +102,8 @@ FuncPage::FuncPage(Window* pParent,const IFunctionManager* _pFunctionManager): m_pFunctionManager(_pFunctionManager) { FreeResource(); - m_aSmartHelpId = aLbFunction.GetSmartHelpId(); - aLbFunction.SetSmartUniqueId(m_aSmartHelpId); + m_aHelpId = aLbFunction.GetHelpId(); + aLbFunction.SetUniqueId(m_aHelpId); InitLRUList(); @@ -190,15 +190,19 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb ) const IFunctionDescription* pDesc = GetFuncDesc( GetFunction() ); if ( pDesc ) { + // FIXME: HELPID + #if 0 const long nHelpId = pDesc->getHelpId(); if ( nHelpId ) aLbFunction.SetSmartHelpId(SmartId(nHelpId)); + #endif } aSelectionLink.Call(this); } else { - aLbFunction.SetSmartHelpId(m_aSmartHelpId); + // FIXME: HELPID + aLbFunction.SetHelpId(m_aHelpId); UpdateFunctionList(); } return 0; diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 09f77cc81019..4d7dc5739d0f 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -82,7 +82,8 @@ private: m_pFunctionManager; ::std::vector< TFunctionDesc > aLRUList; - SmartId m_aSmartHelpId; + // FIXME: HELPID + rtl::OString m_aHelpId; void impl_addFunctions(const IFunctionCategory* _pCategory); diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index 4ba8d87c139b..db8a4e136015 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -758,8 +758,10 @@ EditBox::EditBox( Window* pParent, const ResId& rResId ) // #105582# the HelpId from the resource must be set for the MultiLineEdit, // not for the control that contains it. - pMEdit->SetSmartHelpId( GetSmartHelpId() ); - SetSmartHelpId( SmartId() ); + // FIXME: HELPID + pMEdit->SetHelpId( GetHelpId() ); + // FIXME: HELPID + SetHelpId( "" ); } EditBox::~EditBox() diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 3876621a3ec0..9afa9fb20587 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -294,22 +294,28 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc) { SetEditDesc(aDefaultString); } - long nHelpId = pFuncDesc->getHelpId(); nArgs = pFuncDesc->getSuppressedArgumentCount(); pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping); aSlider.Hide(); + // FIXME: HELPID + #if 0 + long nHelpId = pFuncDesc->getHelpId(); SetHelpId( nHelpId ); aEdArg1.SetHelpId( nHelpId ); aEdArg2.SetHelpId( nHelpId ); aEdArg3.SetHelpId( nHelpId ); aEdArg4.SetHelpId( nHelpId ); + #endif // Unique-IDs muessen gleich bleiben fuer Automatisierung - SetUniqueId( HID_FORMULA_FAP_PAGE ); + // FIXME: HELPID + #if 0 + SetUniqueId( ""/*HID_FORMULA_FAP_PAGE*/ ); aEdArg1.SetUniqueId( HID_FORMULA_FAP_EDIT1 ); aEdArg2.SetUniqueId( HID_FORMULA_FAP_EDIT2 ); aEdArg3.SetUniqueId( HID_FORMULA_FAP_EDIT3 ); aEdArg4.SetUniqueId( HID_FORMULA_FAP_EDIT4 ); + #endif SetActiveLine(0); } else diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index e0b5d259302d..c51a326477fa 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -206,14 +206,13 @@ namespace svt String sHelpURL( _rURL ); if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) ) { - String sID = sHelpURL.Copy( sizeof( "HID:" ) - 1 ); - sal_Int32 nHelpId = sID.ToInt32(); - + // FIXME: HELPID + rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); if ( _bFileView ) // the file view "overloaded" the SetHelpId - static_cast< SvtFileView* >( _pControl )->SetHelpId( nHelpId ); + static_cast< SvtFileView* >( _pControl )->SetHelpId( sID ); else - _pControl->SetHelpId( nHelpId ); + _pControl->SetHelpId( sID ); } else { @@ -224,13 +223,13 @@ namespace svt //--------------------------------------------------------------------- ::rtl::OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView ) { - sal_Int32 nHelpId = _pControl->GetHelpId(); + // FIXME: HELPID + rtl::OString aHelpId = _pControl->GetHelpId(); if ( _bFileView ) // the file view "overloaded" the SetHelpId - nHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( ); + aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( ); - ::rtl::OUString sHelpURL( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - sHelpURL += ::rtl::OUString::valueOf( (sal_Int32)nHelpId ); + rtl::OUString sHelpURL( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) ); return sHelpURL; } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index c7a18050c3ff..87df9e404b6a 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -600,7 +600,8 @@ void SvtFileDialog::Init_Impl bool bSaveMode = ( FILEDLG_MODE_SAVE == _pImp->_eMode ); pURLBox->SetNoURLSelection( bSaveMode ); - _pImp->_pEdFileName->SetHelpId( HID_FILEDLG_AUTOCOMPLETEBOX ); + // FIXME: HELPID + _pImp->_pEdFileName->SetHelpId( ""/*HID_FILEDLG_AUTOCOMPLETEBOX*/ ); _pImp->_pFtFileType = new FixedText( this, SvtResId( FT_EXPLORERFILE_FILETYPE ) ); _pImp->CreateFilterListControl( this, SvtResId( LB_EXPLORERFILE_FILETYPE ) ); @@ -649,7 +650,8 @@ void SvtFileDialog::Init_Impl _pFileView->SetUrlFilter( &m_aURLFilter ); _pFileView->EnableAutoResize(); - _pFileView->SetHelpId( HID_FILEDLG_STANDARD ); + // FIXME: HELPID + _pFileView->SetHelpId( ""/*HID_FILEDLG_STANDARD*/ ); _pFileView->SetStyle( _pFileView->GetStyle() | WB_TABSTOP ); // Positionen und Groessen der Knoepfe bestimmen. @@ -701,7 +703,8 @@ void SvtFileDialog::Init_Impl if ( nStyle & SFXWB_READONLY ) { _pCbReadOnly = new CheckBox( this, SvtResId( CB_EXPLORERFILE_READONLY ) ); - _pCbReadOnly->SetHelpId( HID_FILEOPEN_READONLY ); + // FIXME: HELPID + _pCbReadOnly->SetHelpId( ""/*HID_FILEOPEN_READONLY*/ ); _pCbReadOnly->SetText( SvtResId( STR_SVT_FILEPICKER_READONLY ) ); AddControl( _pCbReadOnly ); ReleaseOwnerShip( _pCbReadOnly ); @@ -810,15 +813,23 @@ void SvtFileDialog::Init_Impl { // different help ids if in save-as mode // 90744 - 09.08.2001 - frank.schoenheit@sun.com - SetHelpId( HID_FILESAVE_DIALOG ); - - _pImp->_pEdFileName->SetHelpId( HID_FILESAVE_FILEURL ); - _pImp->_pBtnFileOpen->SetHelpId( HID_FILESAVE_DOSAVE ); - _pImp->_pBtnNewFolder->SetHelpId( HID_FILESAVE_CREATEDIRECTORY ); - _pImp->_pBtnStandard->SetHelpId( HID_FILESAVE_DEFAULTDIRECTORY ); - _pImp->_pBtnUp->SetHelpId( HID_FILESAVE_LEVELUP ); - _pImp->GetFilterListControl()->SetHelpId( HID_FILESAVE_FILETYPE ); - _pFileView->SetHelpId( HID_FILESAVE_FILEVIEW ); + // FIXME: HELPID + SetHelpId( ""/*HID_FILESAVE_DIALOG*/ ); + + // FIXME: HELPID + _pImp->_pEdFileName->SetHelpId( ""/*HID_FILESAVE_FILEURL*/ ); + // FIXME: HELPID + _pImp->_pBtnFileOpen->SetHelpId( ""/*HID_FILESAVE_DOSAVE*/ ); + // FIXME: HELPID + _pImp->_pBtnNewFolder->SetHelpId( ""/*HID_FILESAVE_CREATEDIRECTORY*/ ); + // FIXME: HELPID + _pImp->_pBtnStandard->SetHelpId( ""/*HID_FILESAVE_DEFAULTDIRECTORY*/ ); + // FIXME: HELPID + _pImp->_pBtnUp->SetHelpId( ""/*HID_FILESAVE_LEVELUP*/ ); + // FIXME: HELPID + _pImp->GetFilterListControl()->SetHelpId( ""/*HID_FILESAVE_FILETYPE*/ ); + // FIXME: HELPID + _pFileView->SetHelpId( ""/*HID_FILESAVE_FILEVIEW*/ ); // formerly, there was only _pLbFileVersion, which was used for 3 different // use cases. For reasons of maintainability, I introduced extra members (_pLbTemplates, _pLbImageTemplates) @@ -827,16 +838,23 @@ void SvtFileDialog::Init_Impl // tests I made lead to a dialog where _no_ of the three list boxes was present. // 96930 - 15.08.2002 - fs@openoffice.org if ( _pImp->_pLbFileVersion ) - _pImp->_pLbFileVersion->SetHelpId( HID_FILESAVE_TEMPLATE ); + // FIXME: HELPID + _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); if ( _pImp->_pLbTemplates ) - _pImp->_pLbTemplates->SetHelpId( HID_FILESAVE_TEMPLATE ); + // FIXME: HELPID + _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); if ( _pImp->_pLbImageTemplates ) - _pImp->_pLbImageTemplates->SetHelpId( HID_FILESAVE_TEMPLATE ); + // FIXME: HELPID + _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); - if ( _pImp->_pCbPassword ) _pImp->_pCbPassword->SetHelpId( HID_FILESAVE_SAVEWITHPASSWORD ); - if ( _pImp->_pCbAutoExtension ) _pImp->_pCbAutoExtension->SetHelpId( HID_FILESAVE_AUTOEXTENSION ); - if ( _pImp->_pCbOptions ) _pImp->_pCbOptions->SetHelpId( HID_FILESAVE_CUSTOMIZEFILTER ); - if ( _pCbSelection ) _pCbSelection->SetHelpId( HID_FILESAVE_SELECTION ); + // FIXME: HELPID + if ( _pImp->_pCbPassword ) _pImp->_pCbPassword->SetHelpId( ""/*HID_FILESAVE_SAVEWITHPASSWORD*/ ); + // FIXME: HELPID + if ( _pImp->_pCbAutoExtension ) _pImp->_pCbAutoExtension->SetHelpId( ""/*HID_FILESAVE_AUTOEXTENSION*/ ); + // FIXME: HELPID + if ( _pImp->_pCbOptions ) _pImp->_pCbOptions->SetHelpId( ""/*HID_FILESAVE_CUSTOMIZEFILTER*/ ); + // FIXME: HELPID + if ( _pCbSelection ) _pCbSelection->SetHelpId( ""/*HID_FILESAVE_SELECTION*/ ); } // correct the z-order of the controls @@ -2981,7 +2999,8 @@ void SvtFileDialog::AddControls_Impl( ) { _pCbLinkBox = new CheckBox( this ); _pCbLinkBox ->SetText( SvtResId( STR_SVT_FILEPICKER_INSERT_AS_LINK ) ); - _pCbLinkBox ->SetHelpId( HID_FILEDLG_LINK_CB ); + // FIXME: HELPID + _pCbLinkBox ->SetHelpId( ""/*HID_FILEDLG_LINK_CB*/ ); AddControl( _pCbLinkBox ); ReleaseOwnerShip( _pCbLinkBox ); _pCbLinkBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) ); @@ -2998,7 +3017,8 @@ void SvtFileDialog::AddControls_Impl( ) // "Vorschau" _pCbPreviewBox = new CheckBox( this ); _pCbPreviewBox->SetText( SvtResId( STR_SVT_FILEPICKER_SHOW_PREVIEW ) ); - _pCbPreviewBox->SetHelpId( HID_FILEDLG_PREVIEW_CB ); + // FIXME: HELPID + _pCbPreviewBox->SetHelpId( ""/*HID_FILEDLG_PREVIEW_CB*/ ); AddControl( _pCbPreviewBox ); ReleaseOwnerShip( _pCbPreviewBox ); _pCbPreviewBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) ); @@ -3046,7 +3066,8 @@ void SvtFileDialog::AddControls_Impl( ) { _pPbPlay = new PushButton( this ); _pPbPlay->SetText( SvtResId( STR_SVT_FILEPICKER_PLAY ) ); - _pPbPlay->SetHelpId( HID_FILESAVE_DOPLAY ); + // FIXME: HELPID + _pPbPlay->SetHelpId( ""/*HID_FILESAVE_DOPLAY*/ ); AddControl( _pPbPlay ); ReleaseOwnerShip( _pPbPlay ); _pPbPlay->SetClickHdl( LINK( this, SvtFileDialog, PlayButtonHdl_Impl ) ); @@ -3058,7 +3079,8 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtFileVersion->SetText( SvtResId( STR_SVT_FILEPICKER_VERSION ) ); _pImp->_pLbFileVersion = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - _pImp->_pLbFileVersion->SetHelpId( HID_FILEOPEN_VERSION ); + // FIXME: HELPID + _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ ); } else if ( _nExtraBits & SFX_EXTRA_TEMPLATES ) { @@ -3066,7 +3088,8 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_TEMPLATES ) ); _pImp->_pLbTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - _pImp->_pLbTemplates->SetHelpId( HID_FILEOPEN_VERSION ); + // FIXME: HELPID + _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ ); // This is strange. During the re-factoring during 96930, I discovered that this help id // is set in the "Templates mode". This was hidden in the previous implementation. // Shouldn't this be a more meaningfull help id. @@ -3078,7 +3101,8 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtImageTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_IMAGE_TEMPLATE ) ); _pImp->_pLbImageTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - _pImp->_pLbImageTemplates->SetHelpId( HID_FILEOPEN_IMAGE_TEMPLATE ); + // FIXME: HELPID + _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILEOPEN_IMAGE_TEMPLATE*/ ); } } diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 458368bd6581..9541c45689b1 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -4005,7 +4005,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent ) if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { pToolBox = (ToolBox *)pWindow; - aToolbarName = pToolBox->GetSmartHelpId().GetStr(); + aToolbarName = rtl::OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 ); sal_Int32 i = aToolbarName.lastIndexOf( ':' ); if (( aToolbarName.getLength() > 0 ) && ( i > 0 ) && (( i+ 1 ) < aToolbarName.getLength() )) @@ -4066,7 +4066,7 @@ IMPL_LINK( LayoutManager, WindowEventListener, VclSimpleEvent*, pEvent ) if ( pWindow && pWindow->GetType() == WINDOW_TOOLBOX ) { pToolBox = (ToolBox *)pWindow; - aToolbarName = pToolBox->GetSmartHelpId().GetStr(); + aToolbarName = rtl::OStringToOUString( pToolBox->GetHelpId(), RTL_TEXTENCODING_UTF8 ); if (( aToolbarName.getLength() > 0 ) && ( m_nLockCount == 0 )) m_aAsyncLayoutTimer.Start(); } diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index 13c5647341e6..c8cf5249dd9a 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -528,7 +528,8 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f } // set help ID for our canvas - pWindow->SetHelpId(HID_BACKINGWINDOW); + // FIXME: HELPID + pWindow->SetHelpId(""/*HID_BACKINGWINDOW*/); // inform BackingWindow about frame BackingWindow* pBack = dynamic_cast(pWindow ); diff --git a/framework/source/services/backingwindow.cxx b/framework/source/services/backingwindow.cxx index e4d37d1fe059..6aa5e274b744 100644 --- a/framework/source/services/backingwindow.cxx +++ b/framework/source/services/backingwindow.cxx @@ -211,15 +211,15 @@ BackingWindow::BackingWindow( Window* i_pParent ) : if( mxDesktop.is() ) mxDesktopDispatchProvider = Reference< XDispatchProvider >( mxDesktop, UNO_QUERY ); - maWriterButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:WriterButton" ) ) ) ); - maCalcButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:CalcButton" ) ) ) ); - maImpressButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:ImpressButton" ) ) ) ); - maDrawButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:DrawButton" ) ) ) ); - maDBButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:DBButton" ) ) ) ); - maMathButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:MathButton" ) ) ) ); - maTemplateButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:TemplateButton" ) ) ) ); - maOpenButton.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:OpenButton" ) ) ) ); - maToolbox.SetSmartHelpId( SmartId( String( RTL_CONSTASCII_USTRINGPARAM( ".HelpId:StartCenter:Toolbox" ) ) ) ); + maWriterButton.SetHelpId( ".HelpId:StartCenter:WriterButton" ); + maCalcButton.SetHelpId( ".HelpId:StartCenter:CalcButton" ); + maImpressButton.SetHelpId( ".HelpId:StartCenter:ImpressButton" ); + maDrawButton.SetHelpId( ".HelpId:StartCenter:DrawButton" ); + maDBButton.SetHelpId( ".HelpId:StartCenter:DBButton" ); + maMathButton.SetHelpId( ".HelpId:StartCenter:MathButton" ); + maTemplateButton.SetHelpId( ".HelpId:StartCenter:TemplateButton" ); + maOpenButton.SetHelpId( ".HelpId:StartCenter:OpenButton" ); + maToolbox.SetHelpId( ".HelpId:StartCenter:Toolbox" ); // init background initBackground(); diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index f0f5d52a47d6..7be1516f1331 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -98,7 +98,8 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo pPopupMenu->InsertItem( 2, aDisplayName ); pPopupMenu->SetItemCommand( 2, aCommand ); //pPopupMenu->SetHelpId( 2, HID_SVX_BASIC_MACRO_ORGANIZER ); - pPopupMenu->SetHelpId( 2, 40012 ); + // FIXME: HELPID + pPopupMenu->SetHelpId( 2, ""/*40012*/ ); // insert providers but not basic or java addScriptItems( pPopupMenu, 4); @@ -219,7 +220,8 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt pPopupMenu->InsertItem( itemId, aDisplayName ); pPopupMenu->SetItemCommand( itemId, aCommand ); //pPopupMenu->SetHelpId( itemId, HID_SVX_COMMON_MACRO_ORGANIZER ); - pPopupMenu->SetHelpId( itemId, 40014 ); + // FIXME: HELPID + pPopupMenu->SetHelpId( itemId, ""/*40014*/ ); itemId++; break; } diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 9fbdf87336cc..0a3295c1395e 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1797,7 +1797,9 @@ void MenuBarManager::FillMenu( sal_Int32 nHelpId = aHelpURL.toInt32(); if ( nHelpId > 0 ) - pMenu->SetHelpId( nId, (USHORT)nHelpId ); + // FIXME: HELPID + // (should set aHelpURL ? + pMenu->SetHelpId( nId, ""/*(USHORT)nHelpId*/ ); if ( nStyle ) { MenuItemBits nBits = pMenu->GetItemBits( nId ); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index cb9cbb2896f7..d143b717366c 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -537,7 +537,8 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc rtl::OUString aId( aHelpURL.copy( HELPID_PREFIX_LENGTH )); sal_uInt16 nHelpId = (sal_uInt16)(aId.toInt32()); if ( nHelpId > 0 ) - m_pStatusBar->SetHelpId( nId, nHelpId ); + // FIXME: HELPID + m_pStatusBar->SetHelpId( nId, ""/*nHelpId*/ ); } ++nId; diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 030a790b35e3..ed506f5345e3 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -137,7 +137,8 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) pStatusBarManager = new StatusBarManager( m_xServiceFactory, xFrame, m_aResourceURL, pStatusBar ); ((FrameworkStatusBar*)pStatusBar)->SetStatusBarManager( pStatusBarManager ); m_xStatusBarManager = Reference< XComponent >( static_cast< OWeakObject *>( pStatusBarManager ), UNO_QUERY ); - pStatusBar->SetUniqueId( HID_STATUSBAR ); + // FIXME: HELPID + pStatusBar->SetUniqueId( ""/*HID_STATUSBAR*/ ); } } diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index d89b81c0f9b6..19625d5e198b 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -303,10 +303,10 @@ ToolBarManager::ToolBarManager( const Reference< XMultiServiceFactory >& rServic // set name for testtool, the useful part is after the last '/' sal_Int32 idx = rResourceName.lastIndexOf('/'); idx++; // will become 0 if '/' not found: use full string - ::rtl::OUString aHelpIdAsString( RTL_CONSTASCII_USTRINGPARAM( HELPID_PREFIX_TESTTOOL )); + ::rtl::OString aHelpIdAsString( HELPID_PREFIX_TESTTOOL ); ::rtl::OUString aToolbarName = rResourceName.copy( idx ); - aHelpIdAsString += aToolbarName; - m_pToolBar->SetSmartHelpId( SmartId( aHelpIdAsString ) ); + aHelpIdAsString += rtl::OUStringToOString( aToolbarName, RTL_TEXTENCODING_UTF8 );; + m_pToolBar->SetHelpId( aHelpIdAsString ); m_aAsyncUpdateControllersTimer.SetTimeout( 50 ); m_aAsyncUpdateControllersTimer.SetTimeoutHdl( LINK( this, ToolBarManager, AsyncUpdateControllersHdl ) ); @@ -883,7 +883,10 @@ void ToolBarManager::CreateControllers() if ( nId == 0 ) continue; - sal_Int16 nWidth( sal_Int16( m_pToolBar->GetHelpId( nId ))); + // FIXME: HELPID + // What ? A width initalized with a help id ? Should we perhaps add two bananas and a coconut to it ? + // sal_Int16 nWidth( sal_Int16( m_pToolBar->GetHelpId( nId ))); + sal_Int16 nWidth( nId ); rtl::OUString aLoadURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:OpenUrl" )); rtl::OUString aCommandURL( m_pToolBar->GetItemCommand( nId )); sal_Bool bInit( sal_True ); @@ -892,7 +895,7 @@ void ToolBarManager::CreateControllers() svt::ToolboxController* pController( 0 ); - m_pToolBar->SetHelpId( nId, 0 ); // reset value again + m_pToolBar->SetHelpId( nId, "" ); // reset value again if ( bHasDisabledEntries ) { aURL.Complete = aCommandURL; @@ -1282,7 +1285,8 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine } // Add additional information for the controller to the obsolete help id - m_pToolBar->SetHelpId( ULONG( nWidth )); + // FIXME: HELPID + m_pToolBar->SetHelpId( ""/*ULONG( nWidth )*/); if ( !bIsVisible ) m_pToolBar->HideItem( nId ); diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 83f280cb46a7..025ebea06a19 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -701,7 +701,9 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_u pToolbar->SetItemState( nItemId, STATE_NOCHECK ); // Use obsolete help id to transport the width of the item - pToolbar->SetHelpId( nItemId, rItem.nWidth ); + // FIXME: HELPID + // this looks broken + pToolbar->SetHelpId( nItemId, ""/*rItem.nWidth*/ ); // Use the user data to store add-on specific data with the toolbar item AddonsParams* pAddonParams = new AddonsParams; diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 02402205bd1c..3d0cda946771 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -216,7 +216,8 @@ void ToolbarsMenuController::addCommand( PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); if ( !!aImage ) pVCLPopupMenu->SetItemImage( nItemId, aImage ); - pVCLPopupMenu->SetHelpId( nItemId, nHelpId ); + // FIXME: HELPID + pVCLPopupMenu->SetHelpId( nItemId, ""/*nHelpId*/ ); } m_aCommandVector.push_back( rCommandURL ); diff --git a/sfx2/inc/sfx2/passwd.hxx b/sfx2/inc/sfx2/passwd.hxx index 4f4a04834257..b0105553cd40 100644 --- a/sfx2/inc/sfx2/passwd.hxx +++ b/sfx2/inc/sfx2/passwd.hxx @@ -78,7 +78,7 @@ public: void SetMinLen( USHORT Len ); void SetMaxLen( USHORT Len ); - void SetEditHelpId( ULONG nId ) { maPasswordED.SetHelpId( nId ); } + void SetEditHelpId( const rtl::OString& rId ) { maPasswordED.SetHelpId( rId ); } void ShowExtras( USHORT nExtras ) { mnExtras = nExtras; } void AllowAsciiOnly( bool i_bAsciiOnly = true ) { mbAsciiOnly = i_bAsciiOnly; } diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx index 60ad04b2e9ab..6a87729e30e3 100644 --- a/sfx2/inc/sfxhelp.hxx +++ b/sfx2/inc/sfxhelp.hxx @@ -45,12 +45,14 @@ class SFX2_DLLPUBLIC SfxHelp : public Help SfxHelp_Impl* pImp; private: - SAL_DLLPRIVATE virtual BOOL Start( ULONG nHelpId, const Window* pWindow ); + // FIXME: HELPID + // SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId ); SAL_DLLPRIVATE String GetHelpModuleName_Impl(); - SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ); + // FIXME: HELPID + // SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ); SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ); public: @@ -60,10 +62,12 @@ public: inline void SetTicket( const String& rTicket ) { aTicket = rTicket; } inline void SetUser( const String& rUser ) { aUser = rUser; } - virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow ); + // FIXME: HELPID + //virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow ); virtual XubString GetHelpText( const String&, const Window* pWindow ); - static String CreateHelpURL( ULONG nHelpId, const String& rModuleName ); + // FIXME: HELPID + // static String CreateHelpURL( ULONG nHelpId, const String& rModuleName ); static String CreateHelpURL( const String& aCommandURL, const String& rModuleName ); static void OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId ); static String GetDefaultHelpModule(); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 14789100bb24..2abcdffe0169 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -354,7 +354,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) if ( 66056 == nHelpId ) { // show Support page with new URL - String sHelpURL = SfxHelp::CreateHelpURL( nHelpId, String() ); + // FIXME: HELPID + String sHelpURL = SfxHelp::CreateHelpURL( String()/*nHelpId*/, String() ); String sParams = sHelpURL.Copy( sHelpURL.Search( '?' ) ); sHelpURL = String::CreateFromAscii("vnd.sun.star.help://shared/text/shared/05/00000001.xhp"); sHelpURL += sParams; @@ -362,7 +363,8 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) pHelp->Start( sHelpURL, NULL ); } else - pHelp->Start( nHelpId, NULL ); // show start page + // FIXME: HELPID + pHelp->Start( String()/*nHelpId*/, NULL ); // show start page bDone = TRUE; } break; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 597509cf34bd..6b8dfe3a023c 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2105,24 +2105,32 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : xFrame->setName( DEFINE_CONST_UNICODE("OFFICE_HELP") ); lcl_disableLayoutOfFrame(xFrame); - aToolBox.SetHelpId( HID_HELP_TOOLBOX ); + // FIXME: HELPID + aToolBox.SetHelpId( ""/*HID_HELP_TOOLBOX*/ ); aToolBox.InsertItem( TBI_INDEX, aIndexOffText ); - aToolBox.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_INDEX, ""/*HID_HELP_TOOLBOXITEM_INDEX*/ ); aToolBox.InsertSeparator(); aToolBox.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ) ); - aToolBox.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_BACKWARD, ""/*HID_HELP_TOOLBOXITEM_BACKWARD*/ ); aToolBox.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ) ); - aToolBox.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_FORWARD, ""/*HID_HELP_TOOLBOXITEM_FORWARD*/ ); aToolBox.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ) ); - aToolBox.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_START, ""/*HID_HELP_TOOLBOXITEM_START*/ ); aToolBox.InsertSeparator(); aToolBox.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ) ); - aToolBox.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_PRINT, ""/*HID_HELP_TOOLBOXITEM_PRINT*/ ); aToolBox.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ) ); - aToolBox.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_BOOKMARKS, ""/*HID_HELP_TOOLBOXITEM_BOOKMARKS*/ ); aToolBox.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ) ); - aToolBox.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG ); + // FIXME: HELPID + aToolBox.SetHelpId( TBI_SEARCHDIALOG, ""/*HID_HELP_TOOLBOXITEM_SEARCHDIALOG*/ ); InitToolBoxImages(); aToolBox.Show(); @@ -2139,7 +2147,8 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : SvtMiscOptions().AddListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) ); if ( aOnStartupCB.GetHelpId() == 0 ) - aOnStartupCB.SetHelpId( HID_HELP_ONSTARTUP_BOX ); + // FIXME: HELPID + aOnStartupCB.SetHelpId( ""/*HID_HELP_ONSTARTUP_BOX*/ ); } // ----------------------------------------------------------------------- @@ -2595,32 +2604,40 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) else aMenu.InsertItem( TBI_INDEX, aIndexOnText, Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ) ); - aMenu.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_INDEX, ""/*HID_HELP_TOOLBOXITEM_INDEX*/ ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) ); - aMenu.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_BACKWARD, ""/*HID_HELP_TOOLBOXITEM_BACKWARD*/ ); aMenu.EnableItem( TBI_BACKWARD, pHelpWin->HasHistoryPredecessor() ); aMenu.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) ); - aMenu.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_FORWARD, ""/*HID_HELP_TOOLBOXITEM_FORWARD*/ ); aMenu.EnableItem( TBI_FORWARD, pHelpWin->HasHistorySuccessor() ); aMenu.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) ); - aMenu.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_START, ""/*HID_HELP_TOOLBOXITEM_START*/ ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) ); - aMenu.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_PRINT, ""/*HID_HELP_TOOLBOXITEM_PRINT*/ ); aMenu.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) ); - aMenu.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_BOOKMARKS, ""/*HID_HELP_TOOLBOXITEM_BOOKMARKS*/ ); aMenu.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) ); - aMenu.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_SEARCHDIALOG, ""/*HID_HELP_TOOLBOXITEM_SEARCHDIALOG*/ ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_SELECTIONMODE, String( SfxResId( STR_HELP_MENU_TEXT_SELECTION_MODE ) ) ); - aMenu.SetHelpId( TBI_SELECTIONMODE, HID_HELP_TEXT_SELECTION_MODE ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_SELECTIONMODE, ""/*HID_HELP_TEXT_SELECTION_MODE*/ ); Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY ); URL aURL; aURL.Complete = DEFINE_CONST_UNICODE(".uno:SelectTextMode"); @@ -2640,7 +2657,8 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aMenu.InsertSeparator(); aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_COPY : IMG_HELP_TOOLBOX_COPY ) ) ); - aMenu.SetHelpId( TBI_COPY, SID_COPY ); + // FIXME: HELPID + aMenu.SetHelpId( TBI_COPY, ""/*SID_COPY*/ ); aMenu.EnableItem( TBI_COPY, HasSelection() ); if ( bIsDebug ) @@ -3225,7 +3243,8 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( aWinPos ( 0, 0 ), sTitle ( pParent->GetText() ) { - SetHelpId( HID_HELP_WINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_HELP_WINDOW*/ ); SetStyle( GetStyle() | WB_DIALOGCONTROL ); pHelpInterceptor->InitWaiter( this ); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index b9ff344a1513..cd2f6b189fd1 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -326,7 +326,8 @@ public: ~SfxHelp_Impl(); SfxHelpOptions_Impl* GetOptions(); - String GetHelpText( ULONG nHelpId, const String& rModule ); // get "Active Help" + // FIXME: HELPID + // String GetHelpText( ULONG nHelpId, const String& rModule ); // get "Active Help" String GetHelpText( const rtl::OUString& aCommandURL, const String& rModule ); sal_Bool HasModule( const ::rtl::OUString& rModule ); // module installed sal_Bool IsHelpInstalled(); // module list not empty @@ -370,6 +371,8 @@ void SfxHelp_Impl::Load() } } +#if 0 +// FIXME: HELPID String SfxHelp_Impl::GetHelpText( ULONG nHelpId, const String& rModule ) { // create help url @@ -379,6 +382,7 @@ String SfxHelp_Impl::GetHelpText( ULONG nHelpId, const String& rModule ) // load help string return SfxContentHelper::GetActiveHelpString( aHelpURL ); } +#endif String SfxHelp_Impl::GetHelpText( const rtl::OUString& aCommandURL, const String& rModule ) { @@ -581,6 +585,8 @@ String SfxHelp::GetHelpModuleName_Impl() return sModuleName; } +#if 0 +// FIXME: HELPID String SfxHelp::CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ) { String aModuleName( rModuleName ); @@ -650,6 +656,7 @@ String SfxHelp::CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ) return aHelpURL; } +#endif String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ) { @@ -802,7 +809,8 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) } else { - aHelpURL = CreateHelpURL_Impl( 0, GetHelpModuleName_Impl( ) ); + // FIXME: HELPID + aHelpURL = CreateHelpURL_Impl( String()/*0*/, GetHelpModuleName_Impl( ) ); // pb i91715: strings begin with ".HelpId:" are not words of the basic ide // they are helpid-strings used by the testtool -> so we ignore them @@ -851,6 +859,8 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) return TRUE; } +#if 0 +// FIXME: HELPID BOOL SfxHelp::Start( ULONG nHelpId, const Window* pWindow ) { String aHelpModuleName( GetHelpModuleName_Impl() ); @@ -878,7 +888,10 @@ BOOL SfxHelp::Start( ULONG nHelpId, const Window* pWindow ) return Start( aHelpURL, pWindow ); } +#endif +#if 0 +// FIXME: HELPID XubString SfxHelp::GetHelpText( ULONG nHelpId, const Window* pWindow ) { String aModuleName = GetHelpModuleName_Impl(); @@ -919,6 +932,7 @@ XubString SfxHelp::GetHelpText( ULONG nHelpId, const Window* pWindow ) return aHelpText; } +#endif XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* ) { @@ -937,6 +951,8 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* ) return sHelpText; } +#if 0 +// FIXME: HELPID String SfxHelp::CreateHelpURL( ULONG nHelpId, const String& rModuleName ) { String aURL; @@ -945,6 +961,7 @@ String SfxHelp::CreateHelpURL( ULONG nHelpId, const String& rModuleName ) aURL = pHelp->CreateHelpURL_Impl( nHelpId, rModuleName ); return aURL; } +#endif String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName ) { @@ -976,7 +993,8 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId ) try { URL aURL; - aURL.Complete = CreateHelpURL_Impl( nHelpId, GetHelpModuleName_Impl() ); + // FIXME: HELPID + aURL.Complete = CreateHelpURL_Impl( String()/*nHelpId*/, GetHelpModuleName_Impl() ); Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ), UNO_QUERY ); xTrans->parseStrict(aURL); diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx index 4635733b934d..1d1ef73ad8cf 100644 --- a/sfx2/source/dialog/about.cxx +++ b/sfx2/source/dialog/about.cxx @@ -298,7 +298,8 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS FreeResource(); // explizite Help-Id - SetHelpId( SID_ABOUT ); + // FIXME: HELPID + SetHelpId( ""/*SID_ABOUT*/ ); //#112429# replace occurences of "StarOffice" in the "StarSuite" version String sCopyright( aCopyrightText.GetText() ); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 2ea5ef5fe4b1..d85a01870074 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -373,9 +373,9 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - sal_uInt32 nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); pImp->aMoveTimer.SetTimeout(50); @@ -393,9 +393,9 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - sal_uInt32 nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); pImp->aMoveTimer.SetTimeout(50); @@ -421,7 +421,8 @@ long SfxModelessDialog::Notify( NotifyEvent& rEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + nHelpId = 0; // pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } @@ -523,7 +524,8 @@ long SfxFloatingWindow::Notify( NotifyEvent& rEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + nHelpId = 0; //pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } @@ -561,9 +563,9 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - sal_uInt32 nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); pImp->aMoveTimer.SetTimeout(50); @@ -582,9 +584,9 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - sal_uInt32 nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); if ( pBindinx ) pImp->StartListening( *pBindinx ); pImp->aMoveTimer.SetTimeout(50); diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 7b4e4289a49c..8ad551278a27 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -918,11 +918,13 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, */ { - ULONG nId = GetHelpId(); + // FIXME: HELPID + ULONG nId = 0;// GetHelpId(); if ( !nId && pCW ) nId = pCW->GetType(); - SetHelpId( 0 ); - SetUniqueId( nId ); + SetHelpId( "" ); + // FIXME: HELPID + SetUniqueId( ""/*nId*/ ); pImp = new SfxDockingWindow_Impl; pImp->bConstructed = FALSE; @@ -960,9 +962,9 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, */ { - ULONG nId = GetHelpId(); - SetHelpId(0); - SetUniqueId( nId ); + // FIXME: HELPID + SetUniqueId( GetHelpId() ); + SetHelpId(""); pImp = new SfxDockingWindow_Impl; pImp->bConstructed = FALSE; @@ -1847,7 +1849,8 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + //nHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 5270eb5d4207..2785a38305cd 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -276,7 +276,8 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve OUString aHelpText; Help* pHelp = Application::GetHelp(); if ( pHelp ) - aHelpText = String( pHelp->GetHelpText( nHelpId, NULL ) ); + // FIXME: HELPID + aHelpText = String( pHelp->GetHelpText( String()/*nHelpId*/, NULL ) ); return aHelpText; } diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index d7f258e7ccb3..b271d1e04dc7 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -51,7 +51,8 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE); eChildAlignment = SFX_ALIGN_NOALIGNMENT; - pWindow->SetHelpId ( HID_NAVIGATOR_WINDOW ); + // FIXME: HELPID + pWindow->SetHelpId ( ""/*HID_NAVIGATOR_WINDOW*/ ); pWindow->SetOutputSizePixel( Size( 270, 240 ) ); ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo ); diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 93c2e0e09595..065b407c6769 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -664,7 +664,8 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText ) aCancelBtn.Show(); aHelpBtn.Show(); aResetBtn.Show(); - aResetBtn.SetHelpId( HID_TABDLG_RESET_BTN ); + // FIXME: HELPID + aResetBtn.SetHelpId( ""/*HID_TABDLG_RESET_BTN*/ ); if ( pUserBtn ) { @@ -680,7 +681,8 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText ) String aStd( SfxResId( STR_STANDARD_SHORTCUT ) ); aBaseFmtBtn.SetText( aStd ); aBaseFmtBtn.SetClickHdl( LINK( this, SfxTabDialog, BaseFmtHdl ) ); - aBaseFmtBtn.SetHelpId( HID_TABDLG_STANDARD_BTN ); + // FIXME: HELPID + aBaseFmtBtn.SetHelpId( ""/*HID_TABDLG_STANDARD_BTN*/ ); // bFmt = tempor"ares Flag im Ctor() "ubergeben, // wenn bFmt == 2, dann auch TRUE, @@ -787,7 +789,8 @@ void SfxTabDialog::EnableApplyButton(BOOL bEnable) pImpl->pApplyButton->SetText( String( SfxResId( STR_APPLY ) ) ); pImpl->pApplyButton->Show(); - pImpl->pApplyButton->SetHelpId( HID_TABDLG_APPLY_BTN ); + // FIXME: HELPID + pImpl->pApplyButton->SetHelpId( ""/*HID_TABDLG_APPLY_BTN*/ ); } else { @@ -1783,7 +1786,8 @@ long SfxTabDialog::Notify( NotifyEvent& rNEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + // nHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 9edeb05b43ac..4777798aef2b 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -778,8 +778,10 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Sfx bHierarchical ( FALSE ), bBindingUpdate ( TRUE ) { - aFmtLb.SetHelpId( HID_TEMPLATE_FMT ); - aFilterLb.SetHelpId( HID_TEMPLATE_FILTER ); + // FIXME: HELPID + aFmtLb.SetHelpId( ""/*HID_TEMPLATE_FMT*/ ); + // FIXME: HELPID + aFilterLb.SetHelpId( ""/*HID_TEMPLATE_FILTER*/ ); aFmtLb.SetWindowBits( WB_SORT | WB_HIDESELECTION ); Font aFont = aFmtLb.GetFont(); aFont.SetWeight( WEIGHT_NORMAL ); @@ -2359,7 +2361,8 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( Font aFont=aFilterLb.GetFont(); aFont.SetWeight( WEIGHT_NORMAL ); aFilterLb.SetFont( aFont ); - m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT ); + // FIXME: HELPID + m_aActionTbL.SetHelpId( ""/*HID_TEMPLDLG_TOOLBOX_LEFT*/ ); } // ------------------------------------------------------------------------ @@ -2384,7 +2387,8 @@ void SfxTemplateDialog_Impl::InsertFamilyItem(USHORT nId,const SfxStyleFamilyIte default: DBG_ERROR("unbekannte StyleFamily"); break; } m_aActionTbL.InsertItem( nId, pItem->GetImage(), pItem->GetText(), 0, 0); - m_aActionTbL.SetHelpId( nId, nHelpId ); + // FIXME: HELPID + m_aActionTbL.SetHelpId( nId, ""/*nHelpId*/ ); } // ------------------------------------------------------------------------ @@ -2683,18 +2687,21 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) uno::Any aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleNewByExample")); ::rtl::OUString sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel ); - pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE); + // FIXME: HELPID + pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, ""/*HID_TEMPLDLG_NEWBYEXAMPLE*/); aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleUpdateByExample")); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel ); - pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE); + // FIXME: HELPID + pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, ""/*HID_TEMPLDLG_UPDATEBYEXAMPLE*/); aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:LoadStyles")); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel ); - pMenu->SetHelpId(SID_TEMPLATE_LOAD, SID_TEMPLATE_LOAD); + // FIXME: HELPID + pMenu->SetHelpId(SID_TEMPLATE_LOAD, ""/*SID_TEMPLATE_LOAD*/); pMenu->SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, MenuSelectHdl)); pMenu->Execute( pBox, diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 719dc5b8d223..1d57e0b9c761 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -245,8 +245,9 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent, // * always work with an own instance, even if we get only NULL in this ctor } - aLeftLb.SetHelpId( HID_CTL_ORGANIZER_LEFT ); - aRightLb.SetHelpId( HID_CTL_ORGANIZER_RIGHT ); + // FIXME: HELPID + aLeftLb.SetHelpId( ""/*HID_CTL_ORGANIZER_LEFT*/ ); + aRightLb.SetHelpId( ""/*HID_CTL_ORGANIZER_RIGHT*/ ); String aWorkPath = SvtPathOptions().GetWorkPath(); if ( aWorkPath.Len() ) diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index d3235b1c7a7f..3b1ebde3f1ae 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -177,7 +177,8 @@ SfxPreviewWin::SfxPreviewWin( Window* pParent, const ResId& rResId, SfxObjectShellLock &rDocSh ) : Window(pParent, rResId), rDocShell( rDocSh ) { - SetHelpId( HID_PREVIEW_FRAME ); + // FIXME: HELPID + SetHelpId( ""/*HID_PREVIEW_FRAME*/ ); // adjust contrast mode initially bool bUseContrast = UseHighContrastSetting(); diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx index 8e006721351a..a254deb24c52 100644 --- a/sfx2/source/doc/querytemplate.cxx +++ b/sfx2/source/doc/querytemplate.cxx @@ -41,7 +41,8 @@ QueryTemplateBox::QueryTemplateBox( Window* pParent, const String& rMessage ) : MessBox ( pParent, 0, Application::GetDisplayName(), rMessage ) { SetImage( QueryBox::GetStandardImage() ); - SetHelpId( MSG_QUERY_LOAD_TEMPLATE ); + // FIXME: HELPID + SetHelpId( ""/*MSG_QUERY_LOAD_TEMPLATE*/ ); AddButton( String( SfxResId( STR_QRYTEMPL_UPDATE_BTN ) ), RET_YES, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON ); diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index ec803718f457..9137abd04764 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -160,7 +160,8 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen // einf"ugen pMenu->InsertItem( nId, aVerbs[n].VerbName ); - pMenu->SetHelpId( nId, (ULONG) nId ); + // FIXME: HELPID + pMenu->SetHelpId( nId, ""/*(ULONG) nId*/ ); } } } @@ -378,7 +379,8 @@ void SfxPopupMenuManager::InsertSeparator( USHORT nPos ) void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, USHORT nPos ) { pSVMenu->InsertItem( nId, rName, nBits,nPos ); - pSVMenu->SetHelpId( nId, (ULONG) nId ); + // FIXME: HELPID + pSVMenu->SetHelpId( nId, ""/*(ULONG) nId*/ ); } //------------------------------------------------------------------------- diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 13c84bc531e2..e3d694eae747 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -464,7 +464,8 @@ void SfxVirtualMenu::CreateFromSVMenu() pSVMenu->SetPopupMenu( nSlotId, pPopup ); } */ - pSVMenu->SetHelpId( nSlotId, 0L ); + // FIXME: HELPID + pSVMenu->SetHelpId( nSlotId, ""/*0L*/ ); pMnuCtrl = pItems+nPos; // normalerweise jetzt erst im Activate-Handler diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index f5b38d5a8a18..fc26d0077161 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1520,7 +1520,8 @@ SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId , bBigImages( FALSE ) , pMenu( 0 ) { - rBox.SetHelpId( nId, HID_TBXCONTROL_FILENEW ); + // FIXME: HELPID + rBox.SetHelpId( nId, ""/*HID_TBXCONTROL_FILENEW*/ ); rBox.SetItemBits( nId, rBox.GetItemBits( nId ) | TIB_DROPDOWN); // Determine the current background color of the menus diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index d99ad8733e03..fea860f6a3ff 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -130,7 +130,8 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) ULONG nHelpId = 0; while ( !nHelpId && pWindow ) { - nHelpId = pWindow->GetHelpId(); + // FIXME: HELPID + // nHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index 1f5543e9e484..a4718c80f099 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -172,7 +172,8 @@ public: void SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; } const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } - void SetHeaderBarHelpId(ULONG nHelpId) {aHeaderBar.SetHelpId(nHelpId);} + // FIXME: HELPID + void SetHeaderBarHelpId(ULONG nHelpId) {aHeaderBar.SetHelpId(""/*nHelpId*/);} }; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 503814823467..124f7fdd2910 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -636,7 +636,8 @@ SvxTPView::SvxTPView( Window * pParent) { FreeResource(); - aViewData.SetHelpId(HID_REDLINING_VIEW_DG_VIEW_TABLE); + // FIXME: HELPID + aViewData.SetHelpId(""/*HID_REDLINING_VIEW_DG_VIEW_TABLE*/); aViewData.SetHeaderBarHelpId(HID_REDLINING_VIEW_DG_VIEW_HEADER); aMinSize=GetSizePixel(); @@ -1177,13 +1178,15 @@ void SvxTPFilter::ShowAction(BOOL bShow) { aCbRange.Hide(); aLbAction.Hide(); - aCbRange.SetHelpId(HID_REDLINING_FILTER_CB_RANGE); + // FIXME: HELPID + aCbRange.SetHelpId(""/*HID_REDLINING_FILTER_CB_RANGE*/); } else { HideRange(); aCbRange.SetText(aActionStr); - aCbRange.SetHelpId(HID_REDLINING_FILTER_CB_ACTION); + // FIXME: HELPID + aCbRange.SetHelpId(""/*HID_REDLINING_FILTER_CB_ACTION*/); aCbRange.Show(); aLbAction.Show(); @@ -1399,7 +1402,8 @@ SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, WinBits nWinStyle) aTCAccept.InsertPage( TP_FILTER, pTPFilter->GetMyName()); aTCAccept.SetTabPage( TP_VIEW, pTPView); aTCAccept.SetTabPage( TP_FILTER, pTPFilter); - aTCAccept.SetHelpId(HID_REDLINING_TABCONTROL); + // FIXME: HELPID + aTCAccept.SetHelpId(""/*HID_REDLINING_TABCONTROL*/); aTCAccept.SetTabPageSizePixel(aMinSize); Size aSize=aTCAccept.GetSizePixel(); @@ -1426,7 +1430,8 @@ SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, const ResId& rResId ) aTCAccept.InsertPage( TP_FILTER, pTPFilter->GetMyName()); aTCAccept.SetTabPage( TP_VIEW, pTPView); aTCAccept.SetTabPage( TP_FILTER, pTPFilter); - aTCAccept.SetHelpId(HID_REDLINING_TABCONTROL); + // FIXME: HELPID + aTCAccept.SetHelpId(""/*HID_REDLINING_TABCONTROL*/); aTCAccept.SetTabPageSizePixel(aMinSize); Size aSize=aTCAccept.GetSizePixel(); diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 95c27a5dcec8..6437b193a793 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -1009,9 +1009,12 @@ SvxLightCtl3D::SvxLightCtl3D( Window* pParent, WinBits nStyle ) void SvxLightCtl3D::Init() { // #i58240# set HelpIDs for scrollbars and switcher - maHorScroller.SetHelpId(HID_CTRL3D_HSCROLL); - maVerScroller.SetHelpId(HID_CTRL3D_VSCROLL); - maSwitcher.SetHelpId(HID_CTRL3D_SWITCHER); + // FIXME: HELPID + maHorScroller.SetHelpId(""/*HID_CTRL3D_HSCROLL*/); + // FIXME: HELPID + maVerScroller.SetHelpId(""/*HID_CTRL3D_VSCROLL*/); + // FIXME: HELPID + maSwitcher.SetHelpId(""/*HID_CTRL3D_SWITCHER*/); // Light preview maLightControl.Show(); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 2cc87eb9e648..fe6a2372b7a0 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1978,8 +1978,8 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V sPattern.AssignAscii("HID:"); if (sHelpURL.Equals(sPattern, 0, sPattern.Len())) { - String sID = sHelpURL.Copy(sPattern.Len()); - pGrid->SetHelpId(sID.ToInt32()); + // FIXME: HELPID + pGrid->SetHelpId(rtl::OUStringToOString(sHelpURL, RTL_TEXTENCODING_UTF8)); } } else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) ) diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 8cc52e4c0b7d..2c63880afd05 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -366,13 +366,20 @@ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) m_aLastBtn.SetSymbol(SYMBOL_LAST); m_aNewBtn.SetModeImage(((DbGridControl*)pParent)->GetImage(DbGridControl_Base::NEW)); - m_aFirstBtn.SetHelpId(HID_GRID_TRAVEL_FIRST); - m_aPrevBtn.SetHelpId(HID_GRID_TRAVEL_PREV); - m_aNextBtn.SetHelpId(HID_GRID_TRAVEL_NEXT); - m_aLastBtn.SetHelpId(HID_GRID_TRAVEL_LAST); - m_aNewBtn.SetHelpId(HID_GRID_TRAVEL_NEW); - m_aAbsolute.SetHelpId(HID_GRID_TRAVEL_ABSOLUTE); - m_aRecordCount.SetHelpId(HID_GRID_NUMBEROFRECORDS); + // FIXME: HELPID + m_aFirstBtn.SetHelpId(""/*HID_GRID_TRAVEL_FIRST*/); + // FIXME: HELPID + m_aPrevBtn.SetHelpId(""/*HID_GRID_TRAVEL_PREV*/); + // FIXME: HELPID + m_aNextBtn.SetHelpId(""/*HID_GRID_TRAVEL_NEXT*/); + // FIXME: HELPID + m_aLastBtn.SetHelpId(""/*HID_GRID_TRAVEL_LAST*/); + // FIXME: HELPID + m_aNewBtn.SetHelpId(""/*HID_GRID_TRAVEL_NEW*/); + // FIXME: HELPID + m_aAbsolute.SetHelpId(""/*HID_GRID_TRAVEL_ABSOLUTE*/); + // FIXME: HELPID + m_aRecordCount.SetHelpId(""/*HID_GRID_NUMBEROFRECORDS*/); // Handler fuer Buttons einrichten m_aFirstBtn.SetClickHdl(LINK(this,NavigationBar,OnClick)); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index e02e8664c6ac..e3425c00b130 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2388,7 +2388,8 @@ namespace svxform { DBG_CTOR(DataNavigator,NULL); - SetHelpId( HID_DATA_NAVIGATOR_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_DATA_NAVIGATOR_WIN*/ ); SetText( SVX_RES( RID_STR_DATANAVIGATOR ) ); Size aSize = m_aDataWin.GetOutputSizePixel(); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9d1b65208fdf..c985c34f12f1 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1168,7 +1168,8 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent ) ,m_aTimerCounter( 0 ) ,m_aDropActionType( DA_SCROLLUP ) { - SetHelpId( HID_FILTER_NAVIGATOR ); + // FIXME: HELPID + SetHelpId( ""/*HID_FILTER_NAVIGATOR*/ ); { { @@ -1941,7 +1942,8 @@ FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWin :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ) ,SfxControllerItem( SID_FM_FILTER_NAVIGATOR_CONTROL, *_pBindings ) { - SetHelpId( HID_FILTER_NAVIGATOR_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_FILTER_NAVIGATOR_WIN*/ ); m_pNavigator = new FmFilterNavigator( this ); m_pNavigator->Show(); diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index bcc275896410..939253dec5bb 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -223,7 +223,8 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding ::Size aPropWinSize(STD_WIN_SIZE_X,STD_WIN_SIZE_Y); SetMinOutputSizePixel(::Size(STD_MIN_SIZE_X,STD_MIN_SIZE_Y)); SetOutputSizePixel(aPropWinSize); - SetUniqueId(UID_FORMPROPBROWSER_FRAME); + // FIXME: HELPID + SetUniqueId(""/*UID_FORMPROPBROWSER_FRAME*/); try { diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index c27b5b69d075..a2e1469418f0 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -592,7 +592,8 @@ namespace svxform ,SfxControllerItem( SID_FM_FMEXPLORER_CONTROL, *_pBindings ) { DBG_CTOR(NavigatorFrame,NULL); - SetHelpId( HID_FORM_NAVIGATOR_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_FORM_NAVIGATOR_WIN*/ ); m_pNavigatorTree = new NavigatorTree(comphelper::getProcessServiceFactory(), this ); m_pNavigatorTree->Show(); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 0c83655042d2..5e37d88126c3 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -200,7 +200,8 @@ namespace svxform ,m_bKeyboardCut( sal_False ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NavigatorTree" ); - SetHelpId( HID_FORM_NAVIGATOR ); + // FIXME: HELPID + SetHelpId( ""/*HID_FORM_NAVIGATOR*/ ); m_aNavigatorImages = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); m_aNavigatorImagesHC = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 7a51348dfaa3..1a87a06010e1 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -104,7 +104,8 @@ FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent ) ,pTabWin( pParent ) { DBG_CTOR(FmFieldWinListBox,NULL); - SetHelpId( HID_FIELD_SEL ); + // FIXME: HELPID + SetHelpId( ""/*HID_FIELD_SEL*/ ); SetHighlightRange( ); } @@ -192,7 +193,8 @@ FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _ ,m_pChangeListener(NULL) { DBG_CTOR(FmFieldWin,NULL); - SetHelpId( HID_FIELD_SEL_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_FIELD_SEL_WIN*/ ); SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) ); pListBox = new FmFieldWinListBox( this ); diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index f275fd9efd72..85babb34a1a7 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -318,7 +318,8 @@ void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const Sf Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) { SvxFmAbsRecWin* pWin = new SvxFmAbsRecWin( pParent, this ); - pWin->SetUniqueId( UID_ABSOLUTE_RECORD_WINDOW ); + // FIXME: HELPID + pWin->SetUniqueId( ""/*UID_ABSOLUTE_RECORD_WINDOW*/ ); return pWin; } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index ccbcd40862de..29c38653b4ac 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -152,7 +152,8 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, { StartListening( *mpGallery ); - maNewTheme.SetHelpId( HID_GALLERY_NEWTHEME ); + // FIXME: HELPID + maNewTheme.SetHelpId( ""/*HID_GALLERY_NEWTHEME*/ ); maNewTheme.SetText( String( GAL_RESID( RID_SVXSTR_GALLERY_CREATETHEME ) ) ); maNewTheme.SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) ); @@ -160,7 +161,8 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, if( mpGallery->GetUserURL().GetProtocol() == INET_PROT_NOT_VALID ) maNewTheme.Disable(); - mpThemes->SetHelpId( HID_GALLERY_THEMELIST ); + // FIXME: HELPID + mpThemes->SetHelpId( ""/*HID_GALLERY_THEMELIST*/ ); mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) ); for( ULONG i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ ) diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 0483a1bc1425..ae1fc2f0e086 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -325,12 +325,14 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, maViewBox.InsertItem( TBX_ID_ICON, aDummyImage ); maViewBox.SetItemBits( TBX_ID_ICON, TIB_RADIOCHECK | TIB_AUTOCHECK ); - maViewBox.SetHelpId( TBX_ID_ICON, HID_GALLERY_ICONVIEW ); + // FIXME: HELPID + maViewBox.SetHelpId( TBX_ID_ICON, ""/*HID_GALLERY_ICONVIEW*/ ); maViewBox.SetQuickHelpText( TBX_ID_ICON, String( GAL_RESID( RID_SVXSTR_GALLERY_ICONVIEW ) ) ); maViewBox.InsertItem( TBX_ID_LIST, aDummyImage ); maViewBox.SetItemBits( TBX_ID_LIST, TIB_RADIOCHECK | TIB_AUTOCHECK ); - maViewBox.SetHelpId( TBX_ID_LIST, HID_GALLERY_LISTVIEW ); + // FIXME: HELPID + maViewBox.SetHelpId( TBX_ID_LIST, ""/*HID_GALLERY_LISTVIEW*/ ); maViewBox.SetQuickHelpText( TBX_ID_LIST, String( GAL_RESID( RID_SVXSTR_GALLERY_LISTVIEW ) ) ); maViewBox.SetBorder( 0, 1 ); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 8022cecc0fbe..ccfb931f2d29 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -61,7 +61,8 @@ GalleryPreview::GalleryPreview( GalleryBrowser2* pParent, GalleryTheme* pTheme ) DragSourceHelper( this ), mpTheme( pTheme ) { - SetHelpId( HID_GALLERY_WINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); InitSettings(); } @@ -73,7 +74,8 @@ GalleryPreview::GalleryPreview( Window* pParent, const ResId & rResId ) : DragSourceHelper( this ), mpTheme( NULL ) { - SetHelpId( HID_GALLERY_PREVIEW ); + // FIXME: HELPID + SetHelpId( ""/*HID_GALLERY_PREVIEW*/ ); InitSettings(); } @@ -309,7 +311,8 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme { EnableFullItemMode( FALSE ); - SetHelpId( HID_GALLERY_WINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); InitSettings(); SetExtraSpacing( 2 ); SetItemWidth( S_THUMB + 6 ); @@ -475,7 +478,8 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme mnCurRow( 0 ), mbInit( FALSE ) { - SetHelpId( HID_GALLERY_WINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); InitSettings(); diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 241ffeb8bc36..676c8b0dc842 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -57,7 +57,8 @@ SvxInsertStatusBarControl::SvxInsertStatusBarControl( USHORT _nSlotId, SfxStatusBarControl( _nSlotId, _nId, rStb ), bInsert( TRUE ) { - rStb.SetHelpId( _nId, _nSlotId ); + // FIXME: HELPID + rStb.SetHelpId( _nId, ""/*_nSlotId*/ ); } // ----------------------------------------------------------------------- diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index edb72ab05eac..fbcb925fd579 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -233,7 +233,8 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, // da Kombi-Controller, immer die aktuelle Id als HelpId setzen // gecachten HelpText vorher l"oschen GetStatusBar().SetHelpText( GetId(), String() ); - GetStatusBar().SetHelpId( GetId(), nSID ); + // FIXME: HELPID + GetStatusBar().SetHelpId( GetId(), ""/*nSID*/ ); if ( nSID == SID_PSZ_FUNCTION ) { diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 06d1e9642b9e..130817432e7f 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -111,7 +111,8 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con { GetStatusBar().SetHelpText( GetId(), String() );// necessary ? - GetStatusBar().SetHelpId( GetId(), nSID ); // necessary ? + // FIXME: HELPID + GetStatusBar().SetHelpId( GetId(), ""/*nSID*/ ); // necessary ? if( SFX_ITEM_AVAILABLE != eState ) { diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index a4cab5f3ef16..c9374ab27fb6 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -111,7 +111,8 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( void ExtrusionDirectionWindow::implInit() { - SetHelpId( HID_POPUP_EXTRUSION_DIRECTION ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_EXTRUSION_DIRECTION*/ ); USHORT i; for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) @@ -124,12 +125,15 @@ void ExtrusionDirectionWindow::implInit() // mpProjectionForewarder = new SfxStatusForwarder( SID_EXTRUSION_PROJECTION, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_DIRECTION*/ ); mpMenu->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); mpDirectionSet = new ValueSet( mpMenu, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); - mpDirectionSet->SetHelpId( HID_VALUESET_EXTRUSION_DIRECTION ); + // FIXME: HELPID + mpDirectionSet->SetHelpId( ""/*HID_VALUESET_EXTRUSION_DIRECTION*/ ); - mpDirectionSet->SetHelpId( HID_POPUP_LINEEND_CTRL ); + // FIXME: HELPID + mpDirectionSet->SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); mpDirectionSet->SetColCount( 3 ); mpDirectionSet->EnableFullItemMode( FALSE ); @@ -501,13 +505,15 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( USHORT nId, void ExtrusionDepthWindow::implInit() { - SetHelpId( HID_POPUP_EXTRUSION_DEPTH ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_EXTRUSION_DEPTH*/ ); // mpDepthForewarder = new SfxStatusForwarder( SID_EXTRUSION_DEPTH, *this ); // mpMetricForewarder = new SfxStatusForwarder( SID_ATTR_METRIC, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_MENU_EXTRUSION_DEPTH ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_DEPTH*/ ); mpMenu->SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) ); @@ -848,7 +854,8 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( void ExtrusionLightingWindow::implInit() { - SetHelpId( HID_POPUP_EXTRUSION_LIGHTING ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_EXTRUSION_LIGHTING*/ ); USHORT i; for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ ) @@ -868,13 +875,16 @@ void ExtrusionLightingWindow::implInit() // mpLightingIntensityForewarder = new SfxStatusForwarder( SID_EXTRUSION_LIGHTING_INTENSITY, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_MENU_EXTRUSION_LIGHTING ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_LIGHTING*/ ); mpMenu->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) ); mpLightingSet = new ValueSet( mpMenu, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); - mpLightingSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); + // FIXME: HELPID + mpLightingSet->SetHelpId( ""/*HID_VALUESET_EXTRUSION_LIGHTING*/ ); - mpLightingSet->SetHelpId( HID_POPUP_LINEEND_CTRL ); + // FIXME: HELPID + mpLightingSet->SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) ); mpLightingSet->SetColCount( 3 ); mpLightingSet->EnableFullItemMode( FALSE ); @@ -1226,14 +1236,16 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( void ExtrusionSurfaceWindow::implInit() { - SetHelpId( HID_POPUP_EXTRUSION_SURFACE ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_EXTRUSION_SURFACE*/ ); bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); // mpSurfaceForewarder = new SfxStatusForwarder( SID_EXTRUSION_SURFACE, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_MENU_EXTRUSION_SURFACE ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_SURFACE*/ ); mpMenu->SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), bHighContrast ? maImgSurface1h : maImgSurface1 ); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 31c77e221d62..5a16fc41e90b 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -504,8 +504,10 @@ Window* SvxFillToolBoxControl::CreateItemWindow( Window *pParent ) pFillAttrLB = (SvxFillAttrBox*)pFillControl->pLbFillAttr; pFillTypeLB = (SvxFillTypeBox*)pFillControl->pLbFillType; - pFillAttrLB->SetUniqueId( HID_FILL_ATTR_LISTBOX ); - pFillTypeLB->SetUniqueId( HID_FILL_TYPE_LISTBOX ); + // FIXME: HELPID + pFillAttrLB->SetUniqueId( ""/*HID_FILL_ATTR_LISTBOX*/ ); + // FIXME: HELPID + pFillTypeLB->SetUniqueId( ""/*HID_FILL_TYPE_LISTBOX */); return pFillControl; } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 1b4f89ca1e8c..dbd815ae3d14 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -361,7 +361,8 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( mxFrame( rFrame ), mbPopupMode( true ) { - SetHelpId( HID_WIN_FONTWORK_ALIGN ); + // FIXME: HELPID + SetHelpId( ""/*HID_WIN_FONTWORK_ALIGN*/ ); implInit(); } @@ -386,18 +387,21 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( mxFrame( rFrame ), mbPopupMode( true ) { - SetHelpId( HID_WIN_FONTWORK_ALIGN ); + // FIXME: HELPID + SetHelpId( ""/*HID_WIN_FONTWORK_ALIGN*/ ); implInit(); } void FontWorkAlignmentWindow::implInit() { - SetHelpId( HID_POPUP_FONTWORK_ALIGN ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_FONTWORK_ALIGN*/ ); bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_POPUP_FONTWORK_ALIGN ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_POPUP_FONTWORK_ALIGN*/ ); mpMenu->SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 ); @@ -610,7 +614,8 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( mxFrame( rFrame ), mbPopupMode( true ) { - SetHelpId( HID_WIN_FONTWORK_CHARSPACE ); + // FIXME: HELPID + SetHelpId( ""/*HID_WIN_FONTWORK_CHARSPACE*/ ); implInit(); } @@ -626,18 +631,21 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( mxFrame( rFrame ), mbPopupMode( true ) { - SetHelpId( HID_WIN_FONTWORK_CHARSPACE ); + // FIXME: HELPID + SetHelpId( ""/*HID_WIN_FONTWORK_CHARSPACE*/ ); implInit(); } void FontWorkCharacterSpacingWindow::implInit() { - SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_FONTWORK_CHARSPACE*/ ); // bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - mpMenu->SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); + // FIXME: HELPID + mpMenu->SetHelpId( ""/*HID_POPUP_FONTWORK_CHARSPACE*/ ); mpMenu->SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_RADIOCHECK ); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index fa5ddd579dee..f73e9b756ccf 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -353,8 +353,9 @@ ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OU maImage.Show(); - maField.SetHelpId( nSlotId ); - maField.SetSmartHelpId( SmartId( rCmd )); + // FIXME: HELPID + // maField.SetHelpId( nSlotId ); + maField.SetHelpId( rtl::OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) ); maField.Show(); } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 6deab3eca30b..f3e208f3e6ce 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -423,8 +423,10 @@ void SvxLineEndWindow::implInit() SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem = NULL; - SetHelpId( HID_POPUP_LINEEND ); - aLineEndSet.SetHelpId( HID_POPUP_LINEEND_CTRL ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_LINEEND*/ ); + // FIXME: HELPID + aLineEndSet.SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); if ( pDocSh ) { diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 5c99e84e6a47..6b5998a3f1b9 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -905,8 +905,10 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, lcl_CalcSizeValueSet( *this, aColorSet, aSize12 ); - SetHelpId( HID_POPUP_COLOR ); - aColorSet.SetHelpId( HID_POPUP_COLOR_CTRL ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_COLOR*/ ); + // FIXME: HELPID + aColorSet.SetHelpId( ""/*HID_POPUP_COLOR_CTRL*/ ); SetText( rWndTitle ); aColorSet.Show(); @@ -1090,7 +1092,8 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& lcl_CalcSizeValueSet( *this, aFrameSet,Size( 20, 20 )); - SetHelpId( HID_POPUP_FRAME ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_FRAME*/ ); SetText( SVX_RESSTR(RID_SVXSTR_FRAME) ); aFrameSet.Show(); } @@ -1350,7 +1353,8 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r lcl_CalcSizeValueSet( *this, aLineSet, aBmpSize ); - SetHelpId( HID_POPUP_LINE ); + // FIXME: HELPID + SetHelpId( ""/*HID_POPUP_LINE*/ ); SetText( SVX_RESSTR(RID_SVXSTR_FRAME_STYLE) ); aLineSet.Show(); } diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index dda324cb98d1..97bcf74e6c10 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -485,13 +485,18 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) { FreeResource(); - m_aRB_To_Simplified.SetHelpId( HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED ); - m_aRB_To_Traditional.SetHelpId( HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL ); + // FIXME: HELPID + m_aRB_To_Simplified.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED*/ ); + // FIXME: HELPID + m_aRB_To_Traditional.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL*/ ); - m_aCB_Reverse.SetHelpId( HID_SVX_CHINESE_DICTIONARY_CB_REVERSE ); + // FIXME: HELPID + m_aCB_Reverse.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_CB_REVERSE*/ ); - m_aCT_DictionaryToSimplified.SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED ); - m_aCT_DictionaryToTraditional.SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL ); + // FIXME: HELPID + m_aCT_DictionaryToSimplified.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED*/ ); + // FIXME: HELPID + m_aCT_DictionaryToTraditional.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL*/ ); SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); @@ -578,7 +583,8 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) m_pHeaderBar = m_aCT_DictionaryToSimplified.createHeaderBar( aColumn1, aColumn2, aColumn3, nWidth1, nWidth2, nWidth3 ); if(m_pHeaderBar) - m_pHeaderBar->SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_HEADER ); + // FIXME: HELPID + m_pHeaderBar->SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_HEADER*/ ); long pTabs[] = { 3, 0, nWidth1, nWidth1 + nWidth2 }; m_aCT_DictionaryToSimplified.SetTabs( &pTabs[0], MAP_PIXEL ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index 213ddc22bace..a2f308248224 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -72,9 +72,12 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) { FreeResource(); - m_aRB_To_Simplified.SetHelpId( HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED ); - m_aRB_To_Traditional.SetHelpId( HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL ); - m_aCB_Use_Variants.SetHelpId( HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS ); + // FIXME: HELPID + m_aRB_To_Simplified.SetHelpId( ""/*HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED*/ ); + // FIXME: HELPID + m_aRB_To_Traditional.SetHelpId( ""/*HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL*/ ); + // FIXME: HELPID + m_aCB_Use_Variants.SetHelpId( ""/*HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS*/ ); SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); -- cgit From 383957c96aac78301a126746c14c631314ee6329 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 13:46:22 +0200 Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids --- automation/inc/automation/commtypes.hxx | 3 +- automation/source/inc/cmdbasestream.hxx | 25 +- automation/source/inc/testapp.hxx | 3 +- automation/source/miniapp/testapp.cxx | 3 +- automation/source/server/cmdbasestream.cxx | 28 +- automation/source/server/recorder.cxx | 133 +++++++--- automation/source/server/recorder.hxx | 9 +- automation/source/server/retstrm.cxx | 19 +- automation/source/server/retstrm.hxx | 25 +- automation/source/server/server.cxx | 2 +- automation/source/server/sta_list.cxx | 50 ++-- automation/source/server/statemnt.cxx | 284 ++++++++++++++------- automation/source/server/statemnt.hxx | 27 +- automation/source/testtool/cmdstrm.cxx | 5 +- automation/source/testtool/cretstrm.hxx | 2 +- automation/source/testtool/objtest.cxx | 174 ++++++++++--- automation/source/testtool/objtest.hxx | 25 +- basctl/source/basicide/basdoc.cxx | 3 +- basctl/source/basicide/baside2b.cxx | 18 +- basctl/source/basicide/baside3.cxx | 3 +- basctl/source/basicide/basides1.cxx | 9 +- basctl/source/basicide/bastypes.cxx | 3 +- basctl/source/dlged/managelang.cxx | 3 +- cui/source/customize/cfg.cxx | 43 +++- cui/source/customize/eventdlg.cxx | 3 +- cui/source/customize/macropg.cxx | 6 +- cui/source/dialogs/SpellDialog.cxx | 21 +- cui/source/dialogs/cuigaldlg.cxx | 3 +- cui/source/dialogs/hangulhanjadlg.cxx | 30 ++- cui/source/dialogs/hldoctp.cxx | 3 +- cui/source/dialogs/hlinettp.cxx | 3 +- cui/source/dialogs/hlmailtp.cxx | 3 +- cui/source/dialogs/iconcdlg.cxx | 12 +- cui/source/dialogs/insrc.cxx | 3 +- cui/source/dialogs/linkdlg.cxx | 3 +- cui/source/dialogs/pastedlg.cxx | 6 +- cui/source/dialogs/postdlg.cxx | 12 +- cui/source/factory/dlgfact.cxx | 12 +- cui/source/inc/cfg.hxx | 3 +- cui/source/inc/dlgname.hxx | 3 +- cui/source/options/connpooloptions.cxx | 6 +- cui/source/options/dbregister.cxx | 6 +- cui/source/options/fontsubs.cxx | 3 +- cui/source/options/optcolor.cxx | 12 +- cui/source/options/optfltr.cxx | 3 +- cui/source/options/optjava.cxx | 3 +- cui/source/options/optlingu.cxx | 12 +- cui/source/options/optpath.cxx | 6 +- cui/source/options/treeopt.cxx | 3 +- cui/source/tabpages/autocdlg.cxx | 15 +- cui/source/tabpages/numpages.cxx | 12 +- cui/source/tabpages/tpbitmap.cxx | 9 +- cui/source/tabpages/tpcolor.cxx | 24 +- cui/source/tabpages/tpgradnt.cxx | 6 +- cui/source/tabpages/tphatch.cxx | 6 +- cui/source/tabpages/tplnedef.cxx | 6 +- cui/source/tabpages/tplneend.cxx | 6 +- extensions/source/abpilot/abspilot.cxx | 15 +- extensions/source/bibliography/framectr.cxx | 3 +- extensions/source/bibliography/general.cxx | 3 +- extensions/source/dbpilots/gridwizard.cxx | 12 +- extensions/source/dbpilots/groupboxwiz.cxx | 12 +- extensions/source/dbpilots/listcombowizard.cxx | 12 +- extensions/source/propctrlr/browserline.cxx | 17 +- extensions/source/propctrlr/browserline.hxx | 3 +- extensions/source/propctrlr/pcrcommon.cxx | 7 +- extensions/source/propctrlr/pcrcommon.hxx | 4 +- extensions/source/propctrlr/propcontroller.cxx | 3 +- extensions/source/propctrlr/propertyeditor.cxx | 12 +- extensions/source/propctrlr/propertyeditor.hxx | 3 +- .../source/dialogs/digitalsignaturesdialog.cxx | 3 +- 71 files changed, 842 insertions(+), 430 deletions(-) diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx index ad8443518e85..a5a5437f0343 100644 --- a/automation/inc/automation/commtypes.hxx +++ b/automation/inc/automation/commtypes.hxx @@ -52,6 +52,7 @@ #include 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/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx index d103dd071e43..e192b66ed8b6 100644 --- a/automation/source/inc/cmdbasestream.hxx +++ b/automation/source/inc/cmdbasestream.hxx @@ -38,6 +38,7 @@ #include #include "icommstream.hxx" +#include "rtl/string.hxx" class CmdBaseStream { @@ -48,20 +49,20 @@ 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 ); // 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 ); + 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 +77,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/testapp.hxx b/automation/source/inc/testapp.hxx index 14b9e30362d0..8393019d1605 100644 --- a/automation/source/inc/testapp.hxx +++ b/automation/source/inc/testapp.hxx @@ -30,7 +30,6 @@ #include #include -#include 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/testapp.cxx b/automation/source/miniapp/testapp.cxx index 0a29fcc7e6e1..eec1d8ac837b 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/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx index 718bc52dad70..bd9f429b9e75 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,7 +64,7 @@ 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); @@ -73,7 +73,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr ) 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); @@ -82,7 +82,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_String *pSt 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); @@ -91,7 +91,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool 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); @@ -103,7 +103,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG 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 +112,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 +122,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 +133,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 +143,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 +282,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 +293,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 6c941032f104..06446952f318 100644 --- a/automation/source/server/recorder.cxx +++ b/automation/source/server/recorder.cxx @@ -105,30 +105,34 @@ 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 ); + // FIXME: HELPID + ::comphelper::UiEventsLogger::logVcl( rtl::OStringToOUString( aParentID, RTL_TEXTENCODING_UTF8 ), nVCLWindowType, rtl::OStringToOUString( aID, RTL_TEXTENCODING_UTF8 ), 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 ); + // FIXME: HELPID + ::comphelper::UiEventsLogger::logVcl( rtl::OStringToOUString( aParentID, RTL_TEXTENCODING_UTF8 ), nVCLWindowType, rtl::OStringToOUString( aID, RTL_TEXTENCODING_UTF8 ), aMethod ); } Window* MacroRecorder::GetParentWithID( Window* pThis ) { Window *pOverlap = pThis->GetWindow( WINDOW_OVERLAP ); - while ( pOverlap != pThis && !pThis->GetSmartUniqueOrHelpId().HasAny() && pThis->GET_REAL_PARENT() ) + // FIXME: HELPID + 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 ) { + // FIXME: HELPID 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 +181,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 +197,16 @@ 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(pWin->GetSmartUniqueOrHelpId().GetNum()) ); //GetNum() ULONG != comm_ULONG on 64bit + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), static_cast(pWin->GetUniqueOrHelpId().GetNum()) ); //GetNum() ULONG != comm_ULONG on 64bit + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("SetPage") ); + // FIXME: HELPID + LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("SetPage") ); } break; } @@ -213,12 +221,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Check ); + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Check ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Check") ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Check") ); } } } @@ -243,12 +255,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { + // FIXME: HELPID + #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); } } break; @@ -277,12 +293,16 @@ 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 ) ); + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() ); } break; } @@ -312,13 +332,17 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) Sound::Beep(); else { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 ); + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 ); + #endif bSendData = TRUE; } } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Select"), nPos ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), nPos ); } } } @@ -334,7 +358,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_BUTTON_CLICK: Window* pParent = pWin->GetParent(); BOOL bDone = FALSE; - if ( pParent->IsDialog() && !pWin->GetSmartUniqueOrHelpId().HasAny() ) + // FIXME: HELPID + if ( pParent->IsDialog() && !pWin->GetUniqueOrHelpId().getLength() ) { switch ( pParent->GetType() ) { @@ -373,18 +398,23 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { + // FIXME: HELPID + #if 0 if ( nMethod != M_Click ) - StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( 0 ), nMethod ); + StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( 0 ), nMethod ); else - StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( 0 ), nMethod, (comm_ULONG)nCurrentButtonId ); + StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( 0 ), nMethod, (comm_ULONG)nCurrentButtonId ); + #endif bSendData = TRUE; } if ( m_bLog ) { if ( nMethod != M_Click ) - LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod ); + // FIXME: HELPID + LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); else - LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod, nCurrentButtonId ); + // FIXME: HELPID + LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod, nCurrentButtonId ); bDone = TRUE; } } @@ -403,12 +433,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { + // FIXME: HELPID + #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetSmartUniqueOrHelpId(), nMethod ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); bDone = TRUE; } } @@ -417,16 +451,21 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - if ( !bSendData && pWin->GetSmartUniqueOrHelpId().HasAny() ) + // FIXME: HELPID + if ( !bSendData && pWin->GetUniqueOrHelpId().getLength() ) { + // FIXME: HELPID + #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click ); + #endif bSendData = TRUE; } } if ( m_bLog ) { if ( !bDone ) - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") ); } } break; @@ -480,12 +519,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod ); + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); } } break; @@ -502,12 +545,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_BUTTON_CLICK: if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click ); + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") ); + // FIXME: HELPID + LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") ); } break; /* Keyevent or Timeout @@ -540,12 +587,15 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // compare to 1 for floating ToolBoxes if ( m_bRecord ) { - if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) ) + // FIXME: HELPID + #if 0 + 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, rtl::OString( 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(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), static_cast(pTB->GetHelpId( pTB->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit + #endif bSendData = TRUE; } /* not needed if ( m_bLog ) @@ -566,7 +616,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(pActionParent->GetHelpId( pActionParent->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit @@ -574,7 +624,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(), rtl::OString( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), CUniString("TearOff") ); // } // } // pActionParent = NULL; @@ -676,11 +726,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) Window *pIdWin = GetParentWithID( pWin ); if ( pIdWin != pWin ) bKeyFollowFocus = TRUE; - aKeyUniqueID = pIdWin->GetSmartUniqueOrHelpId(); + // FIXME: HELPID + 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 +1075,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { if ( m_bRecord ) { - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), M_SetText, aEditModifyString ); + // FIXME: HELPID + #if 0 + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), M_SetText, aEditModifyString ); + #endif bSendData = TRUE; } if ( m_bLog ) { - LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Modify") ); + // FIXME: HELPID + 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 baa6355848ff..5a409513cacc 100644 --- a/automation/source/server/recorder.hxx +++ b/automation/source/server/recorder.hxx @@ -27,7 +27,6 @@ #include #include -#include #include 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 13a9e9b72258..36c783fe7fbd 100644 --- a/automation/source/server/retstrm.cxx +++ b/automation/source/server/retstrm.cxx @@ -47,17 +47,17 @@ 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 ) +void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, SbxValue &aValue ) { Write(USHORT(SIReturn)); Write(nRet); @@ -66,17 +66,17 @@ void RetStream::GenReturn ( USHORT nRet, SmartId aUId, SbxValue &aValue ) 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 ) +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 ); } @@ -93,9 +93,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." ); + // FIXME: HELPID + #if 0 + DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "rtl::OString contains Number and String. using String only." ); if ( pId->HasString() ) { String aTmp( pId->GetStr() ); @@ -103,6 +105,7 @@ void RetStream::Write( SmartId* pId ) } else Write( static_cast(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit + #endif } diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx index 888d1717422c..0a340ee41a4a 100644 --- a/automation/source/server/retstrm.hxx +++ b/automation/source/server/retstrm.hxx @@ -28,7 +28,6 @@ #define _RETSTRM_HXX #include -#include #include "cmdbasestream.hxx" class SvStream; @@ -43,24 +42,24 @@ public: 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 );} + 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, SbxValue &aValue ); + void GenReturn( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool ); // 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 +74,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 e4e59251dd63..5a27e2b3b71b 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 diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index 7f346c298563..f87746eb7988 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -77,15 +77,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# +rtl::OString StatementList::aSubMenuId1 = rtl::OString(); // Untermenüs bei PopupMenus +rtl::OString StatementList::aSubMenuId2 = rtl::OString(); // erstmal 2-Stufig +rtl::OString StatementList::aSubMenuId3 = rtl::OString(); // and now even 3 levels #i31512# SystemWindow *StatementList::pMenuWindow = NULL; TTProperties *StatementList::pTTProperties = NULL; @@ -129,7 +129,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( "4321" ) && pWin->GetUniqueId().equals( "1234" )) /* UniString GEN_RES_STR0( ULONG nResId ) { return ResString( nResId ); } @@ -154,7 +155,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, rtl::OString(), CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") ); #endif pCurrentProfileStatement = this; } @@ -170,18 +171,18 @@ void StatementList::SendProfile( String aText ) pProfiler->EndProfileInterval(); if ( pProfiler->IsProfilingPerCommand() ) - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileLine( aText ) ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileLine( aText ) ); if ( pProfiler->IsPartitioning() ) - pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileTime ), static_cast(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit + pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileTime ), static_cast(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit } if ( pProfiler->IsAutoProfiling() ) - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() ); #if OSL_DEBUG_LEVEL > 1 if ( pCurrentProfileStatement == NULL ) - pRet->GenReturn( RET_ProfileInfo, SmartId(), CUniString("SendProfile ohne InitProfile\n") ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), CUniString("SendProfile ohne InitProfile\n") ); #endif pCurrentProfileStatement = NULL; } @@ -389,7 +390,9 @@ Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL May BOOL SearchUID::IsWinOK( Window *pWin ) { - if ( aUId.Matches( pWin->GetSmartUniqueOrHelpId() ) ) + // FIXME: HELPID + #if 0 + if ( aUId.Matches( pWin->GetUniqueOrHelpId() ) ) { if ( ( pWin->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pWin->IsVisible() ) return TRUE; @@ -451,10 +454,11 @@ BOOL SearchUID::IsWinOK( Window *pWin ) return FALSE; } else + #endif return FALSE; } -Window* StatementList::SearchTree( SmartId aUId ,BOOL bSearchButtonOnToolbox ) +Window* StatementList::SearchTree( rtl::OString aUId ,BOOL bSearchButtonOnToolbox ) { SearchUID aSearch(aUId,bSearchButtonOnToolbox); @@ -973,7 +977,8 @@ String StatementList::ClientTree(Window *pBase, int Indent) WRITE(sIndent); WRITEc("UId : "); - WRITE(UIdString(pBase->GetSmartUniqueOrHelpId())); + // FIXME: HELPID + WRITE(String(rtl::OStringToOUString(pBase->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8))); WRITEc(":0x"); WRITE( String::CreateFromInt64( @@ -1038,10 +1043,11 @@ 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); + // FIXME: HELPID + pWindowWaitPointer->SetHelpId(aWindowWaitOldHelpId); + pWindowWaitPointer->SetUniqueId(aWindowWaitOldUniqueId); - aWindowWaitUId = SmartId(); + aWindowWaitUId = rtl::OString(); pWindowWaitPointer = NULL; StartTime = Time(0L); return TRUE; @@ -1050,7 +1056,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 @@ -1061,10 +1067,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; @@ -1078,7 +1084,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, rtl::OString(nType), aMessage ); } diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 68ff61bbaa0d..f4a2ed5ddd4b 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -152,13 +152,14 @@ pfunc_osl_printDebugMessage StatementCommand::pOriginal_osl_DebugMessageFunc = N #define RESET_APPLICATION_TO_BACKING_WINDOW +// FIXME: HELPID #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("4321") ); \ + pWin->SetUniqueId( rtl::OString("1234") ); // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -299,8 +300,10 @@ BOOL StatementFlow::Execute() // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // neue Hilfsfunktion, die stetig erweitert werden muss -static short ImpGetRType( Window *pWin, SmartId aUId ) +static short ImpGetRType( Window *pWin, rtl::OString aUId ) { + // FIXME: HELPID + #if 0 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" ); @@ -322,6 +325,9 @@ static short ImpGetRType( Window *pWin, SmartId aUId ) #endif } } + #else + short nRT = 0; + #endif #ifdef DBG_UTIL short n = nRT; @@ -588,9 +594,9 @@ BOOL StatementSlot::Execute() if ( !bMenuClosed ) { pPopup->EndExecute(0); - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; bMenuClosed = TRUE; #if OSL_DEBUG_LEVEL > 1 @@ -712,12 +718,12 @@ BOOL StatementSlot::Execute() { case TT_PR_ERR_NODISPATCHER: { - ReportError( SmartId(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED_NO_DISPATCHER ) ); + ReportError( rtl::OString(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(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) ); } break; } @@ -769,7 +775,7 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, , bBool2(FALSE) { QueStatement( pAfterThis ); - aSmartMethodId = SmartId( nMethodId ); + aSmartMethodId = rtl::OString( nMethodId ); #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Directly adding Conmmand:" ); @@ -806,7 +812,7 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) { QueStatement( NULL ); pCmdIn->Read( nMethodId ); - aSmartMethodId = SmartId( nMethodId ); + aSmartMethodId = rtl::OString( nMethodId ); pCmdIn->Read( nParams ); if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nNr1 ); @@ -863,7 +869,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 ); { // Klammerung, so daß der String nicht während der Rekursion bestehen bleibt String aName; @@ -933,8 +939,12 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst break; default: - if ( pBase->GetSmartUniqueOrHelpId().Equals( SmartId() ) && !( nConf & DH_MODE_ALLWIN ) ) + // FIXME: HELPID + #if 0 + if ( pBase->GetSmartUniqueOrHelpId().Equals( rtl::OString() ) && !( nConf & DH_MODE_ALLWIN ) ) bSkip = TRUE; + #endif + break; } if ( !bSkip ) @@ -962,13 +972,16 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst aTypeSuffix.AppendAscii( "/Unknown", 8 ); } - SmartId aId = pBase->GetSmartUniqueOrHelpId(); + // FIXME: HELPID + rtl::OString aId = pBase->GetUniqueOrHelpId(); + #if 0 if ( aId.HasString() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( aId.GetStr() ), (comm_ULONG)pBase->GetType(), + pRet->GenReturn ( RET_WinInfo, rtl::OString( 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(), + pRet->GenReturn ( RET_WinInfo, rtl::OString( aId.GetNum() ), (comm_ULONG)pBase->GetType(), TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE ); + #endif if ( pBase->GetType() == WINDOW_TOOLBOX ) // Buttons und Controls auf Toolboxen. @@ -989,26 +1002,32 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst pItemWin = pTB->GetItemWindow( pTB->GetItemId( i ) ); if ( pTB->GetItemType( i ) == TOOLBOXITEM_BUTTON && ( !pItemWin || !pItemWin->IsVisible() ) ) { + // FIXME: HELPID + #if 0 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, rtl::OString( 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, rtl::OString( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON, TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), FALSE ); + #endif } else { if ( pItemWin ) { + // FIXME: HELPID + #if 0 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, rtl::OString( 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, rtl::OString( 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++ ) WriteControlData( pItemWin->GetChild(ii), nConf, FALSE ); + #endif } else { @@ -1035,12 +1054,15 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst default: DBG_ERROR1( "Unknown TOOLBOXITEM %i", pTB->GetItemType( i ) ); } + // FIXME: HELPID + #if 0 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, rtl::OString( 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, rtl::OString( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE, aToolBoxItemType.AppendAscii(": ").Append(aName), FALSE ); + #endif } } } @@ -1090,9 +1112,12 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst break; } - pRet->GenReturn ( RET_WinInfo, SmartId( aID ), (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(), // So daß der Text angezeigt wird! + // FIXME: HELPID + #if 0 + pRet->GenReturn ( RET_WinInfo, rtl::OString( 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 ); + #endif } return; // ButtonDialog ist hier schon komplett abgehandelt. @@ -1138,12 +1163,15 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst default: DBG_ERROR1( "Unknown MENUITEM %i", pMenu->GetItemType( i ) ); } + // FIXME: HELPID + #if 0 if ( pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, SmartId( pMenu->GetItemCommand(nID) ), (comm_ULONG)0, + pRet->GenReturn ( RET_WinInfo, rtl::OString( 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( nID ), (comm_ULONG)0, aMenuItemType.AppendAscii(": ").Append(aName), FALSE ); + #endif } } @@ -1559,12 +1587,15 @@ BOOL StatementCommand::DisplayHID() if ( GetTTSettings()->Act ) { SET_WIN(GetTTSettings()->Act); + // FIXME: HELPID + #if 0 GetTTSettings()->pDisplayHidWin->SetDisplayText(GetTTSettings()->Act->GetSmartUniqueOrHelpId().GetText().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())); else GetTTSettings()->pDisplayHidWin->SetText( GetTTSettings()->aOriginalCaption ); + #endif } else GetTTSettings()->pDisplayHidWin->SetDisplayText(CUniString("Kein Window/Control gefunden")); @@ -1574,8 +1605,11 @@ BOOL StatementCommand::DisplayHID() // SET_WIN(GetTTSettings()->Act); if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().Len() > 0 ) { - GetTTSettings()->Act->SetSmartUniqueId( SmartId( GetTTSettings()->pDisplayHidWin->GetDisplayText().ToInt32() ) ); + // FIXME: HELPID + #if 0 + GetTTSettings()->Act->SetSmartUniqueId( rtl::OString( GetTTSettings()->pDisplayHidWin->GetDisplayText().ToInt32() ) ); GetTTSettings()->pDisplayHidWin->ClearDisplayTextModified(); + #endif } } /* if ( Application::GetLastInputInterval() > 5000 ) // 5 Sekunden lang nix geschehen @@ -2113,7 +2147,7 @@ void StatementCommand::Translate() if( (nParams & PARAM_ULONG_1) && nLNr1 ) { String aDouble; - Window *pWin = SearchTree( SmartId( nLNr1 ) ,FALSE ); + Window *pWin = SearchTree( rtl::OString( nLNr1 ) ,FALSE ); if ( pWin ) { pWin = pWin->GetWindow( WINDOW_OVERLAP ); @@ -2152,14 +2186,16 @@ 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 ) + // FIXME: HELPID + while ( IsDialog( pNew ) && !pNew->GetUniqueOrHelpId().getLength() && pNew->GetChildCount() == 1 ) pNew = pNew->GetChild( 0 ); pTranslationWindow = pNew; } aTranslation = CUniString("0;"); - aTranslation += pTranslationWindow->GetSmartUniqueOrHelpId().GetText(); + // FIXME: HELPID + aTranslation += String(rtl::OStringToOUString( pTranslationWindow->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8 )); aTranslation += ';'; aTranslation += TypeString( pTranslationWindow->GetType() ); @@ -2173,7 +2209,8 @@ void StatementCommand::Translate() if ( pParentDialog ) { - aTranslation += pParentDialog->GetSmartUniqueOrHelpId().GetText(); + // FIXME: HELPID + aTranslation += String(rtl::OStringToOUString(pParentDialog->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8)); aTranslation += ';'; aTranslation += TypeString( pParentDialog->GetType() ); } @@ -2334,10 +2371,11 @@ BOOL StatementCommand::Execute() +// FIXME: HELPID #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( rtl::OStringToOUString( pControl->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8) ) ); #else #define REPORT_WIN_CLOSED(pControl, aInfo) _REPORT_WIN_CLOSED(pControl, aInfo) #endif @@ -2345,6 +2383,7 @@ BOOL StatementCommand::Execute() #define REPORT_WIN_CLOSEDc(pControl, aInfo ) \ REPORT_WIN_CLOSED(pControl, CUniString(aInfo) ) +// FIXME: HELPID #define _REPORT_WIN_CLOSED(pControl, aInfo) \ if ( aString1.Len() ) \ aString1 += '\n'; \ @@ -2354,7 +2393,7 @@ BOOL StatementCommand::Execute() aString1.AppendAscii("\" geschlossen, RType = ");\ aString1 += TypeString(pControl->GetType()); \ aString1.AppendAscii(", UId = "); \ - aString1 += UIdString(pControl->GetSmartUniqueOrHelpId()); + aString1 += String(rtl::OStringToOUString(pControl->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8)); switch ( nMethodId ) @@ -2387,9 +2426,9 @@ BOOL StatementCommand::Execute() bCatchGPF = TRUE; bUsePostEvents = TRUE; - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; } if ( !nRetryCount ) @@ -2410,12 +2449,14 @@ BOOL StatementCommand::Execute() && pControl->GetType() != WINDOW_BORDERWINDOW && nRetryCount-- ) { - short nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() ); + // FIXME: HELPID + short nRT = ImpGetRType( pControl, pControl->GetUniqueOrHelpId() ); 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() ); + // FIXME: HELPID + nRT = ImpGetRType( pControl, pControl->GetUniqueOrHelpId() ); } switch( nRT ) @@ -2692,7 +2733,12 @@ BOOL StatementCommand::Execute() else if ( !IsDialog(pWin) ) ReportError( GEN_RES_STR0( S_NO_DIALOG_IN_GETACTIVE ) ); else - pRet->GenReturn( RET_Value, aSmartMethodId, static_cast(pWin->GetSmartUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit + { + // FIXME: HELPID + #if 0 + pRet->GenReturn( RET_Value, aSmartMethodId, static_cast(pWin->GetUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit + #endif + } } break; case RC_UseBindings: @@ -2725,7 +2771,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, rtl::OString(), pProfiler->GetProfileHeader() ); } else if ( nParams & PARAM_USHORT_1 ) { // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr] @@ -2738,32 +2784,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, rtl::OString( 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, rtl::OString( S_ProfileBorder1 ), (comm_ULONG)nNr1 ); }; + if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileBorder2 ), (comm_ULONG)nNr2 ); }; + if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileBorder3 ), (comm_ULONG)nNr3 ); }; + if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, rtl::OString( 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, rtl::OString(), aString1 ); } else { // Normales Profiling je Kommando: profile if ( pProfiler->IsAutoProfiling() ) { - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() ); pProfiler->StopAutoProfiling(); } pProfiler->StartProfilingPerCommand(); // Der Header ist abhängig vom Modus - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileHeader() ); } } else // Profiling wieder ausschalten: Profile false @@ -2774,13 +2820,13 @@ BOOL StatementCommand::Execute() if ( pProfiler->IsAutoProfiling() ) { - pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() ); pProfiler->StopAutoProfiling(); } if ( pProfiler->IsPartitioning() ) { - pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileDump ), (comm_ULONG)0 ); + pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileDump ), (comm_ULONG)0 ); pProfiler->StopPartitioning(); } @@ -2944,12 +2990,15 @@ BOOL StatementCommand::Execute() { if ( pMenu->GetPopupMenu(nNr1) ) { + // FIXME: HELPID + #if 0 if ( !aSubMenuId1.GetNum() ) - aSubMenuId1 = SmartId(nNr1); + aSubMenuId1 = rtl::OString(nNr1); else if ( !aSubMenuId2.GetNum() ) - aSubMenuId2 = SmartId(nNr1); + aSubMenuId2 = rtl::OString(nNr1); else if ( !aSubMenuId3.GetNum() ) - aSubMenuId3 = SmartId(nNr1); + aSubMenuId3 = rtl::OString(nNr1); + #endif if ( pPopup ) pPopup->SelectEntry(nNr1); @@ -2961,17 +3010,17 @@ BOOL StatementCommand::Execute() if ( pPopup ) { pPopup->EndExecute(nNr1); - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; } else { pMenuBar->SelectEntry(nNr1); - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; } } @@ -3582,13 +3631,14 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType ) { comm_ULONG nId; pCmdIn->Read( nId ); - aUId = SmartId( nId ); + aUId = rtl::OString( nId ); } else if ( nControlIdType == SIStringControl ) { String aId; pCmdIn->Read( aId ); - aUId = SmartId( aId ); + // FIXME: HELPID + aUId = rtl::OUStringToOString( aId, RTL_TEXTENCODING_UTF8 ); } else { @@ -3697,11 +3747,14 @@ static Window*ImpGetButton( Window *pBase, WinBits nMask, WinBits nWinBits ) BOOL StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung ) { + // FIXME: HELPID + #if 0 if ( pControl && ( ( ( IsAccessable(pControl) || (nMethodId & M_WITH_RETURN) ) && pControl->IsVisible() ) || aUId.Matches( UID_ACTIVE ) ) ) return TRUE; else + #endif { UniString aBezeichnung( cBezeichnung, RTL_TEXTENCODING_ASCII_US ); if ( aBezeichnung.Len() > 0 ) @@ -3722,7 +3775,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 ) @@ -3756,6 +3809,8 @@ USHORT StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, if ( !pMenu ) return 1; + // FIXME: HELPID + #if 0 if ( aSubMenuId1.GetNum() ) { pPopup = pMenu->GetPopupMenu( @@ -3776,6 +3831,7 @@ USHORT StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, sal::static_int_cast< USHORT >(aSubMenuId3.GetNum())); pMenu = pPopup; } + #endif return 0; } @@ -4016,7 +4072,10 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) default: return FALSE; } + // FIXME: HELPID + #if 0 SendProfile( UIdString( aUId ).Append('.').Append( MethodString( nMethodId ) ) ); + #endif return TRUE; } return FALSE; @@ -4301,9 +4360,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; case M_OpenContextMenu: { - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; Point aPos; ToolBox* pTB = (ToolBox*)pControl; @@ -4337,9 +4396,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; case M_UseMenu: { - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; while ( pControl && !( ( pControl->GetType() == WINDOW_SYSWINDOW || pControl->GetType() == WINDOW_WORKWINDOW ) && ControlOK( pControl, "" ) ) ) @@ -4430,7 +4489,10 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) default: ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); } + // FIXME: HELPID + #if 0 SendProfile( UIdString( aUId ).Append('.').Append( MethodString( nMethodId ) ) ); + #endif } break; case M_StatusGetText: @@ -4585,9 +4647,12 @@ BOOL StatementControl::Execute() #endif + // FIXME: HELPID + #if 0 if ( aUId.Matches( UID_ACTIVE ) ) pControl = GetAnyActive(); else + #endif { BOOL bSearchButtonOnToolbox = (nParams == PARAM_NONE) && ((M_Click == nMethodId) || (M_TearOff == nMethodId) || (M_IsEnabled == nMethodId) || (M_OpenMenu == nMethodId)); bSearchButtonOnToolbox |= (nParams == PARAM_USHORT_1) && (M_GetState == nMethodId); @@ -4606,6 +4671,8 @@ BOOL StatementControl::Execute() if ( pControl && pControl->GetType() == WINDOW_TOOLBOX ) { + // FIXME: HELPID + #if 0 if ( !aUId.Matches( pControl->GetSmartUniqueOrHelpId() ) ) { // Also wenn wir irgendwas auf einer Toolbox gefunden haben switch ( nMethodId ) @@ -4622,6 +4689,7 @@ BOOL StatementControl::Execute() pControl = NULL; } } + #endif } @@ -4808,22 +4876,27 @@ BOOL StatementControl::Execute() } break; case M_GetPage: + // FIXME: HELPID + #if 0 pRet->GenReturn ( RET_Value, aUId, ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetSmartUniqueOrHelpId().GetText()); + #endif break; case M_SetPage : { // Wegen lokaler Variablen + // FIXME: HELPID + #if 0 TabControl *pTControl = ((TabControl*)pControl); USHORT nActive = pTControl->GetCurPageId(); USHORT i,anz; - SmartId aID; - SmartId aWantedID; + rtl::OString aID; + rtl::OString aWantedID; if ( (nParams & PARAM_ULONG_1) ) { - aWantedID = SmartId( nLNr1 ); + aWantedID = rtl::OString( nLNr1 ); } else if ( (nParams & PARAM_STR_1) ) { - aWantedID = SmartId( aString1 ); + aWantedID = rtl::OString( aString1 ); } else ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); @@ -4852,6 +4925,7 @@ BOOL StatementControl::Execute() pTControl->ActivatePage();*/ ReportError( aWantedID, GEN_RES_STR1( S_TABPAGE_NOT_FOUND, MethodString( nMethodId ) ) ); } + #endif } break; default: @@ -5279,9 +5353,9 @@ BOOL StatementControl::Execute() ImplMouseButtonUp ( pControl, aMEvnt, FORCE_DIRECT_CALL ); - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; } break; @@ -5293,7 +5367,9 @@ BOOL StatementControl::Execute() case C_ToolBox: { ToolBox *pTB = ((ToolBox*)pControl); - if ( !aUId.Matches( pTB->GetSmartUniqueOrHelpId() ) ) // Also Button auf der ToolBox gefunden + // FIXME: HELPID + #if 0 + if ( !aUId.Matches( pTB->GetUniqueOrHelpId() ) ) // Also Button auf der ToolBox gefunden { if ( (nParams == PARAM_NONE) || (nParams == PARAM_USHORT_1) ) { // Wir fälschen einen Parameter @@ -5312,19 +5388,21 @@ BOOL StatementControl::Execute() else ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); } + #endif +// FIXME: HELPID #define FIND_ITEM\ USHORT nItemPos = 0;\ BOOL bItemFound = FALSE;\ {\ - SmartId aButtonId;\ + rtl::OString aButtonId;\ if( nParams == PARAM_STR_1 )\ - aButtonId = SmartId( aString1 );\ + aButtonId = rtl::OString( rtl::OUStringToOString( aString1, RTL_TEXTENCODING_UTF8 ) );\ 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 = rtl::OString( ""/*nLNr1*/ );\ + for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && 1/*!aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos)))*/ &&\ + 1/*!aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos)))*/ ; nItemPos++ ) {}\ + bItemFound = 1/*aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos)))*/ || 1/*aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos)))*/;\ if ( !bItemFound )\ ReportError( aUId, GEN_RES_STR1( S_HELPID_ON_TOOLBOX_NOT_FOUND, MethodString( nMethodId ) ) );\ else\ @@ -5386,9 +5464,9 @@ BOOL StatementControl::Execute() MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT); ImplMouseButtonDown( pTB, aMEvnt );*/ - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; new StatementCommand( this, RC_MenuSelect, PARAM_USHORT_1, pTB->GetItemId(nItemPos) + TOOLBOX_MENUITEM_START ); @@ -5451,9 +5529,9 @@ BOOL StatementControl::Execute() ImplMouseButtonUp( pTB, aMEvnt); // Das Fenster ist offen. - aSubMenuId1 = SmartId(); - aSubMenuId2 = SmartId(); - aSubMenuId3 = SmartId(); + aSubMenuId1 = rtl::OString(); + aSubMenuId2 = rtl::OString(); + aSubMenuId3 = rtl::OString(); pMenuWindow = NULL; } } @@ -5475,7 +5553,10 @@ BOOL StatementControl::Execute() switch (nNr1) { case 0: + // FIXME: HELPID + #if 0 pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetHelpId(pTB->GetItemId(nItemPos))); + #endif break; case 1: pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemType(nItemPos)); @@ -6194,7 +6275,10 @@ protected: break; case M_Close: //aWindowWaitUId = aUId; - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + // FIXME: HELPID + #if 0 + DBG_ASSERT( aUId.Matches( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + #endif SET_WINP_CLOSING(pControl); ((DockingWindow*)pControl)->Close(); break; @@ -6270,7 +6354,10 @@ protected: break; } case M_Close: - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + // FIXME_ HELPID + #if 0 + DBG_ASSERT( aUId.Matches( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + #endif SET_WINP_CLOSING(pControl); ((FloatingWindow*)pControl)->Close(); break; @@ -6293,7 +6380,10 @@ protected: AnimateMouse( pControl, MitteOben); break; case M_Close: + // FIXME: HELPID + #if 0 DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + #endif SET_WINP_CLOSING(pControl); ((SystemWindow*)pControl)->Close(); break; @@ -6302,7 +6392,10 @@ protected: Window *pChild = GetWinByRT( pControl, WINDOW_OKBUTTON ); if( ControlOK( pChild, "OK Button" ) ) { + // FIXME: HELPID + #if 0 DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + #endif SET_WINP_CLOSING(pControl); ((Button*)pChild)->Click(); } @@ -6313,7 +6406,10 @@ protected: Window *pChild = GetWinByRT( pControl, WINDOW_CANCELBUTTON ); if( ControlOK( pChild, "Cancel Button" ) ) { + // FIXME: HELPID + #if 0 DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + #endif SET_WINP_CLOSING(pControl); ((Button*)pChild)->Click(); } @@ -6350,7 +6446,10 @@ protected: AnimateMouse( pControl, MitteOben); break; case M_Close: + // FIXME: HELPID + #if 0 DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); + #endif SET_WINP_CLOSING(pControl); ((WorkWindow*)pControl)->Close(); break; @@ -6575,7 +6674,10 @@ protected: #endif if ( bStatementDone ) { + // FIXME: HELPID + #if 0 SendProfile( UIdString( aUId ).Append('.').Append( MethodString( nMethodId ) ) ); + #endif delete this; } else diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx index 4e580a09749c..2014e6d3a4fe 100644 --- a/automation/source/server/statemnt.hxx +++ b/automation/source/server/statemnt.hxx @@ -54,7 +54,6 @@ #include #include #include -#include #include 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 rtl::OString aSubMenuId1; // Untermenüs bei PopupMenus + static rtl::OString aSubMenuId2; // erstmal 2-Stufig + static rtl::OString 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,7 @@ class StatementCommand : public StatementList // Befehl ausf friend class ImplRemoteControl; protected: USHORT nMethodId; - SmartId aSmartMethodId; + rtl::OString aSmartMethodId; USHORT nParams; comm_USHORT nNr1,nNr2,nNr3,nNr4; comm_ULONG nLNr1; @@ -385,7 +384,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 +435,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/testtool/cmdstrm.cxx b/automation/source/testtool/cmdstrm.cxx index 4f6d413f4280..a0e50e912498 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 75229bb32cb7..147b04bc0414 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/objtest.cxx b/automation/source/testtool/objtest.cxx index 2361361f277f..779cf32648b2 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 Te 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,10 @@ void ControlDef::Write( SvStream &aStream ) if ( pSons ) for ( USHORT i = 0 ; pSons->Count() > i ; i++ ) ((ControlDef*)(*pSons)[i])->Write(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 +295,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 +310,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 +321,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 +694,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 +879,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 +897,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 +999,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 +1028,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 +1047,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 +1141,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 +1182,7 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName ) } aLongname = aLine.GetToken(0,cMyDelim); - aUId = SmartId( (ULONG)aLine.GetToken(1,cMyDelim).ToInt64() ); + aUId = rtl::OString( (ULONG)aLine.GetToken(1,cMyDelim).ToInt64() ); if ( bSortByName ) pNewItem = new ControlDef( aLongname, aUId ); @@ -1211,7 +1231,7 @@ void ReadFlatArray( const ControlDefLoad arWas [], CNames *&pNames ) while ( String::CreateFromAscii(arWas[nIndex].Kurzname).Len() > 0 ) { - SmartId aUId (arWas[nIndex].nUId); + rtl::OString aUId (arWas[nIndex].nUId); const ControlItem *pX = new ControlDef( arWas[nIndex].Kurzname, aUId); pNames->C40_PTR_INSERT(ControlItem, pX); nIndex++; @@ -1472,7 +1492,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 +1530,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 +1684,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 +2177,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 +2216,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, if ( !IsError() && ((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN ) { pImpl->pNextReturn = ((SbxTransportMethod*)pVar); - aNextReturnId = SmartId( ((SbxTransportMethod*)pVar)->nValue ); + aNextReturnId = rtl::OString( ((SbxTransportMethod*)pVar)->nValue ); } if ( SingleCommandBlock ) EndBlock(); @@ -2266,13 +2289,16 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, { In->GenCmdControl (pMember->GetULong(), (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar); - aNextReturnId = SmartId( pMember->GetULong() ); + 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 +2309,7 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, else { pImpl->pNextReturn = NULL; - aNextReturnId = SmartId(); + aNextReturnId = rtl::OString(); } } @@ -2839,7 +2865,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 +2880,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 +2898,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 +2924,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 +2937,7 @@ SbxVariable* TestToolObj::Find( const String& aStr, SbxClassType aType) pMyVar->SetUserData( ID_UNODispatch ); pMyVar->aUnoSlot = pWhatName->pData->aUId.GetStr(); } + #endif return pMyVar; } @@ -2910,7 +2945,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 +2953,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 +3358,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 +3395,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 +3442,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { case RET_Sequence: { + // FIXME: HELPID + #if 0 ULONG nUId = aUId.GetNum(); if ( nSequence != nUId ) { @@ -3407,6 +3454,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { nClearSequence = nUId; } + #endif } break; case RET_Value: @@ -3415,6 +3463,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) // ULONG nHintUserData = pImpl->pNextReturn->GetParent()->GetUserData(); // pImpl->pNextReturn->GetParent()->SetUserData(0); // if ( nUId == pImpl->pNextReturn->GetParent()->GetULong() ) + // FIXME: HELPID + #if 0 if ( aNextReturnId.Matches( aUId ) ) { if( nParams & PARAM_ULONG_1 ) @@ -3438,6 +3488,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { ADD_ERROR(SbxERR_BAD_ACTION, GEN_RES_STR0(S_RETURNED_VALUE_ID_MISSMATCH) ) } + #endif // pImpl->pNextReturn->GetParent()->SetUserData(nHintUserData); pImpl->pNextReturn = NULL; } @@ -3468,7 +3519,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 +3558,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 +3575,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 +3592,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) delete pNewItem; } } + #endif aWinInfoHdl.Call( pWinInfo ); @@ -3544,6 +3601,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 +3731,13 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) break; } } + #endif } break; case RET_DirectLoging: { + // FIXME: HELPID + #if 0 ULONG nUId = aUId.GetNum(); switch ( nUId ) { @@ -3694,6 +3756,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) default: ; } + #endif } break; case RET_MacroRecorder: @@ -3724,7 +3787,7 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) if ( m_pReverseControls ) { USHORT nNr; - ControlItem *pNewItem = new ControlItemUId( String(), SmartId( nLNr1 ) ); + 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 +4022,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 +4085,14 @@ 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; + #endif } return String(); } @@ -4030,9 +4104,14 @@ 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; + #endif } return CUniString( "UnknownKeyCode" ); } @@ -4061,7 +4140,7 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = bFound = FALSE; if ( aType.CompareTo(UIdKenn) == COMPARE_EQUAL ) { - aResult = pShortNames->GetName(SmartId(nNumber)); + aResult = pShortNames->GetName(rtl::OString(nNumber)); bFound = TRUE; } if ( aType.CompareTo(MethodKenn ) == COMPARE_EQUAL ) @@ -4078,12 +4157,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 +4179,22 @@ 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)); + aResult = pShortNames->GetName(rtl::OString(nNumber)); bFound = TRUE; } if ( aType.CompareTo(TabKenn ) == COMPARE_EQUAL ) @@ -4142,7 +4231,7 @@ SbTextType TestToolObj::GetSymbolType( const String &rSymbol, BOOL bWasControl ) } - ControlDef WhatName( rSymbol, SmartId() ); + ControlDef WhatName( rSymbol, rtl::OString() ); if ( bWasControl ) { @@ -4233,11 +4322,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 d82e4626a4d2..f62d59311024 100644 --- a/automation/source/testtool/objtest.hxx +++ b/automation/source/testtool/objtest.hxx @@ -35,7 +35,6 @@ #include #include "cmdstrm.hxx" #include -#include #include "httprequest.hxx" #include @@ -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/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index cdf4c58015ba..69db90a10024 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -103,7 +103,8 @@ void BasicDocShell::FillStatusBar( StatusBar& rStatusBar ) // signatures rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); - rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); + // FIXME: HELPID + rStatusBar.SetHelpId(SID_SIGNATURE, ""/*SID_SIGNATURE*/); // Position aTmp.Erase(); diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index b6b4accb7dd6..d2b227319e60 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -177,7 +177,8 @@ EditorWindow::EditorWindow( Window* pParent ) : Wallpaper(GetSettings().GetStyleSettings().GetFieldColor())); SetPointer( Pointer( POINTER_TEXT ) ); - SetHelpId( HID_BASICIDE_EDITORWINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_EDITORWINDOW*/ ); pSourceViewConfig->AddListener(this); } @@ -948,7 +949,8 @@ BreakPointWindow::BreakPointWindow( Window* pParent ) : // Falls in EditEngine autom. gescrollt wurde, wuesste ich sonst nicht, // wo ich gerade stehe. - SetHelpId( HID_BASICIDE_BREAKPOINTWINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_BREAKPOINTWINDOW*/ ); } @@ -1187,7 +1189,8 @@ WatchWindow::WatchWindow( Window* pParent ) : nVirtToolBoxHeight = aXEdit.GetSizePixel().Height() + 7; nHeaderBarHeight = 16; - aTreeListBox.SetHelpId(HID_BASICIDE_WATCHWINDOW_LIST); + // FIXME: HELPID + aTreeListBox.SetHelpId(""/*HID_BASICIDE_WATCHWINDOW_LIST*/); aTreeListBox.EnableInplaceEditing( TRUE ); aTreeListBox.SetSelectHdl( LINK( this, WatchWindow, TreeListHdl ) ); aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight + nHeaderBarHeight ) ); @@ -1239,7 +1242,8 @@ WatchWindow::WatchWindow( Window* pParent ) : SetText( String( IDEResId( RID_STR_WATCHNAME ) ) ); - SetHelpId( HID_BASICIDE_WATCHWINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_WATCHWINDOW*/ ); // make watch window keyboard accessible GetSystemWindow()->GetTaskPaneList()->AddWindow( this ); @@ -1522,7 +1526,8 @@ StackWindow::StackWindow( Window* pParent ) : aGotoCallButton( this, IDEResId( RID_IMGBTN_GOTOCALL ) ), aStackStr( IDEResId( RID_STR_STACK ) ) { - aTreeListBox.SetHelpId(HID_BASICIDE_STACKWINDOW_LIST); + // FIXME: HELPID + aTreeListBox.SetHelpId(""/*HID_BASICIDE_STACKWINDOW_LIST*/); aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight ) ); aTreeListBox.SetHighlightRange(); aTreeListBox.SetSelectionMode( NO_SELECTION ); @@ -1531,7 +1536,8 @@ StackWindow::StackWindow( Window* pParent ) : SetText( String( IDEResId( RID_STR_STACKNAME ) ) ); - SetHelpId( HID_BASICIDE_STACKWINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_STACKWINDOW*/ ); aGotoCallButton.SetClickHdl( LINK( this, StackWindow, ButtonHdl ) ); aGotoCallButton.SetPosPixel( Point( DWBORDER, 2 ) ); diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index afbe3daf5be1..9e84a7d36adf 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -124,7 +124,8 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St pEditor->GetModel()->SetNotifyUndoActionHdl( LINK(this, DialogWindow, NotifyUndoActionHdl)); - SetHelpId( HID_BASICIDE_DIALOGWINDOW ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_DIALOGWINDOW*/ ); // set readonly mode for readonly libraries ::rtl::OUString aOULibName( aLibName ); diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 4432de9aa282..7ae1f9528bb2 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -1065,14 +1065,16 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO AdjustPosSizePixel( Point( 0, 0 ), GetViewFrame()->GetWindow().GetOutputSizePixel() ); if( pCurWin->IsA( TYPE( ModulWindow ) ) ) { - GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW ); + // FIXME: HELPID + GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_MODULWINDOW*/ ); pModulLayout->SetModulWindow( (ModulWindow*)pCurWin ); pModulLayout->Show(); } else { pModulLayout->Hide(); - GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_DIALOGWINDOW ); + // FIXME: HELPID + GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_DIALOGWINDOW*/ ); } if ( bRememberAsCurrent ) @@ -1121,7 +1123,8 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO else { SetWindow( pModulLayout ); - GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW ); + // FIXME: HELPID + GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_MODULWINDOW*/ ); SfxObjectShell::SetCurrentComponent( NULL ); } SetUndoManager( pCurWin ? pCurWin->GetUndoManager() : 0 ); diff --git a/basctl/source/basicide/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index af42503a5dae..cd2f155528e0 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -521,7 +521,8 @@ BasicIDETabBar::BasicIDETabBar( Window* pParent ) : { EnableEditMode( TRUE ); - SetHelpId( HID_BASICIDE_TABBAR ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_TABBAR*/ ); } void __EXPORT BasicIDETabBar::MouseButtonDown( const MouseEvent& rMEvt ) diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 41c86699203b..1b39a568b23b 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -323,7 +323,8 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog( Window* pParent, Localizatio if ( m_pLocalizationMgr->isLibraryLocalized() ) { // change to "Add Interface Language" mode - SetHelpId( HID_BASICIDE_ADDNEW_LANGUAGE ); + // FIXME: HELPID + SetHelpId( ""/*HID_BASICIDE_ADDNEW_LANGUAGE*/ ); m_pCheckLangLB = new SvxCheckListBox( this, IDEResId( LB_ADD_LANGUAGE ) ); SetText( String( IDEResId( STR_ADDLANG_TITLE ) ) ); m_aLanguageFT.SetText( String( IDEResId( STR_ADDLANG_LABEL ) ) ); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index d9f730e0224f..154e79811186 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2629,7 +2629,8 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU ); + // FIXME: HELPID + pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_MENU*/ ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) ); bool ret = pNameDialog->Execute(); @@ -2687,7 +2688,8 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_SUBMENU_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU ); + // FIXME: HELPID + pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_NAME_SUBMENU*/ ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_ADD_SUBMENU ) ); bool ret = pNameDialog->Execute(); @@ -2733,7 +2735,8 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM ); + // FIXME: HELPID + pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_MENU_ITEM*/ ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) ); bool ret = pNameDialog->Execute(); @@ -3129,16 +3132,21 @@ SvxConfigEntry::GetHelpText() { if ( aHelpText.getLength() == 0 ) { + #if 0 OUString helpid = OUString::createFromAscii( "helpid:" ); if ( aHelpURL.indexOf( helpid ) != -1 ) { aHelpURL = aHelpURL.copy( helpid.getLength() ); } + #endif Help* pHelp = Application::GetHelp(); + #if 0 if ( aHelpURL.toInt32() != 0 ) + #endif { - aHelpText = pHelp->GetHelpText( aHelpURL.toInt32(), NULL ); + // FIXME: HELPID + aHelpText = pHelp->GetHelpText( aHelpURL/*.toInt32()*/, NULL ); } if ( aHelpText.getLength() == 0 && aCommand.getLength() != 0 ) @@ -3343,19 +3351,26 @@ SvxToolbarConfigPage::SvxToolbarConfigPage( : SvxConfigPage( pParent, rSet ) { - SetHelpId( HID_SVX_CONFIG_TOOLBAR ); + // FIXME: HELPID + SetHelpId( ""/*HID_SVX_CONFIG_TOOLBAR*/ ); aContentsListBox = new SvxToolbarEntriesListBox(this, CUI_RES(BOX_ENTRIES)); FreeResource(); PositionContentsListBox(); aContentsListBox->SetZOrder( &aAddCommandsButton, WINDOW_ZORDER_BEFOR ); - aContentsListBox->SetHelpId( HID_SVX_CONFIG_TOOLBAR_CONTENTS ); - aNewTopLevelButton.SetHelpId( HID_SVX_NEW_TOOLBAR ); - aModifyTopLevelButton.SetHelpId( HID_SVX_MODIFY_TOOLBAR ); - aAddCommandsButton.SetHelpId( HID_SVX_NEW_TOOLBAR_ITEM ); - aModifyCommandButton.SetHelpId( HID_SVX_MODIFY_TOOLBAR_ITEM ); - aSaveInListBox.SetHelpId( HID_SVX_SAVE_IN ); + // FIXME: HELPID + aContentsListBox->SetHelpId( ""/*HID_SVX_CONFIG_TOOLBAR_CONTENTS*/ ); + // FIXME: HELPID + aNewTopLevelButton.SetHelpId( ""/*HID_SVX_NEW_TOOLBAR*/ ); + // FIXME: HELPID + aModifyTopLevelButton.SetHelpId( ""/*HID_SVX_MODIFY_TOOLBAR*/ ); + // FIXME: HELPID + aAddCommandsButton.SetHelpId( ""/*HID_SVX_NEW_TOOLBAR_ITEM*/ ); + // FIXME: HELPID + aModifyCommandButton.SetHelpId( ""/*HID_SVX_MODIFY_TOOLBAR_ITEM*/ ); + // FIXME: HELPID + aSaveInListBox.SetHelpId( ""/*HID_SVX_SAVE_IN*/ ); aTopLevelSeparator.SetText( CUI_RES ( RID_SVXSTR_PRODUCTNAME_TOOLBARS ) ); @@ -3571,7 +3586,8 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR ); + // FIXME: HELPID + pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_TOOLBAR*/ ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) ); bool ret = pNameDialog->Execute(); @@ -3662,7 +3678,8 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM ); + // FIXME: HELPID + pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM*/ ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) ); bool ret = pNameDialog->Execute(); diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 8592dbaded5f..5a6cc5505d94 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -89,7 +89,8 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, // must be done after FreeResource is called InitResources(); - mpImpl->pEventLB->GetListBox().SetHelpId( HID_SVX_MACRO_LB_EVENT ); + // FIXME: HELPID + mpImpl->pEventLB->GetListBox().SetHelpId( ""/*HID_SVX_MACRO_LB_EVENT*/ ); aSaveInListBox.SetSelectHdl( LINK( this, SvxEventConfigPage, SelectHdl_Impl ) ); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index e7d70dd9d396..944fd10f8533 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -170,7 +170,8 @@ _HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) : maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ), maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ) { - maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX ); + // FIXME: HELPID + maListBox.SetHelpId( ""/*HID_MACRO_HEADERTABLISTBOX*/ ); } _HeaderTabListBox::~_HeaderTabListBox() @@ -874,7 +875,8 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram // must be done after FreeResource is called InitResources(); - mpImpl->pEventLB->GetListBox().SetHelpId( HID_SVX_MACRO_LB_EVENT ); + // FIXME: HELPID + mpImpl->pEventLB->GetListBox().SetHelpId( ""/*HID_SVX_MACRO_LB_EVENT*/ ); InitAndSetHandler( xNameReplace, Reference< container::XNameReplace>(0), Reference< util::XModifiable >(0)); DisplayAppEvents(true); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index d243ce96f27c..052809d07bd8 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -249,13 +249,20 @@ SpellDialog::SpellDialog( pImpl = new SpellDialog_Impl; //HelpIds - aClosePB. SetHelpId(HID_SPLDLG_BUTTON_CLOSE ); - aIgnorePB. SetHelpId(HID_SPLDLG_BUTTON_IGNORE ); - aIgnoreAllPB. SetHelpId(HID_SPLDLG_BUTTON_IGNOREALL); - aIgnoreRulePB. SetHelpId(HID_SPLDLG_BUTTON_IGNORERULE); - aChangePB. SetHelpId(HID_SPLDLG_BUTTON_CHANGE ); - aChangeAllPB. SetHelpId(HID_SPLDLG_BUTTON_CHANGEALL); - aExplainPB. SetHelpId(HID_SPLDLG_BUTTON_EXPLAIN ); + // FIXME: HELPID + aClosePB. SetHelpId(""/*HID_SPLDLG_BUTTON_CLOSE*/ ); + // FIXME: HELPID + aIgnorePB. SetHelpId(""/*HID_SPLDLG_BUTTON_IGNORE*/ ); + // FIXME: HELPID + aIgnoreAllPB. SetHelpId(""/*HID_SPLDLG_BUTTON_IGNOREALL*/); + // FIXME: HELPID + aIgnoreRulePB. SetHelpId(""/*HID_SPLDLG_BUTTON_IGNORERULE*/); + // FIXME: HELPID + aChangePB. SetHelpId(""/*HID_SPLDLG_BUTTON_CHANGE*/ ); + // FIXME: HELPID + aChangeAllPB. SetHelpId(""/*HID_SPLDLG_BUTTON_CHANGEALL*/); + // FIXME: HELPID + aExplainPB. SetHelpId(""/*HID_SPLDLG_BUTTON_EXPLAIN*/ ); Init_Impl(); // disable controls if service is missing diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index a205db2a28c9..58962c458281 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -678,7 +678,8 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) String aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); BOOL bReadOnly = pThm->IsReadOnly() && !pThm->IsImported(); - aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME ); + // FIXME: HELPID + aEdtMSName.SetHelpId( ""/*HID_GALLERY_EDIT_MSNAME*/ ); aEdtMSName.SetText( pThm->GetName() ); aEdtMSName.SetReadOnly( bReadOnly ); diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 2198a42c3fcf..f59a64879c87 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -511,9 +511,12 @@ namespace svx } void SuggestionDisplay::SetHelpIds() { - this->SetHelpId( HID_HANGULDLG_SUGGESTIONS ); - m_aValueSet.SetHelpId( HID_HANGULDLG_SUGGESTIONS_GRID ); - m_aListBox.SetHelpId( HID_HANGULDLG_SUGGESTIONS_LIST ); + // FIXME: HELPID + this->SetHelpId( ""/*HID_HANGULDLG_SUGGESTIONS*/ ); + // FIXME: HELPID + m_aValueSet.SetHelpId( ""/*HID_HANGULDLG_SUGGESTIONS_GRID*/ ); + // FIXME: HELPID + m_aListBox.SetHelpId( ""/*HID_HANGULDLG_SUGGESTIONS_LIST*/ ); } //========================================================================= @@ -619,13 +622,20 @@ namespace svx // initial control values m_aSimpleConversion.Check(); - m_pPlayground->GetButton(SvxCommonLinguisticControl::eClose )->SetHelpId(HID_HANGULDLG_BUTTON_CLOSE ); - m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnore )->SetHelpId(HID_HANGULDLG_BUTTON_IGNORE ); - m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnoreAll )->SetHelpId(HID_HANGULDLG_BUTTON_IGNOREALL); - m_pPlayground->GetButton(SvxCommonLinguisticControl::eChange )->SetHelpId(HID_HANGULDLG_BUTTON_CHANGE ); - m_pPlayground->GetButton(SvxCommonLinguisticControl::eChangeAll )->SetHelpId(HID_HANGULDLG_BUTTON_CHANGEALL); - m_pPlayground->GetButton(SvxCommonLinguisticControl::eOptions )->SetHelpId(HID_HANGULDLG_BUTTON_OPTIONS ); - m_pPlayground->GetWordInputControl().SetHelpId(HID_HANGULDLG_EDIT_NEWWORD); + // FIXME: HELPID + m_pPlayground->GetButton(SvxCommonLinguisticControl::eClose )->SetHelpId(""/*HID_HANGULDLG_BUTTON_CLOSE*/ ); + // FIXME: HELPID + m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnore )->SetHelpId(""/*HID_HANGULDLG_BUTTON_IGNORE*/ ); + // FIXME: HELPID + m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnoreAll )->SetHelpId(""/*HID_HANGULDLG_BUTTON_IGNOREALL*/); + // FIXME: HELPID + m_pPlayground->GetButton(SvxCommonLinguisticControl::eChange )->SetHelpId(""/*HID_HANGULDLG_BUTTON_CHANGE*/ ); + // FIXME: HELPID + m_pPlayground->GetButton(SvxCommonLinguisticControl::eChangeAll )->SetHelpId(""/*HID_HANGULDLG_BUTTON_CHANGEALL*/); + // FIXME: HELPID + m_pPlayground->GetButton(SvxCommonLinguisticControl::eOptions )->SetHelpId(""/*HID_HANGULDLG_BUTTON_OPTIONS*/ ); + // FIXME: HELPID + m_pPlayground->GetWordInputControl().SetHelpId(""/*HID_HANGULDLG_EDIT_NEWWORD*/); FreeResource(); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index a87d7710f484..f4f1dfefb352 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -78,7 +78,8 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS maCbbPath.Show(); String aFileScheme( INET_FILE_SCHEME, RTL_TEXTENCODING_ASCII_US ); maCbbPath.SetBaseURL(aFileScheme); - maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH ); + // FIXME: HELPID + maCbbPath.SetHelpId( ""/*HID_HYPERDLG_DOC_PATH*/ ); SetExchangeSupport (); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index 79fde6c7a64c..bc932dba7a78 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -83,7 +83,8 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maCbbTarget.SetPosSizePixel ( LogicToPixel( Point( COL_2, 25 ), MAP_APPFONT ), LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbTarget.Show(); - maCbbTarget.SetHelpId( HID_HYPERDLG_INET_PATH ); + // FIXME: HELPID + maCbbTarget.SetHelpId( ""/*HID_HYPERDLG_INET_PATH*/ ); // Find Path to Std-Doc String aStrBasePaths( SvtPathOptions().GetTemplatePath() ); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index 5ea43e165883..e60716483526 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -74,7 +74,8 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbReceiver.Show(); - maCbbReceiver.SetHelpId( HID_HYPERDLG_MAIL_PATH ); + // FIXME: HELPID + maCbbReceiver.SetHelpId( ""/*HID_HYPERDLG_MAIL_PATH*/ ); SetExchangeSupport (); diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index adea20068499..97d1f83a6dd2 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -300,7 +300,8 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, maIconCtrl.Show(); maIconCtrl.SetChoiceWithCursor ( TRUE ); maIconCtrl.SetSelectionMode( SINGLE_SELECTION ); - maIconCtrl.SetHelpId( HID_ICCDIALOG_CHOICECTRL ); + // FIXME: HELPID + maIconCtrl.SetHelpId( ""/*HID_ICCDIALOG_CHOICECTRL*/ ); // ItemSet if ( pSet ) @@ -311,11 +312,14 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, // Buttons aOKBtn.SetClickHdl ( LINK( this, IconChoiceDialog, OkHdl ) ); - aOKBtn.SetHelpId( HID_ICCDIALOG_OK_BTN ); - aCancelBtn.SetHelpId( HID_ICCDIALOG_CANCEL_BTN ); + // FIXME: HELPID + aOKBtn.SetHelpId( ""/*HID_ICCDIALOG_OK_BTN*/ ); + // FIXME: HELPID + aCancelBtn.SetHelpId( ""/*HID_ICCDIALOG_CANCEL_BTN*/ ); aResetBtn.SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) ); aResetBtn.SetText( CUI_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) ); - aResetBtn.SetHelpId( HID_ICCDIALOG_RESET_BTN ); + // FIXME: HELPID + aResetBtn.SetHelpId( ""/*HID_ICCDIALOG_RESET_BTN*/ ); aOKBtn.Show(); aCancelBtn.Show(); aHelpBtn.Show(); diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 41d603c81802..48010eb867ed 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -70,7 +70,8 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) aTmp += aRow; } SetText( aTmp ); - SetHelpId( nHelpId ); + // FIXME: HELPID + SetHelpId( ""/*nHelpId*/ ); } short SvxInsRowColDlg::Execute(void) diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 0193cefa2964..e571e94880c9 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -109,7 +109,8 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml { FreeResource(); - aTbLinks.SetHelpId(HID_LINKDLG_TABLB); + // FIXME: HELPID + aTbLinks.SetHelpId(""/*HID_LINKDLG_TABLB*/); aTbLinks.SetSelectionMode( MULTIPLE_SELECTION ); aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT ); aTbLinks.Resize(); // OS: Hack fuer richtige Selektion diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index 2fe952b9197a..d5e023e33da4 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -63,8 +63,10 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent ) aSObject( CUI_RES( S_OBJECT ) ) { FreeResource(); - SetHelpId( HID_PASTE_DLG ); - SetUniqueId( HID_PASTE_DLG ); + // FIXME: HELPID + SetHelpId( ""/*HID_PASTE_DLG*/ ); + // FIXME: HELPID + SetUniqueId( ""/*HID_PASTE_DLG*/ ); Font aFont = aFtObjectSource.GetFont(); aFont.SetWeight( WEIGHT_LIGHT ); diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 8ff20084f591..6b9038b0949f 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -89,10 +89,14 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, { if (bRedline) // HelpIDs fuer Redlining { - SetHelpId(HID_REDLINING_DLG); - aEditED.SetHelpId(HID_REDLINING_EDIT); - aPrevBtn.SetHelpId(HID_REDLINING_PREV); - aNextBtn.SetHelpId(HID_REDLINING_NEXT); + // FIXME: HELPID + SetHelpId(""/*HID_REDLINING_DLG*/); + // FIXME: HELPID + aEditED.SetHelpId(""/*HID_REDLINING_EDIT*/); + // FIXME: HELPID + aPrevBtn.SetHelpId(""/*HID_REDLINING_PREV*/); + // FIXME: HELPID + aNextBtn.SetHelpId(""/*HID_REDLINING_NEXT*/); } aPrevBtn.SetClickHdl( LINK( this, SvxPostItDialog, PrevHdl ) ); diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 8929e9ebdef5..ba22a2cdf615 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -729,7 +729,8 @@ void AbstractSvxNameDialog_Impl::SetEditHelpId(ULONG nHelpId) } void AbstractSvxNameDialog_Impl::SetHelpId( ULONG nHelpId ) { - pDlg->SetHelpId( nHelpId ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*nHelpId*/ ); } void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr ) { @@ -843,7 +844,8 @@ void AbstractSvxMultiFileDialog_Impl::SetTitle( const String& rNewTitle ) void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId ) { - pDlg->SetHelpId( nHelpId ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*nHelpId*/ ); } Window * AbstractSvxHpLinkDlg_Impl::GetWindow() @@ -1889,7 +1891,8 @@ SfxAbstractInsertObjectDialog* AbstractDialogFactory_Impl::CreateInsertObjectDia if ( pDlg ) { - pDlg->SetHelpId( nSlotId ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*nSlotId*/ ); return new AbstractInsertObjectDialog_Impl( pDlg ); } return 0; @@ -1908,7 +1911,8 @@ VclAbstractDialog* AbstractDialogFactory_Impl::CreateEditObjectDialog( Window* p if ( pDlg ) { - pDlg->SetHelpId( nSlotId ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*nSlotId*/ ); return new VclAbstractDialog_Impl( pDlg ); } return 0; diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index ecf0f81dd754..875a06ce332f 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -744,7 +744,8 @@ public: aBtnOK.Enable( rLink.Call( this ) > 0 ); } - void SetEditHelpId(ULONG nHelpId) {aEdtName.SetHelpId(nHelpId);} + // FIXME: HELPID + void SetEditHelpId(ULONG /*nHelpId*/) {aEdtName.SetHelpId(""/*nHelpId*/);} }; class SvxIconSelectorDialog : public ModalDialog diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx index ae7aa832d264..593a3045b592 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -91,7 +91,8 @@ public: aBtnOK.Enable( rLink.Call( this ) > 0 ); } - void SetEditHelpId(ULONG nHelpId) {aEdtName.SetHelpId(nHelpId);} + // FIXME: HELPID + void SetEditHelpId(ULONG /*nHelpId*/) {aEdtName.SetHelpId(""/*nHelpId*/);} }; /////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 76bbafa54faa..585839b45fe8 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -114,8 +114,10 @@ namespace offapp { SetStyle((GetStyle() & ~WB_HSCROLL) | WB_AUTOHSCROLL); - SetUniqueId(UID_OFA_CONNPOOL_DRIVERLIST_BACK); - GetDataWindow().SetHelpId(HID_OFA_CONNPOOL_DRIVERLIST); + // FIXME: HELPID + SetUniqueId(""/*UID_OFA_CONNPOOL_DRIVERLIST_BACK*/); + // FIXME: HELPID + GetDataWindow().SetHelpId(""/*HID_OFA_CONNPOOL_DRIVERLIST*/); } //-------------------------------------------------------------------- diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index c617a3e4c515..555bc5290f37 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -169,8 +169,10 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx pPathBox->InitHeaderBar( pHeaderBar ); pPathBox->SetHighlightRange(); - pPathBox->SetHelpId( HID_DBPATH_CTL_PATH ); - pHeaderBar->SetHelpId( HID_DBPATH_HEADERBAR ); + // FIXME: HELPID + pPathBox->SetHelpId( ""/*HID_DBPATH_CTL_PATH*/ ); + // FIXME: HELPID + pHeaderBar->SetHelpId( ""/*HID_DBPATH_HEADERBAR*/ ); pPathBox->Show(); pHeaderBar->Show(); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 36e43a88ecce..6903cae224d0 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -97,7 +97,8 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, aNewPnt.Y() += nDelta; aNewDelTBX.SetPosPixel( aNewPnt ); - aCheckLB.SetHelpId(HID_OFA_FONT_SUBST_CLB); + // FIXME: HELPID + aCheckLB.SetHelpId(""/*HID_OFA_FONT_SUBST_CLB*/); aCheckLB.SetWindowBits(aCheckLB.GetStyle()|WB_HSCROLL|WB_VSCROLL); aCheckLB.SetSelectionMode(MULTIPLE_SELECTION); aCheckLB.SortByCol(2); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 90befc998e01..3de833cfd814 100644 --- a/cui/source/options/optcolor.cxx +++ b/cui/source/options/optcolor.cxx @@ -815,7 +815,8 @@ 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); + // FIXME: HELPID + aCheckBoxes[i]->SetHelpId(""/*HID_COLORPAGE_CHECKBOX_START + i*/); if(bSetTextColor) aCheckBoxes[i]->SetTextColor(aRCheckCol); } @@ -854,13 +855,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); + // FIXME: HELPID + aColorBoxes[0]->SetHelpId(""/*HID_COLORPAGE_LISTBOX_START*/); for( sal_Int32 i = 1; i < nCount; i++ ) { if(aColorBoxes[i]) { aColorBoxes[i]->CopyEntries( *aColorBoxes[0] ); - aColorBoxes[i]->SetHelpId(HID_COLORPAGE_LISTBOX_START + i); + // FIXME: HELPID + aColorBoxes[i]->SetHelpId(""/*HID_COLORPAGE_LISTBOX_START + i*/); } } } @@ -1018,7 +1021,8 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl( const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); aScrollWindow.SetBackground(Wallpaper(rStyleSettings.GetFieldColor())); - aScrollWindow.SetHelpId( HID_OPTIONS_COLORCONFIG_COLORLIST_WIN ); + // FIXME: HELPID + aScrollWindow.SetHelpId( ""/*HID_OPTIONS_COLORCONFIG_COLORLIST_WIN*/ ); aVScroll.EnableDrag(); aVScroll.Show(); aHeaderHB.SetPosSizePixel( diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 637230587e6b..06e4bdb16bba 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -164,7 +164,8 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, aCheckLB.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED ); - aCheckLB.SetHelpId( HID_OFAPAGE_MSFLTR2_CLB ); + // FIXME: HELPID + aCheckLB.SetHelpId( ""/*HID_OFAPAGE_MSFLTR2_CLB*/ ); aCheckLB.SetWindowBits( WB_HSCROLL| WB_VSCROLL ); } diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 31a40f2cd221..c1c864f6c831 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -197,7 +197,8 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet sHeader += '\t'; m_aJavaList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT ); - m_aJavaList.SetHelpId( HID_OPTIONS_JAVA_LIST ); + // FIXME: HELPID + m_aJavaList.SetHelpId( ""/*HID_OPTIONS_JAVA_LIST*/ ); FreeResource(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index f5bfd351ae45..29a4376a1a54 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1141,7 +1141,8 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, pCheckButtonData = NULL; aLinguModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - aLinguModulesCLB.SetHelpId(HID_CLB_LINGU_MODULES ); + // FIXME: HELPID + aLinguModulesCLB.SetHelpId(""/*HID_CLB_LINGU_MODULES*/ ); aLinguModulesCLB.SetHighlightRange(); aLinguModulesCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguModulesCLB.SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl)); @@ -1151,7 +1152,8 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, aLinguOptionsEditPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl )); aLinguDicsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - aLinguDicsCLB.SetHelpId(HID_CLB_EDIT_MODULES_DICS ); + // FIXME: HELPID + aLinguDicsCLB.SetHelpId(""/*HID_CLB_EDIT_MODULES_DICS*/ ); aLinguDicsCLB.SetHighlightRange(); aLinguDicsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguDicsCLB.SetCheckButtonHdl(LINK(this, SvxLinguTabPage, BoxCheckButtonHdl_Impl)); @@ -1161,7 +1163,8 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, aLinguDicsDelPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl )); aLinguOptionsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - aLinguOptionsCLB.SetHelpId(HID_CLB_LINGU_OPTIONS ); + // FIXME: HELPID + aLinguOptionsCLB.SetHelpId(""/*HID_CLB_LINGU_OPTIONS*/ ); aLinguOptionsCLB.SetHighlightRange(); aLinguOptionsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguOptionsCLB.SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl)); @@ -2052,7 +2055,8 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) aModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); aModulesCLB.SetHighlightRange(); - aModulesCLB.SetHelpId(HID_CLB_EDIT_MODULES_MODULES ); + // FIXME: HELPID + aModulesCLB.SetHelpId(""/*HID_CLB_EDIT_MODULES_MODULES*/ ); aModulesCLB.SetSelectHdl( LINK( this, SvxEditModulesDlg, SelectHdl_Impl )); aModulesCLB.SetCheckButtonHdl( LINK( this, SvxEditModulesDlg, BoxCheckButtonHdl_Impl) ); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index f3d31aa33025..feb0b35efe41 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -263,8 +263,10 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) : pPathBox->SetTabs( &nTabs[0], MAP_APPFONT ); pPathBox->InitHeaderBar( pHeaderBar ); pPathBox->SetHighlightRange(); - pPathBox->SetHelpId( HID_OPTPATH_CTL_PATH ); - pHeaderBar->SetHelpId( HID_OPTPATH_HEADERBAR ); + // FIXME: HELPID + pPathBox->SetHelpId( ""/*HID_OPTPATH_CTL_PATH*/ ); + // FIXME: HELPID + pHeaderBar->SetHelpId( ""/*HID_OPTPATH_HEADERBAR*/ ); pPathBox->Show(); pHeaderBar->Show(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index b63d9afc647e..bbdb4bb17a1f 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -889,7 +889,8 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() aPageImagesHC = ImageList( ResId( RID_IMGLIST_TREEOPT_HC, *pIsoRes ) ); delete pIsoRes; - aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX ); + // FIXME: HELPID + aTreeLB.SetHelpId( ""/*HID_OFADLG_TREELISTBOX*/ ); aTreeLB.SetWindowBits( WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINES | WB_HASLINESATROOT | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 0ee3c38c1e1d..3b01ba9c0e1f 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -105,7 +105,8 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : aLanguageFT.SetZOrder(0, WINDOW_ZORDER_FIRST); aLanguageLB.SetZOrder(&aLanguageFT, WINDOW_ZORDER_BEHIND); - aLanguageLB.SetHelpId(HID_AUTOCORR_LANGUAGE); + // FIXME: HELPID + aLanguageLB.SetHelpId(""/*HID_AUTOCORR_LANGUAGE*/); FreeResource(); AddTabPage(RID_OFAPAGE_AUTOCORR_OPTIONS, OfaAutocorrOptionsPage::Create, 0); @@ -228,7 +229,8 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, { FreeResource(); - aCheckLB.SetHelpId(HID_OFAPAGE_AUTOCORR_CLB); + // FIXME: HELPID + aCheckLB.SetHelpId(""/*HID_OFAPAGE_AUTOCORR_CLB*/); } /*-----------------14.10.96 15.58------------------- @@ -492,7 +494,8 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, //typ. Anfuehrungszeichen einsetzen SvtSysLocale aSysLcl; - aCheckLB.SetHelpId(HID_OFAPAGE_AUTOFORMAT_CLB); + // FIXME: HELPID + aCheckLB.SetHelpId(""/*HID_OFAPAGE_AUTOFORMAT_CLB*/); aCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL); aCheckLB.SetSelectHdl(LINK(this, OfaSwAutoFmtOptionsPage, SelectHdl)); @@ -2062,8 +2065,10 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : BOOL bShowSWOptions = FALSE; - aCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_CLB ); - aSwCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_SW_CLB ); + // FIXME: HELPID + aCheckLB.SetHelpId( ""/*HID_OFAPAGE_QUOTE_CLB*/ ); + // FIXME: HELPID + aSwCheckLB.SetHelpId( ""/*HID_OFAPAGE_QUOTE_SW_CLB*/ ); SFX_ITEMSET_ARG( &rSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, FALSE ); if ( pItem && pItem->GetValue() ) diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 9bf88e151770..e531c2ccda55 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -243,7 +243,8 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, SetExchangeSupport(); pExamplesVS->SetSelectHdl(LINK(this, SvxSingleNumPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxSingleNumPickTabPage, DoubleClickHdl_Impl)); - pExamplesVS->SetHelpId(HID_VALUESET_SINGLENUM ); + // FIXME: HELPID + pExamplesVS->SetHelpId(""/*HID_VALUESET_SINGLENUM*/ ); Reference xDefNum = lcl_GetNumberingProvider(); if(xDefNum.is()) @@ -472,7 +473,8 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, SetExchangeSupport(); pExamplesVS->SetSelectHdl(LINK(this, SvxBulletPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxBulletPickTabPage, DoubleClickHdl_Impl)); - pExamplesVS->SetHelpId(HID_VALUESET_BULLET ); + // FIXME: HELPID + pExamplesVS->SetHelpId(""/*HID_VALUESET_BULLET*/ ); } /*-----------------07.02.97 12.10------------------- @@ -675,7 +677,8 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, pExamplesVS->SetSelectHdl(LINK(this, SvxNumPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxNumPickTabPage, DoubleClickHdl_Impl)); - pExamplesVS->SetHelpId(HID_VALUESET_NUM ); + // FIXME: HELPID + pExamplesVS->SetHelpId(""/*HID_VALUESET_NUM*/ ); Reference xDefNum = lcl_GetNumberingProvider(); if(xDefNum.is()) @@ -991,7 +994,8 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, // Grafiknamen ermitteln GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); - pExamplesVS->SetHelpId(HID_VALUESET_NUMBMP ); + // FIXME: HELPID + pExamplesVS->SetHelpId(""/*HID_VALUESET_NUMBMP*/ ); for(USHORT i = 0; i < aGrfNames.Count(); i++) { pExamplesVS->InsertItem( i + 1, i); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 9060b6fb013e..14c51452feeb 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -645,7 +645,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); } if( pWarnBox->Execute() != RET_OK ) @@ -775,7 +776,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); } @@ -887,7 +889,8 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 5152bd0e9478..48178ca4d0e7 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -488,7 +488,8 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -574,7 +575,8 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -1036,9 +1038,12 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG ) aMtrFldColorModel4.Hide(); aMtrFldColorModel4.SetValue( 0L ); - aMtrFldColorModel1.SetHelpId( HID_TPCOLOR_RGB_1 ); - aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_RGB_2 ); - aMtrFldColorModel3.SetHelpId( HID_TPCOLOR_RGB_3 ); + // FIXME: HELPID + aMtrFldColorModel1.SetHelpId( ""/*HID_TPCOLOR_RGB_1*/ ); + // FIXME: HELPID + aMtrFldColorModel2.SetHelpId( ""/*HID_TPCOLOR_RGB_2*/ ); + // FIXME: HELPID + aMtrFldColorModel3.SetHelpId( ""/*HID_TPCOLOR_RGB_3*/ ); // Da der alte HelpText noch am Control steht wuerde // ein Umsetzen der HelpID alleine nichts bewirken @@ -1082,9 +1087,12 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG ) aFtColorModel4.Show(); aMtrFldColorModel4.Show(); - aMtrFldColorModel1.SetHelpId( HID_TPCOLOR_CMYK_1 ); - aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_CMYK_2 ); - aMtrFldColorModel3.SetHelpId( HID_TPCOLOR_CMYK_3 ); + // FIXME: HELPID + aMtrFldColorModel1.SetHelpId( ""/*HID_TPCOLOR_CMYK_1*/ ); + // FIXME: HELPID + aMtrFldColorModel2.SetHelpId( ""/*HID_TPCOLOR_CMYK_2*/ ); + // FIXME: HELPID + aMtrFldColorModel3.SetHelpId( ""/*HID_TPCOLOR_CMYK_3*/ ); // s.o. aMtrFldColorModel1.SetHelpText( String() ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index 1de256416b9d..f7f8d2319846 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -482,7 +482,8 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); } if( pWarnBox->Execute() != RET_OK ) @@ -599,7 +600,8 @@ IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aBox.Execute(); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 4fa65d95221a..70de87806a78 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -546,7 +546,8 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); } if( pWarnBox->Execute() != RET_OK ) @@ -659,7 +660,8 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index 5f1b385e8137..dd105e0ed682 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -639,7 +639,8 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aBox.Execute(); } } @@ -720,7 +721,8 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index 4949ce4da6fa..ed7ff628060f 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -372,7 +372,8 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -520,7 +521,8 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); + // FIXME: HELPID + aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); aBox.Execute(); } } diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index b315893b6447..a596143fac0f 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -106,11 +106,16 @@ namespace abp WZS_INVALID_STATE ); - m_pPrevPage->SetHelpId(HID_ABSPILOT_PREVIOUS); - m_pNextPage->SetHelpId(HID_ABSPILOT_NEXT); - m_pCancel->SetHelpId(HID_ABSPILOT_CANCEL); - m_pFinish->SetHelpId(HID_ABSPILOT_FINISH); - m_pHelp->SetUniqueId(UID_ABSPILOT_HELP); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_ABSPILOT_PREVIOUS*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_ABSPILOT_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_ABSPILOT_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_ABSPILOT_FINISH*/); + // FIXME: HELPID + m_pHelp->SetUniqueId(""/*UID_ABSPILOT_HELP*/); m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) ); diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 4489fad70161..72a018650e6b 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -198,7 +198,8 @@ BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWi ,pBibMod(NULL) { Window* pParent = VCLUnoHelper::GetWindow( xWindow ); - pParent->SetUniqueId(UID_BIB_FRAME_WINDOW); + // FIXME: HELPID + pParent->SetUniqueId(""/*UID_BIB_FRAME_WINDOW*/); bDisposing=sal_False; bHierarchical=sal_True; pImp = new BibFrameCtrl_Impl; diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 33cff121021b..aed795d37c15 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -245,7 +245,8 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): pDatMan(pMan) { aControlParentWin.Show(); - aControlParentWin.SetHelpId(HID_BIB_CONTROL_PARENT); + // FIXME: HELPID + aControlParentWin.SetHelpId(""/*HID_BIB_CONTROL_PARENT*/); aStdSize = GetOutputSizePixel(); aBibTypeArr[0] = String(BibResId(ST_TYPE_ARTICLE)); diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 6e28567aef62..ef9f4088028b 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -65,10 +65,14 @@ namespace dbp { initControlSettings(&m_aSettings); - m_pPrevPage->SetHelpId(HID_GRIDWIZARD_PREVIOUS); - m_pNextPage->SetHelpId(HID_GRIDWIZARD_NEXT); - m_pCancel->SetHelpId(HID_GRIDWIZARD_CANCEL); - m_pFinish->SetHelpId(HID_GRIDWIZARD_FINISH); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_GRIDWIZARD_PREVIOUS*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_GRIDWIZARD_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_GRIDWIZARD_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_GRIDWIZARD_FINISH*/); // if we do not need the data source selection page ... if (!needDatasourceSelection()) diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index 7bf3138bf5fe..d98a23046e69 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -66,10 +66,14 @@ namespace dbp { initControlSettings(&m_aSettings); - m_pPrevPage->SetHelpId(HID_GROUPWIZARD_PREVIOUS); - m_pNextPage->SetHelpId(HID_GROUPWIZARD_NEXT); - m_pCancel->SetHelpId(HID_GROUPWIZARD_CANCEL); - m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_GROUPWIZARD_PREVIOUS*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_GROUPWIZARD_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_GROUPWIZARD_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_GROUPWIZARD_FINISH*/); } //--------------------------------------------------------------------- diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 2e810654baa4..135fc3721982 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -67,10 +67,14 @@ namespace dbp { initControlSettings(&m_aSettings); - m_pPrevPage->SetHelpId(HID_LISTWIZARD_PREVIOUS); - m_pNextPage->SetHelpId(HID_LISTWIZARD_NEXT); - m_pCancel->SetHelpId(HID_LISTWIZARD_CANCEL); - m_pFinish->SetHelpId(HID_LISTWIZARD_FINISH); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_LISTWIZARD_PREVIOUS*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_LISTWIZARD_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_LISTWIZARD_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_LISTWIZARD_FINISH*/); // if we do not need the data source selection page ... if (!needDatasourceSelection()) diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 71a0bb2db3ce..7548a35fbbb9 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -105,20 +105,25 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::SetComponentHelpIds( const SmartId& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId ) + void OBrowserLine::SetComponentHelpIds( const rtl::OString& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId ) { if ( m_pControlWindow ) - m_pControlWindow->SetSmartHelpId( _rHelpId ); + // FIXME: HELPID + m_pControlWindow->SetHelpId( _rHelpId ); if ( m_pBrowseButton ) { - m_pBrowseButton->SetSmartHelpId( _rHelpId ); - m_pBrowseButton->SetUniqueId( _bPrimaryButtonId ); + // FIXME: HELPID + m_pBrowseButton->SetHelpId( _rHelpId ); + // FIXME: HELPID + m_pBrowseButton->SetUniqueId( ""/*_bPrimaryButtonId*/ ); if ( m_pAdditionalBrowseButton ) { - m_pAdditionalBrowseButton->SetSmartHelpId( _rHelpId ); - m_pAdditionalBrowseButton->SetUniqueId( _nSecondaryButtonId ); + // FIXME: HELPID + m_pAdditionalBrowseButton->SetHelpId( _rHelpId ); + // FIXME: HELPID + m_pAdditionalBrowseButton->SetUniqueId( ""/*_nSecondaryButtonId*/ ); } } } diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index db747b4a6b99..5ac0d4c9758d 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -92,7 +92,8 @@ namespace pcr const ::rtl::OUString& GetEntryName() const { return m_sEntryName; } - void SetComponentHelpIds( const SmartId& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId ); + // FIXME: HELPID + void SetComponentHelpIds( const rtl::OString& _rHelpId, sal_uInt32 _bPrimaryButtonId, sal_uInt32 _nSecondaryButtonId ); void SetTitle(const String& rString ); void FullFillTitleString(); diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index 9e09d4977697..317a42d56425 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -51,12 +51,17 @@ namespace pcr //= HelpIdUrl //======================================================================== //------------------------------------------------------------------------ - SmartId HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) + rtl::OString HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) { + // FIXME: HELPID + #if 0 SmartId aSmartHelpId( _rHelpURL ); if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) ) aSmartHelpId = SmartId( _rHelpURL.copy( sizeof( "HID:" ) - 1 ).toInt32() ); return aSmartHelpId; + #else + return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); + #endif } //------------------------------------------------------------------------ diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index 80f83d03a2e6..162b9780ca30 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -37,7 +37,6 @@ #include /** === end UNO includes === **/ -#include #include #include #include @@ -78,7 +77,8 @@ namespace pcr class HelpIdUrl { public: - static SmartId getHelpId( const ::rtl::OUString& _rHelpURL ); + // FIXME: HELPID + static rtl::OString getHelpId( const ::rtl::OUString& _rHelpURL ); static ::rtl::OUString getHelpURL( sal_uInt32 _nHelpId ); }; diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index cf14f3778682..2bb73f06490d 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1273,7 +1273,8 @@ 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() ); + // FIXME: HELPID + 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 36d2e78956a7..d40007664c5a 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,8 @@ namespace pcr pPage->getListBox().SetObserver(m_pObserver); pPage->getListBox().EnableHelpSection( m_bHasHelpSection ); pPage->getListBox().SetHelpLineLimites( m_nMinHelpLines, m_nMaxHelpLines ); - pPage->SetSmartHelpId( _rHelpId ); + // FIXME: HELPID + pPage->SetHelpId( _rHelpId ); // immediately activate the page m_aTabControl.SetTabPage(nId, pPage); @@ -248,8 +249,13 @@ namespace pcr //------------------------------------------------------------------ void OPropertyEditor::SetHelpId( sal_uInt32 nHelpId ) { - Control::SetHelpId(0); + Control::SetHelpId(""); + // FIXME: HELPID + #if 0 m_aTabControl.SetHelpId(nHelpId); + #else + (void)nHelpId; + #endif } //------------------------------------------------------------------ diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 304b7628b1d5..455524f853bb 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -98,7 +98,8 @@ namespace pcr void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); void SetHelpId( sal_uInt32 nHelpId ); - sal_uInt16 AppendPage( const String& r, const SmartId& _rHelpId ); + // FIXME: HELPID + 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/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 5ea3fbb47a38..0947db14cbb7 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -210,7 +210,8 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( ,m_bWarningShowSignMacro(false) { // --> PB #i48253 the tablistbox needs its own unique id - maSignaturesLB.Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG ); + // FIXME: HELPID + maSignaturesLB.Window::SetUniqueId( ""/*HID_XMLSEC_TREE_SIGNATURESDLG*/ ); // <-- static long nTabs[] = { 4, 0, 6*DS_LB_WIDTH/100, 36*DS_LB_WIDTH/100, 74*DS_LB_WIDTH/100 }; maSignaturesLB.SetTabs( &nTabs[ 0 ] ); -- cgit From 80d0be076d0415ace6b899b0d1437f740dabb01e Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 13:46:22 +0200 Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids --- sd/source/filter/html/pubdlg.cxx | 7 +++++-- .../ui/animations/CustomAnimationCreateDialog.cxx | 15 +++++++++----- sd/source/ui/animations/CustomAnimationDialog.cxx | 24 ++++++++++++++-------- sd/source/ui/app/sdmod.cxx | 3 ++- sd/source/ui/dlg/LayerTabBar.cxx | 3 ++- sd/source/ui/dlg/PaneDockingWindow.cxx | 3 ++- sd/source/ui/dlg/dlgass.cxx | 6 +++++- sd/source/ui/dlg/headerfooterdlg.cxx | 6 ++++-- sd/source/ui/dlg/navigatr.cxx | 5 +++-- sd/source/ui/dlg/sddlgfact.cxx | 4 +++- sd/source/ui/slideshow/showwin.cxx | 6 ++++-- sd/source/ui/toolpanel/LayoutMenu.cxx | 3 ++- sd/source/ui/toolpanel/ScrollPanel.cxx | 3 ++- sd/source/ui/toolpanel/SubToolPanel.cxx | 3 ++- sd/source/ui/toolpanel/TaskPaneViewShell.cxx | 3 ++- sd/source/ui/toolpanel/ToolPanel.cxx | 3 ++- .../ui/toolpanel/controls/MasterPagesPanel.cxx | 9 +++++--- .../ui/toolpanel/controls/MasterPagesSelector.cxx | 5 +++-- .../ui/toolpanel/controls/MasterPagesSelector.hxx | 2 +- sd/source/ui/view/ViewShellImplementation.cxx | 6 ++++-- sd/source/ui/view/drviews2.cxx | 6 ++++-- sd/source/ui/view/drviews5.cxx | 18 ++++++++++------ sd/source/ui/view/drviewsa.cxx | 24 ++++++++++++++-------- sd/source/ui/view/outlnvsh.cxx | 6 ++++-- sd/source/ui/view/sdruler.cxx | 6 ++++-- sd/source/ui/view/sdwindow.cxx | 3 ++- sd/source/ui/view/tabcontr.cxx | 3 ++- 27 files changed, 124 insertions(+), 61 deletions(-) diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 55e141f8d4cb..c2d975cb9429 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -478,7 +478,8 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) SetDefaults(); - SetHelpId(aPageHelpIds[0]); + // FIXME: HELPID + SetHelpId(""/*aPageHelpIds[0]*/); aNextPageButton.GrabFocus(); } @@ -1286,7 +1287,9 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG ) void SdPublishingDlg::ChangePage() { int nPage = aAssistentFunc.GetCurrentPage(); - SetHelpId(aPageHelpIds[nPage-1]); + // FIXME: HELPID + (void)nPage; + SetHelpId(""/*aPageHelpIds[nPage-1]*/); UpdatePage(); diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 3ac3d1f24a07..217bdd4267cb 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -542,19 +542,24 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, Custo const CustomAnimationPresets& rPresets = CustomAnimationPresets::getCustomAnimationPresets(); mpTabPages[ENTRANCE] = new CustomAnimationCreateTabPage( mpTabControl, this, ENTRANCE, rPresets.getEntrancePresets(), bHasText ); - mpTabPages[ENTRANCE]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE ); + // FIXME: HELPID + mpTabPages[ENTRANCE]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE*/ ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_ENTRANCE, mpTabPages[ENTRANCE] ); mpTabPages[EMPHASIS] = new CustomAnimationCreateTabPage( mpTabControl, this, EMPHASIS, rPresets.getEmphasisPresets(), bHasText ); - mpTabPages[EMPHASIS]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS ); + // FIXME: HELPID + mpTabPages[EMPHASIS]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS*/ ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_EMPHASIS, mpTabPages[EMPHASIS] ); mpTabPages[EXIT] = new CustomAnimationCreateTabPage( mpTabControl, this, EXIT, rPresets.getExitPresets(), bHasText ); - mpTabPages[EXIT]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_EXIT ); + // FIXME: HELPID + mpTabPages[EXIT]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_EXIT*/ ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_EXIT, mpTabPages[EXIT] ); mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, this, MOTIONPATH, rPresets.getMotionPathsPresets(), bHasText ); - mpTabPages[MOTIONPATH]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH ); + // FIXME: HELPID + mpTabPages[MOTIONPATH]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH*/ ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_MOTIONPATH, mpTabPages[MOTIONPATH] ); mpTabPages[MISCEFFECTS] = new CustomAnimationCreateTabPage( mpTabControl, this, MISCEFFECTS, rPresets.getMiscPresets(), bHasText ); - mpTabPages[MISCEFFECTS]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS ); + // FIXME: HELPID + mpTabPages[MISCEFFECTS]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS*/ ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_MISCEFFECTS, mpTabPages[MISCEFFECTS] ); getCurrentPage()->setDuration( mfDuration ); diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index 7f942562b951..b1efd1cf1904 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -144,7 +144,8 @@ PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, Window* pParent, c mpControl = new ListBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); mpControl->SetDropDownLineCount( 10 ); mpControl->SetSelectHdl( rModifyHdl ); - mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX ); + // FIXME: HELPID + mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX*/ ); setValue( rValue, aPresetId ); @@ -230,7 +231,8 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con mpControl = new ColorListBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); mpControl->SetDropDownLineCount( 10 ); mpControl->SetSelectHdl( rModifyHdl ); - mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX ); + // FIXME: HELPID + mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX*/ ); SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); @@ -322,7 +324,8 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const mpControl = new FontNameBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); mpControl->SetDropDownLineCount( 10 ); mpControl->SetSelectHdl( rModifyHdl ); - mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX ); + // FIXME: HELPID + mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX*/ ); SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem; @@ -501,7 +504,8 @@ CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, Window* pP mpControl = new DropdownMenuBox( pParent, mpMetric, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, CharHeightPropertyBox, implMenuSelectHdl )); mpControl->SetModifyHdl( rModifyHdl ); - mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX ); + // FIXME: HELPID + mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX*/ ); OUString aPresetId; setValue( rValue, aPresetId ); @@ -603,7 +607,8 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window mpControl = new DropdownMenuBox( pParent, mpMetric, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, TransparencyPropertyBox, implMenuSelectHdl )); - mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX ); + // FIXME: HELPID + mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX*/ ); Link aLink( LINK( this, TransparencyPropertyBox, implModifyHdl ) ); mpControl->SetModifyHdl( aLink ); @@ -719,7 +724,8 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, Window* pParen mpMenu = new PopupMenu(SdResId( RID_CUSTOMANIMATION_ROTATION_POPUP ) ); mpControl = new DropdownMenuBox( pParent, mpMetric, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, RotationPropertyBox, implMenuSelectHdl )); - mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX ); + // FIXME: HELPID + mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX*/ ); Link aLink( LINK( this, RotationPropertyBox, implModifyHdl ) ); mpControl->SetModifyHdl( aLink ); @@ -860,7 +866,8 @@ ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, Window* pParent, con mpMenu = new PopupMenu(SdResId( RID_CUSTOMANIMATION_SCALE_POPUP ) ); mpControl = new DropdownMenuBox( pParent, mpMetric, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, ScalePropertyBox, implMenuSelectHdl )); - mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX ); + // FIXME: HELPID + mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX*/ ); Link aLink( LINK( this, ScalePropertyBox, implModifyHdl ) ); mpControl->SetModifyHdl( aLink ); @@ -1039,7 +1046,8 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, Window* pPar mpMenu = new PopupMenu(SdResId( RID_CUSTOMANIMATION_FONTSTYLE_POPUP ) ); mpControl = new DropdownMenuBox( pParent, mpEdit, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, FontStylePropertyBox, implMenuSelectHdl )); - mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX ); + // FIXME: HELPID + mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX*/ ); OUString aPresetId; setValue( rValue, aPresetId ); diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index fb180509cff9..32087f993e62 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -192,7 +192,8 @@ void SdModule::FillStatusBar(StatusBar& rStatusBar) // signatures rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); - rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); + // FIXME: HELPID + rStatusBar.SetHelpId(SID_SIGNATURE, ""/*SID_SIGNATURE*/); diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 29425a3bda71..a5053617288d 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -71,7 +71,8 @@ LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent) EnableEditMode(); SetSizePixel(Size(0, 0)); SetMaxPageWidth( 150 ); - SetHelpId( HID_SD_TABBAR_LAYERS ); + // FIXME: HELPID + SetHelpId( ""/*HID_SD_TABBAR_LAYERS*/ ); } diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index c0dcd76f0fae..2ebba0ca6d91 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -282,7 +282,8 @@ USHORT PaneDockingWindow::AddMenu ( rsMenuName, TIB_DROPDOWNONLY, nItemCount>0 ? nItemCount-1 : (USHORT)-1); - mpTitleToolBox->SetHelpId( nItemId, nHelpId ); + // FIXME: HELPID + mpTitleToolBox->SetHelpId( nItemId, ""/*nHelpId*/ ); mpTitleToolBox->SetClickHdl (rCallback); mpTitleToolBox->SetDropdownClickHdl (rCallback); diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index d398724a3074..455cca1d281a 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -1119,7 +1119,11 @@ void AssistentDlgImpl::ChangePage() USHORT nPage = (USHORT)maAssistentFunc.GetCurrentPage(); if( mpWindow ) - mpWindow->SetHelpId( PageHelpIds[nPage-1]); + { + // FIXME: HELPID + (void)nPage; + mpWindow->SetHelpId( ""/*PageHelpIds[nPage-1]*/); + } UpdatePage(); diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 294e61f3fe40..6669b98c6818 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -240,7 +240,8 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent maTabCtrl.Show(); mpSlideTabPage = new HeaderFooterTabPage( this, &maTabCtrl, pDoc, pSlide, false ); - mpSlideTabPage->SetHelpId( HID_SD_TABPAGE_HEADERFOOTER_SLIDE ); + // FIXME: HELPID + mpSlideTabPage->SetHelpId( ""/*HID_SD_TABPAGE_HEADERFOOTER_SLIDE*/ ); maTabCtrl.SetTabPage( RID_SD_TABPAGE_HEADERFOOTER_SLIDE, mpSlideTabPage ); Size aSiz = mpSlideTabPage->GetSizePixel(); @@ -253,7 +254,8 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent } mpNotesHandoutsTabPage = new HeaderFooterTabPage( this, &maTabCtrl, pDoc, pNotes, true ); - mpNotesHandoutsTabPage->SetHelpId( HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT ); + // FIXME: HELPID + mpNotesHandoutsTabPage->SetHelpId( ""/*HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT*/ ); maTabCtrl.SetTabPage( RID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT, mpNotesHandoutsTabPage ); aSiz = mpNotesHandoutsTabPage->GetSizePixel(); diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 294aa6feb65a..c019ab330c71 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -317,8 +317,9 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) if( nRId > 0 ) { pMenu->InsertItem( nID, String( SdResId( nRId ) ) ); - pMenu->SetHelpId( nID, HID_SD_NAVIGATOR_MENU1 + - nID - NAVIGATOR_DRAGTYPE_URL ); + // FIXME: HELPID + pMenu->SetHelpId( nID, ""/*HID_SD_NAVIGATOR_MENU1 + + nID - NAVIGATOR_DRAGTYPE_URL*/ ); } } diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index 468b55f56c8a..f95c4027d7f8 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -270,7 +270,9 @@ void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) } void AbstractSdInsertLayerDlg_Impl::SetHelpId( ULONG nHelpId ) { - pDlg->SetHelpId( nHelpId ); + // FIXME: HELPID + (void)nHelpId; + pDlg->SetHelpId( ""/*nHelpId*/ ); } // AbstractSdInsertLayerDlg_Impl end diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index fe6f9483b8b6..c81abe4b0931 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -76,8 +76,10 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, :: SetMapMode(aMap); // HelpId setzen - SetHelpId( HID_SD_WIN_PRESENTATION ); - SetUniqueId( HID_SD_WIN_PRESENTATION ); + // FIXME: HELPID + SetHelpId( ""/*HID_SD_WIN_PRESENTATION*/ ); + // FIXME: HELPID + SetUniqueId( ""/*HID_SD_WIN_PRESENTATION*/ ); maPauseTimer.SetTimeoutHdl( LINK( this, ShowWindow, PauseTimeoutHdl ) ); maPauseTimer.SetTimeout( 1000 ); diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index a2bb1d0cbbac..2ba3ac742d18 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -261,7 +261,8 @@ LayoutMenu::LayoutMenu ( | ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL | ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER); - SetSmartHelpId(SmartId(HID_SD_TASK_PANE_PREVIEW_LAYOUTS)); + // FIXME: HELPID + Window::SetHelpId(""/*HID_SD_TASK_PANE_PREVIEW_LAYOUTS*/); SetAccessibleName(SdResId(STR_TASKPANEL_LAYOUT_MENU_TITLE)); Link aStateChangeLink (LINK(this,LayoutMenu,StateChangeHandler)); diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index cff065777235..a257c0e9597f 100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -132,7 +132,8 @@ TitledControl* ScrollPanel::AddControl ( rTitle, TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE), TitleBar::TBT_SUB_CONTROL_HEADLINE); - pTitledControl->GetTitleBar()->SetHelpId(nHelpId); + // FIXME: HELPID + pTitledControl->GetTitleBar()->SetHelpId(""/*nHelpId*/); AddControl(::std::auto_ptr(pTitledControl)); diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index 31c29f4f1c08..6e24da8c7c59 100644 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx @@ -112,7 +112,8 @@ void SubToolPanel::AddControl ( TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE), TitleBar::TBT_SUB_CONTROL_HEADLINE); pTitledControl->GetWindow()->SetParent(this); - pTitledControl->GetWindow()->SetHelpId(nHelpId); + // FIXME: HELPID + pTitledControl->GetWindow()->SetHelpId(""/*nHelpId*/); ::std::auto_ptr pChild (pTitledControl); // Add a down link only for the first control so that when diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx index d80beba7cd10..a00142fa81c1 100644 --- a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx +++ b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx @@ -362,7 +362,8 @@ TaskPaneViewShell::TaskPaneViewShell ( GetParentWindow()->SetBackground(Wallpaper()); mpContentWindow->SetBackground(Wallpaper()); - GetParentWindow()->SetHelpId(HID_SD_TASK_PANE); + // FIXME: HELPID + GetParentWindow()->SetHelpId(""/*HID_SD_TASK_PANE*/); PaneDockingWindow* pDockingWindow = dynamic_cast(GetDockingWindow()); if (pDockingWindow != NULL) diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index 89ab9397d4ee..1743da65ca75 100644 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -117,7 +117,8 @@ sal_uInt32 ToolPanel::AddControl ( rFocusManager.RegisterLink(pChild->GetWindow(),pFirst, KEY_DOWN); } - pTitledControl->GetWindow()->SetHelpId(nHelpId); + // FIXME: HELPID + pTitledControl->GetWindow()->SetHelpId(""/*nHelpId*/); return mpControlContainer->AddControl (pChild); } diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx index b897e1514862..b2e0048af64a 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx @@ -66,7 +66,8 @@ MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase) rBase, pContainer)); pSelector->LateInit(); - pSelector->SetSmartHelpId( SmartId(HID_SD_TASK_PANE_PREVIEW_CURRENT) ); + // FIXME: HELPID + pSelector->SetHelpId( ""/*HID_SD_TASK_PANE_PREVIEW_CURRENT*/ ); GetShellManager()->AddSubShell( HID_SD_TASK_PANE_PREVIEW_CURRENT, pSelector.get(), @@ -83,7 +84,8 @@ MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase) rBase, pContainer)); pSelector->LateInit(); - pSelector->SetSmartHelpId( SmartId(HID_SD_TASK_PANE_PREVIEW_RECENT) ); + // FIXME: HELPID + pSelector->SetHelpId( ""/*HID_SD_TASK_PANE_PREVIEW_RECENT*/ ); GetShellManager()->AddSubShell( HID_SD_TASK_PANE_PREVIEW_RECENT, pSelector.get(), @@ -101,7 +103,8 @@ MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase) *pDrawViewShell, pContainer)); pSelector->LateInit(); - pSelector->SetSmartHelpId( SmartId(HID_SD_TASK_PANE_PREVIEW_ALL) ); + // FIXME: HELPID + pSelector->SetHelpId( ""/*HID_SD_TASK_PANE_PREVIEW_ALL*/ ); GetShellManager()->AddSubShell( HID_SD_TASK_PANE_PREVIEW_ALL, pSelector.get(), diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index 4571d4278140..d94e1dfd2b1f 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -787,11 +787,12 @@ void MasterPagesSelector::ClearPageSet (void) -void MasterPagesSelector::SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode ) +void MasterPagesSelector::SetHelpId( const rtl::OString& aId ) { const ::osl::MutexGuard aGuard (maMutex); - mpPageSet->SetSmartHelpId( aId, aMode ); + // FIXME: HELPID + mpPageSet->SetHelpId( aId ); } diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index a480729aa9c8..0852b9b07087 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx @@ -121,7 +121,7 @@ public: */ void ClearPageSet (void); - void SetSmartHelpId( const SmartId& aId, SmartIdUpdateMode aMode = SMART_SET_SMART ); + void SetHelpId( const rtl::OString& aId ); /** Mark the preview that belongs to the given index as not up-to-date anymore with respect to page content or preview size. diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index 8193ae3004d2..c076b6680501 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -95,8 +95,10 @@ ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent) { FreeResource(); - SetHelpId( HID_SD_UNDODELETEWARNING_DLG ); - maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX ); + // FIXME: HELPID + SetHelpId( ""/*HID_SD_UNDODELETEWARNING_DLG*/ ); + // FIXME: HELPID + maDisableCB.SetHelpId( ""/*HID_SD_UNDODELETEWARNING_CBX*/ ); maYesBtn.SetText(Button::GetStandardText(BUTTON_YES)); maNoBtn.SetText(Button::GetStandardText(BUTTON_NO)); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index aa1a0f53c15a..f6591b15188c 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -133,8 +133,10 @@ ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent) { FreeResource(); - SetHelpId( HID_SD_UNDODELETEWARNING_DLG ); - maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX ); + // FIXME: HELPID + SetHelpId( ""/*HID_SD_UNDODELETEWARNING_DLG*/ ); + // FIXME: HELPID + maDisableCB.SetHelpId( ""/*HID_SD_UNDODELETEWARNING_CBX*/ ); maYesBtn.SetText(Button::GetStandardText(BUTTON_YES)); maNoBtn.SetText(Button::GetStandardText(BUTTON_NO)); diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 18ff686fc612..54d8fa0bcd94 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -597,20 +597,26 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence if (mePageKind == PK_NOTES) { SetHelpId( SID_NOTESMODE ); - GetActiveWindow()->SetHelpId( SID_NOTESMODE ); - GetActiveWindow()->SetUniqueId( SID_NOTESMODE ); + // FIXME: HELPID + GetActiveWindow()->SetHelpId( ""/*SID_NOTESMODE*/ ); + // FIXME: HELPID + GetActiveWindow()->SetUniqueId( ""/*SID_NOTESMODE*/ ); } else if (mePageKind == PK_HANDOUT) { SetHelpId( SID_HANDOUTMODE ); - GetActiveWindow()->SetHelpId( SID_HANDOUTMODE ); - GetActiveWindow()->SetUniqueId( SID_HANDOUTMODE ); + // FIXME: HELPID + GetActiveWindow()->SetHelpId( ""/*SID_HANDOUTMODE*/ ); + // FIXME: HELPID + GetActiveWindow()->SetUniqueId( ""/*SID_HANDOUTMODE*/ ); } else { SetHelpId( SD_IF_SDDRAWVIEWSHELL ); - GetActiveWindow()->SetHelpId( SD_IF_SDDRAWVIEWSHELL ); - GetActiveWindow()->SetUniqueId( SD_IF_SDDRAWVIEWSHELL ); + // FIXME: HELPID + GetActiveWindow()->SetHelpId( ""/*SD_IF_SDDRAWVIEWSHELL*/ ); + // FIXME: HELPID + GetActiveWindow()->SetUniqueId( ""/*SD_IF_SDDRAWVIEWSHELL*/ ); } } diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 4d30831f4e2a..7071ea522002 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -347,16 +347,20 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) if( eDocType == DOCUMENT_TYPE_DRAW ) { SetHelpId( SD_IF_SDGRAPHICVIEWSHELL ); - GetActiveWindow()->SetHelpId( SD_IF_SDGRAPHICVIEWSHELL ); - GetActiveWindow()->SetUniqueId( SD_IF_SDGRAPHICVIEWSHELL ); + // FIXME: HELPID + GetActiveWindow()->SetHelpId( ""/*SD_IF_SDGRAPHICVIEWSHELL*/ ); + // FIXME: HELPID + GetActiveWindow()->SetUniqueId( ""/*SD_IF_SDGRAPHICVIEWSHELL*/ ); } else { if (mePageKind == PK_NOTES) { SetHelpId( SID_NOTESMODE ); - GetActiveWindow()->SetHelpId( SID_NOTESMODE ); - GetActiveWindow()->SetUniqueId( SID_NOTESMODE ); + // FIXME: HELPID + GetActiveWindow()->SetHelpId( ""/*SID_NOTESMODE*/ ); + // FIXME: HELPID + GetActiveWindow()->SetUniqueId( ""/*SID_NOTESMODE*/ ); // AutoLayouts muessen erzeugt sein GetDoc()->StopWorkStartupDelay(); @@ -364,8 +368,10 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) else if (mePageKind == PK_HANDOUT) { SetHelpId( SID_HANDOUTMODE ); - GetActiveWindow()->SetHelpId( SID_HANDOUTMODE ); - GetActiveWindow()->SetUniqueId( SID_HANDOUTMODE ); + // FIXME: HELPID + GetActiveWindow()->SetHelpId( ""/*SID_HANDOUTMODE*/ ); + // FIXME: HELPID + GetActiveWindow()->SetUniqueId( ""/*SID_HANDOUTMODE*/ ); // AutoLayouts muessen erzeugt sein GetDoc()->StopWorkStartupDelay(); @@ -373,8 +379,10 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) else { SetHelpId( SD_IF_SDDRAWVIEWSHELL ); - GetActiveWindow()->SetHelpId( SD_IF_SDDRAWVIEWSHELL ); - GetActiveWindow()->SetUniqueId( SD_IF_SDDRAWVIEWSHELL ); + // FIXME: HELPID + GetActiveWindow()->SetHelpId( ""/*SD_IF_SDDRAWVIEWSHELL*/ ); + // FIXME: HELPID + GetActiveWindow()->SetUniqueId( ""/*SD_IF_SDDRAWVIEWSHELL*/ ); } } diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 1467e6c24bd0..53afc793786e 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -179,8 +179,10 @@ void OutlineViewShell::Construct(DrawDocShell* ) SetName (aName); SetHelpId( SD_IF_SDOUTLINEVIEWSHELL ); - GetActiveWindow()->SetHelpId( SD_IF_SDOUTLINEVIEWSHELL ); - GetActiveWindow()->SetUniqueId( SD_IF_SDOUTLINEVIEWSHELL ); + // FIXME: HELPID + GetActiveWindow()->SetHelpId( ""/*SD_IF_SDOUTLINEVIEWSHELL*/ ); + // FIXME: HELPID + GetActiveWindow()->SetUniqueId( ""/*SD_IF_SDOUTLINEVIEWSHELL*/ ); } diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 679c28bb3a93..68ea51a9a914 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -113,12 +113,14 @@ Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, USH if ( nWinStyle & WB_HSCROLL ) { bHorz = TRUE; - SetHelpId( HID_SD_RULER_HORIZONTAL ); + // FIXME: HELPID + SetHelpId( ""/*HID_SD_RULER_HORIZONTAL*/ ); } else { bHorz = FALSE; - SetHelpId( HID_SD_RULER_VERTICAL ); + // FIXME: HELPID + SetHelpId( ""/*HID_SD_RULER_VERTICAL*/ ); } } diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 7cae5d452a1b..7092fcfc0b7e 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -100,7 +100,8 @@ Window::Window(::Window* pParent) // Hilfe-ID setzen // SetHelpId(HID_SD_WIN_DOCUMENT); - SetUniqueId(HID_SD_WIN_DOCUMENT); + // FIXME: HELPID + SetUniqueId(""/*HID_SD_WIN_DOCUMENT*/); // #i78183# Added after discussed with AF EnableRTL(FALSE); diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index d9d074eee395..1350054bcdb5 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -102,7 +102,8 @@ TabControl::TabControl(DrawViewShell* pViewSh, Window* pParent) : EnableEditMode(); SetSizePixel(Size(0, 0)); SetMaxPageWidth( 150 ); - SetHelpId( HID_SD_TABBAR_PAGES ); + // FIXME: HELPID + SetHelpId( ""/*HID_SD_TABBAR_PAGES*/ ); } /************************************************************************* -- cgit From a381e73c6f0693d2de99a4963343806361a62748 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 13:46:22 +0200 Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids --- .../ext/macromigration/macromigrationpages.cxx | 3 +- dbaccess/source/ui/app/AppController.cxx | 3 +- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 24 ++++++++++----- dbaccess/source/ui/app/AppDetailView.cxx | 24 ++++++++++----- dbaccess/source/ui/app/AppSwapWindow.cxx | 3 +- dbaccess/source/ui/app/AppView.cxx | 9 ++++-- dbaccess/source/ui/browser/dbtreeview.cxx | 3 +- dbaccess/source/ui/browser/unodatbr.cxx | 15 ++++++--- dbaccess/source/ui/control/FieldDescControl.cxx | 3 ++ dbaccess/source/ui/control/RelationControl.cxx | 6 +++- dbaccess/source/ui/control/sqledit.cxx | 3 +- dbaccess/source/ui/dlg/ConnectionPage.cxx | 36 ++++++++++++++-------- dbaccess/source/ui/dlg/adtabdlg.cxx | 9 ++++-- dbaccess/source/ui/dlg/dbwiz.cxx | 15 ++++++--- dbaccess/source/ui/dlg/dbwizsetup.cxx | 15 ++++++--- dbaccess/source/ui/dlg/dlgsave.cxx | 3 +- dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 12 +++++--- dbaccess/source/ui/dlg/sqlmessage.cxx | 10 +++--- dbaccess/source/ui/misc/UITools.cxx | 3 +- dbaccess/source/ui/querydesign/QTableWindow.cxx | 3 +- dbaccess/source/ui/querydesign/QueryTableView.cxx | 3 +- .../source/ui/querydesign/SelectionBrowseBox.cxx | 21 +++++++++---- .../source/ui/relationdesign/RelationTableView.cxx | 3 +- dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 3 +- dbaccess/source/ui/tabledesign/TEditControl.cxx | 15 ++++++--- .../source/ui/tabledesign/TableDesignHelpBar.cxx | 3 +- dbaccess/source/ui/tabledesign/TableDesignView.cxx | 3 +- .../source/ui/tabledesign/TableFieldDescWin.cxx | 6 ++-- reportdesign/source/ui/dlg/AddField.cxx | 6 ++-- reportdesign/source/ui/dlg/Condition.cxx | 6 ++-- reportdesign/source/ui/dlg/GroupsSorting.cxx | 3 +- reportdesign/source/ui/dlg/Navigator.cxx | 3 +- reportdesign/source/ui/report/DesignView.cxx | 3 +- reportdesign/source/ui/report/EndMarker.cxx | 3 +- reportdesign/source/ui/report/ReportSection.cxx | 3 +- reportdesign/source/ui/report/ReportWindow.cxx | 3 +- reportdesign/source/ui/report/SectionWindow.cxx | 3 +- reportdesign/source/ui/report/StartMarker.cxx | 9 ++++-- reportdesign/source/ui/report/ViewsWindow.cxx | 3 +- 39 files changed, 204 insertions(+), 100 deletions(-) diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index 4e35663c5a81..23e45d389671 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -134,7 +134,8 @@ namespace dbmm m_aSaveAsLocation.SetModifyHdl( LINK( this, SaveDBDocPage, OnLocationModified ) ); m_aSaveAsLocation.SetDropDownLineCount( 20 ); - m_aSaveAsLocation.SetHelpId( HID_MACRO_MIGRATION_BACKUP_LOCATION ); + // FIXME: HELPID + m_aSaveAsLocation.SetHelpId( ""/*HID_MACRO_MIGRATION_BACKUP_LOCATION*/ ); impl_updateLocationDependentItems(); } diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index ecc39c7aa169..073de6f00a5a 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -460,7 +460,8 @@ void SAL_CALL OApplicationController::disposing() sal_Bool OApplicationController::Construct(Window* _pParent) { setView( * new OApplicationView( _pParent, getORB(), *this, m_ePreviewMode ) ); - getView()->SetUniqueId(UID_APP_VIEW); + // FIXME: HELPID + getView()->SetUniqueId(""/*UID_APP_VIEW*/); // late construction sal_Bool bSuccess = sal_False; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index afad4e3a2d7c..2da2461f4356 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -307,23 +307,29 @@ OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _r m_aTBPreview.SetOutStyle(TOOLBOX_STYLE_FLAT); m_aTBPreview.InsertItem(SID_DB_APP_DISABLE_PREVIEW,m_aMenu->GetItemText(SID_DB_APP_DISABLE_PREVIEW),TIB_LEFT|TIB_DROPDOWN|TIB_AUTOSIZE|TIB_RADIOCHECK); - m_aTBPreview.SetHelpId(HID_APP_VIEW_PREVIEW_CB); + // FIXME: HELPID + m_aTBPreview.SetHelpId(""/*HID_APP_VIEW_PREVIEW_CB*/); m_aTBPreview.SetDropdownClickHdl( LINK( this, OAppDetailPageHelper, OnDropdownClickHdl ) ); m_aTBPreview.EnableMenuStrings(); m_aTBPreview.Enable(TRUE); - m_aBorder.SetUniqueId(UID_APP_VIEW_PREVIEW_1); + // FIXME: HELPID + m_aBorder.SetUniqueId(""/*UID_APP_VIEW_PREVIEW_1*/); - m_aPreview.SetHelpId(HID_APP_VIEW_PREVIEW_1); + // FIXME: HELPID + m_aPreview.SetHelpId(""/*HID_APP_VIEW_PREVIEW_1*/); m_pTablePreview = new OTablePreviewWindow(&m_aBorder,WB_READONLY | WB_DIALOGCONTROL ); - m_pTablePreview->SetHelpId(HID_APP_VIEW_PREVIEW_2); + // FIXME: HELPID + m_pTablePreview->SetHelpId(""/*HID_APP_VIEW_PREVIEW_2*/); - m_aDocumentInfo.SetHelpId(HID_APP_VIEW_PREVIEW_3); + // FIXME: HELPID + m_aDocumentInfo.SetHelpId(""/*HID_APP_VIEW_PREVIEW_3*/); m_xWindow = VCLUnoHelper::GetInterface( m_pTablePreview ); - SetUniqueId(UID_APP_DETAILPAGE_HELPER); + // FIXME: HELPID + SetUniqueId(""/*UID_APP_DETAILPAGE_HELPER*/); for (int i=0; i < E_ELEMENT_TYPE_COUNT; ++i) m_pLists[i] = NULL; ImplInitSettings(); @@ -703,7 +709,8 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon ,getBorderWin().getView()->getORB() ,WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP ,sal_False); - pTreeView->SetHelpId(HID_APP_TABLE_TREE); + // FIXME: HELPID + pTreeView->SetHelpId(""/*HID_APP_TABLE_TREE*/); m_pLists[E_TABLE] = pTreeView; ImageProvider aImageProvider( _xConnection ); @@ -881,7 +888,10 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC ) { DBTreeListBox* pTreeView = new DBTreeListBox(this,getBorderWin().getView()->getORB(),WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP); + // FIXME: HELPID + #if 0 pTreeView->SetHelpId(_nHelpId); + #endif return createTree( pTreeView, _rImage, _rImageHC ); } diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 9908134b8e1c..b7ce02485bc6 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -406,11 +406,15 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView ,m_pDetailView(_pDetailView) { DBG_CTOR(OTasksWindow,NULL); - SetUniqueId(UID_APP_TASKS_WINDOW); - m_aCreation.SetHelpId(HID_APP_CREATION_LIST); + // FIXME: HELPID + SetUniqueId(""/*UID_APP_TASKS_WINDOW*/); + // FIXME: HELPID + m_aCreation.SetHelpId(""/*HID_APP_CREATION_LIST*/); m_aCreation.SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl)); - m_aHelpText.SetHelpId(HID_APP_HELP_TEXT); - m_aDescription.SetHelpId(HID_APP_DESCRIPTION_TEXT); + // FIXME: HELPID + m_aHelpText.SetHelpId(""/*HID_APP_HELP_TEXT*/); + // FIXME: HELPID + m_aDescription.SetHelpId(""/*HID_APP_DESCRIPTION_TEXT*/); m_aDescription.SetText(ModuleRes(STR_DESCRIPTION)); ImplInitSettings(sal_True,sal_True,sal_True); } @@ -600,7 +604,8 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe ,m_rBorderWin(_rParent) { DBG_CTOR(OApplicationDetailView,NULL); - SetUniqueId(UID_APP_DETAIL_VIEW); + // FIXME: HELPID + SetUniqueId(""/*UID_APP_DETAIL_VIEW*/); ImplInitSettings( sal_True, sal_True, sal_True ); m_pControlHelper = new OAppDetailPageHelper(&m_aContainer,m_rBorderWin,_ePreviewMode); @@ -611,10 +616,12 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe pTasks->Show(); pTasks->Disable(m_rBorderWin.getView()->getCommandController().isDataSourceReadOnly()); m_aTasks.setChildWindow(pTasks); - m_aTasks.SetUniqueId(UID_APP_TASKS_VIEW); + // FIXME: HELPID + m_aTasks.SetUniqueId(""/*UID_APP_TASKS_VIEW*/); m_aTasks.Show(); - m_aContainer.SetUniqueId(UID_APP_CONTAINER_VIEW); + // FIXME: HELPID + m_aContainer.SetUniqueId(""/*UID_APP_CONTAINER_VIEW*/); m_aContainer.Show(); const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width(); @@ -623,7 +630,8 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe set(&m_aContainer,&m_aTasks); m_aHorzSplitter.Show(); - m_aHorzSplitter.SetUniqueId(UID_APP_VIEW_HORZ_SPLIT); + // FIXME: HELPID + m_aHorzSplitter.SetUniqueId(""/*UID_APP_VIEW_HORZ_SPLIT*/); setSplitter(&m_aHorzSplitter); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index ae9ca3f5d93e..6ecb2d0e4701 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -81,7 +81,8 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind m_aIconControl.SetClickHdl(LINK(this, OApplicationSwapWindow, OnContainerSelectHdl)); m_aIconControl.setControlActionListener( &m_rBorderWin.getView()->getAppController() ); - m_aIconControl.SetHelpId(HID_APP_SWAP_ICONCONTROL); + // FIXME: HELPID + m_aIconControl.SetHelpId(""/*HID_APP_SWAP_ICONCONTROL*/); m_aIconControl.Show(); //m_aIconControl.Enable(TRUE); } diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index e049f60d0f13..d6a53cc112f4 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -138,10 +138,12 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev m_pPanel->SetBorderStyle(WINDOW_BORDER_MONO); OApplicationSwapWindow* pSwap = new OApplicationSwapWindow( m_pPanel, *this ); pSwap->Show(); - pSwap->SetUniqueId(UID_APP_SWAP_VIEW); + // FIXME: HELPID + pSwap->SetUniqueId(""/*UID_APP_SWAP_VIEW*/); m_pPanel->setChildWindow(pSwap); - m_pPanel->SetUniqueId(UID_APP_DATABASE_VIEW); + // FIXME: HELPID + m_pPanel->SetUniqueId(""/*UID_APP_DATABASE_VIEW*/); m_pPanel->Show(); m_pDetailView = new OApplicationDetailView(*this,_ePreviewMode); @@ -284,7 +286,8 @@ OApplicationView::OApplicationView( Window* pParent } m_pWin = new OAppBorderWindow(this,_ePreviewMode); - m_pWin->SetUniqueId(UID_APP_VIEW_BORDER_WIN); + // FIXME: HELPID + m_pWin->SetUniqueId(""/*UID_APP_VIEW_BORDER_WIN*/); m_pWin->Show(); ImplInitSettings(); diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index 65185f9f3e73..8129c67afd0f 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -64,7 +64,8 @@ DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory > m_pTreeListBox->EnableCheckButton(NULL); m_pTreeListBox->SetDragDropMode( 0 ); m_pTreeListBox->EnableInplaceEditing( sal_True ); - m_pTreeListBox->SetHelpId(HID_TLB_TREELISTBOX); + // FIXME: HELPID + m_pTreeListBox->SetHelpId(""/*HID_TLB_TREELISTBOX*/); m_pTreeListBox->Show(); } diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index f5880cf804de..3b111cbb869d 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -393,7 +393,8 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent) m_pTreeView->getListBox().setContextMenuProvider( this ); m_pTreeView->getListBox().setControlActionListener( this ); - m_pTreeView->SetHelpId(HID_CTL_TREEVIEW); + // FIXME: HELPID + m_pTreeView->SetHelpId(""/*HID_CTL_TREEVIEW*/); // a default pos for the splitter, so that the listbox is about 80 (logical) pixels wide m_pSplitter->SetSplitPosPixel( getBrowserView()->LogicToPixel( ::Size( 80, 0 ), MAP_APPFONT ).Width() ); @@ -409,11 +410,15 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent) m_pTreeView->setSelChangeHdl( LINK( this, SbaTableQueryBrowser, OnSelectionChange ) ); // TODO - getBrowserView()->getVclControl()->GetDataWindow().SetUniqueId(UID_DATABROWSE_DATAWINDOW); - getBrowserView()->getVclControl()->SetHelpId(HID_CTL_TABBROWSER); - getBrowserView()->SetUniqueId(UID_CTL_CONTENT); + // FIXME: HELPID + getBrowserView()->getVclControl()->GetDataWindow().SetUniqueId(""/*UID_DATABROWSE_DATAWINDOW*/); + // FIXME: HELPID + getBrowserView()->getVclControl()->SetHelpId(""/*HID_CTL_TABBROWSER*/); + // FIXME: HELPID + getBrowserView()->SetUniqueId(""/*UID_CTL_CONTENT*/); if (getBrowserView()->getVclControl()->GetHeaderBar()) - getBrowserView()->getVclControl()->GetHeaderBar()->SetHelpId(HID_DATABROWSE_HEADER); + // FIXME: HELPID + getBrowserView()->getVclControl()->GetHeaderBar()->SetHelpId(""/*HID_DATABROWSE_HEADER*/); InvalidateFeature(ID_BROWSER_EXPLORER); } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index c2c8affcd4a8..a8eec1c463fb 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1072,7 +1072,10 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) // ----------------------------------------------------------------------------- void OFieldDescControl::InitializeControl(Control* _pControl,ULONG _nHelpId,bool _bAddChangeHandler) { + // FIXME: HELPID + #if 0 _pControl->SetHelpId(_nHelpId); + #endif if ( _bAddChangeHandler ) ((OPropListBoxCtrl*)_pControl)->SetSelectHdl(LINK(this,OFieldDescControl,ChangeHdl)); diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 14bbe171c613..72c36f9a8cd5 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -367,7 +367,10 @@ namespace dbaui m_pListCell->SelectEntry( sName ); } + // FIXME: HELPID + #if 0 m_pListCell->SetHelpId(nHelpId); + #endif } } @@ -505,7 +508,8 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent , m_pParentDialog(_pParentDialog) { m_pRC_Tables = new ORelationControl( this,m_pTableMap ); - m_pRC_Tables->SetHelpId(HID_RELDLG_KEYFIELDS); + // FIXME: HELPID + m_pRC_Tables->SetHelpId(""/*HID_RELDLG_KEYFIELDS*/); m_pRC_Tables->Init( ); m_pRC_Tables->SetZOrder(&m_lmbRightTable, WINDOW_ZORDER_BEHIND); diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index 1945557c2999..ac031d635cea 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -52,7 +52,8 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) : ,m_bStopTimer(sal_False ) { DBG_CTOR(OSqlEdit,NULL); - SetHelpId( HID_CTL_QRYSQLEDIT ); + // FIXME: HELPID + SetHelpId( ""/*HID_CTL_QRYSQLEDIT*/ ); SetModifyHdl( LINK(this, OSqlEdit, ModifyHdl) ); m_timerUndoActionCreation.SetTimeout(1000); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index dac80070a640..8a49ceb7e59b 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -244,19 +244,23 @@ namespace dbaui { case ::dbaccess::DST_DBASE: m_aFT_Connection.SetText(String(ModuleRes(STR_DBASE_PATH_OR_FILE))); - m_aConnectionURL.SetHelpId(HID_DSADMIN_DBASE_PATH); + // FIXME: HELPID + m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_DBASE_PATH*/); break; case ::dbaccess::DST_FLAT: m_aFT_Connection.SetText(String(ModuleRes(STR_FLAT_PATH_OR_FILE))); - m_aConnectionURL.SetHelpId(HID_DSADMIN_FLAT_PATH); + // FIXME: HELPID + m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_FLAT_PATH*/); break; case ::dbaccess::DST_CALC: m_aFT_Connection.SetText(String(ModuleRes(STR_CALC_PATH_OR_FILE))); - m_aConnectionURL.SetHelpId(HID_DSADMIN_CALC_PATH); + // FIXME: HELPID + m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_CALC_PATH*/); break; case ::dbaccess::DST_ADABAS: m_aFT_Connection.SetText(String(ModuleRes(STR_ADABAS_DATABASE_NAME))); - m_aConnectionURL.SetHelpId(HID_DSADMIN_ADABAS_DATABASE); + // FIXME: HELPID + m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_ADABAS_DATABASE*/); break; case ::dbaccess::DST_ADO: m_aFT_Connection.SetText(String(ModuleRes(STR_COMMONURL))); @@ -264,33 +268,40 @@ namespace dbaui case ::dbaccess::DST_MSACCESS: case ::dbaccess::DST_MSACCESS_2007: m_aFT_Connection.SetText(String(ModuleRes(STR_MSACCESS_MDB_FILE))); - m_aConnectionURL.SetHelpId(HID_DSADMIN_MSACCESS_MDB_FILE); + // FIXME: HELPID + m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_MSACCESS_MDB_FILE*/); break; case ::dbaccess::DST_MYSQL_NATIVE: case ::dbaccess::DST_MYSQL_JDBC: m_aFT_Connection.SetText(String(ModuleRes(STR_MYSQL_DATABASE_NAME))); - m_aConnectionURL.SetHelpId( HID_DSADMIN_MYSQL_DATABASE ); + // FIXME: HELPID + m_aConnectionURL.SetHelpId( ""/*HID_DSADMIN_MYSQL_DATABASE*/ ); break; case ::dbaccess::DST_ORACLE_JDBC: m_aFT_Connection.SetText(String(ModuleRes(STR_ORACLE_DATABASE_NAME))); - m_aConnectionURL.SetHelpId(HID_DSADMIN_ORACLE_DATABASE); + // FIXME: HELPID + m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_ORACLE_DATABASE*/); break; case ::dbaccess::DST_MYSQL_ODBC: case ::dbaccess::DST_ODBC: m_aFT_Connection.SetText(String(ModuleRes(STR_NAME_OF_ODBC_DATASOURCE))); - m_aConnectionURL.SetHelpId( eType == ::dbaccess::DST_MYSQL_ODBC ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE : HID_DSADMIN_ODBC_DATASOURCE); + // FIXME: HELPID + m_aConnectionURL.SetHelpId( ""/*eType == ::dbaccess::DST_MYSQL_ODBC ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE : HID_DSADMIN_ODBC_DATASOURCE*/); break; case ::dbaccess::DST_LDAP: m_aFT_Connection.SetText(String(ModuleRes(STR_HOSTNAME))); - m_aConnectionURL.SetHelpId( HID_DSADMIN_LDAP_HOSTNAME ); + // FIXME: HELPID + m_aConnectionURL.SetHelpId( ""/*HID_DSADMIN_LDAP_HOSTNAME*/ ); break; case ::dbaccess::DST_MOZILLA: m_aFT_Connection.SetText(String(ModuleRes(STR_MOZILLA_PROFILE_NAME))); - m_aConnectionURL.SetHelpId( HID_DSADMIN_MOZILLA_PROFILE_NAME ); + // FIXME: HELPID + m_aConnectionURL.SetHelpId( ""/*HID_DSADMIN_MOZILLA_PROFILE_NAME*/ ); break; case ::dbaccess::DST_THUNDERBIRD: m_aFT_Connection.SetText(String(ModuleRes(STR_THUNDERBIRD_PROFILE_NAME))); - m_aConnectionURL.SetHelpId( HID_DSADMIN_THUNDERBIRD_PROFILE_NAME ); + // FIXME: HELPID + m_aConnectionURL.SetHelpId( ""/*HID_DSADMIN_THUNDERBIRD_PROFILE_NAME*/ ); break; case ::dbaccess::DST_OUTLOOK: case ::dbaccess::DST_OUTLOOKEXP: @@ -320,7 +331,8 @@ namespace dbaui bool bShowUserAuthenfication = ( eAuthMode != AuthNone ); bool bShowUser = ( eAuthMode == AuthUserPwd ); - m_aPB_Connection.SetHelpId(HID_DSADMIN_BROWSECONN); + // FIXME: HELPID + m_aPB_Connection.SetHelpId(""/*HID_DSADMIN_BROWSECONN*/); m_aFL2.Show( bShowUserAuthenfication ); m_aUserNameLabel.Show( bShowUser && bShowUserAuthenfication ); m_aUserName.Show( bShowUser && bShowUserAuthenfication ); diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index a4914cd45cc5..5f0e7628876e 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -360,10 +360,13 @@ OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext ) // der Close-Button hat schon einen Standard-Help-Text, den ich aber hier nicht haben moechte, also den Text ruecksetzen // und eine neue ID verteilen aCloseButton.SetHelpText(String()); - aCloseButton.SetHelpId(HID_JOINSH_ADDTAB_CLOSE); + // FIXME: HELPID + aCloseButton.SetHelpId(""/*HID_JOINSH_ADDTAB_CLOSE*/); - m_aTableList.SetHelpId( HID_JOINSH_ADDTAB_TABLELIST ); - m_aQueryList.SetHelpId( HID_JOINSH_ADDTAB_QUERYLIST ); + // FIXME: HELPID + m_aTableList.SetHelpId( ""/*HID_JOINSH_ADDTAB_TABLELIST*/ ); + // FIXME: HELPID + m_aQueryList.SetHelpId( ""/*HID_JOINSH_ADDTAB_QUERYLIST*/ ); ////////////////////////////////////////////////////////////////////// m_aCaseTables.SetClickHdl( LINK( this, OAddTableDlg, OnTypeSelected ) ); diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index cdecbd295df6..78fe8aef1f84 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -145,11 +145,16 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent enableButtons(WZB_FINISH, sal_False); enableAutomaticNextButtonState( true ); - m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS); - m_pNextPage->SetHelpId(HID_DBWIZ_NEXT); - m_pCancel->SetHelpId(HID_DBWIZ_CANCEL); - m_pFinish->SetHelpId(HID_DBWIZ_FINISH); - m_pHelp->SetUniqueId(UID_DBWIZ_HELP); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_DBWIZ_PREVIOUS*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_DBWIZ_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_DBWIZ_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_DBWIZ_FINISH*/); + // FIXME: HELPID + m_pHelp->SetUniqueId(""/*UID_DBWIZ_HELP*/); // no local resources needed anymore DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _pItems->GetItem(DSID_TYPECOLLECTION)); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 5a601bd56c92..c2bf98061782 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -318,11 +318,16 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent aPath.push_back(PAGE_DBSETUPWIZARD_INTRO); declarePath( static_cast(m_pCollection->size()+1), aPath); - m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS); - m_pNextPage->SetHelpId(HID_DBWIZ_NEXT); - m_pCancel->SetHelpId(HID_DBWIZ_CANCEL); - m_pFinish->SetHelpId(HID_DBWIZ_FINISH); - m_pHelp->SetUniqueId(UID_DBWIZ_HELP); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_DBWIZ_PREVIOUS*/); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_DBWIZ_NEXT*/); + // FIXME: HELPID + m_pCancel->SetHelpId(""/*HID_DBWIZ_CANCEL*/); + // FIXME: HELPID + m_pFinish->SetHelpId(""/*HID_DBWIZ_FINISH*/); + // FIXME: HELPID + m_pHelp->SetUniqueId(""/*UID_DBWIZ_HELP*/); SetRoadmapInteractive( sal_True ); ActivatePage(); } diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index ee6b853b5eed..db0542525aa3 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -470,7 +470,8 @@ void OSaveAsDlg::implInit() else if ( SAD_TITLE_RENAME == ( m_pImpl->m_nFlags & SAD_TITLE_RENAME ) ) { SetText( String( ModuleRes( STR_TITLE_RENAME ) ) ); - m_pImpl->m_aTitle.SetHelpId(HID_DLG_RENAME); + // FIXME: HELPID + m_pImpl->m_aTitle.SetHelpId(""/*HID_DLG_RENAME*/); } m_pImpl->m_aPB_OK.SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl)); diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index ef715d8061cd..aa1dd1d3e002 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -128,8 +128,10 @@ DBG_NAME(IndexFieldsControl) { DBG_CTOR(IndexFieldsControl,NULL); - SetUniqueId( UID_DLGINDEX_INDEXDETAILS_BACK ); - GetDataWindow().SetUniqueId( UID_DLGINDEX_INDEXDETAILS_MAIN ); + // FIXME: HELPID + SetUniqueId( ""/*UID_DLGINDEX_INDEXDETAILS_BACK*/ ); + // FIXME: HELPID + GetDataWindow().SetUniqueId( ""/*UID_DLGINDEX_INDEXDETAILS_MAIN*/ ); } //------------------------------------------------------------------ @@ -290,8 +292,10 @@ DBG_NAME(IndexFieldsControl) m_pSortingCell->InsertEntry(m_sAscendingText); m_pSortingCell->InsertEntry(m_sDescendingText); - m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD ); - m_pSortingCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_SORTORDER ); + // FIXME: HELPID + m_pFieldNameCell->SetHelpId( ""/*HID_DLGINDEX_INDEXDETAILS_FIELD*/ ); + // FIXME: HELPID + m_pSortingCell->SetHelpId( ""/*HID_DLGINDEX_INDEXDETAILS_SORTORDER*/ ); } //------------------------------------------------------------------ diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index f7600fd137ed..34f26083c913 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -689,11 +689,8 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle ) { lcl_addButton( *this, BUTTON_HELP, false ); - SmartId aHelpId( m_sHelpURL ); - if ( m_sHelpURL.indexOfAsciiL( "HID:", 4 ) == 0 ) - aHelpId = SmartId( m_sHelpURL.copy( 4 ).toInt32() ); - - SetSmartHelpId( aHelpId ); + // FIXME: HELPID + SetHelpId( rtl::OUStringToOString( m_sHelpURL, RTL_TEXTENCODING_UTF8 ) ); } } @@ -726,7 +723,8 @@ void OSQLMessageBox::impl_addDetailsButton() PushButton* pButton = GetPushButton( BUTTONID_MORE ); OSL_ENSURE( pButton, "OSQLMessageBox::impl_addDetailsButton: just added this button, why isn't it there?" ); pButton->SetClickHdl( LINK( this, OSQLMessageBox, ButtonClickHdl ) ); - pButton->SetUniqueId( UID_SQLERROR_BUTTONMORE ); + // FIXME: HELPID + pButton->SetUniqueId( ""/*UID_SQLERROR_BUTTONMORE*/ ); } } diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 930dd089951a..4979718ad41f 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1651,7 +1651,8 @@ sal_Int32 askForUserAction(Window* _pParent,USHORT _nTitle,USHORT _nText,sal_Boo if ( _bAll ) { aAsk.AddButton(String(ModuleRes(STR_BUTTON_TEXT_ALL)), RET_ALL, 0); - aAsk.GetPushButton(RET_ALL)->SetHelpId(HID_CONFIRM_DROP_BUTTON_ALL); + // FIXME: HELPID + aAsk.GetPushButton(RET_ALL)->SetHelpId(""/*HID_CONFIRM_DROP_BUTTON_ALL*/); } return aAsk.Execute(); } diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index f22d6f64ee87..d06c45cfce3a 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -119,7 +119,8 @@ OQueryTableWindow::OQueryTableWindow( Window* pParent, const TTableWindowData::v if (m_strInitialAlias == pTabWinData->GetTableName()) m_strInitialAlias = ::rtl::OUString(); - SetHelpId(HID_CTL_QRYDGNTAB); + // FIXME: HELPID + SetHelpId(""/*HID_CTL_QRYDGNTAB*/); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index c083392a9613..e61d0b52fc84 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -310,7 +310,8 @@ OQueryTableView::OQueryTableView( Window* pParent,OQueryDesignView* pView) : OJoinTableView( pParent,pView) { DBG_CTOR(OQueryTableView,NULL); - SetHelpId(HID_CTL_QRYDGNTAB); + // FIXME: HELPID + SetHelpId(""/*HID_CTL_QRYDGNTAB*/); } //------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 7bded25d5a7d..3822cd263002 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -173,7 +173,8 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) ,m_bInUndoMode(sal_False) { DBG_CTOR(OSelectionBrowseBox,NULL); - SetHelpId(HID_CTL_QRYDGNCRIT); + // FIXME: HELPID + SetHelpId(""/*HID_CTL_QRYDGNCRIT*/); m_nMode = BROWSER_COLUMNSELECTION | BROWSER_HIDESELECT | BROWSER_KEEPSELECTION | BROWSER_HIDECURSOR @@ -188,11 +189,16 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) m_pOrderCell = new ListBoxControl(&GetDataWindow()); m_pFunctionCell = new ListBoxControl(&GetDataWindow()); m_pFunctionCell->SetDropDownLineCount( 20 ); - m_pVisibleCell->SetHelpId(HID_QRYDGN_ROW_VISIBLE); - m_pTableCell->SetHelpId(HID_QRYDGN_ROW_TABLE); - m_pFieldCell->SetHelpId(HID_QRYDGN_ROW_FIELD); - m_pOrderCell->SetHelpId(HID_QRYDGN_ROW_ORDER); - m_pFunctionCell->SetHelpId(HID_QRYDGN_ROW_FUNCTION); + // FIXME: HELPID + m_pVisibleCell->SetHelpId(""/*HID_QRYDGN_ROW_VISIBLE*/); + // FIXME: HELPID + m_pTableCell->SetHelpId(""/*HID_QRYDGN_ROW_TABLE*/); + // FIXME: HELPID + m_pFieldCell->SetHelpId(""/*HID_QRYDGN_ROW_FIELD*/); + // FIXME: HELPID + m_pOrderCell->SetHelpId(""/*HID_QRYDGN_ROW_ORDER*/); + // FIXME: HELPID + m_pFunctionCell->SetHelpId(""/*HID_QRYDGN_ROW_FUNCTION*/); ////////////////////////////////////////////////////////////////////// // TriState der ::com::sun::star::form::CheckBox abschalten @@ -2709,10 +2715,13 @@ void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,c enableControl(_rEntry,m_pTextCell); + // FIXME: HELPID + #if 0 if (m_pTextCell->GetHelpId() != _nHelpId) // da TextCell in verschiedenen Kontexten verwendet wird, muss ich den gecachten HelpText loeschen m_pTextCell->SetHelpText(String()); m_pTextCell->SetHelpId(_nHelpId); + #endif } // ----------------------------------------------------------------------------- void OSelectionBrowseBox::invalidateUndoRedo() diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index e14c234cc5d3..c422ea5cf1e1 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -101,7 +101,8 @@ ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pV { DBG_CTOR(ORelationTableView,NULL); - SetHelpId(HID_CTL_RELATIONTAB); + // FIXME: HELPID + SetHelpId(""/*HID_CTL_RELATIONTAB*/); } //------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 727de7fe60ea..8d5edcdacd1b 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -62,7 +62,8 @@ OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp { DBG_CTOR(OFieldDescGenWin,NULL); m_pFieldControl = new OTableFieldControl(this,pHelp); - m_pFieldControl->SetHelpId(HID_TAB_DESIGN_FIELDCONTROL); + // FIXME: HELPID + m_pFieldControl->SetHelpId(""/*HID_TAB_DESIGN_FIELDCONTROL*/); m_pFieldControl->Show(); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 40741ac02bb7..4590d7b9082b 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -246,8 +246,10 @@ OTableEditorCtrl::OTableEditorCtrl(Window* pWindow) { DBG_CTOR(OTableEditorCtrl,NULL); - SetHelpId(HID_TABDESIGN_BACKGROUND); - GetDataWindow().SetHelpId(HID_CTL_TABLEEDIT); + // FIXME: HELPID + SetHelpId(""/*HID_TABDESIGN_BACKGROUND*/); + // FIXME: HELPID + GetDataWindow().SetHelpId(""/*HID_CTL_TABLEEDIT*/); m_pRowList = GetView()->getController().getRows(); m_nDataPos = 0; @@ -342,9 +344,12 @@ void OTableEditorCtrl::InitCellController() pDescrCell = new Edit( &GetDataWindow(), WB_LEFT ); pDescrCell->SetMaxTextLen( MAX_DESCR_LEN ); - pNameCell->SetHelpId(HID_TABDESIGN_NAMECELL); - pTypeCell->SetHelpId(HID_TABDESIGN_TYPECELL); - pDescrCell->SetHelpId(HID_TABDESIGN_COMMENTCELL); + // FIXME: HELPID + pNameCell->SetHelpId(""/*HID_TABDESIGN_NAMECELL*/); + // FIXME: HELPID + pTypeCell->SetHelpId(""/*HID_TABDESIGN_TYPECELL*/); + // FIXME: HELPID + pDescrCell->SetHelpId(""/*HID_TABDESIGN_COMMENTCELL*/); Size aHeight; const Control* pControls[] = { pTypeCell,pDescrCell,pNameCell}; diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index c2326e441c95..183bcb8fca71 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -52,7 +52,8 @@ OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) : { DBG_CTOR(OTableDesignHelpBar,NULL); m_pTextWin = new MultiLineEdit( this, WB_VSCROLL | WB_LEFT | WB_BORDER | WB_NOTABSTOP | WB_READONLY); - m_pTextWin->SetHelpId(HID_TABLE_DESIGN_HELP_WINDOW); + // FIXME: HELPID + m_pTextWin->SetHelpId(""/*HID_TABLE_DESIGN_HELP_WINDOW*/); m_pTextWin->SetReadOnly(); m_pTextWin->SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() ); m_pTextWin->Show(); diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index f16624dbdad2..ce106ee74952 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -90,7 +90,8 @@ OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORD m_pEditorCtrl = new OTableEditorCtrl( this); m_pFieldDescWin = new OTableFieldDescWin( this ); - m_pFieldDescWin->SetHelpId(HID_TAB_DESIGN_DESCWIN); + // FIXME: HELPID + m_pFieldDescWin->SetHelpId(""/*HID_TAB_DESIGN_DESCWIN*/); // set depending windows and controls m_pEditorCtrl->SetDescrWin(m_pFieldDescWin); diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 6f136ab0b4e8..3f60dd06f4b5 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -93,11 +93,13 @@ OTableFieldDescWin::OTableFieldDescWin( Window* pParent) ////////////////////////////////////////////////////////////////////// // HelpBar m_pHelpBar = new OTableDesignHelpBar( this ); - m_pHelpBar->SetHelpId(HID_TAB_DESIGN_HELP_TEXT_FRAME); + // FIXME: HELPID + m_pHelpBar->SetHelpId(""/*HID_TAB_DESIGN_HELP_TEXT_FRAME*/); m_pHelpBar->Show(); m_pGenPage = new OFieldDescGenWin( this, m_pHelpBar ); - getGenPage()->SetHelpId( HID_TABLE_DESIGN_TABPAGE_GENERAL ); + // FIXME: HELPID + getGenPage()->SetHelpId( ""/*HID_TABLE_DESIGN_TABPAGE_GENERAL*/ ); getGenPage()->Show(); } diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index dc6681bbd1e6..f52a7c3e0fda 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -117,7 +117,8 @@ OAddFieldWindowListBox::OAddFieldWindowListBox( OAddFieldWindow* _pParent ) ,m_pTabWin( _pParent ) { DBG_CTOR( rpt_OAddFieldWindowListBox,NULL); - SetHelpId( HID_RPT_FIELD_SEL ); + // FIXME: HELPID + SetHelpId( ""/*HID_RPT_FIELD_SEL*/ ); SetSelectionMode(MULTIPLE_SELECTION); SetDragDropMode( 0xFFFF ); SetHighlightRange( ); @@ -177,7 +178,8 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent ,m_pContainerListener(NULL) { DBG_CTOR( rpt_OAddFieldWindow,NULL); - SetHelpId( HID_RPT_FIELD_SEL_WIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_RPT_FIELD_SEL_WIN*/ ); SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) ); SetMinOutputSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y)); diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index e3591ae03534..63fe50c1e343 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -147,8 +147,10 @@ OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition) ,m_nSlotId(0) ,m_aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ) { - m_aColorSet.SetHelpId( HID_RPT_POPUP_COLOR_CTRL ); - SetHelpId( HID_RPT_POPUP_COLOR ); + // FIXME: HELPID + m_aColorSet.SetHelpId( ""/*HID_RPT_POPUP_COLOR_CTRL*/ ); + // FIXME: HELPID + SetHelpId( ""/*HID_RPT_POPUP_COLOR*/ ); const Size aSize12( 13, 13 ); ::std::auto_ptr pColorTable(new XColorTable( SvtPathOptions().GetPalettePath() )); short i = 0; diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 7e83adbb4e49..8de734760bd3 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -366,7 +366,8 @@ void OFieldExpressionControl::lateInit() m_pComboCell = new ComboBoxControl( &GetDataWindow() ); m_pComboCell->SetSelectHdl(LINK(this,OFieldExpressionControl,CBChangeHdl)); - m_pComboCell->SetHelpId(HID_RPT_FIELDEXPRESSION); + // FIXME: HELPID + m_pComboCell->SetHelpId(""/*HID_RPT_FIELDEXPRESSION*/); Control* pControls[] = {m_pComboCell}; for (size_t i = 0; i < sizeof(pControls)/sizeof(pControls[0]); ++i) diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index af61f3b6d514..56ddb2f26141 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -240,7 +240,8 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController ) m_pSelectionListener = new OSelectionChangeMultiplexer(this,&m_rController); - SetHelpId( HID_REPORT_NAVIGATOR_TREE ); + // FIXME: HELPID + SetHelpId( ""/*HID_REPORT_NAVIGATOR_TREE*/ ); m_aNavigatorImages = ImageList( ModuleRes( RID_SVXIMGLIST_RPTEXPL ) ); m_aNavigatorImagesHC = ImageList( ModuleRes( RID_SVXIMGLIST_RPTEXPL_HC ) ); diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 37a67f99eb63..477f40c8151a 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -163,7 +163,8 @@ ODesignView::ODesignView( Window* pParent, ,m_bDeleted( FALSE ) { DBG_CTOR( rpt_ODesignView,NULL); - SetHelpId(UID_RPT_RPT_APP_VIEW); + // FIXME: HELPID + SetHelpId(""/*UID_RPT_RPT_APP_VIEW*/); ImplInitSettings(); SetMapMode( MapMode( MAP_100TH_MM ) ); diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index c32a07d5fc76..40849726ffea 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -44,7 +44,8 @@ OEndMarker::OEndMarker(Window* _pParent ,const ::rtl::OUString& _sColorEntry) : OColorListener(_pParent,_sColorEntry) { DBG_CTOR( rpt_OEndMarker,NULL); - SetUniqueId(HID_RPT_ENDMARKER); + // FIXME: HELPID + SetUniqueId(""/*HID_RPT_ENDMARKER*/); ImplInitSettings(); SetPaintTransparent(TRUE); } diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 04222d6e2f1e..1239c133961f 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -101,7 +101,8 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re { DBG_CTOR( rpt_OReportSection,NULL); EnableChildTransparentMode(); - SetHelpId(HID_REPORTSECTION); + // FIXME: HELPID + SetHelpId(""/*HID_REPORTSECTION*/); SetMapMode( MapMode( MAP_100TH_MM ) ); try diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index 3a2f4559b43a..af1ebfaf8c19 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -72,7 +72,8 @@ OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) ,m_pObjFac( new DlgEdFactory() ) { DBG_CTOR( rpt_OReportWindow,NULL); - SetHelpId(UID_RPT_REPORTWINDOW); + // FIXME: HELPID + SetHelpId(""/*UID_RPT_REPORTWINDOW*/); SetMapMode( MapMode( MAP_100TH_MM ) ); m_aViewsWindow.Show(); diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index d0bbb2fd27a6..c80072fd3276 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -64,7 +64,8 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep ,m_aEndMarker( this,_sColorEntry) { DBG_CTOR( rpt_OSectionWindow,NULL); - SetUniqueId(UID_RPT_SECTIONSWINDOW); + // FIXME: HELPID + SetUniqueId(""/*UID_RPT_SECTIONSWINDOW*/); const MapMode& rMapMode = _pParent->GetMapMode(); SetMapMode( rMapMode ); ImplInitSettings(); diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index c3fed866e534..2afbb31d3535 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -65,13 +65,16 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const ::rtl::OUString& _sCol ,m_bShowRuler(sal_True) { DBG_CTOR( rpt_OStartMarker,NULL); - SetUniqueId(HID_RPT_STARTMARKER); + // FIXME: HELPID + SetUniqueId(""/*HID_RPT_STARTMARKER*/); osl_incrementInterlockedCount(&s_nImageRefCount); initDefaultNodeImages(); ImplInitSettings(); - m_aText.SetHelpId(HID_RPT_START_TITLE); - m_aImage.SetHelpId(HID_RPT_START_IMAGE); + // FIXME: HELPID + m_aText.SetHelpId(""/*HID_RPT_START_TITLE*/); + // FIXME: HELPID + m_aImage.SetHelpId(""/*HID_RPT_START_IMAGE*/); m_aText.Show(); m_aImage.Show(); m_aVRuler.Show(); diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index bcd50236aab3..770fcdb764d4 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -185,7 +185,8 @@ OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow) { DBG_CTOR( rpt_OViewsWindow,NULL); SetPaintTransparent(TRUE); - SetUniqueId(UID_RPT_VIEWSWINDOW); + // FIXME: HELPID + SetUniqueId(""/*UID_RPT_VIEWSWINDOW*/); SetMapMode( MapMode( MAP_100TH_MM ) ); m_aColorConfig.AddListener(this); ImplInitSettings(); -- cgit From 095647164a0f6cdd3d85fc29cbeb089f65179c4b Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 13:46:22 +0200 Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids --- .../dialogs/ChartTypeDialogController.cxx | 3 ++- chart2/source/controller/dialogs/DataBrowser.cxx | 3 ++- .../controller/dialogs/dlg_CreationWizard.cxx | 3 ++- .../source/controller/dialogs/dlg_DataSource.cxx | 3 ++- .../controller/dialogs/dlg_InsertAxis_Grid.cxx | 21 ++++++++++----- .../source/controller/dialogs/tp_TitleRotation.cxx | 3 ++- .../dialogs/tp_Wizard_TitlesAndObjects.cxx | 9 ++++--- chart2/source/controller/main/ChartWindow.cxx | 3 ++- sc/source/ui/app/inputwin.cxx | 30 ++++++++++++++-------- sc/source/ui/app/scmod.cxx | 27 ++++++++++++------- sc/source/ui/dbgui/dpgroupdlg.cxx | 3 ++- sc/source/ui/dbgui/pvfundlg.cxx | 3 ++- sc/source/ui/dbgui/pvlaydlg.cxx | 15 +++++++---- sc/source/ui/docshell/docsh4.cxx | 6 +++-- sc/source/ui/miscdlgs/anyrefdg.cxx | 3 +++ sc/source/ui/miscdlgs/linkarea.cxx | 3 ++- sc/source/ui/miscdlgs/shtabdlg.cxx | 6 +++-- sc/source/ui/miscdlgs/solveroptions.cxx | 3 ++- sc/source/ui/miscdlgs/strindlg.cxx | 21 ++++++++++----- sc/source/ui/miscdlgs/warnbox.cxx | 3 ++- sc/source/ui/navipi/scenwnd.cxx | 6 +++-- sc/source/ui/pagedlg/tphf.cxx | 6 +++-- sc/source/ui/view/gridwin.cxx | 6 +++-- sc/source/ui/view/preview.cxx | 6 +++-- sc/source/ui/view/tabvwsh3.cxx | 24 +++++++++++------ 25 files changed, 147 insertions(+), 72 deletions(-) diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index 5e8bd7336b86..bd50a4144d9b 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -1156,7 +1156,8 @@ void CombiColumnLineChartDialogController::showExtraControls( Window* pParent, c m_pMF_NumberOfLines->SetLast( 100, FUNIT_CUSTOM ); m_pMF_NumberOfLines->SetMin( 1, FUNIT_CUSTOM ); m_pMF_NumberOfLines->SetMax( 100, FUNIT_CUSTOM ); - m_pMF_NumberOfLines->SetHelpId( HID_SCH_NUM_OF_LINES ); + // FIXME: HELPID + m_pMF_NumberOfLines->SetHelpId( ""/*HID_SCH_NUM_OF_LINES*/ ); m_pMF_NumberOfLines->SetModifyHdl( LINK( this, CombiColumnLineChartDialogController, ChangeLineCountHdl ) ); } diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 67930fc6f7a7..74ab52795f32 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -241,7 +241,8 @@ SeriesHeader::SeriesHeader( Window * pParent ) : m_spSeriesName->EnableUpdateData( 4 * EDIT_UPDATEDATA_TIMEOUT ); // define is in vcl/edit.hxx m_spSeriesName->SetUpdateDataHdl( LINK( this, SeriesHeader, SeriesNameChanged )); m_spSeriesName->SetModifyHdl( LINK( this, SeriesHeader, SeriesNameEdited )); - m_spSeriesName->SetSmartHelpId( SmartId( HID_SCH_DATA_SERIES_LABEL )); + // FIXME: HELPID + m_spSeriesName->SetHelpId( ""/*HID_SCH_DATA_SERIES_LABEL*/ ); Show(); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 5b82e57f7044..88974a501dc7 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -117,7 +117,8 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM #endif , WZS_INVALID_STATE ); - this->SetRoadmapSmartHelpId( SmartId( HID_SCH_WIZARD_ROADMAP ) ); + // FIXME: HELPID + this->SetRoadmapHelpId( ""/*HID_SCH_WIZARD_ROADMAP*/ ); this->SetRoadmapInteractive( sal_True ); Size aAdditionalRoadmapSize( LogicToPixel( Size( 85, 0 ), MAP_APPFONT ) ); Size aSize( this->GetSizePixel() ); diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index 9469293ae1c5..b9d0b842e836 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -187,7 +187,8 @@ DataSourceDialog::DataSourceDialog( m_pTabControl->SelectTabPage( m_nLastPageId ); - SetHelpId( HID_SCH_DLG_RANGES ); + // FIXME: HELPID + SetHelpId( ""/*HID_SCH_DLG_RANGES*/ ); } DataSourceDialog::~DataSourceDialog() diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index e97f15898064..ca4c21a3ba01 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -88,15 +88,22 @@ SchAxisDlg::SchAxisDlg( Window* pWindow FreeResource(); if(!bAxisDlg) { - SetHelpId( SID_INSERT_GRIDS ); + // FIXME: HELPID + SetHelpId( ""/*SID_INSERT_GRIDS*/ ); SetText( ObjectNameProvider::getName(OBJECTTYPE_GRID,true) ); - aCbPrimaryX.SetHelpId( HID_SCH_CB_XGRID ); - aCbPrimaryY.SetHelpId( HID_SCH_CB_YGRID ); - aCbPrimaryZ.SetHelpId( HID_SCH_CB_ZGRID ); - aCbSecondaryX.SetHelpId( HID_SCH_CB_SECONDARY_XGRID ); - aCbSecondaryY.SetHelpId( HID_SCH_CB_SECONDARY_YGRID ); - aCbSecondaryZ.SetHelpId( HID_SCH_CB_SECONDARY_ZGRID ); + // FIXME: HELPID + aCbPrimaryX.SetHelpId( ""/*HID_SCH_CB_XGRID*/ ); + // FIXME: HELPID + aCbPrimaryY.SetHelpId( ""/*HID_SCH_CB_YGRID*/ ); + // FIXME: HELPID + aCbPrimaryZ.SetHelpId( ""/*HID_SCH_CB_ZGRID*/ ); + // FIXME: HELPID + aCbSecondaryX.SetHelpId( ""/*HID_SCH_CB_SECONDARY_XGRID*/ ); + // FIXME: HELPID + aCbSecondaryY.SetHelpId( ""/*HID_SCH_CB_SECONDARY_YGRID*/ ); + // FIXME: HELPID + aCbSecondaryZ.SetHelpId( ""/*HID_SCH_CB_SECONDARY_ZGRID*/ ); aFlPrimary.Hide(); aFlSecondary.Hide(); diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 5b1d5647dc6c..a1915c4b9583 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -68,7 +68,8 @@ SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow, aFtTextDirection.SetPosPixel( aFtTextDirection.GetPosPixel() + aMove ); aLbTextDirection.SetPosPixel( aLbTextDirection.GetPosPixel() + aMove ); - aLbTextDirection.SetHelpId( HID_SCH_TEXTDIRECTION_EQUATION ); + // FIXME: HELPID + aLbTextDirection.SetHelpId( ""/*HID_SCH_TEXTDIRECTION_EQUATION*/ ); } } diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index 8c97de81dd5d..40ea37d217a7 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -75,9 +75,12 @@ TitlesAndObjectsTabPage::TitlesAndObjectsTabPage( svt::OWizardMachine* pParent aFont.SetWeight( WEIGHT_BOLD ); m_aFT_TitleDescription.SetControlFont( aFont ); - m_aCB_Grid_X.SetHelpId( HID_SCH_CB_XGRID ); - m_aCB_Grid_Y.SetHelpId( HID_SCH_CB_YGRID ); - m_aCB_Grid_Z.SetHelpId( HID_SCH_CB_ZGRID ); + // FIXME: HELPID + m_aCB_Grid_X.SetHelpId( ""/*HID_SCH_CB_XGRID*/ ); + // FIXME: HELPID + m_aCB_Grid_Y.SetHelpId( ""/*HID_SCH_CB_YGRID*/ ); + // FIXME: HELPID + m_aCB_Grid_Z.SetHelpId( ""/*HID_SCH_CB_ZGRID*/ ); m_apTitleResources->SetUpdateDataHdl( LINK( this, TitlesAndObjectsTabPage, ChangeHdl )); m_apLegendPositionResources->SetChangeHdl( LINK( this, TitlesAndObjectsTabPage, ChangeHdl )); diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 240b615cf0f6..5400524e8a1e 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -59,7 +59,8 @@ ChartWindow::ChartWindow( WindowController* pWindowController, Window* pParent, , m_pWindowController( pWindowController ) , m_bInPaint(false) { - this->SetSmartHelpId( SmartId( HID_SCH_WIN_DOCUMENT ) ); + // FIXME: HELPID + this->SetHelpId( ""/*HID_SCH_WIN_DOCUMENT*/ ); this->SetMapMode( MapMode(MAP_100TH_MM) ); adjustHighContrastMode(); // chart does not depend on exact pixel painting => enable antialiased drawing diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index f6fc2cb27b71..484734acc888 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -177,22 +177,28 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) : InsertWindow ( 7, &aTextWindow, 0, 6 ); aWndPos .SetQuickHelpText( ScResId( SCSTR_QHELP_POSWND ) ); - aWndPos .SetHelpId ( HID_INSWIN_POS ); + // FIXME: HELPID + aWndPos .SetHelpId ( ""/*HID_INSWIN_POS*/ ); aTextWindow.SetQuickHelpText( ScResId( SCSTR_QHELP_INPUTWND ) ); - aTextWindow.SetHelpId ( HID_INSWIN_INPUT ); + // FIXME: HELPID + aTextWindow.SetHelpId ( ""/*HID_INSWIN_INPUT*/ ); // kein SetHelpText, die Hilfetexte kommen aus der Hilfe SetItemText ( SID_INPUT_FUNCTION, ScResId( SCSTR_QHELP_BTNCALC ) ); - SetHelpId ( SID_INPUT_FUNCTION, HID_INSWIN_CALC ); + // FIXME: HELPID + SetHelpId ( SID_INPUT_FUNCTION, ""/*HID_INSWIN_CALC*/ ); SetItemText ( SID_INPUT_SUM, aTextSum ); - SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME ); + // FIXME: HELPID + SetHelpId ( SID_INPUT_SUM, ""/*HID_INSWIN_SUMME*/ ); SetItemText ( SID_INPUT_EQUAL, aTextEqual ); - SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC ); + // FIXME: HELPID + SetHelpId ( SID_INPUT_EQUAL, ""/*HID_INSWIN_FUNC*/ ); - SetHelpId( HID_SC_INPUTWIN ); // fuer die ganze Eingabezeile + // FIXME: HELPID + SetHelpId( ""/*HID_SC_INPUTWIN*/ ); // fuer die ganze Eingabezeile aWndPos .Show(); aTextWindow .Show(); @@ -560,9 +566,11 @@ void ScInputWindow::SetOkCancelMode() InsertItem( SID_INPUT_CANCEL, IMAGE( SID_INPUT_CANCEL ), 0, 3 ); InsertItem( SID_INPUT_OK, IMAGE( SID_INPUT_OK ), 0, 4 ); SetItemText ( SID_INPUT_CANCEL, aTextCancel ); - SetHelpId ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL ); + // FIXME: HELPID + SetHelpId ( SID_INPUT_CANCEL, ""/*HID_INSWIN_CANCEL*/ ); SetItemText ( SID_INPUT_OK, aTextOk ); - SetHelpId ( SID_INPUT_OK, HID_INSWIN_OK ); + // FIXME: HELPID + SetHelpId ( SID_INPUT_OK, ""/*HID_INSWIN_OK*/ ); bIsOkCancelMode = TRUE; } } @@ -585,9 +593,11 @@ void ScInputWindow::SetSumAssignMode() InsertItem( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ), 0, 3 ); InsertItem( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), 0, 4 ); SetItemText ( SID_INPUT_SUM, aTextSum ); - SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME ); + // FIXME: HELPID + SetHelpId ( SID_INPUT_SUM, ""/*HID_INSWIN_SUMME*/ ); SetItemText ( SID_INPUT_EQUAL, aTextEqual ); - SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC ); + // FIXME: HELPID + SetHelpId ( SID_INPUT_EQUAL, ""/*HID_INSWIN_FUNC*/ ); bIsOkCancelMode = FALSE; SetFormulaMode(FALSE); // kein editieren -> keine Formel diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index dc5d1010dfc8..6bd2dcdba209 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -383,25 +383,29 @@ void ScModule::FillStatusBar(StatusBar& rStatusBar) rStatusBar.InsertItem( SID_STATUS_DOCPOS, TEXT_WIDTH( String().Fill( 10, 'X' ) ), SIB_LEFT|SIB_AUTOSIZE ); - rStatusBar.SetHelpId( SID_STATUS_DOCPOS, SID_STATUS_DOCPOS ); + // FIXME: HELPID + rStatusBar.SetHelpId( SID_STATUS_DOCPOS, ""/*SID_STATUS_DOCPOS*/ ); // Seitenvorlage rStatusBar.InsertItem( SID_STATUS_PAGESTYLE, TEXT_WIDTH( String().Fill( 15, 'X' ) ), SIB_LEFT|SIB_AUTOSIZE ); - rStatusBar.SetHelpId( SID_STATUS_PAGESTYLE, SID_STATUS_PAGESTYLE ); + // FIXME: HELPID + rStatusBar.SetHelpId( SID_STATUS_PAGESTYLE, ""/*SID_STATUS_PAGESTYLE*/ ); // Einfuege-/Ueberschreibmodus rStatusBar.InsertItem( SID_ATTR_INSERT, SvxInsertStatusBarControl::GetDefItemWidth(rStatusBar), SIB_CENTER ); - rStatusBar.SetHelpId( SID_ATTR_INSERT, SID_ATTR_INSERT ); + // FIXME: HELPID + rStatusBar.SetHelpId( SID_ATTR_INSERT, ""/*SID_ATTR_INSERT*/ ); // Selektionsmodus rStatusBar.InsertItem( SID_STATUS_SELMODE, SvxSelectionModeControl::GetDefItemWidth(rStatusBar), SIB_CENTER ); - rStatusBar.SetHelpId( SID_STATUS_SELMODE, SID_STATUS_SELMODE ); + // FIXME: HELPID + rStatusBar.SetHelpId( SID_STATUS_SELMODE, ""/*SID_STATUS_SELMODE*/ ); // Dokument geaendert rStatusBar.InsertItem( SID_DOC_MODIFIED, @@ -409,28 +413,33 @@ void ScModule::FillStatusBar(StatusBar& rStatusBar) // signatures rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); - rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); + // FIXME: HELPID + rStatusBar.SetHelpId(SID_SIGNATURE, ""/*SID_SIGNATURE*/); - rStatusBar.SetHelpId( SID_DOC_MODIFIED, SID_DOC_MODIFIED ); + // FIXME: HELPID + rStatusBar.SetHelpId( SID_DOC_MODIFIED, ""/*SID_DOC_MODIFIED*/ ); // den aktuellen Kontext anzeigen Uhrzeit / FramePos / TabellenInfo / Errors rStatusBar.InsertItem( SID_ATTR_SIZE, SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar), SIB_AUTOSIZE|SIB_LEFT|SIB_USERDRAW); - rStatusBar.SetHelpId( SID_ATTR_SIZE, SID_ATTR_SIZE ); + // FIXME: HELPID + rStatusBar.SetHelpId( SID_ATTR_SIZE, ""/*SID_ATTR_SIZE*/ ); // Ma"sstab rStatusBar.InsertItem( SID_ATTR_ZOOM, SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar), SIB_CENTER ); - rStatusBar.SetHelpId( SID_ATTR_ZOOM, SID_ATTR_ZOOM ); + // FIXME: HELPID + rStatusBar.SetHelpId( SID_ATTR_ZOOM, ""/*SID_ATTR_ZOOM*/ ); // ZoomSlider rStatusBar.InsertItem( SID_ATTR_ZOOMSLIDER, TEXT_WIDTH( String().Fill( 15, 'X' ) ), SIB_CENTER ); - rStatusBar.SetHelpId( SID_ATTR_ZOOMSLIDER, SID_ATTR_ZOOMSLIDER ); + // FIXME: HELPID + rStatusBar.SetHelpId( SID_ATTR_ZOOMSLIDER, ""/*SID_ATTR_ZOOMSLIDER*/ ); } #undef TEXT_WIDTH diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index 4ac3fb8d68ad..ad88d7501663 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -240,7 +240,8 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent, maStartHelper ( maRbAutoStart, maRbManStart, maEdStart, rNullDate ), maEndHelper ( maRbAutoEnd, maRbManEnd, maEdEnd, rNullDate ) { - maLbUnits.SetHelpId( HID_SC_DPDATEGROUP_LB ); + // FIXME: HELPID + maLbUnits.SetHelpId( ""/*HID_SC_DPDATEGROUP_LB*/ ); ResStringArray aArr( ScResId( STR_UNITS ) ); for( USHORT nIdx = 0, nCount = sal::static_int_cast(aArr.Count()); nIdx < nCount; ++nIdx ) maLbUnits.InsertEntry( aArr.GetString( nIdx ) ); diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index 6b04993ba0bc..dfc4e771e637 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -651,7 +651,8 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayou // *** HIDDEN ITEMS *** - maLbHide.SetHelpId( HID_SC_DPSUBT_HIDE ); + // FIXME: HELPID + maLbHide.SetHelpId( ""/*HID_SC_DPSUBT_HIDE*/ ); InitHideListBox(); // *** HIERARCHY *** diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index 1eca44a787ed..221b7781893b 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -332,11 +332,16 @@ void __EXPORT ScDPLayoutDlg::Init() aBtnDrillDown.Check(); } - aWndPage.SetHelpId( HID_SC_DPLAY_PAGE ); - aWndCol.SetHelpId( HID_SC_DPLAY_COLUMN ); - aWndRow.SetHelpId( HID_SC_DPLAY_ROW ); - aWndData.SetHelpId( HID_SC_DPLAY_DATA ); - aWndSelect.SetHelpId( HID_SC_DPLAY_SELECT ); + // FIXME: HELPID + aWndPage.SetHelpId( ""/*HID_SC_DPLAY_PAGE*/ ); + // FIXME: HELPID + aWndCol.SetHelpId( ""/*HID_SC_DPLAY_COLUMN*/ ); + // FIXME: HELPID + aWndRow.SetHelpId( ""/*HID_SC_DPLAY_ROW*/ ); + // FIXME: HELPID + aWndData.SetHelpId( ""/*HID_SC_DPLAY_DATA*/ ); + // FIXME: HELPID + aWndSelect.SetHelpId( ""/*HID_SC_DPLAY_SELECT*/ ); InitFocus(); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 157b98497e83..0e998ae92732 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -1182,8 +1182,10 @@ BOOL ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, BOOL bJustQuer _pParent ? _pParent : GetActiveDialogParent(), &aText ); pDlg->SetText( aTitle ); pDlg->SetMinLen( 1 ); - pDlg->SetHelpId( SID_CHG_PROTECT ); - pDlg->SetEditHelpId( HID_CHG_PROTECT ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*SID_CHG_PROTECT*/ ); + // FIXME: HELPID + pDlg->SetEditHelpId( ""/*HID_CHG_PROTECT*/ ); if ( !bProtected ) pDlg->ShowExtras( SHOWEXTRAS_CONFIRM ); if ( pDlg->Execute() == RET_OK ) diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 32b3376da9a7..19aedcece154 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -690,10 +690,13 @@ ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pActiveWin(NULL) { m_aHelper.SetWindow(/*this*/&m_rWindow); + // FIXME: HELPID + #if 0 if(m_rWindow.GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und //in eine UniqueId gewandelt wird, machen //wir das an dieser Stelle rueckgaengig. + #endif aTimer.SetTimeout(200); aTimer.SetTimeoutHdl(LINK( this, ScRefHandler, UpdateFocusHdl)); diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 48e33622e99f..f01779730fbf 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -76,7 +76,8 @@ ScLinkedAreaDlg::ScLinkedAreaDlg( Window* pParent ) : { FreeResource(); - aCbUrl.SetHelpId( HID_SCDLG_LINKAREAURL ); // SvtURLBox ctor always sets SID_OPENURL + // FIXME: HELPID + aCbUrl.SetHelpId( ""/*HID_SCDLG_LINKAREAURL*/ ); // SvtURLBox ctor always sets SID_OPENURL aCbUrl.SetSelectHdl( LINK( this, ScLinkedAreaDlg, FileHdl ) ); aBtnBrowse.SetClickHdl( LINK( this, ScLinkedAreaDlg, BrowseHdl ) ); aLbRanges.SetSelectHdl( LINK( this, ScLinkedAreaDlg, RangeHdl ) ); diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 7e57ebbe5d60..f63e6bb45512 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -66,8 +66,10 @@ void ScShowTabDlg::SetDescription( { SetText( rTitle ); aFtLbTitle.SetText( rFixedText ); - SetHelpId( nDlgHelpId ); - aLb.SetHelpId( nLbHelpId ); + // FIXME: HELPID + SetHelpId( ""/*nDlgHelpId*/ ); + // FIXME: HELPID + aLb.SetHelpId( ""/*nLbHelpId*/ ); } void ScShowTabDlg::Insert( const String& rString, BOOL bSelected ) diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 418a88b3cbea..8b209665606c 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -146,7 +146,8 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, maBtnEdit.SetClickHdl( LINK( this, ScSolverOptionsDialog, ButtonHdl ) ); maLbSettings.SetWindowBits( WB_CLIPCHILDREN|WB_FORCE_MAKEVISIBLE ); - maLbSettings.SetHelpId( HID_SC_SOLVEROPTIONS_LB ); + // FIXME: HELPID + maLbSettings.SetHelpId( ""/*HID_SC_SOLVEROPTIONS_LB*/ ); maLbSettings.SetHighlightRange(); maLbSettings.SetSelectHdl( LINK( this, ScSolverOptionsDialog, SettingsSelHdl ) ); diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index b8dc2e13538e..1d625d81cf7c 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -64,7 +64,8 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ) { - SetHelpId( nHelpId ); + // FIXME: HELPID + SetHelpId( ""/*nHelpId*/ ); SetText( rTitle ); aFtEditTitle.SetText( rEditTitle ); aEdInput.SetText( rDefault ); @@ -73,18 +74,24 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, // HelpId for Edit different for different uses if ( nHelpId == FID_TAB_APPEND ) - aEdInput.SetHelpId( HID_SC_APPEND_NAME ); + // FIXME: HELPID + aEdInput.SetHelpId( ""/*HID_SC_APPEND_NAME*/ ); else if ( nHelpId == FID_TAB_RENAME ) - aEdInput.SetHelpId( HID_SC_RENAME_NAME ); + // FIXME: HELPID + aEdInput.SetHelpId( ""/*HID_SC_RENAME_NAME*/ ); else if ( nHelpId == HID_SC_ADD_AUTOFMT ) - aEdInput.SetHelpId( HID_SC_AUTOFMT_NAME ); + // FIXME: HELPID + aEdInput.SetHelpId( ""/*HID_SC_AUTOFMT_NAME*/ ); else if ( nHelpId == HID_SC_REN_AFMT_DLG ) - aEdInput.SetHelpId( HID_SC_REN_AFMT_NAME ); + // FIXME: HELPID + aEdInput.SetHelpId( ""/*HID_SC_REN_AFMT_NAME*/ ); else if ( nHelpId == SID_RENAME_OBJECT ) - aEdInput.SetHelpId( HID_SC_RENAME_OBJECT ); + // FIXME: HELPID + aEdInput.SetHelpId( ""/* HID_SC_RENAME_OBJECT*/ ); // #i68101# else if ( nHelpId == SID_TITLE_DESCRIPTION_OBJECT ) - aEdInput.SetHelpId( HID_SC_TITLE_DESCRIPTION_OBJECT ); + // FIXME: HELPID + aEdInput.SetHelpId( ""/*HID_SC_TITLE_DESCRIPTION_OBJECT*/ ); else DBG_ERRORFILE( "unknown ID" ); diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index 24b2e62a1c78..b03db3c35286 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -70,7 +70,8 @@ void ScCbWarningBox::DisableDialog() ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) : ScCbWarningBox( pParent, String( ScResId( STR_REPLCELLSWARN ) ), true ) { - SetHelpId( HID_SC_REPLCELLSWARN ); + // FIXME: HELPID + SetHelpId( ""/*HID_SC_REPLCELLSWARN*/ ); } bool ScReplaceWarnBox::IsDialogEnabled() diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index e7dff0bf37c7..38ff9760b742 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -225,8 +225,10 @@ ScScenarioWindow::ScScenarioWindow( Window* pParent,const String& aQH_List, aEdComment.SetFont( aFont ); aEdComment.SetMaxTextLen( 512 ); aLbScenario.SetPosPixel( Point(0,0) ); - aLbScenario.SetHelpId(HID_SC_SCENWIN_TOP); - aEdComment.SetHelpId(HID_SC_SCENWIN_BOTTOM); + // FIXME: HELPID + aLbScenario.SetHelpId(""/*HID_SC_SCENWIN_TOP*/); + // FIXME: HELPID + aEdComment.SetHelpId(""/*HID_SC_SCENWIN_BOTTOM*/); aLbScenario.Show(); aEdComment.Show(); diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index de647cf5f82a..86f06246794e 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -98,9 +98,11 @@ ScHFPage::ScHFPage( Window* pParent, USHORT nResId, aTurnOnBox.SetClickHdl ( LINK( this, ScHFPage, TurnOnHdl ) ); if ( nId == SID_ATTR_PAGE_HEADERSET ) - aBtnEdit.SetHelpId( HID_SC_HEADER_EDIT ); + // FIXME: HELPID + aBtnEdit.SetHelpId( ""/*HID_SC_HEADER_EDIT*/ ); else - aBtnEdit.SetHelpId( HID_SC_FOOTER_EDIT ); + // FIXME: HELPID + aBtnEdit.SetHelpId( ""/*HID_SC_FOOTER_EDIT*/ ); } //------------------------------------------------------------------ diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 87740a88e4df..43eb2879236f 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -425,8 +425,10 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic EnableChildTransparentMode(); SetDialogControlFlags( WINDOW_DLGCTRL_RETURN | WINDOW_DLGCTRL_WANTFOCUS ); - SetHelpId( HID_SC_WIN_GRIDWIN ); - SetUniqueId( HID_SC_WIN_GRIDWIN ); + // FIXME: HELPID + SetHelpId( ""/*HID_SC_WIN_GRIDWIN*/ ); + // FIXME: HELPID + SetUniqueId( ""/*HID_SC_WIN_GRIDWIN*/ ); SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() ); EnableRTL( FALSE ); diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 83fdab9000e6..27c82967b9e6 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -135,8 +135,10 @@ ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pView SetOutDevViewType( OUTDEV_VIEWTYPE_PRINTPREVIEW ); //#106611# SetBackground(); - SetHelpId( HID_SC_WIN_PREVIEW ); - SetUniqueId( HID_SC_WIN_PREVIEW ); + // FIXME: HELPID + SetHelpId( ""/*HID_SC_WIN_PREVIEW*/ ); + // FIXME: HELPID + SetUniqueId( ""/*HID_SC_WIN_PREVIEW*/ ); SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() ); } diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index c291d01d71c2..29cdac803d5c 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -1015,8 +1015,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_UNPROTECTDOC) ); pDlg->SetMinLen( 0 ); - pDlg->SetHelpId( FID_PROTECT_DOC ); - pDlg->SetEditHelpId( HID_PASSWD_DOC ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*FID_PROTECT_DOC*/ ); + // FIXME: HELPID + pDlg->SetEditHelpId( ""/*HID_PASSWD_DOC*/ ); if (pDlg->Execute() == RET_OK) aPassword = pDlg->GetPassword(); @@ -1038,8 +1040,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_PROTECTDOC) ); pDlg->SetMinLen( 0 ); - pDlg->SetHelpId( FID_PROTECT_DOC ); - pDlg->SetEditHelpId( HID_PASSWD_DOC ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*FID_PROTECT_DOC*/ ); + // FIXME: HELPID + pDlg->SetEditHelpId( ""/*HID_PASSWD_DOC*/ ); pDlg->ShowExtras( SHOWEXTRAS_CONFIRM ); if (pDlg->Execute() == RET_OK) @@ -1161,8 +1165,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg.reset(new SfxPasswordDialog(GetDialogParent(), &aText)); pDlg->SetText( ScResId(SCSTR_UNPROTECTTAB) ); pDlg->SetMinLen( 0 ); - pDlg->SetHelpId( FID_PROTECT_TABLE ); - pDlg->SetEditHelpId( HID_PASSWD_TABLE ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*FID_PROTECT_TABLE*/ ); + // FIXME: HELPID + pDlg->SetEditHelpId( ""/*HID_PASSWD_TABLE*/ ); if (pDlg->Execute() == RET_OK) aPassword = pDlg->GetPassword(); @@ -1183,8 +1189,10 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg.reset(new SfxPasswordDialog(GetDialogParent(), &aText)); pDlg->SetText( ScResId(SCSTR_PROTECTTAB) ); pDlg->SetMinLen( 0 ); - pDlg->SetHelpId( FID_PROTECT_TABLE ); - pDlg->SetEditHelpId( HID_PASSWD_TABLE ); + // FIXME: HELPID + pDlg->SetHelpId( ""/*FID_PROTECT_TABLE*/ ); + // FIXME: HELPID + pDlg->SetEditHelpId( ""/*HID_PASSWD_TABLE*/ ); pDlg->ShowExtras( SHOWEXTRAS_CONFIRM ); if (pDlg->Execute() == RET_OK) -- cgit From 27f199af29794fffb97eb73357c7f9dd4dae0201 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 13:46:22 +0200 Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids --- starmath/source/dialog.cxx | 8 ++- starmath/source/edit.cxx | 3 +- starmath/source/smmod.cxx | 3 +- starmath/source/view.cxx | 6 +- sw/source/ui/chrdlg/swuiccoll.cxx | 3 +- sw/source/ui/config/mailconfigpage.cxx | 6 +- sw/source/ui/config/optload.cxx | 3 +- sw/source/ui/dbui/addresslistdialog.cxx | 6 +- sw/source/ui/dbui/dbtree.cxx | 3 +- sw/source/ui/dbui/mailmergechildwindow.cxx | 9 ++- sw/source/ui/dbui/mailmergewizard.cxx | 6 +- sw/source/ui/dbui/mmaddressblockpage.cxx | 9 ++- sw/source/ui/dbui/mmgreetingspage.cxx | 48 ++++++++++----- sw/source/ui/dbui/selectdbtabledialog.cxx | 6 +- sw/source/ui/dialog/swdlgfact.cxx | 4 +- sw/source/ui/dialog/uiregionsw.cxx | 6 +- sw/source/ui/docvw/edtwin.cxx | 3 +- sw/source/ui/docvw/srcedtw.cxx | 3 +- sw/source/ui/envelp/envlop1.cxx | 6 +- sw/source/ui/envelp/label1.cxx | 21 ++++--- sw/source/ui/fldui/FldRefTreeListBox.cxx | 3 +- sw/source/ui/fldui/flddinf.cxx | 3 +- sw/source/ui/fldui/fldedt.cxx | 6 +- sw/source/ui/fldui/fldtdlg.cxx | 6 +- sw/source/ui/frmdlg/column.cxx | 3 +- sw/source/ui/index/cnttab.cxx | 15 +++-- sw/source/ui/index/swuiidxmrk.cxx | 98 ++++++++++++++++++++---------- sw/source/ui/lingu/olmenu.cxx | 15 +++-- sw/source/ui/misc/glosbib.cxx | 3 +- sw/source/ui/misc/glossary.cxx | 3 +- sw/source/ui/misc/insrule.cxx | 3 +- sw/source/ui/misc/num.cxx | 3 +- sw/source/ui/misc/outline.cxx | 3 +- sw/source/ui/misc/redlndlg.cxx | 3 +- sw/source/ui/ribbar/inputwin.cxx | 3 +- sw/source/ui/ribbar/workctrl.cxx | 6 +- sw/source/ui/shells/textsh1.cxx | 9 ++- sw/source/ui/uiview/pview.cxx | 9 ++- sw/source/ui/uiview/viewmdi.cxx | 9 ++- sw/source/ui/uno/unomod.cxx | 10 ++- sw/source/ui/utlui/content.cxx | 3 +- sw/source/ui/utlui/glbltree.cxx | 39 ++++++++---- sw/source/ui/utlui/navipi.cxx | 18 ++++-- 43 files changed, 293 insertions(+), 142 deletions(-) diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index 257fdb959484..c73db4dae4a0 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -775,7 +775,9 @@ void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId) DBG_ASSERT(aEmptyText.Len() == 0, "Sm: Ooops..."); #endif - rField.SetHelpId(nHelpId); + // FIXME: HELPID + (void)nHelpId; + rField.SetHelpId(""/*nHelpId*/); rField.SetHelpText(aEmptyText); // since MetricField inherits from SpinField which has a sub Edit field @@ -783,7 +785,9 @@ void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId) // for it too. Edit *pSubEdit = rField.GetSubEdit(); if (pSubEdit) - { pSubEdit->SetHelpId(nHelpId); + { + // FIXME: HELPID + pSubEdit->SetHelpId(""/*nHelpId*/); pSubEdit->SetHelpText(aEmptyText); } } diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 94e30ce82501..0471b1111e1f 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -107,7 +107,8 @@ SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) : pVScrollBar (0), pScrollBox (0) { - SetHelpId(HID_SMA_COMMAND_WIN_EDIT); + // FIXME: HELPID + SetHelpId(""/*HID_SMA_COMMAND_WIN_EDIT*/); SetMapMode(MAP_PIXEL); // Even RTL languages don't use RTL for math diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 451bb8664bc5..18b3912ecf45 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -342,7 +342,8 @@ void SmModule::FillStatusBar(StatusBar &rBar) rBar.InsertItem(SID_ATTR_ZOOM, rBar.GetTextWidth(C2S(" 100% "))); rBar.InsertItem(SID_MODIFYSTATUS, rBar.GetTextWidth(C2S(" * "))); rBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rBar ), SIB_USERDRAW ); - rBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); + // FIXME: HELPID + rBar.SetHelpId(SID_SIGNATURE, ""/*SID_SIGNATURE*/); } diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index 1552d4edc231..ddb6a37da33a 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -111,8 +111,10 @@ SmGraphicWindow::SmGraphicWindow(SmViewShell* pShell): SetTotalSize(); - SetHelpId(HID_SMA_WIN_DOCUMENT); - SetUniqueId(HID_SMA_WIN_DOCUMENT); + // FIXME: HELPID + SetHelpId(""/*HID_SMA_WIN_DOCUMENT*/); + // FIXME: HELPID + SetUniqueId(""/*HID_SMA_WIN_DOCUMENT*/); } SmGraphicWindow::~SmGraphicWindow() diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index a9d90a4c02e4..cbe0b9c16c3d 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -114,7 +114,8 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT ); aTbLinks.Resize(); // OS: Hack fuer richtige Selektion aTbLinks.SetSpaceBetweenEntries( 0 ); - aTbLinks.SetHelpId(HID_COND_COLL_TABLIST); + // FIXME: HELPID + aTbLinks.SetHelpId(""/*HID_COND_COLL_TABLIST*/); SfxStyleFamilies aFamilies(SW_RES(DLG_STYLE_DESIGNER)); const SfxStyleFamilyItem* pFamilyItem = 0; diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 5fa03de5e0a5..49d1a037e311 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -325,10 +325,12 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare aSz.Width()/2, HIB_LEFT | HIB_VCENTER ); - m_aStatusHB.SetHelpId(HID_MM_TESTACCOUNTSETTINGS_HB ); + // FIXME: HELPID + m_aStatusHB.SetHelpId(""/*HID_MM_TESTACCOUNTSETTINGS_HB*/ ); m_aStatusHB.Show(); - m_aStatusLB.SetHelpId(HID_MM_TESTACCOUNTSETTINGS_TLB); + // FIXME: HELPID + m_aStatusLB.SetHelpId(""/*HID_MM_TESTACCOUNTSETTINGS_TLB*/); static long nTabs[] = {2, 0, aSz.Width()/2 }; m_aStatusLB.SetWindowBits( WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ); m_aStatusLB.SetSelectionMode( SINGLE_SELECTION ); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 4a0c9c2a6b25..ffb6333be337 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -499,7 +499,8 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) aLbLevel.SelectEntryPos( nLvl < MAXLEVEL ? nLvl + 1 : 0 ); aEdDelim.SetText( sDelim ); - aCheckLB.SetHelpId(HID_OPTCAPTION_CLB); + // FIXME: HELPID + aCheckLB.SetHelpId(""/*HID_OPTCAPTION_CLB*/); FreeResource(); diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index dc007fc68e13..f64bde3a0da8 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -214,10 +214,12 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) : m_aListHB.InsertItem( ITEMID_TABLE, m_sTable, aSz.Width()/2, HIB_LEFT | HIB_VCENTER | HIB_FIXED | HIB_FIXEDPOS /*| HIB_CLICKABLE | HIB_UPARROW */); - m_aListHB.SetHelpId(HID_MM_ADDRESSLIST_HB ); + // FIXME: HELPID + m_aListHB.SetHelpId(""/*HID_MM_ADDRESSLIST_HB*/ ); m_aListHB.Show(); - m_aListLB.SetHelpId(HID_MM_ADDRESSLIST_TLB); + // FIXME: HELPID + m_aListLB.SetHelpId(""/*HID_MM_ADDRESSLIST_TLB*/); static long nTabs[] = {2, 0, aSz.Width()/2 }; m_aListLB.SetWindowBits( WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ); m_aListLB.SetSelectionMode( SINGLE_SELECTION ); diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index 1e0a1faf1cbc..ee02eb283649 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -236,7 +236,8 @@ SwDBTreeList::SwDBTreeList(Window *pParent, const ResId& rResId, bShowColumns (bShowCol), pImpl(new SwDBTreeList_Impl(pSh)) { - SetHelpId(HID_DB_SELECTION_TLB); + // FIXME: HELPID + SetHelpId(""/*HID_DB_SELECTION_TLB*/); if (IsVisible()) InitTreeList(); diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index 758f52840230..6b3fd3317d06 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -384,7 +384,8 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf m_nStatusHeight = m_aSeparatorFL.GetPosPixel().Y() - m_aStatusLB.GetPosPixel().Y(); String sTask(SW_RES(ST_TASK)); String sStatus(SW_RES(ST_STATUS)); - m_aStatusLB.SetHelpId(HID_MM_SENDMAILS_STATUSLB); + // FIXME: HELPID + m_aStatusLB.SetHelpId(""/*HID_MM_SENDMAILS_STATUSLB*/); FreeResource(); @@ -413,10 +414,12 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf m_aStatusHB.InsertItem( ITEMID_STATUS, sStatus, nPos2, HIB_LEFT | HIB_VCENTER ); - m_aStatusHB.SetHelpId(HID_MM_ADDRESSLIST_HB ); + // FIXME: HELPID + m_aStatusHB.SetHelpId(""/*HID_MM_ADDRESSLIST_HB*/ ); m_aStatusHB.Show(); - m_aStatusLB.SetHelpId(HID_MM_MAILSTATUS_TLB); + // FIXME: HELPID + m_aStatusLB.SetHelpId(""/*HID_MM_MAILSTATUS_TLB*/); static long nTabs[] = {3, 0, nPos1, aSz.Width() }; m_aStatusLB.SetWindowBits( WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ); m_aStatusLB.SetSelectionMode( SINGLE_SELECTION ); diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 54cf6edac512..e37ff3184717 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -89,8 +89,10 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rItem enableButtons(WZB_FINISH, sal_False); m_pFinish->SetText(m_sFinish); - m_pNextPage->SetHelpId(HID_MM_NEXT_PAGE); - m_pPrevPage->SetHelpId(HID_MM_PREV_PAGE); + // FIXME: HELPID + m_pNextPage->SetHelpId(""/*HID_MM_NEXT_PAGE*/); + // FIXME: HELPID + m_pPrevPage->SetHelpId(""/*HID_MM_PREV_PAGE*/); //#i51949# no output type page visible if e-Mail is not supported if(rItem.IsMailAvailable()) diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index b2d8c790c25d..f507243b0605 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1070,7 +1070,8 @@ SwAssignFieldsControl::SwAssignFieldsControl( m_nFirstYPos(0) { SetStyle(GetStyle()|WB_TABSTOP|WB_DIALOGCONTROL); - SetHelpId(HID_MM_ASSIGN_FIELDS); + // FIXME: HELPID + SetHelpId(""/*HID_MM_ASSIGN_FIELDS*/); long nHBHeight = m_aHeaderHB.CalcWindowSizePixel().Height(); Size aOutputSize(GetOutputSize()); m_aHeaderHB.SetSizePixel( @@ -1106,7 +1107,8 @@ SwAssignFieldsControl::SwAssignFieldsControl( sLabel.Insert(rHeader, 1); pNewText->SetText(sLabel); ListBox* pNewLB = new ListBox(&m_aWindow, ResId(LB_FIELDS, *rResId.GetResMgr())); - pNewLB->SetHelpId( HID_MM_HEADER_0 + i ); + // FIXME: HELPID + pNewLB->SetHelpId( ""/*HID_MM_HEADER_0 + i*/ ); pNewLB->SelectEntryPos(0); for(sal_Int32 nField = 0; nField < aFields.getLength(); ++nField) pNewLB->InsertEntry(pFields[nField]); @@ -1440,7 +1442,8 @@ DDListBox::DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId rResId) SetSelectionMode( SINGLE_SELECTION ); SetDragDropMode( SV_DRAGDROP_CTRL_COPY ); EnableAsyncDrag(TRUE); - SetHelpId(HID_MM_CUSTOMFIELDS); + // FIXME: HELPID + SetHelpId(""/*HID_MM_CUSTOMFIELDS*/); // expand selection to the complete width of the ListBox SetHighlightRange(); Show(); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index c7613055d6ab..9bd44837ed45 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -308,14 +308,22 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent) m_pNeutralCB = &m_aNeutralCB; m_bIsTabPage = true; - m_pPersonalizedCB->SetHelpId( HID_MM_GREETINGS_CB_PERSONALIZED); - m_pFemaleLB->SetHelpId( HID_MM_GREETINGS_LB_FEMALE ); - m_pFemalePB->SetHelpId( HID_MM_GREETINGS_PB_FEMALE ); - m_pMaleLB->SetHelpId( HID_MM_GREETINGS_LB_MALE ); - m_pMalePB->SetHelpId( HID_MM_GREETINGS_PB_MALE ); - m_pFemaleColumnLB->SetHelpId( HID_MM_GREETINGS_LB_FEMALECOLUMN); - m_pFemaleFieldCB->SetHelpId( HID_MM_GREETINGS_CB_FEMALEFIELD ); - m_pNeutralCB->SetHelpId( HID_MM_GREETINGS_CB_NEUTRAL ); + // FIXME: HELPID + m_pPersonalizedCB->SetHelpId( ""/*HID_MM_GREETINGS_CB_PERSONALIZED*/); + // FIXME: HELPID + m_pFemaleLB->SetHelpId( ""/*HID_MM_GREETINGS_LB_FEMALE*/ ); + // FIXME: HELPID + m_pFemalePB->SetHelpId( ""/*HID_MM_GREETINGS_PB_FEMALE*/ ); + // FIXME: HELPID + m_pMaleLB->SetHelpId( ""/*HID_MM_GREETINGS_LB_MALE*/ ); + // FIXME: HELPID + m_pMalePB->SetHelpId( ""/*HID_MM_GREETINGS_PB_MALE*/ ); + // FIXME: HELPID + m_pFemaleColumnLB->SetHelpId( ""/*HID_MM_GREETINGS_LB_FEMALECOLUMN*/); + // FIXME: HELPID + m_pFemaleFieldCB->SetHelpId( ""/*HID_MM_GREETINGS_CB_FEMALEFIELD*/ ); + // FIXME: HELPID + m_pNeutralCB->SetHelpId( ""/*HID_MM_GREETINGS_CB_NEUTRAL*/ ); FreeResource(); m_aGreetingLineCB.SetClickHdl(LINK(this, SwMailMergeGreetingsPage, ContainsHdl_Impl)); @@ -524,14 +532,22 @@ SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard) m_pNeutralCB = &m_aNeutralCB; m_bIsTabPage = false; - m_pPersonalizedCB->SetHelpId( HID_MM_BODY_CB_PERSONALIZED ); - m_pFemaleLB->SetHelpId( HID_MM_BODY_LB_FEMALE ); - m_pFemalePB->SetHelpId( HID_MM_BODY_PB_FEMALE ); - m_pMaleLB->SetHelpId( HID_MM_BODY_LB_MALE ); - m_pMalePB->SetHelpId( HID_MM_BODY_PB_MALE ); - m_pFemaleColumnLB->SetHelpId( HID_MM_BODY_LB_FEMALECOLUMN ); - m_pFemaleFieldCB->SetHelpId( HID_MM_BODY_CB_FEMALEFIELD ); - m_pNeutralCB->SetHelpId( HID_MM_BODY_CB_NEUTRAL ); + // FIXME: HELPID + m_pPersonalizedCB->SetHelpId( ""/*HID_MM_BODY_CB_PERSONALIZED*/ ); + // FIXME: HELPID + m_pFemaleLB->SetHelpId( ""/*HID_MM_BODY_LB_FEMALE*/ ); + // FIXME: HELPID + m_pFemalePB->SetHelpId( ""/*HID_MM_BODY_PB_FEMALE*/ ); + // FIXME: HELPID + m_pMaleLB->SetHelpId( ""/*HID_MM_BODY_LB_MALE*/ ); + // FIXME: HELPID + m_pMalePB->SetHelpId( ""/*HID_MM_BODY_PB_MALE*/ ); + // FIXME: HELPID + m_pFemaleColumnLB->SetHelpId( ""/*HID_MM_BODY_LB_FEMALECOLUMN*/ ); + // FIXME: HELPID + m_pFemaleFieldCB->SetHelpId( ""/*HID_MM_BODY_CB_FEMALEFIELD*/ ); + // FIXME: HELPID + m_pNeutralCB->SetHelpId( ""/*HID_MM_BODY_CB_NEUTRAL*/ ); FreeResource(); m_aGreetingLineCB.SetClickHdl(LINK(this, SwMailBodyDialog, ContainsHdl_Impl)); diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 6cb7b87336c8..eb02d713beb7 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -103,12 +103,14 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent, m_aTableHB.InsertItem( 2, m_sType, aSz.Width()/2, HIB_LEFT | HIB_VCENTER /*| HIB_CLICKABLE | HIB_UPARROW */); - m_aTableHB.SetHelpId(HID_MM_ADDRESSLIST_HB ); + // FIXME: HELPID + m_aTableHB.SetHelpId(""/*HID_MM_ADDRESSLIST_HB*/ ); m_aTableHB.Show(); static long nTabs[] = {3, 0, aSz.Width()/2, aSz.Width() }; m_aTableLB.SetTabs(&nTabs[0], MAP_PIXEL); - m_aTableLB.SetHelpId(HID_MM_SELECTDBTABLEDDIALOG_LISTBOX); + // FIXME: HELPID + m_aTableLB.SetHelpId(""/*HID_MM_SELECTDBTABLEDDIALOG_LISTBOX*/); m_aTableLB.SetWindowBits( WB_CLIPCHILDREN ); m_aTableLB.SetSpaceBetweenEntries(3); m_aTableLB.SetSelectionMode( SINGLE_SELECTION ); diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index 8447489e5b03..e945ae388e78 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -453,7 +453,9 @@ String AbstractInsFootNoteDlg_Impl::GetStr() } void AbstractInsFootNoteDlg_Impl::SetHelpId( ULONG nHelpId ) { - pDlg->SetHelpId( nHelpId ); + // FIXME: HELPID + (void)nHelpId; + pDlg->SetHelpId( ""/*nHelpId*/ ); } void AbstractInsFootNoteDlg_Impl::SetText( const XubString& rStr ) { diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index b4151f6d1462..dc1c25e588c1 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -157,7 +157,8 @@ public: SwTestPasswdDlg(Window* pParent) : SfxPasswordDialog(pParent) { - SetHelpId(HID_DLG_PASSWD_SECTION); + // FIXME: HELPID + SetHelpId(""/*HID_DLG_PASSWD_SECTION*/); } }; @@ -430,7 +431,8 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) aSubRegionED.AddEventListener( LINK( this, SwEditRegionDlg, SubRegionEventHdl )); aSubRegionED.EnableAutocomplete( sal_True, sal_True ); - aTree.SetHelpId(HID_REGION_TREE); + // FIXME: HELPID + aTree.SetHelpId(""/*HID_REGION_TREE*/); aTree.SetSelectionMode( MULTIPLE_SELECTION ); aTree.SetWindowBits(WB_HASBUTTONSATROOT|WB_CLIPCHILDREN|WB_HSCROLL); aTree.SetSpaceBetweenEntries(0); diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index e2e59e17831e..94a87349f539 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -4558,7 +4558,8 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView): nKS_NUMDOWN_Count(0), // #i23725# nKS_NUMINDENTINC_Count(0) // #i23725# { - SetHelpId(HID_EDIT_WIN); + // FIXME: HELPID + SetHelpId(""/*HID_EDIT_WIN*/); EnableChildTransparentMode(); SetDialogControlFlags( WINDOW_DLGCTRL_RETURN | WINDOW_DLGCTRL_WANTFOCUS ); diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index 55a0cb47e296..f80cc6c18805 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -253,7 +253,8 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) : bDoSyntaxHighlight(TRUE), bHighlighting(FALSE) { - SetHelpId(HID_SOURCE_EDITWIN); + // FIXME: HELPID + SetHelpId(""/*HID_SOURCE_EDITWIN*/); CreateTextEngine(); pSourceViewConfig->AddListener(this); } diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index 279ce515c1d9..c7878d071c4d 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -173,12 +173,14 @@ SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet, FreeResource(); GetOKButton().SetText(String(SW_RES(STR_BTN_NEWDOC))); - GetOKButton().SetHelpId(HID_ENVELOP_PRINT); + // FIXME: HELPID + GetOKButton().SetHelpId(""/*HID_ENVELOP_PRINT*/); GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird if (GetUserButton()) { GetUserButton()->SetText(bInsert ? sInsert : sChange); - GetUserButton()->SetHelpId(HID_ENVELOP_INSERT); + // FIXME: HELPID + GetUserButton()->SetHelpId(""/*HID_ENVELOP_INSERT*/); } AddTabPage(TP_ENV_ENV, SwEnvPage ::Create, 0); diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 162a6a5cea4f..2f698fb7817f 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -143,7 +143,8 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet, FreeResource(); GetOKButton().SetText(String(SW_RES(STR_BTN_NEW_DOC))); - GetOKButton().SetHelpId(HID_LABEL_INSERT); + // FIXME: HELPID + GetOKButton().SetHelpId(""/*HID_LABEL_INSERT*/); GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird AddTabPage(TP_LAB_LAB, m_bLabel ? sFormat : sMedium ,SwLabPage ::Create, 0, sal_False, 0); @@ -345,11 +346,16 @@ void lcl_ChgYPos(Window& rWin, long nDiff) void SwLabPage::SetToBusinessCard() { - SetHelpId(HID_BUSINESS_FMT_PAGE); - aContButton.SetHelpId(HID_BUSINESS_FMT_PAGE_CONT); - aSheetButton.SetHelpId(HID_BUSINESS_FMT_PAGE_SHEET); - aMakeBox.SetHelpId(HID_BUSINESS_FMT_PAGE_BRAND); - aTypeBox.SetHelpId(HID_BUSINESS_FMT_PAGE_TYPE); + // FIXME: HELPID + SetHelpId(""/*HID_BUSINESS_FMT_PAGE*/); + // FIXME: HELPID + aContButton.SetHelpId(""/*HID_BUSINESS_FMT_PAGE_CONT*/); + // FIXME: HELPID + aSheetButton.SetHelpId(""/*HID_BUSINESS_FMT_PAGE_SHEET*/); + // FIXME: HELPID + aMakeBox.SetHelpId(""/*HID_BUSINESS_FMT_PAGE_BRAND*/); + // FIXME: HELPID + aTypeBox.SetHelpId(""/*HID_BUSINESS_FMT_PAGE_TYPE*/); m_bLabel = sal_False; aWritingText.Hide(); aAddrBox.Hide(); @@ -727,7 +733,8 @@ SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet) aAutoTextLB.SetWindowBits( WB_HSCROLL ); aAutoTextLB.SetSpaceBetweenEntries(0); aAutoTextLB.SetSelectionMode( SINGLE_SELECTION ); - aAutoTextLB.SetHelpId(HID_BUSINESS_CARD_CONTENT); + // FIXME: HELPID + aAutoTextLB.SetHelpId(""/*HID_BUSINESS_CARD_CONTENT*/); SetExchangeSupport(); aAutoTextLB.SetSelectHdl(LINK(this, SwVisitingCardPage, AutoTextSelectHdl)); diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index 38910327754e..aa8f8f473685 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -37,7 +37,8 @@ SwFldRefTreeListBox::SwFldRefTreeListBox( Window* pParent, const ResId& rResId) : SvTreeListBox( pParent, rResId ) { - SetHelpId( HID_REFSELECTION_TOOLTIP ); + // FIXME: HELPID + SetHelpId( ""/*HID_REFSELECTION_TOOLTIP*/ ); } SwFldRefTreeListBox::~SwFldRefTreeListBox() diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 07ab852e199e..a4c1c455bc17 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -87,7 +87,8 @@ SwFldDokInfPage::SwFldDokInfPage(Window* pWindow, const SfxItemSet& rCoreSet ) : { FreeResource(); - aTypeTLB.SetHelpId(HID_FIELD_DINF_TYPE); + // FIXME: HELPID + aTypeTLB.SetHelpId(""/*HID_FIELD_DINF_TYPE*/); aTypeTLB.SetSelectionMode(SINGLE_SELECTION); aTypeTLB.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); // Font nicht setzen, damit der Font des Controls uebernommen wird! diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index 2c354551f1f3..adeac01b3f11 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -141,7 +141,8 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw) : aNextBT.SetClickHdl(LINK(this, SwFldEditDlg, NextPrevHdl)); aAddressBT.SetClickHdl(LINK(this, SwFldEditDlg, AddressHdl)); - aAddressBT.SetHelpId(HID_FLDEDT_ADDRESS); + // FIXME: HELPID + aAddressBT.SetHelpId(""/*HID_FLDEDT_ADDRESS*/); Init(); } @@ -247,7 +248,8 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup) break; } - pTabPage->SetHelpId(nHelpId); + // FIXME: HELPID + pTabPage->SetHelpId(""/*nHelpId*/); static_cast(pTabPage)->SetWrtShell(pSh); SetTabPage(pTabPage); diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index 308bc379d4f4..e7ca5db5e9c9 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -84,11 +84,13 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) RemoveResetButton(); GetOKButton().SetText(String(SW_RES(STR_FLD_INSERT))); - GetOKButton().SetHelpId(HID_FIELD_INSERT); + // FIXME: HELPID + GetOKButton().SetHelpId(""/*HID_FIELD_INSERT*/); GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird GetCancelButton().SetText(String(SW_RES(STR_FLD_CLOSE))); - GetCancelButton().SetHelpId(HID_FIELD_CLOSE); + // FIXME: HELPID + GetCancelButton().SetHelpId(""/*HID_FIELD_CLOSE*/); GetCancelButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird FreeResource(); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 0a3c8cc33623..90c01fbb329e 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -505,7 +505,8 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet) FreeResource(); SetExchangeSupport(); - aDefaultVS.SetHelpId(HID_COLUMN_VALUESET); + // FIXME: HELPID + aDefaultVS.SetHelpId(""/*HID_COLUMN_VALUESET*/); aDefaultVS.SetColCount( 5 ); aDefaultVS.SetStyle( aDefaultVS.GetStyle() | WB_ITEMBORDER diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index a8a01a4f8222..3f2e98dc0e1b 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1036,7 +1036,8 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS aFromObjCLB.InsertEntry(rNames.GetString(i)); aFromObjCLB.SetEntryData( i, (void*)rNames.GetValue(i) ); } - aFromObjCLB.SetHelpId(HID_OLE_CHECKLB); + // FIXME: HELPID + aFromObjCLB.SetHelpId(""/*HID_OLE_CHECKLB*/); SetExchangeSupport(); aTypeLB.SetSelectHdl(LINK(this, SwTOXSelectTabPage, TOXTypeHdl)); @@ -1791,7 +1792,8 @@ public: bNextControl(sal_False), m_pParent( pTokenWin ) { - SetHelpId( HID_TOX_ENTRY_EDIT ); + // FIXME: HELPID + SetHelpId( ""/*HID_TOX_ENTRY_EDIT*/ ); } virtual void KeyInput( const KeyEvent& rKEvt ); @@ -1876,7 +1878,8 @@ public: bNextControl(sal_False), m_pParent(pTokenWin) { - SetHelpId(HID_TOX_ENTRY_BUTTON); + // FIXME: HELPID + SetHelpId(""/*HID_TOX_ENTRY_BUTTON*/); } virtual void KeyInput( const KeyEvent& rKEvt ); @@ -2128,7 +2131,8 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet aLevelLB.SetSpaceBetweenEntries(0); aLevelLB.SetSelectionMode( SINGLE_SELECTION ); aLevelLB.SetHighlightRange(); // select full width - aLevelLB.SetHelpId(HID_INSERT_INDEX_ENTRY_LEVEL_LB); + // FIXME: HELPID + aLevelLB.SetHelpId(""/*HID_INSERT_INDEX_ENTRY_LEVEL_LB*/); aLevelLB.Show(); aLastTOXType.eType = (TOXTypes)USHRT_MAX; @@ -3094,7 +3098,8 @@ SwTokenWindow::SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId) : m_pParent(pParent) { SetStyle(GetStyle()|WB_TABSTOP|WB_DIALOGCONTROL); - SetHelpId(HID_TOKEN_WINDOW); + // FIXME: HELPID + SetHelpId(""/*HID_TOKEN_WINDOW*/); for(sal_uInt16 i = 0; i < TOKEN_END; i++) { sal_uInt16 nTextId = STR_BUTTON_TEXT_START + i; diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index 6083da00da06..b33d8d777920 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -179,27 +179,47 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent, SetStyle(GetStyle()|WB_DIALOGCONTROL); FreeResource(); - aOKBT .SetHelpId(HID_INSERT_IDX_MRK_OK ); - aCancelBT .SetHelpId(HID_INSERT_IDX_MRK_CLOSE ); - aDelBT .SetHelpId(HID_INSERT_IDX_MRK_DELETE ); - aNewBT .SetHelpId(HID_INSERT_IDX_MRK_NEW ); - aPrevBT .SetHelpId(HID_INSERT_IDX_MRK_PREV ); - aPrevSameBT .SetHelpId(HID_INSERT_IDX_MRK_PREV_SAME ); - aNextBT .SetHelpId(HID_INSERT_IDX_MRK_NEXT ); - aNextSameBT .SetHelpId(HID_INSERT_IDX_MRK_NEXT_SAME ); - aTypeDCB .SetHelpId(HID_INSERT_IDX_MRK_TYPE ); - aEntryED .SetHelpId(HID_INSERT_IDX_MRK_ENTRY ); - aKeyDCB .SetHelpId(HID_INSERT_IDX_MRK_PRIM_KEY ); - aKey2DCB .SetHelpId(HID_INSERT_IDX_MRK_SEC_KEY ); - aLevelED .SetHelpId(HID_INSERT_IDX_MRK_LEVEL ); - aMainEntryCB .SetHelpId(HID_INSERT_IDX_MRK_MAIN_ENTRY); - aApplyToAllCB .SetHelpId(HID_INSERT_IDX_MRK_APPLY_ALL ); - aPhoneticED0 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING ); - aPhoneticED1 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING ); - aPhoneticED2 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING ); - - aSearchCaseSensitiveCB.SetHelpId( HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE ); - aSearchCaseWordOnlyCB.SetHelpId( HID_INSERT_IDX_MRK_SRCH_WORDONLY ); + // FIXME: HELPID + aOKBT .SetHelpId(""/*HID_INSERT_IDX_MRK_OK*/ ); + // FIXME: HELPID + aCancelBT .SetHelpId(""/*HID_INSERT_IDX_MRK_CLOSE*/ ); + // FIXME: HELPID + aDelBT .SetHelpId(""/*HID_INSERT_IDX_MRK_DELETE*/ ); + // FIXME: HELPID + aNewBT .SetHelpId(""/*HID_INSERT_IDX_MRK_NEW*/ ); + // FIXME: HELPID + aPrevBT .SetHelpId(""/*HID_INSERT_IDX_MRK_PREV*/ ); + // FIXME: HELPID + aPrevSameBT .SetHelpId(""/*HID_INSERT_IDX_MRK_PREV_SAME*/ ); + // FIXME: HELPID + aNextBT .SetHelpId(""/*HID_INSERT_IDX_MRK_NEXT*/ ); + // FIXME: HELPID + aNextSameBT .SetHelpId(""/*HID_INSERT_IDX_MRK_NEXT_SAME*/ ); + // FIXME: HELPID + aTypeDCB .SetHelpId(""/*HID_INSERT_IDX_MRK_TYPE*/ ); + // FIXME: HELPID + aEntryED .SetHelpId(""/*HID_INSERT_IDX_MRK_ENTRY*/ ); + // FIXME: HELPID + aKeyDCB .SetHelpId(""/*HID_INSERT_IDX_MRK_PRIM_KEY*/ ); + // FIXME: HELPID + aKey2DCB .SetHelpId(""/*HID_INSERT_IDX_MRK_SEC_KEY*/ ); + // FIXME: HELPID + aLevelED .SetHelpId(""/*HID_INSERT_IDX_MRK_LEVEL*/ ); + // FIXME: HELPID + aMainEntryCB .SetHelpId(""/*HID_INSERT_IDX_MRK_MAIN_ENTRY*/); + // FIXME: HELPID + aApplyToAllCB .SetHelpId(""/*HID_INSERT_IDX_MRK_APPLY_ALL*/ ); + // FIXME: HELPID + aPhoneticED0 .SetHelpId(""/*HID_INSERT_IDX_MRK_PHONETIC_READING*/ ); + // FIXME: HELPID + aPhoneticED1 .SetHelpId(""/*HID_INSERT_IDX_MRK_PHONETIC_READING*/ ); + // FIXME: HELPID + aPhoneticED2 .SetHelpId(""/*HID_INSERT_IDX_MRK_PHONETIC_READING*/ ); + + // FIXME: HELPID + aSearchCaseSensitiveCB.SetHelpId( ""/*HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE*/ ); + // FIXME: HELPID + aSearchCaseWordOnlyCB.SetHelpId( ""/*HID_INSERT_IDX_MRK_SRCH_WORDONLY*/ ); GetParent()->SetText( SW_RESSTR( bNewMark ? STR_IDXMRK_INSERT : STR_IDXMRK_EDIT)); @@ -1275,21 +1295,30 @@ SwAuthMarkDlg::SwAuthMarkDlg( Window *pParent, SetStyle(GetStyle()|WB_DIALOGCONTROL); FreeResource(); - aFromComponentRB.SetHelpId(HID_AUTH_MARK_DLG_FROM_COMP_RB); - aFromDocContentRB.SetHelpId(HID_AUTH_MARK_DLG_FROM_DOC_RB ); - aEntryED.SetHelpId(HID_AUTH_MARK_DLG_ID_LISTBOX ); - aEntryLB.SetHelpId(HID_AUTH_MARK_DLG_ID_LISTBOX ); + // FIXME: HELPID + aFromComponentRB.SetHelpId(""/*HID_AUTH_MARK_DLG_FROM_COMP_RB*/); + // FIXME: HELPID + aFromDocContentRB.SetHelpId(""/*HID_AUTH_MARK_DLG_FROM_DOC_RB*/ ); + // FIXME: HELPID + aEntryED.SetHelpId(""/*HID_AUTH_MARK_DLG_ID_LISTBOX*/ ); + // FIXME: HELPID + aEntryLB.SetHelpId(""/*HID_AUTH_MARK_DLG_ID_LISTBOX*/ ); aFromComponentRB.Show(bNewEntry); aFromDocContentRB.Show(bNewEntry); aFromComponentRB.Check(bIsFromComponent); aFromDocContentRB.Check(!bIsFromComponent); - aOKBT .SetHelpId(HID_INSERT_AUTH_MRK_OK ); - aCancelBT .SetHelpId(HID_INSERT_AUTH_MRK_CLOSE); - aEntryED .SetHelpId(HID_INSERT_AUTH_MRK_ENTRY ); - aCreateEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_CREATE_ENTRY ); - aEditEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_EDIT_ENTRY ); + // FIXME: HELPID + aOKBT .SetHelpId(""/*HID_INSERT_AUTH_MRK_OK*/ ); + // FIXME: HELPID + aCancelBT .SetHelpId(""/*HID_INSERT_AUTH_MRK_CLOSE*/); + // FIXME: HELPID + aEntryED .SetHelpId(""/*HID_INSERT_AUTH_MRK_ENTRY*/ ); + // FIXME: HELPID + aCreateEntryPB .SetHelpId(""/*HID_INSERT_AUTH_MRK_CREATE_ENTRY*/ ); + // FIXME: HELPID + aEditEntryPB .SetHelpId(""/*HID_INSERT_AUTH_MRK_EDIT_ENTRY*/ ); aOKBT.SetClickHdl(LINK(this,SwAuthMarkDlg, InsertHdl)); aCancelBT.SetClickHdl(LINK(this,SwAuthMarkDlg, CloseHdl)); @@ -1741,7 +1770,8 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, pTypeListBox->SetPosPixel(bLeft ? aTR1 : aTR2); pTypeListBox->Show(); pTypeListBox->SetSelectHdl(LINK(this, SwCreateAuthEntryDlg_Impl, EnableHdl)); - pTypeListBox->SetHelpId(aCurInfo.nHelpId); + // FIXME: HELPID + pTypeListBox->SetHelpId(""/*aCurInfo.nHelpId*/); } else if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField && !m_bNewEntryMode) @@ -1769,7 +1799,8 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, pIdentifierBox->SetSizePixel(aTmp); pIdentifierBox->SetPosPixel(bLeft ? aTR1 : aTR2); pIdentifierBox->Show(); - pIdentifierBox->SetHelpId(aCurInfo.nHelpId); + // FIXME: HELPID + pIdentifierBox->SetHelpId(""/*aCurInfo.nHelpId*/); } else { @@ -1780,7 +1811,8 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, pEdits[nIndex]->SetPosPixel(bLeft ? aTR1 : aTR2); pEdits[nIndex]->SetText(pFields[aCurInfo.nToxField]); pEdits[nIndex]->Show(); - pEdits[nIndex]->SetHelpId(aCurInfo.nHelpId); + // FIXME: HELPID + pEdits[nIndex]->SetHelpId(""/*aCurInfo.nHelpId*/); if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField) { pEdits[nIndex]->SetModifyHdl(LINK(this, SwCreateAuthEntryDlg_Impl, ShortNameHdl)); diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index a3f2b67b69b6..1920d051edd0 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -447,13 +447,15 @@ bGrammarResults(false) { const String aEntry = aSuggestions[ i ]; InsertItem( nPos, aEntry, 0, i ); - SetHelpId( nPos, HID_LINGU_REPLACE); + // FIXME: HELPID + SetHelpId( nPos, ""/*HID_LINGU_REPLACE*/); if (aSuggestionImageUrl.getLength() > 0) SetItemImage( nPos, aImage ); pMenu->InsertItem( nId, aEntry ); - pMenu->SetHelpId( nPos, HID_LINGU_AUTOCORR); + // FIXME: HELPID + pMenu->SetHelpId( nPos, ""/*HID_LINGU_AUTOCORR*/); } } @@ -462,7 +464,8 @@ bGrammarResults(false) SetItemText( MN_SPELLING, aSpellingAndGrammar ); USHORT nItemPos = GetItemPos( MN_IGNORE ); InsertItem( MN_IGNORE_SELECTION, aIgnoreSelection, 0, nItemPos ); - SetHelpId( MN_IGNORE_SELECTION, HID_LINGU_IGNORE_SELECTION); + // FIXME: HELPID + SetHelpId( MN_IGNORE_SELECTION, ""/*HID_LINGU_IGNORE_SELECTION*/); EnableItem( MN_AUTOCORR, bEnable ); @@ -632,7 +635,8 @@ aInfo16( SW_RES(IMG_INFO_16) ) { const String aEntry = aSuggestions[ i ]; InsertItem( nItemId, aEntry, 0, nPos++ ); - SetHelpId( nItemId, HID_LINGU_REPLACE ); + // FIXME: HELPID + SetHelpId( nItemId, ""/*HID_LINGU_REPLACE*/ ); if (aSuggestionImageUrl.getLength() > 0) SetItemImage( nItemId, aImage ); @@ -647,7 +651,8 @@ aInfo16( SW_RES(IMG_INFO_16) ) SetItemText( MN_SPELLING, aSpellingAndGrammar ); USHORT nItemPos = GetItemPos( MN_IGNORE ); InsertItem( MN_IGNORE_SELECTION, aIgnoreSelection, 0, nItemPos ); - SetHelpId( MN_IGNORE_SELECTION, HID_LINGU_IGNORE_SELECTION); + // FIXME: HELPID + SetHelpId( MN_IGNORE_SELECTION, ""/*HID_LINGU_IGNORE_SELECTION*/); EnableItem( MN_AUTOCORR, false ); diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 59a918fc4030..9632d1a1e83d 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -105,7 +105,8 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, 0, 160 }; - aGroupTLB.SetHelpId(HID_GLOS_GROUP_TREE); + // FIXME: HELPID + aGroupTLB.SetHelpId(""/*HID_GLOS_GROUP_TREE*/); aGroupTLB.SetTabs( &nTabs[0], MAP_APPFONT ); aGroupTLB.SetWindowBits(WB_HSCROLL|WB_CLIPCHILDREN|WB_SORT); aGroupTLB.SetSelectHdl(LINK(this, SwGlossaryGroupDlg, SelectHdl)); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index a2b6b85a7449..adcd40541487 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -293,7 +293,8 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, if( bIsDocReadOnly ) aInsertBtn.Enable(sal_False); aNameED.GrabFocus(); - aCategoryBox.SetHelpId(HID_MD_GLOS_CATEGORY); + // FIXME: HELPID + aCategoryBox.SetHelpId(""/*HID_MD_GLOS_CATEGORY*/); aCategoryBox.SetWindowBits(WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL|WB_VSCROLL|WB_CLIPCHILDREN|WB_SORT); aCategoryBox.GetModel()->SetSortMode(SortAscending); aCategoryBox.SetHighlightRange(); // ueber volle Breite selektieren diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx index c053030201ad..3c450dca93d4 100644 --- a/sw/source/ui/misc/insrule.cxx +++ b/sw/source/ui/misc/insrule.cxx @@ -77,7 +77,8 @@ SwInsertGrfRulerDlg::SwInsertGrfRulerDlg( Window* pParent ) : // Grafiknamen ermitteln GalleryExplorer::BeginLocking(GALLERY_THEME_RULERS); GalleryExplorer::FillObjList( GALLERY_THEME_RULERS, aGrfNames ); - pExampleVS->SetHelpId(HID_VS_RULER); + // FIXME: HELPID + pExampleVS->SetHelpId(""/*HID_VS_RULER*/); Color aColor(COL_WHITE); pExampleVS->InsertItem( 1, 1); pExampleVS->SetItemText( 1, sSimple); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index 43c92a72a3f7..a313064cb1be 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -1064,7 +1064,8 @@ SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent, { FreeResource(); GetUserButton()->SetText(sRemoveText); - GetUserButton()->SetHelpId(HID_NUM_RESET); + // FIXME: HELPID + GetUserButton()->SetHelpId(""/*HID_NUM_RESET*/); GetUserButton()->SetClickHdl(LINK(this, SwSvxNumBulletTabDialog, RemoveNumberingHdl)); if(!rWrtSh.GetCurNumRule()) GetUserButton()->Enable(FALSE); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index e733aa0389c2..5b035d48fe51 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -239,7 +239,8 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent, // <-- PushButton* pUserButton = GetUserButton(); pUserButton->SetText(SW_RES(ST_FORM)); - pUserButton->SetHelpId(HID_OUTLINE_FORM); + // FIXME: HELPID + pUserButton->SetHelpId(""/*HID_OUTLINE_FORM*/); pUserButton->SetClickHdl(LINK(this, SwOutlineTabDialog, FormHdl)); FreeResource(); diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index b87060bd19b0..fd2c5f36ddad 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -244,7 +244,8 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt) : bRedlnAutoFmt (bAutoFmt), bInhibitActivate( false ) { - aTabPagesCTRL.SetHelpId(HID_REDLINE_CTRL); + // FIXME: HELPID + aTabPagesCTRL.SetHelpId(""/*HID_REDLINE_CTRL*/); pTPView = aTabPagesCTRL.GetViewPage(); pTable = pTPView->GetTableControl(); diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index c14f91632a4c..f7d9067a1ded 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -90,7 +90,8 @@ SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind ) InsertSeparator ( 1 ); InsertSeparator (); InsertWindow( ED_FORMULA, &aEdit); - SetHelpId(ED_FORMULA, HID_EDIT_FORMULA); + // FIXME: HELPID + SetHelpId(ED_FORMULA, ""/*HID_EDIT_FORMULA*/); BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode(); SetItemImage( FN_FORMULA_CALC, pManager->GetImage(FN_FORMULA_CALC, bHC )); diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index c75cb3f0dfc4..aaa5b19b1f4e 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -492,7 +492,8 @@ SwScrollNaviPopup::SwScrollNaviPopup( USHORT nId, const Reference< XFrame >& rFr { USHORT i; - aToolBox.SetHelpId(HID_NAVI_VS); + // FIXME: HELPID + aToolBox.SetHelpId(""/*HID_NAVI_VS*/); aToolBox.SetLineCount( 2 ); aToolBox.SetOutStyle(TOOLBOX_STYLE_FLAT); for( i = 0; i < NID_COUNT; i++) @@ -508,7 +509,8 @@ SwScrollNaviPopup::SwScrollNaviPopup( USHORT nId, const Reference< XFrame >& rFr nTbxBits = TIB_CHECKABLE; } aToolBox.InsertItem(nNaviId, sText, nTbxBits); - aToolBox.SetHelpId( nNaviId, aNavigationHelpIds[i] ); + // FIXME: HELPID + aToolBox.SetHelpId( nNaviId, ""/*aNavigationHelpIds[i]*/ ); } ApplyImageList(); aToolBox.InsertBreak(NID_COUNT/2); diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index b7aa72acfb2c..f1ca35df298a 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -274,11 +274,14 @@ short lcl_AskRedlineMode(Window *pWin) BUTTONDIALOG_FOCUSBUTTON; aQBox.AddButton(String(SW_RES(STR_REDLINE_ACCEPT_ALL)), RET_OK, nBtnFlags); - aQBox.GetPushButton( RET_OK )->SetHelpId(HID_AUTOFORMAT_ACCEPT); + // FIXME: HELPID + aQBox.GetPushButton( RET_OK )->SetHelpId(""/*HID_AUTOFORMAT_ACCEPT*/); aQBox.AddButton(String(SW_RES(STR_REDLINE_REJECT_ALL)), RET_CANCEL, BUTTONDIALOG_CANCELBUTTON); - aQBox.GetPushButton( RET_CANCEL )->SetHelpId(HID_AUTOFORMAT_REJECT ); + // FIXME: HELPID + aQBox.GetPushButton( RET_CANCEL )->SetHelpId(""/*HID_AUTOFORMAT_REJECT*/ ); aQBox.AddButton(String(SW_RES(STR_REDLINE_EDIT)), 2, 0); - aQBox.GetPushButton( 2 )->SetHelpId(HID_AUTOFORMAT_EDIT_CHG); + // FIXME: HELPID + aQBox.GetPushButton( 2 )->SetHelpId(""/*HID_AUTOFORMAT_EDIT_CHG*/); aQBox.SetButtonHelpText( RET_OK, aEmptyStr ); return aQBox.Execute(); diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index d499add5ad53..d328c0e10bbd 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -728,7 +728,8 @@ SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView ) maPaintedPreviewDocRect( Rectangle(0,0,0,0) ) { SetOutDevViewType( OUTDEV_VIEWTYPE_PRINTPREVIEW ); //#106611# - SetHelpId(HID_PAGEPREVIEW); + // FIXME: HELPID + SetHelpId(""/*HID_PAGEPREVIEW*/); SetFillColor( GetBackground().GetColor() ); SetLineColor( GetBackground().GetColor()); SetMapMode( MapMode(MAP_TWIP) ); @@ -1937,9 +1938,11 @@ int SwPagePreView::_CreateScrollbar( BOOL bHori ) { pPageUpBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEUP ) ); - pPageUpBtn->SetHelpId(FN_PAGEUP); + // FIXME: HELPID + pPageUpBtn->SetHelpId(""/*FN_PAGEUP*/); pPageDownBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEDOWN ) ); - pPageDownBtn->SetHelpId(FN_PAGEDOWN); + // FIXME: HELPID + pPageDownBtn->SetHelpId(""/*FN_PAGEDOWN*/); Link aLk( LINK( this, SwPagePreView, BtnPage ) ); pPageUpBtn->SetClickHdl( aLk ); pPageDownBtn->SetClickHdl( aLk ); diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index 9dfa8e79ecfa..2477107cdc2f 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -343,12 +343,15 @@ void SwView::CreatePageButtons(BOOL bShow) { Window *pMDI = &GetViewFrame()->GetWindow(); pPageUpBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEUP ), TRUE ); - pPageUpBtn->SetHelpId(HID_SCRL_PAGEUP); + // FIXME: HELPID + pPageUpBtn->SetHelpId(""/*HID_SCRL_PAGEUP*/); pPageDownBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEDOWN ), FALSE ); - pPageDownBtn->SetHelpId(HID_SCRL_PAGEDOWN); + // FIXME: HELPID + pPageDownBtn->SetHelpId(""/*HID_SCRL_PAGEDOWN*/); Reference< XFrame > xFrame = GetViewFrame()->GetFrame().GetFrameInterface(); pNaviBtn = new SwNaviImageButton(pMDI, xFrame ); - pNaviBtn->SetHelpId(HID_SCRL_NAVI); + // FIXME: HELPID + pNaviBtn->SetHelpId(""/*HID_SCRL_NAVI*/); Link aLk( LINK( this, SwView, BtnPage ) ); pPageUpBtn->SetClickHdl( aLk ); pPageDownBtn->SetClickHdl( aLk ); diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index bb0fde6b1fb4..4140a1414919 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -800,13 +800,16 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c if ( ! ( rValue >>= sHelpURL ) ) throw IllegalArgumentException(); SwEditWin &rEditWin = pView->GetEditWin(); + // FIXME: HELPID + #if 0 OUString sPrefix = sHelpURL.copy ( 0, 4 ); // Make sure we have a valid string...should be in the format HID:12345 if ( ! sPrefix.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "HID:" ) ) ) throw IllegalArgumentException (); OUString sNumber = sHelpURL.copy ( 4 ); sal_uInt32 nHelpId = sNumber.toInt32(); - rEditWin.SetHelpId ( nHelpId ); + #endif + rEditWin.SetHelpId ( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) /*nHelpId*/ ); } else throw UnknownPropertyException(); @@ -985,9 +988,14 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u { bBool = sal_False; OUStringBuffer sHelpURL; + // FIXME: HELPID + #if 0 sHelpURL.appendAscii ( "HID:" ); SwEditWin &rEditWin = pView->GetEditWin(); sHelpURL.append ( static_cast < sal_Int32 > ( rEditWin.GetHelpId() ) ); + #endif + SwEditWin &rEditWin = pView->GetEditWin(); + sHelpURL.append( rtl::OStringToOUString( rEditWin.GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); rValue <<= sHelpURL.makeStringAndClear(); } else diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 0b0bca564f48..2cad05667f03 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -933,7 +933,8 @@ SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) : { sal_uInt16 i; - SetHelpId(HID_NAVIGATOR_TREELIST); + // FIXME: HELPID + SetHelpId(""/*HID_NAVIGATOR_TREELIST*/); SetNodeDefaultImages(); SetDoubleClickHdl(LINK(this, SwContentTree, ContentDoubleClickHdl)); diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index e9b8fdf6feef..c959e8572666 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -206,7 +206,8 @@ SwGlobalTree::SwGlobalTree(Window* pParent, const ResId& rResId) : { aContextStrings[i] = SW_RESSTR(i+ ST_GLOBAL_CONTEXT_FIRST); } - SetHelpId(HID_NAVIGATOR_GLOB_TREELIST); + // FIXME: HELPID + SetHelpId(""/*HID_NAVIGATOR_GLOB_TREELIST*/); SelectHdl(); SetDoubleClickHdl(LINK(this, SwGlobalTree, DoubleClickHdl)); EnableContextMenuHandling(); @@ -381,34 +382,44 @@ PopupMenu* SwGlobalTree::CreateContextMenu() for (USHORT i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++) { pSubPop2->InsertItem( i, aContextStrings[ST_UPDATE_SEL - ST_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] ); - pSubPop2->SetHelpId(i, aHelpForMenu[i]); + // FIXME: HELPID + pSubPop2->SetHelpId(i, ""/*aHelpForMenu[i]*/); } pSubPop2->EnableItem(CTX_UPDATE_SEL, 0 != (nEnableFlags & ENABLE_UPDATE_SEL)); pSubPop1->InsertItem(CTX_INSERT_ANY_INDEX, aContextStrings[ST_INDEX - ST_GLOBAL_CONTEXT_FIRST]); - pSubPop1->SetHelpId(CTX_INSERT_ANY_INDEX, aHelpForMenu[CTX_INSERT_ANY_INDEX]); + // FIXME: HELPID + pSubPop1->SetHelpId(CTX_INSERT_ANY_INDEX, ""/*aHelpForMenu[CTX_INSERT_ANY_INDEX]*/); pSubPop1->InsertItem(CTX_INSERT_FILE, aContextStrings[ST_FILE - ST_GLOBAL_CONTEXT_FIRST]); - pSubPop1->SetHelpId(CTX_INSERT_FILE, aHelpForMenu[CTX_INSERT_FILE]); + // FIXME: HELPID + pSubPop1->SetHelpId(CTX_INSERT_FILE, ""/*aHelpForMenu[CTX_INSERT_FILE]*/); pSubPop1->InsertItem(CTX_INSERT_NEW_FILE, aContextStrings[ST_NEW_FILE - ST_GLOBAL_CONTEXT_FIRST]); - pSubPop1->SetHelpId(CTX_INSERT_NEW_FILE, aHelpForMenu[CTX_INSERT_NEW_FILE]); + // FIXME: HELPID + pSubPop1->SetHelpId(CTX_INSERT_NEW_FILE, ""/*aHelpForMenu[CTX_INSERT_NEW_FILE]*/); pSubPop1->InsertItem(CTX_INSERT_TEXT, aContextStrings[ST_TEXT - ST_GLOBAL_CONTEXT_FIRST]); - pSubPop1->SetHelpId(CTX_INSERT_TEXT, aHelpForMenu[CTX_INSERT_TEXT]); + // FIXME: HELPID + pSubPop1->SetHelpId(CTX_INSERT_TEXT, ""/*aHelpForMenu[CTX_INSERT_TEXT]*/); pPop->InsertItem(CTX_UPDATE, aContextStrings[ST_UPDATE - ST_GLOBAL_CONTEXT_FIRST]); - pPop->SetHelpId(CTX_UPDATE, aHelpForMenu[CTX_UPDATE]); + // FIXME: HELPID + pPop->SetHelpId(CTX_UPDATE, ""/*aHelpForMenu[CTX_UPDATE]*/); pPop->InsertItem(CTX_EDIT, aContextStrings[ST_EDIT_CONTENT - ST_GLOBAL_CONTEXT_FIRST]); - pPop->SetHelpId(CTX_EDIT, aHelpForMenu[CTX_EDIT]); + // FIXME: HELPID + pPop->SetHelpId(CTX_EDIT, ""/*aHelpForMenu[CTX_EDIT]*/); if(nEnableFlags&ENABLE_EDIT_LINK) { pPop->InsertItem(CTX_EDIT_LINK, aContextStrings[ST_EDIT_LINK - ST_GLOBAL_CONTEXT_FIRST]); - pPop->SetHelpId(CTX_EDIT_LINK, aHelpForMenu[CTX_EDIT_LINK]); + // FIXME: HELPID + pPop->SetHelpId(CTX_EDIT_LINK, ""/*aHelpForMenu[CTX_EDIT_LINK]*/); } pPop->InsertItem(CTX_INSERT, aContextStrings[ST_INSERT - ST_GLOBAL_CONTEXT_FIRST]); - pPop->SetHelpId(CTX_INSERT, aHelpForMenu[CTX_INSERT]); + // FIXME: HELPID + pPop->SetHelpId(CTX_INSERT, ""/*aHelpForMenu[CTX_INSERT]*/); pPop->InsertSeparator() ; pPop->InsertItem(CTX_DELETE, aContextStrings[ST_DELETE - ST_GLOBAL_CONTEXT_FIRST]); - pPop->SetHelpId(CTX_DELETE, aHelpForMenu[CTX_DELETE]); + // FIXME: HELPID + pPop->SetHelpId(CTX_DELETE, ""/*aHelpForMenu[CTX_DELETE]*/); //evtl. disablen pSubPop1->EnableItem(CTX_INSERT_ANY_INDEX, 0 != (nEnableFlags & ENABLE_INSERT_IDX )); @@ -439,7 +450,8 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox) for (USHORT i = CTX_INSERT_ANY_INDEX; i <= CTX_INSERT_TEXT; i++) { pMenu->InsertItem( i, aContextStrings[ST_INDEX - ST_GLOBAL_CONTEXT_FIRST - CTX_INSERT_ANY_INDEX + i] ); - pMenu->SetHelpId(i, aHelpForMenu[i] ); + // FIXME: HELPID + pMenu->SetHelpId(i, ""/*aHelpForMenu[i]*/ ); } pMenu->EnableItem(CTX_INSERT_ANY_INDEX, 0 != (nEnableFlags & ENABLE_INSERT_IDX )); // pMenu->EnableItem(CTX_INSERT_CNTIDX, 0 != (nEnableFlags & ENABLE_INSERT_IDX )); @@ -459,7 +471,8 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox) for (USHORT i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++) { pMenu->InsertItem( i, aContextStrings[ST_UPDATE_SEL - ST_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] ); - pMenu->SetHelpId(i, aHelpForMenu[i] ); + // FIXME: HELPID + pMenu->SetHelpId(i, ""/*aHelpForMenu[i]*/ ); } pMenu->EnableItem(CTX_UPDATE_SEL, 0 != (nEnableFlags & ENABLE_UPDATE_SEL)); pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl)); diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index ea43533f70d8..bce0b5cabef0 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -433,7 +433,8 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox ) for (USHORT i = 0; i <= REGION_MODE_EMBEDDED; i++) { pMenu->InsertItem( i + 1, aContextArr[i] ); - pMenu->SetHelpId(i + 1, HID_NAVI_DRAG_HYP + i); + // FIXME: HELPID + pMenu->SetHelpId(i + 1, ""/*HID_NAVI_DRAG_HYP + i*/); /*HID_NAVI_DRAG_HYP HID_NAVI_DRAG_LINK HID_NAVI_DRAG_COPY */ @@ -456,7 +457,8 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox ) for (USHORT i = 101; i <= 100 + MAXLEVEL; i++) { pMenu->InsertItem( i, String::CreateFromInt32(i - 100) ); - pMenu->SetHelpId( i, HID_NAVI_OUTLINES ); + // FIXME: HELPID + pMenu->SetHelpId( i, ""/*HID_NAVI_OUTLINES*/ ); } pMenu->CheckItem( aContentTree.GetOutlineLevel() + 100 ); pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl)); @@ -792,9 +794,12 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, GetCreateView(); InitImageList(); - aContentToolBox.SetHelpId(HID_NAVIGATOR_TOOLBOX ); - aGlobalToolBox.SetHelpId(HID_NAVIGATOR_GLOBAL_TOOLBOX); - aDocListBox.SetHelpId(HID_NAVIGATOR_LISTBOX ); + // FIXME: HELPID + aContentToolBox.SetHelpId(""/*HID_NAVIGATOR_TOOLBOX*/ ); + // FIXME: HELPID + aGlobalToolBox.SetHelpId(""/*HID_NAVIGATOR_GLOBAL_TOOLBOX*/); + // FIXME: HELPID + aDocListBox.SetHelpId(""/*HID_NAVIGATOR_LISTBOX*/ ); nDocLBIniHeight = aDocListBox.GetSizePixel().Height(); nZoomOutInit = nZoomOut = Resource::ReadShortRes(); @@ -821,7 +826,8 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, aContentToolBox.InsertSeparator(4); aContentToolBox.InsertWindow( FN_PAGENUMBER, pEdit, 0, 4); aContentToolBox.InsertSeparator(4); - aContentToolBox.SetHelpId(FN_PAGENUMBER, HID_NAVI_TBX16); + // FIXME: HELPID + aContentToolBox.SetHelpId(FN_PAGENUMBER, ""/*HID_NAVI_TBX16*/); aContentToolBox.ShowItem( FN_PAGENUMBER ); for( USHORT i = 0; i <= REGION_MODE_EMBEDDED; i++ ) -- cgit From cfcc107d5ed81af450a87780a4cd2caee4f84a57 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 13:46:22 +0200 Subject: changehid: #i111874# remove SmartId, make HID of type rtl::OString, fill in dummies for all explicit help ids --- filter/source/xsltdialog/xmlfileview.cxx | 6 ++++-- filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 3 ++- filter/source/xsltdialog/xmlfiltertabdialog.cxx | 3 ++- filter/source/xsltdialog/xmlfiltertabpagebasic.cxx | 6 ++++-- filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 12 ++++++++---- 5 files changed, 20 insertions(+), 10 deletions(-) diff --git a/filter/source/xsltdialog/xmlfileview.cxx b/filter/source/xsltdialog/xmlfileview.cxx index a9cb18bed8d2..ea7e41dd8ed3 100644 --- a/filter/source/xsltdialog/xmlfileview.cxx +++ b/filter/source/xsltdialog/xmlfileview.cxx @@ -524,8 +524,10 @@ XMLSourceFileDialog::XMLSourceFileDialog( Window* pParent, ResMgr& rResMgr, cons maPBValidate.SetClickHdl(LINK( this, XMLSourceFileDialog, ClickHdl_Impl ) ); maLBOutput.SetSelectHdl(LINK(this, XMLSourceFileDialog, SelectHdl_Impl ) ); mpTextWindow = new XMLFileWindow( this ); - mpTextWindow->SetHelpId( HID_XML_FILTER_OUTPUT_WINDOW ); - maLBOutput.SetHelpId( HID_XML_FILTER_TEST_VALIDATE_OUPUT ); + // FIXME: HELPID + mpTextWindow->SetHelpId( ""/*HID_XML_FILTER_OUTPUT_WINDOW*/ ); + // FIXME: HELPID + maLBOutput.SetHelpId( ""/*HID_XML_FILTER_TEST_VALIDATE_OUPUT*/ ); Resize(); } diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 46cab18f6c77..931181e3fffb 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -91,7 +91,8 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog( Window* pParent, ResMgr& rResM mpFilterListBox->SetSelectHdl( LINK( this, XMLFilterSettingsDialog, SelectionChangedHdl_Impl ) ); mpFilterListBox->SetDeselectHdl( LINK( this, XMLFilterSettingsDialog, SelectionChangedHdl_Impl ) ); mpFilterListBox->SetDoubleClickHdl( LINK( this, XMLFilterSettingsDialog, DoubleClickHdl_Impl ) ); - mpFilterListBox->SetHelpId( HID_XML_FILTER_LIST ); + // FIXME: HELPID + mpFilterListBox->SetHelpId( ""/*HID_XML_FILTER_LIST*/ ); maPBNew.SetClickHdl(LINK( this, XMLFilterSettingsDialog, ClickHdl_Impl ) ); maPBEdit.SetClickHdl(LINK( this, XMLFilterSettingsDialog, ClickHdl_Impl ) ); diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index 63c369610295..b74adb0bd69c 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -63,7 +63,8 @@ XMLFilterTabDialog::XMLFilterTabDialog( Window *pParent, ResMgr& rResMgr, const { FreeResource(); - maTabCtrl.SetHelpId( HID_XML_FILTER_TABPAGE_CTRL ); + // FIXME: HELPID + maTabCtrl.SetHelpId( ""/*HID_XML_FILTER_TABPAGE_CTRL*/ ); mpOldInfo = pInfo; mpNewInfo = new filter_info_impl( *mpOldInfo ); diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx index b88e9ff802a4..1c4642e743e9 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx @@ -50,8 +50,10 @@ XMLFilterTabPageBasic::XMLFilterTabPageBasic( Window* pParent, ResMgr& rResMgr ) maFTDescription( this, ResId( FT_XML_DESCRIPTION, rResMgr ) ), maEDDescription( this, ResId( ED_XML_DESCRIPTION, rResMgr ) ) { - maCBApplication.SetHelpId( HID_XML_FILTER_APPLICATION ); - maEDDescription.SetHelpId( HID_XML_FILTER_DESCRIPTION ); + // FIXME: HELPID + maCBApplication.SetHelpId( ""/*HID_XML_FILTER_APPLICATION*/ ); + // FIXME: HELPID + maEDDescription.SetHelpId( ""/*HID_XML_FILTER_DESCRIPTION*/ ); FreeResource(); diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index 17743a09d321..95485951ae0a 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -91,10 +91,14 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, co maPBImportXSLT.SetClickHdl( LINK ( this, XMLFilterTabPageXSLT, ClickBrowseHdl_Impl ) ); maPBImportTemplate.SetClickHdl( LINK ( this, XMLFilterTabPageXSLT, ClickBrowseHdl_Impl ) ); - maEDDTDSchema.SetHelpId( HID_XML_FILTER_DTD ); - maEDExportXSLT.SetHelpId( HID_XML_FILTER_EXPORT_XSLT ); - maEDImportXSLT.SetHelpId( HID_XML_FILTER_IMPORT_XSLT ); - maEDImportTemplate.SetHelpId( HID_XML_FILTER_IMPORT_TEMPLATE ); + // FIXME: HELPID + maEDDTDSchema.SetHelpId( ""/*HID_XML_FILTER_DTD*/ ); + // FIXME: HELPID + maEDExportXSLT.SetHelpId( ""/*HID_XML_FILTER_EXPORT_XSLT*/ ); + // FIXME: HELPID + maEDImportXSLT.SetHelpId( ""/*HID_XML_FILTER_IMPORT_XSLT*/ ); + // FIXME: HELPID + maEDImportTemplate.SetHelpId( ""/*HID_XML_FILTER_IMPORT_TEMPLATE*/ ); } XMLFilterTabPageXSLT::~XMLFilterTabPageXSLT() -- cgit From 02baa49c4817741d9761b6140fdee5d5dfbfe1d1 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 15:22:01 +0200 Subject: fix warning --- toolkit/source/awt/vclxdialog.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/toolkit/source/awt/vclxdialog.cxx b/toolkit/source/awt/vclxdialog.cxx index dd4b4e740ab1..129f3b2132ab 100644 --- a/toolkit/source/awt/vclxdialog.cxx +++ b/toolkit/source/awt/vclxdialog.cxx @@ -215,6 +215,8 @@ void VCLXDialog::setHelpId( sal_Int32 id ) throw(::com::sun::star::uno::RuntimeE Window* pWindow = GetWindow(); if ( pWindow ) pWindow->SetHelpId( id ); + #else + (void)id; #endif } -- cgit From db3bae48af6b96d853b204f065b5843c4f7f712e Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 18:05:29 +0200 Subject: fix a warning --- framework/source/uielement/toolbarsmenucontroller.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 3d0cda946771..d3a616a76629 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -218,6 +218,7 @@ void ToolbarsMenuController::addCommand( pVCLPopupMenu->SetItemImage( nItemId, aImage ); // FIXME: HELPID pVCLPopupMenu->SetHelpId( nItemId, ""/*nHelpId*/ ); + (void)nHelpId; } m_aCommandVector.push_back( rCommandURL ); -- cgit From 00b95402e79f521a027375efc47409096a7766dc Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 19:27:35 +0200 Subject: fix warnings --- automation/source/server/retstrm.cxx | 2 ++ automation/source/server/sta_list.cxx | 2 ++ automation/source/server/statemnt.cxx | 1 + automation/source/testtool/objtest.cxx | 4 ++++ 4 files changed, 9 insertions(+) diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx index 36c783fe7fbd..43776af565e5 100644 --- a/automation/source/server/retstrm.cxx +++ b/automation/source/server/retstrm.cxx @@ -105,6 +105,8 @@ void RetStream::Write( rtl::OString* pId ) } else Write( static_cast(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit + #else + (void)pId; #endif } diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index f87746eb7988..258ca8e751fa 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -454,6 +454,8 @@ BOOL SearchUID::IsWinOK( Window *pWin ) return FALSE; } else + #else + (void)pWin; #endif return FALSE; } diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index f4a2ed5ddd4b..98d9bd31d0e0 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -327,6 +327,7 @@ static short ImpGetRType( Window *pWin, rtl::OString aUId ) } #else short nRT = 0; + (void)aUId; #endif #ifdef DBG_UTIL diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index 779cf32648b2..34840cd3e16b 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -240,6 +240,8 @@ void ControlDef::Write( SvStream &aStream ) if ( pSons ) for ( USHORT i = 0 ; pSons->Count() > i ; i++ ) ((ControlDef*)(*pSons)[i])->Write(aStream); + #else + (void)aStream; #endif } @@ -4092,6 +4094,7 @@ String TestToolObj::GetMethodName( ULONG nMethodId ) return Controls::pClasses->GetObject(nElement)->pData->Kurzname; #else (void)nElement; + (void)nMethodId; #endif } return String(); @@ -4111,6 +4114,7 @@ String TestToolObj::GetKeyName( USHORT nKeyCode ) return CmdStream::pKeyCodes->GetObject(nElement)->pData->Kurzname; #else (void)nElement; + (void)nKeyCode; #endif } return CUniString( "UnknownKeyCode" ); -- cgit From e2ad46c4d4bb61681caf69938ee0fc41f69d9de3 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 20:01:36 +0200 Subject: fix warnings --- svx/inc/svx/simptabl.hxx | 2 +- svx/source/stbctrls/xmlsecctrl.cxx | 1 + svx/source/tbxctrls/grafctrl.cxx | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index a4718c80f099..c409ed5b63be 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -173,7 +173,7 @@ public: const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } // FIXME: HELPID - void SetHeaderBarHelpId(ULONG nHelpId) {aHeaderBar.SetHelpId(""/*nHelpId*/);} + void SetHeaderBarHelpId(ULONG /*nHelpId*/) {aHeaderBar.SetHelpId(""/*nHelpId*/);} }; diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 130817432e7f..3df835510ed6 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -112,6 +112,7 @@ void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, con GetStatusBar().SetHelpText( GetId(), String() );// necessary ? // FIXME: HELPID + (void)nSID; GetStatusBar().SetHelpId( GetId(), ""/*nSID*/ ); // necessary ? if( SFX_ITEM_AVAILABLE != eState ) diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index f73e9b756ccf..aae0bd4fc12b 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -354,6 +354,7 @@ ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OU maImage.Show(); // FIXME: HELPID + (void)nSlotId; // maField.SetHelpId( nSlotId ); maField.SetHelpId( rtl::OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) ); maField.Show(); -- cgit From 3b1416e6d35dea58daaa93a7b14477f6e0c15eed Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 20:07:26 +0200 Subject: fix windows compile --- automation/source/server/sta_list.cxx | 7 +++++-- automation/source/testtool/objtest.cxx | 23 +++++++++++++++-------- 2 files changed, 20 insertions(+), 10 deletions(-) diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index 258ca8e751fa..fedec0f77b76 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -174,7 +174,8 @@ void StatementList::SendProfile( String aText ) pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileLine( aText ) ); if ( pProfiler->IsPartitioning() ) - pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileTime ), static_cast(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit + // FIXME: HELPID + pRet->GenReturn( RET_ProfileInfo, rtl::OString( /*S_ProfileTime*/ ), static_cast(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit } if ( pProfiler->IsAutoProfiling() ) @@ -1086,7 +1087,9 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever) void StatementList::DirectLog( ULONG nType, String aMessage ) { if ( pRet ) - pRet->GenReturn( RET_DirectLoging, rtl::OString(nType), aMessage ); + // FIXME: HELPID + pRet->GenReturn( RET_DirectLoging, rtl::OString(/*nType*/), aMessage ); + (void) nType; } diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index 34840cd3e16b..efb2294a5549 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -1184,7 +1184,8 @@ void TestToolObj::ReadFlat( String Filename, CNames *&pNames, BOOL bSortByName ) } aLongname = aLine.GetToken(0,cMyDelim); - aUId = rtl::OString( (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 ); @@ -1233,7 +1234,8 @@ void ReadFlatArray( const ControlDefLoad arWas [], CNames *&pNames ) while ( String::CreateFromAscii(arWas[nIndex].Kurzname).Len() > 0 ) { - rtl::OString 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++; @@ -1541,7 +1543,7 @@ BOOL TestToolObj::ReadNamesBin( String Filename, CNames *&pSIds, CNames *&pContr { comm_ULONG nUId; aStream >> nUId; - aUId = rtl::OString( nUId ); + aUId = rtl::OString();// nUId; } if (aName.GetChar(0) == '*' || bIsFlat ) // Globaler Kurzname (Dialogname oder SId) @@ -2218,7 +2220,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, if ( !IsError() && ((SbxTransportMethod*)pVar)->nValue & M_WITH_RETURN ) { pImpl->pNextReturn = ((SbxTransportMethod*)pVar); - aNextReturnId = rtl::OString( ((SbxTransportMethod*)pVar)->nValue ); + // FIXME: HELPID + aNextReturnId = rtl::OString();// ((SbxTransportMethod*)pVar)->nValue ); } if ( SingleCommandBlock ) EndBlock(); @@ -2291,7 +2294,8 @@ void TestToolObj::SFX_NOTIFY( SfxBroadcaster&, const TypeId&, { In->GenCmdControl (pMember->GetULong(), (USHORT)((SbxTransportMethod*)pVar)->nValue, rPar); - aNextReturnId = rtl::OString( pMember->GetULong() ); + // FIXME: HELPID + aNextReturnId = rtl::OString();// pMember->GetULong() ); } else { @@ -3789,7 +3793,8 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) if ( m_pReverseControls ) { USHORT nNr; - ControlItem *pNewItem = new ControlItemUId( String(), rtl::OString( 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; @@ -4144,7 +4149,8 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = bFound = FALSE; if ( aType.CompareTo(UIdKenn) == COMPARE_EQUAL ) { - aResult = pShortNames->GetName(rtl::OString(nNumber)); + // FIXME: HELPID + aResult = pShortNames->GetName(rtl::OString(/*nNumber*/)); bFound = TRUE; } if ( aType.CompareTo(MethodKenn ) == COMPARE_EQUAL ) @@ -4198,7 +4204,8 @@ static ControlDefLoad __READONLY_DATA arRes_Type [] = } if ( aType.CompareTo(SlotKenn ) == COMPARE_EQUAL ) { - aResult = pShortNames->GetName(rtl::OString(nNumber)); + // FIXME: HELPID + aResult = pShortNames->GetName(rtl::OString(/*nNumber*/)); bFound = TRUE; } if ( aType.CompareTo(TabKenn ) == COMPARE_EQUAL ) -- cgit From f8a801d058e39e89a71c85afdb0b1c1718f36b45 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Fri, 4 Jun 2010 20:20:37 +0200 Subject: fix windows compile --- sfx2/inc/sfxhelp.hxx | 4 +++- sfx2/source/appl/sfxhelp.cxx | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx index 6a87729e30e3..b19f78c6184b 100644 --- a/sfx2/inc/sfxhelp.hxx +++ b/sfx2/inc/sfxhelp.hxx @@ -48,7 +48,8 @@ private: // FIXME: HELPID // SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); - SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId ); + // FIXME: HELPID + // SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId ); SAL_DLLPRIVATE String GetHelpModuleName_Impl(); // FIXME: HELPID @@ -69,6 +70,7 @@ public: // FIXME: HELPID // static String CreateHelpURL( ULONG nHelpId, const String& rModuleName ); static String CreateHelpURL( const String& aCommandURL, const String& rModuleName ); + using Help::OpenHelpAgent; static void OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId ); static String GetDefaultHelpModule(); static ::rtl::OUString GetCurrentModuleIdentifier(); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index cd2f6b189fd1..9c246c592b82 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -974,11 +974,18 @@ String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleN void SfxHelp::OpenHelpAgent( SfxFrame*, ULONG nHelpId ) { +// FIXME HELPID +#if 0 SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); if ( pHelp ) pHelp->OpenHelpAgent( nHelpId ); +#else +(void)nHelpId; +#endif } +// FIXME: HELPID +#if 0 void SfxHelp::OpenHelpAgent( ULONG nHelpId ) { if ( SvtHelpOptions().IsHelpAgentAutoStartMode() ) @@ -1023,6 +1030,7 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId ) // } } } +#endif String SfxHelp::GetDefaultHelpModule() { -- cgit From 6a85eaf9ed3188b991c11d2eb2660939a990d04f Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Sat, 5 Jun 2010 13:58:32 +0200 Subject: fix warnings --- sd/source/ui/dlg/PaneDockingWindow.cxx | 1 + sd/source/ui/toolpanel/ScrollPanel.cxx | 1 + sd/source/ui/toolpanel/SubToolPanel.cxx | 1 + sd/source/ui/toolpanel/ToolPanel.cxx | 1 + 4 files changed, 4 insertions(+) diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index 2ebba0ca6d91..e545d832b1d9 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -284,6 +284,7 @@ USHORT PaneDockingWindow::AddMenu ( nItemCount>0 ? nItemCount-1 : (USHORT)-1); // FIXME: HELPID mpTitleToolBox->SetHelpId( nItemId, ""/*nHelpId*/ ); + (void)nHelpId; mpTitleToolBox->SetClickHdl (rCallback); mpTitleToolBox->SetDropdownClickHdl (rCallback); diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index a257c0e9597f..72b40e57e611 100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -134,6 +134,7 @@ TitledControl* ScrollPanel::AddControl ( TitleBar::TBT_SUB_CONTROL_HEADLINE); // FIXME: HELPID pTitledControl->GetTitleBar()->SetHelpId(""/*nHelpId*/); + (void)nHelpId; AddControl(::std::auto_ptr(pTitledControl)); diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index 6e24da8c7c59..bb9a65a5b728 100644 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx @@ -114,6 +114,7 @@ void SubToolPanel::AddControl ( pTitledControl->GetWindow()->SetParent(this); // FIXME: HELPID pTitledControl->GetWindow()->SetHelpId(""/*nHelpId*/); + (void)nHelpId; ::std::auto_ptr pChild (pTitledControl); // Add a down link only for the first control so that when diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index 1743da65ca75..7a640788f9c7 100644 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -119,6 +119,7 @@ sal_uInt32 ToolPanel::AddControl ( // FIXME: HELPID pTitledControl->GetWindow()->SetHelpId(""/*nHelpId*/); + (void)nHelpId; return mpControlContainer->AddControl (pChild); } -- cgit From da2c9e0f833dd1caccd0a0881cdb3f410cb0577a Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Sat, 5 Jun 2010 13:58:32 +0200 Subject: fix warnings --- cui/source/dialogs/insrc.cxx | 1 + cui/source/factory/dlgfact.cxx | 2 ++ extensions/source/propctrlr/browserline.cxx | 2 ++ 3 files changed, 5 insertions(+) diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 48010eb867ed..6e0cd2881161 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -72,6 +72,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) SetText( aTmp ); // FIXME: HELPID SetHelpId( ""/*nHelpId*/ ); + (void)nHelpId; } short SvxInsRowColDlg::Execute(void) diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index ba22a2cdf615..91ec831ab5dc 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -731,6 +731,7 @@ void AbstractSvxNameDialog_Impl::SetHelpId( ULONG nHelpId ) { // FIXME: HELPID pDlg->SetHelpId( ""/*nHelpId*/ ); + (void)nHelpId; } void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr ) { @@ -846,6 +847,7 @@ void AbstractSvxMultiFileDialog_Impl::SetHelpId( ULONG nHelpId ) { // FIXME: HELPID pDlg->SetHelpId( ""/*nHelpId*/ ); + (void)nHelpId; } Window * AbstractSvxHpLinkDlg_Impl::GetWindow() diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 7548a35fbbb9..142b112032fe 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -117,6 +117,7 @@ namespace pcr m_pBrowseButton->SetHelpId( _rHelpId ); // FIXME: HELPID m_pBrowseButton->SetUniqueId( ""/*_bPrimaryButtonId*/ ); + (void)_bPrimaryButtonId; if ( m_pAdditionalBrowseButton ) { @@ -124,6 +125,7 @@ namespace pcr m_pAdditionalBrowseButton->SetHelpId( _rHelpId ); // FIXME: HELPID m_pAdditionalBrowseButton->SetUniqueId( ""/*_nSecondaryButtonId*/ ); + (void)_nSecondaryButtonId; } } } -- cgit From 2310854cdad328a9a964ea4a09daeba4ec8b1741 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Sat, 5 Jun 2010 13:58:32 +0200 Subject: fix warnings --- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 2 ++ dbaccess/source/ui/control/FieldDescControl.cxx | 2 ++ dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx | 2 ++ 3 files changed, 6 insertions(+) diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 2da2461f4356..525bf12ffed3 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -891,6 +891,8 @@ DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Ima // FIXME: HELPID #if 0 pTreeView->SetHelpId(_nHelpId); + #else + (void)_nHelpId; #endif return createTree( pTreeView, _rImage, _rImageHC ); } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index a8eec1c463fb..95fcbf5e150d 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1075,6 +1075,8 @@ void OFieldDescControl::InitializeControl(Control* _pControl,ULONG _nHelpId,bool // FIXME: HELPID #if 0 _pControl->SetHelpId(_nHelpId); + #else + (void)_nHelpId; #endif if ( _bAddChangeHandler ) ((OPropListBoxCtrl*)_pControl)->SetSelectHdl(LINK(this,OFieldDescControl,ChangeHdl)); diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 3822cd263002..1723a262ab49 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -2721,6 +2721,8 @@ void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,c // da TextCell in verschiedenen Kontexten verwendet wird, muss ich den gecachten HelpText loeschen m_pTextCell->SetHelpText(String()); m_pTextCell->SetHelpId(_nHelpId); + #else + (void)_nHelpId; #endif } // ----------------------------------------------------------------------------- -- cgit From 48fbbe2989e13b073c266345081c0ed73e2ec0ef Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Sat, 5 Jun 2010 13:58:32 +0200 Subject: fix warnings --- sc/source/ui/miscdlgs/shtabdlg.cxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index f63e6bb45512..46807c6754a7 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -68,8 +68,10 @@ void ScShowTabDlg::SetDescription( aFtLbTitle.SetText( rFixedText ); // FIXME: HELPID SetHelpId( ""/*nDlgHelpId*/ ); + (void)nDlgHelpId; // FIXME: HELPID aLb.SetHelpId( ""/*nLbHelpId*/ ); + (void)nLbHelpId; } void ScShowTabDlg::Insert( const String& rString, BOOL bSelected ) -- cgit From 603694c8c2f44ca225bf373fa1c2d977047c4f70 Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Mon, 7 Jun 2010 11:58:56 +0200 Subject: fix warnings --- sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx | 1 + 1 file changed, 1 insertion(+) diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx index 0852b9b07087..79801909402a 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.hxx @@ -121,6 +121,7 @@ public: */ void ClearPageSet (void); + using SfxShell::SetHelpId; void SetHelpId( const rtl::OString& aId ); /** Mark the preview that belongs to the given index as not up-to-date -- cgit From aa7147590570dcb0813b6fcebb6496179b9df5cb Mon Sep 17 00:00:00 2001 From: "Philipp Lohmann [pl]" Date: Mon, 7 Jun 2010 11:58:56 +0200 Subject: fix warnings --- extensions/source/propctrlr/browserview.cxx | 3 ++- extensions/source/propctrlr/propertyeditor.cxx | 3 +++ extensions/source/propctrlr/propertyeditor.hxx | 1 - 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/extensions/source/propctrlr/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index a023c5ef6b01..aceb3982054e 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -56,7 +56,8 @@ namespace pcr DBG_CTOR(OPropertyBrowserView,NULL); m_pPropBox = new OPropertyEditor( this ); - m_pPropBox->SetHelpId(HID_FM_PROPDLG_TABCTR); + // FIXME: HELPID + m_pPropBox->SetHelpId(""/*HID_FM_PROPDLG_TABCTR*/); m_pPropBox->setPageActivationHandler(LINK(this, OPropertyBrowserView, OnPageActivation)); m_pPropBox->Show(); diff --git a/extensions/source/propctrlr/propertyeditor.cxx b/extensions/source/propctrlr/propertyeditor.cxx index d40007664c5a..5abcf155cc2e 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -246,6 +246,8 @@ namespace pcr return nId; } +// FIXME: HELPID +#if 0 //------------------------------------------------------------------ void OPropertyEditor::SetHelpId( sal_uInt32 nHelpId ) { @@ -257,6 +259,7 @@ namespace pcr (void)nHelpId; #endif } +#endif //------------------------------------------------------------------ void OPropertyEditor::RemovePage(sal_uInt16 nID) diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 455524f853bb..10b4b73fe54c 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -97,7 +97,6 @@ namespace pcr void SetHelpText( const ::rtl::OUString& _rHelpText ); void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); - void SetHelpId( sal_uInt32 nHelpId ); // FIXME: HELPID sal_uInt16 AppendPage( const String& r, const rtl::OString& _rHelpId ); void SetPage( sal_uInt16 ); -- cgit From f24b1da07ebfbc95e76af93fc9c7133f7d52daa5 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 10 Jul 2010 18:21:24 +0200 Subject: CWS changehid: #i111874#: change code to support HelpIds as byte strings --- avmedia/inc/helpids.hrc | 24 +- avmedia/source/framework/mediacontrol.cxx | 36 +- avmedia/source/framework/mediaplayer.cxx | 3 +- avmedia/source/viewer/mediawindow_impl.cxx | 3 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 18 +- .../source/deployment/gui/dp_gui_extlistbox.cxx | 3 +- desktop/source/deployment/gui/license_dialog.cxx | 3 +- desktop/source/inc/helpid.hrc | 69 +- desktop/source/migration/wizard.cxx | 12 +- editeng/inc/helpid.hrc | 64 +- editeng/source/editeng/editview.cxx | 6 +- editeng/source/misc/svxacorr.cxx | 31 +- formula/inc/formula/IFunctionDescription.hxx | 2 +- formula/inc/formula/formdata.hxx | 1 - formula/inc/formula/formula.hxx | 6 +- formula/inc/helpids.hrc | 46 +- formula/source/ui/dlg/FormulaHelper.cxx | 2 +- formula/source/ui/dlg/formula.cxx | 34 +- formula/source/ui/dlg/funcpage.cxx | 10 +- formula/source/ui/dlg/funcpage.hxx | 1 - formula/source/ui/dlg/funcutl.cxx | 2 - formula/source/ui/dlg/parawin.cxx | 20 +- fpicker/source/office/OfficeControlAccess.cxx | 22 +- fpicker/source/office/iodlg.cxx | 74 +- fpicker/source/office/iodlg.hrc | 32 +- framework/inc/helpid.hrc | 16 +- framework/inc/uielement/commandinfo.hxx | 2 + framework/inc/uielement/toolbarmerger.hxx | 1 + framework/inc/uielement/toolbarsmenucontroller.hxx | 2 +- framework/source/services/backingcomp.cxx | 3 +- framework/source/services/menudocumenthandler.cxx | 903 --------------------- .../source/uielement/macrosmenucontroller.cxx | 9 +- framework/source/uielement/menubarmanager.cxx | 5 - framework/source/uielement/statusbarmanager.cxx | 11 - framework/source/uielement/statusbarwrapper.cxx | 3 +- framework/source/uielement/toolbarmanager.cxx | 13 +- framework/source/uielement/toolbarmerger.cxx | 12 +- .../source/uielement/toolbarsmenucontroller.cxx | 18 +- idl/source/prj/command.cxx | 2 + sfx2/inc/sfx2/basedlgs.hxx | 3 - sfx2/inc/sfx2/dispatch.hxx | 4 +- sfx2/inc/sfx2/filedlghelper.hxx | 2 +- sfx2/inc/sfx2/mnumgr.hxx | 2 +- sfx2/inc/sfx2/msg.hxx | 5 + sfx2/inc/sfx2/opengrf.hxx | 2 +- sfx2/inc/sfx2/sfxcommands.h | 345 ++++++++ sfx2/inc/sfx2/sfxdlg.hxx | 4 +- sfx2/inc/sfxhelp.hxx | 13 +- sfx2/sdi/sfx.sdi | 2 +- sfx2/source/appl/app.src | 163 ---- sfx2/source/appl/appserv.cxx | 9 +- sfx2/source/appl/newhelp.cxx | 59 +- sfx2/source/appl/opengrf.cxx | 2 +- sfx2/source/appl/sfxhelp.cxx | 367 +++------ sfx2/source/control/dispatch.cxx | 25 +- sfx2/source/control/msg.cxx | 15 +- sfx2/source/dialog/about.cxx | 4 +- sfx2/source/dialog/basedlgs.cxx | 45 +- sfx2/source/dialog/dialog.hrc | 1 - sfx2/source/dialog/dialog.src | 17 +- sfx2/source/dialog/dockwin.cxx | 56 +- sfx2/source/dialog/filedlghelper.cxx | 37 +- sfx2/source/dialog/filedlgimpl.hxx | 4 +- sfx2/source/dialog/navigat.cxx | 3 +- sfx2/source/dialog/newstyle.src | 3 +- sfx2/source/dialog/tabdlg.cxx | 20 +- sfx2/source/dialog/templdlg.cxx | 61 +- sfx2/source/dialog/templdlg.src | 4 +- sfx2/source/doc/doc.hrc | 1 - sfx2/source/doc/doc.src | 8 - sfx2/source/doc/doctdlg.src | 3 +- sfx2/source/doc/docvor.cxx | 5 +- sfx2/source/doc/docvor.src | 2 +- sfx2/source/doc/iframe.cxx | 2 +- sfx2/source/doc/new.cxx | 3 +- sfx2/source/doc/new.src | 4 +- sfx2/source/doc/objcont.cxx | 11 - sfx2/source/doc/querytemplate.cxx | 5 +- sfx2/source/inc/helpid.hrc | 623 +++++++------- sfx2/source/menu/menu.src | 7 +- sfx2/source/menu/mnumgr.cxx | 7 +- sfx2/source/menu/virtmenu.cxx | 26 +- sfx2/source/statbar/stbitem.cxx | 5 + sfx2/source/toolbox/tbxitem.cxx | 3 +- sfx2/source/view/frame2.cxx | 11 +- svx/inc/fmhelp.hrc | 142 ++-- svx/inc/globlmn_tmpl.hrc | 187 +---- svx/inc/helpid.hrc | 495 ++++++----- svx/inc/svx/dialogs.hrc | 4 - svx/inc/svx/exthelpid.hrc | 13 +- svx/inc/svx/simptabl.hxx | 3 +- svx/inc/svx/svxcommands.h | 604 ++++++++++++++ svx/inc/svx/svxdlg.hxx | 8 +- svx/prj/d.lst | 1 + svx/source/dialog/bmpmask.src | 2 +- svx/source/dialog/ctredlin.cxx | 15 +- svx/source/dialog/dlgctl3d.cxx | 9 +- svx/source/dialog/fontwork.src | 2 +- svx/source/dialog/hyprlink.src | 4 +- svx/source/dialog/srchdlg.cxx | 2 +- svx/source/dialog/srchdlg.src | 3 +- svx/source/engine3d/float3d.src | 4 +- svx/source/fmcomp/fmgridif.cxx | 5 +- svx/source/fmcomp/gridctrl.cxx | 21 +- svx/source/fmcomp/gridctrl.src | 44 +- svx/source/form/datanavi.cxx | 3 +- svx/source/form/filtnav.cxx | 6 +- svx/source/form/filtnav.src | 4 - svx/source/form/fmPropBrw.cxx | 3 +- svx/source/form/fmexpl.cxx | 3 +- svx/source/form/fmexpl.src | 62 +- svx/source/form/formshell.src | 6 +- svx/source/form/navigatortree.cxx | 3 +- svx/source/form/tabwin.cxx | 6 +- svx/source/form/tbxform.cxx | 3 +- svx/source/gallery2/galbrws1.cxx | 6 +- svx/source/gallery2/galbrws2.cxx | 6 +- svx/source/gallery2/galctrl.cxx | 12 +- svx/source/gallery2/gallery.src | 2 +- svx/source/stbctrls/insctrl.cxx | 2 - svx/source/stbctrls/pszctrl.cxx | 20 +- svx/source/stbctrls/xmlsecctrl.cxx | 8 +- svx/source/tbxctrls/extrusioncontrols.cxx | 36 +- svx/source/tbxctrls/fillctrl.cxx | 6 +- svx/source/tbxctrls/fontworkgallery.cxx | 24 +- svx/source/tbxctrls/grafctrl.cxx | 5 +- svx/source/tbxctrls/linectrl.cxx | 6 +- svx/source/tbxctrls/makefile.mk | 1 - svx/source/tbxctrls/tbcontrl.cxx | 12 +- svx/source/tbxctrls/tbxdraw.src | 265 ------ svx/source/toolbars/extrusionbar.src | 59 -- svx/source/toolbars/fontworkbar.src | 34 - .../chinese_dictionarydialog.cxx | 18 +- .../chinese_translationdialog.cxx | 9 +- uui/source/ids.hrc | 25 +- 135 files changed, 2282 insertions(+), 3468 deletions(-) delete mode 100644 framework/source/services/menudocumenthandler.cxx create mode 100644 sfx2/inc/sfx2/sfxcommands.h create mode 100644 svx/inc/svx/svxcommands.h delete mode 100644 svx/source/tbxctrls/tbxdraw.src diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc index 2d7ccd764762..902230466053 100644 --- a/avmedia/inc/helpids.hrc +++ b/avmedia/inc/helpids.hrc @@ -30,17 +30,17 @@ #include -#define HID_AVMEDIA_TOOLBOXITEM_PLAY (HID_AVMEDIA_START+0) -#define HID_AVMEDIA_TOOLBOXITEM_PAUSE (HID_AVMEDIA_START+1) -#define HID_AVMEDIA_TOOLBOXITEM_STOP (HID_AVMEDIA_START+2) -#define HID_AVMEDIA_TOOLBOXITEM_MUTE (HID_AVMEDIA_START+3) -#define HID_AVMEDIA_TOOLBOXITEM_LOOP (HID_AVMEDIA_START+4) -#define HID_AVMEDIA_TOOLBOXITEM_OPEN (HID_AVMEDIA_START+5) -#define HID_AVMEDIA_TOOLBOXITEM_INSERT (HID_AVMEDIA_START+6) -#define HID_AVMEDIA_ZOOMLISTBOX (HID_AVMEDIA_START+7) -#define HID_AVMEDIA_TIMESLIDER (HID_AVMEDIA_START+8) -#define HID_AVMEDIA_TIMEEDIT (HID_AVMEDIA_START+9) -#define HID_AVMEDIA_VOLUMESLIDER (HID_AVMEDIA_START+10) -#define HID_AVMEDIA_PLAYERWINDOW (HID_AVMEDIA_START+11) +#define HID_AVMEDIA_TOOLBOXITEM_PLAY "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY" +#define HID_AVMEDIA_TOOLBOXITEM_PAUSE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE" +#define HID_AVMEDIA_TOOLBOXITEM_STOP "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP" +#define HID_AVMEDIA_TOOLBOXITEM_MUTE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE" +#define HID_AVMEDIA_TOOLBOXITEM_LOOP "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP" +#define HID_AVMEDIA_TOOLBOXITEM_OPEN "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN" +#define HID_AVMEDIA_TOOLBOXITEM_INSERT "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT" +#define HID_AVMEDIA_ZOOMLISTBOX "AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX" +#define HID_AVMEDIA_TIMESLIDER "AVMEDIA_HID_AVMEDIA_TIMESLIDER" +#define HID_AVMEDIA_TIMEEDIT "AVMEDIA_HID_AVMEDIA_TIMEEDIT" +#define HID_AVMEDIA_VOLUMESLIDER "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER" +#define HID_AVMEDIA_PLAYERWINDOW "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW" #endif // _AVMEDIA_HELPIDS_HRC diff --git a/avmedia/source/framework/mediacontrol.cxx b/avmedia/source/framework/mediacontrol.cxx index 781f2b7d290d..a71b5268abd7 100644 --- a/avmedia/source/framework/mediacontrol.cxx +++ b/avmedia/source/framework/mediacontrol.cxx @@ -94,12 +94,10 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_OPEN, implGetImage( AVMEDIA_IMG_OPEN ), String( AVMEDIA_RESID( AVMEDIA_STR_OPEN ) ) ); - // FIXME: HELPID - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, ""/*HID_AVMEDIA_TOOLBOXITEM_OPEN*/ ); + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_OPEN, HID_AVMEDIA_TOOLBOXITEM_OPEN ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_INSERT, implGetImage( AVMEDIA_IMG_INSERT ), String( AVMEDIA_RESID( AVMEDIA_STR_INSERT ) ) ); - // FIXME: HELPID - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, ""/*HID_AVMEDIA_TOOLBOXITEM_INSERT*/ ); + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_INSERT, HID_AVMEDIA_TOOLBOXITEM_INSERT ); maPlayToolBox.InsertSeparator(); } @@ -119,22 +117,18 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : } maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PLAY, implGetImage( AVMEDIA_IMG_PLAY ), String( AVMEDIA_RESID( AVMEDIA_STR_PLAY ) ), TIB_CHECKABLE ); - // FIXME: HELPID - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, ""/*HID_AVMEDIA_TOOLBOXITEM_PLAY*/ ); + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PLAY, HID_AVMEDIA_TOOLBOXITEM_PLAY ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_PAUSE, implGetImage( AVMEDIA_IMG_PAUSE ), String( AVMEDIA_RESID( AVMEDIA_STR_PAUSE ) ), TIB_CHECKABLE ); - // FIXME: HELPID - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, ""/*HID_AVMEDIA_TOOLBOXITEM_PAUSE*/ ); + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_PAUSE, HID_AVMEDIA_TOOLBOXITEM_PAUSE ); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_STOP, implGetImage( AVMEDIA_IMG_STOP ), String( AVMEDIA_RESID( AVMEDIA_STR_STOP ) ), TIB_CHECKABLE ); - // FIXME: HELPID - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, ""/*HID_AVMEDIA_TOOLBOXITEM_STOP*/ ); + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_STOP, HID_AVMEDIA_TOOLBOXITEM_STOP ); maPlayToolBox.InsertSeparator(); maPlayToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_LOOP, implGetImage( AVMEDIA_IMG_ENDLESS ), String( AVMEDIA_RESID( AVMEDIA_STR_ENDLESS ) ) ); - // FIXME: HELPID - maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, ""/*HID_AVMEDIA_TOOLBOXITEM_LOOP*/ ); + maPlayToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_LOOP, HID_AVMEDIA_TOOLBOXITEM_LOOP ); if( MEDIACONTROLSTYLE_SINGLELINE == meControlStyle ) maPlayToolBox.InsertSeparator(); @@ -147,8 +141,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maTimeSlider.SetSlideHdl( LINK( this, MediaControl, implTimeHdl ) ); maTimeSlider.SetEndSlideHdl( LINK( this, MediaControl, implTimeEndHdl ) ); maTimeSlider.SetRange( Range( 0, AVMEDIA_TIME_RANGE ) ); - // FIXME: HELPID - maTimeSlider.SetHelpId( ""/*HID_AVMEDIA_TIMESLIDER*/ ); + maTimeSlider.SetHelpId( HID_AVMEDIA_TIMESLIDER ); maTimeSlider.SetUpdateMode( true ); maTimeSlider.SetSizePixel( Size( 128, maPlayToolBox.GetSizePixel().Height() ) ); maTimeSlider.Show(); @@ -158,8 +151,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maTimeEdit.SetUpdateMode( true ); maTimeEdit.SetSizePixel( Size( maTimeEdit.GetTextWidth( aTimeText ) + 8, maPlayToolBox.GetSizePixel().Height() ) ); maTimeEdit.SetControlBackground( Application::GetSettings().GetStyleSettings().GetWindowColor() ); - // FIXME: HELPID - maTimeEdit.SetHelpId( ""/*HID_AVMEDIA_TIMEEDIT*/ ); + maTimeEdit.SetHelpId( HID_AVMEDIA_TIMEEDIT ); maTimeEdit.Disable(); maTimeEdit.Show(); maMinSize.Width() += maTimeEdit.GetSizePixel().Width(); @@ -168,8 +160,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maMuteToolBox.InsertSeparator(); maMuteToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_MUTE, implGetImage( AVMEDIA_IMG_MUTE ), String( AVMEDIA_RESID( AVMEDIA_STR_MUTE ) ) ); - // FIXME: HELPID - maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, ""/*HID_AVMEDIA_TOOLBOXITEM_MUTE*/ ); + maMuteToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_MUTE, HID_AVMEDIA_TOOLBOXITEM_MUTE ); maMuteToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) ); maMuteToolBox.SetSizePixel( maMuteToolBox.CalcWindowSizePixel() ); @@ -180,8 +171,7 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : maVolumeSlider.SetEndSlideHdl( LINK( this, MediaControl, implVolumeEndHdl ) ); maVolumeSlider.SetRange( Range( AVMEDIA_DB_RANGE, 0 ) ); maVolumeSlider.SetUpdateMode( true ); - // FIXME: HELPID - maVolumeSlider.SetHelpId( ""/*HID_AVMEDIA_VOLUMESLIDER*/ ); + maVolumeSlider.SetHelpId( HID_AVMEDIA_VOLUMESLIDER ); maVolumeSlider.SetSizePixel( Size( 48, maPlayToolBox.GetSizePixel().Height() ) ); maVolumeSlider.Show(); maMinSize.Width() += maVolumeSlider.GetSizePixel().Width(); @@ -192,12 +182,10 @@ MediaControl::MediaControl( Window* pParent, MediaControlStyle eControlStyle ) : mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_200 ) ), AVMEDIA_ZOOMLEVEL_200 ); mpZoomListBox->InsertEntry( String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM_FIT ) ), AVMEDIA_ZOOMLEVEL_FIT ); mpZoomListBox->SetSelectHdl( LINK( this, MediaControl, implZoomSelectHdl ) ); - // FIXME: HELPID - mpZoomListBox->SetHelpId( ""/*HID_AVMEDIA_ZOOMLISTBOX*/ ); + mpZoomListBox->SetHelpId( HID_AVMEDIA_ZOOMLISTBOX ); maZoomToolBox.InsertItem( AVMEDIA_TOOLBOXITEM_ZOOM, String( AVMEDIA_RESID( AVMEDIA_STR_ZOOM ) ) ); - // FIXME: HELPID - maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, ""/*HID_AVMEDIA_ZOOMLISTBOX*/ ); + maZoomToolBox.SetHelpId( AVMEDIA_TOOLBOXITEM_ZOOM, HID_AVMEDIA_ZOOMLISTBOX ); maZoomToolBox.SetItemWindow( AVMEDIA_TOOLBOXITEM_ZOOM, mpZoomListBox ); maZoomToolBox.SetSelectHdl( LINK( this, MediaControl, implSelectHdl ) ); diff --git a/avmedia/source/framework/mediaplayer.cxx b/avmedia/source/framework/mediaplayer.cxx index c66f88817fe3..caab783c6a7c 100644 --- a/avmedia/source/framework/mediaplayer.cxx +++ b/avmedia/source/framework/mediaplayer.cxx @@ -124,8 +124,7 @@ void MediaFloater::ToggleFloatingMode() Window* pWindow = mpMediaWindow->getWindow(); if( pWindow ) - // FIXME: HELPID - pWindow->SetHelpId( ""/*HID_AVMEDIA_PLAYERWINDOW*/ ); + pWindow->SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); mpMediaWindow->show(); } diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index 14d174beec80..553eea6196c1 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -179,8 +179,7 @@ MediaWindowImpl::MediaWindowImpl( Window* pParent, MediaWindow* pMediaWindow, bo mpEmptyBmpEx( NULL ), mpAudioBmpEx( NULL ) { - // FIXME: HELPID - maChildWindow.SetHelpId( ""/*HID_AVMEDIA_PLAYERWINDOW*/ ); + maChildWindow.SetHelpId( HID_AVMEDIA_PLAYERWINDOW ); maChildWindow.Hide(); if( mpMediaWindowControl ) diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index fa61c437e1ba..2d0733dfbae3 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -183,14 +183,10 @@ ExtBoxWithBtns_Impl::ExtBoxWithBtns_Impl( ExtMgrDialog* pParent, TheExtensionMan m_pEnableBtn = new PushButton( this, WB_TABSTOP ); m_pRemoveBtn = new PushButton( this, WB_TABSTOP ); - // FIXME: HELPID - SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX*/ ); - // FIXME: HELPID - m_pOptionsBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_OPTIONS*/ ); - // FIXME: HELPID - m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_DISABLE*/ ); - // FIXME: HELPID - m_pRemoveBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_REMOVE*/ ); + SetHelpId( HID_EXTENSION_MANAGER_LISTBOX ); + m_pOptionsBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_OPTIONS ); + m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE ); + m_pRemoveBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_REMOVE ); m_pOptionsBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, HandleOptionsBtn ) ); m_pEnableBtn->SetClickHdl( LINK( this, ExtBoxWithBtns_Impl, HandleEnableBtn ) ); @@ -298,14 +294,12 @@ void ExtBoxWithBtns_Impl::SetButtonStatus( const TEntry_Impl pEntry ) if ( ( pEntry->m_eState == REGISTERED ) || ( pEntry->m_eState == NOT_AVAILABLE ) ) { m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) ); - // FIXME: HELPID - m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_DISABLE*/ ); + m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE ); } else { m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) ); - // FIXME: HELPID - m_pEnableBtn->SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX_ENABLE*/ ); + m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_ENABLE ); } if ( ( pEntry->m_eState == NOT_AVAILABLE ) || pEntry->m_bMissingDeps ) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 3e5db094d032..2e02a90f59fd 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -186,8 +186,7 @@ ExtensionBox_Impl::ExtensionBox_Impl( Dialog* pParent, TheExtensionManager *pMan m_pScrollBar( NULL ), m_pManager( pManager ) { - // FIXME: HELPID - SetHelpId( ""/*HID_EXTENSION_MANAGER_LISTBOX*/ ); + SetHelpId( HID_EXTENSION_MANAGER_LISTBOX ); m_pScrollBar = new ScrollBar( this, WB_VERT ); m_pScrollBar->SetScrollHdl( LINK( this, ExtensionBox_Impl, ScrollHdl ) ); diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 9e837f235db1..50992eb07a97 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -221,8 +221,7 @@ LicenseDialogImpl::LicenseDialogImpl( FreeResource(); - // FIXME: HELPID - m_acceptButton.SetUniqueId(""/*UID_BTN_LICENSE_ACCEPT*/); + m_acceptButton.SetUniqueId(UID_BTN_LICENSE_ACCEPT); m_fiArrow1.Show(true); m_fiArrow2.Show(false); m_mlLicense.SetText(sLicenseText); diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index 2619c4398881..1dfae71768b3 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -30,49 +30,40 @@ #include "svl/solar.hrc" -#define HID_GLOBAL_FALLBACK 0xFFFFFFFF +#define HID_PACKAGE_MANAGER "DESKTOP_HID_PACKAGE_MANAGER" +#define HID_PACKAGE_MANAGER_TREELISTBOX "DESKTOP_HID_PACKAGE_MANAGER_TREELISTBOX" +#define HID_PACKAGE_MANAGER_PROGRESS "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS" +#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL" +#define HID_PACKAGE_MANAGER_MENU_ITEM "DESKTOP_HID_PACKAGE_MANAGER_MENU_ITEM" -#define HID_PACKAGE_MANAGER (HID_DESKTOP_START + 0) -#define HID_PACKAGE_MANAGER_TREELISTBOX (HID_DESKTOP_START + 1) -#define HID_PACKAGE_MANAGER_PROGRESS (HID_DESKTOP_START + 2) -#define HID_PACKAGE_MANAGER_PROGRESS_CANCEL (HID_DESKTOP_START + 3) -#define HID_PACKAGE_MANAGER_MENU_ITEM (HID_DESKTOP_START + 4) +#define HID_FIRSTSTART_DIALOG "DESKTOP_HID_FIRSTSTART_DIALOG" +#define HID_FIRSTSTART_WELCOME "DESKTOP_HID_FIRSTSTART_WELCOME" +#define HID_FIRSTSTART_LICENSE "DESKTOP_HID_FIRSTSTART_LICENSE" +#define HID_FIRSTSTART_MIGRATION "DESKTOP_HID_FIRSTSTART_MIGRATION" +#define HID_FIRSTSTART_REGISTRATION "DESKTOP_HID_FIRSTSTART_REGISTRATION" +#define HID_FIRSTSTART_USER "DESKTOP_HID_FIRSTSTART_USER" +#define HID_FIRSTSTART_PREV "DESKTOP_HID_FIRSTSTART_PREV" +#define HID_FIRSTSTART_NEXT "DESKTOP_HID_FIRSTSTART_NEXT" +#define HID_FIRSTSTART_CANCEL "DESKTOP_HID_FIRSTSTART_CANCEL" +#define HID_FIRSTSTART_FINISH "DESKTOP_HID_FIRSTSTART_FINISH" +#define UID_FIRSTSTART_HELP "DESKTOP_UID_FIRSTSTART_HELP" +#define UID_BTN_LICENSE_ACCEPT "DESKTOP_UID_BTN_LICENSE_ACCEPT" +#define HID_FIRSTSTART_UPDATE_CHECK "DESKTOP_HID_FIRSTSTART_UPDATE_CHECK" +#define HID_DEPLOYMENT_GUI_UPDATE "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE" +#define HID_DEPLOYMENT_GUI_UPDATEINSTALL "DESKTOP_HID_DEPLOYMENT_GUI_UPDATEINSTALL" +#define HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER" +#define HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES" +#define HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES "DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES" -#define HID_FIRSTSTART_DIALOG (HID_DESKTOP_START + 5) -#define HID_FIRSTSTART_WELCOME (HID_DESKTOP_START + 6) -#define HID_FIRSTSTART_LICENSE (HID_DESKTOP_START + 7) -#define HID_FIRSTSTART_MIGRATION (HID_DESKTOP_START + 8) -#define HID_FIRSTSTART_REGISTRATION (HID_DESKTOP_START + 9) -#define HID_FIRSTSTART_USER (HID_DESKTOP_START + 10) -#define HID_FIRSTSTART_PREV (HID_DESKTOP_START + 11) -#define HID_FIRSTSTART_NEXT (HID_DESKTOP_START + 12) -#define HID_FIRSTSTART_CANCEL (HID_DESKTOP_START + 13) -#define HID_FIRSTSTART_FINISH (HID_DESKTOP_START + 14) -#define UID_FIRSTSTART_HELP (HID_DESKTOP_START + 15) -#define UID_BTN_LICENSE_ACCEPT (HID_DESKTOP_START + 16) -#define HID_FIRSTSTART_UPDATE_CHECK (HID_DESKTOP_START + 17) -#define HID_DEPLOYMENT_GUI_UPDATE (HID_DESKTOP_START + 18) -#define HID_DEPLOYMENT_GUI_UPDATEINSTALL (HID_DESKTOP_START + 19) -#define HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER (HID_DESKTOP_START + 20) -#define HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES (HID_DESKTOP_START + 21) -#define HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES (HID_DESKTOP_START + 22) +#define HID_EXTENSION_MANAGER_LISTBOX "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX" +#define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS" +#define HID_EXTENSION_MANAGER_LISTBOX_ENABLE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE" +#define HID_EXTENSION_MANAGER_LISTBOX_DISABLE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE" +#define HID_EXTENSION_MANAGER_LISTBOX_REMOVE "DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE" -#define HID_EXTENSION_MANAGER_LISTBOX (HID_DESKTOP_START + 23) -#define HID_EXTENSION_MANAGER_LISTBOX_OPTIONS (HID_DESKTOP_START + 24) -#define HID_EXTENSION_MANAGER_LISTBOX_ENABLE (HID_DESKTOP_START + 25) -#define HID_EXTENSION_MANAGER_LISTBOX_DISABLE (HID_DESKTOP_START + 26) -#define HID_EXTENSION_MANAGER_LISTBOX_REMOVE (HID_DESKTOP_START + 27) +#define HID_EXTENSION_DEPENDENCIES "DESKTOP_HID_EXTENSION_DEPENDENCIES" -#define HID_EXTENSION_DEPENDENCIES (HID_DESKTOP_START + 28) - -#define HID_PACKAGE_MANAGER_UPD_REQ (HID_DESKTOP_START + 29) - -#define ACT_DESKTOP_HID_END HID_PACKAGE_MANAGER_UPD_REQ - -// check bounds: -#if ACT_DESKTOP_HID_END > HID_DESKTOP_END -#error Resource overflow in #line, #file -#endif +#define HID_PACKAGE_MANAGER_UPD_REQ "DESKTOP_HID_PACKAGE_MANAGER_UPD_REQ" #endif diff --git a/desktop/source/migration/wizard.cxx b/desktop/source/migration/wizard.cxx index 3169386db192..48ee2abc71ca 100644 --- a/desktop/source/migration/wizard.cxx +++ b/desktop/source/migration/wizard.cxx @@ -191,14 +191,10 @@ FirstStartWizard::FirstStartWizard( Window* pParent, sal_Bool bLicenseNeedsAccep SetPageSizePixel(LogicToPixel(aTPSize, MAP_APPFONT)); //set help id - // FIXME: HELPID - m_pPrevPage->SetHelpId(""/*HID_FIRSTSTART_PREV*/); - // FIXME: HELPID - m_pNextPage->SetHelpId(""/*HID_FIRSTSTART_NEXT*/); - // FIXME: HELPID - m_pCancel->SetHelpId(""/*HID_FIRSTSTART_CANCEL*/); - // FIXME: HELPID - m_pFinish->SetHelpId(""/*HID_FIRSTSTART_FINISH*/); + m_pPrevPage->SetHelpId(HID_FIRSTSTART_PREV); + m_pNextPage->SetHelpId(HID_FIRSTSTART_NEXT); + m_pCancel->SetHelpId(HID_FIRSTSTART_CANCEL); + m_pFinish->SetHelpId(HID_FIRSTSTART_FINISH); // m_pHelp->SetUniqueId(UID_FIRSTSTART_HELP); m_pHelp->Hide(); m_pHelp->Disable(); diff --git a/editeng/inc/helpid.hrc b/editeng/inc/helpid.hrc index 204f97842bf9..4b6a745c4415 100644 --- a/editeng/inc/helpid.hrc +++ b/editeng/inc/helpid.hrc @@ -35,47 +35,31 @@ #include // Help-Ids -------------------------------------------------------------- -#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_EDIT_START) -#define HID_EDITENG_SPELLER_PARALANGUAGE (HID_EDIT_START + 1) -#define HID_EDITENG_SPELLER_ADDWORD (HID_EDIT_START + 2) -#define HID_EDITENG_SPELLER_AUTOCORRECT (HID_EDIT_START + 3) -#define HID_EDITENG_SPELLER_IGNORE (HID_EDIT_START + 4) -#define HID_EDITENG_SPELLER_START (HID_EDIT_START + 5) -#define HID_AUTOCORR_HELP_END (HID_EDIT_START + 6) -#define HID_AUTOCORR_HELP_START (HID_EDIT_START + 7) -#define HID_AUTOCORR_HELP_WORD HID_AUTOCORR_HELP_START +#define HID_EDITENG_SPELLER_WORDLANGUAGE "EDITENG_HID_EDITENG_SPELLER_WORDLANGUAGE" +#define HID_EDITENG_SPELLER_PARALANGUAGE "EDITENG_HID_EDITENG_SPELLER_PARALANGUAGE" +#define HID_EDITENG_SPELLER_ADDWORD "EDITENG_HID_EDITENG_SPELLER_ADDWORD" +#define HID_EDITENG_SPELLER_AUTOCORRECT "EDITENG_HID_EDITENG_SPELLER_AUTOCORRECT" +#define HID_EDITENG_SPELLER_IGNORE "EDITENG_HID_EDITENG_SPELLER_IGNORE" +#define HID_EDITENG_SPELLER_START "EDITENG_HID_EDITENG_SPELLER_START" -#define HID_AUTOCORR_HELP_SENT (HID_AUTOCORR_HELP_START+1) -#define HID_AUTOCORR_HELP_SENTWORD (HID_AUTOCORR_HELP_START+2) -#define HID_AUTOCORR_HELP_ACORWORD (HID_AUTOCORR_HELP_START+3) - -#define HID_AUTOCORR_HELP_ACORSENTWORD (HID_AUTOCORR_HELP_START+5) - -#define HID_AUTOCORR_HELP_CHGTOENEMDASH (HID_AUTOCORR_HELP_START+7) -#define HID_AUTOCORR_HELP_WORDENEMDASH (HID_AUTOCORR_HELP_START+8) -#define HID_AUTOCORR_HELP_SENTENEMDASH (HID_AUTOCORR_HELP_START+9) -#define HID_AUTOCORR_HELP_SENTWORDENEMDASH (HID_AUTOCORR_HELP_START+10) -#define HID_AUTOCORR_HELP_ACORWORDENEMDASH (HID_AUTOCORR_HELP_START+11) - -#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH (HID_AUTOCORR_HELP_START+13) -#define HID_AUTOCORR_HELP_CHGQUOTES (HID_AUTOCORR_HELP_START+15) -#define HID_AUTOCORR_HELP_CHGSGLQUOTES (HID_AUTOCORR_HELP_START+16) -#define HID_AUTOCORR_HELP_SETINETATTR (HID_AUTOCORR_HELP_START+17) -#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE (HID_AUTOCORR_HELP_START+18) -#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL (HID_AUTOCORR_HELP_START+19) -#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL (HID_AUTOCORR_HELP_START+20) -#define HID_AUTOCORR_HELP_CHGORDINALNUMBER (HID_AUTOCORR_HELP_START+21) // HID_EDIT_START + 28 - -// please adjust ACT_SVX_HID_END2 below if you add entries here! - -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_SVX_HID_END (HID_EDIT_START+28) -#if ACT_SVX_HID_END > HID_EDIT_END -#error Resource-Ueberlauf in #line, #file -#endif +#define HID_AUTOCORR_HELP_WORD "EDITENG_HID_AUTOCORR_HELP_START" +#define HID_AUTOCORR_HELP_SENT "EDITENG_HID_AUTOCORR_HELP_SENT" +#define HID_AUTOCORR_HELP_SENTWORD "EDITENG_HID_AUTOCORR_HELP_SENTWORD" +#define HID_AUTOCORR_HELP_ACORWORD "EDITENG_HID_AUTOCORR_HELP_ACORWORD" +#define HID_AUTOCORR_HELP_ACORSENTWORD "EDITENG_HID_AUTOCORR_HELP_ACORSENTWORD" +#define HID_AUTOCORR_HELP_CHGTOENEMDASH "EDITENG_HID_AUTOCORR_HELP_CHGTOENEMDASH" +#define HID_AUTOCORR_HELP_WORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_WORDENEMDASH" +#define HID_AUTOCORR_HELP_SENTENEMDASH "EDITENG_HID_AUTOCORR_HELP_SENTENEMDASH" +#define HID_AUTOCORR_HELP_SENTWORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_SENTWORDENEMDASH" +#define HID_AUTOCORR_HELP_ACORWORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_ACORWORDENEMDASH" +#define HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH "EDITENG_HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH" +#define HID_AUTOCORR_HELP_CHGQUOTES "EDITENG_HID_AUTOCORR_HELP_CHGQUOTES" +#define HID_AUTOCORR_HELP_CHGSGLQUOTES "EDITENG_HID_AUTOCORR_HELP_CHGSGLQUOTES" +#define HID_AUTOCORR_HELP_SETINETATTR "EDITENG_HID_AUTOCORR_HELP_SETINETATTR" +#define HID_AUTOCORR_HELP_INGNOREDOUBLESPACE "EDITENG_HID_AUTOCORR_HELP_INGNOREDOUBLESPACE" +#define HID_AUTOCORR_HELP_CHGWEIGHTUNDERL "EDITENG_HID_AUTOCORR_HELP_CHGWEIGHTUNDERL" +#define HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL "EDITENG_HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL" +#define HID_AUTOCORR_HELP_CHGORDINALNUMBER "EDITENG_HID_AUTOCORR_HELP_CHGORDINALNUMBER" #endif diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 35c51b82d1fe..766023a0038c 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -1083,11 +1083,9 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link* pCallBack ) String aParaStr( EditResId( RID_STR_PARAGRAPH ) ); aParaStr.SearchAndReplace( String( RTL_CONSTASCII_USTRINGPARAM( "%x" ) ), aTmpPara ); aPopupMenu.InsertItem( MN_WORDLANGUAGE, aWordStr ); - // FIXME: HELPID - aPopupMenu.SetHelpId( MN_WORDLANGUAGE, ""/*HID_EDITENG_SPELLER_WORDLANGUAGE*/ ); + aPopupMenu.SetHelpId( MN_WORDLANGUAGE, HID_EDITENG_SPELLER_WORDLANGUAGE ); aPopupMenu.InsertItem( MN_PARALANGUAGE, aParaStr ); - // FIXME: HELPID - aPopupMenu.SetHelpId( MN_PARALANGUAGE, ""/*HID_EDITENG_SPELLER_PARALANGUAGE*/ ); + aPopupMenu.SetHelpId( MN_PARALANGUAGE, HID_EDITENG_SPELLER_PARALANGUAGE ); } // ## Create mnemonics here diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 3e875e0b0fdc..42d7816199c7 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1389,6 +1389,32 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, if( nRet ) { + const char* aHelpIds[] = + { + HID_AUTOCORR_HELP_WORD, + HID_AUTOCORR_HELP_SENT, + HID_AUTOCORR_HELP_SENTWORD, + HID_AUTOCORR_HELP_ACORWORD, + "", + HID_AUTOCORR_HELP_ACORSENTWORD, + "", + HID_AUTOCORR_HELP_CHGTOENEMDASH, + HID_AUTOCORR_HELP_WORDENEMDASH, + HID_AUTOCORR_HELP_SENTENEMDASH, + HID_AUTOCORR_HELP_SENTWORDENEMDASH, + HID_AUTOCORR_HELP_ACORWORDENEMDASH, + "", + HID_AUTOCORR_HELP_ACORSENTWORDENEMDASH, + "", + HID_AUTOCORR_HELP_CHGQUOTES, + HID_AUTOCORR_HELP_CHGSGLQUOTES, + HID_AUTOCORR_HELP_SETINETATTR, + HID_AUTOCORR_HELP_INGNOREDOUBLESPACE, + HID_AUTOCORR_HELP_CHGWEIGHTUNDERL, + HID_AUTOCORR_HELP_CHGFRACTIONSYMBOL, + HID_AUTOCORR_HELP_CHGORDINALNUMBER + }; + ULONG nHelpId = 0; if( nRet & ( Autocorrect|CptlSttSntnc|CptlSttWrd|ChgToEnEmDash ) ) { @@ -1415,9 +1441,8 @@ ULONG SvxAutoCorrect::AutoCorrect( SvxAutoCorrDoc& rDoc, const String& rTxt, if( nHelpId ) { - nHelpId += HID_AUTOCORR_HELP_START - 1; - // FIXME: HELPID - Application::GetHelp()->OpenHelpAgent( String()/*nHelpId*/ ); + nHelpId -= 1; + Application::GetHelp()->OpenHelpAgent( aHelpIds[nHelpId] ); } } diff --git a/formula/inc/formula/IFunctionDescription.hxx b/formula/inc/formula/IFunctionDescription.hxx index 110b1dfd2470..8dd3a95ae067 100644 --- a/formula/inc/formula/IFunctionDescription.hxx +++ b/formula/inc/formula/IFunctionDescription.hxx @@ -92,7 +92,7 @@ namespace formula virtual void fillVisibleArgumentMapping(::std::vector& _rArguments) const = 0; virtual void initArgumentInfo() const = 0; virtual ::rtl::OUString getSignature() const = 0; - virtual long getHelpId() const = 0; + virtual rtl::OString getHelpId() const = 0; // parameter virtual sal_uInt32 getParameterCount() const = 0; diff --git a/formula/inc/formula/formdata.hxx b/formula/inc/formula/formdata.hxx index 780f95f8fdb5..0db3492a9519 100644 --- a/formula/inc/formula/formdata.hxx +++ b/formula/inc/formula/formdata.hxx @@ -81,7 +81,6 @@ private: USHORT nEdFocus; String aUndoStr; BOOL bMatrix; - // FIXME: HELPID rtl::OString aUniqueId; Selection aSelection; }; diff --git a/formula/inc/formula/formula.hxx b/formula/inc/formula/formula.hxx index 0039b66b4ae2..c12501f61103 100644 --- a/formula/inc/formula/formula.hxx +++ b/formula/inc/formula/formula.hxx @@ -80,9 +80,7 @@ protected: ::std::pair RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( BOOL bForced = FALSE ); - // FIXME: HELPID rtl::OString FindFocusWin(Window *pWin); - // FIXME: HELPID void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId); void HighlightFunctionParas(const String& aFormula); @@ -131,14 +129,12 @@ protected: ::std::pair RefInputStartBefore( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputStartAfter( RefEdit* pEdit, RefButton* pButton = NULL ); void RefInputDoneAfter( BOOL bForced = FALSE ); - // FIXME: HELPID rtl::OString FindFocusWin(Window *pWin); - // FIXME: HELPID void SetFocusWin(Window *pWin,const rtl::OString& nUniqueId); void HighlightFunctionParas(const String& aFormula); void SetMeText(const String& _sText); - FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate); + FormulaDlgMode SetMeText(const String& _sText,xub_StrLen PrivStart, xub_StrLen PrivEnd,BOOL bMatrix,BOOL _bSelect,BOOL _bUpdate); void Update(); BOOL CheckMatrix(String& aFormula /*IN/OUT*/); String GetMeText() const; diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc index ff51f806b734..796f46752411 100644 --- a/formula/inc/helpids.hrc +++ b/formula/inc/helpids.hrc @@ -31,32 +31,26 @@ #include // HID_FORMULA_START #endif -#define HID_FORMULADLG_FORMULA (HID_FORMULA_START + 0) -#define HID_FORMULA_FAP_FORMULA (HID_FORMULA_START + 1) -#define HID_FORMULA_FAP_STRUCT (HID_FORMULA_START + 2) -#define HID_FORMULA_FAP_PAGE (HID_FORMULA_START + 3) -#define HID_FORMULA_FAP_EDIT1 (HID_FORMULA_START + 4) -#define HID_FORMULA_FAP_EDIT2 (HID_FORMULA_START + 5) -#define HID_FORMULA_FAP_EDIT3 (HID_FORMULA_START + 6) -#define HID_FORMULA_FAP_EDIT4 (HID_FORMULA_START + 7) -#define HID_FORMULA_FAP_BTN_FX1 (HID_FORMULA_START + 8) -#define HID_FORMULA_FAP_BTN_FX2 (HID_FORMULA_START + 9) -#define HID_FORMULA_FAP_BTN_FX3 (HID_FORMULA_START +10) -#define HID_FORMULA_FAP_BTN_FX4 (HID_FORMULA_START +11) -#define HID_FORMULA_FAP_BTN_REF1 (HID_FORMULA_START +12) -#define HID_FORMULA_FAP_BTN_REF2 (HID_FORMULA_START +13) -#define HID_FORMULA_FAP_BTN_REF3 (HID_FORMULA_START +14) -#define HID_FORMULA_FAP_BTN_REF4 (HID_FORMULA_START +15) -#define HID_FORMULA_LB_CATEGORY (HID_FORMULA_START +16) -#define HID_FORMULA_LB_FUNCTION (HID_FORMULA_START +17) -#define HID_FORMULATAB_FUNCTION (HID_FORMULA_START +18) -#define HID_FORMULATAB_STRUCT (HID_FORMULA_START +19) - - -#if HID_FORMULATAB_STRUCT > HID_FORMULA_END -#error Help-Id Ueberlauf in #file, #line -#endif -// don't forget to update the file util/hidother.src +#define HID_FORMULADLG_FORMULA "FORMULA_HID_FORMULADLG_FORMULA" +#define HID_FORMULA_FAP_FORMULA "FORMULA_HID_FORMULA_FAP_FORMULA" +#define HID_FORMULA_FAP_STRUCT "FORMULA_HID_FORMULA_FAP_STRUCT" +#define HID_FORMULA_FAP_PAGE "FORMULA_HID_FORMULA_FAP_PAGE" +#define HID_FORMULA_FAP_EDIT1 "FORMULA_HID_FORMULA_FAP_EDIT1" +#define HID_FORMULA_FAP_EDIT2 "FORMULA_HID_FORMULA_FAP_EDIT2" +#define HID_FORMULA_FAP_EDIT3 "FORMULA_HID_FORMULA_FAP_EDIT3" +#define HID_FORMULA_FAP_EDIT4 "FORMULA_HID_FORMULA_FAP_EDIT4" +#define HID_FORMULA_FAP_BTN_FX1 "FORMULA_HID_FORMULA_FAP_BTN_FX1" +#define HID_FORMULA_FAP_BTN_FX2 "FORMULA_HID_FORMULA_FAP_BTN_FX2" +#define HID_FORMULA_FAP_BTN_FX3 "FORMULA_HID_FORMULA_FAP_BTN_FX3" +#define HID_FORMULA_FAP_BTN_FX4 "FORMULA_HID_FORMULA_FAP_BTN_FX4" +#define HID_FORMULA_FAP_BTN_REF1 "FORMULA_HID_FORMULA_FAP_BTN_REF1" +#define HID_FORMULA_FAP_BTN_REF2 "FORMULA_HID_FORMULA_FAP_BTN_REF2" +#define HID_FORMULA_FAP_BTN_REF3 "FORMULA_HID_FORMULA_FAP_BTN_REF3" +#define HID_FORMULA_FAP_BTN_REF4 "FORMULA_HID_FORMULA_FAP_BTN_REF4" +#define HID_FORMULA_LB_CATEGORY "FORMULA_HID_FORMULA_LB_CATEGORY" +#define HID_FORMULA_LB_FUNCTION "FORMULA_HID_FORMULA_LB_FUNCTION" +#define HID_FORMULATAB_FUNCTION "FORMULA_HID_FORMULATAB_FUNCTION" +#define HID_FORMULATAB_STRUCT "FORMULA_HID_FORMULATAB_STRUCT" #endif //FORMULA_HELPID_HRC diff --git a/formula/source/ui/dlg/FormulaHelper.cxx b/formula/source/ui/dlg/FormulaHelper.cxx index 3adbd95d9fd1..1d71b40919eb 100644 --- a/formula/source/ui/dlg/FormulaHelper.cxx +++ b/formula/source/ui/dlg/FormulaHelper.cxx @@ -50,7 +50,7 @@ namespace formula virtual void fillVisibleArgumentMapping(::std::vector& ) const {} virtual void initArgumentInfo() const {} virtual ::rtl::OUString getSignature() const { return ::rtl::OUString(); } - virtual long getHelpId() const { return 0; } + virtual rtl::OString getHelpId() const { return ""; } virtual sal_uInt32 getParameterCount() const { return 0; } virtual ::rtl::OUString getParameterName(sal_uInt32 ) const { return ::rtl::OUString(); } virtual ::rtl::OUString getParameterDescription(sal_uInt32 ) const { return ::rtl::OUString(); } diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx index 8255aae371da..0a971e94e5b6 100644 --- a/formula/source/ui/dlg/formula.cxx +++ b/formula/source/ui/dlg/formula.cxx @@ -226,14 +226,10 @@ namespace formula FormulaHelper m_aFormulaHelper; - // FIXME: HELPID rtl::OString m_aEditHelpId; - // FIXME: HELPID rtl::OString aOldHelp; - // FIXME: HELPID rtl::OString aOldUnique; - // FIXME: HELPID rtl::OString aActivWinId; BOOL bIsShutDown; @@ -334,9 +330,7 @@ FormulaDlg_Impl::FormulaDlg_Impl(Dialog* pParent aTabCtrl.SetTabPage( TP_FUNCTION, pFuncPage); aTabCtrl.SetTabPage( TP_STRUCT, pStructPage); - // FIXME: HELPID aOldHelp = pParent->GetHelpId(); // HelpId aus Resource immer fuer "Seite 1" - // FIXME: HELPID aOldUnique = pParent->GetUniqueId(); aFtResult.Show( _bSupportResult ); @@ -414,7 +408,6 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) if(pWin!=NULL) { aActivWinId = pWin->GetUniqueId(); - // FIXME: HELPID if(aActivWinId.getLength()==0) { Window* pParent=pWin->GetParent(); @@ -422,14 +415,12 @@ void FormulaDlg_Impl::PreNotify( NotifyEvent& rNEvt ) { aActivWinId=pParent->GetUniqueId(); - // FIXME: HELPID if(aActivWinId.getLength()!=0) break; pParent=pParent->GetParent(); } } - // FIXME: HELPID - if(aActivWinId!=0) + if(aActivWinId.getLength()) { FormEditData* pData = m_pHelper->getFormEditData(); @@ -833,9 +824,7 @@ void FormulaDlg_Impl::FillListboxes() aNewTitle = aTitle1; // HelpId fuer 1. Seite ist die aus der Resource - // FIXME: HELPID m_pParent->SetHelpId( aOldHelp ); - // FIXME: HELPID m_pParent->SetUniqueId( aOldUnique ); } // ----------------------------------------------------------------------------- @@ -872,12 +861,9 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) aFtEditName.SetText( pFuncDesc->getFunctionName() ); aFtEditName.Show(); pParaWin->Show(); - // FIXME: HELPID - #if 0 - const long nHelpId = pFuncDesc->getHelpId(); - if ( nHelpId ) - pMEdit->SetSmartHelpId(SmartId(nHelpId)); - #endif + const rtl::OString aHelpId = pFuncDesc->getHelpId(); + if ( aHelpId.getLength() ) + pMEdit->SetHelpId(aHelpId); } xub_StrLen nOldStart, nOldEnd; @@ -933,7 +919,6 @@ void FormulaDlg_Impl::FillControls(BOOL &rbNext, BOOL &rbPrev) else { aFtEditName.SetText(String()); - // FIXME: HELPID pMEdit->SetHelpId( m_aEditHelpId ); } // Test, ob vorne/hinten noch mehr Funktionen sind @@ -1809,7 +1794,6 @@ rtl::OString FormulaDlg_Impl::FindFocusWin(Window *pWin) rtl::OString aUniqueId; if(pWin->HasFocus()) { - // FIXME: HELPID aUniqueId=pWin->GetUniqueId(); if(aUniqueId.getLength()==0) { @@ -1942,13 +1926,11 @@ void FormulaModalDialog::RefInputDoneAfter( BOOL bForced ) rtl::OString FormulaModalDialog::FindFocusWin(Window *pWin) { - // FIXME: HELPID return m_pImpl->FindFocusWin( pWin ); } void FormulaModalDialog::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { - // FIXME: HELPID if(pWin->GetUniqueId()==nUniqueId) { pWin->GrabFocus(); @@ -2024,13 +2006,10 @@ FormulaDlg::FormulaDlg( SfxBindings* pB, SfxChildWindow* pCW, ,_pHelper,_pFunctionMgr,_pDlg)) { FreeResource(); - // FIXME: HELPID - #if 0 - if(GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId + if(!GetHelpId().getLength()) //Hack, da im SfxModelessDialog die HelpId SetHelpId(GetUniqueId()); //fuer einen ModelessDialog entfernt und //in eine UniqueId gewandelt wird, machen //wir das an dieser Stelle rueckgaengig. - #endif SetText(m_pImpl->aTitle1); } @@ -2102,13 +2081,11 @@ void FormulaDlg::RefInputDoneAfter( BOOL bForced ) rtl::OString FormulaDlg::FindFocusWin(Window *pWin) { - // FIXME: HELPID return m_pImpl->FindFocusWin( pWin ); } void FormulaDlg::SetFocusWin(Window *pWin,const rtl::OString& nUniqueId) { - // FIXME: HELPID if(pWin->GetUniqueId()==nUniqueId) { pWin->GrabFocus(); @@ -2178,7 +2155,6 @@ IMPL_LINK( FormulaDlg, UpdateFocusHdl, Timer*, EMPTYARG ) if (pData) // wird nicht ueber Close zerstoert; { m_pImpl->m_pHelper->setReferenceInput(pData); - // FIXME: HELPID rtl::OString nUniqueId(pData->GetUniqueId()); SetFocusWin(this,nUniqueId); } diff --git a/formula/source/ui/dlg/funcpage.cxx b/formula/source/ui/dlg/funcpage.cxx index a66b4b2137af..1f8b64c7b4ba 100644 --- a/formula/source/ui/dlg/funcpage.cxx +++ b/formula/source/ui/dlg/funcpage.cxx @@ -190,18 +190,14 @@ IMPL_LINK( FuncPage, SelHdl, ListBox*, pLb ) const IFunctionDescription* pDesc = GetFuncDesc( GetFunction() ); if ( pDesc ) { - // FIXME: HELPID - #if 0 - const long nHelpId = pDesc->getHelpId(); - if ( nHelpId ) - aLbFunction.SetSmartHelpId(SmartId(nHelpId)); - #endif + const rtl::OString sHelpId = pDesc->getHelpId(); + if ( sHelpId.getLength() ) + aLbFunction.SetHelpId(sHelpId); } aSelectionLink.Call(this); } else { - // FIXME: HELPID aLbFunction.SetHelpId(m_aHelpId); UpdateFunctionList(); } diff --git a/formula/source/ui/dlg/funcpage.hxx b/formula/source/ui/dlg/funcpage.hxx index 4d7dc5739d0f..225114ff00aa 100644 --- a/formula/source/ui/dlg/funcpage.hxx +++ b/formula/source/ui/dlg/funcpage.hxx @@ -82,7 +82,6 @@ private: m_pFunctionManager; ::std::vector< TFunctionDesc > aLRUList; - // FIXME: HELPID rtl::OString m_aHelpId; diff --git a/formula/source/ui/dlg/funcutl.cxx b/formula/source/ui/dlg/funcutl.cxx index db8a4e136015..c4e28b3da8f1 100644 --- a/formula/source/ui/dlg/funcutl.cxx +++ b/formula/source/ui/dlg/funcutl.cxx @@ -758,9 +758,7 @@ EditBox::EditBox( Window* pParent, const ResId& rResId ) // #105582# the HelpId from the resource must be set for the MultiLineEdit, // not for the control that contains it. - // FIXME: HELPID pMEdit->SetHelpId( GetHelpId() ); - // FIXME: HELPID SetHelpId( "" ); } diff --git a/formula/source/ui/dlg/parawin.cxx b/formula/source/ui/dlg/parawin.cxx index 9afa9fb20587..5e656aea0967 100644 --- a/formula/source/ui/dlg/parawin.cxx +++ b/formula/source/ui/dlg/parawin.cxx @@ -297,25 +297,19 @@ void ParaWin::SetFunctionDesc(const IFunctionDescription* pFDesc) nArgs = pFuncDesc->getSuppressedArgumentCount(); pFuncDesc->fillVisibleArgumentMapping(aVisibleArgMapping); aSlider.Hide(); - // FIXME: HELPID - #if 0 - long nHelpId = pFuncDesc->getHelpId(); - SetHelpId( nHelpId ); - aEdArg1.SetHelpId( nHelpId ); - aEdArg2.SetHelpId( nHelpId ); - aEdArg3.SetHelpId( nHelpId ); - aEdArg4.SetHelpId( nHelpId ); - #endif + rtl::OString sHelpId = pFuncDesc->getHelpId(); + SetHelpId( sHelpId ); + aEdArg1.SetHelpId( sHelpId ); + aEdArg2.SetHelpId( sHelpId ); + aEdArg3.SetHelpId( sHelpId ); + aEdArg4.SetHelpId( sHelpId ); // Unique-IDs muessen gleich bleiben fuer Automatisierung - // FIXME: HELPID - #if 0 - SetUniqueId( ""/*HID_FORMULA_FAP_PAGE*/ ); + SetUniqueId( HID_FORMULA_FAP_PAGE ); aEdArg1.SetUniqueId( HID_FORMULA_FAP_EDIT1 ); aEdArg2.SetUniqueId( HID_FORMULA_FAP_EDIT2 ); aEdArg3.SetUniqueId( HID_FORMULA_FAP_EDIT3 ); aEdArg4.SetUniqueId( HID_FORMULA_FAP_EDIT4 ); - #endif SetActiveLine(0); } else diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index c51a326477fa..1e34b2eee840 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -205,32 +205,26 @@ namespace svt { String sHelpURL( _rURL ); if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) ) - { - // FIXME: HELPID - rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); - if ( _bFileView ) - // the file view "overloaded" the SetHelpId - static_cast< SvtFileView* >( _pControl )->SetHelpId( sID ); - else - _pControl->SetHelpId( sID ); - } + sHelpURL = sHelpURL.Copy( sizeof( "HID:" ) - 1 ); + + // URLs should always be UTF8 encoded and escaped + rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); + if ( _bFileView ) + // the file view "overloaded" the SetHelpId + static_cast< SvtFileView* >( _pControl )->SetHelpId( sID ); else - { - DBG_ERRORFILE( "OControlAccess::setHelpURL: unsupported help URL type!" ); - } + _pControl->SetHelpId( sID ); } //--------------------------------------------------------------------- ::rtl::OUString OControlAccess::getHelpURL( Window* _pControl, sal_Bool _bFileView ) { - // FIXME: HELPID rtl::OString aHelpId = _pControl->GetHelpId(); if ( _bFileView ) // the file view "overloaded" the SetHelpId aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( ); rtl::OUString sHelpURL( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) ); - return sHelpURL; } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 87df9e404b6a..c7a18050c3ff 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -600,8 +600,7 @@ void SvtFileDialog::Init_Impl bool bSaveMode = ( FILEDLG_MODE_SAVE == _pImp->_eMode ); pURLBox->SetNoURLSelection( bSaveMode ); - // FIXME: HELPID - _pImp->_pEdFileName->SetHelpId( ""/*HID_FILEDLG_AUTOCOMPLETEBOX*/ ); + _pImp->_pEdFileName->SetHelpId( HID_FILEDLG_AUTOCOMPLETEBOX ); _pImp->_pFtFileType = new FixedText( this, SvtResId( FT_EXPLORERFILE_FILETYPE ) ); _pImp->CreateFilterListControl( this, SvtResId( LB_EXPLORERFILE_FILETYPE ) ); @@ -650,8 +649,7 @@ void SvtFileDialog::Init_Impl _pFileView->SetUrlFilter( &m_aURLFilter ); _pFileView->EnableAutoResize(); - // FIXME: HELPID - _pFileView->SetHelpId( ""/*HID_FILEDLG_STANDARD*/ ); + _pFileView->SetHelpId( HID_FILEDLG_STANDARD ); _pFileView->SetStyle( _pFileView->GetStyle() | WB_TABSTOP ); // Positionen und Groessen der Knoepfe bestimmen. @@ -703,8 +701,7 @@ void SvtFileDialog::Init_Impl if ( nStyle & SFXWB_READONLY ) { _pCbReadOnly = new CheckBox( this, SvtResId( CB_EXPLORERFILE_READONLY ) ); - // FIXME: HELPID - _pCbReadOnly->SetHelpId( ""/*HID_FILEOPEN_READONLY*/ ); + _pCbReadOnly->SetHelpId( HID_FILEOPEN_READONLY ); _pCbReadOnly->SetText( SvtResId( STR_SVT_FILEPICKER_READONLY ) ); AddControl( _pCbReadOnly ); ReleaseOwnerShip( _pCbReadOnly ); @@ -813,23 +810,15 @@ void SvtFileDialog::Init_Impl { // different help ids if in save-as mode // 90744 - 09.08.2001 - frank.schoenheit@sun.com - // FIXME: HELPID - SetHelpId( ""/*HID_FILESAVE_DIALOG*/ ); - - // FIXME: HELPID - _pImp->_pEdFileName->SetHelpId( ""/*HID_FILESAVE_FILEURL*/ ); - // FIXME: HELPID - _pImp->_pBtnFileOpen->SetHelpId( ""/*HID_FILESAVE_DOSAVE*/ ); - // FIXME: HELPID - _pImp->_pBtnNewFolder->SetHelpId( ""/*HID_FILESAVE_CREATEDIRECTORY*/ ); - // FIXME: HELPID - _pImp->_pBtnStandard->SetHelpId( ""/*HID_FILESAVE_DEFAULTDIRECTORY*/ ); - // FIXME: HELPID - _pImp->_pBtnUp->SetHelpId( ""/*HID_FILESAVE_LEVELUP*/ ); - // FIXME: HELPID - _pImp->GetFilterListControl()->SetHelpId( ""/*HID_FILESAVE_FILETYPE*/ ); - // FIXME: HELPID - _pFileView->SetHelpId( ""/*HID_FILESAVE_FILEVIEW*/ ); + SetHelpId( HID_FILESAVE_DIALOG ); + + _pImp->_pEdFileName->SetHelpId( HID_FILESAVE_FILEURL ); + _pImp->_pBtnFileOpen->SetHelpId( HID_FILESAVE_DOSAVE ); + _pImp->_pBtnNewFolder->SetHelpId( HID_FILESAVE_CREATEDIRECTORY ); + _pImp->_pBtnStandard->SetHelpId( HID_FILESAVE_DEFAULTDIRECTORY ); + _pImp->_pBtnUp->SetHelpId( HID_FILESAVE_LEVELUP ); + _pImp->GetFilterListControl()->SetHelpId( HID_FILESAVE_FILETYPE ); + _pFileView->SetHelpId( HID_FILESAVE_FILEVIEW ); // formerly, there was only _pLbFileVersion, which was used for 3 different // use cases. For reasons of maintainability, I introduced extra members (_pLbTemplates, _pLbImageTemplates) @@ -838,23 +827,16 @@ void SvtFileDialog::Init_Impl // tests I made lead to a dialog where _no_ of the three list boxes was present. // 96930 - 15.08.2002 - fs@openoffice.org if ( _pImp->_pLbFileVersion ) - // FIXME: HELPID - _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); + _pImp->_pLbFileVersion->SetHelpId( HID_FILESAVE_TEMPLATE ); if ( _pImp->_pLbTemplates ) - // FIXME: HELPID - _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); + _pImp->_pLbTemplates->SetHelpId( HID_FILESAVE_TEMPLATE ); if ( _pImp->_pLbImageTemplates ) - // FIXME: HELPID - _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILESAVE_TEMPLATE*/ ); + _pImp->_pLbImageTemplates->SetHelpId( HID_FILESAVE_TEMPLATE ); - // FIXME: HELPID - if ( _pImp->_pCbPassword ) _pImp->_pCbPassword->SetHelpId( ""/*HID_FILESAVE_SAVEWITHPASSWORD*/ ); - // FIXME: HELPID - if ( _pImp->_pCbAutoExtension ) _pImp->_pCbAutoExtension->SetHelpId( ""/*HID_FILESAVE_AUTOEXTENSION*/ ); - // FIXME: HELPID - if ( _pImp->_pCbOptions ) _pImp->_pCbOptions->SetHelpId( ""/*HID_FILESAVE_CUSTOMIZEFILTER*/ ); - // FIXME: HELPID - if ( _pCbSelection ) _pCbSelection->SetHelpId( ""/*HID_FILESAVE_SELECTION*/ ); + if ( _pImp->_pCbPassword ) _pImp->_pCbPassword->SetHelpId( HID_FILESAVE_SAVEWITHPASSWORD ); + if ( _pImp->_pCbAutoExtension ) _pImp->_pCbAutoExtension->SetHelpId( HID_FILESAVE_AUTOEXTENSION ); + if ( _pImp->_pCbOptions ) _pImp->_pCbOptions->SetHelpId( HID_FILESAVE_CUSTOMIZEFILTER ); + if ( _pCbSelection ) _pCbSelection->SetHelpId( HID_FILESAVE_SELECTION ); } // correct the z-order of the controls @@ -2999,8 +2981,7 @@ void SvtFileDialog::AddControls_Impl( ) { _pCbLinkBox = new CheckBox( this ); _pCbLinkBox ->SetText( SvtResId( STR_SVT_FILEPICKER_INSERT_AS_LINK ) ); - // FIXME: HELPID - _pCbLinkBox ->SetHelpId( ""/*HID_FILEDLG_LINK_CB*/ ); + _pCbLinkBox ->SetHelpId( HID_FILEDLG_LINK_CB ); AddControl( _pCbLinkBox ); ReleaseOwnerShip( _pCbLinkBox ); _pCbLinkBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) ); @@ -3017,8 +2998,7 @@ void SvtFileDialog::AddControls_Impl( ) // "Vorschau" _pCbPreviewBox = new CheckBox( this ); _pCbPreviewBox->SetText( SvtResId( STR_SVT_FILEPICKER_SHOW_PREVIEW ) ); - // FIXME: HELPID - _pCbPreviewBox->SetHelpId( ""/*HID_FILEDLG_PREVIEW_CB*/ ); + _pCbPreviewBox->SetHelpId( HID_FILEDLG_PREVIEW_CB ); AddControl( _pCbPreviewBox ); ReleaseOwnerShip( _pCbPreviewBox ); _pCbPreviewBox->SetClickHdl( LINK( this, SvtFileDialog, ClickHdl_Impl ) ); @@ -3066,8 +3046,7 @@ void SvtFileDialog::AddControls_Impl( ) { _pPbPlay = new PushButton( this ); _pPbPlay->SetText( SvtResId( STR_SVT_FILEPICKER_PLAY ) ); - // FIXME: HELPID - _pPbPlay->SetHelpId( ""/*HID_FILESAVE_DOPLAY*/ ); + _pPbPlay->SetHelpId( HID_FILESAVE_DOPLAY ); AddControl( _pPbPlay ); ReleaseOwnerShip( _pPbPlay ); _pPbPlay->SetClickHdl( LINK( this, SvtFileDialog, PlayButtonHdl_Impl ) ); @@ -3079,8 +3058,7 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtFileVersion->SetText( SvtResId( STR_SVT_FILEPICKER_VERSION ) ); _pImp->_pLbFileVersion = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - // FIXME: HELPID - _pImp->_pLbFileVersion->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ ); + _pImp->_pLbFileVersion->SetHelpId( HID_FILEOPEN_VERSION ); } else if ( _nExtraBits & SFX_EXTRA_TEMPLATES ) { @@ -3088,8 +3066,7 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_TEMPLATES ) ); _pImp->_pLbTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - // FIXME: HELPID - _pImp->_pLbTemplates->SetHelpId( ""/*HID_FILEOPEN_VERSION*/ ); + _pImp->_pLbTemplates->SetHelpId( HID_FILEOPEN_VERSION ); // This is strange. During the re-factoring during 96930, I discovered that this help id // is set in the "Templates mode". This was hidden in the previous implementation. // Shouldn't this be a more meaningfull help id. @@ -3101,8 +3078,7 @@ void SvtFileDialog::AddControls_Impl( ) _pImp->_pFtImageTemplates->SetText( SvtResId( STR_SVT_FILEPICKER_IMAGE_TEMPLATE ) ); _pImp->_pLbImageTemplates = new ListBox( this, SvtResId( LB_EXPLORERFILE_SHARED_LISTBOX ) ); - // FIXME: HELPID - _pImp->_pLbImageTemplates->SetHelpId( ""/*HID_FILEOPEN_IMAGE_TEMPLATE*/ ); + _pImp->_pLbImageTemplates->SetHelpId( HID_FILEOPEN_IMAGE_TEMPLATE ); } } diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc index 9f5997a4089c..e27ec2cbe3bc 100644 --- a/fpicker/source/office/iodlg.hrc +++ b/fpicker/source/office/iodlg.hrc @@ -86,22 +86,22 @@ #define SID_SFX_START 5000 #define SID_OPENURL (SID_SFX_START + 596) -#define HID_FILEDLG_STANDARD (HID_SFX_START + 27) -#define HID_FILEDLG_MANAGER (HID_SFX_START + 28) -#define HID_FILEDLG_URL (HID_SFX_START + 29) -#define HID_FILEDLG_USE_PASSWD (HID_SFX_START + 31) -#define HID_FILEDLG_READ_ONLY (HID_SFX_START + 32) - -#define HID_FILEDLG_AUTOCOMPLETEBOX (HID_SFX_START + 218) -#define HID_FILEDLG_SAVE_BTN (HID_SFX_START + 219) -#define HID_FILEDLG_SAVE_FILENAME (HID_SFX_START + 220) -#define HID_FILEDLG_SAVE_FILETYPE (HID_SFX_START + 221) -#define HID_FILEDLG_INSERT_BTN (HID_SFX_START + 222) -#define HID_FILEDLG_PATH_BTN (HID_SFX_START + 223) -#define HID_FILEDLG_PATH_FILENAME (HID_SFX_START + 224) -#define HID_FILEDLG_FOLDER_BTN (HID_SFX_START + 225) -#define HID_FILEDLG_FOLDER_FILENAME (HID_SFX_START + 226) -#define HID_FILEDLG_SRCHFOLDER_BTN (HID_SFX_START + 227) +#define HID_FILEDLG_STANDARD "FPICKER_HID_FILEDLG_STANDARD" +#define HID_FILEDLG_MANAGER "FPICKER_HID_FILEDLG_MANAGER" +#define HID_FILEDLG_URL "FPICKER_HID_FILEDLG_URL" +#define HID_FILEDLG_USE_PASSWD "FPICKER_HID_FILEDLG_USE_PASSWD" +#define HID_FILEDLG_READ_ONLY "FPICKER_HID_FILEDLG_READ_ONLY" + +#define HID_FILEDLG_AUTOCOMPLETEBOX "FPICKER_HID_FILEDLG_AUTOCOMPLETEBOX" +#define HID_FILEDLG_SAVE_BTN "FPICKER_HID_FILEDLG_SAVE_BTN" +#define HID_FILEDLG_SAVE_FILENAME "FPICKER_HID_FILEDLG_SAVE_FILENAME" +#define HID_FILEDLG_SAVE_FILETYPE "FPICKER_HID_FILEDLG_SAVE_FILETYPE" +#define HID_FILEDLG_INSERT_BTN "FPICKER_HID_FILEDLG_INSERT_BTN" +#define HID_FILEDLG_PATH_BTN "FPICKER_HID_FILEDLG_PATH_BTN" +#define HID_FILEDLG_PATH_FILENAME "FPICKER_HID_FILEDLG_PATH_FILENAME" +#define HID_FILEDLG_FOLDER_BTN "FPICKER_HID_FILEDLG_FOLDER_BTN" +#define HID_FILEDLG_FOLDER_FILENAME "FPICKER_HID_FILEDLG_FOLDER_FILENAME" +#define HID_FILEDLG_SRCHFOLDER_BTN "FPICKER_HID_FILEDLG_SRCHFOLDER_BTN" #endif diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc index f40d5fcaaa2d..3f9068e65d26 100644 --- a/framework/inc/helpid.hrc +++ b/framework/inc/helpid.hrc @@ -33,17 +33,11 @@ // Help-Ids ----------------------------------------------------------------- -#define HID_BACKINGWINDOW (HID_FRAMEWORK_START + 0) -#define HID_LICENSEDIALOG (HID_FRAMEWORK_START + 1) -#define HID_STATUSBAR (HID_FRAMEWORK_START + 2) - -#define ACT_FRAMEWORK_HID_END HID_BACKINGWINDOW - -// "Uberlaufpr"ufung -------------------------------------------------------- - -#if ACT_FRAMEWORK_HID_END > HID_FRAMEWORK_END -#error Resource-Ueberlauf in #line, #file -#endif +#define HID_BACKINGWINDOW "FWK_HID_BACKINGWINDOW" +#define HID_LICENSEDIALOG "FWK_HID_LICENSEDIALOG" +#define HID_STATUSBAR "FWK_HID_STATUSBAR" +#define HID_SVX_COMMON_MACRO_ORGANIZER "FWK_HID_SVX_COMMON_MACRO_ORGANIZER" +#define HID_SVX_BASIC_MACRO_ORGANIZER "FWK_HID_SVX_BASIC_MACRO_ORGANIZER" #endif // #ifndef _FRAMEWORK_HELPID_HRC diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx index d33ab0d7baad..5b9822af86e6 100644 --- a/framework/inc/uielement/commandinfo.hxx +++ b/framework/inc/uielement/commandinfo.hxx @@ -47,11 +47,13 @@ namespace framework struct CommandInfo { CommandInfo() : nId( 0 ), + nWidth( 0 ), nImageInfo( 0 ), bMirrored( false ), bRotated( false ) {} USHORT nId; + sal_uInt32 nWidth; ::std::vector< USHORT > aIds; sal_Int16 nImageInfo; sal_Bool bMirrored : 1, diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index 8016bbb620b8..12301f170f26 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -145,6 +145,7 @@ class ToolBarMerger const ::rtl::OUString& rControlType ); static void CreateToolbarItem( ToolBox* pToolbox, + CommandToInfoMap& rCommandMap, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonToolbarItem& rAddonToolbarItem ); diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index dcb0b57182df..5ffc014d1771 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -102,7 +102,7 @@ namespace framework ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > getLayoutManagerToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& rLayoutManager ); rtl::OUString getUINameFromCommand( const rtl::OUString& rCommandURL ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const rtl::OUString& rCommandURL ); - void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, USHORT nHelpId, const rtl::OUString& aLabel ); + void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OString& sHelpId, const rtl::OUString& aLabel ); sal_Bool isContextSensitiveToolbarNonVisible(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState; diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index c8cf5249dd9a..13c5647341e6 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -528,8 +528,7 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f } // set help ID for our canvas - // FIXME: HELPID - pWindow->SetHelpId(""/*HID_BACKINGWINDOW*/); + pWindow->SetHelpId(HID_BACKINGWINDOW); // inform BackingWindow about frame BackingWindow* pBack = dynamic_cast(pWindow ); diff --git a/framework/source/services/menudocumenthandler.cxx b/framework/source/services/menudocumenthandler.cxx deleted file mode 100644 index 8741fff39320..000000000000 --- a/framework/source/services/menudocumenthandler.cxx +++ /dev/null @@ -1,903 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_framework.hxx" - -#include -#include -#include -#include - -#ifndef __FRAMEWORK_SERVICES_ATTRIBUTELIST_HXX_ -#include -#endif - -#ifndef __COM_SUN_STAR_XML_SAX_XEXTENDEDDOCUMENTHANDLER_HPP_ -#include -#endif - - -using namespace ::rtl; -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::xml::sax; - -const int ITEMID_START_VALUE = 1000; - -#define XMLNS_MENU "http://openoffice.org/2001/menu" -#define XMLNS_PREFIX "menu:" - -#define ELEMENT_MENUBAR "http://openoffice.org/2001/menu^menubar" -#define ELEMENT_MENU "http://openoffice.org/2001/menu^menu" -#define ELEMENT_MENUPOPUP "http://openoffice.org/2001/menu^menupopup" -#define ELEMENT_MENUITEM "http://openoffice.org/2001/menu^menuitem" -#define ELEMENT_MENUSEPARATOR "http://openoffice.org/2001/menu^menuseparator" - -#define ELEMENT_NS_MENUBAR "menu:menubar" -#define ELEMENT_NS_MENU "menu:menu" -#define ELEMENT_NS_MENUPOPUP "menu:menupopup" -#define ELEMENT_NS_MENUITEM "menu:menuitem" -#define ELEMENT_NS_MENUSEPARATOR "menu:menuseparator" - -#define ATTRIBUTE_ID "http://openoffice.org/2001/menu^id" -#define ATTRIBUTE_LABEL "http://openoffice.org/2001/menu^label" -#define ATTRIBUTE_HELPID "http://openoffice.org/2001/menu^helpid" -#define ATTRIBUTE_LINEBREAK "http://openoffice.org/2001/menu^linebreak" - -#define ATTRIBUTE_NS_ID "menu:id" -#define ATTRIBUTE_NS_LABEL "menu:label" -#define ATTRIBUTE_NS_HELPID "menu:helpid" -#define ATTRIBUTE_NS_LINEBREAK "menu:linebreak" - -#define ATTRIBUTE_XMLNS_MENU "xmlns:menu" - -#define ATTRIBUTE_TYPE_CDATA "CDATA" - -#define MENUBAR_DOCTYPE "" - - -// special popup menus (filled during runtime) must be saved as a menuitem!!! -// same as in menumanager.cxx - you have to change both files!!! -#define SID_SFX_START 5000 -#define SID_NEWDOCDIRECT (SID_SFX_START + 537) -#define SID_AUTOPILOTMENU (SID_SFX_START + 1381) -#define SID_FORMATMENU (SID_SFX_START + 780) - -const ::rtl::OUString aSlotProtocol( RTL_CONSTASCII_USTRINGPARAM( "slot:" )); -const ::rtl::OUString aSlotNewDocDirect( RTL_CONSTASCII_USTRINGPARAM( "slot:5537" )); -const ::rtl::OUString aSlotAutoPilot( RTL_CONSTASCII_USTRINGPARAM( "slot:6381" )); - -const ::rtl::OUString aSpecialFileMenu( RTL_CONSTASCII_USTRINGPARAM( "file" )); -const ::rtl::OUString aSpecialWindowMenu( RTL_CONSTASCII_USTRINGPARAM( "window" )); - -const ULONG MENU_SAVE_LABEL = 0x00000001; - -namespace framework -{ - -// ----------------------------------------------------------------------------- -// Base class implementation - -ReadMenuDocumentHandlerBase::ReadMenuDocumentHandlerBase() : - m_xLocator( 0 ), - m_xReader( 0 ) -{ -} - -ReadMenuDocumentHandlerBase::~ReadMenuDocumentHandlerBase() -{ -} - -Any SAL_CALL ReadMenuDocumentHandlerBase::queryInterface( - const Type & rType ) -throw( RuntimeException ) -{ - Any a = ::cppu::queryInterface( - rType , - SAL_STATIC_CAST( XDocumentHandler*, this )); - if ( a.hasValue() ) - return a; - - return OWeakObject::queryInterface( rType ); -} - -void SAL_CALL ReadMenuDocumentHandlerBase::ignorableWhitespace( - const OUString& aWhitespaces ) -throw( SAXException, RuntimeException ) -{ -} - -void SAL_CALL ReadMenuDocumentHandlerBase::processingInstruction( - const OUString& aTarget, const OUString& aData ) -throw( SAXException, RuntimeException ) -{ -} - -void SAL_CALL ReadMenuDocumentHandlerBase::setDocumentLocator( - const Reference< XLocator > &xLocator) -throw( SAXException, RuntimeException ) -{ - m_xLocator = xLocator; -} - -::rtl::OUString ReadMenuDocumentHandlerBase::getErrorLineString() -{ - char buffer[32]; - - if ( m_xLocator.is() ) - { - snprintf( buffer, sizeof(buffer), "Line: %ld - ", static_cast( m_xLocator->getLineNumber() )); - return OUString::createFromAscii( buffer ); - } - else - return OUString(); -} - -// ----------------------------------------------------------------------------- - -// #110897# -OReadMenuDocumentHandler::OReadMenuDocumentHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - MenuBar* pMenuBar ) -: // #110897# - mxServiceFactory(xServiceFactory), - m_pMenuBar( pMenuBar ), - m_nElementDepth( 0 ), - m_bMenuBarMode( sal_False ), - m_nItemId( ITEMID_START_VALUE ) -{ -} - -// #110897# -const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuDocumentHandler::getServiceFactory() -{ - // #110897# - return mxServiceFactory; -} - -OReadMenuDocumentHandler::~OReadMenuDocumentHandler() -{ -} - - -void SAL_CALL OReadMenuDocumentHandler::startDocument(void) - throw ( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuDocumentHandler::endDocument(void) - throw( SAXException, RuntimeException ) -{ - if ( m_nElementDepth > 0 ) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "A closing element is missing!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } -} - - -void SAL_CALL OReadMenuDocumentHandler::startElement( - const OUString& aName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException ) -{ - if ( m_bMenuBarMode ) - { - ++m_nElementDepth; - m_xReader->startElement( aName, xAttrList ); - } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUBAR ))) - { - ++m_nElementDepth; - m_bMenuBarMode = sal_True; - - // #110897# m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( m_pMenuBar, &m_nItemId )); - m_xReader = Reference< XDocumentHandler >( new OReadMenuBarHandler( getServiceFactory(), m_pMenuBar, &m_nItemId )); - - m_xReader->startDocument(); - } -} - - -void SAL_CALL OReadMenuDocumentHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuDocumentHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException ) -{ - if ( m_bMenuBarMode ) - { - --m_nElementDepth; - m_xReader->endElement( aName ); - if ( 0 == m_nElementDepth ) - { - m_xReader->endDocument(); - m_xReader = Reference< XDocumentHandler >(); - m_bMenuBarMode = sal_False; - if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUBAR ))) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menubar expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - } -} - - -// ----------------------------------------------------------------------------- - - -// #110897# -OReadMenuBarHandler::OReadMenuBarHandler( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xServiceFactory, - MenuBar* pMenuBar, USHORT* pItemId ) -: // #110897# - mxServiceFactory( xServiceFactory ), - m_pMenuBar( pMenuBar ), - m_nElementDepth( 0 ), - m_bMenuMode( sal_False ), - m_pItemId( pItemId ) -{ -} - -// #110897# -const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& OReadMenuBarHandler::getServiceFactory() -{ - // #110897# - return mxServiceFactory; -} - -OReadMenuBarHandler::~OReadMenuBarHandler() -{ -} - - -void SAL_CALL OReadMenuBarHandler::startDocument(void) - throw ( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuBarHandler::endDocument(void) - throw( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuBarHandler::startElement( - const OUString& aName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException ) -{ - if ( m_bMenuMode ) - { - ++m_nElementDepth; - m_xReader->startElement( aName, xAttrList ); - } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) - { - ++m_nElementDepth; - - ULONG nHelpId = 0; - OUString aCommandId; - OUString aLabel; - - m_bMenuMode = sal_True; - PopupMenu* pMenu = new PopupMenu(); - - // read attributes for menu - for ( int i=0; i< xAttrList->getLength(); i++ ) - { - OUString aName = xAttrList->getNameByIndex( i ); - OUString aValue = xAttrList->getValueByIndex( i ); - if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID ))) - aCommandId = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL ))) - aLabel = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID ))) - nHelpId = aValue.toInt32(); - } - - if ( aCommandId.getLength() > 0 ) - { - USHORT nItemId; - if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 ) - nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32(); - else - nItemId = ++(*m_pItemId); - - m_pMenuBar->InsertItem( nItemId, String() ); - m_pMenuBar->SetPopupMenu( nItemId, pMenu ); - m_pMenuBar->SetItemCommand( nItemId, aCommandId ); - if ( nHelpId > 0 ) - m_pMenuBar->SetHelpId( nItemId, nHelpId ); - if ( aLabel.getLength() > 0 ) - { - m_pMenuBar->SetItemText( nItemId, aLabel ); - m_pMenuBar->SetUserValue( nItemId, MENU_SAVE_LABEL ); - } - else - { - m_pMenuBar->SetUserValue( nItemId, 0 ); - } - } - else - { - delete pMenu; - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "attribute id for element menu required!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - - m_xReader = Reference< XDocumentHandler >( new OReadMenuHandler( pMenu, m_pItemId )); - m_xReader->startDocument(); - } - else - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "element menu expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } -} - - -void SAL_CALL OReadMenuBarHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) -{ -} - - -void OReadMenuBarHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException ) -{ - if ( m_bMenuMode ) - { - --m_nElementDepth; - if ( 0 == m_nElementDepth ) - { - m_xReader->endDocument(); - m_xReader = Reference< XDocumentHandler >(); - m_bMenuMode = sal_False; - if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menu expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - else - m_xReader->endElement( aName ); - } -} - - -// ----------------------------------------------------------------------------- - - -OReadMenuHandler::OReadMenuHandler( Menu* pMenu, USHORT* pItemId ) : - m_pMenu( pMenu ), - m_nElementDepth( 0 ), - m_bMenuPopupMode( sal_False ), - m_pItemId( pItemId ) -{ -} - - -OReadMenuHandler::~OReadMenuHandler() -{ -} - - -void SAL_CALL OReadMenuHandler::startDocument(void) - throw ( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuHandler::endDocument(void) - throw( SAXException, RuntimeException) -{ -} - - -void SAL_CALL OReadMenuHandler::startElement( - const OUString& aName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException ) -{ - if ( m_bMenuPopupMode ) - { - ++m_nElementDepth; - m_xReader->startElement( aName, xAttrList ); - } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUPOPUP ))) - { - ++m_nElementDepth; - m_bMenuPopupMode = sal_True; - m_xReader = Reference< XDocumentHandler >( new OReadMenuPopupHandler( m_pMenu, m_pItemId )); - m_xReader->startDocument(); - } - else - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown element found!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } -} - - -void SAL_CALL OReadMenuHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException ) -{ - if ( m_bMenuPopupMode ) - { - --m_nElementDepth; - if ( 0 == m_nElementDepth ) - { - m_xReader->endDocument(); - m_xReader = Reference< XDocumentHandler >(); - m_bMenuPopupMode = sal_False; - if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUPOPUP ))) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menupopup expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - else - m_xReader->endElement( aName ); - } -} - - -// ----------------------------------------------------------------------------- - - -OReadMenuPopupHandler::OReadMenuPopupHandler( Menu* pMenu, USHORT* pItemId ) : - m_pMenu( pMenu ), - m_nElementDepth( 0 ), - m_bMenuMode( sal_False ), - m_pItemId( pItemId ), - m_nNextElementExpected( ELEM_CLOSE_NONE ) -{ -} - - -OReadMenuPopupHandler::~OReadMenuPopupHandler() -{ -} - - -void SAL_CALL OReadMenuPopupHandler::startDocument(void) - throw ( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuPopupHandler::endDocument(void) - throw( SAXException, RuntimeException) -{ -} - - -void SAL_CALL OReadMenuPopupHandler::startElement( - const OUString& aName, const Reference< XAttributeList > &xAttrList ) -throw( SAXException, RuntimeException ) -{ - ++m_nElementDepth; - - if ( m_bMenuMode ) - m_xReader->startElement( aName, xAttrList ); - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) - { - ULONG nHelpId = 0; - OUString aCommandId; - OUString aLabel; - - m_bMenuMode = sal_True; - PopupMenu* pMenu = new PopupMenu(); - - // read attributes for menu - for ( int i=0; i< xAttrList->getLength(); i++ ) - { - OUString aName = xAttrList->getNameByIndex( i ); - OUString aValue = xAttrList->getValueByIndex( i ); - if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID ))) - aCommandId = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL ))) - aLabel = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID ))) - nHelpId = aValue.toInt32(); - } - - if ( aCommandId.getLength() > 0 ) - { - USHORT nItemId; - if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 ) - nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32(); - else - nItemId = ++(*m_pItemId); - - m_pMenu->InsertItem( nItemId, String() ); - m_pMenu->SetPopupMenu( nItemId, pMenu ); - m_pMenu->SetItemCommand( nItemId, aCommandId ); - if ( nHelpId > 0 ) - m_pMenu->SetHelpId( nItemId, nHelpId ); - if ( aLabel.getLength() > 0 ) - { - m_pMenu->SetItemText( nItemId, aLabel ); - m_pMenu->SetUserValue( nItemId, MENU_SAVE_LABEL ); - } - else - { - m_pMenu->SetUserValue( nItemId, 0 ); - } - } - else - { - delete pMenu; - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "attribute id for element menu required!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - - m_xReader = Reference< XDocumentHandler >( new OReadMenuHandler( pMenu, m_pItemId )); - m_xReader->startDocument(); - } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM ))) - { - ULONG nHelpId = 0; - OUString aCommandId; - OUString aLabel; - - // read attributes for menu item - for ( int i=0; i< xAttrList->getLength(); i++ ) - { - OUString aName = xAttrList->getNameByIndex( i ); - OUString aValue = xAttrList->getValueByIndex( i ); - if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_ID ))) - aCommandId = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_LABEL ))) - aLabel = aValue; - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ATTRIBUTE_HELPID ))) - nHelpId = aValue.toInt32(); - } - - if ( aCommandId.getLength() > 0 ) - { - USHORT nItemId; - if ( aCommandId.compareTo( aSlotProtocol, aSlotProtocol.getLength() ) == 0 ) - nItemId = (USHORT) aCommandId.copy( aSlotProtocol.getLength() ).toInt32(); - else - nItemId = ++(*m_pItemId); - - m_pMenu->InsertItem( nItemId, String() ); - m_pMenu->SetItemCommand( nItemId, aCommandId ); - if ( nHelpId > 0 ) - m_pMenu->SetHelpId( nItemId, nHelpId ); - if ( aLabel.getLength() > 0 ) - { - m_pMenu->SetItemText( nItemId, aLabel ); - m_pMenu->SetUserValue( nItemId, MENU_SAVE_LABEL ); - } - else - { - m_pMenu->SetUserValue( nItemId, 0 ); - } - } - - m_nNextElementExpected = ELEM_CLOSE_MENUITEM; - } - else if ( aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUSEPARATOR ))) - { - m_pMenu->InsertSeparator(); - m_nNextElementExpected = ELEM_CLOSE_MENUSEPARATOR; - } - else - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown element found!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } -} - - -void SAL_CALL OReadMenuPopupHandler::characters(const rtl::OUString& aChars) -throw( SAXException, RuntimeException ) -{ -} - - -void SAL_CALL OReadMenuPopupHandler::endElement( const OUString& aName ) - throw( SAXException, RuntimeException ) -{ - --m_nElementDepth; - if ( m_bMenuMode ) - { - if ( 0 == m_nElementDepth ) - { - m_xReader->endDocument(); - m_xReader = Reference< XDocumentHandler >(); - m_bMenuMode = sal_False; - if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENU ))) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menu expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - else - m_xReader->endElement( aName ); - } - else - { - if ( m_nNextElementExpected == ELEM_CLOSE_MENUITEM ) - { - if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUITEM ))) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menuitem expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - else if ( m_nNextElementExpected == ELEM_CLOSE_MENUSEPARATOR ) - { - if ( !aName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( ELEMENT_MENUSEPARATOR ))) - { - OUString aErrorMessage = getErrorLineString(); - aErrorMessage += OUString( RTL_CONSTASCII_USTRINGPARAM( "closing element menuseparator expected!" )); - throw SAXException( aErrorMessage, Reference< XInterface >(), Any() ); - } - } - - m_nNextElementExpected = ELEM_CLOSE_NONE; - } -} - - -// --------------------------------- Write XML --------------------------------- - - -OWriteMenuDocumentHandler::OWriteMenuDocumentHandler( MenuBar* pMenu, Reference< XDocumentHandler > rxWriteDocumentHandler ) : - m_pMenuBar( pMenu ), - m_xWriteDocumentHandler( rxWriteDocumentHandler ) -{ - m_xEmptyList = Reference< XAttributeList >( (XAttributeList *)new AttributeListImpl, UNO_QUERY ); - m_aAttributeType = OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_TYPE_CDATA )); -} - - -OWriteMenuDocumentHandler::~OWriteMenuDocumentHandler() -{ -} - - -void OWriteMenuDocumentHandler::WriteMenuDocument() -throw ( SAXException, RuntimeException ) -{ - AttributeListImpl* pList = new AttributeListImpl; - Reference< XAttributeList > rList( (XAttributeList *) pList , UNO_QUERY ); - - m_xWriteDocumentHandler->startDocument(); - - // write DOCTYPE line! - Reference< XExtendedDocumentHandler > xExtendedDocHandler( m_xWriteDocumentHandler, UNO_QUERY ); - if ( xExtendedDocHandler.is() ) - { - xExtendedDocHandler->unknown( OUString( RTL_CONSTASCII_USTRINGPARAM( MENUBAR_DOCTYPE )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - } - - pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_XMLNS_MENU )), - m_aAttributeType, - OUString( RTL_CONSTASCII_USTRINGPARAM( XMLNS_MENU )) ); - - pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )), - m_aAttributeType, - OUString( RTL_CONSTASCII_USTRINGPARAM( "menubar" )) ); - - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUBAR )), pList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - - WriteMenu( m_pMenuBar ); - - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUBAR )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endDocument(); -} - - -void OWriteMenuDocumentHandler::WriteMenu( Menu* pMenu ) -throw ( SAXException, RuntimeException ) -{ - USHORT nItemCount = pMenu->GetItemCount(); - BOOL bSeparator = FALSE; - - for ( USHORT nItemPos = 0; nItemPos < nItemCount; nItemPos++ ) - { - USHORT nItemId = pMenu->GetItemId( nItemPos ); - - PopupMenu* pPopupMenu = pMenu->GetPopupMenu( nItemId ); - if ( pPopupMenu ) - { - OUString aItemCommand = pMenu->GetItemCommand( nItemId ); - - if ( nItemId == SID_NEWDOCDIRECT || - nItemId == SID_AUTOPILOTMENU ) - { - // special popup menus (filled during runtime) must be saved as a menuitem!!! - WriteMenuItem( pMenu, nItemId ); - bSeparator = FALSE; - } - else if ( nItemId == SID_FORMATMENU ) - { - // special popup menu - must be written as empty popup! - AttributeListImpl* pListMenu = new AttributeListImpl; - Reference< XAttributeList > xListMenu( (XAttributeList *)pListMenu , UNO_QUERY ); - - String aCommand( pMenu->GetItemCommand( nItemId ) ); - if ( !aCommand.Len() ) - { - aCommand = String::CreateFromAscii("slot:"); - aCommand += String::CreateFromInt32( nItemId ); - } - - pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )), - m_aAttributeType, - aCommand ); - -// if ( pMenu->GetUserValue( nItemId ) & MENU_SAVE_LABEL ) - pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )), - m_aAttributeType, - pMenu->GetItemText( nItemId ) ); - - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )), xListMenu ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - bSeparator = FALSE; - } - else if ( !AddonPopupMenu::IsCommandURLPrefix ( aItemCommand )) - { - AttributeListImpl* pListMenu = new AttributeListImpl; - Reference< XAttributeList > xListMenu( (XAttributeList *)pListMenu , UNO_QUERY ); - - String aCommand( pMenu->GetItemCommand( nItemId ) ); - if ( !aCommand.Len() ) - { - aCommand = String::CreateFromAscii("slot:"); - aCommand += String::CreateFromInt32( nItemId ); - } - - pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )), - m_aAttributeType, - aCommand ); - -// if ( pMenu->GetUserValue( nItemId ) & MENU_SAVE_LABEL ) - pListMenu->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )), - m_aAttributeType, - pMenu->GetItemText( nItemId ) ); - - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )), xListMenu ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - - WriteMenu( pPopupMenu ); - - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUPOPUP )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENU )) ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - bSeparator = FALSE; - } - } - else - { - if ( pMenu->GetItemType( nItemPos ) != MENUITEM_SEPARATOR ) - { - // don't save special menu items for (window list and pickup list, add-ons ) - if ( !MenuConfiguration::IsPickListItemId( nItemId ) && - !MenuConfiguration::IsWindowListItemId( nItemId ) && - !AddonMenuManager::IsAddonMenuId( nItemId )) - { - bSeparator = FALSE; - WriteMenuItem( pMenu, nItemId ); - } - } - else if ( !bSeparator ) - { - // Don't write two separators together - WriteMenuSeparator(); - bSeparator = TRUE; - } - } - } -} - - -void OWriteMenuDocumentHandler::WriteMenuItem( Menu* pMenu, USHORT nItemId ) -{ - AttributeListImpl* pList = new AttributeListImpl; - Reference< XAttributeList > xList( (XAttributeList *) pList , UNO_QUERY ); - - String aCommand( pMenu->GetItemCommand( nItemId ) ); - if ( !aCommand.Len() ) - { - aCommand = String::CreateFromAscii("slot:"); - aCommand += String::CreateFromInt32( nItemId ); - } - - pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_ID )), - m_aAttributeType, - aCommand ); - - ULONG nHelpId = pMenu->GetHelpId( nItemId ); - if ( nHelpId > 0 ) - { - pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_HELPID )), - m_aAttributeType, - OUString::valueOf( sal_Int64( nHelpId )) ); - } - -// if ( pMenu->GetUserValue( nItemId ) & MENU_SAVE_LABEL ) - pList->addAttribute( OUString( RTL_CONSTASCII_USTRINGPARAM( ATTRIBUTE_NS_LABEL )), - m_aAttributeType, - pMenu->GetItemText( nItemId )); - - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )), xList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUITEM )) ); -} - - -void OWriteMenuDocumentHandler::WriteMenuSeparator() -{ - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->startElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUSEPARATOR )), m_xEmptyList ); - m_xWriteDocumentHandler->ignorableWhitespace( OUString() ); - m_xWriteDocumentHandler->endElement( OUString( RTL_CONSTASCII_USTRINGPARAM( ELEMENT_NS_MENUSEPARATOR )) ); -} - -} // namespace framework diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 7be1516f1331..34579e903d6a 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -48,6 +48,7 @@ #include #include #include "helper/mischelper.hxx" +#include "helpid.hrc" using namespace com::sun::star::uno; using namespace com::sun::star::lang; @@ -97,9 +98,7 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo String aDisplayName = RetrieveLabelFromCommand( aCommand ); pPopupMenu->InsertItem( 2, aDisplayName ); pPopupMenu->SetItemCommand( 2, aCommand ); - //pPopupMenu->SetHelpId( 2, HID_SVX_BASIC_MACRO_ORGANIZER ); - // FIXME: HELPID - pPopupMenu->SetHelpId( 2, ""/*40012*/ ); + pPopupMenu->SetHelpId( 2, ".uno:MacroDialog" ); // insert providers but not basic or java addScriptItems( pPopupMenu, 4); @@ -219,9 +218,7 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt aDisplayName.Append( ellipsis ); pPopupMenu->InsertItem( itemId, aDisplayName ); pPopupMenu->SetItemCommand( itemId, aCommand ); - //pPopupMenu->SetHelpId( itemId, HID_SVX_COMMON_MACRO_ORGANIZER ); - // FIXME: HELPID - pPopupMenu->SetHelpId( itemId, ""/*40014*/ ); + pPopupMenu->SetHelpId( itemId, rtl::OString( aCommand.GetBuffer(), aCommand.Len(), RTL_TEXTENCODING_UTF8 ) ); itemId++; break; } diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 0a3295c1395e..58c1c8782f9e 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1795,11 +1795,6 @@ void MenuBarManager::FillMenu( pMenu->InsertItem( nId, aLabel ); pMenu->SetItemCommand( nId, aCommandURL ); - sal_Int32 nHelpId = aHelpURL.toInt32(); - if ( nHelpId > 0 ) - // FIXME: HELPID - // (should set aHelpURL ? - pMenu->SetHelpId( nId, ""/*(USHORT)nHelpId*/ ); if ( nStyle ) { MenuItemBits nBits = pMenu->GetItemBits( nId ); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index d143b717366c..553026827524 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -530,17 +530,6 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc m_pStatusBar->InsertItem( nId, nWidth, nItemBits, nOffset ); m_pStatusBar->SetItemCommand( nId, aCommandURL ); m_pStatusBar->SetAccessibleName( nId, aString ); -// m_pStatusBar->SetHelpText( nId, aString ); - - if ( aHelpURL.indexOf( aHelpIdPrefix ) == 0 ) - { - rtl::OUString aId( aHelpURL.copy( HELPID_PREFIX_LENGTH )); - sal_uInt16 nHelpId = (sal_uInt16)(aId.toInt32()); - if ( nHelpId > 0 ) - // FIXME: HELPID - m_pStatusBar->SetHelpId( nId, ""/*nHelpId*/ ); - } - ++nId; } } diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index ed506f5345e3..030a790b35e3 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -137,8 +137,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments ) pStatusBarManager = new StatusBarManager( m_xServiceFactory, xFrame, m_aResourceURL, pStatusBar ); ((FrameworkStatusBar*)pStatusBar)->SetStatusBarManager( pStatusBarManager ); m_xStatusBarManager = Reference< XComponent >( static_cast< OWeakObject *>( pStatusBarManager ), UNO_QUERY ); - // FIXME: HELPID - pStatusBar->SetUniqueId( ""/*HID_STATUSBAR*/ ); + pStatusBar->SetUniqueId( HID_STATUSBAR ); } } diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 19625d5e198b..3cf90b1867f5 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -883,15 +883,13 @@ void ToolBarManager::CreateControllers() if ( nId == 0 ) continue; - // FIXME: HELPID - // What ? A width initalized with a help id ? Should we perhaps add two bananas and a coconut to it ? - // sal_Int16 nWidth( sal_Int16( m_pToolBar->GetHelpId( nId ))); - sal_Int16 nWidth( nId ); rtl::OUString aLoadURL( RTL_CONSTASCII_USTRINGPARAM( ".uno:OpenUrl" )); rtl::OUString aCommandURL( m_pToolBar->GetItemCommand( nId )); sal_Bool bInit( sal_True ); sal_Bool bCreate( sal_True ); Reference< XStatusListener > xController; + CommandToInfoMap::iterator pCommandIter = m_aCommandMap.find( aCommandURL ); + sal_Int32 nWidth = ( pCommandIter != m_aCommandMap.end() ? pCommandIter->second.nWidth : 0 ); svt::ToolboxController* pController( 0 ); @@ -1188,7 +1186,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine rtl::OUString aHelpURL; rtl::OUString aTooltip; sal_uInt16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); - sal_uInt16 nWidth( 0 ); + sal_uInt32 nWidth( 0 ); sal_Bool bIsVisible( sal_True ); sal_uInt32 nStyle( 0 ); @@ -1277,6 +1275,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine if ( pIter == m_aCommandMap.end()) { aCmdInfo.nId = nId; + aCmdInfo.nWidth = nWidth; m_aCommandMap.insert( CommandToInfoMap::value_type( aCommandURL, aCmdInfo )); } else @@ -1284,10 +1283,6 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine pIter->second.aIds.push_back( nId ); } - // Add additional information for the controller to the obsolete help id - // FIXME: HELPID - m_pToolBar->SetHelpId( ""/*ULONG( nWidth )*/); - if ( !bIsVisible ) m_pToolBar->HideItem( nId ); diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 025ebea06a19..aca62a8b44ef 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -512,7 +512,6 @@ bool ToolBarMerger::MergeItems( pToolbar->InsertSeparator( sal_uInt16( nInsPos )); else { - ToolBarMerger::CreateToolbarItem( pToolbar, sal_uInt16( nInsPos ), rItemId, rItem ); CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL ); if ( pIter == rCommandMap.end()) { @@ -524,6 +523,8 @@ bool ToolBarMerger::MergeItems( { pIter->second.aIds.push_back( rItemId ); } + + ToolBarMerger::CreateToolbarItem( pToolbar, rCommandMap, sal_uInt16( nInsPos ), rItemId, rItem ); } ++nIndex; @@ -691,7 +692,7 @@ bool ToolBarMerger::RemoveItems( return pResult; } -void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonToolbarItem& rItem ) +void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, CommandToInfoMap& rCommandMap, sal_uInt16 nPos, sal_uInt16 nItemId, const AddonToolbarItem& rItem ) { pToolbar->InsertItem( nItemId, rItem.aLabel, 0, nPos ); pToolbar->SetItemCommand( nItemId, rItem.aCommandURL ); @@ -700,10 +701,9 @@ void ToolBarMerger::CreateToolbarItem( ToolBox* pToolbar, sal_uInt16 nPos, sal_u pToolbar->EnableItem( nItemId, sal_True ); pToolbar->SetItemState( nItemId, STATE_NOCHECK ); - // Use obsolete help id to transport the width of the item - // FIXME: HELPID - // this looks broken - pToolbar->SetHelpId( nItemId, ""/*rItem.nWidth*/ ); + CommandToInfoMap::iterator pIter = rCommandMap.find( rItem.aCommandURL ); + if ( pIter != rCommandMap.end() ) + pIter->second.nWidth = rItem.nWidth; // Use the user data to store add-on specific data with the toolbar item AddonsParams* pAddonParams = new AddonsParams; diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index d3a616a76629..6ed3e7233a77 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -181,7 +181,7 @@ ToolbarsMenuController::~ToolbarsMenuController() } void ToolbarsMenuController::addCommand( - Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, USHORT nHelpId, const rtl::OUString& rLabel ) + Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OString& sHelpId, const rtl::OUString& rLabel ) { USHORT nItemId = m_xPopupMenu->getItemCount()+1; @@ -216,9 +216,7 @@ void ToolbarsMenuController::addCommand( PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); if ( !!aImage ) pVCLPopupMenu->SetItemImage( nItemId, aImage ); - // FIXME: HELPID - pVCLPopupMenu->SetHelpId( nItemId, ""/*nHelpId*/ ); - (void)nHelpId; + pVCLPopupMenu->SetHelpId( nItemId, sHelpId ); } m_aCommandVector.push_back( rCommandURL ); @@ -510,14 +508,14 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) || m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" )) { - addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR )), 10360, aEmptyString ); + addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR )), CMD_HYPERLINKBAR, aEmptyString ); if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) || m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" )) - addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), 10417, aEmptyString ); + addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), CMD_COLORBAR, aEmptyString ); else if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" )) - addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), 26241, aEmptyString ); + addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), CMD_INPUTLINEBAR, aEmptyString ); else - addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), 20128, aEmptyString ); + addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), CMD_FORMULABAR, aEmptyString ); } sal_Bool bAddCommand( sal_True ); @@ -540,7 +538,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r m_xPopupMenu->insertSeparator( nItemCount+1 ); } - addCommand( m_xPopupMenu, aConfigureToolbar, 5904, aEmptyString ); + addCommand( m_xPopupMenu, aConfigureToolbar, CONFIGURE_TOOLBARS, aEmptyString ); } // Add separator if no configure has been added @@ -556,7 +554,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r String aLabelStr = String( FwkResId( STR_RESTORE_TOOLBARS )); rtl::OUString aRestoreCmd( RTL_CONSTASCII_USTRINGPARAM( CMD_RESTOREVISIBILITY )); - addCommand( m_xPopupMenu, aRestoreCmd, 9999, aLabelStr ); + addCommand( m_xPopupMenu, aRestoreCmd, CMD_RESTOREVISIBILITY, aLabelStr ); } } diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index 4b2535a7e61b..9509219eb99a 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -276,6 +276,8 @@ SvCommand::SvCommand( int argc, char ** argv ) if( 's' == aFirstChar ) { // Name der Slot-Ausgabe aSlotMapFile = aName; + aName += String::CreateFromAscii(".csv"); + aCSVFile = aName; } else if( 'l' == aFirstChar ) { // Name der Listing diff --git a/sfx2/inc/sfx2/basedlgs.hxx b/sfx2/inc/sfx2/basedlgs.hxx index 3508ea026637..fc7b318965b0 100644 --- a/sfx2/inc/sfx2/basedlgs.hxx +++ b/sfx2/inc/sfx2/basedlgs.hxx @@ -69,7 +69,6 @@ class SFX2_DLLPUBLIC SfxModalDialog: public ModalDialog { sal_uInt32 nUniqId; String aExtraData; - Timer aTimer; const SfxItemSet* pInputSet; SfxItemSet* pOutputSet; @@ -77,8 +76,6 @@ private: SAL_DLLPRIVATE SfxModalDialog(SfxModalDialog &); // not defined SAL_DLLPRIVATE void operator =(SfxModalDialog &); // not defined - DECL_DLLPRIVATE_LINK( TimerHdl_Impl, Timer* ); - SAL_DLLPRIVATE void SetDialogData_Impl(); SAL_DLLPRIVATE void GetDialogData_Impl(); SAL_DLLPRIVATE void init(); diff --git a/sfx2/inc/sfx2/dispatch.hxx b/sfx2/inc/sfx2/dispatch.hxx index f0dd2248c456..8d99d6efd9f4 100644 --- a/sfx2/inc/sfx2/dispatch.hxx +++ b/sfx2/inc/sfx2/dispatch.hxx @@ -122,7 +122,7 @@ friend class SfxViewFrame; DECL_DLLPRIVATE_LINK( PostMsgHandler, SfxRequest * ); SAL_DLLPRIVATE int Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest &rReq, BOOL bRecord ); - SAL_DLLPRIVATE sal_uInt32 _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*); + SAL_DLLPRIVATE void _Update_Impl( BOOL,BOOL,BOOL,SfxWorkWindow*); SAL_DLLPRIVATE void CollectTools_Impl(SfxWorkWindow*); protected: @@ -237,7 +237,7 @@ public: //#if 0 // _SOLAR__PRIVATE SAL_DLLPRIVATE BOOL HasSlot_Impl( USHORT ); SAL_DLLPRIVATE void SetMenu_Impl(); - SAL_DLLPRIVATE long Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc. + SAL_DLLPRIVATE void Update_Impl( BOOL bForce = FALSE ); // ObjectBars etc. SAL_DLLPRIVATE BOOL IsUpdated_Impl() const; SAL_DLLPRIVATE void DebugOutput_Impl() const; SAL_DLLPRIVATE void ResetObjectBars_Impl(); diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index d17553e2b2d0..ac267c7c6d45 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -305,7 +305,7 @@ public: Pointer to an array of help ids. For each element in _pControlId, there must be a corresponding element herein. */ - void SetControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId ); + void SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); void SetDialogHelpId( const sal_Int32 _nHelpId ); void CreateMatcher( const String& rName ); diff --git a/sfx2/inc/sfx2/mnumgr.hxx b/sfx2/inc/sfx2/mnumgr.hxx index ee1c81daa603..98c282562354 100644 --- a/sfx2/inc/sfx2/mnumgr.hxx +++ b/sfx2/inc/sfx2/mnumgr.hxx @@ -122,7 +122,7 @@ public: void EndInsert(); void CheckItem( USHORT, BOOL ); void RemoveItem( USHORT ); - void InsertItem( USHORT, const String&, MenuItemBits, + void InsertItem( USHORT, const String&, MenuItemBits, const rtl::OString& rHelpId, USHORT nPos = MENU_APPEND ); void InsertSeparator( USHORT nPos = MENU_APPEND ); void RemoveDisabledEntries(); diff --git a/sfx2/inc/sfx2/msg.hxx b/sfx2/inc/sfx2/msg.hxx index efbc2d2c75af..10fbd222a2ed 100644 --- a/sfx2/inc/sfx2/msg.hxx +++ b/sfx2/inc/sfx2/msg.hxx @@ -29,6 +29,9 @@ #include #include +#include +#include +#include //-------------------------------------------------------------------- @@ -287,6 +290,8 @@ public: USHORT GetValue() const { return nValue; } const SfxType* GetType() const { return pType; } const char* GetUnoName() const { return pUnoName; } + SFX2_DLLPUBLIC rtl::OString GetCommand() const; + SFX2_DLLPUBLIC rtl::OUString GetCommandString() const; USHORT GetFormalArgumentCount() const { return nArgDefCount; } const SfxFormalArgument& GetFormalArgument( USHORT nNo ) const diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx index 0d11462685d5..a041f6687c62 100644 --- a/sfx2/inc/sfx2/opengrf.hxx +++ b/sfx2/inc/sfx2/opengrf.hxx @@ -55,7 +55,7 @@ public: void SetCurrentFilter(const String&); /// Set dialog help id at FileDlgHelper - void SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId ); + void SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId ); /// Set control help ids at FileDlgHelper void SetDialogHelpId( const INT32 _nHelpId ); private: diff --git a/sfx2/inc/sfx2/sfxcommands.h b/sfx2/inc/sfx2/sfxcommands.h new file mode 100644 index 000000000000..bdf27baac7b3 --- /dev/null +++ b/sfx2/inc/sfx2/sfxcommands.h @@ -0,0 +1,345 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SFX2_SFXCOMMANDS_HRC +#define SFX2_SFXCOMMANDS_HRC + +#define CMD_SID_VIEWSHELL0 ".uno:_SwitchViewShell0" +#define CMD_SID_VIEWSHELL1 ".uno:_SwitchViewShell1" +#define CMD_SID_VIEWSHELL2 ".uno:_SwitchViewShell2" +#define CMD_SID_VIEWSHELL3 ".uno:_SwitchViewShell3" +#define CMD_SID_VIEWSHELL4 ".uno:_SwitchViewShell4" +#define CMD_SID_ABOUT ".uno:About" +#define CMD_SID_ACTIVATE ".uno:Activate" +#define CMD_SID_HELPBALLOONS ".uno:ActiveHelp" +#define CMD_SID_STYLE_FAMILY ".uno:ActualStyleFamily" +#define CMD_SID_NEWDOC ".uno:NewDoc" +#define CMD_SID_CREATELINK ".uno:AddBookmark" +#define CMD_SID_NEWDOCDIRECT ".uno:AddDirect" +#define CMD_SID_TEMPLATE_ADDRESSBOKSOURCE ".uno:AddressBookSource" +#define CMD_SID_BASICIDE_ADDWATCH ".uno:AddWatch" +#define CMD_SID_DOCINFO_AUTHOR ".uno:Author" +#define CMD_SID_AUTOHIDE ".uno:AutoHide" +#define CMD_SID_AUTOPILOTMENU ".uno:AutoPilotMenu" +#define CMD_SID_GALLERY_BG_BRUSH ".uno:BackgroundImage" +#define CMD_SID_BACKSPACE ".uno:Backspace" +#define CMD_SID_BASICBREAK ".uno:BasicBreak" +#define CMD_SID_BASICIDE_APPEAR ".uno:BasicIDEAppear" +#define CMD_SID_BASICSTEPINTO ".uno:BasicStepInto" +#define CMD_SID_BASICSTEPOUT ".uno:BasicStepOut" +#define CMD_SID_BASICSTEPOVER ".uno:BasicStepOver" +#define CMD_SID_BASICSTOP ".uno:BasicStop" +#define CMD_SID_BROWSER ".uno:Beamer" +#define CMD_SID_BASICIDE_BRKPNTSCHANGED ".uno:BreakPointsChanged" +#define CMD_SID_BROWSE_BACKWARD ".uno:BrowseBackward" +#define CMD_SID_BROWSE_FORWARD ".uno:BrowseForward" +#define CMD_SID_BROWSER_MODE ".uno:BrowseView" +#define CMD_SID_BUILD_VERSION ".uno:BuildVersion" +#define CMD_SID_CAPTION ".uno:Caption" +#define CMD_SID_STYLE_FAMILY1 ".uno:CharStyle" +#define CMD_SID_CHECK_KEY ".uno:CheckKey" +#define CMD_SID_BASICIDE_CHOOSEMACRO ".uno:ChooseMacro" +#define CMD_SID_CLEARHISTORY ".uno:ClearHistory" +#define CMD_SID_CLOSEWINS ".uno:CloseWins" +#define CMD_SID_CLOSEDOCS ".uno:CloseDocs" +#define CMD_SID_CLOSEDOC ".uno:CloseDoc" +#define CMD_SID_CLOSEWIN ".uno:CloseWin" +#define CMD_SID_CLOSING ".uno:Closing" +#define CMD_SID_DOCINFO_COMMENTS ".uno:Comments" +#define CMD_SID_OFFICE_COMMERCIAL_USE ".uno:CommercialUse" +#define CMD_SID_DOCUMENT_COMPARE ".uno:CompareDocuments" +#define CMD_SID_BASICCOMPILE ".uno:CompileBasic" +#define CMD_SID_CONFIG ".uno:ConfigureDialog" +#define CMD_SID_CONTEXT ".uno:Context" +#define CMD_SID_COPY ".uno:Copy" +#define CMD_SID_CRASH ".uno:Crash" +#define CMD_SID_BASICIDE_CREATEMACRO ".uno:CreateMacro" +#define CMD_SID_CURRENT_URL ".uno:CurrentURL" +#define CMD_SID_CURSORENDOFSCREEN ".uno:CursorEndOfScreen" +#define CMD_SID_CURSORTOPOFSCREEN ".uno:CursorTopOfScreen" +#define CMD_SID_OFFICE_CUSTOMERNUMBER ".uno:CustomerNumber" +#define CMD_SID_CUT ".uno:Cut" +#define CMD_SID_DEFAULTFILEPATH ".uno:DefaultFilePath" +#define CMD_SID_DEFAULTFILENAME ".uno:DefaultFileName" +#define CMD_SID_DELETE ".uno:Delete" +#define CMD_SID_BASICIDE_DELETECURRENT ".uno:DeleteCurrent" +#define CMD_SID_STYLE_DELETE ".uno:DeleteStyle" +#define CMD_SID_STYLE_DESIGNER ".uno:DesignerDialog" +#define CMD_SID_STYLE_DRAGHIERARCHIE ".uno:DragHierarchy" +#define CMD_SID_EDITDOC ".uno:EditDoc" +#define CMD_SID_BASICIDE_EDITMACRO ".uno:EditMacro" +#define CMD_SID_STYLE_EDIT ".uno:EditStyle" +#define CMD_FID_SEARCH_NOW ".uno:ExecuteSearch" +#define CMD_SID_EXTENDEDHELP ".uno:ExtendedHelp" +#define CMD_SID_FILE_NAME ".uno:FileName" +#define CMD_SID_FOCUSURLBOX ".uno:FocusUrlBox" +#define CMD_SID_FORMATMENU ".uno:FormatMenu" +#define CMD_SID_STYLE_FAMILY3 ".uno:FrameStyle" +#define CMD_SID_FRAMETITLE ".uno:FrameTitle" +#define CMD_SID_PROGFILENAME ".uno:FullName" +#define CMD_SID_DOCFULLNAME ".uno:FullName" +#define CMD_SID_WIN_FULLSCREEN ".uno:FullScreen" +#define CMD_SID_FILLFRAME ".uno:GetFrameWindow" +#define CMD_SID_CURSORDOWN ".uno:GoDown" +#define CMD_SID_CURSORPAGEDOWN ".uno:GoDownBlock" +#define CMD_SID_CURSORPAGEDOWN_SEL ".uno:GoDownBlockSel" +#define CMD_SID_CURSORDOWN_SEL ".uno:GoDownSel" +#define CMD_SID_CURSORLEFT ".uno:GoLeft" +#define CMD_SID_CURSORPAGELEFT ".uno:GoLeftBlock" +#define CMD_SID_CURSORPAGELEFT_SEL ".uno:GoLeftBlockSel" +#define CMD_SID_CURSORLEFT_SEL ".uno:GoLeftSel" +#define CMD_SID_CURSORRIGHT ".uno:GoRight" +#define CMD_SID_CURSORRIGHT_SEL ".uno:GoRightSel" +#define CMD_SID_CURSORENDOFFILE ".uno:GoToEndOfData" +#define CMD_SID_CURSORENDOFFILE_SEL ".uno:GoToEndOfDataSel" +#define CMD_SID_CURSOREND ".uno:GoToEndOfRow" +#define CMD_SID_CURSOREND_SEL ".uno:GoToEndOfRowSel" +#define CMD_SID_CURSORTOPOFFILE ".uno:GoToStart" +#define CMD_SID_CURSORHOME ".uno:GoToStartOfRow" +#define CMD_SID_CURSORHOME_SEL ".uno:GoToStartOfRowSel" +#define CMD_SID_CURSORTOPOFFILE_SEL ".uno:GoToStartSel" +#define CMD_SID_CURSORUP ".uno:GoUp" +#define CMD_SID_CURSORPAGEUP ".uno:GoUpBlock" +#define CMD_SID_CURSORPAGEUP_SEL ".uno:GoUpBlockSel" +#define CMD_SID_CURSORUP_SEL ".uno:GoUpSel" +#define CMD_SID_HELP_ANNOTATE ".uno:HelpAnnotate" +#define CMD_SID_HELP_BOOKMARK ".uno:HelpBookmark" +#define CMD_SID_HELP_HELPFILEBOX ".uno:HelpChooseFile" +#define CMD_SID_HELP_DOWNLOAD ".uno:HelpDownload" +#define CMD_SID_HELP_PI ".uno:HelperDialog" +#define CMD_SID_HELPINDEX ".uno:HelpIndex" +#define CMD_SID_HELPMENU ".uno:HelpMenu" +#define CMD_SID_HELPONHELP ".uno:HelpOnHelp" +#define CMD_SID_HELP_SEARCH ".uno:HelpSearch" +#define CMD_SID_HELPTIPS ".uno:HelpTip" +#define CMD_SID_HELP_ZOOMIN ".uno:HelpZoomIn" +#define CMD_SID_HELP_ZOOMOUT ".uno:HelpZoomOut" +#define CMD_SID_BASICIDE_HIDECURPAGE ".uno:HideCurPage" +#define CMD_SID_HYPERLINK_DIALOG ".uno:HyperlinkDialog" +#define CMD_SID_INSERTDOC ".uno:InsertDoc" +#define CMD_SID_HYPERLINK_INSERT ".uno:InsertHyperlink" +#define CMD_SID_INSERT_FLOATINGFRAME ".uno:InsertObjectFloatingFrame" +#define CMD_SID_INTERNET_ONLINE ".uno:InternetOnline" +#define CMD_SID_INTERNET_SEARCH ".uno:InternetSearch" +#define CMD_SID_DOC_LOADING ".uno:IsLoading" +#define CMD_SID_IMG_LOADING ".uno:IsLoadingImages" +#define CMD_SID_PRINTOUT ".uno:IsPrinting" +#define CMD_SID_JUMPTOMARK ".uno:JumpToMark" +#define CMD_SID_DOCINFO_KEYWORDS ".uno:Keywords" +#define CMD_SID_BASICIDE_LIBLOADED ".uno:LibLoaded" +#define CMD_SID_BASICIDE_LIBREMOVED ".uno:LibRemoved" +#define CMD_SID_BASICIDE_LIBSELECTED ".uno:LibSelect" +#define CMD_SID_BASICIDE_LIBSELECTOR ".uno:LibSelector" +#define CMD_SID_OFFICE_PLK ".uno:LicenceKey" +#define CMD_SID_CONFIGACCEL ".uno:LoadAccel" +#define CMD_SID_BASICLOAD ".uno:LoadBasic" +#define CMD_SID_LOADCONFIG ".uno:LoadConfiguration" +#define CMD_SID_CONFIGEVENT ".uno:LoadEvents" +#define CMD_SID_CONFIGMENU ".uno:LoadMenu" +#define CMD_SID_CONFIGSTATUSBAR ".uno:LoadStatusBar" +#define CMD_SID_TOOLBOXOPTIONS ".uno:LoadToolBox" +#define CMD_SID_LOGOUT ".uno:Logout" +#define CMD_SID_SCRIPTORGANIZER ".uno:ScriptOrganizer" +#define CMD_SID_MACROORGANIZER ".uno:MacroOrganizer" +#define CMD_SID_RUNMACRO ".uno:RunMacro" +#define CMD_SID_BASICCHOOSER ".uno:MacroDialog" +#define CMD_SID_MAIL_NOTIFY ".uno:MailReceipt" +#define CMD_SID_MAIL_CHILDWIN ".uno:MailWindow" +#define CMD_SID_BASICIDE_MATCHGROUP ".uno:MatchGroup" +#define CMD_SID_TOGGLE_MENUBAR ".uno:MenuBarVisible" +#define CMD_SID_DOCUMENT_MERGE ".uno:MergeDocuments" +#define CMD_SID_ATTR_METRIC ".uno:MetricUnit" +#define CMD_SID_MODIFIED ".uno:Modified" +#define CMD_SID_DOC_MODIFIED ".uno:ModifiedStatus" +#define CMD_SID_BASICIDE_MODULEDLG ".uno:ModuleDialog" +#define CMD_SID_BASICIDE_NAMECHANGEDONTAB ".uno:NameChangedOnTab" +#define CMD_SID_NAVIGATOR ".uno:Navigator" +#define CMD_SID_RESTORE_EDITING_VIEW ".uno:RestoreEditingView" +#define CMD_SID_BASICIDE_NEWDIALOG ".uno:NewDialog" +#define CMD_SID_BASICIDE_NEWMODULE ".uno:NewModule" +#define CMD_SID_CREATE_BASICOBJECT ".uno:NewObject" +#define CMD_SID_STYLE_NEW ".uno:NewStyle" +#define CMD_SID_NEWWINDOW ".uno:NewWindow" +#define CMD_SID_BASICIDE_OBJCAT ".uno:ObjectCatalog" +#define CMD_SID_OBJECT ".uno:ObjectMenue" +#define CMD_SID_OLD_PALK ".uno:OldPALK" +#define CMD_SID_OPENDOC ".uno:Open" +#define CMD_SID_WEBHTML ".uno:WebHtml" +#define CMD_SID_OPENHYPERLINK ".uno:OpenHyperlink" +#define CMD_SID_DOCINFO_TITLE ".uno:DocInfoTitle" +#define CMD_SID_OPENTEMPLATE ".uno:OpenTemplate" +#define CMD_SID_OPENURL ".uno:OpenUrl" +#define CMD_SID_OPTIONS ".uno:Options" +#define CMD_SID_ORGANIZER ".uno:Organizer" +#define CMD_SID_STYLE_FAMILY4 ".uno:PageStyle" +#define CMD_SID_STYLE_FAMILY2 ".uno:ParaStyle" +#define CMD_SID_PARTWIN ".uno:PartWindow" +#define CMD_SID_PASTE ".uno:Paste" +#define CMD_SID_CLIPBOARD_FORMAT_ITEMS ".uno:ClipboardFormatItems" +#define CMD_SID_PASTE_SPECIAL ".uno:PasteSpecial" +#define CMD_SID_DOCPATH ".uno:DocPath" +#define CMD_SID_PICKLIST ".uno:PickList" +#define CMD_SID_PLAYMACRO ".uno:PlayMacro" +#define CMD_SID_PLUGINS_ACTIVE ".uno:PlugInsActive" +#define CMD_SID_PRINTDOC ".uno:Print" +#define CMD_SID_PRINTDOCDIRECT ".uno:PrintDefault" +#define CMD_SID_PRINTER_NAME ".uno:Printer" +#define CMD_SID_SETUPPRINTER ".uno:PrinterSetup" +#define CMD_SID_PRINTPREVIEW ".uno:PrintPreview" +#define CMD_SID_OFFICE_PRIVATE_USE ".uno:PrivateUse" +#define CMD_SID_DOCINFO ".uno:SetDocumentProperties" +#define CMD_SID_QUITAPP ".uno:Quit" +#define CMD_SID_DOC_READONLY ".uno:ReadOnly" +#define CMD_SID_RECORDMACRO ".uno:MacroRecorder" +#define CMD_SID_STOP_RECORDING ".uno:StopRecording" +#define CMD_SID_RECORDING_FLOATWINDOW ".uno:MacroRecordingFloat" +#define CMD_SID_REDO ".uno:Redo" +#define CMD_SID_DELETE_BASICOBJECT ".uno:ReleaseObject" +#define CMD_SID_RELOAD ".uno:Reload" +#define CMD_SID_BASICIDE_REMOVEWATCH ".uno:RemoveWatch" +#define CMD_SID_BASICIDE_RENAMECURRENT ".uno:RenameCurrent" +#define CMD_SID_REPAINT ".uno:Repaint" +#define CMD_SID_REPEAT ".uno:RepeatAction" +#define CMD_SID_RUBY_DIALOG ".uno:RubyDialog" +#define CMD_SID_BASICRUN ".uno:RunBasic" +#define CMD_SID_STARTSW ".uno:RunStarWriter" +#define CMD_SID_SAVEDOC ".uno:Save" +#define CMD_SID_SAVEDOCS ".uno:SaveAll" +#define CMD_SID_SAVEASDOC ".uno:SaveAs" +#define CMD_SID_DOCTEMPLATE ".uno:SaveAsTemplate" +#define CMD_SID_BASICSAVEAS ".uno:SaveBasicAs" +#define CMD_SID_EXPORT_DIALOG ".uno:ExportDialog" +#define CMD_SID_IMPORT_DIALOG ".uno:ImportDialog" +#define CMD_SID_SAVECONFIG ".uno:SaveConfiguration" +#define CMD_SID_DOC_SAVED ".uno:Saved" +#define CMD_SID_BASICIDE_SBXDELETED ".uno:SbxDeleted" +#define CMD_SID_BASICIDE_SBXINSERTED ".uno:SbxInserted" +#define CMD_SID_BASICIDE_SBXRENAMED ".uno:SbxRenamed" +#define CMD_SID_MAIL_SCROLLBODY_PAGEDOWN ".uno:ScrollBodyPageDown" +#define CMD_SID_SEARCH_DLG ".uno:SearchDialog" +#define CMD_SID_SEARCH_OPTIONS ".uno:SearchOptions" +#define CMD_SID_SEARCH_ITEM ".uno:SearchProperties" +#define CMD_SID_SELECTALL ".uno:SelectAll" +#define CMD_FN_FAX ".uno:SendFax" +#define CMD_SID_MAIL_SENDDOC ".uno:SendMail" +#define CMD_SID_MAIL_SENDDOCASPDF ".uno:SendMailDocAsPDF" +#define CMD_SID_MAIL_SENDDOCASFORMAT ".uno:SendMailDocAsFormat" +#define CMD_SID_MAIL_SENDDOCASMS ".uno:SendMailDocAsMS" +#define CMD_SID_MAIL_SENDDOCASOOO ".uno:SendMailDocAsOOo" +#define CMD_SID_SETOPTIONS ".uno:SetOptions" +#define CMD_SID_OFFICE_PALK ".uno:SetPALK" +#define CMD_SID_SHOW_BROWSER ".uno:ShowBrowser" +#define CMD_SID_SHOWPOPUPS ".uno:ShowPopups" +#define CMD_SID_BASICIDE_SHOWSBX ".uno:ShowSbx" +#define CMD_SID_SOURCEVIEW ".uno:SourceView" +#define CMD_SID_ONLINE_REGISTRATION_DLG ".uno:StartRegistrationDialog" +#define CMD_SID_STATUSBARTEXT ".uno:StatusBar" +#define CMD_SID_TOGGLESTATUSBAR ".uno:StatusBarVisible" +#define CMD_SID_BASICIDE_STAT_DATE ".uno:StatusGetDate" +#define CMD_SID_BASICIDE_STAT_POS ".uno:StatusGetPosition" +#define CMD_SID_BASICIDE_STAT_TITLE ".uno:StatusGetTitle" +#define CMD_SID_BASICIDE_STOREALLMODULESOURCES ".uno:StoreAllModuleSources" +#define CMD_SID_BASICIDE_STOREMODULESOURCE ".uno:StoreModuleSource" +#define CMD_SID_STYLE_APPLY ".uno:StyleApplyState" +#define CMD_SID_STYLE_CATALOG ".uno:StyleCatalog" +#define CMD_SID_STYLE_NEW_BY_EXAMPLE ".uno:StyleNewByExample" +#define CMD_SID_STYLE_UPDATE_BY_EXAMPLE ".uno:StyleUpdateByExample" +#define CMD_SID_STYLE_WATERCAN ".uno:StyleWatercanMode" +#define CMD_SID_VIEWSHELL ".uno:SwitchViewShell" +#define CMD_SID_TASKBAR ".uno:TaskBarVisible" +#define CMD_SID_STYLE_FAMILY5 ".uno:ListStyle" +#define CMD_SID_TIPWINDOW ".uno:TipsDialog" +#define CMD_SID_DOCTITLE ".uno:Title" +#define CMD_SID_TITLE ".uno:Title" +#define CMD_SID_BASICIDE_TOGGLEBRKPNT ".uno:ToggleBreakPoint" +#define CMD_SID_BASICIDE_SHOWWINDOW ".uno:BasicIDEShowWindow" +#define CMD_SID_EDITMACRO ".uno:ToolsMacroEdit" +#define CMD_SID_UNDO ".uno:Undo" +#define CMD_SID_FORMATPAINTBRUSH ".uno:FormatPaintbrush" +#define CMD_SID_ATTR_UNDO_COUNT ".uno:UndoCount" +#define CMD_SID_BASICIDE_UPDATEALLMODULESOURCES ".uno:UpdateAllModuleSources" +#define CMD_SID_BASICIDE_UPDATEMODULESOURCE ".uno:UpdateModuleSource" +#define CMD_SID_BASICIDE_MANAGEBRKPNTS ".uno:ManageBreakPoints" +#define CMD_SID_BASICIDE_TOGGLEBRKPNTENABLED ".uno:ToggleBreakPointEnabled" +#define CMD_SID_UPDATE_VERSION ".uno:UpdateVersion" +#define CMD_SID_VERSION ".uno:VersionDialog" +#define CMD_SID_SIGNATURE ".uno:Signature" +#define CMD_SID_MACRO_SIGNATURE ".uno:MacroSignature" +#define CMD_SID_VERSION_VISIBLE ".uno:VersionVisible" +#define CMD_SID_VIEW_DATA_SOURCE_BROWSER ".uno:ViewDataSourceBrowser" +#define CMD_SID_WIN_VISIBLE ".uno:WinVisible" +#define CMD_SID_MDIWINDOWLIST ".uno:WindowList" +#define CMD_SID_ZOOM_IN ".uno:ZoomMinus" +#define CMD_SID_ZOOM ".uno:Zooming" +#define CMD_SID_ZOOM_NEXT ".uno:ZoomNext" +#define CMD_SID_ZOOM_OUT ".uno:ZoomPlus" +#define CMD_SID_ZOOM_PREV ".uno:ZoomPrevious" +#define CMD_SID_ZOOM_TOOLBOX ".uno:ZoomToolBox" +#define CMD_SID_EXPORTDOC ".uno:ExportTo" +#define CMD_SID_EXPORTDOCASPDF ".uno:ExportToPDF" +#define CMD_SID_DIRECTEXPORTDOCASPDF ".uno:ExportDirectToPDF" +#define CMD_SID_IMAGE_ORIENTATION ".uno:ImageOrientation" +#define CMD_SID_SAVE_VERSION_ON_CLOSE ".uno:SaveVersionOnClose" +#define CMD_SID_ADDONS ".uno:Addons" +#define CMD_SID_SHOW_IME_STATUS_WINDOW ".uno:ShowImeStatusWindow" +#define CMD_SID_UPDATE_CONFIG ".uno:UpdateConfiguration" +#define CMD_SID_HELP_SUPPORTPAGE ".uno:HelpSupport" +#define CMD_SID_HELP_TUTORIALS ".uno:HelpTutorials" +#define CMD_SID_ADDONHELP ".uno:AddonHelp" +#define CMD_SID_FORMATMENUSTATE ".uno:FormatMenuState" +#define CMD_SID_INET_DLG ".uno:InternetDialog" +#define CMD_SID_ONLINE_REGISTRATION ".uno:OnlineRegistrationDlg" +#define CMD_SID_OFFICE_CHECK_PLZ ".uno:CheckPLZ" +#define CMD_SID_ADDRESS_DATA_SOURCE ".uno:AutoPilotAddressDataSource" +#define CMD_FN_BUSINESS_CARD ".uno:InsertBusinessCard" +#define CMD_FN_LABEL ".uno:InsertLabels" +#define CMD_FN_XFORMS_INIT ".uno:NewXForms" +#define CMD_SID_SD_AUTOPILOT ".uno:AutoPilotPresentations" +#define CMD_SID_NEWSD ".uno:NewPresentation" +#define CMD_SID_COMP_BIBLIOGRAPHY ".uno:BibliographyComponent" +#define CMD_SID_MINIMIZED ".uno:Minimized" +#define CMD_SID_AUTO_CORRECT_DLG ".uno:AutoCorrectDlg" +#define CMD_SID_OPTIONS_TREEDIALOG ".uno:OptionsTreeDialog" +#define CMD_SID_TERMINATE_INPLACEACTIVATION ".uno:TerminateInplaceActivation" +#define CMD_SID_RECENTFILELIST ".uno:RecentFileList" +#define CMD_SID_AVAILABLE_TOOLBARS ".uno:AvailableToolbars" +#define CMD_SID_AVMEDIA_PLAYER ".uno:AVMediaPlayer" +#define CMD_SID_INSERT_AVMEDIA ".uno:InsertAVMedia" +#define CMD_SID_MORE_DICTIONARIES ".uno:MoreDictionaries" +#define CMD_SID_ACTIVATE_STYLE_APPLY ".uno:ActivateStyleApply" +#define CMD_SID_DOCKWIN_0 ".uno:DockingWindow0" +#define CMD_SID_DOCKWIN_1 ".uno:DockingWindow1" +#define CMD_SID_DOCKWIN_2 ".uno:DockingWindow2" +#define CMD_SID_DOCKWIN_3 ".uno:DockingWindow3" +#define CMD_SID_DOCKWIN_4 ".uno:DockingWindow4" +#define CMD_SID_DOCKWIN_5 ".uno:DockingWindow5" +#define CMD_SID_DOCKWIN_6 ".uno:DockingWindow6" +#define CMD_SID_DOCKWIN_7 ".uno:DockingWindow7" +#define CMD_SID_DOCKWIN_8 ".uno:DockingWindow8" +#define CMD_SID_DOCKWIN_9 ".uno:DockingWindow9" +#define CMD_SID_PASTE_UNFORMATTED ".uno:PasteUnformatted" + +#endif diff --git a/sfx2/inc/sfx2/sfxdlg.hxx b/sfx2/inc/sfx2/sfxdlg.hxx index d82abeefe8bc..f3d773f98afc 100644 --- a/sfx2/inc/sfx2/sfxdlg.hxx +++ b/sfx2/inc/sfx2/sfxdlg.hxx @@ -133,10 +133,10 @@ public: const String *pUserButtonText=0 ) = 0; virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId ) = 0; virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId ) = 0; - virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, USHORT nSlotId, + virtual SfxAbstractInsertObjectDialog* CreateInsertObjectDialog( Window* pParent, const rtl::OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& xStor, const SvObjectServerList* pList = 0 )=0; - virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, USHORT nSlotId, + virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommand, const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj )=0; virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent )=0; virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML=FALSE, sfx2::SvBaseLink* p=0 )=0; diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx index b19f78c6184b..608361a1e777 100644 --- a/sfx2/inc/sfxhelp.hxx +++ b/sfx2/inc/sfxhelp.hxx @@ -45,15 +45,10 @@ class SFX2_DLLPUBLIC SfxHelp : public Help SfxHelp_Impl* pImp; private: - // FIXME: HELPID - // SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); - // FIXME: HELPID - // SAL_DLLPRIVATE virtual void OpenHelpAgent( ULONG nHelpId ); + SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId ); SAL_DLLPRIVATE String GetHelpModuleName_Impl(); - // FIXME: HELPID - // SAL_DLLPRIVATE String CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ); SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ); public: @@ -63,15 +58,11 @@ public: inline void SetTicket( const String& rTicket ) { aTicket = rTicket; } inline void SetUser( const String& rUser ) { aUser = rUser; } - // FIXME: HELPID - //virtual XubString GetHelpText( ULONG nHelpId, const Window* pWindow ); virtual XubString GetHelpText( const String&, const Window* pWindow ); - // FIXME: HELPID - // static String CreateHelpURL( ULONG nHelpId, const String& rModuleName ); static String CreateHelpURL( const String& aCommandURL, const String& rModuleName ); using Help::OpenHelpAgent; - static void OpenHelpAgent( SfxFrame* pFrame, ULONG nHelpId ); + static void OpenHelpAgent( SfxFrame* pFrame, const rtl::OString& sHelpId ); static String GetDefaultHelpModule(); static ::rtl::OUString GetCurrentModuleIdentifier(); }; diff --git a/sfx2/sdi/sfx.sdi b/sfx2/sdi/sfx.sdi index 10a920852848..785eea211f4f 100644 --- a/sfx2/sdi/sfx.sdi +++ b/sfx2/sdi/sfx.sdi @@ -6356,7 +6356,7 @@ SfxBoolItem TaskBarVisible SID_TASKBAR ] //-------------------------------------------------------------------------- -SfxTemplateItem TemplateFamily5 SID_STYLE_FAMILY5 +SfxTemplateItem ListStyle SID_STYLE_FAMILY5 [ /* flags: */ diff --git a/sfx2/source/appl/app.src b/sfx2/source/appl/app.src index 0858e66e7347..47750cd73f78 100644 --- a/sfx2/source/appl/app.src +++ b/sfx2/source/appl/app.src @@ -626,169 +626,6 @@ String RID_ENVTOOLBOX Text [ en-US ] = "Function Bar" ; }; -ToolBox RID_ENVTOOLBOX -{ - HelpId = RID_ENVTOOLBOX ; - ButtonType = BUTTON_SYMBOL ; - LineSpacing = TRUE ; - Border = TRUE ; - Scroll = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Customize = TRUE ; - FloatingMode = FALSE ; - Hide = TRUE ; - HideWhenDeactivate = TRUE ; - Align = BOXALIGN_TOP ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_OPENURL ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_NEWDOCDIRECT ; - DropDown = TRUE; - }; - ToolBoxItem - { - Identifier = SID_NEWDOC ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_OPENDOC ; - }; - ToolBoxItem - { - Identifier = SID_SAVEDOC ; - }; - ToolBoxItem - { - Identifier = SID_SAVEASDOC ; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_EDITDOC ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_DIRECTEXPORTDOCASPDF ; - }; - ToolBoxItem - { - Identifier = SID_PRINTDOCDIRECT ; - }; - ToolBoxItem - { - Identifier = FN_FAX ; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_CUT ; - }; - ToolBoxItem - { - Identifier = SID_COPY ; - }; - ToolBoxItem - { - Identifier = SID_PASTE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_UNDO ; - }; - ToolBoxItem - { - Identifier = SID_REDO ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_NAVIGATOR ; - }; - ToolBoxItem - { - Identifier = SID_STYLE_DESIGNER ; - }; - ToolBoxItem - { - Identifier = SID_HYPERLINK_DIALOG ; - }; - ToolBoxItem - { - Identifier = SID_HYPERLINK_INSERT ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_WIN_FULLSCREEN ; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_RECORDMACRO; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_GALLERY ; - }; - ToolBoxItem - { - Identifier = SID_AVMEDIA_PLAYER ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_CLOSEDOC; - Hide = TRUE; - }; - }; -}; - String RID_SPECIALCONFIG_ERROR { Text [ en-US ] = "An error has occurred in the special configuration.\nPlease contact your administrator." ; diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 2abcdffe0169..decb3dd186f0 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -350,12 +350,10 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) Help* pHelp = Application::GetHelp(); if ( pHelp ) { - ULONG nHelpId = ( rReq.GetSlot() == SID_HELP_SUPPORTPAGE ) ? 66056 : 0; - if ( 66056 == nHelpId ) + if ( rReq.GetSlot() == SID_HELP_SUPPORTPAGE ) { // show Support page with new URL - // FIXME: HELPID - String sHelpURL = SfxHelp::CreateHelpURL( String()/*nHelpId*/, String() ); + String sHelpURL = SfxHelp::CreateHelpURL( String::CreateFromAscii(".uno:HelpSupport"), String() ); String sParams = sHelpURL.Copy( sHelpURL.Search( '?' ) ); sHelpURL = String::CreateFromAscii("vnd.sun.star.help://shared/text/shared/05/00000001.xhp"); sHelpURL += sParams; @@ -363,8 +361,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) pHelp->Start( sHelpURL, NULL ); } else - // FIXME: HELPID - pHelp->Start( String()/*nHelpId*/, NULL ); // show start page + pHelp->Start( String::CreateFromAscii(".uno:HelpIndex"), NULL ); // show start page bDone = TRUE; } break; diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 6b8dfe3a023c..9289920b8e09 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2105,32 +2105,24 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : xFrame->setName( DEFINE_CONST_UNICODE("OFFICE_HELP") ); lcl_disableLayoutOfFrame(xFrame); - // FIXME: HELPID - aToolBox.SetHelpId( ""/*HID_HELP_TOOLBOX*/ ); + aToolBox.SetHelpId( HID_HELP_TOOLBOX ); aToolBox.InsertItem( TBI_INDEX, aIndexOffText ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_INDEX, ""/*HID_HELP_TOOLBOXITEM_INDEX*/ ); + aToolBox.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX ); aToolBox.InsertSeparator(); aToolBox.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ) ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_BACKWARD, ""/*HID_HELP_TOOLBOXITEM_BACKWARD*/ ); + aToolBox.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD ); aToolBox.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ) ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_FORWARD, ""/*HID_HELP_TOOLBOXITEM_FORWARD*/ ); + aToolBox.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD ); aToolBox.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ) ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_START, ""/*HID_HELP_TOOLBOXITEM_START*/ ); + aToolBox.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START ); aToolBox.InsertSeparator(); aToolBox.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ) ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_PRINT, ""/*HID_HELP_TOOLBOXITEM_PRINT*/ ); + aToolBox.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT ); aToolBox.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ) ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_BOOKMARKS, ""/*HID_HELP_TOOLBOXITEM_BOOKMARKS*/ ); + aToolBox.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS ); aToolBox.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ) ); - // FIXME: HELPID - aToolBox.SetHelpId( TBI_SEARCHDIALOG, ""/*HID_HELP_TOOLBOXITEM_SEARCHDIALOG*/ ); + aToolBox.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG ); InitToolBoxImages(); aToolBox.Show(); @@ -2146,9 +2138,8 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : SvtMiscOptions().AddListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) ); - if ( aOnStartupCB.GetHelpId() == 0 ) - // FIXME: HELPID - aOnStartupCB.SetHelpId( ""/*HID_HELP_ONSTARTUP_BOX*/ ); + if ( !aOnStartupCB.GetHelpId().getLength() ) + aOnStartupCB.SetHelpId( HID_HELP_ONSTARTUP_BOX ); } // ----------------------------------------------------------------------- @@ -2604,40 +2595,32 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) else aMenu.InsertItem( TBI_INDEX, aIndexOnText, Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_INDEX, ""/*HID_HELP_TOOLBOXITEM_INDEX*/ ); + aMenu.SetHelpId( TBI_INDEX, HID_HELP_TOOLBOXITEM_INDEX ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_BACKWARD, String( SfxResId( STR_HELP_BUTTON_PREV ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PREV : IMG_HELP_TOOLBOX_PREV ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_BACKWARD, ""/*HID_HELP_TOOLBOXITEM_BACKWARD*/ ); + aMenu.SetHelpId( TBI_BACKWARD, HID_HELP_TOOLBOXITEM_BACKWARD ); aMenu.EnableItem( TBI_BACKWARD, pHelpWin->HasHistoryPredecessor() ); aMenu.InsertItem( TBI_FORWARD, String( SfxResId( STR_HELP_BUTTON_NEXT ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_NEXT : IMG_HELP_TOOLBOX_NEXT ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_FORWARD, ""/*HID_HELP_TOOLBOXITEM_FORWARD*/ ); + aMenu.SetHelpId( TBI_FORWARD, HID_HELP_TOOLBOXITEM_FORWARD ); aMenu.EnableItem( TBI_FORWARD, pHelpWin->HasHistorySuccessor() ); aMenu.InsertItem( TBI_START, String( SfxResId( STR_HELP_BUTTON_START ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_START : IMG_HELP_TOOLBOX_START ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_START, ""/*HID_HELP_TOOLBOXITEM_START*/ ); + aMenu.SetHelpId( TBI_START, HID_HELP_TOOLBOXITEM_START ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_PRINT, String( SfxResId( STR_HELP_BUTTON_PRINT ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_PRINT : IMG_HELP_TOOLBOX_PRINT ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_PRINT, ""/*HID_HELP_TOOLBOXITEM_PRINT*/ ); + aMenu.SetHelpId( TBI_PRINT, HID_HELP_TOOLBOXITEM_PRINT ); aMenu.InsertItem( TBI_BOOKMARKS, String( SfxResId( STR_HELP_BUTTON_ADDBOOKMARK ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_BOOKMARKS : IMG_HELP_TOOLBOX_BOOKMARKS ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_BOOKMARKS, ""/*HID_HELP_TOOLBOXITEM_BOOKMARKS*/ ); + aMenu.SetHelpId( TBI_BOOKMARKS, HID_HELP_TOOLBOXITEM_BOOKMARKS ); aMenu.InsertItem( TBI_SEARCHDIALOG, String( SfxResId( STR_HELP_BUTTON_SEARCHDIALOG ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_SEARCHDIALOG : IMG_HELP_TOOLBOX_SEARCHDIALOG ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_SEARCHDIALOG, ""/*HID_HELP_TOOLBOXITEM_SEARCHDIALOG*/ ); + aMenu.SetHelpId( TBI_SEARCHDIALOG, HID_HELP_TOOLBOXITEM_SEARCHDIALOG ); aMenu.InsertSeparator(); aMenu.InsertItem( TBI_SELECTIONMODE, String( SfxResId( STR_HELP_MENU_TEXT_SELECTION_MODE ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_SELECTIONMODE, ""/*HID_HELP_TEXT_SELECTION_MODE*/ ); + aMenu.SetHelpId( TBI_SELECTIONMODE, HID_HELP_TEXT_SELECTION_MODE ); Reference < XDispatchProvider > xProv( xFrame, UNO_QUERY ); URL aURL; aURL.Complete = DEFINE_CONST_UNICODE(".uno:SelectTextMode"); @@ -2657,8 +2640,7 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aMenu.InsertSeparator(); aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ), Image( SfxResId( bHiContrast ? IMG_HELP_TOOLBOX_HC_COPY : IMG_HELP_TOOLBOX_COPY ) ) ); - // FIXME: HELPID - aMenu.SetHelpId( TBI_COPY, ""/*SID_COPY*/ ); + aMenu.SetHelpId( TBI_COPY, ".uno:Copy" ); aMenu.EnableItem( TBI_COPY, HasSelection() ); if ( bIsDebug ) @@ -3243,8 +3225,7 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( aWinPos ( 0, 0 ), sTitle ( pParent->GetText() ) { - // FIXME: HELPID - SetHelpId( ""/*HID_HELP_WINDOW*/ ); + SetHelpId( HID_HELP_WINDOW ); SetStyle( GetStyle() | WB_DIALOGCONTROL ); pHelpInterceptor->InitWaiter( this ); diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index a4d134df27fa..23fb100c7895 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -284,7 +284,7 @@ void SvxOpenGraphicDialog::SetCurrentFilter(const String& rStr) mpImpl->aFileDlg.SetCurrentFilter(rStr); } -void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const INT32* _pHelpId ) +void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId ) { mpImpl->aFileDlg.SetControlHelpIds( _pControlId, _pHelpId ); } diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 9c246c592b82..a18521e3a289 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -29,7 +29,7 @@ #include "precompiled_sfx2.hxx" #include "sfxhelp.hxx" - +#include #include #include #include @@ -76,6 +76,7 @@ #include #include #include +#include using namespace ::com::sun::star::beans; using namespace ::com::sun::star::frame; @@ -221,13 +222,13 @@ sal_Bool GetHelpAnchor_Impl( const String& _rURL, String& _rAnchor ) class SfxHelpOptions_Impl : public utl::ConfigItem { private: - SvULongsSort* m_pIds; + std::set < rtl::OString > m_aIds; public: SfxHelpOptions_Impl(); ~SfxHelpOptions_Impl(); - BOOL HasId( ULONG nId ) { USHORT nDummy; return m_pIds ? m_pIds->Seek_Entry( nId, &nDummy ) : FALSE; } + bool HasId( const rtl::OString& rId ) { return m_aIds.size() ? m_aIds.find( rId ) != m_aIds.end() : false; } virtual void Notify( const com::sun::star::uno::Sequence< rtl::OUString >& aPropertyNames ); virtual void Commit(); }; @@ -254,7 +255,6 @@ static Sequence< ::rtl::OUString > GetPropertyNames() SfxHelpOptions_Impl::SfxHelpOptions_Impl() : ConfigItem( ::rtl::OUString::createFromAscii("Office.SFX/Help") ) - , m_pIds( NULL ) { Sequence< ::rtl::OUString > aNames = GetPropertyNames(); Sequence< Any > aValues = GetProperties( aNames ); @@ -275,11 +275,15 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl() ::rtl::OUString aCodedList; if ( pValues[nProp] >>= aCodedList ) { - String aTmp( aCodedList ); - USHORT nCount = aTmp.GetTokenCount( ',' ); - m_pIds = new SvULongsSort(); - for ( USHORT n=0; nInsert( (ULONG) aTmp.GetToken( n, ',' ).ToInt64() ); + rtl::OString aTmp( aCodedList, aCodedList.getLength(), RTL_TEXTENCODING_UTF8 ); + sal_Int32 nIndex = 0; + do + { + rtl::OString aToken = aTmp.getToken( 0, ',', nIndex ); + if ( aToken.getLength() ) + m_aIds.insert( aToken ); + } + while ( nIndex >= 0 ); } else { DBG_ERRORFILE( "Wrong property type!" ); @@ -299,7 +303,6 @@ SfxHelpOptions_Impl::SfxHelpOptions_Impl() SfxHelpOptions_Impl::~SfxHelpOptions_Impl() { - delete m_pIds; } @@ -326,8 +329,6 @@ public: ~SfxHelp_Impl(); SfxHelpOptions_Impl* GetOptions(); - // FIXME: HELPID - // String GetHelpText( ULONG nHelpId, const String& rModule ); // get "Active Help" String GetHelpText( const rtl::OUString& aCommandURL, const String& rModule ); sal_Bool HasModule( const ::rtl::OUString& rModule ); // module installed sal_Bool IsHelpInstalled(); // module list not empty @@ -371,19 +372,6 @@ void SfxHelp_Impl::Load() } } -#if 0 -// FIXME: HELPID -String SfxHelp_Impl::GetHelpText( ULONG nHelpId, const String& rModule ) -{ - // create help url - String aHelpURL = SfxHelp::CreateHelpURL( nHelpId, rModule ); - // added 'active' parameter - aHelpURL.Insert( String( DEFINE_CONST_UNICODE("&Active=true") ), aHelpURL.SearchBackward( '#' ) ); - // load help string - return SfxContentHelper::GetActiveHelpString( aHelpURL ); -} -#endif - String SfxHelp_Impl::GetHelpText( const rtl::OUString& aCommandURL, const String& rModule ) { // create help url @@ -585,79 +573,6 @@ String SfxHelp::GetHelpModuleName_Impl() return sModuleName; } -#if 0 -// FIXME: HELPID -String SfxHelp::CreateHelpURL_Impl( ULONG nHelpId, const String& rModuleName ) -{ - String aModuleName( rModuleName ); - if ( aModuleName.Len() == 0 ) - aModuleName = getDefaultModule_Impl(); - - // build up the help URL - String aHelpURL; - if ( aTicket.Len() ) - { - // if there is a ticket, we are inside a plugin, so a special Help URL must be sent - aHelpURL = DEFINE_CONST_UNICODE("vnd.sun.star.cmd:help?"); - aHelpURL += DEFINE_CONST_UNICODE("HELP_Request_Mode=contextIndex&HELP_Session_Mode=context&HELP_CallMode=portal&HELP_Device=html"); - - if ( !nHelpId ) - { - // no help id -> start page - aHelpURL += DEFINE_CONST_UNICODE("&HELP_ContextID=start"); - } - else - { - aHelpURL += DEFINE_CONST_UNICODE("&HELP_ContextID="); - aHelpURL += String::CreateFromInt64( nHelpId ); - } - - aHelpURL += DEFINE_CONST_UNICODE("&HELP_ProgramID="); - aHelpURL += aModuleName; - aHelpURL += DEFINE_CONST_UNICODE("&HELP_User="); - aHelpURL += aUser; - aHelpURL += DEFINE_CONST_UNICODE("&HELP_Ticket="); - aHelpURL += aTicket; - aHelpURL += DEFINE_CONST_UNICODE("&HELP_Language="); - aHelpURL += aLanguageStr; - if ( aCountryStr.Len() ) - { - aHelpURL += DEFINE_CONST_UNICODE("&HELP_Country="); - aHelpURL += aCountryStr; - } - } - else - { - sal_Bool bHasAnchor = sal_False; - String aAnchor; - aHelpURL = String::CreateFromAscii("vnd.sun.star.help://"); - aHelpURL += aModuleName; - - if ( !nHelpId ) - aHelpURL += String::CreateFromAscii("/start"); - else - { - aHelpURL += '/'; - aHelpURL += String::CreateFromInt64( nHelpId ); - - String aTempURL = aHelpURL; - AppendConfigToken_Impl( aTempURL, sal_True ); - bHasAnchor = GetHelpAnchor_Impl( aTempURL, aAnchor ); - } - - AppendConfigToken_Impl( aHelpURL, sal_True ); - - if ( bHasAnchor ) - { - aHelpURL += '#'; - aHelpURL += aAnchor; - } - } - - return aHelpURL; -} -#endif - String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ) { // build up the help URL @@ -667,28 +582,7 @@ String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rM String aModuleName( rModuleName ); if ( aModuleName.Len() == 0 ) - { - // no active module (quicklaunch?) -> detect default module - SvtModuleOptions aModOpt; - if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SWRITER ) ) - aModuleName = DEFINE_CONST_UNICODE("swriter"); - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCALC ) ) - aModuleName = DEFINE_CONST_UNICODE("scalc"); - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SIMPRESS ) ) - aModuleName = DEFINE_CONST_UNICODE("simpress"); - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SDRAW ) ) - aModuleName = DEFINE_CONST_UNICODE("sdraw"); - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SMATH ) ) - aModuleName = DEFINE_CONST_UNICODE("smath"); - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SCHART ) ) - aModuleName = DEFINE_CONST_UNICODE("schart"); - else if ( aModOpt.IsModuleInstalled( SvtModuleOptions::E_SBASIC ) ) - aModuleName = DEFINE_CONST_UNICODE("sbasic"); - else - { - DBG_ERRORFILE( "no installed module found" ); - } - } + aModuleName = getDefaultModule_Impl(); aHelpURL = String::CreateFromAscii("vnd.sun.star.help://"); aHelpURL += aModuleName; @@ -701,7 +595,7 @@ String SfxHelp::CreateHelpURL_Impl( const String& aCommandURL, const String& rM aHelpURL += String( rtl::Uri::encode( aCommandURL, rtl_UriCharClassRelSegment, rtl_UriEncodeKeepEscapes, - RTL_TEXTENCODING_ASCII_US )); + RTL_TEXTENCODING_UTF8 )); String aTempURL = aHelpURL; AppendConfigToken_Impl( aTempURL, sal_True ); @@ -769,6 +663,49 @@ SfxHelpWindow_Impl* impl_createHelp(Reference< XFrame >& rHelpTask , return pHelpWindow; } +XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow ) +{ + String sModuleName = GetHelpModuleName_Impl(); + String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName ); + + ByteString aNewHelpId; + + if ( pWindow && !sHelpText.Len() ) + { + // no help text found -> try with parent help id. + Window* pParent = pWindow->GetParent(); + while ( pParent ) + { + aNewHelpId = pParent->GetHelpId(); + sHelpText = pImp->GetHelpText( String( aNewHelpId, RTL_TEXTENCODING_UTF8 ), sModuleName ); + if ( sHelpText.Len() > 0 ) + pParent = NULL; + else + pParent = pParent->GetParent(); + } + + if ( bIsDebug && !sHelpText.Len() ) + aNewHelpId.Erase(); + } + + // add some debug information? + if ( bIsDebug ) + { + sHelpText += DEFINE_CONST_UNICODE("\n-------------\n"); + sHelpText += String( sModuleName ); + sHelpText += DEFINE_CONST_UNICODE(": "); + sHelpText += aCommandURL; + if ( aNewHelpId.Len() ) + { + sHelpText += DEFINE_CONST_UNICODE(" - "); + sHelpText += String( aNewHelpId, RTL_TEXTENCODING_UTF8 ); + } + } + + return sHelpText; +} + + BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) { // check if help is available @@ -790,34 +727,33 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) INetProtocol nProtocol = aParser.GetProtocol(); if ( nProtocol != INET_PROT_VND_SUN_STAR_HELP ) { - // #i90162 Accept anything that is not invalid as help id, as both - // uno: URLs used as commands/help ids in the Office and the scheme - // used in extension help ids (e.g. com.foocorp.foo-ext:FooDialogButton) - // are accepted as INET_PROT_UNO respectively INET_PROT_GENERIC - bool bAcceptAsURL = ( nProtocol != INET_PROT_NOT_VALID ); - - // #i94891 As in some extensions help ids like foo.bar.dummy without - // any : have been used that worked before the fix of #i90162 (see - // above) strings containing . will be also accepted to avoid brea- - // king the help of existing extensions. - if( !bAcceptAsURL ) - bAcceptAsURL = ( rURL.Search( '.' ) != STRING_NOTFOUND ); - - if ( bAcceptAsURL ) - { - aHelpURL = CreateHelpURL_Impl( rURL, GetHelpModuleName_Impl( ) ); - } - else + String aHelpModuleName( GetHelpModuleName_Impl() ); + aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName ); + if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) { - // FIXME: HELPID - aHelpURL = CreateHelpURL_Impl( String()/*0*/, GetHelpModuleName_Impl( ) ); - - // pb i91715: strings begin with ".HelpId:" are not words of the basic ide - // they are helpid-strings used by the testtool -> so we ignore them - static const String sHelpIdScheme( DEFINE_CONST_OUSTRING(".HelpId:") ); - if ( rURL.Search( sHelpIdScheme ) != 0 ) - sKeyword = ::rtl::OUString( rURL ); + // no help found -> try with parent help id. + Window* pParent = pWindow->GetParent(); + while ( pParent ) + { + ByteString aHelpId = pParent->GetHelpId(); + aHelpURL = CreateHelpURL( String( aHelpId, RTL_TEXTENCODING_UTF8 ), aHelpModuleName ); + if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) + break; + else + { + pParent = pParent->GetParent(); + if ( !pParent ) + // create help url of start page ( helpid == 0 -> start page) + aHelpURL = CreateHelpURL( String(), aHelpModuleName ); + } + } } + + // pb i91715: strings begin with ".HelpId:" are not words of the basic ide + // they are helpid-strings used by the testtool -> so we ignore them + static const String sHelpIdScheme( DEFINE_CONST_OUSTRING(".HelpId:") ); + if ( rURL.Search( sHelpIdScheme ) != 0 ) + sKeyword = ::rtl::OUString( rURL ); } Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( @@ -847,6 +783,12 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) if (!xHelp.is() || !xHelpContent.is() || !pHelpWindow) return FALSE; +#ifdef DBG_UTIL + ByteString aTmp("SfxHelp: HelpId = "); + aTmp += ByteString( aHelpURL, RTL_TEXTENCODING_UTF8 ); + DBG_TRACE( aTmp.GetBuffer() ); +#endif + pHelpWindow->SetHelpURL( aHelpURL ); pHelpWindow->loadHelpContent(aHelpURL); if ( sKeyword.getLength() > 0 ) @@ -859,110 +801,6 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) return TRUE; } -#if 0 -// FIXME: HELPID -BOOL SfxHelp::Start( ULONG nHelpId, const Window* pWindow ) -{ - String aHelpModuleName( GetHelpModuleName_Impl() ); - String aHelpURL = CreateHelpURL( nHelpId, aHelpModuleName ); - if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) - { - // no help found -> try with parent help id. - Window* pParent = pWindow->GetParent(); - while ( pParent ) - { - nHelpId = pParent->GetSmartUniqueOrHelpId().GetNum(); - aHelpURL = CreateHelpURL( nHelpId, aHelpModuleName ); - - if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) - break; - else - { - pParent = pParent->GetParent(); - if ( !pParent ) - // create help url of start page ( helpid == 0 -> start page) - aHelpURL = CreateHelpURL( 0, aHelpModuleName ); - } - } - } - - return Start( aHelpURL, pWindow ); -} -#endif - -#if 0 -// FIXME: HELPID -XubString SfxHelp::GetHelpText( ULONG nHelpId, const Window* pWindow ) -{ - String aModuleName = GetHelpModuleName_Impl(); - String aHelpText = pImp->GetHelpText( nHelpId, aModuleName ); - ULONG nNewHelpId = 0; - - if ( pWindow && aHelpText.Len() == 0 ) - { - // no help text found -> try with parent help id. - Window* pParent = pWindow->GetParent(); - while ( pParent ) - { - nNewHelpId = pParent->GetHelpId(); - aHelpText = pImp->GetHelpText( nNewHelpId, aModuleName ); - - if ( aHelpText.Len() > 0 ) - pParent = NULL; - else - pParent = pParent->GetParent(); - } - - if ( bIsDebug && aHelpText.Len() == 0 ) - nNewHelpId = 0; - } - - if ( bIsDebug ) - { - aHelpText += DEFINE_CONST_UNICODE("\n\n"); - aHelpText += aModuleName; - aHelpText += DEFINE_CONST_UNICODE(" - "); - aHelpText += String::CreateFromInt64( nHelpId ); - if ( nNewHelpId ) - { - aHelpText += DEFINE_CONST_UNICODE(" - "); - aHelpText += String::CreateFromInt64( nNewHelpId ); - } - } - - return aHelpText; -} -#endif - -XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* ) -{ - String sModuleName = GetHelpModuleName_Impl(); - String sHelpText = pImp->GetHelpText( aCommandURL, sModuleName ); - - // add some debug information? - if ( bIsDebug ) - { - sHelpText += DEFINE_CONST_UNICODE("\n-------------\n"); - sHelpText += String( sModuleName ); - sHelpText += DEFINE_CONST_UNICODE(": "); - sHelpText += aCommandURL; - } - - return sHelpText; -} - -#if 0 -// FIXME: HELPID -String SfxHelp::CreateHelpURL( ULONG nHelpId, const String& rModuleName ) -{ - String aURL; - SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); - if ( pHelp ) - aURL = pHelp->CreateHelpURL_Impl( nHelpId, rModuleName ); - return aURL; -} -#endif - String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleName ) { String aURL; @@ -972,36 +810,25 @@ String SfxHelp::CreateHelpURL( const String& aCommandURL, const String& rModuleN return aURL; } -void SfxHelp::OpenHelpAgent( SfxFrame*, ULONG nHelpId ) +void SfxHelp::OpenHelpAgent( SfxFrame*, const rtl::OString& sHelpId ) { -// FIXME HELPID -#if 0 - SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); - if ( pHelp ) - pHelp->OpenHelpAgent( nHelpId ); -#else -(void)nHelpId; -#endif + SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); + if ( pHelp ) + pHelp->OpenHelpAgent( sHelpId ); } -// FIXME: HELPID -#if 0 -void SfxHelp::OpenHelpAgent( ULONG nHelpId ) +void SfxHelp::OpenHelpAgent( const rtl::OString& sHelpId ) { if ( SvtHelpOptions().IsHelpAgentAutoStartMode() ) { -// SfxHelp* pHelp = SAL_STATIC_CAST( SfxHelp*, Application::GetHelp() ); -// if ( pHelp ) -// { SfxHelpOptions_Impl *pOpt = pImp->GetOptions(); - if ( !pOpt->HasId( nHelpId ) ) + if ( !pOpt->HasId( sHelpId ) ) return; try { URL aURL; - // FIXME: HELPID - aURL.Complete = CreateHelpURL_Impl( String()/*nHelpId*/, GetHelpModuleName_Impl() ); + aURL.Complete = CreateHelpURL_Impl( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8 ), GetHelpModuleName_Impl() ); Reference < XURLTransformer > xTrans( ::comphelper::getProcessServiceFactory()->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.util.URLTransformer" ) ), UNO_QUERY ); xTrans->parseStrict(aURL); @@ -1027,10 +854,8 @@ void SfxHelp::OpenHelpAgent( ULONG nHelpId ) { DBG_ERRORFILE( "OpenHelpAgent: caught an exception while executing the dispatch!" ); } -// } } } -#endif String SfxHelp::GetDefaultHelpModule() { diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index e66dd2c56eaf..444be02127b3 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -281,7 +281,11 @@ int SfxDispatcher::Call_Impl( SfxShell& rShell, const SfxSlot &rSlot, SfxRequest if ( !pView ) pView = SfxViewFrame::Current(); if ( pView ) - SfxHelp::OpenHelpAgent( &pView->GetFrame(), rReq.GetSlot() ); + { + rtl::OString aCmd(".uno:"); + aCmd += rSlot.GetUnoName(); + SfxHelp::OpenHelpAgent( &pView->GetFrame(), aCmd ); + } SfxExecFunc pFunc = rSlot.GetExecFnc(); rShell.CallExec( pFunc, rReq ); @@ -1675,14 +1679,14 @@ void SfxDispatcher::SetMenu_Impl() } //-------------------------------------------------------------------- -long SfxDispatcher::Update_Impl( sal_Bool bForce ) +void SfxDispatcher::Update_Impl( sal_Bool bForce ) { SFX_STACK(SfxDispatcher::Update_Impl); Flush(); if ( !pImp->pFrame || pImp->bUILocked ) - return 0; + return; SFX_APP(); // -Wall is this required??? SfxDispatcher *pDisp = this; @@ -1704,7 +1708,7 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce ) } if ( !bUpdate || pImp->pFrame->GetFrame().IsClosing_Impl() ) - return 0; + return; SfxViewFrame* pTop = pImp->pFrame ? pImp->pFrame->GetTopViewFrame() : NULL; sal_Bool bUIActive = pTop && pTop->GetBindings().GetDispatcher() == this; @@ -1778,12 +1782,11 @@ long SfxDispatcher::Update_Impl( sal_Bool bForce ) if ( xLayoutManager.is() ) xLayoutManager->unlock(); - return 1; + return; } -sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bool bIsIPOwner, SfxWorkWindow *pTaskWin ) +void SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, sal_Bool bIsIPOwner, SfxWorkWindow *pTaskWin ) { - sal_uInt32 nHelpId = 0; SFX_APP(); SfxWorkWindow *pWorkWin = pImp->pFrame->GetFrame().GetWorkWindow_Impl(); sal_Bool bIsActive = sal_False; @@ -1798,7 +1801,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, } if ( pImp->pParent && !pImp->bQuiet /* && bUIActive */ ) - nHelpId = pImp->pParent->_Update_Impl( bUIActive, bIsMDIApp, bIsIPOwner, pTaskWin ); + pImp->pParent->_Update_Impl( bUIActive, bIsMDIApp, bIsIPOwner, pTaskWin ); for (sal_uInt16 n=0; naObjBars[n].nResId = 0; @@ -1807,7 +1810,7 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, // bQuiet : own shells aren't considered for UI and SlotServer // bNoUI: own Shells aren't considered fors UI if ( pImp->bQuiet || pImp->bNoUI || (pImp->pFrame && pImp->pFrame->GetObjectShell()->IsPreview()) ) - return nHelpId; + return; sal_uInt32 nStatBarId=0; SfxShell *pStatusBarShell = NULL; @@ -1818,8 +1821,6 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, { SfxShell *pShell = GetShell( nShell-1 ); SfxInterface *pIFace = pShell->GetInterface(); - if (pShell->GetHelpId()) - nHelpId = pShell->GetHelpId(); // don't consider shells if "Hidden" oder "Quiet" sal_Bool bReadOnlyShell = IsReadOnlyShell_Impl( nShell-1 ); @@ -1950,8 +1951,6 @@ sal_uInt32 SfxDispatcher::_Update_Impl( sal_Bool bUIActive, sal_Bool bIsMDIApp, pImp->pFrame->GetFrame().GetWorkWindow_Impl()->SetStatusBar_Impl( nStatBarId, pStatusBarShell, rBindings ); } } - - return nHelpId; } //-------------------------------------------------------------------- diff --git a/sfx2/source/control/msg.cxx b/sfx2/source/control/msg.cxx index 0aa4df6902ee..6b05c03160ff 100644 --- a/sfx2/source/control/msg.cxx +++ b/sfx2/source/control/msg.cxx @@ -29,9 +29,6 @@ #include "precompiled_sfx2.hxx" #include #include -#ifndef GCC -#endif - #include //==================================================================== @@ -63,4 +60,16 @@ USHORT SfxSlot::GetWhich( const SfxItemPool &rPool ) const return nMasterSlotId; } +::rtl::OString SfxSlot::GetCommand() const +{ + rtl::OString sRet(".uno:"); + sRet += pUnoName; + return sRet; +} + +::rtl::OUString SfxSlot::GetCommandString() const +{ + rtl::OString aCmd(GetCommand()); + return rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 ); +} diff --git a/sfx2/source/dialog/about.cxx b/sfx2/source/dialog/about.cxx index 1d1ef73ad8cf..73284dbd9806 100644 --- a/sfx2/source/dialog/about.cxx +++ b/sfx2/source/dialog/about.cxx @@ -297,9 +297,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId, const String& rVerS FreeResource(); - // explizite Help-Id - // FIXME: HELPID - SetHelpId( ""/*SID_ABOUT*/ ); + SetHelpId( ".uno:About" ); //#112429# replace occurences of "StarOffice" in the "StarSuite" version String sCopyright( aCopyrightText.GetText() ); diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index d85a01870074..df1f13155513 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -160,9 +160,6 @@ void SfxModalDialog::GetDialogData_Impl() void SfxModalDialog::init() { GetDialogData_Impl(); - aTimer.SetTimeout( 100 ); - aTimer.SetTimeoutHdl( LINK( this, SfxModalDialog, TimerHdl_Impl ) ); - aTimer.Start(); } // ----------------------------------------------------------------------- @@ -214,13 +211,7 @@ SfxModalDialog::~SfxModalDialog() */ { -/* - SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI(); - if ( pHelpPI ) - pHelpPI->ResetTopic(); -*/ SetDialogData_Impl(); - aTimer.Stop(); delete pOutputSet; } @@ -233,16 +224,6 @@ void SfxModalDialog::CreateOutputItemSet( SfxItemPool& rPool ) // ----------------------------------------------------------------------- -IMPL_LINK( SfxModalDialog, TimerHdl_Impl, Timer*, EMPTYARG ) -{ -/* - SfxHelpPI *pHelpPI = SFX_APP()->GetHelpPI(); - if ( pHelpPI ) - pHelpPI->LoadTopic( GetHelpId() ); - */ - return 0L; -} - void SfxModalDialog::CreateOutputItemSet( const SfxItemSet& rSet ) { DBG_ASSERT( !pOutputSet, "Double creation of OutputSet!" ); @@ -373,7 +354,6 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - // FIXME: HELPID SetUniqueId( GetHelpId() ); SetHelpId(""); if ( pBindinx ) @@ -393,7 +373,6 @@ SfxModelessDialog::SfxModelessDialog( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - // FIXME: HELPID SetUniqueId( GetHelpId() ); SetHelpId(""); if ( pBindinx ) @@ -418,16 +397,15 @@ long SfxModelessDialog::Notify( NotifyEvent& rEvt ) pBindings->SetActiveFrame( pImp->pMgr->GetFrame() ); pImp->pMgr->Activate_Impl(); Window* pWindow = rEvt.GetWindow(); - ULONG nHelpId = 0; - while ( !nHelpId && pWindow ) + rtl::OString sHelpId; + while ( !sHelpId.getLength() && pWindow ) { - // FIXME: HELPID - nHelpId = 0; // pWindow->GetHelpId(); + sHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } - if ( nHelpId ) - SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId ); + if ( sHelpId.getLength() ) + SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId ); } else if ( rEvt.GetType() == EVENT_LOSEFOCUS && !HasChildPathFocus() ) { @@ -521,16 +499,15 @@ long SfxFloatingWindow::Notify( NotifyEvent& rEvt ) pBindings->SetActiveFrame( pImp->pMgr->GetFrame() ); pImp->pMgr->Activate_Impl(); Window* pWindow = rEvt.GetWindow(); - ULONG nHelpId = 0; - while ( !nHelpId && pWindow ) + rtl::OString sHelpId; + while ( !sHelpId.getLength() && pWindow ) { - // FIXME: HELPID - nHelpId = 0; //pWindow->GetHelpId(); + sHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } - if ( nHelpId ) - SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId ); + if ( sHelpId.getLength() ) + SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId ); } else if ( rEvt.GetType() == EVENT_LOSEFOCUS ) { @@ -563,7 +540,6 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - // FIXME: HELPID SetUniqueId( GetHelpId() ); SetHelpId(""); if ( pBindinx ) @@ -584,7 +560,6 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, { pImp->pMgr = pCW; pImp->bConstructed = FALSE; - // FIXME: HELPID SetUniqueId( GetHelpId() ); SetHelpId(""); if ( pBindinx ) diff --git a/sfx2/source/dialog/dialog.hrc b/sfx2/source/dialog/dialog.hrc index f1e100e17cf5..78844d335f6a 100644 --- a/sfx2/source/dialog/dialog.hrc +++ b/sfx2/source/dialog/dialog.hrc @@ -76,7 +76,6 @@ #define CB_URL ( RC_DIALOG_BEGIN + 64 ) #define STR_INTERNET ( RC_DIALOG_BEGIN + 65 ) -#define RID_AUTOHIDE ( RC_DIALOG_BEGIN + 66 ) #define DLG_ONLINE_REGISTER ( RC_DIALOG_BEGIN + 68 ) #define DLG_VERSIONS ( RC_DIALOG_BEGIN + 69 ) diff --git a/sfx2/source/dialog/dialog.src b/sfx2/source/dialog/dialog.src index a54d2c340d04..53e232a7c63c 100644 --- a/sfx2/source/dialog/dialog.src +++ b/sfx2/source/dialog/dialog.src @@ -231,22 +231,7 @@ ModalDialog RID_URLOPEN Left = TRUE ; }; }; -Menu RID_AUTOHIDE -{ - ItemList = - { - MenuItem - { - Identifier = SID_AUTOHIDE ; - HelpID = SID_AUTOHIDE ; - Text [ en-US ] = "Hide" ; - }; - }; -}; -String RID_AUTOHIDE -{ - Text [ en-US ] = "Don't Hide" ; -}; + String SID_NAVIGATOR { Text [ en-US ] = "Navigator"; diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 8ad551278a27..499987f5ff3b 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -46,6 +46,7 @@ #include #include "sfxhelp.hxx" #include +#include #include #include @@ -918,13 +919,23 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, */ { - // FIXME: HELPID - ULONG nId = 0;// GetHelpId(); - if ( !nId && pCW ) - nId = pCW->GetType(); - SetHelpId( "" ); - // FIXME: HELPID - SetUniqueId( ""/*nId*/ ); + if ( GetHelpId().getLength() ) + { + SetUniqueId( GetHelpId() ); + SetHelpId(""); + } + else + { + SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); + SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool(); + const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); + if ( pSlot ) + { + rtl::OString aCmd(".uno:"); + aCmd += pSlot->GetUnoName(); + SetUniqueId( aCmd ); + } + } pImp = new SfxDockingWindow_Impl; pImp->bConstructed = FALSE; @@ -962,9 +973,23 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, */ { - // FIXME: HELPID - SetUniqueId( GetHelpId() ); - SetHelpId(""); + if ( GetHelpId().getLength() ) + { + SetUniqueId( GetHelpId() ); + SetHelpId(""); + } + else + { + SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); + SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool(); + const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); + if ( pSlot ) + { + rtl::OString aCmd(".uno:"); + aCmd += pSlot->GetUnoName(); + SetUniqueId( aCmd ); + } + } pImp = new SfxDockingWindow_Impl; pImp->bConstructed = FALSE; @@ -1846,16 +1871,15 @@ long SfxDockingWindow::Notify( NotifyEvent& rEvt ) pMgr->Activate_Impl(); Window* pWindow = rEvt.GetWindow(); - ULONG nHelpId = 0; - while ( !nHelpId && pWindow ) + rtl::OString sHelpId; + while ( !sHelpId.getLength() && pWindow ) { - // FIXME: HELPID - //nHelpId = pWindow->GetHelpId(); + sHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } - if ( nHelpId ) - SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), nHelpId ); + if ( sHelpId.getLength() ) + SfxHelp::OpenHelpAgent( &pBindings->GetDispatcher_Impl()->GetFrame()->GetFrame(), sHelpId ); // In VCL geht Notify zun"achst an das Fenster selbst, // also base class rufen, sonst erf"ahrt der parent nichts diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 2785a38305cd..6512bac43b7e 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -218,55 +218,55 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve { //!!! todo: cache the help strings (here or TRA) - ULONG nHelpId = 0; + rtl::OString sHelpId; // mapping from element id -> help id switch ( aEvent.ElementId ) { case ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION : - nHelpId = HID_FILESAVE_AUTOEXTENSION; + sHelpId = HID_FILESAVE_AUTOEXTENSION; break; case ExtendedFilePickerElementIds::CHECKBOX_PASSWORD : - nHelpId = HID_FILESAVE_SAVEWITHPASSWORD; + sHelpId = HID_FILESAVE_SAVEWITHPASSWORD; break; case ExtendedFilePickerElementIds::CHECKBOX_FILTEROPTIONS : - nHelpId = HID_FILESAVE_CUSTOMIZEFILTER; + sHelpId = HID_FILESAVE_CUSTOMIZEFILTER; break; case ExtendedFilePickerElementIds::CHECKBOX_READONLY : - nHelpId = HID_FILEOPEN_READONLY; + sHelpId = HID_FILEOPEN_READONLY; break; case ExtendedFilePickerElementIds::CHECKBOX_LINK : - nHelpId = HID_FILEDLG_LINK_CB; + sHelpId = HID_FILEDLG_LINK_CB; break; case ExtendedFilePickerElementIds::CHECKBOX_PREVIEW : - nHelpId = HID_FILEDLG_PREVIEW_CB; + sHelpId = HID_FILEDLG_PREVIEW_CB; break; case ExtendedFilePickerElementIds::PUSHBUTTON_PLAY : - nHelpId = HID_FILESAVE_DOPLAY; + sHelpId = HID_FILESAVE_DOPLAY; break; case ExtendedFilePickerElementIds::LISTBOX_VERSION_LABEL : case ExtendedFilePickerElementIds::LISTBOX_VERSION : - nHelpId = HID_FILEOPEN_VERSION; + sHelpId = HID_FILEOPEN_VERSION; break; case ExtendedFilePickerElementIds::LISTBOX_TEMPLATE_LABEL : case ExtendedFilePickerElementIds::LISTBOX_TEMPLATE : - nHelpId = HID_FILESAVE_TEMPLATE; + sHelpId = HID_FILESAVE_TEMPLATE; break; case ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE_LABEL : case ExtendedFilePickerElementIds::LISTBOX_IMAGE_TEMPLATE : - nHelpId = HID_FILEOPEN_IMAGE_TEMPLATE; + sHelpId = HID_FILEOPEN_IMAGE_TEMPLATE; break; case ExtendedFilePickerElementIds::CHECKBOX_SELECTION : - nHelpId = HID_FILESAVE_SELECTION; + sHelpId = HID_FILESAVE_SELECTION; break; default: @@ -276,8 +276,7 @@ OUString FileDialogHelper_Impl::handleHelpRequested( const FilePickerEvent& aEve OUString aHelpText; Help* pHelp = Application::GetHelp(); if ( pHelp ) - // FIXME: HELPID - aHelpText = String( pHelp->GetHelpText( String()/*nHelpId*/, NULL ) ); + aHelpText = String( pHelp->GetHelpText( String( ByteString(sHelpId), RTL_TEXTENCODING_UTF8), NULL ) ); return aHelpText; } @@ -1223,7 +1222,7 @@ void SAL_CALL PickerThread_Impl::run() } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId ) +void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ) { DBG_ASSERT( _pControlId && _pHelpId, "FileDialogHelper_Impl::setControlHelpIds: invalid array pointers!" ); if ( !_pControlId || !_pHelpId ) @@ -1239,10 +1238,8 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con { while ( *_pControlId ) { - // calc the help id of the element ::rtl::OUString sId( sHelpIdPrefix ); - sId += ::rtl::OUString::valueOf( *_pHelpId ); - // set the help id + sId += ::rtl::OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 ); xControlAccess->setValue( *_pControlId, ControlActions::SET_HELP_URL, makeAny( sId ) ); ++_pControlId; ++_pHelpId; @@ -1256,7 +1253,7 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::setDialogHelpId( const sal_Int32 _nHelpId ) +void FileDialogHelper_Impl::setDialogHelpId( sal_Int32 _nHelpId ) { svt::SetDialogHelpId( mxFileDlg, _nHelpId ); } @@ -2458,7 +2455,7 @@ void FileDialogHelper::CreateMatcher( const String& rFactory ) } // ------------------------------------------------------------------------ -void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId ) +void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ) { mpImp->setControlHelpIds( _pControlId, _pHelpId ); } diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index b023b8fb53a9..bfd94595feee 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -140,8 +140,8 @@ namespace sfx2 void correctVirtualDialogType(); - void setControlHelpIds( const sal_Int16* _pControlId, const sal_Int32* _pHelpId ); - void setDialogHelpId( const sal_Int32 _nHelpId ); + void setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); + void setDialogHelpId( sal_Int32 nId ); sal_Bool CheckFilterOptionsCapability( const SfxFilter* _pFilter ); diff --git a/sfx2/source/dialog/navigat.cxx b/sfx2/source/dialog/navigat.cxx index b271d1e04dc7..d7f258e7ccb3 100644 --- a/sfx2/source/dialog/navigat.cxx +++ b/sfx2/source/dialog/navigat.cxx @@ -51,8 +51,7 @@ SfxNavigatorWrapper::SfxNavigatorWrapper( Window* pParentWnd , WB_STDDOCKWIN | WB_CLIPCHILDREN | WB_SIZEABLE | WB_3DLOOK | WB_ROLLABLE); eChildAlignment = SFX_ALIGN_NOALIGNMENT; - // FIXME: HELPID - pWindow->SetHelpId ( ""/*HID_NAVIGATOR_WINDOW*/ ); + pWindow->SetHelpId ( HID_NAVIGATOR_WINDOW ); pWindow->SetOutputSizePixel( Size( 270, 240 ) ); ( ( SfxDockingWindow* ) pWindow )->Initialize( pInfo ); diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src index fa5fa62a2ee4..90ed1a139cbb 100644 --- a/sfx2/source/dialog/newstyle.src +++ b/sfx2/source/dialog/newstyle.src @@ -28,10 +28,11 @@ #include #include "dialog.hrc" #include "newstyle.hrc" +#include "sfx2/sfxcommands.h" ModalDialog DLG_NEW_STYLE_BY_EXAMPLE { - HelpId = SID_STYLE_NEW_BY_EXAMPLE ; + HelpId = CMD_SID_STYLE_NEW_BY_EXAMPLE ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 177 , 112 ) ; diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 065b407c6769..3c7a58cd09f9 100644 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -664,8 +664,7 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText ) aCancelBtn.Show(); aHelpBtn.Show(); aResetBtn.Show(); - // FIXME: HELPID - aResetBtn.SetHelpId( ""/*HID_TABDLG_RESET_BTN*/ ); + aResetBtn.SetHelpId( HID_TABDLG_RESET_BTN ); if ( pUserBtn ) { @@ -681,8 +680,7 @@ void SfxTabDialog::Init_Impl( BOOL bFmtFlag, const String* pUserButtonText ) String aStd( SfxResId( STR_STANDARD_SHORTCUT ) ); aBaseFmtBtn.SetText( aStd ); aBaseFmtBtn.SetClickHdl( LINK( this, SfxTabDialog, BaseFmtHdl ) ); - // FIXME: HELPID - aBaseFmtBtn.SetHelpId( ""/*HID_TABDLG_STANDARD_BTN*/ ); + aBaseFmtBtn.SetHelpId( HID_TABDLG_STANDARD_BTN ); // bFmt = tempor"ares Flag im Ctor() "ubergeben, // wenn bFmt == 2, dann auch TRUE, @@ -789,8 +787,7 @@ void SfxTabDialog::EnableApplyButton(BOOL bEnable) pImpl->pApplyButton->SetText( String( SfxResId( STR_APPLY ) ) ); pImpl->pApplyButton->Show(); - // FIXME: HELPID - pImpl->pApplyButton->SetHelpId( ""/*HID_TABDLG_APPLY_BTN*/ ); + pImpl->pApplyButton->SetHelpId( HID_TABDLG_APPLY_BTN ); } else { @@ -1783,16 +1780,15 @@ long SfxTabDialog::Notify( NotifyEvent& rNEvt ) if ( pViewFrame ) { Window* pWindow = rNEvt.GetWindow(); - ULONG nHelpId = 0; - while ( !nHelpId && pWindow ) + rtl::OString sHelpId; + while ( !sHelpId.getLength() && pWindow ) { - // FIXME: HELPID - // nHelpId = pWindow->GetHelpId(); + sHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } - if ( nHelpId ) - SfxHelp::OpenHelpAgent( &pViewFrame->GetFrame(), nHelpId ); + if ( sHelpId.getLength() ) + SfxHelp::OpenHelpAgent( &pViewFrame->GetFrame(), sHelpId ); } } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 4777798aef2b..a3d9fd7b4ed2 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -778,10 +778,8 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Sfx bHierarchical ( FALSE ), bBindingUpdate ( TRUE ) { - // FIXME: HELPID - aFmtLb.SetHelpId( ""/*HID_TEMPLATE_FMT*/ ); - // FIXME: HELPID - aFilterLb.SetHelpId( ""/*HID_TEMPLATE_FILTER*/ ); + aFmtLb.SetHelpId( HID_TEMPLATE_FMT ); + aFilterLb.SetHelpId( HID_TEMPLATE_FILTER ); aFmtLb.SetWindowBits( WB_SORT | WB_HIDESELECTION ); Font aFont = aFmtLb.GetFont(); aFont.SetWeight( WEIGHT_NORMAL ); @@ -2210,32 +2208,6 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox // HilfePI antriggern, wenn von Call als Handler und Bereich erlaubt ist if( !pListBox || pListBox->IsSelected( pListBox->GetHdlEntry() ) ) { -#ifdef WIR_KOENNEN_WIEDER_HILFE_FUER_STYLESHEETS - SfxHelpPI* pHelpPI = SFX_APP()->GetHelpPI(); - if ( pHelpPI && pListBox && IsInitialized() && - GetSelectedEntry().Len() ) - { - const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl(); - const SfxStyleFamily eFam = pItem->GetFamily(); - DBG_ASSERT(pStyleSheetPool, "Kein Pool"); - // SfxStyleSheetBase* pStyle = pStyleSheetPool - // ? pStyleSheetPool->Find( GetSelectedEntry(), eFam ) : 0; - SfxStyleSheetBase *pStyle; - if ( pStyleSheetPool ) - pStyle = pStyleSheetPool->Find ( GetSelectedEntry(), eFam ); - else - pStyle = 0; - - if ( pStyle ) - { - String aHelpFile; - ULONG nHelpId=pStyle->GetHelpId(aHelpFile); - if ( nHelpId ) - pHelpPI->LoadTopic( nHelpId ); - } - } -#endif - // nur, wenn Giesskanne an ist if ( IsInitialized() && IsCheckedItem(SID_STYLE_WATERCAN) && @@ -2361,8 +2333,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( Font aFont=aFilterLb.GetFont(); aFont.SetWeight( WEIGHT_NORMAL ); aFilterLb.SetFont( aFont ); - // FIXME: HELPID - m_aActionTbL.SetHelpId( ""/*HID_TEMPLDLG_TOOLBOX_LEFT*/ ); + m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT ); } // ------------------------------------------------------------------------ @@ -2376,19 +2347,18 @@ void SfxTemplateDialog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable ) void SfxTemplateDialog_Impl::InsertFamilyItem(USHORT nId,const SfxStyleFamilyItem *pItem) { - USHORT nHelpId = 0; + rtl::OString sHelpId; switch( (USHORT) pItem->GetFamily() ) { - case SFX_STYLE_FAMILY_CHAR: nHelpId = SID_STYLE_FAMILY1; break; - case SFX_STYLE_FAMILY_PARA: nHelpId = SID_STYLE_FAMILY2; break; - case SFX_STYLE_FAMILY_FRAME:nHelpId = SID_STYLE_FAMILY3; break; - case SFX_STYLE_FAMILY_PAGE: nHelpId = SID_STYLE_FAMILY4; break; - case SFX_STYLE_FAMILY_PSEUDO: nHelpId = SID_STYLE_FAMILY5; break; - default: DBG_ERROR("unbekannte StyleFamily"); break; + case SFX_STYLE_FAMILY_CHAR: sHelpId = ".uno:CharStyle"; break; + case SFX_STYLE_FAMILY_PARA: sHelpId = ".uno:ParaStyle"; break; + case SFX_STYLE_FAMILY_FRAME: sHelpId = ".uno:FrameStyle"; break; + case SFX_STYLE_FAMILY_PAGE: sHelpId = ".uno:PageStyle"; break; + case SFX_STYLE_FAMILY_PSEUDO: sHelpId = ".uno:ListStyle"; break; + default: DBG_ERROR("unknown StyleFamily"); break; } m_aActionTbL.InsertItem( nId, pItem->GetImage(), pItem->GetText(), 0, 0); - // FIXME: HELPID - m_aActionTbL.SetHelpId( nId, ""/*nHelpId*/ ); + m_aActionTbL.SetHelpId( nId, sHelpId ); } // ------------------------------------------------------------------------ @@ -2687,21 +2657,18 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox ) uno::Any aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleNewByExample")); ::rtl::OUString sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_NEW_BY_EXAMPLE, sLabel ); - // FIXME: HELPID - pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, ""/*HID_TEMPLDLG_NEWBYEXAMPLE*/); + pMenu->SetHelpId(SID_STYLE_NEW_BY_EXAMPLE, HID_TEMPLDLG_NEWBYEXAMPLE); aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:StyleUpdateByExample")); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_STYLE_UPDATE_BY_EXAMPLE, sLabel ); - // FIXME: HELPID - pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, ""/*HID_TEMPLDLG_UPDATEBYEXAMPLE*/); + pMenu->SetHelpId(SID_STYLE_UPDATE_BY_EXAMPLE, HID_TEMPLDLG_UPDATEBYEXAMPLE); aCommand = xUICommands->getByName(::rtl::OUString::createFromAscii(".uno:LoadStyles")); sLabel = lcl_GetLabel( aCommand ); pMenu->InsertItem( SID_TEMPLATE_LOAD, sLabel ); - // FIXME: HELPID - pMenu->SetHelpId(SID_TEMPLATE_LOAD, ""/*SID_TEMPLATE_LOAD*/); + pMenu->SetHelpId(SID_TEMPLATE_LOAD, ".uno:LoadStyles"); pMenu->SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, MenuSelectHdl)); pMenu->Execute( pBox, diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src index a4adcd77b6d3..e5b4f1fd9cdf 100644 --- a/sfx2/source/dialog/templdlg.src +++ b/sfx2/source/dialog/templdlg.src @@ -57,7 +57,7 @@ ImageList IMG_LST_STYLE_DESIGNER_HC // RID_STYLECATALOG ------------------------------------------------------ ModalDialog RID_STYLECATALOG { - HelpId = SID_STYLE_CATALOG ; + HelpId = CMD_SID_STYLE_CATALOG ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 181 , 134 ) ; @@ -146,7 +146,7 @@ DockingWindow DLG_STYLE_DESIGNER { Text [ en-US ] = "Styles and Formatting" ; - HelpId = SID_STYLE_DESIGNER ; + HelpId = CMD_SID_STYLE_DESIGNER ; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/sfx2/source/doc/doc.hrc b/sfx2/source/doc/doc.hrc index 838168e64526..7e8fd688af52 100644 --- a/sfx2/source/doc/doc.hrc +++ b/sfx2/source/doc/doc.hrc @@ -44,7 +44,6 @@ #define STR_NOSTARTPRINTER (RID_SFX_DOC_START+ 8) #define MSG_CONFIRM_FILTER (RID_SFX_DOC_START+11) #define MSG_CONFIRM_OVERWRITE_TEMPLATE (RID_SFX_DOC_START+12) -#define MSG_QUERY_LOAD_TEMPLATE (RID_SFX_DOC_START+13) #define STR_DELETE_REGION (RID_SFX_DOC_START+14) #define STR_DELETE_TEMPLATE (RID_SFX_DOC_START+15) diff --git a/sfx2/source/doc/doc.src b/sfx2/source/doc/doc.src index d17b62c9b52a..497d4ccd7c97 100644 --- a/sfx2/source/doc/doc.src +++ b/sfx2/source/doc/doc.src @@ -43,14 +43,6 @@ QueryBox MSG_CONFIRM_OVERWRITE_TEMPLATE DefButton = WB_DEF_NO ; Message [ en-US ] = "Name already in use.\nDo you want to overwrite document template?" ; }; -QueryBox MSG_QUERY_LOAD_TEMPLATE -{ - BUTTONS = WB_YES_NO ; - DEFBUTTON = WB_DEF_NO ; - HelpId = MSG_QUERY_LOAD_TEMPLATE; - - Message [ en-US ] = "The Styles in this document do not match your current Styles. Should your current Styles be applied to this document?"; -}; String STR_DELETE_REGION { Text [ en-US ] = "Are you sure you want to delete the region \"$1\"?" ; diff --git a/sfx2/source/doc/doctdlg.src b/sfx2/source/doc/doctdlg.src index 91d966fbd2d5..3192de44c19a 100644 --- a/sfx2/source/doc/doctdlg.src +++ b/sfx2/source/doc/doctdlg.src @@ -28,10 +28,11 @@ #include #include "doc.hrc" #include "doctdlg.hrc" +#include ModalDialog DLG_DOC_TEMPLATE { - HelpId = SID_DOCTEMPLATE ; + HelpId = CMD_SID_DOCTEMPLATE ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 280 , 128 ) ; diff --git a/sfx2/source/doc/docvor.cxx b/sfx2/source/doc/docvor.cxx index 1d57e0b9c761..719dc5b8d223 100644 --- a/sfx2/source/doc/docvor.cxx +++ b/sfx2/source/doc/docvor.cxx @@ -245,9 +245,8 @@ SfxOrganizeDlg_Impl::SfxOrganizeDlg_Impl( SfxTemplateOrganizeDlg* pParent, // * always work with an own instance, even if we get only NULL in this ctor } - // FIXME: HELPID - aLeftLb.SetHelpId( ""/*HID_CTL_ORGANIZER_LEFT*/ ); - aRightLb.SetHelpId( ""/*HID_CTL_ORGANIZER_RIGHT*/ ); + aLeftLb.SetHelpId( HID_CTL_ORGANIZER_LEFT ); + aRightLb.SetHelpId( HID_CTL_ORGANIZER_RIGHT ); String aWorkPath = SvtPathOptions().GetWorkPath(); if ( aWorkPath.Len() ) diff --git a/sfx2/source/doc/docvor.src b/sfx2/source/doc/docvor.src index 2c9975de9bb8..d9ef886f59bb 100644 --- a/sfx2/source/doc/docvor.src +++ b/sfx2/source/doc/docvor.src @@ -37,7 +37,7 @@ ModalDialog DLG_ORGANIZE { - HelpId = SID_ORGANIZER ; + HelpId = CMD_SID_ORGANIZER ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 271 , 162 ) ; diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 3ad0cc51a923..f7df58ffd397 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -384,7 +384,7 @@ void SAL_CALL IFrameObject::removeVetoableChangeListener(const ::rtl::OUString&, ::sal_Int16 SAL_CALL IFrameObject::execute() throw (::com::sun::star::uno::RuntimeException) { SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, SID_INSERT_FLOATINGFRAME, mxObj ); + VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, rtl::OUString::createFromAscii(".uno:InsertObjectFloatingFrame"), mxObj ); if ( pDlg ) pDlg->Execute(); return 0; diff --git a/sfx2/source/doc/new.cxx b/sfx2/source/doc/new.cxx index 3b1ebde3f1ae..d3235b1c7a7f 100644 --- a/sfx2/source/doc/new.cxx +++ b/sfx2/source/doc/new.cxx @@ -177,8 +177,7 @@ SfxPreviewWin::SfxPreviewWin( Window* pParent, const ResId& rResId, SfxObjectShellLock &rDocSh ) : Window(pParent, rResId), rDocShell( rDocSh ) { - // FIXME: HELPID - SetHelpId( ""/*HID_PREVIEW_FRAME*/ ); + SetHelpId( HID_PREVIEW_FRAME ); // adjust contrast mode initially bool bUseContrast = UseHighContrastSetting(); diff --git a/sfx2/source/doc/new.src b/sfx2/source/doc/new.src index 146f9f630570..63c9f49110dd 100644 --- a/sfx2/source/doc/new.src +++ b/sfx2/source/doc/new.src @@ -28,12 +28,14 @@ #include #include "doc.hrc" #include "new.hrc" +#include + // pragma ---------------------------------------------------------------- // DLG_NEW_FILE ---------------------------------------------------------- ModalDialog DLG_NEW_FILE { - HelpId = SID_NEWDOC ; + HelpId = CMD_SID_NEWDOC ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 336 , 96 ) ; diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index e73594af1e10..2e5968d83077 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -365,17 +365,6 @@ void SfxObjectShell::TriggerHelpPI(USHORT nIdx1, USHORT nIdx2, USHORT) { SfxStyleSheetBasePool *pStylePool = GetStyleSheetPool(); SetOrganizerSearchMask(pStylePool); -#ifdef WIR_KOENNEN_WIEDER_HILFE_FUER_STYLESHEETS - SfxStyleSheetBase *pStyle = (*pStylePool)[nIdx2]; - if(pStyle) - { - String aHelpFile; - ULONG nHelpId=pStyle->GetHelpId(aHelpFile); - SfxHelpPI* pHelpPI = SFX_APP()->GetHelpPI(); - if ( pHelpPI && nHelpId ) - pHelpPI->LoadTopic( nHelpId ); - } -#endif } } diff --git a/sfx2/source/doc/querytemplate.cxx b/sfx2/source/doc/querytemplate.cxx index a254deb24c52..3e6a529bc67e 100644 --- a/sfx2/source/doc/querytemplate.cxx +++ b/sfx2/source/doc/querytemplate.cxx @@ -31,7 +31,7 @@ #include "querytemplate.hxx" #include "sfxresid.hxx" #include "doc.hrc" - +#include "helpid.hrc" #include namespace sfx2 @@ -41,8 +41,7 @@ QueryTemplateBox::QueryTemplateBox( Window* pParent, const String& rMessage ) : MessBox ( pParent, 0, Application::GetDisplayName(), rMessage ) { SetImage( QueryBox::GetStandardImage() ); - // FIXME: HELPID - SetHelpId( ""/*MSG_QUERY_LOAD_TEMPLATE*/ ); + SetHelpId( HID_QUERY_LOAD_TEMPLATE ); AddButton( String( SfxResId( STR_QRYTEMPL_UPDATE_BTN ) ), RET_YES, BUTTONDIALOG_DEFBUTTON | BUTTONDIALOG_OKBUTTON | BUTTONDIALOG_FOCUSBUTTON ); diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index 29ad461d18da..86353e4ca968 100644 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc @@ -30,330 +30,323 @@ // include ------------------------------------------------------------------ #include +#include // Help-Ids ----------------------------------------------------------------- -#define HID_GLOBAL_FALLBACK 0xFFFFFFFF +#define HID_FILTER_SELECT "SFX2_HID_FILTER_SELECT" +#define HID_USERDEFBMP "SFX2_HID_USERDEFBMP" +#define HID_DOCINFO_EDT "SFX2_HID_DOCINFO_EDT" +#define HID_PASSWD "SFX2_HID_PASSWD" +#define HID_PRINTMONITOR "SFX2_HID_PRINTMONITOR" +#define HID_CONFIG_OBJECTBAR "SFX2_HID_CONFIG_OBJECTBAR" +#define HID_MANAGE_STYLES "SFX2_HID_MANAGE_STYLES" +#define HID_CONFIG_EVENT "SFX2_HID_CONFIG_EVENT" +#define HID_DOCINFODESC "SFX2_HID_DOCINFODESC" +#define HID_DOCINFODOC "SFX2_HID_DOCINFODOC" +#define HID_DOCINFOUSER "SFX2_HID_DOCINFOUSER" +#define HID_BOOKMARKPROPS "SFX2_HID_BOOKMARKPROPS" +#define HID_BOOKGROUPPROPS "SFX2_HID_BOOKGROUPPROPS" +#define HID_BOOKFILEPROPS "SFX2_HID_BOOKFILEPROPS" +#define HID_NEWS_SERVERPROPS "SFX2_HID_NEWS_SERVERPROPS" +#define HID_NEWS_RULEPAGE "SFX2_HID_NEWS_RULEPAGE" +#define HID_MAILINTRAYPROPS "SFX2_HID_MAILINTRAYPROPS" +#define HID_DOCINFORELOAD "SFX2_HID_DOCINFORELOAD" +#define HID_NEWS_GROUPPAGE "SFX2_HID_NEWS_GROUPPAGE" +#define HID_NEWS_SERVERPAGE "SFX2_HID_NEWS_SERVERPAGE" +#define HID_FILEDLG_STANDARD "SFX2_HID_FILEDLG_STANDARD" +#define HID_FILEDLG_MANAGER "SFX2_HID_FILEDLG_MANAGER" +#define HID_FILEDLG_URL "SFX2_HID_FILEDLG_URL" +#define HID_FILEDLG_FILE "SFX2_HID_FILEDLG_FILE" +#define HID_FILEDLG_USE_PASSWD "SFX2_HID_FILEDLG_USE_PASSWD" +#define HID_FILEDLG_READ_ONLY "SFX2_HID_FILEDLG_READ_ONLY" +#define HID_EXPLORERCONTROL "SFX2_HID_EXPLORERCONTROL" +#define HID_BROWSERCONTROL "SFX2_HID_BROWSERCONTROL" +#define HID_CTL_ORGANIZER_LEFT "SFX2_HID_CTL_ORGANIZER_LEFT" +#define HID_CTL_ORGANIZER_RIGHT "SFX2_HID_CTL_ORGANIZER_RIGHT" +#define HID_EXPLMAILSRV_GENERAL_PAGE "SFX2_HID_EXPLMAILSRV_GENERAL_PAGE" +#define HID_EXPLMAILSRV_PROTOCOL_PAGE "SFX2_HID_EXPLMAILSRV_PROTOCOL_PAGE" +#define HID_EXPLMAILSRV_DATAMATCH_PAGE "SFX2_HID_EXPLMAILSRV_DATAMATCH_PAGE" +#define HID_EXPLMAILSRV_SENDJOURNAL_PAGE "SFX2_HID_EXPLMAILSRV_SENDJOURNAL_PAGE" +#define HID_EXPLMAIL_GENERAL_PAGE "SFX2_HID_EXPLMAIL_GENERAL_PAGE" +#define HID_NEWS_CTL_RULES "SFX2_HID_NEWS_CTL_RULES" +#define HID_NEWS_CTL_GROUPS "SFX2_HID_NEWS_CTL_GROUPS" +#define HID_CONFIG_OBJECTBAR_CTL "SFX2_HID_CONFIG_OBJECTBAR_CTL" +#define HID_NEWS_QUICKSEARCH "SFX2_HID_NEWS_QUICKSEARCH" +#define HID_NEWS_SERVERVIEWPROPS "SFX2_HID_NEWS_SERVERVIEWPROPS" +#define HID_NEWS_SHOWARTICLEPROPS "SFX2_HID_NEWS_SHOWARTICLEPROPS" +#define HID_NEWS_SHOWGROUPPROPS "SFX2_HID_NEWS_SHOWGROUPPROPS" +#define HID_NEWS_USER "SFX2_HID_NEWS_USER" +#define HID_MULTISELECTION_GENERAL_PAGE "SFX2_HID_MULTISELECTION_GENERAL_PAGE" +#define HID_LINK_GENERAL_PAGE "SFX2_HID_LINK_GENERAL_PAGE" +#define HID_LINK_ADDRESS_PAGE "SFX2_HID_LINK_ADDRESS_PAGE" +#define HID_FOLDER_GENERAL_PAGE "SFX2_HID_FOLDER_GENERAL_PAGE" +#define HID_FILE_GENERAL_PAGE "SFX2_HID_FILE_GENERAL_PAGE" +#define HID_FTP_GENERAL_PAGE "SFX2_HID_FTP_GENERAL_PAGE" +#define HID_PRINT_OPTIONS "SFX2_HID_PRINT_OPTIONS" +#define HID_PREVIEW_FRAME "SFX2_HID_PREVIEW_FRAME" +#define HID_DOCINFO_FRAME "SFX2_HID_DOCINFO_FRAME" +#define HID_EXPLORER_FRAME "SFX2_HID_EXPLORER_FRAME" +#define HID_APP_WIN "SFX2_HID_APP_WIN" +#define HID_TEMPLATE_FMT "SFX2_HID_TEMPLATE_FMT" +#define HID_TEMPLATE_FILTER "SFX2_HID_TEMPLATE_FILTER" +#define HID_FTPSERVER_PAGE "SFX2_HID_FTPSERVER_PAGE" +#define HID_DLG_SFX_EXP_SEARCH "SFX2_HID_DLG_SFX_EXP_SEARCH" +#define HID_TP_SFX_EXP_SEARCH_CRITERIA "SFX2_HID_TP_SFX_EXP_SEARCH_CRITERIA" +#define HID_TP_SFX_EXP_SEARCH_PLACE "SFX2_HID_TP_SFX_EXP_SEARCH_PLACE" +#define HID_SEARCH_DLG_TABLB "SFX2_HID_SEARCH_DLG_TABLB" +#define HID_TEMPLDLG_NEWBYEXAMPLE "SFX2_HID_TEMPLDLG_NEWBYEXAMPLE" +#define HID_TEMPLDLG_UPDATEBYEXAMPLE "SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE" +#define HID_TEMPLDLG_WATERCAN "SFX2_HID_TEMPLDLG_WATERCAN" +#define HID_DESKTOP "SFX2_HID_DESKTOP" +#define HID_EXPLORERTOOLSTOOLBOX "SFX2_HID_EXPLORERTOOLSTOOLBOX" +#define HID_EXPLOREROBJECTTOOLBOX "SFX2_HID_EXPLOREROBJECTTOOLBOX" +#define HID_RECORDINGTOOLBOX "SFX2_HID_RECORDINGTOOLBOX" +#define HID_FULLSCREENTOOLBOX "SFX2_HID_FULLSCREENTOOLBOX" +#define HID_HELPBAR "SFX2_HID_HELPBAR" +#define HID_ENVTOOLBOX "SFX2_HID_ENVTOOLBOX" +#define HID_FRAMESETEDIT_TOOLBOX "SFX2_HID_FRAMESETEDIT_TOOLBOX" +#define HID_NAVIGATOR_WINDOW "SFX2_HID_NAVIGATOR_WINDOW" +#define HID_TABDLG_RESET_BTN "SFX2_HID_TABDLG_RESET_BTN" +#define HID_TABDLG_STANDARD_BTN "SFX2_HID_TABDLG_STANDARD_BTN" +#define HID_HELPAGENT_TIP_BOX "SFX2_HID_HELPAGENT_TIP_BOX" +#define HID_TEMPLDLG_TOOLBOX_LEFT "SFX2_HID_TEMPLDLG_TOOLBOX_LEFT" +#define HID_TEMPLDLG_TOOLBOX_RIGHT "SFX2_HID_TEMPLDLG_TOOLBOX_RIGHT" +#define HID_EXPLORER_SRCH_COUNT "SFX2_HID_EXPLORER_SRCH_COUNT" +#define HID_BEAMER_SORT_ASCENDING "SFX2_HID_BEAMER_SORT_ASCENDING" +#define HID_BEAMER_SORT_DESCENDING "SFX2_HID_BEAMER_SORT_DESCENDING" +#define HID_EXPLORER_SRCH_LATEST_COUNT "SFX2_HID_EXPLORER_SRCH_LATEST_COUNT" +#define HID_CONFIG_EVENT_OFFICE_BASED "SFX2_HID_CONFIG_EVENT_OFFICE_BASED" +#define HID_CONFIG_EVENT_DOCUMENT_BASED "SFX2_HID_CONFIG_EVENT_DOCUMENT_BASED" +#define HID_ORGANIZE_NEW "SFX2_HID_ORGANIZE_NEW" +#define HID_ORGANIZE_DELETE "SFX2_HID_ORGANIZE_DELETE" +#define HID_ORGANIZE_EDIT "SFX2_HID_ORGANIZE_EDIT" +#define HID_ORGANIZE_COPY_FROM "SFX2_HID_ORGANIZE_COPY_FROM" +#define HID_ORGANIZE_COPY_TO "SFX2_HID_ORGANIZE_COPY_TO" +#define HID_ORGANIZE_PRINT "SFX2_HID_ORGANIZE_PRINT" +#define HID_ORGANIZE_PRINTER_SETUP "SFX2_HID_ORGANIZE_PRINTER_SETUP" +#define HID_ORGANIZE_RESCAN "SFX2_HID_ORGANIZE_RESCAN" +#define HID_STYLIST_NEW "SFX2_HID_STYLIST_NEW" +#define HID_STYLIST_EDIT "SFX2_HID_STYLIST_EDIT" +#define HID_STYLIST_DELETE "SFX2_HID_STYLIST_DELETE" +#define HID_EXPLORERMENU_ARRANGEICONS "SFX2_HID_EXPLORERMENU_ARRANGEICONS" +#define HID_EXPLORERMENU_ARRANGEICONS_ONGRID "SFX2_HID_EXPLORERMENU_ARRANGEICONS_ONGRID" +#define HID_EXPLORERMENU_FIXEDICONPOS "SFX2_HID_EXPLORERMENU_FIXEDICONPOS" +#define HID_EXPLORERMENU_OPEN "SFX2_HID_EXPLORERMENU_OPEN" +#define HID_EXPLORERMENU_PRINT "SFX2_HID_EXPLORERMENU_PRINT" +#define HID_EXPLORERMENU_SEARCH "SFX2_HID_EXPLORERMENU_SEARCH" +#define HID_EXPLORERMENU_COPY "SFX2_HID_EXPLORERMENU_COPY" +#define HID_EXPLORERMENU_DELETE "SFX2_HID_EXPLORERMENU_DELETE" +#define HID_EXPLORERMENU_CREATELINK "SFX2_HID_EXPLORERMENU_CREATELINK" +#define HID_EXPLORERMENU_EDITPROPERTIES "SFX2_HID_EXPLORERMENU_EDITPROPERTIES" +#define HID_EXPLORERMENU_DOWNLOAD "SFX2_HID_EXPLORERMENU_DOWNLOAD" +#define HID_EXPLORERMENU_STDTEMPLATE "SFX2_HID_EXPLORERMENU_STDTEMPLATE" +#define HID_EXPLORERDLG_FILELIST "SFX2_HID_EXPLORERDLG_FILELIST" +#define HID_PDFOLDERS_WORKPLACE "SFX2_HID_PDFOLDERS_WORKPLACE" +#define HID_PDFOLDERS_EXPLORER "SFX2_HID_PDFOLDERS_EXPLORER" +#define HID_PDFOLDERS_STANDARD "SFX2_HID_PDFOLDERS_STANDARD" +#define HID_PDFOLDERS_ROOT "SFX2_HID_PDFOLDERS_ROOT" +#define HID_PDFOLDERS_DESKTOP "SFX2_HID_PDFOLDERS_DESKTOP" +#define HID_CNTMENU_REMOVE_GROUP "SFX2_HID_CNTMENU_REMOVE_GROUP" +#define HID_CNTMENU_CLEAR_CACHE "SFX2_HID_CNTMENU_CLEAR_CACHE" +#define HID_CNT_SYNC_INFO_DLG "SFX2_HID_CNT_SYNC_INFO_DLG" +#define HID_CNT_REMOVE_REMOVEDLIST "SFX2_HID_CNT_REMOVE_REMOVEDLIST" +#define HID_CNT_ABORT_DIALOG "SFX2_HID_CNT_ABORT_DIALOG" +#define HID_CNT_PAGE_PRJ_DATAEXCHANGE "SFX2_HID_CNT_PAGE_PRJ_DATAEXCHANGE" +#define HID_CHAOSDOC_OBJECTBAR_FILE "SFX2_HID_CHAOSDOC_OBJECTBAR_FILE" +#define HID_CHAOSDOC_OBJECTBAR_MESSAGE "SFX2_HID_CHAOSDOC_OBJECTBAR_MESSAGE" +#define HID_CHAOSDOC_MN_PART_OPEN "SFX2_HID_CHAOSDOC_MN_PART_OPEN" +#define HID_CHAOSDOC_MN_PART_DELETE "SFX2_HID_CHAOSDOC_MN_PART_DELETE" +#define HID_CHAOSDOC_MN_PART_RENAME "SFX2_HID_CHAOSDOC_MN_PART_RENAME" +#define HID_CHAOSDOC_MN_PART_SAVEAS "SFX2_HID_CHAOSDOC_MN_PART_SAVEAS" +#define HID_EXPLORER_DOCVIEW_ICON "SFX2_HID_EXPLORER_DOCVIEW_ICON" +#define HID_EXPLORER_DOCVIEW_DETAILS "SFX2_HID_EXPLORER_DOCVIEW_DETAILS" +#define HID_CHAOSDOC_WIN "SFX2_HID_CHAOSDOC_WIN" +#define HID_CHAOSDOC_WIN_HEADER "SFX2_HID_CHAOSDOC_WIN_HEADER" +#define HID_CHAOSDOC_WIN_PARTS "SFX2_HID_CHAOSDOC_WIN_PARTS" +#define HID_CHAOSDOC_WIN_BODY "SFX2_HID_CHAOSDOC_WIN_BODY" +#define HID_CNT_INSERT_COLUMN "SFX2_HID_CNT_INSERT_COLUMN" +#define HID_CNT_REMOVE_COLUMN "SFX2_HID_CNT_REMOVE_COLUMN" +#define HID_CNT_OPT_WIDTH "SFX2_HID_CNT_OPT_WIDTH" +#define HID_CNT_SORT_ASC "SFX2_HID_CNT_SORT_ASC" +#define HID_CNT_SORT_DESC "SFX2_HID_CNT_SORT_DESC" +#define HID_CNT_RULEPG_OPEN_DIR "SFX2_HID_CNT_RULEPG_OPEN_DIR" +#define HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK "SFX2_HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK" +#define HID_CHAOSDOC_MN_HEADER_COPYLINK "SFX2_HID_CHAOSDOC_MN_HEADER_COPYLINK" +#define HID_CLEAN_CACHE "SFX2_HID_CLEAN_CACHE" +#define HID_SBOX_LOCATION "SFX2_HID_SBOX_LOCATION" +#define HID_SBOX_SUBSCRIBTION "SFX2_HID_SBOX_SUBSCRIBTION" +#define HID_SBOX_CDF_SUBSCRIBTION "SFX2_HID_SBOX_CDF_SUBSCRIBTION" +#define HID_SBOX_SCHEDULE "SFX2_HID_SBOX_SCHEDULE" +#define HID_SBOX_NOTIFICATION "SFX2_HID_SBOX_NOTIFICATION" +#define HID_SBOX_SDC_GENERAL "SFX2_HID_SBOX_SDC_GENERAL" +#define HID_BRWBOX_HEADERBAR "SFX2_HID_BRWBOX_HEADERBAR" +#define HID_CANNOT_CREATE_BMK_HERE "SFX2_HID_CANNOT_CREATE_BMK_HERE" +#define HID_CREATE_BOOKMARK "SFX2_HID_CREATE_BOOKMARK" +#define HID_TASKBAR "SFX2_HID_TASKBAR" +#define HID_TASKBUTTONBAR "SFX2_HID_TASKBUTTONBAR" +#define HID_TASKTOOLBAR "SFX2_HID_TASKTOOLBAR" +#define HID_CHAOSDOC_SHOW_FSYS_EXTENSION "SFX2_HID_CHAOSDOC_SHOW_FSYS_EXTENSION" +#define HID_CNT_FILE "SFX2_HID_CNT_FILE" +#define HID_CHAOSDOC_MN_BODY_OPENLINK "SFX2_HID_CHAOSDOC_MN_BODY_OPENLINK" +#define HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK "SFX2_HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK" +#define HID_CHAOSDOC_MN_BODY_DOWNLOAD "SFX2_HID_CHAOSDOC_MN_BODY_DOWNLOAD" +#define HID_CHAOSDOC_MN_BODY_ADDBOOKMARK "SFX2_HID_CHAOSDOC_MN_BODY_ADDBOOKMARK" +#define HID_OPEN_MENU_CNT "SFX2_HID_OPEN_MENU_CNT" +#define HID_CNT_OPEN_AS_TEMPLATE "SFX2_HID_CNT_OPEN_AS_TEMPLATE" +#define HID_CNT_OPEN_AS_DOC "SFX2_HID_CNT_OPEN_AS_DOC" +#define HID_PDFOLDERS_TEMPLATE "SFX2_HID_PDFOLDERS_TEMPLATE" +#define HID_EXPLORER_ROOT "SFX2_HID_EXPLORER_ROOT" +#define HID_RESET_URL "SFX2_HID_RESET_URL" +#define HID_PHONE_DIALOG "SFX2_HID_PHONE_DIALOG" +#define HID_QB_RESOLVE_LINK "SFX2_HID_QB_RESOLVE_LINK" +#define HID_CHAOSDOC_MN_HEADER_FLAG_BOLD "SFX2_HID_CHAOSDOC_MN_HEADER_FLAG_BOLD" +#define HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC "SFX2_HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC" +#define HID_CHAOSDOC_MN_HEADER_BIG_HEADER "SFX2_HID_CHAOSDOC_MN_HEADER_BIG_HEADER" +#define HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER "SFX2_HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER" +#define HID_CNT_MARK_THREAD_MARKED "SFX2_HID_CNT_MARK_THREAD_MARKED" +#define HID_CNT_MARK_THREAD_UNMARKED "SFX2_HID_CNT_MARK_THREAD_UNMARKED" +#define HID_CNT_DLG_SEARCH_BT_SHOW "SFX2_HID_CNT_DLG_SEARCH_BT_SHOW" +#define HID_CNT_DLG_SEARCH_BT_UPDATE "SFX2_HID_CNT_DLG_SEARCH_BT_UPDATE" +#define HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE "SFX2_HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE" +#define HID_CNT_DLG_SEARCH_BT_STOP "SFX2_HID_CNT_DLG_SEARCH_BT_STOP" +#define HID_CNT_PAGE_HEADER "SFX2_HID_CNT_PAGE_HEADER" +#define HID_CNT_DLG_ADDRESS "SFX2_HID_CNT_DLG_ADDRESS" +#define HID_EXPLORERMENU_AUTO_ARRANGEICONS "SFX2_HID_EXPLORERMENU_AUTO_ARRANGEICONS" +#define HID_EXPLORERMENU_AUTO_ADJUSTICONS "SFX2_HID_EXPLORERMENU_AUTO_ADJUSTICONS" +#define HID_EXPLORERMENU_FREE_POSITIONING "SFX2_HID_EXPLORERMENU_FREE_POSITIONING" +#define HID_CNT_TARGET_MENU "SFX2_HID_CNT_TARGET_MENU" +#define HID_CNT_PAGE_DESCRIPTION "SFX2_HID_CNT_PAGE_DESCRIPTION" +#define HID_CNT_LB_HEADER "SFX2_HID_CNT_LB_HEADER" +#define HID_CNT_LB_DESCRIPTION "SFX2_HID_CNT_LB_DESCRIPTION" +#define HID_GROUPVIEW_BIG_SYMBOLS "SFX2_HID_GROUPVIEW_BIG_SYMBOLS" +#define HID_GROUPVIEW_SMALL_SYMBOLS "SFX2_HID_GROUPVIEW_SMALL_SYMBOLS" +#define HID_GROUPVIEW_ADD_GROUP "SFX2_HID_GROUPVIEW_ADD_GROUP" +#define HID_GROUPVIEW_REMOVE_GROUP "SFX2_HID_GROUPVIEW_REMOVE_GROUP" +#define HID_GROUPVIEW_RENAME_GROUP "SFX2_HID_GROUPVIEW_RENAME_GROUP" +#define HID_GROUPVIEW_ADD_BOOKMARK "SFX2_HID_GROUPVIEW_ADD_BOOKMARK" +#define HID_GROUPVIEW_TREE "SFX2_HID_GROUPVIEW_TREE" +#define HID_GROUPVIEW_ADD_AS_FOLDER "SFX2_HID_GROUPVIEW_ADD_AS_FOLDER" +#define HID_GROUPVIEW_ADD_AS_BMK "SFX2_HID_GROUPVIEW_ADD_AS_BMK" +#define HID_GROUPVIEW_REMOVE_BMK "SFX2_HID_GROUPVIEW_REMOVE_BMK" +#define HID_GROUPVIEW_CONTENT_BIG "SFX2_HID_GROUPVIEW_CONTENT_BIG" +#define HID_GROUPVIEW_CONTENT_SMALL "SFX2_HID_GROUPVIEW_CONTENT_SMALL" +#define HID_GROUPVIEW_CONTENT_TREE "SFX2_HID_GROUPVIEW_CONTENT_TREE" +#define HID_GROUPVIEW_SHOW_DOCS "SFX2_HID_GROUPVIEW_SHOW_DOCS" +#define HID_EDIT_TEMPLATE "SFX2_HID_EDIT_TEMPLATE" +#define HID_PDFOLDERS_GRAPHICS "SFX2_HID_PDFOLDERS_GRAPHICS" +#define HID_FILEDLG_AUTOCOMPLETEBOX "SFX2_HID_FILEDLG_AUTOCOMPLETEBOX" +#define HID_FILEDLG_SAVE_BTN "SFX2_HID_FILEDLG_SAVE_BTN" +#define HID_FILEDLG_SAVE_FILENAME "SFX2_HID_FILEDLG_SAVE_FILENAME" +#define HID_FILEDLG_SAVE_FILETYPE "SFX2_HID_FILEDLG_SAVE_FILETYPE" +#define HID_FILEDLG_INSERT_BTN "SFX2_HID_FILEDLG_INSERT_BTN" +#define HID_FILEDLG_PATH_BTN "SFX2_HID_FILEDLG_PATH_BTN" +#define HID_FILEDLG_PATH_FILENAME "SFX2_HID_FILEDLG_PATH_FILENAME" +#define HID_FILEDLG_FOLDER_BTN "SFX2_HID_FILEDLG_FOLDER_BTN" +#define HID_FILEDLG_FOLDER_FILENAME "SFX2_HID_FILEDLG_FOLDER_FILENAME" +#define HID_FILEDLG_SRCHFOLDER_BTN "SFX2_HID_FILEDLG_SRCHFOLDER_BTN" +#define HID_PDFOLDERS_GROUPS "SFX2_HID_PDFOLDERS_GROUPS" +#define HID_OPEN_CHOOSE_FILTER "SFX2_HID_OPEN_CHOOSE_FILTER" +#define HID_PDFOLDERS_BOOKMARKS "SFX2_HID_PDFOLDERS_BOOKMARKS" +#define HID_PDFOLDERS_FAVORITES_ADD "SFX2_HID_PDFOLDERS_FAVORITES_ADD" +#define HID_PDFOLDERS_FAVORITES_REMOVE "SFX2_HID_PDFOLDERS_FAVORITES_REMOVE" +#define HID_PDFOLDERS_HISTORY "SFX2_HID_PDFOLDERS_HISTORY" +#define HID_FILEDLG_EDIT_FAVORITES "SFX2_HID_FILEDLG_EDIT_FAVORITES" +#define HID_FILEDLG_NEW_FAVORITE "SFX2_HID_FILEDLG_NEW_FAVORITE" +#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX "SFX2_HID_FILEDLG_EDIT_FAVORITES_LISTBOX" +#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR "SFX2_HID_FILEDLG_EDIT_FAVORITES_HEADERBAR" +#define HID_CNT_CB_FORCE_BODY_EXPORT "SFX2_HID_CNT_CB_FORCE_BODY_EXPORT" +#define HID_CNT_PAGE_REPSTATE_CONTROL "SFX2_HID_CNT_PAGE_REPSTATE_CONTROL" +#define HID_TASKSTATUSBAR "SFX2_HID_TASKSTATUSBAR" +#define HID_CNT_PAGE_HEADER_TABBAR "SFX2_HID_CNT_PAGE_HEADER_TABBAR" +#define HID_CNT_PAGE_SUBSCR_TABBAR "SFX2_HID_CNT_PAGE_SUBSCR_TABBAR" +#define HID_CHAOSDOC_MN_PART_PRINT "SFX2_HID_CHAOSDOC_MN_PART_PRINT" +#define HID_STATUSINDICATOR_TEXT "SFX2_HID_STATUSINDICATOR_TEXT" +#define HID_STATUSINDICATOR_PROGRESS "SFX2_HID_STATUSINDICATOR_PROGRESS" +#define HID_CNT_VALUE_ADDED_NONE "SFX2_HID_CNT_VALUE_ADDED_NONE" +#define HID_CNT_VALUE_ADDED_DOCINFO "SFX2_HID_CNT_VALUE_ADDED_DOCINFO" +#define HID_CNT_VALUE_ADDED_FULL "SFX2_HID_CNT_VALUE_ADDED_FULL" +#define HID_CNT_MESSAGE_STOREMODE_REMOTE "SFX2_HID_CNT_MESSAGE_STOREMODE_REMOTE" +#define HID_CNT_MESSAGE_STOREMODE_LOCAL "SFX2_HID_CNT_MESSAGE_STOREMODE_LOCAL" +#define HID_CNT_VIEW_ALL_ARTICLES "SFX2_HID_CNT_VIEW_ALL_ARTICLES" +#define HID_CNT_VIEW_UNREAD_ARTICLES "SFX2_HID_CNT_VIEW_UNREAD_ARTICLES" +#define HID_CNT_VIEW_READ_ARTICLES "SFX2_HID_CNT_VIEW_READ_ARTICLES" +#define HID_CNT_VIEW_MARKED_ARTICLES "SFX2_HID_CNT_VIEW_MARKED_ARTICLES" +#define HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES "SFX2_HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES" +#define HID_CNT_VIEW_ALL_FOLDERS "SFX2_HID_CNT_VIEW_ALL_FOLDERS" +#define HID_CNT_VIEW_SUBSCRIBED_FOLDERS "SFX2_HID_CNT_VIEW_SUBSCRIBED_FOLDERS" +#define HID_CNT_VIEW_ACTIVE_FOLDERS "SFX2_HID_CNT_VIEW_ACTIVE_FOLDERS" +#define HID_CNT_SENT_VIEW_ALL_ARTICLES "SFX2_HID_CNT_SENT_VIEW_ALL_ARTICLES" +#define HID_CNT_SENT_VIEW_SENT_ARTICLES "SFX2_HID_CNT_SENT_VIEW_SENT_ARTICLES" +#define HID_CNT_SENT_VIEW_UNSENT_ARTICLES "SFX2_HID_CNT_SENT_VIEW_UNSENT_ARTICLES" +#define HID_CNT_SENT_VIEW_MARKED_ARTICLES "SFX2_HID_CNT_SENT_VIEW_MARKED_ARTICLES" +#define HID_MAILWIN_SEND_BUTTON "SFX2_HID_MAILWIN_SEND_BUTTON" +#define HID_MAILWIN_CLOSE_BUTTON "SFX2_HID_MAILWIN_CLOSE_BUTTON" +#define HID_MAILWIN_ROLE_BOX "SFX2_HID_MAILWIN_ROLE_BOX" +#define HID_MAILWIN_ADDRESS_EDIT "SFX2_HID_MAILWIN_ADDRESS_EDIT" +#define HID_MAILWIN_ADDRESS_BOX "SFX2_HID_MAILWIN_ADDRESS_BOX" +#define HID_MAILWIN_SUBJECT_EDIT "SFX2_HID_MAILWIN_SUBJECT_EDIT" +#define HID_MAILWIN_FROM_EDIT "SFX2_HID_MAILWIN_FROM_EDIT" +#define HID_MAILWIN_PRIO_BOX "SFX2_HID_MAILWIN_PRIO_BOX" +#define HID_TABDLG_APPLY_BTN "SFX2_HID_TABDLG_APPLY_BTN" +#define HID_TP_COMMONPRINTOPTIONS "SFX2_HID_TP_COMMONPRINTOPTIONS" +#define HID_FILEDLG_LINK_CB "SFX2_HID_FILEDLG_LINK_CB" +#define HID_FILEDLG_PREVIEW_CB "SFX2_HID_FILEDLG_PREVIEW_CB" +#define HID_HELP_WINDOW "SFX2_HID_HELP_WINDOW" +#define HID_HELP_LISTBOX "SFX2_HID_HELP_LISTBOX" +#define HID_HELP_TABCONTROL "SFX2_HID_HELP_TABCONTROL" +#define HID_HELP_TOOLBOX "SFX2_HID_HELP_TOOLBOX" +#define HID_HELP_TOOLBOXITEM_INDEX "SFX2_HID_HELP_TOOLBOXITEM_INDEX" +#define HID_HELP_TOOLBOXITEM_START "SFX2_HID_HELP_TOOLBOXITEM_START" +#define HID_HELP_TOOLBOXITEM_BACKWARD "SFX2_HID_HELP_TOOLBOXITEM_BACKWARD" +#define HID_HELP_TOOLBOXITEM_FORWARD "SFX2_HID_HELP_TOOLBOXITEM_FORWARD" +#define HID_HELP_TOOLBOXITEM_PRINT "SFX2_HID_HELP_TOOLBOXITEM_PRINT" +#define HID_HELP_TOOLBOXITEM_BOOKMARKS "SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS" +#define HID_HELP_TABPAGE_CONTENTS "SFX2_HID_HELP_TABPAGE_CONTENTS" +#define HID_HELP_TABPAGE_INDEX "SFX2_HID_HELP_TABPAGE_INDEX" +#define HID_HELP_TABPAGE_SEARCH "SFX2_HID_HELP_TABPAGE_SEARCH" +#define HID_HELP_TABPAGE_BOOKMARKS "SFX2_HID_HELP_TABPAGE_BOOKMARKS" +#define HID_TBXCONTROL_FILENEW "SFX2_HID_TBXCONTROL_FILENEW" +#define HID_ORGANIZE_STDTEMPLATE_ADD "SFX2_HID_ORGANIZE_STDTEMPLATE_ADD" +#define HID_ORGANIZE_STDTEMPLATE_DEL "SFX2_HID_ORGANIZE_STDTEMPLATE_DEL" +#define HID_HELP_TOOLBOXITEM_SEARCHDIALOG "SFX2_HID_HELP_TOOLBOXITEM_SEARCHDIALOG" +#define HID_HELP_BOOKMARKS_OPEN "SFX2_HID_HELP_BOOKMARKS_OPEN" +#define HID_HELP_BOOKMARKS_RENAME "SFX2_HID_HELP_BOOKMARKS_RENAME" +#define HID_HELP_BOOKMARKS_DELETE "SFX2_HID_HELP_BOOKMARKS_DELETE" +#define HID_CLOSE_WARNING "SFX2_HID_CLOSE_WARNING" +#define HID_DID_SAVE_PACKED_XML "SFX2_HID_DID_SAVE_PACKED_XML" +#define HID_HELP_TREELISTBOX_CONTENTS "SFX2_HID_HELP_TREELISTBOX_CONTENTS" +#define HID_CUSTOMIZETOOLBOX "SFX2_HID_CUSTOMIZETOOLBOX" +#define HID_CUSTOMIZETOOLBOX_FUNCTIONS "SFX2_HID_CUSTOMIZETOOLBOX_FUNCTIONS" +#define HID_CUSTOMIZETOOLBOX_TOOLBOX "SFX2_HID_CUSTOMIZETOOLBOX_TOOLBOX" +#define HID_HELP_TEXT_SELECTION_MODE "SFX2_HID_HELP_TEXT_SELECTION_MODE" -#define HID_FILTER_SELECT (HID_SFX_START + 0) -#define HID_USERDEFBMP (HID_SFX_START + 1) -#define HID_DOCINFO_EDT (HID_SFX_START + 2) -#define HID_PASSWD (HID_SFX_START + 3) -#define HID_PRINTMONITOR (HID_SFX_START + 4) -#define HID_CONFIG_OBJECTBAR (HID_SFX_START + 5) -#define HID_MANAGE_STYLES (HID_SFX_START + 6) -#define HID_CONFIG_EVENT (HID_SFX_START + 7) -#define HID_DOCINFODESC (HID_SFX_START + 8) -#define HID_DOCINFODOC (HID_SFX_START + 9) -#define HID_DOCINFOUSER (HID_SFX_START + 10) -#define HID_BOOKMARKPROPS (HID_SFX_START + 14) -#define HID_BOOKGROUPPROPS (HID_SFX_START + 15) -#define HID_BOOKFILEPROPS (HID_SFX_START + 16) -#define HID_NEWS_SERVERPROPS (HID_SFX_START + 20) -#define HID_NEWS_RULEPAGE (HID_SFX_START + 21) -#define HID_MAILINTRAYPROPS (HID_SFX_START + 23) -#define HID_DOCINFORELOAD (HID_SFX_START + 24) -#define HID_NEWS_GROUPPAGE (HID_SFX_START + 25) -#define HID_NEWS_SERVERPAGE (HID_SFX_START + 26) -#define HID_FILEDLG_STANDARD (HID_SFX_START + 27) -#define HID_FILEDLG_MANAGER (HID_SFX_START + 28) -#define HID_FILEDLG_URL (HID_SFX_START + 29) -#define HID_FILEDLG_FILE (HID_SFX_START + 30) -#define HID_FILEDLG_USE_PASSWD (HID_SFX_START + 31) -#define HID_FILEDLG_READ_ONLY (HID_SFX_START + 32) -#define HID_EXPLORERCONTROL (HID_SFX_START + 33) -#define HID_BROWSERCONTROL (HID_SFX_START + 34) -#define HID_CTL_ORGANIZER_LEFT (HID_SFX_START + 35) -#define HID_CTL_ORGANIZER_RIGHT (HID_SFX_START + 36) -#define HID_EXPLMAILSRV_GENERAL_PAGE (HID_SFX_START + 37) -#define HID_EXPLMAILSRV_PROTOCOL_PAGE (HID_SFX_START + 38) -#define HID_EXPLMAILSRV_DATAMATCH_PAGE (HID_SFX_START + 39) -#define HID_EXPLMAILSRV_SENDJOURNAL_PAGE (HID_SFX_START + 40) -#define HID_EXPLMAIL_GENERAL_PAGE (HID_SFX_START + 41) -#define HID_NEWS_CTL_RULES (HID_SFX_START + 42) -#define HID_NEWS_CTL_GROUPS (HID_SFX_START + 43) -#define HID_CONFIG_OBJECTBAR_CTL (HID_SFX_START + 44) -#define HID_NEWS_QUICKSEARCH (HID_SFX_START + 45) -#define HID_NEWS_SERVERVIEWPROPS (HID_SFX_START + 46) -#define HID_NEWS_SHOWARTICLEPROPS (HID_SFX_START + 47) -#define HID_NEWS_SHOWGROUPPROPS (HID_SFX_START + 48) -#define HID_NEWS_USER (HID_SFX_START + 49) -#define HID_MULTISELECTION_GENERAL_PAGE (HID_SFX_START + 50) -#define HID_LINK_GENERAL_PAGE (HID_SFX_START + 51) -#define HID_LINK_ADDRESS_PAGE (HID_SFX_START + 52) -#define HID_FOLDER_GENERAL_PAGE (HID_SFX_START + 53) -#define HID_FILE_GENERAL_PAGE (HID_SFX_START + 54) -#define HID_FTP_GENERAL_PAGE (HID_SFX_START + 55) -#define HID_PRINT_OPTIONS (HID_SFX_START + 56) -#define HID_PREVIEW_FRAME (HID_SFX_START + 57) -#define HID_DOCINFO_FRAME (HID_SFX_START + 58) -#define HID_EXPLORER_FRAME (HID_SFX_START + 59) -#define HID_APP_WIN (HID_SFX_START + 60) -#define HID_TEMPLATE_FMT (HID_SFX_START + 61) -#define HID_TEMPLATE_FILTER (HID_SFX_START + 62) -#define HID_FTPSERVER_PAGE (HID_SFX_START + 63) -#define HID_DLG_SFX_EXP_SEARCH (HID_SFX_START + 65) -#define HID_TP_SFX_EXP_SEARCH_CRITERIA (HID_SFX_START + 66) -#define HID_TP_SFX_EXP_SEARCH_PLACE (HID_SFX_START + 67) -#define HID_SEARCH_DLG_TABLB (HID_SFX_START + 68) -#define HID_TEMPLDLG_NEWBYEXAMPLE (HID_SFX_START + 69) -#define HID_TEMPLDLG_UPDATEBYEXAMPLE (HID_SFX_START + 70) -#define HID_TEMPLDLG_WATERCAN (HID_SFX_START + 71) -#define HID_DESKTOP (HID_SFX_START + 78) -#define HID_EXPLORERTOOLSTOOLBOX (HID_SFX_START + 79) -#define HID_EXPLOREROBJECTTOOLBOX (HID_SFX_START + 80) -#define HID_RECORDINGTOOLBOX (HID_SFX_START + 81) -#define HID_FULLSCREENTOOLBOX (HID_SFX_START + 82) -#define HID_HELPBAR (HID_SFX_START + 83) -#define HID_ENVTOOLBOX (HID_SFX_START + 84) -#define HID_FRAMESETEDIT_TOOLBOX (HID_SFX_START + 85) -#define HID_NAVIGATOR_WINDOW (HID_SFX_START + 86) -#define HID_TABDLG_RESET_BTN (HID_SFX_START + 89) -#define HID_TABDLG_STANDARD_BTN (HID_SFX_START + 90) -#define HID_HELPAGENT_TIP_BOX (HID_SFX_START + 91) -#define HID_TEMPLDLG_TOOLBOX_LEFT (HID_SFX_START + 92) -#define HID_TEMPLDLG_TOOLBOX_RIGHT (HID_SFX_START + 93) -#define HID_EXPLORER_SRCH_COUNT (HID_SFX_START + 94) -#define HID_BEAMER_SORT_ASCENDING (HID_SFX_START + 95) -#define HID_BEAMER_SORT_DESCENDING (HID_SFX_START + 96) -#define HID_EXPLORER_SRCH_LATEST_COUNT (HID_SFX_START + 97) -#define HID_CONFIG_EVENT_OFFICE_BASED (HID_SFX_START + 98) -#define HID_CONFIG_EVENT_DOCUMENT_BASED (HID_SFX_START + 99) -#define HID_ORGANIZE_NEW (HID_SFX_START + 100) -#define HID_ORGANIZE_DELETE (HID_SFX_START + 101) -#define HID_ORGANIZE_EDIT (HID_SFX_START + 102) -#define HID_ORGANIZE_COPY_FROM (HID_SFX_START + 103) -#define HID_ORGANIZE_COPY_TO (HID_SFX_START + 104) -#define HID_ORGANIZE_PRINT (HID_SFX_START + 105) -#define HID_ORGANIZE_PRINTER_SETUP (HID_SFX_START + 106) -#define HID_ORGANIZE_RESCAN (HID_SFX_START + 107) -#define HID_STYLIST_NEW (HID_SFX_START + 108) -#define HID_STYLIST_EDIT (HID_SFX_START + 109) -#define HID_STYLIST_DELETE (HID_SFX_START + 110) -#define HID_EXPLORERMENU_ARRANGEICONS (HID_SFX_START + 111) -#define HID_EXPLORERMENU_ARRANGEICONS_ONGRID (HID_SFX_START + 112) -#define HID_EXPLORERMENU_FIXEDICONPOS (HID_SFX_START + 113) -#define HID_EXPLORERMENU_OPEN (HID_SFX_START + 114) -#define HID_EXPLORERMENU_PRINT (HID_SFX_START + 115) -#define HID_EXPLORERMENU_SEARCH (HID_SFX_START + 116) -#define HID_EXPLORERMENU_COPY (HID_SFX_START + 117) -#define HID_EXPLORERMENU_DELETE (HID_SFX_START + 118) -#define HID_EXPLORERMENU_CREATELINK (HID_SFX_START + 119) -#define HID_EXPLORERMENU_EDITPROPERTIES (HID_SFX_START + 120) -#define HID_EXPLORERMENU_DOWNLOAD (HID_SFX_START + 121) -#define HID_EXPLORERMENU_STDTEMPLATE (HID_SFX_START + 122) -#define HID_EXPLORERDLG_FILELIST (HID_SFX_START + 124) -#define HID_PDFOLDERS_WORKPLACE (HID_SFX_START + 125) -#define HID_PDFOLDERS_EXPLORER (HID_SFX_START + 126) -#define HID_PDFOLDERS_STANDARD (HID_SFX_START + 127) -#define HID_PDFOLDERS_ROOT (HID_SFX_START + 128) -#define HID_PDFOLDERS_DESKTOP (HID_SFX_START + 129) -#define HID_CNTMENU_REMOVE_GROUP (HID_SFX_START + 130) -#define HID_CNTMENU_CLEAR_CACHE (HID_SFX_START + 131) -#define HID_CNT_SYNC_INFO_DLG (HID_SFX_START + 132) -#define HID_CNT_REMOVE_REMOVEDLIST (HID_SFX_START + 133) -#define HID_CNT_ABORT_DIALOG (HID_SFX_START + 134) -#define HID_CNT_PAGE_PRJ_DATAEXCHANGE (HID_SFX_START + 135) -#define HID_CHAOSDOC_OBJECTBAR_FILE (HID_SFX_START + 136) -#define HID_CHAOSDOC_OBJECTBAR_MESSAGE (HID_SFX_START + 137) -#define HID_CHAOSDOC_MN_PART_OPEN (HID_SFX_START + 138) -#define HID_CHAOSDOC_MN_PART_DELETE (HID_SFX_START + 139) -#define HID_CHAOSDOC_MN_PART_RENAME (HID_SFX_START + 140) -#define HID_CHAOSDOC_MN_PART_SAVEAS (HID_SFX_START + 141) -#define HID_EXPLORER_DOCVIEW_ICON (HID_SFX_START + 142) -#define HID_EXPLORER_DOCVIEW_DETAILS (HID_SFX_START + 143) -#define HID_CHAOSDOC_WIN (HID_SFX_START + 144) -#define HID_CHAOSDOC_WIN_HEADER (HID_SFX_START + 145) -#define HID_CHAOSDOC_WIN_PARTS (HID_SFX_START + 146) -#define HID_CHAOSDOC_WIN_BODY (HID_SFX_START + 147) -#define HID_CNT_INSERT_COLUMN (HID_SFX_START + 148) -#define HID_CNT_REMOVE_COLUMN (HID_SFX_START + 149) -#define HID_CNT_OPT_WIDTH (HID_SFX_START + 150) -#define HID_CNT_SORT_ASC (HID_SFX_START + 151) -#define HID_CNT_SORT_DESC (HID_SFX_START + 152) -#define HID_CNT_RULEPG_OPEN_DIR (HID_SFX_START + 153) -#define HID_CHAOSDOC_MN_HEADER_ADDRESSBOOK (HID_SFX_START + 154) -#define HID_CHAOSDOC_MN_HEADER_COPYLINK (HID_SFX_START + 155) -#define HID_CLEAN_CACHE (HID_SFX_START + 156) -#define HID_SBOX_LOCATION (HID_SFX_START + 157) -#define HID_SBOX_SUBSCRIBTION (HID_SFX_START + 158) -#define HID_SBOX_CDF_SUBSCRIBTION (HID_SFX_START + 159) -#define HID_SBOX_SCHEDULE (HID_SFX_START + 160) -#define HID_SBOX_NOTIFICATION (HID_SFX_START + 161) -#define HID_SBOX_SDC_GENERAL (HID_SFX_START + 162) -#define HID_BRWBOX_HEADERBAR (HID_SFX_START + 163) -#define HID_CANNOT_CREATE_BMK_HERE (HID_SFX_START + 164) -#define HID_CREATE_BOOKMARK (HID_SFX_START + 165) -#define HID_TASKBAR (HID_SFX_START + 166) -#define HID_TASKBUTTONBAR (HID_SFX_START + 167) -#define HID_TASKTOOLBAR (HID_SFX_START + 168) -#define HID_CHAOSDOC_SHOW_FSYS_EXTENSION (HID_SFX_START + 169) -#define HID_CNT_FILE (HID_SFX_START + 170) -#define HID_CHAOSDOC_MN_BODY_OPENLINK (HID_SFX_START + 171) -#define HID_CHAOSDOC_MN_BODY_OPENLINK_BLANK (HID_SFX_START + 172) -#define HID_CHAOSDOC_MN_BODY_DOWNLOAD (HID_SFX_START + 173) -#define HID_CHAOSDOC_MN_BODY_ADDBOOKMARK (HID_SFX_START + 174) -#define HID_OPEN_MENU_CNT (HID_SFX_START + 175) -#define HID_CNT_OPEN_AS_TEMPLATE (HID_SFX_START + 176) -#define HID_CNT_OPEN_AS_DOC (HID_SFX_START + 177) -#define HID_PDFOLDERS_TEMPLATE (HID_SFX_START + 178) -#define HID_EXPLORER_ROOT (HID_SFX_START + 179) -#define HID_RESET_URL (HID_SFX_START + 180) -#define HID_PHONE_DIALOG (HID_SFX_START + 181) -#define HID_QB_RESOLVE_LINK (HID_SFX_START + 182) -#define HID_CHAOSDOC_MN_HEADER_FLAG_BOLD (HID_SFX_START + 183) -#define HID_CHAOSDOC_MN_HEADER_FLAG_ITALIC (HID_SFX_START + 184) -#define HID_CHAOSDOC_MN_HEADER_BIG_HEADER (HID_SFX_START + 185) -#define HID_CHAOSDOC_MN_HEADER_TEMPLATE_HEADER (HID_SFX_START + 186) -#define HID_CNT_MARK_THREAD_MARKED (HID_SFX_START + 187) -#define HID_CNT_MARK_THREAD_UNMARKED (HID_SFX_START + 188) -#define HID_CNT_DLG_SEARCH_BT_SHOW (HID_SFX_START + 189) -#define HID_CNT_DLG_SEARCH_BT_UPDATE (HID_SFX_START + 190) -#define HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE (HID_SFX_START + 191) -#define HID_CNT_DLG_SEARCH_BT_STOP (HID_SFX_START + 192) -#define HID_CNT_PAGE_HEADER (HID_SFX_START + 193) -#define HID_CNT_DLG_ADDRESS (HID_SFX_START + 194) -#define HID_EXPLORERMENU_AUTO_ARRANGEICONS (HID_SFX_START + 195) -#define HID_EXPLORERMENU_AUTO_ADJUSTICONS (HID_SFX_START + 196) -#define HID_EXPLORERMENU_FREE_POSITIONING (HID_SFX_START + 197) -#define HID_CNT_TARGET_MENU (HID_SFX_START + 198) -#define HID_CNT_PAGE_DESCRIPTION (HID_SFX_START + 199) -#define HID_CNT_LB_HEADER (HID_SFX_START + 200) -#define HID_CNT_LB_DESCRIPTION (HID_SFX_START + 201) -#define HID_GROUPVIEW_BIG_SYMBOLS (HID_SFX_START + 202) -#define HID_GROUPVIEW_SMALL_SYMBOLS (HID_SFX_START + 203) -#define HID_GROUPVIEW_ADD_GROUP (HID_SFX_START + 204) -#define HID_GROUPVIEW_REMOVE_GROUP (HID_SFX_START + 205) -#define HID_GROUPVIEW_RENAME_GROUP (HID_SFX_START + 206) -#define HID_GROUPVIEW_ADD_BOOKMARK (HID_SFX_START + 207) -#define HID_GROUPVIEW_TREE (HID_SFX_START + 208) -#define HID_GROUPVIEW_ADD_AS_FOLDER (HID_SFX_START + 209) -#define HID_GROUPVIEW_ADD_AS_BMK (HID_SFX_START + 210) -#define HID_GROUPVIEW_REMOVE_BMK (HID_SFX_START + 211) -#define HID_GROUPVIEW_CONTENT_BIG (HID_SFX_START + 212) -#define HID_GROUPVIEW_CONTENT_SMALL (HID_SFX_START + 213) -#define HID_GROUPVIEW_CONTENT_TREE (HID_SFX_START + 214) -#define HID_GROUPVIEW_SHOW_DOCS (HID_SFX_START + 215) -#define HID_EDIT_TEMPLATE (HID_SFX_START + 216) -#define HID_PDFOLDERS_GRAPHICS (HID_SFX_START + 217) -#define HID_FILEDLG_AUTOCOMPLETEBOX (HID_SFX_START + 218) -#define HID_FILEDLG_SAVE_BTN (HID_SFX_START + 219) -#define HID_FILEDLG_SAVE_FILENAME (HID_SFX_START + 220) -#define HID_FILEDLG_SAVE_FILETYPE (HID_SFX_START + 221) -#define HID_FILEDLG_INSERT_BTN (HID_SFX_START + 222) -#define HID_FILEDLG_PATH_BTN (HID_SFX_START + 223) -#define HID_FILEDLG_PATH_FILENAME (HID_SFX_START + 224) -#define HID_FILEDLG_FOLDER_BTN (HID_SFX_START + 225) -#define HID_FILEDLG_FOLDER_FILENAME (HID_SFX_START + 226) -#define HID_FILEDLG_SRCHFOLDER_BTN (HID_SFX_START + 227) -#define HID_PDFOLDERS_GROUPS (HID_SFX_START + 228) -#define HID_OPEN_CHOOSE_FILTER (HID_SFX_START + 229) -#define HID_PDFOLDERS_BOOKMARKS (HID_SFX_START + 230) -#define HID_PDFOLDERS_FAVORITES_ADD (HID_SFX_START + 231) -#define HID_PDFOLDERS_FAVORITES_REMOVE (HID_SFX_START + 232) -#define HID_PDFOLDERS_HISTORY (HID_SFX_START + 233) -#define HID_FILEDLG_EDIT_FAVORITES (HID_SFX_START + 234) -#define HID_FILEDLG_NEW_FAVORITE (HID_SFX_START + 235) -#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX (HID_SFX_START + 236) -#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR (HID_SFX_START + 237) -#define HID_CNT_CB_FORCE_BODY_EXPORT (HID_SFX_START + 240) -#define HID_CNT_PAGE_REPSTATE_CONTROL (HID_SFX_START + 241) -#define HID_TASKSTATUSBAR (HID_SFX_START + 242) -#define HID_CNT_PAGE_HEADER_TABBAR (HID_SFX_START + 244) -#define HID_CNT_PAGE_SUBSCR_TABBAR (HID_SFX_START + 245) -#define HID_CHAOSDOC_MN_PART_PRINT (HID_SFX_START + 246) -#define HID_STATUSINDICATOR_TEXT (HID_SFX_START + 247) -#define HID_STATUSINDICATOR_PROGRESS (HID_SFX_START + 248) -#define HID_CNT_VALUE_ADDED_NONE (HID_SFX_START + 249) -#define HID_CNT_VALUE_ADDED_DOCINFO (HID_SFX_START + 250) -#define HID_CNT_VALUE_ADDED_FULL (HID_SFX_START + 251) -#define HID_CNT_MESSAGE_STOREMODE_REMOTE (HID_SFX_START + 252) -#define HID_CNT_MESSAGE_STOREMODE_LOCAL (HID_SFX_START + 253) -#define HID_CNT_VIEW_ALL_ARTICLES (HID_SFX_START + 254) -#define HID_CNT_VIEW_UNREAD_ARTICLES (HID_SFX_START + 255) -#define HID_CNT_VIEW_READ_ARTICLES (HID_SFX_START + 256) -#define HID_CNT_VIEW_MARKED_ARTICLES (HID_SFX_START + 257) -#define HID_CNT_VIEW_MARKED_AND_UNREAD_ARTICLES (HID_SFX_START + 258) -#define HID_CNT_VIEW_ALL_FOLDERS (HID_SFX_START + 259) -#define HID_CNT_VIEW_SUBSCRIBED_FOLDERS (HID_SFX_START + 260) -#define HID_CNT_VIEW_ACTIVE_FOLDERS (HID_SFX_START + 261) -#define HID_CNT_SENT_VIEW_ALL_ARTICLES (HID_SFX_START + 262) -#define HID_CNT_SENT_VIEW_SENT_ARTICLES (HID_SFX_START + 263) -#define HID_CNT_SENT_VIEW_UNSENT_ARTICLES (HID_SFX_START + 264) -#define HID_CNT_SENT_VIEW_MARKED_ARTICLES (HID_SFX_START + 265) -#define HID_MAILWIN_SEND_BUTTON (HID_SFX_START + 266) -#define HID_MAILWIN_CLOSE_BUTTON (HID_SFX_START + 267) -#define HID_MAILWIN_ROLE_BOX (HID_SFX_START + 268) -#define HID_MAILWIN_ADDRESS_EDIT (HID_SFX_START + 269) -#define HID_MAILWIN_ADDRESS_BOX (HID_SFX_START + 270) -#define HID_MAILWIN_SUBJECT_EDIT (HID_SFX_START + 271) -#define HID_MAILWIN_FROM_EDIT (HID_SFX_START + 272) -#define HID_MAILWIN_PRIO_BOX (HID_SFX_START + 273) -#define HID_TABDLG_APPLY_BTN (HID_SFX_START + 274) -#define HID_TP_COMMONPRINTOPTIONS (HID_SFX_START + 275) -#define HID_FILEDLG_LINK_CB (HID_SFX_START + 276) -#define HID_FILEDLG_PREVIEW_CB (HID_SFX_START + 277) -#define HID_HELP_WINDOW (HID_SFX_START + 278) -#define HID_HELP_LISTBOX (HID_SFX_START + 279) -#define HID_HELP_TABCONTROL (HID_SFX_START + 280) -#define HID_HELP_TOOLBOX (HID_SFX_START + 281) -#define HID_HELP_TOOLBOXITEM_INDEX (HID_SFX_START + 282) -#define HID_HELP_TOOLBOXITEM_START (HID_SFX_START + 283) -#define HID_HELP_TOOLBOXITEM_BACKWARD (HID_SFX_START + 284) -#define HID_HELP_TOOLBOXITEM_FORWARD (HID_SFX_START + 285) -#define HID_HELP_TOOLBOXITEM_PRINT (HID_SFX_START + 286) -#define HID_HELP_TOOLBOXITEM_BOOKMARKS (HID_SFX_START + 287) -#define HID_HELP_TABPAGE_CONTENTS (HID_SFX_START + 288) -#define HID_HELP_TABPAGE_INDEX (HID_SFX_START + 289) -#define HID_HELP_TABPAGE_SEARCH (HID_SFX_START + 290) -#define HID_HELP_TABPAGE_BOOKMARKS (HID_SFX_START + 291) -#define HID_TBXCONTROL_FILENEW (HID_SFX_START + 292) -#define HID_ORGANIZE_STDTEMPLATE_ADD (HID_SFX_START + 293) -#define HID_ORGANIZE_STDTEMPLATE_DEL (HID_SFX_START + 294) -#define HID_HELP_TOOLBOXITEM_SEARCHDIALOG (HID_SFX_START + 295) -#define HID_HELP_BOOKMARKS_OPEN (HID_SFX_START + 296) -#define HID_HELP_BOOKMARKS_RENAME (HID_SFX_START + 297) -#define HID_HELP_BOOKMARKS_DELETE (HID_SFX_START + 298) -#define HID_CLOSE_WARNING (HID_SFX_START + 299) -#define HID_DID_SAVE_PACKED_XML (HID_SFX_START + 300) -#define HID_HELP_TREELISTBOX_CONTENTS (HID_SFX_START + 301) -#define HID_CUSTOMIZETOOLBOX (HID_SFX_START + 302) -#define HID_CUSTOMIZETOOLBOX_FUNCTIONS (HID_SFX_START + 303) -#define HID_CUSTOMIZETOOLBOX_TOOLBOX (HID_SFX_START + 304) -#define HID_HELP_TEXT_SELECTION_MODE (HID_SFX_START + 305) +#define HID_WARNING_SECURITY_HYPERLINK "SFX2_HID_WARNING_SECURITY_HYPERLINK" +#define HID_FILEDLG_EXPORTASPDF "SFX2_HID_FILEDLG_EXPORTASPDF" +#define HID_USERDEFBMP_TOOLBOX "SFX2_HID_USERDEFBMP_TOOLBOX" -#define HID_WARNING_SECURITY_HYPERLINK (HID_SFX_START + 306) -#define HID_FILEDLG_EXPORTASPDF (HID_SFX_START + 307) -#define HID_USERDEFBMP_TOOLBOX (HID_SFX_START + 308) +#define HID_CONFIG_LOAD "SFX2_HID_CONFIG_LOAD" +#define HID_CONFIG_SAVE "SFX2_HID_CONFIG_SAVE" -#define HID_CONFIG_LOAD (HID_SFX_START + 309) -#define HID_CONFIG_SAVE (HID_SFX_START + 310) +#define HID_SEARCHDIALOG "SFX2_HID_SEARCHDIALOG" -#define HID_SEARCHDIALOG (HID_SFX_START + 311) +#define HID_XMLSEC_WARNING_BROKENSIGNATURE "SFX2_HID_XMLSEC_WARNING_BROKENSIGNATURE" +#define HID_XMLSEC_QUERY_LOSINGSIGNATURE "SFX2_HID_XMLSEC_QUERY_LOSINGSIGNATURE" +#define HID_XMLSEC_QUERY_SAVEBEFORESIGN "SFX2_HID_XMLSEC_QUERY_SAVEBEFORESIGN" +#define HID_XMLSECDLG_MACROWARN "SFX2_HID_XMLSECDLG_MACROWARN" +#define HID_XMLSEC_INFO_WRONGDOCFORMAT "SFX2_HID_XMLSEC_INFO_WRONGDOCFORMAT" +#define HID_WARNING_MACROSDISABLED "SFX2_HID_WARNING_MACROSDISABLED" +#define HID_WARNING_ALIENFORMAT "SFX2_HID_WARNING_ALIENFORMAT" +#define HID_HELP_ONSTARTUP_BOX "SFX2_HID_HELP_ONSTARTUP_BOX" +#define HID_DLG_CHECKFORONLINEUPDATE "SFX2_HID_DLG_CHECKFORONLINEUPDATE" +#define HID_TP_CUSTOMPROPERTIES "SFX2_HID_TP_CUSTOMPROPERTIES" +#define HID_CTRL_CUSTOMPROPERTIES "SFX2_HID_CTRL_CUSTOMPROPERTIES" +#define HID_CTRL_CUSTOMPROPS_YES_NO "SFX2_HID_CTRL_CUSTOMPROPS_YES_NO" +#define HID_DLG_CUSTOMPROPS_DURATION "SFX2_HID_DLG_CUSTOMPROPS_DURATION" -#define HID_XMLSEC_WARNING_BROKENSIGNATURE (HID_SFX_START + 314) -#define HID_XMLSEC_QUERY_LOSINGSIGNATURE (HID_SFX_START + 315) -#define HID_XMLSEC_QUERY_SAVEBEFORESIGN (HID_SFX_START + 316) -#define HID_XMLSECDLG_MACROWARN (HID_SFX_START + 317) -#define HID_XMLSEC_INFO_WRONGDOCFORMAT (HID_SFX_START + 318) -#define HID_WARNING_MACROSDISABLED (HID_SFX_START + 319) -#define HID_WARNING_ALIENFORMAT (HID_SFX_START + 320) -#define HID_HELP_ONSTARTUP_BOX (HID_SFX_START + 321) -#define HID_DLG_CHECKFORONLINEUPDATE (HID_SFX_START + 322) -#define HID_TP_CUSTOMPROPERTIES (HID_SFX_START + 324) -#define HID_CTRL_CUSTOMPROPERTIES (HID_SFX_START + 325) -#define HID_CTRL_CUSTOMPROPS_YES_NO (HID_SFX_START + 326) -#define HID_DLG_CUSTOMPROPS_DURATION (HID_SFX_START + 327) +#define HID_HELP_ONHELP "SFX2_HID_HELP_ONHELP" -#define ACT_SFX_HID_END HID_DLG_CUSTOMPROPS_DURATION - -// "Uberlaufpr"ufung -------------------------------------------------------- - -#if ACT_SFX_HID_END > HID_SFX_END -#error Resource-Ueberlauf in #line, #file -#endif - -#define HID_HELP_ONHELP 68245 +#define HID_QUERY_LOAD_TEMPLATE "SFX2_HID_QUERY_LOAD_TEMPLATE" #endif // #ifndef _SFX_HELPID_HRC diff --git a/sfx2/source/menu/menu.src b/sfx2/source/menu/menu.src index 97c9c7f640fa..0f9501e8502a 100644 --- a/sfx2/source/menu/menu.src +++ b/sfx2/source/menu/menu.src @@ -26,6 +26,7 @@ ************************************************************************/ #include "menu.hrc" +#include String STR_MENU_CFGITEM { @@ -44,19 +45,19 @@ Menu MN_CLIPBOARDFUNCS MenuItem { Identifier = SID_CUT ; - HelpID = SID_CUT ; + HelpID = CMD_SID_CUT ; Text [ en-US ] = "Cu~t" ; }; MenuItem { Identifier = SID_COPY ; - HelpID = SID_COPY ; + HelpID = CMD_SID_COPY ; Text [ en-US ] = "~Copy" ; }; MenuItem { Identifier = SID_PASTE ; - HelpID = SID_PASTE ; + HelpID = CMD_SID_PASTE ; Text [ en-US ] = "~Paste" ; }; }; diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 9137abd04764..c76f47345979 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -160,8 +160,6 @@ void InsertVerbs_Impl( SfxBindings* pBindings, const com::sun::star::uno::Sequen // einf"ugen pMenu->InsertItem( nId, aVerbs[n].VerbName ); - // FIXME: HELPID - pMenu->SetHelpId( nId, ""/*(ULONG) nId*/ ); } } } @@ -376,11 +374,10 @@ void SfxPopupMenuManager::InsertSeparator( USHORT nPos ) //------------------------------------------------------------------------- -void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, USHORT nPos ) +void SfxPopupMenuManager::InsertItem( USHORT nId, const String& rName, MenuItemBits nBits, const rtl::OString& rHelpId, USHORT nPos ) { pSVMenu->InsertItem( nId, rName, nBits,nPos ); - // FIXME: HELPID - pSVMenu->SetHelpId( nId, ""/*(ULONG) nId*/ ); + pSVMenu->SetHelpId( nId, rHelpId ); } //------------------------------------------------------------------------- diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index e3d694eae747..48ff6a3948c5 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -345,7 +345,9 @@ void SfxVirtualMenu::CreateFromSVMenu() DBG_CHKTHIS(SfxVirtualMenu, 0); // Merge Addon popup menus into the SV Menu - Reference< com::sun::star::frame::XFrame > xFrame( pBindings->GetDispatcher()->GetFrame()->GetFrame().GetFrameInterface() ); + SfxViewFrame* pViewFrame = pBindings->GetDispatcher()->GetFrame(); + SfxSlotPool* pSlotPool = pViewFrame->GetObjectShell()->GetModule()->GetSlotPool(); + Reference< com::sun::star::frame::XFrame > xFrame( pViewFrame->GetFrame().GetFrameInterface() ); if ( pSVMenu->IsMenuBar() ) { @@ -448,24 +450,14 @@ void SfxVirtualMenu::CreateFromSVMenu() } else { -/* - if ( nSlotId >= SID_SFX_START && !SfxMenuManager::IsPopupFunction(nSlotId) ) + const SfxSlot* pSlot = pSlotPool->GetSlot( nSlotId ); + if ( pSlot ) { - // Echte Popups sollen keine SlotIds haben; leider sind - // da noch Altlasten mit herumzuschleppen ... - String aTitle = pSVMenu->GetItemText( nSlotId ); - pSVMenu->SetPopupMenu( nSlotId, NULL ); - USHORT nPos = pSVMenu->GetItemPos( nSlotId ); - pSVMenu->RemoveItem( nPos ); - nSlotId = 1; - while ( pSVMenu->GetItemPos(nSlotId) != MENU_ITEM_NOTFOUND ) - nSlotId++; - pSVMenu->InsertItem( nSlotId, aTitle, 0, nPos ); - pSVMenu->SetPopupMenu( nSlotId, pPopup ); + rtl::OString aCmd(".uno:"); + aCmd += pSlot->GetUnoName(); + pSVMenu->SetHelpId( nSlotId, pSlot->GetUnoName() ); } -*/ - // FIXME: HELPID - pSVMenu->SetHelpId( nSlotId, ""/*0L*/ ); + pMnuCtrl = pItems+nPos; // normalerweise jetzt erst im Activate-Handler diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index defccd4e23be..9b5fbd2d5d4e 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -132,7 +132,12 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( { USHORT nSlotId = pSlot->GetSlotId(); if ( nSlotId > 0 ) + { + rtl::OString aCmd(".uno:"); + aCmd += pSlot->GetUnoName(); return SfxStatusBarControl::CreateControl( nSlotId, nID, pStatusBar, pModule ); + pStatusBar->SetHelpId( nSlotId, aCmd ); + } } return NULL; diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index fc26d0077161..f5b38d5a8a18 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -1520,8 +1520,7 @@ SfxAppToolBoxControl_Impl::SfxAppToolBoxControl_Impl( USHORT nSlotId, USHORT nId , bBigImages( FALSE ) , pMenu( 0 ) { - // FIXME: HELPID - rBox.SetHelpId( nId, ""/*HID_TBXCONTROL_FILENEW*/ ); + rBox.SetHelpId( nId, HID_TBXCONTROL_FILENEW ); rBox.SetItemBits( nId, rBox.GetItemBits( nId ) | TIB_DROPDOWN); // Determine the current background color of the menus diff --git a/sfx2/source/view/frame2.cxx b/sfx2/source/view/frame2.cxx index fea860f6a3ff..ef2574c0d574 100644 --- a/sfx2/source/view/frame2.cxx +++ b/sfx2/source/view/frame2.cxx @@ -127,16 +127,15 @@ long SfxFrameWindow_Impl::Notify( NotifyEvent& rNEvt ) // TODO/LATER: do we still need this code? Window* pWindow = rNEvt.GetWindow(); - ULONG nHelpId = 0; - while ( !nHelpId && pWindow ) + rtl::OString sHelpId; + while ( !sHelpId.getLength() && pWindow ) { - // FIXME: HELPID - // nHelpId = pWindow->GetHelpId(); + sHelpId = pWindow->GetHelpId(); pWindow = pWindow->GetParent(); } - if ( nHelpId ) - SfxHelp::OpenHelpAgent( pFrame, nHelpId ); + if ( sHelpId.getLength() ) + SfxHelp::OpenHelpAgent( pFrame, sHelpId ); // if focus was on an external window, the clipboard content might have been changed pView->GetBindings().Invalidate( SID_PASTE ); diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index ab9aa9f8ce1b..6c4787cd1fbc 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -30,88 +30,68 @@ // include ----------------------------------------------------------- #include -// in solar.hrc -//#define HID_FORMS_START (HID_LIB_START+4000) -//#define HID_FORMS_END (HID_LIB_START+4999) - // Help-Ids -------------------------------------------------------------- -#define HID_DLG_DBMSG ( HID_FORMS_START + 1) -#define HID_FORM_NAVIGATOR ( HID_FORMS_START + 2) -#define HID_FORM_NAVIGATOR_WIN ( HID_FORMS_START + 3) -#define HID_FIELD_SEL ( HID_FORMS_START + 4) -#define HID_FIELD_SEL_WIN ( HID_FORMS_START + 5) -#define HID_FILTER_NAVIGATOR ( HID_FORMS_START + 6) -#define HID_FILTER_NAVIGATOR_WIN ( HID_FORMS_START + 7) -#define HID_FM_DLG_SEARCH ( HID_FORMS_START + 8) -#define HID_SEARCH_TEXT ( HID_FORMS_START + 9) -#define HID_SEARCH_ALLFIELDS ( HID_FORMS_START + 10) -//#define HID_SEARCH_SINGLEFIELD ( HID_FORMS_START + 11) -#define HID_SEARCH_FIELDSELECTION ( HID_FORMS_START + 12) -#define HID_SEARCH_POSITION ( HID_FORMS_START + 13) -#define HID_SEARCH_FORMATTER ( HID_FORMS_START + 14) -#define HID_SEARCH_CASE ( HID_FORMS_START + 15) -#define HID_SEARCH_BACKWARD ( HID_FORMS_START + 16) -#define HID_SEARCH_STARTOVER ( HID_FORMS_START + 17) -#define HID_SEARCH_WILDCARD ( HID_FORMS_START + 18) -#define HID_SEARCH_REGULAR ( HID_FORMS_START + 19) -#define HID_SEARCH_APPROX ( HID_FORMS_START + 20) -#define HID_SEARCH_APPROXSETTINGS ( HID_FORMS_START + 21) -#define HID_SEARCH_BTN_SEARCH ( HID_FORMS_START + 22) -#define HID_SEARCH_BTN_CLOSE ( HID_FORMS_START + 23) -#define HID_CONTROLS_DATE_N_TIME ( HID_FORMS_START + 24) -#define HID_GRID_TRAVEL_FIRST ( HID_FORMS_START + 25) -#define HID_GRID_TRAVEL_PREV ( HID_FORMS_START + 26) -#define HID_GRID_TRAVEL_NEXT ( HID_FORMS_START + 27) -#define HID_GRID_TRAVEL_LAST ( HID_FORMS_START + 28) -#define HID_GRID_TRAVEL_NEW ( HID_FORMS_START + 29) -#define HID_GRID_TRAVEL_ABSOLUTE ( HID_FORMS_START + 30) -#define HID_GRID_NUMBEROFRECORDS ( HID_FORMS_START + 31) -#define UID_SEARCH_RECORDSTATUS ( HID_FORMS_START + 32) -#define UID_FORMPROPBROWSER_FRAME ( HID_FORMS_START + 33) -#define UID_ABSOLUTE_RECORD_WINDOW ( HID_FORMS_START + 34) -#define HID_DATA_NAVIGATOR_WIN ( HID_FORMS_START + 35) -#define HID_XFORMS_ADDDATAITEM_DLG ( HID_FORMS_START + 36) -#define HID_XFORMS_ADDCONDITION_DLG ( HID_FORMS_START + 37) -#define HID_XFORMS_NAMESPACEITEM_DLG ( HID_FORMS_START + 38) -#define HID_XFORMS_NAMESPACEITEM_LIST ( HID_FORMS_START + 39) -#define HID_XFORMS_MANAGENAMESPACE_DLG ( HID_FORMS_START + 40) -//#define HID_TP_XFORMS_INSTANCE ( HID_FORMS_START + 41) -//#define HID_TP_XFORMS_SUBMISSION ( HID_FORMS_START + 42) -//#define HID_TP_XFORMS_BINDING ( HID_FORMS_START + 43) -#define HID_MN_XFORMS_MODELS_ADD ( HID_FORMS_START + 44) -#define HID_MN_XFORMS_MODELS_EDIT ( HID_FORMS_START + 45) -#define HID_MN_XFORMS_MODELS_REMOVE ( HID_FORMS_START + 46) -#define HID_MN_XFORMS_INSTANCES_ADD ( HID_FORMS_START + 47) -#define HID_MN_XFORMS_INSTANCES_EDIT ( HID_FORMS_START + 48) -#define HID_MN_XFORMS_INSTANCES_REMOVE ( HID_FORMS_START + 49) -#define HID_MN_XFORMS_SHOW_DETAILS ( HID_FORMS_START + 50) -#define HID_XFORMS_TOOLBOX ( HID_FORMS_START + 51) -#define HID_XFORMS_TOOLBOX_ITEM_ADD ( HID_FORMS_START + 52) -#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT ( HID_FORMS_START + 53) -#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE ( HID_FORMS_START + 54) -#define HID_XFORMS_TOOLBOX_ITEM_EDIT ( HID_FORMS_START + 55) -#define HID_XFORMS_TOOLBOX_ITEM_REMOVE ( HID_FORMS_START + 56) -#define HID_XFORMS_ITEMS_LIST ( HID_FORMS_START + 57) -#define HID_XFORMS_MODELS_LIST ( HID_FORMS_START + 58) -#define HID_XFORMS_MODELS_MENUBTN ( HID_FORMS_START + 59) -#define HID_XFORMS_INSTANCES_MENUBTN ( HID_FORMS_START + 60) -#define HID_XFORMS_ADDSUBMISSION_DLG ( HID_FORMS_START + 61) -#define HID_XFORMS_ADDMODEL_DLG ( HID_FORMS_START + 62) -#define HID_XFORMS_ADDINSTANCE_DLG ( HID_FORMS_START + 63) -#define HID_XFORMS_MID_INSERT_CONTROL ( HID_FORMS_START + 64) -#define HID_XFORMS_TAB_CONTROL ( HID_FORMS_START + 65) - // if you add a new define here, please adjust the overflow check - // at the end of the file!! - -// ----------------------------------------------------------------------- -// "Uberlaufpr"ufung ----------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_FM_HID_END HID_XFORMS_TAB_CONTROL - -#if ACT_FM_HID_END > HID_FORMS_END -#error Resource-Ueberlauf in #line, #file -#endif +#define HID_DLG_DBMSG "SVX_HID_DLG_DBMSG" +#define HID_FORM_NAVIGATOR "SVX_HID_FORM_NAVIGATOR" +#define HID_FORM_NAVIGATOR_WIN "SVX_HID_FORM_NAVIGATOR_WIN" +#define HID_FIELD_SEL "SVX_HID_FIELD_SEL" +#define HID_FIELD_SEL_WIN "SVX_HID_FIELD_SEL_WIN" +#define HID_FILTER_NAVIGATOR "SVX_HID_FILTER_NAVIGATOR" +#define HID_FILTER_NAVIGATOR_WIN "SVX_HID_FILTER_NAVIGATOR_WIN" +#define HID_FM_DLG_SEARCH "SVX_HID_FM_DLG_SEARCH" +#define HID_SEARCH_TEXT "SVX_HID_SEARCH_TEXT" +#define HID_SEARCH_ALLFIELDS "SVX_HID_SEARCH_ALLFIELDS" +#define HID_SEARCH_FIELDSELECTION "SVX_HID_SEARCH_FIELDSELECTION" +#define HID_SEARCH_POSITION "SVX_HID_SEARCH_POSITION" +#define HID_SEARCH_FORMATTER "SVX_HID_SEARCH_FORMATTER" +#define HID_SEARCH_CASE "SVX_HID_SEARCH_CASE" +#define HID_SEARCH_BACKWARD "SVX_HID_SEARCH_BACKWARD" +#define HID_SEARCH_STARTOVER "SVX_HID_SEARCH_STARTOVER" +#define HID_SEARCH_WILDCARD "SVX_HID_SEARCH_WILDCARD" +#define HID_SEARCH_REGULAR "SVX_HID_SEARCH_REGULAR" +#define HID_SEARCH_APPROX "SVX_HID_SEARCH_APPROX" +#define HID_SEARCH_APPROXSETTINGS "SVX_HID_SEARCH_APPROXSETTINGS" +#define HID_SEARCH_BTN_SEARCH "SVX_HID_SEARCH_BTN_SEARCH" +#define HID_SEARCH_BTN_CLOSE "SVX_HID_SEARCH_BTN_CLOSE" +#define HID_CONTROLS_DATE_N_TIME "SVX_HID_CONTROLS_DATE_N_TIME" +#define HID_GRID_TRAVEL_FIRST "SVX_HID_GRID_TRAVEL_FIRST" +#define HID_GRID_TRAVEL_PREV "SVX_HID_GRID_TRAVEL_PREV" +#define HID_GRID_TRAVEL_NEXT "SVX_HID_GRID_TRAVEL_NEXT" +#define HID_GRID_TRAVEL_LAST "SVX_HID_GRID_TRAVEL_LAST" +#define HID_GRID_TRAVEL_NEW "SVX_HID_GRID_TRAVEL_NEW" +#define HID_GRID_TRAVEL_ABSOLUTE "SVX_HID_GRID_TRAVEL_ABSOLUTE" +#define HID_GRID_NUMBEROFRECORDS "SVX_HID_GRID_NUMBEROFRECORDS" +#define UID_SEARCH_RECORDSTATUS "SVX_UID_SEARCH_RECORDSTATUS" +#define UID_FORMPROPBROWSER_FRAME "SVX_UID_FORMPROPBROWSER_FRAME" +#define UID_ABSOLUTE_RECORD_WINDOW "SVX_UID_ABSOLUTE_RECORD_WINDOW" +#define HID_DATA_NAVIGATOR_WIN "SVX_HID_DATA_NAVIGATOR_WIN" +#define HID_XFORMS_ADDDATAITEM_DLG "SVX_HID_XFORMS_ADDDATAITEM_DLG" +#define HID_XFORMS_ADDCONDITION_DLG "SVX_HID_XFORMS_ADDCONDITION_DLG" +#define HID_XFORMS_NAMESPACEITEM_DLG "SVX_HID_XFORMS_NAMESPACEITEM_DLG" +#define HID_XFORMS_NAMESPACEITEM_LIST "SVX_HID_XFORMS_NAMESPACEITEM_LIST" +#define HID_XFORMS_MANAGENAMESPACE_DLG "SVX_HID_XFORMS_MANAGENAMESPACE_DLG" +#define HID_MN_XFORMS_MODELS_ADD "SVX_HID_MN_XFORMS_MODELS_ADD" +#define HID_MN_XFORMS_MODELS_EDIT "SVX_HID_MN_XFORMS_MODELS_EDIT" +#define HID_MN_XFORMS_MODELS_REMOVE "SVX_HID_MN_XFORMS_MODELS_REMOVE" +#define HID_MN_XFORMS_INSTANCES_ADD "SVX_HID_MN_XFORMS_INSTANCES_ADD" +#define HID_MN_XFORMS_INSTANCES_EDIT "SVX_HID_MN_XFORMS_INSTANCES_EDIT" +#define HID_MN_XFORMS_INSTANCES_REMOVE "SVX_HID_MN_XFORMS_INSTANCES_REMOVE" +#define HID_MN_XFORMS_SHOW_DETAILS "SVX_HID_MN_XFORMS_SHOW_DETAILS" +#define HID_XFORMS_TOOLBOX "SVX_HID_XFORMS_TOOLBOX" +#define HID_XFORMS_TOOLBOX_ITEM_ADD "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD" +#define HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT" +#define HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE "SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE" +#define HID_XFORMS_TOOLBOX_ITEM_EDIT "SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT" +#define HID_XFORMS_TOOLBOX_ITEM_REMOVE "SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE" +#define HID_XFORMS_ITEMS_LIST "SVX_HID_XFORMS_ITEMS_LIST" +#define HID_XFORMS_MODELS_LIST "SVX_HID_XFORMS_MODELS_LIST" +#define HID_XFORMS_MODELS_MENUBTN "SVX_HID_XFORMS_MODELS_MENUBTN" +#define HID_XFORMS_INSTANCES_MENUBTN "SVX_HID_XFORMS_INSTANCES_MENUBTN" +#define HID_XFORMS_ADDSUBMISSION_DLG "SVX_HID_XFORMS_ADDSUBMISSION_DLG" +#define HID_XFORMS_ADDMODEL_DLG "SVX_HID_XFORMS_ADDMODEL_DLG" +#define HID_XFORMS_ADDINSTANCE_DLG "SVX_HID_XFORMS_ADDINSTANCE_DLG" +#define HID_XFORMS_MID_INSERT_CONTROL "SVX_HID_XFORMS_MID_INSERT_CONTROL" +#define HID_XFORMS_TAB_CONTROL "SVX_HID_XFORMS_TAB_CONTROL" #endif diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index e328a39a0707..252bdc69623e 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -38,288 +38,242 @@ #define ITEM_FORM_CONTROL_PROPERTIES\ Identifier = SID_FM_CTL_PROPERTIES ; \ Command = ".uno:ControlProperties" ; \ - HelpID = SID_FM_CTL_PROPERTIES ; \ Text [ en-US ] = "Con~trol..." ; \ #define ITEM_FORM_PROPERTIES\ Identifier = SID_FM_PROPERTIES ; \ Command = ".uno:FormProperties" ; \ - HelpID = SID_FM_PROPERTIES ; \ Text [ en-US ] = "For~m..." ; \ #define ITEM_REPLACE_CONTROL\ Identifier = SID_FM_CHANGECONTROLTYPE ;\ Command = ".uno:ChangeControlType" ; \ - HelpID = SID_FM_CHANGECONTROLTYPE ; \ Text [ en-US ] = "~Replace with"; \ #define ITEM_FORMAT_TEMPLATECATALOG \ Identifier = SID_STYLE_CATALOG ; \ Command = ".uno:StyleCatalog" ; \ - HelpID = SID_STYLE_CATALOG ; \ Text [ en-US ] = "~Catalog..." ; \ #define ITEM_FORMAT_TEMPLATE \ Identifier = SID_STYLE_DESIGNER ; \ Command = ".uno:DesignerDialog" ; \ - HelpID = SID_STYLE_DESIGNER ; \ Text [ en-US ] = "St~ylist" ; \ #define ITEM_FORMAT_AUTOFORMAT \ Identifier = SID_AUTOFORMAT ; \ Command = ".uno:AutoFormat" ; \ - HelpID = SID_AUTOFORMAT ; \ Text [ en-US ] = "Auto~Format..." ;\ #define ITEM_FORMAT_CHAR_DLG \ Identifier = SID_CHAR_DLG ; \ Command = ".uno:FontDialog" ; \ - HelpID = SID_CHAR_DLG ; \ Text [ en-US ] = "C~haracter..." ;\ #define ITEM_FORMAT_PARA_DLG \ Identifier = SID_PARA_DLG ; \ Command = ".uno:ParagraphDialog" ; \ - HelpID = SID_PARA_DLG ; \ Text [ en-US ] = "P~aragraph..." ;\ #define ITEM_FORMAT_FONTWORK \ Identifier = SID_FONTWORK ; \ Command = ".uno:FontWork" ; \ - HelpID = SID_FONTWORK ; \ Text [ en-US ] = "F~ontwork" ;\ #define ITEM_EDIT_CUT \ Identifier = SID_CUT ; \ Command = ".uno:Cut" ; \ - HelpID = SID_CUT ; \ Text [ en-US ] = "Cu~t" ;\ #define ITEM_EDIT_COPY \ Identifier = SID_COPY ; \ Command = ".uno:Copy" ; \ - HelpID = SID_COPY ; \ Text [ en-US ] = "~Copy" ;\ #define ITEM_EDIT_DELETE \ Identifier = SID_DELETE ; \ Command = ".uno:Delete" ; \ - HelpID = SID_DELETE ; \ Text [ en-US ] = "~Delete" ;\ #define ITEM_FORMAT_ATTR_CHAR_FONT \ Identifier = SID_ATTR_CHAR_FONT ; \ Command = ".uno:CharFontName" ; \ - HelpID = SID_ATTR_CHAR_FONT ; \ Text [ en-US ] = "Font" ;\ #define ITEM_FORMAT_ATTR_CHAR_FONTHEIGHT \ Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \ Command = ".uno:FontHeight" ; \ - HelpID = SID_ATTR_CHAR_FONTHEIGHT ; \ Text [ en-US ] = "Size" ;\ #define ITEM_FORMAT_ATTR_CHAR_WEIGHT \ Identifier = SID_ATTR_CHAR_WEIGHT ; \ Command = ".uno:Bold" ; \ - HelpID = SID_ATTR_CHAR_WEIGHT ; \ Text [ en-US ] = "Bold" ; \ #define ITEM_FORMAT_ATTR_CHAR_POSTURE \ Identifier = SID_ATTR_CHAR_POSTURE ; \ Command = ".uno:Italic" ; \ - HelpID = SID_ATTR_CHAR_POSTURE ; \ Text [ en-US ] = "Italic" ;\ #define ITEM_FORMAT_ATTR_CHAR_UNDERLINE \ Identifier = SID_ATTR_CHAR_UNDERLINE ; \ Command = ".uno:Underline" ; \ - HelpID = SID_ATTR_CHAR_UNDERLINE ; \ Text [ en-US ] = "Underline" ;\ #define ITEM_FORMAT_ATTR_CHAR_OVERLINE \ Identifier = SID_ATTR_CHAR_OVERLINE ; \ Command = ".uno:Overline" ; \ - HelpID = SID_ATTR_CHAR_OVERLINE ; \ Text [ en-US ] = "Overline" ;\ #define ITEM_FORMAT_ATTR_CHAR_STRIKEOUT \ Identifier = SID_ATTR_CHAR_STRIKEOUT ; \ Command = ".uno:Strikeout" ; \ - HelpID = SID_ATTR_CHAR_STRIKEOUT ; \ Text [ en-US ] = "Strikethrough" ;\ #define ITEM_FORMAT_ATTR_CHAR_SHADOWED \ Identifier = SID_ATTR_CHAR_SHADOWED ; \ Command = ".uno:Shadowed" ; \ - HelpID = SID_ATTR_CHAR_SHADOWED ; \ Text [ en-US ] = "Shadow" ;\ #define ITEM_FORMAT_ATTR_CHAR_CONTOUR \ Identifier = SID_ATTR_CHAR_CONTOUR ; \ Command = ".uno:OutlineFont" ; \ - HelpID = SID_ATTR_CHAR_CONTOUR ; \ Text [ en-US ] = "Outline" ;\ #define ITEM_FORMAT_SET_SUPER_SCRIPT \ Identifier = SID_SET_SUPER_SCRIPT; \ - HelpID = SID_SET_SUPER_SCRIPT; \ + Command = CMD_SID_SET_SUPER_SCRIPT; \ Text [ en-US ] = "Su~perscript"; \ #define ITEM_FORMAT_SET_SUB_SCRIPT \ Identifier = SID_SET_SUB_SCRIPT; \ - HelpID = SID_SET_SUB_SCRIPT; \ + Command = CMD_SID_SET_SUB_SCRIPT; \ Text [ en-US ] = "Su~bscript"; \ #define ITEM_FORMAT_ATTR_PARA_ADJUST_LEFT \ Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ Command = ".uno:LeftPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ Text [ en-US ] = "~Left" ;\ #define ITEM_FORMAT_ATTR_PARA_ADJUST_RIGHT \ Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \ Command = ".uno:RightPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ Text [ en-US ] = "~Right" ;\ #define ITEM_FORMAT_ATTR_PARA_ADJUST_CENTER \ Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \ Command = ".uno:CenterPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ Text [ en-US ] = "~Centered" ;\ #define ITEM_FORMAT_ATTR_PARA_ADJUST_BLOCK \ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ Command = ".uno:JustifyPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ Text [ en-US ] = "Justified" ;\ #define ITEM_FORMAT_PARA_LINESPACE_10 \ Identifier = SID_ATTR_PARA_LINESPACE_10 ; \ Command = ".uno:SpacePara1" ; \ - HelpID = SID_ATTR_PARA_LINESPACE_10 ; \ Text [ en-US ] = "Single" ;\ #define ITEM_FORMAT_PARA_LINESPACE_15 \ Identifier = SID_ATTR_PARA_LINESPACE_15 ; \ Command = ".uno:SpacePara15" ; \ - HelpID = SID_ATTR_PARA_LINESPACE_15 ; \ Text [ en-US ] = "1.5 lines" ;\ #define ITEM_FORMAT_PARA_LINESPACE_20 \ Identifier = SID_ATTR_PARA_LINESPACE_20 ; \ Command = ".uno:SpacePara2" ; \ - HelpID = SID_ATTR_PARA_LINESPACE_20 ; \ Text [ en-US ] = "~Double" ;\ #define ITEM_FORMAT_FRAME_TO_TOP \ Identifier = SID_FRAME_TO_TOP ; \ Command = ".uno:BringToFront" ; \ - HelpID = SID_FRAME_TO_TOP ; \ Text [ en-US ] = "~Bring to Front" ;\ #define ITEM_FORMAT_FRAME_TO_BOTTOM \ Identifier = SID_FRAME_TO_BOTTOM ; \ Command = ".uno:SendToBack" ; \ - HelpID = SID_FRAME_TO_BOTTOM ; \ Text [ en-US ] = "~Send to Back" ;\ #define ITEM_FORMAT_OBJECT_ALIGN \ Identifier = SID_OBJECT_ALIGN ; \ Command = ".uno:ObjectAlign" ; \ - HelpID = SID_OBJECT_ALIGN ; \ Text [ en-US ] = "A~lignment" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_LEFT \ Identifier = SID_OBJECT_ALIGN_LEFT ; \ Command = ".uno:ObjectAlignLeft" ; \ - HelpID = SID_OBJECT_ALIGN_LEFT ; \ Text [ en-US ] = "~Left" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_CENTER \ Identifier = SID_OBJECT_ALIGN_CENTER ; \ Command = ".uno:AlignCenter" ; \ - HelpID = SID_OBJECT_ALIGN_CENTER ; \ Text [ en-US ] = "~Centered" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_RIGHT \ Identifier = SID_OBJECT_ALIGN_RIGHT ; \ Command = ".uno:ObjectAlignRight" ; \ - HelpID = SID_OBJECT_ALIGN_RIGHT ; \ Text [ en-US ] = "~Right" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_UP \ Identifier = SID_OBJECT_ALIGN_UP ; \ Command = ".uno:AlignUp" ; \ - HelpID = SID_OBJECT_ALIGN_UP ; \ Text [ en-US ] = "~Top" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_MIDDLE \ Identifier = SID_OBJECT_ALIGN_MIDDLE ; \ Command = ".uno:AlignMiddle" ; \ - HelpID = SID_OBJECT_ALIGN_MIDDLE ; \ Text [ en-US ] = "C~enter" ;\ #define ITEM_FORMAT_OBJECT_ALIGN_DOWN \ Identifier = SID_OBJECT_ALIGN_DOWN ; \ Command = ".uno:AlignDown" ; \ - HelpID = SID_OBJECT_ALIGN_DOWN ; \ Text [ en-US ] = "~Bottom" ;\ #define ITEM_FORMAT_ATTRIBUTES_LINE \ Identifier = SID_ATTRIBUTES_LINE ; \ Command = ".uno:FormatLine" ; \ - HelpID = SID_ATTRIBUTES_LINE ; \ Text [ en-US ] = "L~ine..." ;\ #define ITEM_FORMAT_ATTRIBUTES_AREA \ Identifier = SID_ATTRIBUTES_AREA ; \ Command = ".uno:FormatArea" ; \ - HelpID = SID_ATTRIBUTES_AREA ; \ Text [ en-US ] = "A~rea..." ;\ #define ITEM_FORMAT_ATTR_TRANSFORM \ Identifier = SID_ATTR_TRANSFORM ; \ Command = ".uno:TransformDialog" ; \ - HelpID = SID_ATTR_TRANSFORM ; \ Text [ en-US ] = "Position and Si~ze..." ;\ #define ITEM_FORMAT_OBJECT_HEAVEN \ Identifier = SID_OBJECT_HEAVEN ; \ Command = ".uno:SetObjectToForeground" ; \ - HelpID = SID_OBJECT_HEAVEN ; \ Text [ en-US ] = "~To Foreground" ;\ #define ITEM_FORMAT_OBJECT_HELL \ Identifier = SID_OBJECT_HELL ; \ Command = ".uno:SetObjectToBackground" ; \ - HelpID = SID_OBJECT_HELL ; \ Text [ en-US ] = "T~o Background" ;\ #define ITEM_FORMAT_BEZIER_EDIT \ Identifier = SID_BEZIER_EDIT ; \ Command = ".uno:ToggleObjectBezierMode" ; \ - HelpID = SID_BEZIER_EDIT ; \ Text [ en-US ] = "Edit ~Points" ;\ #define ITEM_FILE_PICKLIST \ Identifier = SID_PICKLIST ; \ Command = ".uno:PickList" ; \ - HelpID = SID_PICKLIST ; \ Text [ en-US ] = "~File" ; \ #define ITEM_FILE_NEWDOC \ Identifier = SID_NEWDOCDIRECT ; \ Command = ".uno:AddDirect" ; \ - HelpID = SID_NEWDOCDIRECT ; \ Text [ en-US ] = "~New" ;\ #define ITEM_FILE_OPENDOC \ Identifier = SID_OPENDOC ; \ Command = ".uno:Open" ; \ - HelpID = SID_OPENDOC ; \ Text [ en-US ] = "~Open..." ;\ @@ -328,62 +282,52 @@ {\ Identifier = SID_AUTOPILOTMENU ; \ Command = ".uno:AutoPilotMenu" ; \ - HelpID = SID_AUTOPILOTMENU ; \ Text [ en-US ] = "A~utoPilot" ; \ }; #define ITEM_FILE_CLOSEDOC \ Identifier = SID_CLOSEDOC ; \ Command = ".uno:CloseDoc" ; \ - HelpID = SID_CLOSEDOC ; \ Text [ en-US ] = "~Close" ;\ #define ITEM_FILE_SAVEDOC \ Identifier = SID_SAVEDOC ; \ Command = ".uno:Save" ; \ - HelpID = SID_SAVEDOC ; \ Text [ en-US ] = "~Save" ; \ #define ITEM_FILE_SAVEDOCS \ Identifier = SID_SAVEDOCS ; \ Command = ".uno:SaveAll" ; \ - HelpID = SID_SAVEDOCS ; \ Text [ en-US ] = "Sa~ve All" ; \ #define ITEM_FILE_SAVEASDOC \ Identifier = SID_SAVEASDOC ; \ Command = ".uno:SaveAs" ; \ - HelpID = SID_SAVEASDOC ; \ Text [ en-US ] = "Save ~As..." ; \ #define ITEM_FILE_EXPORTDOC \ Identifier = SID_EXPORTDOC ; \ Command = ".uno:ExportTo" ; \ - HelpID = SID_EXPORTDOC ; \ Text [ en-US ] = "Expor~t..." ; \ #define ITEM_FILE_EXPORTDOCASPDF \ Identifier = SID_EXPORTDOCASPDF ; \ Command = ".uno:ExportToPDF" ; \ - HelpID = SID_EXPORTDOCASPDF ; \ Text [ en-US ] = "Export as P~DF..." ; \ #define ITEM_FILE_VERSIONDIALOG \ Identifier = SID_VERSION ; \ Command = ".uno:VersionDialog" ; \ - HelpID = SID_VERSION ; \ Text [ en-US ] = "Versions..." ; \ #define ITEM_FILE_LASTVERSIONDOC \ Identifier = SID_RELOAD ; \ Command = ".uno:Reload" ; \ - HelpID = SID_RELOAD ; \ Text [ en-US ] = "Reload" ;\ #define ITEM_FILE_DOCINFO \ Identifier = SID_DOCINFO ; \ Command = ".uno:SetDocumentProperties" ; \ - HelpID = SID_DOCINFO ; \ Text [ en-US ] = "Propert~ies..." ;\ #define ITEM_FILE_DOCTEMPLATE \ @@ -398,28 +342,24 @@ { \ Identifier = SID_ORGANIZER ; \ Command = ".uno:Organizer" ; \ - HelpId = SID_ORGANIZER ; \ Text [ en-US ] = "~Organize...";\ }; \ MenuItem \ { \ Identifier = SID_TEMPLATE_ADDRESSBOKSOURCE; \ Command = ".uno:AddressBookSource" ; \ - HelpId = SID_TEMPLATE_ADDRESSBOKSOURCE; \ Text [ en-US ] = "~Address Book Source..."; \ }; \ MenuItem \ { \ Identifier = SID_DOCTEMPLATE ; \ Command = ".uno:SaveAsTemplate" ; \ - HelpId = SID_DOCTEMPLATE ; \ Text [ en-US ] = "~Save...";\ }; \ MenuItem \ { \ Identifier = SID_OPENTEMPLATE ; \ Command = ".uno:OpenTemplate" ; \ - HelpId = SID_OPENTEMPLATE ; \ Text [ en-US ] = "~Edit...";\ }; \ }; \ @@ -428,164 +368,138 @@ #define ITEM_FILE_PRINTPREVIEW \ Identifier = SID_PRINTPREVIEW ; \ Command = ".uno:PrintPreview" ; \ - HelpID = SID_PRINTPREVIEW ; \ Text [ en-US ] = "Pa~ge Preview" ;\ #define ITEM_FILE_SETUPPRINTER \ Identifier = SID_SETUPPRINTER ; \ Command = ".uno:PrinterSetup" ; \ - HelpID = SID_SETUPPRINTER ; \ Text [ en-US ] = "P~rinter Settings..." ; \ #define ITEM_FILE_PRINTDOC \ Identifier = SID_PRINTDOC ; \ Command = ".uno:Print" ; \ - HelpID = SID_PRINTDOC ; \ Text [ en-US ] = "~Print..." ; \ #define ITEM_FILE_MAIL_SENDDOC \ Identifier = SID_MAIL_SENDDOC ; \ Command = ".uno:SendMail" ; \ - HelpID = SID_MAIL_SENDDOC ; \ Text [ en-US ] = "Document as ~E-mail..." ; \ #define ITEM_FILE_MAIL_SENDDOCASPDF \ Identifier = SID_MAIL_SENDDOCASPDF ; \ Command = ".uno:SendMailDocAsPDF" ; \ - HelpID = SID_MAIL_SENDDOCASPDF ; \ Text [ en-US ] = "Document as P~DF Attachment..." ; \ #define ITEM_FILE_QUITAPP \ Identifier = SID_QUITAPP ; \ Command = ".uno:Quit" ; \ - HelpID = SID_QUITAPP ; \ Text [ en-US ] = "E~xit" ; \ #define ITEM_FILE_LOGOUT \ Identifier = SID_LOGOUT ; \ Command = ".uno:Logout" ; \ - HelpID = SID_LOGOUT ; \ Text [ en-US ] = "Logout" ; \ #define ITEM_EDIT_UNDO \ Identifier = SID_UNDO ; \ Command = ".uno:UndoAction" ; \ - HelpID = SID_UNDO ; \ Text [ en-US ] = "Can't Undo" ; \ #define ITEM_EDIT_REDO \ Identifier = SID_REDO ; \ Command = ".uno:Redo" ; \ - HelpID = SID_REDO ; \ Text [ en-US ] = "Can't Restore" ; \ #define ITEM_EDIT_REPEAT \ Identifier = SID_REPEAT ; \ Command = ".uno:Repeat" ; \ - HelpID = SID_REPEAT ; \ Text [ en-US ] = "~Repeat" ; \ #define ITEM_EDIT_PASTE \ Identifier = SID_PASTE ; \ Command = ".uno:Paste" ; \ - HelpID = SID_PASTE ; \ Text [ en-US ] = "~Paste" ; \ #define ITEM_EDIT_SELECTALL \ Identifier = SID_SELECTALL ; \ Command = ".uno:SelectAll" ; \ - HelpID = SID_SELECTALL ; \ Text [ en-US ] = "Select ~All" ; \ #define ITEM_EDIT_SEARCH_DLG \ Identifier = SID_SEARCH_DLG ; \ Command = ".uno:SearchDialog" ; \ - HelpID = SID_SEARCH_DLG ; \ Text [ en-US ] = "~Find & Replace..." ; \ #define ITEM_EDIT_NAVIGATOR \ Identifier = SID_NAVIGATOR ; \ Command = ".uno:Navigator" ; \ - HelpID = SID_NAVIGATOR ; \ Text [ en-US ] = "~Navigator" ; \ #define ITEM_EDIT_BIBLIOGRAPHY \ Identifier = SID_COMP_BIBLIOGRAPHY ; \ Command = ".uno:BibliographyComponent" ; \ - HelpID = SID_COMP_BIBLIOGRAPHY ; \ Text [ en-US ] = "~Bibliography Database"; \ #define ITEM_EDIT_PLUGINS_ACTIVE \ Identifier = SID_PLUGINS_ACTIVE ; \ Command = ".uno:PlugInsActive" ; \ - HelpID = SID_PLUGINS_ACTIVE ; \ Text [ en-US ] = "P~lug-in" ; \ #define ITEM_EDIT_IMAP \ Identifier = SID_IMAP ; \ Command = ".uno:ImageMapDialog" ; \ - HelpID = SID_IMAP ; \ Text [ en-US ] = "ImageMap" ; \ #define ITEM_EDIT_OBJECT \ Identifier = SID_OBJECT ; \ Command = ".uno:ObjectMenue" ; \ - HelpID = SID_OBJECT ; \ Text [ en-US ] = "~Object" ; \ #define ITEM_VIEW_ATTR_ZOOM \ Identifier = SID_ATTR_ZOOM ; \ Command = ".uno:Zoom" ; \ - HelpID = SID_ATTR_ZOOM ; \ Text [ en-US ] = "~Zoom..." ; \ #define ITEM_VIEW_TOGGLEFUNCTIONBAR \ Identifier = SID_TOGGLEFUNCTIONBAR ; \ Command = ".uno:FunctionBarVisible" ; \ - HelpID = SID_TOGGLEFUNCTIONBAR ; \ Text [ en-US ] = "~Function Bar" ; \ #define ITEM_VIEW_TOGGLEOBJECTBAR \ Identifier = SID_TOGGLEOBJECTBAR ; \ Command = ".uno:ObjectBarVisible" ; \ - HelpID = SID_TOGGLEOBJECTBAR ; \ Text [ en-US ] = "~Object Bar" ; \ #define ITEM_VIEW_TOGGLEINETBAR \ Identifier = SID_TOGGLEINETBAR ; \ - HelpID = SID_TOGGLEINETBAR ; \ + Command = CMD_SID_TOGGLEINETBAR; \ Text [ en-US ] = "Internet Bar" ; \ #define ITEM_VIEW_TOGGLESTATUSBAR \ Identifier = SID_TOGGLESTATUSBAR ; \ Command = ".uno:StatusBarVisible" ; \ - HelpID = SID_TOGGLESTATUSBAR ; \ Text [ en-US ] = "~Status Bar" ; \ #define ITEM_VIEW_TOGGLEIMESTATUSWINDOW \ Identifier = SID_SHOW_IME_STATUS_WINDOW ; \ Command = ".uno:ShowImeStatusWindow" ; \ - HelpID = SID_SHOW_IME_STATUS_WINDOW ; \ Text [ en-US ] = "~Input Method Status"; \ #define ITEM_VIEW_TASKBAR \ Identifier = SID_TASKBAR ; \ Command = ".uno:TaskBarVisible" ; \ - HelpID = SID_TASKBAR ; \ Text [ en-US ] = "~Status Bar" ; \ #define ITEM_VIEW_COLORBAR \ Identifier = SID_COLOR_CONTROL ; \ Command = ".uno:ColorControl" ; \ - HelpID = SID_COLOR_CONTROL ; \ Text [ en-US ] = "~Color Bar" ; \ #define ITEM_VIEW_FULLSCREEN \ Identifier = SID_WIN_FULLSCREEN ; \ Command = ".uno:FullScreen" ; \ - HelpID = SID_WIN_FULLSCREEN ; \ Text [ en-US ] = "F~ull Screen" ; \ @@ -598,26 +512,22 @@ #define ITEM_VIEW_BROWSER_MODE \ Identifier = SID_BROWSER_MODE ; \ Command = ".uno:BrowseView" ; \ - HelpID = SID_BROWSER_MODE ; \ Text [ en-US ] = "~Online Layout" ; \ #define ITEM_VIEW_BROWSER \ Identifier = SID_BROWSER ; \ Command = ".uno:Beamer" ; \ - HelpID = SID_BROWSER ; \ Text [ en-US ] = "~Beamer" ; \ #define ITEM_INSERT_HYPERLINK_INSERT \ Identifier = SID_HYPERLINK_INSERT ; \ Command = ".uno:InsertHyperlink" ; \ - HelpID = SID_HYPERLINK_INSERT ; \ Text [ en-US ] = "~Hyperlink Bar" ; \ #define ITEM_INSERT_INSERT_GRAPHIC \ Identifier = SID_INSERT_GRAPHIC ; \ Command = ".uno:InsertGraphic" ; \ - HelpID = SID_INSERT_GRAPHIC ; \ Text [ en-US ] = "~Graphics..." ; \ #define ITEM_INSERT_TWAIN_SELECT \ @@ -625,7 +535,6 @@ {\ Identifier = SID_TWAIN_SELECT ; \ Command = ".uno:TwainSelect" ; \ - HelpID = SID_TWAIN_SELECT ; \ Text [ en-US ] = "~Select Source..." ; \ }; @@ -634,7 +543,6 @@ {\ Identifier = SID_TWAIN_TRANSFER ; \ Command = ".uno:TwainTransfer" ; \ - HelpID = SID_TWAIN_TRANSFER ; \ Text [ en-US ] = "~Request..." ; \ }; @@ -643,7 +551,6 @@ {\ Identifier = SID_SCAN ; \ Command = ".uno:Scan" ; \ - HelpID = SID_SCAN ; \ Text [ en-US ] = "Scan" ; \ SubMenu = Menu\ {\ @@ -658,19 +565,16 @@ #define ITEM_INSERT_INSERT_DIAGRAM \ Identifier = SID_INSERT_DIAGRAM ; \ Command = ".uno:InsertObjectChart" ; \ - HelpID = SID_INSERT_DIAGRAM ; \ Text [ en-US ] = "~Chart..." ; \ #define ITEM_INSERT_GALLERY \ Identifier = SID_GALLERY ; \ Command = ".uno:Gallery" ; \ - HelpID = SID_GALLERY ; \ Text [ en-US ] = "~Gallery" ; \ #define ITEM_INSERT_INSERTDOC \ Identifier = SID_INSERTDOC ; \ Command = ".uno:InsertDoc" ; \ - HelpID = SID_INSERTDOC ; \ Text [ en-US ] = "~File..." ; \ #define TMP_SID_INSERT_PLUGIN \ @@ -678,7 +582,6 @@ {\ Identifier = SID_INSERT_PLUGIN ; \ Command = ".uno:InsertPlugin" ; \ - HelpID = SID_INSERT_PLUGIN ; \ Text [ en-US ] = "~Plug-in..." ; \ }; @@ -687,7 +590,6 @@ {\ Identifier = SID_INSERT_SOUND ; \ Command = ".uno:InsertSound" ; \ - HelpID = SID_INSERT_SOUND ; \ Text [ en-US ] = "~Sound..." ; \ }; @@ -696,7 +598,6 @@ {\ Identifier = SID_INSERT_VIDEO ; \ Command = ".uno:InsertVideo" ; \ - HelpID = SID_INSERT_VIDEO ; \ Text [ en-US ] = "~Video..." ; \ }; @@ -706,7 +607,6 @@ {\ Identifier = SID_INSERT_APPLET ; \ Command = ".uno:InsertApplet" ; \ - HelpID = SID_INSERT_APPLET ; \ Text [ en-US ] = "~Applet..." ; \ }; #else @@ -716,7 +616,6 @@ MenuItem\ {\ Identifier = SID_MN_INSERT_OBJECT_DLGS ; \ - HelpID = SID_MN_INSERT_OBJECT_DLGS ; \ Command = ".uno:ObjectMenu" ; \ Text [ en-US ] = "~Object" ; \ SubMenu = Menu\ @@ -727,7 +626,6 @@ {\ Identifier = SID_INSERT_OBJECT ; \ Command = ".uno:InsertObject" ; \ - HelpID = SID_INSERT_OBJECT ; \ Text [ en-US ] = "~OLE Object..." ; \ };\ TMP_SID_INSERT_PLUGIN\ @@ -738,7 +636,6 @@ {\ Identifier = SID_INSERT_MATH ; \ Command = ".uno:InsertMath" ; \ - HelpID = SID_INSERT_MATH ; \ Text [ en-US ] = "~Formula..." ; \ };\ };\ @@ -749,7 +646,6 @@ MenuItem\ {\ Identifier = SID_MN_INSERT_OBJECT_DLGS ; \ - HelpID = SID_MN_INSERT_OBJECT_DLGS ; \ Command = ".uno:ObjectMenu" ; \ Text [ en-US ] = "~Object" ; \ SubMenu = Menu\ @@ -760,14 +656,12 @@ {\ Identifier = SID_INSERT_OBJECT ; \ Command = ".uno:InsertObject" ; \ - HelpID = SID_INSERT_OBJECT ; \ Text [ en-US ] = "~OLE Object..." ; \ };\ MenuItem\ {\ Identifier = SID_INSERT_MATH ; \ Command = ".uno:InsertMath" ; \ - HelpID = SID_INSERT_MATH ; \ Text [ en-US ] = "~Formula" ; \ };\ };\ @@ -778,7 +672,6 @@ MenuItem\ {\ Identifier = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ - HelpID = DEFINE_SLOTID_FOR_NUMBER_BULLETS ; \ Text [ en-US ] = "~Numbering/Bullets..." ; \ }; @@ -786,7 +679,6 @@ #define ITEM_FORMAT \ Identifier = SID_OBJECTMENU0 ; \ - HelpID = SID_OBJECTMENU0 ; \ Command = ".uno:FormatMenu" ; \ Text [ en-US ] = "F~ormat" ; \ @@ -794,7 +686,6 @@ #define ITEM_TOOLS_MACROS \ Identifier = SID_SCRIPTORGANIZER ; \ - HelpId = SID_SCRIPTORGANIZER ; \ Command = ".uno:ScriptOrganizer" ; \ Text [ en-US ] = "Scripts/Macros" ; \ @@ -810,13 +701,11 @@ { \ Identifier = SID_RECORDMACRO ; \ Command = ".uno:MacroRecorder" ; \ - HelpId = SID_RECORDMACRO ; \ Text [ en-US ] = "Record Macro"; }; \ MenuItem \ { \ Identifier = SID_BASICCHOOSER ; \ Command = ".uno:MacroDialog" ; \ - HelpID = SID_BASICCHOOSER ; \ Text [ en-US ] = "~Macro..." ; \ }; \ }; \ @@ -829,7 +718,6 @@ #define ITEM_TOOLS_CONFIG \ Identifier = SID_CONFIG ; \ Command = ".uno:ConfigureDialog"; \ - HelpID = SID_CONFIG ; \ Text [ en-US ] = "~Configure..." ; \ @@ -838,7 +726,6 @@ {\ Identifier = SID_AUTO_CORRECT_DLG ; \ Command = ".uno:AutoCorrectDlg" ; \ - HelpID = SID_AUTO_CORRECT_DLG ; \ Text [ en-US ] = "~AutoCorrect..." ; \ }; @@ -847,7 +734,6 @@ {\ Identifier = SID_SD_GRAPHIC_OPTIONS ; \ Command = ".uno:SdGraphicOptions" ; \ - HelpID = SID_SD_GRAPHIC_OPTIONS ; \ Text [ en-US ] = "~Drawing..." ; \ }; @@ -856,7 +742,6 @@ {\ Identifier = SID_OPTIONS_TREEDIALOG ; \ Command = ".uno:OptionsTreeDialog" ; \ - HelpID = SID_OPTIONS_TREEDIALOG ; \ Text [ en-US ] = "~Options..." ; \ }; @@ -867,13 +752,11 @@ #define ITEM_WINDOW_MDIWINDOWLIST \ Identifier = SID_MDIWINDOWLIST ; \ Command = ".uno:WindowList" ; \ - HelpID = SID_MDIWINDOWLIST ; \ Text [ en-US ] = "~Window" ; \ #define ITEM_WINDOW_CLONEWIN \ Identifier = SID_NEWWINDOW ; \ Command = ".uno:NewWindow" ; \ - HelpID = SID_NEWWINDOW ; \ Text [ en-US ] = "~New Window" ; \ #define ITEM_WINDOW_CASCADEWINS \ @@ -881,7 +764,6 @@ {\ Identifier = SID_CASCADEWINS ; \ Command = ".uno:Cascade" ; \ - HelpID = SID_CASCADEWINS ; \ Text [ en-US ] = "~Cascade" ; \ }; @@ -890,7 +772,6 @@ {\ Identifier = SID_TILEWINS ; \ Command = ".uno:Tile" ; \ - HelpID = SID_TILEWINS ; \ Text [ en-US ] = "~Tile" ; \ }; @@ -899,7 +780,6 @@ {\ Identifier = SID_HORIZONTALWINS ; \ Command = ".uno:ArrangeHorizontal" ; \ - HelpID = SID_HORIZONTALWINS ; \ Text [ en-US ] = "~Horizontally" ; \ }; @@ -908,14 +788,12 @@ {\ Identifier = SID_VERTICALWINS ; \ Command = ".uno:ArrangeVertical" ; \ - HelpID = SID_VERTICALWINS ; \ Text [ en-US ] = "~Vertically" ; \ }; #define ITEM_WINDOW_CLOSEWIN \ Identifier = SID_CLOSEWIN ; \ Command = ".uno:CloseWin" ; \ - HelpID = SID_CLOSEWIN ; \ Text [ en-US ] = "Close Window" ; \ #define ITEM_HYPERLINK_DIALOG \ @@ -923,7 +801,6 @@ {\ Identifier = SID_HYPERLINK_DIALOG ; \ Command = ".uno:HyperlinkDialog" ; \ - HelpID = SID_HYPERLINK_DIALOG ; \ Text [ en-US ] = "~Hyperlink" ; \ } ; @@ -932,7 +809,6 @@ {\ Identifier = SID_POLY_MERGE ; \ Command = ".uno:Merge" ; \ - HelpID = SID_POLY_MERGE ; \ Text [ en-US ] = "~Merge" ; \ }; #define ITEM_POLY_SUBSTRACT \ @@ -940,7 +816,6 @@ {\ Identifier = SID_POLY_SUBSTRACT ; \ Command = ".uno:Substract" ; \ - HelpID = SID_POLY_SUBSTRACT ; \ Text [ en-US ] = "~Subtract" ; \ }; #define ITEM_POLY_INTERSECT \ @@ -948,7 +823,6 @@ {\ Identifier = SID_POLY_INTERSECT ; \ Command = ".uno:Intersect" ; \ - HelpID = SID_POLY_INTERSECT ; \ Text [ en-US ] = "I~ntersect" ; \ }; @@ -957,7 +831,6 @@ { \ Identifier = SID_POLY_FORMEN ; \ Command = ".uno:PolyFormen" ; \ - HelpID = SID_POLY_FORMEN ; \ Text [ en-US ] = "~Shapes" ; \ SubMenu = Menu \ {\ @@ -1016,56 +889,47 @@ #define ITEM_HELP_HELPMENU \ Identifier = SID_HELPMENU ; \ Command = ".uno:HelpMenu" ; \ - HelpID = SID_HELPMENU ; \ Text [ en-US ] = "~Help" ; \ #define ITEM_HELP_HELPINDEX \ Identifier = SID_HELPINDEX ; \ Command = ".uno:HelpIndex" ; \ - HelpID = SID_HELPINDEX ; \ Text [ en-US ] = "~Contents" ; \ #define ITEM_HELP_HELPONHELP \ Identifier = SID_HELPONHELP ; \ Command = ".uno:HelpOnHelp" ; \ - HelpID = SID_HELPONHELP ; \ Text [ en-US ] = "Using Help" ; \ #define ITEM_HELP_HELP_PI \ Identifier = SID_HELP_PI ; \ Command = ".uno:HelperDialog" ; \ - HelpID = SID_HELP_PI ; \ Text [ en-US ] = "Help ~Agent" ; \ #define ITEM_HELP_HELPTIPS \ Identifier = SID_HELPTIPS ; \ Command = ".uno:HelpTip" ; \ - HelpID = SID_HELPTIPS ; \ Text [ en-US ] = "~Tips" ; \ #define ITEM_HELP_BALLOONHELP \ Identifier = SID_HELPBALLOONS ; \ Command = ".uno:ActiveHelp" ; \ - HelpID = SID_HELPBALLOONS ; \ Text [ en-US ] = "~Extended Tips" ; \ #define ITEM_HELP_SUPPORTPAGE \ Identifier = SID_HELP_SUPPORTPAGE ; \ Command = ".uno:HelpSupport" ; \ - HelpID = SID_HELP_SUPPORTPAGE ; \ Text [ en-US ] = "~Support" ; \ #define ITEM_HELP_ONLINE_REGISTRATION \ Identifier = SID_ONLINE_REGISTRATION ; \ Command = ".uno:OnlineRegistrationDlg" ; \ - HelpID = SID_ONLINE_REGISTRATION ; \ Text [ en-US ] = "~Registration..." ; \ #define ITEM_HELP_ABOUT \ Identifier = SID_ABOUT ; \ Command = ".uno:About" ; \ - HelpID = SID_ABOUT ; \ Text [ en-US ] = "A~bout %PRODUCTNAME..." ; \ /*------------------------------------------------------------------------ @@ -1131,39 +995,33 @@ #define ITEM_POPUP_TEMPLATE_EDIT \ Identifier = SID_STYLE_EDIT ; \ Command = ".uno:EditStyle" ; \ - HelpID = SID_STYLE_EDIT ; \ Text [ en-US ] = "Edit Paragraph Style..." ; \ // Gruppen-/Kombination-Funktionen #define ITEM_POPUP_GROUP \ Identifier = SID_GROUP ; \ Command = ".uno:FormatGroup" ; \ - HelpID = SID_GROUP ; \ Text [ en-US ] = "~Group" ; \ #define ITEM_POPUP_UNGROUP \ Identifier = SID_UNGROUP ; \ Command = ".uno:FormatUngroup" ; \ - HelpID = SID_UNGROUP ; \ Text [ en-US ] = "~Ungroup" ; \ #define ITEM_POPUP_ENTER_GROUP \ Identifier = SID_ENTER_GROUP ; \ Command = ".uno:EnterGroup" ; \ - HelpID = SID_ENTER_GROUP ; \ Text [ en-US ] = "~Edit Group" ; \ #define ITEM_POPUP_LEAVE_GROUP \ Identifier = SID_LEAVE_GROUP ; \ Command = ".uno:LeaveGroup" ; \ - HelpID = SID_LEAVE_GROUP ; \ Text [ en-US ] = "E~xit Group" ; \ #define ITEM_GROUP_MENU \ MenuItem\ {\ Identifier = SID_MN_GROUP ; \ - HelpID = SID_MN_GROUP ; \ Command = ".uno:GroupMenu" ; \ SubMenu = Menu\ {\ @@ -1195,14 +1053,12 @@ { \ Identifier = SID_DATASOURCE_ADMINISTRATION ; \ Command = ".uno:DatasourceAdministration" ; \ - HelpID = SID_DATASOURCE_ADMINISTRATION ; \ Text [ en-US ] = "~Data Sources..." ; \ }; #define ITEM_VIEW_DATA_SOURCE_BROWSER \ Identifier = SID_VIEW_DATA_SOURCE_BROWSER; \ Command = ".uno:ViewDataSourceBrowser" ; \ - HelpID = SID_VIEW_DATA_SOURCE_BROWSER; \ Text [ en-US ] = "~Data Sources" ; \ /*------------------------------------------------------------------------ @@ -1211,112 +1067,92 @@ #define ITEM_TOOLBAR_SET_JUSTIFY_PARA \ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ Command = ".uno:JustifyPara" ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; #define ITEM_TOOLBAR_NEWDOCDIRECT \ Identifier = SID_NEWDOCDIRECT ; \ Command = ".uno:AddDirect" ; \ - HelpID = SID_NEWDOCDIRECT ; #define ITEM_TOOLBAR_PRINTDOCDIRECT \ Identifier = SID_PRINTDOCDIRECT ; \ Command = ".uno:PrintDefault" ; \ - HelpID = SID_PRINTDOCDIRECT ; #define ITEM_TOOLBAR_INSERT_DRAW \ Identifier = SID_INSERT_DRAW ; \ Command = ".uno:InsertDraw" ; \ - HelpID = SID_INSERT_DRAW ; \ DropDown = TRUE ; #define ITEM_TOOLBAR_CHOOSE_CONTROLS \ Identifier = SID_CHOOSE_CONTROLS ; \ Command = ".uno:ChooseControls" ; \ - HelpID = SID_CHOOSE_CONTROLS ; \ DropDown = TRUE ; #define ITEM_TOOLBAR_AUTOSPELL_CHECK \ Identifier = SID_AUTOSPELL_CHECK ; \ Command = ".uno:SpellOnline" ; \ - HelpID = SID_AUTOSPELL_CHECK ; #define ITEM_TOOLBAR_TEMPLATE_APPLY \ Identifier = SID_STYLE_APPLY ; \ Command = ".uno:StyleApply" ; \ - HelpID = SID_STYLE_APPLY ; #define ITEM_TOOLBAR_ATTR_CHAR_COLOR \ Identifier = SID_ATTR_CHAR_COLOR ; \ Command = ".uno:Color" ; \ - HelpID = SID_ATTR_CHAR_COLOR ;\ DropDown = TRUE ; #define ITEM_TOOLBAR_BACKGROUND_PATTERN \ Identifier = SID_BACKGROUND_PATTERN ; \ Command = ".uno:BackgroundPatternController" ; \ - HelpID = SID_BACKGROUND_PATTERN ;\ DropDown = TRUE ; #define ITEM_TOOLBAR_BACKGROUND_COLOR \ Identifier = SID_BACKGROUND_COLOR ; \ Command = ".uno:BackgroundColor" ; \ - HelpID = SID_BACKGROUND_COLOR ;\ DropDown = TRUE ; #define ITEM_TOOLBAR_ATTR_BORDER \ Identifier = SID_ATTR_BORDER ; \ Command = ".uno:BorderStyle" ; \ - HelpID = SID_ATTR_BORDER ; #define ITEM_TOOLBAR_FRAME_LINESTYLE \ Identifier = SID_FRAME_LINESTYLE ; \ Command = ".uno:LineStyle" ; \ - HelpID = SID_FRAME_LINESTYLE ; #define ITEM_TOOLBAR_FRAME_LINECOLOR \ Identifier = SID_FRAME_LINECOLOR ; \ Command = ".uno:FrameLineColor" ; \ - HelpID = SID_FRAME_LINECOLOR ; #define ITEM_TOOLBAR_SIM_START \ Identifier = SID_SIM_START ; \ Command = ".uno:LaunchStarImage" ; \ - HelpID = SID_SIM_START ; #define ITEM_TOOLBAR_ATTR_LINEEND_STYLE \ Identifier = SID_ATTR_LINEEND_STYLE ; \ Command = ".uno:LineEndStyle" ; \ - HelpID = SID_ATTR_LINEEND_STYLE ; \ DropDown = TRUE ; #define ITEM_TOOLBAR_ATTR_LINE_STYLE \ Identifier = SID_ATTR_LINE_STYLE ; \ Command = ".uno:XLineStyle" ; \ - HelpID = SID_ATTR_LINE_STYLE ; #define ITEM_TOOLBAR_ATTR_LINE_WIDTH \ Identifier = SID_ATTR_LINE_WIDTH ; \ Command = ".uno:LineWidth" ; \ - HelpID = SID_ATTR_LINE_WIDTH ; #define ITEM_TOOLBAR_ATTR_LINE_COLOR \ Identifier = SID_ATTR_LINE_COLOR ; \ Command = ".uno:XLineColor" ; \ - HelpID = SID_ATTR_LINE_COLOR ; #define ITEM_TOOLBAR_ATTR_FILL_STYLE \ Identifier = SID_ATTR_FILL_STYLE ; \ Command = ".uno:FillStyle" ; \ - HelpID = SID_ATTR_FILL_STYLE ; #define ITEM_TOOLBAR_OBJECT_ROTATE \ Identifier = SID_OBJECT_ROTATE ; \ Command = ".uno:ToggleObjectRotateMode" ; \ - HelpID = SID_OBJECT_ROTATE ; #define ITEM_VIEW_OFFICEBAR \ Identifier = SID_GROUPVIEW; \ - HelpID = SID_GROUPVIEW; \ + Command = CMD_SID_GROUPVIEW; \ Text [ en-US ] = "~Office Bar" ; \ @@ -1324,7 +1160,6 @@ MenuItem\ {\ Identifier = SID_MN_SUB_TRANSLITERATE ; \ - HelpID = SID_MN_SUB_TRANSLITERATE ; \ Command = ".uno:TransliterateMenu" ; \ SubMenu = Menu\ {\ @@ -1334,42 +1169,36 @@ {\ Identifier = SID_TRANSLITERATE_UPPER ; \ Command = ".uno:ChangeCaseToUpper" ; \ - HelpID = SID_TRANSLITERATE_UPPER ; \ Text [ en-US ] = "~Uppercase";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_LOWER; \ Command = ".uno:ChangeCaseToLower" ; \ - HelpID = SID_TRANSLITERATE_LOWER; \ Text [ en-US ] = "~Lowercase";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_HALFWIDTH; \ Command = ".uno:ChangeCaseToHalfWidth" ; \ - HelpID = SID_TRANSLITERATE_HALFWIDTH; \ Text [ en-US ] = "H~alf-width";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_FULLWIDTH; \ Command = ".uno:ChangeCaseToFullWidth" ; \ - HelpID = SID_TRANSLITERATE_FULLWIDTH; \ Text [ en-US ] = "Full-width";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_HIRAGANA; \ Command = ".uno:ChangeCaseToHiragana" ; \ - HelpID = SID_TRANSLITERATE_HIRAGANA; \ Text [ en-US ] = "~Hiragana";\ };\ MenuItem\ {\ Identifier = SID_TRANSLITERATE_KATAGANA; \ Command = ".uno:ChangeCaseToKatakana" ; \ - HelpID = SID_TRANSLITERATE_KATAGANA; \ Text [ en-US ] = "~Katakana";\ };\ };\ @@ -1379,23 +1208,23 @@ #define ITEM_OPEN_HYPERLINK \ Identifier = SID_OPEN_HYPERLINK ; \ - HelpID = SID_OPEN_HYPERLINK ; \ + Command = CMD_SID_OPEN_HYPERLINK; \ Text [ en-US ] = "~Open Hyperlink" ; \ #define ITEM_OPEN_SMARTTAGMENU \ Identifier = SID_OPEN_SMARTTAGMENU ; \ - HelpID = SID_OPEN_SMARTTAGMENU ; \ + Command = CMD_SID_OPEN_SMARTTAGMENU; \ Text [ en-US ] = "Open ~Smart Tag Menu" ; \ #define ITEM_OPEN_XML_FILTERSETTINGS \ Identifier = SID_OPEN_XML_FILTERSETTINGS ; \ - HelpID = SID_OPEN_XML_FILTERSETTINGS ; \ + Command = CMD_SID_OPEN_XML_FILTERSETTINGS; \ Text [ en-US ] = "~XML Filter Settings..."; \ #define ITEM_HANGUL_HANJA_CONVERSION \ Identifier = SID_HANGUL_HANJA_CONVERSION; \ - HelpId = SID_HANGUL_HANJA_CONVERSION; \ + Command = CMD_SID_HANGUL_HANJA_CONVERSION; \ Text [ en-US ] = "Hangul/Hanja Conversion..."; \ #endif // #ifndef _GLOBLMN_HRC diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 6d9153818cde..63687550dd12 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -31,264 +31,255 @@ #include #include +#include +#include // Help-Ids -------------------------------------------------------------- -#define HID_ALIGN_TBX (HID_SVX_START + 1) -#define HID_BMPMASK_CTL_PIPETTE (HID_SVX_START + 4) -#define HID_BMPMASK_CTL_QCOL_1 (HID_SVX_START + 5) -#define HID_BMPMASK_TBI_PIPETTE (HID_SVX_START + 6) -#define HID_COLOR_CTL_COLORS (HID_SVX_START + 7) -#define HID_CONTDLG_APPLY (HID_SVX_START + 8) -#define HID_CONTDLG_AUTOCONTOUR (HID_SVX_START + 9) -#define HID_CONTDLG_CIRCLE (HID_SVX_START + 10) -#define HID_CONTDLG_FREEPOLY (HID_SVX_START + 11) -#define HID_CONTDLG_GRAPHWND (HID_SVX_START + 12) -#define HID_CONTDLG_PIPETTE (HID_SVX_START + 13) -#define HID_CONTDLG_POLY (HID_SVX_START + 14) -#define HID_CONTDLG_POLYDELETE (HID_SVX_START + 15) -#define HID_CONTDLG_POLYEDIT (HID_SVX_START + 16) -#define HID_CONTDLG_POLYINSERT (HID_SVX_START + 17) -#define HID_CONTDLG_POLYMOVE (HID_SVX_START + 18) -#define HID_CONTDLG_RECT (HID_SVX_START + 19) -#define HID_CONTDLG_REDO (HID_SVX_START + 20) -#define HID_CONTDLG_SELECT (HID_SVX_START + 21) -#define HID_CONTDLG_TOOLBOX (HID_SVX_START + 22) -#define HID_CONTDLG_UNDO (HID_SVX_START + 23) -#define HID_CONTDLG_WORKPLACE (HID_SVX_START + 24) -#define HID_CTL_FONTWORK_FAVORITES (HID_SVX_START + 25) -#define HID_CTRL3D_HSCROLL (HID_SVX_START + 26) -#define HID_CTRL3D_SWITCHER (HID_SVX_START + 27) -#define HID_CTRL3D_VSCROLL (HID_SVX_START + 28) -#define HID_CTRL_COLOR (HID_SVX_START + 29) -#define HID_DRAWTOOL_TBX (HID_SVX_START + 30) -#define HID_EDITENG_SPELLER_ADDWORD (HID_SVX_START + 31) -#define HID_EDITENG_SPELLER_AUTOCORRECT (HID_SVX_START + 32) -#define HID_EDITENG_SPELLER_IGNORE (HID_SVX_START + 33) -#define HID_EDITENG_SPELLER_PARALANGUAGE (HID_SVX_START + 34) -#define HID_EDITENG_SPELLER_START (HID_SVX_START + 35) -#define HID_EDITENG_SPELLER_WORDLANGUAGE (HID_SVX_START + 36) -#define HID_FILL_ATTR_LISTBOX (HID_SVX_START + 37) -#define HID_FILL_TYPE_LISTBOX (HID_SVX_START + 38) -#define HID_FONTWORK_CTL_FORMS (HID_SVX_START + 39) -#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE (HID_SVX_START + 40) -#define HID_FONTWORK_TBI_ADJUST_CENTER (HID_SVX_START + 41) -#define HID_FONTWORK_TBI_ADJUST_LEFT (HID_SVX_START + 42) -#define HID_FONTWORK_TBI_ADJUST_MIRROR (HID_SVX_START + 43) -#define HID_FONTWORK_TBI_ADJUST_RIGHT (HID_SVX_START + 44) -#define HID_FONTWORK_TBI_OUTLINE (HID_SVX_START + 45) -#define HID_FONTWORK_TBI_SHADOW_NORMAL (HID_SVX_START + 46) -#define HID_FONTWORK_TBI_SHADOW_OFF (HID_SVX_START + 47) -#define HID_FONTWORK_TBI_SHADOW_SLANT (HID_SVX_START + 48) -#define HID_FONTWORK_TBI_SHOWFORM (HID_SVX_START + 49) -#define HID_FONTWORK_TBI_STYLE_OFF (HID_SVX_START + 50) -#define HID_FONTWORK_TBI_STYLE_ROTATE (HID_SVX_START + 51) -#define HID_FONTWORK_TBI_STYLE_SLANTX (HID_SVX_START + 52) -#define HID_FONTWORK_TBI_STYLE_SLANTY (HID_SVX_START + 53) -#define HID_FONTWORK_TBI_STYLE_UPRIGHT (HID_SVX_START + 54) -#define HID_FORMAT_FOOTER (HID_SVX_START + 55) -#define HID_FORMAT_HEADER (HID_SVX_START + 56) +#define HID_ALIGN_TBX "SVX_HID_ALIGN_TBX" +#define HID_BMPMASK_CTL_PIPETTE "SVX_HID_BMPMASK_CTL_PIPETTE" +#define HID_BMPMASK_CTL_QCOL_1 "SVX_HID_BMPMASK_CTL_QCOL_1" +#define HID_BMPMASK_TBI_PIPETTE "SVX_HID_BMPMASK_TBI_PIPETTE" +#define HID_COLOR_CTL_COLORS "SVX_HID_COLOR_CTL_COLORS" +#define HID_CONTDLG_APPLY "SVX_HID_CONTDLG_APPLY" +#define HID_CONTDLG_AUTOCONTOUR "SVX_HID_CONTDLG_AUTOCONTOUR" +#define HID_CONTDLG_CIRCLE "SVX_HID_CONTDLG_CIRCLE" +#define HID_CONTDLG_FREEPOLY "SVX_HID_CONTDLG_FREEPOLY" +#define HID_CONTDLG_GRAPHWND "SVX_HID_CONTDLG_GRAPHWND" +#define HID_CONTDLG_PIPETTE "SVX_HID_CONTDLG_PIPETTE" +#define HID_CONTDLG_POLY "SVX_HID_CONTDLG_POLY" +#define HID_CONTDLG_POLYDELETE "SVX_HID_CONTDLG_POLYDELETE" +#define HID_CONTDLG_POLYEDIT "SVX_HID_CONTDLG_POLYEDIT" +#define HID_CONTDLG_POLYINSERT "SVX_HID_CONTDLG_POLYINSERT" +#define HID_CONTDLG_POLYMOVE "SVX_HID_CONTDLG_POLYMOVE" +#define HID_CONTDLG_RECT "SVX_HID_CONTDLG_RECT" +#define HID_CONTDLG_REDO "SVX_HID_CONTDLG_REDO" +#define HID_CONTDLG_SELECT "SVX_HID_CONTDLG_SELECT" +#define HID_CONTDLG_TOOLBOX "SVX_HID_CONTDLG_TOOLBOX" +#define HID_CONTDLG_UNDO "SVX_HID_CONTDLG_UNDO" +#define HID_CONTDLG_WORKPLACE "SVX_HID_CONTDLG_WORKPLACE" +#define HID_CTL_FONTWORK_FAVORITES "SVX_HID_CTL_FONTWORK_FAVORITES" +#define HID_CTRL3D_HSCROLL "SVX_HID_CTRL3D_HSCROLL" +#define HID_CTRL3D_SWITCHER "SVX_HID_CTRL3D_SWITCHER" +#define HID_CTRL3D_VSCROLL "SVX_HID_CTRL3D_VSCROLL" +#define HID_CTRL_COLOR "SVX_HID_CTRL_COLOR" +#define HID_DRAWTOOL_TBX "SVX_HID_DRAWTOOL_TBX" +#define HID_EDITENG_SPELLER_ADDWORD "SVX_HID_EDITENG_SPELLER_ADDWORD" +#define HID_EDITENG_SPELLER_AUTOCORRECT "SVX_HID_EDITENG_SPELLER_AUTOCORRECT" +#define HID_EDITENG_SPELLER_IGNORE "SVX_HID_EDITENG_SPELLER_IGNORE" +#define HID_EDITENG_SPELLER_PARALANGUAGE "SVX_HID_EDITENG_SPELLER_PARALANGUAGE" +#define HID_EDITENG_SPELLER_START "SVX_HID_EDITENG_SPELLER_START" +#define HID_EDITENG_SPELLER_WORDLANGUAGE "SVX_HID_EDITENG_SPELLER_WORDLANGUAGE" +#define HID_FILL_ATTR_LISTBOX "SVX_HID_FILL_ATTR_LISTBOX" +#define HID_FILL_TYPE_LISTBOX "SVX_HID_FILL_TYPE_LISTBOX" +#define HID_FONTWORK_CTL_FORMS "SVX_HID_FONTWORK_CTL_FORMS" +#define HID_FONTWORK_TBI_ADJUST_AUTOSIZE "SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE" +#define HID_FONTWORK_TBI_ADJUST_CENTER "SVX_HID_FONTWORK_TBI_ADJUST_CENTER" +#define HID_FONTWORK_TBI_ADJUST_LEFT "SVX_HID_FONTWORK_TBI_ADJUST_LEFT" +#define HID_FONTWORK_TBI_ADJUST_MIRROR "SVX_HID_FONTWORK_TBI_ADJUST_MIRROR" +#define HID_FONTWORK_TBI_ADJUST_RIGHT "SVX_HID_FONTWORK_TBI_ADJUST_RIGHT" +#define HID_FONTWORK_TBI_OUTLINE "SVX_HID_FONTWORK_TBI_OUTLINE" +#define HID_FONTWORK_TBI_SHADOW_NORMAL "SVX_HID_FONTWORK_TBI_SHADOW_NORMAL" +#define HID_FONTWORK_TBI_SHADOW_OFF "SVX_HID_FONTWORK_TBI_SHADOW_OFF" +#define HID_FONTWORK_TBI_SHADOW_SLANT "SVX_HID_FONTWORK_TBI_SHADOW_SLANT" +#define HID_FONTWORK_TBI_SHOWFORM "SVX_HID_FONTWORK_TBI_SHOWFORM" +#define HID_FONTWORK_TBI_STYLE_OFF "SVX_HID_FONTWORK_TBI_STYLE_OFF" +#define HID_FONTWORK_TBI_STYLE_ROTATE "SVX_HID_FONTWORK_TBI_STYLE_ROTATE" +#define HID_FONTWORK_TBI_STYLE_SLANTX "SVX_HID_FONTWORK_TBI_STYLE_SLANTX" +#define HID_FONTWORK_TBI_STYLE_SLANTY "SVX_HID_FONTWORK_TBI_STYLE_SLANTY" +#define HID_FONTWORK_TBI_STYLE_UPRIGHT "SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT" +#define HID_FORMAT_FOOTER "SVX_HID_FORMAT_FOOTER" +#define HID_FORMAT_HEADER "SVX_HID_FORMAT_HEADER" // free -#define HID_GALLERY_ICONVIEW (HID_SVX_START + 58) -#define HID_GALLERY_LISTVIEW (HID_SVX_START + 59) -#define HID_GALLERY_MN_ADD (HID_SVX_START + 60) -#define HID_GALLERY_MN_ADDMENU (HID_SVX_START + 61) -#define HID_GALLERY_MN_ADD_LINK (HID_SVX_START + 62) -#define HID_GALLERY_MN_BACKGROUND (HID_SVX_START + 63) -#define HID_GALLERY_MN_COPYCLIPBOARD (HID_SVX_START + 64) -#define HID_GALLERY_MN_DELETE (HID_SVX_START + 65) -#define HID_GALLERY_MN_PASTECLIPBOARD (HID_SVX_START + 66) -#define HID_GALLERY_MN_PREVIEW (HID_SVX_START + 67) -#define HID_GALLERY_NEWTHEME (HID_SVX_START + 68) -#define HID_GALLERY_PREVIEW (HID_SVX_START + 69) -#define HID_GALLERY_PROPERTIES (HID_SVX_START + 70) -#define HID_GALLERY_RENAME (HID_SVX_START + 71) -#define HID_GALLERY_THEMELIST (HID_SVX_START + 72) +#define HID_GALLERY_ICONVIEW "SVX_HID_GALLERY_ICONVIEW" +#define HID_GALLERY_LISTVIEW "SVX_HID_GALLERY_LISTVIEW" +#define HID_GALLERY_MN_ADD "SVX_HID_GALLERY_MN_ADD" +#define HID_GALLERY_MN_ADDMENU "SVX_HID_GALLERY_MN_ADDMENU" +#define HID_GALLERY_MN_ADD_LINK "SVX_HID_GALLERY_MN_ADD_LINK" +#define HID_GALLERY_MN_BACKGROUND "SVX_HID_GALLERY_MN_BACKGROUND" +#define HID_GALLERY_MN_COPYCLIPBOARD "SVX_HID_GALLERY_MN_COPYCLIPBOARD" +#define HID_GALLERY_MN_DELETE "SVX_HID_GALLERY_MN_DELETE" +#define HID_GALLERY_MN_PASTECLIPBOARD "SVX_HID_GALLERY_MN_PASTECLIPBOARD" +#define HID_GALLERY_MN_PREVIEW "SVX_HID_GALLERY_MN_PREVIEW" +#define HID_GALLERY_NEWTHEME "SVX_HID_GALLERY_NEWTHEME" +#define HID_GALLERY_PREVIEW "SVX_HID_GALLERY_PREVIEW" +#define HID_GALLERY_PROPERTIES "SVX_HID_GALLERY_PROPERTIES" +#define HID_GALLERY_RENAME "SVX_HID_GALLERY_RENAME" +#define HID_GALLERY_THEMELIST "SVX_HID_GALLERY_THEMELIST" // free -#define HID_GALLERY_WINDOW (HID_SVX_START + 74) -#define HID_GRFFILTER (HID_SVX_START + 75) -#define HID_GRFFILTER_EMBOSS (HID_SVX_START + 76) -#define HID_GRFFILTER_INVERT (HID_SVX_START + 77) -#define HID_GRFFILTER_MOSAIC (HID_SVX_START + 78) -#define HID_GRFFILTER_POPART (HID_SVX_START + 79) -#define HID_GRFFILTER_POSTER (HID_SVX_START + 80) -#define HID_GRFFILTER_REMOVENOISE (HID_SVX_START + 81) -#define HID_GRFFILTER_SEPIA (HID_SVX_START + 82) -#define HID_GRFFILTER_SHARPEN (HID_SVX_START + 83) -#define HID_GRFFILTER_SMOOTH (HID_SVX_START + 84) -#define HID_GRFFILTER_SOBEL (HID_SVX_START + 85) -#define HID_GRFFILTER_SOLARIZE (HID_SVX_START + 86) +#define HID_GALLERY_WINDOW "SVX_HID_GALLERY_WINDOW" +#define HID_GRFFILTER "SVX_HID_GRFFILTER" +#define HID_GRFFILTER_EMBOSS "SVX_HID_GRFFILTER_EMBOSS" +#define HID_GRFFILTER_INVERT "SVX_HID_GRFFILTER_INVERT" +#define HID_GRFFILTER_MOSAIC "SVX_HID_GRFFILTER_MOSAIC" +#define HID_GRFFILTER_POPART "SVX_HID_GRFFILTER_POPART" +#define HID_GRFFILTER_POSTER "SVX_HID_GRFFILTER_POSTER" +#define HID_GRFFILTER_REMOVENOISE "SVX_HID_GRFFILTER_REMOVENOISE" +#define HID_GRFFILTER_SEPIA "SVX_HID_GRFFILTER_SEPIA" +#define HID_GRFFILTER_SHARPEN "SVX_HID_GRFFILTER_SHARPEN" +#define HID_GRFFILTER_SMOOTH "SVX_HID_GRFFILTER_SMOOTH" +#define HID_GRFFILTER_SOBEL "SVX_HID_GRFFILTER_SOBEL" +#define HID_GRFFILTER_SOLARIZE "SVX_HID_GRFFILTER_SOLARIZE" -#define HID_IMAPDLG_ACTIVE (HID_SVX_START + 88) -#define HID_IMAPDLG_APPLY (HID_SVX_START + 89) -#define HID_IMAPDLG_CIRCLE (HID_SVX_START + 90) -#define HID_IMAPDLG_FREEPOLY (HID_SVX_START + 91) -#define HID_IMAPDLG_GRAPHWND (HID_SVX_START + 92) -#define HID_IMAPDLG_MACRO (HID_SVX_START + 93) -#define HID_IMAPDLG_OPEN (HID_SVX_START + 94) -#define HID_IMAPDLG_POLY (HID_SVX_START + 95) -#define HID_IMAPDLG_POLYDELETE (HID_SVX_START + 96) -#define HID_IMAPDLG_POLYEDIT (HID_SVX_START + 97) -#define HID_IMAPDLG_POLYINSERT (HID_SVX_START + 98) -#define HID_IMAPDLG_POLYMOVE (HID_SVX_START + 99) -#define HID_IMAPDLG_PROPERTY (HID_SVX_START + 100) -#define HID_IMAPDLG_RECT (HID_SVX_START + 101) -#define HID_IMAPDLG_REDO (HID_SVX_START + 102) -#define HID_IMAPDLG_SAVEAS (HID_SVX_START + 103) -#define HID_IMAPDLG_SELECT (HID_SVX_START + 104) -#define HID_IMAPDLG_TOOLBOX (HID_SVX_START + 105) -#define HID_IMAPDLG_UNDO (HID_SVX_START + 106) -#define HID_MENU_EXTRUSION_DEPTH (HID_SVX_START + 107) -#define HID_MENU_EXTRUSION_DIRECTION (HID_SVX_START + 108) -#define HID_MENU_EXTRUSION_LIGHTING (HID_SVX_START + 109) -#define HID_MENU_EXTRUSION_SURFACE (HID_SVX_START + 110) -#define HID_MNU_FUNC_AVG (HID_SVX_START + 111) -#define HID_MNU_FUNC_COUNT (HID_SVX_START + 112) -#define HID_MNU_FUNC_COUNT2 (HID_SVX_START + 113) -#define HID_MNU_FUNC_MAX (HID_SVX_START + 114) -#define HID_MNU_FUNC_MIN (HID_SVX_START + 115) -#define HID_MNU_FUNC_NONE (HID_SVX_START + 116) -#define HID_MNU_FUNC_SUM (HID_SVX_START + 117) -#define HID_MNU_ZOOM_100 (HID_SVX_START + 118) -#define HID_MNU_ZOOM_150 (HID_SVX_START + 119) -#define HID_MNU_ZOOM_200 (HID_SVX_START + 120) -#define HID_MNU_ZOOM_50 (HID_SVX_START + 121) -#define HID_MNU_ZOOM_75 (HID_SVX_START + 122) -#define HID_MNU_ZOOM_OPTIMAL (HID_SVX_START + 123) -#define HID_MNU_ZOOM_PAGE_WIDTH (HID_SVX_START + 124) -#define HID_MNU_ZOOM_WHOLE_PAGE (HID_SVX_START + 125) -#define HID_OPTIONS_GRID (HID_SVX_START + 126) -#define HID_PASSWORD (HID_SVX_START + 127) -#define HID_POPUP_COLOR (HID_SVX_START + 128) -#define HID_POPUP_COLOR_CTRL (HID_SVX_START + 129) -#define HID_POPUP_EXTRUSION_DEPTH (HID_SVX_START + 130) -#define HID_POPUP_EXTRUSION_DIRECTION (HID_SVX_START + 131) -#define HID_POPUP_EXTRUSION_LIGHTING (HID_SVX_START + 132) -#define HID_POPUP_EXTRUSION_SURFACE (HID_SVX_START + 133) -#define HID_POPUP_FONTWORK_ALIGN (HID_SVX_START + 134) -#define HID_POPUP_FONTWORK_CHARSPACE (HID_SVX_START + 135) -#define HID_POPUP_FRAME (HID_SVX_START + 136) -#define HID_POPUP_LINE (HID_SVX_START + 137) -#define HID_POPUP_LINEEND (HID_SVX_START + 138) -#define HID_POPUP_LINEEND_CTRL (HID_SVX_START + 139) -#define HID_REDLINING_FILTER_BTN_REF (HID_SVX_START + 140) -#define HID_REDLINING_FILTER_CB_ACTION (HID_SVX_START + 141) -#define HID_REDLINING_FILTER_CB_AUTOR (HID_SVX_START + 142) -#define HID_REDLINING_FILTER_CB_COMMENT (HID_SVX_START + 143) -#define HID_REDLINING_FILTER_CB_DATE (HID_SVX_START + 144) -#define HID_REDLINING_FILTER_CB_RANGE (HID_SVX_START + 145) -#define HID_REDLINING_FILTER_DF_DATE (HID_SVX_START + 146) -#define HID_REDLINING_FILTER_DF_DATE2 (HID_SVX_START + 147) -#define HID_REDLINING_FILTER_ED_COMMENT (HID_SVX_START + 148) -#define HID_REDLINING_FILTER_ED_RANGE (HID_SVX_START + 149) -#define HID_REDLINING_FILTER_IB_CLOCK (HID_SVX_START + 150) -#define HID_REDLINING_FILTER_IB_CLOCK2 (HID_SVX_START + 151) -#define HID_REDLINING_FILTER_LB_ACTION (HID_SVX_START + 152) -#define HID_REDLINING_FILTER_LB_AUTOR (HID_SVX_START + 153) -#define HID_REDLINING_FILTER_LB_DATE (HID_SVX_START + 154) -#define HID_REDLINING_FILTER_PAGE (HID_SVX_START + 155) -#define HID_REDLINING_FILTER_TF_DATE (HID_SVX_START + 156) -#define HID_REDLINING_FILTER_TF_DATE2 (HID_SVX_START + 157) -#define HID_REDLINING_TABCONTROL (HID_SVX_START + 158) -#define HID_REDLINING_VIEW_DG_VIEW (HID_SVX_START + 159) -#define HID_REDLINING_VIEW_DG_VIEW_HEADER (HID_SVX_START + 160) -#define HID_REDLINING_VIEW_DG_VIEW_TABLE (HID_SVX_START + 161) -#define HID_REDLINING_VIEW_PAGE (HID_SVX_START + 162) -#define HID_REDLINING_VIEW_PB_ACCEPT (HID_SVX_START + 163) -#define HID_REDLINING_VIEW_PB_ACCEPTALL (HID_SVX_START + 164) -#define HID_REDLINING_VIEW_PB_REJECT (HID_SVX_START + 165) -#define HID_REDLINING_VIEW_PB_REJECTALL (HID_SVX_START + 166) -#define HID_REDLINING_VIEW_PB_UNDO (HID_SVX_START + 167) -#define HID_RUBY_DIALOG (HID_SVX_START + 168) -#define HID_STYLE_LISTBOX (HID_SVX_START + 169) -#define HID_SVXTBX_ALIGNMENT (HID_SVX_START + 170) -#define HID_SVXTBX_DRAW (HID_SVX_START + 171) -#define HID_SVXTBX_UNDO_REDO_CTRL (HID_SVX_START + 172) -#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE (HID_SVX_START + 173) -#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER (HID_SVX_START + 174) -#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED (HID_SVX_START + 175) -#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL (HID_SVX_START + 176) -#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_START + 177) -#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_START + 178) -#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS (HID_SVX_START + 179) -#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED (HID_SVX_START + 180) -#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL (HID_SVX_START + 181) -#define HID_SVX_MDLG_DOCRECOVERY_BROKEN (HID_SVX_START + 182) -#define HID_SVX_MDLG_DOCRECOVERY_PROGR (HID_SVX_START + 183) -#define HID_SVX_MDLG_ERR_REP_OPTIONS (HID_SVX_START + 184) -#define HID_SVX_MDLG_ERR_REP_PREVIEW (HID_SVX_START + 185) -#define HID_SVX_TABDLG_DOCRECOVERY (HID_SVX_START + 186) -#define HID_SVX_TP_DOCRECOVERY_RECOVER (HID_SVX_START + 187) -#define HID_SVX_TP_DOCRECOVERY_SAVE (HID_SVX_START + 188) -#define HID_SVX_TP_ERR_REP_SEND (HID_SVX_START + 189) -#define HID_SVX_TP_ERR_REP_WELCOME (HID_SVX_START + 190) +#define HID_IMAPDLG_ACTIVE "SVX_HID_IMAPDLG_ACTIVE" +#define HID_IMAPDLG_APPLY "SVX_HID_IMAPDLG_APPLY" +#define HID_IMAPDLG_CIRCLE "SVX_HID_IMAPDLG_CIRCLE" +#define HID_IMAPDLG_FREEPOLY "SVX_HID_IMAPDLG_FREEPOLY" +#define HID_IMAPDLG_GRAPHWND "SVX_HID_IMAPDLG_GRAPHWND" +#define HID_IMAPDLG_MACRO "SVX_HID_IMAPDLG_MACRO" +#define HID_IMAPDLG_OPEN "SVX_HID_IMAPDLG_OPEN" +#define HID_IMAPDLG_POLY "SVX_HID_IMAPDLG_POLY" +#define HID_IMAPDLG_POLYDELETE "SVX_HID_IMAPDLG_POLYDELETE" +#define HID_IMAPDLG_POLYEDIT "SVX_HID_IMAPDLG_POLYEDIT" +#define HID_IMAPDLG_POLYINSERT "SVX_HID_IMAPDLG_POLYINSERT" +#define HID_IMAPDLG_POLYMOVE "SVX_HID_IMAPDLG_POLYMOVE" +#define HID_IMAPDLG_PROPERTY "SVX_HID_IMAPDLG_PROPERTY" +#define HID_IMAPDLG_RECT "SVX_HID_IMAPDLG_RECT" +#define HID_IMAPDLG_REDO "SVX_HID_IMAPDLG_REDO" +#define HID_IMAPDLG_SAVEAS "SVX_HID_IMAPDLG_SAVEAS" +#define HID_IMAPDLG_SELECT "SVX_HID_IMAPDLG_SELECT" +#define HID_IMAPDLG_TOOLBOX "SVX_HID_IMAPDLG_TOOLBOX" +#define HID_IMAPDLG_UNDO "SVX_HID_IMAPDLG_UNDO" +#define HID_MENU_EXTRUSION_DEPTH "SVX_HID_MENU_EXTRUSION_DEPTH" +#define HID_MENU_EXTRUSION_DIRECTION "SVX_HID_MENU_EXTRUSION_DIRECTION" +#define HID_MENU_EXTRUSION_LIGHTING "SVX_HID_MENU_EXTRUSION_LIGHTING" +#define HID_MENU_EXTRUSION_SURFACE "SVX_HID_MENU_EXTRUSION_SURFACE" +#define HID_MNU_FUNC_AVG "SVX_HID_MNU_FUNC_AVG" +#define HID_MNU_FUNC_COUNT "SVX_HID_MNU_FUNC_COUNT" +#define HID_MNU_FUNC_COUNT2 "SVX_HID_MNU_FUNC_COUNT2" +#define HID_MNU_FUNC_MAX "SVX_HID_MNU_FUNC_MAX" +#define HID_MNU_FUNC_MIN "SVX_HID_MNU_FUNC_MIN" +#define HID_MNU_FUNC_NONE "SVX_HID_MNU_FUNC_NONE" +#define HID_MNU_FUNC_SUM "SVX_HID_MNU_FUNC_SUM" +#define HID_MNU_ZOOM_100 "SVX_HID_MNU_ZOOM_100" +#define HID_MNU_ZOOM_150 "SVX_HID_MNU_ZOOM_150" +#define HID_MNU_ZOOM_200 "SVX_HID_MNU_ZOOM_200" +#define HID_MNU_ZOOM_50 "SVX_HID_MNU_ZOOM_50" +#define HID_MNU_ZOOM_75 "SVX_HID_MNU_ZOOM_75" +#define HID_MNU_ZOOM_OPTIMAL "SVX_HID_MNU_ZOOM_OPTIMAL" +#define HID_MNU_ZOOM_PAGE_WIDTH "SVX_HID_MNU_ZOOM_PAGE_WIDTH" +#define HID_MNU_ZOOM_WHOLE_PAGE "SVX_HID_MNU_ZOOM_WHOLE_PAGE" +#define HID_OPTIONS_GRID "SVX_HID_OPTIONS_GRID" +#define HID_PASSWORD "SVX_HID_PASSWORD" +#define HID_POPUP_COLOR "SVX_HID_POPUP_COLOR" +#define HID_POPUP_COLOR_CTRL "SVX_HID_POPUP_COLOR_CTRL" +#define HID_POPUP_EXTRUSION_DEPTH "SVX_HID_POPUP_EXTRUSION_DEPTH" +#define HID_POPUP_EXTRUSION_DIRECTION "SVX_HID_POPUP_EXTRUSION_DIRECTION" +#define HID_POPUP_EXTRUSION_LIGHTING "SVX_HID_POPUP_EXTRUSION_LIGHTING" +#define HID_POPUP_EXTRUSION_SURFACE "SVX_HID_POPUP_EXTRUSION_SURFACE" +#define HID_POPUP_FONTWORK_ALIGN "SVX_HID_POPUP_FONTWORK_ALIGN" +#define HID_POPUP_FONTWORK_CHARSPACE "SVX_HID_POPUP_FONTWORK_CHARSPACE" +#define HID_POPUP_FRAME "SVX_HID_POPUP_FRAME" +#define HID_POPUP_LINE "SVX_HID_POPUP_LINE" +#define HID_POPUP_LINEEND "SVX_HID_POPUP_LINEEND" +#define HID_POPUP_LINEEND_CTRL "SVX_HID_POPUP_LINEEND_CTRL" +#define HID_REDLINING_FILTER_BTN_REF "SVX_HID_REDLINING_FILTER_BTN_REF" +#define HID_REDLINING_FILTER_CB_ACTION "SVX_HID_REDLINING_FILTER_CB_ACTION" +#define HID_REDLINING_FILTER_CB_AUTOR "SVX_HID_REDLINING_FILTER_CB_AUTOR" +#define HID_REDLINING_FILTER_CB_COMMENT "SVX_HID_REDLINING_FILTER_CB_COMMENT" +#define HID_REDLINING_FILTER_CB_DATE "SVX_HID_REDLINING_FILTER_CB_DATE" +#define HID_REDLINING_FILTER_CB_RANGE "SVX_HID_REDLINING_FILTER_CB_RANGE" +#define HID_REDLINING_FILTER_DF_DATE "SVX_HID_REDLINING_FILTER_DF_DATE" +#define HID_REDLINING_FILTER_DF_DATE2 "SVX_HID_REDLINING_FILTER_DF_DATE2" +#define HID_REDLINING_FILTER_ED_COMMENT "SVX_HID_REDLINING_FILTER_ED_COMMENT" +#define HID_REDLINING_FILTER_ED_RANGE "SVX_HID_REDLINING_FILTER_ED_RANGE" +#define HID_REDLINING_FILTER_IB_CLOCK "SVX_HID_REDLINING_FILTER_IB_CLOCK" +#define HID_REDLINING_FILTER_IB_CLOCK2 "SVX_HID_REDLINING_FILTER_IB_CLOCK2" +#define HID_REDLINING_FILTER_LB_ACTION "SVX_HID_REDLINING_FILTER_LB_ACTION" +#define HID_REDLINING_FILTER_LB_AUTOR "SVX_HID_REDLINING_FILTER_LB_AUTOR" +#define HID_REDLINING_FILTER_LB_DATE "SVX_HID_REDLINING_FILTER_LB_DATE" +#define HID_REDLINING_FILTER_PAGE "SVX_HID_REDLINING_FILTER_PAGE" +#define HID_REDLINING_FILTER_TF_DATE "SVX_HID_REDLINING_FILTER_TF_DATE" +#define HID_REDLINING_FILTER_TF_DATE2 "SVX_HID_REDLINING_FILTER_TF_DATE2" +#define HID_REDLINING_TABCONTROL "SVX_HID_REDLINING_TABCONTROL" +#define HID_REDLINING_VIEW_DG_VIEW "SVX_HID_REDLINING_VIEW_DG_VIEW" +#define HID_REDLINING_VIEW_DG_VIEW_HEADER "SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER" +#define HID_REDLINING_VIEW_DG_VIEW_TABLE "SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE" +#define HID_REDLINING_VIEW_PAGE "SVX_HID_REDLINING_VIEW_PAGE" +#define HID_REDLINING_VIEW_PB_ACCEPT "SVX_HID_REDLINING_VIEW_PB_ACCEPT" +#define HID_REDLINING_VIEW_PB_ACCEPTALL "SVX_HID_REDLINING_VIEW_PB_ACCEPTALL" +#define HID_REDLINING_VIEW_PB_REJECT "SVX_HID_REDLINING_VIEW_PB_REJECT" +#define HID_REDLINING_VIEW_PB_REJECTALL "SVX_HID_REDLINING_VIEW_PB_REJECTALL" +#define HID_REDLINING_VIEW_PB_UNDO "SVX_HID_REDLINING_VIEW_PB_UNDO" +#define HID_RUBY_DIALOG "SVX_HID_RUBY_DIALOG" +#define HID_STYLE_LISTBOX "SVX_HID_STYLE_LISTBOX" +#define HID_SVXTBX_ALIGNMENT "SVX_HID_SVXTBX_ALIGNMENT" +#define HID_SVXTBX_DRAW "SVX_HID_SVXTBX_DRAW" +#define HID_SVXTBX_UNDO_REDO_CTRL "SVX_HID_SVXTBX_UNDO_REDO_CTRL" +#define HID_SVX_CHINESE_DICTIONARY_CB_REVERSE "SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE" +#define HID_SVX_CHINESE_DICTIONARY_LB_HEADER "SVX_HID_SVX_CHINESE_DICTIONARY_LB_HEADER" +#define HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED" +#define HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL" +#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED" +#define HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL" +#define HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS "SVX_HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS" +#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED "SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED" +#define HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL "SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL" +#define HID_SVX_MDLG_DOCRECOVERY_BROKEN "SVX_HID_SVX_MDLG_DOCRECOVERY_BROKEN" +#define HID_SVX_MDLG_DOCRECOVERY_PROGR "SVX_HID_SVX_MDLG_DOCRECOVERY_PROGR" +#define HID_SVX_MDLG_ERR_REP_OPTIONS "SVX_HID_SVX_MDLG_ERR_REP_OPTIONS" +#define HID_SVX_MDLG_ERR_REP_PREVIEW "SVX_HID_SVX_MDLG_ERR_REP_PREVIEW" +#define HID_SVX_TABDLG_DOCRECOVERY "SVX_HID_SVX_TABDLG_DOCRECOVERY" +#define HID_SVX_TP_DOCRECOVERY_RECOVER "SVX_HID_SVX_TP_DOCRECOVERY_RECOVER" +#define HID_SVX_TP_DOCRECOVERY_SAVE "SVX_HID_SVX_TP_DOCRECOVERY_SAVE" +#define HID_SVX_TP_ERR_REP_SEND "SVX_HID_SVX_TP_ERR_REP_SEND" +#define HID_SVX_TP_ERR_REP_WELCOME "SVX_HID_SVX_TP_ERR_REP_WELCOME" -#define HID_VALUESET_EXTRUSION_DIRECTION (HID_SVX_START + 192) -#define HID_VALUESET_EXTRUSION_LIGHTING (HID_SVX_START + 193) -#define HID_WIN_FONTWORK_ALIGN (HID_SVX_START + 194) -#define HID_WIN_FONTWORK_CHARSPACE (HID_SVX_START + 195) -#define HID_XMLSEC_CALL (HID_SVX_START + 196) -#define HID_OFA_HYPERLINK_DLG (HID_SVX_START + 197) -#define HID_OFA_HYPERLINK_NAME (HID_SVX_START + 198) -#define HID_OFA_HYPERLINK_SEARCH (HID_SVX_START + 199) -#define HID_OFA_HYPERLINK_TARGET (HID_SVX_START + 200) -#define HID_OFA_HYPERLINK_URL (HID_SVX_START + 201) -#define HID_OFA_HYPERLINK_URL_TXT (HID_SVX_START + 202) -#define HID_AUTOCORR_DLG (HID_SVX_START + 203) -#define HID_SVXCTL_MAIL_ATTACH (HID_SVX_START + 204) -#define HID_SVXDLG_REGISTRATION (HID_SVX_START + 205) -#define HID_SVXDLG_TREE_BASE (HID_SVX_START + 206) -#define HID_SVXDLG_TREE_CHART (HID_SVX_START + 207) -#define HID_SVXDLG_TREE_FILTER (HID_SVX_START + 208) -#define HID_SVXDLG_TREE_LANGUAGE (HID_SVX_START + 209) -#define HID_SVXWIN_MAIL_ATTACH (HID_SVX_START + 210) -#define HID_SVXWIN_MAIL_HEADER (HID_SVX_START + 211) -#define HID_SVX_DLGFORMNEW (HID_SVX_START + 212) -#define HID_SVX_DLGTABNEW (HID_SVX_START + 213) -#define HID_SVX_HYPERLINK (HID_SVX_START + 214) -#define HID_SVX_MAILATTACH_ASCII_CB (HID_SVX_START + 215) -#define HID_SVX_MAILATTACH_HTML_CB (HID_SVX_START + 216) -#define HID_SVX_MAILATTACH_OFFICE_CB (HID_SVX_START + 217) -#define HID_SVX_MAILATTACH_PRIORITY_LB (HID_SVX_START + 218) -#define HID_SVX_MAILATTACH_RECEIPT_CB (HID_SVX_START + 219) -#define HID_SVX_MAILATTACH_RTF_CB (HID_SVX_START + 220) -#define HID_SVX_MAILHEAD_HEAD_WIN (HID_SVX_START + 221) -#define HID_SVX_MAILHEAD_PRIORITY_LB (HID_SVX_START + 222) -#define HID_SVX_MAILHEAD_PROTOCOL_LB (HID_SVX_START + 223) -#define HID_SVX_MAILHEAD_RCPT_CB (HID_SVX_START + 224) -#define HID_SVX_MAILHEAD_RCPT_ED (HID_SVX_START + 225) -#define HID_SVX_MAILHEAD_RCPT_LB (HID_SVX_START + 226) -#define HID_SVX_MAILHEAD_RECEIPT_CB (HID_SVX_START + 227) -#define HID_SVX_MAILHEAD_ROLE_LB (HID_SVX_START + 228) -#define HID_SVX_MAILHEAD_SUBJECT_ED (HID_SVX_START + 229) -#define HID_SVX_MAILMENU_ADDADDRESS (HID_SVX_START + 230) -#define HID_SVX_MAILMENU_COPYLINK (HID_SVX_START + 231) -#define HID_SVX_MAILMENU_DELETE (HID_SVX_START + 232) -#define HID_SVX_MAILMENU_FILE (HID_SVX_START + 233) -#define HID_SVX_MAILMENU_OPEN (HID_SVX_START + 234) -#define HID_SVX_MAILMENU_RENAME (HID_SVX_START + 235) -#define HID_SVX_MAILMENU_SAVEAS (HID_SVX_START + 236) -#define HID_SVX_MAILMENU_SIG1 (HID_SVX_START + 237) -#define HID_SVX_MAILMENU_SIG2 (HID_SVX_START + 238) -#define HID_SVX_MAILMENU_SIG3 (HID_SVX_START + 239) -#define HID_SVX_MAILMENU_SIG4 (HID_SVX_START + 240) -#define HID_SVX_MAILTOOLBOX (HID_SVX_START + 241) -#define HID_SVX_SENDMENU_ENCRYPT (HID_SVX_START + 242) -#define HID_SVX_SENDMENU_PLAIN (HID_SVX_START + 243) -#define HID_SVX_SENDMENU_SIGN (HID_SVX_START + 244) -#define HID_SVX_SENDMENU_SIGNANDENCRYPT (HID_SVX_START + 245) -#define HID_SVX_TP_APPEARANCE (HID_SVX_START + 246) -#define HID_SVX_TP_DESKTOP (HID_SVX_START + 247) - -// please adjust ACT_SVX_HID_END2 below if you add entries here! - -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_SVX_HID_END (HID_SVX_START+247) -#if ACT_SVX_HID_END > HID_SVX_END -#error Resource-Ueberlauf in #line, #file -#endif +#define HID_VALUESET_EXTRUSION_DIRECTION "SVX_HID_VALUESET_EXTRUSION_DIRECTION" +#define HID_VALUESET_EXTRUSION_LIGHTING "SVX_HID_VALUESET_EXTRUSION_LIGHTING" +#define HID_WIN_FONTWORK_ALIGN "SVX_HID_WIN_FONTWORK_ALIGN" +#define HID_WIN_FONTWORK_CHARSPACE "SVX_HID_WIN_FONTWORK_CHARSPACE" +#define HID_XMLSEC_CALL "SVX_HID_XMLSEC_CALL" +#define HID_OFA_HYPERLINK_DLG "SVX_HID_OFA_HYPERLINK_DLG" +#define HID_OFA_HYPERLINK_NAME "SVX_HID_OFA_HYPERLINK_NAME" +#define HID_OFA_HYPERLINK_SEARCH "SVX_HID_OFA_HYPERLINK_SEARCH" +#define HID_OFA_HYPERLINK_TARGET "SVX_HID_OFA_HYPERLINK_TARGET" +#define HID_OFA_HYPERLINK_URL "SVX_HID_OFA_HYPERLINK_URL" +#define HID_OFA_HYPERLINK_URL_TXT "SVX_HID_OFA_HYPERLINK_URL_TXT" +#define HID_AUTOCORR_DLG "SVX_HID_AUTOCORR_DLG" +#define HID_SVXCTL_MAIL_ATTACH "SVX_HID_SVXCTL_MAIL_ATTACH" +#define HID_SVXDLG_REGISTRATION "SVX_HID_SVXDLG_REGISTRATION" +#define HID_SVXDLG_TREE_BASE "SVX_HID_SVXDLG_TREE_BASE" +#define HID_SVXDLG_TREE_CHART "SVX_HID_SVXDLG_TREE_CHART" +#define HID_SVXDLG_TREE_FILTER "SVX_HID_SVXDLG_TREE_FILTER" +#define HID_SVXDLG_TREE_LANGUAGE "SVX_HID_SVXDLG_TREE_LANGUAGE" +#define HID_SVXWIN_MAIL_ATTACH "SVX_HID_SVXWIN_MAIL_ATTACH" +#define HID_SVXWIN_MAIL_HEADER "SVX_HID_SVXWIN_MAIL_HEADER" +#define HID_SVX_DLGFORMNEW "SVX_HID_SVX_DLGFORMNEW" +#define HID_SVX_DLGTABNEW "SVX_HID_SVX_DLGTABNEW" +#define HID_SVX_HYPERLINK "SVX_HID_SVX_HYPERLINK" +#define HID_SVX_MAILATTACH_ASCII_CB "SVX_HID_SVX_MAILATTACH_ASCII_CB" +#define HID_SVX_MAILATTACH_HTML_CB "SVX_HID_SVX_MAILATTACH_HTML_CB" +#define HID_SVX_MAILATTACH_OFFICE_CB "SVX_HID_SVX_MAILATTACH_OFFICE_CB" +#define HID_SVX_MAILATTACH_PRIORITY_LB "SVX_HID_SVX_MAILATTACH_PRIORITY_LB" +#define HID_SVX_MAILATTACH_RECEIPT_CB "SVX_HID_SVX_MAILATTACH_RECEIPT_CB" +#define HID_SVX_MAILATTACH_RTF_CB "SVX_HID_SVX_MAILATTACH_RTF_CB" +#define HID_SVX_MAILHEAD_HEAD_WIN "SVX_HID_SVX_MAILHEAD_HEAD_WIN" +#define HID_SVX_MAILHEAD_PRIORITY_LB "SVX_HID_SVX_MAILHEAD_PRIORITY_LB" +#define HID_SVX_MAILHEAD_PROTOCOL_LB "SVX_HID_SVX_MAILHEAD_PROTOCOL_LB" +#define HID_SVX_MAILHEAD_RCPT_CB "SVX_HID_SVX_MAILHEAD_RCPT_CB" +#define HID_SVX_MAILHEAD_RCPT_ED "SVX_HID_SVX_MAILHEAD_RCPT_ED" +#define HID_SVX_MAILHEAD_RCPT_LB "SVX_HID_SVX_MAILHEAD_RCPT_LB" +#define HID_SVX_MAILHEAD_RECEIPT_CB "SVX_HID_SVX_MAILHEAD_RECEIPT_CB" +#define HID_SVX_MAILHEAD_ROLE_LB "SVX_HID_SVX_MAILHEAD_ROLE_LB" +#define HID_SVX_MAILHEAD_SUBJECT_ED "SVX_HID_SVX_MAILHEAD_SUBJECT_ED" +#define HID_SVX_MAILMENU_ADDADDRESS "SVX_HID_SVX_MAILMENU_ADDADDRESS" +#define HID_SVX_MAILMENU_COPYLINK "SVX_HID_SVX_MAILMENU_COPYLINK" +#define HID_SVX_MAILMENU_DELETE "SVX_HID_SVX_MAILMENU_DELETE" +#define HID_SVX_MAILMENU_FILE "SVX_HID_SVX_MAILMENU_FILE" +#define HID_SVX_MAILMENU_OPEN "SVX_HID_SVX_MAILMENU_OPEN" +#define HID_SVX_MAILMENU_RENAME "SVX_HID_SVX_MAILMENU_RENAME" +#define HID_SVX_MAILMENU_SAVEAS "SVX_HID_SVX_MAILMENU_SAVEAS" +#define HID_SVX_MAILMENU_SIG1 "SVX_HID_SVX_MAILMENU_SIG1" +#define HID_SVX_MAILMENU_SIG2 "SVX_HID_SVX_MAILMENU_SIG2" +#define HID_SVX_MAILMENU_SIG3 "SVX_HID_SVX_MAILMENU_SIG3" +#define HID_SVX_MAILMENU_SIG4 "SVX_HID_SVX_MAILMENU_SIG4" +#define HID_SVX_MAILTOOLBOX "SVX_HID_SVX_MAILTOOLBOX" +#define HID_SVX_SENDMENU_ENCRYPT "SVX_HID_SVX_SENDMENU_ENCRYPT" +#define HID_SVX_SENDMENU_PLAIN "SVX_HID_SVX_SENDMENU_PLAIN" +#define HID_SVX_SENDMENU_SIGN "SVX_HID_SVX_SENDMENU_SIGN" +#define HID_SVX_SENDMENU_SIGNANDENCRYPT "SVX_HID_SVX_SENDMENU_SIGNANDENCRYPT" +#define HID_SVX_TP_APPEARANCE "SVX_HID_SVX_TP_APPEARANCE" +#define HID_SVX_TP_DESKTOP "SVX_HID_SVX_TP_DESKTOP" #endif diff --git a/svx/inc/svx/dialogs.hrc b/svx/inc/svx/dialogs.hrc index d193652b57fc..e1b785cf3bee 100644 --- a/svx/inc/svx/dialogs.hrc +++ b/svx/inc/svx/dialogs.hrc @@ -317,10 +317,6 @@ #define RID_SVXBMP_3D_FOCAL_LENGTH_09 (RID_SVX_START + 180) #define RID_SVXBMP_3D_FOCAL_LENGTH_10 (RID_SVX_START + 181) -// fuer ToolboxControls Alignment und Drawobjekte -#define RID_SVXTBX_DRAW (RID_SVX_START + 189) -#define RID_SVXTBX_ALIGNMENT (RID_SVX_START + 190) - // Ids fuer Autokorrektur #define RID_SVX_AUTOCORR (RID_SVX_START + 192) diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc index 68cd1b224650..4d885e422b70 100644 --- a/svx/inc/svx/exthelpid.hrc +++ b/svx/inc/svx/exthelpid.hrc @@ -37,19 +37,10 @@ // are moved to this exported (delivered) hrc file // Help-Ids -------------------------------------------------------------- -#define HID_GALLERY_ACTUALIZE (HID_SVX_EXT0_START + 0) -#define HID_GALLERY_TITLE (HID_SVX_EXT0_START + 1) +#define HID_GALLERY_ACTUALIZE "SVX_HID_GALLERY_ACTUALIZE" +#define HID_GALLERY_TITLE "SVX_HID_GALLERY_TITLE" // please adjust ACT_SVX_EXT_HID_END2 below if you add entries here! -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_SVX_EXT_HID_END (HID_SVX_EXT0_START + 1) -#if ACT_SVX_EXT_HID_END > HID_SVX_EXT0_END -#error Resource-Ueberlauf in #line, #file -#endif - #endif diff --git a/svx/inc/svx/simptabl.hxx b/svx/inc/svx/simptabl.hxx index c409ed5b63be..e24dedbdc22c 100644 --- a/svx/inc/svx/simptabl.hxx +++ b/svx/inc/svx/simptabl.hxx @@ -172,8 +172,7 @@ public: void SetHeaderBarDblClickHdl( const Link& rLink ) { aHeaderBarDblClickLink = rLink; } const Link& GetHeaderBarDblClickHdl() const { return aHeaderBarDblClickLink; } - // FIXME: HELPID - void SetHeaderBarHelpId(ULONG /*nHelpId*/) {aHeaderBar.SetHelpId(""/*nHelpId*/);} + void SetHeaderBarHelpId(const rtl::OString& rHelpId) {aHeaderBar.SetHelpId(rHelpId);} }; diff --git a/svx/inc/svx/svxcommands.h b/svx/inc/svx/svxcommands.h new file mode 100644 index 000000000000..54376da62e7b --- /dev/null +++ b/svx/inc/svx/svxcommands.h @@ -0,0 +1,604 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SVX_SVXCOMMANDS_HRC +#define SVX_SVXCOMMANDS_HRC + +#define CMD_SID_INET_DLG ".uno:InternetDialog" +#define CMD_SID_FM_RECORD_ABSOLUTE ".uno:AbsoluteRecord" +#define CMD_SID_FM_ADD_FIELD ".uno:AddField" +#define CMD_SID_FM_ADDTABLE ".uno:AddTable" +#define CMD_SID_OBJECT_ALIGN_CENTER ".uno:AlignCenter" +#define CMD_SID_OBJECT_ALIGN_DOWN ".uno:AlignDown" +#define CMD_SID_OBJECT_ALIGN_LEFT ".uno:ObjectAlignLeft" +#define CMD_SID_ATTR_PARA_ADJUST ".uno:Alignment" +#define CMD_SID_OBJECT_ALIGN_MIDDLE ".uno:AlignMiddle" +#define CMD_SID_OBJECT_ALIGN_RIGHT ".uno:ObjectAlignRight" +#define CMD_SID_OBJECT_ALIGN_UP ".uno:AlignUp" +#define CMD_SID_DRAW_ARC ".uno:Arc" +#define CMD_SID_3D_ASSIGN ".uno:Assign3D" +#define CMD_SID_FM_AUTOCONTROLFOCUS ".uno:AutoControlFocus" +#define CMD_SID_FM_AUTOFILTER ".uno:AutoFilter" +#define CMD_SID_AUTOFORMAT ".uno:AutoFormat" +#define CMD_SID_TABLE_STYLE ".uno:TableStyle" +#define CMD_SID_TABLE_STYLE_SETTINGS ".uno:TableStyleSettings" +#define CMD_SID_TABLEDESIGN ".uno:TableDesign" +#define CMD_SID_BACKGROUND_COLOR ".uno:BackgroundColor" +#define CMD_SID_ATTR_BRUSH ".uno:BackgroundPattern" +#define CMD_SID_BACKGROUND_PATTERN ".uno:BackgroundPatternController" +#define CMD_SID_DRAW_BEZIER_NOFILL ".uno:Bezier_Unfilled" +#define CMD_SID_BEZIER_APPEND ".uno:BezierAppend" +#define CMD_SID_BEZIER_CLOSE ".uno:BezierClose" +#define CMD_SID_BEZIER_CONVERT ".uno:BezierConvert" +#define CMD_SID_BEZIER_CUTLINE ".uno:BezierCutLine" +#define CMD_SID_BEZIER_DELETE ".uno:BezierDelete" +#define CMD_SID_BEZIER_EDGE ".uno:BezierEdge" +#define CMD_SID_BEZIER_ELIMINATE_POINTS ".uno:BezierEliminatePoints" +#define CMD_SID_DRAW_BEZIER_FILL ".uno:BezierFill" +#define CMD_SID_BEZIER_INSERT ".uno:BezierInsert" +#define CMD_SID_BEZIER_MOVE ".uno:BezierMove" +#define CMD_SID_BEZIER_SMOOTH ".uno:BezierSmooth" +#define CMD_SID_BEZIER_SYMMTR ".uno:BezierSymmetric" +#define CMD_SID_BEZIERTO ".uno:BezierTo" +#define CMD_SID_BMPMASK ".uno:BmpMask" +#define CMD_SID_BMPMASK_EXEC ".uno:BmpMaskExec" +#define CMD_SID_BMPMASK_PIPETTE ".uno:BmpMaskPipette" +#define CMD_SID_ATTR_CHAR_WEIGHT ".uno:Bold" +#define CMD_SID_ATTR_CHAR_LATIN_WEIGHT ".uno:BoldLatin" +#define CMD_SID_ATTR_CHAR_CJK_WEIGHT ".uno:BoldCJK" +#define CMD_SID_ATTR_CHAR_CTL_WEIGHT ".uno:BoldCTL" +#define CMD_SID_BORDER_OBJECT ".uno:Border" +#define CMD_SID_ATTR_BORDER_INNER ".uno:BorderInner" +#define CMD_SID_ATTR_BORDER_OUTER ".uno:BorderOuter" +#define CMD_SID_ATTR_BORDER ".uno:SetBorderStyle" +#define CMD_SID_FRAME_TO_TOP ".uno:BringToFront" +#define CMD_SID_DRAW_CAPTION ".uno:DrawCaption" +#define CMD_SID_ATTR_CHAR_CASEMAP ".uno:CaseMap" +#define CMD_SID_ATTR_PARA_ADJUST_CENTER ".uno:CenterPara" +#define CMD_SID_TRANSLITERATE_FULLWIDTH ".uno:ChangeCaseToFullWidth" +#define CMD_SID_TRANSLITERATE_HALFWIDTH ".uno:ChangeCaseToHalfWidth" +#define CMD_SID_TRANSLITERATE_HIRAGANA ".uno:ChangeCaseToHiragana" +#define CMD_SID_TRANSLITERATE_KATAGANA ".uno:ChangeCaseToKatakana" +#define CMD_SID_TRANSLITERATE_LOWER ".uno:ChangeCaseToLower" +#define CMD_SID_TRANSLITERATE_UPPER ".uno:ChangeCaseToUpper" +#define CMD_SID_FM_CHANGECONTROLTYPE ".uno:ChangeControlType" +#define CMD_SID_ATTR_CHAR_FONT ".uno:CharFontName" +#define CMD_SID_ATTR_CHAR_LATIN_FONT ".uno:CharFontNameLatin" +#define CMD_SID_ATTR_CHAR_CJK_FONT ".uno:CharFontNameCJK" +#define CMD_SID_ATTR_CHAR_CTL_FONT ".uno:CharFontNameCTL" +#define CMD_SID_INSERT_CHECKBOX ".uno:Checkbox" +#define CMD_SID_FM_CHECKBOX ".uno:CheckBox" +#define CMD_SID_CHOOSE_CONTROLS ".uno:ChooseControls" +#define CMD_SID_CHOOSE_POLYGON ".uno:ChoosePolygon" +#define CMD_SID_DRAW_CIRCLE ".uno:Circle" +#define CMD_SID_DRAW_CIRCLE_NOFILL ".uno:Circle_Unfilled" +#define CMD_SID_DRAW_CIRCLEARC ".uno:CircleArc" +#define CMD_SID_DRAW_CIRCLECUT ".uno:CircleCut" +#define CMD_SID_DRAW_CIRCLECUT_NOFILL ".uno:CircleCut_Unfilled" +#define CMD_SID_DRAW_CIRCLEPIE ".uno:CirclePie" +#define CMD_SID_DRAW_CIRCLEPIE_NOFILL ".uno:CirclePie_Unfilled" +#define CMD_SID_OUTLINE_DELETEALL ".uno:ClearOutline" +#define CMD_SID_ATTR_CHAR_COLOR ".uno:Color" +#define CMD_SID_COLOR_CONTROL ".uno:ColorControl" +#define CMD_SID_FM_COMBOBOX ".uno:ComboBox" +#define CMD_SID_FM_NAVIGATIONBAR ".uno:NavigationBar" +#define CMD_SID_INSERT_COMBOBOX ".uno:Combobox" +#define CMD_SID_FM_CONFIG ".uno:Config" +#define CMD_SID_FM_MORE_CONTROLS ".uno:MoreControls" +#define CMD_SID_FM_FORM_DESIGN_TOOLS ".uno:FormDesignTools" +#define CMD_SID_CONTOUR_DLG ".uno:ContourDialog" +#define CMD_SID_CONTOUR_EXEC ".uno:ContourExecute" +#define CMD_SID_FM_CTL_PROPERTIES ".uno:ControlProperties" +#define CMD_SID_FM_CONVERTTO_BUTTON ".uno:ConvertToButton" +#define CMD_SID_FM_CONVERTTO_CHECKBOX ".uno:ConvertToCheckBox" +#define CMD_SID_FM_CONVERTTO_COMBOBOX ".uno:ConvertToCombo" +#define CMD_SID_FM_CONVERTTO_CURRENCY ".uno:ConvertToCurrency" +#define CMD_SID_FM_CONVERTTO_DATE ".uno:ConvertToDate" +#define CMD_SID_FM_CONVERTTO_EDIT ".uno:ConvertToEdit" +#define CMD_SID_FM_CONVERTTO_FILECONTROL ".uno:ConvertToFileControl" +#define CMD_SID_FM_CONVERTTO_FIXEDTEXT ".uno:ConvertToFixed" +#define CMD_SID_FM_CONVERTTO_FORMATTED ".uno:ConvertToFormatted" +#define CMD_SID_FM_CONVERTTO_SCROLLBAR ".uno:ConvertToScrollBar" +#define CMD_SID_FM_CONVERTTO_SPINBUTTON ".uno:ConvertToSpinButton" +#define CMD_SID_FM_CONVERTTO_GROUPBOX ".uno:ConvertToGroup" +#define CMD_SID_FM_CONVERTTO_IMAGEBUTTON ".uno:ConvertToImageBtn" +#define CMD_SID_FM_CONVERTTO_IMAGECONTROL ".uno:ConvertToImageControl" +#define CMD_SID_FM_CONVERTTO_LISTBOX ".uno:ConvertToList" +#define CMD_SID_FM_CONVERTTO_NUMERIC ".uno:ConvertToNumeric" +#define CMD_SID_FM_CONVERTTO_PATTERN ".uno:ConvertToPattern" +#define CMD_SID_FM_CONVERTTO_RADIOBUTTON ".uno:ConvertToRadio" +#define CMD_SID_FM_CONVERTTO_TIME ".uno:ConvertToTime" +#define CMD_SID_FM_CONVERTTO_NAVIGATIONBAR ".uno:ConvertToNavigationBar" +#define CMD_SID_FM_COUNTALL ".uno:CountAll" +#define CMD_SID_FM_CREATE_CONTROL ".uno:CreateControl" +#define CMD_SID_INSERT_CURRENCYFIELD ".uno:InsertCurrencyField" +#define CMD_SID_FM_CURRENCYFIELD ".uno:CurrencyField" +#define CMD_SID_DASH ".uno:Dash" +#define CMD_SID_INSERT_DATEFIELD ".uno:AddDateField" +#define CMD_SID_FM_DATEFIELD ".uno:DateField" +#define CMD_FN_NUM_BULLET_ON ".uno:DefaultBullet" +#define CMD_SID_FM_RECORD_DELETE ".uno:DeleteRecord" +#define CMD_SID_FM_DESIGN_MODE ".uno:SwitchControlDesignMode" +#define CMD_SID_DISTRIBUTE_DLG ".uno:DistributeSelection" +#define CMD_SID_DRAW_SELECT ".uno:DrawSelect" +#define CMD_SID_INSERT_DRAW ".uno:InsertDraw" +#define CMD_SID_DSBROWSER_EXPLORER ".uno:DSBrowserExplorer" +#define CMD_SID_FM_EDIT ".uno:Edit" +#define CMD_SID_INSERT_EDIT ".uno:InsertEdit" +#define CMD_SID_DRAW_ELLIPSE ".uno:Ellipse" +#define CMD_SID_DRAW_ELLIPSE_NOFILL ".uno:Ellipse_Unfilled" +#define CMD_SID_DRAW_ELLIPSECUT ".uno:EllipseCut" +#define CMD_SID_DRAW_ELLIPSECUT_NOFILL ".uno:EllipseCut_Unfilled" +#define CMD_SID_ENTER_GROUP ".uno:EnterGroup" +#define CMD_SID_ATTR_CHAR_ESCAPEMENT ".uno:Escapement" +#define CMD_SID_FM_FIELDS_CONTROL ".uno:FieldController" +#define CMD_SID_FM_FILECONTROL ".uno:FileControl" +#define CMD_SID_INSERT_FILECONTROL ".uno:InsertFileControl" +#define CMD_SID_INSERT_TREECONTROL ".uno:InsertTreeControl" +#define CMD_SID_ATTR_FILL_BITMAP ".uno:FillBitmap" +#define CMD_SID_ATTR_FILL_COLOR ".uno:FillColor" +#define CMD_SID_ATTR_FILL_GRADIENT ".uno:FillGradient" +#define CMD_SID_ATTR_FILL_HATCH ".uno:FillHatch" +#define CMD_SID_ATTR_FILL_STYLE ".uno:FillStyle" +#define CMD_SID_FM_FILTERCRIT ".uno:FilterCrit" +#define CMD_SID_FM_RECORD_FIRST ".uno:FirstRecord" +#define CMD_SID_ATTR_FLASH ".uno:Flash" +#define CMD_SID_FM_FMEXPLORER_CONTROL ".uno:FmExplorerController" +#define CMD_SID_FM_FILTER_NAVIGATOR_CONTROL ".uno:FmFilterNavigatorController" +#define CMD_SID_CHAR_DLG ".uno:FontDialog" +#define CMD_SID_ATTR_CHAR_FONTHEIGHT ".uno:FontHeight" +#define CMD_SID_ATTR_CHAR_LATIN_FONTHEIGHT ".uno:FontHeighLatin" +#define CMD_SID_ATTR_CHAR_CJK_FONTHEIGHT ".uno:FontHeightCJK" +#define CMD_SID_ATTR_CHAR_CTL_FONTHEIGHT ".uno:FontHeightCTL" +#define CMD_SID_FONTWORK ".uno:FontWork" +#define CMD_SID_FORMTEXT_ADJUST ".uno:FontWorkTextAdjust" +#define CMD_SID_FORMTEXT_STDFORM ".uno:FontWorkTextClearAttributes" +#define CMD_SID_FORMTEXT_DISTANCE ".uno:FontWorkTextDistance" +#define CMD_SID_FORMTEXT_MIRROR ".uno:FontWorkTextMirror" +#define CMD_SID_FORMTEXT_OUTLINE ".uno:FontWorkTextOutline" +#define CMD_SID_FORMTEXT_SHADOW ".uno:FontWorkTextShadow" +#define CMD_SID_FORMTEXT_SHDWCOLOR ".uno:FontWorkTextShadowColor" +#define CMD_SID_FORMTEXT_SHDWXVAL ".uno:FontWorkTextShadowXVal" +#define CMD_SID_FORMTEXT_SHDWYVAL ".uno:FontWorkTextShadowYVal" +#define CMD_SID_FORMTEXT_START ".uno:FontWorkTextStart" +#define CMD_SID_FORMTEXT_STYLE ".uno:FontWorkTextStyle" +#define CMD_SID_ATTRIBUTES_AREA ".uno:FormatArea" +#define CMD_SID_FORMTEXT_HIDEFORM ".uno:FormatFontWorkClose" +#define CMD_SID_GROUP ".uno:FormatGroup" +#define CMD_SID_ATTRIBUTES_LINE ".uno:FormatLine" +#define CMD_SID_FM_FORMATTEDFIELD ".uno:FormattedField" +#define CMD_SID_FM_SCROLLBAR ".uno:ScrollBar" +#define CMD_SID_FM_SPINBUTTON ".uno:SpinButton" +#define CMD_SID_INSERT_FORMATTEDFIELD ".uno:InsertFormattedField" +#define CMD_SID_UNGROUP ".uno:FormatUngroup" +#define CMD_SID_FM_FILTER_START ".uno:FormFilter" +#define CMD_SID_FM_FORM_FILTERED ".uno:FormFiltered" +#define CMD_SID_FM_FILTER_EXECUTE ".uno:FormFilterExecute" +#define CMD_SID_FM_FILTER_EXIT ".uno:FormFilterExit" +#define CMD_SID_FM_FILTER_NAVIGATOR ".uno:FormFilterNavigator" +#define CMD_SID_FM_PROPERTIES ".uno:FormProperties" +#define CMD_SID_DRAW_FREELINE ".uno:Freeline" +#define CMD_SID_DRAW_FREELINE_NOFILL ".uno:Freeline_Unfilled" +#define CMD_SID_ATTR_AUTO_COLOR_INVALID ".uno:AutoColorInvalid" +#define CMD_SID_GALLERY ".uno:Gallery" +#define CMD_SID_GALLERY_ENABLE_ADDCOPY ".uno:GalleryEnableAddCopy" +#define CMD_SID_GETREDOSTRINGS ".uno:GetRedoStrings" +#define CMD_SID_GETUNDOSTRINGS ".uno:GetUndoStrings" +#define CMD_SID_ATTR_GRAF_CROP ".uno:GrafAttrCrop" +#define CMD_SID_ATTR_GRAF_BLUE ".uno:GrafBlue" +#define CMD_SID_ATTR_GRAF_CONTRAST ".uno:GrafContrast" +#define CMD_SID_ATTR_GRAF_GAMMA ".uno:GrafGamma" +#define CMD_SID_ATTR_GRAF_GREEN ".uno:GrafGreen" +#define CMD_SID_ATTR_GRAF_INVERT ".uno:GrafInvert" +#define CMD_SID_ATTR_GRAF_LUMINANCE ".uno:GrafLuminance" +#define CMD_SID_ATTR_GRAF_MODE ".uno:GrafMode" +#define CMD_SID_ATTR_GRAF_RED ".uno:GrafRed" +#define CMD_SID_ATTR_GRAF_TRANSPARENCE ".uno:GrafTransparence" +#define CMD_SID_GRFFILTER_INVERT ".uno:GraphicFilterInvert" +#define CMD_SID_GRFFILTER_MOSAIC ".uno:GraphicFilterMosaic" +#define CMD_SID_GRFFILTER_POPART ".uno:GraphicFilterPopart" +#define CMD_SID_GRFFILTER_POSTER ".uno:GraphicFilterPoster" +#define CMD_SID_GRFFILTER_EMBOSS ".uno:GraphicFilterRelief" +#define CMD_SID_GRFFILTER_REMOVENOISE ".uno:GraphicFilterRemoveNoise" +#define CMD_SID_GRFFILTER_SEPIA ".uno:GraphicFilterSepia" +#define CMD_SID_GRFFILTER_SHARPEN ".uno:GraphicFilterSharpen" +#define CMD_SID_GRFFILTER_SMOOTH ".uno:GraphicFilterSmooth" +#define CMD_SID_GRFFILTER_SOBEL ".uno:GraphicFilterSobel" +#define CMD_SID_GRFFILTER_SOLARIZE ".uno:GraphicFilterSolarize" +#define CMD_SID_GRFFILTER ".uno:GraphicFilterToolbox" +#define CMD_SID_FM_DBGRID ".uno:Grid" +#define CMD_SID_GRID_USE ".uno:GridUse" +#define CMD_SID_GRID_VISIBLE ".uno:GridVisible" +#define CMD_SID_OUTLINE_MAKE ".uno:Group" +#define CMD_SID_FM_GROUPBOX ".uno:GroupBox" +#define CMD_SID_INSERT_GROUPBOX ".uno:Groupbox" +#define CMD_SID_RULER_LR_MIN_MAX ".uno:HeaderFooterBorder" +#define CMD_SID_HELPLINES_MOVE ".uno:HelplinesMove" +#define CMD_SID_INSERT_HFIXEDLINE ".uno:HFixedLine" +#define CMD_SID_OUTLINE_HIDE ".uno:HideDetail" +#define CMD_SID_INSERT_HSCROLLBAR ".uno:HScrollbar" +#define CMD_SID_HYPERLINK_GETLINK ".uno:Hyperlink" +#define CMD_SID_FM_IMAGEBUTTON ".uno:Imagebutton" +#define CMD_SID_FM_IMAGECONTROL ".uno:ImageControl" +#define CMD_SID_INSERT_IMAGECONTROL ".uno:InsertImageControl" +#define CMD_SID_IMAP ".uno:ImageMapDialog" +#define CMD_SID_IMAP_EXEC ".uno:ImageMapExecute" +#define CMD_SID_3D_INIT ".uno:Init3D" +#define CMD_SID_OBJECTRESIZE ".uno:InPlaceObjectResize" +#define CMD_SID_ENTER_STRING ".uno:EnterString" +#define CMD_SID_INSERT_POSTIT ".uno:InsertAnnotation" +#define CMD_SID_SHOW_POSTIT ".uno:ShowAnnotations" +#define CMD_SID_REPLYTO_POSTIT ".uno:ReplyToAnnotation" +#define CMD_SID_DELETE_POSTIT ".uno:DeleteAnnotation" +#define CMD_SID_DELETEALL_POSTIT ".uno:DeleteAllAnnotation" +#define CMD_SID_DELETEALLBYAUTHOR_POSTIT ".uno:DeleteAllAnnotationByAuthor" +#define CMD_SID_NEXT_POSTIT ".uno:NextAnnotation" +#define CMD_SID_PREVIOUS_POSTIT ".uno:PreviousAnnotation" +#define CMD_SID_INSERT_APPLET ".uno:InsertApplet" +#define CMD_SID_GALLERY_FORMATS ".uno:InsertGalleryPic" +#define CMD_SID_INSERT_GRAPHIC ".uno:InsertGraphic" +#define CMD_SID_INSERT_IMAGE ".uno:InsertImage" +#define CMD_SID_INSERT_MATH ".uno:InsertMath" +#define CMD_SID_ATTR_INSERT ".uno:InsertMode" +#define CMD_FN_NUM_NUMBERING_ON ".uno:DefaultNumbering" +#define CMD_SID_INSERT_OBJECT ".uno:InsertObject" +#define CMD_SID_INSERT_DIAGRAM ".uno:InsertObjectChart" +#define CMD_SID_INSERT_PLUGIN ".uno:InsertPlugin" +#define CMD_SID_INSERT_SOUND ".uno:InsertSound" +#define CMD_SID_CHARMAP ".uno:InsertSymbol" +#define CMD_SID_ATTR_TABLE ".uno:InsertSpreadsheet" +#define CMD_SID_INSERT_TABLE ".uno:InsertTable" +#define CMD_SID_INSERT_FRAME ".uno:InsertTextFrame" +#define CMD_SID_INSERT_VIDEO ".uno:InsertVideo" +#define CMD_SID_POLY_INTERSECT ".uno:Intersect" +#define CMD_SID_ATTR_CHAR_POSTURE ".uno:Italic" +#define CMD_SID_ATTR_CHAR_LATIN_POSTURE ".uno:ItalicLatin" +#define CMD_SID_ATTR_CHAR_CJK_POSTURE ".uno:ItalicCJK" +#define CMD_SID_ATTR_CHAR_CTL_POSTURE ".uno:ItalicCTL" +#define CMD_SID_ATTR_PARA_ADJUST_BLOCK ".uno:JustifyPara" +#define CMD_SID_INSERT_FIXEDTEXT ".uno:InsertFixedText" +#define CMD_SID_FM_FIXEDTEXT ".uno:Label" +#define CMD_SID_ATTR_CHAR_LANGUAGE ".uno:Language" +#define CMD_SID_ATTR_CHAR_LATIN_LANGUAGE ".uno:LanguageLatin" +#define CMD_SID_FM_RECORD_LAST ".uno:LastRecord" +#define CMD_SID_FM_LEAVE_CREATE ".uno:LeaveFMCreateMode" +#define CMD_SID_LEAVE_GROUP ".uno:LeaveGroup" +#define CMD_SID_ATTR_PARA_ADJUST_LEFT ".uno:LeftPara" +#define CMD_SID_ATTR_LRSPACE ".uno:LeftRightMargin" +#define CMD_SID_ATTR_PARA_LRSPACE ".uno:LeftRightParaMargin" +#define CMD_SID_ATTR_PARA_LRSPACE_VERTICAL ".uno:LeftRightParaMargin_Vertical" +#define CMD_SID_DRAW_LINE ".uno:Line" +#define CMD_SID_DRAW_XLINE ".uno:Line_Diagonal" +#define CMD_SID_FRAME_LINECOLOR ".uno:FrameLineColor" +#define CMD_SID_ATTR_LINE_DASH ".uno:LineDash" +#define CMD_SID_ATTR_LINEEND_STYLE ".uno:LineEndStyle" +#define CMD_SID_ATTR_PARA_LINESPACE ".uno:LineSpacing" +#define CMD_SID_FRAME_LINESTYLE ".uno:LineStyle" +#define CMD_SID_ATTR_LINE_WIDTH ".uno:LineWidth" +#define CMD_SID_FM_LISTBOX ".uno:ListBox" +#define CMD_SID_INSERT_LISTBOX ".uno:InsertListbox" +#define CMD_SID_POLY_MERGE ".uno:Merge" +#define CMD_SID_BASICIDE_NEWJAVAMODULE ".uno:NewJavaModule" +#define CMD_SID_FM_RECORD_NEW ".uno:NewRecord" +#define CMD_SID_FM_RECORD_NEXT ".uno:NextRecord" +#define CMD_SID_FM_NUMERICFIELD ".uno:NumericField" +#define CMD_SID_INSERT_NUMERICFIELD ".uno:InsertNumericField" +#define CMD_SID_OBJECT_ALIGN ".uno:ObjectAlign" +#define CMD_SID_FRAME_DOWN ".uno:ObjectBackOne" +#define CMD_SID_FRAME_UP ".uno:ObjectForwardOne" +#define CMD_SID_FM_OPEN_READONLY ".uno:OpenReadOnly" +#define CMD_SID_FM_ORDERCRIT ".uno:OrderCrit" +#define CMD_SID_ATTR_PARA_ORPHANS ".uno:Orphan" +#define CMD_SID_OUTLINE_BULLET ".uno:OutlineBullet" +#define CMD_SID_OUTLINE_COLLAPSE ".uno:OutlineCollapse" +#define CMD_SID_OUTLINE_COLLAPSE_ALL ".uno:OutlineCollapseAll" +#define CMD_SID_OUTLINE_DOWN ".uno:OutlineDown" +#define CMD_SID_OUTLINE_EXPAND ".uno:OutlineExpand" +#define CMD_SID_OUTLINE_EXPAND_ALL ".uno:OutlineExpandAll" +#define CMD_SID_ATTR_CHAR_CONTOUR ".uno:OutlineFont" +#define CMD_SID_OUTLINE_FORMAT ".uno:OutlineFormat" +#define CMD_SID_OUTLINE_LEFT ".uno:OutlineLeft" +#define CMD_SID_OUTLINE_RIGHT ".uno:OutlineRight" +#define CMD_SID_OUTLINE_UP ".uno:OutlineUp" +#define CMD_SID_ATTR_PARA_PAGEBREAK ".uno:Pagebreak" +#define CMD_SID_ATTR_PAGE_PAPERBIN ".uno:PagePaperBin" +#define CMD_SID_ATTR_PAGE_SIZE ".uno:AttributePageSize" +#define CMD_SID_ATTR_PARA_MODEL ".uno:AttributeParaModel" +#define CMD_SID_ATTR_PAGE ".uno:AttributePage" +#define CMD_SID_ATTR_CHAR_AUTOKERN ".uno:PairKerning" +#define CMD_SID_PARA_DLG ".uno:ParagraphDialog" +#define CMD_SID_ATTR_PARA_KEEP ".uno:ParaKeepTogether" +#define CMD_SID_ATTR_PARA_SPLIT ".uno:ParaSplit" +#define CMD_SID_INSERT_PATTERNFIELD ".uno:InsertPatternField" +#define CMD_SID_FM_PATTERNFIELD ".uno:PatternField" +#define CMD_SID_DRAW_PIE ".uno:Pie" +#define CMD_SID_DRAW_PIE_NOFILL ".uno:Pie_Unfilled" +#define CMD_SID_POLY_FORMEN ".uno:PolyFormen" +#define CMD_SID_DRAW_XPOLYGON ".uno:Polygon_Diagonal" +#define CMD_SID_DRAW_XPOLYGON_NOFILL ".uno:Polygon_Diagonal_Unfilled" +#define CMD_SID_DRAW_POLYGON_NOFILL ".uno:Polygon_Unfilled" +#define CMD_SID_ATTR_POSITION ".uno:Position" +#define CMD_SID_INSERT_PREVIEW ".uno:Preview" +#define CMD_SID_FM_RECORD_PREV ".uno:PrevRecord" +#define CMD_SID_INSERT_PROGRESSBAR ".uno:ProgressBar" +#define CMD_SID_FM_PROPERTY_CONTROL ".uno:PropertyController" +#define CMD_SID_FM_PUSHBUTTON ".uno:Pushbutton" +#define CMD_SID_INSERT_PUSHBUTTON ".uno:InsertPushbutton" +#define CMD_SID_INSERT_RADIOBUTTON ".uno:Radiobutton" +#define CMD_SID_FM_RADIOBUTTON ".uno:RadioButton" +#define CMD_SID_READONLY_MODE ".uno:ReadOnlyMode" +#define CMD_SID_FM_RECORD_FROM_TEXT ".uno:RecFromText" +#define CMD_SID_FM_RECORD_SAVE ".uno:RecSave" +#define CMD_SID_FM_SEARCH ".uno:RecSearch" +#define CMD_SID_DRAW_RECT ".uno:Rect" +#define CMD_SID_DRAW_RECT_ROUND ".uno:Rect_Rounded" +#define CMD_SID_DRAW_RECT_ROUND_NOFILL ".uno:Rect_Rounded_Unfilled" +#define CMD_SID_DRAW_RECT_NOFILL ".uno:Rect_Unfilled" +#define CMD_SID_FM_RECORD_TEXT ".uno:RecText" +#define CMD_SID_FM_RECORD_TOTAL ".uno:RecTotal" +#define CMD_SID_FM_RECORD_UNDO ".uno:RecUndo" +#define CMD_SID_FM_REFRESH ".uno:Refresh" +#define CMD_SID_FM_REFRESH_FORM_CONTROL ".uno:RefreshFormControl" +#define CMD_SID_FM_FILTER_REMOVE ".uno:RemoveFilter" +#define CMD_SID_FM_REMOVE_FILTER_SORT ".uno:RemoveFilterSort" +#define CMD_FID_SEARCH_REPLACESET ".uno:ReplaceSet" +#define CMD_SID_ATTR_PARA_ADJUST_RIGHT ".uno:RightPara" +#define CMD_SID_RULER_BORDER_DISTANCE ".uno:RulerBorderDistance" +#define CMD_SID_RULER_BORDERS ".uno:RulerBorders" +#define CMD_SID_RULER_BORDERS_VERTICAL ".uno:RulerBordersVertical" +#define CMD_SID_RULER_NULL_OFFSET ".uno:RulerNullOffset" +#define CMD_SID_RULER_PAGE_POS ".uno:RulerPagePos" +#define CMD_SID_RULER_PROTECT ".uno:RulerProtect" +#define CMD_SID_FM_EXECUTE ".uno:SbaExecuteSql" +#define CMD_SID_FM_NATIVESQL ".uno:SbaNativeSql" +#define CMD_SID_SCAN ".uno:Scan" +#define CMD_SID_SC_EDITOPTIONS ".uno:ScEditOptions" +#define CMD_SID_SCH_EDITOPTIONS ".uno:SchEditOptions" +#define CMD_SID_SD_EDITOPTIONS ".uno:SdEditOptions" +#define CMD_SID_SD_GRAPHIC_OPTIONS ".uno:SdGraphicOptions" +#define CMD_FID_SEARCH_OFF ".uno:SearchOff" +#define CMD_FID_SEARCH_ON ".uno:SearchOn" +#define CMD_FID_SEARCH_SEARCHSET ".uno:SearchSet" +#define CMD_SID_SELECT ".uno:Select" +#define CMD_SID_FRAME_TO_BOTTOM ".uno:SendToBack" +#define CMD_SID_SET_DEFAULT ".uno:SetDefault" +#define CMD_SID_HYPERLINK_SETLINK ".uno:SetHyperlink" +#define CMD_SID_ATTR_PARA_HYPHENZONE ".uno:SetHyphenZone" +#define CMD_SID_ATTR_LONG_LRSPACE ".uno:SetLongLeftRightMargin" +#define CMD_SID_ATTR_LONG_ULSPACE ".uno:SetLongTopBottomMargin" +#define CMD_SID_OBJECT_HELL ".uno:SetObjectToBackground" +#define CMD_SID_OBJECT_HEAVEN ".uno:SetObjectToForeground" +#define CMD_SID_ATTR_PAGE_MAXSIZE ".uno:SetPageMaxSize" +#define CMD_SID_ATTR_BORDER_SHADOW ".uno:BorderShadow" +#define CMD_SID_ATTR_FILL_SHADOW ".uno:FillShadow" +#define CMD_SID_ATTR_CHAR_SHADOWED ".uno:Shadowed" +#define CMD_SID_OUTLINE_SHOW ".uno:ShowDetail" +#define CMD_SID_FM_SHOW_FMEXPLORER ".uno:ShowFmExplorer" +#define CMD_SID_SHOW_ITEMBROWSER ".uno:ShowItemBrowser" +#define CMD_SID_SHOW_PROPERTYBROWSER ".uno:ShowPropBrowser" +#define CMD_SID_FM_SHOW_PROPERTIES ".uno:ShowProperties" +#define CMD_SID_FM_SHOW_PROPERTY_BROWSER ".uno:ShowPropertyBrowser" +#define CMD_SID_RULER ".uno:ShowRuler" +#define CMD_SID_SIM_EDITOPTIONS ".uno:SimEditOptions" +#define CMD_SID_ATTR_SIZE ".uno:Size" +#define CMD_SID_SM_EDITOPTIONS ".uno:SmEditOptions" +#define CMD_SID_FM_SORTDOWN ".uno:SortDown" +#define CMD_SID_FM_SORTUP ".uno:Sortup" +#define CMD_SID_ATTR_PARA_LINESPACE_10 ".uno:SpacePara1" +#define CMD_SID_ATTR_PARA_LINESPACE_15 ".uno:SpacePara15" +#define CMD_SID_ATTR_PARA_LINESPACE_20 ".uno:SpacePara2" +#define CMD_SID_ATTR_CHAR_KERNING ".uno:Spacing" +#define CMD_SID_AUTOSPELL_CHECK ".uno:SpellOnline" +#define CMD_SID_INSERT_SPINBUTTON ".uno:Spinbutton" +#define CMD_SID_DRAW_SQUARE ".uno:Square" +#define CMD_SID_DRAW_SQUARE_ROUND ".uno:Square_Rounded" +#define CMD_SID_DRAW_SQUARE_ROUND_NOFILL ".uno:Square_Rounded_Unfilled" +#define CMD_SID_DRAW_SQUARE_NOFILL ".uno:Square_Unfilled" +#define CMD_SID_3D_STATE ".uno:State3D" +#define CMD_SID_ATTR_CHAR_STRIKEOUT ".uno:Strikeout" +#define CMD_SID_SET_SUB_SCRIPT ".uno:SubScript" +#define CMD_SID_POLY_SUBSTRACT ".uno:Substract" +#define CMD_SID_SET_SUPER_SCRIPT ".uno:SuperScript" +#define CMD_SID_SW_EDITOPTIONS ".uno:SwEditOptions" +#define CMD_SID_FM_TAB_DIALOG ".uno:TabDialog" +#define CMD_SID_ATTR_TABSTOP ".uno:Tabstops" +#define CMD_SID_ATTR_TABSTOP_VERTICAL ".uno:TabstopsVertical" +#define CMD_SID_DIALOG_TESTMODE ".uno:TestMode" +#define CMD_SID_ATTR_CHAR ".uno:Text" +#define CMD_SID_DRAW_TEXT ".uno:DrawText" +#define CMD_SID_DRAW_TEXT_MARQUEE ".uno:Text_Marquee" +#define CMD_SID_TEXTDIRECTION_LEFT_TO_RIGHT ".uno:TextdirectionLeftToRight" +#define CMD_SID_TEXTDIRECTION_TOP_TO_BOTTOM ".uno:TextdirectionTopToBottom" +#define CMD_SID_ATTR_TEXT_FITTOSIZE ".uno:TextFitToSize" +#define CMD_SID_THESAURUS ".uno:Thesaurus" +#define CMD_SID_INSERT_TIMEFIELD ".uno:InsertTimeField" +#define CMD_SID_FM_TIMEFIELD ".uno:TimeField" +#define CMD_SID_BEZIER_EDIT ".uno:ToggleObjectBezierMode" +#define CMD_SID_OBJECT_ROTATE ".uno:ToggleObjectRotateMode" +#define CMD_SID_TEXTEDIT ".uno:ToolEdit" +#define CMD_SID_OBJECT_SELECT ".uno:SelectObject" +#define CMD_SID_ATTR_ULSPACE ".uno:TopBottomMargin" +#define CMD_SID_ATTR_TRANSFORM ".uno:TransformDialog" +#define CMD_SID_TWAIN_SELECT ".uno:TwainSelect" +#define CMD_SID_TWAIN_TRANSFER ".uno:TwainTransfer" +#define CMD_SID_ATTR_CHAR_UNDERLINE ".uno:Underline" +#define CMD_SID_ATTR_CHAR_OVERLINE ".uno:Overline" +#define CMD_SID_OUTLINE_REMOVE ".uno:Ungroup" +#define CMD_SID_INSERT_URLBUTTON ".uno:URLButton" +#define CMD_SID_FM_USE_WIZARDS ".uno:UseWizards" +#define CMD_SID_DRAW_CAPTION_VERTICAL ".uno:VerticalCaption" +#define CMD_SID_DRAW_TEXT_VERTICAL ".uno:VerticalText" +#define CMD_SID_INSERT_VFIXEDLINE ".uno:VFixedLine" +#define CMD_SID_FM_VIEW_AS_GRID ".uno:ViewFormAsGrid" +#define CMD_SID_INSERT_VSCROLLBAR ".uno:VScrollbar" +#define CMD_SID_ATTR_PARA_WIDOWS ".uno:Widow" +#define CMD_SID_3D_WIN ".uno:Window3D" +#define CMD_SID_ATTR_CHAR_WORDLINEMODE ".uno:WordMode" +#define CMD_SID_ATTR_LINE_COLOR ".uno:XLineColor" +#define CMD_SID_ATTR_LINE_STYLE ".uno:XLineStyle" +#define CMD_SID_ATTR_ZOOM ".uno:Zoom" +#define CMD_SID_SIZE_REAL ".uno:Zoom100Percent" +#define CMD_SID_SIZE_OPTIMAL ".uno:ZoomObjects" +#define CMD_SID_SIZE_ALL ".uno:ZoomOptimal" +#define CMD_SID_SIZE_PAGE ".uno:ZoomPage" +#define CMD_SID_SIZE_PAGE_WIDTH ".uno:ZoomPageWidth" +#define CMD_SID_SIZE_VISAREA ".uno:ZoomVisArea" +#define CMD_SID_FM_GRABCONTROLFOCUS ".uno:GrabControlFocus" +#define CMD_SID_FM_CREATE_FIELDCONTROL ".uno:CreateFieldControl" +#define CMD_SID_INSERT_SELECT ".uno:SelectMode" +#define CMD_SID_PARA_VERTALIGN ".uno:VerticalParagraphAlignment" +#define CMD_SID_ATTR_CHAR_RELIEF ".uno:CharacterRelief" +#define CMD_SID_ATTR_BRUSH_CHAR ".uno:CharacterBackgroundPattern" +#define CMD_SID_ATTR_CHAR_ROTATED ".uno:CharacterRotation" +#define CMD_SID_ATTR_CHAR_SCALEWIDTH ".uno:CharacterWidthScalingFactor" +#define CMD_SID_ATTR_NUMBERFORMAT_VALUE ".uno:NumberFormatValue" +#define CMD_SID_ATTR_ALIGN_HOR_JUSTIFY ".uno:HorizontalJustification" +#define CMD_SID_ATTR_ALIGN_VER_JUSTIFY ".uno:VerticalJustification" +#define CMD_SID_ATTR_ALIGN_INDENT ".uno:AlignmentIndent" +#define CMD_SID_ATTR_ALIGN_HYPHENATION ".uno:AlignmentHyphenation" +#define CMD_SID_ATTR_ALIGN_DEGREES ".uno:AlignmentRotation" +#define CMD_SID_ATTR_ALIGN_LOCKPOS ".uno:AlignmentRotationMode" +#define CMD_SID_ATTR_ALIGN_MARGIN ".uno:AlignmentMargin" +#define CMD_SID_ATTR_ALIGN_STACKED ".uno:AlignmentStacked" +#define CMD_SID_ATTR_PARA_LEFT_TO_RIGHT ".uno:ParaLeftToRight" +#define CMD_SID_ATTR_PARA_RIGHT_TO_LEFT ".uno:ParaRightToLeft" +#define CMD_SID_RULER_TEXT_RIGHT_TO_LEFT ".uno:TextRTL" +#define CMD_SID_OPEN_HYPERLINK ".uno:OpenHyperlinkOnCursor" +#define CMD_SID_CTLFONT_STATE ".uno:CTLFontState" +#define CMD_SID_VERTICALTEXT_STATE ".uno:VerticalTextState" +#define CMD_SID_OPEN_XML_FILTERSETTINGS ".uno:OpenXMLFilterSettings" +#define CMD_SID_HANGUL_HANJA_CONVERSION ".uno:HangulHanjaConversion" +#define CMD_SID_CHINESE_CONVERSION ".uno:ChineseConversion" +#define CMD_SID_SPELL_DIALOG ".uno:SpellDialog" +#define CMD_SID_RULER_ROWS ".uno:RulerRows" +#define CMD_SID_RULER_ROWS_VERTICAL ".uno:RulerRowsVertical" +#define CMD_SID_ATTR_CHAR_FONTLIST ".uno:FontNameList" +#define CMD_SID_EXTRUSION_TOOGLE ".uno:ExtrusionToggle" +#define CMD_SID_EXTRUSION_TILT_DOWN ".uno:ExtrusionTiltDown" +#define CMD_SID_EXTRUSION_TILT_UP ".uno:ExtrusionTiltUp" +#define CMD_SID_EXTRUSION_TILT_LEFT ".uno:ExtrusionTiltLeft" +#define CMD_SID_EXTRUSION_TILT_RIGHT ".uno:ExtrusionTiltRight" +#define CMD_SID_EXTRUSION_DEPTH_FLOATER ".uno:ExtrusionDepthFloater" +#define CMD_SID_EXTRUSION_DEPTH_DIALOG ".uno:ExtrusionDepthDialog" +#define CMD_SID_EXTRUSION_DIRECTION_FLOATER ".uno:ExtrusionDirectionFloater" +#define CMD_SID_EXTRUSION_LIGHTING_FLOATER ".uno:ExtrusionLightingFloater" +#define CMD_SID_EXTRUSION_SURFACE_FLOATER ".uno:ExtrusionSurfaceFloater" +#define CMD_SID_EXTRUSION_3D_COLOR ".uno:Extrusion3DColor" +#define CMD_SID_EXTRUSION_DEPTH ".uno:ExtrusionDepth" +#define CMD_SID_EXTRUSION_DIRECTION ".uno:ExtrusionDirection" +#define CMD_SID_EXTRUSION_PROJECTION ".uno:ExtrusionProjection" +#define CMD_SID_EXTRUSION_LIGHTING_DIRECTION ".uno:ExtrusionLightingDirection" +#define CMD_SID_EXTRUSION_LIGHTING_INTENSITY ".uno:ExtrusionLightingIntensity" +#define CMD_SID_EXTRUSION_SURFACE ".uno:ExtrusionSurface" +#define CMD_SID_FONTWORK_GALLERY_FLOATER ".uno:FontworkGalleryFloater" +#define CMD_SID_FONTWORK_SHAPE_TYPE ".uno:FontworkShapeType" +#define CMD_SID_FONTWORK_SAME_LETTER_HEIGHTS ".uno:FontworkSameLetterHeights" +#define CMD_SID_FONTWORK_ALIGNMENT_FLOATER ".uno:FontworkAlignmentFloater" +#define CMD_SID_FONTWORK_CHARACTER_SPACING_FLOATER ".uno:FontworkCharacterSpacingFloater" +#define CMD_SID_FONTWORK_SHAPE ".uno:FontworkShape" +#define CMD_SID_FONTWORK_ALIGNMENT ".uno:FontworkAlignment" +#define CMD_SID_FONTWORK_CHARACTER_SPACING ".uno:FontworkCharacterSpacing" +#define CMD_SID_FONTWORK_CHARACTER_SPACING_DIALOG ".uno:FontworkCharacterSpacingDialog" +#define CMD_SID_FONTWORK_KERN_CHARACTER_PAIRS ".uno:FontworkKernCharacterPairs" +#define CMD_SID_GET_COLORTABLE ".uno:GetColorTable" +#define CMD_SID_SPELLCHECKER_CHANGED ".uno:SpellCheckerChanged" +#define CMD_SID_ATTR_YEAR2000 ".uno:Year2000" +#define CMD_SID_INC_INDENT ".uno:IncrementIndent" +#define CMD_SID_DEC_INDENT ".uno:DecrementIndent" +#define CMD_SID_TABLE_CELL ".uno:StateTableCell" +#define CMD_SID_OUTLINE_TO_IMPRESS ".uno:SendOutlineToImpress" +#define CMD_SID_ATTR_DEFTABSTOP ".uno:DefTabStop" +#define CMD_SID_ATTR_LANGUAGE ".uno:DocumentLanguage" +#define CMD_SID_ATTR_CHAR_CJK_LANGUAGE ".uno:DocumentLanguageCJK" +#define CMD_SID_ATTR_CHAR_CTL_LANGUAGE ".uno:DocumentLanguageCTL" +#define CMD_SID_OPT_LOCALE_CHANGED ".uno:OptionsLocaleChanged" +#define CMD_SID_SBA_BRW_INSERT ".uno:SbaBrwInsert" +#define CMD_SID_DRAWTBX_CS_BASIC ".uno:BasicShapes" +#define CMD_SID_DRAWTBX_CS_SYMBOL ".uno:SymbolShapes" +#define CMD_SID_DRAWTBX_CS_ARROW ".uno:ArrowShapes" +#define CMD_SID_DRAWTBX_CS_FLOWCHART ".uno:FlowChartShapes" +#define CMD_SID_DRAWTBX_CS_CALLOUT ".uno:CalloutShapes" +#define CMD_SID_DRAWTBX_CS_STAR ".uno:StarShapes" +#define CMD_SID_DRAW_CS_ID ".uno:CustomShape" +#define CMD_SID_DASH_LIST ".uno:DashListState" +#define CMD_SID_LINEEND_LIST ".uno:LineEndListState" +#define CMD_SID_COLOR_TABLE ".uno:ColorTableState" +#define CMD_SID_GRADIENT_LIST ".uno:GradientListState" +#define CMD_SID_HATCH_LIST ".uno:HatchListState" +#define CMD_SID_BITMAP_LIST ".uno:BitmapListState" +#define CMD_SID_ATTR_CHAR_EMPHASISMARK ".uno:EmphasisMark" +#define CMD_SID_FM_SHOW_DATANAVIGATOR ".uno:ShowDataNavigator" +#define CMD_SID_FM_DATANAVIGATOR_CONTROL ".uno:FmDataNavigatorController" +#define CMD_SID_ALIGN_ANY_LEFT ".uno:CommonAlignLeft" +#define CMD_SID_ALIGN_ANY_HCENTER ".uno:CommonAlignHorizontalCenter" +#define CMD_SID_ALIGN_ANY_RIGHT ".uno:CommonAlignRight" +#define CMD_SID_ALIGN_ANY_JUSTIFIED ".uno:CommonAlignJustified" +#define CMD_SID_ALIGN_ANY_TOP ".uno:CommonAlignTop" +#define CMD_SID_ALIGN_ANY_VCENTER ".uno:CommonAlignVerticalCenter" +#define CMD_SID_ALIGN_ANY_BOTTOM ".uno:CommonAlignBottom" +#define CMD_SID_ALIGN_ANY_HDEFAULT ".uno:CommonAlignHorizontalDefault" +#define CMD_SID_ALIGN_ANY_VDEFAULT ".uno:CommonAlignVerticalDefault" +#define CMD_SID_AVMEDIA_TOOLBOX ".uno:AVMediaToolBox" +#define CMD_SID_BORDER_REDUCED_MODE ".uno:BorderReducedMode" +#define CMD_SID_COLOR_SETTINGS ".uno:ColorSettings" +#define CMD_SID_MAIL_EXPORT_FINISHED ".uno:MailExportFinished" +#define CMD_SID_INSERT_ZWSP ".uno:InsertZWSP" +#define CMD_SID_INSERT_ZWNBSP ".uno:InsertZWNBSP" +#define CMD_SID_INSERT_LRM ".uno:InsertLRM" +#define CMD_SID_INSERT_RLM ".uno:InsertRLM" +#define CMD_FN_INSERT_SOFT_HYPHEN ".uno:InsertSoftHyphen" +#define CMD_FN_INSERT_HARDHYPHEN ".uno:InsertHardHyphen" +#define CMD_FN_INSERT_HARD_SPACE ".uno:InsertNonBreakingSpace" +#define CMD_SID_BASICIDE_MANAGE_LANG ".uno:ManageLanguage" +#define CMD_SID_BASICIDE_CURRENT_LANG ".uno:CurrentLanguage" +#define CMD_SID_TABLE_MERGE_CELLS ".uno:MergeCells" +#define CMD_SID_TABLE_SPLIT_CELLS ".uno:SplitCell" +#define CMD_SID_OPTIMIZE_TABLE ".uno:OptimizeTable" +#define CMD_SID_TABLE_VERT_BOTTOM ".uno:CellVertBottom" +#define CMD_SID_TABLE_VERT_CENTER ".uno:CellVertCenter" +#define CMD_SID_TABLE_VERT_NONE ".uno:CellVertTop" +#define CMD_SID_TABLE_INSERT_ROW ".uno:InsertRows" +#define CMD_SID_TABLE_INSERT_COL ".uno:InsertColumns" +#define CMD_SID_TABLE_DELETE_ROW ".uno:DeleteRows" +#define CMD_SID_TABLE_DELETE_COL ".uno:DeleteColumns" +#define CMD_SID_TABLE_SELECT_ALL ".uno:SelectTable" +#define CMD_SID_TABLE_SELECT_COL ".uno:EntireColumn" +#define CMD_SID_TABLE_SELECT_ROW ".uno:EntireRow" +#define CMD_SID_FORMAT_TABLE_DLG ".uno:TableDialog" +#define CMD_SID_TABLE_AUTOSUM ".uno:AutoSum" +#define CMD_SID_TABLE_SORT_DIALOG ".uno:TableSort" +#define CMD_SID_OPEN_SMARTTAGMENU ".uno:OpenSmartTagMenuOnCursor" +#define CMD_SID_ATTR_ZOOMSLIDER ".uno:ZoomSlider" +#define CMD_SID_FONTNAMELIST ".uno:FontNameStringList" +#define CMD_SID_LANGUAGE_STATUS ".uno:LanguageStatus" +#define CMD_SID_CHAR_DLG_FOR_PARAGRAPH ".uno:FontDialogForParagraph" +#define CMD_SID_GROW_FONT_SIZE ".uno:Grow" +#define CMD_SID_SHRINK_FONT_SIZE ".uno:Shrink" +#define CMD_SID_RECHECK_DOCUMENT ".uno:RecheckDocument" +#define CMD_SID_TABLE_INSERT_COL_DLG ".uno:InsertColumnDialog" +#define CMD_SID_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog" + +#endif diff --git a/svx/inc/svx/svxdlg.hxx b/svx/inc/svx/svxdlg.hxx index df11041b38a8..983a048a4ff7 100644 --- a/svx/inc/svx/svxdlg.hxx +++ b/svx/inc/svx/svxdlg.hxx @@ -195,9 +195,9 @@ class AbstractSvxNameDialog :public VclAbstractDialog //add for SvxNameDialog public: virtual void GetName( String& rName ) = 0; virtual void SetCheckNameHdl( const Link& rLink, bool bCheckImmediately = false ) = 0; - virtual void SetEditHelpId(ULONG nHelpId) = 0; + virtual void SetEditHelpId(const rtl::OString&) = 0; //from class Window - virtual void SetHelpId( ULONG nHelpId ) = 0; + virtual void SetHelpId( const rtl::OString& ) = 0; virtual void SetText( const XubString& rStr ) = 0; }; @@ -243,7 +243,7 @@ public: //from SvxMultiPathDialog virtual void SetClassPathMode() = 0; //From Class Window - virtual void SetHelpId( ULONG nHelpId ) = 0; + virtual void SetHelpId( const rtl::OString& ) = 0; }; class AbstractSvxHpLinkDlg : public VclAbstractDialog //add for SvxHpLinkDlg @@ -500,7 +500,7 @@ public: virtual SvxAbstractNewTableDialog* CreateSvxNewTableDialog( Window* pParent ) = 0; - virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, ULONG nHelpId ) = 0; + virtual SvxAbstractInsRowColDlg* CreateSvxInsRowColDlg( Window* pParent, bool bCol, const rtl::OString& sHelpId ) = 0; }; #endif diff --git a/svx/prj/d.lst b/svx/prj/d.lst index 7d2f508d9d21..24dfe87f78e4 100644 --- a/svx/prj/d.lst +++ b/svx/prj/d.lst @@ -18,6 +18,7 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res mkdir: %_DEST%\inc%_EXT%\svx +..\inc\svx\svxcommands.h %_DEST%\inc%_EXT%\svx\svxcommands.h ..\sdi\svx.sdi %_DEST%\inc%_EXT%\svx\svx.sdi ..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi ..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index 445a46025dd0..e65ce8c119aa 100644 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -37,7 +37,7 @@ // RID_SVXDLG_BMPMASK ---------------------------------------------------- DockingWindow RID_SVXDLG_BMPMASK { - HelpId = SID_BMPMASK ; + HelpId = CMD_SID_BMPMASK ; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/svx/source/dialog/ctredlin.cxx b/svx/source/dialog/ctredlin.cxx index 124f7fdd2910..503814823467 100644 --- a/svx/source/dialog/ctredlin.cxx +++ b/svx/source/dialog/ctredlin.cxx @@ -636,8 +636,7 @@ SvxTPView::SvxTPView( Window * pParent) { FreeResource(); - // FIXME: HELPID - aViewData.SetHelpId(""/*HID_REDLINING_VIEW_DG_VIEW_TABLE*/); + aViewData.SetHelpId(HID_REDLINING_VIEW_DG_VIEW_TABLE); aViewData.SetHeaderBarHelpId(HID_REDLINING_VIEW_DG_VIEW_HEADER); aMinSize=GetSizePixel(); @@ -1178,15 +1177,13 @@ void SvxTPFilter::ShowAction(BOOL bShow) { aCbRange.Hide(); aLbAction.Hide(); - // FIXME: HELPID - aCbRange.SetHelpId(""/*HID_REDLINING_FILTER_CB_RANGE*/); + aCbRange.SetHelpId(HID_REDLINING_FILTER_CB_RANGE); } else { HideRange(); aCbRange.SetText(aActionStr); - // FIXME: HELPID - aCbRange.SetHelpId(""/*HID_REDLINING_FILTER_CB_ACTION*/); + aCbRange.SetHelpId(HID_REDLINING_FILTER_CB_ACTION); aCbRange.Show(); aLbAction.Show(); @@ -1402,8 +1399,7 @@ SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, WinBits nWinStyle) aTCAccept.InsertPage( TP_FILTER, pTPFilter->GetMyName()); aTCAccept.SetTabPage( TP_VIEW, pTPView); aTCAccept.SetTabPage( TP_FILTER, pTPFilter); - // FIXME: HELPID - aTCAccept.SetHelpId(""/*HID_REDLINING_TABCONTROL*/); + aTCAccept.SetHelpId(HID_REDLINING_TABCONTROL); aTCAccept.SetTabPageSizePixel(aMinSize); Size aSize=aTCAccept.GetSizePixel(); @@ -1430,8 +1426,7 @@ SvxAcceptChgCtr::SvxAcceptChgCtr( Window* pParent, const ResId& rResId ) aTCAccept.InsertPage( TP_FILTER, pTPFilter->GetMyName()); aTCAccept.SetTabPage( TP_VIEW, pTPView); aTCAccept.SetTabPage( TP_FILTER, pTPFilter); - // FIXME: HELPID - aTCAccept.SetHelpId(""/*HID_REDLINING_TABCONTROL*/); + aTCAccept.SetHelpId(HID_REDLINING_TABCONTROL); aTCAccept.SetTabPageSizePixel(aMinSize); Size aSize=aTCAccept.GetSizePixel(); diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 6437b193a793..95c27a5dcec8 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -1009,12 +1009,9 @@ SvxLightCtl3D::SvxLightCtl3D( Window* pParent, WinBits nStyle ) void SvxLightCtl3D::Init() { // #i58240# set HelpIDs for scrollbars and switcher - // FIXME: HELPID - maHorScroller.SetHelpId(""/*HID_CTRL3D_HSCROLL*/); - // FIXME: HELPID - maVerScroller.SetHelpId(""/*HID_CTRL3D_VSCROLL*/); - // FIXME: HELPID - maSwitcher.SetHelpId(""/*HID_CTRL3D_SWITCHER*/); + maHorScroller.SetHelpId(HID_CTRL3D_HSCROLL); + maVerScroller.SetHelpId(HID_CTRL3D_VSCROLL); + maSwitcher.SetHelpId(HID_CTRL3D_SWITCHER); // Light preview maLightControl.Show(); diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src index b0c63d9313d4..c6239dc5ef09 100644 --- a/svx/source/dialog/fontwork.src +++ b/svx/source/dialog/fontwork.src @@ -34,7 +34,7 @@ // RID_SVXDLG_FONTWORK --------------------------------------------------- DockingWindow RID_SVXDLG_FONTWORK { - HelpId = SID_FONTWORK ; + HelpId = CMD_SID_FONTWORK ; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; diff --git a/svx/source/dialog/hyprlink.src b/svx/source/dialog/hyprlink.src index abefc7832d8b..c59a2f8eb52a 100644 --- a/svx/source/dialog/hyprlink.src +++ b/svx/source/dialog/hyprlink.src @@ -98,7 +98,7 @@ ToolBox RID_SVXDLG_HYPERLINK }; ToolBoxItem { - HelpID = SID_HYPERLINK_SETLINK ; + HelpID = CMD_SID_HYPERLINK_SETLINK ; Identifier = BTN_LINK ; Disable = TRUE ; DropDown = TRUE ; @@ -106,7 +106,7 @@ ToolBox RID_SVXDLG_HYPERLINK }; ToolBoxItem { - HelpID = SID_CREATELINK ; + HelpID = CMD_SID_CREATELINK ; Identifier = BTN_INSERT_BOOKMARK ; Disable = TRUE ; Hide = TRUE; diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 5f3aa24394a3..8e717b309151 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -427,7 +427,7 @@ void lcl_MoveDown( Window& rWindow, sal_Int32 nOffset ) void SvxSearchDialog::Construct_Impl() { #if ENABLE_LAYOUT - SetHelpId (SID_SEARCH_DLG); + SetHelpId (".uno:SearchDialog"); #endif /* ENABLE_LAYOUT */ // temporary to avoid incompatibility diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src index 52c91d17587d..a724edbe28bb 100644 --- a/svx/source/dialog/srchdlg.src +++ b/svx/source/dialog/srchdlg.src @@ -29,6 +29,7 @@ #include #include "srchdlg.hrc" +#include #define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; } ; @@ -51,7 +52,7 @@ String RID_SVXSTR_REPLACE ModelessDialog RID_SVXDLG_SEARCH { - HelpId = SID_SEARCH_DLG ; + HelpId = CMD_SID_SEARCH_DLG ; OutputSize = TRUE ; Hide = TRUE ; SvLook = TRUE ; diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index b3e8992f4338..3e80dc9fe485 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -27,6 +27,8 @@ #include #include "float3d.hrc" +#include + #define WIDTH 158 #define HEIGHT 209 #define BORDER 3 @@ -64,7 +66,7 @@ DockingWindow RID_SVXFLOAT_3D { - HelpID = SID_3D_WIN ; + HelpID = CMD_SID_3D_WIN ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index fe6a2372b7a0..9d596d529774 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1977,10 +1977,7 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V String sPattern; sPattern.AssignAscii("HID:"); if (sHelpURL.Equals(sPattern, 0, sPattern.Len())) - { - // FIXME: HELPID - pGrid->SetHelpId(rtl::OUStringToOString(sHelpURL, RTL_TEXTENCODING_UTF8)); - } + pGrid->SetHelpId(rtl::OUStringToOString(sHelpURL, RTL_TEXTENCODING_UTF8)); } else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) ) { diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 2c63880afd05..8cc52e4c0b7d 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -366,20 +366,13 @@ DbGridControl::NavigationBar::NavigationBar(Window* pParent, WinBits nStyle) m_aLastBtn.SetSymbol(SYMBOL_LAST); m_aNewBtn.SetModeImage(((DbGridControl*)pParent)->GetImage(DbGridControl_Base::NEW)); - // FIXME: HELPID - m_aFirstBtn.SetHelpId(""/*HID_GRID_TRAVEL_FIRST*/); - // FIXME: HELPID - m_aPrevBtn.SetHelpId(""/*HID_GRID_TRAVEL_PREV*/); - // FIXME: HELPID - m_aNextBtn.SetHelpId(""/*HID_GRID_TRAVEL_NEXT*/); - // FIXME: HELPID - m_aLastBtn.SetHelpId(""/*HID_GRID_TRAVEL_LAST*/); - // FIXME: HELPID - m_aNewBtn.SetHelpId(""/*HID_GRID_TRAVEL_NEW*/); - // FIXME: HELPID - m_aAbsolute.SetHelpId(""/*HID_GRID_TRAVEL_ABSOLUTE*/); - // FIXME: HELPID - m_aRecordCount.SetHelpId(""/*HID_GRID_NUMBEROFRECORDS*/); + m_aFirstBtn.SetHelpId(HID_GRID_TRAVEL_FIRST); + m_aPrevBtn.SetHelpId(HID_GRID_TRAVEL_PREV); + m_aNextBtn.SetHelpId(HID_GRID_TRAVEL_NEXT); + m_aLastBtn.SetHelpId(HID_GRID_TRAVEL_LAST); + m_aNewBtn.SetHelpId(HID_GRID_TRAVEL_NEW); + m_aAbsolute.SetHelpId(HID_GRID_TRAVEL_ABSOLUTE); + m_aRecordCount.SetHelpId(HID_GRID_NUMBEROFRECORDS); // Handler fuer Buttons einrichten m_aFirstBtn.SetClickHdl(LINK(this,NavigationBar,OnClick)); diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src index e974f5b28b1a..60e43a19f41e 100644 --- a/svx/source/fmcomp/gridctrl.src +++ b/svx/source/fmcomp/gridctrl.src @@ -29,6 +29,8 @@ #include #include "globlmn.hrc" #include "fmhelp.hrc" +#include + Menu RID_SVXMNU_ROWS { ItemList = @@ -36,19 +38,19 @@ Menu RID_SVXMNU_ROWS MenuItem { Identifier = SID_FM_DELETEROWS ; - HelpID = SID_FM_DELETEROWS ; +// HelpId = CMD_SID_FM_DELETEROWS ; Text [ en-US ] = "Delete Rows" ; }; MenuItem { Identifier = SID_FM_RECORD_SAVE ; - HelpID = SID_FM_RECORD_SAVE ; + HelpId = CMD_SID_FM_RECORD_SAVE ; Text [ en-US ] = "Save Record" ; }; MenuItem { Identifier = SID_FM_RECORD_UNDO ; - HelpID = SID_FM_RECORD_UNDO ; + HelpId = CMD_SID_FM_RECORD_UNDO ; Text [ en-US ] = "Undo: Data entry" ; }; }; @@ -60,7 +62,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_INSERTCOL ; - HelpID = SID_FM_INSERTCOL ; +// HelpId = CMD_SID_FM_INSERTCOL ; Text [ en-US ] = "Insert ~Column" ; SubMenu = Menu { @@ -69,61 +71,61 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_EDIT ; - HelpID = SID_FM_EDIT ; + HelpId = CMD_SID_FM_EDIT ; Text [ en-US ] = "Text Box" ; }; MenuItem { Identifier = SID_FM_CHECKBOX ; - HelpID = SID_FM_CHECKBOX ; + HelpId = CMD_SID_FM_CHECKBOX ; Text [ en-US ] = "Check Box" ; }; MenuItem { Identifier = SID_FM_COMBOBOX ; - HelpID = SID_FM_COMBOBOX ; + HelpId = CMD_SID_FM_COMBOBOX ; Text [ en-US ] = "Combo Box" ; }; MenuItem { Identifier = SID_FM_LISTBOX ; - HelpID = SID_FM_LISTBOX ; + HelpId = CMD_SID_FM_LISTBOX ; Text [ en-US ] = "List Box" ; }; MenuItem { Identifier = SID_FM_DATEFIELD ; - HelpID = SID_FM_DATEFIELD ; + HelpId = CMD_SID_FM_DATEFIELD ; Text [ en-US ] = "Date Field" ; }; MenuItem { Identifier = SID_FM_TIMEFIELD ; - HelpID = SID_FM_TIMEFIELD ; + HelpId = CMD_SID_FM_TIMEFIELD ; Text [ en-US ] = "Time Field" ; }; MenuItem { Identifier = SID_FM_NUMERICFIELD ; - HelpID = SID_FM_NUMERICFIELD ; + HelpId = CMD_SID_FM_NUMERICFIELD ; Text [ en-US ] = "Numeric Field" ; }; MenuItem { Identifier = SID_FM_CURRENCYFIELD ; - HelpID = SID_FM_CURRENCYFIELD ; + HelpId = CMD_SID_FM_CURRENCYFIELD ; Text [ en-US ] = "Currency Field" ; }; MenuItem { Identifier = SID_FM_PATTERNFIELD ; - HelpID = SID_FM_PATTERNFIELD ; + HelpId = CMD_SID_FM_PATTERNFIELD ; Text [ en-US ] = "Pattern Field" ; }; MenuItem { Identifier = SID_FM_FORMATTEDFIELD ; - HelpID = SID_FM_FORMATTEDFIELD ; + HelpId = CMD_SID_FM_FORMATTEDFIELD ; Text [ en-US ] = "Formatted Field" ; }; MenuItem @@ -140,25 +142,25 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_CHANGECOL ; - HelpID = SID_FM_CHANGECOL ; +// HelpId = CMD_SID_FM_CHANGECOL ; Text [ en-US ] = "~Replace with" ; }; MenuItem { Identifier = SID_FM_DELETECOL ; - HelpID = SID_FM_DELETECOL ; +// HelpId = CMD_SID_FM_DELETECOL ; Text [ en-US ] = "Delete Column" ; }; MenuItem { Identifier = SID_FM_HIDECOL ; - HelpID = SID_FM_HIDECOL ; +// HelpId = CMD_SID_FM_HIDECOL ; Text [ en-US ] = "~Hide Column"; }; MenuItem { Identifier = SID_FM_SHOWCOLS ; - HelpID = SID_FM_SHOWCOLS ; +// HelpId = CMD_SID_FM_SHOWCOLS ; SubMenu = Menu { ItemList = @@ -166,7 +168,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOWCOLS_MORE ; - HelpID = SID_FM_SHOWCOLS_MORE ; +// HelpId = CMD_SID_FM_SHOWCOLS_MORE ; Text [ en-US ] = "~More..."; }; MenuItem @@ -176,7 +178,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOWALLCOLS ; - HelpID = SID_FM_SHOWALLCOLS ; +// HelpId = CMD_SID_FM_SHOWALLCOLS ; Text [ en-US ] = "~All"; }; }; @@ -186,7 +188,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOW_PROPERTY_BROWSER ; - HelpID = SID_FM_SHOW_PROPERTY_BROWSER ; + HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ; Text [ en-US ] = "Column..." ; }; }; diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index e3425c00b130..e02e8664c6ac 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2388,8 +2388,7 @@ namespace svxform { DBG_CTOR(DataNavigator,NULL); - // FIXME: HELPID - SetHelpId( ""/*HID_DATA_NAVIGATOR_WIN*/ ); + SetHelpId( HID_DATA_NAVIGATOR_WIN ); SetText( SVX_RES( RID_STR_DATANAVIGATOR ) ); Size aSize = m_aDataWin.GetOutputSizePixel(); diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index c985c34f12f1..9d1b65208fdf 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1168,8 +1168,7 @@ FmFilterNavigator::FmFilterNavigator( Window* pParent ) ,m_aTimerCounter( 0 ) ,m_aDropActionType( DA_SCROLLUP ) { - // FIXME: HELPID - SetHelpId( ""/*HID_FILTER_NAVIGATOR*/ ); + SetHelpId( HID_FILTER_NAVIGATOR ); { { @@ -1942,8 +1941,7 @@ FmFilterNavigatorWin::FmFilterNavigatorWin( SfxBindings* _pBindings, SfxChildWin :SfxDockingWindow( _pBindings, _pMgr, _pParent, WinBits(WB_STDMODELESS|WB_SIZEABLE|WB_ROLLABLE|WB_3DLOOK|WB_DOCKABLE) ) ,SfxControllerItem( SID_FM_FILTER_NAVIGATOR_CONTROL, *_pBindings ) { - // FIXME: HELPID - SetHelpId( ""/*HID_FILTER_NAVIGATOR_WIN*/ ); + SetHelpId( HID_FILTER_NAVIGATOR_WIN ); m_pNavigator = new FmFilterNavigator( this ); m_pNavigator->Show(); diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src index 82b74e84331c..c03e90df7130 100644 --- a/svx/source/form/filtnav.src +++ b/svx/source/form/filtnav.src @@ -34,25 +34,21 @@ Menu RID_FM_FILTER_MENU MenuItem { Identifier = SID_FM_DELETE ; - HelpID = SID_FM_DELETE ; Text [ en-US ] = "~Delete" ; }; MenuItem { Identifier = SID_FM_FILTER_EDIT ; - HelpID = SID_FM_FILTER_EDIT ; Text [ en-US ] = "~Edit" ; }; MenuItem { Identifier = SID_FM_FILTER_IS_NULL ; - HelpID = SID_FM_FILTER_IS_NULL ; Text [ en-US ] = "~Is Null" ; }; MenuItem { Identifier = SID_FM_FILTER_IS_NOT_NULL ; - HelpID = SID_FM_FILTER_IS_NOT_NULL ; Text [ en-US ] = "I~s not Null" ; }; }; diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index 939253dec5bb..bcc275896410 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -223,8 +223,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding ::Size aPropWinSize(STD_WIN_SIZE_X,STD_WIN_SIZE_Y); SetMinOutputSizePixel(::Size(STD_MIN_SIZE_X,STD_MIN_SIZE_Y)); SetOutputSizePixel(aPropWinSize); - // FIXME: HELPID - SetUniqueId(""/*UID_FORMPROPBROWSER_FRAME*/); + SetUniqueId(UID_FORMPROPBROWSER_FRAME); try { diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index a2e1469418f0..c27b5b69d075 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -592,8 +592,7 @@ namespace svxform ,SfxControllerItem( SID_FM_FMEXPLORER_CONTROL, *_pBindings ) { DBG_CTOR(NavigatorFrame,NULL); - // FIXME: HELPID - SetHelpId( ""/*HID_FORM_NAVIGATOR_WIN*/ ); + SetHelpId( HID_FORM_NAVIGATOR_WIN ); m_pNavigatorTree = new NavigatorTree(comphelper::getProcessServiceFactory(), this ); m_pNavigatorTree->Show(); diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index 17881727cd5f..d1d8001eeec0 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -29,6 +29,8 @@ #include "fmresids.hrc" #include "fmexpl.hrc" #include "globlmn.hrc" +#include + Menu RID_FMEXPLORER_POPUPMENU { ItemList = @@ -36,7 +38,7 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_NEW ; - HelpID = SID_FM_NEW ; +// HelpId = CMD_SID_FM_NEW ; Text [ en-US ] = "~New" ; SubMenu = Menu { @@ -45,13 +47,13 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_NEW_FORM ; - HelpID = SID_FM_NEW_FORM ; +// HelpId = CMD_SID_FM_NEW_FORM ; Text [ en-US ] = "Form" ; }; MenuItem { Identifier = SID_FM_NEW_HIDDEN ; - HelpID = SID_FM_NEW_HIDDEN ; +// HelpId = CMD_SID_FM_NEW_HIDDEN ; Text [ en-US ] = "Hidden Control" ; }; }; @@ -60,7 +62,7 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_CHANGECONTROLTYPE ; - HelpID = SID_FM_CHANGECONTROLTYPE ; + HelpId = CMD_SID_FM_CHANGECONTROLTYPE ; Text [ en-US ] = "Replace with"; }; MenuItem { ITEM_EDIT_CUT }; @@ -69,37 +71,37 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_DELETE ; - HelpID = SID_FM_DELETE ; +// HelpId = CMD_SID_FM_DELETE ; Text [ en-US ] = "~Delete" ; }; MenuItem { Identifier = SID_FM_TAB_DIALOG ; - HelpID = SID_FM_TAB_DIALOG ; + HelpId = CMD_SID_FM_TAB_DIALOG ; Text [ en-US ] = "Tab Order..." ; }; MenuItem { Identifier = SID_FM_RENAME_OBJECT ; - HelpID = SID_FM_RENAME_OBJECT ; +// HelpId = CMD_SID_FM_RENAME_OBJECT ; Text [ en-US ] = "~Rename" ; }; MenuItem { Identifier = SID_FM_SHOW_PROPERTY_BROWSER ; - HelpID = SID_FM_SHOW_PROPERTY_BROWSER ; + HelpId = CMD_SID_FM_SHOW_PROPERTY_BROWSER ; Text [ en-US ] = "Propert~ies" ; }; MenuItem { Identifier = SID_FM_OPEN_READONLY ; - HelpID = SID_FM_OPEN_READONLY ; + HelpId = CMD_SID_FM_OPEN_READONLY ; Text [ en-US ] = "Open in Design Mode" ; }; MenuItem { Identifier = SID_FM_AUTOCONTROLFOCUS ; - HelpID = SID_FM_AUTOCONTROLFOCUS ; + HelpId = CMD_SID_FM_AUTOCONTROLFOCUS ; Text [ en-US ] = "Automatic Control Focus"; }; }; @@ -112,140 +114,140 @@ Menu RID_FMSHELL_CONVERSIONMENU MenuItem { Identifier = SID_FM_CONVERTTO_EDIT ; - HelpID = SID_FM_CONVERTTO_EDIT ; + HelpId = CMD_SID_FM_CONVERTTO_EDIT ; Command = ".uno:ConvertToEdit" ; Text [ en-US ] = "~Text Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_BUTTON ; - HelpID = SID_FM_CONVERTTO_BUTTON ; + HelpId = CMD_SID_FM_CONVERTTO_BUTTON ; Command = ".uno:ConvertToButton" ; Text [ en-US ] = "~Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_FIXEDTEXT ; - HelpID = SID_FM_CONVERTTO_FIXEDTEXT ; + HelpId = CMD_SID_FM_CONVERTTO_FIXEDTEXT ; Command = ".uno:ConvertToFixed" ; Text [ en-US ] = "La~bel field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_GROUPBOX ; - HelpID = SID_FM_CONVERTTO_GROUPBOX ; + HelpId = CMD_SID_FM_CONVERTTO_GROUPBOX ; Command = ".uno:ConvertToGroup" ; Text [ en-US ] = "G~roup Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_LISTBOX ; - HelpID = SID_FM_CONVERTTO_LISTBOX ; + HelpId = CMD_SID_FM_CONVERTTO_LISTBOX ; Command = ".uno:ConvertToList" ; Text [ en-US ] = "L~ist Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_CHECKBOX ; - HelpID = SID_FM_CONVERTTO_CHECKBOX ; + HelpId = CMD_SID_FM_CONVERTTO_CHECKBOX ; Command = ".uno:ConvertToCheckBox" ; Text [ en-US ] = "~Check Box"; }; MenuItem { Identifier = SID_FM_CONVERTTO_RADIOBUTTON ; - HelpID = SID_FM_CONVERTTO_RADIOBUTTON ; + HelpId = CMD_SID_FM_CONVERTTO_RADIOBUTTON ; Command = ".uno:ConvertToRadio" ; Text [ en-US ] = "~Radio Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_COMBOBOX ; - HelpID = SID_FM_CONVERTTO_COMBOBOX ; + HelpId = CMD_SID_FM_CONVERTTO_COMBOBOX ; Command = ".uno:ConvertToCombo" ; Text [ en-US ] = "Combo Bo~x"; }; MenuItem { Identifier = SID_FM_CONVERTTO_IMAGEBUTTON ; - HelpID = SID_FM_CONVERTTO_IMAGEBUTTON ; + HelpId = CMD_SID_FM_CONVERTTO_IMAGEBUTTON ; Command = ".uno:ConvertToImageBtn" ; Text [ en-US ] = "I~mage Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_FILECONTROL ; - HelpID = SID_FM_CONVERTTO_FILECONTROL ; + HelpId = CMD_SID_FM_CONVERTTO_FILECONTROL ; Command = ".uno:ConvertToFileControl" ; Text [ en-US ] = "~File Selection"; }; MenuItem { Identifier = SID_FM_CONVERTTO_DATE ; - HelpID = SID_FM_CONVERTTO_DATE ; + HelpId = CMD_SID_FM_CONVERTTO_DATE ; Command = ".uno:ConvertToDate" ; Text [ en-US ] = "~Date Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_TIME ; - HelpID = SID_FM_CONVERTTO_TIME ; + HelpId = CMD_SID_FM_CONVERTTO_TIME ; Command = ".uno:ConvertToTime" ; Text [ en-US ] = "Tim~e Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_NUMERIC ; - HelpID = SID_FM_CONVERTTO_NUMERIC ; + HelpId = CMD_SID_FM_CONVERTTO_NUMERIC ; Command = ".uno:ConvertToNumeric" ; Text [ en-US ] = "~Numerical Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_CURRENCY ; - HelpID = SID_FM_CONVERTTO_CURRENCY ; + HelpId = CMD_SID_FM_CONVERTTO_CURRENCY ; Command = ".uno:ConvertToCurrency" ; Text [ en-US ] = "C~urrency Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_PATTERN ; - HelpID = SID_FM_CONVERTTO_PATTERN ; + HelpId = CMD_SID_FM_CONVERTTO_PATTERN ; Command = ".uno:ConvertToPattern" ; Text [ en-US ] = "~Pattern Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_IMAGECONTROL ; - HelpID = SID_FM_CONVERTTO_IMAGECONTROL ; + HelpId = CMD_SID_FM_CONVERTTO_IMAGECONTROL ; Command = ".uno:ConvertToImageControl" ; Text [ en-US ] = "Ima~ge Control"; }; MenuItem { Identifier = SID_FM_CONVERTTO_FORMATTED ; - HelpID = SID_FM_CONVERTTO_FORMATTED ; + HelpId = CMD_SID_FM_CONVERTTO_FORMATTED ; Command = ".uno:ConvertToFormatted" ; Text [ en-US ] = "Fo~rmatted Field"; }; MenuItem { Identifier = SID_FM_CONVERTTO_SCROLLBAR ; - HelpID = SID_FM_CONVERTTO_SCROLLBAR ; + HelpId = CMD_SID_FM_CONVERTTO_SCROLLBAR ; Command = ".uno:ConvertToScrollBar" ; Text [ en-US ] = "Scroll bar"; }; MenuItem { Identifier = SID_FM_CONVERTTO_SPINBUTTON; - HelpID = SID_FM_CONVERTTO_SPINBUTTON; + HelpId = CMD_SID_FM_CONVERTTO_SPINBUTTON; Command = ".uno:ConvertToSpinButton" ; Text [ en-US ] = "Spin Button"; }; MenuItem { Identifier = SID_FM_CONVERTTO_NAVIGATIONBAR; - HelpID = SID_FM_CONVERTTO_NAVIGATIONBAR; + HelpId = CMD_SID_FM_CONVERTTO_NAVIGATIONBAR; Command = ".uno:ConvertToNavigationBar" ; Text [ en-US ] = "Navigation Bar" ; }; diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src index 5a7e25e14f13..b36590354b17 100644 --- a/svx/source/form/formshell.src +++ b/svx/source/form/formshell.src @@ -47,7 +47,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_STYLE; - HelpID = MENU_FM_TEXTATTRIBITES_STYLE; +// HelpID = MENU_FM_TEXTATTRIBITES_STYLE; Text [ en-US ] = "St~yle"; SubMenu = Menu { @@ -96,7 +96,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_ALIGNMENT; - HelpID = MENU_FM_TEXTATTRIBITES_ALIGNMENT; +// HelpID = MENU_FM_TEXTATTRIBITES_ALIGNMENT; Text [ en-US ] = "~Alignment"; RadioCheck = TRUE; SubMenu = Menu @@ -129,7 +129,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_SPACING; - HelpID = MENU_FM_TEXTATTRIBITES_SPACING; +// HelpID = MENU_FM_TEXTATTRIBITES_SPACING; Text [ en-US ] = "~Line Spacing"; _MenuItemFlags = MIB_RADIOCHECK; SubMenu = Menu diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 5e37d88126c3..0c83655042d2 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -200,8 +200,7 @@ namespace svxform ,m_bKeyboardCut( sal_False ) { RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NavigatorTree" ); - // FIXME: HELPID - SetHelpId( ""/*HID_FORM_NAVIGATOR*/ ); + SetHelpId( HID_FORM_NAVIGATOR ); m_aNavigatorImages = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL ) ); m_aNavigatorImagesHC = ImageList( SVX_RES( RID_SVXIMGLIST_FMEXPL_HC ) ); diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 1a87a06010e1..7a51348dfaa3 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -104,8 +104,7 @@ FmFieldWinListBox::FmFieldWinListBox( FmFieldWin* pParent ) ,pTabWin( pParent ) { DBG_CTOR(FmFieldWinListBox,NULL); - // FIXME: HELPID - SetHelpId( ""/*HID_FIELD_SEL*/ ); + SetHelpId( HID_FIELD_SEL ); SetHighlightRange( ); } @@ -193,8 +192,7 @@ FmFieldWin::FmFieldWin(SfxBindings* _pBindings, SfxChildWindow* _pMgr, Window* _ ,m_pChangeListener(NULL) { DBG_CTOR(FmFieldWin,NULL); - // FIXME: HELPID - SetHelpId( ""/*HID_FIELD_SEL_WIN*/ ); + SetHelpId( HID_FIELD_SEL_WIN ); SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) ); pListBox = new FmFieldWinListBox( this ); diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index 85babb34a1a7..f275fd9efd72 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -318,8 +318,7 @@ void SvxFmTbxCtlAbsRec::StateChanged( USHORT nSID, SfxItemState eState, const Sf Window* SvxFmTbxCtlAbsRec::CreateItemWindow( Window* pParent ) { SvxFmAbsRecWin* pWin = new SvxFmAbsRecWin( pParent, this ); - // FIXME: HELPID - pWin->SetUniqueId( ""/*UID_ABSOLUTE_RECORD_WINDOW*/ ); + pWin->SetUniqueId( UID_ABSOLUTE_RECORD_WINDOW ); return pWin; } diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index 29c38653b4ac..ccbcd40862de 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -152,8 +152,7 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, { StartListening( *mpGallery ); - // FIXME: HELPID - maNewTheme.SetHelpId( ""/*HID_GALLERY_NEWTHEME*/ ); + maNewTheme.SetHelpId( HID_GALLERY_NEWTHEME ); maNewTheme.SetText( String( GAL_RESID( RID_SVXSTR_GALLERY_CREATETHEME ) ) ); maNewTheme.SetClickHdl( LINK( this, GalleryBrowser1, ClickNewThemeHdl ) ); @@ -161,8 +160,7 @@ GalleryBrowser1::GalleryBrowser1( GalleryBrowser* pParent, const ResId& rResId, if( mpGallery->GetUserURL().GetProtocol() == INET_PROT_NOT_VALID ) maNewTheme.Disable(); - // FIXME: HELPID - mpThemes->SetHelpId( ""/*HID_GALLERY_THEMELIST*/ ); + mpThemes->SetHelpId( HID_GALLERY_THEMELIST ); mpThemes->SetSelectHdl( LINK( this, GalleryBrowser1, SelectThemeHdl ) ); for( ULONG i = 0, nCount = mpGallery->GetThemeCount(); i < nCount; i++ ) diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index ae1fc2f0e086..0483a1bc1425 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -325,14 +325,12 @@ GalleryBrowser2::GalleryBrowser2( GalleryBrowser* pParent, const ResId& rResId, maViewBox.InsertItem( TBX_ID_ICON, aDummyImage ); maViewBox.SetItemBits( TBX_ID_ICON, TIB_RADIOCHECK | TIB_AUTOCHECK ); - // FIXME: HELPID - maViewBox.SetHelpId( TBX_ID_ICON, ""/*HID_GALLERY_ICONVIEW*/ ); + maViewBox.SetHelpId( TBX_ID_ICON, HID_GALLERY_ICONVIEW ); maViewBox.SetQuickHelpText( TBX_ID_ICON, String( GAL_RESID( RID_SVXSTR_GALLERY_ICONVIEW ) ) ); maViewBox.InsertItem( TBX_ID_LIST, aDummyImage ); maViewBox.SetItemBits( TBX_ID_LIST, TIB_RADIOCHECK | TIB_AUTOCHECK ); - // FIXME: HELPID - maViewBox.SetHelpId( TBX_ID_LIST, ""/*HID_GALLERY_LISTVIEW*/ ); + maViewBox.SetHelpId( TBX_ID_LIST, HID_GALLERY_LISTVIEW ); maViewBox.SetQuickHelpText( TBX_ID_LIST, String( GAL_RESID( RID_SVXSTR_GALLERY_LISTVIEW ) ) ); maViewBox.SetBorder( 0, 1 ); diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index ccfb931f2d29..8022cecc0fbe 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -61,8 +61,7 @@ GalleryPreview::GalleryPreview( GalleryBrowser2* pParent, GalleryTheme* pTheme ) DragSourceHelper( this ), mpTheme( pTheme ) { - // FIXME: HELPID - SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); + SetHelpId( HID_GALLERY_WINDOW ); InitSettings(); } @@ -74,8 +73,7 @@ GalleryPreview::GalleryPreview( Window* pParent, const ResId & rResId ) : DragSourceHelper( this ), mpTheme( NULL ) { - // FIXME: HELPID - SetHelpId( ""/*HID_GALLERY_PREVIEW*/ ); + SetHelpId( HID_GALLERY_PREVIEW ); InitSettings(); } @@ -311,8 +309,7 @@ GalleryIconView::GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme { EnableFullItemMode( FALSE ); - // FIXME: HELPID - SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); + SetHelpId( HID_GALLERY_WINDOW ); InitSettings(); SetExtraSpacing( 2 ); SetItemWidth( S_THUMB + 6 ); @@ -478,8 +475,7 @@ GalleryListView::GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme mnCurRow( 0 ), mbInit( FALSE ) { - // FIXME: HELPID - SetHelpId( ""/*HID_GALLERY_WINDOW*/ ); + SetHelpId( HID_GALLERY_WINDOW ); InitSettings(); diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src index fae88c0db251..81ab0f1ac6d9 100644 --- a/svx/source/gallery2/gallery.src +++ b/svx/source/gallery2/gallery.src @@ -35,7 +35,7 @@ DockingWindow RID_SVXDLG_GALLERYBROWSER { - HelpId = SID_GALLERY; + HelpId = CMD_SID_GALLERY; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 676c8b0dc842..2ca1c5b5cfdd 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -57,8 +57,6 @@ SvxInsertStatusBarControl::SvxInsertStatusBarControl( USHORT _nSlotId, SfxStatusBarControl( _nSlotId, _nId, rStb ), bInsert( TRUE ) { - // FIXME: HELPID - rStb.SetHelpId( _nId, ""/*_nSlotId*/ ); } // ----------------------------------------------------------------------- diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index fbcb925fd579..e980ece5c8b6 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -176,6 +176,10 @@ struct SvxPosSizeStatusBarControl_Impl Images fu"r die Position und Gro"sse laden. */ +#define STR_POSITION ".uno:Position" +#define STR_TABLECELL ".uno:StateTableCell" +#define STR_FUNC ".uno:StatusBarFunc" + SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( USHORT _nSlotId, USHORT _nId, StatusBar& rStb ) : @@ -190,9 +194,9 @@ SvxPosSizeStatusBarControl::SvxPosSizeStatusBarControl( USHORT _nSlotId, pImp->aPosImage = Image( ResId( RID_SVXBMP_POSITION, DIALOG_MGR() ) ); pImp->aSizeImage = Image( ResId( RID_SVXBMP_SIZE, DIALOG_MGR() ) ); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Position" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StateTableCell" ))); - addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StatusBarFunc" ))); + addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_POSITION ))); // SID_ATTR_POSITION + addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_TABLECELL ))); // SID_TABLE_CELL + addStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( STR_FUNC ))); // SID_PSZ_FUNCTION } // ----------------------------------------------------------------------- @@ -233,8 +237,14 @@ void SvxPosSizeStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, // da Kombi-Controller, immer die aktuelle Id als HelpId setzen // gecachten HelpText vorher l"oschen GetStatusBar().SetHelpText( GetId(), String() ); - // FIXME: HELPID - GetStatusBar().SetHelpId( GetId(), ""/*nSID*/ ); + + switch ( nSID ) + { + case SID_ATTR_POSITION : GetStatusBar().SetHelpId( GetId(), STR_POSITION ); break; + case SID_TABLE_CELL: GetStatusBar().SetHelpId( GetId(), STR_TABLECELL ); break; + case SID_PSZ_FUNCTION: GetStatusBar().SetHelpId( GetId(), STR_FUNC ); break; + default: break; + } if ( nSID == SID_PSZ_FUNCTION ) { diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 3df835510ed6..92d8f7ad0746 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -107,14 +107,8 @@ XmlSecStatusBarControl::~XmlSecStatusBarControl() delete mpImpl; } -void XmlSecStatusBarControl::StateChanged( USHORT nSID, SfxItemState eState, const SfxPoolItem* pState ) +void XmlSecStatusBarControl::StateChanged( USHORT, SfxItemState eState, const SfxPoolItem* pState ) { - GetStatusBar().SetHelpText( GetId(), String() );// necessary ? - - // FIXME: HELPID - (void)nSID; - GetStatusBar().SetHelpId( GetId(), ""/*nSID*/ ); // necessary ? - if( SFX_ITEM_AVAILABLE != eState ) { mpImpl->mnState = (UINT16)SIGNATURESTATE_UNKNOWN; diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index c9374ab27fb6..a4cab5f3ef16 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -111,8 +111,7 @@ ExtrusionDirectionWindow::ExtrusionDirectionWindow( void ExtrusionDirectionWindow::implInit() { - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_EXTRUSION_DIRECTION*/ ); + SetHelpId( HID_POPUP_EXTRUSION_DIRECTION ); USHORT i; for( i = DIRECTION_NW; i <= DIRECTION_SE; i++ ) @@ -125,15 +124,12 @@ void ExtrusionDirectionWindow::implInit() // mpProjectionForewarder = new SfxStatusForwarder( SID_EXTRUSION_PROJECTION, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - // FIXME: HELPID - mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_DIRECTION*/ ); + mpMenu->SetHelpId( HID_MENU_EXTRUSION_DIRECTION ); mpMenu->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); mpDirectionSet = new ValueSet( mpMenu, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); - // FIXME: HELPID - mpDirectionSet->SetHelpId( ""/*HID_VALUESET_EXTRUSION_DIRECTION*/ ); + mpDirectionSet->SetHelpId( HID_VALUESET_EXTRUSION_DIRECTION ); - // FIXME: HELPID - mpDirectionSet->SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); + mpDirectionSet->SetHelpId( HID_POPUP_LINEEND_CTRL ); mpDirectionSet->SetSelectHdl( LINK( this, ExtrusionDirectionWindow, SelectHdl ) ); mpDirectionSet->SetColCount( 3 ); mpDirectionSet->EnableFullItemMode( FALSE ); @@ -505,15 +501,13 @@ ExtrusionDepthWindow::ExtrusionDepthWindow( USHORT nId, void ExtrusionDepthWindow::implInit() { - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_EXTRUSION_DEPTH*/ ); + SetHelpId( HID_POPUP_EXTRUSION_DEPTH ); // mpDepthForewarder = new SfxStatusForwarder( SID_EXTRUSION_DEPTH, *this ); // mpMetricForewarder = new SfxStatusForwarder( SID_ATTR_METRIC, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - // FIXME: HELPID - mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_DEPTH*/ ); + mpMenu->SetHelpId( HID_MENU_EXTRUSION_DEPTH ); mpMenu->SetSelectHdl( LINK( this, ExtrusionDepthWindow, SelectHdl ) ); @@ -854,8 +848,7 @@ ExtrusionLightingWindow::ExtrusionLightingWindow( void ExtrusionLightingWindow::implInit() { - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_EXTRUSION_LIGHTING*/ ); + SetHelpId( HID_POPUP_EXTRUSION_LIGHTING ); USHORT i; for( i = FROM_TOP_LEFT; i <= FROM_BOTTOM_RIGHT; i++ ) @@ -875,16 +868,13 @@ void ExtrusionLightingWindow::implInit() // mpLightingIntensityForewarder = new SfxStatusForwarder( SID_EXTRUSION_LIGHTING_INTENSITY, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - // FIXME: HELPID - mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_LIGHTING*/ ); + mpMenu->SetHelpId( HID_MENU_EXTRUSION_LIGHTING ); mpMenu->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) ); mpLightingSet = new ValueSet( mpMenu, WB_TABSTOP | WB_MENUSTYLEVALUESET | WB_FLATVALUESET | WB_NOBORDER | WB_NO_DIRECTSELECT ); - // FIXME: HELPID - mpLightingSet->SetHelpId( ""/*HID_VALUESET_EXTRUSION_LIGHTING*/ ); + mpLightingSet->SetHelpId( HID_VALUESET_EXTRUSION_LIGHTING ); - // FIXME: HELPID - mpLightingSet->SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); + mpLightingSet->SetHelpId( HID_POPUP_LINEEND_CTRL ); mpLightingSet->SetSelectHdl( LINK( this, ExtrusionLightingWindow, SelectHdl ) ); mpLightingSet->SetColCount( 3 ); mpLightingSet->EnableFullItemMode( FALSE ); @@ -1236,16 +1226,14 @@ ExtrusionSurfaceWindow::ExtrusionSurfaceWindow( void ExtrusionSurfaceWindow::implInit() { - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_EXTRUSION_SURFACE*/ ); + SetHelpId( HID_POPUP_EXTRUSION_SURFACE ); bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); // mpSurfaceForewarder = new SfxStatusForwarder( SID_EXTRUSION_SURFACE, *this ); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - // FIXME: HELPID - mpMenu->SetHelpId( ""/*HID_MENU_EXTRUSION_SURFACE*/ ); + mpMenu->SetHelpId( HID_MENU_EXTRUSION_SURFACE ); mpMenu->SetSelectHdl( LINK( this, ExtrusionSurfaceWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_WIREFRAME ) ), bHighContrast ? maImgSurface1h : maImgSurface1 ); diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 5a16fc41e90b..31c77e221d62 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -504,10 +504,8 @@ Window* SvxFillToolBoxControl::CreateItemWindow( Window *pParent ) pFillAttrLB = (SvxFillAttrBox*)pFillControl->pLbFillAttr; pFillTypeLB = (SvxFillTypeBox*)pFillControl->pLbFillType; - // FIXME: HELPID - pFillAttrLB->SetUniqueId( ""/*HID_FILL_ATTR_LISTBOX*/ ); - // FIXME: HELPID - pFillTypeLB->SetUniqueId( ""/*HID_FILL_TYPE_LISTBOX */); + pFillAttrLB->SetUniqueId( HID_FILL_ATTR_LISTBOX ); + pFillTypeLB->SetUniqueId( HID_FILL_TYPE_LISTBOX ); return pFillControl; } diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index dbd815ae3d14..1b4f89ca1e8c 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -361,8 +361,7 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( mxFrame( rFrame ), mbPopupMode( true ) { - // FIXME: HELPID - SetHelpId( ""/*HID_WIN_FONTWORK_ALIGN*/ ); + SetHelpId( HID_WIN_FONTWORK_ALIGN ); implInit(); } @@ -387,21 +386,18 @@ FontWorkAlignmentWindow::FontWorkAlignmentWindow( mxFrame( rFrame ), mbPopupMode( true ) { - // FIXME: HELPID - SetHelpId( ""/*HID_WIN_FONTWORK_ALIGN*/ ); + SetHelpId( HID_WIN_FONTWORK_ALIGN ); implInit(); } void FontWorkAlignmentWindow::implInit() { - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_FONTWORK_ALIGN*/ ); + SetHelpId( HID_POPUP_FONTWORK_ALIGN ); bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - // FIXME: HELPID - mpMenu->SetHelpId( ""/*HID_POPUP_FONTWORK_ALIGN*/ ); + mpMenu->SetHelpId( HID_POPUP_FONTWORK_ALIGN ); mpMenu->SetSelectHdl( LINK( this, FontWorkAlignmentWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_ALIGN_LEFT ) ), bHighContrast ? maImgAlgin1h : maImgAlgin1 ); @@ -614,8 +610,7 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( mxFrame( rFrame ), mbPopupMode( true ) { - // FIXME: HELPID - SetHelpId( ""/*HID_WIN_FONTWORK_CHARSPACE*/ ); + SetHelpId( HID_WIN_FONTWORK_CHARSPACE ); implInit(); } @@ -631,21 +626,18 @@ FontWorkCharacterSpacingWindow::FontWorkCharacterSpacingWindow( mxFrame( rFrame ), mbPopupMode( true ) { - // FIXME: HELPID - SetHelpId( ""/*HID_WIN_FONTWORK_CHARSPACE*/ ); + SetHelpId( HID_WIN_FONTWORK_CHARSPACE ); implInit(); } void FontWorkCharacterSpacingWindow::implInit() { - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_FONTWORK_CHARSPACE*/ ); + SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); // bool bHighContrast = GetSettings().GetStyleSettings().GetHighContrastMode(); mpMenu = new ToolbarMenu( this, WB_CLIPCHILDREN ); - // FIXME: HELPID - mpMenu->SetHelpId( ""/*HID_POPUP_FONTWORK_CHARSPACE*/ ); + mpMenu->SetHelpId( HID_POPUP_FONTWORK_CHARSPACE ); mpMenu->SetSelectHdl( LINK( this, FontWorkCharacterSpacingWindow, SelectHdl ) ); mpMenu->appendEntry( 0, String( SVX_RES( STR_CHARS_SPACING_VERY_TIGHT ) ), MIB_RADIOCHECK ); diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index aae0bd4fc12b..849d495e214e 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -316,7 +316,7 @@ public: // ----------------------------------------------------------------------------- -ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : +ImplGrafControl::ImplGrafControl( Window* pParent, USHORT, const rtl::OUString& rCmd, const Reference< XFrame >& rFrame ) : Control( pParent, WB_TABSTOP ), maImage ( this ), maField ( this, rCmd, rFrame ) @@ -353,9 +353,6 @@ ImplGrafControl::ImplGrafControl( Window* pParent, USHORT nSlotId, const rtl::OU maImage.Show(); - // FIXME: HELPID - (void)nSlotId; - // maField.SetHelpId( nSlotId ); maField.SetHelpId( rtl::OUStringToOString( rCmd, RTL_TEXTENCODING_UTF8 ) ); maField.Show(); } diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index f3e208f3e6ce..6deab3eca30b 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -423,10 +423,8 @@ void SvxLineEndWindow::implInit() SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem = NULL; - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_LINEEND*/ ); - // FIXME: HELPID - aLineEndSet.SetHelpId( ""/*HID_POPUP_LINEEND_CTRL*/ ); + SetHelpId( HID_POPUP_LINEEND ); + aLineEndSet.SetHelpId( HID_POPUP_LINEEND_CTRL ); if ( pDocSh ) { diff --git a/svx/source/tbxctrls/makefile.mk b/svx/source/tbxctrls/makefile.mk index 47da008e87a3..8abfa24938f9 100644 --- a/svx/source/tbxctrls/makefile.mk +++ b/svx/source/tbxctrls/makefile.mk @@ -74,7 +74,6 @@ SRC1FILES = \ lboxctrl.src \ linectrl.src \ tbcontrl.src \ - tbxdraw.src \ grafctrl.src # --- Targets ------------------------------------------------------- diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 6b5998a3f1b9..5c99e84e6a47 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -905,10 +905,8 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, lcl_CalcSizeValueSet( *this, aColorSet, aSize12 ); - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_COLOR*/ ); - // FIXME: HELPID - aColorSet.SetHelpId( ""/*HID_POPUP_COLOR_CTRL*/ ); + SetHelpId( HID_POPUP_COLOR ); + aColorSet.SetHelpId( HID_POPUP_COLOR_CTRL ); SetText( rWndTitle ); aColorSet.Show(); @@ -1092,8 +1090,7 @@ SvxFrameWindow_Impl::SvxFrameWindow_Impl( USHORT nId, const Reference< XFrame >& lcl_CalcSizeValueSet( *this, aFrameSet,Size( 20, 20 )); - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_FRAME*/ ); + SetHelpId( HID_POPUP_FRAME ); SetText( SVX_RESSTR(RID_SVXSTR_FRAME) ); aFrameSet.Show(); } @@ -1353,8 +1350,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( USHORT nId, const Reference< XFrame >& r lcl_CalcSizeValueSet( *this, aLineSet, aBmpSize ); - // FIXME: HELPID - SetHelpId( ""/*HID_POPUP_LINE*/ ); + SetHelpId( HID_POPUP_LINE ); SetText( SVX_RESSTR(RID_SVXSTR_FRAME_STYLE) ); aLineSet.Show(); } diff --git a/svx/source/tbxctrls/tbxdraw.src b/svx/source/tbxctrls/tbxdraw.src deleted file mode 100644 index 0641ff39e1bf..000000000000 --- a/svx/source/tbxctrls/tbxdraw.src +++ /dev/null @@ -1,265 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - // include --------------------------------------------------------------- -#include "tbxdraw.hrc" -#include -#include "helpid.hrc" -#include - // pragma ---------------------------------------------------------------- - - // ----------------------------------------------------------------------- -#define IMAGE_STDBTN_COLOR Color { Red = 0xC000; Green = 0xC000; Blue = 0xC000; } -FloatingWindow RID_SVXTBX_DRAW -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpID = HID_DRAWTOOL_TBX ; - ToolBox TBX_DRAW - { - HelpId = HID_SVXTBX_DRAW ; - SVLook = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_OBJECT_SELECT ; - HelpID = SID_OBJECT_SELECT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Selection" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_LINE ; - HelpID = SID_DRAW_LINE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Line" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_RECT ; - HelpID = SID_DRAW_RECT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Rectangle" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_ELLIPSE ; - HelpID = SID_DRAW_ELLIPSE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Ellipse" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_POLYGON_NOFILL ; - HelpID = SID_DRAW_POLYGON_NOFILL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Polygon" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_BEZIER_NOFILL ; - HelpID = SID_DRAW_BEZIER_NOFILL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Curve"; - }; - ToolBoxItem - { - Identifier = SID_DRAW_FREELINE_NOFILL ; - HelpID = SID_DRAW_FREELINE_NOFILL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Freeform Line"; - }; - ToolBoxItem - { - Identifier = SID_DRAW_ARC ; - HelpID = SID_DRAW_ARC ; - RadioCheck = TRUE ; - Text [ en-US ] = "Arc" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_PIE ; - HelpID = SID_DRAW_PIE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Ellipse Pie" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CIRCLECUT ; - HelpID = SID_DRAW_CIRCLECUT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Circle Segment" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT ; - HelpID = SID_DRAW_TEXT ; - RadioCheck = TRUE ; - Text [ en-US ] = "Text" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT_VERTICAL ; - HelpID = SID_DRAW_TEXT_VERTICAL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Vertical Text"; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT_MARQUEE ; - HelpID = SID_DRAW_TEXT_MARQUEE ; - RadioCheck = TRUE ; - Text [ en-US ] = "Text Animation" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CAPTION ; - HelpID = SID_DRAW_CAPTION ; - RadioCheck = TRUE ; - Text [ en-US ] = "Callouts" ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CAPTION_VERTICAL ; - HelpID = SID_DRAW_CAPTION_VERTICAL ; - RadioCheck = TRUE ; - Text [ en-US ] = "Vertical Callout"; - }; - }; - }; - Text [ en-US ] = "Draw Functions" ; -}; -FloatingWindow RID_SVXTBX_ALIGNMENT -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - HelpID = HID_ALIGN_TBX ; - SVLook = TRUE ; - Text [ en-US ] = "Alignment" ; - ToolBox TBX_ALIGNMENT - { - HelpId = HID_SVXTBX_ALIGNMENT ; - SVLook = TRUE ; - HelpID = SID_OBJECT_ALIGN ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_LEFT ; - HelpID = SID_OBJECT_ALIGN_LEFT ; - Text [ en-US ] = "Left" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_CENTER ; - HelpID = SID_OBJECT_ALIGN_CENTER ; - Text [ en-US ] = "Center" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_RIGHT ; - HelpID = SID_OBJECT_ALIGN_RIGHT ; - Text [ en-US ] = "Right" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_UP ; - HelpID = SID_OBJECT_ALIGN_UP ; - Text [ en-US ] = "Top" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_MIDDLE ; - HelpID = SID_OBJECT_ALIGN_MIDDLE ; - Text [ en-US ] = "Centered" ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN_DOWN ; - HelpID = SID_OBJECT_ALIGN_DOWN ; - Text [ en-US ] = "Bottom" ; - }; - }; - }; -}; - // ********************************************************************** EOF - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/svx/source/toolbars/extrusionbar.src b/svx/source/toolbars/extrusionbar.src index 3e6c6ad7e5cb..dd6f3066a51e 100644 --- a/svx/source/toolbars/extrusionbar.src +++ b/svx/source/toolbars/extrusionbar.src @@ -1,65 +1,6 @@ #include #include -ToolBox RID_SVX_EXTRUSION_BAR -{ - HelpId = RID_SVX_EXTRUSION_BAR ; - Align = BOXALIGN_BOTTOM ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_EXTRUSION_TOOGLE ; - HelpID = SID_EXTRUSION_TOOGLE ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_DOWN ; - HelpID = SID_EXTRUSION_TILT_DOWN ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_UP ; - HelpID = SID_EXTRUSION_TILT_UP ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_LEFT ; - HelpID = SID_EXTRUSION_TILT_LEFT ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_TILT_RIGHT ; - HelpID = SID_EXTRUSION_TILT_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_DEPTH_FLOATER ; - HelpID = SID_EXTRUSION_DEPTH_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_DIRECTION_FLOATER ; - HelpID = SID_EXTRUSION_DIRECTION_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_LIGHTING_FLOATER ; - HelpID = SID_EXTRUSION_LIGHTING_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_SURFACE_FLOATER ; - HelpID = SID_EXTRUSION_SURFACE_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_EXTRUSION_3D_COLOR ; - HelpID = SID_EXTRUSION_3D_COLOR ; - }; - }; -}; - String RID_SVX_EXTRUSION_BAR { Text [ en-US ] = "Extrusion"; diff --git a/svx/source/toolbars/fontworkbar.src b/svx/source/toolbars/fontworkbar.src index 79279b3432db..a7bdd2cccada 100644 --- a/svx/source/toolbars/fontworkbar.src +++ b/svx/source/toolbars/fontworkbar.src @@ -27,40 +27,6 @@ #include -ToolBox RID_SVX_FONTWORK_BAR -{ - HelpId = RID_SVX_FONTWORK_BAR ; - Align = BOXALIGN_BOTTOM ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_FONTWORK_GALLERY_FLOATER ; - HelpID = SID_FONTWORK_GALLERY_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_SHAPE_TYPE ; - HelpID = SID_FONTWORK_SHAPE_TYPE ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_SAME_LETTER_HEIGHTS ; - HelpID = SID_FONTWORK_SAME_LETTER_HEIGHTS ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_ALIGNMENT_FLOATER ; - HelpID = SID_FONTWORK_ALIGNMENT_FLOATER ; - }; - ToolBoxItem - { - Identifier = SID_FONTWORK_CHARACTER_SPACING_FLOATER ; - HelpID = SID_FONTWORK_CHARACTER_SPACING_FLOATER ; - }; - }; -}; - String RID_SVX_FONTWORK_BAR { Text [ en-US ] = "Fontwork"; diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx index 97bcf74e6c10..dda324cb98d1 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx @@ -485,18 +485,13 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) { FreeResource(); - // FIXME: HELPID - m_aRB_To_Simplified.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED*/ ); - // FIXME: HELPID - m_aRB_To_Traditional.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL*/ ); + m_aRB_To_Simplified.SetHelpId( HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED ); + m_aRB_To_Traditional.SetHelpId( HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL ); - // FIXME: HELPID - m_aCB_Reverse.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_CB_REVERSE*/ ); + m_aCB_Reverse.SetHelpId( HID_SVX_CHINESE_DICTIONARY_CB_REVERSE ); - // FIXME: HELPID - m_aCT_DictionaryToSimplified.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED*/ ); - // FIXME: HELPID - m_aCT_DictionaryToTraditional.SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL*/ ); + m_aCT_DictionaryToSimplified.SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED ); + m_aCT_DictionaryToTraditional.SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL ); SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); @@ -583,8 +578,7 @@ ChineseDictionaryDialog::ChineseDictionaryDialog( Window* pParent ) m_pHeaderBar = m_aCT_DictionaryToSimplified.createHeaderBar( aColumn1, aColumn2, aColumn3, nWidth1, nWidth2, nWidth3 ); if(m_pHeaderBar) - // FIXME: HELPID - m_pHeaderBar->SetHelpId( ""/*HID_SVX_CHINESE_DICTIONARY_LB_HEADER*/ ); + m_pHeaderBar->SetHelpId( HID_SVX_CHINESE_DICTIONARY_LB_HEADER ); long pTabs[] = { 3, 0, nWidth1, nWidth1 + nWidth2 }; m_aCT_DictionaryToSimplified.SetTabs( &pTabs[0], MAP_PIXEL ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx index a2f308248224..213ddc22bace 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.cxx @@ -72,12 +72,9 @@ ChineseTranslationDialog::ChineseTranslationDialog( Window* pParent ) { FreeResource(); - // FIXME: HELPID - m_aRB_To_Simplified.SetHelpId( ""/*HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED*/ ); - // FIXME: HELPID - m_aRB_To_Traditional.SetHelpId( ""/*HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL*/ ); - // FIXME: HELPID - m_aCB_Use_Variants.SetHelpId( ""/*HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS*/ ); + m_aRB_To_Simplified.SetHelpId( HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED ); + m_aRB_To_Traditional.SetHelpId( HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL ); + m_aCB_Use_Variants.SetHelpId( HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS ); SvtLinguConfig aLngCfg; sal_Bool bValue = sal_Bool(); diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc index 9bf5856bc270..a75cd02b17b8 100644 --- a/uui/source/ids.hrc +++ b/uui/source/ids.hrc @@ -167,20 +167,17 @@ #define ERRCODE_UUI_SSLWARN_INVALID_1 (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 1) #define TITLE_UUI_SSLWARN_INVALID (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 3) -#define HID_DLG_LOGIN (HID_UUI_START + 0) -#define HID_DLG_COOKIES (HID_UUI_START + 1) -#define HID_DLG_MASTERPASSWORD_UUI (HID_UUI_START+2) -#define HID_DLG_MASTERPASSWORD_CRT (HID_UUI_START+3) -#define HID_DLG_FILTER_SELECT (HID_UUI_START+4) -#define HID_DLG_PASSWORD_UUI (HID_UUI_START+5) -#define HID_DLG_PASSWORD_CRT (HID_UUI_START+6) -#define HID_DLG_UNKNOWNAUTH_UUI (HID_UUI_START+7) -#define HID_DLG_SSLWARN_UUI (HID_UUI_START+8) -#define HID_XMLSECDLG_MACROWARN (HID_UUI_START+9) -#define HID_DLG_NEWERVERSIONWARNING (HID_UUI_START+10) - -// HID_UUI_END (aka HID_CHAOS_NEW_DATABASE) is reserved in -// sfx2/util/hidother.src +#define HID_DLG_LOGIN "UUI_HID_DLG_LOGIN" +#define HID_DLG_COOKIES "UUI_HID_DLG_COOKIES" +#define HID_DLG_MASTERPASSWORD_UUI "UUI_HID_DLG_MASTERPASSWORD_UUI" +#define HID_DLG_MASTERPASSWORD_CRT "UUI_HID_DLG_MASTERPASSWORD_CRT" +#define HID_DLG_FILTER_SELECT "UUI_HID_DLG_FILTER_SELECT" +#define HID_DLG_PASSWORD_UUI "UUI_HID_DLG_PASSWORD_UUI" +#define HID_DLG_PASSWORD_CRT "UUI_HID_DLG_PASSWORD_CRT" +#define HID_DLG_UNKNOWNAUTH_UUI "UUI_HID_DLG_UNKNOWNAUTH_UUI" +#define HID_DLG_SSLWARN_UUI "UUI_HID_DLG_SSLWARN_UUI" +#define HID_XMLSECDLG_MACROWARN "UUI_HID_XMLSECDLG_MACROWARN" +#define HID_DLG_NEWERVERSIONWARNING "UUI_HID_DLG_NEWERVERSIONWARNING" #endif // UUI_IDS_HRC -- cgit From d1f6ae4254c5f3b6047551d95fe341ac8d6dd56b Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 10 Jul 2010 18:21:24 +0200 Subject: CWS changehid: #i111874#: change code to support HelpIds as byte strings --- dbaccess/inc/dbaccess_helpid.hrc | 807 ++++++++++----------- dbaccess/inc/dbaccess_slotid.hrc | 3 + dbaccess/inc/genericcontroller.hxx | 2 +- .../ext/macromigration/macromigrationpages.cxx | 3 +- dbaccess/source/ui/app/AppController.cxx | 3 +- dbaccess/source/ui/app/AppDetailPageHelper.cxx | 41 +- dbaccess/source/ui/app/AppDetailPageHelper.hxx | 2 +- dbaccess/source/ui/app/AppDetailView.cxx | 24 +- dbaccess/source/ui/app/AppSwapWindow.cxx | 3 +- dbaccess/source/ui/app/AppView.cxx | 9 +- dbaccess/source/ui/app/app.src | 19 - dbaccess/source/ui/browser/dbtreeview.cxx | 3 +- dbaccess/source/ui/browser/genericcontroller.cxx | 4 +- dbaccess/source/ui/browser/sbabrw.src | 2 - dbaccess/source/ui/browser/unodatbr.cxx | 15 +- dbaccess/source/ui/control/FieldDescControl.cxx | 13 +- dbaccess/source/ui/control/RelationControl.cxx | 14 +- dbaccess/source/ui/control/sqledit.cxx | 3 +- dbaccess/source/ui/dlg/AutoControls_tmpl.hrc | 25 +- dbaccess/source/ui/dlg/ConnectionPage.cxx | 36 +- dbaccess/source/ui/dlg/ConnectionPage.src | 2 +- dbaccess/source/ui/dlg/TablesSingleDlg.cxx | 7 +- dbaccess/source/ui/dlg/adtabdlg.cxx | 9 +- dbaccess/source/ui/dlg/adtabdlg.src | 2 +- dbaccess/source/ui/dlg/dbadminsetup.src | 24 +- dbaccess/source/ui/dlg/dbwiz.cxx | 15 +- dbaccess/source/ui/dlg/dbwizsetup.cxx | 15 +- dbaccess/source/ui/dlg/dlgsave.cxx | 3 +- dbaccess/source/ui/dlg/indexfieldscontrol.cxx | 12 +- dbaccess/source/ui/dlg/sqlmessage.cxx | 12 +- dbaccess/source/ui/inc/FieldDescControl.hxx | 4 +- dbaccess/source/ui/inc/UITools.hxx | 2 +- dbaccess/source/ui/inc/dbu_resource.hrc | 2 +- dbaccess/source/ui/misc/UITools.cxx | 7 +- dbaccess/source/ui/misc/WTypeSelect.cxx | 2 + dbaccess/source/ui/misc/WizardPages.src | 3 +- dbaccess/source/ui/querydesign/QTableWindow.cxx | 3 +- dbaccess/source/ui/querydesign/QueryTableView.cxx | 3 +- .../source/ui/querydesign/SelectionBrowseBox.cxx | 29 +- .../source/ui/querydesign/SelectionBrowseBox.hxx | 2 +- .../source/ui/relationdesign/RelationTableView.cxx | 3 +- dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx | 3 +- dbaccess/source/ui/tabledesign/TEditControl.cxx | 17 +- .../source/ui/tabledesign/TableDesignHelpBar.cxx | 3 +- dbaccess/source/ui/tabledesign/TableDesignView.cxx | 3 +- .../source/ui/tabledesign/TableFieldDescWin.cxx | 6 +- dbaccess/source/ui/tabledesign/table.src | 4 +- reportdesign/inc/helpids.hrc | 173 +++-- reportdesign/source/ui/dlg/AddField.cxx | 6 +- reportdesign/source/ui/dlg/Condition.cxx | 6 +- reportdesign/source/ui/dlg/Formula.cxx | 4 +- reportdesign/source/ui/dlg/GroupsSorting.cxx | 3 +- reportdesign/source/ui/dlg/Navigator.cxx | 3 +- reportdesign/source/ui/dlg/Navigator.src | 5 - reportdesign/source/ui/inc/FunctionHelper.hxx | 2 +- reportdesign/source/ui/inc/metadata.hxx | 4 +- .../source/ui/inspection/DataProviderHandler.cxx | 4 +- .../source/ui/inspection/DefaultInspection.cxx | 7 +- .../source/ui/inspection/GeometryHandler.cxx | 10 +- reportdesign/source/ui/inspection/metadata.cxx | 14 +- reportdesign/source/ui/misc/FunctionHelper.cxx | 4 +- reportdesign/source/ui/report/DesignView.cxx | 7 +- reportdesign/source/ui/report/EndMarker.cxx | 3 +- reportdesign/source/ui/report/ReportSection.cxx | 3 +- reportdesign/source/ui/report/ReportWindow.cxx | 3 +- reportdesign/source/ui/report/SectionWindow.cxx | 3 +- reportdesign/source/ui/report/StartMarker.cxx | 9 +- reportdesign/source/ui/report/ViewsWindow.cxx | 3 +- reportdesign/source/ui/report/report.src | 24 +- 69 files changed, 691 insertions(+), 837 deletions(-) diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index ce0aafdd8da7..7a33836c0b1c 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -32,442 +32,439 @@ #include // HID_DBACCESS_START #endif -#define HID_DSADMIN_CHARSET (HID_DBACCESS_START + 9) - -#define HID_DLG_FILTERCRIT (HID_DBACCESS_START + 15) -#define HID_DLG_ORDERCRIT (HID_DBACCESS_START + 16) - -#define HID_DATABROWSE_HEADER (HID_DBACCESS_START + 17) -#define HID_CTL_TABBROWSER (HID_DBACCESS_START + 18) -#define UID_DATABROWSE_DATAWINDOW (HID_DBACCESS_START + 19) -#define HID_CTL_TREEVIEW (HID_DBACCESS_START + 20) -#define UID_CTL_CONTENT (HID_DBACCESS_START + 21) -#define HID_TLB_TABBROWSER (HID_DBACCESS_START + 22) -#define HID_TLB_TREELISTBOX (HID_DBACCESS_START + 23) -#define HID_DSADMIN_DIALOG (HID_DBACCESS_START + 24) - - -#define HID_DSADMIN_TABCONTROL (HID_DBACCESS_START + 27) -#define HID_DSADMIN_PAGE_GENERAL (HID_DBACCESS_START + 28) -#define HID_DSADMIN_PAGE_DBASE (HID_DBACCESS_START + 29) -#define HID_DSADMIN_PAGE_JDBC (HID_DBACCESS_START + 30) -#define HID_DSADMIN_PAGE_ODBC (HID_DBACCESS_START + 31) -#define HID_DSADMIN_PAGE_ADABAS (HID_DBACCESS_START + 32) -#define HID_DSADMIN_PAGE_TEXT (HID_DBACCESS_START + 33) -#define HID_DSADMIN_TABLE_SUBSCRIPTION (HID_DBACCESS_START + 34) -#define HID_DSADMIN_DSACTIONS_NEWDS (HID_DBACCESS_START + 35) -#define HID_DSADMIN_DSACTIONS_DELETEDS (HID_DBACCESS_START + 36) -#define HID_DSADMIN_DSACTIONS_RESTOREDS (HID_DBACCESS_START + 37) -#define HID_DSADMIN_DSNAME (HID_DBACCESS_START + 38) -#define HID_DSADMIN_DSTYPE (HID_DBACCESS_START + 39) -#define HID_DSADMIN_URL_GENERAL (HID_DBACCESS_START + 40) -#define HID_DSADMIN_BROWSECONN (HID_DBACCESS_START + 41) -#define HID_DSADMIN_LOGINTIMEOUT_NUMBER (HID_DBACCESS_START + 42) -#define HID_DSADMIN_LOGINTIMEOUT_UNIT (HID_DBACCESS_START + 43) -#define HID_DSADMIN_SHOWDELETED (HID_DBACCESS_START + 44) -#define HID_DSADMIN_ALLOWLONG (HID_DBACCESS_START + 45) -#define HID_DSADMIN_DBASE_INDICIES (HID_DBACCESS_START + 46) -#define HID_DSADMIN_DRIVERCLASS (HID_DBACCESS_START + 47) -#define HID_DSADMIN_ODBC_OPTIONS (HID_DBACCESS_START + 48) -#define HID_DSADMIN_TEXT_HEADER (HID_DBACCESS_START + 49) -#define HID_DSADMIN_FIELD_SEPARATOR (HID_DBACCESS_START + 50) -#define HID_DSADMIN_TEXT_SEPARATOR (HID_DBACCESS_START + 51) -#define HID_DSADMIN_DECIMAL_SEPARATOR (HID_DBACCESS_START + 52) -#define HID_DSADMIN_THOUSANDS_SEPARATOR (HID_DBACCESS_START + 53) -#define HID_DSADMIN_EXTENSION (HID_DBACCESS_START + 54) -#define HID_DSADMIN_ALL_TABLES (HID_DBACCESS_START + 55) -#define HID_DSADMIN_NO_TABLES (HID_DBACCESS_START + 56) -#define HID_DSADMIN_SELECT_TABLES (HID_DBACCESS_START + 57) -#define HID_DSADMIN_TABLE_SELECTOR (HID_DBACCESS_START + 58) -#define HID_DSADMIN_SUPPRESS_VERSIONCL (HID_DBACCESS_START + 59) - -#define HID_GENERIC_SQL_ERROR (HID_DBACCESS_START + 60) - -#define HID_BROWSER_COLUMNFORMAT (HID_DBACCESS_START + 61) -#define HID_BROWSER_COLUMNWIDTH (HID_DBACCESS_START + 62) -#define HID_BROWSER_TABLEFORMAT (HID_DBACCESS_START + 63) -#define HID_BROWSER_ROWHEIGHT (HID_DBACCESS_START + 64) -#define HID_BROWSER_EDIT_DATABASE (HID_DBACCESS_START + 65) -#define HID_BROWSER_CLOSECONN (HID_DBACCESS_START + 66) -#define HID_BROWSER_REFRESHCONN (HID_DBACCESS_START + 67) - -#define HID_DLG_ROWHEIGHT (HID_DBACCESS_START + 68) -#define HID_DLG_COLWIDTH (HID_DBACCESS_START + 69) - - -#define HID_TLB_QUERYDESIGN (HID_DBACCESS_START + 70) -#define HID_CTL_QRYSQLEDIT (HID_DBACCESS_START + 71) -#define HID_DSADMIN_SPECIAL_MESSAGE (HID_DBACCESS_START + 72) - -#define HID_BROWSER_QUERY_CREATE_TEXT (HID_DBACCESS_START + 73) - -#define HID_DLG_ERROR (HID_DBACCESS_START + 74) -#define HID_DLG_TEXT (HID_DBACCESS_START + 75) -#define UID_SQLERROR_BUTTONMORE (HID_DBACCESS_START + 76) -#define HID_DLG_SAVE_AS (HID_DBACCESS_START + 77) - -#define HID_BROWSER_QUERY_EDIT (HID_DBACCESS_START + 78) -#define HID_BROWSER_QUERY_DELETE (HID_DBACCESS_START + 79) - -#define HID_DSADMIN_USER_ADO (HID_DBACCESS_START + 80) -#define HID_DSADMIN_PWDREC_ADO (HID_DBACCESS_START + 81) -#define HID_DSADMIN_CONNURL_ADOPAGE (HID_DBACCESS_START + 82) -#define HID_DSADMIN_PAGE_ADO (HID_DBACCESS_START + 83) - - -#define HID_JOINSH_ADDTAB_CLOSE (HID_DBACCESS_START + 84) -#define HID_JOINSH_ADDTAB_TABLELIST (HID_DBACCESS_START + 85) -#define HID_CTL_QRYDGNTAB (HID_DBACCESS_START + 86) -#define HID_DLG_QRY_JOIN (HID_DBACCESS_START + 87) -#define HID_DLG_QRY_JOINTYPE (HID_DBACCESS_START + 88) -#define HID_JOINSH_ADDTAB_QUERYLIST (HID_DBACCESS_START + 89) -#define HID_DLG_QRY_HELPTEXT (HID_DBACCESS_START + 92) - -#define HID_CTL_QRYDGNCRIT (HID_DBACCESS_START + 93) -#define HID_QRYDGN_ROW_VISIBLE (HID_DBACCESS_START + 94) -#define HID_QRYDGN_ROW_TABLE (HID_DBACCESS_START + 95) -#define HID_QRYDGN_ROW_FIELD (HID_DBACCESS_START + 96) -#define HID_QRYDGN_ROW_ORDER (HID_DBACCESS_START + 97) -#define HID_QRYDGN_ROW_FUNCTION (HID_DBACCESS_START + 98) -#define HID_QRYDGN_ROW_ALIAS (HID_DBACCESS_START + 99) -#define HID_QRYDGN_ROW_CRIT (HID_DBACCESS_START + 100) - -#define HID_QUERY_FUNCTION (HID_DBACCESS_START + 101) -#define HID_QUERY_TABLENAME (HID_DBACCESS_START + 102) -#define HID_QUERY_ALIASNAME (HID_DBACCESS_START + 103) -#define HID_QUERY_DISTINCT (HID_DBACCESS_START + 104) - -#define HID_BROWSER_QUERY_CREATE_DESIGN (HID_DBACCESS_START + 105) - -#define HID_DSADMIN_QUERIES (HID_DBACCESS_START + 106) -#define HID_DSADMIN_QUERIES_NEW (HID_DBACCESS_START + 107) -#define HID_DSADMIN_QUERIES_EDIT (HID_DBACCESS_START + 108) -#define HID_DSADMIN_QUERIES_DELETE (HID_DBACCESS_START + 109) -#define HID_DSADMIN_QUERYADMINISTRATION (HID_DBACCESS_START + 110) - - -#define HID_TAB_DESIGN_TABLE_DESC (HID_DBACCESS_START + 111) -#define HID_TAB_DESIGN_FIELDCONTROL (HID_DBACCESS_START + 112) -#define HID_TABLE_DESIGN_HELP_WINDOW (HID_DBACCESS_START + 113) -#define HID_TAB_DESIGN_DESCWIN (HID_DBACCESS_START + 114) -#define HID_TAB_DESIGN_TABLE_PROPS (HID_DBACCESS_START + 115) -#define HID_TABDESIGN_BACKGROUND (HID_DBACCESS_START + 116) -#define HID_CTL_TABLEEDIT (HID_DBACCESS_START + 117) -#define HID_TABDESIGN_NAMECELL (HID_DBACCESS_START + 118) -#define HID_TABDESIGN_TYPECELL (HID_DBACCESS_START + 119) -#define HID_TABDESIGN_COMMENTCELL (HID_DBACCESS_START + 120) -#define SID_TABLEDESIGN_INSERTROWS (HID_DBACCESS_START + 121) -#define SID_TABLEDESIGN_TABED_PRIMARYKEY (HID_DBACCESS_START + 122) -#define HID_TLB_TABLEDESIGN (HID_DBACCESS_START + 123) -#define HID_TAB_DESIGN_HELP_TEXT_FRAME (HID_DBACCESS_START + 124) -#define HID_TABLE_DESIGN_TABPAGE_GENERAL (HID_DBACCESS_START + 125) -#define HID_TAB_ENT_DEFAULT (HID_DBACCESS_START + 126) -#define HID_TAB_ENT_FORMAT_SAMPLE (HID_DBACCESS_START + 127) -#define HID_TAB_ENT_FORMAT (HID_DBACCESS_START + 128) -#define HID_TAB_ENT_BOOL_DEFAULT (HID_DBACCESS_START + 129) -#define HID_TAB_ENT_REQUIRED (HID_DBACCESS_START + 130) -#define HID_TAB_ENT_AUTOINCREMENT (HID_DBACCESS_START + 131) -#define HID_TAB_ENT_TEXT_LEN (HID_DBACCESS_START + 132) -#define HID_TAB_ENT_TYPE (HID_DBACCESS_START + 133) -#define HID_TAB_ENT_COLUMNNAME (HID_DBACCESS_START + 134) -#define HID_TAB_ENT_NUMTYP (HID_DBACCESS_START + 135) -#define HID_TAB_ENT_LEN (HID_DBACCESS_START + 136) -#define HID_TAB_ENT_SCALE (HID_DBACCESS_START + 137) -#define HID_BROWSER_TABLE_CREATE_DESIGN (HID_DBACCESS_START + 138) -#define HID_BROWSER_TABLE_EDIT (HID_DBACCESS_START + 139) -#define HID_BROWSER_TABLE_DELETE (HID_DBACCESS_START + 140) -#define HID_SQLERROR_EXCHAIN_ERRORS (HID_DBACCESS_START + 141) -#define HID_SQLERROR_EXCHAIN_TEXT (HID_DBACCESS_START + 142) -#define HID_TAB_WIZ_COLUMN_SELECT (HID_DBACCESS_START + 146) -#define HID_TAB_WIZ_TYPE_SELECT (HID_DBACCESS_START + 147) -#define HID_TAB_NAMEMATCHING_COLS_AVAIL (HID_DBACCESS_START + 148) -#define HID_TAB_NAMEMATCHING_COLS_ASSIGN (HID_DBACCESS_START + 149) -#define HID_TAB_WIZ_COPYTABLE (HID_DBACCESS_START + 150) -#define HID_TAB_WIZ_TABLENAME_EDIT (HID_DBACCESS_START + 151) -#define HID_CTL_RELATIONTAB (HID_DBACCESS_START + 152) -#define HID_TLB_RELATIONDESIGN (HID_DBACCESS_START + 153) -#define HID_RELATIONDIALOG_LEFTFIELDCELL (HID_DBACCESS_START + 154) -#define HID_RELATIONDIALOG_RIGHTFIELDCELL (HID_DBACCESS_START + 155) -#define HID_RELDLG_KEYFIELDS (HID_DBACCESS_START + 156) -#define HID_BROWSER_RELATION_DESIGN (HID_DBACCESS_START + 157) -#define HID_TABLE_DESIGN_NO_CONNECTION (HID_DBACCESS_START + 158) -#define HID_DSADMIN_CREATEDATABASE (HID_DBACCESS_START + 159) -#define HID_BROWSER_COLUMNINFO (HID_DBACCESS_START + 160) -#define HID_DSADMIN_USECATALOG (HID_DBACCESS_START + 161) -#define HID_BROWSER_VIEW_CREATE_DESIGN (HID_DBACCESS_START + 162) -#define HID_DSADMIN_DOCUMENTS (HID_DBACCESS_START + 166) -#define HID_DSADMIN_DOCUMENTLINKS (HID_DBACCESS_START + 167) -#define HID_DSADMIN_FILTER_EXPLANATION (HID_DBACCESS_START + 168) -#define HID_CONFIRM_DROP_BUTTON_ALL (HID_DBACCESS_START + 169) -#define HID_DSBROWSER_BOOKMARK_SELECTED (HID_DBACCESS_START + 170) -#define HID_DSADMIN_TABLE_TOOLBOX (HID_DBACCESS_START + 171) -#define HID_DSADMIN_QUERY_TOOLBOX (HID_DBACCESS_START + 172) -#define HID_DSADMIN_BOOKMARK_TOOLBOX (HID_DBACCESS_START + 173) -#define HID_DSADMIN_PAGE_LDAP (HID_DBACCESS_START + 174) -#define HID_DSADMIN_LDAP_HOSTNAME (HID_DBACCESS_START + 175) -#define HID_DSADMIN_LDAP_BASEDN (HID_DBACCESS_START + 176) -#define HID_DSADMIN_LDAP_PORTNUMBER (HID_DBACCESS_START + 177) -#define HID_DSBROWSER_BOOKMARKSELECTED (HID_DBACCESS_START + 178) -#define HID_DSBROWSER_DISCONNECTING (HID_DBACCESS_START + 179) -#define HID_TAB_PAGE_USERADMIN (HID_DBACCESS_START + 180) -#define HID_TAB_PAGE_PBUSER (HID_DBACCESS_START + 181) -#define HID_TAB_PAGE_PBCHGPWD (HID_DBACCESS_START + 182) -#define HID_TAB_PAGE_PBUSERDELETE (HID_DBACCESS_START + 183) -#define HID_TAB_PAGE_TBLGRANTS (HID_DBACCESS_START + 184) -#define HID_TAB_PAGE_LBUSER (HID_DBACCESS_START + 185) -#define HID_DSBROWSER_DIRECTSQL (HID_DBACCESS_START + 186) -#define HID_DSADMIN_LDAP_ROWCOUNT (HID_DBACCESS_START + 187) -#define HID_BROWSER_QUERY_EDITSQL (HID_DBACCESS_START + 189) -#define HID_DSADMIN_PAGE_MOZILLA (HID_DBACCESS_START + 190) -#define HID_DSADMIN_MOZILLA_PROFILE_NAME (HID_DBACCESS_START + 191) -#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME (HID_DBACCESS_START + 192) -#define HID_BROWSER_OPEN_DOCUMENT (HID_DBACCESS_START + 193) -#define HID_BROWSER_EDIT_DOCUMENT (HID_DBACCESS_START + 194) -#define HID_BROWSER_BEW_DOCUMENT (HID_DBACCESS_START + 195) -#define HID_DLG_PASSWORD (HID_DBACCESS_START + 196) - -#define HID_DLGIDX_NEWINDEX (HID_DBACCESS_START + 197) -#define HID_DLGIDX_DROPINDEX (HID_DBACCESS_START + 198) -#define HID_DLGIDX_RENAMEINDEX (HID_DBACCESS_START + 199) -#define HID_DLGIDX_SAVEINDEX (HID_DBACCESS_START + 200) -#define HID_DLGIDX_RESETINDEX (HID_DBACCESS_START + 201) -#define HID_DLGIDX_INDEXLIST (HID_DBACCESS_START + 202) -#define UID_DLGINDEX_INDEXDETAILS_BACK (HID_DBACCESS_START + 203) -#define UID_DLGINDEX_INDEXDETAILS_MAIN (HID_DBACCESS_START + 204) -#define HID_DLGINDEX_INDEXDETAILS_FIELD (HID_DBACCESS_START + 205) -#define HID_DLGINDEX_INDEXDETAILS_SORTORDER (HID_DBACCESS_START + 206) - -#define HID_DOCLINKEDIT_URL (HID_DBACCESS_START + 207) -#define HID_QUERY_SQLMODE (HID_DBACCESS_START + 208) - -#define HID_BROWSER_REFRESH_REBUILDVIEW (HID_DBACCESS_START + 209) -#define HID_BROWSER_RENAME_ENTRY (HID_DBACCESS_START + 210) - -#define HID_QUERY_EDIT_JOINCONNECTION (HID_DBACCESS_START + 211) - -#define HID_DLG_QRY_WINDOW_CONTROL (HID_DBACCESS_START + 212) -#define HID_DLG_QRY_LEFT_TABLE (HID_DBACCESS_START + 213) -#define HID_DLG_QRY_RIGHT_TABLE (HID_DBACCESS_START + 214) - -#define HID_DLG_REL_CASC_DEL (HID_DBACCESS_START + 215) -#define HID_DLG_REL_NO_CASC_DEL (HID_DBACCESS_START + 216) -#define HID_DLG_REL_CASC_DEL_NULL (HID_DBACCESS_START + 217) -#define HID_DLG_REL_CASC_DEL_DEFAULT (HID_DBACCESS_START + 218) - -#define HID_DLG_REL_CASC_UPD (HID_DBACCESS_START + 219) -#define HID_DLG_REL_NO_CASC_UPD (HID_DBACCESS_START + 220) -#define HID_DLG_REL_CASC_UPD_NULL (HID_DBACCESS_START + 221) -#define HID_DLG_REL_CASC_UPD_DEFAULT (HID_DBACCESS_START + 222) -#define HID_BROWSER_SAVE_RECORD (HID_DBACCESS_START + 223) -#define HID_BROWSER_UNDO_RECORD (HID_DBACCESS_START + 224) - -#define HID_DSADMIN_SQL92CHECK (HID_DBACCESS_START + 225) -#define HID_DSADMIN_AUTOINCREMENTVALUE (HID_DBACCESS_START + 226) -#define HID_DOCUMENT_CREATE_REPWIZ (HID_DBACCESS_START + 227) -#define HID_TAB_AUTOINCREMENTVALUE (HID_DBACCESS_START + 228) -#define HID_DSADMIN_RETRIEVE_AUTO (HID_DBACCESS_START + 229) -#define HID_DSADMIN_AUTORETRIEVEENABLED (HID_DBACCESS_START + 230) - -#define HID_DSADMIN_PAGE_MYSQL_ODBC (HID_DBACCESS_START + 231) -#define HID_TAB_PAGE_TABLEPRIVILEGES (HID_DBACCESS_START + 232) - -#define HID_DSADMIN_PAGE_USERDRIVER (HID_DBACCESS_START + 233) -#define HID_DSADMIN_USER_DEFINED (HID_DBACCESS_START + 234) -#define HID_DSADMIN_USERDEF_OPTIONS (HID_DBACCESS_START + 235) -#define HID_DSADMIN_CHARSET_USERDEF (HID_DBACCESS_START + 236) -#define HID_DSADMIN_USER_LDAP (HID_DBACCESS_START + 237) -#define HID_DSADMIN_PWDREC_LDAP (HID_DBACCESS_START + 238) -#define HID_DSADMIN_USESSL_LDAP (HID_DBACCESS_START + 239) -#define HID_BROWSER_QUERY_WIZARD (HID_DBACCESS_START + 237) - -#define HID_DLG_RENAME (HID_DBACCESS_START + 237) - -#define HID_DSADMIN_PAGE_MYSQL_JDBC (HID_DBACCESS_START + 238) - -#define HID_DSADMIN_DBASE_PATH (HID_DBACCESS_START + 239) -#define HID_DSADMIN_MYSQL_DATABASE (HID_DBACCESS_START + 240) -#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE (HID_DBACCESS_START + 241) -#define HID_DSADMIN_ODBC_DATASOURCE (HID_DBACCESS_START + 242) -#define HID_DSADMIN_ADABAS_DATABASE (HID_DBACCESS_START + 243) -#define HID_DSADMIN_MSACCESS_MDB_FILE (HID_DBACCESS_START + 244) -#define HID_DSADMIN_PAGE_MSACCESS (HID_DBACCESS_START + 245) -#define HID_DSADMIN_FLAT_PATH (HID_DBACCESS_START + 246) -#define HID_DSADMIN_CALC_PATH (HID_DBACCESS_START + 247) -#define HID_DSADMIN_ADVANCED (HID_DBACCESS_START + 248) -#define HID_DSADMIN_BOOLEANCOMPARISON (HID_DBACCESS_START + 249) -#define HID_DSADMIN_ORACLE_DATABASE (HID_DBACCESS_START + 250) - -#define UID_APP_VIEW (HID_DBACCESS_START + 251) -#define HID_APP_TABLE_TREE (HID_DBACCESS_START + 252) -#define HID_APP_FORM_TREE (HID_DBACCESS_START + 253) -#define HID_APP_QUERY_TREE (HID_DBACCESS_START + 254) -#define HID_APP_REPORT_TREE (HID_DBACCESS_START + 255) -#define UID_APP_DETAIL_VIEW (HID_DBACCESS_START + 256) -#define UID_APP_VIEW_VERT_SPLIT (HID_DBACCESS_START + 257) -#define UID_APP_VIEW_BORDER_WIN (HID_DBACCESS_START + 258) -#define HID_APP_CREATION_LIST (HID_DBACCESS_START + 259) -#define UID_APP_SWAP_VIEW (HID_DBACCESS_START + 260) -#define UID_DLG_TABLE_FILTER (HID_DBACCESS_START + 261) -#define HID_APP_SWAP_ICONCONTROL (HID_DBACCESS_START + 262) - -#define HID_DSADMIN_APPENDTABLEALIAS (HID_DBACCESS_START + 263) -#define HID_DSADMIN_PARAMETERNAMESUBST (HID_DBACCESS_START + 264) -#define HID_DSADMIN_IGNOREDRIVER_PRIV (HID_DBACCESS_START + 265) -#define HID_DSADMIN_HOSTNAME (HID_DBACCESS_START + 266) -#define HID_DSADMIN_PORTNUMBER (HID_DBACCESS_START + 267) - -#define HID_APP_HELP_TEXT (HID_DBACCESS_START + 268) -#define HID_EXPLORERDLG_COLLECTION (HID_DBACCESS_START + 269) -#define UID_APP_DATABASE_VIEW (HID_DBACCESS_START + 270) -#define UID_APP_TASKS_VIEW (HID_DBACCESS_START + 271) -#define UID_APP_CONTAINER_VIEW (HID_DBACCESS_START + 272) -#define UID_APP_TASKS_WINDOW (HID_DBACCESS_START + 273) -#define HID_APP_DESCRIPTION_TEXT (HID_DBACCESS_START + 274) -#define UID_APP_DETAILPAGE_HELPER (HID_DBACCESS_START + 275) -#define HID_APP_VIEW_PREVIEW_CB (HID_DBACCESS_START + 276) -#define HID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 277) -#define HID_APP_VIEW_PREVIEW_2 (HID_DBACCESS_START + 278) +#define HID_DSADMIN_CHARSET "DBACCESS_HID_DSADMIN_CHARSET" + +#define HID_DLG_FILTERCRIT "DBACCESS_HID_DLG_FILTERCRIT" +#define HID_DLG_ORDERCRIT "DBACCESS_HID_DLG_ORDERCRIT" + +#define HID_DATABROWSE_HEADER "DBACCESS_HID_DATABROWSE_HEADER" +#define HID_CTL_TABBROWSER "DBACCESS_HID_CTL_TABBROWSER" +#define UID_DATABROWSE_DATAWINDOW "DBACCESS_UID_DATABROWSE_DATAWINDOW" +#define HID_CTL_TREEVIEW "DBACCESS_HID_CTL_TREEVIEW" +#define UID_CTL_CONTENT "DBACCESS_UID_CTL_CONTENT" +#define HID_TLB_TABBROWSER "DBACCESS_HID_TLB_TABBROWSER" +#define HID_TLB_TREELISTBOX "DBACCESS_HID_TLB_TREELISTBOX" +#define HID_DSADMIN_DIALOG "DBACCESS_HID_DSADMIN_DIALOG" + + +#define HID_DSADMIN_TABCONTROL "DBACCESS_HID_DSADMIN_TABCONTROL" +#define HID_DSADMIN_PAGE_GENERAL "DBACCESS_HID_DSADMIN_PAGE_GENERAL" +#define HID_DSADMIN_PAGE_DBASE "DBACCESS_HID_DSADMIN_PAGE_DBASE" +#define HID_DSADMIN_PAGE_JDBC "DBACCESS_HID_DSADMIN_PAGE_JDBC" +#define HID_DSADMIN_PAGE_ODBC "DBACCESS_HID_DSADMIN_PAGE_ODBC" +#define HID_DSADMIN_PAGE_ADABAS "DBACCESS_HID_DSADMIN_PAGE_ADABAS" +#define HID_DSADMIN_PAGE_TEXT "DBACCESS_HID_DSADMIN_PAGE_TEXT" +#define HID_DSADMIN_TABLE_SUBSCRIPTION "DBACCESS_HID_DSADMIN_TABLE_SUBSCRIPTION" +#define HID_DSADMIN_DSACTIONS_NEWDS "DBACCESS_HID_DSADMIN_DSACTIONS_NEWDS" +#define HID_DSADMIN_DSACTIONS_DELETEDS "DBACCESS_HID_DSADMIN_DSACTIONS_DELETEDS" +#define HID_DSADMIN_DSACTIONS_RESTOREDS "DBACCESS_HID_DSADMIN_DSACTIONS_RESTOREDS" +#define HID_DSADMIN_DSNAME "DBACCESS_HID_DSADMIN_DSNAME" +#define HID_DSADMIN_DSTYPE "DBACCESS_HID_DSADMIN_DSTYPE" +#define HID_DSADMIN_URL_GENERAL "DBACCESS_HID_DSADMIN_URL_GENERAL" +#define HID_DSADMIN_BROWSECONN "DBACCESS_HID_DSADMIN_BROWSECONN" +#define HID_DSADMIN_LOGINTIMEOUT_NUMBER "DBACCESS_HID_DSADMIN_LOGINTIMEOUT_NUMBER" +#define HID_DSADMIN_LOGINTIMEOUT_UNIT "DBACCESS_HID_DSADMIN_LOGINTIMEOUT_UNIT" +#define HID_DSADMIN_SHOWDELETED "DBACCESS_HID_DSADMIN_SHOWDELETED" +#define HID_DSADMIN_ALLOWLONG "DBACCESS_HID_DSADMIN_ALLOWLONG" +#define HID_DSADMIN_DBASE_INDICIES "DBACCESS_HID_DSADMIN_DBASE_INDICIES" +#define HID_DSADMIN_DRIVERCLASS "DBACCESS_HID_DSADMIN_DRIVERCLASS" +#define HID_DSADMIN_ODBC_OPTIONS "DBACCESS_HID_DSADMIN_ODBC_OPTIONS" +#define HID_DSADMIN_TEXT_HEADER "DBACCESS_HID_DSADMIN_TEXT_HEADER" +#define HID_DSADMIN_FIELD_SEPARATOR "DBACCESS_HID_DSADMIN_FIELD_SEPARATOR" +#define HID_DSADMIN_TEXT_SEPARATOR "DBACCESS_HID_DSADMIN_TEXT_SEPARATOR" +#define HID_DSADMIN_DECIMAL_SEPARATOR "DBACCESS_HID_DSADMIN_DECIMAL_SEPARATOR" +#define HID_DSADMIN_THOUSANDS_SEPARATOR "DBACCESS_HID_DSADMIN_THOUSANDS_SEPARATOR" +#define HID_DSADMIN_EXTENSION "DBACCESS_HID_DSADMIN_EXTENSION" +#define HID_DSADMIN_ALL_TABLES "DBACCESS_HID_DSADMIN_ALL_TABLES" +#define HID_DSADMIN_NO_TABLES "DBACCESS_HID_DSADMIN_NO_TABLES" +#define HID_DSADMIN_SELECT_TABLES "DBACCESS_HID_DSADMIN_SELECT_TABLES" +#define HID_DSADMIN_TABLE_SELECTOR "DBACCESS_HID_DSADMIN_TABLE_SELECTOR" +#define HID_DSADMIN_SUPPRESS_VERSIONCL "DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL" + +#define HID_GENERIC_SQL_ERROR "DBACCESS_HID_GENERIC_SQL_ERROR" + +#define HID_BROWSER_COLUMNFORMAT "DBACCESS_HID_BROWSER_COLUMNFORMAT" +#define HID_BROWSER_COLUMNWIDTH "DBACCESS_HID_BROWSER_COLUMNWIDTH" +#define HID_BROWSER_TABLEFORMAT "DBACCESS_HID_BROWSER_TABLEFORMAT" +#define HID_BROWSER_ROWHEIGHT "DBACCESS_HID_BROWSER_ROWHEIGHT" +#define HID_BROWSER_EDIT_DATABASE "DBACCESS_HID_BROWSER_EDIT_DATABASE" +#define HID_BROWSER_CLOSECONN "DBACCESS_HID_BROWSER_CLOSECONN" +#define HID_BROWSER_REFRESHCONN "DBACCESS_HID_BROWSER_REFRESHCONN" + +#define HID_DLG_ROWHEIGHT "DBACCESS_HID_DLG_ROWHEIGHT" +#define HID_DLG_COLWIDTH "DBACCESS_HID_DLG_COLWIDTH" + + +#define HID_TLB_QUERYDESIGN "DBACCESS_HID_TLB_QUERYDESIGN" +#define HID_CTL_QRYSQLEDIT "DBACCESS_HID_CTL_QRYSQLEDIT" +#define HID_DSADMIN_SPECIAL_MESSAGE "DBACCESS_HID_DSADMIN_SPECIAL_MESSAGE" + +#define HID_BROWSER_QUERY_CREATE_TEXT "DBACCESS_HID_BROWSER_QUERY_CREATE_TEXT" + +#define HID_DLG_ERROR "DBACCESS_HID_DLG_ERROR" +#define HID_DLG_TEXT "DBACCESS_HID_DLG_TEXT" +#define UID_SQLERROR_BUTTONMORE "DBACCESS_UID_SQLERROR_BUTTONMORE" +#define HID_DLG_SAVE_AS "DBACCESS_HID_DLG_SAVE_AS" + +#define HID_BROWSER_QUERY_EDIT "DBACCESS_HID_BROWSER_QUERY_EDIT" +#define HID_BROWSER_QUERY_DELETE "DBACCESS_HID_BROWSER_QUERY_DELETE" + +#define HID_DSADMIN_USER_ADO "DBACCESS_HID_DSADMIN_USER_ADO" +#define HID_DSADMIN_PWDREC_ADO "DBACCESS_HID_DSADMIN_PWDREC_ADO" +#define HID_DSADMIN_CONNURL_ADOPAGE "DBACCESS_HID_DSADMIN_CONNURL_ADOPAGE" +#define HID_DSADMIN_PAGE_ADO "DBACCESS_HID_DSADMIN_PAGE_ADO" + + +#define HID_JOINSH_ADDTAB_CLOSE "DBACCESS_HID_JOINSH_ADDTAB_CLOSE" +#define HID_JOINSH_ADDTAB_TABLELIST "DBACCESS_HID_JOINSH_ADDTAB_TABLELIST" +#define HID_CTL_QRYDGNTAB "DBACCESS_HID_CTL_QRYDGNTAB" +#define HID_DLG_QRY_JOIN "DBACCESS_HID_DLG_QRY_JOIN" +#define HID_DLG_QRY_JOINTYPE "DBACCESS_HID_DLG_QRY_JOINTYPE" +#define HID_JOINSH_ADDTAB_QUERYLIST "DBACCESS_HID_JOINSH_ADDTAB_QUERYLIST" +#define HID_DLG_QRY_HELPTEXT "DBACCESS_HID_DLG_QRY_HELPTEXT" + +#define HID_CTL_QRYDGNCRIT "DBACCESS_HID_CTL_QRYDGNCRIT" +#define HID_QRYDGN_ROW_VISIBLE "DBACCESS_HID_QRYDGN_ROW_VISIBLE" +#define HID_QRYDGN_ROW_TABLE "DBACCESS_HID_QRYDGN_ROW_TABLE" +#define HID_QRYDGN_ROW_FIELD "DBACCESS_HID_QRYDGN_ROW_FIELD" +#define HID_QRYDGN_ROW_ORDER "DBACCESS_HID_QRYDGN_ROW_ORDER" +#define HID_QRYDGN_ROW_FUNCTION "DBACCESS_HID_QRYDGN_ROW_FUNCTION" +#define HID_QRYDGN_ROW_ALIAS "DBACCESS_HID_QRYDGN_ROW_ALIAS" +#define HID_QRYDGN_ROW_CRIT "DBACCESS_HID_QRYDGN_ROW_CRIT" + +#define HID_QUERY_FUNCTION "DBACCESS_HID_QUERY_FUNCTION" +#define HID_QUERY_TABLENAME "DBACCESS_HID_QUERY_TABLENAME" +#define HID_QUERY_ALIASNAME "DBACCESS_HID_QUERY_ALIASNAME" +#define HID_QUERY_DISTINCT "DBACCESS_HID_QUERY_DISTINCT" + +#define HID_BROWSER_QUERY_CREATE_DESIGN "DBACCESS_HID_BROWSER_QUERY_CREATE_DESIGN" + +#define HID_DSADMIN_QUERIES "DBACCESS_HID_DSADMIN_QUERIES" +#define HID_DSADMIN_QUERIES_NEW "DBACCESS_HID_DSADMIN_QUERIES_NEW" +#define HID_DSADMIN_QUERIES_EDIT "DBACCESS_HID_DSADMIN_QUERIES_EDIT" +#define HID_DSADMIN_QUERIES_DELETE "DBACCESS_HID_DSADMIN_QUERIES_DELETE" +#define HID_DSADMIN_QUERYADMINISTRATION "DBACCESS_HID_DSADMIN_QUERYADMINISTRATION" + + +#define HID_TAB_DESIGN_TABLE_DESC "DBACCESS_HID_TAB_DESIGN_TABLE_DESC" +#define HID_TAB_DESIGN_FIELDCONTROL "DBACCESS_HID_TAB_DESIGN_FIELDCONTROL" +#define HID_TABLE_DESIGN_HELP_WINDOW "DBACCESS_HID_TABLE_DESIGN_HELP_WINDOW" +#define HID_TAB_DESIGN_DESCWIN "DBACCESS_HID_TAB_DESIGN_DESCWIN" +#define HID_TAB_DESIGN_TABLE_PROPS "DBACCESS_HID_TAB_DESIGN_TABLE_PROPS" +#define HID_TABDESIGN_BACKGROUND "DBACCESS_HID_TABDESIGN_BACKGROUND" +#define HID_CTL_TABLEEDIT "DBACCESS_HID_CTL_TABLEEDIT" +#define HID_TABDESIGN_NAMECELL "DBACCESS_HID_TABDESIGN_NAMECELL" +#define HID_TABDESIGN_TYPECELL "DBACCESS_HID_TABDESIGN_TYPECELL" +#define HID_TABDESIGN_COMMENTCELL "DBACCESS_HID_TABDESIGN_COMMENTCELL" +#define HID_TABLEDESIGN_INSERTROWS "DBACCESS_HID_TABLEDESIGN_INSERTROWS" +#define HID_TABLEDESIGN_TABED_PRIMARYKEY "DBACCESS_HID_TABLEDESIGN_TABED_PRIMARYKEY" +#define HID_TLB_TABLEDESIGN "DBACCESS_HID_TLB_TABLEDESIGN" +#define HID_TAB_DESIGN_HELP_TEXT_FRAME "DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME" +#define HID_TABLE_DESIGN_TABPAGE_GENERAL "DBACCESS_HID_TABLE_DESIGN_TABPAGE_GENERAL" +#define HID_TAB_ENT_DEFAULT "DBACCESS_HID_TAB_ENT_DEFAULT" +#define HID_TAB_ENT_FORMAT_SAMPLE "DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE" +#define HID_TAB_ENT_FORMAT "DBACCESS_HID_TAB_ENT_FORMAT" +#define HID_TAB_ENT_BOOL_DEFAULT "DBACCESS_HID_TAB_ENT_BOOL_DEFAULT" +#define HID_TAB_ENT_REQUIRED "DBACCESS_HID_TAB_ENT_REQUIRED" +#define HID_TAB_ENT_AUTOINCREMENT "DBACCESS_HID_TAB_ENT_AUTOINCREMENT" +#define HID_TAB_ENT_TEXT_LEN "DBACCESS_HID_TAB_ENT_TEXT_LEN" +#define HID_TAB_ENT_TYPE "DBACCESS_HID_TAB_ENT_TYPE" +#define HID_TAB_ENT_COLUMNNAME "DBACCESS_HID_TAB_ENT_COLUMNNAME" +#define HID_TAB_ENT_NUMTYP "DBACCESS_HID_TAB_ENT_NUMTYP" +#define HID_TAB_ENT_LEN "DBACCESS_HID_TAB_ENT_LEN" +#define HID_TAB_ENT_SCALE "DBACCESS_HID_TAB_ENT_SCALE" +#define HID_BROWSER_TABLE_CREATE_DESIGN "DBACCESS_HID_BROWSER_TABLE_CREATE_DESIGN" +#define HID_BROWSER_TABLE_EDIT "DBACCESS_HID_BROWSER_TABLE_EDIT" +#define HID_BROWSER_TABLE_DELETE "DBACCESS_HID_BROWSER_TABLE_DELETE" +#define HID_SQLERROR_EXCHAIN_ERRORS "DBACCESS_HID_SQLERROR_EXCHAIN_ERRORS" +#define HID_SQLERROR_EXCHAIN_TEXT "DBACCESS_HID_SQLERROR_EXCHAIN_TEXT" +#define HID_TAB_WIZ_COLUMN_SELECT "DBACCESS_HID_TAB_WIZ_COLUMN_SELECT" +#define HID_TAB_WIZ_TYPE_SELECT "DBACCESS_HID_TAB_WIZ_TYPE_SELECT" +#define HID_TAB_NAMEMATCHING_COLS_AVAIL "DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL" +#define HID_TAB_NAMEMATCHING_COLS_ASSIGN "DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN" +#define HID_TAB_WIZ_COPYTABLE "DBACCESS_HID_TAB_WIZ_COPYTABLE" +#define HID_TAB_WIZ_TABLENAME_EDIT "DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT" +#define HID_CTL_RELATIONTAB "DBACCESS_HID_CTL_RELATIONTAB" +#define HID_TLB_RELATIONDESIGN "DBACCESS_HID_TLB_RELATIONDESIGN" +#define HID_RELATIONDIALOG_LEFTFIELDCELL "DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL" +#define HID_RELATIONDIALOG_RIGHTFIELDCELL "DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL" +#define HID_RELDLG_KEYFIELDS "DBACCESS_HID_RELDLG_KEYFIELDS" +#define HID_BROWSER_RELATION_DESIGN "DBACCESS_HID_BROWSER_RELATION_DESIGN" +#define HID_TABLE_DESIGN_NO_CONNECTION "DBACCESS_HID_TABLE_DESIGN_NO_CONNECTION" +#define HID_DSADMIN_CREATEDATABASE "DBACCESS_HID_DSADMIN_CREATEDATABASE" +#define HID_BROWSER_COLUMNINFO "DBACCESS_HID_BROWSER_COLUMNINFO" +#define HID_DSADMIN_USECATALOG "DBACCESS_HID_DSADMIN_USECATALOG" +#define HID_BROWSER_VIEW_CREATE_DESIGN "DBACCESS_HID_BROWSER_VIEW_CREATE_DESIGN" +#define HID_DSADMIN_DOCUMENTS "DBACCESS_HID_DSADMIN_DOCUMENTS" +#define HID_DSADMIN_DOCUMENTLINKS "DBACCESS_HID_DSADMIN_DOCUMENTLINKS" +#define HID_DSADMIN_FILTER_EXPLANATION "DBACCESS_HID_DSADMIN_FILTER_EXPLANATION" +#define HID_CONFIRM_DROP_BUTTON_ALL "DBACCESS_HID_CONFIRM_DROP_BUTTON_ALL" +#define HID_DSBROWSER_BOOKMARK_SELECTED "DBACCESS_HID_DSBROWSER_BOOKMARK_SELECTED" +#define HID_DSADMIN_TABLE_TOOLBOX "DBACCESS_HID_DSADMIN_TABLE_TOOLBOX" +#define HID_DSADMIN_QUERY_TOOLBOX "DBACCESS_HID_DSADMIN_QUERY_TOOLBOX" +#define HID_DSADMIN_BOOKMARK_TOOLBOX "DBACCESS_HID_DSADMIN_BOOKMARK_TOOLBOX" +#define HID_DSADMIN_PAGE_LDAP "DBACCESS_HID_DSADMIN_PAGE_LDAP" +#define HID_DSADMIN_LDAP_HOSTNAME "DBACCESS_HID_DSADMIN_LDAP_HOSTNAME" +#define HID_DSADMIN_LDAP_BASEDN "DBACCESS_HID_DSADMIN_LDAP_BASEDN" +#define HID_DSADMIN_LDAP_PORTNUMBER "DBACCESS_HID_DSADMIN_LDAP_PORTNUMBER" +#define HID_DSBROWSER_BOOKMARKSELECTED "DBACCESS_HID_DSBROWSER_BOOKMARKSELECTED" +#define HID_DSBROWSER_DISCONNECTING "DBACCESS_HID_DSBROWSER_DISCONNECTING" +#define HID_TAB_PAGE_USERADMIN "DBACCESS_HID_TAB_PAGE_USERADMIN" +#define HID_TAB_PAGE_PBUSER "DBACCESS_HID_TAB_PAGE_PBUSER" +#define HID_TAB_PAGE_PBCHGPWD "DBACCESS_HID_TAB_PAGE_PBCHGPWD" +#define HID_TAB_PAGE_PBUSERDELETE "DBACCESS_HID_TAB_PAGE_PBUSERDELETE" +#define HID_TAB_PAGE_TBLGRANTS "DBACCESS_HID_TAB_PAGE_TBLGRANTS" +#define HID_TAB_PAGE_LBUSER "DBACCESS_HID_TAB_PAGE_LBUSER" +#define HID_DSBROWSER_DIRECTSQL "DBACCESS_HID_DSBROWSER_DIRECTSQL" +#define HID_DSADMIN_LDAP_ROWCOUNT "DBACCESS_HID_DSADMIN_LDAP_ROWCOUNT" +#define HID_BROWSER_QUERY_EDITSQL "DBACCESS_HID_BROWSER_QUERY_EDITSQL" +#define HID_DSADMIN_PAGE_MOZILLA "DBACCESS_HID_DSADMIN_PAGE_MOZILLA" +#define HID_DSADMIN_MOZILLA_PROFILE_NAME "DBACCESS_HID_DSADMIN_MOZILLA_PROFILE_NAME" +#define HID_DSADMIN_THUNDERBIRD_PROFILE_NAME "DBACCESS_HID_DSADMIN_THUNDERBIRD_PROFILE_NAME" +#define HID_BROWSER_OPEN_DOCUMENT "DBACCESS_HID_BROWSER_OPEN_DOCUMENT" +#define HID_BROWSER_EDIT_DOCUMENT "DBACCESS_HID_BROWSER_EDIT_DOCUMENT" +#define HID_BROWSER_BEW_DOCUMENT "DBACCESS_HID_BROWSER_BEW_DOCUMENT" +#define HID_DLG_PASSWORD "DBACCESS_HID_DLG_PASSWORD" + +#define HID_DLGIDX_NEWINDEX "DBACCESS_HID_DLGIDX_NEWINDEX" +#define HID_DLGIDX_DROPINDEX "DBACCESS_HID_DLGIDX_DROPINDEX" +#define HID_DLGIDX_RENAMEINDEX "DBACCESS_HID_DLGIDX_RENAMEINDEX" +#define HID_DLGIDX_SAVEINDEX "DBACCESS_HID_DLGIDX_SAVEINDEX" +#define HID_DLGIDX_RESETINDEX "DBACCESS_HID_DLGIDX_RESETINDEX" +#define HID_DLGIDX_INDEXLIST "DBACCESS_HID_DLGIDX_INDEXLIST" +#define UID_DLGINDEX_INDEXDETAILS_BACK "DBACCESS_UID_DLGINDEX_INDEXDETAILS_BACK" +#define UID_DLGINDEX_INDEXDETAILS_MAIN "DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN" +#define HID_DLGINDEX_INDEXDETAILS_FIELD "DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD" +#define HID_DLGINDEX_INDEXDETAILS_SORTORDER "DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER" + +#define HID_DOCLINKEDIT_URL "DBACCESS_HID_DOCLINKEDIT_URL" +#define HID_QUERY_SQLMODE "DBACCESS_HID_QUERY_SQLMODE" + +#define HID_BROWSER_REFRESH_REBUILDVIEW "DBACCESS_HID_BROWSER_REFRESH_REBUILDVIEW" +#define HID_BROWSER_RENAME_ENTRY "DBACCESS_HID_BROWSER_RENAME_ENTRY" + +#define HID_QUERY_EDIT_JOINCONNECTION "DBACCESS_HID_QUERY_EDIT_JOINCONNECTION" + +#define HID_DLG_QRY_WINDOW_CONTROL "DBACCESS_HID_DLG_QRY_WINDOW_CONTROL" +#define HID_DLG_QRY_LEFT_TABLE "DBACCESS_HID_DLG_QRY_LEFT_TABLE" +#define HID_DLG_QRY_RIGHT_TABLE "DBACCESS_HID_DLG_QRY_RIGHT_TABLE" + +#define HID_DLG_REL_CASC_DEL "DBACCESS_HID_DLG_REL_CASC_DEL" +#define HID_DLG_REL_NO_CASC_DEL "DBACCESS_HID_DLG_REL_NO_CASC_DEL" +#define HID_DLG_REL_CASC_DEL_NULL "DBACCESS_HID_DLG_REL_CASC_DEL_NULL" +#define HID_DLG_REL_CASC_DEL_DEFAULT "DBACCESS_HID_DLG_REL_CASC_DEL_DEFAULT" + +#define HID_DLG_REL_CASC_UPD "DBACCESS_HID_DLG_REL_CASC_UPD" +#define HID_DLG_REL_NO_CASC_UPD "DBACCESS_HID_DLG_REL_NO_CASC_UPD" +#define HID_DLG_REL_CASC_UPD_NULL "DBACCESS_HID_DLG_REL_CASC_UPD_NULL" +#define HID_DLG_REL_CASC_UPD_DEFAULT "DBACCESS_HID_DLG_REL_CASC_UPD_DEFAULT" +#define HID_BROWSER_SAVE_RECORD "DBACCESS_HID_BROWSER_SAVE_RECORD" +#define HID_BROWSER_UNDO_RECORD "DBACCESS_HID_BROWSER_UNDO_RECORD" + +#define HID_DSADMIN_SQL92CHECK "DBACCESS_HID_DSADMIN_SQL92CHECK" +#define HID_DSADMIN_AUTOINCREMENTVALUE "DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE" +#define HID_DOCUMENT_CREATE_REPWIZ "DBACCESS_HID_DOCUMENT_CREATE_REPWIZ" +#define HID_TAB_AUTOINCREMENTVALUE "DBACCESS_HID_TAB_AUTOINCREMENTVALUE" +#define HID_DSADMIN_RETRIEVE_AUTO "DBACCESS_HID_DSADMIN_RETRIEVE_AUTO" +#define HID_DSADMIN_AUTORETRIEVEENABLED "DBACCESS_HID_DSADMIN_AUTORETRIEVEENABLED" + +#define HID_DSADMIN_PAGE_MYSQL_ODBC "DBACCESS_HID_DSADMIN_PAGE_MYSQL_ODBC" +#define HID_TAB_PAGE_TABLEPRIVILEGES "DBACCESS_HID_TAB_PAGE_TABLEPRIVILEGES" + +#define HID_DSADMIN_PAGE_USERDRIVER "DBACCESS_HID_DSADMIN_PAGE_USERDRIVER" +#define HID_DSADMIN_USER_DEFINED "DBACCESS_HID_DSADMIN_USER_DEFINED" +#define HID_DSADMIN_USERDEF_OPTIONS "DBACCESS_HID_DSADMIN_USERDEF_OPTIONS" +#define HID_DSADMIN_CHARSET_USERDEF "DBACCESS_HID_DSADMIN_CHARSET_USERDEF" +#define HID_DSADMIN_USER_LDAP "DBACCESS_HID_DSADMIN_USER_LDAP" +#define HID_DSADMIN_PWDREC_LDAP "DBACCESS_HID_DSADMIN_PWDREC_LDAP" +#define HID_DSADMIN_USESSL_LDAP "DBACCESS_HID_DSADMIN_USESSL_LDAP" +#define HID_BROWSER_QUERY_WIZARD "DBACCESS_HID_BROWSER_QUERY_WIZARD" + +#define HID_DLG_RENAME "DBACCESS_HID_DLG_RENAME" + +#define HID_DSADMIN_PAGE_MYSQL_JDBC "DBACCESS_HID_DSADMIN_PAGE_MYSQL_JDBC" + +#define HID_DSADMIN_DBASE_PATH "DBACCESS_HID_DSADMIN_DBASE_PATH" +#define HID_DSADMIN_MYSQL_DATABASE "DBACCESS_HID_DSADMIN_MYSQL_DATABASE" +#define HID_DSADMIN_MYSQL_ODBC_DATASOURCE "DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE" +#define HID_DSADMIN_ODBC_DATASOURCE "DBACCESS_HID_DSADMIN_ODBC_DATASOURCE" +#define HID_DSADMIN_ADABAS_DATABASE "DBACCESS_HID_DSADMIN_ADABAS_DATABASE" +#define HID_DSADMIN_MSACCESS_MDB_FILE "DBACCESS_HID_DSADMIN_MSACCESS_MDB_FILE" +#define HID_DSADMIN_PAGE_MSACCESS "DBACCESS_HID_DSADMIN_PAGE_MSACCESS" +#define HID_DSADMIN_FLAT_PATH "DBACCESS_HID_DSADMIN_FLAT_PATH" +#define HID_DSADMIN_CALC_PATH "DBACCESS_HID_DSADMIN_CALC_PATH" +#define HID_DSADMIN_ADVANCED "DBACCESS_HID_DSADMIN_ADVANCED" +#define HID_DSADMIN_BOOLEANCOMPARISON "DBACCESS_HID_DSADMIN_BOOLEANCOMPARISON" +#define HID_DSADMIN_ORACLE_DATABASE "DBACCESS_HID_DSADMIN_ORACLE_DATABASE" + +#define UID_APP_VIEW "DBACCESS_UID_APP_VIEW" +#define HID_APP_TABLE_TREE "DBACCESS_HID_APP_TABLE_TREE" +#define HID_APP_FORM_TREE "DBACCESS_HID_APP_FORM_TREE" +#define HID_APP_QUERY_TREE "DBACCESS_HID_APP_QUERY_TREE" +#define HID_APP_REPORT_TREE "DBACCESS_HID_APP_REPORT_TREE" +#define UID_APP_DETAIL_VIEW "DBACCESS_UID_APP_DETAIL_VIEW" +#define UID_APP_VIEW_VERT_SPLIT "DBACCESS_UID_APP_VIEW_VERT_SPLIT" +#define UID_APP_VIEW_BORDER_WIN "DBACCESS_UID_APP_VIEW_BORDER_WIN" +#define HID_APP_CREATION_LIST "DBACCESS_HID_APP_CREATION_LIST" +#define UID_APP_SWAP_VIEW "DBACCESS_UID_APP_SWAP_VIEW" +#define HID_APP_SWAP_ICONCONTROL "DBACCESS_HID_APP_SWAP_ICONCONTROL" + +#define HID_DSADMIN_APPENDTABLEALIAS "DBACCESS_HID_DSADMIN_APPENDTABLEALIAS" +#define HID_DSADMIN_PARAMETERNAMESUBST "DBACCESS_HID_DSADMIN_PARAMETERNAMESUBST" +#define HID_DSADMIN_IGNOREDRIVER_PRIV "DBACCESS_HID_DSADMIN_IGNOREDRIVER_PRIV" +#define HID_DSADMIN_HOSTNAME "DBACCESS_HID_DSADMIN_HOSTNAME" +#define HID_DSADMIN_PORTNUMBER "DBACCESS_HID_DSADMIN_PORTNUMBER" + +#define HID_APP_HELP_TEXT "DBACCESS_HID_APP_HELP_TEXT" +#define HID_EXPLORERDLG_COLLECTION "DBACCESS_HID_EXPLORERDLG_COLLECTION" +#define UID_APP_DATABASE_VIEW "DBACCESS_UID_APP_DATABASE_VIEW" +#define UID_APP_TASKS_VIEW "DBACCESS_UID_APP_TASKS_VIEW" +#define UID_APP_CONTAINER_VIEW "DBACCESS_UID_APP_CONTAINER_VIEW" +#define UID_APP_TASKS_WINDOW "DBACCESS_UID_APP_TASKS_WINDOW" +#define HID_APP_DESCRIPTION_TEXT "DBACCESS_HID_APP_DESCRIPTION_TEXT" +#define UID_APP_DETAILPAGE_HELPER "DBACCESS_UID_APP_DETAILPAGE_HELPER" +#define HID_APP_VIEW_PREVIEW_CB "DBACCESS_HID_APP_VIEW_PREVIEW_CB" +#define HID_APP_VIEW_PREVIEW_1 "DBACCESS_HID_APP_VIEW_PREVIEW_1" +#define HID_APP_VIEW_PREVIEW_2 "DBACCESS_HID_APP_VIEW_PREVIEW_2" // free -#define UID_APP_VIEW_HORZ_SPLIT (HID_DBACCESS_START + 280) -#define UID_APP_VIEW_PREVIEW_1 (HID_DBACCESS_START + 281) -#define HID_APP_VIEW_PREVIEW_3 (HID_DBACCESS_START + 282) +#define UID_APP_VIEW_HORZ_SPLIT "DBACCESS_UID_APP_VIEW_HORZ_SPLIT" +#define UID_APP_VIEW_PREVIEW_1 "DBACCESS_UID_APP_VIEW_PREVIEW_1" +#define HID_APP_VIEW_PREVIEW_3 "DBACCESS_HID_APP_VIEW_PREVIEW_3" -#define HID_DSADMIN_TYPE_DIALOG (HID_DBACCESS_START + 283) -#define HID_DSADMIN_ENABLEOUTERJOIN (HID_DBACCESS_START + 284) -#define HID_DSADMIN_ADABASADMIN (HID_DBACCESS_START + 285) -#define HID_DSADMIN_USERADMIN (HID_DBACCESS_START + 286) +#define HID_DSADMIN_TYPE_DIALOG "DBACCESS_HID_DSADMIN_TYPE_DIALOG" +#define HID_DSADMIN_ENABLEOUTERJOIN "DBACCESS_HID_DSADMIN_ENABLEOUTERJOIN" +#define HID_DSADMIN_ADABASADMIN "DBACCESS_HID_DSADMIN_ADABASADMIN" +#define HID_DSADMIN_USERADMIN "DBACCESS_HID_DSADMIN_USERADMIN" -#define HID_DBWIZ_PREVIOUS (HID_DBACCESS_START + 287) -#define HID_DBWIZ_NEXT (HID_DBACCESS_START + 288) -#define HID_DBWIZ_CANCEL (HID_DBACCESS_START + 289) -#define HID_DBWIZ_FINISH (HID_DBACCESS_START + 290) -#define UID_DBWIZ_HELP (HID_DBACCESS_START + 291) +#define HID_DBWIZ_PREVIOUS "DBACCESS_HID_DBWIZ_PREVIOUS" +#define HID_DBWIZ_NEXT "DBACCESS_HID_DBWIZ_NEXT" +#define HID_DBWIZ_CANCEL "DBACCESS_HID_DBWIZ_CANCEL" +#define HID_DBWIZ_FINISH "DBACCESS_HID_DBWIZ_FINISH" +#define UID_DBWIZ_HELP "DBACCESS_UID_DBWIZ_HELP" -#define HID_DSADMIN_CATALOG (HID_DBACCESS_START + 292) -#define HID_DSADMIN_SCHEMA (HID_DBACCESS_START + 293) -#define HID_DSADMIN_IGNOREINDEXAPPENDIX (HID_DBACCESS_START + 294) -#define HID_DSADMIN_DOSLINEENDS (HID_DBACCESS_START + 295) +#define HID_DSADMIN_CATALOG "DBACCESS_HID_DSADMIN_CATALOG" +#define HID_DSADMIN_SCHEMA "DBACCESS_HID_DSADMIN_SCHEMA" +#define HID_DSADMIN_IGNOREINDEXAPPENDIX "DBACCESS_HID_DSADMIN_IGNOREINDEXAPPENDIX" +#define HID_DSADMIN_DOSLINEENDS "DBACCESS_HID_DSADMIN_DOSLINEENDS" -#define HID_BROWSER_ADMINISTRATE (HID_DBACCESS_START + 296) +#define HID_BROWSER_ADMINISTRATE "DBACCESS_HID_BROWSER_ADMINISTRATE" -#define HID_DSADMIN_AS_BEFORE_CORRELATION_NAME (HID_DBACCESS_START + 297) -#define HID_DSADMIN_CHECK_REQUIRED_FIELDS (HID_DBACCESS_START + 298) -#define HID_DSADMIN_ESCAPE_DATETIME (HID_DBACCESS_START + 299) +#define HID_DSADMIN_AS_BEFORE_CORRELATION_NAME "DBACCESS_HID_DSADMIN_AS_BEFORE_CORRELATION_NAME" +#define HID_DSADMIN_CHECK_REQUIRED_FIELDS "DBACCESS_HID_DSADMIN_CHECK_REQUIRED_FIELDS" +#define HID_DSADMIN_ESCAPE_DATETIME "DBACCESS_HID_DSADMIN_ESCAPE_DATETIME" -#define HID_PAGE_DBWIZARD_GENERALPAGE (HID_DBACCESS_START + 300) -#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE (HID_DBACCESS_START + 301) -#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE (HID_DBACCESS_START + 302) +#define HID_PAGE_DBWIZARD_GENERALPAGE "DBACCESS_HID_PAGE_DBWIZARD_GENERALPAGE" +#define HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE "DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE" +#define HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE "DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE" -#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION (HID_DBACCESS_START + 304) -#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION (HID_DBACCESS_START + 305) +#define HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION "DBACCESS_HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION" +#define HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION "DBACCESS_HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION" -#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES (HID_DBACCESS_START + 307) -#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES (HID_DBACCESS_START + 308) -#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES (HID_DBACCESS_START + 309) -#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION (HID_DBACCESS_START + 310) +#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES "DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES" +#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES "DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES" +#define HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES "DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES" +#define HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION "DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION" -#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE (HID_DBACCESS_START + 311) -#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE (HID_DBACCESS_START + 312) -#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR (HID_DBACCESS_START + 313) -#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR (HID_DBACCESS_START + 314) -#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR (HID_DBACCESS_START + 315) -#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR (HID_DBACCESS_START + 316) +#define HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE "DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE" +#define HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE "DBACCESS_HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE" +#define HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR "DBACCESS_HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR" +#define HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR "DBACCESS_HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR" +#define HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR "DBACCESS_HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR" +#define HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR "DBACCESS_HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR" -#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION (HID_DBACCESS_START + 317) -#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION (HID_DBACCESS_START + 318) +#define HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION "DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION" +#define HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION "DBACCESS_HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION" -#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER (HID_DBACCESS_START + 319) -#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN (HID_DBACCESS_START + 320) -#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER (HID_DBACCESS_START + 321) -#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL (HID_DBACCESS_START + 322) -#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION (HID_DBACCESS_START + 323) +#define HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER "DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER" +#define HID_PAGE_DBWIZARD_LDAP_ET_BASEDN "DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN" +#define HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER "DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER" +#define HID_PAGE_DBWIZARD_LDAP_CB_USESSL "DBACCESS_HID_PAGE_DBWIZARD_LDAP_CB_USESSL" +#define HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION "DBACCESS_HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION" -#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME (HID_DBACCESS_START + 326) -#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME (HID_DBACCESS_START + 327) +#define HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME "DBACCESS_HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME" +#define HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME "DBACCESS_HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME" -#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC (HID_DBACCESS_START + 329) -#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC (HID_DBACCESS_START + 330) +#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC "DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC" +#define HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC "DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC" -#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME (HID_DBACCESS_START + 333) -#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER (HID_DBACCESS_START + 334) -#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT (HID_DBACCESS_START + 335) -#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS (HID_DBACCESS_START + 336) -#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS (HID_DBACCESS_START + 337) +#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME" +#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER" +#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT" +#define HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS" +#define HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS "DBACCESS_HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS" -#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL (HID_DBACCESS_START + 340) -#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL (HID_DBACCESS_START + 341) +#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL" +#define HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL "DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL" -#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS (HID_DBACCESS_START + 342) -#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS (HID_DBACCESS_START + 343) +#define HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS" +#define HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS "DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS" -#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME (HID_DBACCESS_START + 344) -#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER (HID_DBACCESS_START + 345) -#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT (HID_DBACCESS_START + 346) -#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS (HID_DBACCESS_START + 347) -#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS (HID_DBACCESS_START + 348) +#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME" +#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER" +#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT" +#define HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS "DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS" +#define HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS "DBACCESS_HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS" -#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL (HID_DBACCESS_START + 349) -#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL (HID_DBACCESS_START + 350) -#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION (HID_DBACCESS_START + 351) +#define HID_PAGE_DBWIZARD_ADO_ET_ADOURL "DBACCESS_HID_PAGE_DBWIZARD_ADO_ET_ADOURL" +#define HID_PAGE_DBWIZARD_ADO_PB_ADOURL "DBACCESS_HID_PAGE_DBWIZARD_ADO_PB_ADOURL" +#define HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION "DBACCESS_HID_PAGE_DBWIZARD_ADO_PB_TESTADOCONNECTION" -#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 355) -#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE (HID_DBACCESS_START + 356) +#define HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE "DBACCESS_HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE" +#define HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE "DBACCESS_HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE" -#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH (HID_DBACCESS_START + 359) -#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH (HID_DBACCESS_START + 360) -#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED (HID_DBACCESS_START + 361) +#define HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH "DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH" +#define HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH "DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH" +#define HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED "DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_CB_SPREADSHEETPASSWORDREQUIRED" -#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED (HID_DBACCESS_START + 365) -#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME (HID_DBACCESS_START + 366) -#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION (HID_DBACCESS_START + 367) +#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED "DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED" +#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME "DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME" +#define HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION "DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_PB_TESTCONNECTION" -#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE (HID_DBACCESS_START + 373) -#define HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE (HID_DBACCESS_START + 374) -#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD (HID_DBACCESS_START + 375) -#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS (HID_DBACCESS_START + 376) +#define HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE "DBACCESS_HID_PAGE_DBWIZARD_FINAL_RB_REGISTERDATASOURCE" +#define HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE "DBACCESS_HID_PAGE_DBWIZARD_FINAL_RB_DONTREGISTERDATASOURCE" +#define HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD "DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD" +#define HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS "DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS" -#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE (HID_DBACCESS_START + 377) -#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE (HID_DBACCESS_START + 378) -#define HID_INDEX_DIALOG_ACTION_TB (HID_DBACCESS_START + 379) +#define HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE "DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE" +#define HID_PAGE_DBWIZARD_USERDEFINED_BROWSE "DBACCESS_HID_PAGE_DBWIZARD_USERDEFINED_BROWSE" +#define HID_INDEX_DIALOG_ACTION_TB "DBACCESS_HID_INDEX_DIALOG_ACTION_TB" -#define HID_DLG_DATABASE_WIZARD (HID_DBACCESS_START + 380) +#define HID_DLG_DATABASE_WIZARD "DBACCESS_HID_DLG_DATABASE_WIZARD" -#define HID_EXTENSION_NOT_PRESENT_DLG ( HID_DBACCESS_START + 381) -#define HID_DLG_QRY_JOIN_CONTROL ( HID_DBACCESS_START + 382) -#define HID_DSADMIN_IGNORECURRENCY ( HID_DBACCESS_START + 383) -#define HID_MACRO_MIGRATION_BACKUP_LOCATION ( HID_DBACCESS_START + 384) -#define HID_DSADMIN_PRIMARY_KEY_SUPPORT ( HID_DBACCESS_START + 385) +#define HID_EXTENSION_NOT_PRESENT_DLG "DBACCESS_HID_EXTENSION_NOT_PRESENT_DLG" +#define HID_DLG_QRY_JOIN_CONTROL "DBACCESS_HID_DLG_QRY_JOIN_CONTROL" +#define HID_DSADMIN_IGNORECURRENCY "DBACCESS_HID_DSADMIN_IGNORECURRENCY" +#define HID_MACRO_MIGRATION_BACKUP_LOCATION "DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION" +#define HID_DSADMIN_PRIMARY_KEY_SUPPORT "DBACCESS_HID_DSADMIN_PRIMARY_KEY_SUPPORT" // this one below have hid in number space HID_SBA_START -#define HID_DLG_ADABAS_NEWDB (HID_SBA_START + 0) -#define HID_DLG_ADABAS_DBNAME (HID_SBA_START + 1) -#define HID_DLG_ADABAS_SYSUSR (HID_SBA_START + 2) -#define HID_DLG_ADABAS_SYSPWD (HID_SBA_START + 3) -#define HID_DLG_ADABAS_CONUSR (HID_SBA_START + 4) -#define HID_DLG_ADABAS_CONPWD (HID_SBA_START + 5) -#define HID_DLG_ADABAS_DATADEVSPACE_SIZE (HID_SBA_START + 6) -#define HID_DLG_ADABAS_CACHE_SIZE (HID_SBA_START + 7) -#define HID_DLG_ADABAS_USR (HID_SBA_START + 8) -#define HID_DLG_ADABAS_DOMAINPWD (HID_SBA_START + 9) -#define HID_DLG_ADABAS_RESTORE (HID_SBA_START + 10) -#define HID_DLG_ADABAS_PBRESTORE (HID_SBA_START + 11) -#define HID_DLG_ADABAS_SYSDEVSPACE (HID_SBA_START + 12) -#define HID_DLG_ADABAS_PBSYSDEVSPACE (HID_SBA_START + 13) -#define HID_DLG_ADABAS_TRANSACTIONLOG (HID_SBA_START + 14) -#define HID_DLG_ADABAS_PBTRANSACTIONLOG (HID_SBA_START + 15) -#define HID_DLG_ADABAS_DATADEVSPACE (HID_SBA_START + 16) -#define HID_DLG_ADABAS_PBDATADEVSPACE (HID_SBA_START + 18) -#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE (HID_SBA_START + 19) -#define HID_DLG_ADABAS_CON_PWD (HID_SBA_START + 20) -#define HID_DLG_ADABAS_SYS_PWD (HID_SBA_START + 21) -#define HID_DLG_ADABAS_DOMAIN_PWD (HID_SBA_START + 22) -//end of HID_SBA_START - -// don't forget to update the file util/hidother.src - +#define HID_DLG_ADABAS_NEWDB "DBACCESS_HID_DLG_ADABAS_NEWDB" +#define HID_DLG_ADABAS_DBNAME "DBACCESS_HID_DLG_ADABAS_DBNAME" +#define HID_DLG_ADABAS_SYSUSR "DBACCESS_HID_DLG_ADABAS_SYSUSR" +#define HID_DLG_ADABAS_SYSPWD "DBACCESS_HID_DLG_ADABAS_SYSPWD" +#define HID_DLG_ADABAS_CONUSR "DBACCESS_HID_DLG_ADABAS_CONUSR" +#define HID_DLG_ADABAS_CONPWD "DBACCESS_HID_DLG_ADABAS_CONPWD" +#define HID_DLG_ADABAS_DATADEVSPACE_SIZE "DBACCESS_HID_DLG_ADABAS_DATADEVSPACE_SIZE" +#define HID_DLG_ADABAS_CACHE_SIZE "DBACCESS_HID_DLG_ADABAS_CACHE_SIZE" +#define HID_DLG_ADABAS_USR "DBACCESS_HID_DLG_ADABAS_USR" +#define HID_DLG_ADABAS_DOMAINPWD "DBACCESS_HID_DLG_ADABAS_DOMAINPWD" +#define HID_DLG_ADABAS_RESTORE "DBACCESS_HID_DLG_ADABAS_RESTORE" +#define HID_DLG_ADABAS_PBRESTORE "DBACCESS_HID_DLG_ADABAS_PBRESTORE" +#define HID_DLG_ADABAS_SYSDEVSPACE "DBACCESS_HID_DLG_ADABAS_SYSDEVSPACE" +#define HID_DLG_ADABAS_PBSYSDEVSPACE "DBACCESS_HID_DLG_ADABAS_PBSYSDEVSPACE" +#define HID_DLG_ADABAS_TRANSACTIONLOG "DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG" +#define HID_DLG_ADABAS_PBTRANSACTIONLOG "DBACCESS_HID_DLG_ADABAS_PBTRANSACTIONLOG" +#define HID_DLG_ADABAS_DATADEVSPACE "DBACCESS_HID_DLG_ADABAS_DATADEVSPACE" +#define HID_DLG_ADABAS_PBDATADEVSPACE "DBACCESS_HID_DLG_ADABAS_PBDATADEVSPACE" +#define HID_DLG_ADABAS_TRANSACTIONLOG_SIZE "DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG_SIZE" +#define HID_DLG_ADABAS_CON_PWD "DBACCESS_HID_DLG_ADABAS_CON_PWD" +#define HID_DLG_ADABAS_SYS_PWD "DBACCESS_HID_DLG_ADABAS_SYS_PWD" +#define HID_DLG_ADABAS_DOMAIN_PWD "DBACCESS_HID_DLG_ADABAS_DOMAIN_PWD" + +#define HID_DLG_JOIN_TABADD "DBACCESS_HID_DLG_JOIN_TABADD" #endif // _DBA_DBACCESS_HELPID_HRC_ diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc index c273a67edcbd..96ff91e7d0e8 100644 --- a/dbaccess/inc/dbaccess_slotid.hrc +++ b/dbaccess/inc/dbaccess_slotid.hrc @@ -109,6 +109,9 @@ #define SID_DB_APP_EDIT_SQL_VIEW ( SID_DBACCESS_START + 66 ) +#define SID_TABLEDESIGN_TABED_PRIMARYKEY ( SID_DBACCESS_START + 67 ) +#define SID_TABLEDESIGN_INSERTROWS ( SID_DBACCESS_START + 68 ) + #endif // _DBACCESS_SLOTID_HRC_ diff --git a/dbaccess/inc/genericcontroller.hxx b/dbaccess/inc/genericcontroller.hxx index fefeec0125a1..6c47ca6f397f 100644 --- a/dbaccess/inc/genericcontroller.hxx +++ b/dbaccess/inc/genericcontroller.hxx @@ -280,7 +280,7 @@ namespace dbaui @param _nHelpId The help id to dispatch. */ - void openHelpAgent(sal_Int32 _nHelpId); + void openHelpAgent( const rtl::OString& _sHelpId ); /** open the help agent for the given help url. @param _pHelpStringURL diff --git a/dbaccess/source/ext/macromigration/macromigrationpages.cxx b/dbaccess/source/ext/macromigration/macromigrationpages.cxx index 23e45d389671..4e35663c5a81 100644 --- a/dbaccess/source/ext/macromigration/macromigrationpages.cxx +++ b/dbaccess/source/ext/macromigration/macromigrationpages.cxx @@ -134,8 +134,7 @@ namespace dbmm m_aSaveAsLocation.SetModifyHdl( LINK( this, SaveDBDocPage, OnLocationModified ) ); m_aSaveAsLocation.SetDropDownLineCount( 20 ); - // FIXME: HELPID - m_aSaveAsLocation.SetHelpId( ""/*HID_MACRO_MIGRATION_BACKUP_LOCATION*/ ); + m_aSaveAsLocation.SetHelpId( HID_MACRO_MIGRATION_BACKUP_LOCATION ); impl_updateLocationDependentItems(); } diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 073de6f00a5a..ecc39c7aa169 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -460,8 +460,7 @@ void SAL_CALL OApplicationController::disposing() sal_Bool OApplicationController::Construct(Window* _pParent) { setView( * new OApplicationView( _pParent, getORB(), *this, m_ePreviewMode ) ); - // FIXME: HELPID - getView()->SetUniqueId(""/*UID_APP_VIEW*/); + getView()->SetUniqueId(UID_APP_VIEW); // late construction sal_Bool bSuccess = sal_False; diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 525bf12ffed3..2a5eb22549b8 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -307,29 +307,23 @@ OAppDetailPageHelper::OAppDetailPageHelper(Window* _pParent,OAppBorderWindow& _r m_aTBPreview.SetOutStyle(TOOLBOX_STYLE_FLAT); m_aTBPreview.InsertItem(SID_DB_APP_DISABLE_PREVIEW,m_aMenu->GetItemText(SID_DB_APP_DISABLE_PREVIEW),TIB_LEFT|TIB_DROPDOWN|TIB_AUTOSIZE|TIB_RADIOCHECK); - // FIXME: HELPID - m_aTBPreview.SetHelpId(""/*HID_APP_VIEW_PREVIEW_CB*/); + m_aTBPreview.SetHelpId(HID_APP_VIEW_PREVIEW_CB); m_aTBPreview.SetDropdownClickHdl( LINK( this, OAppDetailPageHelper, OnDropdownClickHdl ) ); m_aTBPreview.EnableMenuStrings(); m_aTBPreview.Enable(TRUE); - // FIXME: HELPID - m_aBorder.SetUniqueId(""/*UID_APP_VIEW_PREVIEW_1*/); + m_aBorder.SetUniqueId(UID_APP_VIEW_PREVIEW_1); - // FIXME: HELPID - m_aPreview.SetHelpId(""/*HID_APP_VIEW_PREVIEW_1*/); + m_aPreview.SetHelpId(HID_APP_VIEW_PREVIEW_1); m_pTablePreview = new OTablePreviewWindow(&m_aBorder,WB_READONLY | WB_DIALOGCONTROL ); - // FIXME: HELPID - m_pTablePreview->SetHelpId(""/*HID_APP_VIEW_PREVIEW_2*/); + m_pTablePreview->SetHelpId(HID_APP_VIEW_PREVIEW_2); - // FIXME: HELPID - m_aDocumentInfo.SetHelpId(""/*HID_APP_VIEW_PREVIEW_3*/); + m_aDocumentInfo.SetHelpId(HID_APP_VIEW_PREVIEW_3); m_xWindow = VCLUnoHelper::GetInterface( m_pTablePreview ); - // FIXME: HELPID - SetUniqueId(""/*UID_APP_DETAILPAGE_HELPER*/); + SetUniqueId(UID_APP_DETAILPAGE_HELPER); for (int i=0; i < E_ELEMENT_TYPE_COUNT; ++i) m_pLists[i] = NULL; ImplInitSettings(); @@ -709,8 +703,7 @@ void OAppDetailPageHelper::createTablesPage(const Reference< XConnection>& _xCon ,getBorderWin().getView()->getORB() ,WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP ,sal_False); - // FIXME: HELPID - pTreeView->SetHelpId(""/*HID_APP_TABLE_TREE*/); + pTreeView->SetHelpId(HID_APP_TABLE_TREE); m_pLists[E_TABLE] = pTreeView; ImageProvider aImageProvider( _xConnection ); @@ -760,23 +753,24 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA { OSL_ENSURE(E_TABLE != _eType,"E_TABLE isn't allowed."); - USHORT nHelpId = 0, nImageId = 0, nImageIdH = 0; + USHORT nImageId = 0, nImageIdH = 0; + rtl::OString sHelpId; ImageProvider aImageProvider; Image aFolderImage, aFolderImageHC; switch( _eType ) { case E_FORM: - nHelpId = HID_APP_FORM_TREE; + sHelpId = HID_APP_FORM_TREE; aFolderImage = aImageProvider.getFolderImage( DatabaseObject::FORM, false ); aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::FORM, true ); break; case E_REPORT: - nHelpId = HID_APP_REPORT_TREE; + sHelpId = HID_APP_REPORT_TREE; aFolderImage = aImageProvider.getFolderImage( DatabaseObject::REPORT, false ); aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::REPORT, true ); break; case E_QUERY: - nHelpId = HID_APP_QUERY_TREE; + sHelpId = HID_APP_QUERY_TREE; aFolderImage = aImageProvider.getFolderImage( DatabaseObject::QUERY, false ); aFolderImageHC = aImageProvider.getFolderImage( DatabaseObject::QUERY, true ); break; @@ -787,7 +781,7 @@ void OAppDetailPageHelper::createPage(ElementType _eType,const Reference< XNameA if ( !m_pLists[_eType] ) { - m_pLists[_eType] = createSimpleTree( nHelpId, aFolderImage, aFolderImageHC ); + m_pLists[_eType] = createSimpleTree( sHelpId, aFolderImage, aFolderImageHC ); } if ( m_pLists[_eType] ) @@ -885,15 +879,10 @@ void OAppDetailPageHelper::fillNames( const Reference< XNameAccess >& _xContaine } } // ----------------------------------------------------------------------------- -DBTreeListBox* OAppDetailPageHelper::createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC ) +DBTreeListBox* OAppDetailPageHelper::createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage, const Image& _rImageHC ) { DBTreeListBox* pTreeView = new DBTreeListBox(this,getBorderWin().getView()->getORB(),WB_HASLINES | WB_SORT | WB_HASBUTTONS | WB_HSCROLL |WB_HASBUTTONSATROOT | WB_TABSTOP); - // FIXME: HELPID - #if 0 - pTreeView->SetHelpId(_nHelpId); - #else - (void)_nHelpId; - #endif + pTreeView->SetHelpId( _sHelpId ); return createTree( pTreeView, _rImage, _rImageHC ); } diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.hxx b/dbaccess/source/ui/app/AppDetailPageHelper.hxx index 5ade6b687949..9f3cadc56a44 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.hxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.hxx @@ -190,7 +190,7 @@ namespace dbaui @return The new tree. */ - DBTreeListBox* createSimpleTree( ULONG _nHelpId, const Image& _rImage, const Image& _rImageHC ); + DBTreeListBox* createSimpleTree( const rtl::OString& _sHelpId, const Image& _rImage, const Image& _rImageHC ); DECL_LINK( OnEntryDoubleClick, SvTreeListBox* ); DECL_LINK( OnEntrySelChange, void* ); diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index b7ce02485bc6..9908134b8e1c 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -406,15 +406,11 @@ OTasksWindow::OTasksWindow(Window* _pParent,OApplicationDetailView* _pDetailView ,m_pDetailView(_pDetailView) { DBG_CTOR(OTasksWindow,NULL); - // FIXME: HELPID - SetUniqueId(""/*UID_APP_TASKS_WINDOW*/); - // FIXME: HELPID - m_aCreation.SetHelpId(""/*HID_APP_CREATION_LIST*/); + SetUniqueId(UID_APP_TASKS_WINDOW); + m_aCreation.SetHelpId(HID_APP_CREATION_LIST); m_aCreation.SetSelectHdl(LINK(this, OTasksWindow, OnEntrySelectHdl)); - // FIXME: HELPID - m_aHelpText.SetHelpId(""/*HID_APP_HELP_TEXT*/); - // FIXME: HELPID - m_aDescription.SetHelpId(""/*HID_APP_DESCRIPTION_TEXT*/); + m_aHelpText.SetHelpId(HID_APP_HELP_TEXT); + m_aDescription.SetHelpId(HID_APP_DESCRIPTION_TEXT); m_aDescription.SetText(ModuleRes(STR_DESCRIPTION)); ImplInitSettings(sal_True,sal_True,sal_True); } @@ -604,8 +600,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe ,m_rBorderWin(_rParent) { DBG_CTOR(OApplicationDetailView,NULL); - // FIXME: HELPID - SetUniqueId(""/*UID_APP_DETAIL_VIEW*/); + SetUniqueId(UID_APP_DETAIL_VIEW); ImplInitSettings( sal_True, sal_True, sal_True ); m_pControlHelper = new OAppDetailPageHelper(&m_aContainer,m_rBorderWin,_ePreviewMode); @@ -616,12 +611,10 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe pTasks->Show(); pTasks->Disable(m_rBorderWin.getView()->getCommandController().isDataSourceReadOnly()); m_aTasks.setChildWindow(pTasks); - // FIXME: HELPID - m_aTasks.SetUniqueId(""/*UID_APP_TASKS_VIEW*/); + m_aTasks.SetUniqueId(UID_APP_TASKS_VIEW); m_aTasks.Show(); - // FIXME: HELPID - m_aContainer.SetUniqueId(""/*UID_APP_CONTAINER_VIEW*/); + m_aContainer.SetUniqueId(UID_APP_CONTAINER_VIEW); m_aContainer.Show(); const long nFrameWidth = LogicToPixel( Size( 3, 0 ), MAP_APPFONT ).Width(); @@ -630,8 +623,7 @@ OApplicationDetailView::OApplicationDetailView(OAppBorderWindow& _rParent,Previe set(&m_aContainer,&m_aTasks); m_aHorzSplitter.Show(); - // FIXME: HELPID - m_aHorzSplitter.SetUniqueId(""/*UID_APP_VIEW_HORZ_SPLIT*/); + m_aHorzSplitter.SetUniqueId(UID_APP_VIEW_HORZ_SPLIT); setSplitter(&m_aHorzSplitter); } // ----------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/app/AppSwapWindow.cxx b/dbaccess/source/ui/app/AppSwapWindow.cxx index 6ecb2d0e4701..ae9ca3f5d93e 100644 --- a/dbaccess/source/ui/app/AppSwapWindow.cxx +++ b/dbaccess/source/ui/app/AppSwapWindow.cxx @@ -81,8 +81,7 @@ OApplicationSwapWindow::OApplicationSwapWindow( Window* _pParent, OAppBorderWind m_aIconControl.SetClickHdl(LINK(this, OApplicationSwapWindow, OnContainerSelectHdl)); m_aIconControl.setControlActionListener( &m_rBorderWin.getView()->getAppController() ); - // FIXME: HELPID - m_aIconControl.SetHelpId(""/*HID_APP_SWAP_ICONCONTROL*/); + m_aIconControl.SetHelpId(HID_APP_SWAP_ICONCONTROL); m_aIconControl.Show(); //m_aIconControl.Enable(TRUE); } diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index d6a53cc112f4..e049f60d0f13 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -138,12 +138,10 @@ OAppBorderWindow::OAppBorderWindow(OApplicationView* _pParent,PreviewMode _ePrev m_pPanel->SetBorderStyle(WINDOW_BORDER_MONO); OApplicationSwapWindow* pSwap = new OApplicationSwapWindow( m_pPanel, *this ); pSwap->Show(); - // FIXME: HELPID - pSwap->SetUniqueId(""/*UID_APP_SWAP_VIEW*/); + pSwap->SetUniqueId(UID_APP_SWAP_VIEW); m_pPanel->setChildWindow(pSwap); - // FIXME: HELPID - m_pPanel->SetUniqueId(""/*UID_APP_DATABASE_VIEW*/); + m_pPanel->SetUniqueId(UID_APP_DATABASE_VIEW); m_pPanel->Show(); m_pDetailView = new OApplicationDetailView(*this,_ePreviewMode); @@ -286,8 +284,7 @@ OApplicationView::OApplicationView( Window* pParent } m_pWin = new OAppBorderWindow(this,_ePreviewMode); - // FIXME: HELPID - m_pWin->SetUniqueId(""/*UID_APP_VIEW_BORDER_WIN*/); + m_pWin->SetUniqueId(UID_APP_VIEW_BORDER_WIN); m_pWin->Show(); ImplInitSettings(); diff --git a/dbaccess/source/ui/app/app.src b/dbaccess/source/ui/app/app.src index 2dec9005f847..4af2bdb70521 100644 --- a/dbaccess/source/ui/app/app.src +++ b/dbaccess/source/ui/app/app.src @@ -111,14 +111,12 @@ Menu RID_MENU_APP_NEW MenuItem { Identifier = SID_APP_NEW_FORM; - HelpId = SID_APP_NEW_FORM; Command = ".uno:DBNewForm"; Text [ en-US ] = "Form..." ; }; MenuItem { Identifier = SID_APP_NEW_REPORT; - HelpId = SID_APP_NEW_REPORT; Command = ".uno:DBNewReport"; Text [ en-US ] = "Report..." ; }; @@ -154,7 +152,6 @@ Menu RID_MENU_APP_NEW MenuItem { Identifier = SID_DB_NEW_VIEW_SQL; - HelpId = SID_DB_NEW_VIEW_SQL; Command = ".uno:DBNewViewSQL"; Text [ en-US ] = "View (Simple)..." ; }; @@ -177,7 +174,6 @@ Menu RID_MENU_APP_EDIT MenuItem { Identifier = SID_DB_APP_PASTE_SPECIAL; - HelpID = SID_DB_APP_PASTE_SPECIAL ; Text[ en-US ] = "Paste Special..."; Command = ".uno:PasteSpecial"; }; @@ -188,42 +184,36 @@ Menu RID_MENU_APP_EDIT MenuItem { Identifier = SID_DB_APP_DELETE; - HelpID = SID_DB_APP_DELETE ; Text[ en-US ] = "Delete"; Command = ".uno:DBDelete"; }; MenuItem { Identifier = SID_DB_APP_RENAME; - HelpID = SID_DB_APP_RENAME ; Text[ en-US ] = "Rename"; Command = ".uno:DBRename"; }; MenuItem { Identifier = SID_DB_APP_EDIT; - HelpID = SID_DB_APP_EDIT ; Text[ en-US ] = "Edit"; Command = ".uno:DBEdit"; }; MenuItem { Identifier = SID_DB_APP_EDIT_SQL_VIEW; - HelpID = SID_DB_APP_EDIT_SQL_VIEW ; Text [ en-US ] = "Edit in SQL View..."; Command = ".uno:DBEditSqlView"; }; MenuItem { Identifier = SID_DB_APP_OPEN; - HelpID = SID_DB_APP_OPEN ; Text[ en-US ] = "Open"; Command = ".uno:DBOpen"; }; MenuItem { Identifier = SID_DB_APP_CONVERTTOVIEW; - HelpID = SID_DB_APP_CONVERTTOVIEW ; Text[ en-US ] = "Create as View"; Command = ".uno:DBConvertToView"; }; @@ -236,14 +226,12 @@ Menu RID_MENU_APP_EDIT MenuItem { Identifier = SID_APP_NEW_REPORT_PRE_SEL; - HelpId = SID_APP_NEW_REPORT_PRE_SEL; Command = ".uno:DBNewReportWithPreSelection"; Text [ en-US ] = "Report..." ; }; MenuItem { Identifier = SID_REPORT_CREATE_REPWIZ_PRE_SEL ; - HelpID = HID_DOCUMENT_CREATE_REPWIZ ; Text[ en-US ] = "Report Wizard..."; Command = ".uno:DBNewReportAutoPilotWithPreSelection"; @@ -255,7 +243,6 @@ Menu RID_MENU_APP_EDIT MenuItem { Identifier = SID_SELECTALL; - HelpID = SID_SELECTALL ; Text[ en-US ] = "Select All"; Command = ".uno:SelectAll"; }; @@ -274,21 +261,18 @@ Menu RID_MENU_APP_EDIT MenuItem { Identifier = SID_DB_APP_DSPROPS; - HelpID = SID_DB_APP_DSPROPS ; Text[ en-US ] = "Properties"; Command = ".uno:DBDSProperties"; }; MenuItem { Identifier = SID_DB_APP_DSCONNECTION_TYPE; - HelpID = SID_DB_APP_DSCONNECTION_TYPE ; Text[ en-US ] = "Connection Type"; Command = ".uno:DBDSConnectionType"; }; MenuItem { Identifier = SID_DB_APP_DSADVANCED_SETTINGS; - HelpID = SID_DB_APP_DSADVANCED_SETTINGS ; Text[ en-US ] = "Advanced Settings"; Command = ".uno:DBDSAdvancedSettings"; }; @@ -394,7 +378,6 @@ Menu RID_MENU_APP_PREVIEW MenuItem { Identifier = SID_DB_APP_DISABLE_PREVIEW; - HelpId = SID_DB_APP_DISABLE_PREVIEW; Text[ en-US ] = "None"; Command = ".uno:DBDisablePreview"; Checkable = TRUE; @@ -404,7 +387,6 @@ Menu RID_MENU_APP_PREVIEW MenuItem { Identifier = SID_DB_APP_VIEW_DOCINFO_PREVIEW; - HelpId = SID_DB_APP_VIEW_DOCINFO_PREVIEW; Text[ en-US ] = "Document Information"; Command = ".uno:DBShowDocInfoPreview"; Checkable = TRUE; @@ -414,7 +396,6 @@ Menu RID_MENU_APP_PREVIEW MenuItem { Identifier = SID_DB_APP_VIEW_DOC_PREVIEW; - HelpId = SID_DB_APP_VIEW_DOC_PREVIEW; Text[ en-US ] = "Document"; Command = ".uno:DBShowDocPreview"; Checkable = TRUE; diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx index 8129c67afd0f..65185f9f3e73 100644 --- a/dbaccess/source/ui/browser/dbtreeview.cxx +++ b/dbaccess/source/ui/browser/dbtreeview.cxx @@ -64,8 +64,7 @@ DBTreeView::DBTreeView( Window* pParent, const Reference< XMultiServiceFactory > m_pTreeListBox->EnableCheckButton(NULL); m_pTreeListBox->SetDragDropMode( 0 ); m_pTreeListBox->EnableInplaceEditing( sal_True ); - // FIXME: HELPID - m_pTreeListBox->SetHelpId(""/*HID_TLB_TREELISTBOX*/); + m_pTreeListBox->SetHelpId(HID_TLB_TREELISTBOX); m_pTreeListBox->Show(); } diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx index 5935baafa2c0..b81b073a56bf 100644 --- a/dbaccess/source/ui/browser/genericcontroller.cxx +++ b/dbaccess/source/ui/browser/genericcontroller.cxx @@ -1387,9 +1387,9 @@ void OGenericUnoController::openHelpAgent(rtl::OUString const& _suHelpStringURL openHelpAgent( aURL ); } -void OGenericUnoController::openHelpAgent(sal_Int32 _nHelpId) +void OGenericUnoController::openHelpAgent(const rtl::OString& _sHelpId) { - openHelpAgent( createHelpAgentURL( lcl_getModuleHelpModuleName( getFrame() ), _nHelpId ) ); + openHelpAgent( createHelpAgentURL( lcl_getModuleHelpModuleName( getFrame() ), _sHelpId ) ); } void OGenericUnoController::openHelpAgent( const URL& _rURL ) diff --git a/dbaccess/source/ui/browser/sbabrw.src b/dbaccess/source/ui/browser/sbabrw.src index 747a2d7ac8cf..476fcf683b3f 100644 --- a/dbaccess/source/ui/browser/sbabrw.src +++ b/dbaccess/source/ui/browser/sbabrw.src @@ -190,14 +190,12 @@ Menu RID_MENU_REFRESH_DATA MenuItem { MID_SBA_QRY_REFRESH - HelpId = SID_FM_REFRESH ; Command = ".uno:Refresh"; }; MenuItem { Identifier = ID_BROWSER_REFRESH_REBUILD; Command = ".uno:DBRebuildData"; - HelpId = HID_BROWSER_REFRESH_REBUILDVIEW; Text [ en-US ] = "Rebuild"; }; }; diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 3b111cbb869d..f5880cf804de 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -393,8 +393,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent) m_pTreeView->getListBox().setContextMenuProvider( this ); m_pTreeView->getListBox().setControlActionListener( this ); - // FIXME: HELPID - m_pTreeView->SetHelpId(""/*HID_CTL_TREEVIEW*/); + m_pTreeView->SetHelpId(HID_CTL_TREEVIEW); // a default pos for the splitter, so that the listbox is about 80 (logical) pixels wide m_pSplitter->SetSplitPosPixel( getBrowserView()->LogicToPixel( ::Size( 80, 0 ), MAP_APPFONT ).Width() ); @@ -410,15 +409,11 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent) m_pTreeView->setSelChangeHdl( LINK( this, SbaTableQueryBrowser, OnSelectionChange ) ); // TODO - // FIXME: HELPID - getBrowserView()->getVclControl()->GetDataWindow().SetUniqueId(""/*UID_DATABROWSE_DATAWINDOW*/); - // FIXME: HELPID - getBrowserView()->getVclControl()->SetHelpId(""/*HID_CTL_TABBROWSER*/); - // FIXME: HELPID - getBrowserView()->SetUniqueId(""/*UID_CTL_CONTENT*/); + getBrowserView()->getVclControl()->GetDataWindow().SetUniqueId(UID_DATABROWSE_DATAWINDOW); + getBrowserView()->getVclControl()->SetHelpId(HID_CTL_TABBROWSER); + getBrowserView()->SetUniqueId(UID_CTL_CONTENT); if (getBrowserView()->getVclControl()->GetHeaderBar()) - // FIXME: HELPID - getBrowserView()->getVclControl()->GetHeaderBar()->SetHelpId(""/*HID_DATABROWSE_HEADER*/); + getBrowserView()->getVclControl()->GetHeaderBar()->SetHelpId(HID_DATABROWSE_HEADER); InvalidateFeature(ID_BROWSER_EXPLORER); } diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 95fcbf5e150d..c5c2a084b64a 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -1070,14 +1070,9 @@ void OFieldDescControl::ActivateAggregate( EControlType eType ) } } // ----------------------------------------------------------------------------- -void OFieldDescControl::InitializeControl(Control* _pControl,ULONG _nHelpId,bool _bAddChangeHandler) +void OFieldDescControl::InitializeControl(Control* _pControl,const ::rtl::OString& _sHelpId,bool _bAddChangeHandler) { - // FIXME: HELPID - #if 0 - _pControl->SetHelpId(_nHelpId); - #else - (void)_nHelpId; - #endif + _pControl->SetHelpId(_sHelpId); if ( _bAddChangeHandler ) ((OPropListBoxCtrl*)_pControl)->SetSelectHdl(LINK(this,OFieldDescControl,ChangeHdl)); @@ -1094,7 +1089,7 @@ FixedText* OFieldDescControl::CreateText(USHORT _nTextRes) return pFixedText; } // ----------------------------------------------------------------------------- -OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,short _nProperty,ULONG _nHelpId) +OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,short _nProperty,const rtl::OString& _sHelpId) { OPropNumericEditCtrl* pControl = new OPropNumericEditCtrl( this, _nHelpStr, _nProperty, WB_BORDER ); pControl->SetDecimalDigits(0); @@ -1102,7 +1097,7 @@ OPropNumericEditCtrl* OFieldDescControl::CreateNumericControl(USHORT _nHelpStr,s pControl->SetMax(0x7FFFFFFF); // soll draussen geaendert werden, wenn noetig pControl->SetStrictFormat(TRUE); - InitializeControl(pControl,_nHelpId,false); + InitializeControl(pControl,_sHelpId,false); return pControl; } diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index 72c36f9a8cd5..ca94faeb56f8 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -338,18 +338,18 @@ namespace dbaui { DBG_CHKTHIS(ORelationControl,NULL); - ULONG nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL; + rtl::OString sHelpId( HID_RELATIONDIALOG_LEFTFIELDCELL ); Reference< XPropertySet> xDef; switch ( getColumnIdent(nColumnId) ) { case SOURCE_COLUMN: xDef = m_xSourceDef; - nHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL; + sHelpId = HID_RELATIONDIALOG_LEFTFIELDCELL; break; case DEST_COLUMN: xDef = m_xDestDef; - nHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL; + sHelpId = HID_RELATIONDIALOG_RIGHTFIELDCELL; break; default: // ????????? @@ -367,10 +367,7 @@ namespace dbaui m_pListCell->SelectEntry( sName ); } - // FIXME: HELPID - #if 0 - m_pListCell->SetHelpId(nHelpId); - #endif + m_pListCell->SetHelpId(sHelpId); } } @@ -508,8 +505,7 @@ OTableListBoxControl::OTableListBoxControl( Window* _pParent , m_pParentDialog(_pParentDialog) { m_pRC_Tables = new ORelationControl( this,m_pTableMap ); - // FIXME: HELPID - m_pRC_Tables->SetHelpId(""/*HID_RELDLG_KEYFIELDS*/); + m_pRC_Tables->SetHelpId(HID_RELDLG_KEYFIELDS); m_pRC_Tables->Init( ); m_pRC_Tables->SetZOrder(&m_lmbRightTable, WINDOW_ZORDER_BEHIND); diff --git a/dbaccess/source/ui/control/sqledit.cxx b/dbaccess/source/ui/control/sqledit.cxx index ac031d635cea..1945557c2999 100644 --- a/dbaccess/source/ui/control/sqledit.cxx +++ b/dbaccess/source/ui/control/sqledit.cxx @@ -52,8 +52,7 @@ OSqlEdit::OSqlEdit( OQueryTextView* pParent, WinBits nWinStyle ) : ,m_bStopTimer(sal_False ) { DBG_CTOR(OSqlEdit,NULL); - // FIXME: HELPID - SetHelpId( ""/*HID_CTL_QRYSQLEDIT*/ ); + SetHelpId( HID_CTL_QRYSQLEDIT ); SetModifyHdl( LINK(this, OSqlEdit, ModifyHdl) ); m_timerUndoActionCreation.SetTimeout(1000); diff --git a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc index 425e713094f3..258eec3a2acf 100644 --- a/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc +++ b/dbaccess/source/ui/dlg/AutoControls_tmpl.hrc @@ -126,7 +126,7 @@ // ------------------------------------------------------------------------------------------------- -#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID) \ +#define AUTO_BROWSECONTROLGROUP( AUTO_X, AUTO_Y, AUTOPAGE_X, AUTO_HID, AUTO_HID2) \ FixedText FT_AUTOBROWSEURL { \ Pos = MAP_APPFONT ( AUTO_X , AUTO_Y ) ; \ Size = MAP_APPFONT ( AUTOPAGE_X - AUTO_X - 6 , FIXEDTEXT_HEIGHT ) ; \ @@ -147,7 +147,7 @@ { \ Pos = MAP_APPFONT ( AUTOPAGE_X - BUTTON_WIDTH - 6 , AUTO_Y + FIXEDTEXT_HEIGHT + 2 ) ; \ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ - HelpId = (AUTO_HID + 1); \ + HelpId = AUTO_HID2; \ TabStop = TRUE ; \ Text[ en-US ] = "Browse"; \ }; @@ -214,7 +214,9 @@ // -------------------------------------------------------------------------------------------------- - +// MBA: the HID set in the FixText can't make any sense; in case this macro was called from within the +// AUTOHELP_JDBCCONTROLGROUP, the FixText would have got the same HID as an EditField from the +// also called AUTO_JDBCDRIVERCLASSGROUP macro; thus I conclude that we can remove the HID from the FixedText #define AUTO_PORTCONTROLGROUP(AUTO_Y, AUTO_HID) \ FixedText FT_AUTOPORTNUMBER \ { \ @@ -235,7 +237,6 @@ \ FixedText FT_AUTOPORTNUMBERDEFAULT \ { \ - HelpId = AUTO_HID + 1 ; \ Pos = MAP_APPFONT (EDIT_X + 22 + UNRELATED_CONTROLS, AUTO_Y +2) ; \ Size = MAP_APPFONT ( WIZARD_PAGE_X - EDIT_X - 22 - UNRELATED_CONTROLS , FIXEDTEXT_HEIGHT ) ; \ Text[ en-US ] = "" ; \ @@ -445,9 +446,9 @@ // -------------------------------------------------------------------------------------------------- -#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID) \ +#define AUTO_HELP_BROWSECONTROLGROUP(AUTO_LINECOUNT, AUTO_HID, AUTO_HID2) \ AUTO_WIZARDHELPTEXT(AUTO_LINECOUNT) \ - AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID) + AUTO_BROWSECONTROLGROUP(START_X, INIT_Y + AUTO_LINECOUNT * FIXEDTEXT_HEIGHT + 2, WIZARD_PAGE_X, AUTO_HID, AUTO_HID2) // -------------------------------------------------------------------------------------------------- @@ -455,7 +456,7 @@ // -------------------------------------------------------------------------------------------------- -#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID) \ +#define AUTO_JDBCDRIVERCLASSGROUP(AUTO_Y, AUTO_HID, AUTO_HID2) \ \ FixedText FT_AUTOJDBCDRIVERCLASS \ { \ @@ -479,7 +480,7 @@ Pos = MAP_APPFONT ( WIZARD_PAGE_X - BUTTON_WIDTH - UNRELATED_CONTROLS , AUTO_Y + FIXEDTEXT_HEIGHT + 2) ; \ Size = MAP_APPFONT ( BUTTON_WIDTH , BUTTON_HEIGHT ) ; \ Size = MAP_APPFONT (50, 14); \ - HelpId = AUTO_HID + 1; \ + HelpId = AUTO_HID2; \ Text[ en-US ] = "Test class" ; \ }; @@ -502,13 +503,13 @@ }; -#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID ) \ +#define AUTOHELP_JDBCCONTROLGROUP( AUTO_HID, AUTO_HID2, AUTO_HID3, AUTO_HID4, AUTO_HID5 ) \ AUTO_WIZARDHELPTEXT( 6 ) \ AUTO_NAMECONTROLGROUP( INIT_Y + 6 * FIXEDTEXT_HEIGHT + 2, AUTO_HID ) \ - AUTO_HOSTCONTROLGROUP(96, AUTO_HID + 1) \ - AUTO_PORTCONTROLGROUP(113, AUTO_HID + 2 ) \ + AUTO_HOSTCONTROLGROUP(96, AUTO_HID2) \ + AUTO_PORTCONTROLGROUP(113, AUTO_HID3 ) \ AUTO_SOCKETCONTROLGROUP(129) \ - AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID + 3) + AUTO_JDBCDRIVERCLASSGROUP(146, AUTO_HID4, AUTO_HID5) // -------------------------------------------------------------------------------------------------- diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 8a49ceb7e59b..dac80070a640 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -244,23 +244,19 @@ namespace dbaui { case ::dbaccess::DST_DBASE: m_aFT_Connection.SetText(String(ModuleRes(STR_DBASE_PATH_OR_FILE))); - // FIXME: HELPID - m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_DBASE_PATH*/); + m_aConnectionURL.SetHelpId(HID_DSADMIN_DBASE_PATH); break; case ::dbaccess::DST_FLAT: m_aFT_Connection.SetText(String(ModuleRes(STR_FLAT_PATH_OR_FILE))); - // FIXME: HELPID - m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_FLAT_PATH*/); + m_aConnectionURL.SetHelpId(HID_DSADMIN_FLAT_PATH); break; case ::dbaccess::DST_CALC: m_aFT_Connection.SetText(String(ModuleRes(STR_CALC_PATH_OR_FILE))); - // FIXME: HELPID - m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_CALC_PATH*/); + m_aConnectionURL.SetHelpId(HID_DSADMIN_CALC_PATH); break; case ::dbaccess::DST_ADABAS: m_aFT_Connection.SetText(String(ModuleRes(STR_ADABAS_DATABASE_NAME))); - // FIXME: HELPID - m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_ADABAS_DATABASE*/); + m_aConnectionURL.SetHelpId(HID_DSADMIN_ADABAS_DATABASE); break; case ::dbaccess::DST_ADO: m_aFT_Connection.SetText(String(ModuleRes(STR_COMMONURL))); @@ -268,40 +264,33 @@ namespace dbaui case ::dbaccess::DST_MSACCESS: case ::dbaccess::DST_MSACCESS_2007: m_aFT_Connection.SetText(String(ModuleRes(STR_MSACCESS_MDB_FILE))); - // FIXME: HELPID - m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_MSACCESS_MDB_FILE*/); + m_aConnectionURL.SetHelpId(HID_DSADMIN_MSACCESS_MDB_FILE); break; case ::dbaccess::DST_MYSQL_NATIVE: case ::dbaccess::DST_MYSQL_JDBC: m_aFT_Connection.SetText(String(ModuleRes(STR_MYSQL_DATABASE_NAME))); - // FIXME: HELPID - m_aConnectionURL.SetHelpId( ""/*HID_DSADMIN_MYSQL_DATABASE*/ ); + m_aConnectionURL.SetHelpId( HID_DSADMIN_MYSQL_DATABASE ); break; case ::dbaccess::DST_ORACLE_JDBC: m_aFT_Connection.SetText(String(ModuleRes(STR_ORACLE_DATABASE_NAME))); - // FIXME: HELPID - m_aConnectionURL.SetHelpId(""/*HID_DSADMIN_ORACLE_DATABASE*/); + m_aConnectionURL.SetHelpId(HID_DSADMIN_ORACLE_DATABASE); break; case ::dbaccess::DST_MYSQL_ODBC: case ::dbaccess::DST_ODBC: m_aFT_Connection.SetText(String(ModuleRes(STR_NAME_OF_ODBC_DATASOURCE))); - // FIXME: HELPID - m_aConnectionURL.SetHelpId( ""/*eType == ::dbaccess::DST_MYSQL_ODBC ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE : HID_DSADMIN_ODBC_DATASOURCE*/); + m_aConnectionURL.SetHelpId( eType == ::dbaccess::DST_MYSQL_ODBC ? HID_DSADMIN_MYSQL_ODBC_DATASOURCE : HID_DSADMIN_ODBC_DATASOURCE); break; case ::dbaccess::DST_LDAP: m_aFT_Connection.SetText(String(ModuleRes(STR_HOSTNAME))); - // FIXME: HELPID - m_aConnectionURL.SetHelpId( ""/*HID_DSADMIN_LDAP_HOSTNAME*/ ); + m_aConnectionURL.SetHelpId( HID_DSADMIN_LDAP_HOSTNAME ); break; case ::dbaccess::DST_MOZILLA: m_aFT_Connection.SetText(String(ModuleRes(STR_MOZILLA_PROFILE_NAME))); - // FIXME: HELPID - m_aConnectionURL.SetHelpId( ""/*HID_DSADMIN_MOZILLA_PROFILE_NAME*/ ); + m_aConnectionURL.SetHelpId( HID_DSADMIN_MOZILLA_PROFILE_NAME ); break; case ::dbaccess::DST_THUNDERBIRD: m_aFT_Connection.SetText(String(ModuleRes(STR_THUNDERBIRD_PROFILE_NAME))); - // FIXME: HELPID - m_aConnectionURL.SetHelpId( ""/*HID_DSADMIN_THUNDERBIRD_PROFILE_NAME*/ ); + m_aConnectionURL.SetHelpId( HID_DSADMIN_THUNDERBIRD_PROFILE_NAME ); break; case ::dbaccess::DST_OUTLOOK: case ::dbaccess::DST_OUTLOOKEXP: @@ -331,8 +320,7 @@ namespace dbaui bool bShowUserAuthenfication = ( eAuthMode != AuthNone ); bool bShowUser = ( eAuthMode == AuthUserPwd ); - // FIXME: HELPID - m_aPB_Connection.SetHelpId(""/*HID_DSADMIN_BROWSECONN*/); + m_aPB_Connection.SetHelpId(HID_DSADMIN_BROWSECONN); m_aFL2.Show( bShowUserAuthenfication ); m_aUserNameLabel.Show( bShowUser && bShowUserAuthenfication ); m_aUserName.Show( bShowUser && bShowUserAuthenfication ); diff --git a/dbaccess/source/ui/dlg/ConnectionPage.src b/dbaccess/source/ui/dlg/ConnectionPage.src index 8ead374bdef4..fb5131ebea6c 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.src +++ b/dbaccess/source/ui/dlg/ConnectionPage.src @@ -55,7 +55,7 @@ TabPage PAGE_CONNECTION }; - AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL) + AUTO_BROWSECONTROLGROUP( 6, UNRELATED_CONTROLS + FIXEDTEXT_HEIGHT + RELATED_CONTROLS, PAGE_X, HID_DSADMIN_URL_GENERAL, HID_DSADMIN_BROWSECONN) FixedText FT_NO_ADDITIONAL_SETTINGS diff --git a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx index 4a12a0dd13ea..352963b21272 100644 --- a/dbaccess/source/ui/dlg/TablesSingleDlg.cxx +++ b/dbaccess/source/ui/dlg/TablesSingleDlg.cxx @@ -34,9 +34,6 @@ #ifndef _DBAUI_DBADMINIMPL_HXX_ #include "DbAdminImpl.hxx" #endif -#ifndef _DBA_DBACCESS_HELPID_HRC_ -#include "dbaccess_helpid.hrc" -#endif #ifndef _DBAUI_TABLESPAGE_HXX_ #include "tablespage.hxx" #endif @@ -51,6 +48,8 @@ #include "propertysetitem.hxx" #endif +#include "dbu_dlg.hrc" + //......................................................................... namespace dbaui { @@ -69,7 +68,7 @@ OTableSubscriptionDialog::OTableSubscriptionDialog(Window* pParent ,SfxItemSet* _pItems ,const Reference< XMultiServiceFactory >& _rxORB ,const ::com::sun::star::uno::Any& _aDataSourceName) - :SfxSingleTabDialog(pParent,UID_DLG_TABLE_FILTER,_pItems) + :SfxSingleTabDialog(pParent,DLG_TABLE_FILTER,_pItems) ,m_pImpl( new ODbDataSourceAdministrationHelper( _rxORB, pParent, this ) ) ,m_bStopExecution(sal_False) ,m_pOutSet(_pItems) diff --git a/dbaccess/source/ui/dlg/adtabdlg.cxx b/dbaccess/source/ui/dlg/adtabdlg.cxx index 5f0e7628876e..a4914cd45cc5 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.cxx +++ b/dbaccess/source/ui/dlg/adtabdlg.cxx @@ -360,13 +360,10 @@ OAddTableDlg::OAddTableDlg( Window* pParent, IAddTableDialogContext& _rContext ) // der Close-Button hat schon einen Standard-Help-Text, den ich aber hier nicht haben moechte, also den Text ruecksetzen // und eine neue ID verteilen aCloseButton.SetHelpText(String()); - // FIXME: HELPID - aCloseButton.SetHelpId(""/*HID_JOINSH_ADDTAB_CLOSE*/); + aCloseButton.SetHelpId(HID_JOINSH_ADDTAB_CLOSE); - // FIXME: HELPID - m_aTableList.SetHelpId( ""/*HID_JOINSH_ADDTAB_TABLELIST*/ ); - // FIXME: HELPID - m_aQueryList.SetHelpId( ""/*HID_JOINSH_ADDTAB_QUERYLIST*/ ); + m_aTableList.SetHelpId( HID_JOINSH_ADDTAB_TABLELIST ); + m_aQueryList.SetHelpId( HID_JOINSH_ADDTAB_QUERYLIST ); ////////////////////////////////////////////////////////////////////// m_aCaseTables.SetClickHdl( LINK( this, OAddTableDlg, OnTypeSelected ) ); diff --git a/dbaccess/source/ui/dlg/adtabdlg.src b/dbaccess/source/ui/dlg/adtabdlg.src index af1d861a0faa..431f86f3d51d 100644 --- a/dbaccess/source/ui/dlg/adtabdlg.src +++ b/dbaccess/source/ui/dlg/adtabdlg.src @@ -38,7 +38,7 @@ ModelessDialog DLG_JOIN_TABADD { OutputSize = TRUE ; SVLook = TRUE ; - HelpID = DLG_JOIN_TABADD ; + HelpID = HID_DLG_JOIN_TABADD ; Size = MAP_APPFONT ( 178 , 147 ) ; Moveable = TRUE ; Closeable = TRUE ; diff --git a/dbaccess/source/ui/dlg/dbadminsetup.src b/dbaccess/source/ui/dlg/dbadminsetup.src index 7b0dbe011342..2a8d762e8d57 100644 --- a/dbaccess/source/ui/dlg/dbadminsetup.src +++ b/dbaccess/source/ui/dlg/dbadminsetup.src @@ -370,7 +370,7 @@ TabPage PAGE_DBWIZARD_MYSQL_JDBC Text[ en-US ] = "Default: 3306"; }; - AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME) + AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT,HID_PAGE_DBWIZARD_JDBC_ET_MYSQLCLASS,HID_PAGE_DBWIZARD_JDBC_PB_TESTMYSQLCLASS) }; TabPage PAGE_DBWIZARD_MYSQL_NATIVE @@ -416,7 +416,7 @@ TabPage PAGE_DBWIZARD_DBASE Text[ en-US ] = "Select the folder where the dBASE files are stored." ; }; - AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION) + AUTO_HELP_BROWSECONTROLGROUP( 3, HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION,HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION) }; @@ -440,7 +440,7 @@ TabPage PAGE_DBWIZARD_TEXT }; - AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE) + AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE,HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE) AUTO_SEPARATORCONTROLGROUP(82, WIZARD_PAGE_X) }; @@ -464,7 +464,7 @@ TabPage PAGE_DBWIZARD_MSACCESS Text[ en-US ] = "Please select the Microsoft Access file you want to access."; }; - AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION) + AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION, HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION) // FT_MSACCESS_MDB_FILE }; @@ -527,7 +527,7 @@ TabPage PAGE_DBWIZARD_ADABAS Text[ en-US ] = "Enter the name of the Adabas D database you want to connect to.\nClick 'Browse...' to select an Adabas D database that is already registered in %PRODUCTNAME." ; }; - AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME) + AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME, HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME) }; @@ -547,7 +547,7 @@ TabPage PAGE_DBWIZARD_ADO Text[ en-US ] = "Please enter the URL of the ADO data source you want to connect to.\nClick 'Browse' to configure provider-specific settings.\nPlease contact your system administrator if you are unsure about the following settings." ; }; - AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL) + AUTO_HELP_BROWSECONTROLGROUP(5, HID_PAGE_DBWIZARD_ADO_ET_ADOURL, HID_PAGE_DBWIZARD_ADO_PB_ADOURL) }; @@ -568,7 +568,7 @@ TabPage PAGE_DBWIZARD_ODBC Text[ en-US ] = "Enter the name of the ODBC database you want to connect to.\nClick 'Browse...' to select an ODBC database that is already registered in %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ; }; - AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE) + AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE, HID_PAGE_DBWIZARD_ODBC_PB_NAMEOFODBCDATASOURCE) }; TabPage PAGE_DBWIZARD_USERDEFINED @@ -578,7 +578,7 @@ TabPage PAGE_DBWIZARD_USERDEFINED Size = MAP_APPFONT ( WIZARD_PAGE_X , WIZARD_PAGE_Y ) ; Hide = TRUE ; - AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE) + AUTO_HELP_BROWSECONTROLGROUP(6, HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE, HID_PAGE_DBWIZARD_USERDEFINED_BROWSE) }; @@ -599,8 +599,8 @@ TabPage PAGE_DBWIZARD_JDBC Text[ en-US ] = "Please enter the required information to connect to a JDBC database.\nPlease contact your system administrator if you are unsure about the following settings." ; }; - AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL) - AUTO_JDBCDRIVERCLASSGROUP(119, HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS) + AUTO_HELP_BROWSECONTROLGROUP(4, HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL, HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL) + AUTO_JDBCDRIVERCLASSGROUP(119, HID_PAGE_DBWIZARD_JDBC_ET_JDBCCLASS, HID_PAGE_DBWIZARD_JDBC_PB_TESTJDBCCLASS) }; @@ -632,7 +632,7 @@ TabPage PAGE_DBWIZARD_ORACLE Text[ en-US ] = "Please enter the required information to connect to an Oracle database.Note that a JDBC Driver Class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings." ; }; - AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME) + AUTOHELP_JDBCCONTROLGROUP(HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT,HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS,HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS) }; @@ -654,7 +654,7 @@ TabPage PAGE_DBWIZARD_SPREADSHEET }; - AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH ) + AUTO_HELP_BROWSECONTROLGROUP(3, HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH,HID_PAGE_DBWIZARD_SPREADSHEET_PB_SPREADSHEETPATH ) String STR_SPREADSHEETPATH{ Text[ en-US ] = "~Location and file name" ; diff --git a/dbaccess/source/ui/dlg/dbwiz.cxx b/dbaccess/source/ui/dlg/dbwiz.cxx index 78fe8aef1f84..cdecbd295df6 100644 --- a/dbaccess/source/ui/dlg/dbwiz.cxx +++ b/dbaccess/source/ui/dlg/dbwiz.cxx @@ -145,16 +145,11 @@ ODbTypeWizDialog::ODbTypeWizDialog(Window* _pParent enableButtons(WZB_FINISH, sal_False); enableAutomaticNextButtonState( true ); - // FIXME: HELPID - m_pPrevPage->SetHelpId(""/*HID_DBWIZ_PREVIOUS*/); - // FIXME: HELPID - m_pNextPage->SetHelpId(""/*HID_DBWIZ_NEXT*/); - // FIXME: HELPID - m_pCancel->SetHelpId(""/*HID_DBWIZ_CANCEL*/); - // FIXME: HELPID - m_pFinish->SetHelpId(""/*HID_DBWIZ_FINISH*/); - // FIXME: HELPID - m_pHelp->SetUniqueId(""/*UID_DBWIZ_HELP*/); + m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS); + m_pNextPage->SetHelpId(HID_DBWIZ_NEXT); + m_pCancel->SetHelpId(HID_DBWIZ_CANCEL); + m_pFinish->SetHelpId(HID_DBWIZ_FINISH); + m_pHelp->SetUniqueId(UID_DBWIZ_HELP); // no local resources needed anymore DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _pItems->GetItem(DSID_TYPECOLLECTION)); diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index c2bf98061782..5a601bd56c92 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -318,16 +318,11 @@ ODbTypeWizDialogSetup::ODbTypeWizDialogSetup(Window* _pParent aPath.push_back(PAGE_DBSETUPWIZARD_INTRO); declarePath( static_cast(m_pCollection->size()+1), aPath); - // FIXME: HELPID - m_pPrevPage->SetHelpId(""/*HID_DBWIZ_PREVIOUS*/); - // FIXME: HELPID - m_pNextPage->SetHelpId(""/*HID_DBWIZ_NEXT*/); - // FIXME: HELPID - m_pCancel->SetHelpId(""/*HID_DBWIZ_CANCEL*/); - // FIXME: HELPID - m_pFinish->SetHelpId(""/*HID_DBWIZ_FINISH*/); - // FIXME: HELPID - m_pHelp->SetUniqueId(""/*UID_DBWIZ_HELP*/); + m_pPrevPage->SetHelpId(HID_DBWIZ_PREVIOUS); + m_pNextPage->SetHelpId(HID_DBWIZ_NEXT); + m_pCancel->SetHelpId(HID_DBWIZ_CANCEL); + m_pFinish->SetHelpId(HID_DBWIZ_FINISH); + m_pHelp->SetUniqueId(UID_DBWIZ_HELP); SetRoadmapInteractive( sal_True ); ActivatePage(); } diff --git a/dbaccess/source/ui/dlg/dlgsave.cxx b/dbaccess/source/ui/dlg/dlgsave.cxx index db0542525aa3..ee6b853b5eed 100644 --- a/dbaccess/source/ui/dlg/dlgsave.cxx +++ b/dbaccess/source/ui/dlg/dlgsave.cxx @@ -470,8 +470,7 @@ void OSaveAsDlg::implInit() else if ( SAD_TITLE_RENAME == ( m_pImpl->m_nFlags & SAD_TITLE_RENAME ) ) { SetText( String( ModuleRes( STR_TITLE_RENAME ) ) ); - // FIXME: HELPID - m_pImpl->m_aTitle.SetHelpId(""/*HID_DLG_RENAME*/); + m_pImpl->m_aTitle.SetHelpId(HID_DLG_RENAME); } m_pImpl->m_aPB_OK.SetClickHdl(LINK(this,OSaveAsDlg,ButtonClickHdl)); diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx index aa1dd1d3e002..ef715d8061cd 100644 --- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx +++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx @@ -128,10 +128,8 @@ DBG_NAME(IndexFieldsControl) { DBG_CTOR(IndexFieldsControl,NULL); - // FIXME: HELPID - SetUniqueId( ""/*UID_DLGINDEX_INDEXDETAILS_BACK*/ ); - // FIXME: HELPID - GetDataWindow().SetUniqueId( ""/*UID_DLGINDEX_INDEXDETAILS_MAIN*/ ); + SetUniqueId( UID_DLGINDEX_INDEXDETAILS_BACK ); + GetDataWindow().SetUniqueId( UID_DLGINDEX_INDEXDETAILS_MAIN ); } //------------------------------------------------------------------ @@ -292,10 +290,8 @@ DBG_NAME(IndexFieldsControl) m_pSortingCell->InsertEntry(m_sAscendingText); m_pSortingCell->InsertEntry(m_sDescendingText); - // FIXME: HELPID - m_pFieldNameCell->SetHelpId( ""/*HID_DLGINDEX_INDEXDETAILS_FIELD*/ ); - // FIXME: HELPID - m_pSortingCell->SetHelpId( ""/*HID_DLGINDEX_INDEXDETAILS_SORTORDER*/ ); + m_pFieldNameCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_FIELD ); + m_pSortingCell->SetHelpId( HID_DLGINDEX_INDEXDETAILS_SORTORDER ); } //------------------------------------------------------------------ diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 34f26083c913..5dd0ccda31b0 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -689,8 +689,13 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle ) { lcl_addButton( *this, BUTTON_HELP, false ); - // FIXME: HELPID - SetHelpId( rtl::OUStringToOString( m_sHelpURL, RTL_TEXTENCODING_UTF8 ) ); + rtl::OUString aTmp; + if ( m_sHelpURL.indexOfAsciiL( "HID:", 4 ) == 0 ) + aTmp = m_sHelpURL.copy( 4 ); + else + aTmp = m_sHelpURL; + + SetHelpId( rtl::OUStringToOString( aTmp, RTL_TEXTENCODING_UTF8 ) ); } } @@ -723,8 +728,7 @@ void OSQLMessageBox::impl_addDetailsButton() PushButton* pButton = GetPushButton( BUTTONID_MORE ); OSL_ENSURE( pButton, "OSQLMessageBox::impl_addDetailsButton: just added this button, why isn't it there?" ); pButton->SetClickHdl( LINK( this, OSQLMessageBox, ButtonClickHdl ) ); - // FIXME: HELPID - pButton->SetUniqueId( ""/*UID_SQLERROR_BUTTONMORE*/ ); + pButton->SetUniqueId( UID_SQLERROR_BUTTONMORE ); } } diff --git a/dbaccess/source/ui/inc/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index a384ad23cb04..10c8c8ec47a0 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -158,9 +158,9 @@ namespace dbaui sal_Bool isTextFormat(const OFieldDescription* _pFieldDescr,sal_uInt32& _nFormatKey) const; void Contruct(); - OPropNumericEditCtrl* CreateNumericControl(USHORT _nHelpStr,short _nProperty,ULONG _nHelpId); + OPropNumericEditCtrl* CreateNumericControl(USHORT _nHelpStr,short _nProperty,const rtl::OString& _sHelpId); FixedText* CreateText(USHORT _nTextRes); - void InitializeControl(Control* _pControl,ULONG _nHelpId,bool _bAddChangeHandler); + void InitializeControl(Control* _pControl,const rtl::OString& _sHelpId,bool _bAddChangeHandler); protected: inline void setRightAligned() { m_bRightAligned = true; } diff --git a/dbaccess/source/ui/inc/UITools.hxx b/dbaccess/source/ui/inc/UITools.hxx index df7208aba9b7..daa8756751cf 100644 --- a/dbaccess/source/ui/inc/UITools.hxx +++ b/dbaccess/source/ui/inc/UITools.hxx @@ -337,7 +337,7 @@ namespace dbaui @return The URL for the help agent to dispatch. */ - ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId); + ::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const rtl::OString& _rHelpId); /** set the evaluation flag at the number formatter @param _rxFormatter diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc index be49adc0e518..730235b207ad 100644 --- a/dbaccess/source/ui/inc/dbu_resource.hrc +++ b/dbaccess/source/ui/inc/dbu_resource.hrc @@ -118,7 +118,7 @@ #define DLG_DATABASE_WIZARD RID_DIALOG_START + 29 #define RID_EXTENSION_NOT_PRESENT_DLG RID_DIALOG_START + 30 #define DLG_TEXT_CONNECTION_SETTINGS RID_DIALOG_START + 31 - +#define DLG_TABLE_FILTER RID_DIALOG_START + 32 //======================================================================== // tab pages diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index 4979718ad41f..9656a9f90d37 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -1497,13 +1497,13 @@ namespace } // annonymous // ......................................................................... // ----------------------------------------------------------------------------- -::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName,const sal_Int32 _nHelpId) +::com::sun::star::util::URL createHelpAgentURL(const ::rtl::OUString& _sModuleName, const rtl::OString& sHelpId) { ::com::sun::star::util::URL aURL; aURL.Complete = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.help://" ) ); aURL.Complete += _sModuleName; aURL.Complete += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ) ); - aURL.Complete += ::rtl::OUString::valueOf(_nHelpId); + aURL.Complete += ::rtl::OUString(sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8); ::rtl::OUString sAnchor; ::rtl::OUString sTempURL = aURL.Complete; @@ -1651,8 +1651,7 @@ sal_Int32 askForUserAction(Window* _pParent,USHORT _nTitle,USHORT _nText,sal_Boo if ( _bAll ) { aAsk.AddButton(String(ModuleRes(STR_BUTTON_TEXT_ALL)), RET_ALL, 0); - // FIXME: HELPID - aAsk.GetPushButton(RET_ALL)->SetHelpId(""/*HID_CONFIRM_DROP_BUTTON_ALL*/); + aAsk.GetPushButton(RET_ALL)->SetHelpId(HID_CONFIRM_DROP_BUTTON_ALL); } return aAsk.Execute(); } diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index f33c82abecb7..fa72a03269cc 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -70,6 +70,8 @@ #include "FieldControls.hxx" #endif +#include "dbaccess_slotid.hrc" + using namespace ::dbaui; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/dbaccess/source/ui/misc/WizardPages.src b/dbaccess/source/ui/misc/WizardPages.src index 9871c3f7d810..624be87c898e 100644 --- a/dbaccess/source/ui/misc/WizardPages.src +++ b/dbaccess/source/ui/misc/WizardPages.src @@ -35,6 +35,7 @@ #include "dbaccess_helpid.hrc" #endif +#include "dbaccess_slotid.hrc" #define WINDOW_SIZE_X 276 #define WINDOW_SIZE_Y 185 @@ -308,7 +309,7 @@ Menu RID_SBA_RTF_PKEYPOPUP MenuItem { Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ; - HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ; + HelpID = HID_TABLEDESIGN_TABED_PRIMARYKEY ; Checkable = TRUE ; Text [ en-US ] = "Primary Key" ; }; diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index d06c45cfce3a..f22d6f64ee87 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -119,8 +119,7 @@ OQueryTableWindow::OQueryTableWindow( Window* pParent, const TTableWindowData::v if (m_strInitialAlias == pTabWinData->GetTableName()) m_strInitialAlias = ::rtl::OUString(); - // FIXME: HELPID - SetHelpId(""/*HID_CTL_QRYDGNTAB*/); + SetHelpId(HID_CTL_QRYDGNTAB); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/querydesign/QueryTableView.cxx b/dbaccess/source/ui/querydesign/QueryTableView.cxx index e61d0b52fc84..c083392a9613 100644 --- a/dbaccess/source/ui/querydesign/QueryTableView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTableView.cxx @@ -310,8 +310,7 @@ OQueryTableView::OQueryTableView( Window* pParent,OQueryDesignView* pView) : OJoinTableView( pParent,pView) { DBG_CTOR(OQueryTableView,NULL); - // FIXME: HELPID - SetHelpId(""/*HID_CTL_QRYDGNTAB*/); + SetHelpId(HID_CTL_QRYDGNTAB); } //------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 1723a262ab49..66b6eec9465c 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -173,8 +173,7 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) ,m_bInUndoMode(sal_False) { DBG_CTOR(OSelectionBrowseBox,NULL); - // FIXME: HELPID - SetHelpId(""/*HID_CTL_QRYDGNCRIT*/); + SetHelpId(HID_CTL_QRYDGNCRIT); m_nMode = BROWSER_COLUMNSELECTION | BROWSER_HIDESELECT | BROWSER_KEEPSELECTION | BROWSER_HIDECURSOR @@ -189,16 +188,11 @@ OSelectionBrowseBox::OSelectionBrowseBox( Window* pParent ) m_pOrderCell = new ListBoxControl(&GetDataWindow()); m_pFunctionCell = new ListBoxControl(&GetDataWindow()); m_pFunctionCell->SetDropDownLineCount( 20 ); - // FIXME: HELPID - m_pVisibleCell->SetHelpId(""/*HID_QRYDGN_ROW_VISIBLE*/); - // FIXME: HELPID - m_pTableCell->SetHelpId(""/*HID_QRYDGN_ROW_TABLE*/); - // FIXME: HELPID - m_pFieldCell->SetHelpId(""/*HID_QRYDGN_ROW_FIELD*/); - // FIXME: HELPID - m_pOrderCell->SetHelpId(""/*HID_QRYDGN_ROW_ORDER*/); - // FIXME: HELPID - m_pFunctionCell->SetHelpId(""/*HID_QRYDGN_ROW_FUNCTION*/); + m_pVisibleCell->SetHelpId(HID_QRYDGN_ROW_VISIBLE); + m_pTableCell->SetHelpId(HID_QRYDGN_ROW_TABLE); + m_pFieldCell->SetHelpId(HID_QRYDGN_ROW_FIELD); + m_pOrderCell->SetHelpId(HID_QRYDGN_ROW_ORDER); + m_pFunctionCell->SetHelpId(HID_QRYDGN_ROW_FUNCTION); ////////////////////////////////////////////////////////////////////// // TriState der ::com::sun::star::form::CheckBox abschalten @@ -2706,7 +2700,7 @@ void OSelectionBrowseBox::enableControl(const OTableFieldDescRef& _rEntry,Window _pControl->EnableInput(bEnable); } // ----------------------------------------------------------------------------- -void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,ULONG _nHelpId) +void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const rtl::OString& _sHelpId) { m_pTextCell->SetText(_sText); m_pTextCell->ClearModifyFlag(); @@ -2715,15 +2709,10 @@ void OSelectionBrowseBox::setTextCellContext(const OTableFieldDescRef& _rEntry,c enableControl(_rEntry,m_pTextCell); - // FIXME: HELPID - #if 0 - if (m_pTextCell->GetHelpId() != _nHelpId) + if (m_pTextCell->GetHelpId() != _sHelpId) // da TextCell in verschiedenen Kontexten verwendet wird, muss ich den gecachten HelpText loeschen m_pTextCell->SetHelpText(String()); - m_pTextCell->SetHelpId(_nHelpId); - #else - (void)_nHelpId; - #endif + m_pTextCell->SetHelpId(_sHelpId); } // ----------------------------------------------------------------------------- void OSelectionBrowseBox::invalidateUndoRedo() diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx index e4fd3471fd97..3d215a81f4c8 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.hxx @@ -261,7 +261,7 @@ namespace dbaui void appendUndoAction(const String& _rOldValue,const String& _rNewValue,sal_Int32 _nRow); OTableFields& getFields() const; void enableControl(const OTableFieldDescRef& _rEntry,Window* _pControl); - void setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,ULONG _nHelpId); + void setTextCellContext(const OTableFieldDescRef& _rEntry,const String& _sText,const rtl::OString& _sHelpId); void invalidateUndoRedo(); OTableFieldDescRef getEntry(OTableFields::size_type _nPos); diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index c422ea5cf1e1..e14c234cc5d3 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -101,8 +101,7 @@ ORelationTableView::ORelationTableView( Window* pParent, ORelationDesignView* pV { DBG_CTOR(ORelationTableView,NULL); - // FIXME: HELPID - SetHelpId(""/*HID_CTL_RELATIONTAB*/); + SetHelpId(HID_CTL_RELATIONTAB); } //------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx index 8d5edcdacd1b..727de7fe60ea 100644 --- a/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx +++ b/dbaccess/source/ui/tabledesign/FieldDescGenWin.cxx @@ -62,8 +62,7 @@ OFieldDescGenWin::OFieldDescGenWin( Window* pParent, OTableDesignHelpBar* pHelp { DBG_CTOR(OFieldDescGenWin,NULL); m_pFieldControl = new OTableFieldControl(this,pHelp); - // FIXME: HELPID - m_pFieldControl->SetHelpId(""/*HID_TAB_DESIGN_FIELDCONTROL*/); + m_pFieldControl->SetHelpId(HID_TAB_DESIGN_FIELDCONTROL); m_pFieldControl->Show(); } //------------------------------------------------------------------------------ diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 4590d7b9082b..2f7fc5f5a2b1 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -106,6 +106,8 @@ #include "TableFieldControl.hxx" #endif +#include "dbaccess_slotid.hrc" + using namespace ::dbaui; using namespace ::comphelper; using namespace ::svt; @@ -246,10 +248,8 @@ OTableEditorCtrl::OTableEditorCtrl(Window* pWindow) { DBG_CTOR(OTableEditorCtrl,NULL); - // FIXME: HELPID - SetHelpId(""/*HID_TABDESIGN_BACKGROUND*/); - // FIXME: HELPID - GetDataWindow().SetHelpId(""/*HID_CTL_TABLEEDIT*/); + SetHelpId(HID_TABDESIGN_BACKGROUND); + GetDataWindow().SetHelpId(HID_CTL_TABLEEDIT); m_pRowList = GetView()->getController().getRows(); m_nDataPos = 0; @@ -344,12 +344,9 @@ void OTableEditorCtrl::InitCellController() pDescrCell = new Edit( &GetDataWindow(), WB_LEFT ); pDescrCell->SetMaxTextLen( MAX_DESCR_LEN ); - // FIXME: HELPID - pNameCell->SetHelpId(""/*HID_TABDESIGN_NAMECELL*/); - // FIXME: HELPID - pTypeCell->SetHelpId(""/*HID_TABDESIGN_TYPECELL*/); - // FIXME: HELPID - pDescrCell->SetHelpId(""/*HID_TABDESIGN_COMMENTCELL*/); + pNameCell->SetHelpId(HID_TABDESIGN_NAMECELL); + pTypeCell->SetHelpId(HID_TABDESIGN_TYPECELL); + pDescrCell->SetHelpId(HID_TABDESIGN_COMMENTCELL); Size aHeight; const Control* pControls[] = { pTypeCell,pDescrCell,pNameCell}; diff --git a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx index 183bcb8fca71..c2326e441c95 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignHelpBar.cxx @@ -52,8 +52,7 @@ OTableDesignHelpBar::OTableDesignHelpBar( Window* pParent ) : { DBG_CTOR(OTableDesignHelpBar,NULL); m_pTextWin = new MultiLineEdit( this, WB_VSCROLL | WB_LEFT | WB_BORDER | WB_NOTABSTOP | WB_READONLY); - // FIXME: HELPID - m_pTextWin->SetHelpId(""/*HID_TABLE_DESIGN_HELP_WINDOW*/); + m_pTextWin->SetHelpId(HID_TABLE_DESIGN_HELP_WINDOW); m_pTextWin->SetReadOnly(); m_pTextWin->SetControlBackground( GetSettings().GetStyleSettings().GetFaceColor() ); m_pTextWin->Show(); diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index ce106ee74952..f16624dbdad2 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -90,8 +90,7 @@ OTableBorderWindow::OTableBorderWindow(Window* pParent) : Window(pParent,WB_BORD m_pEditorCtrl = new OTableEditorCtrl( this); m_pFieldDescWin = new OTableFieldDescWin( this ); - // FIXME: HELPID - m_pFieldDescWin->SetHelpId(""/*HID_TAB_DESIGN_DESCWIN*/); + m_pFieldDescWin->SetHelpId(HID_TAB_DESIGN_DESCWIN); // set depending windows and controls m_pEditorCtrl->SetDescrWin(m_pFieldDescWin); diff --git a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx index 3f60dd06f4b5..6f136ab0b4e8 100644 --- a/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx +++ b/dbaccess/source/ui/tabledesign/TableFieldDescWin.cxx @@ -93,13 +93,11 @@ OTableFieldDescWin::OTableFieldDescWin( Window* pParent) ////////////////////////////////////////////////////////////////////// // HelpBar m_pHelpBar = new OTableDesignHelpBar( this ); - // FIXME: HELPID - m_pHelpBar->SetHelpId(""/*HID_TAB_DESIGN_HELP_TEXT_FRAME*/); + m_pHelpBar->SetHelpId(HID_TAB_DESIGN_HELP_TEXT_FRAME); m_pHelpBar->Show(); m_pGenPage = new OFieldDescGenWin( this, m_pHelpBar ); - // FIXME: HELPID - getGenPage()->SetHelpId( ""/*HID_TABLE_DESIGN_TABPAGE_GENERAL*/ ); + getGenPage()->SetHelpId( HID_TABLE_DESIGN_TABPAGE_GENERAL ); getGenPage()->Show(); } diff --git a/dbaccess/source/ui/tabledesign/table.src b/dbaccess/source/ui/tabledesign/table.src index d40da4e3c358..fe01dff5f79f 100644 --- a/dbaccess/source/ui/tabledesign/table.src +++ b/dbaccess/source/ui/tabledesign/table.src @@ -171,7 +171,7 @@ Menu RID_TABLEDESIGNROWPOPUPMENU MenuItem { Identifier = SID_TABLEDESIGN_INSERTROWS ; - HelpID = SID_TABLEDESIGN_INSERTROWS ; + HelpID = HID_TABLEDESIGN_INSERTROWS ; Text [ en-US ] = "Insert Rows" ; }; MenuItem @@ -181,7 +181,7 @@ Menu RID_TABLEDESIGNROWPOPUPMENU MenuItem { Identifier = SID_TABLEDESIGN_TABED_PRIMARYKEY ; - HelpID = SID_TABLEDESIGN_TABED_PRIMARYKEY ; + HelpID = HID_TABLEDESIGN_TABED_PRIMARYKEY ; Checkable = TRUE ; Text [ en-US ] = "Primary Key" ; }; diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc index f73782a1d8d4..410e11337147 100644 --- a/reportdesign/inc/helpids.hrc +++ b/reportdesign/inc/helpids.hrc @@ -31,100 +31,99 @@ #include // HID_RPT_DBACCESS_START #endif -#define UID_RPT_RPT_APP_VIEW (HID_RPT_START + 0) -#define UID_RPT_SCROLLWINDOW (HID_RPT_START + 1) -#define UID_RPT_REPORTWINDOW (HID_RPT_START + 2) -#define HID_RPT_HORZ_RULER (HID_RPT_START + 3) -#define UID_RPT_SECTIONSWINDOW (HID_RPT_START + 4) -#define UID_RPT_VIEWSWINDOW (HID_RPT_START + 5) -#define HID_RPT_ENDMARKER (HID_RPT_START + 6) -#define HID_RPT_SPLITTER (HID_RPT_START + 7) -#define HID_REPORTSECTION (HID_RPT_START + 8) -#define HID_RPT_HORZ_SCROLLBAR (HID_RPT_START + 9) -#define HID_RPT_VERT_SCROLLBAR (HID_RPT_START + 10) -#define HID_RPT_STARTMARKER (HID_RPT_START + 11) -#define HID_RPT_FIELDEXPRESSION (HID_RPT_START + 12) -#define HID_RPT_SORTORDER (HID_RPT_START + 13) -#define HID_RPT_GROUPSBRW (HID_RPT_START + 14) -#define HID_RPT_GROUPSSORTING_DLG (HID_RPT_START + 15) -#define HID_RPT_PAGENUMBERS_DLG (HID_RPT_START + 16) -#define HID_RPT_DATETIME_DLG (HID_RPT_START + 17) -#define HID_RPT_CONDFORMAT_DLG (HID_RPT_START + 18) -#define HID_RPT_CONDFORMAT_TB (HID_RPT_START + 19) -#define HID_RPT_CRTL_FORMAT_PREVIEW (HID_RPT_START + 20) -#define HID_RPT_COND_DLG (HID_RPT_START + 21) -#define HID_RPT_POPUP_COLOR_CTRL (HID_RPT_START + 22) -#define HID_RPT_POPUP_COLOR (HID_RPT_START + 23) -#define HID_RPT_FIELD_SEL (HID_RPT_START + 24) -#define HID_RPT_FIELD_SEL_WIN (HID_RPT_START + 25) -#define HID_RPT_PROPDLG_TAB_GENERAL (HID_RPT_START + 26) -#define HID_RPT_PROPDLG_TAB_DATA (HID_RPT_START + 27) +#define UID_RPT_PROP_FORMULA "REPORTDESIGN_UID_RPT_PROP_FORMULA" +#define UID_RPT_RPT_PROP_DLG_FONT_TYPE "REPORTDESIGN_UID_RPT_RPT_PROP_DLG_FONT_TYPE" +#define UID_RPT_RPT_PROP_DLG_AREA "REPORTDESIGN_UID_RPT_RPT_PROP_DLG_AREA" +#define UID_RPT_PROP_CHARTTYPE_DLG "REPORTDESIGN_UID_RPT_PROP_CHARTTYPE_DLG" +#define UID_RPT_PROP_DLG_LINKFIELDS "REPORTDESIGN_UID_RPT_PROP_DLG_LINKFIELDS" -#define HID_RPT_PROP_FORCENEWPAGE (HID_RPT_START + 28) -#define HID_RPT_PROP_NEWROWORCOL (HID_RPT_START + 29) -#define HID_RPT_PROP_KEEPTOGETHER (HID_RPT_START + 30) -#define HID_RPT_PROP_CANGROW (HID_RPT_START + 31) -#define HID_RPT_PROP_CANSHRINK (HID_RPT_START + 32) -#define HID_RPT_PROP_REPEATSECTION (HID_RPT_START + 33) -#define HID_RPT_PROP_FORMULALIST (HID_RPT_START + 34) -#define HID_RPT_PROP_SCOPE (HID_RPT_START + 35) -#define HID_RPT_PROP_TYPE (HID_RPT_START + 36) -#define HID_RPT_PROP_MASTERFIELDS (HID_RPT_START + 37) -#define HID_RPT_PROP_DETAILFIELDS (HID_RPT_START + 38) -#define HID_RPT_PROP_AREA (HID_RPT_START + 39) -#define UID_RPT_RPT_PROP_DLG_AREA (HID_RPT_START + 40) -#define HID_RPT_PROP_MIMETYPE (HID_RPT_START + 41) +#define UID_RPT_RPT_APP_VIEW "REPORTDESIGN_UID_RPT_RPT_APP_VIEW" +#define UID_RPT_SCROLLWINDOW "REPORTDESIGN_UID_RPT_SCROLLWINDOW" +#define UID_RPT_REPORTWINDOW "REPORTDESIGN_UID_RPT_REPORTWINDOW" +#define HID_RPT_HORZ_RULER "REPORTDESIGN_HID_RPT_HORZ_RULER" +#define UID_RPT_SECTIONSWINDOW "REPORTDESIGN_UID_RPT_SECTIONSWINDOW" +#define UID_RPT_VIEWSWINDOW "REPORTDESIGN_UID_RPT_VIEWSWINDOW" +#define HID_RPT_ENDMARKER "REPORTDESIGN_HID_RPT_ENDMARKER" +#define HID_RPT_SPLITTER "REPORTDESIGN_HID_RPT_SPLITTER" +#define HID_REPORTSECTION "REPORTDESIGN_HID_REPORTSECTION" +#define HID_RPT_HORZ_SCROLLBAR "REPORTDESIGN_HID_RPT_HORZ_SCROLLBAR" +#define HID_RPT_VERT_SCROLLBAR "REPORTDESIGN_HID_RPT_VERT_SCROLLBAR" +#define HID_RPT_STARTMARKER "REPORTDESIGN_HID_RPT_STARTMARKER" +#define HID_RPT_FIELDEXPRESSION "REPORTDESIGN_HID_RPT_FIELDEXPRESSION" +#define HID_RPT_SORTORDER "REPORTDESIGN_HID_RPT_SORTORDER" +#define HID_RPT_GROUPSBRW "REPORTDESIGN_HID_RPT_GROUPSBRW" +#define HID_RPT_GROUPSSORTING_DLG "REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG" +#define HID_RPT_PAGENUMBERS_DLG "REPORTDESIGN_HID_RPT_PAGENUMBERS_DLG" +#define HID_RPT_DATETIME_DLG "REPORTDESIGN_HID_RPT_DATETIME_DLG" +#define HID_RPT_CONDFORMAT_DLG "REPORTDESIGN_HID_RPT_CONDFORMAT_DLG" +#define HID_RPT_CONDFORMAT_TB "REPORTDESIGN_HID_RPT_CONDFORMAT_TB" +#define HID_RPT_CRTL_FORMAT_PREVIEW "REPORTDESIGN_HID_RPT_CRTL_FORMAT_PREVIEW" +#define HID_RPT_COND_DLG "REPORTDESIGN_HID_RPT_COND_DLG" +#define HID_RPT_POPUP_COLOR_CTRL "REPORTDESIGN_HID_RPT_POPUP_COLOR_CTRL" +#define HID_RPT_POPUP_COLOR "REPORTDESIGN_HID_RPT_POPUP_COLOR" +#define HID_RPT_FIELD_SEL "REPORTDESIGN_HID_RPT_FIELD_SEL" +#define HID_RPT_FIELD_SEL_WIN "REPORTDESIGN_HID_RPT_FIELD_SEL_WIN" +#define HID_RPT_PROPDLG_TAB_GENERAL "REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL" +#define HID_RPT_PROPDLG_TAB_DATA "REPORTDESIGN_HID_RPT_PROPDLG_TAB_DATA" + +#define HID_RPT_PROP_FORCENEWPAGE "REPORTDESIGN_HID_RPT_PROP_FORCENEWPAGE" +#define HID_RPT_PROP_NEWROWORCOL "REPORTDESIGN_HID_RPT_PROP_NEWROWORCOL" +#define HID_RPT_PROP_KEEPTOGETHER "REPORTDESIGN_HID_RPT_PROP_KEEPTOGETHER" +#define HID_RPT_PROP_CANGROW "REPORTDESIGN_HID_RPT_PROP_CANGROW" +#define HID_RPT_PROP_CANSHRINK "REPORTDESIGN_HID_RPT_PROP_CANSHRINK" +#define HID_RPT_PROP_REPEATSECTION "REPORTDESIGN_HID_RPT_PROP_REPEATSECTION" +#define HID_RPT_PROP_FORMULALIST "REPORTDESIGN_HID_RPT_PROP_FORMULALIST" +#define HID_RPT_PROP_SCOPE "REPORTDESIGN_HID_RPT_PROP_SCOPE" +#define HID_RPT_PROP_TYPE "REPORTDESIGN_HID_RPT_PROP_TYPE" +#define HID_RPT_PROP_MASTERFIELDS "REPORTDESIGN_HID_RPT_PROP_MASTERFIELDS" +#define HID_RPT_PROP_DETAILFIELDS "REPORTDESIGN_HID_RPT_PROP_DETAILFIELDS" +#define HID_RPT_PROP_AREA "REPORTDESIGN_HID_RPT_PROP_AREA" +#define HID_RPT_PROP_MIMETYPE "REPORTDESIGN_HID_RPT_PROP_MIMETYPE" // free // free -#define HID_RPT_PROP_PRINTREPEATEDVALUES (HID_RPT_START + 44) -#define HID_RPT_PROP_CONDITIONALPRINTEXPRESSION (HID_RPT_START + 45) -#define HID_RPT_PROP_VERTICALALIGN (HID_RPT_START + 46) -#define HID_RPT_PROP_STARTNEWCOLUMN (HID_RPT_START + 47) -#define HID_RPT_PROP_STARTNEWPAGE (HID_RPT_START + 48) -#define HID_RPT_PROP_RESETPAGENUMBER (HID_RPT_START + 49) -#define HID_RPT_PROP_PARAADJUST (HID_RPT_START + 50) -#define HID_RPT_PROP_MINHEIGHTNEWPAGE (HID_RPT_START + 51) -#define HID_RPT_PROP_PRINTWHENGROUPCHANGE (HID_RPT_START + 52) -#define HID_RPT_PROP_CHARTTYPE (HID_RPT_START + 53) +#define HID_RPT_PROP_PRINTREPEATEDVALUES "REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES" +#define HID_RPT_PROP_CONDITIONALPRINTEXPRESSION "REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION" +#define HID_RPT_PROP_VERTICALALIGN "REPORTDESIGN_HID_RPT_PROP_VERTICALALIGN" +#define HID_RPT_PROP_STARTNEWCOLUMN "REPORTDESIGN_HID_RPT_PROP_STARTNEWCOLUMN" +#define HID_RPT_PROP_STARTNEWPAGE "REPORTDESIGN_HID_RPT_PROP_STARTNEWPAGE" +#define HID_RPT_PROP_RESETPAGENUMBER "REPORTDESIGN_HID_RPT_PROP_RESETPAGENUMBER" +#define HID_RPT_PROP_PARAADJUST "REPORTDESIGN_HID_RPT_PROP_PARAADJUST" +#define HID_RPT_PROP_MINHEIGHTNEWPAGE "REPORTDESIGN_HID_RPT_PROP_MINHEIGHTNEWPAGE" +#define HID_RPT_PROP_PRINTWHENGROUPCHANGE "REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE" +#define HID_RPT_PROP_CHARTTYPE "REPORTDESIGN_HID_RPT_PROP_CHARTTYPE" // free // free -#define HID_RPT_PROP_VISIBLE (HID_RPT_START + 55) -#define HID_RPT_PROP_GROUPKEEPTOGETHER (HID_RPT_START + 56) -#define HID_RPT_PROP_PAGEHEADEROPTION (HID_RPT_START + 57) -#define HID_RPT_PROP_PAGEFOOTEROPTION (HID_RPT_START + 58) -#define UID_RPT_PROP_DLG_LINE_STYLE (HID_RPT_START + 59) -#define HID_RPT_PROP_PREVIEW_COUNT (HID_RPT_START + 60) -#define HID_RPT_PROP_DATAFIELD (HID_RPT_START + 61) -#define HID_RPT_PROP_BACKCOLOR (HID_RPT_START + 62) -#define HID_RPT_PROP_RPT_POSITIONX (HID_RPT_START + 63) -#define HID_RPT_PROP_RPT_POSITIONY (HID_RPT_START + 64) -#define HID_RPT_PROP_RPT_WIDTH (HID_RPT_START + 65) -#define HID_RPT_PROP_RPT_HEIGHT (HID_RPT_START + 66) -#define HID_RPT_START_TITLE (HID_RPT_START + 67) -#define HID_RPT_START_IMAGE (HID_RPT_START + 68) -#define HID_RPT_PROP_DEEPTRAVERSING (HID_RPT_START + 69) -#define HID_RPT_PROP_PREEVALUATED (HID_RPT_START + 70) -#define HID_RPT_NAVIGATOR_DLG (HID_RPT_START + 71) -#define HID_REPORT_NAVIGATOR_TREE (HID_RPT_START + 72) -#define HID_RPT_PROP_FORMULA (HID_RPT_START + 73) -#define HID_RPT_PROP_INITIALFORMULA (HID_RPT_START + 74) -#define HID_RPT_PROP_RPT_FONT (HID_RPT_START + 75) -#define UID_RPT_RPT_PROP_DLG_FONT_TYPE (HID_RPT_START + 76) -#define HID_RPT_PROP_PRESERVEIRI (HID_RPT_START + 77) -#define HID_RPT_PROP_BACKTRANSPARENT (HID_RPT_START + 78) -#define HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT (HID_RPT_START + 79) -#define UID_RPT_PROP_CHARTTYPE_DLG (HID_RPT_START + 80) -#define UID_RPT_PROP_DLG_LINKFIELDS (HID_RPT_START + 81) -#define UID_RPT_PROP_FORMULA (HID_RPT_START + 82) +#define HID_RPT_PROP_VISIBLE "REPORTDESIGN_HID_RPT_PROP_VISIBLE" +#define HID_RPT_PROP_GROUPKEEPTOGETHER "REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER" +#define HID_RPT_PROP_PAGEHEADEROPTION "REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION" +#define HID_RPT_PROP_PAGEFOOTEROPTION "REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION" +#define UID_RPT_PROP_DLG_LINE_STYLE "REPORTDESIGN_UID_RPT_PROP_DLG_LINE_STYLE" +#define HID_RPT_PROP_PREVIEW_COUNT "REPORTDESIGN_HID_RPT_PROP_PREVIEW_COUNT" +#define HID_RPT_PROP_DATAFIELD "REPORTDESIGN_HID_RPT_PROP_DATAFIELD" +#define HID_RPT_PROP_BACKCOLOR "REPORTDESIGN_HID_RPT_PROP_BACKCOLOR" +#define HID_RPT_PROP_RPT_POSITIONX "REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX" +#define HID_RPT_PROP_RPT_POSITIONY "REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY" +#define HID_RPT_PROP_RPT_WIDTH "REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH" +#define HID_RPT_PROP_RPT_HEIGHT "REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT" +#define HID_RPT_START_TITLE "REPORTDESIGN_HID_RPT_START_TITLE" +#define HID_RPT_START_IMAGE "REPORTDESIGN_HID_RPT_START_IMAGE" +#define HID_RPT_PROP_DEEPTRAVERSING "REPORTDESIGN_HID_RPT_PROP_DEEPTRAVERSING" +#define HID_RPT_PROP_PREEVALUATED "REPORTDESIGN_HID_RPT_PROP_PREEVALUATED" +#define HID_RPT_NAVIGATOR_DLG "REPORTDESIGN_HID_RPT_NAVIGATOR_DLG" +#define HID_REPORT_NAVIGATOR_TREE "REPORTDESIGN_HID_REPORT_NAVIGATOR_TREE" +#define HID_RPT_PROP_FORMULA "REPORTDESIGN_HID_RPT_PROP_FORMULA" +#define HID_RPT_PROP_INITIALFORMULA "REPORTDESIGN_HID_RPT_PROP_INITIALFORMULA" +#define HID_RPT_PROP_RPT_FONT "REPORTDESIGN_HID_RPT_PROP_RPT_FONT" +#define HID_RPT_PROP_PRESERVEIRI "REPORTDESIGN_HID_RPT_PROP_PRESERVEIRI" +#define HID_RPT_PROP_BACKTRANSPARENT "REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT" +#define HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT "REPORTDESIGN_HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT" -#define HID_RPT_GROUPSORT_MOVE_UP (HID_RPT_START + 82) -#define HID_RPT_GROUPSORT_MOVE_DOWN (HID_RPT_START + 83) -#define HID_RPT_GROUPSORT_DELETE (HID_RPT_START + 84) +#define HID_RPT_GROUPSORT_MOVE_UP "REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_UP" +#define HID_RPT_GROUPSORT_MOVE_DOWN "REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_DOWN" +#define HID_RPT_GROUPSORT_DELETE "REPORTDESIGN_HID_RPT_GROUPSORT_DELETE" -#if UID_RPT_PROP_FORMULA > HID_RPT_END -#error Help-Id Ueberlauf in #file, #line -#endif -// don't forget to update the file util/hidother.src +#define HID_FRAME_UP "REPORTDESIGN_HID_FRAME_UP" +#define HID_FRAME_DOWN "REPORTDESIGN_HID_FRAME_DOWN" #endif //RTPUI_REPORTDESIGN_HELPID_HRC diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx index f52a7c3e0fda..dc6681bbd1e6 100644 --- a/reportdesign/source/ui/dlg/AddField.cxx +++ b/reportdesign/source/ui/dlg/AddField.cxx @@ -117,8 +117,7 @@ OAddFieldWindowListBox::OAddFieldWindowListBox( OAddFieldWindow* _pParent ) ,m_pTabWin( _pParent ) { DBG_CTOR( rpt_OAddFieldWindowListBox,NULL); - // FIXME: HELPID - SetHelpId( ""/*HID_RPT_FIELD_SEL*/ ); + SetHelpId( HID_RPT_FIELD_SEL ); SetSelectionMode(MULTIPLE_SELECTION); SetDragDropMode( 0xFFFF ); SetHighlightRange( ); @@ -178,8 +177,7 @@ OAddFieldWindow::OAddFieldWindow(Window* pParent ,m_pContainerListener(NULL) { DBG_CTOR( rpt_OAddFieldWindow,NULL); - // FIXME: HELPID - SetHelpId( ""/*HID_RPT_FIELD_SEL_WIN*/ ); + SetHelpId( HID_RPT_FIELD_SEL_WIN ); SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetFaceColor()) ); SetMinOutputSizePixel(Size(STD_WIN_SIZE_X,STD_WIN_SIZE_Y)); diff --git a/reportdesign/source/ui/dlg/Condition.cxx b/reportdesign/source/ui/dlg/Condition.cxx index 63fe50c1e343..e3591ae03534 100644 --- a/reportdesign/source/ui/dlg/Condition.cxx +++ b/reportdesign/source/ui/dlg/Condition.cxx @@ -147,10 +147,8 @@ OColorPopup::OColorPopup(Window* _pParent,Condition* _pCondition) ,m_nSlotId(0) ,m_aColorSet( this, WinBits( WB_ITEMBORDER | WB_NAMEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT) ) { - // FIXME: HELPID - m_aColorSet.SetHelpId( ""/*HID_RPT_POPUP_COLOR_CTRL*/ ); - // FIXME: HELPID - SetHelpId( ""/*HID_RPT_POPUP_COLOR*/ ); + m_aColorSet.SetHelpId( HID_RPT_POPUP_COLOR_CTRL ); + SetHelpId( HID_RPT_POPUP_COLOR ); const Size aSize12( 13, 13 ); ::std::auto_ptr pColorTable(new XColorTable( SvtPathOptions().GetPalettePath() )); short i = 0; diff --git a/reportdesign/source/ui/dlg/Formula.cxx b/reportdesign/source/ui/dlg/Formula.cxx index c54380cb7d2a..682ec6b17438 100644 --- a/reportdesign/source/ui/dlg/Formula.cxx +++ b/reportdesign/source/ui/dlg/Formula.cxx @@ -99,7 +99,7 @@ FormulaDialog::~FormulaDialog() { if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) ); aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)).GetBuffer() ) ); ::std::auto_ptr aTemp2(m_pAddField); @@ -209,7 +209,7 @@ void FormulaDialog::ToggleCollapsed( RefEdit* _pEdit, RefButton* _pButton) { m_pAddField = new OAddFieldWindow(this,m_xRowSet); m_pAddField->SetCreateHdl(LINK( this, FormulaDialog, OnClickHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( HID_RPT_FIELD_SEL_WIN ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( HID_RPT_FIELD_SEL_WIN ) ); if ( aDlgOpt.Exists() ) { m_pAddField->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); diff --git a/reportdesign/source/ui/dlg/GroupsSorting.cxx b/reportdesign/source/ui/dlg/GroupsSorting.cxx index 8de734760bd3..7e83adbb4e49 100644 --- a/reportdesign/source/ui/dlg/GroupsSorting.cxx +++ b/reportdesign/source/ui/dlg/GroupsSorting.cxx @@ -366,8 +366,7 @@ void OFieldExpressionControl::lateInit() m_pComboCell = new ComboBoxControl( &GetDataWindow() ); m_pComboCell->SetSelectHdl(LINK(this,OFieldExpressionControl,CBChangeHdl)); - // FIXME: HELPID - m_pComboCell->SetHelpId(""/*HID_RPT_FIELDEXPRESSION*/); + m_pComboCell->SetHelpId(HID_RPT_FIELDEXPRESSION); Control* pControls[] = {m_pComboCell}; for (size_t i = 0; i < sizeof(pControls)/sizeof(pControls[0]); ++i) diff --git a/reportdesign/source/ui/dlg/Navigator.cxx b/reportdesign/source/ui/dlg/Navigator.cxx index 56ddb2f26141..af61f3b6d514 100644 --- a/reportdesign/source/ui/dlg/Navigator.cxx +++ b/reportdesign/source/ui/dlg/Navigator.cxx @@ -240,8 +240,7 @@ NavigatorTree::NavigatorTree( Window* pParent,OReportController& _rController ) m_pSelectionListener = new OSelectionChangeMultiplexer(this,&m_rController); - // FIXME: HELPID - SetHelpId( ""/*HID_REPORT_NAVIGATOR_TREE*/ ); + SetHelpId( HID_REPORT_NAVIGATOR_TREE ); m_aNavigatorImages = ImageList( ModuleRes( RID_SVXIMGLIST_RPTEXPL ) ); m_aNavigatorImagesHC = ImageList( ModuleRes( RID_SVXIMGLIST_RPTEXPL_HC ) ); diff --git a/reportdesign/source/ui/dlg/Navigator.src b/reportdesign/source/ui/dlg/Navigator.src index 496bae3b0ab7..b9e639dfe646 100644 --- a/reportdesign/source/ui/dlg/Navigator.src +++ b/reportdesign/source/ui/dlg/Navigator.src @@ -110,7 +110,6 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_SORTINGANDGROUPING; - HelpId = SID_SORTINGANDGROUPING ; Command = ".uno:DbSortingAndGrouping"; Text [ en-US ] = "Sorting and Grouping..."; }; @@ -121,7 +120,6 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_PAGEHEADERFOOTER; - HelpId = SID_PAGEHEADERFOOTER ; Command = ".uno:PageHeaderFooter"; Checkable = TRUE; Text [ en-US ] = "Page Header/Footer..."; @@ -129,7 +127,6 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_REPORTHEADERFOOTER; - HelpId = SID_REPORTHEADERFOOTER ; Command = ".uno:ReportHeaderFooter"; Checkable = TRUE; Text [ en-US ] = "Report Header/Footer..."; @@ -141,7 +138,6 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_RPT_NEW_FUNCTION; - HelpId = SID_RPT_NEW_FUNCTION; Command = ".uno:NewFunction"; Text [ en-US ] = "New Function"; }; @@ -152,7 +148,6 @@ Menu RID_MENU_NAVIGATOR MenuItem { Identifier = SID_SHOW_PROPERTYBROWSER; - HelpId = SID_SHOW_PROPERTYBROWSER ; Command = ".uno:FormProperties"; Text [ en-US ] = "Properties..."; }; diff --git a/reportdesign/source/ui/inc/FunctionHelper.hxx b/reportdesign/source/ui/inc/FunctionHelper.hxx index 48da4e0eb180..e2a43c163808 100644 --- a/reportdesign/source/ui/inc/FunctionHelper.hxx +++ b/reportdesign/source/ui/inc/FunctionHelper.hxx @@ -81,7 +81,7 @@ public: virtual void fillVisibleArgumentMapping(::std::vector& _rArguments) const ; virtual void initArgumentInfo() const; virtual ::rtl::OUString getSignature() const ; - virtual long getHelpId() const ; + virtual rtl::OString getHelpId() const ; virtual sal_uInt32 getParameterCount() const ; virtual ::rtl::OUString getParameterName(sal_uInt32 _nPos) const ; virtual ::rtl::OUString getParameterDescription(sal_uInt32 _nPos) const ; diff --git a/reportdesign/source/ui/inc/metadata.hxx b/reportdesign/source/ui/inc/metadata.hxx index 5ab2f53467ba..3cc2a20cc465 100644 --- a/reportdesign/source/ui/inc/metadata.hxx +++ b/reportdesign/source/ui/inc/metadata.hxx @@ -60,7 +60,7 @@ namespace rptui // IPropertyInfoService sal_Int32 getPropertyId(const String& _rName) const; String getPropertyTranslation(sal_Int32 _nId) const; - sal_Int32 getPropertyHelpId(sal_Int32 _nId) const; + rtl::OString getPropertyHelpId(sal_Int32 _nId) const; sal_uInt32 getPropertyUIFlags(sal_Int32 _nId) const; static void getExcludeProperties(::std::vector< com::sun::star::beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler); @@ -83,7 +83,7 @@ namespace rptui class HelpIdUrl { public: - static ::rtl::OUString getHelpURL( sal_uInt32 _nHelpId ); + static ::rtl::OUString getHelpURL( const rtl::OString& _sHelpId ); }; //======================================================================== diff --git a/reportdesign/source/ui/inspection/DataProviderHandler.cxx b/reportdesign/source/ui/inspection/DataProviderHandler.cxx index 57e293994741..66f75fa090ed 100644 --- a/reportdesign/source/ui/inspection/DataProviderHandler.cxx +++ b/reportdesign/source/ui/inspection/DataProviderHandler.cxx @@ -284,7 +284,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co switch(nId) { case PROPERTY_ID_CHARTTYPE: - aOut.PrimaryButtonId = UID_RPT_PROP_CHARTTYPE_DLG; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_CHARTTYPE_DLG); aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::TextField , sal_True); aOut.HasPrimaryButton = sal_True; break; @@ -294,7 +294,7 @@ inspection::LineDescriptor SAL_CALL DataProviderHandler::describePropertyLine(co case PROPERTY_ID_MASTERFIELDS: case PROPERTY_ID_DETAILFIELDS: aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::StringListField , sal_False); - aOut.PrimaryButtonId = UID_RPT_PROP_DLG_LINKFIELDS; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_DLG_LINKFIELDS); aOut.HasPrimaryButton = sal_True; break; default: diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 929225751437..60ff62578b1b 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -47,11 +47,12 @@ namespace rptui { //........................................................................ //------------------------------------------------------------------------ - ::rtl::OUString HelpIdUrl::getHelpURL( sal_uInt32 _nHelpId ) + ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId ) { ::rtl::OUStringBuffer aBuffer; + ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); aBuffer.appendAscii( "HID:" ); - aBuffer.append( (sal_Int32)_nHelpId ); + aBuffer.append( aTmp.getStr() ); return aBuffer.makeStringAndClear(); } @@ -235,7 +236,7 @@ namespace rptui { const sal_Char* programmaticName; USHORT uiNameResId; - sal_uInt32 helpId; + rtl::OString helpId; } aCategories[] = { { "General", RID_STR_PROPPAGE_DEFAULT, HID_RPT_PROPDLG_TAB_GENERAL }, { "Data", RID_STR_PROPPAGE_DATA, HID_RPT_PROPDLG_TAB_DATA }, diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx index cc4a4d709941..084bd77f8d5b 100644 --- a/reportdesign/source/ui/inspection/GeometryHandler.cxx +++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx @@ -777,12 +777,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const break; case PROPERTY_ID_INITIALFORMULA: case PROPERTY_ID_FORMULA: - aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.HasPrimaryButton = sal_True; aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False); break; case PROPERTY_ID_CONDITIONALPRINTEXPRESSION: - aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.HasPrimaryButton = sal_True; aOut.Control = _xControlFactory->createPropertyControl(inspection::PropertyControlType::MultiLineTextField , sal_False); break; @@ -797,7 +797,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const if ( m_nDataFieldType == DATA_OR_FORMULA ) { - aOut.PrimaryButtonId = UID_RPT_PROP_FORMULA; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_PROP_FORMULA); aOut.HasPrimaryButton = sal_True; } @@ -824,12 +824,12 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::ColorListBox, sal_False ); break; case PROPERTY_ID_FONT: - aOut.PrimaryButtonId = UID_RPT_RPT_PROP_DLG_FONT_TYPE; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_FONT_TYPE); aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True ); aOut.HasPrimaryButton = sal_True; break; case PROPERTY_ID_AREA: - aOut.PrimaryButtonId = UID_RPT_RPT_PROP_DLG_AREA; + aOut.PrimaryButtonId = rtl::OUString::createFromAscii(UID_RPT_RPT_PROP_DLG_AREA); aOut.Control = _xControlFactory->createPropertyControl( inspection::PropertyControlType::TextField, sal_True ); aOut.HasPrimaryButton = sal_True; break; diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx index 4cd952e05e1f..2c98d134196e 100644 --- a/reportdesign/source/ui/inspection/metadata.cxx +++ b/reportdesign/source/ui/inspection/metadata.cxx @@ -58,7 +58,7 @@ namespace rptui { String sName; String sTranslation; - sal_uInt32 nHelpId; + rtl::OString sHelpId; sal_Int32 nId; sal_uInt16 nPos; sal_uInt32 nUIFlags; @@ -68,16 +68,16 @@ namespace rptui sal_Int32 _nId, const String& aTranslation, sal_uInt16 nPosId, - sal_uInt32 nHelpId, + const rtl::OString& _sHelpId, 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) @@ -200,10 +200,10 @@ namespace rptui } //------------------------------------------------------------------------ - 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(); } //------------------------------------------------------------------------ @@ -219,7 +219,7 @@ namespace rptui // intialisierung if(!s_pPropertyInfos) getPropertyInfo(); - OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, 0, 0); + OPropertyInfoImpl aSearch(_rName, 0L, String(), 0, "", 0); const OPropertyInfoImpl* pPropInfo = ::std::lower_bound( s_pPropertyInfos, s_pPropertyInfos + s_nCount, aSearch, PropertyInfoLessByName() ); diff --git a/reportdesign/source/ui/misc/FunctionHelper.cxx b/reportdesign/source/ui/misc/FunctionHelper.cxx index 4e15218c2af8..791251e0424a 100644 --- a/reportdesign/source/ui/misc/FunctionHelper.cxx +++ b/reportdesign/source/ui/misc/FunctionHelper.cxx @@ -221,9 +221,9 @@ void FunctionDescription::initArgumentInfo() const return m_xFunctionDescription->getSignature(); } // ----------------------------------------------------------------------------- -long FunctionDescription::getHelpId() const +rtl::OString FunctionDescription::getHelpId() const { - return 0; + return rtl::OString(); } // ----------------------------------------------------------------------------- sal_uInt32 FunctionDescription::getParameterCount() const diff --git a/reportdesign/source/ui/report/DesignView.cxx b/reportdesign/source/ui/report/DesignView.cxx index 477f40c8151a..339e136c2fec 100644 --- a/reportdesign/source/ui/report/DesignView.cxx +++ b/reportdesign/source/ui/report/DesignView.cxx @@ -163,8 +163,7 @@ ODesignView::ODesignView( Window* pParent, ,m_bDeleted( FALSE ) { DBG_CTOR( rpt_ODesignView,NULL); - // FIXME: HELPID - SetHelpId(""/*UID_RPT_RPT_APP_VIEW*/); + SetHelpId(UID_RPT_RPT_APP_VIEW); ImplInitSettings(); SetMapMode( MapMode( MAP_100TH_MM ) ); @@ -204,7 +203,7 @@ ODesignView::~ODesignView() } if ( m_pAddField ) { - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( UID_RPT_RPT_APP_VIEW ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) ); aDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( m_pAddField->GetWindowState(WINDOWSTATE_MASK_ALL).GetBuffer() ) ); notifySystemWindow(this,m_pAddField,::comphelper::mem_fun(&TaskPaneList::RemoveWindow)); ::std::auto_ptr aTemp2(m_pAddField); @@ -601,7 +600,7 @@ void ODesignView::toggleAddField() uno::Reference < beans::XPropertySet > xSet(rReportController.getRowSet(),uno::UNO_QUERY); m_pAddField = new OAddFieldWindow(this,xSet); m_pAddField->SetCreateHdl(LINK( &rReportController, OReportController, OnCreateHdl ) ); - SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromInt32( UID_RPT_RPT_APP_VIEW ) ); + SvtViewOptions aDlgOpt( E_WINDOW, String::CreateFromAscii( UID_RPT_RPT_APP_VIEW ) ); if ( aDlgOpt.Exists() ) m_pAddField->SetWindowState( ByteString( aDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) ); m_pAddField->Update(); diff --git a/reportdesign/source/ui/report/EndMarker.cxx b/reportdesign/source/ui/report/EndMarker.cxx index 40849726ffea..c32a07d5fc76 100644 --- a/reportdesign/source/ui/report/EndMarker.cxx +++ b/reportdesign/source/ui/report/EndMarker.cxx @@ -44,8 +44,7 @@ OEndMarker::OEndMarker(Window* _pParent ,const ::rtl::OUString& _sColorEntry) : OColorListener(_pParent,_sColorEntry) { DBG_CTOR( rpt_OEndMarker,NULL); - // FIXME: HELPID - SetUniqueId(""/*HID_RPT_ENDMARKER*/); + SetUniqueId(HID_RPT_ENDMARKER); ImplInitSettings(); SetPaintTransparent(TRUE); } diff --git a/reportdesign/source/ui/report/ReportSection.cxx b/reportdesign/source/ui/report/ReportSection.cxx index 1239c133961f..04222d6e2f1e 100644 --- a/reportdesign/source/ui/report/ReportSection.cxx +++ b/reportdesign/source/ui/report/ReportSection.cxx @@ -101,8 +101,7 @@ OReportSection::OReportSection(OSectionWindow* _pParent,const uno::Reference< re { DBG_CTOR( rpt_OReportSection,NULL); EnableChildTransparentMode(); - // FIXME: HELPID - SetHelpId(""/*HID_REPORTSECTION*/); + SetHelpId(HID_REPORTSECTION); SetMapMode( MapMode( MAP_100TH_MM ) ); try diff --git a/reportdesign/source/ui/report/ReportWindow.cxx b/reportdesign/source/ui/report/ReportWindow.cxx index af1ebfaf8c19..3a2f4559b43a 100644 --- a/reportdesign/source/ui/report/ReportWindow.cxx +++ b/reportdesign/source/ui/report/ReportWindow.cxx @@ -72,8 +72,7 @@ OReportWindow::OReportWindow(OScrollWindowHelper* _pParent,ODesignView* _pView) ,m_pObjFac( new DlgEdFactory() ) { DBG_CTOR( rpt_OReportWindow,NULL); - // FIXME: HELPID - SetHelpId(""/*UID_RPT_REPORTWINDOW*/); + SetHelpId(UID_RPT_REPORTWINDOW); SetMapMode( MapMode( MAP_100TH_MM ) ); m_aViewsWindow.Show(); diff --git a/reportdesign/source/ui/report/SectionWindow.cxx b/reportdesign/source/ui/report/SectionWindow.cxx index c80072fd3276..d0bbb2fd27a6 100644 --- a/reportdesign/source/ui/report/SectionWindow.cxx +++ b/reportdesign/source/ui/report/SectionWindow.cxx @@ -64,8 +64,7 @@ OSectionWindow::OSectionWindow( OViewsWindow* _pParent,const uno::Reference< rep ,m_aEndMarker( this,_sColorEntry) { DBG_CTOR( rpt_OSectionWindow,NULL); - // FIXME: HELPID - SetUniqueId(""/*UID_RPT_SECTIONSWINDOW*/); + SetUniqueId(UID_RPT_SECTIONSWINDOW); const MapMode& rMapMode = _pParent->GetMapMode(); SetMapMode( rMapMode ); ImplInitSettings(); diff --git a/reportdesign/source/ui/report/StartMarker.cxx b/reportdesign/source/ui/report/StartMarker.cxx index 2afbb31d3535..c3fed866e534 100644 --- a/reportdesign/source/ui/report/StartMarker.cxx +++ b/reportdesign/source/ui/report/StartMarker.cxx @@ -65,16 +65,13 @@ OStartMarker::OStartMarker(OSectionWindow* _pParent,const ::rtl::OUString& _sCol ,m_bShowRuler(sal_True) { DBG_CTOR( rpt_OStartMarker,NULL); - // FIXME: HELPID - SetUniqueId(""/*HID_RPT_STARTMARKER*/); + SetUniqueId(HID_RPT_STARTMARKER); osl_incrementInterlockedCount(&s_nImageRefCount); initDefaultNodeImages(); ImplInitSettings(); - // FIXME: HELPID - m_aText.SetHelpId(""/*HID_RPT_START_TITLE*/); - // FIXME: HELPID - m_aImage.SetHelpId(""/*HID_RPT_START_IMAGE*/); + m_aText.SetHelpId(HID_RPT_START_TITLE); + m_aImage.SetHelpId(HID_RPT_START_IMAGE); m_aText.Show(); m_aImage.Show(); m_aVRuler.Show(); diff --git a/reportdesign/source/ui/report/ViewsWindow.cxx b/reportdesign/source/ui/report/ViewsWindow.cxx index 770fcdb764d4..bcd50236aab3 100644 --- a/reportdesign/source/ui/report/ViewsWindow.cxx +++ b/reportdesign/source/ui/report/ViewsWindow.cxx @@ -185,8 +185,7 @@ OViewsWindow::OViewsWindow( OReportWindow* _pReportWindow) { DBG_CTOR( rpt_OViewsWindow,NULL); SetPaintTransparent(TRUE); - // FIXME: HELPID - SetUniqueId(""/*UID_RPT_VIEWSWINDOW*/); + SetUniqueId(UID_RPT_VIEWSWINDOW); SetMapMode( MapMode( MAP_100TH_MM ) ); m_aColorConfig.AddListener(this); ImplInitSettings(); diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index 4a84f7bd034d..f9f8afcbcb9a 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -32,7 +32,7 @@ #ifndef _SBASLTID_HRC #include #endif - +#include "helpids.hrc" // Dialog Controls --------------------------------------------------------------- @@ -298,7 +298,6 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_SORTINGANDGROUPING; - HelpId = SID_SORTINGANDGROUPING ; Command = ".uno:DbSortingAndGrouping"; Text [ en-US ] = "Sorting and Grouping..."; }; @@ -309,14 +308,12 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_ATTR_CHAR_COLOR_BACKGROUND; - HelpId = SID_ATTR_CHAR_COLOR_BACKGROUND ; Command = ".uno:DBBackgroundColor"; Text [ en-US ] = "Background Color..."; }; MenuItem { Identifier = SID_RULER; - HelpId = SID_RULER ; Command = ".uno:ShowRuler"; Checkable = TRUE; Text [ en-US ] = "Ruler..."; @@ -324,7 +321,6 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_GRID_VISIBLE; - HelpId = SID_GRID_VISIBLE ; Command = ".uno:GridVisible"; Checkable = TRUE; Text [ en-US ] = "Grid..."; @@ -336,14 +332,12 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_PAGEHEADERFOOTER; - HelpId = SID_PAGEHEADERFOOTER ; Command = ".uno:PageHeaderFooter"; Checkable = TRUE; }; MenuItem { Identifier = SID_REPORTHEADERFOOTER; - HelpId = SID_REPORTHEADERFOOTER ; Command = ".uno:ReportHeaderFooter"; Checkable = TRUE; }; @@ -354,7 +348,6 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_ARRANGEMENU ; - HelpID = SID_ARRANGEMENU ; Command = ".uno:ArrangeMenu" ; Text [ en-US ] = "~Arrange" ; SubMenu = Menu @@ -368,13 +361,13 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_FRAME_UP ; - HelpID = SID_FRAME_UP ; + HelpId = HID_FRAME_UP; Text [ en-US ] = "Bring ~Forward" ; }; MenuItem { Identifier = SID_FRAME_DOWN ; - HelpID = SID_FRAME_DOWN ; + HelpId = HID_FRAME_DOWN; Text [ en-US ] = "Send Back~ward" ; }; MenuItem @@ -443,7 +436,6 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_RESIZING ; Command = ".uno:ObjectResize" ; - HelpID = SID_OBJECT_RESIZING ; Text [ en-US ] = "~Object Resizing" ; Text [ x-comment ] = " "; SubMenu = Menu @@ -454,7 +446,6 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_SMALLESTWIDTH ; Command = ".uno:SmallestWidth" ; - HelpID = SID_OBJECT_SMALLESTWIDTH ; Text [ en-US ] = "~Fit to smallest width" ; Text [ x-comment ] = " "; }; @@ -462,7 +453,6 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_GREATESTWIDTH ; Command = ".uno:GreatestWidth" ; - HelpID = SID_OBJECT_GREATESTWIDTH ; Text [ en-US ] = "~Fit to greatest width" ; Text [ x-comment ] = " "; }; @@ -474,7 +464,6 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_SMALLESTHEIGHT ; Command = ".uno:SmallestHeight" ; - HelpID = SID_OBJECT_SMALLESTHEIGHT ; Text [ en-US ] = "~Fit to smallest height" ; Text [ x-comment ] = " "; }; @@ -482,7 +471,6 @@ Menu RID_MENU_REPORT { Identifier = SID_OBJECT_GREATESTHEIGHT ; Command = ".uno:GreatestHeight" ; - HelpID = SID_OBJECT_GREATESTHEIGHT ; Text [ en-US ] = "~Fit to greatest height" ; Text [ x-comment ] = " "; }; @@ -498,7 +486,6 @@ Menu RID_MENU_REPORT { Identifier = SID_SECTION_SHRINK_MENU ; Command = ".uno:SectionShrinkMenu" ; - HelpID = SID_SECTION_SHRINK_MENU ; Text [ en-US ] = "Section" ; Text [ x-comment ] = " "; SubMenu = Menu @@ -509,7 +496,6 @@ Menu RID_MENU_REPORT { Identifier = SID_SECTION_SHRINK ; Command = ".uno:SectionShrink" ; - HelpID = SID_SECTION_SHRINK ; Text [ en-US ] = "Shrink" ; Text [ x-comment ] = " "; }; @@ -517,7 +503,6 @@ Menu RID_MENU_REPORT { Identifier = SID_SECTION_SHRINK_TOP ; Command = ".uno:SectionShrinkTop" ; - HelpID = SID_SECTION_SHRINK_TOP ; Text [ en-US ] = "Shrink from top" ; Text [ x-comment ] = " "; }; @@ -525,7 +510,6 @@ Menu RID_MENU_REPORT { Identifier = SID_SECTION_SHRINK_BOTTOM ; Command = ".uno:SectionShrinkBottom" ; - HelpID = SID_SECTION_SHRINK_BOTTOM ; Text [ en-US ] = "Shrink from bottom" ; Text [ x-comment ] = " "; }; @@ -539,7 +523,6 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_DISTRIBUTION; - HelpId = SID_DISTRIBUTION ; Command = ".uno:Distribution"; Text [ en-US ] = "Distribution..." ; }; @@ -550,7 +533,6 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_SHOW_PROPERTYBROWSER; - HelpId = SID_SHOW_PROPERTYBROWSER ; Command = ".uno:FormProperties"; Text [ en-US ] = "Properties..."; }; -- cgit From 22e9afcab567030e0b1d029400dd85851b2d86e3 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 10 Jul 2010 18:21:24 +0200 Subject: CWS changehid: #i111874#: change code to support HelpIds as byte strings --- rsc/inc/rscdb.hxx | 1 + rsc/source/parser/rscdb.cxx | 3 +- rsc/source/parser/rscicpx.cxx | 8 +- svtools/inc/svtools/helpid.hrc | 116 ++++++++++++++--------------- svtools/source/contnr/templwin.cxx | 6 +- svtools/source/control/inettbc.cxx | 3 +- svtools/source/dialogs/addresstemplate.cxx | 3 +- svtools/source/dialogs/filedlg2.cxx | 63 ++++++---------- svtools/source/dialogs/wizardmachine.cxx | 6 +- svtools/source/misc/helpagentwindow.cxx | 3 +- toolkit/source/awt/vclxwindow.cxx | 10 ++- vcl/inc/vcl/help.hxx | 2 +- vcl/source/app/help.cxx | 2 +- vcl/source/window/menu.cxx | 7 +- vcl/source/window/toolbox2.cxx | 7 +- 15 files changed, 116 insertions(+), 124 deletions(-) diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 1d5af35de9ff..51461cf356d6 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -285,6 +285,7 @@ public: RscRange a0to9999Short; RscIdRange aIdLong; RscString aString; + RscString aStringLiteral; RscFlag aWinBits; RscLangEnum aLangType; RscLangArray aLangString; diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 97d23d4e3b53..05f7210fd357 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -81,6 +81,7 @@ RscTypCont :: RscTypCont( RscError * pErrHdl, a0to9999Short( pHS->getID( "YearShort" ), RSC_NOTYPE ), aIdLong( pHS->getID( "IDLONG" ), RSC_NOTYPE ), aString( pHS->getID( "Chars" ), RSC_NOTYPE ), + aStringLiteral( pHS->getID( "Chars" ), RSC_NOTYPE ), aWinBits( pHS->getID( "WinBits" ), RSC_NOTYPE ), aLangType(), aLangString( pHS->getID( "Lang_Chars" ), RSC_NOTYPE, &aString, &aLangType ), @@ -125,7 +126,7 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont, else rLang = rtl::OString(); #if OSL_DEBUG_LEVEL > 1 - fprintf( stderr, " %s (0x%hx)", aL.getStr(), nRet ); + fprintf( stderr, " %s (0x%hx)", aL.getStr(), (int)nRet ); #endif return nRet; } diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 2d0f9a4edbeb..1942711a4a47 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -297,7 +297,7 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, InsWinBit( pClassWindow, "DialogControl", nTabControlId ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassWindow->SetVariable( nId, &aString, NULL, 0, WINDOW_HELPID ); + pClassWindow->SetVariable( nId, &aStringLiteral, NULL, 0, WINDOW_HELPID ); nRsc_XYMAPMODEId = nId = aNmTb.Put( "_XYMapMode", VARNAME ); @@ -1201,7 +1201,7 @@ RscTop * RscTypCont::InitClassMenuItem( RscTop * pSuper, pClassMenuItem->SetVariable( nId, &aLangString, NULL, 0, RSC_MENUITEM_HELPTEXT ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassMenuItem->SetVariable( nId, &aString, NULL, 0, + pClassMenuItem->SetVariable( nId, &aStringLiteral, NULL, 0, RSC_MENUITEM_HELPID ); nId = aNmTb.Put( "AccelKey", VARNAME ); pClassMenuItem->SetVariable( nId, pClassKeyCode, NULL, 0, @@ -1276,7 +1276,7 @@ RscTop * RscTypCont::InitClassMessBox( RscTop * pSuper, nId = aNmTb.Put( "DefButton", VARNAME ); pClassMessBox->SetVariable( nId, pMessDefButton ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassMessBox->SetVariable( nId, &aString ); + pClassMessBox->SetVariable( nId, &aStringLiteral ); nId = aNmTb.Put( "SysModal", VARNAME ); pClassMessBox->SetVariable( nId, &aBool ); nId = aNmTb.Put( "Title", VARNAME ); @@ -2015,7 +2015,7 @@ RscTop * RscTypCont::InitClassToolBoxItem( RscTop * pSuper, pClassToolBoxItem->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, l_nVarId ); } nId = aNmTb.Put( "HelpID", VARNAME ); - pClassToolBoxItem->SetVariable( nId, &aString, NULL, 0, + pClassToolBoxItem->SetVariable( nId, &aStringLiteral, NULL, 0, RSC_TOOLBOXITEM_HELPID ); nId = aNmTb.Put( "Text", VARNAME ); pClassToolBoxItem->SetVariable( nId, &aLangString, NULL, 0, diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc index 1ffb7a99fb32..3c9a38d94bff 100644 --- a/svtools/inc/svtools/helpid.hrc +++ b/svtools/inc/svtools/helpid.hrc @@ -34,84 +34,84 @@ // Help-Ids -------------------------------------------------------------- -#define HID_FILEDLG_OPENDLG (HID_SVTOOLS_START + 0) -#define HID_FILEDLG_PATHDLG (HID_SVTOOLS_START + 1) -#define HID_FILEDLG_DIR (HID_SVTOOLS_START + 2) -#define HID_FILEDLG_EDIT (HID_SVTOOLS_START + 3) -#define HID_FILEDLG_DIRS (HID_SVTOOLS_START + 4) -#define HID_FILEDLG_DRIVE (HID_SVTOOLS_START + 5) -#define HID_FILEDLG_DRIVES (HID_SVTOOLS_START + 6) -#define HID_FILEDLG_NEWDIR (HID_SVTOOLS_START + 7) -#define HID_FILEDLG_HOME (HID_SVTOOLS_START + 8) -#define HID_FILEDLG_FILE (HID_SVTOOLS_START + 9) -#define HID_FILEDLG_FILES (HID_SVTOOLS_START + 10) -#define HID_FILEDLG_PATH (HID_SVTOOLS_START + 11) -#define HID_FILEDLG_TYPE (HID_SVTOOLS_START + 12) -#define HID_FILEDLG_TYPES (HID_SVTOOLS_START + 13) +#define HID_FILEDLG_OPENDLG "SVT_HID_FILEDLG_OPENDLG" +#define HID_FILEDLG_PATHDLG "SVT_HID_FILEDLG_PATHDLG" +#define HID_FILEDLG_DIR "SVT_HID_FILEDLG_DIR" +#define HID_FILEDLG_EDIT "SVT_HID_FILEDLG_EDIT" +#define HID_FILEDLG_DIRS "SVT_HID_FILEDLG_DIRS" +#define HID_FILEDLG_DRIVE "SVT_HID_FILEDLG_DRIVE" +#define HID_FILEDLG_DRIVES "SVT_HID_FILEDLG_DRIVES" +#define HID_FILEDLG_NEWDIR "SVT_HID_FILEDLG_NEWDIR" +#define HID_FILEDLG_HOME "SVT_HID_FILEDLG_HOME" +#define HID_FILEDLG_FILE "SVT_HID_FILEDLG_FILE" +#define HID_FILEDLG_FILES "SVT_HID_FILEDLG_FILES" +#define HID_FILEDLG_PATH "SVT_HID_FILEDLG_PATH" +#define HID_FILEDLG_TYPE "SVT_HID_FILEDLG_TYPE" +#define HID_FILEDLG_TYPES "SVT_HID_FILEDLG_TYPES" // HelpID's fuer die Textkomponente -#define HID_TEXTCPNT_OPEN_LINK (HID_SVTOOLS_START + 14) -#define HID_TEXTCPNT_OPEN_LINK_NEW (HID_SVTOOLS_START + 15) -#define HID_TEXTCPNT_DOWNLOAD (HID_SVTOOLS_START + 16) -#define HID_TEXTCPNT_ADD_BOOKMARK (HID_SVTOOLS_START + 17) -#define HID_TEXTCPNT_COPY_LINK (HID_SVTOOLS_START + 18) +#define HID_TEXTCPNT_OPEN_LINK "SVT_HID_TEXTCPNT_OPEN_LINK" +#define HID_TEXTCPNT_OPEN_LINK_NEW "SVT_HID_TEXTCPNT_OPEN_LINK_NEW" +#define HID_TEXTCPNT_DOWNLOAD "SVT_HID_TEXTCPNT_DOWNLOAD" +#define HID_TEXTCPNT_ADD_BOOKMARK "SVT_HID_TEXTCPNT_ADD_BOOKMARK" +#define HID_TEXTCPNT_COPY_LINK "SVT_HID_TEXTCPNT_COPY_LINK" // HelpID's fuer RegisterDialog -#define HID_LIMITED_DIALOG (HID_SVTOOLS_START + 20) +#define HID_LIMITED_DIALOG "SVT_HID_LIMITED_DIALOG" // Help ids of template dialog -#define HID_TEMPLATEDLG_DIALOG (HID_SVTOOLS_START + 21) -#define HID_TEMPLATEDLG_ICONCTRL (HID_SVTOOLS_START + 22) -#define HID_TEMPLATEDLG_FILEVIEW (HID_SVTOOLS_START + 23) -#define HID_TEMPLATEDLG_TB_BACK (HID_SVTOOLS_START + 24) -#define HID_TEMPLATEDLG_TB_PREV (HID_SVTOOLS_START + 25) -#define HID_TEMPLATEDLG_TB_PRINT (HID_SVTOOLS_START + 26) -#define HID_TEMPLATEDLG_TB_DOCINFO (HID_SVTOOLS_START + 27) -#define HID_TEMPLATEDLG_TB_PREVIEW (HID_SVTOOLS_START + 28) +#define HID_TEMPLATEDLG_DIALOG "SVT_HID_TEMPLATEDLG_DIALOG" +#define HID_TEMPLATEDLG_ICONCTRL "SVT_HID_TEMPLATEDLG_ICONCTRL" +#define HID_TEMPLATEDLG_FILEVIEW "SVT_HID_TEMPLATEDLG_FILEVIEW" +#define HID_TEMPLATEDLG_TB_BACK "SVT_HID_TEMPLATEDLG_TB_BACK" +#define HID_TEMPLATEDLG_TB_PREV "SVT_HID_TEMPLATEDLG_TB_PREV" +#define HID_TEMPLATEDLG_TB_PRINT "SVT_HID_TEMPLATEDLG_TB_PRINT" +#define HID_TEMPLATEDLG_TB_DOCINFO "SVT_HID_TEMPLATEDLG_TB_DOCINFO" +#define HID_TEMPLATEDLG_TB_PREVIEW "SVT_HID_TEMPLATEDLG_TB_PREVIEW" -#define HID_ADDRTEMPL_FIELD_ASSIGNMENT (HID_SVTOOLS_START + 29) +#define HID_ADDRTEMPL_FIELD_ASSIGNMENT "SVT_HID_ADDRTEMPL_FIELD_ASSIGNMENT" // Help ids for the filepicker dialogs -#define HID_EXPLORERDLG_FILE (HID_SVTOOLS_START + 30) +#define HID_EXPLORERDLG_FILE "SVT_HID_EXPLORERDLG_FILE" // help ids for fileview contextmenu -#define HID_FILEVIEW_MENU_DELETE (HID_SVTOOLS_START + 31) -#define HID_FILEVIEW_MENU_RENAME (HID_SVTOOLS_START + 32) +#define HID_FILEVIEW_MENU_DELETE "SVT_HID_FILEVIEW_MENU_DELETE" +#define HID_FILEVIEW_MENU_RENAME "SVT_HID_FILEVIEW_MENU_RENAME" // help ids for the different modi of the file picker dialog // FREE -#define HID_FILESAVE_LEVELUP (HID_SVTOOLS_START + 34) -#define HID_FILESAVE_CREATEDIRECTORY (HID_SVTOOLS_START + 35) -#define HID_FILESAVE_DEFAULTDIRECTORY (HID_SVTOOLS_START + 36) -#define HID_FILESAVE_FILEVIEW (HID_SVTOOLS_START + 37) -#define HID_FILESAVE_TEMPLATE (HID_SVTOOLS_START + 38) -#define HID_FILESAVE_FILEURL (HID_SVTOOLS_START + 39) -#define HID_FILESAVE_FILETYPE (HID_SVTOOLS_START + 40) -#define HID_FILESAVE_DOSAVE (HID_SVTOOLS_START + 41) -#define HID_FILESAVE_AUTOEXTENSION (HID_SVTOOLS_START + 42) -#define HID_FILESAVE_SAVEWITHPASSWORD (HID_SVTOOLS_START + 43) -#define HID_FILESAVE_CUSTOMIZEFILTER (HID_SVTOOLS_START + 44) -#define HID_FILESAVE_SELECTION (HID_SVTOOLS_START + 45) -#define HID_FILESAVE_DIALOG (HID_SVTOOLS_START + 46) -#define HID_FILESAVE_DOPLAY (HID_SVTOOLS_START + 47) - -#define HID_FILEOPEN_READONLY (HID_SVTOOLS_START + 48) -#define HID_FILEOPEN_VERSION (HID_SVTOOLS_START + 49) -#define HID_FILEOPEN_IMAGE_TEMPLATE (HID_SVTOOLS_START + 50) - -#define HID_FILEDLG_LINK_CB (HID_SFX_START + 276) -#define HID_FILEDLG_PREVIEW_CB (HID_SFX_START + 277) +#define HID_FILESAVE_LEVELUP "SVT_HID_FILESAVE_LEVELUP" +#define HID_FILESAVE_CREATEDIRECTORY "SVT_HID_FILESAVE_CREATEDIRECTORY" +#define HID_FILESAVE_DEFAULTDIRECTORY "SVT_HID_FILESAVE_DEFAULTDIRECTORY" +#define HID_FILESAVE_FILEVIEW "SVT_HID_FILESAVE_FILEVIEW" +#define HID_FILESAVE_TEMPLATE "SVT_HID_FILESAVE_TEMPLATE" +#define HID_FILESAVE_FILEURL "SVT_HID_FILESAVE_FILEURL" +#define HID_FILESAVE_FILETYPE "SVT_HID_FILESAVE_FILETYPE" +#define HID_FILESAVE_DOSAVE "SVT_HID_FILESAVE_DOSAVE" +#define HID_FILESAVE_AUTOEXTENSION "SVT_HID_FILESAVE_AUTOEXTENSION" +#define HID_FILESAVE_SAVEWITHPASSWORD "SVT_HID_FILESAVE_SAVEWITHPASSWORD" +#define HID_FILESAVE_CUSTOMIZEFILTER "SVT_HID_FILESAVE_CUSTOMIZEFILTER" +#define HID_FILESAVE_SELECTION "SVT_HID_FILESAVE_SELECTION" +#define HID_FILESAVE_DIALOG "SVT_HID_FILESAVE_DIALOG" +#define HID_FILESAVE_DOPLAY "SVT_HID_FILESAVE_DOPLAY" + +#define HID_FILEOPEN_READONLY "SVT_HID_FILEOPEN_READONLY" +#define HID_FILEOPEN_VERSION "SVT_HID_FILEOPEN_VERSION" +#define HID_FILEOPEN_IMAGE_TEMPLATE "SVT_HID_FILEOPEN_IMAGE_TEMPLATE" + +#define HID_FILEDLG_LINK_CB "SVT_HID_FILEDLG_LINK_CB" +#define HID_FILEDLG_PREVIEW_CB "SVT_HID_FILEDLG_PREVIEW_CB" // uniqueid for the helpagent window (testtool) -#define HID_HELPAGENT_WINDOW (HID_SVTOOLS_START + 51) +#define HID_HELPAGENT_WINDOW "SVT_HID_HELPAGENT_WINDOW" // registration dialog -#define HID_REGISTRATION_DIALOG (HID_SVTOOLS_START + 52) +#define HID_REGISTRATION_DIALOG "SVT_HID_REGISTRATION_DIALOG" -#define HID_PRINTDIALOG_TOFILE (HID_SVTOOLS_START + 53) +#define HID_PRINTDIALOG_TOFILE "SVT_HID_PRINTDIALOG_TOFILE" -#define HID_WIZARD_NEXT (HID_SVTOOLS_START + 54) -#define HID_WIZARD_PREVIOUS (HID_SVTOOLS_START + 55) +#define HID_WIZARD_NEXT "SVT_HID_WIZARD_NEXT" +#define HID_WIZARD_PREVIOUS "SVT_HID_WIZARD_PREVIOUS" #endif diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 578150967727..47b5ab9aa4b9 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -346,8 +346,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) : aDummyHeaderBar.Show(); aIconCtrl.SetAccessibleName( String( RTL_CONSTASCII_USTRINGPARAM("Groups") ) ); - // FIMXE: HELPID - aIconCtrl.SetHelpId( "" /*HID_TEMPLATEDLG_ICONCTRL*/ ); + aIconCtrl.SetHelpId( HID_TEMPLATEDLG_ICONCTRL ); aIconCtrl.SetChoiceWithCursor( TRUE ); aIconCtrl.SetSelectionMode( SINGLE_SELECTION ); aIconCtrl.Show(); @@ -610,8 +609,7 @@ SvtFileViewWindow_Impl::SvtFileViewWindow_Impl( SvtTemplateWindow* pParent ) : { aFileView.SetStyle( aFileView.GetStyle() | WB_DIALOGCONTROL | WB_TABSTOP ); - // FIXME: HELPID - aFileView.SetHelpId( "" /*HID_TEMPLATEDLG_FILEVIEW*/ ); + aFileView.SetHelpId( HID_TEMPLATEDLG_FILEVIEW ); aFileView.Show(); aFileView.SetPosPixel( Point( 0, 0 ) ); aFileView.EnableAutoResize(); diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 85325911114f..6781efc070fe 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -858,8 +858,7 @@ SvtURLBox::SvtURLBox( Window* pParent, const ResId& _rResId, INetProtocol eSmart void SvtURLBox::ImplInit() { pImp = new SvtURLBox_Impl(); - // FIXME: HELPID - SetHelpId( ""/*SID_OPENURL*/ ); + SetHelpId( ".uno:OpenURL" ); EnableAutocomplete( FALSE ); SetText( String() ); diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index 82b8cd2c5c04..2849ddb71d10 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -609,8 +609,7 @@ void AssignmentPersistentData::Commit() m_pImpl->pFields[row * 2 + column]->SetDropDownLineCount(15); m_pImpl->pFields[row * 2 + column]->SetSelectHdl(LINK(this, AddressBookSourceDialog, OnFieldSelect)); - // FIXME: HELPID - m_pImpl->pFields[row * 2 + column]->SetHelpId( "" /*HID_ADDRTEMPL_FIELD_ASSIGNMENT*/); + m_pImpl->pFields[row * 2 + column]->SetHelpId(HID_ADDRTEMPL_FIELD_ASSIGNMENT); } } diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index 1f6af3f36660..86ad4f40ecd3 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -132,8 +132,7 @@ ImpPathDialog::ImpPathDialog( PathDialog* pDlg, RESOURCE_TYPE nType, BOOL bCreat pNewDirBtn->Enable( bCreateDir ); } - // FIXME: HELPID - pDlg->SetHelpId( ""/*HID_FILEDLG_PATHDLG*/ ); + pDlg->SetHelpId( HID_FILEDLG_PATHDLG ); lang::Locale aLocale = Application::GetSettings().GetLocale(); xCollator = ::vcl::unohelper::CreateCollator(); @@ -174,35 +173,29 @@ void ImpPathDialog::InitControls() long nH = 0; UniString aEmptyStr; - // FIXME: HELPID INITCONTROL( pDirTitel, FixedText, 0, - aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DIR ) ), ""/*HID_FILEDLG_DIR*/ ); + aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DIR ) ), HID_FILEDLG_DIR ); aPnt.Y() += aFTSiz.Height() + a3Siz.Height(); - // FIXME: HELPID - INITCONTROL( pEdit, Edit, WB_BORDER, aPnt, aEDSiz, aPath.GetFull(), ""/*HID_FILEDLG_EDIT*/ ); + INITCONTROL( pEdit, Edit, WB_BORDER, aPnt, aEDSiz, aPath.GetFull(), HID_FILEDLG_EDIT ); aPnt.Y() += aEDSiz.Height() + a3Siz.Height(); #ifndef UNX long nLbH2 = pDlg->LogicToPixel( Size( 0, 60 ), MAP_APPFONT ).Height(); - // FIXME: HELPID INITCONTROL( pDirList, KbdListBox, WB_AUTOHSCROLL | WB_BORDER, - aPnt, Size( aEDSiz.Width(), nLbH1 ), aEmptyStr, ""/*HID_FILEDLG_DIRS*/ ); + aPnt, Size( aEDSiz.Width(), nLbH1 ), aEmptyStr, HID_FILEDLG_DIRS ); aPnt.Y() += nLbH1 + a6Siz.Height(); - // FIXME: HELPID INITCONTROL( pDriveTitle, FixedText, 0, - aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DRIVES ) ), ""/*HID_FILEDLG_DRIVE*/ ); + aPnt, aFTSiz, UniString( SvtResId( STR_FILEDLG_DRIVES ) ), HID_FILEDLG_DRIVE ); aPnt.Y() += aFTSiz.Height() + a3Siz.Height(); - // FIXME: HELPID INITCONTROL( pDriveList, ListBox, WB_DROPDOWN, - aPnt, Size( aEDSiz.Width(), nLbH2 ), aEmptyStr, ""/*HID_FILEDLG_DRIVES*/ ); + aPnt, Size( aEDSiz.Width(), nLbH2 ), aEmptyStr, HID_FILEDLG_DRIVES ); nH = aPnt.Y() + aEDSiz.Height() + a6Siz.Height(); #else long nNewH = nLbH1 + 3 * a3Siz.Height() + aFTSiz.Height() + aEDSiz.Height(); - // FIXME: HELPID INITCONTROL( pDirList, KbdListBox, WB_AUTOHSCROLL | WB_BORDER, - aPnt, Size( aEDSiz.Width(), nNewH ), aEmptyStr, ""/*HID_FILEDLG_DIRS*/ ); + aPnt, Size( aEDSiz.Width(), nNewH ), aEmptyStr, HID_FILEDLG_DIRS ); nH = aPnt.Y() + nNewH + a6Siz.Height(); pDriveTitle = NULL; pDriveList = NULL; @@ -238,14 +231,12 @@ void ImpPathDialog::InitControls() INITCONTROL( pCancelBtn, CancelButton, 0, aPnt, aBtnSiz, aCancelStr, "" ); aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); - // FIXME: HELPID INITCONTROL( pNewDirBtn, PushButton, WB_DEFBUTTON, - aPnt, aBtnSiz, aNewDirStr, ""/*HID_FILEDLG_NEWDIR*/ ); + aPnt, aBtnSiz, aNewDirStr, HID_FILEDLG_NEWDIR ); #if defined(UNX) || defined(OS2) aPnt.Y() += aBtnSiz.Height() + a3Siz.Height(); - // FIXME: HELPID INITCONTROL( pHomeBtn, PushButton, WB_DEFBUTTON, - aPnt, aBtnSiz, aHomeDirStr, ""/*HID_FILEDLG_HOME*/ ); + aPnt, aBtnSiz, aHomeDirStr, HID_FILEDLG_HOME ); #else pHomeBtn = NULL; #endif @@ -723,8 +714,7 @@ ImpFileDialog::ImpFileDialog( PathDialog* pDlg, WinBits nWinBits, RESOURCE_TYPE if ( nType == WINDOW_FILEDIALOG ) InitControls(); - // FIXME: HELPID - pDlg->SetHelpId( ""/*HID_FILEDLG_OPENDLG*/ ); + pDlg->SetHelpId( HID_FILEDLG_OPENDLG ); } @@ -752,47 +742,36 @@ void ImpFileDialog::InitControls() const int nW = 160; const int nH = 48; // Um den Dialog in eine akzeptable Form zu bringen - // FIXME: HELPID INITCONTROL( pFileTitel, FixedText, 0, - Point(10, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_FILE ) ), ""/*HID_FILEDLG_FILE*/ ); - // FIXME: HELPID + Point(10, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_FILE ) ), HID_FILEDLG_FILE ); INITCONTROL( pEdit, Edit, WB_BORDER, - Point(10, 31), Size(nW, 20), aEmptyStr, ""/*HID_FILEDLG_EDIT*/ ); // aMask() - // FIXME: HELPID + Point(10, 31), Size(nW, 20), aEmptyStr, HID_FILEDLG_EDIT ); // aMask() INITCONTROL( pFileList, ListBox, WB_SORT | WB_AUTOHSCROLL | WB_BORDER, - Point(10, 58), Size(nW, 180-nH), aEmptyStr, ""/*HID_FILEDLG_FILES*/ ); + Point(10, 58), Size(nW, 180-nH), aEmptyStr, HID_FILEDLG_FILES ); - // FIXME: HELPID INITCONTROL( pDirTitel, FixedText, 0, - Point(nW+20, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DIR ) ), ""/*HID_FILEDLG_DIR*/ ); - // FIXME: HELPID + Point(nW+20, 12), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DIR ) ), HID_FILEDLG_DIR ); INITCONTROL( pDirPath, FixedInfo, WB_PATHELLIPSIS, - Point(nW+20, 33), Size(nW, 20), aPath.GetFull(), ""/*HID_FILEDLG_PATH*/ ); - // FIXME: HELPID + Point(nW+20, 33), Size(nW, 20), aPath.GetFull(), HID_FILEDLG_PATH ); INITCONTROL( pDirList, KbdListBox, WB_AUTOHSCROLL | WB_BORDER, - Point(nW+20, 58), Size(nW, 180-nH ), aEmptyStr, ""/*HID_FILEDLG_DIRS*/ ); + Point(nW+20, 58), Size(nW, 180-nH ), aEmptyStr, HID_FILEDLG_DIRS ); - // FIXME: HELPID INITCONTROL( pTypeTitel, FixedText, 0, - Point(10, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_TYPE ) ), ""/*HID_FILEDLG_TYPE*/ ); + Point(10, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_TYPE ) ), HID_FILEDLG_TYPE ); #ifndef UNX - // FIXME: HELPID INITCONTROL( pTypeList, ListBox, WB_DROPDOWN, - Point(10, 265-nH ), Size(nW, 100 ), aEmptyStr, ""/*HID_FILEDLG_TYPES*/ ); + Point(10, 265-nH ), Size(nW, 100 ), aEmptyStr, HID_FILEDLG_TYPES ); - // FIXME: HELPID INITCONTROL( pDriveTitle, FixedText, 0, - Point(nW+20, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DRIVES ) ), ""/*HID_FILEDLG_DRIVE*/ ); - // FIXME: HELPID + Point(nW+20, 246-nH), Size(nW, 18), UniString( SvtResId( STR_FILEDLG_DRIVES ) ), HID_FILEDLG_DRIVE ); INITCONTROL( pDriveList, ListBox, WB_DROPDOWN, - Point(nW+20, 265-nH ), Size(nW, 100 ), aEmptyStr, ""/*HID_FILEDLG_DRIVES*/ ); + Point(nW+20, 265-nH ), Size(nW, 100 ), aEmptyStr, HID_FILEDLG_DRIVES ); pNewDirBtn = NULL; pHomeBtn = NULL; #else - // FIXME: HELPID INITCONTROL( pTypeList, ListBox, WB_DROPDOWN, - Point(10, 265-nH ), Size(2*nW+20, 100 ), aEmptyStr, ""/*HID_FILEDLG_TYPES*/ ); + Point(10, 265-nH ), Size(2*nW+20, 100 ), aEmptyStr, HID_FILEDLG_TYPES ); pDriveTitle = NULL; pDriveList = NULL; diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index 24c68a9cdb00..393509734a62 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -177,8 +177,7 @@ namespace svt if (_nButtonFlags & WZB_PREVIOUS) { m_pPrevPage = new PushButton(this, WB_TABSTOP); - // FIXME: HELPID - m_pPrevPage->SetHelpId( "" /*HID_WIZARD_PREVIOUS*/ ); + m_pPrevPage->SetHelpId( HID_WIZARD_PREVIOUS ); m_pPrevPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); m_pPrevPage->SetText(String(SvtResId(STR_WIZDLG_PREVIOUS))); m_pPrevPage->Show(); @@ -195,8 +194,7 @@ namespace svt if (_nButtonFlags & WZB_NEXT) { m_pNextPage = new PushButton(this, WB_TABSTOP); - // FIXME: HELPID - m_pNextPage->SetHelpId( "" /*HID_WIZARD_NEXT*/ ); + m_pNextPage->SetHelpId( HID_WIZARD_NEXT ); m_pNextPage->SetSizePixel( LogicToPixel( Size( 50, 14 ), MAP_APPFONT ) ); m_pNextPage->SetText(String(SvtResId(STR_WIZDLG_NEXT))); m_pNextPage->Show(); diff --git a/svtools/source/misc/helpagentwindow.cxx b/svtools/source/misc/helpagentwindow.cxx index 930d3412c632..55800a213a2e 100644 --- a/svtools/source/misc/helpagentwindow.cxx +++ b/svtools/source/misc/helpagentwindow.cxx @@ -109,8 +109,7 @@ namespace svt AlwaysEnableInput( TRUE, TRUE ); // unique id for the testtool - // FIXME: HELPID - SetUniqueId( ""/*HID_HELPAGENT_WINDOW*/ ); + SetUniqueId( HID_HELPAGENT_WINDOW ); } //-------------------------------------------------------------------- diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 69371342a9a7..2a6a5fc6a752 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1708,7 +1708,15 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: ::rtl::OUString aURL; if ( Value >>= aURL ) { - pWindow->SetHelpId( rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ) ); + String aHelpURL( aURL ); + String aPattern( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); + if ( aHelpURL.CompareIgnoreCaseToAscii( aPattern, aPattern.Len() ) == COMPARE_EQUAL ) + { + String aID = aHelpURL.Copy( aPattern.Len() ); + pWindow->SetHelpId( rtl::OUStringToOString( aID, RTL_TEXTENCODING_UTF8 ) ); + } + else + pWindow->SetHelpId( rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ) ); } } break; diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx index c0e9c6bacf50..ade2a339bcf9 100644 --- a/vcl/inc/vcl/help.hxx +++ b/vcl/inc/vcl/help.hxx @@ -71,7 +71,7 @@ public: const String& GetHelpFile() const { return maHelpFile; } virtual BOOL Start( const XubString& rKeyWord, const Window* pWindow ); - virtual void OpenHelpAgent( const String& rHelpId ); + virtual void OpenHelpAgent( const rtl::OString& rHelpId ); virtual XubString GetHelpText( const String& aHelpURL, const Window* pWindow ); static void EnableContextHelp(); diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index 97be0ae9e2d4..33209de44950 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -62,7 +62,7 @@ Help::~Help() // ----------------------------------------------------------------------- -void Help::OpenHelpAgent( const String& ) +void Help::OpenHelpAgent( const rtl::OString& ) { } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 38741f7cc1af..7f28e33948c7 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2045,7 +2045,12 @@ rtl::OString Menu::GetHelpId( USHORT nItemId ) const MenuItemData* pData = pItemList->GetData( nItemId ); if ( pData ) - aRet = pData->aHelpId; + { + if ( pData->aHelpId.getLength() ) + aRet = pData->aHelpId; + else + aRet = ::rtl::OUStringToOString( pData->aCommandStr, RTL_TEXTENCODING_UTF8 ); + } return aRet; } diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index c9b8a6ab0f08..35a39676353a 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -1936,7 +1936,12 @@ rtl::OString ToolBox::GetHelpId( USHORT nItemId ) const ImplToolItem* pItem = ImplGetItem( nItemId ); if ( pItem ) - aRet = pItem->maHelpId; + { + if ( pItem->maHelpId.getLength() ) + aRet = pItem->maHelpId; + else + aRet = ::rtl::OUStringToOString( pItem->maCommandStr, RTL_TEXTENCODING_UTF8 ); + } return aRet; } -- cgit From c80988b0107424ba6de85531ed55fd493a0a64cb Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 10 Jul 2010 18:21:24 +0200 Subject: CWS changehid: #i111874#: change code to support HelpIds as byte strings --- starmath/inc/dialog.hxx | 2 +- starmath/inc/smcommands.h | 68 + starmath/inc/smmod.hxx | 1 - starmath/inc/starmath.hrc | 584 ++++----- starmath/source/dialog.cxx | 11 +- starmath/source/edit.cxx | 3 +- starmath/source/smmod.cxx | 11 - starmath/source/smres.src | 93 +- starmath/source/view.cxx | 6 +- sw/inc/helpid.h | 1879 ++++++++++++++-------------- sw/inc/swabstdlg.hxx | 2 +- sw/inc/swcommands.h | 434 +++++++ sw/source/ui/app/docsh2.cxx | 38 +- sw/source/ui/app/mn.src | 155 ++- sw/source/ui/chrdlg/swbreak.src | 2 +- sw/source/ui/chrdlg/swuiccoll.cxx | 3 +- sw/source/ui/config/mailconfigpage.cxx | 6 +- sw/source/ui/config/optload.cxx | 3 +- sw/source/ui/dbui/addresslistdialog.cxx | 6 +- sw/source/ui/dbui/dbtree.cxx | 3 +- sw/source/ui/dbui/mailmergechildwindow.cxx | 9 +- sw/source/ui/dbui/mailmergewizard.cxx | 6 +- sw/source/ui/dbui/mmaddressblockpage.cxx | 28 +- sw/source/ui/dbui/mmgreetingspage.cxx | 48 +- sw/source/ui/dbui/selectdbtabledialog.cxx | 6 +- sw/source/ui/dialog/regionsw.src | 2 +- sw/source/ui/dialog/swdlgfact.cxx | 6 +- sw/source/ui/dialog/swdlgfact.hxx | 2 +- sw/source/ui/dialog/uiregionsw.cxx | 6 +- sw/source/ui/dochdl/selglos.src | 2 +- sw/source/ui/docvw/docvw.src | 22 +- sw/source/ui/docvw/edtwin.cxx | 3 +- sw/source/ui/docvw/srcedtw.cxx | 3 +- sw/source/ui/envelp/envlop1.cxx | 6 +- sw/source/ui/envelp/envprt.src | 12 +- sw/source/ui/envelp/label1.cxx | 21 +- sw/source/ui/envelp/mailmrge.src | 2 +- sw/source/ui/fldui/FldRefTreeListBox.cxx | 3 +- sw/source/ui/fldui/flddinf.cxx | 3 +- sw/source/ui/fldui/fldedt.cxx | 21 +- sw/source/ui/fldui/fldtdlg.cxx | 6 +- sw/source/ui/frmdlg/column.cxx | 3 +- sw/source/ui/inc/ribbar.hrc | 3 - sw/source/ui/inc/swmn_tmpl.hrc | 47 +- sw/source/ui/index/cnttab.cxx | 15 +- sw/source/ui/index/idxmrk.src | 12 +- sw/source/ui/index/multmrk.src | 2 +- sw/source/ui/index/swuiidxmrk.cxx | 101 +- sw/source/ui/lingu/olmenu.cxx | 15 +- sw/source/ui/misc/bookmark.src | 2 +- sw/source/ui/misc/glosbib.cxx | 3 +- sw/source/ui/misc/glossary.cxx | 3 +- sw/source/ui/misc/glossary.src | 2 +- sw/source/ui/misc/insrule.cxx | 3 +- sw/source/ui/misc/num.cxx | 3 +- sw/source/ui/misc/outline.cxx | 3 +- sw/source/ui/misc/redlndlg.cxx | 3 +- sw/source/ui/misc/srtdlg.src | 2 +- sw/source/ui/ribbar/inputwin.cxx | 3 +- sw/source/ui/ribbar/inputwin.src | 12 +- sw/source/ui/ribbar/makefile.mk | 1 - sw/source/ui/ribbar/tblctrl.src | 94 -- sw/source/ui/ribbar/workctrl.cxx | 8 +- sw/source/ui/ribbar/workctrl.src | 147 +-- sw/source/ui/shells/shells.src | 834 ------------ sw/source/ui/shells/tabsh.cxx | 3 +- sw/source/ui/shells/textsh1.cxx | 13 +- sw/source/ui/table/colwd.src | 2 +- sw/source/ui/table/convert.src | 2 +- sw/source/ui/table/instable.src | 2 +- sw/source/ui/table/mergetbl.src | 2 +- sw/source/ui/table/rowht.src | 2 +- sw/source/ui/table/splittbl.src | 2 +- sw/source/ui/uiview/pview.cxx | 9 +- sw/source/ui/uiview/pview.src | 88 -- sw/source/ui/uiview/view.src | 154 --- sw/source/ui/uiview/viewdlg2.cxx | 4 +- sw/source/ui/uiview/viewmdi.cxx | 9 +- sw/source/ui/uno/unomod.cxx | 13 +- sw/source/ui/utlui/content.cxx | 3 +- sw/source/ui/utlui/glbltree.cxx | 41 +- sw/source/ui/utlui/navipi.cxx | 27 +- sw/source/ui/web/web.src | 252 ---- sw/source/ui/wrtsh/wrtsh1.cxx | 7 +- 84 files changed, 2128 insertions(+), 3355 deletions(-) create mode 100644 starmath/inc/smcommands.h create mode 100644 sw/inc/swcommands.h delete mode 100644 sw/source/ui/ribbar/tblctrl.src diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index b019a5b08ee1..1b21f6696f71 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -257,7 +257,7 @@ class SmDistanceDialog : public ModalDialog DECL_LINK(CheckBoxClickHdl, CheckBox *); using Window::SetHelpId; - void SetHelpId(MetricField &rField, ULONG nHelpId); + void SetHelpId(MetricField &rField, const rtl::OString& sHelpId); void SetCategory(USHORT Category); void ApplyImages(); diff --git a/starmath/inc/smcommands.h b/starmath/inc/smcommands.h new file mode 100644 index 000000000000..d2f08c55f4c4 --- /dev/null +++ b/starmath/inc/smcommands.h @@ -0,0 +1,68 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SM_SNCOMMANDS_HRC +#define SM_SMCOMMANDS_HRC + +#define CMD_SID_ADJUST ".uno:Adjust" +#define CMD_SID_ALIGN ".uno:ChangeAlignment" +#define CMD_SID_DISTANCE ".uno:ChangeDistance" +#define CMD_SID_FONT ".uno:ChangeFont" +#define CMD_SID_FONTSIZE ".uno:ChangeFontSize" +#define CMD_SID_CMDBOXWINDOW ".uno:CommandWindow" +#define CMD_SID_PREFERENCES ".uno:Preferences" +#define CMD_SID_TEXT ".uno:ConfigName" +#define CMD_SID_COPYOBJECT ".uno:CopyObject" +#define CMD_SID_DRAW ".uno:Draw" +#define CMD_SID_FITINWINDOW ".uno:FitInWindow" +#define CMD_SID_FORMULACURSOR ".uno:FormelCursor" +#define CMD_SID_GAPHIC_SM ".uno:Graphic" +#define CMD_SID_INSERTCOMMAND ".uno:InsertCommand" +#define CMD_SID_INSERTTEXT ".uno:InsertConfigName" +#define CMD_SID_INSERT_FORMULA ".uno:InsertFormula" +#define CMD_SID_LOADSYMBOLS ".uno:LoadSymbols" +#define CMD_SID_MODIFYSTATUS ".uno:ModifyStatus" +#define CMD_SID_NEXTERR ".uno:NextError" +#define CMD_SID_NEXTMARK ".uno:NextMark" +#define CMD_SID_PASTEOBJECT ".uno:PasteObject" +#define CMD_SID_PREVERR ".uno:PrevError" +#define CMD_SID_PREVMARK ".uno:PrevMark" +#define CMD_SID_AUTO_REDRAW ".uno:RedrawAutomatic" +#define CMD_SID_SAVESYMBOLS ".uno:SaveSymbols" +#define CMD_SID_GETEDITTEXT ".uno:SetPaperSize" +#define CMD_SID_SYMBOLS_CATALOGUE ".uno:SymbolCatalogue" +#define CMD_SID_SYMBOLS ".uno:Symbols" +#define CMD_SID_TEXTMODE ".uno:Textmode" +#define CMD_SID_TEXTSTATUS ".uno:TextStatus" +#define CMD_SID_TOOLBOXWINDOW ".uno:ToolBowWindow" +#define CMD_SID_TOOLBOX ".uno:ToolBox" +#define CMD_SID_VIEW100 ".uno:View100" +#define CMD_SID_VIEW200 ".uno:View200" +#define CMD_SID_VIEW050 ".uno:View50" +#define CMD_SID_ZOOMIN ".uno:ZoomIn" +#define CMD_SID_ZOOMOUT ".uno:ZoomOut" + +#endif diff --git a/starmath/inc/smmod.hxx b/starmath/inc/smmod.hxx index bd8292e9a7b1..1dd4792e72d8 100644 --- a/starmath/inc/smmod.hxx +++ b/starmath/inc/smmod.hxx @@ -131,7 +131,6 @@ class SmModule : public SfxModule, utl::ConfigurationListener SvtSysLocale *pSysLocale; VirtualDevice *pVirtualDev; - virtual void FillStatusBar(StatusBar &rBar); void _CreateSysLocale() const; void _CreateVirtualDev() const; diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 2fbc7b4066d1..ffc06d6174e9 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -456,298 +456,298 @@ #define MN_SUB_SENDTO (RID_APP_START + 3120) -#define HID_SMA_OPTIONSDIALOG (HID_SMA_START + 1) -#define HID_SMA_FONTDIALOG (HID_SMA_START + 2) -#define HID_SMA_FONTSIZEDIALOG (HID_SMA_START + 3) -#define HID_SMA_FONTTYPEDIALOG (HID_SMA_START + 4) -#define HID_SMA_DISTANCEDIALOG (HID_SMA_START + 5) -#define HID_SMA_ALIGNDIALOG (HID_SMA_START + 6) -#define HID_SMA_PRINTOPTIONPAGE (HID_SMA_START + 7) -#define HID_SMA_SYMBOLDIALOG (HID_SMA_START + 8) -#define HID_SMA_SYMDEFINEDIALOG (HID_SMA_START + 9) -#define HID_SMA_EXTRAOPTIONPAGE (HID_SMA_START + 10) -#define HID_SMA_DOCSAVEQUERY (HID_SMA_START + 11) -#define HID_SMA_OBJECTSAVEQUERY (HID_SMA_START + 12) -#define HID_SMA_DEFAULTSAVEQUERY (HID_SMA_START + 13) -#define HID_SMA_ILLEGALOBJECTERROR (HID_SMA_START + 14) -#define HID_SMA_ILLEGALFILEERROR (HID_SMA_START + 15) -#define HID_SMA_WRITESYMBOLERROR (HID_SMA_START + 16) -#define HID_SMA_READSYMBOLERROR (HID_SMA_START + 17) -#define HID_SMA_NOMATHTYPEFACEWARNING (HID_SMA_START + 18) -#define HID_SMA_OBJECTNAME (HID_SMA_START + 19) -#define HID_SMA_VIEWNAME (HID_SMA_START + 20) -#define HID_SMA_UNDOEDITNAME (HID_SMA_START + 21) -#define HID_SMA_UNDOFORMATNAME (HID_SMA_START + 22) -#define HID_SMA_APPICO (HID_SMA_START + 23) -#define HID_SMA_DOCICO (HID_SMA_START + 24) -#define HID_SMA_TMPICO (HID_SMA_START + 25) -#define HID_SMA_COMMANDMENU (HID_SMA_START + 26) -#define HID_SMA_VIEWMENU (HID_SMA_START + 27) -#define HID_SMA_DISTANCEMENU (HID_SMA_START + 28) -#define HID_SMA_FONTMENU (HID_SMA_START + 29) -#define HID_SMA_STARTUPWINDOW (HID_SMA_START + 30) -#define HID_SMA_TOOLBOXWINDOW (HID_SMA_START + 31) -#define HID_SMA_CMDBOXWINDOW (HID_SMA_START + 32) -#define HID_SMA_UPDATEOBJECT (HID_SMA_START + 33) -#define HID_SMA_FONTREGULAR (HID_SMA_START + 34) -#define HID_SMA_FONTITALIC (HID_SMA_START + 35) -#define HID_SMA_FONTBOLD (HID_SMA_START + 36) -#define HID_SMA_PRINTOPTION (HID_SMA_START + 37) -#define HID_SMA_DOCUMENTSTR (HID_SMA_START + 38) -#define HID_SMA_SYMBOLFILESSTR (HID_SMA_START + 39) -#define HID_SMA_ALLFILESSTR (HID_SMA_START + 40) -#define HID_SMA_CREATORSTR (HID_SMA_START + 41) -#define HID_SMA_FILESMFTYP (HID_SMA_START + 42) -#define HID_SMA_FILESYMTYP (HID_SMA_START + 43) -#define HID_SMA_WIN_DOCUMENT (HID_SMA_START + 44) -#define HID_SMA_COMMAND_WIN_EDIT (HID_SMA_START + 45) - -#define HID_SMA_PLUSX (HID_SMA_START + 50) -#define HID_SMA_MINUSX (HID_SMA_START + 51) -#define HID_SMA_PLUSMINUSX (HID_SMA_START + 52) -#define HID_SMA_MINUSPLUSX (HID_SMA_START + 53) -#define HID_SMA_NEGX (HID_SMA_START + 54) -#define HID_SMA_XPLUSY (HID_SMA_START + 55) -#define HID_SMA_XMINUSY (HID_SMA_START + 56) -#define HID_SMA_XCDOTY (HID_SMA_START + 57) -#define HID_SMA_XTIMESY (HID_SMA_START + 58) -#define HID_SMA_XSYMTIMESY (HID_SMA_START + 59) -#define HID_SMA_XSYMDIVIDEY (HID_SMA_START + 60) -#define HID_SMA_XDIVY (HID_SMA_START + 61) -#define HID_SMA_XOVERY (HID_SMA_START + 62) -#define HID_SMA_XODIVIDEY (HID_SMA_START + 63) -#define HID_SMA_XODOTY (HID_SMA_START + 64) -#define HID_SMA_XOMINUSY (HID_SMA_START + 65) -#define HID_SMA_XOPLUSY (HID_SMA_START + 66) -#define HID_SMA_XOTIMESY (HID_SMA_START + 67) -#define HID_SMA_XANDY (HID_SMA_START + 68) -#define HID_SMA_XORY (HID_SMA_START + 69) -#define HID_SMA_XEQY (HID_SMA_START + 70) -#define HID_SMA_XNEQY (HID_SMA_START + 71) -#define HID_SMA_XLTY (HID_SMA_START + 72) -#define HID_SMA_XGTY (HID_SMA_START + 73) -#define HID_SMA_XLEY (HID_SMA_START + 74) -#define HID_SMA_XGEY (HID_SMA_START + 75) -#define HID_SMA_XLESLANTY (HID_SMA_START + 76) -#define HID_SMA_XGESLANTY (HID_SMA_START + 77) -#define HID_SMA_XLLY (HID_SMA_START + 78) -#define HID_SMA_XGGY (HID_SMA_START + 79) -#define HID_SMA_XDEFY (HID_SMA_START + 80) -#define HID_SMA_XEQUIVY (HID_SMA_START + 81) -#define HID_SMA_XAPPROXY (HID_SMA_START + 82) -#define HID_SMA_XSIMY (HID_SMA_START + 83) -#define HID_SMA_XSIMEQY (HID_SMA_START + 84) -#define HID_SMA_XPROPY (HID_SMA_START + 85) -#define HID_SMA_XORTHOY (HID_SMA_START + 86) -#define HID_SMA_XPARALLELY (HID_SMA_START + 87) -#define HID_SMA_XTOWARDY (HID_SMA_START + 88) -#define HID_SMA_XTRANSLY (HID_SMA_START + 89) -#define HID_SMA_XTRANSRY (HID_SMA_START + 90) -#define HID_SMA_XINY (HID_SMA_START + 91) -#define HID_SMA_XNOTINY (HID_SMA_START + 92) -#define HID_SMA_XOWNSY (HID_SMA_START + 93) -#define HID_SMA_XUNIONY (HID_SMA_START + 94) -#define HID_SMA_XINTERSECTIONY (HID_SMA_START + 95) -#define HID_SMA_XSETMINUSY (HID_SMA_START + 96) -#define HID_SMA_XSLASHY (HID_SMA_START + 97) -#define HID_SMA_XSUBSETY (HID_SMA_START + 98) -#define HID_SMA_XSUBSETEQY (HID_SMA_START + 99) -#define HID_SMA_XSUPSETY (HID_SMA_START + 100) -#define HID_SMA_XSUPSETEQY (HID_SMA_START + 101) -#define HID_SMA_XNSUBSETY (HID_SMA_START + 102) -#define HID_SMA_XNSUBSETEQY (HID_SMA_START + 103) -#define HID_SMA_XNSUPSETY (HID_SMA_START + 104) -#define HID_SMA_XNSUPSETEQY (HID_SMA_START + 105) -#define HID_SMA_ABSX (HID_SMA_START + 106) -#define HID_SMA_FACTX (HID_SMA_START + 107) -#define HID_SMA_SQRTX (HID_SMA_START + 108) -#define HID_SMA_NROOTXY (HID_SMA_START + 109) -#define HID_SMA_EX (HID_SMA_START + 110) -#define HID_SMA_EXPX (HID_SMA_START + 111) -#define HID_SMA_LNX (HID_SMA_START + 112) -#define HID_SMA_LOGX (HID_SMA_START + 113) -#define HID_SMA_SINX (HID_SMA_START + 114) -#define HID_SMA_COSX (HID_SMA_START + 115) -#define HID_SMA_TANX (HID_SMA_START + 116) -#define HID_SMA_COTX (HID_SMA_START + 117) -#define HID_SMA_ARCSINX (HID_SMA_START + 118) -#define HID_SMA_ARCCOSX (HID_SMA_START + 119) -#define HID_SMA_ARCTANX (HID_SMA_START + 120) -#define HID_SMA_ARCCOTX (HID_SMA_START + 121) -#define HID_SMA_SINHX (HID_SMA_START + 122) -#define HID_SMA_COSHX (HID_SMA_START + 123) -#define HID_SMA_TANHX (HID_SMA_START + 124) -#define HID_SMA_COTHX (HID_SMA_START + 125) -#define HID_SMA_ARSINHX (HID_SMA_START + 126) -#define HID_SMA_ARCOSHX (HID_SMA_START + 127) -#define HID_SMA_ARTANHX (HID_SMA_START + 128) -#define HID_SMA_ARCOTHX (HID_SMA_START + 129) -#define HID_SMA_SUMX (HID_SMA_START + 130) -#define HID_SMA_PRODX (HID_SMA_START + 131) -#define HID_SMA_COPRODX (HID_SMA_START + 132) -#define HID_SMA_LIMX (HID_SMA_START + 133) -#define HID_SMA_LIMINFX (HID_SMA_START + 134) -#define HID_SMA_LIMSUPX (HID_SMA_START + 135) -#define HID_SMA_EXISTS (HID_SMA_START + 136) -#define HID_SMA_FORALL (HID_SMA_START + 137) -#define HID_SMA_NABLA (HID_SMA_START + 138) -#define HID_SMA_INTX (HID_SMA_START + 139) -#define HID_SMA_IINTX (HID_SMA_START + 140) -#define HID_SMA_IIINTX (HID_SMA_START + 141) -#define HID_SMA_LINTX (HID_SMA_START + 142) -#define HID_SMA_LLINTX (HID_SMA_START + 143) -#define HID_SMA_LLLINTX (HID_SMA_START + 144) -#define HID_SMA_FROMX (HID_SMA_START + 145) -#define HID_SMA_TOX (HID_SMA_START + 146) -#define HID_SMA_FROMXTOY (HID_SMA_START + 147) -#define HID_SMA_XCIRCY (HID_SMA_START + 148) -#define HID_SMA_XDIVIDESY (HID_SMA_START + 149) -#define HID_SMA_XNDIVIDESY (HID_SMA_START + 150) -#define HID_SMA_DLARROW (HID_SMA_START + 151) -#define HID_SMA_DLRARROW (HID_SMA_START + 152) -#define HID_SMA_DRARROW (HID_SMA_START + 153) - -#define HID_SMA_MISC_CAT (HID_SMA_START + 154) -#define HID_SMA_UNBINOPS_CAT (HID_SMA_START + 155) -#define HID_SMA_RELATIONS_CAT (HID_SMA_START + 156) -#define HID_SMA_SETOPERATIONS_CAT (HID_SMA_START + 157) -#define HID_SMA_FUNCTIONS_CAT (HID_SMA_START + 158) -#define HID_SMA_OPERATORS_CAT (HID_SMA_START + 159) -#define HID_SMA_ATTRIBUTES_CAT (HID_SMA_START + 160) -#define HID_SMA_BRACKETS_CAT (HID_SMA_START + 161) -#define HID_SMA_FORMAT_CAT (HID_SMA_START + 162) - -#define HID_SMA_OPERATOR_WIN (HID_SMA_START + 163) -#define HID_SMA_UNBINOPS_TBX (HID_SMA_START + 164) -#define HID_SMA_RELATIONS_TBX (HID_SMA_START + 165) -#define HID_SMA_SETOPERATIONS_TBX (HID_SMA_START + 166) -#define HID_SMA_FUNCTIONS_TBX (HID_SMA_START + 167) -#define HID_SMA_OPERATORS_TBX (HID_SMA_START + 168) -#define HID_SMA_ATTRIBUTES_TBX (HID_SMA_START + 169) -#define HID_SMA_BRACKETS_TBX (HID_SMA_START + 170) -#define HID_SMA_FORMAT_TBX (HID_SMA_START + 171) -#define HID_SMA_SELECTION_TBX (HID_SMA_START + 172) -#define HID_SMA_COMMAND_WIN (HID_SMA_START + 173) -#define HID_SMA_MISC_MENU (HID_SMA_START + 174) -#define HID_SMA_FUNCTIONSOTHER1_MENU (HID_SMA_START + 175) - -#define HID_SMA_ACUTEX (HID_SMA_START + 180) -#define HID_SMA_BARX (HID_SMA_START + 181) -#define HID_SMA_BREVEX (HID_SMA_START + 182) -#define HID_SMA_CHECKX (HID_SMA_START + 183) -#define HID_SMA_CIRCLEX (HID_SMA_START + 184) -#define HID_SMA_DOTX (HID_SMA_START + 185) -#define HID_SMA_DDOTX (HID_SMA_START + 186) -#define HID_SMA_DDDOTX (HID_SMA_START + 187) -#define HID_SMA_GRAVEX (HID_SMA_START + 188) -#define HID_SMA_HATX (HID_SMA_START + 189) -#define HID_SMA_TILDEX (HID_SMA_START + 190) -#define HID_SMA_VECX (HID_SMA_START + 191) -#define HID_SMA_UNDERLINEX (HID_SMA_START + 192) -#define HID_SMA_OVERLINEX (HID_SMA_START + 193) -#define HID_SMA_OVERSTRIKEX (HID_SMA_START + 194) -#define HID_SMA_PHANTOMX (HID_SMA_START + 195) -#define HID_SMA_BOLDX (HID_SMA_START + 196) -#define HID_SMA_ITALX (HID_SMA_START + 197) -#define HID_SMA_SIZEXY (HID_SMA_START + 198) -#define HID_SMA_FONTXY (HID_SMA_START + 199) -#define HID_SMA_COLORX (HID_SMA_START + 200) -#define HID_SMA_LRGROUPX (HID_SMA_START + 201) -#define HID_SMA_LRPARENTX (HID_SMA_START + 202) -#define HID_SMA_LRBRACKETX (HID_SMA_START + 203) -#define HID_SMA_LRBRACEX (HID_SMA_START + 204) -#define HID_SMA_LRANGLEX (HID_SMA_START + 205) -#define HID_SMA_LRCEILX (HID_SMA_START + 206) -#define HID_SMA_LRFLOORX (HID_SMA_START + 207) -#define HID_SMA_LRLINEX (HID_SMA_START + 208) -#define HID_SMA_LRDLINEX (HID_SMA_START + 209) -#define HID_SMA_SLRPARENTX (HID_SMA_START + 210) -#define HID_SMA_SLRBRACKETX (HID_SMA_START + 211) -#define HID_SMA_SLRBRACEX (HID_SMA_START + 212) -#define HID_SMA_SLRANGLEX (HID_SMA_START + 213) -#define HID_SMA_SLRCEILX (HID_SMA_START + 214) -#define HID_SMA_SLRFLOORX (HID_SMA_START + 215) -#define HID_SMA_SLRLINEX (HID_SMA_START + 216) -#define HID_SMA_SLRDLINEX (HID_SMA_START + 217) -#define HID_SMA_RSUBX (HID_SMA_START + 218) -#define HID_SMA_RSUPX (HID_SMA_START + 219) -#define HID_SMA_LSUBX (HID_SMA_START + 220) -#define HID_SMA_LSUPX (HID_SMA_START + 221) -#define HID_SMA_SBLANK (HID_SMA_START + 222) -#define HID_SMA_BLANK (HID_SMA_START + 223) -#define HID_SMA_NEWLINE (HID_SMA_START + 224) -#define HID_SMA_BINOMXY (HID_SMA_START + 225) -#define HID_SMA_STACK (HID_SMA_START + 226) -#define HID_SMA_MATRIX (HID_SMA_START + 227) -#define HID_SMA_ALIGNLX (HID_SMA_START + 228) -#define HID_SMA_ALIGNCX (HID_SMA_START + 229) -#define HID_SMA_ALIGNRX (HID_SMA_START + 230) -#define HID_SMA_ALEPH (HID_SMA_START + 231) -#define HID_SMA_EMPTYSET (HID_SMA_START + 232) -#define HID_SMA_RE (HID_SMA_START + 233) -#define HID_SMA_IM (HID_SMA_START + 234) -#define HID_SMA_INFINITY (HID_SMA_START + 235) -#define HID_SMA_PARTIAL (HID_SMA_START + 236) -#define HID_SMA_WP (HID_SMA_START + 237) -#define HID_SMA_DOTSAXIS (HID_SMA_START + 238) -#define HID_SMA_DOTSUP (HID_SMA_START + 239) -#define HID_SMA_DOTSDOWN (HID_SMA_START + 240) -#define HID_SMA_DOTSLOW (HID_SMA_START + 241) -#define HID_SMA_DOTSVERT (HID_SMA_START + 242) - -#define HID_SMA_SETN (HID_SMA2_START + 1) -#define HID_SMA_SETZ (HID_SMA2_START + 2) -#define HID_SMA_SETQ (HID_SMA2_START + 3) -#define HID_SMA_SETR (HID_SMA2_START + 4) -#define HID_SMA_SETC (HID_SMA2_START + 5) -#define HID_SMA_WIDEHATX (HID_SMA2_START + 6) -#define HID_SMA_WIDETILDEX (HID_SMA2_START + 7) -#define HID_SMA_WIDEVECX (HID_SMA2_START + 8) -#define HID_SMA_CSUBX (HID_SMA2_START + 9) -#define HID_SMA_CSUPX (HID_SMA2_START + 10) -#define HID_SMA_HBAR (HID_SMA2_START + 11) -#define HID_SMA_LAMBDABAR (HID_SMA2_START + 12) -#define HID_SMA_LEFTARROW (HID_SMA2_START + 13) -#define HID_SMA_RIGHTARROW (HID_SMA2_START + 14) -#define HID_SMA_UPARROW (HID_SMA2_START + 15) -#define HID_SMA_DOWNARROW (HID_SMA2_START + 16) - -#define HID_SMA_DEFAULT_DIST (HID_SMA2_START + 17) -#define HID_SMA_LINE_DIST (HID_SMA2_START + 18) -#define HID_SMA_ROOT_DIST (HID_SMA2_START + 19) -#define HID_SMA_SUP_DIST (HID_SMA2_START + 20) -#define HID_SMA_SUB_DIST (HID_SMA2_START + 21) -#define HID_SMA_NUMERATOR_DIST (HID_SMA2_START + 22) -#define HID_SMA_DENOMINATOR_DIST (HID_SMA2_START + 23) -#define HID_SMA_FRACLINE_EXCWIDTH (HID_SMA2_START + 24) -#define HID_SMA_FRACLINE_LINEWIDTH (HID_SMA2_START + 25) -#define HID_SMA_UPPERLIMIT_DIST (HID_SMA2_START + 26) -#define HID_SMA_LOWERLIMIT_DIST (HID_SMA2_START + 27) -#define HID_SMA_BRACKET_EXCHEIGHT (HID_SMA2_START + 28) -#define HID_SMA_BRACKET_DIST (HID_SMA2_START + 29) -#define HID_SMA_MATRIXROW_DIST (HID_SMA2_START + 30) -#define HID_SMA_MATRIXCOL_DIST (HID_SMA2_START + 31) -#define HID_SMA_ATTRIBUT_DIST (HID_SMA2_START + 32) -#define HID_SMA_INTERATTRIBUT_DIST (HID_SMA2_START + 33) -#define HID_SMA_OPERATOR_EXCHEIGHT (HID_SMA2_START + 34) -#define HID_SMA_OPERATOR_DIST (HID_SMA2_START + 35) -#define HID_SMA_LEFTBORDER_DIST (HID_SMA2_START + 36) -#define HID_SMA_RIGHTBORDER_DIST (HID_SMA2_START + 37) -#define HID_SMA_UPPERBORDER_DIST (HID_SMA2_START + 38) -#define HID_SMA_LOWERBORDER_DIST (HID_SMA2_START + 39) -#define HID_SMA_SCALE_ALL_BRACKETS (HID_SMA2_START + 40) -#define HID_SMA_BRACKET_EXCHEIGHT2 (HID_SMA2_START + 41) -#define HID_SMA_LMRANGLEXY (HID_SMA2_START + 42) -#define HID_SMA_SLMRANGLEXY (HID_SMA2_START + 43) -#define HID_SMA_XWIDESLASHY (HID_SMA2_START + 44) -#define HID_SMA_XWIDEBSLASHY (HID_SMA2_START + 45) -#define HID_SMA_XOVERBRACEY (HID_SMA2_START + 46) -#define HID_SMA_XUNDERBRACEY (HID_SMA2_START + 47) -#define HID_SMA_LRDBRACKETX (HID_SMA2_START + 48) -#define HID_SMA_SLRDBRACKETX (HID_SMA2_START + 49) - -#define HID_SMA_CONTROL_SYMBOLSET_VIEW (HID_SMA2_START + 50) -#define HID_SMA_CONTROL_FONTCHAR_VIEW (HID_SMA2_START + 51) +#define HID_SMA_OPTIONSDIALOG "STARMATH_HID_SMA_OPTIONSDIALOG" +#define HID_SMA_FONTDIALOG "STARMATH_HID_SMA_FONTDIALOG" +#define HID_SMA_FONTSIZEDIALOG "STARMATH_HID_SMA_FONTSIZEDIALOG" +#define HID_SMA_FONTTYPEDIALOG "STARMATH_HID_SMA_FONTTYPEDIALOG" +#define HID_SMA_DISTANCEDIALOG "STARMATH_HID_SMA_DISTANCEDIALOG" +#define HID_SMA_ALIGNDIALOG "STARMATH_HID_SMA_ALIGNDIALOG" +#define HID_SMA_PRINTOPTIONPAGE "STARMATH_HID_SMA_PRINTOPTIONPAGE" +#define HID_SMA_SYMBOLDIALOG "STARMATH_HID_SMA_SYMBOLDIALOG" +#define HID_SMA_SYMDEFINEDIALOG "STARMATH_HID_SMA_SYMDEFINEDIALOG" +#define HID_SMA_EXTRAOPTIONPAGE "STARMATH_HID_SMA_EXTRAOPTIONPAGE" +#define HID_SMA_DOCSAVEQUERY "STARMATH_HID_SMA_DOCSAVEQUERY" +#define HID_SMA_OBJECTSAVEQUERY "STARMATH_HID_SMA_OBJECTSAVEQUERY" +#define HID_SMA_DEFAULTSAVEQUERY "STARMATH_HID_SMA_DEFAULTSAVEQUERY" +#define HID_SMA_ILLEGALOBJECTERROR "STARMATH_HID_SMA_ILLEGALOBJECTERROR" +#define HID_SMA_ILLEGALFILEERROR "STARMATH_HID_SMA_ILLEGALFILEERROR" +#define HID_SMA_WRITESYMBOLERROR "STARMATH_HID_SMA_WRITESYMBOLERROR" +#define HID_SMA_READSYMBOLERROR "STARMATH_HID_SMA_READSYMBOLERROR" +#define HID_SMA_NOMATHTYPEFACEWARNING "STARMATH_HID_SMA_NOMATHTYPEFACEWARNING" +#define HID_SMA_OBJECTNAME "STARMATH_HID_SMA_OBJECTNAME" +#define HID_SMA_VIEWNAME "STARMATH_HID_SMA_VIEWNAME" +#define HID_SMA_UNDOEDITNAME "STARMATH_HID_SMA_UNDOEDITNAME" +#define HID_SMA_UNDOFORMATNAME "STARMATH_HID_SMA_UNDOFORMATNAME" +#define HID_SMA_APPICO "STARMATH_HID_SMA_APPICO" +#define HID_SMA_DOCICO "STARMATH_HID_SMA_DOCICO" +#define HID_SMA_TMPICO "STARMATH_HID_SMA_TMPICO" +#define HID_SMA_COMMANDMENU "STARMATH_HID_SMA_COMMANDMENU" +#define HID_SMA_VIEWMENU "STARMATH_HID_SMA_VIEWMENU" +#define HID_SMA_DISTANCEMENU "STARMATH_HID_SMA_DISTANCEMENU" +#define HID_SMA_FONTMENU "STARMATH_HID_SMA_FONTMENU" +#define HID_SMA_STARTUPWINDOW "STARMATH_HID_SMA_STARTUPWINDOW" +#define HID_SMA_TOOLBOXWINDOW "STARMATH_HID_SMA_TOOLBOXWINDOW" +#define HID_SMA_CMDBOXWINDOW "STARMATH_HID_SMA_CMDBOXWINDOW" +#define HID_SMA_UPDATEOBJECT "STARMATH_HID_SMA_UPDATEOBJECT" +#define HID_SMA_FONTREGULAR "STARMATH_HID_SMA_FONTREGULAR" +#define HID_SMA_FONTITALIC "STARMATH_HID_SMA_FONTITALIC" +#define HID_SMA_FONTBOLD "STARMATH_HID_SMA_FONTBOLD" +#define HID_SMA_PRINTOPTION "STARMATH_HID_SMA_PRINTOPTION" +#define HID_SMA_DOCUMENTSTR "STARMATH_HID_SMA_DOCUMENTSTR" +#define HID_SMA_SYMBOLFILESSTR "STARMATH_HID_SMA_SYMBOLFILESSTR" +#define HID_SMA_ALLFILESSTR "STARMATH_HID_SMA_ALLFILESSTR" +#define HID_SMA_CREATORSTR "STARMATH_HID_SMA_CREATORSTR" +#define HID_SMA_FILESMFTYP "STARMATH_HID_SMA_FILESMFTYP" +#define HID_SMA_FILESYMTYP "STARMATH_HID_SMA_FILESYMTYP" +#define HID_SMA_WIN_DOCUMENT "STARMATH_HID_SMA_WIN_DOCUMENT" +#define HID_SMA_COMMAND_WIN_EDIT "STARMATH_HID_SMA_COMMAND_WIN_EDIT" + +#define HID_SMA_PLUSX "STARMATH_HID_SMA_PLUSX" +#define HID_SMA_MINUSX "STARMATH_HID_SMA_MINUSX" +#define HID_SMA_PLUSMINUSX "STARMATH_HID_SMA_PLUSMINUSX" +#define HID_SMA_MINUSPLUSX "STARMATH_HID_SMA_MINUSPLUSX" +#define HID_SMA_NEGX "STARMATH_HID_SMA_NEGX" +#define HID_SMA_XPLUSY "STARMATH_HID_SMA_XPLUSY" +#define HID_SMA_XMINUSY "STARMATH_HID_SMA_XMINUSY" +#define HID_SMA_XCDOTY "STARMATH_HID_SMA_XCDOTY" +#define HID_SMA_XTIMESY "STARMATH_HID_SMA_XTIMESY" +#define HID_SMA_XSYMTIMESY "STARMATH_HID_SMA_XSYMTIMESY" +#define HID_SMA_XSYMDIVIDEY "STARMATH_HID_SMA_XSYMDIVIDEY" +#define HID_SMA_XDIVY "STARMATH_HID_SMA_XDIVY" +#define HID_SMA_XOVERY "STARMATH_HID_SMA_XOVERY" +#define HID_SMA_XODIVIDEY "STARMATH_HID_SMA_XODIVIDEY" +#define HID_SMA_XODOTY "STARMATH_HID_SMA_XODOTY" +#define HID_SMA_XOMINUSY "STARMATH_HID_SMA_XOMINUSY" +#define HID_SMA_XOPLUSY "STARMATH_HID_SMA_XOPLUSY" +#define HID_SMA_XOTIMESY "STARMATH_HID_SMA_XOTIMESY" +#define HID_SMA_XANDY "STARMATH_HID_SMA_XANDY" +#define HID_SMA_XORY "STARMATH_HID_SMA_XORY" +#define HID_SMA_XEQY "STARMATH_HID_SMA_XEQY" +#define HID_SMA_XNEQY "STARMATH_HID_SMA_XNEQY" +#define HID_SMA_XLTY "STARMATH_HID_SMA_XLTY" +#define HID_SMA_XGTY "STARMATH_HID_SMA_XGTY" +#define HID_SMA_XLEY "STARMATH_HID_SMA_XLEY" +#define HID_SMA_XGEY "STARMATH_HID_SMA_XGEY" +#define HID_SMA_XLESLANTY "STARMATH_HID_SMA_XLESLANTY" +#define HID_SMA_XGESLANTY "STARMATH_HID_SMA_XGESLANTY" +#define HID_SMA_XLLY "STARMATH_HID_SMA_XLLY" +#define HID_SMA_XGGY "STARMATH_HID_SMA_XGGY" +#define HID_SMA_XDEFY "STARMATH_HID_SMA_XDEFY" +#define HID_SMA_XEQUIVY "STARMATH_HID_SMA_XEQUIVY" +#define HID_SMA_XAPPROXY "STARMATH_HID_SMA_XAPPROXY" +#define HID_SMA_XSIMY "STARMATH_HID_SMA_XSIMY" +#define HID_SMA_XSIMEQY "STARMATH_HID_SMA_XSIMEQY" +#define HID_SMA_XPROPY "STARMATH_HID_SMA_XPROPY" +#define HID_SMA_XORTHOY "STARMATH_HID_SMA_XORTHOY" +#define HID_SMA_XPARALLELY "STARMATH_HID_SMA_XPARALLELY" +#define HID_SMA_XTOWARDY "STARMATH_HID_SMA_XTOWARDY" +#define HID_SMA_XTRANSLY "STARMATH_HID_SMA_XTRANSLY" +#define HID_SMA_XTRANSRY "STARMATH_HID_SMA_XTRANSRY" +#define HID_SMA_XINY "STARMATH_HID_SMA_XINY" +#define HID_SMA_XNOTINY "STARMATH_HID_SMA_XNOTINY" +#define HID_SMA_XOWNSY "STARMATH_HID_SMA_XOWNSY" +#define HID_SMA_XUNIONY "STARMATH_HID_SMA_XUNIONY" +#define HID_SMA_XINTERSECTIONY "STARMATH_HID_SMA_XINTERSECTIONY" +#define HID_SMA_XSETMINUSY "STARMATH_HID_SMA_XSETMINUSY" +#define HID_SMA_XSLASHY "STARMATH_HID_SMA_XSLASHY" +#define HID_SMA_XSUBSETY "STARMATH_HID_SMA_XSUBSETY" +#define HID_SMA_XSUBSETEQY "STARMATH_HID_SMA_XSUBSETEQY" +#define HID_SMA_XSUPSETY "STARMATH_HID_SMA_XSUPSETY" +#define HID_SMA_XSUPSETEQY "STARMATH_HID_SMA_XSUPSETEQY" +#define HID_SMA_XNSUBSETY "STARMATH_HID_SMA_XNSUBSETY" +#define HID_SMA_XNSUBSETEQY "STARMATH_HID_SMA_XNSUBSETEQY" +#define HID_SMA_XNSUPSETY "STARMATH_HID_SMA_XNSUPSETY" +#define HID_SMA_XNSUPSETEQY "STARMATH_HID_SMA_XNSUPSETEQY" +#define HID_SMA_ABSX "STARMATH_HID_SMA_ABSX" +#define HID_SMA_FACTX "STARMATH_HID_SMA_FACTX" +#define HID_SMA_SQRTX "STARMATH_HID_SMA_SQRTX" +#define HID_SMA_NROOTXY "STARMATH_HID_SMA_NROOTXY" +#define HID_SMA_EX "STARMATH_HID_SMA_EX" +#define HID_SMA_EXPX "STARMATH_HID_SMA_EXPX" +#define HID_SMA_LNX "STARMATH_HID_SMA_LNX" +#define HID_SMA_LOGX "STARMATH_HID_SMA_LOGX" +#define HID_SMA_SINX "STARMATH_HID_SMA_SINX" +#define HID_SMA_COSX "STARMATH_HID_SMA_COSX" +#define HID_SMA_TANX "STARMATH_HID_SMA_TANX" +#define HID_SMA_COTX "STARMATH_HID_SMA_COTX" +#define HID_SMA_ARCSINX "STARMATH_HID_SMA_ARCSINX" +#define HID_SMA_ARCCOSX "STARMATH_HID_SMA_ARCCOSX" +#define HID_SMA_ARCTANX "STARMATH_HID_SMA_ARCTANX" +#define HID_SMA_ARCCOTX "STARMATH_HID_SMA_ARCCOTX" +#define HID_SMA_SINHX "STARMATH_HID_SMA_SINHX" +#define HID_SMA_COSHX "STARMATH_HID_SMA_COSHX" +#define HID_SMA_TANHX "STARMATH_HID_SMA_TANHX" +#define HID_SMA_COTHX "STARMATH_HID_SMA_COTHX" +#define HID_SMA_ARSINHX "STARMATH_HID_SMA_ARSINHX" +#define HID_SMA_ARCOSHX "STARMATH_HID_SMA_ARCOSHX" +#define HID_SMA_ARTANHX "STARMATH_HID_SMA_ARTANHX" +#define HID_SMA_ARCOTHX "STARMATH_HID_SMA_ARCOTHX" +#define HID_SMA_SUMX "STARMATH_HID_SMA_SUMX" +#define HID_SMA_PRODX "STARMATH_HID_SMA_PRODX" +#define HID_SMA_COPRODX "STARMATH_HID_SMA_COPRODX" +#define HID_SMA_LIMX "STARMATH_HID_SMA_LIMX" +#define HID_SMA_LIMINFX "STARMATH_HID_SMA_LIMINFX" +#define HID_SMA_LIMSUPX "STARMATH_HID_SMA_LIMSUPX" +#define HID_SMA_EXISTS "STARMATH_HID_SMA_EXISTS" +#define HID_SMA_FORALL "STARMATH_HID_SMA_FORALL" +#define HID_SMA_NABLA "STARMATH_HID_SMA_NABLA" +#define HID_SMA_INTX "STARMATH_HID_SMA_INTX" +#define HID_SMA_IINTX "STARMATH_HID_SMA_IINTX" +#define HID_SMA_IIINTX "STARMATH_HID_SMA_IIINTX" +#define HID_SMA_LINTX "STARMATH_HID_SMA_LINTX" +#define HID_SMA_LLINTX "STARMATH_HID_SMA_LLINTX" +#define HID_SMA_LLLINTX "STARMATH_HID_SMA_LLLINTX" +#define HID_SMA_FROMX "STARMATH_HID_SMA_FROMX" +#define HID_SMA_TOX "STARMATH_HID_SMA_TOX" +#define HID_SMA_FROMXTOY "STARMATH_HID_SMA_FROMXTOY" +#define HID_SMA_XCIRCY "STARMATH_HID_SMA_XCIRCY" +#define HID_SMA_XDIVIDESY "STARMATH_HID_SMA_XDIVIDESY" +#define HID_SMA_XNDIVIDESY "STARMATH_HID_SMA_XNDIVIDESY" +#define HID_SMA_DLARROW "STARMATH_HID_SMA_DLARROW" +#define HID_SMA_DLRARROW "STARMATH_HID_SMA_DLRARROW" +#define HID_SMA_DRARROW "STARMATH_HID_SMA_DRARROW" + +#define HID_SMA_MISC_CAT "STARMATH_HID_SMA_MISC_CAT" +#define HID_SMA_UNBINOPS_CAT "STARMATH_HID_SMA_UNBINOPS_CAT" +#define HID_SMA_RELATIONS_CAT "STARMATH_HID_SMA_RELATIONS_CAT" +#define HID_SMA_SETOPERATIONS_CAT "STARMATH_HID_SMA_SETOPERATIONS_CAT" +#define HID_SMA_FUNCTIONS_CAT "STARMATH_HID_SMA_FUNCTIONS_CAT" +#define HID_SMA_OPERATORS_CAT "STARMATH_HID_SMA_OPERATORS_CAT" +#define HID_SMA_ATTRIBUTES_CAT "STARMATH_HID_SMA_ATTRIBUTES_CAT" +#define HID_SMA_BRACKETS_CAT "STARMATH_HID_SMA_BRACKETS_CAT" +#define HID_SMA_FORMAT_CAT "STARMATH_HID_SMA_FORMAT_CAT" + +#define HID_SMA_OPERATOR_WIN "STARMATH_HID_SMA_OPERATOR_WIN" +#define HID_SMA_UNBINOPS_TBX "STARMATH_HID_SMA_UNBINOPS_TBX" +#define HID_SMA_RELATIONS_TBX "STARMATH_HID_SMA_RELATIONS_TBX" +#define HID_SMA_SETOPERATIONS_TBX "STARMATH_HID_SMA_SETOPERATIONS_TBX" +#define HID_SMA_FUNCTIONS_TBX "STARMATH_HID_SMA_FUNCTIONS_TBX" +#define HID_SMA_OPERATORS_TBX "STARMATH_HID_SMA_OPERATORS_TBX" +#define HID_SMA_ATTRIBUTES_TBX "STARMATH_HID_SMA_ATTRIBUTES_TBX" +#define HID_SMA_BRACKETS_TBX "STARMATH_HID_SMA_BRACKETS_TBX" +#define HID_SMA_FORMAT_TBX "STARMATH_HID_SMA_FORMAT_TBX" +#define HID_SMA_SELECTION_TBX "STARMATH_HID_SMA_SELECTION_TBX" +#define HID_SMA_COMMAND_WIN "STARMATH_HID_SMA_COMMAND_WIN" +#define HID_SMA_MISC_MENU "STARMATH_HID_SMA_MISC_MENU" +#define HID_SMA_FUNCTIONSOTHER1_MENU "STARMATH_HID_SMA_FUNCTIONSOTHER1_MENU" + +#define HID_SMA_ACUTEX "STARMATH_HID_SMA_ACUTEX" +#define HID_SMA_BARX "STARMATH_HID_SMA_BARX" +#define HID_SMA_BREVEX "STARMATH_HID_SMA_BREVEX" +#define HID_SMA_CHECKX "STARMATH_HID_SMA_CHECKX" +#define HID_SMA_CIRCLEX "STARMATH_HID_SMA_CIRCLEX" +#define HID_SMA_DOTX "STARMATH_HID_SMA_DOTX" +#define HID_SMA_DDOTX "STARMATH_HID_SMA_DDOTX" +#define HID_SMA_DDDOTX "STARMATH_HID_SMA_DDDOTX" +#define HID_SMA_GRAVEX "STARMATH_HID_SMA_GRAVEX" +#define HID_SMA_HATX "STARMATH_HID_SMA_HATX" +#define HID_SMA_TILDEX "STARMATH_HID_SMA_TILDEX" +#define HID_SMA_VECX "STARMATH_HID_SMA_VECX" +#define HID_SMA_UNDERLINEX "STARMATH_HID_SMA_UNDERLINEX" +#define HID_SMA_OVERLINEX "STARMATH_HID_SMA_OVERLINEX" +#define HID_SMA_OVERSTRIKEX "STARMATH_HID_SMA_OVERSTRIKEX" +#define HID_SMA_PHANTOMX "STARMATH_HID_SMA_PHANTOMX" +#define HID_SMA_BOLDX "STARMATH_HID_SMA_BOLDX" +#define HID_SMA_ITALX "STARMATH_HID_SMA_ITALX" +#define HID_SMA_SIZEXY "STARMATH_HID_SMA_SIZEXY" +#define HID_SMA_FONTXY "STARMATH_HID_SMA_FONTXY" +#define HID_SMA_COLORX "STARMATH_HID_SMA_COLORX" +#define HID_SMA_LRGROUPX "STARMATH_HID_SMA_LRGROUPX" +#define HID_SMA_LRPARENTX "STARMATH_HID_SMA_LRPARENTX" +#define HID_SMA_LRBRACKETX "STARMATH_HID_SMA_LRBRACKETX" +#define HID_SMA_LRBRACEX "STARMATH_HID_SMA_LRBRACEX" +#define HID_SMA_LRANGLEX "STARMATH_HID_SMA_LRANGLEX" +#define HID_SMA_LRCEILX "STARMATH_HID_SMA_LRCEILX" +#define HID_SMA_LRFLOORX "STARMATH_HID_SMA_LRFLOORX" +#define HID_SMA_LRLINEX "STARMATH_HID_SMA_LRLINEX" +#define HID_SMA_LRDLINEX "STARMATH_HID_SMA_LRDLINEX" +#define HID_SMA_SLRPARENTX "STARMATH_HID_SMA_SLRPARENTX" +#define HID_SMA_SLRBRACKETX "STARMATH_HID_SMA_SLRBRACKETX" +#define HID_SMA_SLRBRACEX "STARMATH_HID_SMA_SLRBRACEX" +#define HID_SMA_SLRANGLEX "STARMATH_HID_SMA_SLRANGLEX" +#define HID_SMA_SLRCEILX "STARMATH_HID_SMA_SLRCEILX" +#define HID_SMA_SLRFLOORX "STARMATH_HID_SMA_SLRFLOORX" +#define HID_SMA_SLRLINEX "STARMATH_HID_SMA_SLRLINEX" +#define HID_SMA_SLRDLINEX "STARMATH_HID_SMA_SLRDLINEX" +#define HID_SMA_RSUBX "STARMATH_HID_SMA_RSUBX" +#define HID_SMA_RSUPX "STARMATH_HID_SMA_RSUPX" +#define HID_SMA_LSUBX "STARMATH_HID_SMA_LSUBX" +#define HID_SMA_LSUPX "STARMATH_HID_SMA_LSUPX" +#define HID_SMA_SBLANK "STARMATH_HID_SMA_SBLANK" +#define HID_SMA_BLANK "STARMATH_HID_SMA_BLANK" +#define HID_SMA_NEWLINE "STARMATH_HID_SMA_NEWLINE" +#define HID_SMA_BINOMXY "STARMATH_HID_SMA_BINOMXY" +#define HID_SMA_STACK "STARMATH_HID_SMA_STACK" +#define HID_SMA_MATRIX "STARMATH_HID_SMA_MATRIX" +#define HID_SMA_ALIGNLX "STARMATH_HID_SMA_ALIGNLX" +#define HID_SMA_ALIGNCX "STARMATH_HID_SMA_ALIGNCX" +#define HID_SMA_ALIGNRX "STARMATH_HID_SMA_ALIGNRX" +#define HID_SMA_ALEPH "STARMATH_HID_SMA_ALEPH" +#define HID_SMA_EMPTYSET "STARMATH_HID_SMA_EMPTYSET" +#define HID_SMA_RE "STARMATH_HID_SMA_RE" +#define HID_SMA_IM "STARMATH_HID_SMA_IM" +#define HID_SMA_INFINITY "STARMATH_HID_SMA_INFINITY" +#define HID_SMA_PARTIAL "STARMATH_HID_SMA_PARTIAL" +#define HID_SMA_WP "STARMATH_HID_SMA_WP" +#define HID_SMA_DOTSAXIS "STARMATH_HID_SMA_DOTSAXIS" +#define HID_SMA_DOTSUP "STARMATH_HID_SMA_DOTSUP" +#define HID_SMA_DOTSDOWN "STARMATH_HID_SMA_DOTSDOWN" +#define HID_SMA_DOTSLOW "STARMATH_HID_SMA_DOTSLOW" +#define HID_SMA_DOTSVERT "STARMATH_HID_SMA_DOTSVERT" + +#define HID_SMA_SETN "STARMATH_HID_SMA_SETN" +#define HID_SMA_SETZ "STARMATH_HID_SMA_SETZ" +#define HID_SMA_SETQ "STARMATH_HID_SMA_SETQ" +#define HID_SMA_SETR "STARMATH_HID_SMA_SETR" +#define HID_SMA_SETC "STARMATH_HID_SMA_SETC" +#define HID_SMA_WIDEHATX "STARMATH_HID_SMA_WIDEHATX" +#define HID_SMA_WIDETILDEX "STARMATH_HID_SMA_WIDETILDEX" +#define HID_SMA_WIDEVECX "STARMATH_HID_SMA_WIDEVECX" +#define HID_SMA_CSUBX "STARMATH_HID_SMA_CSUBX" +#define HID_SMA_CSUPX "STARMATH_HID_SMA_CSUPX" +#define HID_SMA_HBAR "STARMATH_HID_SMA_HBAR" +#define HID_SMA_LAMBDABAR "STARMATH_HID_SMA_LAMBDABAR" +#define HID_SMA_LEFTARROW "STARMATH_HID_SMA_LEFTARROW" +#define HID_SMA_RIGHTARROW "STARMATH_HID_SMA_RIGHTARROW" +#define HID_SMA_UPARROW "STARMATH_HID_SMA_UPARROW" +#define HID_SMA_DOWNARROW "STARMATH_HID_SMA_DOWNARROW" + +#define HID_SMA_DEFAULT_DIST "STARMATH_HID_SMA_DEFAULT_DIST" +#define HID_SMA_LINE_DIST "STARMATH_HID_SMA_LINE_DIST" +#define HID_SMA_ROOT_DIST "STARMATH_HID_SMA_ROOT_DIST" +#define HID_SMA_SUP_DIST "STARMATH_HID_SMA_SUP_DIST" +#define HID_SMA_SUB_DIST "STARMATH_HID_SMA_SUB_DIST" +#define HID_SMA_NUMERATOR_DIST "STARMATH_HID_SMA_NUMERATOR_DIST" +#define HID_SMA_DENOMINATOR_DIST "STARMATH_HID_SMA_DENOMINATOR_DIST" +#define HID_SMA_FRACLINE_EXCWIDTH "STARMATH_HID_SMA_FRACLINE_EXCWIDTH" +#define HID_SMA_FRACLINE_LINEWIDTH "STARMATH_HID_SMA_FRACLINE_LINEWIDTH" +#define HID_SMA_UPPERLIMIT_DIST "STARMATH_HID_SMA_UPPERLIMIT_DIST" +#define HID_SMA_LOWERLIMIT_DIST "STARMATH_HID_SMA_LOWERLIMIT_DIST" +#define HID_SMA_BRACKET_EXCHEIGHT "STARMATH_HID_SMA_BRACKET_EXCHEIGHT" +#define HID_SMA_BRACKET_DIST "STARMATH_HID_SMA_BRACKET_DIST" +#define HID_SMA_MATRIXROW_DIST "STARMATH_HID_SMA_MATRIXROW_DIST" +#define HID_SMA_MATRIXCOL_DIST "STARMATH_HID_SMA_MATRIXCOL_DIST" +#define HID_SMA_ATTRIBUT_DIST "STARMATH_HID_SMA_ATTRIBUT_DIST" +#define HID_SMA_INTERATTRIBUT_DIST "STARMATH_HID_SMA_INTERATTRIBUT_DIST" +#define HID_SMA_OPERATOR_EXCHEIGHT "STARMATH_HID_SMA_OPERATOR_EXCHEIGHT" +#define HID_SMA_OPERATOR_DIST "STARMATH_HID_SMA_OPERATOR_DIST" +#define HID_SMA_LEFTBORDER_DIST "STARMATH_HID_SMA_LEFTBORDER_DIST" +#define HID_SMA_RIGHTBORDER_DIST "STARMATH_HID_SMA_RIGHTBORDER_DIST" +#define HID_SMA_UPPERBORDER_DIST "STARMATH_HID_SMA_UPPERBORDER_DIST" +#define HID_SMA_LOWERBORDER_DIST "STARMATH_HID_SMA_LOWERBORDER_DIST" +#define HID_SMA_SCALE_ALL_BRACKETS "STARMATH_HID_SMA_SCALE_ALL_BRACKETS" +#define HID_SMA_BRACKET_EXCHEIGHT2 "STARMATH_HID_SMA_BRACKET_EXCHEIGHT2" +#define HID_SMA_LMRANGLEXY "STARMATH_HID_SMA_LMRANGLEXY" +#define HID_SMA_SLMRANGLEXY "STARMATH_HID_SMA_SLMRANGLEXY" +#define HID_SMA_XWIDESLASHY "STARMATH_HID_SMA_XWIDESLASHY" +#define HID_SMA_XWIDEBSLASHY "STARMATH_HID_SMA_XWIDEBSLASHY" +#define HID_SMA_XOVERBRACEY "STARMATH_HID_SMA_XOVERBRACEY" +#define HID_SMA_XUNDERBRACEY "STARMATH_HID_SMA_XUNDERBRACEY" +#define HID_SMA_LRDBRACKETX "STARMATH_HID_SMA_LRDBRACKETX" +#define HID_SMA_SLRDBRACKETX "STARMATH_HID_SMA_SLRDBRACKETX" + +#define HID_SMA_CONTROL_SYMBOLSET_VIEW "STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW" +#define HID_SMA_CONTROL_FONTCHAR_VIEW "STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW" #define BMP_ARROW_RIGHT 1 diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx index c73db4dae4a0..280261322f08 100644 --- a/starmath/source/dialog.cxx +++ b/starmath/source/dialog.cxx @@ -764,7 +764,7 @@ IMPL_LINK( SmDistanceDialog, CheckBoxClickHdl, CheckBox *, pCheckBox ) } -void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId) +void SmDistanceDialog::SetHelpId(MetricField &rField, const rtl::OString& sHelpId) { //! HelpID's die auf diese Weise explizit gesetzt werden, muessen im //! util Verzeichnis im File "hidother.src" mit Hilfe von "hidspecial" @@ -775,9 +775,7 @@ void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId) DBG_ASSERT(aEmptyText.Len() == 0, "Sm: Ooops..."); #endif - // FIXME: HELPID - (void)nHelpId; - rField.SetHelpId(""/*nHelpId*/); + rField.SetHelpId(sHelpId); rField.SetHelpText(aEmptyText); // since MetricField inherits from SpinField which has a sub Edit field @@ -786,8 +784,7 @@ void SmDistanceDialog::SetHelpId(MetricField &rField, ULONG nHelpId) Edit *pSubEdit = rField.GetSubEdit(); if (pSubEdit) { - // FIXME: HELPID - pSubEdit->SetHelpId(""/*nHelpId*/); + pSubEdit->SetHelpId(sHelpId); pSubEdit->SetHelpText(aEmptyText); } } @@ -805,7 +802,7 @@ void SmDistanceDialog::SetCategory(USHORT nCategory) #if OSL_DEBUG_LEVEL > 1 DBG_ASSERT(NOCATEGORIES == 10, "Sm : Array passt nicht zu Anzahl der Kategorien"); #endif - ULONG __READONLY_DATA aCatMf2Hid[10][4] = + const char* __READONLY_DATA aCatMf2Hid[10][4] = { { HID_SMA_DEFAULT_DIST, HID_SMA_LINE_DIST, HID_SMA_ROOT_DIST, 0 }, { HID_SMA_SUP_DIST, HID_SMA_SUB_DIST , 0, 0 }, diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx index 0471b1111e1f..94e30ce82501 100644 --- a/starmath/source/edit.cxx +++ b/starmath/source/edit.cxx @@ -107,8 +107,7 @@ SmEditWindow::SmEditWindow( SmCmdBoxWindow &rMyCmdBoxWin ) : pVScrollBar (0), pScrollBox (0) { - // FIXME: HELPID - SetHelpId(""/*HID_SMA_COMMAND_WIN_EDIT*/); + SetHelpId(HID_SMA_COMMAND_WIN_EDIT); SetMapMode(MAP_PIXEL); // Even RTL languages don't use RTL for math diff --git a/starmath/source/smmod.cxx b/starmath/source/smmod.cxx index 18b3912ecf45..1fd0d2ab8d3c 100644 --- a/starmath/source/smmod.cxx +++ b/starmath/source/smmod.cxx @@ -336,17 +336,6 @@ void SmModule::GetState(SfxItemSet &rSet) } } -void SmModule::FillStatusBar(StatusBar &rBar) -{ - rBar.InsertItem(SID_TEXTSTATUS, 300, SIB_LEFT | SIB_IN); - rBar.InsertItem(SID_ATTR_ZOOM, rBar.GetTextWidth(C2S(" 100% "))); - rBar.InsertItem(SID_MODIFYSTATUS, rBar.GetTextWidth(C2S(" * "))); - rBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rBar ), SIB_USERDRAW ); - // FIXME: HELPID - rBar.SetHelpId(SID_SIGNATURE, ""/*SID_SIGNATURE*/); - -} - /* -----------------15.02.99 12:45------------------- * * --------------------------------------------------*/ diff --git a/starmath/source/smres.src b/starmath/source/smres.src index ec6d8114759b..93b584ae8381 100644 --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -31,6 +31,7 @@ #include "starmath.hrc" #include "dialog.hrc" #include "toolbox.hrc" +#include "smcommands.h" #define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; } #define IMAGE_STDBTN_COLOR_HC IMAGE_STDBTN_COLOR @@ -109,7 +110,7 @@ ModalDialog RID_FONTSIZEDIALOG Moveable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; - HelpID = SID_FONTSIZE ; + HelpId = CMD_SID_FONTSIZE ; Size = MAP_APPFONT ( 171 , 120 ) ; Text [ en-US ] = "Font Sizes" ; FixedText 1 @@ -269,7 +270,7 @@ ModalDialog RID_FONTTYPEDIALOG { OutputSize = TRUE ; SVLook = TRUE ; - HelpID = SID_FONT ; + HelpId = CMD_SID_FONT ; Size = MAP_APPFONT ( 282 , 153 ) ; Text [ en-US ] = "Fonts" ; Moveable = TRUE ; @@ -425,7 +426,7 @@ ModalDialog RID_DISTANCEDIALOG Moveable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; - HelpID = SID_DISTANCE ; + HelpId = CMD_SID_DISTANCE ; Size = MAP_APPFONT ( 240 , 90 ) ; Text [ en-US ] = "Spacing" ; FixedText 1 @@ -919,7 +920,7 @@ ModalDialog RID_ALIGNDIALOG Moveable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; - HelpID = SID_ALIGN ; + HelpId = CMD_SID_ALIGN ; Size = MAP_APPFONT ( 139 , 66 ) ; Text [ en-US ] = "Alignment" ; RadioButton 1 @@ -1402,37 +1403,37 @@ Menu RID_VIEWMENU MenuItem { Identifier = SID_VIEW050 ; - HelpID = SID_VIEW050 ; + HelpId = CMD_SID_VIEW050 ; Text [ en-US ] = "~View 50%" ; }; MenuItem { Identifier = SID_VIEW100 ; - HelpID = SID_VIEW100 ; + HelpId = CMD_SID_VIEW100 ; Text [ en-US ] = "View ~100%" ; }; MenuItem { Identifier = SID_VIEW200 ; - HelpID = SID_VIEW200 ; + HelpId = CMD_SID_VIEW200 ; Text [ en-US ] = "View ~200%" ; }; MenuItem { Identifier = SID_ZOOMIN ; - HelpID = SID_ZOOMIN ; + HelpId = CMD_SID_ZOOMIN ; Text [ en-US ] = "~Zoom In" ; }; MenuItem { Identifier = SID_ZOOMOUT ; - HelpID = SID_ZOOMOUT ; + HelpId = CMD_SID_ZOOMOUT ; Text [ en-US ] = "Zoom ~Out" ; }; MenuItem { Identifier = SID_ADJUST ; - HelpID = SID_ADJUST ; + HelpId = CMD_SID_ADJUST ; Text [ en-US ] = "~Display All" ; }; MenuItem @@ -1442,7 +1443,7 @@ Menu RID_VIEWMENU MenuItem { Identifier = SID_DRAW ; - HelpID = SID_DRAW ; + HelpId = CMD_SID_DRAW ; Text [ en-US ] = "U~pdate" ; }; }; @@ -3478,76 +3479,6 @@ String RID_ERR_RIGHTEXPECTED Text [ en-US ] = "'RIGHT' expected" ; }; -#include "menu.src" - -ToolBox RID_MATH_TOOLBOX -{ - HelpId = RID_MATH_TOOLBOX ; - Customize = TRUE ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Align = BOXALIGN_LEFT ; - Size = MAP_APPFONT ( 0 , 0 ) ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_ZOOMIN ; - HelpID = SID_ZOOMIN ; - Text [ en-US ] = "Zoom In" ; - }; - ToolBoxItem - { - Identifier = SID_ZOOMOUT ; - HelpID = SID_ZOOMOUT ; - Text [ en-US ] = "Zoom Out" ; - }; - ToolBoxItem - { - Identifier = SID_VIEW100 ; - HelpID = SID_VIEW100 ; - Text [ en-US ] = "Zoom 100%" ; - }; - ToolBoxItem - { - Identifier = SID_ADJUST ; - HelpID = SID_ADJUST ; - Text [ en-US ] = "Entire Formula" ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_DRAW ; - HelpID = SID_DRAW ; - Text [ en-US ] = "Refresh" ; - }; - ToolBoxItem - { - Identifier = SID_FORMULACURSOR ; - HelpID = SID_FORMULACURSOR ; - Text [ en-US ] = "Formula Cursor"; - }; - ToolBoxItem - { - Identifier = SID_SYMBOLS_CATALOGUE ; - HelpID = SID_SYMBOLS_CATALOGUE ; - Text [ en-US ] = "Symbols" ; - }; - }; -}; - String RID_MATH_TOOLBOX { Text [ en-US ] = "Main Toolbar" ; diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx index ddb6a37da33a..1552d4edc231 100644 --- a/starmath/source/view.cxx +++ b/starmath/source/view.cxx @@ -111,10 +111,8 @@ SmGraphicWindow::SmGraphicWindow(SmViewShell* pShell): SetTotalSize(); - // FIXME: HELPID - SetHelpId(""/*HID_SMA_WIN_DOCUMENT*/); - // FIXME: HELPID - SetUniqueId(""/*HID_SMA_WIN_DOCUMENT*/); + SetHelpId(HID_SMA_WIN_DOCUMENT); + SetUniqueId(HID_SMA_WIN_DOCUMENT); } SmGraphicWindow::~SmGraphicWindow() diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 8c43631aaf4e..24a795aec551 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -28,956 +28,971 @@ #include #endif +#include "swcommands.h" +#include +#include + #define HID_BASE HID_APP_START -#define HID_BIB_BASE (HID_BASE + 1) -#define HID_DBSEL (HID_BASE + 2) -#define HID_DBEDIT (HID_BASE + 3) -#define HID_PRINT_OPTION (HID_BASE + 4) -#define HID_MERGE_PRINTMONITOR (HID_BASE + 5) -#define HID_FLD_INPUT (HID_BASE + 6) -#define HID_CONFIG_MISC (HID_BASE + 7) -#define HID_CONFIG_PATH (HID_BASE + 8) -#define HID_CONFIG_TB (HID_BASE + 9) -#define HID_PG_FOOTNOTE (HID_BASE + 10) -#define HID_FORMAT_GRAPHIC (HID_BASE + 11) -#define HID_FILTERSTATUS (HID_BASE + 12) -#define HID_DOCINFO_EDT (HID_BASE + 13) -#define HID_DBLOGON (HID_BASE + 14) -#define HID_MAC_ASSIGN (HID_BASE + 15) -#define HID_CONFIG_MN (HID_BASE + 16) -#define HID_PAPERSIZE (HID_BASE + 17) -#define HID_PASSWD (HID_BASE + 18) -#define HID_SPELLING_OPTIONS (HID_BASE + 19) -#define HID_HYPHENATE_OPTIONS (HID_BASE + 20) -#define HID_FORMAT_COLUMN (HID_BASE + 21) -#define HID_CONFIG_SAVE (HID_BASE + 22) -#define HID_NUM_NAMES (HID_BASE + 23) -#define HID_SYMBOL_SELECT (HID_BASE + 24) -#define HID_CONFIG_KY (HID_BASE + 25) -#define HID_LINKEDIT (HID_BASE + 26) -#define HID_GRAPHIC_PREVIEW (HID_BASE + 28) -#define HID_DICTIONARY (HID_BASE + 29) -#define HID_SET_STYLE (HID_BASE + 30) -#define HID_RIBBONBAR (HID_BASE + 31) -#define HID_STATUSLINE (HID_BASE + 32) -#define HID_DOCBAR (HID_BASE + 33) -#define HID_VRULER (HID_BASE + 34) -#define HID_MAKRO_WINDOW (HID_BASE + 35) -#define HID_ENVELOP_FORMAT (HID_BASE + 37) -#define HID_ENVELOP_PRINTER (HID_BASE + 38) - -#define HID_HEADER_FOOTER_DLG (HID_BASE + 39) -#define HID_GRID_DLG (HID_BASE + 40) -#define HID_USER_ADDRESS_DLG (HID_BASE + 41) -#define HID_SELECT_FAX_DLG (HID_BASE + 42) - -#define HID_LABEL_FORMAT (HID_BASE + 43) -#define HID_BRSORT (HID_BASE + 44) -#define HID_BRSEEK (HID_BASE + 45) -#define HID_BRCFG (HID_BASE + 46) - -#define HID_FORMEDT_CONTENT (HID_BASE + 47) -#define HID_FORMEDT_USER (HID_BASE + 48) -#define HID_FORMEDT_INDEX (HID_BASE + 49) - -#define HID_SCRL_PAGEUP (HID_BASE + 50) -#define HID_SCRL_PAGEDOWN (HID_BASE + 51) - -#define HID_DRAW_WIN (HID_BASE + 52) -#define HID_EDIT_WIN (HID_BASE + 53) - -#define HID_INSERT_CTRL (HID_BASE + 54) // TbxControl Einfuegen -#define HID_INSERT_OBJ_CTRL (HID_BASE + 55) -#define HID_INSERT_FIELD_CTRL (HID_BASE + 56) - -#define HID_SOURCEVIEW (HID_BASE + 57) -#define HID_TBL_OPT_CTRL (HID_BASE + 58) -#define HID_AUTOFORMAT_CLB (HID_BASE + 59) - -#define HID_SCRL_NAVI (HID_BASE + 60) -#define HID_NAVI_DRAG_HYP (HID_BASE + 61) -#define HID_NAVI_DRAG_LINK (HID_BASE + 62) -#define HID_NAVI_DRAG_COPY (HID_BASE + 63) -#define HID_NAVI_OUTLINES (HID_BASE + 64) - -#define HID_AUTOFORMAT_EXEC (HID_BASE + 65) -#define HID_AUTOFORMAT_CLOSE (HID_BASE + 66) - -#define HID_PAGEPREVIEW (HID_BASE + 67) -#define HID_SOURCE_EDITWIN (HID_BASE + 68) +#define HID_BIB_BASE "SW_HID_BIB_BASE" +#define HID_DBSEL "SW_HID_DBSEL" +#define HID_DBEDIT "SW_HID_DBEDIT" +#define HID_PRINT_OPTION "SW_HID_PRINT_OPTION" +#define HID_MERGE_PRINTMONITOR "SW_HID_MERGE_PRINTMONITOR" +#define HID_FLD_INPUT "SW_HID_FLD_INPUT" +#define HID_CONFIG_MISC "SW_HID_CONFIG_MISC" +#define HID_CONFIG_PATH "SW_HID_CONFIG_PATH" +#define HID_CONFIG_TB "SW_HID_CONFIG_TB" +#define HID_PG_FOOTNOTE "SW_HID_PG_FOOTNOTE" +#define HID_FORMAT_GRAPHIC "SW_HID_FORMAT_GRAPHIC" +#define HID_FILTERSTATUS "SW_HID_FILTERSTATUS" +#define HID_DOCINFO_EDT "SW_HID_DOCINFO_EDT" +#define HID_DBLOGON "SW_HID_DBLOGON" +#define HID_MAC_ASSIGN "SW_HID_MAC_ASSIGN" +#define HID_CONFIG_MN "SW_HID_CONFIG_MN" +#define HID_PAPERSIZE "SW_HID_PAPERSIZE" +#define HID_PASSWD "SW_HID_PASSWD" +#define HID_SPELLING_OPTIONS "SW_HID_SPELLING_OPTIONS" +#define HID_HYPHENATE_OPTIONS "SW_HID_HYPHENATE_OPTIONS" +#define HID_FORMAT_COLUMN "SW_HID_FORMAT_COLUMN" +#define HID_CONFIG_SAVE "SW_HID_CONFIG_SAVE" +#define HID_NUM_NAMES "SW_HID_NUM_NAMES" +#define HID_SYMBOL_SELECT "SW_HID_SYMBOL_SELECT" +#define HID_CONFIG_KY "SW_HID_CONFIG_KY" +#define HID_LINKEDIT "SW_HID_LINKEDIT" +#define HID_GRAPHIC_PREVIEW "SW_HID_GRAPHIC_PREVIEW" +#define HID_DICTIONARY "SW_HID_DICTIONARY" +#define HID_SET_STYLE "SW_HID_SET_STYLE" +#define HID_RIBBONBAR "SW_HID_RIBBONBAR" +#define HID_STATUSLINE "SW_HID_STATUSLINE" +#define HID_DOCBAR "SW_HID_DOCBAR" +#define HID_VRULER "SW_HID_VRULER" +#define HID_MAKRO_WINDOW "SW_HID_MAKRO_WINDOW" +#define HID_ENVELOP_FORMAT "SW_HID_ENVELOP_FORMAT" +#define HID_ENVELOP_PRINTER "SW_HID_ENVELOP_PRINTER" + +#define HID_HEADER_FOOTER_DLG "SW_HID_HEADER_FOOTER_DLG" +#define HID_GRID_DLG "SW_HID_GRID_DLG" +#define HID_USER_ADDRESS_DLG "SW_HID_USER_ADDRESS_DLG" +#define HID_SELECT_FAX_DLG "SW_HID_SELECT_FAX_DLG" + +#define HID_LABEL_FORMAT "SW_HID_LABEL_FORMAT" +#define HID_BRSORT "SW_HID_BRSORT" +#define HID_BRSEEK "SW_HID_BRSEEK" +#define HID_BRCFG "SW_HID_BRCFG" + +#define HID_FORMEDT_CONTENT "SW_HID_FORMEDT_CONTENT" +#define HID_FORMEDT_USER "SW_HID_FORMEDT_USER" +#define HID_FORMEDT_INDEX "SW_HID_FORMEDT_INDEX" + +#define HID_SCRL_PAGEUP "SW_HID_SCRL_PAGEUP" +#define HID_SCRL_PAGEDOWN "SW_HID_SCRL_PAGEDOWN" + +#define HID_DRAW_WIN "SW_HID_DRAW_WIN" +#define HID_EDIT_WIN "SW_HID_EDIT_WIN" + +#define HID_INSERT_CTRL "SW_HID_INSERT_CTRL" // TbxControl Einfuegen +#define HID_INSERT_OBJ_CTRL "SW_HID_INSERT_OBJ_CTRL" +#define HID_INSERT_FIELD_CTRL "SW_HID_INSERT_FIELD_CTRL" + +#define HID_SOURCEVIEW "SW_HID_SOURCEVIEW" +#define HID_TBL_OPT_CTRL "SW_HID_TBL_OPT_CTRL" +#define HID_AUTOFORMAT_CLB "SW_HID_AUTOFORMAT_CLB" + +#define HID_SCRL_NAVI "SW_HID_SCRL_NAVI" +#define HID_NAVI_DRAG_HYP "SW_HID_NAVI_DRAG_HYP" +#define HID_NAVI_DRAG_LINK "SW_HID_NAVI_DRAG_LINK" +#define HID_NAVI_DRAG_COPY "SW_HID_NAVI_DRAG_COPY" +#define HID_NAVI_OUTLINES "SW_HID_NAVI_OUTLINES" + +#define HID_AUTOFORMAT_EXEC "SW_HID_AUTOFORMAT_EXEC" +#define HID_AUTOFORMAT_CLOSE "SW_HID_AUTOFORMAT_CLOSE" + +#define HID_PAGEPREVIEW "SW_HID_PAGEPREVIEW" +#define HID_SOURCE_EDITWIN "SW_HID_SOURCE_EDITWIN" // Dialog Help-IDs ********************************************************** -#define HID_CONVERT_FROM (HID_BASE + 200) -#define HID_CONVERT_TO (HID_BASE + 201) -#define HID_EDIT_POSTIT (HID_BASE + 202) -#define HID_INSERT_CHART (HID_BASE + 203) -#define HID_PAGE_PREVIEW (HID_BASE + 204) -#define HID_INSERT_HYPERLINK (HID_BASE + 205) -#define HID_NAVIGATOR_TREELIST (HID_BASE + 206) -#define HID_DLG_CAPTION (HID_BASE + 207) -#define HID_DLG_GLOSS_DECIDE (HID_BASE + 208) -#define HID_NAVIGATOR_TOOLBOX (HID_BASE + 209) -#define HID_NAVIGATOR_LISTBOX (HID_BASE + 210) -#define HID_NUM_BULLET_DLG (HID_BASE + 211) -#define HID_VS_SINGLENUM (HID_BASE + 212) -#define HID_VS_NUM (HID_BASE + 213) -#define HID_VS_BULLET (HID_BASE + 214) -#define HID_VS_NUMBMP (HID_BASE + 215) -#define HID_VS_RULER (HID_BASE + 216) -#define HID_RULER_DIALOG (HID_BASE + 217) -#define HID_INSERT_ABSTRACT (HID_BASE + 218) -#define HID_NAVI_TBX1 (HID_BASE + 219) -#define HID_NAVI_TBX2 (HID_BASE + 220) -#define HID_NAVI_TBX3 (HID_BASE + 221) -#define HID_NAVI_TBX4 (HID_BASE + 222) -#define HID_NAVI_TBX5 (HID_BASE + 223) -#define HID_NAVI_TBX6 (HID_BASE + 224) -#define HID_NAVI_TBX7 (HID_BASE + 225) -#define HID_NAVI_TBX8 (HID_BASE + 226) -#define HID_NAVI_TBX9 (HID_BASE + 227) -#define HID_NAVI_TBX10 (HID_BASE + 228) -#define HID_NAVI_TBX11 (HID_BASE + 229) -#define HID_NAVI_TBX12 (HID_BASE + 230) -#define HID_NAVI_TBX13 (HID_BASE + 231) -#define HID_NAVI_TBX14 (HID_BASE + 232) -#define HID_NAVI_TBX15 (HID_BASE + 233) -#define HID_NAVI_VS (HID_BASE + 234) -#define HID_NUM_FORMAT_BTN (HID_BASE + 235) -#define HID_PPREV_ZOOM (HID_BASE + 236) -#define HID_NAVI_TBX16 (HID_BASE + 237) -#define HID_LTEMPL_TEXT (HID_BASE + 238) -#define HID_LTEMPL_FRAME (HID_BASE + 239) -#define HID_LTEMPL_PAGE (HID_BASE + 240) -#define HID_LTEMPL_OVERRIDE (HID_BASE + 241) -#define HID_LTEMPL_TEMPLATES (HID_BASE + 242) -#define HID_NAVI_TBX17 (HID_BASE + 243) -#define HID_NAVI_TBX18 (HID_BASE + 244) -#define HID_NAVI_TBX19 (HID_BASE + 245) -#define HID_NAVI_TBX20 (HID_BASE + 246) -#define HID_NAVI_TBX21 (HID_BASE + 247) -#define HID_NAVI_TBX22 (HID_BASE + 248) -#define HID_NAVI_TBX23 (HID_BASE + 249) -#define HID_NAVI_TBX24 (HID_BASE + 250) -#define HID_NAVIGATOR_GLOBAL_TOOLBOX (HID_BASE + 251) -#define HID_NAVIGATOR_GLOB_TREELIST (HID_BASE + 252) -#define HID_GLOS_GROUP_TREE (HID_BASE + 253) -#define HID_GLBLTREE_UPDATE (HID_BASE + 254) -#define HID_GLBLTREE_INSERT (HID_BASE + 255) -#define HID_GLBLTREE_EDIT (HID_BASE + 256) -#define HID_GLBLTREE_DEL (HID_BASE + 257) -#define HID_GLBLTREE_INS_IDX (HID_BASE + 258) -#define HID_GLBLTREE_INS_CNTIDX (HID_BASE + 259) -#define HID_GLBLTREE_INS_USRIDX (HID_BASE + 260) -#define HID_GLBLTREE_INS_FILE (HID_BASE + 261) -#define HID_GLBLTREE_INS_NEW_FILE (HID_BASE + 262) -#define HID_GLBLTREE_INS_TEXT (HID_BASE + 263) -#define HID_GLBLTREE_UPD_SEL (HID_BASE + 264) -#define HID_GLBLTREE_UPD_IDX (HID_BASE + 265) -#define HID_GLBLTREE_UPD_LINK (HID_BASE + 266) -#define HID_GLBLTREEUPD_ALL (HID_BASE + 267) -#define HID_NUM_OUTL_NAMED_NUMS (HID_BASE + 268) -#define HID_NUM_OUTL_NUM_SAVEAS (HID_BASE + 269) -#define HID_NUM_NAMED_NUMS (HID_BASE + 270) -#define HID_NUM_NUM_SAVEAS (HID_BASE + 271) -#define HID_NUM_STD_NUMBER (HID_BASE + 272) -#define HID_NUM_DEL_NUMBER (HID_BASE + 273) -#define HID_NUM_STD_BULLET (HID_BASE + 274) -#define HID_NUM_DEL_BULLET (HID_BASE + 275) -#define HID_NAVI_CONTENT (HID_BASE + 276) -#define HID_NAVI_GLOBAL (HID_BASE + 277) -#define HID_LTEMPL_NUMBERING (HID_BASE + 278) -#define HID_FLDVAR_APPLY (HID_BASE + 279) -#define HID_FLDVAR_DELETE (HID_BASE + 280) -#define HID_FLDEDT_ADDRESS (HID_BASE + 281) -#define HID_SORT_ACTION (HID_BASE + 282) -#define HID_SORT_AUTHOR (HID_BASE + 283) -#define HID_SORT_DATE (HID_BASE + 284) -#define HID_SORT_COMMENT (HID_BASE + 285) -#define HID_SW_SORT_POSITION (HID_BASE + 286) -#define HID_SYNC_BTN (HID_BASE + 287) -#define HID_EDIT_COMMENT (HID_BASE + 288) -#define HID_SEL_TEMPLATE (HID_BASE + 289) -#define HID_DLG_SEQUENCE_OPTION (HID_BASE + 290) -#define HID_DLG_FLDEDT_NEXT (HID_BASE + 291) -#define HID_DLG_FLDEDT_PREV (HID_BASE + 292) -#define HID_DLG_FLDEDT_ADDRESS (HID_BASE + 293) -#define HID_DLG_PRV_PRT_OPTIONS (HID_BASE + 294) - -#define HID_FILEDLG_CHARDLG (HID_BASE + 295) -#define HID_FILEDLG_LOADTEMPLATE (HID_BASE + 296) -#define HID_FILEDLG_ROMENU (HID_BASE + 297) -#define HID_FILEDLG_MAILMRGE1 (HID_BASE + 298) -#define HID_FILEDLG_MAILMRGE2 (HID_BASE + 299) -#define HID_FILEDLG_FRMPAGE (HID_BASE + 300) -#define HID_FILEDLG_SRCVIEW (HID_BASE + 301) -#define HID_FILEDLG_WIZDOKU (HID_BASE + 302) -#define HID_PREVIEW_ZOOM (HID_BASE + 303) - -#define HID_REDLINE_AUTOFMT_ACCEPT (HID_BASE + 304) -#define HID_MULTI_TOX_DLG (HID_BASE + 305) -#define HID_ASCII_FILTER (HID_BASE + 306) -#define HID_GLBLTREE_EDIT_LINK (HID_BASE + 307) -#define HID_FORMAT_NAME_OBJECT_NAME (HID_BASE + 308)// #100286# -#define HID_REFSELECTION_TOOLTIP (HID_BASE + 309) // #i83479# +#define HID_CONVERT_FROM "SW_HID_CONVERT_FROM" +#define HID_CONVERT_TO "SW_HID_CONVERT_TO" +#define HID_EDIT_POSTIT "SW_HID_EDIT_POSTIT" +#define HID_INSERT_CHART "SW_HID_INSERT_CHART" +#define HID_PAGE_PREVIEW "SW_HID_PAGE_PREVIEW" +#define HID_INSERT_HYPERLINK "SW_HID_INSERT_HYPERLINK" +#define HID_NAVIGATOR_TREELIST "SW_HID_NAVIGATOR_TREELIST" +#define HID_DLG_CAPTION "SW_HID_DLG_CAPTION" +#define HID_DLG_GLOSS_DECIDE "SW_HID_DLG_GLOSS_DECIDE" +#define HID_NAVIGATOR_TOOLBOX "SW_HID_NAVIGATOR_TOOLBOX" +#define HID_NAVIGATOR_LISTBOX "SW_HID_NAVIGATOR_LISTBOX" +#define HID_NUM_BULLET_DLG "SW_HID_NUM_BULLET_DLG" +#define HID_VS_SINGLENUM "SW_HID_VS_SINGLENUM" +#define HID_VS_NUM "SW_HID_VS_NUM" +#define HID_VS_BULLET "SW_HID_VS_BULLET" +#define HID_VS_NUMBMP "SW_HID_VS_NUMBMP" +#define HID_VS_RULER "SW_HID_VS_RULER" +#define HID_RULER_DIALOG "SW_HID_RULER_DIALOG" +#define HID_INSERT_ABSTRACT "SW_HID_INSERT_ABSTRACT" +#define HID_NAVI_TBX1 "SW_HID_NAVI_TBX1" +#define HID_NAVI_TBX2 "SW_HID_NAVI_TBX2" +#define HID_NAVI_TBX3 "SW_HID_NAVI_TBX3" +#define HID_NAVI_TBX4 "SW_HID_NAVI_TBX4" +#define HID_NAVI_TBX5 "SW_HID_NAVI_TBX5" +#define HID_NAVI_TBX6 "SW_HID_NAVI_TBX6" +#define HID_NAVI_TBX7 "SW_HID_NAVI_TBX7" +#define HID_NAVI_TBX8 "SW_HID_NAVI_TBX8" +#define HID_NAVI_TBX9 "SW_HID_NAVI_TBX9" +#define HID_NAVI_TBX10 "SW_HID_NAVI_TBX10" +#define HID_NAVI_TBX11 "SW_HID_NAVI_TBX11" +#define HID_NAVI_TBX12 "SW_HID_NAVI_TBX12" +#define HID_NAVI_TBX13 "SW_HID_NAVI_TBX13" +#define HID_NAVI_TBX14 "SW_HID_NAVI_TBX14" +#define HID_NAVI_TBX15 "SW_HID_NAVI_TBX15" +#define HID_NAVI_VS "SW_HID_NAVI_VS" +#define HID_NUM_FORMAT_BTN "SW_HID_NUM_FORMAT_BTN" +#define HID_PPREV_ZOOM "SW_HID_PPREV_ZOOM" +#define HID_NAVI_TBX16 "SW_HID_NAVI_TBX16" +#define HID_LTEMPL_TEXT "SW_HID_LTEMPL_TEXT" +#define HID_LTEMPL_FRAME "SW_HID_LTEMPL_FRAME" +#define HID_LTEMPL_PAGE "SW_HID_LTEMPL_PAGE" +#define HID_LTEMPL_OVERRIDE "SW_HID_LTEMPL_OVERRIDE" +#define HID_LTEMPL_TEMPLATES "SW_HID_LTEMPL_TEMPLATES" +#define HID_NAVI_TBX17 "SW_HID_NAVI_TBX17" +#define HID_NAVI_TBX18 "SW_HID_NAVI_TBX18" +#define HID_NAVI_TBX19 "SW_HID_NAVI_TBX19" +#define HID_NAVI_TBX20 "SW_HID_NAVI_TBX20" +#define HID_NAVI_TBX21 "SW_HID_NAVI_TBX21" +#define HID_NAVI_TBX22 "SW_HID_NAVI_TBX22" +#define HID_NAVI_TBX23 "SW_HID_NAVI_TBX23" +#define HID_NAVI_TBX24 "SW_HID_NAVI_TBX24" +#define HID_NAVIGATOR_GLOBAL_TOOLBOX "SW_HID_NAVIGATOR_GLOBAL_TOOLBOX" +#define HID_NAVIGATOR_GLOB_TREELIST "SW_HID_NAVIGATOR_GLOB_TREELIST" +#define HID_GLOS_GROUP_TREE "SW_HID_GLOS_GROUP_TREE" +#define HID_GLBLTREE_UPDATE "SW_HID_GLBLTREE_UPDATE" +#define HID_GLBLTREE_INSERT "SW_HID_GLBLTREE_INSERT" +#define HID_GLBLTREE_EDIT "SW_HID_GLBLTREE_EDIT" +#define HID_GLBLTREE_DEL "SW_HID_GLBLTREE_DEL" +#define HID_GLBLTREE_INS_IDX "SW_HID_GLBLTREE_INS_IDX" +#define HID_GLBLTREE_INS_CNTIDX "SW_HID_GLBLTREE_INS_CNTIDX" +#define HID_GLBLTREE_INS_USRIDX "SW_HID_GLBLTREE_INS_USRIDX" +#define HID_GLBLTREE_INS_FILE "SW_HID_GLBLTREE_INS_FILE" +#define HID_GLBLTREE_INS_NEW_FILE "SW_HID_GLBLTREE_INS_NEW_FILE" +#define HID_GLBLTREE_INS_TEXT "SW_HID_GLBLTREE_INS_TEXT" +#define HID_GLBLTREE_UPD_SEL "SW_HID_GLBLTREE_UPD_SEL" +#define HID_GLBLTREE_UPD_IDX "SW_HID_GLBLTREE_UPD_IDX" +#define HID_GLBLTREE_UPD_LINK "SW_HID_GLBLTREE_UPD_LINK" +#define HID_GLBLTREEUPD_ALL "SW_HID_GLBLTREEUPD_ALL" +#define HID_NUM_OUTL_NAMED_NUMS "SW_HID_NUM_OUTL_NAMED_NUMS" +#define HID_NUM_OUTL_NUM_SAVEAS "SW_HID_NUM_OUTL_NUM_SAVEAS" +#define HID_NUM_NAMED_NUMS "SW_HID_NUM_NAMED_NUMS" +#define HID_NUM_NUM_SAVEAS "SW_HID_NUM_NUM_SAVEAS" +#define HID_NUM_STD_NUMBER "SW_HID_NUM_STD_NUMBER" +#define HID_NUM_DEL_NUMBER "SW_HID_NUM_DEL_NUMBER" +#define HID_NUM_STD_BULLET "SW_HID_NUM_STD_BULLET" +#define HID_NUM_DEL_BULLET "SW_HID_NUM_DEL_BULLET" +#define HID_NAVI_CONTENT "SW_HID_NAVI_CONTENT" +#define HID_NAVI_GLOBAL "SW_HID_NAVI_GLOBAL" +#define HID_LTEMPL_NUMBERING "SW_HID_LTEMPL_NUMBERING" +#define HID_FLDVAR_APPLY "SW_HID_FLDVAR_APPLY" +#define HID_FLDVAR_DELETE "SW_HID_FLDVAR_DELETE" +#define HID_FLDEDT_ADDRESS "SW_HID_FLDEDT_ADDRESS" +#define HID_SORT_ACTION "SW_HID_SORT_ACTION" +#define HID_SORT_AUTHOR "SW_HID_SORT_AUTHOR" +#define HID_SORT_DATE "SW_HID_SORT_DATE" +#define HID_SORT_COMMENT "SW_HID_SORT_COMMENT" +#define HID_SW_SORT_POSITION "SW_HID_SW_SORT_POSITION" +#define HID_SYNC_BTN "SW_HID_SYNC_BTN" +#define HID_EDIT_COMMENT "SW_HID_EDIT_COMMENT" +#define HID_SEL_TEMPLATE "SW_HID_SEL_TEMPLATE" +#define HID_DLG_SEQUENCE_OPTION "SW_HID_DLG_SEQUENCE_OPTION" +#define HID_DLG_FLDEDT_NEXT "SW_HID_DLG_FLDEDT_NEXT" +#define HID_DLG_FLDEDT_PREV "SW_HID_DLG_FLDEDT_PREV" +#define HID_DLG_FLDEDT_ADDRESS "SW_HID_DLG_FLDEDT_ADDRESS" +#define HID_DLG_PRV_PRT_OPTIONS "SW_HID_DLG_PRV_PRT_OPTIONS" + +#define HID_FILEDLG_CHARDLG "SW_HID_FILEDLG_CHARDLG" +#define HID_FILEDLG_LOADTEMPLATE "SW_HID_FILEDLG_LOADTEMPLATE" +#define HID_FILEDLG_ROMENU "SW_HID_FILEDLG_ROMENU" +#define HID_FILEDLG_MAILMRGE1 "SW_HID_FILEDLG_MAILMRGE1" +#define HID_FILEDLG_MAILMRGE2 "SW_HID_FILEDLG_MAILMRGE2" +#define HID_FILEDLG_FRMPAGE "SW_HID_FILEDLG_FRMPAGE" +#define HID_FILEDLG_SRCVIEW "SW_HID_FILEDLG_SRCVIEW" +#define HID_FILEDLG_WIZDOKU "SW_HID_FILEDLG_WIZDOKU" +#define HID_PREVIEW_ZOOM "SW_HID_PREVIEW_ZOOM" + +#define HID_REDLINE_AUTOFMT_ACCEPT "SW_HID_REDLINE_AUTOFMT_ACCEPT" +#define HID_MULTI_TOX_DLG "SW_HID_MULTI_TOX_DLG" +#define HID_ASCII_FILTER "SW_HID_ASCII_FILTER" +#define HID_GLBLTREE_EDIT_LINK "SW_HID_GLBLTREE_EDIT_LINK" +#define HID_FORMAT_NAME_OBJECT_NAME "SW_HID_FORMAT_NAME_OBJECT_NAME"// #100286# +#define HID_REFSELECTION_TOOLTIP "SW_HID_REFSELECTION_TOOLTIP" // #i83479# // TabPage Help-IDs ********************************************************* -#define HID_DROPCAPS (HID_BASE + 400) -#define HID_FRM_EXT (HID_BASE + 401) -#define HID_FRM_STD (HID_BASE + 402) -#define HID_GRF_EXT (HID_BASE + 403) -#define HID_COLUMN (HID_BASE + 404) -#define HID_DOC_STAT (HID_BASE + 405) -#define HID_MACROASSIGN (HID_BASE + 406) -#define HID_FOOTNOTE_PAGE (HID_BASE + 407) -#define HID_OPTDOCDISP_PAGE (HID_BASE + 408) -#define HID_OPTGRID_PAGE (HID_BASE + 409) -#define HID_OPTTEST_PAGE (HID_BASE + 410) -#define HID_OPTPRINT_PAGE (HID_BASE + 411) -#define HID_FORMAT_TABLE (HID_BASE + 412) -#define HID_TABLE_COLUMN (HID_BASE + 413) -#define HID_LAB_LAB (HID_BASE + 414) -#define HID_LAB_PRT (HID_BASE + 415) -#define HID_ENV_PRT (HID_BASE + 416) -#define HID_LAB_FMT (HID_BASE + 417) -#define HID_ENV_ENV (HID_BASE + 418) -#define HID_ENV_FMT (HID_BASE + 419) -#define HID_FRM_URL (HID_BASE + 421) -#define HID_CHAR_URL (HID_BASE + 422) -#define HID_CONTENT_OPT (HID_BASE + 423) -#define HID_LAYOUT_OPT (HID_BASE + 424) -#define HID_STD_FONT (HID_BASE + 425) -#define HID_COND_COLL (HID_BASE + 426) -#define HID_FRM_ADD (HID_BASE + 427) -#define HID_TABLE_TEXTFLOW (HID_BASE + 428) -#define HID_AUTOFMT_BY_INPUT (HID_BASE + 429) -#define HID_AUTOFMT_APPLY (HID_BASE + 430) -#define HID_OPTTABLE_PAGE (HID_BASE + 431) -#define HID_PICK_SINGLE_NUM (HID_BASE + 432) -#define HID_PICK_BULLET (HID_BASE + 433) -#define HID_PICK_NUM (HID_BASE + 434) -#define HID_PICK_BMP (HID_BASE + 435) - -#define HID_FLD_DB (HID_BASE + 437) -#define HID_FLD_DOKINF (HID_BASE + 438) -#define HID_FLD_VAR (HID_BASE + 439) -#define HID_FLD_DOK (HID_BASE + 440) -#define HID_FLD_FUNC (HID_BASE + 441) -#define HID_FLD_REF (HID_BASE + 442) -#define HID_OPTSHDWCRSR (HID_BASE + 443) -#define HID_NUM_OPTIONS (HID_BASE + 444) -#define HID_NUM_POSITION (HID_BASE + 445) -#define HID_NUMPARA (HID_BASE + 446) -#define HID_FOOTNOTE_OPTIONS (HID_BASE + 447) -#define HID_ENDNOTE_OPTIONS (HID_BASE + 448) -#define HID_REDLINE_OPT (HID_BASE + 449) -#define HID_LINENUMBERING (HID_BASE + 450) -#define HID_REDLINE_ACCEPT (HID_BASE + 451) -#define HID_EDIT_FLD_DB (HID_BASE + 452) -#define HID_EDIT_FLD_DOKINF (HID_BASE + 453) -#define HID_EDIT_FLD_VAR (HID_BASE + 454) -#define HID_EDIT_FLD_DOK (HID_BASE + 455) -#define HID_EDIT_FLD_FUNC (HID_BASE + 456) -#define HID_EDIT_FLD_REF (HID_BASE + 457) -#define HID_REDLINE_CTRL (HID_BASE + 458) -#define HID_TP_OUTLINE_NUM (HID_BASE + 459) -#define HID_OPTINSERT_PAGE (HID_BASE + 460) -#define HID_OPTCAPTION_PAGE (HID_BASE + 461) -#define HID_OPTLOAD_PAGE (HID_BASE + 462) -#define HID_INSERT_TOX_PAGE (HID_BASE + 463) -#define HID_TOX_FORM_ENTRY_PAGE (HID_BASE + 464) -#define HID_TOX_FORM_STYLES_PAGE (HID_BASE + 465) -#define HID_INSERT_TOX_TABDLG (HID_BASE + 466) -#define HID_INSERT_SECTION_PAGE (HID_BASE + 467) -#define HID_INSERT_SECTION_DLG (HID_BASE + 468) -#define HID_SECTION_PROPERTIES_DLG (HID_BASE + 469) -#define HID_RENAME_XNAMED (HID_BASE + 470) -#define HID_TP_TOX_SELECT (HID_BASE + 471) -#define HID_TP_TOX_ENTRY (HID_BASE + 472) -#define HID_TOX_STYLES_PAGE (HID_BASE + 473) -#define HID_TP_VISITING_CARDS (HID_BASE + 474) -#define HID_DLG_ADD_IDX_STYLES (HID_BASE + 475) -#define HID_ADD_STYLES_TLB (HID_BASE + 476) -#define HID_OLE_CHECKLB (HID_BASE + 477) -#define HID_DLG_CREATE_AUTH_ENTRY (HID_BASE + 478) -#define HID_TP_PRIVATE_DATA (HID_BASE + 479) - -#define HID_TP_BUSINESS_DATA (HID_BASE + 480) -#define HID_SECTION_FTNENDNOTES_PAGE (HID_BASE + 481) -#define HID_TEXTGRID_PAGE (HID_BASE + 482) -#define HID_OPTCOMPATIBILITY_PAGE (HID_BASE + 483) -#define HID_COMPATIBILITY_OPTIONS_BOX (HID_BASE + 484) +#define HID_DROPCAPS "SW_HID_DROPCAPS" +#define HID_FRM_EXT "SW_HID_FRM_EXT" +#define HID_FRM_STD "SW_HID_FRM_STD" +#define HID_GRF_EXT "SW_HID_GRF_EXT" +#define HID_COLUMN "SW_HID_COLUMN" +#define HID_DOC_STAT "SW_HID_DOC_STAT" +#define HID_MACROASSIGN "SW_HID_MACROASSIGN" +#define HID_FOOTNOTE_PAGE "SW_HID_FOOTNOTE_PAGE" +#define HID_OPTDOCDISP_PAGE "SW_HID_OPTDOCDISP_PAGE" +#define HID_OPTGRID_PAGE "SW_HID_OPTGRID_PAGE" +#define HID_OPTTEST_PAGE "SW_HID_OPTTEST_PAGE" +#define HID_OPTPRINT_PAGE "SW_HID_OPTPRINT_PAGE" +#define HID_FORMAT_TABLE "SW_HID_FORMAT_TABLE" +#define HID_TABLE_COLUMN "SW_HID_TABLE_COLUMN" +#define HID_LAB_LAB "SW_HID_LAB_LAB" +#define HID_LAB_PRT "SW_HID_LAB_PRT" +#define HID_ENV_PRT "SW_HID_ENV_PRT" +#define HID_LAB_FMT "SW_HID_LAB_FMT" +#define HID_ENV_ENV "SW_HID_ENV_ENV" +#define HID_ENV_FMT "SW_HID_ENV_FMT" +#define HID_FRM_URL "SW_HID_FRM_URL" +#define HID_CHAR_URL "SW_HID_CHAR_URL" +#define HID_CONTENT_OPT "SW_HID_CONTENT_OPT" +#define HID_LAYOUT_OPT "SW_HID_LAYOUT_OPT" +#define HID_STD_FONT "SW_HID_STD_FONT" +#define HID_COND_COLL "SW_HID_COND_COLL" +#define HID_FRM_ADD "SW_HID_FRM_ADD" +#define HID_TABLE_TEXTFLOW "SW_HID_TABLE_TEXTFLOW" +#define HID_AUTOFMT_BY_INPUT "SW_HID_AUTOFMT_BY_INPUT" +#define HID_AUTOFMT_APPLY "SW_HID_AUTOFMT_APPLY" +#define HID_OPTTABLE_PAGE "SW_HID_OPTTABLE_PAGE" +#define HID_PICK_SINGLE_NUM "SW_HID_PICK_SINGLE_NUM" +#define HID_PICK_BULLET "SW_HID_PICK_BULLET" +#define HID_PICK_NUM "SW_HID_PICK_NUM" +#define HID_PICK_BMP "SW_HID_PICK_BMP" + +#define HID_FLD_DB "SW_HID_FLD_DB" +#define HID_FLD_DOKINF "SW_HID_FLD_DOKINF" +#define HID_FLD_VAR "SW_HID_FLD_VAR" +#define HID_FLD_DOK "SW_HID_FLD_DOK" +#define HID_FLD_FUNC "SW_HID_FLD_FUNC" +#define HID_FLD_REF "SW_HID_FLD_REF" +#define HID_OPTSHDWCRSR "SW_HID_OPTSHDWCRSR" +#define HID_NUM_OPTIONS "SW_HID_NUM_OPTIONS" +#define HID_NUM_POSITION "SW_HID_NUM_POSITION" +#define HID_NUMPARA "SW_HID_NUMPARA" +#define HID_FOOTNOTE_OPTIONS "SW_HID_FOOTNOTE_OPTIONS" +#define HID_ENDNOTE_OPTIONS "SW_HID_ENDNOTE_OPTIONS" +#define HID_REDLINE_OPT "SW_HID_REDLINE_OPT" +#define HID_LINENUMBERING "SW_HID_LINENUMBERING" +#define HID_REDLINE_ACCEPT "SW_HID_REDLINE_ACCEPT" +#define HID_EDIT_FLD_DB "SW_HID_EDIT_FLD_DB" +#define HID_EDIT_FLD_DOKINF "SW_HID_EDIT_FLD_DOKINF" +#define HID_EDIT_FLD_VAR "SW_HID_EDIT_FLD_VAR" +#define HID_EDIT_FLD_DOK "SW_HID_EDIT_FLD_DOK" +#define HID_EDIT_FLD_FUNC "SW_HID_EDIT_FLD_FUNC" +#define HID_EDIT_FLD_REF "SW_HID_EDIT_FLD_REF" +#define HID_REDLINE_CTRL "SW_HID_REDLINE_CTRL" +#define HID_TP_OUTLINE_NUM "SW_HID_TP_OUTLINE_NUM" +#define HID_OPTINSERT_PAGE "SW_HID_OPTINSERT_PAGE" +#define HID_OPTCAPTION_PAGE "SW_HID_OPTCAPTION_PAGE" +#define HID_OPTLOAD_PAGE "SW_HID_OPTLOAD_PAGE" +#define HID_INSERT_TOX_PAGE "SW_HID_INSERT_TOX_PAGE" +#define HID_TOX_FORM_ENTRY_PAGE "SW_HID_TOX_FORM_ENTRY_PAGE" +#define HID_TOX_FORM_STYLES_PAGE "SW_HID_TOX_FORM_STYLES_PAGE" +#define HID_INSERT_TOX_TABDLG "SW_HID_INSERT_TOX_TABDLG" +#define HID_INSERT_SECTION_PAGE "SW_HID_INSERT_SECTION_PAGE" +#define HID_INSERT_SECTION_DLG "SW_HID_INSERT_SECTION_DLG" +#define HID_SECTION_PROPERTIES_DLG "SW_HID_SECTION_PROPERTIES_DLG" +#define HID_RENAME_XNAMED "SW_HID_RENAME_XNAMED" +#define HID_TP_TOX_SELECT "SW_HID_TP_TOX_SELECT" +#define HID_TP_TOX_ENTRY "SW_HID_TP_TOX_ENTRY" +#define HID_TOX_STYLES_PAGE "SW_HID_TOX_STYLES_PAGE" +#define HID_TP_VISITING_CARDS "SW_HID_TP_VISITING_CARDS" +#define HID_DLG_ADD_IDX_STYLES "SW_HID_DLG_ADD_IDX_STYLES" +#define HID_ADD_STYLES_TLB "SW_HID_ADD_STYLES_TLB" +#define HID_OLE_CHECKLB "SW_HID_OLE_CHECKLB" +#define HID_DLG_CREATE_AUTH_ENTRY "SW_HID_DLG_CREATE_AUTH_ENTRY" +#define HID_TP_PRIVATE_DATA "SW_HID_TP_PRIVATE_DATA" + +#define HID_TP_BUSINESS_DATA "SW_HID_TP_BUSINESS_DATA" +#define HID_SECTION_FTNENDNOTES_PAGE "SW_HID_SECTION_FTNENDNOTES_PAGE" +#define HID_TEXTGRID_PAGE "SW_HID_TEXTGRID_PAGE" +#define HID_OPTCOMPATIBILITY_PAGE "SW_HID_OPTCOMPATIBILITY_PAGE" +#define HID_COMPATIBILITY_OPTIONS_BOX "SW_HID_COMPATIBILITY_OPTIONS_BOX" // AutoPilot Help-IDs ********************************************************* -#define HID_LETTER_PAGE1 (HID_BASE + 501) -#define HID_LETTER_PAGE2 (HID_BASE + 502) -#define HID_LETTER_PAGE3 (HID_BASE + 503) -#define HID_LETTER_PAGE4 (HID_BASE + 504) -#define HID_LETTER_PAGE5 (HID_BASE + 505) -#define HID_LETTER_PAGE6 (HID_BASE + 506) -#define HID_LETTER_PAGE7 (HID_BASE + 507) -#define HID_LETTER_PAGE8 (HID_BASE + 508) -#define HID_LETTER_PAGE9 (HID_BASE + 509) - -#define HID_FAX_PAGE1 (HID_BASE + 511) -#define HID_FAX_PAGE2 (HID_BASE + 512) -#define HID_FAX_PAGE3 (HID_BASE + 513) -#define HID_FAX_PAGE4 (HID_BASE + 514) -#define HID_FAX_PAGE5 (HID_BASE + 515) -#define HID_FAX_PAGE6 (HID_BASE + 516) -#define HID_FAX_PAGE7 (HID_BASE + 517) -#define HID_FAX_PAGE8 (HID_BASE + 518) - -#define HID_MEMO_PAGE1 (HID_BASE + 521) -#define HID_MEMO_PAGE2 (HID_BASE + 522) -#define HID_MEMO_PAGE3 (HID_BASE + 523) -#define HID_MEMO_PAGE4 (HID_BASE + 524) -#define HID_MEMO_PAGE5 (HID_BASE + 525) - -#define HID_AGENDA_PAGE1 (HID_BASE + 531) -#define HID_AGENDA_PAGE2 (HID_BASE + 532) -#define HID_AGENDA_PAGE3 (HID_BASE + 533) -#define HID_AGENDA_PAGE4 (HID_BASE + 534) -#define HID_AGENDA_PAGE5 (HID_BASE + 535) -#define HID_AGENDA_PAGE6 (HID_BASE + 536) - -#define HID_AUTOPILOT_NEXT (HID_BASE + 537) -#define HID_AUTOPILOT_PREV (HID_BASE + 538) -#define HID_AUTOPILOT_OK (HID_BASE + 539) +#define HID_LETTER_PAGE1 "SW_HID_LETTER_PAGE1" +#define HID_LETTER_PAGE2 "SW_HID_LETTER_PAGE2" +#define HID_LETTER_PAGE3 "SW_HID_LETTER_PAGE3" +#define HID_LETTER_PAGE4 "SW_HID_LETTER_PAGE4" +#define HID_LETTER_PAGE5 "SW_HID_LETTER_PAGE5" +#define HID_LETTER_PAGE6 "SW_HID_LETTER_PAGE6" +#define HID_LETTER_PAGE7 "SW_HID_LETTER_PAGE7" +#define HID_LETTER_PAGE8 "SW_HID_LETTER_PAGE8" +#define HID_LETTER_PAGE9 "SW_HID_LETTER_PAGE9" + +#define HID_FAX_PAGE1 "SW_HID_FAX_PAGE1" +#define HID_FAX_PAGE2 "SW_HID_FAX_PAGE2" +#define HID_FAX_PAGE3 "SW_HID_FAX_PAGE3" +#define HID_FAX_PAGE4 "SW_HID_FAX_PAGE4" +#define HID_FAX_PAGE5 "SW_HID_FAX_PAGE5" +#define HID_FAX_PAGE6 "SW_HID_FAX_PAGE6" +#define HID_FAX_PAGE7 "SW_HID_FAX_PAGE7" +#define HID_FAX_PAGE8 "SW_HID_FAX_PAGE8" + +#define HID_MEMO_PAGE1 "SW_HID_MEMO_PAGE1" +#define HID_MEMO_PAGE2 "SW_HID_MEMO_PAGE2" +#define HID_MEMO_PAGE3 "SW_HID_MEMO_PAGE3" +#define HID_MEMO_PAGE4 "SW_HID_MEMO_PAGE4" +#define HID_MEMO_PAGE5 "SW_HID_MEMO_PAGE5" + +#define HID_AGENDA_PAGE1 "SW_HID_AGENDA_PAGE1" +#define HID_AGENDA_PAGE2 "SW_HID_AGENDA_PAGE2" +#define HID_AGENDA_PAGE3 "SW_HID_AGENDA_PAGE3" +#define HID_AGENDA_PAGE4 "SW_HID_AGENDA_PAGE4" +#define HID_AGENDA_PAGE5 "SW_HID_AGENDA_PAGE5" +#define HID_AGENDA_PAGE6 "SW_HID_AGENDA_PAGE6" + +#define HID_AUTOPILOT_NEXT "SW_HID_AUTOPILOT_NEXT" +#define HID_AUTOPILOT_PREV "SW_HID_AUTOPILOT_PREV" +#define HID_AUTOPILOT_OK "SW_HID_AUTOPILOT_OK" // HelpIds fuers Menue ***************************************************** -#define HID_MN_SUB_TBLROW (HID_BASE + 600) -#define HID_MN_SUB_TBLCOL (HID_BASE + 601) -#define HID_MN_SUB_AUTOFORMAT (HID_BASE + 602) -#define HID_MN_SUB_TOOLBAR (HID_BASE + 603) -#define HID_MN_SUB_FIELD (HID_BASE + 604) -#define HID_MN_SUB_GRAPHIC (HID_BASE + 605) -#define HID_MN_SUB_TEMPLATES (HID_BASE + 606) -#define HID_MN_SUB_ARRANGE (HID_BASE + 607) -#define HID_MN_SUB_SPELLING (HID_BASE + 608) -#define HID_MN_SUB_UPDATE (HID_BASE + 609) -#define HID_MN_SUB_MIRROR (HID_BASE + 610) -#define HID_MN_SUB_ALIGN (HID_BASE + 611) -#define HID_MN_SUB_OPTIONS (HID_BASE + 612) - -#define HID_MN_CALC_PHD (HID_BASE + 613) -#define HID_MN_CALC_SQRT (HID_BASE + 614) -#define HID_MN_CALC_OR (HID_BASE + 615) -#define HID_MN_CALC_XOR (HID_BASE + 616) -#define HID_MN_CALC_AND (HID_BASE + 617) -#define HID_MN_CALC_NOT (HID_BASE + 618) -#define HID_MN_CALC_EQ (HID_BASE + 619) -#define HID_MN_CALC_NEQ (HID_BASE + 620) -#define HID_MN_CALC_LEQ (HID_BASE + 621) -#define HID_MN_CALC_GEQ (HID_BASE + 622) -#define HID_MN_CALC_LES (HID_BASE + 623) -#define HID_MN_CALC_GRE (HID_BASE + 624) -#define HID_MN_CALC_SUM (HID_BASE + 625) -#define HID_MN_CALC_MEAN (HID_BASE + 626) -#define HID_MN_CALC_MIN (HID_BASE + 627) -#define HID_MN_CALC_MAX (HID_BASE + 628) -#define HID_MN_CALC_SIN (HID_BASE + 629) -#define HID_MN_CALC_COS (HID_BASE + 630) -#define HID_MN_CALC_TAN (HID_BASE + 631) -#define HID_MN_CALC_ASIN (HID_BASE + 632) -#define HID_MN_CALC_ACOS (HID_BASE + 633) -#define HID_MN_CALC_ATAN (HID_BASE + 634) -#define HID_MN_CALC_POW (HID_BASE + 635) -#define HID_MN_CALC_LISTSEP (HID_BASE + 636) -#define HID_MN_POP_OPS (HID_BASE + 637) -#define HID_MN_POP_STATISTICS (HID_BASE + 638) -#define HID_MN_POP_FUNC (HID_BASE + 639) -#define HID_MN_RSC_END (HID_BASE + 640) -#define HID_MN_CALC_ROUND (HID_BASE + 641) -#define HID_MN_SUB_MACRO (HID_BASE + 642) - -#define HID_MN_READONLY_SAVEGRAPHIC (HID_BASE + 645) -#define HID_MN_READONLY_GRAPHICTOGALLERY (HID_BASE + 646) -#define HID_MN_READONLY_TOGALLERYLINK (HID_BASE + 647) -#define HID_MN_READONLY_TOGALLERYCOPY (HID_BASE + 648) -#define HID_MN_READONLY_SAVEBACKGROUND (HID_BASE + 649) -#define HID_MN_READONLY_BACKGROUNDTOGALLERY (HID_BASE + 650) -#define HID_MN_READONLY_COPYLINK (HID_BASE + 651) -#define HID_MN_READONLY_COPYGRAPHIC (HID_BASE + 652) -#define HID_MN_READONLY_LOADGRAPHIC (HID_BASE + 653) -#define HID_MN_READONLY_GRAPHICOFF (HID_BASE + 654) -#define HID_MN_READONLY_PLUGINOFF (HID_BASE + 655) - -#define HID_MD_GLOS_DEFINE (HID_BASE + 656) -#define HID_MD_GLOS_REPLACE (HID_BASE + 657) -#define HID_MD_GLOS_RENAME (HID_BASE + 658) -#define HID_MD_GLOS_DELETE (HID_BASE + 659) -#define HID_MD_GLOS_EDIT (HID_BASE + 660) -#define HID_MD_GLOS_MACRO (HID_BASE + 661) -#define HID_LINGU_ADD_WORD (HID_BASE + 662) -#define HID_LINGU_IGNORE_WORD (HID_BASE + 663) -#define HID_LINGU_SPELLING_DLG (HID_BASE + 664) -#define HID_LINGU_AUTOCORR (HID_BASE + 665) -#define HID_LINGU_REPLACE (HID_BASE + 666) -#define HID_MD_GLOS_CATEGORY (HID_BASE + 667) -#define HID_REGION_TREE (HID_BASE + 668) -#define HID_LINGU_WORD_LANGUAGE (HID_BASE + 669) -#define HID_LINGU_PARA_LANGUAGE (HID_BASE + 670) -#define HID_MD_GLOS_DEFINE_TEXT (HID_BASE + 671) -#define HID_DLG_PASSWD_SECTION (HID_BASE + 672) -#define HID_MD_COPY_TO_CLIPBOARD (HID_BASE + 673) -#define HID_MD_GLOS_IMPORT (HID_BASE + 674) -#define HID_SMARTTAG_MAIN (HID_BASE + 675) // SMARTTAGS -#define HID_LINGU_IGNORE_SELECTION (HID_BASE + 676) // grammar check context menu +#define HID_MN_SUB_TBLROW "SW_HID_MN_SUB_TBLROW" +#define HID_MN_SUB_TBLCOL "SW_HID_MN_SUB_TBLCOL" +#define HID_MN_SUB_AUTOFORMAT "SW_HID_MN_SUB_AUTOFORMAT" +#define HID_MN_SUB_TOOLBAR "SW_HID_MN_SUB_TOOLBAR" +#define HID_MN_SUB_FIELD "SW_HID_MN_SUB_FIELD" +#define HID_MN_SUB_GRAPHIC "SW_HID_MN_SUB_GRAPHIC" +#define HID_MN_SUB_TEMPLATES "SW_HID_MN_SUB_TEMPLATES" +#define HID_MN_SUB_ARRANGE "SW_HID_MN_SUB_ARRANGE" +#define HID_MN_SUB_SPELLING "SW_HID_MN_SUB_SPELLING" +#define HID_MN_SUB_UPDATE "SW_HID_MN_SUB_UPDATE" +#define HID_MN_SUB_MIRROR "SW_HID_MN_SUB_MIRROR" +#define HID_MN_SUB_ALIGN "SW_HID_MN_SUB_ALIGN" +#define HID_MN_SUB_OPTIONS "SW_HID_MN_SUB_OPTIONS" + +#define HID_MN_CALC_PHD "SW_HID_MN_CALC_PHD" +#define HID_MN_CALC_SQRT "SW_HID_MN_CALC_SQRT" +#define HID_MN_CALC_OR "SW_HID_MN_CALC_OR" +#define HID_MN_CALC_XOR "SW_HID_MN_CALC_XOR" +#define HID_MN_CALC_AND "SW_HID_MN_CALC_AND" +#define HID_MN_CALC_NOT "SW_HID_MN_CALC_NOT" +#define HID_MN_CALC_EQ "SW_HID_MN_CALC_EQ" +#define HID_MN_CALC_NEQ "SW_HID_MN_CALC_NEQ" +#define HID_MN_CALC_LEQ "SW_HID_MN_CALC_LEQ" +#define HID_MN_CALC_GEQ "SW_HID_MN_CALC_GEQ" +#define HID_MN_CALC_LES "SW_HID_MN_CALC_LES" +#define HID_MN_CALC_GRE "SW_HID_MN_CALC_GRE" +#define HID_MN_CALC_SUM "SW_HID_MN_CALC_SUM" +#define HID_MN_CALC_MEAN "SW_HID_MN_CALC_MEAN" +#define HID_MN_CALC_MIN "SW_HID_MN_CALC_MIN" +#define HID_MN_CALC_MAX "SW_HID_MN_CALC_MAX" +#define HID_MN_CALC_SIN "SW_HID_MN_CALC_SIN" +#define HID_MN_CALC_COS "SW_HID_MN_CALC_COS" +#define HID_MN_CALC_TAN "SW_HID_MN_CALC_TAN" +#define HID_MN_CALC_ASIN "SW_HID_MN_CALC_ASIN" +#define HID_MN_CALC_ACOS "SW_HID_MN_CALC_ACOS" +#define HID_MN_CALC_ATAN "SW_HID_MN_CALC_ATAN" +#define HID_MN_CALC_POW "SW_HID_MN_CALC_POW" +#define HID_MN_CALC_LISTSEP "SW_HID_MN_CALC_LISTSEP" +#define HID_MN_POP_OPS "SW_HID_MN_POP_OPS" +#define HID_MN_POP_STATISTICS "SW_HID_MN_POP_STATISTICS" +#define HID_MN_POP_FUNC "SW_HID_MN_POP_FUNC" +#define HID_MN_RSC_END "SW_HID_MN_RSC_END" +#define HID_MN_CALC_ROUND "SW_HID_MN_CALC_ROUND" +#define HID_MN_SUB_MACRO "SW_HID_MN_SUB_MACRO" + +#define HID_MN_READONLY_SAVEGRAPHIC "SW_HID_MN_READONLY_SAVEGRAPHIC" +#define HID_MN_READONLY_GRAPHICTOGALLERY "SW_HID_MN_READONLY_GRAPHICTOGALLERY" +#define HID_MN_READONLY_TOGALLERYLINK "SW_HID_MN_READONLY_TOGALLERYLINK" +#define HID_MN_READONLY_TOGALLERYCOPY "SW_HID_MN_READONLY_TOGALLERYCOPY" +#define HID_MN_READONLY_SAVEBACKGROUND "SW_HID_MN_READONLY_SAVEBACKGROUND" +#define HID_MN_READONLY_BACKGROUNDTOGALLERY "SW_HID_MN_READONLY_BACKGROUNDTOGALLERY" +#define HID_MN_READONLY_COPYLINK "SW_HID_MN_READONLY_COPYLINK" +#define HID_MN_READONLY_COPYGRAPHIC "SW_HID_MN_READONLY_COPYGRAPHIC" +#define HID_MN_READONLY_LOADGRAPHIC "SW_HID_MN_READONLY_LOADGRAPHIC" +#define HID_MN_READONLY_GRAPHICOFF "SW_HID_MN_READONLY_GRAPHICOFF" +#define HID_MN_READONLY_PLUGINOFF "SW_HID_MN_READONLY_PLUGINOFF" + +#define HID_MD_GLOS_DEFINE "SW_HID_MD_GLOS_DEFINE" +#define HID_MD_GLOS_REPLACE "SW_HID_MD_GLOS_REPLACE" +#define HID_MD_GLOS_RENAME "SW_HID_MD_GLOS_RENAME" +#define HID_MD_GLOS_DELETE "SW_HID_MD_GLOS_DELETE" +#define HID_MD_GLOS_EDIT "SW_HID_MD_GLOS_EDIT" +#define HID_MD_GLOS_MACRO "SW_HID_MD_GLOS_MACRO" +#define HID_LINGU_ADD_WORD "SW_HID_LINGU_ADD_WORD" +#define HID_LINGU_IGNORE_WORD "SW_HID_LINGU_IGNORE_WORD" +#define HID_LINGU_SPELLING_DLG "SW_HID_LINGU_SPELLING_DLG" +#define HID_LINGU_AUTOCORR "SW_HID_LINGU_AUTOCORR" +#define HID_LINGU_REPLACE "SW_HID_LINGU_REPLACE" +#define HID_MD_GLOS_CATEGORY "SW_HID_MD_GLOS_CATEGORY" +#define HID_REGION_TREE "SW_HID_REGION_TREE" +#define HID_LINGU_WORD_LANGUAGE "SW_HID_LINGU_WORD_LANGUAGE" +#define HID_LINGU_PARA_LANGUAGE "SW_HID_LINGU_PARA_LANGUAGE" +#define HID_MD_GLOS_DEFINE_TEXT "SW_HID_MD_GLOS_DEFINE_TEXT" +#define HID_DLG_PASSWD_SECTION "SW_HID_DLG_PASSWD_SECTION" +#define HID_MD_COPY_TO_CLIPBOARD "SW_HID_MD_COPY_TO_CLIPBOARD" +#define HID_MD_GLOS_IMPORT "SW_HID_MD_GLOS_IMPORT" +#define HID_SMARTTAG_MAIN "SW_HID_SMARTTAG_MAIN" // SMARTTAGS +#define HID_LINGU_IGNORE_SELECTION "SW_HID_LINGU_IGNORE_SELECTION" // grammar check context menu // Weiter Help-IDs ********************************************************** -#define HID_CLOSE_FILE (HID_BASE + 1001) -#define HID_LAUNCH_REGISTRY (HID_BASE + 1002) -#define HID_MERGE_FILE (HID_BASE + 1003) -#define HID_MERGE_FILE_DLG (HID_BASE + 1004) -#define HID_NEW_FILE (HID_BASE + 1005) -#define HID_OPEN_FILE (HID_BASE + 1007) -#define HID_OPEN_LASTVERSION (HID_BASE + 1009) -#define HID_PRINT_FILE (HID_BASE + 1010) -#define HID_PRINT_FILE_OPTIONS (HID_BASE + 1011) -#define HID_SAVE_FILE_AS (HID_BASE + 1012) -#define HID_SAVE_FILE (HID_BASE + 1013) -#define HID_SETUP_PRINTER_DLG (HID_BASE + 1015) -#define HID_EXIT (HID_BASE + 1017) -#define HID_CREATE_DOCUMENT (HID_BASE + 1019) -#define HID_DOCSTAT_DLG (HID_BASE + 1020) -#define HID_LOAD_TEMPLATE_DLG (HID_BASE + 1021) -#define HID_SAVE_ALL (HID_BASE + 1023) -#define HID_NEW_FILE_DEFAULT (HID_BASE + 1024) -#define HID_PRINT_FILE_DEFAULT (HID_BASE + 1025) -#define HID_FAX (HID_BASE + 1028) -#define HID_SELECT_DATABASE (HID_BASE + 1030) -#define HID_DOC_INFO_DLG (HID_BASE + 1031) -#define HID_DOC_MGR_DLG (HID_BASE + 1032) -#define HID_OPTCAPTION_CLB (HID_BASE + 1033) - -#define HID_COPY (HID_BASE + 1102) -#define HID_CUT (HID_BASE + 1103) -#define HID_EDIT_FIELD (HID_BASE + 1104) -#define HID_EDIT_FILE_INFO_DLG (HID_BASE + 1107) -#define HID_EDIT_LINK_DLG (HID_BASE + 1109) -#define HID_EDIT_OBJECT (HID_BASE + 1110) -#define HID_GOTO (HID_BASE + 1111) -#define HID_SET_FIELD_VALUE (HID_BASE + 1112) -#define HID_PASTE (HID_BASE + 1113) -#define HID_REDO (HID_BASE + 1116) -#define HID_SEARCH (HID_BASE + 1117) -#define HID_REPLACE (HID_BASE + 1118) -#define HID_SELECT_ALL (HID_BASE + 1119) -#define HID_UNDO (HID_BASE + 1120) -#define HID_REPEAT (HID_BASE + 1122) -#define HID_BUFFER_UPDATE (HID_BASE + 1124) -#define HID_UPDATE_FIELDS (HID_BASE + 1126) -#define HID_EXECUTE_MACROFIELD (HID_BASE + 1127) -#define HID_EDIT_FORMULA (HID_BASE + 1128) -#define HID_CALC_TABLE (HID_BASE + 1129) -#define HID_NUM_BULLET_DOWN (HID_BASE + 1130) -#define HID_NUM_BULLET_UP (HID_BASE + 1131) -#define HID_NUM_BULLET_PREV (HID_BASE + 1132) -#define HID_NUM_BULLET_NEXT (HID_BASE + 1133) -#define HID_NUM_BULLET_MOVEUP (HID_BASE + 1134) -#define HID_NUM_BULLET_MOVEDOWN (HID_BASE + 1135) -#define HID_NUM_BULLET_NONUM (HID_BASE + 1136) -#define HID_NUM_BULLET_OFF (HID_BASE + 1137) -#define HID_NUM_BULLET_ON (HID_BASE + 1138) -#define HID_NUM_BULLET_OUTLINE_DOWN (HID_BASE + 1139) -#define HID_NUM_BULLET_OUTLINE_UP (HID_BASE + 1140) -#define HID_NUM_BULLET_OUTLINE_MOVEUP (HID_BASE + 1141) -#define HID_NUM_BULLET_OUTLINE_MOVEDOWN (HID_BASE + 1142) -#define HID_UPDATE_INPUTFIELDS (HID_BASE + 1143) -#define HID_NUM_NUMBERING_ON (HID_BASE + 1144) -#define HID_REPEAT_SEARCH (HID_BASE + 1150) -#define HID_REPAGINATE (HID_BASE + 1161) - -#define HID_REFRESH_VIEW (HID_BASE + 1201) -#define HID_RIBBON (HID_BASE + 1210) -#define HID_RULER (HID_BASE + 1211) -#define HID_STATUSBAR (HID_BASE + 1212) -#define HID_TOOLBOX (HID_BASE + 1213) -#define HID_VIEW_BOUNDS (HID_BASE + 1214) -#define HID_VIEW_FIELDS (HID_BASE + 1215) -#define HID_VLINEAL (HID_BASE + 1216) -#define HID_VSCROLLBAR (HID_BASE + 1217) -#define HID_HSCROLLBAR (HID_BASE + 1218) -#define HID_VIEW_META_CHARS (HID_BASE + 1224) -#define HID_VIEW_MARKS (HID_BASE + 1225) -#define HID_VIEW_FIELDNAME (HID_BASE + 1226) -#define HID_VIEW_TABLEGRID (HID_BASE + 1227) -#define HID_ZOOM (HID_BASE + 1231) - -#define HID_DELETE_BOOKMARK (HID_BASE + 1301) -#define HID_INSERT_BREAK (HID_BASE + 1303) -#define HID_INSERT_COLUMN_BREAK (HID_BASE + 1305) -#define HID_INSERT_FILE (HID_BASE + 1309) -#define HID_INSERT_FOOTNOTE (HID_BASE + 1311) -#define HID_INSERT_GRAFIC (HID_BASE + 1315) -#define HID_INSERT_LINEBREAK (HID_BASE + 1318) -#define HID_INSERT_MERGEFIELD_DLG (HID_BASE + 1320) -#define HID_INSERT_OBJECT_DLG (HID_BASE + 1322) -#define HID_INSERT_PAGEBREAK (HID_BASE + 1323) -#define HID_INSERT_RECORD (HID_BASE + 1326) -#define HID_MERGE_RECORD (HID_BASE + 1327) -#define HID_INSERT_SYMBOL (HID_BASE + 1328) -#define HID_INSERT_STRING (HID_BASE + 1331) -#define HID_INSERT_COLS (HID_BASE + 1332) -#define HID_INSERT_FRAME_INTERACT (HID_BASE + 1333) -#define HID_INSERT_FRAME (HID_BASE + 1334) -#define HID_INSERT_IDX_ENTRY (HID_BASE + 1340) -#define HID_INSERT_USERIDX_ENTRY (HID_BASE + 1341) -#define HID_INSERT_CNTNTIDX_ENTRY (HID_BASE + 1342) -#define HID_INSERT_SOFT_HYPHEN (HID_BASE + 1350) -#define HID_INSERT_HARD_SPACE (HID_BASE + 1351) - -#define HID_SET_FONT (HID_BASE + 1401) -#define HID_SET_FONT_SIZE (HID_BASE + 1402) -#define HID_GROW_FONT_SIZE (HID_BASE + 1403) -#define HID_SHRINK_FONT_SIZE (HID_BASE + 1404) -#define HID_SET_BOLD (HID_BASE + 1405) -#define HID_SET_ITALIC (HID_BASE + 1406) -#define HID_SET_SHADOW (HID_BASE + 1407) -#define HID_SET_OUTLINE (HID_BASE + 1408) -#define HID_SET_UNDERLINE (HID_BASE + 1409) -#define HID_SET_STRIKEOUT (HID_BASE + 1410) -#define HID_SET_SUPER_SCRIPT (HID_BASE + 1411) -#define HID_SET_SUB_SCRIPT (HID_BASE + 1412) -#define HID_SET_COLOR (HID_BASE + 1413) -#define HID_SET_CASEMAP (HID_BASE + 1414) -#define HID_SET_LANGUAGE (HID_BASE + 1415) -#define HID_SET_KERNING (HID_BASE + 1416) -#define HID_INDENT_TO_TABSTOP (HID_BASE + 1417) -#define HID_SET_LEFT_PARA (HID_BASE + 1418) -#define HID_SET_RIGHT_PARA (HID_BASE + 1419) -#define HID_SET_CENTER_PARA (HID_BASE + 1420) -#define HID_SET_JUSTIFY_PARA (HID_BASE + 1421) -#define HID_SET_LINE_SPACE_1 (HID_BASE + 1422) -#define HID_SET_LINE_SPACE_15 (HID_BASE + 1423) -#define HID_SET_LINE_SPACE_2 (HID_BASE + 1424) -#define HID_FLIP_HORZ_GRAFIC (HID_BASE + 1425) -#define HID_FLIP_VERT_GRAFIC (HID_BASE + 1426) -#define HID_SET_ADJUST (HID_BASE + 1428) -#define HID_SET_LRMARGIN (HID_BASE + 1429) -#define HID_SET_ULMARGIN (HID_BASE + 1430) -#define HID_UNINDENT_TO_TABSTOP (HID_BASE + 1431) -#define HID_SET_HYPHEN_ZONE (HID_BASE + 1432) -#define HID_SET_PAGE_BREAK (HID_BASE + 1433) -#define HID_SET_KEEP_TOGETHER (HID_BASE + 1434) -#define HID_SET_WIDOW (HID_BASE + 1436) -#define HID_SET_ORPHAN (HID_BASE + 1437) -#define HID_FORMAT_SHADOW (HID_BASE + 1438) -#define HID_FORMAT_BORDER (HID_BASE + 1439) -#define HID_FORMAT_CHAR_DLG (HID_BASE + 1441) -#define HID_FORMAT_PARA_DLG (HID_BASE + 1443) -#define HID_FORMAT_TAB (HID_BASE + 1444) -#define HID_FORMAT_TAB_DLG (HID_BASE + 1445) -#define HID_FORMAT_BORDER_DLG (HID_BASE + 1447) -#define HID_FORMAT_BACKGROUND (HID_BASE + 1448) -#define HID_FORMAT_BACKGROUND_DLG (HID_BASE + 1450) -#define HID_FORMAT_PAGE (HID_BASE + 1451) -#define HID_FORMAT_PAGE_DLG (HID_BASE + 1452) -#define HID_FORMAT_DROPCAPS (HID_BASE + 1454) -#define HID_FORMAT_FRAME_DLG (HID_BASE + 1456) -#define HID_FORMAT_GRAFIC_DLG (HID_BASE + 1458) -#define HID_FORMAT_TABLE_DLG (HID_BASE + 1460) -#define HID_NEW_STYLE_BY_EXAMPLE (HID_BASE + 1462) -#define HID_UPDATE_STYLE_BY_EXAMPLE (HID_BASE + 1463) -#define HID_STYLE_SHEET_FRAME_DLG (HID_BASE + 1464) -#define HID_STYLE_SHEET_DOC_DLG (HID_BASE + 1465) -#define HID_FORMAT_RESET (HID_BASE + 1469) -#define HID_FRAME_TO_TOP (HID_BASE + 1470) -#define HID_FRAME_TO_BOTTOM (HID_BASE + 1471) -#define HID_FRAME_NOWRAP (HID_BASE + 1472) -#define HID_FRAME_WRAP (HID_BASE + 1473) -#define HID_FRAME_WRAPTHRU (HID_BASE + 1474) -#define HID_FRAME_ALIGN_HORZ_LEFT (HID_BASE + 1475) -#define HID_FRAME_ALIGN_HORZ_RIGHT (HID_BASE + 1476) -#define HID_FRAME_ALIGN_HORZ_CENTER (HID_BASE + 1477) -#define HID_FRAME_ALIGN_VERT_TOP (HID_BASE + 1478) -#define HID_FRAME_ALIGN_VERT_BOTTOM (HID_BASE + 1479) -#define HID_FRAME_ALIGN_VERT_CENTER (HID_BASE + 1480) -#define HID_SET_FRM_SIZE (HID_BASE + 1481) -#define HID_SET_FRM_POSITION (HID_BASE + 1482) -#define HID_SET_FRM_ANCHOR (HID_BASE + 1483) -#define HID_SET_FRM_WRAP (HID_BASE + 1484) -#define HID_SET_FRM_DIST (HID_BASE + 1485) -#define HID_SET_FRM_OPTIONS (HID_BASE + 1486) -#define HID_SET_GRF_MIRROR (HID_BASE + 1488) -#define HID_SET_TABLE_WIDTH (HID_BASE + 1489) -#define HID_SET_TABLE_ALIGN (HID_BASE + 1490) -#define HID_SET_CHAR_STYLE (HID_BASE + 1491) -#define HID_SET_PARA_STYLE (HID_BASE + 1492) -#define HID_SET_PAGE_STYLE (HID_BASE + 1493) -#define HID_SET_FRM_MACRO (HID_BASE + 1494) -#define HID_SET_FRM_COLUMNS (HID_BASE + 1495) -#define HID_SET_FRM_COLUMN_WIDTH (HID_BASE + 1496) -#define HID_UPDATE_STYLES_DIRECT (HID_BASE + 1497) - -#define HID_TABLE_INSERT_ROW (HID_BASE + 1501) -#define HID_TABLE_DELETE_ROW (HID_BASE + 1503) -#define HID_TABLE_DELETE_COL (HID_BASE + 1504) -#define HID_TABLE_MERGE_CELLS (HID_BASE + 1506) -#define HID_AUTOFMT_TABLE (HID_BASE + 1507) -#define HID_SWDLG_STRINPUT (HID_BASE + 1508) -#define HID_TABLE_SET_ULSPACE (HID_BASE + 1509) -#define HID_TABLE_SET_GRID (HID_BASE + 1510) -#define HID_TABLE_SET_SHADOW (HID_BASE + 1511) -#define HID_TABLE_SELECT_ROW (HID_BASE + 1513) -#define HID_TABLE_SELECT_COL (HID_BASE + 1514) -#define HID_TABLE_SELECT_ALL (HID_BASE + 1515) -#define HID_TABLE_SET_READ_ONLY_CELLS (HID_BASE + 1517) -#define HID_TABLE_UNSET_READ_ONLY_CELLS (HID_BASE + 1519) -#define HID_PAGE_STYLE_SET_COLS (HID_BASE + 1538) -#define HID_SET_PROP_LINE_SPACE (HID_BASE + 1540) -#define HID_SET_ABS_LINE_SPACE (HID_BASE + 1541) - -#define HID_SPELLING_DLG (HID_BASE + 1601) -#define HID_THESAURUS_DLG (HID_BASE + 1604) -#define HID_HYPHENATE_OPT_DLG (HID_BASE + 1607) -#define HID_SORTING (HID_BASE + 1613) -#define HID_SORTING_DLG (HID_BASE + 1614) -#define HID_CALCULATE (HID_BASE + 1615) -#define HID_RECORD_MACRO_DLG (HID_BASE + 1622) -#define HID_PLAY_MACRO_DLG (HID_BASE + 1624) -#define HID_CONFIG_DLG (HID_BASE + 1627) -#define HID_EXPAND_GLOSSARY (HID_BASE + 1628) -#define HID_RENAME_GLOSSARY (HID_BASE + 1629) -#define HID_CONFIG_MENU (HID_BASE + 1630) -#define HID_CONFIG_KEY (HID_BASE + 1631) -#define HID_ASSIGN_LOCAL_MACRO_DLG (HID_BASE + 1632) -#define HID_COMPILE_MACRO (HID_BASE + 1633) -#define HID_CONFIG_VIEWOPTIONS (HID_BASE + 1635) -#define HID_CONFIG_COLORS (HID_BASE + 1636) -#define HID_INSERT_GLOSSARY (HID_BASE + 1640) -#define HID_AUTO_CORRECT (HID_BASE + 1649) -#define HID_AUTO_CORRECT_DLG (HID_BASE + 1650) -#define HID_HELP_PI (HID_BASE + 1655) -#define HID_NAVIGATION_PI (HID_BASE + 1656) -#define HID_TEMPLATE_PI (HID_BASE + 1657) -#define HID_ADDR_PI (HID_BASE + 1658) -#define HID_NAVIGATION_PI_GOTO_PAGE (HID_BASE + 1659) -#define HID_LETTER_WIZZARD (HID_BASE + 1660) -#define HID_FAX_WIZZARD (HID_BASE + 1661) -#define HID_MEMO_WIZZARD (HID_BASE + 1662) -#define HID_AGENDA_WIZZARD (HID_BASE + 1663) - -#define HID_NEW_WINDOW (HID_BASE + 1701) -#define HID_ARRANGE_ALL_WIN (HID_BASE + 1702) -#define HID_ARRANGE_CASCADE_WIN (HID_BASE + 1703) -#define HID_ARRANGE_HORZ_WIN (HID_BASE + 1704) -#define HID_ARRANGE_VERT_WIN (HID_BASE + 1705) - -#define HID_SHOW_HELP_INDEX (HID_BASE + 1802) -#define HID_SHOW_KEYBOARD_HELP (HID_BASE + 1803) -#define HID_SHOW_HELP_MANUAL (HID_BASE + 1804) -#define HID_SHOW_UPDATE_HELP (HID_BASE + 1805) - -#define HID_CHAR_LEFT (HID_BASE + 1901) -#define HID_CHAR_RIGHT (HID_BASE + 1902) -#define HID_LINE_UP (HID_BASE + 1903) -#define HID_LINE_DOWN (HID_BASE + 1904) -#define HID_START_OF_LINE (HID_BASE + 1905) -#define HID_END_OF_LINE (HID_BASE + 1906) -#define HID_START_OF_DOCUMENT (HID_BASE + 1907) -#define HID_END_OF_DOCUMENT (HID_BASE + 1908) -#define HID_START_OF_NEXT_PAGE (HID_BASE + 1909) -#define HID_END_OF_NEXT_PAGE (HID_BASE + 1910) -#define HID_START_OF_PREV_PAGE (HID_BASE + 1911) -#define HID_END_OF_PREV_PAGE (HID_BASE + 1912) -#define HID_START_OF_PAGE (HID_BASE + 1913) -#define HID_END_OF_PAGE (HID_BASE + 1914) -#define HID_START_OF_COLUMN (HID_BASE + 1917) -#define HID_END_OF_COLUMN (HID_BASE + 1918) -#define HID_START_OF_PARA (HID_BASE + 1919) -#define HID_END_OF_PARA (HID_BASE + 1920) -#define HID_NEXT_WORD (HID_BASE + 1921) -#define HID_PREV_WORD (HID_BASE + 1922) -#define HID_NEXT_SENT (HID_BASE + 1923) -#define HID_PREV_SENT (HID_BASE + 1924) -#define HID_DELETE (HID_BASE + 1925) -#define HID_BACKSPACE (HID_BASE + 1926) -#define HID_DELETE_SENT (HID_BASE + 1927) -#define HID_DELETE_BACK_SENT (HID_BASE + 1928) -#define HID_DELETE_WORD (HID_BASE + 1929) -#define HID_DELETE_BACK_WORD (HID_BASE + 1930) -#define HID_DELETE_LINE (HID_BASE + 1931) -#define HID_DELETE_BACK_LINE (HID_BASE + 1932) -#define HID_DELETE_PARA (HID_BASE + 1933) -#define HID_DELETE_BACK_PARA (HID_BASE + 1934) -#define HID_DELETE_WHOLE_LINE (HID_BASE + 1935) -#define HID_SET_INS_MODE (HID_BASE + 1936) -#define HID_PAGEUP (HID_BASE + 1937) -#define HID_PAGEDOWN (HID_BASE + 1938) -#define HID_SET_ADD_MODE (HID_BASE + 1939) -#define HID_SET_EXT_MODE (HID_BASE + 1940) -#define HID_ESCAPE (HID_BASE + 1941) -#define HID_SELECT_WORD (HID_BASE + 1943) -#define HID_START_TABLE (HID_BASE + 1947) -#define HID_END_TABLE (HID_BASE + 1948) -#define HID_NEXT_TABLE (HID_BASE + 1949) -#define HID_PREV_TABLE (HID_BASE + 1950) -#define HID_START_OF_NEXT_COLUMN (HID_BASE + 1951) -#define HID_END_OF_NEXT_COLUMN (HID_BASE + 1952) -#define HID_START_OF_PREV_COLUMN (HID_BASE + 1953) -#define HID_END_OF_PREV_COLUMN (HID_BASE + 1954) -#define HID_FOOTNOTE_TO_ANCHOR (HID_BASE + 1955) -#define HID_NEXT_FOOTNOTE (HID_BASE + 1956) -#define HID_PREV_FOOTNOTE (HID_BASE + 1957) -#define HID_CNTNT_TO_NEXT_FRAME (HID_BASE + 1958) -#define HID_FRAME_TO_ANCHOR (HID_BASE + 1959) -#define HID_TO_HEADER (HID_BASE + 1960) -#define HID_TO_FOOTER (HID_BASE + 1961) -#define HID_IDX_MARK_TO_IDX (HID_BASE + 1962) - -#define HID_ENVELOP (HID_BASE + 2050) -#define HID_LABEL (HID_BASE + 2051) -#define HID_ENVELOP_PRINT (HID_BASE + 2052) - -#define HID_NAVIGATION_IMGBTN (HID_BASE + 2054) -#define HID_ENVELOP_INSERT (HID_BASE + 2055) - -#define HID_WEBTOOLS_TOOLBOX (HID_BASE + 2056) -#define HID_WEBTEXT_TOOLBOX (HID_BASE + 2057) -#define HID_WEBFRAME_TOOLBOX (HID_BASE + 2058) -#define HID_TEXT_TOOLBOX (HID_BASE + 2059) -#define HID_TABLE_TOOLBOX (HID_BASE + 2060) -#define HID_FRAME_TOOLBOX (HID_BASE + 2061) -#define HID_GRAFIK_TOOLBOX (HID_BASE + 2062) -#define HID_OLE_TOOLBOX (HID_BASE + 2063) -#define HID_DRAW_TOOLBOX (HID_BASE + 2064) -#define HID_BEZIER_TOOLBOX (HID_BASE + 2066) -#define HID_DRAW_TEXT_TOOLBOX (HID_BASE + 2067) -#define HID_NUM_TOOLBOX (HID_BASE + 2068) -#define HID_TOOLS_TOOLBOX (HID_BASE + 2069) -#define HID_SRCVIEW_TOOLBOX (HID_BASE + 2070) - -#define HID_LABEL_INSERT (HID_BASE + 2071) -#define HID_CALC_TOOLBOX (HID_BASE + 2072) -#define HID_PVIEW_TOOLBOX (HID_BASE + 2073) - -#define HID_FIELD_INSERT (HID_BASE + 2074) -#define HID_FIELD_CLOSE (HID_BASE + 2075) - -#define HID_COND_COLL_TABLIST (HID_BASE + 2076) - -#define HID_DB_SELECTION_TLB (HID_BASE + 2077) -#define HID_FIELD_DINF_TYPE (HID_BASE + 2078) - -#define HID_DRAWFORM_TOOLBOX (HID_BASE + 2079) -#define HID_SELECT_TEMPLATE (HID_BASE + 2080) - -#define HID_AP_INSERT_DB_SEL (HID_BASE + 2081) -#define HID_WEBGRAPHIC_TOOLBOX (HID_BASE + 2082) -#define HID_OUTLINE_FORM (HID_BASE + 2083) -#define HID_NUM_RESET (HID_BASE + 2084) - -#define HID_AUTOFORMAT_REJECT (HID_BASE + 2085) -#define HID_AUTOFORMAT_ACCEPT (HID_BASE + 2086) -#define HID_AUTOFORMAT_EDIT_CHG (HID_BASE + 2087) +#define HID_CLOSE_FILE "SW_HID_CLOSE_FILE" +#define HID_LAUNCH_REGISTRY "SW_HID_LAUNCH_REGISTRY" +#define HID_MERGE_FILE "SW_HID_MERGE_FILE" +#define HID_MERGE_FILE_DLG "SW_HID_MERGE_FILE_DLG" +#define HID_NEW_FILE "SW_HID_NEW_FILE" +#define HID_OPEN_FILE "SW_HID_OPEN_FILE" +#define HID_OPEN_LASTVERSION "SW_HID_OPEN_LASTVERSION" +#define HID_PRINT_FILE "SW_HID_PRINT_FILE" +#define HID_PRINT_FILE_OPTIONS "SW_HID_PRINT_FILE_OPTIONS" +#define HID_SAVE_FILE_AS "SW_HID_SAVE_FILE_AS" +#define HID_SAVE_FILE "SW_HID_SAVE_FILE" +#define HID_SETUP_PRINTER_DLG "SW_HID_SETUP_PRINTER_DLG" +#define HID_EXIT "SW_HID_EXIT" +#define HID_CREATE_DOCUMENT "SW_HID_CREATE_DOCUMENT" +#define HID_DOCSTAT_DLG "SW_HID_DOCSTAT_DLG" +#define HID_LOAD_TEMPLATE_DLG "SW_HID_LOAD_TEMPLATE_DLG" +#define HID_SAVE_ALL "SW_HID_SAVE_ALL" +#define HID_NEW_FILE_DEFAULT "SW_HID_NEW_FILE_DEFAULT" +#define HID_PRINT_FILE_DEFAULT "SW_HID_PRINT_FILE_DEFAULT" +#define HID_FAX "SW_HID_FAX" +#define HID_SELECT_DATABASE "SW_HID_SELECT_DATABASE" +#define HID_DOC_INFO_DLG "SW_HID_DOC_INFO_DLG" +#define HID_DOC_MGR_DLG "SW_HID_DOC_MGR_DLG" +#define HID_OPTCAPTION_CLB "SW_HID_OPTCAPTION_CLB" + +#define HID_COPY "SW_HID_COPY" +#define HID_CUT "SW_HID_CUT" +#define HID_EDIT_FIELD "SW_HID_EDIT_FIELD" +#define HID_EDIT_FILE_INFO_DLG "SW_HID_EDIT_FILE_INFO_DLG" +#define HID_EDIT_LINK_DLG "SW_HID_EDIT_LINK_DLG" +#define HID_EDIT_OBJECT "SW_HID_EDIT_OBJECT" +#define HID_GOTO "SW_HID_GOTO" +#define HID_SET_FIELD_VALUE "SW_HID_SET_FIELD_VALUE" +#define HID_PASTE "SW_HID_PASTE" +#define HID_REDO "SW_HID_REDO" +#define HID_SEARCH "SW_HID_SEARCH" +#define HID_REPLACE "SW_HID_REPLACE" +#define HID_SELECT_ALL "SW_HID_SELECT_ALL" +#define HID_UNDO "SW_HID_UNDO" +#define HID_REPEAT "SW_HID_REPEAT" +#define HID_BUFFER_UPDATE "SW_HID_BUFFER_UPDATE" +#define HID_UPDATE_FIELDS "SW_HID_UPDATE_FIELDS" +#define HID_EXECUTE_MACROFIELD "SW_HID_EXECUTE_MACROFIELD" +#define HID_EDIT_FORMULA "SW_HID_EDIT_FORMULA" +#define HID_CALC_TABLE "SW_HID_CALC_TABLE" +#define HID_NUM_BULLET_DOWN "SW_HID_NUM_BULLET_DOWN" +#define HID_NUM_BULLET_UP "SW_HID_NUM_BULLET_UP" +#define HID_NUM_BULLET_PREV "SW_HID_NUM_BULLET_PREV" +#define HID_NUM_BULLET_NEXT "SW_HID_NUM_BULLET_NEXT" +#define HID_NUM_BULLET_MOVEUP "SW_HID_NUM_BULLET_MOVEUP" +#define HID_NUM_BULLET_MOVEDOWN "SW_HID_NUM_BULLET_MOVEDOWN" +#define HID_NUM_BULLET_NONUM "SW_HID_NUM_BULLET_NONUM" +#define HID_NUM_BULLET_OFF "SW_HID_NUM_BULLET_OFF" +#define HID_NUM_BULLET_ON "SW_HID_NUM_BULLET_ON" +#define HID_NUM_BULLET_OUTLINE_DOWN "SW_HID_NUM_BULLET_OUTLINE_DOWN" +#define HID_NUM_BULLET_OUTLINE_UP "SW_HID_NUM_BULLET_OUTLINE_UP" +#define HID_NUM_BULLET_OUTLINE_MOVEUP "SW_HID_NUM_BULLET_OUTLINE_MOVEUP" +#define HID_NUM_BULLET_OUTLINE_MOVEDOWN "SW_HID_NUM_BULLET_OUTLINE_MOVEDOWN" +#define HID_UPDATE_INPUTFIELDS "SW_HID_UPDATE_INPUTFIELDS" +#define HID_NUM_NUMBERING_ON "SW_HID_NUM_NUMBERING_ON" +#define HID_REPEAT_SEARCH "SW_HID_REPEAT_SEARCH" +#define HID_REPAGINATE "SW_HID_REPAGINATE" + +#define HID_REFRESH_VIEW "SW_HID_REFRESH_VIEW" +#define HID_RIBBON "SW_HID_RIBBON" +#define HID_RULER "SW_HID_RULER" +#define HID_STATUSBAR "SW_HID_STATUSBAR" +#define HID_TOOLBOX "SW_HID_TOOLBOX" +#define HID_VIEW_BOUNDS "SW_HID_VIEW_BOUNDS" +#define HID_VIEW_FIELDS "SW_HID_VIEW_FIELDS" +#define HID_VLINEAL "SW_HID_VLINEAL" +#define HID_VSCROLLBAR "SW_HID_VSCROLLBAR" +#define HID_HSCROLLBAR "SW_HID_HSCROLLBAR" +#define HID_VIEW_META_CHARS "SW_HID_VIEW_META_CHARS" +#define HID_VIEW_MARKS "SW_HID_VIEW_MARKS" +#define HID_VIEW_FIELDNAME "SW_HID_VIEW_FIELDNAME" +#define HID_VIEW_TABLEGRID "SW_HID_VIEW_TABLEGRID" +#define HID_ZOOM "SW_HID_ZOOM" + +#define HID_DELETE_BOOKMARK "SW_HID_DELETE_BOOKMARK" +#define HID_INSERT_BREAK "SW_HID_INSERT_BREAK" +#define HID_INSERT_COLUMN_BREAK "SW_HID_INSERT_COLUMN_BREAK" +#define HID_INSERT_FILE "SW_HID_INSERT_FILE" +#define HID_INSERT_FOOTNOTE "SW_HID_INSERT_FOOTNOTE" +#define HID_INSERT_GRAFIC "SW_HID_INSERT_GRAFIC" +#define HID_INSERT_LINEBREAK "SW_HID_INSERT_LINEBREAK" +#define HID_INSERT_MERGEFIELD_DLG "SW_HID_INSERT_MERGEFIELD_DLG" +#define HID_INSERT_OBJECT_DLG "SW_HID_INSERT_OBJECT_DLG" +#define HID_INSERT_PAGEBREAK "SW_HID_INSERT_PAGEBREAK" +#define HID_INSERT_RECORD "SW_HID_INSERT_RECORD" +#define HID_MERGE_RECORD "SW_HID_MERGE_RECORD" +#define HID_INSERT_SYMBOL "SW_HID_INSERT_SYMBOL" +#define HID_INSERT_STRING "SW_HID_INSERT_STRING" +#define HID_INSERT_COLS "SW_HID_INSERT_COLS" +#define HID_INSERT_FRAME_INTERACT "SW_HID_INSERT_FRAME_INTERACT" +#define HID_INSERT_FRAME "SW_HID_INSERT_FRAME" +#define HID_INSERT_IDX_ENTRY "SW_HID_INSERT_IDX_ENTRY" +#define HID_INSERT_USERIDX_ENTRY "SW_HID_INSERT_USERIDX_ENTRY" +#define HID_INSERT_CNTNTIDX_ENTRY "SW_HID_INSERT_CNTNTIDX_ENTRY" +#define HID_INSERT_SOFT_HYPHEN "SW_HID_INSERT_SOFT_HYPHEN" +#define HID_INSERT_HARD_SPACE "SW_HID_INSERT_HARD_SPACE" + +#define HID_SET_FONT "SW_HID_SET_FONT" +#define HID_SET_FONT_SIZE "SW_HID_SET_FONT_SIZE" +#define HID_GROW_FONT_SIZE "SW_HID_GROW_FONT_SIZE" +#define HID_SHRINK_FONT_SIZE "SW_HID_SHRINK_FONT_SIZE" +#define HID_SET_BOLD "SW_HID_SET_BOLD" +#define HID_SET_ITALIC "SW_HID_SET_ITALIC" +#define HID_SET_SHADOW "SW_HID_SET_SHADOW" +#define HID_SET_OUTLINE "SW_HID_SET_OUTLINE" +#define HID_SET_UNDERLINE "SW_HID_SET_UNDERLINE" +#define HID_SET_STRIKEOUT "SW_HID_SET_STRIKEOUT" +#define HID_SET_SUPER_SCRIPT "SW_HID_SET_SUPER_SCRIPT" +#define HID_SET_SUB_SCRIPT "SW_HID_SET_SUB_SCRIPT" +#define HID_SET_COLOR "SW_HID_SET_COLOR" +#define HID_SET_CASEMAP "SW_HID_SET_CASEMAP" +#define HID_SET_LANGUAGE "SW_HID_SET_LANGUAGE" +#define HID_SET_KERNING "SW_HID_SET_KERNING" +#define HID_INDENT_TO_TABSTOP "SW_HID_INDENT_TO_TABSTOP" +#define HID_SET_LEFT_PARA "SW_HID_SET_LEFT_PARA" +#define HID_SET_RIGHT_PARA "SW_HID_SET_RIGHT_PARA" +#define HID_SET_CENTER_PARA "SW_HID_SET_CENTER_PARA" +#define HID_SET_JUSTIFY_PARA "SW_HID_SET_JUSTIFY_PARA" +#define HID_SET_LINE_SPACE_1 "SW_HID_SET_LINE_SPACE_1" +#define HID_SET_LINE_SPACE_15 "SW_HID_SET_LINE_SPACE_15" +#define HID_SET_LINE_SPACE_2 "SW_HID_SET_LINE_SPACE_2" +#define HID_FLIP_HORZ_GRAFIC "SW_HID_FLIP_HORZ_GRAFIC" +#define HID_FLIP_VERT_GRAFIC "SW_HID_FLIP_VERT_GRAFIC" +#define HID_SET_ADJUST "SW_HID_SET_ADJUST" +#define HID_SET_LRMARGIN "SW_HID_SET_LRMARGIN" +#define HID_SET_ULMARGIN "SW_HID_SET_ULMARGIN" +#define HID_UNINDENT_TO_TABSTOP "SW_HID_UNINDENT_TO_TABSTOP" +#define HID_SET_HYPHEN_ZONE "SW_HID_SET_HYPHEN_ZONE" +#define HID_SET_PAGE_BREAK "SW_HID_SET_PAGE_BREAK" +#define HID_SET_KEEP_TOGETHER "SW_HID_SET_KEEP_TOGETHER" +#define HID_SET_WIDOW "SW_HID_SET_WIDOW" +#define HID_SET_ORPHAN "SW_HID_SET_ORPHAN" +#define HID_FORMAT_SHADOW "SW_HID_FORMAT_SHADOW" +#define HID_FORMAT_BORDER "SW_HID_FORMAT_BORDER" +#define HID_FORMAT_CHAR_DLG "SW_HID_FORMAT_CHAR_DLG" +#define HID_FORMAT_PARA_DLG "SW_HID_FORMAT_PARA_DLG" +#define HID_FORMAT_TAB "SW_HID_FORMAT_TAB" +#define HID_FORMAT_TAB_DLG "SW_HID_FORMAT_TAB_DLG" +#define HID_FORMAT_BORDER_DLG "SW_HID_FORMAT_BORDER_DLG" +#define HID_FORMAT_BACKGROUND "SW_HID_FORMAT_BACKGROUND" +#define HID_FORMAT_BACKGROUND_DLG "SW_HID_FORMAT_BACKGROUND_DLG" +#define HID_FORMAT_PAGE "SW_HID_FORMAT_PAGE" +#define HID_FORMAT_PAGE_DLG "SW_HID_FORMAT_PAGE_DLG" +#define HID_FORMAT_DROPCAPS "SW_HID_FORMAT_DROPCAPS" +#define HID_FORMAT_FRAME_DLG "SW_HID_FORMAT_FRAME_DLG" +#define HID_FORMAT_GRAFIC_DLG "SW_HID_FORMAT_GRAFIC_DLG" +#define HID_FORMAT_TABLE_DLG "SW_HID_FORMAT_TABLE_DLG" +#define HID_NEW_STYLE_BY_EXAMPLE "SW_HID_NEW_STYLE_BY_EXAMPLE" +#define HID_UPDATE_STYLE_BY_EXAMPLE "SW_HID_UPDATE_STYLE_BY_EXAMPLE" +#define HID_STYLE_SHEET_FRAME_DLG "SW_HID_STYLE_SHEET_FRAME_DLG" +#define HID_STYLE_SHEET_DOC_DLG "SW_HID_STYLE_SHEET_DOC_DLG" +#define HID_FORMAT_RESET "SW_HID_FORMAT_RESET" +#define HID_FRAME_TO_TOP "SW_HID_FRAME_TO_TOP" +#define HID_FRAME_TO_BOTTOM "SW_HID_FRAME_TO_BOTTOM" +#define HID_FRAME_NOWRAP "SW_HID_FRAME_NOWRAP" +#define HID_FRAME_WRAP "SW_HID_FRAME_WRAP" +#define HID_FRAME_WRAPTHRU "SW_HID_FRAME_WRAPTHRU" +#define HID_FRAME_ALIGN_HORZ_LEFT "SW_HID_FRAME_ALIGN_HORZ_LEFT" +#define HID_FRAME_ALIGN_HORZ_RIGHT "SW_HID_FRAME_ALIGN_HORZ_RIGHT" +#define HID_FRAME_ALIGN_HORZ_CENTER "SW_HID_FRAME_ALIGN_HORZ_CENTER" +#define HID_FRAME_ALIGN_VERT_TOP "SW_HID_FRAME_ALIGN_VERT_TOP" +#define HID_FRAME_ALIGN_VERT_BOTTOM "SW_HID_FRAME_ALIGN_VERT_BOTTOM" +#define HID_FRAME_ALIGN_VERT_CENTER "SW_HID_FRAME_ALIGN_VERT_CENTER" +#define HID_SET_FRM_SIZE "SW_HID_SET_FRM_SIZE" +#define HID_SET_FRM_POSITION "SW_HID_SET_FRM_POSITION" +#define HID_SET_FRM_ANCHOR "SW_HID_SET_FRM_ANCHOR" +#define HID_SET_FRM_WRAP "SW_HID_SET_FRM_WRAP" +#define HID_SET_FRM_DIST "SW_HID_SET_FRM_DIST" +#define HID_SET_FRM_OPTIONS "SW_HID_SET_FRM_OPTIONS" +#define HID_SET_GRF_MIRROR "SW_HID_SET_GRF_MIRROR" +#define HID_SET_TABLE_WIDTH "SW_HID_SET_TABLE_WIDTH" +#define HID_SET_TABLE_ALIGN "SW_HID_SET_TABLE_ALIGN" +#define HID_SET_CHAR_STYLE "SW_HID_SET_CHAR_STYLE" +#define HID_SET_PARA_STYLE "SW_HID_SET_PARA_STYLE" +#define HID_SET_PAGE_STYLE "SW_HID_SET_PAGE_STYLE" +#define HID_SET_FRM_MACRO "SW_HID_SET_FRM_MACRO" +#define HID_SET_FRM_COLUMNS "SW_HID_SET_FRM_COLUMNS" +#define HID_SET_FRM_COLUMN_WIDTH "SW_HID_SET_FRM_COLUMN_WIDTH" +#define HID_UPDATE_STYLES_DIRECT "SW_HID_UPDATE_STYLES_DIRECT" + +#define HID_TABLE_INSERT_ROW "SW_HID_TABLE_INSERT_ROW" +#define HID_TABLE_DELETE_ROW "SW_HID_TABLE_DELETE_ROW" +#define HID_TABLE_DELETE_COL "SW_HID_TABLE_DELETE_COL" +#define HID_TABLE_MERGE_CELLS "SW_HID_TABLE_MERGE_CELLS" +#define HID_AUTOFMT_TABLE "SW_HID_AUTOFMT_TABLE" +#define HID_SWDLG_STRINPUT "SW_HID_SWDLG_STRINPUT" +#define HID_TABLE_SET_ULSPACE "SW_HID_TABLE_SET_ULSPACE" +#define HID_TABLE_SET_GRID "SW_HID_TABLE_SET_GRID" +#define HID_TABLE_SET_SHADOW "SW_HID_TABLE_SET_SHADOW" +#define HID_TABLE_SELECT_ROW "SW_HID_TABLE_SELECT_ROW" +#define HID_TABLE_SELECT_COL "SW_HID_TABLE_SELECT_COL" +#define HID_TABLE_SELECT_ALL "SW_HID_TABLE_SELECT_ALL" +#define HID_TABLE_SET_READ_ONLY_CELLS "SW_HID_TABLE_SET_READ_ONLY_CELLS" +#define HID_TABLE_UNSET_READ_ONLY_CELLS "SW_HID_TABLE_UNSET_READ_ONLY_CELLS" +#define HID_PAGE_STYLE_SET_COLS "SW_HID_PAGE_STYLE_SET_COLS" +#define HID_SET_PROP_LINE_SPACE "SW_HID_SET_PROP_LINE_SPACE" +#define HID_SET_ABS_LINE_SPACE "SW_HID_SET_ABS_LINE_SPACE" + +#define HID_SPELLING_DLG "SW_HID_SPELLING_DLG" +#define HID_THESAURUS_DLG "SW_HID_THESAURUS_DLG" +#define HID_HYPHENATE_OPT_DLG "SW_HID_HYPHENATE_OPT_DLG" +#define HID_SORTING "SW_HID_SORTING" +#define HID_SORTING_DLG "SW_HID_SORTING_DLG" +#define HID_CALCULATE "SW_HID_CALCULATE" +#define HID_RECORD_MACRO_DLG "SW_HID_RECORD_MACRO_DLG" +#define HID_PLAY_MACRO_DLG "SW_HID_PLAY_MACRO_DLG" +#define HID_CONFIG_DLG "SW_HID_CONFIG_DLG" +#define HID_EXPAND_GLOSSARY "SW_HID_EXPAND_GLOSSARY" +#define HID_RENAME_GLOSSARY "SW_HID_RENAME_GLOSSARY" +#define HID_CONFIG_MENU "SW_HID_CONFIG_MENU" +#define HID_CONFIG_KEY "SW_HID_CONFIG_KEY" +#define HID_ASSIGN_LOCAL_MACRO_DLG "SW_HID_ASSIGN_LOCAL_MACRO_DLG" +#define HID_COMPILE_MACRO "SW_HID_COMPILE_MACRO" +#define HID_CONFIG_VIEWOPTIONS "SW_HID_CONFIG_VIEWOPTIONS" +#define HID_CONFIG_COLORS "SW_HID_CONFIG_COLORS" +#define HID_INSERT_GLOSSARY "SW_HID_INSERT_GLOSSARY" +#define HID_AUTO_CORRECT "SW_HID_AUTO_CORRECT" +#define HID_AUTO_CORRECT_DLG "SW_HID_AUTO_CORRECT_DLG" +#define HID_HELP_PI "SW_HID_HELP_PI" +#define HID_NAVIGATION_PI "SW_HID_NAVIGATION_PI" +#define HID_TEMPLATE_PI "SW_HID_TEMPLATE_PI" +#define HID_ADDR_PI "SW_HID_ADDR_PI" +#define HID_NAVIGATION_PI_GOTO_PAGE "SW_HID_NAVIGATION_PI_GOTO_PAGE" +#define HID_LETTER_WIZZARD "SW_HID_LETTER_WIZZARD" +#define HID_FAX_WIZZARD "SW_HID_FAX_WIZZARD" +#define HID_MEMO_WIZZARD "SW_HID_MEMO_WIZZARD" +#define HID_AGENDA_WIZZARD "SW_HID_AGENDA_WIZZARD" + +#define HID_NEW_WINDOW "SW_HID_NEW_WINDOW" +#define HID_ARRANGE_ALL_WIN "SW_HID_ARRANGE_ALL_WIN" +#define HID_ARRANGE_CASCADE_WIN "SW_HID_ARRANGE_CASCADE_WIN" +#define HID_ARRANGE_HORZ_WIN "SW_HID_ARRANGE_HORZ_WIN" +#define HID_ARRANGE_VERT_WIN "SW_HID_ARRANGE_VERT_WIN" + +#define HID_SHOW_HELP_INDEX "SW_HID_SHOW_HELP_INDEX" +#define HID_SHOW_KEYBOARD_HELP "SW_HID_SHOW_KEYBOARD_HELP" +#define HID_SHOW_HELP_MANUAL "SW_HID_SHOW_HELP_MANUAL" +#define HID_SHOW_UPDATE_HELP "SW_HID_SHOW_UPDATE_HELP" + +#define HID_CHAR_LEFT "SW_HID_CHAR_LEFT" +#define HID_CHAR_RIGHT "SW_HID_CHAR_RIGHT" +#define HID_LINE_UP "SW_HID_LINE_UP" +#define HID_LINE_DOWN "SW_HID_LINE_DOWN" +#define HID_START_OF_LINE "SW_HID_START_OF_LINE" +#define HID_END_OF_LINE "SW_HID_END_OF_LINE" +#define HID_START_OF_DOCUMENT "SW_HID_START_OF_DOCUMENT" +#define HID_END_OF_DOCUMENT "SW_HID_END_OF_DOCUMENT" +#define HID_START_OF_NEXT_PAGE "SW_HID_START_OF_NEXT_PAGE" +#define HID_END_OF_NEXT_PAGE "SW_HID_END_OF_NEXT_PAGE" +#define HID_START_OF_PREV_PAGE "SW_HID_START_OF_PREV_PAGE" +#define HID_END_OF_PREV_PAGE "SW_HID_END_OF_PREV_PAGE" +#define HID_START_OF_PAGE "SW_HID_START_OF_PAGE" +#define HID_END_OF_PAGE "SW_HID_END_OF_PAGE" +#define HID_START_OF_COLUMN "SW_HID_START_OF_COLUMN" +#define HID_END_OF_COLUMN "SW_HID_END_OF_COLUMN" +#define HID_START_OF_PARA "SW_HID_START_OF_PARA" +#define HID_END_OF_PARA "SW_HID_END_OF_PARA" +#define HID_NEXT_WORD "SW_HID_NEXT_WORD" +#define HID_PREV_WORD "SW_HID_PREV_WORD" +#define HID_NEXT_SENT "SW_HID_NEXT_SENT" +#define HID_PREV_SENT "SW_HID_PREV_SENT" +#define HID_DELETE "SW_HID_DELETE" +#define HID_BACKSPACE "SW_HID_BACKSPACE" +#define HID_DELETE_SENT "SW_HID_DELETE_SENT" +#define HID_DELETE_BACK_SENT "SW_HID_DELETE_BACK_SENT" +#define HID_DELETE_WORD "SW_HID_DELETE_WORD" +#define HID_DELETE_BACK_WORD "SW_HID_DELETE_BACK_WORD" +#define HID_DELETE_LINE "SW_HID_DELETE_LINE" +#define HID_DELETE_BACK_LINE "SW_HID_DELETE_BACK_LINE" +#define HID_DELETE_PARA "SW_HID_DELETE_PARA" +#define HID_DELETE_BACK_PARA "SW_HID_DELETE_BACK_PARA" +#define HID_DELETE_WHOLE_LINE "SW_HID_DELETE_WHOLE_LINE" +#define HID_SET_INS_MODE "SW_HID_SET_INS_MODE" +#define HID_PAGEUP "SW_HID_PAGEUP" +#define HID_PAGEDOWN "SW_HID_PAGEDOWN" +#define HID_SET_ADD_MODE "SW_HID_SET_ADD_MODE" +#define HID_SET_EXT_MODE "SW_HID_SET_EXT_MODE" +#define HID_ESCAPE "SW_HID_ESCAPE" +#define HID_SELECT_WORD "SW_HID_SELECT_WORD" +#define HID_START_TABLE "SW_HID_START_TABLE" +#define HID_END_TABLE "SW_HID_END_TABLE" +#define HID_NEXT_TABLE "SW_HID_NEXT_TABLE" +#define HID_PREV_TABLE "SW_HID_PREV_TABLE" +#define HID_START_OF_NEXT_COLUMN "SW_HID_START_OF_NEXT_COLUMN" +#define HID_END_OF_NEXT_COLUMN "SW_HID_END_OF_NEXT_COLUMN" +#define HID_START_OF_PREV_COLUMN "SW_HID_START_OF_PREV_COLUMN" +#define HID_END_OF_PREV_COLUMN "SW_HID_END_OF_PREV_COLUMN" +#define HID_FOOTNOTE_TO_ANCHOR "SW_HID_FOOTNOTE_TO_ANCHOR" +#define HID_NEXT_FOOTNOTE "SW_HID_NEXT_FOOTNOTE" +#define HID_PREV_FOOTNOTE "SW_HID_PREV_FOOTNOTE" +#define HID_CNTNT_TO_NEXT_FRAME "SW_HID_CNTNT_TO_NEXT_FRAME" +#define HID_FRAME_TO_ANCHOR "SW_HID_FRAME_TO_ANCHOR" +#define HID_TO_HEADER "SW_HID_TO_HEADER" +#define HID_TO_FOOTER "SW_HID_TO_FOOTER" +#define HID_IDX_MARK_TO_IDX "SW_HID_IDX_MARK_TO_IDX" + +#define HID_ENVELOP "SW_HID_ENVELOP" +#define HID_LABEL "SW_HID_LABEL" +#define HID_ENVELOP_PRINT "SW_HID_ENVELOP_PRINT" + +#define HID_NAVIGATION_IMGBTN "SW_HID_NAVIGATION_IMGBTN" +#define HID_ENVELOP_INSERT "SW_HID_ENVELOP_INSERT" + +#define HID_WEBTOOLS_TOOLBOX "SW_HID_WEBTOOLS_TOOLBOX" +#define HID_WEBTEXT_TOOLBOX "SW_HID_WEBTEXT_TOOLBOX" +#define HID_WEBFRAME_TOOLBOX "SW_HID_WEBFRAME_TOOLBOX" +#define HID_TEXT_TOOLBOX "SW_HID_TEXT_TOOLBOX" +#define HID_TABLE_TOOLBOX "SW_HID_TABLE_TOOLBOX" +#define HID_FRAME_TOOLBOX "SW_HID_FRAME_TOOLBOX" +#define HID_GRAFIK_TOOLBOX "SW_HID_GRAFIK_TOOLBOX" +#define HID_OLE_TOOLBOX "SW_HID_OLE_TOOLBOX" +#define HID_DRAW_TOOLBOX "SW_HID_DRAW_TOOLBOX" +#define HID_BEZIER_TOOLBOX "SW_HID_BEZIER_TOOLBOX" +#define HID_DRAW_TEXT_TOOLBOX "SW_HID_DRAW_TEXT_TOOLBOX" +#define HID_NUM_TOOLBOX "SW_HID_NUM_TOOLBOX" +#define HID_TOOLS_TOOLBOX "SW_HID_TOOLS_TOOLBOX" +#define HID_SRCVIEW_TOOLBOX "SW_HID_SRCVIEW_TOOLBOX" + +#define HID_LABEL_INSERT "SW_HID_LABEL_INSERT" +#define HID_CALC_TOOLBOX "SW_HID_CALC_TOOLBOX" +#define HID_PVIEW_TOOLBOX "SW_HID_PVIEW_TOOLBOX" + +#define HID_FIELD_INSERT "SW_HID_FIELD_INSERT" +#define HID_FIELD_CLOSE "SW_HID_FIELD_CLOSE" + +#define HID_COND_COLL_TABLIST "SW_HID_COND_COLL_TABLIST" + +#define HID_DB_SELECTION_TLB "SW_HID_DB_SELECTION_TLB" +#define HID_FIELD_DINF_TYPE "SW_HID_FIELD_DINF_TYPE" + +#define HID_DRAWFORM_TOOLBOX "SW_HID_DRAWFORM_TOOLBOX" +#define HID_SELECT_TEMPLATE "SW_HID_SELECT_TEMPLATE" + +#define HID_AP_INSERT_DB_SEL "SW_HID_AP_INSERT_DB_SEL" +#define HID_WEBGRAPHIC_TOOLBOX "SW_HID_WEBGRAPHIC_TOOLBOX" +#define HID_OUTLINE_FORM "SW_HID_OUTLINE_FORM" +#define HID_NUM_RESET "SW_HID_NUM_RESET" + +#define HID_AUTOFORMAT_REJECT "SW_HID_AUTOFORMAT_REJECT" +#define HID_AUTOFORMAT_ACCEPT "SW_HID_AUTOFORMAT_ACCEPT" +#define HID_AUTOFORMAT_EDIT_CHG "SW_HID_AUTOFORMAT_EDIT_CHG" //insert index/entries/Pattern buttons and edits -#define HID_TOX_ENTRY_BUTTON (HID_BASE + 2088) -#define HID_TOX_ENTRY_EDIT (HID_BASE + 2089) - -#define HID_DLG_NEW_USER_IDX (HID_BASE + 2090) -#define HID_INSERT_IDX_MRK_OK (HID_BASE + 2091) -#define HID_INSERT_IDX_MRK_CLOSE (HID_BASE + 2092) -#define HID_INSERT_AUTH_MRK_OK (HID_BASE + 2093) -#define HID_INSERT_AUTH_MRK_CLOSE (HID_BASE + 2094) -#define HID_INSERT_IDX_MRK_DELETE (HID_BASE + 2095) -#define HID_INSERT_IDX_MRK_NEW (HID_BASE + 2096) -#define HID_INSERT_IDX_MRK_PREV (HID_BASE + 2097) -#define HID_INSERT_IDX_MRK_PREV_SAME (HID_BASE + 2098) -#define HID_INSERT_IDX_MRK_NEXT (HID_BASE + 2099) -#define HID_INSERT_IDX_MRK_NEXT_SAME (HID_BASE + 2100) -#define HID_INSERT_IDX_MRK_TYPE (HID_BASE + 2101) -#define HID_INSERT_IDX_MRK_ENTRY (HID_BASE + 2102) -#define HID_INSERT_IDX_MRK_PRIM_KEY (HID_BASE + 2103) -#define HID_INSERT_IDX_MRK_SEC_KEY (HID_BASE + 2104) -#define HID_INSERT_IDX_MRK_LEVEL (HID_BASE + 2105) -#define HID_INSERT_IDX_MRK_MAIN_ENTRY (HID_BASE + 2106) -#define HID_INSERT_IDX_MRK_APPLY_ALL (HID_BASE + 2107) -#define HID_INSERT_AUTH_MRK_ENTRY (HID_BASE + 2108) -#define HID_INSERT_AUTH_MRK_CREATE_ENTRY (HID_BASE + 2109) -#define HID_INSERT_AUTH_MRK_EDIT_ENTRY (HID_BASE + 2110) -#define HID_TOKEN_WINDOW (HID_BASE + 2111) - -#define HID_AUTH_FIELD_IDENTIFIER (HID_BASE + 2112 ) -#define HID_AUTH_FIELD_AUTHORITY_TYPE (HID_BASE + 2113 ) -#define HID_AUTH_FIELD_ADDRESS (HID_BASE + 2114 ) -#define HID_AUTH_FIELD_ANNOTE (HID_BASE + 2115 ) -#define HID_AUTH_FIELD_AUTHOR (HID_BASE + 2116 ) -#define HID_AUTH_FIELD_BOOKTITLE (HID_BASE + 2117 ) -#define HID_AUTH_FIELD_CHAPTER (HID_BASE + 2118 ) -#define HID_AUTH_FIELD_EDITION (HID_BASE + 2119 ) -#define HID_AUTH_FIELD_EDITOR (HID_BASE + 2120 ) -#define HID_AUTH_FIELD_HOWPUBLISHED (HID_BASE + 2121 ) -#define HID_AUTH_FIELD_INSTITUTION (HID_BASE + 2122 ) -#define HID_AUTH_FIELD_JOURNAL (HID_BASE + 2123 ) -#define HID_AUTH_FIELD_MONTH (HID_BASE + 2124 ) -#define HID_AUTH_FIELD_NOTE (HID_BASE + 2125 ) -#define HID_AUTH_FIELD_NUMBER (HID_BASE + 2126 ) -#define HID_AUTH_FIELD_ORGANIZATIONS (HID_BASE + 2127 ) -#define HID_AUTH_FIELD_PAGES (HID_BASE + 2128 ) -#define HID_AUTH_FIELD_PUBLISHER (HID_BASE + 2129 ) -#define HID_AUTH_FIELD_SCHOOL (HID_BASE + 2130 ) -#define HID_AUTH_FIELD_SERIES (HID_BASE + 2131 ) -#define HID_AUTH_FIELD_TITLE (HID_BASE + 2132 ) -#define HID_AUTH_FIELD_REPORT_TYPE (HID_BASE + 2133 ) -#define HID_AUTH_FIELD_VOLUME (HID_BASE + 2134 ) -#define HID_AUTH_FIELD_YEAR (HID_BASE + 2135 ) -#define HID_AUTH_FIELD_URL (HID_BASE + 2136 ) -#define HID_AUTH_FIELD_CUSTOM1 (HID_BASE + 2137 ) -#define HID_AUTH_FIELD_CUSTOM2 (HID_BASE + 2138 ) -#define HID_AUTH_FIELD_CUSTOM3 (HID_BASE + 2139 ) -#define HID_AUTH_FIELD_CUSTOM4 (HID_BASE + 2140 ) -#define HID_AUTH_FIELD_CUSTOM5 (HID_BASE + 2141 ) -#define HID_AUTH_FIELD_ISBN (HID_BASE + 2142 ) - -#define HID_AUTH_MARK_DLG_FROM_COMP_RB (HID_BASE + 2143 ) -#define HID_AUTH_MARK_DLG_FROM_DOC_RB (HID_BASE + 2144 ) -#define HID_AUTH_MARK_DLG_ID_LISTBOX (HID_BASE + 2145 ) - -#define HID_INSERT_INDEX_ENTRY_LEVEL_LB (HID_BASE + 2146 ) -#define HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE (HID_BASE + 2147 ) -#define HID_INSERT_IDX_MRK_SRCH_WORDONLY (HID_BASE + 2148 ) -#define HID_DLG_CREATE_AUTOMARK (HID_BASE + 2149 ) -#define HID_BUSINESS_CARD_CONTENT (HID_BASE + 2150 ) -#define HID_SAVE_LABEL_DLG (HID_BASE + 2151 ) -#define HID_BUSINESS_FMT_PAGE (HID_BASE + 2152 ) -#define HID_BUSINESS_FMT_PAGE_CONT (HID_BASE + 2153 ) -#define HID_BUSINESS_FMT_PAGE_SHEET (HID_BASE + 2154 ) -#define HID_BUSINESS_FMT_PAGE_BRAND (HID_BASE + 2155 ) -#define HID_BUSINESS_FMT_PAGE_TYPE (HID_BASE + 2156 ) -#define HID_SEND_MASTER_DIALOG (HID_BASE + 2157 ) -#define HID_SEND_MASTER_CTRL_PUSHBUTTON_OK (HID_BASE + 2158 ) -#define HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL (HID_BASE + 2159 ) -#define HID_SEND_MASTER_CTRL_LISTBOX_FILTER (HID_BASE + 2160 ) -#define HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW (HID_BASE + 2161 ) -#define HID_SEND_MASTER_CTRL_EDIT_FILEURL (HID_BASE + 2162 ) -#define HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION (HID_BASE + 2163 ) -#define HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE (HID_BASE + 2164 ) -#define HID_SEND_MASTER_CTRL_DUMMY (HID_BASE + 2165 ) - -#define HID_SEND_HTML_DIALOG (HID_BASE + 2166 ) -#define HID_SEND_HTML_CTRL_PUSHBUTTON_OK (HID_BASE + 2167 ) -#define HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL (HID_BASE + 2168 ) -#define HID_SEND_HTML_CTRL_LISTBOX_FILTER (HID_BASE + 2169 ) -#define HID_SEND_HTML_CTRL_CONTROL_FILEVIEW (HID_BASE + 2170 ) -#define HID_SEND_HTML_CTRL_EDIT_FILEURL (HID_BASE + 2171 ) -#define HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION (HID_BASE + 2172 ) -#define HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE (HID_BASE + 2173 ) -#define HID_SEND_HTML_CTRL_DUMMY (HID_BASE + 2174 ) - -#define HID_INSERT_IDX_MRK_PHONETIC_READING (HID_BASE + 2175 ) -#define HID_COLUMN_VALUESET (HID_BASE + 2176 ) -#define HID_PVIEW_ZOOM_LB (HID_BASE + 2177 ) -#define HID_MAIL_MERGE_SELECT (HID_BASE + 2178 ) -#define HID_MAIL_MERGE_CREATE_FROM (HID_BASE + 2179 ) -#define HID_MAIL_MERGE_INSERT_FIELDS (HID_BASE + 2180 ) -#define HID_PRINT_AS_MERGE (HID_BASE + 2181 ) -#define HID_MERGE_SOURCE_UNAVAILABLE (HID_BASE + 2182 ) -#define HID_DATA_SOURCES_UNAVAILABLE (HID_BASE + 2183 ) -#define HID_MODULE_TOOLBOX (HID_BASE + 2184 ) -#define HID_SECTION_INDENTS_PAGE (HID_BASE + 2185 ) - -#define HID_FLD_DROPDOWN (HID_BASE + 2186 ) -#define HID_MM_DOCSELECTPAGE (HID_BASE + 2187 ) -#define HID_MM_OUTPUTTYPEPAGE (HID_BASE + 2188 ) -#define HID_MM_ADDRESSBLOCKPAGE (HID_BASE + 2189 ) -#define HID_MM_GREETINGSPAGE (HID_BASE + 2190 ) -#define HID_MM_PREPAREMERGEPAGE (HID_BASE + 2191 ) -#define HID_MM_MERGEPAGE (HID_BASE + 2192 ) -#define HID_MM_OUTPUTPAGE (HID_BASE + 2193 ) -#define HID_MM_ADDRESSLISTDIALOG (HID_BASE + 2194 ) -#define HID_MM_SELECTDBTABLEDDIALOG (HID_BASE + 2195 ) -#define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX (HID_BASE + 2196 ) -#define HID_MM_DBTABLEPREVIEWDIALOG (HID_BASE + 2197 ) -#define HID_MM_CREATEADDRESSLIST (HID_BASE + 2198 ) -#define HID_MM_FIND_ENTRY (HID_BASE + 2199 ) -#define HID_MM_ADD_RENAME_ENTRY (HID_BASE + 2200 ) -#define HID_MM_CUSTOMIZE_ADDRESS_LIST (HID_BASE + 2201 ) -#define HID_MM_CUSTOMIZEADDRESSBLOCK (HID_BASE + 2202 ) -#define HID_MM_SELECTADDRESSBLOCK (HID_BASE + 2203 ) -#define HID_MM_ASSIGNFIELDS (HID_BASE + 2204 ) -#define HID_MM_MAILNOTINSTALLED (HID_BASE + 2205 ) -#define HID_MM_LAYOUT_PAGE (HID_BASE + 2206 ) -#define HID_MM_COPYTO (HID_BASE + 2207 ) -#define HID_MM_ADDRESSLIST_HB (HID_BASE + 2208 ) -#define HID_MM_ADDRESSLIST_TLB (HID_BASE + 2209 ) -#define HID_TP_MAILCONFIG (HID_BASE + 2210 ) -#define HID_MM_TESTACCOUNTSETTINGS (HID_BASE + 2211 ) -#define HID_MM_TESTACCOUNTSETTINGS_TLB (HID_BASE + 2212 ) -#define HID_MM_TESTACCOUNTSETTINGS_HB (HID_BASE + 2213 ) -#define HID_MM_MAILBODY (HID_BASE + 2214 ) -#define HID_MM_SENDMAILS (HID_BASE + 2215 ) -#define HID_MM_SENDMAILS_STATUSLB (HID_BASE + 2216 ) -#define HID_MAILMERGECHILD (HID_BASE + 2217 ) -#define HID_MM_CUSTOMFIELDS (HID_BASE + 2218 ) -#define HID_DLG_WORDCOUNT (HID_BASE + 2219 ) -#define HID_MM_MAILSTATUS_TLB (HID_BASE + 2220 ) -#define HID_RETURN_TO_MAILMERGE (HID_BASE + 2221 ) -#define HID_MM_SAVEWARNING (HID_BASE + 2222 ) -#define HID_MM_QUERY (HID_BASE + 2223 ) -#define HID_MM_SENDWARNING (HID_BASE + 2224 ) -#define HID_MM_SERVERAUTHENTICATION (HID_BASE + 2225 ) - -#define HID_MEDIA_TOOLBOX (HID_BASE + 2227) -#define HID_NID_TBL (HID_BASE + 2228) -#define HID_NID_FRM (HID_BASE + 2229) -#define HID_NID_GRF (HID_BASE + 2230) -#define HID_NID_OLE (HID_BASE + 2231) -#define HID_NID_PGE (HID_BASE + 2232) -#define HID_NID_OUTL (HID_BASE + 2233) -#define HID_NID_MARK (HID_BASE + 2234) -#define HID_NID_DRW (HID_BASE + 2235) -#define HID_NID_CTRL (HID_BASE + 2236) -#define HID_NID_PREV (HID_BASE + 2237) -#define HID_NID_REG (HID_BASE + 2238) -#define HID_NID_BKM (HID_BASE + 2239) -#define HID_NID_SEL (HID_BASE + 2240) -#define HID_NID_FTN (HID_BASE + 2241) -#define HID_NID_POSTIT (HID_BASE + 2242) -#define HID_NID_SRCH_REP (HID_BASE + 2243) -#define HID_NID_INDEX_ENTRY (HID_BASE + 2244) -#define HID_NID_TABLE_FORMULA (HID_BASE + 2245) -#define HID_NID_TABLE_FORMULA_ERROR (HID_BASE + 2246) -#define HID_NID_NEXT (HID_BASE + 2247) -#define HID_MM_NEXT_PAGE (HID_BASE + 2248) -#define HID_MM_PREV_PAGE (HID_BASE + 2249) -#define HID_MM_GREETINGS_CB_PERSONALIZED (HID_BASE + 2250) -#define HID_MM_GREETINGS_LB_FEMALE (HID_BASE + 2251) -#define HID_MM_GREETINGS_PB_FEMALE (HID_BASE + 2252) -#define HID_MM_GREETINGS_LB_MALE (HID_BASE + 2253) -#define HID_MM_GREETINGS_PB_MALE (HID_BASE + 2254) -#define HID_MM_GREETINGS_LB_FEMALECOLUMN (HID_BASE + 2255) -#define HID_MM_GREETINGS_CB_FEMALEFIELD (HID_BASE + 2256) -#define HID_MM_GREETINGS_CB_NEUTRAL (HID_BASE + 2257) -#define HID_MM_BODY_CB_PERSONALIZED (HID_BASE + 2258) -#define HID_MM_BODY_LB_FEMALE (HID_BASE + 2259) -#define HID_MM_BODY_PB_FEMALE (HID_BASE + 2260) -#define HID_MM_BODY_LB_MALE (HID_BASE + 2261) -#define HID_MM_BODY_PB_MALE (HID_BASE + 2262) -#define HID_MM_BODY_LB_FEMALECOLUMN (HID_BASE + 2263) -#define HID_MM_BODY_CB_FEMALEFIELD (HID_BASE + 2264) -#define HID_MM_BODY_CB_NEUTRAL (HID_BASE + 2265) -#define HID_MM_ASSIGN_FIELDS (HID_BASE + 2266) -#define HID_MM_HEADER_0 (HID_BASE + 2267) -#define HID_MM_HEADER_1 (HID_BASE + 2268) -#define HID_MM_HEADER_2 (HID_BASE + 2269) -#define HID_MM_HEADER_3 (HID_BASE + 2270) -#define HID_MM_HEADER_4 (HID_BASE + 2271) -#define HID_MM_HEADER_5 (HID_BASE + 2272) -#define HID_MM_HEADER_6 (HID_BASE + 2273) -#define HID_MM_HEADER_7 (HID_BASE + 2274) -#define HID_MM_HEADER_8 (HID_BASE + 2275) -#define HID_MM_HEADER_9 (HID_BASE + 2276) -#define HID_MM_HEADER_10 (HID_BASE + 2277) -#define HID_MM_HEADER_11 (HID_BASE + 2278) -#define HID_MM_HEADER_12 (HID_BASE + 2279) -#define HID_MM_HEADER_13 (HID_BASE + 2280) +#define HID_TOX_ENTRY_BUTTON "SW_HID_TOX_ENTRY_BUTTON" +#define HID_TOX_ENTRY_EDIT "SW_HID_TOX_ENTRY_EDIT" + +#define HID_DLG_NEW_USER_IDX "SW_HID_DLG_NEW_USER_IDX" +#define HID_INSERT_IDX_MRK_OK "SW_HID_INSERT_IDX_MRK_OK" +#define HID_INSERT_IDX_MRK_CLOSE "SW_HID_INSERT_IDX_MRK_CLOSE" +#define HID_INSERT_AUTH_MRK_OK "SW_HID_INSERT_AUTH_MRK_OK" +#define HID_INSERT_AUTH_MRK_CLOSE "SW_HID_INSERT_AUTH_MRK_CLOSE" +#define HID_INSERT_IDX_MRK_DELETE "SW_HID_INSERT_IDX_MRK_DELETE" +#define HID_INSERT_IDX_MRK_NEW "SW_HID_INSERT_IDX_MRK_NEW" +#define HID_INSERT_IDX_MRK_PREV "SW_HID_INSERT_IDX_MRK_PREV" +#define HID_INSERT_IDX_MRK_PREV_SAME "SW_HID_INSERT_IDX_MRK_PREV_SAME" +#define HID_INSERT_IDX_MRK_NEXT "SW_HID_INSERT_IDX_MRK_NEXT" +#define HID_INSERT_IDX_MRK_NEXT_SAME "SW_HID_INSERT_IDX_MRK_NEXT_SAME" +#define HID_INSERT_IDX_MRK_TYPE "SW_HID_INSERT_IDX_MRK_TYPE" +#define HID_INSERT_IDX_MRK_ENTRY "SW_HID_INSERT_IDX_MRK_ENTRY" +#define HID_INSERT_IDX_MRK_PRIM_KEY "SW_HID_INSERT_IDX_MRK_PRIM_KEY" +#define HID_INSERT_IDX_MRK_SEC_KEY "SW_HID_INSERT_IDX_MRK_SEC_KEY" +#define HID_INSERT_IDX_MRK_LEVEL "SW_HID_INSERT_IDX_MRK_LEVEL" +#define HID_INSERT_IDX_MRK_MAIN_ENTRY "SW_HID_INSERT_IDX_MRK_MAIN_ENTRY" +#define HID_INSERT_IDX_MRK_APPLY_ALL "SW_HID_INSERT_IDX_MRK_APPLY_ALL" +#define HID_INSERT_AUTH_MRK_ENTRY "SW_HID_INSERT_AUTH_MRK_ENTRY" +#define HID_INSERT_AUTH_MRK_CREATE_ENTRY "SW_HID_INSERT_AUTH_MRK_CREATE_ENTRY" +#define HID_INSERT_AUTH_MRK_EDIT_ENTRY "SW_HID_INSERT_AUTH_MRK_EDIT_ENTRY" +#define HID_TOKEN_WINDOW "SW_HID_TOKEN_WINDOW" + +#define HID_AUTH_FIELD_IDENTIFIER "SW_HID_AUTH_FIELD_IDENTIFIER" +#define HID_AUTH_FIELD_AUTHORITY_TYPE "SW_HID_AUTH_FIELD_AUTHORITY_TYPE" +#define HID_AUTH_FIELD_ADDRESS "SW_HID_AUTH_FIELD_ADDRESS" +#define HID_AUTH_FIELD_ANNOTE "SW_HID_AUTH_FIELD_ANNOTE" +#define HID_AUTH_FIELD_AUTHOR "SW_HID_AUTH_FIELD_AUTHOR" +#define HID_AUTH_FIELD_BOOKTITLE "SW_HID_AUTH_FIELD_BOOKTITLE" +#define HID_AUTH_FIELD_CHAPTER "SW_HID_AUTH_FIELD_CHAPTER" +#define HID_AUTH_FIELD_EDITION "SW_HID_AUTH_FIELD_EDITION" +#define HID_AUTH_FIELD_EDITOR "SW_HID_AUTH_FIELD_EDITOR" +#define HID_AUTH_FIELD_HOWPUBLISHED "SW_HID_AUTH_FIELD_HOWPUBLISHED" +#define HID_AUTH_FIELD_INSTITUTION "SW_HID_AUTH_FIELD_INSTITUTION" +#define HID_AUTH_FIELD_JOURNAL "SW_HID_AUTH_FIELD_JOURNAL" +#define HID_AUTH_FIELD_MONTH "SW_HID_AUTH_FIELD_MONTH" +#define HID_AUTH_FIELD_NOTE "SW_HID_AUTH_FIELD_NOTE" +#define HID_AUTH_FIELD_NUMBER "SW_HID_AUTH_FIELD_NUMBER" +#define HID_AUTH_FIELD_ORGANIZATIONS "SW_HID_AUTH_FIELD_ORGANIZATIONS" +#define HID_AUTH_FIELD_PAGES "SW_HID_AUTH_FIELD_PAGES" +#define HID_AUTH_FIELD_PUBLISHER "SW_HID_AUTH_FIELD_PUBLISHER" +#define HID_AUTH_FIELD_SCHOOL "SW_HID_AUTH_FIELD_SCHOOL" +#define HID_AUTH_FIELD_SERIES "SW_HID_AUTH_FIELD_SERIES" +#define HID_AUTH_FIELD_TITLE "SW_HID_AUTH_FIELD_TITLE" +#define HID_AUTH_FIELD_REPORT_TYPE "SW_HID_AUTH_FIELD_REPORT_TYPE" +#define HID_AUTH_FIELD_VOLUME "SW_HID_AUTH_FIELD_VOLUME" +#define HID_AUTH_FIELD_YEAR "SW_HID_AUTH_FIELD_YEAR" +#define HID_AUTH_FIELD_URL "SW_HID_AUTH_FIELD_URL" +#define HID_AUTH_FIELD_CUSTOM1 "SW_HID_AUTH_FIELD_CUSTOM1" +#define HID_AUTH_FIELD_CUSTOM2 "SW_HID_AUTH_FIELD_CUSTOM2" +#define HID_AUTH_FIELD_CUSTOM3 "SW_HID_AUTH_FIELD_CUSTOM3" +#define HID_AUTH_FIELD_CUSTOM4 "SW_HID_AUTH_FIELD_CUSTOM4" +#define HID_AUTH_FIELD_CUSTOM5 "SW_HID_AUTH_FIELD_CUSTOM5" +#define HID_AUTH_FIELD_ISBN "SW_HID_AUTH_FIELD_ISBN" + +#define HID_AUTH_MARK_DLG_FROM_COMP_RB "SW_HID_AUTH_MARK_DLG_FROM_COMP_RB" +#define HID_AUTH_MARK_DLG_FROM_DOC_RB "SW_HID_AUTH_MARK_DLG_FROM_DOC_RB" +#define HID_AUTH_MARK_DLG_ID_LISTBOX "SW_HID_AUTH_MARK_DLG_ID_LISTBOX" + +#define HID_INSERT_INDEX_ENTRY_LEVEL_LB "SW_HID_INSERT_INDEX_ENTRY_LEVEL_LB" +#define HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE "SW_HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE" +#define HID_INSERT_IDX_MRK_SRCH_WORDONLY "SW_HID_INSERT_IDX_MRK_SRCH_WORDONLY" +#define HID_DLG_CREATE_AUTOMARK "SW_HID_DLG_CREATE_AUTOMARK" +#define HID_BUSINESS_CARD_CONTENT "SW_HID_BUSINESS_CARD_CONTENT" +#define HID_SAVE_LABEL_DLG "SW_HID_SAVE_LABEL_DLG" +#define HID_BUSINESS_FMT_PAGE "SW_HID_BUSINESS_FMT_PAGE" +#define HID_BUSINESS_FMT_PAGE_CONT "SW_HID_BUSINESS_FMT_PAGE_CONT" +#define HID_BUSINESS_FMT_PAGE_SHEET "SW_HID_BUSINESS_FMT_PAGE_SHEET" +#define HID_BUSINESS_FMT_PAGE_BRAND "SW_HID_BUSINESS_FMT_PAGE_BRAND" +#define HID_BUSINESS_FMT_PAGE_TYPE "SW_HID_BUSINESS_FMT_PAGE_TYPE" +#define HID_SEND_MASTER_DIALOG "SW_HID_SEND_MASTER_DIALOG" +#define HID_SEND_MASTER_CTRL_PUSHBUTTON_OK "SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_OK" +#define HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL "SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL" +#define HID_SEND_MASTER_CTRL_LISTBOX_FILTER "SW_HID_SEND_MASTER_CTRL_LISTBOX_FILTER" +#define HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW "SW_HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW" +#define HID_SEND_MASTER_CTRL_EDIT_FILEURL "SW_HID_SEND_MASTER_CTRL_EDIT_FILEURL" +#define HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION "SW_HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION" +#define HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE "SW_HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE" +#define HID_SEND_MASTER_CTRL_DUMMY "SW_HID_SEND_MASTER_CTRL_DUMMY" + +#define HID_SEND_HTML_DIALOG "SW_HID_SEND_HTML_DIALOG" +#define HID_SEND_HTML_CTRL_PUSHBUTTON_OK "SW_HID_SEND_HTML_CTRL_PUSHBUTTON_OK" +#define HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL "SW_HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL" +#define HID_SEND_HTML_CTRL_LISTBOX_FILTER "SW_HID_SEND_HTML_CTRL_LISTBOX_FILTER" +#define HID_SEND_HTML_CTRL_CONTROL_FILEVIEW "SW_HID_SEND_HTML_CTRL_CONTROL_FILEVIEW" +#define HID_SEND_HTML_CTRL_EDIT_FILEURL "SW_HID_SEND_HTML_CTRL_EDIT_FILEURL" +#define HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION "SW_HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION" +#define HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE "SW_HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE" +#define HID_SEND_HTML_CTRL_DUMMY "SW_HID_SEND_HTML_CTRL_DUMMY" + +#define HID_INSERT_IDX_MRK_PHONETIC_READING "SW_HID_INSERT_IDX_MRK_PHONETIC_READING" +#define HID_COLUMN_VALUESET "SW_HID_COLUMN_VALUESET" +#define HID_PVIEW_ZOOM_LB "SW_HID_PVIEW_ZOOM_LB" +#define HID_MAIL_MERGE_SELECT "SW_HID_MAIL_MERGE_SELECT" +#define HID_MAIL_MERGE_CREATE_FROM "SW_HID_MAIL_MERGE_CREATE_FROM" +#define HID_MAIL_MERGE_INSERT_FIELDS "SW_HID_MAIL_MERGE_INSERT_FIELDS" +#define HID_PRINT_AS_MERGE "SW_HID_PRINT_AS_MERGE" +#define HID_MERGE_SOURCE_UNAVAILABLE "SW_HID_MERGE_SOURCE_UNAVAILABLE" +#define HID_DATA_SOURCES_UNAVAILABLE "SW_HID_DATA_SOURCES_UNAVAILABLE" +#define HID_MODULE_TOOLBOX "SW_HID_MODULE_TOOLBOX" +#define HID_SECTION_INDENTS_PAGE "SW_HID_SECTION_INDENTS_PAGE" + +#define HID_FLD_DROPDOWN "SW_HID_FLD_DROPDOWN" +#define HID_MM_DOCSELECTPAGE "SW_HID_MM_DOCSELECTPAGE" +#define HID_MM_OUTPUTTYPEPAGE "SW_HID_MM_OUTPUTTYPEPAGE" +#define HID_MM_ADDRESSBLOCKPAGE "SW_HID_MM_ADDRESSBLOCKPAGE" +#define HID_MM_GREETINGSPAGE "SW_HID_MM_GREETINGSPAGE" +#define HID_MM_PREPAREMERGEPAGE "SW_HID_MM_PREPAREMERGEPAGE" +#define HID_MM_MERGEPAGE "SW_HID_MM_MERGEPAGE" +#define HID_MM_OUTPUTPAGE "SW_HID_MM_OUTPUTPAGE" +#define HID_MM_ADDRESSLISTDIALOG "SW_HID_MM_ADDRESSLISTDIALOG" +#define HID_MM_SELECTDBTABLEDDIALOG "SW_HID_MM_SELECTDBTABLEDDIALOG" +#define HID_MM_SELECTDBTABLEDDIALOG_LISTBOX "SW_HID_MM_SELECTDBTABLEDDIALOG_LISTBOX" +#define HID_MM_DBTABLEPREVIEWDIALOG "SW_HID_MM_DBTABLEPREVIEWDIALOG" +#define HID_MM_CREATEADDRESSLIST "SW_HID_MM_CREATEADDRESSLIST" +#define HID_MM_FIND_ENTRY "SW_HID_MM_FIND_ENTRY" +#define HID_MM_ADD_RENAME_ENTRY "SW_HID_MM_ADD_RENAME_ENTRY" +#define HID_MM_CUSTOMIZE_ADDRESS_LIST "SW_HID_MM_CUSTOMIZE_ADDRESS_LIST" +#define HID_MM_CUSTOMIZEADDRESSBLOCK "SW_HID_MM_CUSTOMIZEADDRESSBLOCK" +#define HID_MM_SELECTADDRESSBLOCK "SW_HID_MM_SELECTADDRESSBLOCK" +#define HID_MM_ASSIGNFIELDS "SW_HID_MM_ASSIGNFIELDS" +#define HID_MM_MAILNOTINSTALLED "SW_HID_MM_MAILNOTINSTALLED" +#define HID_MM_LAYOUT_PAGE "SW_HID_MM_LAYOUT_PAGE" +#define HID_MM_COPYTO "SW_HID_MM_COPYTO" +#define HID_MM_ADDRESSLIST_HB "SW_HID_MM_ADDRESSLIST_HB" +#define HID_MM_ADDRESSLIST_TLB "SW_HID_MM_ADDRESSLIST_TLB" +#define HID_TP_MAILCONFIG "SW_HID_TP_MAILCONFIG" +#define HID_MM_TESTACCOUNTSETTINGS "SW_HID_MM_TESTACCOUNTSETTINGS" +#define HID_MM_TESTACCOUNTSETTINGS_TLB "SW_HID_MM_TESTACCOUNTSETTINGS_TLB" +#define HID_MM_TESTACCOUNTSETTINGS_HB "SW_HID_MM_TESTACCOUNTSETTINGS_HB" +#define HID_MM_MAILBODY "SW_HID_MM_MAILBODY" +#define HID_MM_SENDMAILS "SW_HID_MM_SENDMAILS" +#define HID_MM_SENDMAILS_STATUSLB "SW_HID_MM_SENDMAILS_STATUSLB" +#define HID_MAILMERGECHILD "SW_HID_MAILMERGECHILD" +#define HID_MM_CUSTOMFIELDS "SW_HID_MM_CUSTOMFIELDS" +#define HID_DLG_WORDCOUNT "SW_HID_DLG_WORDCOUNT" +#define HID_MM_MAILSTATUS_TLB "SW_HID_MM_MAILSTATUS_TLB" +#define HID_RETURN_TO_MAILMERGE "SW_HID_RETURN_TO_MAILMERGE" +#define HID_MM_SAVEWARNING "SW_HID_MM_SAVEWARNING" +#define HID_MM_QUERY "SW_HID_MM_QUERY" +#define HID_MM_SENDWARNING "SW_HID_MM_SENDWARNING" +#define HID_MM_SERVERAUTHENTICATION "SW_HID_MM_SERVERAUTHENTICATION" + +#define HID_MEDIA_TOOLBOX "SW_HID_MEDIA_TOOLBOX" +#define HID_NID_TBL "SW_HID_NID_TBL" +#define HID_NID_FRM "SW_HID_NID_FRM" +#define HID_NID_GRF "SW_HID_NID_GRF" +#define HID_NID_OLE "SW_HID_NID_OLE" +#define HID_NID_PGE "SW_HID_NID_PGE" +#define HID_NID_OUTL "SW_HID_NID_OUTL" +#define HID_NID_MARK "SW_HID_NID_MARK" +#define HID_NID_DRW "SW_HID_NID_DRW" +#define HID_NID_CTRL "SW_HID_NID_CTRL" +#define HID_NID_PREV "SW_HID_NID_PREV" +#define HID_NID_REG "SW_HID_NID_REG" +#define HID_NID_BKM "SW_HID_NID_BKM" +#define HID_NID_SEL "SW_HID_NID_SEL" +#define HID_NID_FTN "SW_HID_NID_FTN" +#define HID_NID_POSTIT "SW_HID_NID_POSTIT" +#define HID_NID_SRCH_REP "SW_HID_NID_SRCH_REP" +#define HID_NID_INDEX_ENTRY "SW_HID_NID_INDEX_ENTRY" +#define HID_NID_TABLE_FORMULA "SW_HID_NID_TABLE_FORMULA" +#define HID_NID_TABLE_FORMULA_ERROR "SW_HID_NID_TABLE_FORMULA_ERROR" +#define HID_NID_NEXT "SW_HID_NID_NEXT" +#define HID_MM_NEXT_PAGE "SW_HID_MM_NEXT_PAGE" +#define HID_MM_PREV_PAGE "SW_HID_MM_PREV_PAGE" +#define HID_MM_GREETINGS_CB_PERSONALIZED "SW_HID_MM_GREETINGS_CB_PERSONALIZED" +#define HID_MM_GREETINGS_LB_FEMALE "SW_HID_MM_GREETINGS_LB_FEMALE" +#define HID_MM_GREETINGS_PB_FEMALE "SW_HID_MM_GREETINGS_PB_FEMALE" +#define HID_MM_GREETINGS_LB_MALE "SW_HID_MM_GREETINGS_LB_MALE" +#define HID_MM_GREETINGS_PB_MALE "SW_HID_MM_GREETINGS_PB_MALE" +#define HID_MM_GREETINGS_LB_FEMALECOLUMN "SW_HID_MM_GREETINGS_LB_FEMALECOLUMN" +#define HID_MM_GREETINGS_CB_FEMALEFIELD "SW_HID_MM_GREETINGS_CB_FEMALEFIELD" +#define HID_MM_GREETINGS_CB_NEUTRAL "SW_HID_MM_GREETINGS_CB_NEUTRAL" +#define HID_MM_BODY_CB_PERSONALIZED "SW_HID_MM_BODY_CB_PERSONALIZED" +#define HID_MM_BODY_LB_FEMALE "SW_HID_MM_BODY_LB_FEMALE" +#define HID_MM_BODY_PB_FEMALE "SW_HID_MM_BODY_PB_FEMALE" +#define HID_MM_BODY_LB_MALE "SW_HID_MM_BODY_LB_MALE" +#define HID_MM_BODY_PB_MALE "SW_HID_MM_BODY_PB_MALE" +#define HID_MM_BODY_LB_FEMALECOLUMN "SW_HID_MM_BODY_LB_FEMALECOLUMN" +#define HID_MM_BODY_CB_FEMALEFIELD "SW_HID_MM_BODY_CB_FEMALEFIELD" +#define HID_MM_BODY_CB_NEUTRAL "SW_HID_MM_BODY_CB_NEUTRAL" +#define HID_MM_ASSIGN_FIELDS "SW_HID_MM_ASSIGN_FIELDS" +#define HID_MM_HEADER_0 "SW_HID_MM_HEADER_0" +#define HID_MM_HEADER_1 "SW_HID_MM_HEADER_1" +#define HID_MM_HEADER_2 "SW_HID_MM_HEADER_2" +#define HID_MM_HEADER_3 "SW_HID_MM_HEADER_3" +#define HID_MM_HEADER_4 "SW_HID_MM_HEADER_4" +#define HID_MM_HEADER_5 "SW_HID_MM_HEADER_5" +#define HID_MM_HEADER_6 "SW_HID_MM_HEADER_6" +#define HID_MM_HEADER_7 "SW_HID_MM_HEADER_7" +#define HID_MM_HEADER_8 "SW_HID_MM_HEADER_8" +#define HID_MM_HEADER_9 "SW_HID_MM_HEADER_9" +#define HID_MM_HEADER_10 "SW_HID_MM_HEADER_10" +#define HID_MM_HEADER_11 "SW_HID_MM_HEADER_11" +#define HID_MM_HEADER_12 "SW_HID_MM_HEADER_12" +#define HID_MM_HEADER_13 "SW_HID_MM_HEADER_13" + +#define HID_ITM_HOR_LEFT "SW_HID_ITM_HOR_LEFT" +#define HID_ITM_HOR_CNTR "SW_HID_ITM_HOR_CNTR" +#define HID_ITM_HOR_RGHT "SW_HID_ITM_HOR_RGHT" +#define HID_ITM_VER_LEFT "SW_HID_ITM_VER_LEFT" +#define HID_ITM_VER_CNTR "SW_HID_ITM_VER_CNTR" +#define HID_ITM_VER_RGHT "SW_HID_ITM_VER_RGHT" + +#define HID_TBX_FORMULA_CALC "SW_HID_TBX_FORMULA_CALC" +#define HID_TBX_FORMULA_CANCEL "SW_HID_TBX_FORMULA_CANCEL" +#define HID_TBX_FORMULA_APPLY "SW_HID_TBX_FORMULA_APPLY" diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index d189f3c31349..d2b4c1f5c1a1 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -127,7 +127,7 @@ public: virtual BOOL IsEndNote() = 0; virtual String GetStr() = 0; //from class Window - virtual void SetHelpId( ULONG nHelpId ) = 0; + virtual void SetHelpId( const rtl::OString& sHelpId ) = 0; virtual void SetText( const XubString& rStr ) = 0; }; diff --git a/sw/inc/swcommands.h b/sw/inc/swcommands.h new file mode 100644 index 000000000000..8d3fe63b75bb --- /dev/null +++ b/sw/inc/swcommands.h @@ -0,0 +1,434 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SW_SWCOMMANDS_HRC +#define SW_SWCOMMANDS_HRC + +#define CMD_SID_CREATE_SW_DRAWVIEW ".uno:CreateSWDrawView" +#define CMD_FN_REDLINE_ACCEPT ".uno:AcceptTrackedChanges" +#define CMD_FN_REDLINE_ON ".uno:TrackChanges" +#define CMD_FN_ADD_UNKNOWN ".uno:AddAllUnknownWords" +#define CMD_FN_FRAME_ALIGN_VERT_BOTTOM ".uno:AlignBottom" +#define CMD_FN_FRAME_ALIGN_VERT_CHAR_BOTTOM ".uno:AlignCharBottom" +#define CMD_FN_FRAME_ALIGN_VERT_CHAR_TOP ".uno:AlignCharTop" +#define CMD_FN_FRAME_ALIGN_HORZ_CENTER ".uno:AlignHorizontalCenter" +#define CMD_FN_FRAME_ALIGN_HORZ_LEFT ".uno:AlignLeft" +#define CMD_FN_FRAME_ALIGN_HORZ_RIGHT ".uno:AlignRight" +#define CMD_FN_FRAME_ALIGN_VERT_ROW_BOTTOM ".uno:AlignRowBottom" +#define CMD_FN_FRAME_ALIGN_VERT_ROW_TOP ".uno:AlignRowTop" +#define CMD_FN_FRAME_ALIGN_VERT_TOP ".uno:AlignTop" +#define CMD_FN_FRAME_ALIGN_VERT_CENTER ".uno:AlignVerticalCenter" +#define CMD_FN_FRAME_ALIGN_VERT_CHAR_CENTER ".uno:AlignVerticalCharCenter" +#define CMD_FN_FRAME_ALIGN_VERT_ROW_CENTER ".uno:AlignVerticalRowCenter" +#define CMD_FN_EDIT_AUTH_ENTRY_DLG ".uno:AuthoritiesEntryDialog" +#define CMD_FN_AUTOFORMAT_APPLY ".uno:AutoFormatApply" +#define CMD_FN_AUTOFORMAT_REDLINE_APPLY ".uno:AutoFormatRedlineApply" +#define CMD_FN_TABLE_AUTOSUM ".uno:AutoSum" +#define CMD_SID_ATTR_CHAR_COLOR_BACKGROUND ".uno:BackColor" +#define CMD_FN_FORMAT_BACKGROUND_DLG ".uno:BackgroundDialog" +#define CMD_FN_BACKSPACE ".uno:SwBackspace" +#define CMD_FN_FORMAT_BORDER_DLG ".uno:BorderDialog" +#define CMD_FN_NUMBER_BULLETS ".uno:BulletsAndNumberingDialog" +#define CMD_FN_CALC_TABLE ".uno:Calc" +#define CMD_FN_CALCULATE ".uno:CalculateSel" +#define CMD_FN_TABLE_VERT_BOTTOM ".uno:CellVertBottom" +#define CMD_FN_TABLE_VERT_CENTER ".uno:CellVertCenter" +#define CMD_FN_TABLE_VERT_NONE ".uno:CellVertTop" +#define CMD_FN_FRAME_CHAIN ".uno:ChainFrames" +#define CMD_FN_CHANGE_DBFIELD ".uno:ChangeDatabaseField" +#define CMD_FN_NUMBERING_OUTLINE_DLG ".uno:ChapterNumberingDialog" +#define CMD_SID_ATTR_CHAR_COLOR_BACKGROUND_EXT ".uno:CharBackgroundExt" +#define CMD_SID_ATTR_CHAR_COLOR_EXT ".uno:CharColorExt" +#define CMD_FN_CHAR_LEFT_SEL ".uno:CharLeftSel" +#define CMD_FN_CHAR_RIGHT_SEL ".uno:CharRightSel" +#define CMD_FN_CLOSE_PAGEPREVIEW ".uno:ClosePreview" +#define CMD_FN_REDLINE_COMMENT ".uno:CommentChangeTracking" +#define CMD_FN_VIEW_META_CHARS ".uno:ControlCodes" +#define CMD_FN_CONVERT_TEXT_TABLE ".uno:ConvertTableText" +#define CMD_FN_ABSTRACT_NEWDOC ".uno:CreateAbstract" +#define CMD_FN_DEC_INDENT_OFFSET ".uno:DecrementIndentValue" +#define CMD_FN_NUM_BULLET_DOWN ".uno:DecrementLevel" +#define CMD_FN_NUM_BULLET_OUTLINE_DOWN ".uno:DecrementSubLevels" +#define CMD_FN_TABLE_DELETE_COL ".uno:DeleteColumns" +#define CMD_FN_TABLE_DELETE_ROW ".uno:DeleteRows" +#define CMD_FN_DELETE_WHOLE_LINE ".uno:DelLine" +#define CMD_FN_DELETE_LINE ".uno:DelToEndOfLine" +#define CMD_FN_DELETE_PARA ".uno:DelToEndOfPara" +#define CMD_FN_DELETE_SENT ".uno:DelToEndOfSentence" +#define CMD_FN_DELETE_WORD ".uno:DelToEndOfWord" +#define CMD_FN_DELETE_BACK_LINE ".uno:DelToStartOfLine" +#define CMD_FN_DELETE_BACK_PARA ".uno:DelToStartOfPara" +#define CMD_FN_DELETE_BACK_SENT ".uno:DelToStartOfSentence" +#define CMD_FN_DELETE_BACK_WORD ".uno:DelToStartOfWord" +#define CMD_FN_TABLE_BALANCE_CELLS ".uno:DistributeColumns" +#define CMD_FN_TABLE_BALANCE_ROWS ".uno:DistributeRows" +#define CMD_FN_EDIT_CURRENT_TOX ".uno:EditCurIndex" +#define CMD_FN_GLOSSARY_DLG ".uno:EditGlossary" +#define CMD_FN_EDIT_HYPERLINK ".uno:EditHyperlink" +#define CMD_FN_EDIT_REGION ".uno:EditRegion" +#define CMD_FN_END_OF_DOCUMENT_SEL ".uno:EndOfDocumentSel" +#define CMD_FN_END_OF_LINE_SEL ".uno:EndOfLineSel" +#define CMD_FN_END_OF_PARA_SEL ".uno:EndOfParaSel" +#define CMD_FN_TABLE_SELECT_COL ".uno:EntireColumn" +#define CMD_FN_TABLE_SELECT_ROW ".uno:EntireRow" +#define CMD_FN_ESCAPE ".uno:Escape" +#define CMD_FN_EXECUTE_MACROFIELD ".uno:ExecuteMacroField" +#define CMD_FN_EXPAND_GLOSSARY ".uno:ExpandGlossary" +#define CMD_FN_EDIT_FIELD ".uno:FieldDialog" +#define CMD_FN_VIEW_FIELDNAME ".uno:Fieldnames" +#define CMD_FN_VIEW_FIELDS ".uno:Fields" +#define CMD_FN_FLIP_HORZ_GRAFIC ".uno:FlipHorizontal" +#define CMD_FN_FLIP_VERT_GRAFIC ".uno:FlipVertical" +#define CMD_SID_ATTR_CHAR_COLOR2 ".uno:FontColor" +#define CMD_FN_FORMAT_FOOTNOTE_DLG ".uno:FootnoteDialog" +#define CMD_FN_EDIT_FOOTNOTE ".uno:EditFootnote" +#define CMD_FN_FORMAT_COLUMN ".uno:FormatColumns" +#define CMD_FN_FORMAT_DROPCAPS ".uno:FormatDropcap" +#define CMD_FN_FORMAT_FRAME_DLG ".uno:FrameDialog" +#define CMD_FN_LINE_DOWN ".uno:GoDown" +#define CMD_FN_CHAR_LEFT ".uno:GoLeft" +#define CMD_FN_CHAR_RIGHT ".uno:GoRight" +#define CMD_FN_FRAME_TO_ANCHOR ".uno:GoToAnchor" +#define CMD_FN_END_TABLE ".uno:GoToEnd" +#define CMD_FN_END_OF_COLUMN ".uno:GoToEndOfColumn" +#define CMD_FN_END_OF_DOCUMENT ".uno:GoToEndOfDoc" +#define CMD_FN_END_OF_LINE ".uno:GoToEndOfLine" +#define CMD_FN_END_OF_NEXT_COLUMN ".uno:GoToEndOfNextColumn" +#define CMD_FN_END_OF_NEXT_PAGE ".uno:GoToEndOfNextPage" +#define CMD_FN_END_OF_NEXT_PAGE_SEL ".uno:GoToEndOfNextPageSel" +#define CMD_FN_END_OF_PAGE ".uno:GoToEndOfPage" +#define CMD_FN_END_OF_PAGE_SEL ".uno:GoToEndOfPageSel" +#define CMD_FN_END_OF_PARA ".uno:GoToEndOfPara" +#define CMD_FN_END_OF_PREV_COLUMN ".uno:GoToEndOfPrevColumn" +#define CMD_FN_END_OF_PREV_PAGE ".uno:GoToEndOfPrevPage" +#define CMD_FN_END_OF_PREV_PAGE_SEL ".uno:GoToEndOfPrevPageSel" +#define CMD_FN_NEXT_TOXMARK ".uno:GotoNextIndexMark" +#define CMD_FN_GOTO_NEXT_INPUTFLD ".uno:GotoNextInputField" +#define CMD_FN_GOTO_NEXT_OBJ ".uno:GotoNextObject" +#define CMD_FN_NEXT_PARA ".uno:GoToNextPara" +#define CMD_FN_GOTO_NEXT_MARK ".uno:GotoNextPlacemarker" +#define CMD_FN_NEXT_SENT ".uno:GoToNextSentence" +#define CMD_FN_NEXT_SENT_SEL ".uno:GotoNextSentenceSel" +#define CMD_FN_NEXT_TBLFML ".uno:GotoNextTableFormula" +#define CMD_FN_NEXT_WORD ".uno:GoToNextWord" +#define CMD_FN_NEXT_TBLFML_ERR ".uno:GotoNextWrongTableFormula" +#define CMD_FN_NAVIGATION_PI_GOTO_PAGE ".uno:GotoPage" +#define CMD_FN_PREV_TOXMARK ".uno:GotoPrevIndexMark" +#define CMD_FN_GOTO_PREV_INPUTFLD ".uno:GotoPrevInputField" +#define CMD_FN_GOTO_PREV_OBJ ".uno:GotoPrevObject" +#define CMD_FN_PREV_PARA ".uno:GoToPrevPara" +#define CMD_FN_GOTO_PREV_MARK ".uno:GotoPrevPlacemarker" +#define CMD_FN_PREV_SENT ".uno:GoToPrevSentence" +#define CMD_FN_PREV_SENT_SEL ".uno:GotoPrevSentenceSel" +#define CMD_FN_PREV_TBLFML ".uno:GotoPrevTableFormula" +#define CMD_FN_PREV_WORD ".uno:GoToPrevWord" +#define CMD_FN_PREV_TBLFML_ERR ".uno:GotoPrevWrongTableFormula" +#define CMD_FN_START_TABLE ".uno:GoToStartOfTable" +#define CMD_FN_START_OF_COLUMN ".uno:GoToStartOfColumn" +#define CMD_FN_START_OF_DOCUMENT ".uno:GoToStartOfDoc" +#define CMD_FN_START_OF_LINE ".uno:GoToStartOfLine" +#define CMD_FN_START_OF_NEXT_COLUMN ".uno:GoToStartOfNextColumn" +#define CMD_FN_START_OF_NEXT_PAGE ".uno:GoToStartOfNextPage" +#define CMD_FN_START_OF_NEXT_PAGE_SEL ".uno:GoToStartOfNextPageSel" +#define CMD_FN_START_OF_PAGE ".uno:GoToStartOfPage" +#define CMD_FN_START_OF_PAGE_SEL ".uno:GoToStartOfPageSel" +#define CMD_FN_START_OF_PARA ".uno:GoToStartOfPara" +#define CMD_FN_START_OF_PREV_COLUMN ".uno:GoToStartOfPrevColumn" +#define CMD_FN_START_OF_PREV_PAGE ".uno:GoToStartOfPrevPage" +#define CMD_FN_START_OF_PREV_PAGE_SEL ".uno:GoToStartOfPrevPageSel" +#define CMD_FN_LINE_UP ".uno:GoUp" +#define CMD_FN_VIEW_GRAPHIC ".uno:Graphic" +#define CMD_FN_FORMAT_GRAFIC_DLG ".uno:GraphicDialog" +#define CMD_FN_SAVE_GRAPHIC ".uno:SaveGraphic" +#define CMD_FN_GROW_FONT_SIZE ".uno:Grow" +#define CMD_FN_HSCROLLBAR ".uno:HScroll" +#define CMD_SID_HTML_MODE ".uno:HtmlMode" +#define CMD_FN_HYPHENATE_OPT_DLG ".uno:Hyphenate" +#define CMD_FN_INC_INDENT_OFFSET ".uno:IncrementIndentValue" +#define CMD_FN_NUM_BULLET_UP ".uno:IncrementLevel" +#define CMD_FN_NUM_BULLET_OUTLINE_UP ".uno:IncrementSubLevels" +#define CMD_FN_EDIT_IDX_ENTRY_DLG ".uno:IndexEntryDialog" +#define CMD_FN_IDX_MARK_TO_IDX ".uno:IndexMarkToIndex" +#define CMD_FN_POSTIT ".uno:InsertAnnotation" +#define CMD_FN_INSERT_FLD_AUTHOR ".uno:InsertAuthorField" +#define CMD_FN_INSERT_AUTH_ENTRY_DLG ".uno:InsertAuthoritiesEntry" +#define CMD_FN_INSERT_BOOKMARK ".uno:InsertBookmark" +#define CMD_FN_INSERT_BREAK_DLG ".uno:InsertBreak" +#define CMD_FN_INSERT_CAPTION ".uno:InsertCaptionDialog" +#define CMD_FN_INSERT_COLUMN_BREAK ".uno:InsertColumnBreak" +#define CMD_FN_TABLE_INSERT_COL_DLG ".uno:InsertColumnDialog" +#define CMD_FN_TABLE_INSERT_COL ".uno:InsertColumns" +#define CMD_FN_INSERT_REGION ".uno:InsertSection" +#define CMD_FN_INSERT_CTRL ".uno:InsertCtrl" +#define CMD_FN_INSERT_FLD_DATE ".uno:InsertDateField" +#define CMD_FN_INSERT_ENDNOTE ".uno:InsertEndnote" +#define CMD_FN_ENVELOP ".uno:InsertEnvelope" +#define CMD_FN_INSERT_FIELD ".uno:InsertField" +#define CMD_FN_INSERT_FIELD_CTRL ".uno:InsertFieldCtrl" +#define CMD_FN_INSERT_FOOTNOTE_DLG ".uno:InsertFootnoteDialog" +#define CMD_FN_INSERT_FOOTNOTE ".uno:InsertFootnote" +#define CMD_FN_EDIT_FORMULA ".uno:InsertFormula" +#define CMD_FN_INSERT_FRAME ".uno:InsertFrame" +#define CMD_FN_INSERT_FRAME_INTERACT ".uno:InsertFrameInteract" +#define CMD_FN_INSERT_FRAME_INTERACT_NOCOL ".uno:InsertFrameInteractNoColumns" +#define CMD_FN_INSERT_HRULER ".uno:InsertGraphicRuler" +#define CMD_FN_INSERT_HYPERLINK ".uno:InsertHyperlinkDlg" +#define CMD_FN_INSERT_IDX_ENTRY_DLG ".uno:InsertIndexesEntry" +#define CMD_FN_INSERT_LINEBREAK ".uno:InsertLinebreak" +#define CMD_FN_INSERT_MULTI_TOX ".uno:InsertMultiIndex" +#define CMD_FN_NUM_BULLET_NONUM ".uno:InsertNeutralParagraph" +#define CMD_FN_INSERT_OBJ_CTRL ".uno:InsertObjCtrl" +#define CMD_FN_INSERT_OBJECT_DLG ".uno:InsertObjectDialog" +#define CMD_FN_INSERT_SMA ".uno:InsertObjectStarMath" +#define CMD_FN_INSERT_PAGEBREAK ".uno:InsertPagebreak" +#define CMD_FN_INSERT_FLD_PGCOUNT ".uno:InsertPageCountField" +#define CMD_FN_INSERT_PAGEFOOTER ".uno:InsertPageFooter" +#define CMD_FN_INSERT_PAGEHEADER ".uno:InsertPageHeader" +#define CMD_FN_INSERT_FLD_PGNUMBER ".uno:InsertPageNumberField" +#define CMD_FN_INSERT_BREAK ".uno:InsertPara" +#define CMD_FN_INSERT_REF_FIELD ".uno:InsertReferenceField" +#define CMD_FN_TABLE_INSERT_ROW_DLG ".uno:InsertRowDialog" +#define CMD_FN_TABLE_INSERT_ROW ".uno:InsertRows" +#define CMD_FN_JAVAEDIT ".uno:InsertScript" +#define CMD_FN_INSERT_TABLE ".uno:InsertTable" +#define CMD_FN_INSERT_FLD_TIME ".uno:InsertTimeField" +#define CMD_FN_INSERT_FLD_TITLE ".uno:InsertTitleField" +#define CMD_FN_INSERT_FLD_TOPIC ".uno:InsertTopicField" +#define CMD_FN_NUM_BULLET_NEXT ".uno:JumpDownThisLevel" +#define CMD_FN_END_DOC_DIRECT ".uno:JumpToEndOfDoc" +#define CMD_FN_TO_FOOTER ".uno:JumpToFooter" +#define CMD_FN_FOOTNOTE_TO_ANCHOR ".uno:JumpToFootnoteOrAnchor" +#define CMD_FN_TO_HEADER ".uno:JumpToHeader" +#define CMD_FN_NEXT_BOOKMARK ".uno:JumpToNextBookmark" +#define CMD_FN_NEXT_FOOTNOTE ".uno:JumpToNextFootnote" +#define CMD_FN_CNTNT_TO_NEXT_FRAME ".uno:JumpToNextFrame" +#define CMD_FN_GOTO_NEXT_REGION ".uno:JumpToNextRegion" +#define CMD_FN_NEXT_TABLE ".uno:JumpToNextTable" +#define CMD_FN_PREV_BOOKMARK ".uno:JumpToPrevBookmark" +#define CMD_FN_PREV_FOOTNOTE ".uno:JumpToPrevFootnote" +#define CMD_FN_GOTO_PREV_REGION ".uno:JumpToPrevRegion" +#define CMD_FN_PREV_TABLE ".uno:JumpToPrevTable" +#define CMD_FN_GOTO_REFERENCE ".uno:JumpToReference" +#define CMD_FN_START_DOC_DIRECT ".uno:JumpToStartOfDoc" +#define CMD_FN_NUM_BULLET_PREV ".uno:JumpUpThisLevel" +#define CMD_FN_LINE_DOWN_SEL ".uno:LineDownSel" +#define CMD_FN_LINE_NUMBERING_DLG ".uno:LineNumberingDialog" +#define CMD_FN_LINE_UP_SEL ".uno:LineUpSel" +#define CMD_FN_EDIT_LINK_DLG ".uno:LinkDialog" +#define CMD_SID_TEMPLATE_LOAD ".uno:LoadStyles" +#define CMD_FN_VIEW_MARKS ".uno:Marks" +#define CMD_FN_TABLE_MERGE_CELLS ".uno:MergeCells" +#define CMD_FN_QRY_MERGE ".uno:MergeDialog" +#define CMD_FN_MAILMERGE_WIZARD ".uno:MailMergeWizard" +#define CMD_FN_TABLE_MERGE_TABLE ".uno:MergeTable" +#define CMD_FN_FORMAT_APPLY_HEAD1 ".uno:ApplyStyleHead1" +#define CMD_FN_FORMAT_APPLY_HEAD2 ".uno:ApplyStyleHead2" +#define CMD_FN_FORMAT_APPLY_HEAD3 ".uno:ApplyStyleHead3" +#define CMD_FN_FORMAT_APPLY_DEFAULT ".uno:ApplyStyleDefault" +#define CMD_FN_FORMAT_APPLY_TEXTBODY ".uno:ApplyStyleTextbody" +#define CMD_FN_GRAPHIC_MIRROR_ON_EVEN_PAGES ".uno:MirrorGraphicOnEvenPages" +#define CMD_FN_FRAME_MIRROR_ON_EVEN_PAGES ".uno:MirrorOnEvenPages" +#define CMD_FN_NUM_BULLET_MOVEDOWN ".uno:MoveDown" +#define CMD_FN_NUM_BULLET_OUTLINE_MOVEDOWN ".uno:MoveDownSubItems" +#define CMD_FN_NUM_BULLET_MOVEUP ".uno:MoveUp" +#define CMD_FN_NUM_BULLET_OUTLINE_MOVEUP ".uno:MoveUpSubItems" +#define CMD_FN_TITLE_DESCRIPTION_SHAPE ".uno:ObjectTitleDescription" +#define CMD_FN_NAME_SHAPE ".uno:NameGroup" +#define CMD_FN_NEW_GLOBAL_DOC ".uno:NewGlobalDoc" +#define CMD_FN_NEW_HTML_DOC ".uno:NewHtmlDoc" +#define CMD_FN_NUMBER_FORMAT ".uno:NumberFormat" +#define CMD_FN_NUMBER_CURRENCY ".uno:NumberFormatCurrency" +#define CMD_FN_NUMBER_DATE ".uno:NumberFormatDate" +#define CMD_FN_NUMBER_TWODEC ".uno:NumberFormatDecimal" +#define CMD_FN_NUMBER_PERCENT ".uno:NumberFormatPercent" +#define CMD_FN_NUMBER_SCIENTIFIC ".uno:NumberFormatScientific" +#define CMD_FN_NUMBER_STANDARD ".uno:NumberFormatStandard" +#define CMD_FN_NUMBER_TIME ".uno:NumberFormatTime" +#define CMD_FN_NUMBER_NEWSTART ".uno:NumberingStart" +#define CMD_FN_NUM_OR_NONUM ".uno:NumberOrNoNumber" +#define CMD_FN_FRAME_DOWN ".uno:ObjectBackOne" +#define CMD_FN_FRAME_UP ".uno:ObjectForwardOne" +#define CMD_FN_AUTOFORMAT_AUTO ".uno:OnlineAutoFormat" +#define CMD_FN_OPTIMIZE_TABLE ".uno:OptimizeTable" +#define CMD_FN_FORMAT_PAGE_COLUMN_DLG ".uno:PageColumnDialog" +#define CMD_FN_FORMAT_PAGE_DLG ".uno:PageDialog" +#define CMD_FN_PAGEDOWN ".uno:PageDown" +#define CMD_FN_PAGEDOWN_SEL ".uno:PageDownSel" +#define CMD_FN_CHANGE_PAGENUM ".uno:PageOffset" +#define CMD_FN_SET_PAGE_STYLE ".uno:PageStyleApply" +#define CMD_FN_STAT_TEMPLATE ".uno:PageStyleName" +#define CMD_FN_PAGEUP ".uno:PageUp" +#define CMD_FN_PAGEUP_SEL ".uno:PageUpSel" +#define CMD_FN_PREVIEW_ZOOM ".uno:PreviewZoom" +#define CMD_FN_PRINT_LAYOUT ".uno:PrintLayout" +#define CMD_FN_PRINT_PAGEPREVIEW ".uno:PrintPagePreView" +#define CMD_FN_TABLE_SET_READ_ONLY_CELLS ".uno:Protect" +#define CMD_FN_REDLINE_PROTECT ".uno:ProtectTraceChangeMode" +#define CMD_FN_REFRESH_VIEW ".uno:RefreshView" +#define CMD_FN_NUM_BULLET_OFF ".uno:RemoveBullets" +#define CMD_FN_REMOVE_CUR_TOX ".uno:RemoveTableOf" +#define CMD_FN_REPAGINATE ".uno:Repaginate" +#define CMD_FN_REPEAT_SEARCH ".uno:RepeatSearch" +#define CMD_FN_FORMAT_RESET ".uno:ResetAttributes" +#define CMD_FN_TABLE_UNSET_READ_ONLY ".uno:ResetTableProtection" +#define CMD_FN_RULER ".uno:Ruler" +#define CMD_FN_QRY_INSERT ".uno:SbaInsert" +#define CMD_FN_QRY_INSERT_FIELD ".uno:SbaInsertField" +#define CMD_FN_QRY_MERGE_FIELD ".uno:SbaMerge" +#define CMD_FN_SCROLL_NAVIGATION ".uno:ScrollNavigation" +#define CMD_FN_SCROLL_NEXT_PREV ".uno:ScrollNextPrev" +#define CMD_FN_TABLE_SELECT_ALL ".uno:SelectTable" +#define CMD_FN_STAT_SELMODE ".uno:SelectionMode" +#define CMD_FN_SELECT_PARA ".uno:SelectText" +#define CMD_FN_SELECT_WORD ".uno:SelectWord" +#define CMD_FN_ABSTRACT_STARIMPRESS ".uno:SendAbstractToStarImpress" +#define CMD_FN_OUTLINE_TO_CLIPBOARD ".uno:SendOutlineToClipboard" +#define CMD_FN_OUTLINE_TO_IMPRESS ".uno:SendOutlineToStarImpress" +#define CMD_FN_TOOL_ANKER_AT_CHAR ".uno:SetAnchorAtChar" +#define CMD_FN_TOOL_ANKER_CHAR ".uno:SetAnchorToChar" +#define CMD_FN_TOOL_ANKER_FRAME ".uno:SetAnchorToFrame" +#define CMD_FN_TOOL_ANKER_PAGE ".uno:SetAnchorToPage" +#define CMD_FN_TOOL_ANKER_PARAGRAPH ".uno:SetAnchorToPara" +#define CMD_FN_TABLE_SET_COL_WIDTH ".uno:SetColumnWidth" +#define CMD_FN_SET_EXT_MODE ".uno:SetExtSelection" +#define CMD_FN_SET_ADD_MODE ".uno:SetMultiSelection" +#define CMD_FN_TABLE_ADJUST_CELLS ".uno:SetOptimalColumnWidth" +#define CMD_FN_TABLE_OPTIMAL_HEIGHT ".uno:SetOptimalRowHeight" +#define CMD_FN_TABLE_SET_ROW_HEIGHT ".uno:SetRowHeight" +#define CMD_FN_SHADOWCURSOR ".uno:ShadowCursor" +#define CMD_FN_SHIFT_BACKSPACE ".uno:ShiftBackspace" +#define CMD_FN_SHOW_MULTIPLE_PAGES ".uno:ShowMultiplePages" +#define CMD_FN_VIEW_NOTES ".uno:ShowAnnotations" +#define CMD_FN_VIEW_HIDDEN_PARA ".uno:ShowHiddenParagraphs" +#define CMD_FN_REDLINE_SHOW ".uno:ShowTrackedChanges" +#define CMD_FN_SHOW_TWO_PAGES ".uno:ShowTwoPages" +#define CMD_FN_SHOW_BOOKVIEW ".uno:ShowBookview" +#define CMD_FN_SHRINK_FONT_SIZE ".uno:Shrink" +#define CMD_FN_SORTING_DLG ".uno:SortDialog" +#define CMD_FN_TABLE_SPLIT_CELLS ".uno:SplitCell" +#define CMD_FN_TABLE_SPLIT_TABLE ".uno:SplitTable" +#define CMD_FN_AUTO_CORRECT ".uno:StartAutoCorrect" +#define CMD_FN_START_OF_DOCUMENT_SEL ".uno:StartOfDocumentSel" +#define CMD_FN_START_OF_LINE_SEL ".uno:StartOfLineSel" +#define CMD_FN_START_OF_PARA_SEL ".uno:StartOfParaSel" +#define CMD_FN_STAT_BOOKMARK ".uno:StateBookmark" +#define CMD_FN_STAT_PAGE ".uno:StatePageNumber" +#define CMD_FN_STAT_ZOOM ".uno:StateZoom" +#define CMD_FN_SET_SUB_SCRIPT ".uno:SubScript" +#define CMD_FN_SET_SUPER_SCRIPT ".uno:SuperScript" +#define CMD_FN_SBA_BRW_INSERT ".uno:SwBrwInsert" +#define CMD_FN_SBA_BRW_MERGE ".uno:SwMailMerge" +#define CMD_FN_SBA_BRW_UPDATE ".uno:SwUpdate" +#define CMD_FN_SYNC_LABELS ".uno:SynchronizeLabelsDlg" +#define CMD_FN_VIEW_TABLEGRID ".uno:TableBoundaries" +#define CMD_FN_FORMAT_TABLE_DLG ".uno:TableDialog" +#define CMD_FN_TABLE_MODE_FIX ".uno:TableModeFix" +#define CMD_FN_TABLE_MODE_FIX_PROP ".uno:TableModeFixProp" +#define CMD_FN_TABLE_MODE_VARIABLE ".uno:TableModeVariable" +#define CMD_FN_NUM_FORMAT_TABLE_DLG ".uno:TableNumberFormatDialog" +#define CMD_FN_SET_MODOPT_TBLNUMFMT ".uno:TableNumberRecognition" +#define CMD_FN_DRAWTEXT_ATTR_DLG ".uno:TextAttributes" +#define CMD_FN_DRAW_WRAP_DLG ".uno:TextWrap" +#define CMD_FN_THESAURUS_DLG ".uno:ThesaurusDialog" +#define CMD_FN_TOOL_ANKER ".uno:ToggleAnchorType" +#define CMD_FN_TOOL_HIERARCHIE ".uno:ToggleObjectLayer" +#define CMD_FN_UNDERLINE_DOUBLE ".uno:UnderlineDouble" +#define CMD_FN_FRAME_UNCHAIN ".uno:UnhainFrames" +#define CMD_FN_TABLE_UNSET_READ_ONLY_CELLS ".uno:UnsetCellsReadOnly" +#define CMD_FN_UPDATE_ALL ".uno:UpdateAll" +#define CMD_FN_UPDATE_TOX ".uno:UpdateAllIndexes" +#define CMD_FN_UPDATE_ALL_LINKS ".uno:UpdateAllLinks" +#define CMD_FN_UPDATE_CHARTS ".uno:UpdateCharts" +#define CMD_FN_UPDATE_CUR_TOX ".uno:UpdateCurIndex" +#define CMD_FN_UPDATE_FIELDS ".uno:UpdateFields" +#define CMD_FN_UPDATE_INPUTFIELDS ".uno:UpdateInputFields" +#define CMD_FN_VIEW_BOUNDS ".uno:ViewBounds" +#define CMD_FN_VLINEAL ".uno:VRuler" +#define CMD_FN_VSCROLLBAR ".uno:VScroll" +#define CMD_FN_PREV_WORD_SEL ".uno:WordLeftSel" +#define CMD_FN_NEXT_WORD_SEL ".uno:WordRightSel" +#define CMD_FN_WRAP_ANCHOR_ONLY ".uno:WrapAnchorOnly" +#define CMD_FN_FRAME_WRAP_CONTOUR ".uno:WrapContour" +#define CMD_FN_FRAME_WRAP_IDEAL ".uno:WrapIdeal" +#define CMD_FN_FRAME_WRAP_LEFT ".uno:WrapLeft" +#define CMD_FN_FRAME_NOWRAP ".uno:WrapOff" +#define CMD_FN_FRAME_WRAP ".uno:WrapOn" +#define CMD_FN_FRAME_WRAP_RIGHT ".uno:WrapRight" +#define CMD_FN_FRAME_WRAPTHRU ".uno:WrapThrough" +#define CMD_FN_FRAME_WRAPTHRU_TRANSP ".uno:WrapThroughTransparent" +#define CMD_FN_INSERT_STRING ".uno:InsertText" +#define CMD_SID_ATTR_PARA_NUMRULE ".uno:NumRule" +#define CMD_SID_ATTR_PARA_OUTLINE_LEVEL ".uno:OutlineLevel" +#define CMD_FN_NUMBER_NEWSTART_AT ".uno:NumNewStartAt" +#define CMD_FN_FORMAT_LINENUMBER ".uno:LineNumber" +#define CMD_SID_ATTR_PARA_PAGENUM ".uno:PageNumber" +#define CMD_SID_ATTR_PARA_REGISTER ".uno:RegisterTrue" +#define CMD_FN_TO_FOOTNOTE_AREA ".uno:JumpToFootnoteArea" +#define CMD_FN_TXTATR_INET ".uno:HyperlinkAttributes" +#define CMD_FN_INSERT_GLOSSARY ".uno:InsertGlossary" +#define CMD_FN_NEW_GLOSSARY ".uno:NewGlossary" +#define CMD_FN_SET_ACT_GLOSSARY ".uno:SetActGlossaryGroup" +#define CMD_FN_DELETE_BOOKMARK ".uno:DeleteBookmark" +#define CMD_FN_DROP_TEXT ".uno:SetDropCapText" +#define CMD_FN_DROP_CHAR_STYLE_NAME ".uno:SetDropCapCharStyleName" +#define CMD_FN_READONLY_SELECTION_MODE ".uno:SelectTextMode" +#define CMD_FN_INSERT_DBFIELD ".uno:InsertDBField" +#define CMD_FN_GOTO_NEXT_CELL ".uno:JumpToNextCell" +#define CMD_FN_GOTO_PREV_CELL ".uno:JumpToPrevCell" +#define CMD_FN_INSERT_FIELD_DATA_ONLY ".uno:InsertFieldDataOnly" +#define CMD_SID_ATTR_BRUSH_ROW ".uno:TableRowBackground" +#define CMD_SID_ATTR_BRUSH_TABLE ".uno:TableBackground" +#define CMD_FN_TABLE_ROW_SPLIT ".uno:RowSplit" +#define CMD_FN_MAILMERGE_CHILDWINDOW ".uno:MailmergeChildWindow" +#define CMD_FN_WORDCOUNT_DIALOG ".uno:WordCountDialog" +#define CMD_FN_MAILMERGE_SENDMAIL_CHILDWINDOW ".uno:SendMailChildWindow" +#define CMD_FN_TABLE_DELETE_TABLE ".uno:DeleteTable" +#define CMD_FN_TABLE_SELECT_CELL ".uno:EntireCell" +#define CMD_FN_CONVERT_TABLE_TO_TEXT ".uno:ConvertTableToText" +#define CMD_FN_CONVERT_TEXT_TO_TABLE ".uno:ConvertTextToTable" +#define CMD_FN_TABLE_HEADLINE_REPEAT ".uno:HeadingRowsRepeat" +#define CMD_FN_TABLE_SORT_DIALOG ".uno:TableSort" +#define CMD_FN_XFORMS_DESIGN_MODE ".uno:SwitchXFormsDesignMode" +#define CMD_FN_REMOVE_DIRECT_CHAR_FORMATS ".uno:RemoveDirectCharFormats" +#define CMD_FN_NUM_CONTINUE ".uno:ContinueNumbering" +#define CMD_FN_SELECTION_MODE_DEFAULT ".uno:SelectionModeDefault" +#define CMD_FN_DELETE_NOTE ".uno:DeleteNote" +#define CMD_FN_REPLY ".uno:ReplyNote" +#define CMD_FN_DELETE_COMMENT ".uno:DeleteComment" +#define CMD_FN_DELETE_NOTE_AUTHOR ".uno:DeleteAuthor" +#define CMD_FN_DELETE_ALL_NOTES ".uno:DeleteAllNotes" +#define CMD_FN_HIDE_NOTE ".uno:HideNote" +#define CMD_FN_HIDE_NOTE_AUTHOR ".uno:HideAuthor" +#define CMD_SID_ATTR_VIEWLAYOUT ".uno:ViewLayout" +#define CMD_FN_HIDE_ALL_NOTES ".uno:HideAllNotes" +#define CMD_FN_SELECTION_MODE_BLOCK ".uno:SelectionModeBlock" +#define CMD_FN_SPELL_GRAMMAR_DIALOG ".uno:SpellingAndGrammarDialog" +#define CMD_FN_REDLINE_ACCEPT_DIRECT ".uno:AcceptTracedChange" +#define CMD_FN_REDLINE_REJECT_DIRECT ".uno:RejectTracedChange" +#define CMD_FN_REMOVE_HYPERLINK ".uno:RemoveHyperlink" +#define CMD_FN_COPY_HYPERLINK_LOCATION ".uno:CopyHyperlinkLocation" + +#endif diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 9cb3caffa7cc..685de346be52 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -1200,7 +1200,7 @@ void SwDocShell::Execute(SfxRequest& rReq) if ( !aFileName.Len() ) { FileDialogHelper aDlgHelper( TemplateDescription::FILESAVE_AUTOEXTENSION_TEMPLATE, 0 ); - //set HelpIds + const sal_Int16 nControlIds[] = { CommonFilePickerElementIds::PUSHBUTTON_OK, CommonFilePickerElementIds::PUSHBUTTON_CANCEL, @@ -1211,15 +1211,33 @@ void SwDocShell::Execute(SfxRequest& rReq) ExtendedFilePickerElementIds::LISTBOX_TEMPLATE, 0 }; - sal_Int32 nHelpIds[8]; - sal_Int32 nStartHelpId = - bCreateHtml ? - HID_SEND_HTML_CTRL_PUSHBUTTON_OK : HID_SEND_MASTER_CTRL_PUSHBUTTON_OK ; - for(int nHelp = 0; nHelp < 7; nHelp++) - nHelpIds[nHelp] = nStartHelpId++; - nHelpIds[7] = 0; - - aDlgHelper.SetControlHelpIds( nControlIds, nHelpIds ); + + const char* aHTMLHelpIds[] = + { + HID_SEND_HTML_CTRL_PUSHBUTTON_OK, + HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL, + HID_SEND_HTML_CTRL_LISTBOX_FILTER, + HID_SEND_HTML_CTRL_CONTROL_FILEVIEW, + HID_SEND_HTML_CTRL_EDIT_FILEURL, + HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION, + HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE, + "" + }; + + const char* aMasterHelpIds[] = + { + HID_SEND_MASTER_CTRL_PUSHBUTTON_OK, + HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL, + HID_SEND_MASTER_CTRL_LISTBOX_FILTER, + HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW, + HID_SEND_MASTER_CTRL_EDIT_FILEURL, + HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION, + HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE, + "" + }; + + const char** pHelpIds = bCreateHtml ? aHTMLHelpIds : aMasterHelpIds; + aDlgHelper.SetControlHelpIds( nControlIds, pHelpIds ); // aDlgHelper.SetDialogHelpId( bCreateHtml ? HID_SEND_HTML_DIALOG : HID_SEND_MASTER_DIALOG ); uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker(); diff --git a/sw/source/ui/app/mn.src b/sw/source/ui/app/mn.src index 81dad77566b2..54f3b617ccea 100644 --- a/sw/source/ui/app/mn.src +++ b/sw/source/ui/app/mn.src @@ -28,6 +28,7 @@ #include "swmn.hrc" +#include "helpid.h" /*------------------------------------------------------------------------ Beschreibung: Menu Window @@ -37,7 +38,7 @@ MenuItem\ {\ Identifier = FN_INSERT_CAPTION ;\ - HelpID = FN_INSERT_CAPTION ;\ + HelpId = CMD_FN_INSERT_CAPTION ;\ Text [ en-US ] = "~Caption..." ;\ }; @@ -45,31 +46,30 @@ MenuItem\ {\ Identifier = FN_FORMAT_TABLE_DLG ; \ - HelpID = FN_FORMAT_TABLE_DLG ; \ + HelpId = CMD_FN_FORMAT_TABLE_DLG ; \ Text [ en-US ] = "~Table..." ; \ };\ MenuItem\ {\ Identifier = FN_TABLE_MERGE_TABLE ; \ - HelpID = FN_TABLE_MERGE_TABLE ; \ + HelpId = CMD_FN_TABLE_MERGE_TABLE ; \ Text [ en-US ] = "Merge Tables";\ };\ MenuItem\ {\ Identifier = FN_TABLE_SPLIT_TABLE ; \ - HelpID = FN_TABLE_SPLIT_TABLE ; \ + HelpId = CMD_FN_TABLE_SPLIT_TABLE ; \ Text [ en-US ] = "~Split Table" ; \ };\ MenuItem\ {\ Identifier = FN_NUM_FORMAT_TABLE_DLG ; \ - HelpID = FN_NUM_FORMAT_TABLE_DLG ; \ + HelpId = CMD_FN_NUM_FORMAT_TABLE_DLG ; \ Text [ en-US ] = "N~umber Format..." ; \ };\ MenuItem\ {\ Identifier = MN_CELL ; \ - HelpID = MN_CELL ; \ Command = ".uno:CellMenu" ; \ /* ### ACHTUNG: Neuer Text in Resource? Ze~lle : Zelle */\ Text [ en-US ] = "~Cell" ; \ @@ -81,46 +81,46 @@ MenuItem\ {\ Identifier = FN_TABLE_MERGE_CELLS ; \ - HelpID = FN_TABLE_MERGE_CELLS ; \ + HelpId = CMD_FN_TABLE_MERGE_CELLS ; \ Text [ en-US ] = "~Merge" ; \ };\ MenuItem\ {\ Identifier = FN_TABLE_SPLIT_CELLS ; \ - HelpID = FN_TABLE_SPLIT_CELLS ; \ + HelpId = CMD_FN_TABLE_SPLIT_CELLS ; \ Text [ en-US ] = "~Split..." ; \ };\ SEPARATOR ; \ MenuItem\ {\ Identifier = FN_TABLE_VERT_NONE ; \ - HelpID = FN_TABLE_VERT_NONE ; \ + HelpId = CMD_FN_TABLE_VERT_NONE ; \ Text [ en-US ] = "~Top" ; \ };\ MenuItem\ {\ Identifier = FN_TABLE_VERT_CENTER ; \ - HelpID = FN_TABLE_VERT_CENTER ; \ + HelpId = CMD_FN_TABLE_VERT_CENTER ; \ Text [ en-US ] = "C~enter" ; \ };\ MenuItem\ {\ Identifier = FN_TABLE_VERT_BOTTOM ; \ - HelpID = FN_TABLE_VERT_BOTTOM ; \ + HelpId = CMD_FN_TABLE_VERT_BOTTOM ; \ Text [ en-US ] = "~Bottom" ; \ };\ SEPARATOR ; \ MenuItem\ {\ Identifier = FN_TABLE_SET_READ_ONLY_CELLS ; \ - HelpID = FN_TABLE_SET_READ_ONLY_CELLS ; \ + HelpId = CMD_FN_TABLE_SET_READ_ONLY_CELLS ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Schützen : ~Sch³tzen */\ Text [ en-US ] = "~Protect" ; \ };\ MenuItem\ {\ Identifier = FN_TABLE_UNSET_READ_ONLY_CELLS ; \ - HelpID = FN_TABLE_UNSET_READ_ONLY_CELLS ; \ + HelpId = CMD_FN_TABLE_UNSET_READ_ONLY_CELLS ; \ Text [ en-US ] = "~Unprotect" ; \ };\ };\ @@ -143,27 +143,27 @@ MenuItem\ {\ Identifier = FN_TABLE_SET_ROW_HEIGHT ; \ - HelpID = FN_TABLE_SET_ROW_HEIGHT ; \ + HelpId = CMD_FN_TABLE_SET_ROW_HEIGHT ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Höhe... : ~H÷he... */\ Text [ en-US ] = "~Height..." ; \ };\ MenuItem\ {\ Identifier = FN_TABLE_ROW_SPLIT;\ - HelpID = FN_TABLE_ROW_SPLIT ; \ + HelpId = CMD_FN_TABLE_ROW_SPLIT ; \ Text [ en-US ] = "Allow Row to Break A~cross Pages and Columns" ; \ };\ MenuItem\ {\ Identifier = FN_TABLE_OPTIMAL_HEIGHT ; \ - HelpID = FN_TABLE_OPTIMAL_HEIGHT ; \ + HelpId = CMD_FN_TABLE_OPTIMAL_HEIGHT ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Optimale Höhe : ~Optimale H÷he */\ Text [ en-US ] = "~Optimal Height" ; \ };\ MenuItem\ {\ Identifier = FN_TABLE_BALANCE_ROWS ; \ - HelpID = FN_TABLE_BALANCE_ROWS ; \ + HelpId = CMD_FN_TABLE_BALANCE_ROWS ; \ /* ### ACHTUNG: Neuer Text in Resource? Gleichmäßig ~verteilen : Gleichmõ˜ig ~verteilen */\ Text [ en-US ] = "Space ~Equally" ; \ };\ @@ -171,7 +171,7 @@ MenuItem\ {\ Identifier = FN_TABLE_SELECT_ROW ; \ - HelpID = FN_TABLE_SELECT_ROW ; \ + HelpId = CMD_FN_TABLE_SELECT_ROW ; \ /* ### ACHTUNG: Neuer Text in Resource? Ausw~ählen : Auswählen */\ /* ### ACHTUNG: Neuer Text in Resource? Ausw~ählen : Ausw~õhlen */\ Text [ en-US ] = "~Select" ; \ @@ -179,14 +179,14 @@ MenuItem\ {\ Identifier = FN_TABLE_INSERT_ROW_DLG ; \ - HelpID = FN_TABLE_INSERT_ROW_DLG ; \ + HelpId = CMD_FN_TABLE_INSERT_ROW_DLG ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Einfügen... : ~Einf³gen... */\ Text [ en-US ] = "~Insert..." ; \ };\ MenuItem\ {\ Identifier = FN_TABLE_DELETE_ROW ; \ - HelpID = FN_TABLE_DELETE_ROW ; \ + HelpId = CMD_FN_TABLE_DELETE_ROW ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */\ Text [ en-US ] = "~Delete" ; \ };\ @@ -207,19 +207,19 @@ MenuItem\ {\ Identifier = FN_TABLE_SET_COL_WIDTH ; \ - HelpID = FN_TABLE_SET_COL_WIDTH ; \ + HelpId = CMD_FN_TABLE_SET_COL_WIDTH ; \ Text [ en-US ] = "~Width..." ; \ };\ MenuItem\ {\ Identifier = FN_TABLE_ADJUST_CELLS ; \ - HelpID = FN_TABLE_ADJUST_CELLS ; \ + HelpId = CMD_FN_TABLE_ADJUST_CELLS ; \ Text [ en-US ] = "~Optimal Width " ; \ };\ MenuItem\ {\ Identifier = FN_TABLE_BALANCE_CELLS ; \ - HelpID = FN_TABLE_BALANCE_CELLS ; \ + HelpId = CMD_FN_TABLE_BALANCE_CELLS ; \ /* ### ACHTUNG: Neuer Text in Resource? Gleichmäßig ~verteilen : Gleichmõ˜ig ~verteilen */\ Text [ en-US ] = "Space ~Equally" ; \ };\ @@ -227,7 +227,7 @@ MenuItem\ {\ Identifier = FN_TABLE_SELECT_COL ; \ - HelpID = FN_TABLE_SELECT_COL ; \ + HelpId = CMD_FN_TABLE_SELECT_COL ; \ /* ### ACHTUNG: Neuer Text in Resource? Ausw~ählen : Auswählen */\ /* ### ACHTUNG: Neuer Text in Resource? Ausw~ählen : Ausw~õhlen */\ Text [ en-US ] = "~Select" ; \ @@ -235,14 +235,14 @@ MenuItem\ {\ Identifier = FN_TABLE_INSERT_COL_DLG ; \ - HelpID = FN_TABLE_INSERT_COL_DLG ; \ + HelpId = CMD_FN_TABLE_INSERT_COL_DLG ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Einfügen... : ~Einf³gen... */\ Text [ en-US ] = "~Insert..." ; \ };\ MenuItem\ {\ Identifier = FN_TABLE_DELETE_COL ; \ - HelpID = FN_TABLE_DELETE_COL ; \ + HelpId = CMD_FN_TABLE_DELETE_COL ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */\ Text [ en-US ] = "~Delete" ; \ };\ @@ -264,7 +264,7 @@ MenuItem\ {\ Identifier = FN_DRAWTEXT_ATTR_DLG ; \ - HelpID = FN_DRAWTEXT_ATTR_DLG ; \ + HelpId = CMD_FN_DRAWTEXT_ATTR_DLG ; \ Text [ en-US ] = "Te~xt..." ; \ }; @@ -272,7 +272,7 @@ MenuItem\ {\ Identifier = FN_NAME_SHAPE ; \ - HelpID = FN_NAME_SHAPE ; \ + HelpId = CMD_FN_NAME_SHAPE ; \ Text [ en-US ] = "Name..." ; \ }; @@ -281,7 +281,7 @@ MenuItem\ {\ Identifier = FN_TITLE_DESCRIPTION_SHAPE; \ - HelpID = FN_TITLE_DESCRIPTION_SHAPE; \ + HelpId = CMD_FN_TITLE_DESCRIPTION_SHAPE; \ Text [ en-US ] = "Description..." ; \ }; @@ -289,7 +289,7 @@ MenuItem\ {\ Identifier = FN_FORMAT_FRAME_DLG ; \ - HelpID = FN_FORMAT_FRAME_DLG ; \ + HelpId = CMD_FN_FORMAT_FRAME_DLG ; \ Text [ en-US ] = "~Frame..." ; \ }; @@ -344,13 +344,13 @@ MenuItem\ {\ Identifier = FN_FRAME_UP ; \ - HelpID = FN_FRAME_UP ; \ + HelpId = CMD_FN_FRAME_UP ; \ Text [ en-US ] = "Bring ~Forward" ; \ };\ MenuItem\ {\ Identifier = FN_FRAME_DOWN ; \ - HelpID = FN_FRAME_DOWN ; \ + HelpId = CMD_FN_FRAME_DOWN ; \ Text [ en-US ] = "Send Back~ward" ; \ }; @@ -430,45 +430,45 @@ MenuItem\ {\ Identifier = FN_REPLY ;\ - HelpID = FN_DELETE_NOTE ;\ + HelpId = CMD_FN_DELETE_NOTE ;\ Text [ en-US ] = "Reply" ;\ };\ SEPARATOR ; \ MenuItem\ {\ Identifier = FN_DELETE_NOTE ;\ - HelpID = FN_DELETE_NOTE ;\ + HelpId = CMD_FN_DELETE_NOTE ;\ Text [ en-US ] = "Delete ~Comment" ;\ };\ MenuItem\ {\ Identifier = FN_DELETE_NOTE_AUTHOR ;\ - HelpID = FN_DELETE_NOTE_AUTHOR ;\ + HelpId = CMD_FN_DELETE_NOTE_AUTHOR ;\ Text [ en-US ] = "Delete ~All Comments by $1" ;\ };\ MenuItem\ {\ Identifier = FN_DELETE_ALL_NOTES ;\ - HelpID = FN_DELETE_ALL_NOTES ;\ + HelpId = CMD_FN_DELETE_ALL_NOTES ;\ Text [ en-US ] = "~Delete All Comments" ;\ };\ /* MenuItem\ {\ Identifier = FN_HIDE_NOTE ;\ - HelpID = FN_HIDE_NOTE ;\ + HelpId = CMD_FN_HIDE_NOTE ;\ Text [ en-US ] = "~Hide comment" ;\ };\ MenuItem\ {\ Identifier = FN_HIDE_NOTE_AUTHOR ;\ - HelpID = FN_HIDE_NOTE_AUTHOR ;\ + HelpId = CMD_FN_HIDE_NOTE_AUTHOR ;\ Text [ en-US ] = "Hide ~author" ;\ };\ MenuItem\ {\ Identifier = FN_HIDE_ALL_NOTES ;\ - HelpID = FN_HIDE_ALL_NOTES ;\ + HelpId = CMD_FN_HIDE_ALL_NOTES ;\ Text [ en-US ] = "Hide all ~comments" ;\ }; */ @@ -513,13 +513,13 @@ Menu MN_TAB_POPUPMENU MenuItem { Identifier = FN_VIEW_TABLEGRID ; - HelpID = FN_VIEW_TABLEGRID ; + HelpId = CMD_FN_VIEW_TABLEGRID ; Text [ en-US ] = "Table Boundaries" ; }; MenuItem { Identifier = FN_SET_MODOPT_TBLNUMFMT ; - HelpID = FN_SET_MODOPT_TBLNUMFMT ; + HelpId = CMD_FN_SET_MODOPT_TBLNUMFMT ; Text [ en-US ] = "~Number Recognition"; }; SEPARATOR ; @@ -531,7 +531,7 @@ Menu MN_TAB_POPUPMENU MenuItem\ {\ Identifier = FN_FRAME_WRAP_CONTOUR ; \ - HelpID = FN_FRAME_WRAP_CONTOUR ; \ + HelpId = CMD_FN_FRAME_WRAP_CONTOUR ; \ Text [ en-US ] = "~Contour" ; \ }; @@ -539,7 +539,7 @@ Menu MN_TAB_POPUPMENU MenuItem\ {\ Identifier = SID_CONTOUR_DLG ; \ - HelpID = SID_CONTOUR_DLG ; \ + HelpId = CMD_SID_CONTOUR_DLG ; \ Text [ en-US ] = "~Edit Contour..." ; \ }; @@ -550,7 +550,6 @@ Menu MN_TAB_POPUPMENU MenuItem\ {\ Identifier = MN_WRAP ; \ - HelpID = MN_WRAP ; \ Command = ".uno:WrapMenu" ; \ Text [ en-US ] = "~Wrap" ; \ SubMenu = Menu\ @@ -561,35 +560,35 @@ Menu MN_TAB_POPUPMENU {\ RadioCheck = TRUE ; \ Identifier = FN_FRAME_NOWRAP ; \ - HelpID = FN_FRAME_NOWRAP ; \ + HelpId = CMD_FN_FRAME_NOWRAP ; \ Text [ en-US ] = "~No Wrap" ; \ };\ MenuItem\ {\ RadioCheck = TRUE ; \ Identifier = FN_FRAME_WRAP ; \ - HelpID = FN_FRAME_WRAP ; \ + HelpId = CMD_FN_FRAME_WRAP ; \ Text [ en-US ] = "~Page Wrap" ; \ };\ MenuItem\ {\ RadioCheck = TRUE ; \ Identifier = FN_FRAME_WRAP_IDEAL ; \ - HelpID = FN_FRAME_WRAP_IDEAL ; \ + HelpId = CMD_FN_FRAME_WRAP_IDEAL ; \ Text [ en-US ] = "~Optimal Page Wrap" ; \ };\ MenuItem\ {\ RadioCheck = TRUE ; \ Identifier = FN_FRAME_WRAPTHRU ; \ - HelpID = FN_FRAME_WRAPTHRU ; \ + HelpId = CMD_FN_FRAME_WRAPTHRU ; \ Text [ en-US ] = "~Wrap Through" ; \ };\ MenuItem\ {\ RadioCheck = TRUE ; \ Identifier = FN_FRAME_WRAPTHRU_TRANSP ; \ - HelpID = FN_FRAME_WRAPTHRU_TRANSP ; \ + HelpId = CMD_FN_FRAME_WRAPTHRU_TRANSP ; \ Text [ en-US ] = "In ~Background" ; \ };\ SEPARATOR ; \ @@ -598,7 +597,7 @@ Menu MN_TAB_POPUPMENU MenuItem\ {\ Identifier = FN_WRAP_ANCHOR_ONLY ; \ - HelpID = FN_WRAP_ANCHOR_ONLY ; \ + HelpId = CMD_FN_WRAP_ANCHOR_ONLY ; \ Text [ en-US ] = "~First Paragraph" ; \ };\ };\ @@ -616,7 +615,6 @@ String MN_DRAW_POPUPMENU MenuItem\ {\ Identifier = MN_WRAP ; \ - HelpID = MN_WRAP ; \ Command = ".uno:WrapMenu" ; \ SubMenu = Menu\ {\ @@ -626,35 +624,35 @@ String MN_DRAW_POPUPMENU {\ RadioCheck = TRUE ; \ Identifier = FN_FRAME_NOWRAP ; \ - HelpID = FN_FRAME_NOWRAP ; \ + HelpId = CMD_FN_FRAME_NOWRAP ; \ Text [ en-US ] = "~No Wrap" ; \ };\ MenuItem\ {\ RadioCheck = TRUE ; \ Identifier = FN_FRAME_WRAP ; \ - HelpID = FN_FRAME_WRAP ; \ + HelpId = CMD_FN_FRAME_WRAP ; \ Text [ en-US ] = "~Page Wrap" ; \ };\ MenuItem\ {\ RadioCheck = TRUE ; \ Identifier = FN_FRAME_WRAP_IDEAL ; \ - HelpID = FN_FRAME_WRAP_IDEAL ; \ + HelpId = CMD_FN_FRAME_WRAP_IDEAL ; \ Text [ en-US ] = "~Optimal Page Wrap" ; \ };\ MenuItem\ {\ RadioCheck = TRUE ; \ Identifier = FN_FRAME_WRAPTHRU ; \ - HelpID = FN_FRAME_WRAPTHRU ; \ + HelpId = CMD_FN_FRAME_WRAPTHRU ; \ Text [ en-US ] = "~Wrap Through" ; \ };\ MenuItem\ {\ RadioCheck = TRUE ; \ Identifier = FN_FRAME_WRAPTHRU_TRANSP ; \ - HelpID = FN_FRAME_WRAPTHRU_TRANSP ; \ + HelpId = CMD_FN_FRAME_WRAPTHRU_TRANSP ; \ Text [ en-US ] = "In ~Background" ; \ };\ SEPARATOR ; \ @@ -662,14 +660,14 @@ String MN_DRAW_POPUPMENU MenuItem\ {\ Identifier = FN_WRAP_ANCHOR_ONLY ; \ - HelpID = FN_WRAP_ANCHOR_ONLY ; \ + HelpId = CMD_FN_WRAP_ANCHOR_ONLY ; \ Text [ en-US ] = "~First Paragraph" ; \ };\ SEPARATOR ; \ MenuItem\ {\ Identifier = FN_DRAW_WRAP_DLG ; \ - HelpID = FN_DRAW_WRAP_DLG ; \ + HelpId = CMD_FN_DRAW_WRAP_DLG ; \ Text [ en-US ] = "~Edit..." ; \ };\ };\ @@ -687,7 +685,7 @@ String MN_DRAW_POPUPMENU MenuItem\ {\ Identifier = FN_TOOL_ANKER_FRAME ; \ - HelpID = FN_TOOL_ANKER_FRAME ; \ + HelpId = CMD_FN_TOOL_ANKER_FRAME ; \ Text [ en-US ] = "To ~Frame" ; \ }; @@ -695,7 +693,7 @@ String MN_DRAW_POPUPMENU MenuItem\ {\ Identifier = FN_TOOL_ANKER ; \ - HelpID = FN_TOOL_ANKER ; \ + HelpId = CMD_FN_TOOL_ANKER ; \ Command = ".uno:AnchorMenu" ; \ Text [ en-US ] = "An~chor" ; \ SubMenu = Menu\ @@ -705,25 +703,25 @@ String MN_DRAW_POPUPMENU MenuItem\ {\ Identifier = FN_TOOL_ANKER_PAGE ; \ - HelpID = FN_TOOL_ANKER_PAGE ; \ + HelpId = CMD_FN_TOOL_ANKER_PAGE ; \ Text [ en-US ] = "To P~age" ; \ };\ MenuItem\ {\ Identifier = FN_TOOL_ANKER_PARAGRAPH ; \ - HelpID = FN_TOOL_ANKER_PARAGRAPH ; \ + HelpId = CMD_FN_TOOL_ANKER_PARAGRAPH ; \ Text [ en-US ] = "To ~Paragraph" ; \ };\ MenuItem\ {\ Identifier = FN_TOOL_ANKER_AT_CHAR ; \ - HelpID = FN_TOOL_ANKER_AT_CHAR ; \ + HelpId = CMD_FN_TOOL_ANKER_AT_CHAR ; \ Text [ en-US ] = "To ~Character" ; \ };\ MenuItem\ {\ Identifier = FN_TOOL_ANKER_CHAR ; \ - HelpID = FN_TOOL_ANKER_CHAR ; \ + HelpId = CMD_FN_TOOL_ANKER_CHAR ; \ Text [ en-US ] = "As C~haracter" ; \ };\ MN_AT_FRAME\ @@ -813,7 +811,7 @@ Menu MN_DRWTXT_POPUPMENU MenuItem\ {\ Identifier = FN_DELETE_COMMENT ;\ - HelpID = FN_DELETE_COMMENT ;\ + HelpId = CMD_FN_DELETE_COMMENT ;\ Text [ en-US ] = "Delete ~Changes Note" ;\ };\ @@ -898,7 +896,6 @@ String MN_GRF_POPUPMENU MenuItem\ {\ Identifier = MN_FORMAT_FRM_HORZ ; \ - HelpID = MN_FORMAT_FRM_HORZ ; \ Command = ".uno:AlignFrameMenu" ; \ SubMenu = Menu\ {\ @@ -907,38 +904,38 @@ String MN_GRF_POPUPMENU MenuItem\ {\ Identifier = FN_FRAME_ALIGN_HORZ_LEFT ; \ - HelpID = FN_FRAME_ALIGN_HORZ_LEFT ; \ + HelpId = CMD_FN_FRAME_ALIGN_HORZ_LEFT ; \ Text [ en-US ] = "~Left" ; \ };\ MenuItem\ {\ Identifier = FN_FRAME_ALIGN_HORZ_CENTER ; \ - HelpID = FN_FRAME_ALIGN_HORZ_CENTER ; \ + HelpId = CMD_FN_FRAME_ALIGN_HORZ_CENTER ; \ Text [ en-US ] = "~Centered" ; \ };\ MenuItem\ {\ Identifier = FN_FRAME_ALIGN_HORZ_RIGHT ; \ - HelpID = FN_FRAME_ALIGN_HORZ_RIGHT ; \ + HelpId = CMD_FN_FRAME_ALIGN_HORZ_RIGHT ; \ Text [ en-US ] = "~Right" ; \ };\ SEPARATOR ; \ MenuItem\ {\ Identifier = FN_FRAME_ALIGN_VERT_TOP ; \ - HelpID = FN_FRAME_ALIGN_VERT_TOP ; \ + HelpId = CMD_FN_FRAME_ALIGN_VERT_TOP ; \ Text [ en-US ] = "Base at ~Top" ; \ };\ MenuItem\ {\ Identifier = FN_FRAME_ALIGN_VERT_CENTER ; \ - HelpID = FN_FRAME_ALIGN_VERT_CENTER ; \ + HelpId = CMD_FN_FRAME_ALIGN_VERT_CENTER ; \ Text [ en-US ] = "Base in ~Middle" ; \ };\ MenuItem\ {\ Identifier = FN_FRAME_ALIGN_VERT_BOTTOM ; \ - HelpID = FN_FRAME_ALIGN_VERT_BOTTOM ; \ + HelpId = CMD_FN_FRAME_ALIGN_VERT_BOTTOM ; \ Text [ en-US ] = "Base at ~Bottom" ; \ };\ };\ @@ -961,13 +958,13 @@ Menu MN_GRF_POPUPMENU MenuItem { Identifier = FN_FORMAT_GRAFIC_DLG ; - HelpID = FN_FORMAT_GRAFIC_DLG ; + HelpId = CMD_FN_FORMAT_GRAFIC_DLG ; Text [ en-US ] = "~Picture..." ; }; MenuItem { Identifier = FN_SAVE_GRAPHIC; - HelpID = FN_SAVE_GRAPHIC; + HelpId = CMD_FN_SAVE_GRAPHIC; Text [ en-US ] = "Save Graphics..." ; }; MN_FRM_CAPTION_ITEM @@ -998,7 +995,7 @@ Menu MN_OLE_POPUPMENU MenuItem { Identifier = FN_FORMAT_FRAME_DLG ; - HelpID = FN_FORMAT_FRAME_DLG ; + HelpId = CMD_FN_FORMAT_FRAME_DLG ; Text [ en-US ] = "Object..." ; }; MN_FRM_CAPTION_ITEM @@ -1040,13 +1037,13 @@ Menu MN_PPREVIEW_POPUPMENU MenuItem { Identifier = FN_PAGEUP ; - HelpID = FN_PAGEUP ; + HelpId = CMD_FN_PAGEUP ; Text [ en-US ] = "Previous Page" ; }; MenuItem { Identifier = FN_PAGEDOWN ; - HelpID = FN_PAGEDOWN ; + HelpId = CMD_FN_PAGEDOWN ; /* ### ACHTUNG: Neuer Text in Resource? Nächste Seite : Nõchste Seite */ Text [ en-US ] = "Next Page" ; }; @@ -1059,14 +1056,14 @@ Menu MN_PPREVIEW_POPUPMENU MenuItem { Identifier = FN_PRINT_PAGEPREVIEW ; - HelpID = FN_PRINT_PAGEPREVIEW ; + HelpId = CMD_FN_PRINT_PAGEPREVIEW ; Text [ en-US ] = "Print" ; }; SEPARATOR ; MenuItem { Identifier = SID_PRINTPREVIEW; - HelpID = SID_PRINTPREVIEW; + HelpId = CMD_SID_PRINTPREVIEW; Text [ en-US ] = "Close Preview" ; }; }; diff --git a/sw/source/ui/chrdlg/swbreak.src b/sw/source/ui/chrdlg/swbreak.src index 8c6cee69d440..7e71101c63cf 100644 --- a/sw/source/ui/chrdlg/swbreak.src +++ b/sw/source/ui/chrdlg/swbreak.src @@ -32,7 +32,7 @@ // #define DLG_BREAK 256 ModalDialog DLG_BREAK { - HelpID = FN_INSERT_BREAK_DLG ; + HelpID = CMD_FN_INSERT_BREAK_DLG ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 161 , 114 ) ; diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index cbe0b9c16c3d..a9d90a4c02e4 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -114,8 +114,7 @@ SwCondCollPage::SwCondCollPage(Window *pParent, const SfxItemSet &rSet) aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT ); aTbLinks.Resize(); // OS: Hack fuer richtige Selektion aTbLinks.SetSpaceBetweenEntries( 0 ); - // FIXME: HELPID - aTbLinks.SetHelpId(""/*HID_COND_COLL_TABLIST*/); + aTbLinks.SetHelpId(HID_COND_COLL_TABLIST); SfxStyleFamilies aFamilies(SW_RES(DLG_STYLE_DESIGNER)); const SfxStyleFamilyItem* pFamilyItem = 0; diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx index 49d1a037e311..5fa03de5e0a5 100644 --- a/sw/source/ui/config/mailconfigpage.cxx +++ b/sw/source/ui/config/mailconfigpage.cxx @@ -325,12 +325,10 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare aSz.Width()/2, HIB_LEFT | HIB_VCENTER ); - // FIXME: HELPID - m_aStatusHB.SetHelpId(""/*HID_MM_TESTACCOUNTSETTINGS_HB*/ ); + m_aStatusHB.SetHelpId(HID_MM_TESTACCOUNTSETTINGS_HB ); m_aStatusHB.Show(); - // FIXME: HELPID - m_aStatusLB.SetHelpId(""/*HID_MM_TESTACCOUNTSETTINGS_TLB*/); + m_aStatusLB.SetHelpId(HID_MM_TESTACCOUNTSETTINGS_TLB); static long nTabs[] = {2, 0, aSz.Width()/2 }; m_aStatusLB.SetWindowBits( WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ); m_aStatusLB.SetSelectionMode( SINGLE_SELECTION ); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index ffb6333be337..4a0c9c2a6b25 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -499,8 +499,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet ) aLbLevel.SelectEntryPos( nLvl < MAXLEVEL ? nLvl + 1 : 0 ); aEdDelim.SetText( sDelim ); - // FIXME: HELPID - aCheckLB.SetHelpId(""/*HID_OPTCAPTION_CLB*/); + aCheckLB.SetHelpId(HID_OPTCAPTION_CLB); FreeResource(); diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index f64bde3a0da8..dc007fc68e13 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -214,12 +214,10 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) : m_aListHB.InsertItem( ITEMID_TABLE, m_sTable, aSz.Width()/2, HIB_LEFT | HIB_VCENTER | HIB_FIXED | HIB_FIXEDPOS /*| HIB_CLICKABLE | HIB_UPARROW */); - // FIXME: HELPID - m_aListHB.SetHelpId(""/*HID_MM_ADDRESSLIST_HB*/ ); + m_aListHB.SetHelpId(HID_MM_ADDRESSLIST_HB ); m_aListHB.Show(); - // FIXME: HELPID - m_aListLB.SetHelpId(""/*HID_MM_ADDRESSLIST_TLB*/); + m_aListLB.SetHelpId(HID_MM_ADDRESSLIST_TLB); static long nTabs[] = {2, 0, aSz.Width()/2 }; m_aListLB.SetWindowBits( WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ); m_aListLB.SetSelectionMode( SINGLE_SELECTION ); diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index ee02eb283649..1e0a1faf1cbc 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -236,8 +236,7 @@ SwDBTreeList::SwDBTreeList(Window *pParent, const ResId& rResId, bShowColumns (bShowCol), pImpl(new SwDBTreeList_Impl(pSh)) { - // FIXME: HELPID - SetHelpId(""/*HID_DB_SELECTION_TLB*/); + SetHelpId(HID_DB_SELECTION_TLB); if (IsVisible()) InitTreeList(); diff --git a/sw/source/ui/dbui/mailmergechildwindow.cxx b/sw/source/ui/dbui/mailmergechildwindow.cxx index 6b3fd3317d06..758f52840230 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.cxx +++ b/sw/source/ui/dbui/mailmergechildwindow.cxx @@ -384,8 +384,7 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf m_nStatusHeight = m_aSeparatorFL.GetPosPixel().Y() - m_aStatusLB.GetPosPixel().Y(); String sTask(SW_RES(ST_TASK)); String sStatus(SW_RES(ST_STATUS)); - // FIXME: HELPID - m_aStatusLB.SetHelpId(""/*HID_MM_SENDMAILS_STATUSLB*/); + m_aStatusLB.SetHelpId(HID_MM_SENDMAILS_STATUSLB); FreeResource(); @@ -414,12 +413,10 @@ SwSendMailDialog::SwSendMailDialog(Window *pParent, SwMailMergeConfigItem& rConf m_aStatusHB.InsertItem( ITEMID_STATUS, sStatus, nPos2, HIB_LEFT | HIB_VCENTER ); - // FIXME: HELPID - m_aStatusHB.SetHelpId(""/*HID_MM_ADDRESSLIST_HB*/ ); + m_aStatusHB.SetHelpId(HID_MM_ADDRESSLIST_HB ); m_aStatusHB.Show(); - // FIXME: HELPID - m_aStatusLB.SetHelpId(""/*HID_MM_MAILSTATUS_TLB*/); + m_aStatusLB.SetHelpId(HID_MM_MAILSTATUS_TLB); static long nTabs[] = {3, 0, nPos1, aSz.Width() }; m_aStatusLB.SetWindowBits( WB_SORT | WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ); m_aStatusLB.SetSelectionMode( SINGLE_SELECTION ); diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index e37ff3184717..54cf6edac512 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -89,10 +89,8 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rItem enableButtons(WZB_FINISH, sal_False); m_pFinish->SetText(m_sFinish); - // FIXME: HELPID - m_pNextPage->SetHelpId(""/*HID_MM_NEXT_PAGE*/); - // FIXME: HELPID - m_pPrevPage->SetHelpId(""/*HID_MM_PREV_PAGE*/); + m_pNextPage->SetHelpId(HID_MM_NEXT_PAGE); + m_pPrevPage->SetHelpId(HID_MM_PREV_PAGE); //#i51949# no output type page visible if e-Mail is not supported if(rItem.IsMailAvailable()) diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index f507243b0605..bd4f0ec3ebde 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -1070,8 +1070,7 @@ SwAssignFieldsControl::SwAssignFieldsControl( m_nFirstYPos(0) { SetStyle(GetStyle()|WB_TABSTOP|WB_DIALOGCONTROL); - // FIXME: HELPID - SetHelpId(""/*HID_MM_ASSIGN_FIELDS*/); + SetHelpId(HID_MM_ASSIGN_FIELDS); long nHBHeight = m_aHeaderHB.CalcWindowSizePixel().Height(); Size aOutputSize(GetOutputSize()); m_aHeaderHB.SetSizePixel( @@ -1098,6 +1097,25 @@ SwAssignFieldsControl::SwAssignFieldsControl( uno::Sequence< ::rtl::OUString> aAssignments = rConfigItem.GetColumnAssignment( rConfigItem.GetCurrentDBData() ); Link aMatchHdl = LINK(this, SwAssignFieldsControl, MatchHdl_Impl); Link aFocusHdl = LINK(this, SwAssignFieldsControl, GotFocusHdl_Impl); + + static const char* aHIDs[] = + { + HID_MM_HEADER_0, + HID_MM_HEADER_1, + HID_MM_HEADER_2, + HID_MM_HEADER_3, + HID_MM_HEADER_4, + HID_MM_HEADER_5, + HID_MM_HEADER_6, + HID_MM_HEADER_7, + HID_MM_HEADER_8, + HID_MM_HEADER_9, + HID_MM_HEADER_10, + HID_MM_HEADER_11, + HID_MM_HEADER_12, + HID_MM_HEADER_13 + }; + //fill the controls for(USHORT i = 0; i < rHeaders.Count(); ++i) { @@ -1107,8 +1125,7 @@ SwAssignFieldsControl::SwAssignFieldsControl( sLabel.Insert(rHeader, 1); pNewText->SetText(sLabel); ListBox* pNewLB = new ListBox(&m_aWindow, ResId(LB_FIELDS, *rResId.GetResMgr())); - // FIXME: HELPID - pNewLB->SetHelpId( ""/*HID_MM_HEADER_0 + i*/ ); + pNewLB->SetHelpId( aHIDs[i] ); pNewLB->SelectEntryPos(0); for(sal_Int32 nField = 0; nField < aFields.getLength(); ++nField) pNewLB->InsertEntry(pFields[nField]); @@ -1442,8 +1459,7 @@ DDListBox::DDListBox(SwCustomizeAddressBlockDialog* pParent, const ResId rResId) SetSelectionMode( SINGLE_SELECTION ); SetDragDropMode( SV_DRAGDROP_CTRL_COPY ); EnableAsyncDrag(TRUE); - // FIXME: HELPID - SetHelpId(""/*HID_MM_CUSTOMFIELDS*/); + SetHelpId(HID_MM_CUSTOMFIELDS); // expand selection to the complete width of the ListBox SetHighlightRange(); Show(); diff --git a/sw/source/ui/dbui/mmgreetingspage.cxx b/sw/source/ui/dbui/mmgreetingspage.cxx index 9bd44837ed45..c7613055d6ab 100644 --- a/sw/source/ui/dbui/mmgreetingspage.cxx +++ b/sw/source/ui/dbui/mmgreetingspage.cxx @@ -308,22 +308,14 @@ SwMailMergeGreetingsPage::SwMailMergeGreetingsPage( SwMailMergeWizard* _pParent) m_pNeutralCB = &m_aNeutralCB; m_bIsTabPage = true; - // FIXME: HELPID - m_pPersonalizedCB->SetHelpId( ""/*HID_MM_GREETINGS_CB_PERSONALIZED*/); - // FIXME: HELPID - m_pFemaleLB->SetHelpId( ""/*HID_MM_GREETINGS_LB_FEMALE*/ ); - // FIXME: HELPID - m_pFemalePB->SetHelpId( ""/*HID_MM_GREETINGS_PB_FEMALE*/ ); - // FIXME: HELPID - m_pMaleLB->SetHelpId( ""/*HID_MM_GREETINGS_LB_MALE*/ ); - // FIXME: HELPID - m_pMalePB->SetHelpId( ""/*HID_MM_GREETINGS_PB_MALE*/ ); - // FIXME: HELPID - m_pFemaleColumnLB->SetHelpId( ""/*HID_MM_GREETINGS_LB_FEMALECOLUMN*/); - // FIXME: HELPID - m_pFemaleFieldCB->SetHelpId( ""/*HID_MM_GREETINGS_CB_FEMALEFIELD*/ ); - // FIXME: HELPID - m_pNeutralCB->SetHelpId( ""/*HID_MM_GREETINGS_CB_NEUTRAL*/ ); + m_pPersonalizedCB->SetHelpId( HID_MM_GREETINGS_CB_PERSONALIZED); + m_pFemaleLB->SetHelpId( HID_MM_GREETINGS_LB_FEMALE ); + m_pFemalePB->SetHelpId( HID_MM_GREETINGS_PB_FEMALE ); + m_pMaleLB->SetHelpId( HID_MM_GREETINGS_LB_MALE ); + m_pMalePB->SetHelpId( HID_MM_GREETINGS_PB_MALE ); + m_pFemaleColumnLB->SetHelpId( HID_MM_GREETINGS_LB_FEMALECOLUMN); + m_pFemaleFieldCB->SetHelpId( HID_MM_GREETINGS_CB_FEMALEFIELD ); + m_pNeutralCB->SetHelpId( HID_MM_GREETINGS_CB_NEUTRAL ); FreeResource(); m_aGreetingLineCB.SetClickHdl(LINK(this, SwMailMergeGreetingsPage, ContainsHdl_Impl)); @@ -532,22 +524,14 @@ SwMailBodyDialog::SwMailBodyDialog(Window* pParent, SwMailMergeWizard* _pWizard) m_pNeutralCB = &m_aNeutralCB; m_bIsTabPage = false; - // FIXME: HELPID - m_pPersonalizedCB->SetHelpId( ""/*HID_MM_BODY_CB_PERSONALIZED*/ ); - // FIXME: HELPID - m_pFemaleLB->SetHelpId( ""/*HID_MM_BODY_LB_FEMALE*/ ); - // FIXME: HELPID - m_pFemalePB->SetHelpId( ""/*HID_MM_BODY_PB_FEMALE*/ ); - // FIXME: HELPID - m_pMaleLB->SetHelpId( ""/*HID_MM_BODY_LB_MALE*/ ); - // FIXME: HELPID - m_pMalePB->SetHelpId( ""/*HID_MM_BODY_PB_MALE*/ ); - // FIXME: HELPID - m_pFemaleColumnLB->SetHelpId( ""/*HID_MM_BODY_LB_FEMALECOLUMN*/ ); - // FIXME: HELPID - m_pFemaleFieldCB->SetHelpId( ""/*HID_MM_BODY_CB_FEMALEFIELD*/ ); - // FIXME: HELPID - m_pNeutralCB->SetHelpId( ""/*HID_MM_BODY_CB_NEUTRAL*/ ); + m_pPersonalizedCB->SetHelpId( HID_MM_BODY_CB_PERSONALIZED ); + m_pFemaleLB->SetHelpId( HID_MM_BODY_LB_FEMALE ); + m_pFemalePB->SetHelpId( HID_MM_BODY_PB_FEMALE ); + m_pMaleLB->SetHelpId( HID_MM_BODY_LB_MALE ); + m_pMalePB->SetHelpId( HID_MM_BODY_PB_MALE ); + m_pFemaleColumnLB->SetHelpId( HID_MM_BODY_LB_FEMALECOLUMN ); + m_pFemaleFieldCB->SetHelpId( HID_MM_BODY_CB_FEMALEFIELD ); + m_pNeutralCB->SetHelpId( HID_MM_BODY_CB_NEUTRAL ); FreeResource(); m_aGreetingLineCB.SetClickHdl(LINK(this, SwMailBodyDialog, ContainsHdl_Impl)); diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index eb02d713beb7..6cb7b87336c8 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -103,14 +103,12 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent, m_aTableHB.InsertItem( 2, m_sType, aSz.Width()/2, HIB_LEFT | HIB_VCENTER /*| HIB_CLICKABLE | HIB_UPARROW */); - // FIXME: HELPID - m_aTableHB.SetHelpId(""/*HID_MM_ADDRESSLIST_HB*/ ); + m_aTableHB.SetHelpId(HID_MM_ADDRESSLIST_HB ); m_aTableHB.Show(); static long nTabs[] = {3, 0, aSz.Width()/2, aSz.Width() }; m_aTableLB.SetTabs(&nTabs[0], MAP_PIXEL); - // FIXME: HELPID - m_aTableLB.SetHelpId(""/*HID_MM_SELECTDBTABLEDDIALOG_LISTBOX*/); + m_aTableLB.SetHelpId(HID_MM_SELECTDBTABLEDDIALOG_LISTBOX); m_aTableLB.SetWindowBits( WB_CLIPCHILDREN ); m_aTableLB.SetSpaceBetweenEntries(3); m_aTableLB.SetSelectionMode( SINGLE_SELECTION ); diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src index f2af8dca3b0d..d798e1acb21a 100644 --- a/sw/source/ui/dialog/regionsw.src +++ b/sw/source/ui/dialog/regionsw.src @@ -87,7 +87,7 @@ *************************************************************************/ ModalDialog MD_EDIT_REGION { - HelpID = FN_EDIT_REGION ; + HelpID = CMD_FN_EDIT_REGION ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 316 , 185 ) ; diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx index e945ae388e78..91d2b2c12b47 100644 --- a/sw/source/ui/dialog/swdlgfact.cxx +++ b/sw/source/ui/dialog/swdlgfact.cxx @@ -451,11 +451,9 @@ String AbstractInsFootNoteDlg_Impl::GetStr() { return pDlg->GetStr(); } -void AbstractInsFootNoteDlg_Impl::SetHelpId( ULONG nHelpId ) +void AbstractInsFootNoteDlg_Impl::SetHelpId( const rtl::OString& sHelpId ) { - // FIXME: HELPID - (void)nHelpId; - pDlg->SetHelpId( ""/*nHelpId*/ ); + pDlg->SetHelpId( sHelpId ); } void AbstractInsFootNoteDlg_Impl::SetText( const XubString& rStr ) { diff --git a/sw/source/ui/dialog/swdlgfact.hxx b/sw/source/ui/dialog/swdlgfact.hxx index 5d8611d51f54..26a86ec2cbfa 100644 --- a/sw/source/ui/dialog/swdlgfact.hxx +++ b/sw/source/ui/dialog/swdlgfact.hxx @@ -283,7 +283,7 @@ class AbstractInsFootNoteDlg_Impl : public AbstractInsFootNoteDlg virtual BOOL IsEndNote(); virtual String GetStr(); //from class Window - virtual void SetHelpId( ULONG nHelpId ); + virtual void SetHelpId( const rtl::OString& sHelpId ); virtual void SetText( const XubString& rStr ); }; //for SwInsFootNoteDlg end diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index dc1c25e588c1..b4151f6d1462 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -157,8 +157,7 @@ public: SwTestPasswdDlg(Window* pParent) : SfxPasswordDialog(pParent) { - // FIXME: HELPID - SetHelpId(""/*HID_DLG_PASSWD_SECTION*/); + SetHelpId(HID_DLG_PASSWD_SECTION); } }; @@ -431,8 +430,7 @@ SwEditRegionDlg::SwEditRegionDlg( Window* pParent, SwWrtShell& rWrtSh ) aSubRegionED.AddEventListener( LINK( this, SwEditRegionDlg, SubRegionEventHdl )); aSubRegionED.EnableAutocomplete( sal_True, sal_True ); - // FIXME: HELPID - aTree.SetHelpId(""/*HID_REGION_TREE*/); + aTree.SetHelpId(HID_REGION_TREE); aTree.SetSelectionMode( MULTIPLE_SELECTION ); aTree.SetWindowBits(WB_HASBUTTONSATROOT|WB_CLIPCHILDREN|WB_HSCROLL); aTree.SetSpaceBetweenEntries(0); diff --git a/sw/source/ui/dochdl/selglos.src b/sw/source/ui/dochdl/selglos.src index 1464b77bd7fc..0815fa7bdacf 100644 --- a/sw/source/ui/dochdl/selglos.src +++ b/sw/source/ui/dochdl/selglos.src @@ -33,7 +33,7 @@ // #define DLG_SEL_GLOS 256 ModalDialog DLG_SEL_GLOS { - HelpID = FN_EXPAND_GLOSSARY ; + HelpID = CMD_FN_EXPAND_GLOSSARY ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 220 , 100 ) ; diff --git a/sw/source/ui/docvw/docvw.src b/sw/source/ui/docvw/docvw.src index dcd0f98103f4..459b673cb188 100644 --- a/sw/source/ui/docvw/docvw.src +++ b/sw/source/ui/docvw/docvw.src @@ -36,56 +36,56 @@ Menu MN_READONLY_POPUP MenuItem { Identifier = MN_READONLY_OPENURL ; - HelpID = SID_OPENDOC ; + HelpId = CMD_SID_OPENDOC ; Text [ en-US ] = "~Open" ; }; MenuItem { Identifier = MN_READONLY_OPENURLNEW ; - HelpID = SID_OPENDOC ; + HelpId = CMD_SID_OPENDOC ; Text [ en-US ] = "Open in New Window" ; }; MenuItem { Identifier = MN_READONLY_EDITDOC ; - HelpID = SID_EDITDOC ; + HelpId = CMD_SID_EDITDOC ; Text [ en-US ] = "~Edit" ; }; MenuItem { Identifier = MN_READONLY_SELECTION_MODE ; - HelpID = FN_READONLY_SELECTION_MODE ; + HelpId = CMD_FN_READONLY_SELECTION_MODE ; Text [ en-US ] = "Select Text"; }; MenuItem { Identifier = MN_READONLY_RELOAD; - HelpID = SID_RELOAD; + HelpId = CMD_SID_RELOAD; Text [ en-US ] = "Re~load"; }; MenuItem { Identifier = MN_READONLY_RELOAD_FRAME; - HelpID = SID_RELOAD; + HelpId = CMD_SID_RELOAD; Text [ en-US ] = "Reload Frame"; }; MenuItem { Identifier = MN_READONLY_SOURCEVIEW ; - HelpID = HID_SOURCEVIEW ; + HelpId = HID_SOURCEVIEW ; Text [ en-US ] = "HT~ML Source" ; }; SEPARATOR MenuItem { Identifier = MN_READONLY_BROWSE_BACKWARD ; - HelpID = SID_BROWSE_BACKWARD ; + HelpId = CMD_SID_BROWSE_BACKWARD ; Text [ en-US ] = "Backwards" ; }; MenuItem { Identifier = MN_READONLY_BROWSE_FORWARD ; - HelpID = SID_BROWSE_FORWARD ; + HelpId = CMD_SID_BROWSE_FORWARD ; Text [ en-US ] = "~Forward" ; }; SEPARATOR @@ -190,14 +190,14 @@ Menu MN_READONLY_POPUP MenuItem { Identifier = SID_WIN_FULLSCREEN; - HelpID = SID_WIN_FULLSCREEN; + HelpId = CMD_SID_WIN_FULLSCREEN; Text [ en-US ] = "Leave Full-Screen Mode" ; }; SEPARATOR MenuItem { Identifier = MN_READONLY_COPY ; - HelpID = SID_COPY; + HelpId = CMD_SID_COPY; Text [ en-US ] = "~Copy" ; }; }; diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx index 94a87349f539..e2e59e17831e 100644 --- a/sw/source/ui/docvw/edtwin.cxx +++ b/sw/source/ui/docvw/edtwin.cxx @@ -4558,8 +4558,7 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView): nKS_NUMDOWN_Count(0), // #i23725# nKS_NUMINDENTINC_Count(0) // #i23725# { - // FIXME: HELPID - SetHelpId(""/*HID_EDIT_WIN*/); + SetHelpId(HID_EDIT_WIN); EnableChildTransparentMode(); SetDialogControlFlags( WINDOW_DLGCTRL_RETURN | WINDOW_DLGCTRL_WANTFOCUS ); diff --git a/sw/source/ui/docvw/srcedtw.cxx b/sw/source/ui/docvw/srcedtw.cxx index f80cc6c18805..55a0cb47e296 100644 --- a/sw/source/ui/docvw/srcedtw.cxx +++ b/sw/source/ui/docvw/srcedtw.cxx @@ -253,8 +253,7 @@ SwSrcEditWindow::SwSrcEditWindow( Window* pParent, SwSrcView* pParentView ) : bDoSyntaxHighlight(TRUE), bHighlighting(FALSE) { - // FIXME: HELPID - SetHelpId(""/*HID_SOURCE_EDITWIN*/); + SetHelpId(HID_SOURCE_EDITWIN); CreateTextEngine(); pSourceViewConfig->AddListener(this); } diff --git a/sw/source/ui/envelp/envlop1.cxx b/sw/source/ui/envelp/envlop1.cxx index c7878d071c4d..279ce515c1d9 100644 --- a/sw/source/ui/envelp/envlop1.cxx +++ b/sw/source/ui/envelp/envlop1.cxx @@ -173,14 +173,12 @@ SwEnvDlg::SwEnvDlg(Window* pParent, const SfxItemSet& rSet, FreeResource(); GetOKButton().SetText(String(SW_RES(STR_BTN_NEWDOC))); - // FIXME: HELPID - GetOKButton().SetHelpId(""/*HID_ENVELOP_PRINT*/); + GetOKButton().SetHelpId(HID_ENVELOP_PRINT); GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird if (GetUserButton()) { GetUserButton()->SetText(bInsert ? sInsert : sChange); - // FIXME: HELPID - GetUserButton()->SetHelpId(""/*HID_ENVELOP_INSERT*/); + GetUserButton()->SetHelpId(HID_ENVELOP_INSERT); } AddTabPage(TP_ENV_ENV, SwEnvPage ::Create, 0); diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src index f671c9506dc6..ef517a6ca1f5 100644 --- a/sw/source/ui/envelp/envprt.src +++ b/sw/source/ui/envelp/envprt.src @@ -49,32 +49,32 @@ TabPage TP_ENV_PRT ToolBoxItem { Identifier = ITM_HOR_LEFT ; - HelpID = ITM_HOR_LEFT ; + HelpID = HID_ITM_HOR_LEFT ; }; ToolBoxItem { Identifier = ITM_HOR_CNTR ; - HelpID = ITM_HOR_CNTR ; + HelpID = HID_ITM_HOR_CNTR ; }; ToolBoxItem { Identifier = ITM_HOR_RGHT ; - HelpID = ITM_HOR_RGHT ; + HelpID = HID_ITM_HOR_RGHT ; }; ToolBoxItem { Identifier = ITM_VER_LEFT ; - HelpID = ITM_VER_LEFT ; + HelpID = HID_ITM_VER_LEFT ; }; ToolBoxItem { Identifier = ITM_VER_CNTR ; - HelpID = ITM_VER_CNTR ; + HelpID = HID_ITM_VER_CNTR ; }; ToolBoxItem { Identifier = ITM_VER_RGHT ; - HelpID = ITM_VER_RGHT ; + HelpID = HID_ITM_VER_RGHT ; }; }; }; diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index 2f698fb7817f..162a6a5cea4f 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -143,8 +143,7 @@ SwLabDlg::SwLabDlg(Window* pParent, const SfxItemSet& rSet, FreeResource(); GetOKButton().SetText(String(SW_RES(STR_BTN_NEW_DOC))); - // FIXME: HELPID - GetOKButton().SetHelpId(""/*HID_LABEL_INSERT*/); + GetOKButton().SetHelpId(HID_LABEL_INSERT); GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird AddTabPage(TP_LAB_LAB, m_bLabel ? sFormat : sMedium ,SwLabPage ::Create, 0, sal_False, 0); @@ -346,16 +345,11 @@ void lcl_ChgYPos(Window& rWin, long nDiff) void SwLabPage::SetToBusinessCard() { - // FIXME: HELPID - SetHelpId(""/*HID_BUSINESS_FMT_PAGE*/); - // FIXME: HELPID - aContButton.SetHelpId(""/*HID_BUSINESS_FMT_PAGE_CONT*/); - // FIXME: HELPID - aSheetButton.SetHelpId(""/*HID_BUSINESS_FMT_PAGE_SHEET*/); - // FIXME: HELPID - aMakeBox.SetHelpId(""/*HID_BUSINESS_FMT_PAGE_BRAND*/); - // FIXME: HELPID - aTypeBox.SetHelpId(""/*HID_BUSINESS_FMT_PAGE_TYPE*/); + SetHelpId(HID_BUSINESS_FMT_PAGE); + aContButton.SetHelpId(HID_BUSINESS_FMT_PAGE_CONT); + aSheetButton.SetHelpId(HID_BUSINESS_FMT_PAGE_SHEET); + aMakeBox.SetHelpId(HID_BUSINESS_FMT_PAGE_BRAND); + aTypeBox.SetHelpId(HID_BUSINESS_FMT_PAGE_TYPE); m_bLabel = sal_False; aWritingText.Hide(); aAddrBox.Hide(); @@ -733,8 +727,7 @@ SwVisitingCardPage::SwVisitingCardPage(Window* pParent, const SfxItemSet& rSet) aAutoTextLB.SetWindowBits( WB_HSCROLL ); aAutoTextLB.SetSpaceBetweenEntries(0); aAutoTextLB.SetSelectionMode( SINGLE_SELECTION ); - // FIXME: HELPID - aAutoTextLB.SetHelpId(""/*HID_BUSINESS_CARD_CONTENT*/); + aAutoTextLB.SetHelpId(HID_BUSINESS_CARD_CONTENT); SetExchangeSupport(); aAutoTextLB.SetSelectHdl(LINK(this, SwVisitingCardPage, AutoTextSelectHdl)); diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src index ec6888e2c0e1..e73dec9e9e72 100644 --- a/sw/source/ui/envelp/mailmrge.src +++ b/sw/source/ui/envelp/mailmrge.src @@ -41,7 +41,7 @@ ModalDialog DLG_MAILMERGE _MAIL_MERGE_STRING_ Moveable = TRUE ; Sizeable = TRUE; - HelpID = FN_QRY_MERGE ; + HelpID = CMD_FN_QRY_MERGE ; Window WIN_BEAMER { Pos = MAP_APPFONT ( 6 , 3 ) ; diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index aa8f8f473685..38910327754e 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -37,8 +37,7 @@ SwFldRefTreeListBox::SwFldRefTreeListBox( Window* pParent, const ResId& rResId) : SvTreeListBox( pParent, rResId ) { - // FIXME: HELPID - SetHelpId( ""/*HID_REFSELECTION_TOOLTIP*/ ); + SetHelpId( HID_REFSELECTION_TOOLTIP ); } SwFldRefTreeListBox::~SwFldRefTreeListBox() diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index a4c1c455bc17..07ab852e199e 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -87,8 +87,7 @@ SwFldDokInfPage::SwFldDokInfPage(Window* pWindow, const SfxItemSet& rCoreSet ) : { FreeResource(); - // FIXME: HELPID - aTypeTLB.SetHelpId(""/*HID_FIELD_DINF_TYPE*/); + aTypeTLB.SetHelpId(HID_FIELD_DINF_TYPE); aTypeTLB.SetSelectionMode(SINGLE_SELECTION); aTypeTLB.SetWindowBits(WB_HASLINES|WB_CLIPCHILDREN|WB_SORT|WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL); // Font nicht setzen, damit der Font des Controls uebernommen wird! diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx index adeac01b3f11..f423a9d70f1a 100644 --- a/sw/source/ui/fldui/fldedt.cxx +++ b/sw/source/ui/fldui/fldedt.cxx @@ -141,8 +141,7 @@ SwFldEditDlg::SwFldEditDlg(SwView& rVw) : aNextBT.SetClickHdl(LINK(this, SwFldEditDlg, NextPrevHdl)); aAddressBT.SetClickHdl(LINK(this, SwFldEditDlg, AddressHdl)); - // FIXME: HELPID - aAddressBT.SetHelpId(""/*HID_FLDEDT_ADDRESS*/); + aAddressBT.SetHelpId(HID_FLDEDT_ADDRESS); Init(); } @@ -196,21 +195,21 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup) { // TabPage erzeugen SfxTabPage* pTabPage = 0; - USHORT nHelpId = 0; + const char* pHelpId = 0; switch (nGroup) { case GRP_DOC: pTabPage = SwFldDokPage::Create(this, *(SfxItemSet*)0); - nHelpId = HID_EDIT_FLD_DOK; + pHelpId = HID_EDIT_FLD_DOK; break; case GRP_FKT: pTabPage = SwFldFuncPage::Create(this, *(SfxItemSet*)0); - nHelpId = HID_EDIT_FLD_FUNC; + pHelpId = HID_EDIT_FLD_FUNC; break; case GRP_REF: pTabPage = SwFldRefPage::Create(this, *(SfxItemSet*)0); - nHelpId = HID_EDIT_FLD_REF; + pHelpId = HID_EDIT_FLD_REF; break; case GRP_REG: { @@ -234,22 +233,22 @@ SfxTabPage* SwFldEditDlg::CreatePage(USHORT nGroup) // } pSet->Put( SfxUnoAnyItem( SID_DOCINFO, uno::makeAny(xUDProps) ) ); pTabPage = SwFldDokInfPage::Create(this, *pSet); - nHelpId = HID_EDIT_FLD_DOKINF; + pHelpId = HID_EDIT_FLD_DOKINF; break; } case GRP_DB: pTabPage = SwFldDBPage::Create(this, *(SfxItemSet*)0); static_cast(pTabPage)->SetWrtShell(*pSh); - nHelpId = HID_EDIT_FLD_DB; + pHelpId = HID_EDIT_FLD_DB; break; case GRP_VAR: pTabPage = SwFldVarPage::Create(this, *(SfxItemSet*)0); - nHelpId = HID_EDIT_FLD_VAR; + pHelpId = HID_EDIT_FLD_VAR; break; } - // FIXME: HELPID - pTabPage->SetHelpId(""/*nHelpId*/); + + pTabPage->SetHelpId(pHelpId); static_cast(pTabPage)->SetWrtShell(pSh); SetTabPage(pTabPage); diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx index e7ca5db5e9c9..308bc379d4f4 100644 --- a/sw/source/ui/fldui/fldtdlg.cxx +++ b/sw/source/ui/fldui/fldtdlg.cxx @@ -84,13 +84,11 @@ SwFldDlg::SwFldDlg(SfxBindings* pB, SwChildWinWrapper* pCW, Window *pParent) RemoveResetButton(); GetOKButton().SetText(String(SW_RES(STR_FLD_INSERT))); - // FIXME: HELPID - GetOKButton().SetHelpId(""/*HID_FIELD_INSERT*/); + GetOKButton().SetHelpId(HID_FIELD_INSERT); GetOKButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird GetCancelButton().SetText(String(SW_RES(STR_FLD_CLOSE))); - // FIXME: HELPID - GetCancelButton().SetHelpId(""/*HID_FIELD_CLOSE*/); + GetCancelButton().SetHelpId(HID_FIELD_CLOSE); GetCancelButton().SetHelpText(aEmptyStr); // Damit generierter Hilfetext verwendet wird FreeResource(); diff --git a/sw/source/ui/frmdlg/column.cxx b/sw/source/ui/frmdlg/column.cxx index 90c01fbb329e..0a3c8cc33623 100644 --- a/sw/source/ui/frmdlg/column.cxx +++ b/sw/source/ui/frmdlg/column.cxx @@ -505,8 +505,7 @@ SwColumnPage::SwColumnPage(Window *pParent, const SfxItemSet &rSet) FreeResource(); SetExchangeSupport(); - // FIXME: HELPID - aDefaultVS.SetHelpId(""/*HID_COLUMN_VALUESET*/); + aDefaultVS.SetHelpId(HID_COLUMN_VALUESET); aDefaultVS.SetColCount( 5 ); aDefaultVS.SetStyle( aDefaultVS.GetStyle() | WB_ITEMBORDER diff --git a/sw/source/ui/inc/ribbar.hrc b/sw/source/ui/inc/ribbar.hrc index 45c494b6f136..c9af820ba35b 100644 --- a/sw/source/ui/inc/ribbar.hrc +++ b/sw/source/ui/inc/ribbar.hrc @@ -69,10 +69,7 @@ #define MN_CALC_POPUP (RC_RIBBAR_BEGIN + 22) #define MN_NUMNAMES_POPUP (RC_RIBBAR_BEGIN + 23) -#define RID_INSERT_CTRL (RC_RIBBAR_BEGIN + 24) -#define RID_INSERT_OBJ_CTRL (RC_RIBBAR_BEGIN + 25) #define RID_INSERT_FIELD_CTRL (RC_RIBBAR_BEGIN + 26) -#define RID_TBL_OPT_CTRL (RC_RIBBAR_BEGIN + 27) #define RID_BEZIER_WIN (RC_RIBBAR_BEGIN + 28) #define RID_SCROLL_NAVI_TBX (RC_RIBBAR_BEGIN + 29) #define RID_SCROLL_NAVIGATION_WIN (RC_RIBBAR_BEGIN + 30) diff --git a/sw/source/ui/inc/swmn_tmpl.hrc b/sw/source/ui/inc/swmn_tmpl.hrc index 3128f741be30..6506b8a23bc3 100644 --- a/sw/source/ui/inc/swmn_tmpl.hrc +++ b/sw/source/ui/inc/swmn_tmpl.hrc @@ -57,7 +57,7 @@ MenuItem\ {\ Identifier = FN_FORMAT_PAGE_DLG ; \ - HelpID = FN_FORMAT_PAGE_DLG ; \ + HelpId = CMD_FN_FORMAT_PAGE_DLG ; \ Text [ en-US ] = "Pa~ge..." ; \ }; @@ -74,7 +74,6 @@ MenuItem\ {\ Identifier = MN_FORMAT_STYLE ; \ - HelpID = MN_FORMAT_STYLE ; \ Command = ".uno:StyleMenu" ; \ Text [ en-US ] = "St~yle" ; \ SubMenu = Menu\ @@ -113,13 +112,13 @@ MenuItem\ {\ Identifier = FN_SET_SUPER_SCRIPT ; \ - HelpID = FN_SET_SUPER_SCRIPT ; \ + HelpId = CMD_FN_SET_SUPER_SCRIPT ; \ Text [ en-US ] = "Superscript" ; \ };\ MenuItem\ {\ Identifier = FN_SET_SUB_SCRIPT ; \ - HelpID = FN_SET_SUB_SCRIPT ; \ + HelpId = CMD_FN_SET_SUB_SCRIPT ; \ Text [ en-US ] = "Subscript" ; \ };\ };\ @@ -128,7 +127,6 @@ MenuItem\ {\ Identifier = MN_FORMAT_ALGN ; \ - HelpID = MN_FORMAT_ALGN ; \ Command = ".uno:AlignTextMenu" ; \ Text [ en-US ] = "A~lignment" ; \ RadioCheck = TRUE ; \ @@ -154,7 +152,7 @@ MenuItem\ {\ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ + HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Justified" ; \ };\ @@ -164,7 +162,6 @@ MenuItem\ {\ Identifier = MN_FORMAT_LINESPACE ; \ - HelpID = MN_FORMAT_LINESPACE ; \ Command = ".uno:LineSpacingMenu" ; \ Text [ en-US ] = "Line Spacing" ; \ _MenuItemFlags = MIB_RADIOCHECK ; \ @@ -209,21 +206,21 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem \ { \ Identifier = FN_EDIT_FIELD ; \ - HelpID = FN_EDIT_FIELD ; \ + HelpId = CMD_FN_EDIT_FIELD ; \ Text [ en-US ] = "Fields..." ; \ }; #define _MN_EDIT_FOOTNOTE \ MenuItem \ { \ Identifier = FN_EDIT_FOOTNOTE ; \ - HelpID = FN_EDIT_FOOTNOTE ; \ + HelpId = CMD_FN_EDIT_FOOTNOTE ; \ Text [ en-US ] = "Footnote/Endnote~..." ; \ }; #define _MN_EDIT_IDX_ENTRY_DLG \ MenuItem \ { \ Identifier = FN_EDIT_IDX_ENTRY_DLG ; \ - HelpID = FN_EDIT_IDX_ENTRY_DLG ; \ + HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG ; \ Text [ en-US ] = "Inde~x Entry..." ; \ }; @@ -231,13 +228,13 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem \ { \ Identifier = FN_REDLINE_ACCEPT_DIRECT; \ - HelpID = FN_REDLINE_ACCEPT_DIRECT ; \ + HelpId = CMD_FN_REDLINE_ACCEPT_DIRECT ; \ Text [ en-US ] = "Accept Change" ; \ };\ MenuItem \ { \ Identifier = FN_REDLINE_REJECT_DIRECT ; \ - HelpID = FN_REDLINE_REJECT_DIRECT ; \ + HelpId = CMD_FN_REDLINE_REJECT_DIRECT ; \ Text [ en-US ] = "Reject Change" ; \ }; \ SEPARATOR ; @@ -245,7 +242,7 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem \ { \ Identifier = FN_EDIT_AUTH_ENTRY_DLG ; \ - HelpID = FN_EDIT_AUTH_ENTRY_DLG ; \ + HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG ; \ Text [ en-US ] = "~Bibliography Entry..."; \ }; \ SEPARATOR ; @@ -258,19 +255,19 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem \ { \ Identifier = FN_EDIT_HYPERLINK ; \ - HelpID = FN_EDIT_HYPERLINK ; \ + HelpId = CMD_FN_EDIT_HYPERLINK ; \ Text [ en-US ] = "Edit Hyperlink..."; \ }; \ MenuItem \ { \ Identifier = FN_COPY_HYPERLINK_LOCATION; \ - HelpID = FN_COPY_HYPERLINK_LOCATION; \ + HelpId = CMD_FN_COPY_HYPERLINK_LOCATION; \ Text [ en-US ] = "Copy Hyperlink ~Location"; \ }; \ MenuItem \ { \ Identifier = FN_REMOVE_HYPERLINK ; \ - HelpID = FN_REMOVE_HYPERLINK ; \ + HelpId = CMD_FN_REMOVE_HYPERLINK ; \ Text [ en-US ] = "Remo~ve Hyperlink"; \ }; @@ -284,7 +281,7 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem\ {\ Identifier = FN_EDIT_HYPERLINK ; \ - HelpID = FN_EDIT_HYPERLINK ; \ + HelpId = CMD_FN_EDIT_HYPERLINK ; \ Text [ en-US ] = "~Edit Hyperlink" ; \ }; @@ -307,7 +304,7 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem\ {\ Identifier = FN_FORMAT_RESET ; \ - HelpID = FN_FORMAT_RESET ; \ + HelpId = CMD_FN_FORMAT_RESET ; \ Text [ en-US ] = "~Default Formatting" ; \ }; @@ -316,25 +313,25 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem \ { \ Identifier = FN_NUMBER_NEWSTART; \ - HelpId = FN_NUMBER_NEWSTART; \ + HelpId = CMD_FN_NUMBER_NEWSTART; \ Text[ en-US ] = "Restart Numbering"; \ }; \ MenuItem \ { \ Identifier = FN_NUM_CONTINUE; \ - HelpId = FN_NUM_CONTINUE; \ + HelpId = CMD_FN_NUM_CONTINUE; \ Text[ en-US ] = "Continue previous numbering"; \ }; \ MenuItem \ { \ Identifier = FN_NUM_BULLET_UP; \ - HelpId = FN_NUM_BULLET_UP; \ + HelpId = CMD_FN_NUM_BULLET_UP; \ Text[ en-US ] = "Up One Level"; \ }; \ MenuItem \ { \ Identifier = FN_NUM_BULLET_DOWN; \ - HelpId = FN_NUM_BULLET_DOWN; \ + HelpId = CMD_FN_NUM_BULLET_DOWN; \ Text[ en-US ] = "Down One Level"; \ }; @@ -357,19 +354,19 @@ location: /uiconfig/[swriter|sweb|sglobal]/menubar/menubar.xml MenuItem \ { \ Identifier = FN_UPDATE_CUR_TOX ; \ - HelpID = FN_UPDATE_CUR_TOX ; \ + HelpId = CMD_FN_UPDATE_CUR_TOX ; \ Text [ en-US ] = "~Update Index/Table"; \ }; \ MenuItem \ { \ Identifier = FN_EDIT_CURRENT_TOX; \ - HelpID = FN_EDIT_CURRENT_TOX; \ + HelpId = CMD_FN_EDIT_CURRENT_TOX; \ Text [ en-US ] = "~Edit Index/Table"; \ }; \ MenuItem \ { \ Identifier = FN_REMOVE_CUR_TOX; \ - HelpID = FN_REMOVE_CUR_TOX; \ + HelpId = CMD_FN_REMOVE_CUR_TOX; \ Text [ en-US ] = "Delete Index/Table"; \ }; \ SEPARATOR ; diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 3f2e98dc0e1b..a8a01a4f8222 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -1036,8 +1036,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(Window* pParent, const SfxItemSet& rAttrS aFromObjCLB.InsertEntry(rNames.GetString(i)); aFromObjCLB.SetEntryData( i, (void*)rNames.GetValue(i) ); } - // FIXME: HELPID - aFromObjCLB.SetHelpId(""/*HID_OLE_CHECKLB*/); + aFromObjCLB.SetHelpId(HID_OLE_CHECKLB); SetExchangeSupport(); aTypeLB.SetSelectHdl(LINK(this, SwTOXSelectTabPage, TOXTypeHdl)); @@ -1792,8 +1791,7 @@ public: bNextControl(sal_False), m_pParent( pTokenWin ) { - // FIXME: HELPID - SetHelpId( ""/*HID_TOX_ENTRY_EDIT*/ ); + SetHelpId( HID_TOX_ENTRY_EDIT ); } virtual void KeyInput( const KeyEvent& rKEvt ); @@ -1878,8 +1876,7 @@ public: bNextControl(sal_False), m_pParent(pTokenWin) { - // FIXME: HELPID - SetHelpId(""/*HID_TOX_ENTRY_BUTTON*/); + SetHelpId(HID_TOX_ENTRY_BUTTON); } virtual void KeyInput( const KeyEvent& rKEvt ); @@ -2131,8 +2128,7 @@ SwTOXEntryTabPage::SwTOXEntryTabPage(Window* pParent, const SfxItemSet& rAttrSet aLevelLB.SetSpaceBetweenEntries(0); aLevelLB.SetSelectionMode( SINGLE_SELECTION ); aLevelLB.SetHighlightRange(); // select full width - // FIXME: HELPID - aLevelLB.SetHelpId(""/*HID_INSERT_INDEX_ENTRY_LEVEL_LB*/); + aLevelLB.SetHelpId(HID_INSERT_INDEX_ENTRY_LEVEL_LB); aLevelLB.Show(); aLastTOXType.eType = (TOXTypes)USHRT_MAX; @@ -3098,8 +3094,7 @@ SwTokenWindow::SwTokenWindow(SwTOXEntryTabPage* pParent, const ResId& rResId) : m_pParent(pParent) { SetStyle(GetStyle()|WB_TABSTOP|WB_DIALOGCONTROL); - // FIXME: HELPID - SetHelpId(""/*HID_TOKEN_WINDOW*/); + SetHelpId(HID_TOKEN_WINDOW); for(sal_uInt16 i = 0; i < TOKEN_END; i++) { sal_uInt16 nTextId = STR_BUTTON_TEXT_START + i; diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src index 483485bf1b4b..4410f407f2ed 100644 --- a/sw/source/ui/index/idxmrk.src +++ b/sw/source/ui/index/idxmrk.src @@ -275,7 +275,7 @@ ModalDialog DLG_EDIT_IDXMARK Moveable = TRUE ; Closeable = TRUE; Sizeable = FALSE ; - HelpID = FN_EDIT_IDX_ENTRY_DLG; + HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG; SVLook = TRUE ; #define IDX_WIN_WIDTH IDX_WIN_WIDTH_NORMAL Size = MAP_APPFONT ( IDX_WIN_WIDTH , 118 ) ; @@ -294,7 +294,7 @@ ModalDialog DLG_EDIT_IDXMARK_CJK Moveable = TRUE ; Closeable = TRUE; Sizeable = FALSE ; - HelpID = FN_EDIT_IDX_ENTRY_DLG; + HelpId = CMD_FN_EDIT_IDX_ENTRY_DLG; SVLook = TRUE ; #define IDX_WIN_WIDTH IDX_WIN_WIDTH_CJK Size = MAP_APPFONT ( IDX_WIN_WIDTH , 118 ) ; @@ -315,7 +315,7 @@ ModelessDialog DLG_INSIDXMARK Sizeable = FALSE ; Hide = TRUE ; // Zoomable = TRUE ; - HelpID = FN_INSERT_IDX_ENTRY_DLG; + HelpId = CMD_FN_INSERT_IDX_ENTRY_DLG; SVLook = TRUE ; #define IDX_WIN_WIDTH IDX_WIN_WIDTH_NORMAL Size = MAP_APPFONT ( IDX_WIN_WIDTH , 138) ; @@ -336,7 +336,7 @@ ModelessDialog DLG_INSIDXMARK_CJK Closeable = TRUE; Sizeable = FALSE ; // Zoomable = TRUE ; - HelpID = FN_INSERT_IDX_ENTRY_DLG; + HelpId = CMD_FN_INSERT_IDX_ENTRY_DLG; SVLook = TRUE ; #define IDX_WIN_WIDTH IDX_WIN_WIDTH_CJK Size = MAP_APPFONT ( IDX_WIN_WIDTH , 138) ; @@ -523,7 +523,7 @@ ModalDialog DLG_EDIT_AUTHMARK Moveable = TRUE ; Closeable = TRUE ; Sizeable = FALSE ; - HelpID = FN_EDIT_AUTH_ENTRY_DLG; + HelpId = CMD_FN_EDIT_AUTH_ENTRY_DLG; SVLook = TRUE ; Size = MAP_APPFONT ( 218 , 118 ) ; #define RADIO_BUTTON_HEIGHT 0 @@ -536,7 +536,7 @@ ModelessDialog DLG_INSAUTHMARK Closeable = TRUE ; Sizeable = FALSE ; // Zoomable = TRUE ; - HelpID = FN_INSERT_AUTH_ENTRY_DLG; + HelpId = CMD_FN_INSERT_AUTH_ENTRY_DLG; SVLook = TRUE ; #define RADIO_BUTTON_HEIGHT 30 Size = MAP_APPFONT ( 218 , 118 + RADIO_BUTTON_HEIGHT) ; diff --git a/sw/source/ui/index/multmrk.src b/sw/source/ui/index/multmrk.src index be7b47d836d4..2182d5170fe5 100644 --- a/sw/source/ui/index/multmrk.src +++ b/sw/source/ui/index/multmrk.src @@ -31,7 +31,7 @@ #include "helpid.h" ModalDialog DLG_MULTMRK { - HelpID = FN_EDIT_IDX_ENTRY_DLG ; + HelpID = CMD_FN_EDIT_IDX_ENTRY_DLG ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 220 , 95 ) ; diff --git a/sw/source/ui/index/swuiidxmrk.cxx b/sw/source/ui/index/swuiidxmrk.cxx index b33d8d777920..54d1fab4cc0c 100644 --- a/sw/source/ui/index/swuiidxmrk.cxx +++ b/sw/source/ui/index/swuiidxmrk.cxx @@ -179,47 +179,27 @@ SwIndexMarkDlg::SwIndexMarkDlg(Window *pParent, SetStyle(GetStyle()|WB_DIALOGCONTROL); FreeResource(); - // FIXME: HELPID - aOKBT .SetHelpId(""/*HID_INSERT_IDX_MRK_OK*/ ); - // FIXME: HELPID - aCancelBT .SetHelpId(""/*HID_INSERT_IDX_MRK_CLOSE*/ ); - // FIXME: HELPID - aDelBT .SetHelpId(""/*HID_INSERT_IDX_MRK_DELETE*/ ); - // FIXME: HELPID - aNewBT .SetHelpId(""/*HID_INSERT_IDX_MRK_NEW*/ ); - // FIXME: HELPID - aPrevBT .SetHelpId(""/*HID_INSERT_IDX_MRK_PREV*/ ); - // FIXME: HELPID - aPrevSameBT .SetHelpId(""/*HID_INSERT_IDX_MRK_PREV_SAME*/ ); - // FIXME: HELPID - aNextBT .SetHelpId(""/*HID_INSERT_IDX_MRK_NEXT*/ ); - // FIXME: HELPID - aNextSameBT .SetHelpId(""/*HID_INSERT_IDX_MRK_NEXT_SAME*/ ); - // FIXME: HELPID - aTypeDCB .SetHelpId(""/*HID_INSERT_IDX_MRK_TYPE*/ ); - // FIXME: HELPID - aEntryED .SetHelpId(""/*HID_INSERT_IDX_MRK_ENTRY*/ ); - // FIXME: HELPID - aKeyDCB .SetHelpId(""/*HID_INSERT_IDX_MRK_PRIM_KEY*/ ); - // FIXME: HELPID - aKey2DCB .SetHelpId(""/*HID_INSERT_IDX_MRK_SEC_KEY*/ ); - // FIXME: HELPID - aLevelED .SetHelpId(""/*HID_INSERT_IDX_MRK_LEVEL*/ ); - // FIXME: HELPID - aMainEntryCB .SetHelpId(""/*HID_INSERT_IDX_MRK_MAIN_ENTRY*/); - // FIXME: HELPID - aApplyToAllCB .SetHelpId(""/*HID_INSERT_IDX_MRK_APPLY_ALL*/ ); - // FIXME: HELPID - aPhoneticED0 .SetHelpId(""/*HID_INSERT_IDX_MRK_PHONETIC_READING*/ ); - // FIXME: HELPID - aPhoneticED1 .SetHelpId(""/*HID_INSERT_IDX_MRK_PHONETIC_READING*/ ); - // FIXME: HELPID - aPhoneticED2 .SetHelpId(""/*HID_INSERT_IDX_MRK_PHONETIC_READING*/ ); - - // FIXME: HELPID - aSearchCaseSensitiveCB.SetHelpId( ""/*HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE*/ ); - // FIXME: HELPID - aSearchCaseWordOnlyCB.SetHelpId( ""/*HID_INSERT_IDX_MRK_SRCH_WORDONLY*/ ); + aOKBT .SetHelpId(HID_INSERT_IDX_MRK_OK ); + aCancelBT .SetHelpId(HID_INSERT_IDX_MRK_CLOSE ); + aDelBT .SetHelpId(HID_INSERT_IDX_MRK_DELETE ); + aNewBT .SetHelpId(HID_INSERT_IDX_MRK_NEW ); + aPrevBT .SetHelpId(HID_INSERT_IDX_MRK_PREV ); + aPrevSameBT .SetHelpId(HID_INSERT_IDX_MRK_PREV_SAME ); + aNextBT .SetHelpId(HID_INSERT_IDX_MRK_NEXT ); + aNextSameBT .SetHelpId(HID_INSERT_IDX_MRK_NEXT_SAME ); + aTypeDCB .SetHelpId(HID_INSERT_IDX_MRK_TYPE ); + aEntryED .SetHelpId(HID_INSERT_IDX_MRK_ENTRY ); + aKeyDCB .SetHelpId(HID_INSERT_IDX_MRK_PRIM_KEY ); + aKey2DCB .SetHelpId(HID_INSERT_IDX_MRK_SEC_KEY ); + aLevelED .SetHelpId(HID_INSERT_IDX_MRK_LEVEL ); + aMainEntryCB .SetHelpId(HID_INSERT_IDX_MRK_MAIN_ENTRY); + aApplyToAllCB .SetHelpId(HID_INSERT_IDX_MRK_APPLY_ALL ); + aPhoneticED0 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING ); + aPhoneticED1 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING ); + aPhoneticED2 .SetHelpId(HID_INSERT_IDX_MRK_PHONETIC_READING ); + + aSearchCaseSensitiveCB.SetHelpId( HID_INSERT_IDX_MRK_SRCH_CASESENSITIVE ); + aSearchCaseWordOnlyCB.SetHelpId( HID_INSERT_IDX_MRK_SRCH_WORDONLY ); GetParent()->SetText( SW_RESSTR( bNewMark ? STR_IDXMRK_INSERT : STR_IDXMRK_EDIT)); @@ -1224,8 +1204,9 @@ public: struct TextInfo { sal_uInt16 nToxField; - sal_uInt16 nHelpId; + const char* pHelpId; }; + static const TextInfo aTextInfoArr[] = { {AUTH_FIELD_IDENTIFIER, HID_AUTH_FIELD_IDENTIFIER }, @@ -1295,30 +1276,21 @@ SwAuthMarkDlg::SwAuthMarkDlg( Window *pParent, SetStyle(GetStyle()|WB_DIALOGCONTROL); FreeResource(); - // FIXME: HELPID - aFromComponentRB.SetHelpId(""/*HID_AUTH_MARK_DLG_FROM_COMP_RB*/); - // FIXME: HELPID - aFromDocContentRB.SetHelpId(""/*HID_AUTH_MARK_DLG_FROM_DOC_RB*/ ); - // FIXME: HELPID - aEntryED.SetHelpId(""/*HID_AUTH_MARK_DLG_ID_LISTBOX*/ ); - // FIXME: HELPID - aEntryLB.SetHelpId(""/*HID_AUTH_MARK_DLG_ID_LISTBOX*/ ); + aFromComponentRB.SetHelpId(HID_AUTH_MARK_DLG_FROM_COMP_RB); + aFromDocContentRB.SetHelpId(HID_AUTH_MARK_DLG_FROM_DOC_RB ); + aEntryED.SetHelpId(HID_AUTH_MARK_DLG_ID_LISTBOX ); + aEntryLB.SetHelpId(HID_AUTH_MARK_DLG_ID_LISTBOX ); aFromComponentRB.Show(bNewEntry); aFromDocContentRB.Show(bNewEntry); aFromComponentRB.Check(bIsFromComponent); aFromDocContentRB.Check(!bIsFromComponent); - // FIXME: HELPID - aOKBT .SetHelpId(""/*HID_INSERT_AUTH_MRK_OK*/ ); - // FIXME: HELPID - aCancelBT .SetHelpId(""/*HID_INSERT_AUTH_MRK_CLOSE*/); - // FIXME: HELPID - aEntryED .SetHelpId(""/*HID_INSERT_AUTH_MRK_ENTRY*/ ); - // FIXME: HELPID - aCreateEntryPB .SetHelpId(""/*HID_INSERT_AUTH_MRK_CREATE_ENTRY*/ ); - // FIXME: HELPID - aEditEntryPB .SetHelpId(""/*HID_INSERT_AUTH_MRK_EDIT_ENTRY*/ ); + aOKBT .SetHelpId(HID_INSERT_AUTH_MRK_OK ); + aCancelBT .SetHelpId(HID_INSERT_AUTH_MRK_CLOSE); + aEntryED .SetHelpId(HID_INSERT_AUTH_MRK_ENTRY ); + aCreateEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_CREATE_ENTRY ); + aEditEntryPB .SetHelpId(HID_INSERT_AUTH_MRK_EDIT_ENTRY ); aOKBT.SetClickHdl(LINK(this,SwAuthMarkDlg, InsertHdl)); aCancelBT.SetClickHdl(LINK(this,SwAuthMarkDlg, CloseHdl)); @@ -1770,8 +1742,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, pTypeListBox->SetPosPixel(bLeft ? aTR1 : aTR2); pTypeListBox->Show(); pTypeListBox->SetSelectHdl(LINK(this, SwCreateAuthEntryDlg_Impl, EnableHdl)); - // FIXME: HELPID - pTypeListBox->SetHelpId(""/*aCurInfo.nHelpId*/); + pTypeListBox->SetHelpId(aCurInfo.pHelpId); } else if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField && !m_bNewEntryMode) @@ -1799,8 +1770,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, pIdentifierBox->SetSizePixel(aTmp); pIdentifierBox->SetPosPixel(bLeft ? aTR1 : aTR2); pIdentifierBox->Show(); - // FIXME: HELPID - pIdentifierBox->SetHelpId(""/*aCurInfo.nHelpId*/); + pIdentifierBox->SetHelpId(aCurInfo.pHelpId); } else { @@ -1811,8 +1781,7 @@ SwCreateAuthEntryDlg_Impl::SwCreateAuthEntryDlg_Impl(Window* pParent, pEdits[nIndex]->SetPosPixel(bLeft ? aTR1 : aTR2); pEdits[nIndex]->SetText(pFields[aCurInfo.nToxField]); pEdits[nIndex]->Show(); - // FIXME: HELPID - pEdits[nIndex]->SetHelpId(""/*aCurInfo.nHelpId*/); + pEdits[nIndex]->SetHelpId(aCurInfo.pHelpId); if(AUTH_FIELD_IDENTIFIER == aCurInfo.nToxField) { pEdits[nIndex]->SetModifyHdl(LINK(this, SwCreateAuthEntryDlg_Impl, ShortNameHdl)); diff --git a/sw/source/ui/lingu/olmenu.cxx b/sw/source/ui/lingu/olmenu.cxx index 1920d051edd0..a3f2b67b69b6 100644 --- a/sw/source/ui/lingu/olmenu.cxx +++ b/sw/source/ui/lingu/olmenu.cxx @@ -447,15 +447,13 @@ bGrammarResults(false) { const String aEntry = aSuggestions[ i ]; InsertItem( nPos, aEntry, 0, i ); - // FIXME: HELPID - SetHelpId( nPos, ""/*HID_LINGU_REPLACE*/); + SetHelpId( nPos, HID_LINGU_REPLACE); if (aSuggestionImageUrl.getLength() > 0) SetItemImage( nPos, aImage ); pMenu->InsertItem( nId, aEntry ); - // FIXME: HELPID - pMenu->SetHelpId( nPos, ""/*HID_LINGU_AUTOCORR*/); + pMenu->SetHelpId( nPos, HID_LINGU_AUTOCORR); } } @@ -464,8 +462,7 @@ bGrammarResults(false) SetItemText( MN_SPELLING, aSpellingAndGrammar ); USHORT nItemPos = GetItemPos( MN_IGNORE ); InsertItem( MN_IGNORE_SELECTION, aIgnoreSelection, 0, nItemPos ); - // FIXME: HELPID - SetHelpId( MN_IGNORE_SELECTION, ""/*HID_LINGU_IGNORE_SELECTION*/); + SetHelpId( MN_IGNORE_SELECTION, HID_LINGU_IGNORE_SELECTION); EnableItem( MN_AUTOCORR, bEnable ); @@ -635,8 +632,7 @@ aInfo16( SW_RES(IMG_INFO_16) ) { const String aEntry = aSuggestions[ i ]; InsertItem( nItemId, aEntry, 0, nPos++ ); - // FIXME: HELPID - SetHelpId( nItemId, ""/*HID_LINGU_REPLACE*/ ); + SetHelpId( nItemId, HID_LINGU_REPLACE ); if (aSuggestionImageUrl.getLength() > 0) SetItemImage( nItemId, aImage ); @@ -651,8 +647,7 @@ aInfo16( SW_RES(IMG_INFO_16) ) SetItemText( MN_SPELLING, aSpellingAndGrammar ); USHORT nItemPos = GetItemPos( MN_IGNORE ); InsertItem( MN_IGNORE_SELECTION, aIgnoreSelection, 0, nItemPos ); - // FIXME: HELPID - SetHelpId( MN_IGNORE_SELECTION, ""/*HID_LINGU_IGNORE_SELECTION*/); + SetHelpId( MN_IGNORE_SELECTION, HID_LINGU_IGNORE_SELECTION); EnableItem( MN_AUTOCORR, false ); diff --git a/sw/source/ui/misc/bookmark.src b/sw/source/ui/misc/bookmark.src index 4e7a4ec0a01f..2896bf07e3a3 100644 --- a/sw/source/ui/misc/bookmark.src +++ b/sw/source/ui/misc/bookmark.src @@ -31,7 +31,7 @@ #include "helpid.h" ModalDialog DLG_INSERT_BOOKMARK { - HelpID = FN_INSERT_BOOKMARK ; + HelpID = CMD_FN_INSERT_BOOKMARK ; OUTPUTSIZE = TRUE ; Size = MAP_APPFONT ( 179 , 96 ) ; /* ### ACHTUNG: Neuer Text in Resource? Textmarke einfügen : Textmarke einf³gen */ diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index 9632d1a1e83d..59a918fc4030 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -105,8 +105,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, 0, 160 }; - // FIXME: HELPID - aGroupTLB.SetHelpId(""/*HID_GLOS_GROUP_TREE*/); + aGroupTLB.SetHelpId(HID_GLOS_GROUP_TREE); aGroupTLB.SetTabs( &nTabs[0], MAP_APPFONT ); aGroupTLB.SetWindowBits(WB_HSCROLL|WB_CLIPCHILDREN|WB_SORT); aGroupTLB.SetSelectHdl(LINK(this, SwGlossaryGroupDlg, SelectHdl)); diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index adcd40541487..a2b6b85a7449 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -293,8 +293,7 @@ SwGlossaryDlg::SwGlossaryDlg(SfxViewFrame* pViewFrame, if( bIsDocReadOnly ) aInsertBtn.Enable(sal_False); aNameED.GrabFocus(); - // FIXME: HELPID - aCategoryBox.SetHelpId(""/*HID_MD_GLOS_CATEGORY*/); + aCategoryBox.SetHelpId(HID_MD_GLOS_CATEGORY); aCategoryBox.SetWindowBits(WB_HASBUTTONS|WB_HASBUTTONSATROOT|WB_HSCROLL|WB_VSCROLL|WB_CLIPCHILDREN|WB_SORT); aCategoryBox.GetModel()->SetSortMode(SortAscending); aCategoryBox.SetHighlightRange(); // ueber volle Breite selektieren diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src index 3ed5c4939791..1988481a1ff0 100644 --- a/sw/source/ui/misc/glossary.src +++ b/sw/source/ui/misc/glossary.src @@ -32,7 +32,7 @@ // #define DLG_GLOSSARY 256 ModalDialog DLG_GLOSSARY { - HelpID = FN_GLOSSARY_DLG ; + HelpID = CMD_FN_GLOSSARY_DLG ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 375 , 164 ) ; diff --git a/sw/source/ui/misc/insrule.cxx b/sw/source/ui/misc/insrule.cxx index 3c450dca93d4..c053030201ad 100644 --- a/sw/source/ui/misc/insrule.cxx +++ b/sw/source/ui/misc/insrule.cxx @@ -77,8 +77,7 @@ SwInsertGrfRulerDlg::SwInsertGrfRulerDlg( Window* pParent ) : // Grafiknamen ermitteln GalleryExplorer::BeginLocking(GALLERY_THEME_RULERS); GalleryExplorer::FillObjList( GALLERY_THEME_RULERS, aGrfNames ); - // FIXME: HELPID - pExampleVS->SetHelpId(""/*HID_VS_RULER*/); + pExampleVS->SetHelpId(HID_VS_RULER); Color aColor(COL_WHITE); pExampleVS->InsertItem( 1, 1); pExampleVS->SetItemText( 1, sSimple); diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx index a313064cb1be..43c92a72a3f7 100644 --- a/sw/source/ui/misc/num.cxx +++ b/sw/source/ui/misc/num.cxx @@ -1064,8 +1064,7 @@ SwSvxNumBulletTabDialog::SwSvxNumBulletTabDialog(Window* pParent, { FreeResource(); GetUserButton()->SetText(sRemoveText); - // FIXME: HELPID - GetUserButton()->SetHelpId(""/*HID_NUM_RESET*/); + GetUserButton()->SetHelpId(HID_NUM_RESET); GetUserButton()->SetClickHdl(LINK(this, SwSvxNumBulletTabDialog, RemoveNumberingHdl)); if(!rWrtSh.GetCurNumRule()) GetUserButton()->Enable(FALSE); diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 5b035d48fe51..e733aa0389c2 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -239,8 +239,7 @@ SwOutlineTabDialog::SwOutlineTabDialog(Window* pParent, // <-- PushButton* pUserButton = GetUserButton(); pUserButton->SetText(SW_RES(ST_FORM)); - // FIXME: HELPID - pUserButton->SetHelpId(""/*HID_OUTLINE_FORM*/); + pUserButton->SetHelpId(HID_OUTLINE_FORM); pUserButton->SetClickHdl(LINK(this, SwOutlineTabDialog, FormHdl)); FreeResource(); diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index fd2c5f36ddad..b87060bd19b0 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -244,8 +244,7 @@ SwRedlineAcceptDlg::SwRedlineAcceptDlg(Dialog *pParent, BOOL bAutoFmt) : bRedlnAutoFmt (bAutoFmt), bInhibitActivate( false ) { - // FIXME: HELPID - aTabPagesCTRL.SetHelpId(""/*HID_REDLINE_CTRL*/); + aTabPagesCTRL.SetHelpId(HID_REDLINE_CTRL); pTPView = aTabPagesCTRL.GetViewPage(); pTable = pTPView->GetTableControl(); diff --git a/sw/source/ui/misc/srtdlg.src b/sw/source/ui/misc/srtdlg.src index a1e6caad6c5e..a451f920dd76 100644 --- a/sw/source/ui/misc/srtdlg.src +++ b/sw/source/ui/misc/srtdlg.src @@ -32,7 +32,7 @@ ModalDialog DLG_SORTING { - HelpID = FN_SORTING_DLG ; + HelpID = CMD_FN_SORTING_DLG ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 268 , 193 ) ; diff --git a/sw/source/ui/ribbar/inputwin.cxx b/sw/source/ui/ribbar/inputwin.cxx index f7d9067a1ded..c14f91632a4c 100644 --- a/sw/source/ui/ribbar/inputwin.cxx +++ b/sw/source/ui/ribbar/inputwin.cxx @@ -90,8 +90,7 @@ SwInputWindow::SwInputWindow( Window* pParent, SfxBindings* pBind ) InsertSeparator ( 1 ); InsertSeparator (); InsertWindow( ED_FORMULA, &aEdit); - // FIXME: HELPID - SetHelpId(ED_FORMULA, ""/*HID_EDIT_FORMULA*/); + SetHelpId(ED_FORMULA, HID_EDIT_FORMULA); BOOL bHC = GetSettings().GetStyleSettings().GetHighContrastMode(); SetItemImage( FN_FORMULA_CALC, pManager->GetImage(FN_FORMULA_CALC, bHC )); diff --git a/sw/source/ui/ribbar/inputwin.src b/sw/source/ui/ribbar/inputwin.src index 13d5fcdd0eae..5686fd7ae6c2 100644 --- a/sw/source/ui/ribbar/inputwin.src +++ b/sw/source/ui/ribbar/inputwin.src @@ -44,7 +44,7 @@ ToolBox RID_TBX_FORMULA ToolBoxItem { Identifier = FN_FORMULA_CALC ; - HelpID = FN_FORMULA_CALC ; + HelpId = HID_TBX_FORMULA_CALC ; DropDown = TRUE ; Text [ en-US ] = "Formula" ; /* ### ACHTUNG: Neuer Text in Resource? Formel auswählen : Formel auswõhlen */ @@ -52,14 +52,14 @@ ToolBox RID_TBX_FORMULA ToolBoxItem { Identifier = FN_FORMULA_CANCEL ; - HelpID = FN_FORMULA_CANCEL ; + HelpId = HID_TBX_FORMULA_CANCEL ; Text [ en-US ] = "Cancel" ; /* ### ACHTUNG: Neuer Text in Resource? Formel nicht übenehmen : Formel nicht ³benehmen */ }; ToolBoxItem { Identifier = FN_FORMULA_APPLY ; - HelpID = FN_FORMULA_APPLY ; + HelpId = HID_TBX_FORMULA_APPLY ; /* ### ACHTUNG: Neuer Text in Resource? Übernehmen : šbernehmen */ Text [ en-US ] = "Apply" ; /* ### ACHTUNG: Neuer Text in Resource? Formel einfügen : Formel einf³gen */ @@ -287,21 +287,21 @@ String STR_TBL_FORMULA ToolBoxItem\ {\ Identifier = FN_FORMULA_CALC ; \ - HelpID = FN_FORMULA_CALC ; \ + HelpID = HID_TBX_FORMULA_CALC ; \ Text [ en-US ] = "Formula" ; \ /* ### ACHTUNG: Neuer Text in Resource? Formel auswählen : Formel auswõhlen */\ };\ ToolBoxItem\ {\ Identifier = FN_FORMULA_CANCEL ; \ - HelpID = FN_FORMULA_CANCEL ; \ + HelpId = HID_TBX_FORMULA_CANCEL ; \ Text [ en-US ] = "Cancel" ; \ /* ### ACHTUNG: Neuer Text in Resource? Formel nicht übenehmen : Formel nicht ³benehmen */\ };\ ToolBoxItem\ {\ Identifier = FN_FORMULA_APPLY ; \ - HelpID = FN_FORMULA_APPLY ; \ + HelpID = HID_TBX_FORMULA_APPLY ; \ /* ### ACHTUNG: Neuer Text in Resource? Übernehmen : šbernehmen */\ Text [ en-US ] = "Apply" ; \ /* ### ACHTUNG: Neuer Text in Resource? Formel einfügen : Formel einf³gen */\ diff --git a/sw/source/ui/ribbar/makefile.mk b/sw/source/ui/ribbar/makefile.mk index 72acc793070a..3a9edfee238b 100644 --- a/sw/source/ui/ribbar/makefile.mk +++ b/sw/source/ui/ribbar/makefile.mk @@ -42,7 +42,6 @@ SRS1NAME=$(TARGET) SRC1FILES = \ tbxanchr.src \ inputwin.src \ - tblctrl.src \ workctrl.src SLOFILES = \ diff --git a/sw/source/ui/ribbar/tblctrl.src b/sw/source/ui/ribbar/tblctrl.src deleted file mode 100644 index 0c783172af74..000000000000 --- a/sw/source/ui/ribbar/tblctrl.src +++ /dev/null @@ -1,94 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "tblctrl.hrc" -#include "helpid.h" -#include "cmdid.h" -FloatingWindow RID_TBL_OPT_CTRL -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpID = HID_TBL_OPT_CTRL ; - ToolBox TBX_OPTIMIZE_TABLE - { - MenuStrings = TRUE ; - SVLook = TRUE ; - HelpID = 1 ; - ItemList = - { - ToolBoxItem - { - Identifier = FN_TABLE_BALANCE_CELLS ; - HelpID = FN_TABLE_BALANCE_CELLS ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_BALANCE_ROWS ; - HelpID = FN_TABLE_BALANCE_ROWS ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_OPTIMAL_HEIGHT ; - HelpID = FN_TABLE_OPTIMAL_HEIGHT ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_ADJUST_CELLS ; - HelpID = FN_TABLE_ADJUST_CELLS ; - }; - }; - }; - Text [ en-US ] = "Optimize" ; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index aaa5b19b1f4e..cf7f4b15a33a 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -454,7 +454,7 @@ static USHORT __READONLY_DATA aNavigationInsertIds[ NAVI_ENTRIES ] = NID_TABLE_FORMULA_ERROR, NID_NEXT }; -static USHORT __READONLY_DATA aNavigationHelpIds[ NAVI_ENTRIES ] = +static const char* __READONLY_DATA aNavigationHelpIds[ NAVI_ENTRIES ] = { // -- first line HID_NID_TBL, @@ -492,8 +492,7 @@ SwScrollNaviPopup::SwScrollNaviPopup( USHORT nId, const Reference< XFrame >& rFr { USHORT i; - // FIXME: HELPID - aToolBox.SetHelpId(""/*HID_NAVI_VS*/); + aToolBox.SetHelpId(HID_NAVI_VS); aToolBox.SetLineCount( 2 ); aToolBox.SetOutStyle(TOOLBOX_STYLE_FLAT); for( i = 0; i < NID_COUNT; i++) @@ -509,8 +508,7 @@ SwScrollNaviPopup::SwScrollNaviPopup( USHORT nId, const Reference< XFrame >& rFr nTbxBits = TIB_CHECKABLE; } aToolBox.InsertItem(nNaviId, sText, nTbxBits); - // FIXME: HELPID - aToolBox.SetHelpId( nNaviId, ""/*aNavigationHelpIds[i]*/ ); + aToolBox.SetHelpId( nNaviId, aNavigationHelpIds[i] ); } ApplyImageList(); aToolBox.InsertBreak(NID_COUNT/2); diff --git a/sw/source/ui/ribbar/workctrl.src b/sw/source/ui/ribbar/workctrl.src index 93681f526502..4fff5c4a9260 100644 --- a/sw/source/ui/ribbar/workctrl.src +++ b/sw/source/ui/ribbar/workctrl.src @@ -32,138 +32,9 @@ #include #endif #include "workctrl.hrc" -#include "workctrl.hrc" #include "helpid.h" #include "cmdid.h" -FloatingWindow RID_INSERT_CTRL -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpID = HID_INSERT_CTRL ; - /* ### ACHTUNG: Neuer Text in Resource? Einfügen : Einf³gen */ - ToolBox TBX_INSERT - { - MenuStrings = TRUE ; - SVLook = TRUE ; - HelpID = 1 ; - ItemList = - { - ToolBoxItem - { - Identifier = FN_INSERT_FRAME_INTERACT_NOCOL ; - HelpID = FN_INSERT_FRAME_INTERACT_NOCOL ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_FRAME_INTERACT ; - HelpID = FN_INSERT_FRAME_INTERACT ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_GRAPHIC ; - HelpID = SID_INSERT_GRAPHIC ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_TABLE ; - HelpID = FN_INSERT_TABLE ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_INSERTDOC ; - HelpID = SID_INSERTDOC ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_FOOTNOTE ; - HelpID = FN_INSERT_FOOTNOTE ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_ENDNOTE ; - HelpID = FN_INSERT_ENDNOTE ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_SYMBOL ; - HelpID = FN_INSERT_SYMBOL ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_REGION ; - HelpID = FN_INSERT_REGION; - DropDown = TRUE ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_IDX_ENTRY_DLG ; - HelpID = FN_INSERT_IDX_ENTRY_DLG ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_BOOKMARK ; - HelpID = FN_INSERT_BOOKMARK ; - RadioCheck = TRUE ; - }; - }; - }; - Text [ en-US ] = "Insert" ; -}; -FloatingWindow RID_INSERT_OBJ_CTRL -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpID = HID_INSERT_OBJ_CTRL ; - /* ### ACHTUNG: Neuer Text in Resource? Objekt einfügen : Objekt einf³gen */ - ToolBox TBX_OBJ_INSERT - { - MenuStrings = TRUE ; - SVLook = TRUE ; - HelpID = 1 ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_INSERT_DIAGRAM ; - HelpID = SID_INSERT_DIAGRAM ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_SMA ; - HelpID = FN_INSERT_SMA ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_FLOATINGFRAME ; - HelpID = SID_INSERT_FLOATINGFRAME ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_OBJECT ; - HelpID = SID_INSERT_OBJECT ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_PLUGIN ; - HelpID = SID_INSERT_PLUGIN ; - }; -#ifdef SOLAR_JAVA - ToolBoxItem - { - Identifier = SID_INSERT_APPLET ; - HelpID = SID_INSERT_APPLET ; - }; -#endif - }; - }; - Text [ en-US ] = "Insert Object" ; -}; + Menu RID_INSERT_FIELD_CTRL { ItemList = @@ -171,45 +42,45 @@ Menu RID_INSERT_FIELD_CTRL MenuItem { Identifier = FN_INSERT_FLD_DATE ; - HelpID = FN_INSERT_FLD_DATE ; + HelpId = CMD_FN_INSERT_FLD_DATE ; Text [ en-US ] = "Date" ; }; MenuItem { Identifier = FN_INSERT_FLD_TIME ; - HelpID = FN_INSERT_FLD_TIME ; + HelpId = CMD_FN_INSERT_FLD_TIME ; Text [ en-US ] = "Time" ; }; //#ifndef MN_SW_WEB MenuItem { Identifier = FN_INSERT_FLD_PGNUMBER ; - HelpID = FN_INSERT_FLD_PGNUMBER ; + HelpId = CMD_FN_INSERT_FLD_PGNUMBER ; Text [ en-US ] = "Page Number" ; }; MenuItem { Identifier = FN_INSERT_FLD_PGCOUNT ; - HelpID = FN_INSERT_FLD_PGCOUNT ; + HelpId = CMD_FN_INSERT_FLD_PGCOUNT ; Text [ en-US ] = "Page Count" ; }; MenuItem { Identifier = FN_INSERT_FLD_TOPIC ; - HelpID = FN_INSERT_FLD_TOPIC ; + HelpId = CMD_FN_INSERT_FLD_TOPIC ; Text [ en-US ] = "Subject" ; }; MenuItem { Identifier = FN_INSERT_FLD_TITLE ; - HelpID = FN_INSERT_FLD_TITLE ; + HelpId = CMD_FN_INSERT_FLD_TITLE ; Text [ en-US ] = "Title" ; }; //#endif MenuItem { Identifier = FN_INSERT_FLD_AUTHOR ; - HelpID = FN_INSERT_FLD_AUTHOR ; + HelpId = CMD_FN_INSERT_FLD_AUTHOR ; Text [ en-US ] = "Author" ; }; MenuItem @@ -219,7 +90,7 @@ Menu RID_INSERT_FIELD_CTRL MenuItem { Identifier = FN_INSERT_FIELD ; - HelpID = FN_INSERT_FIELD ; + HelpId = CMD_FN_INSERT_FIELD ; Text [ en-US ] = "Other..." ; }; }; diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src index 7e9a20bb6fc0..8e6527206d77 100644 --- a/sw/source/ui/shells/shells.src +++ b/sw/source/ui/shells/shells.src @@ -156,880 +156,46 @@ String RID_TEXT_TOOLBOX Text [ en-US ] = "Text Object Bar" ; Text [ x-comment ] = " "; }; -ToolBox RID_TEXT_TOOLBOX -{ - HelpID = HID_TEXT_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - HideWhenDeactivate = TRUE ; - LineSpacing = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - ItemList = - { - MN_TEMPLATE - MN_FONT - MN_TEXT1(TRUE) - MN_TEXT1_BLOCK - MN_TEXT_LTR_RTL - MN_TEXT_LINESPACE - MN_TEXT2 - MN_TEXT_BACKGROUND - MN_TEXT_DIALOGS(TRUE) - }; - Scroll = TRUE ; -}; String RID_TABLE_TOOLBOX { Text [ en-US ] = "Table Object Bar" ; Text [ x-comment ] = " "; }; -ToolBox RID_TABLE_TOOLBOX -{ - HelpID = HID_TABLE_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - Scroll = TRUE ; - ItemList = - { - MN_TEMPLATE - MN_FONT - ToolBoxItem - { - Identifier = FN_TABLE_AUTOSUM ; - HelpID = FN_TABLE_AUTOSUM ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_MODE_FIX ; - HelpID = FN_TABLE_MODE_FIX ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_MODE_FIX_PROP ; - HelpID = FN_TABLE_MODE_FIX_PROP ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_MODE_VARIABLE ; - HelpID = FN_TABLE_MODE_VARIABLE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_MERGE_CELLS ; - HelpID = FN_TABLE_MERGE_CELLS ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_SPLIT_CELLS ; - HelpID = FN_TABLE_SPLIT_CELLS ; - }; - ToolBoxItem - { - DropDown = TRUE ; - Identifier = FN_OPTIMIZE_TABLE ; - HelpID = FN_OPTIMIZE_TABLE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_INSERT_ROW ; - HelpID = FN_TABLE_INSERT_ROW ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_INSERT_COL ; - HelpID = FN_TABLE_INSERT_COL ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_DELETE_ROW ; - HelpID = FN_TABLE_DELETE_ROW ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_DELETE_COL ; - HelpID = FN_TABLE_DELETE_COL ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_SELECT_ALL; - HelpID = FN_TABLE_SELECT_ALL; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_TABLE_SELECT_COL; - HelpID = FN_TABLE_SELECT_COL; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_TABLE_SELECT_ROW; - HelpID = FN_TABLE_SELECT_ROW; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_TABLE_VERT_NONE; - HelpID = FN_TABLE_VERT_NONE; - RadioCheck = TRUE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_TABLE_VERT_CENTER; - HelpID = FN_TABLE_VERT_CENTER; - RadioCheck = TRUE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_TABLE_VERT_BOTTOM; - HelpID = FN_TABLE_VERT_BOTTOM; - RadioCheck = TRUE; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - ITEM_TOOLBAR_ATTR_BORDER - }; - ToolBoxItem - { - ITEM_TOOLBAR_FRAME_LINESTYLE - }; - ToolBoxItem - { - ITEM_TOOLBAR_FRAME_LINECOLOR - Hide = TRUE; - }; - ToolBoxItem - { - ITEM_TOOLBAR_BACKGROUND_COLOR - }; - }; -}; String RID_FRAME_TOOLBOX { Text [ en-US ] = "Frame Object Bar" ; Text [ x-comment ] = " "; }; -ToolBox RID_FRAME_TOOLBOX -{ - HelpID = HID_FRAME_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - MenuStrings = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - Hide = TRUE ; - ItemList = - { - MN_TEMPLATE - MN_FRAME_WRAP - MN_FRAME1 - MN_FRAME2 - MN_FRAME3 - MN_LINESTYLE - MN_BACKGROUND_COLOR - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_ATTRIBUTES_FRAME - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_LAYER - ToolBoxItem - { - Identifier = FN_TOOL_ANKER ; - HelpID = FN_TOOL_ANKER ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_FRAME_CHAIN ; - HelpID = FN_FRAME_CHAIN ; - }; - ToolBoxItem - { - Identifier = FN_FRAME_UNCHAIN ; - HelpID = FN_FRAME_UNCHAIN ; - }; - }; - Scroll = TRUE ; -}; String RID_GRAFIK_TOOLBOX { Text [ en-US ] = "Graphics Object Bar" ; Text [ x-comment ] = " "; }; -ToolBox RID_GRAFIK_TOOLBOX -{ - HelpID = HID_GRAFIK_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - MenuStrings = TRUE ; - Customize = TRUE ; - Hide = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_GRFFILTER; - HelpID = SID_GRFFILTER; - DropDown = TRUE ; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_MODE; - HelpID = SID_ATTR_GRAF_MODE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_RED; - HelpID = SID_ATTR_GRAF_RED; - }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_GREEN; - HelpID = SID_ATTR_GRAF_GREEN; - }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_BLUE; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_LUMINANCE; - HelpID = SID_ATTR_GRAF_LUMINANCE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_CONTRAST; - HelpID = SID_ATTR_GRAF_CONTRAST; - }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_GAMMA; - HelpID = SID_ATTR_GRAF_GAMMA; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_TRANSPARENCE; - HelpID = SID_ATTR_GRAF_TRANSPARENCE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = FN_FLIP_VERT_GRAFIC ; - HelpID = FN_FLIP_VERT_GRAFIC ; - }; - ToolBoxItem - { - Identifier = FN_FLIP_HORZ_GRAFIC ; - HelpID = FN_FLIP_HORZ_GRAFIC ; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_ATTRIBUTES_GRAFIK - }; - Scroll = TRUE ; -}; String RID_OLE_TOOLBOX { Text [ en-US ] = "Object" ; Text [ x-comment ] = " "; }; -ToolBox RID_OLE_TOOLBOX -{ - HelpID = HID_OLE_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - Scroll = TRUE ; - ItemList = - { - MN_TEMPLATE - MN_FRAME_WRAP - MN_CONTOUR - MN_FRAME1 - MN_FRAME2 - MN_FRAME3 - MN_LINESTYLE - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_ATTRIBUTES_OLE - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_LAYER - ToolBoxItem - { - Identifier = FN_TOOL_ANKER ; - HelpID = FN_TOOL_ANKER ; - DropDown = TRUE ; - }; - }; -}; String RID_DRAW_TOOLBOX { Text [ en-US ] = "Draw Object Bar" ; Text [ x-comment ] = " "; }; -ToolBox RID_DRAW_TOOLBOX -{ - HelpID = HID_DRAW_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_BEZIER_EDIT ; - HelpID = SID_BEZIER_EDIT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_LINE ; - HelpID = SID_ATTRIBUTES_LINE ; - }; - ToolBoxItem - { - ITEM_TOOLBAR_ATTR_LINEEND_STYLE - }; - ToolBoxItem - { - ITEM_TOOLBAR_ATTR_LINE_STYLE - }; - ToolBoxItem - { - ITEM_TOOLBAR_ATTR_LINE_WIDTH - }; - ToolBoxItem - { - ITEM_TOOLBAR_ATTR_LINE_COLOR - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_AREA ; - HelpID = SID_ATTRIBUTES_AREA ; - }; - ToolBoxItem - { - ITEM_TOOLBAR_ATTR_FILL_STYLE - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - ITEM_TOOLBAR_OBJECT_ROTATE - }; - ToolBoxItem - { - Identifier = FN_TOOL_ANKER ; - HelpID = FN_TOOL_ANKER ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_FRAME_NOWRAP ; - HelpID = FN_FRAME_NOWRAP ; - RadioCheck = TRUE ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_FRAME_WRAP ; - HelpID = FN_FRAME_WRAP ; - RadioCheck = TRUE ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_FRAME_WRAP_IDEAL ; - HelpID = FN_FRAME_WRAP_IDEAL ; - RadioCheck = TRUE ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_FRAME_WRAP_LEFT ; - HelpID = FN_FRAME_WRAP_LEFT ; - RadioCheck = TRUE ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_FRAME_WRAP_RIGHT ; - HelpID = FN_FRAME_WRAP_RIGHT ; - RadioCheck = TRUE ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_FRAME_WRAPTHRU ; - HelpID = FN_FRAME_WRAPTHRU ; - RadioCheck = TRUE ; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_FRAME_WRAP_CONTOUR ; - HelpID = FN_FRAME_WRAP_CONTOUR ; - Hide = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HEAVEN ; - HelpID = SID_OBJECT_HEAVEN ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HELL ; - HelpID = SID_OBJECT_HELL ; - }; - MN_LAYER - MN_GRID( HIDE=TRUE ) - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN ; - HelpID = SID_OBJECT_ALIGN ; - DropDown = TRUE ; - }; - }; - Scroll = TRUE ; -}; String RID_BEZIER_TOOLBOX { Text [ en-US ] = "Bézier Object Bar" ; Text [ x-comment ] = " "; }; -ToolBox RID_BEZIER_TOOLBOX -{ - HelpID = HID_BEZIER_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_BEZIER_EDIT ; - HelpID = SID_BEZIER_EDIT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_MOVE ; - HelpID = SID_BEZIER_MOVE ; - RadioCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_INSERT ; - HelpID = SID_BEZIER_INSERT ; - RadioCheck = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_DELETE ; - HelpID = SID_BEZIER_DELETE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_CUTLINE ; - HelpID = SID_BEZIER_CUTLINE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_CONVERT ; - HelpID = SID_BEZIER_CONVERT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_EDGE ; - HelpID = SID_BEZIER_EDGE ; - RadioCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_SMOOTH ; - HelpID = SID_BEZIER_SMOOTH ; - RadioCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_SYMMTR ; - HelpID = SID_BEZIER_SYMMTR ; - RadioCheck = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_CLOSE ; - HelpID = SID_BEZIER_CLOSE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_ELIMINATE_POINTS ; - HelpID = SID_BEZIER_ELIMINATE_POINTS ; - }; - }; - Scroll = TRUE ; -}; String RID_DRAW_TEXT_TOOLBOX { Text [ en-US ] = "Text Object Bar/Graphics" ; Text [ x-comment ] = " "; }; -ToolBox RID_DRAW_TEXT_TOOLBOX -{ - HelpID = HID_DRAW_TEXT_TOOLBOX ; - Border = TRUE ; - Customize = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - ItemList = - { - MN_FONT - MN_TEXT1(FALSE) - MN_TEXT1_BLOCK - MN_TEXT_LINESPACE - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - ITEM_TOOLBAR_ATTR_CHAR_COLOR - Hide = TRUE; - }; - MN_TEXT_LTR_RTL - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - }; - - MN_TEXT_DIALOGS(FALSE) - }; - ItemList[ ar ] = - { - MN_FONT - MN_TEXT1_RTL(FALSE) - MN_TEXT1_BLOCK - MN_TEXT_LINESPACE - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - ITEM_TOOLBAR_ATTR_CHAR_COLOR - Hide = TRUE; - }; - MN_TEXT_RTL_LTR - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - }; - - MN_TEXT_DIALOGS(FALSE) - }; - ItemList[ he ] = - { - MN_FONT - MN_TEXT1_RTL(FALSE) - MN_TEXT1_BLOCK - MN_TEXT_LINESPACE - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - ITEM_TOOLBAR_ATTR_CHAR_COLOR - Hide = TRUE; - }; - MN_TEXT_RTL_LTR - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - }; - - MN_TEXT_DIALOGS(FALSE) - }; - Scroll = TRUE ; -}; String RID_NUM_TOOLBOX { Text [ en-US ] = "Numbering Object Bar" ; Text [ x-comment ] = " "; }; -ToolBox RID_NUM_TOOLBOX -{ - HelpID = HID_NUM_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - ItemList = - { - MN_TEMPLATE - MN_FONT - ToolBoxItem - { - Identifier = FN_NUM_BULLET_OFF ; - HelpID = FN_NUM_BULLET_OFF ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_NUM_BULLET_UP ; - HelpID = FN_NUM_BULLET_UP ; - }; - ToolBoxItem - { - Identifier = FN_NUM_BULLET_DOWN ; - HelpID = FN_NUM_BULLET_DOWN ; - }; - ToolBoxItem - { - Identifier = FN_NUM_BULLET_OUTLINE_UP ; - HelpID = FN_NUM_BULLET_OUTLINE_UP ; - }; - ToolBoxItem - { - Identifier = FN_NUM_BULLET_OUTLINE_DOWN ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_NUM_BULLET_NONUM ; - HelpID = FN_NUM_BULLET_NONUM ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_NUM_BULLET_MOVEUP ; - HelpID = FN_NUM_BULLET_MOVEUP ; - }; - ToolBoxItem - { - Identifier = FN_NUM_BULLET_MOVEDOWN ; - HelpID = FN_NUM_BULLET_MOVEDOWN ; - }; - ToolBoxItem - { - Identifier = FN_NUM_BULLET_OUTLINE_MOVEUP ; - HelpID = FN_NUM_BULLET_OUTLINE_MOVEUP ; - }; - ToolBoxItem - { - Identifier = FN_NUM_BULLET_OUTLINE_MOVEDOWN ; - HelpID = FN_NUM_BULLET_OUTLINE_MOVEDOWN ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_NUMBER_NEWSTART ; - HelpID = FN_NUMBER_NEWSTART ; - }; - ToolBoxItem - { - Identifier = FN_NUMBER_BULLETS ; - HelpID = FN_NUMBER_BULLETS ; - }; - }; - Scroll = TRUE ; -}; String STR_SHELLNAME_TEXT { Text [ en-US ] = "Text" ; diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 5f3389791122..f87bc0d41208 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -961,10 +961,11 @@ void SwTableShell::Execute(SfxRequest &rReq) case FN_TABLE_INSERT_COL_DLG: case FN_TABLE_INSERT_ROW_DLG: { + const SfxSlot* pSlot = GetStaticInterface()->GetSlot(nSlot); if ( FN_TABLE_INSERT_ROW_DLG != nSlot || !rSh.IsInRepeatedHeadline()) { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ::std::auto_ptr pDlg( pFact ? pFact->CreateSvxInsRowColDlg( GetView().GetWindow(), nSlot == FN_TABLE_INSERT_COL_DLG, nSlot) : 0); + ::std::auto_ptr pDlg( pFact ? pFact->CreateSvxInsRowColDlg( GetView().GetWindow(), nSlot == FN_TABLE_INSERT_COL_DLG, pSlot->GetCommand() ) : 0); if( pDlg.get() && (pDlg->Execute() == 1) ) { diff --git a/sw/source/ui/shells/textsh1.cxx b/sw/source/ui/shells/textsh1.cxx index f1ca35df298a..3f63462f129d 100644 --- a/sw/source/ui/shells/textsh1.cxx +++ b/sw/source/ui/shells/textsh1.cxx @@ -124,7 +124,7 @@ #include #include #include - +#include #include using namespace ::com::sun::star; @@ -274,14 +274,11 @@ short lcl_AskRedlineMode(Window *pWin) BUTTONDIALOG_FOCUSBUTTON; aQBox.AddButton(String(SW_RES(STR_REDLINE_ACCEPT_ALL)), RET_OK, nBtnFlags); - // FIXME: HELPID - aQBox.GetPushButton( RET_OK )->SetHelpId(""/*HID_AUTOFORMAT_ACCEPT*/); + aQBox.GetPushButton( RET_OK )->SetHelpId(HID_AUTOFORMAT_ACCEPT); aQBox.AddButton(String(SW_RES(STR_REDLINE_REJECT_ALL)), RET_CANCEL, BUTTONDIALOG_CANCELBUTTON); - // FIXME: HELPID - aQBox.GetPushButton( RET_CANCEL )->SetHelpId(""/*HID_AUTOFORMAT_REJECT*/ ); + aQBox.GetPushButton( RET_CANCEL )->SetHelpId(HID_AUTOFORMAT_REJECT ); aQBox.AddButton(String(SW_RES(STR_REDLINE_EDIT)), 2, 0); - // FIXME: HELPID - aQBox.GetPushButton( 2 )->SetHelpId(""/*HID_AUTOFORMAT_EDIT_CHG*/); + aQBox.GetPushButton( 2 )->SetHelpId(HID_AUTOFORMAT_EDIT_CHG); aQBox.SetButtonHelpText( RET_OK, aEmptyStr ); return aQBox.Execute(); @@ -441,7 +438,7 @@ void SwTextShell::Execute(SfxRequest &rReq) AbstractInsFootNoteDlg* pDlg = pFact->CreateInsFootNoteDlg( DLG_INS_FOOTNOTE, GetView().GetWindow(), rWrtSh, FALSE ); DBG_ASSERT(pDlg, "Dialogdiet fail!"); - pDlg->SetHelpId(nSlot); + pDlg->SetHelpId(GetStaticInterface()->GetSlot(nSlot)->GetCommand()); if ( pDlg->Execute() == RET_OK ) { USHORT nId = pDlg->IsEndNote() ? FN_INSERT_ENDNOTE : FN_INSERT_FOOTNOTE; diff --git a/sw/source/ui/table/colwd.src b/sw/source/ui/table/colwd.src index aa1cf468867f..c7be192823f3 100644 --- a/sw/source/ui/table/colwd.src +++ b/sw/source/ui/table/colwd.src @@ -32,7 +32,7 @@ // #define DLG_COL_WIDTH 256 ModalDialog DLG_COL_WIDTH { - HelpID = FN_TABLE_SET_COL_WIDTH ; + HelpID = CMD_FN_TABLE_SET_COL_WIDTH ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 159 , 60 ) ; diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src index e2ff4ed1c2e3..9dfffff2280a 100644 --- a/sw/source/ui/table/convert.src +++ b/sw/source/ui/table/convert.src @@ -31,7 +31,7 @@ #include "helpid.h" ModalDialog DLG_CONV_TEXT_TABLE { - HelpID = FN_CONVERT_TEXT_TABLE ; + HelpID = CMD_FN_CONVERT_TEXT_TABLE ; OUTPUTSIZE = TRUE ; Size = MAP_APPFONT ( 203 , 169 ) ; Text [ en-US ] = "Convert Table to Text" ; diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src index e5f83f2a1ee3..55bb287a1331 100644 --- a/sw/source/ui/table/instable.src +++ b/sw/source/ui/table/instable.src @@ -32,7 +32,7 @@ // #define DLG_INSERT_TABLE 256 ModalDialog DLG_INSERT_TABLE { - HelpID = FN_INSERT_TABLE ; + HelpID = CMD_FN_INSERT_TABLE ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 280 , 166 ) ; diff --git a/sw/source/ui/table/mergetbl.src b/sw/source/ui/table/mergetbl.src index 81ea30f9b003..8f75736cf6b2 100644 --- a/sw/source/ui/table/mergetbl.src +++ b/sw/source/ui/table/mergetbl.src @@ -31,7 +31,7 @@ #include "helpid.h" ModalDialog DLG_MERGE_TABLE { - HelpID = FN_TABLE_MERGE_TABLE ; + HelpID = CMD_FN_TABLE_MERGE_TABLE ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 207 , 57 ) ; diff --git a/sw/source/ui/table/rowht.src b/sw/source/ui/table/rowht.src index 71a616bef045..f365bf042337 100644 --- a/sw/source/ui/table/rowht.src +++ b/sw/source/ui/table/rowht.src @@ -31,7 +31,7 @@ #include "helpid.h" ModalDialog DLG_ROW_HEIGHT { - HelpID = FN_TABLE_SET_ROW_HEIGHT ; + HelpID = CMD_FN_TABLE_SET_ROW_HEIGHT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 157 , 60 ) ; diff --git a/sw/source/ui/table/splittbl.src b/sw/source/ui/table/splittbl.src index 879d4528d7de..790675ed8ad0 100644 --- a/sw/source/ui/table/splittbl.src +++ b/sw/source/ui/table/splittbl.src @@ -31,7 +31,7 @@ #include "helpid.h" ModalDialog DLG_SPLIT_TABLE { - HelpID = FN_TABLE_SPLIT_TABLE ; + HelpID = CMD_FN_TABLE_SPLIT_TABLE ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 207 , 76 ) ; diff --git a/sw/source/ui/uiview/pview.cxx b/sw/source/ui/uiview/pview.cxx index d328c0e10bbd..452fac6bb302 100644 --- a/sw/source/ui/uiview/pview.cxx +++ b/sw/source/ui/uiview/pview.cxx @@ -728,8 +728,7 @@ SwPagePreViewWin::SwPagePreViewWin( Window *pParent, SwPagePreView& rPView ) maPaintedPreviewDocRect( Rectangle(0,0,0,0) ) { SetOutDevViewType( OUTDEV_VIEWTYPE_PRINTPREVIEW ); //#106611# - // FIXME: HELPID - SetHelpId(""/*HID_PAGEPREVIEW*/); + SetHelpId(HID_PAGEPREVIEW); SetFillColor( GetBackground().GetColor() ); SetLineColor( GetBackground().GetColor()); SetMapMode( MapMode(MAP_TWIP) ); @@ -1938,11 +1937,9 @@ int SwPagePreView::_CreateScrollbar( BOOL bHori ) { pPageUpBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEUP ) ); - // FIXME: HELPID - pPageUpBtn->SetHelpId(""/*FN_PAGEUP*/); + pPageUpBtn->SetHelpId(GetStaticInterface()->GetSlot(FN_PAGEUP)->GetCommand()); pPageDownBtn = new ImageButton(pMDI, SW_RES( BTN_PAGEDOWN ) ); - // FIXME: HELPID - pPageDownBtn->SetHelpId(""/*FN_PAGEDOWN*/); + pPageDownBtn->SetHelpId(GetStaticInterface()->GetSlot(FN_PAGEDOWN)->GetCommand()); Link aLk( LINK( this, SwPagePreView, BtnPage ) ); pPageUpBtn->SetClickHdl( aLk ); pPageDownBtn->SetClickHdl( aLk ); diff --git a/sw/source/ui/uiview/pview.src b/sw/source/ui/uiview/pview.src index 53f672dbdb60..f38c0557df0b 100644 --- a/sw/source/ui/uiview/pview.src +++ b/sw/source/ui/uiview/pview.src @@ -371,94 +371,6 @@ String RID_PVIEW_TOOLBOX { Text [ en-US ] = "Page Preview" ; }; -ToolBox RID_PVIEW_TOOLBOX -{ - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - HelpID = HID_PVIEW_TOOLBOX ; - ItemList = - { - ToolBoxItem - { - Identifier = FN_PAGEUP ; - HelpID = FN_PAGEUP ; - }; - ToolBoxItem - { - Identifier = FN_PAGEDOWN ; - HelpID = FN_PAGEDOWN ; - }; - ToolBoxItem - { - Identifier = FN_START_OF_DOCUMENT ; - HelpID = FN_START_OF_DOCUMENT ; - }; - ToolBoxItem - { - Identifier = FN_END_OF_DOCUMENT ; - HelpID = FN_END_OF_DOCUMENT ; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = FN_SHOW_TWO_PAGES ; - HelpID = FN_SHOW_TWO_PAGES ; - }; - ToolBoxItem - { - Identifier = FN_SHOW_MULTIPLE_PAGES ; - HelpID = FN_SHOW_MULTIPLE_PAGES ; - DropDown = TRUE; - }; - ToolBoxItem - { - Identifier = FN_SHOW_BOOKVIEW ; - HelpID = FN_SHOW_BOOKVIEW ; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ZOOM_OUT; - HelpID = SID_ZOOM_OUT ; - }; - ToolBoxItem - { - Identifier = SID_ZOOM_IN; - HelpID = SID_ZOOM_IN ; - }; - ToolBoxItem - { - Identifier = FN_PREVIEW_ZOOM; - HelpID = HID_PREVIEW_ZOOM ; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_WIN_FULLSCREEN ; - HelpID = SID_WIN_FULLSCREEN ; - }; - ToolBoxItem - { - Identifier = FN_PRINT_PAGEPREVIEW ; - HelpID = FN_PRINT_PAGEPREVIEW ; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = FN_CLOSE_PAGEPREVIEW; - HelpID = SID_PRINTPREVIEW; - }; - }; - Scroll = TRUE ; -}; diff --git a/sw/source/ui/uiview/view.src b/sw/source/ui/uiview/view.src index 7c47fe6ef208..11543c0ac8f3 100644 --- a/sw/source/ui/uiview/view.src +++ b/sw/source/ui/uiview/view.src @@ -196,160 +196,6 @@ String MN_SRCVIEW_POPUPMENU Text [ en-US ] = "HTML source" ; }; -ToolBox RID_TOOLS_TOOLBOX -{ - HelpID = HID_TOOLS_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Scroll = TRUE ; - Align = BOXALIGN_LEFT ; - Hide = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = FN_INSERT_CTRL ; - HelpID = HID_INSERT_CTRL ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_FIELD_CTRL ; - HelpID = HID_INSERT_FIELD_CTRL ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_OBJ_CTRL ; - HelpID = HID_INSERT_OBJ_CTRL ; - DropDown = TRUE ; - }; - ToolBoxItem - { - ITEM_TOOLBAR_INSERT_DRAW - }; - ToolBoxItem - { - ITEM_FORM_CONFIG - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_GLOSSARY_DLG ; - HelpID = FN_GLOSSARY_DLG ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_CAPTION; - HelpID = FN_INSERT_CAPTION ; - Hide = TRUE ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_IDX_ENTRY_DLG; - HelpId = FN_INSERT_IDX_ENTRY_DLG; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_INSERT_REF_FIELD; - HelpID = FN_INSERT_REF_FIELD ; - Hide = TRUE ; - }; - ToolBoxItem - { - Identifier = FN_SHADOWCURSOR ; - HelpID = FN_SHADOWCURSOR ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_SPELL_GRAMMAR_DIALOG; - HelpID = FN_SPELL_GRAMMAR_DIALOG; - }; - ToolBoxItem - { - ITEM_TOOLBAR_AUTOSPELL_CHECK - }; - ToolBoxItem - { - Identifier = FN_HYPHENATE_OPT_DLG; - HelpID = FN_HYPHENATE_OPT_DLG; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_THESAURUS_DLG; - HelpID = FN_THESAURUS_DLG; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_SEARCH_DLG ; - HelpID = SID_SEARCH_DLG ; - }; - ToolBoxItem - { - Identifier = SID_VIEW_DATA_SOURCE_BROWSER ; - HelpID = SID_VIEW_DATA_SOURCE_BROWSER ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_ZOOM; - HelpID = SID_ATTR_ZOOM ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_VIEW_META_CHARS ; - HelpID = FN_VIEW_META_CHARS ; - }; - ToolBoxItem - { - Identifier = FN_VIEW_FIELDNAME ; - HelpID = FN_VIEW_FIELDNAME ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_VIEW_GRAPHIC ; - HelpID = FN_VIEW_GRAPHIC ; - }; - ToolBoxItem - { - Identifier = SID_BROWSER_MODE ; - HelpID = SID_BROWSER_MODE ; - }; - }; -}; Menu MN_SRCVIEW_POPUPMENU { ItemList = diff --git a/sw/source/ui/uiview/viewdlg2.cxx b/sw/source/ui/uiview/viewdlg2.cxx index bbff2271e9fa..a6a64078840d 100644 --- a/sw/source/ui/uiview/viewdlg2.cxx +++ b/sw/source/ui/uiview/viewdlg2.cxx @@ -31,7 +31,7 @@ #include #include - +#include #include #include @@ -92,7 +92,7 @@ void SwView::ExecDlgExt(SfxRequest &rReq) pMDI, *pWrtShell, TRUE ); DBG_ASSERT(pDlg, "Dialogdiet fail!"); - pDlg->SetHelpId(FN_EDIT_FOOTNOTE); + pDlg->SetHelpId(GetStaticInterface()->GetSlot(FN_EDIT_FOOTNOTE)->GetCommand()); pDlg->SetText( SW_RESSTR(STR_EDIT_FOOTNOTE) ); pDlg->Execute(); delete pDlg; diff --git a/sw/source/ui/uiview/viewmdi.cxx b/sw/source/ui/uiview/viewmdi.cxx index 2477107cdc2f..9dfa8e79ecfa 100644 --- a/sw/source/ui/uiview/viewmdi.cxx +++ b/sw/source/ui/uiview/viewmdi.cxx @@ -343,15 +343,12 @@ void SwView::CreatePageButtons(BOOL bShow) { Window *pMDI = &GetViewFrame()->GetWindow(); pPageUpBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEUP ), TRUE ); - // FIXME: HELPID - pPageUpBtn->SetHelpId(""/*HID_SCRL_PAGEUP*/); + pPageUpBtn->SetHelpId(HID_SCRL_PAGEUP); pPageDownBtn = new SwHlpImageButton(pMDI, SW_RES( BTN_PAGEDOWN ), FALSE ); - // FIXME: HELPID - pPageDownBtn->SetHelpId(""/*HID_SCRL_PAGEDOWN*/); + pPageDownBtn->SetHelpId(HID_SCRL_PAGEDOWN); Reference< XFrame > xFrame = GetViewFrame()->GetFrame().GetFrameInterface(); pNaviBtn = new SwNaviImageButton(pMDI, xFrame ); - // FIXME: HELPID - pNaviBtn->SetHelpId(""/*HID_SCRL_NAVI*/); + pNaviBtn->SetHelpId(HID_SCRL_NAVI); Link aLk( LINK( this, SwView, BtnPage ) ); pPageUpBtn->SetClickHdl( aLk ); pPageDownBtn->SetClickHdl( aLk ); diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index 4140a1414919..272e7033ceeb 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -800,16 +800,12 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c if ( ! ( rValue >>= sHelpURL ) ) throw IllegalArgumentException(); SwEditWin &rEditWin = pView->GetEditWin(); - // FIXME: HELPID - #if 0 OUString sPrefix = sHelpURL.copy ( 0, 4 ); // Make sure we have a valid string...should be in the format HID:12345 if ( ! sPrefix.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "HID:" ) ) ) throw IllegalArgumentException (); - OUString sNumber = sHelpURL.copy ( 4 ); - sal_uInt32 nHelpId = sNumber.toInt32(); - #endif - rEditWin.SetHelpId ( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) /*nHelpId*/ ); + OUString aID = sHelpURL.copy ( 4 ); + rEditWin.SetHelpId ( rtl::OUStringToOString( aID, RTL_TEXTENCODING_UTF8 ) ); } else throw UnknownPropertyException(); @@ -988,13 +984,8 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u { bBool = sal_False; OUStringBuffer sHelpURL; - // FIXME: HELPID - #if 0 sHelpURL.appendAscii ( "HID:" ); SwEditWin &rEditWin = pView->GetEditWin(); - sHelpURL.append ( static_cast < sal_Int32 > ( rEditWin.GetHelpId() ) ); - #endif - SwEditWin &rEditWin = pView->GetEditWin(); sHelpURL.append( rtl::OStringToOUString( rEditWin.GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); rValue <<= sHelpURL.makeStringAndClear(); } diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 2cad05667f03..0b0bca564f48 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -933,8 +933,7 @@ SwContentTree::SwContentTree(Window* pParent, const ResId& rResId) : { sal_uInt16 i; - // FIXME: HELPID - SetHelpId(""/*HID_NAVIGATOR_TREELIST*/); + SetHelpId(HID_NAVIGATOR_TREELIST); SetNodeDefaultImages(); SetDoubleClickHdl(LINK(this, SwContentTree, ContentDoubleClickHdl)); diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index c959e8572666..68385459b4bf 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -117,7 +117,7 @@ using ::rtl::OUString; #define GLBL_TABPOS_SUB 5 const SfxObjectShell* SwGlobalTree::pShowShell = 0; -static const USHORT __FAR_DATA aHelpForMenu[] = +static const char* __FAR_DATA aHelpForMenu[] = { 0, // HID_GLBLTREE_UPDATE, //CTX_UPDATE @@ -206,8 +206,7 @@ SwGlobalTree::SwGlobalTree(Window* pParent, const ResId& rResId) : { aContextStrings[i] = SW_RESSTR(i+ ST_GLOBAL_CONTEXT_FIRST); } - // FIXME: HELPID - SetHelpId(""/*HID_NAVIGATOR_GLOB_TREELIST*/); + SetHelpId(HID_NAVIGATOR_GLOB_TREELIST); SelectHdl(); SetDoubleClickHdl(LINK(this, SwGlobalTree, DoubleClickHdl)); EnableContextMenuHandling(); @@ -382,44 +381,34 @@ PopupMenu* SwGlobalTree::CreateContextMenu() for (USHORT i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++) { pSubPop2->InsertItem( i, aContextStrings[ST_UPDATE_SEL - ST_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] ); - // FIXME: HELPID - pSubPop2->SetHelpId(i, ""/*aHelpForMenu[i]*/); + pSubPop2->SetHelpId(i, aHelpForMenu[i]); } pSubPop2->EnableItem(CTX_UPDATE_SEL, 0 != (nEnableFlags & ENABLE_UPDATE_SEL)); pSubPop1->InsertItem(CTX_INSERT_ANY_INDEX, aContextStrings[ST_INDEX - ST_GLOBAL_CONTEXT_FIRST]); - // FIXME: HELPID - pSubPop1->SetHelpId(CTX_INSERT_ANY_INDEX, ""/*aHelpForMenu[CTX_INSERT_ANY_INDEX]*/); + pSubPop1->SetHelpId(CTX_INSERT_ANY_INDEX, aHelpForMenu[CTX_INSERT_ANY_INDEX]); pSubPop1->InsertItem(CTX_INSERT_FILE, aContextStrings[ST_FILE - ST_GLOBAL_CONTEXT_FIRST]); - // FIXME: HELPID - pSubPop1->SetHelpId(CTX_INSERT_FILE, ""/*aHelpForMenu[CTX_INSERT_FILE]*/); + pSubPop1->SetHelpId(CTX_INSERT_FILE, aHelpForMenu[CTX_INSERT_FILE]); pSubPop1->InsertItem(CTX_INSERT_NEW_FILE, aContextStrings[ST_NEW_FILE - ST_GLOBAL_CONTEXT_FIRST]); - // FIXME: HELPID - pSubPop1->SetHelpId(CTX_INSERT_NEW_FILE, ""/*aHelpForMenu[CTX_INSERT_NEW_FILE]*/); + pSubPop1->SetHelpId(CTX_INSERT_NEW_FILE, aHelpForMenu[CTX_INSERT_NEW_FILE]); pSubPop1->InsertItem(CTX_INSERT_TEXT, aContextStrings[ST_TEXT - ST_GLOBAL_CONTEXT_FIRST]); - // FIXME: HELPID - pSubPop1->SetHelpId(CTX_INSERT_TEXT, ""/*aHelpForMenu[CTX_INSERT_TEXT]*/); + pSubPop1->SetHelpId(CTX_INSERT_TEXT, aHelpForMenu[CTX_INSERT_TEXT]); pPop->InsertItem(CTX_UPDATE, aContextStrings[ST_UPDATE - ST_GLOBAL_CONTEXT_FIRST]); - // FIXME: HELPID - pPop->SetHelpId(CTX_UPDATE, ""/*aHelpForMenu[CTX_UPDATE]*/); + pPop->SetHelpId(CTX_UPDATE, aHelpForMenu[CTX_UPDATE]); pPop->InsertItem(CTX_EDIT, aContextStrings[ST_EDIT_CONTENT - ST_GLOBAL_CONTEXT_FIRST]); - // FIXME: HELPID - pPop->SetHelpId(CTX_EDIT, ""/*aHelpForMenu[CTX_EDIT]*/); + pPop->SetHelpId(CTX_EDIT, aHelpForMenu[CTX_EDIT]); if(nEnableFlags&ENABLE_EDIT_LINK) { pPop->InsertItem(CTX_EDIT_LINK, aContextStrings[ST_EDIT_LINK - ST_GLOBAL_CONTEXT_FIRST]); - // FIXME: HELPID - pPop->SetHelpId(CTX_EDIT_LINK, ""/*aHelpForMenu[CTX_EDIT_LINK]*/); + pPop->SetHelpId(CTX_EDIT_LINK, aHelpForMenu[CTX_EDIT_LINK]); } pPop->InsertItem(CTX_INSERT, aContextStrings[ST_INSERT - ST_GLOBAL_CONTEXT_FIRST]); - // FIXME: HELPID - pPop->SetHelpId(CTX_INSERT, ""/*aHelpForMenu[CTX_INSERT]*/); + pPop->SetHelpId(CTX_INSERT, aHelpForMenu[CTX_INSERT]); pPop->InsertSeparator() ; pPop->InsertItem(CTX_DELETE, aContextStrings[ST_DELETE - ST_GLOBAL_CONTEXT_FIRST]); - // FIXME: HELPID - pPop->SetHelpId(CTX_DELETE, ""/*aHelpForMenu[CTX_DELETE]*/); + pPop->SetHelpId(CTX_DELETE, aHelpForMenu[CTX_DELETE]); //evtl. disablen pSubPop1->EnableItem(CTX_INSERT_ANY_INDEX, 0 != (nEnableFlags & ENABLE_INSERT_IDX )); @@ -450,8 +439,7 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox) for (USHORT i = CTX_INSERT_ANY_INDEX; i <= CTX_INSERT_TEXT; i++) { pMenu->InsertItem( i, aContextStrings[ST_INDEX - ST_GLOBAL_CONTEXT_FIRST - CTX_INSERT_ANY_INDEX + i] ); - // FIXME: HELPID - pMenu->SetHelpId(i, ""/*aHelpForMenu[i]*/ ); + pMenu->SetHelpId(i, aHelpForMenu[i] ); } pMenu->EnableItem(CTX_INSERT_ANY_INDEX, 0 != (nEnableFlags & ENABLE_INSERT_IDX )); // pMenu->EnableItem(CTX_INSERT_CNTIDX, 0 != (nEnableFlags & ENABLE_INSERT_IDX )); @@ -471,8 +459,7 @@ void SwGlobalTree::TbxMenuHdl(USHORT nTbxId, ToolBox* pBox) for (USHORT i = CTX_UPDATE_SEL; i <= CTX_UPDATE_ALL; i++) { pMenu->InsertItem( i, aContextStrings[ST_UPDATE_SEL - ST_GLOBAL_CONTEXT_FIRST - CTX_UPDATE_SEL+ i] ); - // FIXME: HELPID - pMenu->SetHelpId(i, ""/*aHelpForMenu[i]*/ ); + pMenu->SetHelpId(i, aHelpForMenu[i] ); } pMenu->EnableItem(CTX_UPDATE_SEL, 0 != (nEnableFlags & ENABLE_UPDATE_SEL)); pMenu->SetSelectHdl(LINK(this, SwGlobalTree, PopupHdl)); diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index bce0b5cabef0..ca2367744713 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -429,15 +429,17 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox ) case FN_DROP_REGION: { + static const char* aHIDs[] = + { + HID_NAVI_DRAG_HYP, + HID_NAVI_DRAG_LINK, + HID_NAVI_DRAG_COPY, + }; PopupMenu *pMenu = new PopupMenu; for (USHORT i = 0; i <= REGION_MODE_EMBEDDED; i++) { pMenu->InsertItem( i + 1, aContextArr[i] ); - // FIXME: HELPID - pMenu->SetHelpId(i + 1, ""/*HID_NAVI_DRAG_HYP + i*/); - /*HID_NAVI_DRAG_HYP - HID_NAVI_DRAG_LINK - HID_NAVI_DRAG_COPY */ + pMenu->SetHelpId(i + 1, aHIDs[i]); } pMenu->CheckItem( nRegionMode + 1 ); pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl)); @@ -457,8 +459,7 @@ IMPL_LINK( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox ) for (USHORT i = 101; i <= 100 + MAXLEVEL; i++) { pMenu->InsertItem( i, String::CreateFromInt32(i - 100) ); - // FIXME: HELPID - pMenu->SetHelpId( i, ""/*HID_NAVI_OUTLINES*/ ); + pMenu->SetHelpId( i, HID_NAVI_OUTLINES ); } pMenu->CheckItem( aContentTree.GetOutlineLevel() + 100 ); pMenu->SetSelectHdl(LINK(this, SwNavigationPI, MenuSelectHdl)); @@ -794,12 +795,9 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, GetCreateView(); InitImageList(); - // FIXME: HELPID - aContentToolBox.SetHelpId(""/*HID_NAVIGATOR_TOOLBOX*/ ); - // FIXME: HELPID - aGlobalToolBox.SetHelpId(""/*HID_NAVIGATOR_GLOBAL_TOOLBOX*/); - // FIXME: HELPID - aDocListBox.SetHelpId(""/*HID_NAVIGATOR_LISTBOX*/ ); + aContentToolBox.SetHelpId(HID_NAVIGATOR_TOOLBOX ); + aGlobalToolBox.SetHelpId(HID_NAVIGATOR_GLOBAL_TOOLBOX); + aDocListBox.SetHelpId(HID_NAVIGATOR_LISTBOX ); nDocLBIniHeight = aDocListBox.GetSizePixel().Height(); nZoomOutInit = nZoomOut = Resource::ReadShortRes(); @@ -826,8 +824,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings, aContentToolBox.InsertSeparator(4); aContentToolBox.InsertWindow( FN_PAGENUMBER, pEdit, 0, 4); aContentToolBox.InsertSeparator(4); - // FIXME: HELPID - aContentToolBox.SetHelpId(FN_PAGENUMBER, ""/*HID_NAVI_TBX16*/); + aContentToolBox.SetHelpId(FN_PAGENUMBER, HID_NAVI_TBX16); aContentToolBox.ShowItem( FN_PAGENUMBER ); for( USHORT i = 0; i <= REGION_MODE_EMBEDDED; i++ ) diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src index 1aa7fc03b4c6..8f1d783595d6 100644 --- a/sw/source/ui/web/web.src +++ b/sw/source/ui/web/web.src @@ -65,124 +65,6 @@ String RID_WEBTOOLS_TOOLBOX { Text [ en-US ] = "Main Toolbar/Web" ; }; -ToolBox RID_WEBTOOLS_TOOLBOX -{ - HelpID = HID_WEBTOOLS_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Scroll = TRUE ; - Hide = TRUE ; - Align = BOXALIGN_LEFT ; - ItemList = - { - ToolBoxItem - { - Identifier = FN_INSERT_CTRL ; - HelpID = HID_INSERT_CTRL ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Identifier = FN_INSERT_FIELD_CTRL ; - HelpID = HID_INSERT_FIELD_CTRL ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_TEXT_MARQUEE ; - HelpID = SID_DRAW_TEXT_MARQUEE ; - }; - ToolBoxItem - { - Identifier = SID_FM_CONFIG ; - HelpID = SID_FM_CONFIG; - DropDown = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = FN_GLOSSARY_DLG ; - HelpID = FN_GLOSSARY_DLG ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Identifier = FN_SPELL_GRAMMAR_DIALOG; - HelpID = FN_SPELL_GRAMMAR_DIALOG; - }; - ToolBoxItem - { - ITEM_TOOLBAR_AUTOSPELL_CHECK - }; - ToolBoxItem - { - Identifier = FN_HYPHENATE_OPT_DLG; - HelpID = FN_HYPHENATE_OPT_DLG; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_THESAURUS_DLG; - HelpID = FN_THESAURUS_DLG; - Hide = TRUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_SEARCH_DLG ; - HelpID = SID_SEARCH_DLG ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_ZOOM; - HelpID = SID_ATTR_ZOOM ; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = FN_VIEW_META_CHARS ; - HelpID = FN_VIEW_META_CHARS ; - }; - ToolBoxItem - { - Identifier = FN_VIEW_GRAPHIC ; - HelpID = FN_VIEW_GRAPHIC ; - }; - ToolBoxItem - { - Identifier = FN_PRINT_LAYOUT ; - HelpID = FN_PRINT_LAYOUT ; - }; - ToolBoxItem - { - Identifier = SID_SOURCEVIEW ; - HelpID = HID_SOURCEVIEW ; - }; - }; -}; /************************************************************************* Textleiste *************************************************************************/ @@ -190,152 +72,18 @@ String RID_WEBTEXT_TOOLBOX { Text [ en-US ] = "Text Object Bar/Web" ; }; -ToolBox RID_WEBTEXT_TOOLBOX -{ - HelpID = HID_WEBTEXT_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Hide = TRUE ; - HideWhenDeactivate = TRUE ; - LineSpacing = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - ItemList = - { - MN_TEMPLATE - MN_FONT - MN_TEXT1(TRUE) - MN_TEXT_LTR_RTL - MN_TEXT_LINESPACE - MN_TEXT2 - MN_TEXT_BACKGROUND - MN_TEXT_DIALOGS(TRUE) - }; - Scroll = TRUE ; -}; String RID_WEBFRAME_TOOLBOX { Text [ en-US ] = "Frame Object Bar/Web" ; }; -ToolBox RID_WEBFRAME_TOOLBOX -{ - HelpID = HID_WEBFRAME_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Hide = TRUE ; - LineSpacing = TRUE ; - MenuStrings = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - ItemList = - { - MN_FRAME_WRAP_WEB - MN_FRAME1 - MN_FRAME3 - MN_LINESTYLE - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - MN_BACKGROUND_COLOR - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_ATTRIBUTES_FRAME - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_LAYER - ToolBoxItem - { - Identifier = FN_TOOL_ANKER ; - HelpID = FN_TOOL_ANKER ; - }; - }; - Scroll = TRUE ; -}; String RID_WEBGRAPHIC_TOOLBOX { Text [ en-US ] = "Graphics Object Bar/Web" ; }; -ToolBox RID_WEBGRAPHIC_TOOLBOX -{ - HelpID = HID_WEBGRAPHIC_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - MenuStrings = TRUE ; - Customize = TRUE ; - Hide = TRUE ; - ItemList = - { - MN_FRAME_WRAP_WEB - MN_FRAME1 - MN_FRAME3 - MN_LINESTYLE - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_ATTRIBUTES_GRAFIK - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_LAYER - ToolBoxItem - { - Identifier = FN_TOOL_ANKER ; - HelpID = FN_TOOL_ANKER ; - DropDown = TRUE ; - }; - }; - Scroll = TRUE ; -}; String RID_WEBOLE_TOOLBOX { Text [ en-US ] = "Object/Web" ; }; -ToolBox RID_WEBOLE_TOOLBOX -{ - HelpID = HID_OLE_TOOLBOX ; - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - LineSpacing = TRUE ; - HideWhenDeactivate = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - Scroll = TRUE ; - ItemList = - { - MN_FRAME_WRAP_WEB - MN_FRAME1 - MN_FRAME3 - MN_LINESTYLE - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_ATTRIBUTES_OLE - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - MN_LAYER - ToolBoxItem - { - Identifier = FN_TOOL_ANKER ; - HelpID = FN_TOOL_ANKER ; - DropDown = TRUE ; - }; - }; -}; /************************************************************************* *************************************************************************/ diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index c7cb89bf5e61..89dbe634ddd1 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -123,6 +123,7 @@ #include #include "PostItMgr.hxx" +#include using namespace sw::mark; using namespace com::sun::star; @@ -466,9 +467,13 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName pReq->AppendItem(SfxBoolItem(FN_PARAM_5, pDescriptor->HasFrameBorder())); }*/ { + SfxSlotPool* pSlotPool = SW_MOD()->GetSlotPool(); + const SfxSlot* pSlot = pSlotPool->GetSlot(nSlotId); + rtl::OString aCmd(".uno:"); + aCmd += pSlot->GetUnoName(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractInsertObjectDialog* pDlg = - pFact->CreateInsertObjectDialog( GetWin(), nSlotId, xStor, &aServerList ); + pFact->CreateInsertObjectDialog( GetWin(), rtl::OUString( aCmd, aCmd.getLength(), RTL_TEXTENCODING_UTF8 ), xStor, &aServerList ); if ( pDlg ) { pDlg->Execute(); -- cgit From e2280d56bfd8f963b4caea5b200a83be8664d5a3 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 10 Jul 2010 18:21:24 +0200 Subject: CWS changehid: #i111874#: change code to support HelpIds as byte strings --- sd/inc/helpids.h | 441 ++++---- sd/inc/sdabstdlg.hxx | 2 +- sd/inc/sdcommands.h | 310 ++++++ sd/inc/sdmod.hxx | 2 - sd/sdi/TaskPaneViewShell.sdi | 178 ---- sd/sdi/ViewShellBase.sdi | 239 ----- sd/sdi/sdraw.sdi | 417 ++++++++ sd/source/filter/html/pubdlg.cxx | 9 +- .../ui/animations/CustomAnimationCreateDialog.cxx | 15 +- sd/source/ui/animations/CustomAnimationDialog.cxx | 24 +- sd/source/ui/annotations/annotations.src | 29 +- sd/source/ui/app/makefile.mk | 1 - sd/source/ui/app/menuids2_tmpl.src | 198 ++-- sd/source/ui/app/menuids3_tmpl.src | 38 +- sd/source/ui/app/menuids4_tmpl.src | 2 +- sd/source/ui/app/menuids_tmpl.src | 274 ++--- sd/source/ui/app/popup.src | 57 +- sd/source/ui/app/popup2_tmpl.src | 28 +- sd/source/ui/app/sdmod.cxx | 52 - sd/source/ui/app/strings.src | 4 +- sd/source/ui/app/tbx_ww.src | 1124 -------------------- sd/source/ui/app/toolbox.src | 737 +------------ sd/source/ui/dlg/LayerTabBar.cxx | 3 +- sd/source/ui/dlg/PaneDockingWindow.cxx | 6 +- sd/source/ui/dlg/animobjs.src | 4 +- sd/source/ui/dlg/copydlg.src | 4 +- sd/source/ui/dlg/custsdlg.src | 2 +- sd/source/ui/dlg/dlgass.cxx | 6 +- sd/source/ui/dlg/dlgsnap.src | 4 +- sd/source/ui/dlg/headerfooterdlg.cxx | 6 +- sd/source/ui/dlg/inspagob.src | 2 +- sd/source/ui/dlg/layeroptionsdlg.src | 3 +- sd/source/ui/dlg/morphdlg.src | 5 +- sd/source/ui/dlg/navigatr.cxx | 13 +- sd/source/ui/dlg/paragr.src | 3 +- sd/source/ui/dlg/present.src | 2 +- sd/source/ui/dlg/sddlgfact.cxx | 6 +- sd/source/ui/dlg/sddlgfact.hxx | 2 +- sd/source/ui/dlg/sdpreslt.src | 4 +- sd/source/ui/dlg/tpaction.src | 2 +- sd/source/ui/dlg/vectdlg.src | 3 +- sd/source/ui/func/fuinsert.cxx | 5 +- sd/source/ui/inc/PaneDockingWindow.hxx | 2 +- sd/source/ui/inc/taskpane/ScrollPanel.hxx | 2 +- sd/source/ui/inc/taskpane/SubToolPanel.hxx | 2 +- sd/source/ui/inc/taskpane/ToolPanel.hxx | 2 +- sd/source/ui/notes/NotesChildWindow.src | 3 +- sd/source/ui/slideshow/showwin.cxx | 6 +- sd/source/ui/table/tableobjectbar.cxx | 4 +- sd/source/ui/toolpanel/LayoutMenu.cxx | 5 +- sd/source/ui/toolpanel/ScrollPanel.cxx | 6 +- sd/source/ui/toolpanel/SubToolPanel.cxx | 6 +- sd/source/ui/toolpanel/TaskPaneViewShell.cxx | 3 +- sd/source/ui/toolpanel/TestPanel.cxx | 6 +- sd/source/ui/toolpanel/ToolPanel.cxx | 6 +- .../ui/toolpanel/controls/MasterPagesPanel.cxx | 15 +- .../ui/toolpanel/controls/MasterPagesSelector.cxx | 1 - sd/source/ui/view/ViewShellImplementation.cxx | 6 +- sd/source/ui/view/drviews2.cxx | 6 +- sd/source/ui/view/drviews5.cxx | 20 +- sd/source/ui/view/drviewsa.cxx | 26 +- sd/source/ui/view/drviewsb.cxx | 6 +- sd/source/ui/view/outlnvsh.cxx | 8 +- sd/source/ui/view/sdruler.cxx | 6 +- sd/source/ui/view/sdwindow.cxx | 3 +- sd/source/ui/view/tabcontr.cxx | 3 +- 66 files changed, 1407 insertions(+), 3012 deletions(-) create mode 100644 sd/inc/sdcommands.h delete mode 100644 sd/source/ui/app/tbx_ww.src diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index b693ebe6fd2c..d9e0f5561a6b 100644 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -28,92 +28,107 @@ #include #endif -#define HID_SD_PRINT_OPTIONS (HID_SD_START + 0) -#define HID_SD_OPTIONS_SNAP (HID_SD_START + 1) -#define HID_SD_OPTIONS_VIEW (HID_SD_START + 2) - -#define HID_SD_AUTOPILOT_PAGE1 (HID_SD_START + 3) -#define HID_SD_AUTOPILOT_PAGE2 (HID_SD_START + 4) -#define HID_SD_AUTOPILOT_PAGE3 (HID_SD_START + 5) -#define HID_SD_AUTOPILOT_PAGE4 (HID_SD_START + 6) -#define HID_SD_AUTOPILOT_PAGE5 (HID_SD_START + 7) -#define HID_SD_AUTOPILOT_PAGE6 (HID_SD_START + 8) - -#define HID_SD_CBX_ONLYSELECTED (HID_SD_START + 9) -#define HID_SD_BTN_FILTERDIALOG (HID_SD_START + 10) - -#define HID_SD_BTN_PAGE (HID_SD_START + 11) -#define HID_SD_BTN_MASTERPAGE (HID_SD_START + 12) -#define HID_SD_BTN_LAYER (HID_SD_START + 13) - -#define HID_SD_BTN_DRAW (HID_SD_START + 14) -#define HID_SD_BTN_SLIDE (HID_SD_START + 15) -#define HID_SD_BTN_OUTLINE (HID_SD_START + 16) -#define HID_SD_BTN_NOTES (HID_SD_START + 17) -#define HID_SD_BTN_HANDOUT (HID_SD_START + 18) - -#define HID_SD_WIN_DOCUMENT (HID_SD_START + 19) - -#define HID_SD_OPTIONS_LAYOUT (HID_SD_START + 20) -#define HID_SD_OPTIONS_CONTENTS (HID_SD_START + 21) -#define HID_SD_OPTIONS_MISC (HID_SD_START + 22) - -#define HID_SD_EFFECT_PREVIEW (HID_SD_START + 23) -#define HID_SD_CTL_NEWFOIL (HID_SD_START + 24) -#define HID_SD_NAVIGATOR_TLB (HID_SD_START + 25) -#define HID_SD_NAVIGATOR (HID_SD_START + 26) - -#define HID_SD_CTL_EFFECTS (HID_SD_START + 27) -#define HID_SD_CTL_TEXT_EFFECTS (HID_SD_START + 28) - -#define HID_SD_CTL_SLIDE_CHANGE (HID_SD_START + 29) - -#define HID_SD_NAVIGATOR_TBX (HID_SD_START + 30) -#define HID_SD_NAVIGATOR_LB (HID_SD_START + 31) - -#define HID_SD_NAVIGATOR_TBI_PEN (HID_SD_START + 33) -#define HID_SD_NAVIGATOR_TBI_FIRST (HID_SD_START + 34) -#define HID_SD_NAVIGATOR_TBI_PREV (HID_SD_START + 35) -#define HID_SD_NAVIGATOR_TBI_NEXT (HID_SD_START + 36) -#define HID_SD_NAVIGATOR_TBI_LAST (HID_SD_START + 37) -#define HID_SD_NAVIGATOR_TBI_DRAGTYPE (HID_SD_START + 38) -#define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER (HID_SD_START + 39) +#include +#include +#include "sdcommands.h" + +#define SHELLID_SD_TASK_PANE_PREVIEW_CURRENT (HID_SD_START + 174) +#define SHELLID_SD_TASK_PANE_PREVIEW_RECENT (HID_SD_START + 175) +#define SHELLID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176) +#define SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177) + +#define HID_NOTESMODE "SD_HID_NOTESMODE" +#define HID_HANDOUTMODE "SD_HID_HANDOUTMODE" +#define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL" +#define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL" +#define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL" + +#define HID_SD_PRINT_OPTIONS "SD_HID_SD_PRINT_OPTIONS" +#define HID_SD_OPTIONS_SNAP "SD_HID_SD_OPTIONS_SNAP" +#define HID_SD_OPTIONS_VIEW "SD_HID_SD_OPTIONS_VIEW" + +#define HID_SD_AUTOPILOT_PAGE1 "SD_HID_SD_AUTOPILOT_PAGE1" +#define HID_SD_AUTOPILOT_PAGE2 "SD_HID_SD_AUTOPILOT_PAGE2" +#define HID_SD_AUTOPILOT_PAGE3 "SD_HID_SD_AUTOPILOT_PAGE3" +#define HID_SD_AUTOPILOT_PAGE4 "SD_HID_SD_AUTOPILOT_PAGE4" +#define HID_SD_AUTOPILOT_PAGE5 "SD_HID_SD_AUTOPILOT_PAGE5" +#define HID_SD_AUTOPILOT_PAGE6 "SD_HID_SD_AUTOPILOT_PAGE6" + +#define HID_SD_CBX_ONLYSELECTED "SD_HID_SD_CBX_ONLYSELECTED" +#define HID_SD_BTN_FILTERDIALOG "SD_HID_SD_BTN_FILTERDIALOG" + +#define HID_SD_BTN_PAGE "SD_HID_SD_BTN_PAGE" +#define HID_SD_BTN_MASTERPAGE "SD_HID_SD_BTN_MASTERPAGE" +#define HID_SD_BTN_LAYER "SD_HID_SD_BTN_LAYER" + +#define HID_SD_BTN_DRAW "SD_HID_SD_BTN_DRAW" +#define HID_SD_BTN_SLIDE "SD_HID_SD_BTN_SLIDE" +#define HID_SD_BTN_OUTLINE "SD_HID_SD_BTN_OUTLINE" +#define HID_SD_BTN_NOTES "SD_HID_SD_BTN_NOTES" +#define HID_SD_BTN_HANDOUT "SD_HID_SD_BTN_HANDOUT" + +#define HID_SD_WIN_DOCUMENT "SD_HID_SD_WIN_DOCUMENT" + +#define HID_SD_OPTIONS_LAYOUT "SD_HID_SD_OPTIONS_LAYOUT" +#define HID_SD_OPTIONS_CONTENTS "SD_HID_SD_OPTIONS_CONTENTS" +#define HID_SD_OPTIONS_MISC "SD_HID_SD_OPTIONS_MISC" + +#define HID_SD_EFFECT_PREVIEW "SD_HID_SD_EFFECT_PREVIEW" +#define HID_SD_CTL_NEWFOIL "SD_HID_SD_CTL_NEWFOIL" +#define HID_SD_NAVIGATOR_TLB "SD_HID_SD_NAVIGATOR_TLB" +#define HID_SD_NAVIGATOR "SD_HID_SD_NAVIGATOR" + +#define HID_SD_CTL_EFFECTS "SD_HID_SD_CTL_EFFECTS" +#define HID_SD_CTL_TEXT_EFFECTS "SD_HID_SD_CTL_TEXT_EFFECTS" + +#define HID_SD_CTL_SLIDE_CHANGE "SD_HID_SD_CTL_SLIDE_CHANGE" + +#define HID_SD_NAVIGATOR_TBX "SD_HID_SD_NAVIGATOR_TBX" +#define HID_SD_NAVIGATOR_LB "SD_HID_SD_NAVIGATOR_LB" + +#define HID_SD_NAVIGATOR_TBI_PEN "SD_HID_SD_NAVIGATOR_TBI_PEN" +#define HID_SD_NAVIGATOR_TBI_FIRST "SD_HID_SD_NAVIGATOR_TBI_FIRST" +#define HID_SD_NAVIGATOR_TBI_PREV "SD_HID_SD_NAVIGATOR_TBI_PREV" +#define HID_SD_NAVIGATOR_TBI_NEXT "SD_HID_SD_NAVIGATOR_TBI_NEXT" +#define HID_SD_NAVIGATOR_TBI_LAST "SD_HID_SD_NAVIGATOR_TBI_LAST" +#define HID_SD_NAVIGATOR_TBI_DRAGTYPE "SD_HID_SD_NAVIGATOR_TBI_DRAGTYPE" +#define HID_SD_NAVIGATOR_TBI_SHAPE_FILTER "SD_HID_SD_NAVIGATOR_TBI_SHAPE_FILTER" // Toolboxen -#define HID_SD_DRAW_DEFAULTTOOLBOX (HID_SD_START + 40) -#define HID_SD_PLUGINTOOLBOX (HID_SD_START + 41) -#define HID_SD_DRAW_TOOLBOX (HID_SD_START + 42) -#define HID_SD_SLIDE_TOOLBOX (HID_SD_START + 43) -#define HID_SD_OUTLINE_TOOLBOX (HID_SD_START + 44) -#define HID_SD_DRAW_OBJ_TOOLBOX (HID_SD_START + 45) -#define HID_SD_DRAW_OPTIONS_TOOLBOX (HID_SD_START + 46) -#define HID_SD_DRAW_COMMONTASK_TOOLBOX (HID_SD_START + 47) -#define HID_SD_BEZIER_TOOLBOX (HID_SD_START + 48) -#define HID_SD_TEXT_TOOLBOX (HID_SD_START + 49) -#define HID_SD_GLUEPOINTS_TOOLBOX (HID_SD_START + 50) -#define HID_SD_SLIDE_OBJ_TOOLBOX (HID_SD_START + 51) +#define HID_SD_DRAW_DEFAULTTOOLBOX "SD_HID_SD_DRAW_DEFAULTTOOLBOX" +#define HID_SD_PLUGINTOOLBOX "SD_HID_SD_PLUGINTOOLBOX" +#define HID_SD_DRAW_TOOLBOX "SD_HID_SD_DRAW_TOOLBOX" +#define HID_SD_SLIDE_TOOLBOX "SD_HID_SD_SLIDE_TOOLBOX" +#define HID_SD_OUTLINE_TOOLBOX "SD_HID_SD_OUTLINE_TOOLBOX" +#define HID_SD_DRAW_OBJ_TOOLBOX "SD_HID_SD_DRAW_OBJ_TOOLBOX" +#define HID_SD_DRAW_OPTIONS_TOOLBOX "SD_HID_SD_DRAW_OPTIONS_TOOLBOX" +#define HID_SD_DRAW_COMMONTASK_TOOLBOX "SD_HID_SD_DRAW_COMMONTASK_TOOLBOX" +#define HID_SD_BEZIER_TOOLBOX "SD_HID_SD_BEZIER_TOOLBOX" +#define HID_SD_TEXT_TOOLBOX "SD_HID_SD_TEXT_TOOLBOX" +#define HID_SD_GLUEPOINTS_TOOLBOX "SD_HID_SD_GLUEPOINTS_TOOLBOX" +#define HID_SD_SLIDE_OBJ_TOOLBOX "SD_HID_SD_SLIDE_OBJ_TOOLBOX" // FloatingWindows -#define HID_SD_FW_ALIGNMENT (HID_SD_START + 52) -#define HID_SD_FW_ZOOM (HID_SD_START + 53) -#define HID_SD_FW_CHOOSE_MODE (HID_SD_START + 54) -#define HID_SD_FW_TEXT (HID_SD_START + 55) -#define HID_SD_FW_RECTANGLES (HID_SD_START + 56) -#define HID_SD_FW_ELLIPSES (HID_SD_START + 57) -#define HID_SD_FW_LINES (HID_SD_START + 58) -#define HID_SD_FW_ARROWS (HID_SD_START + 59) -#define HID_SD_FW_3D_OBJECTS (HID_SD_START + 60) -#define HID_SD_FW_CONNECTORS (HID_SD_START + 61) -#define HID_SD_FW_INSERT (HID_SD_START + 62) -#define HID_SD_FW_POSITION (HID_SD_START + 63) - -#define HID_SD_BTN_PREVIEW (HID_SD_START + 64) - -#define HID_SD_NAVIGATOR_MENU1 (HID_SD_START + 65) -#define HID_SD_NAVIGATOR_MENU2 (HID_SD_START + 66) -#define HID_SD_NAVIGATOR_MENU3 (HID_SD_START + 67) - -#define HID_SD_WIN_PRESENTATION (HID_SD_START + 68) +#define HID_SD_FW_ALIGNMENT "SD_HID_SD_FW_ALIGNMENT" +#define HID_SD_FW_ZOOM "SD_HID_SD_FW_ZOOM" +#define HID_SD_FW_CHOOSE_MODE "SD_HID_SD_FW_CHOOSE_MODE" +#define HID_SD_FW_TEXT "SD_HID_SD_FW_TEXT" +#define HID_SD_FW_RECTANGLES "SD_HID_SD_FW_RECTANGLES" +#define HID_SD_FW_ELLIPSES "SD_HID_SD_FW_ELLIPSES" +#define HID_SD_FW_LINES "SD_HID_SD_FW_LINES" +#define HID_SD_FW_ARROWS "SD_HID_SD_FW_ARROWS" +#define HID_SD_FW_3D_OBJECTS "SD_HID_SD_FW_3D_OBJECTS" +#define HID_SD_FW_CONNECTORS "SD_HID_SD_FW_CONNECTORS" +#define HID_SD_FW_INSERT "SD_HID_SD_FW_INSERT" +#define HID_SD_FW_POSITION "SD_HID_SD_FW_POSITION" + +#define HID_SD_BTN_PREVIEW "SD_HID_SD_BTN_PREVIEW" + +#define HID_SD_NAVIGATOR_MENU1 "SD_HID_SD_NAVIGATOR_MENU1" +#define HID_SD_NAVIGATOR_MENU2 "SD_HID_SD_NAVIGATOR_MENU2" +#define HID_SD_NAVIGATOR_MENU3 "SD_HID_SD_NAVIGATOR_MENU3" + +#define HID_SD_WIN_PRESENTATION "SD_HID_SD_WIN_PRESENTATION" // HelpIDs fuer Vorlagen #define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70) @@ -147,127 +162,127 @@ #define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97) #define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98) -#define HID_DLG_DEFINE_CUSTOMSHOW (HID_SD_START + 99) -#define HID_DLG_DEFINE_CUSTOMSHOW_CTL (HID_SD_START + 100) - #define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101) -#define HID_CTL_ACTION_DLG_1 (HID_SD_START + 102) -#define HID_CTL_ACTION_DLG_2 (HID_SD_START + 103) - -#define HID_SD_BTN_PRESENTATION (HID_SD_START + 104) - -#define HID_SD_HTMLEXPORT_PAGE1 (HID_SD_START + 105) -#define HID_SD_HTMLEXPORT_PAGE2 (HID_SD_START + 106) -#define HID_SD_HTMLEXPORT_PAGE3 (HID_SD_START + 107) -#define HID_SD_HTMLEXPORT_PAGE4 (HID_SD_START + 108) -#define HID_SD_HTMLEXPORT_PAGE5 (HID_SD_START + 109) -#define HID_SD_HTMLEXPORT_PAGE6 (HID_SD_START + 110) - -#define HID_SD_CHGFOIL_LAYOUT (HID_SD_START + 111) -#define HID_SD_CHGFOIL_BACKGROUND (HID_SD_START + 112) -#define HID_SD_CHGFOIL_OBJECTS (HID_SD_START + 113) -#define HID_SD_CHGFOIL_NAME (HID_SD_START + 114) - -#define HID_SD_HTMLEXPORT_DLG_DNAME (HID_SD_START + 115) - -#define HID_FM_CTL_SELECTION (HID_SD_START + 116) - -#define HID_SD_AUTOPILOT_REGION (HID_SD_START + 117) -#define HID_SD_AUTOPILOT_TEMPLATES (HID_SD_START + 118) -#define HID_SD_AUTOPILOT_OPEN (HID_SD_START + 119) -#define HID_SD_AUTOPILOT_PAGETEMPLATES (HID_SD_START + 120) - -#define HID_SD_DRAW_GRAF_TOOLBOX (HID_SD_START + 121) - -#define HID_SD_FW_GRAFFILTERS (HID_SD_START + 122) - -#define HID_SD_TABBAR_PAGES (HID_SD_START + 123) -#define HID_SD_TABBAR_LAYERS (HID_SD_START + 124) - -#define HID_SD_UNDODELETEWARNING_DLG (HID_SD_START + 125) -#define HID_SD_UNDODELETEWARNING_CBX (HID_SD_START + 126) - -#define HID_SD_PAGEOBJSTLB (HID_SD_START + 127) - -#define HID_SD_NAMEDIALOG_OBJECT (HID_SD_START + 128) -#define HID_SD_NAMEDIALOG_PAGE (HID_SD_START + 129) -#define HID_SD_NAMEDIALOG_LINEEND (HID_SD_START + 130) - -#define HID_SD_DRAW_3D_TOOLBOX (HID_SD_START + 131) -#define HID_SD_DRAW_FONTWORK_TOOLBOX (HID_SD_START + 132) - -#define HID_SD_TABPAGE_HEADERFOOTER_SLIDE (HID_SD_START + 133) -#define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT (HID_SD_START + 134) - -#define HID_SD_DRAW_MEDIA_TOOLBOX (HID_SD_START + 135) - -#define HID_SD_TASK_PANE (HID_SD_START + 136) -#define HID_SD_SLIDE_DESIGNS (HID_SD_START + 137) -#define HID_SD_CURRENT_MASTERS (HID_SD_START + 138) -#define HID_SD_RECENT_MASTERS (HID_SD_START + 139) -#define HID_SD_ALL_MASTERS (HID_SD_START + 140) -#define HID_SD_SLIDE_LAYOUTS (HID_SD_START + 141) -#define HID_SD_CUSTOM_ANIMATIONS (HID_SD_START + 142) -#define HID_SD_SLIDE_TRANSITIONS (HID_SD_START + 143) - -#define HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT (HID_SD_START + 144) -#define HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT (HID_SD_START + 145) -#define HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT (HID_SD_START + 146) -#define HID_SD_CUSTOMANIMATIONPANE_LB_START (HID_SD_START + 147) -#define HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY (HID_SD_START + 148) -#define HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE (HID_SD_START + 149) -#define HID_SD_CUSTOMANIMATIONPANE_CB_SPEED (HID_SD_START + 150) -#define HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST (HID_SD_START + 151) -#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP (HID_SD_START + 152) -#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN (HID_SD_START + 153) -#define HID_SD_CUSTOMANIMATIONPANE_PB_PLAY (HID_SD_START + 154) -#define HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW (HID_SD_START + 155) -#define HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW (HID_SD_START + 156) - -#define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES (HID_SD_START + 157) -#define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL (HID_SD_START + 158) -#define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY (HID_SD_START + 159) -#define HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW (HID_SD_START + 160) -#define HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW (HID_SD_START + 161) - -#define HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS (HID_SD_START + 162) -#define HID_SD_SLIDETRANSITIONPANE_LB_SPEED (HID_SD_START + 163) -#define HID_SD_SLIDETRANSITIONPANE_LB_SOUND (HID_SD_START + 164) -#define HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND (HID_SD_START + 165) -#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE (HID_SD_START + 166) -#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO (HID_SD_START + 167) -#define HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER (HID_SD_START + 168) -#define HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL (HID_SD_START + 169) -#define HID_SD_SLIDETRANSITIONPANE_PB_PLAY (HID_SD_START + 170) -#define HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW (HID_SD_START + 171) -#define HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW (HID_SD_START + 172) - -#define HID_SD_TASK_PANE_VIEW_MENU (HID_SD_START + 173) -#define HID_SD_TASK_PANE_PREVIEW_CURRENT (HID_SD_START + 174) -#define HID_SD_TASK_PANE_PREVIEW_RECENT (HID_SD_START + 175) -#define HID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176) -#define HID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177) - -#define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE (HID_SD_START + 178) -#define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS (HID_SD_START + 179) -#define HID_SD_CUSTOMANIMATIONDIALOG_EXIT (HID_SD_START + 180) -#define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH (HID_SD_START + 181) -#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS (HID_SD_START + 182) - -#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX (HID_SD_START + 183) -#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX (HID_SD_START + 184) -#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX (HID_SD_START + 185) -#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX (HID_SD_START + 186) -#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX (HID_SD_START + 187) -#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX (HID_SD_START + 188) -#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX (HID_SD_START + 189) -#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX (HID_SD_START + 190) - -#define HID_SD_SLIDESHOW_DISPLAY (HID_SD_START + 191) - -#define HID_SD_RULER_HORIZONTAL (HID_SD_START + 192) -#define HID_SD_RULER_VERTICAL (HID_SD_START + 193) +#define HID_DLG_DEFINE_CUSTOMSHOW "SD_HID_DLG_DEFINE_CUSTOMSHOW" +#define HID_DLG_DEFINE_CUSTOMSHOW_CTL "SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL" + +#define HID_CTL_ACTION_DLG_1 "SD_HID_CTL_ACTION_DLG_1" +#define HID_CTL_ACTION_DLG_2 "SD_HID_CTL_ACTION_DLG_2" + +#define HID_SD_BTN_PRESENTATION "SD_HID_SD_BTN_PRESENTATION" + +#define HID_SD_HTMLEXPORT_PAGE1 "SD_HID_SD_HTMLEXPORT_PAGE1" +#define HID_SD_HTMLEXPORT_PAGE2 "SD_HID_SD_HTMLEXPORT_PAGE2" +#define HID_SD_HTMLEXPORT_PAGE3 "SD_HID_SD_HTMLEXPORT_PAGE3" +#define HID_SD_HTMLEXPORT_PAGE4 "SD_HID_SD_HTMLEXPORT_PAGE4" +#define HID_SD_HTMLEXPORT_PAGE5 "SD_HID_SD_HTMLEXPORT_PAGE5" +#define HID_SD_HTMLEXPORT_PAGE6 "SD_HID_SD_HTMLEXPORT_PAGE6" + +#define HID_SD_CHGFOIL_LAYOUT "SD_HID_SD_CHGFOIL_LAYOUT" +#define HID_SD_CHGFOIL_BACKGROUND "SD_HID_SD_CHGFOIL_BACKGROUND" +#define HID_SD_CHGFOIL_OBJECTS "SD_HID_SD_CHGFOIL_OBJECTS" +#define HID_SD_CHGFOIL_NAME "SD_HID_SD_CHGFOIL_NAME" + +#define HID_SD_HTMLEXPORT_DLG_DNAME "SD_HID_SD_HTMLEXPORT_DLG_DNAME" + +#define HID_FM_CTL_SELECTION "SD_HID_FM_CTL_SELECTION" + +#define HID_SD_AUTOPILOT_REGION "SD_HID_SD_AUTOPILOT_REGION" +#define HID_SD_AUTOPILOT_TEMPLATES "SD_HID_SD_AUTOPILOT_TEMPLATES" +#define HID_SD_AUTOPILOT_OPEN "SD_HID_SD_AUTOPILOT_OPEN" +#define HID_SD_AUTOPILOT_PAGETEMPLATES "SD_HID_SD_AUTOPILOT_PAGETEMPLATES" + +#define HID_SD_DRAW_GRAF_TOOLBOX "SD_HID_SD_DRAW_GRAF_TOOLBOX" + +#define HID_SD_FW_GRAFFILTERS "SD_HID_SD_FW_GRAFFILTERS" + +#define HID_SD_TABBAR_PAGES "SD_HID_SD_TABBAR_PAGES" +#define HID_SD_TABBAR_LAYERS "SD_HID_SD_TABBAR_LAYERS" + +#define HID_SD_UNDODELETEWARNING_DLG "SD_HID_SD_UNDODELETEWARNING_DLG" +#define HID_SD_UNDODELETEWARNING_CBX "SD_HID_SD_UNDODELETEWARNING_CBX" + +#define HID_SD_PAGEOBJSTLB "SD_HID_SD_PAGEOBJSTLB" + +#define HID_SD_NAMEDIALOG_OBJECT "SD_HID_SD_NAMEDIALOG_OBJECT" +#define HID_SD_NAMEDIALOG_PAGE "SD_HID_SD_NAMEDIALOG_PAGE" +#define HID_SD_NAMEDIALOG_LINEEND "SD_HID_SD_NAMEDIALOG_LINEEND" + +#define HID_SD_DRAW_3D_TOOLBOX "SD_HID_SD_DRAW_3D_TOOLBOX" +#define HID_SD_DRAW_FONTWORK_TOOLBOX "SD_HID_SD_DRAW_FONTWORK_TOOLBOX" + +#define HID_SD_TABPAGE_HEADERFOOTER_SLIDE "SD_HID_SD_TABPAGE_HEADERFOOTER_SLIDE" +#define HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT "SD_HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT" + +#define HID_SD_DRAW_MEDIA_TOOLBOX "SD_HID_SD_DRAW_MEDIA_TOOLBOX" + +#define HID_SD_TASK_PANE "SD_HID_SD_TASK_PANE" +#define HID_SD_SLIDE_DESIGNS "SD_HID_SD_SLIDE_DESIGNS" +#define HID_SD_CURRENT_MASTERS "SD_HID_SD_CURRENT_MASTERS" +#define HID_SD_RECENT_MASTERS "SD_HID_SD_RECENT_MASTERS" +#define HID_SD_ALL_MASTERS "SD_HID_SD_ALL_MASTERS" +#define HID_SD_SLIDE_LAYOUTS "SD_HID_SD_SLIDE_LAYOUTS" +#define HID_SD_CUSTOM_ANIMATIONS "SD_HID_SD_CUSTOM_ANIMATIONS" +#define HID_SD_SLIDE_TRANSITIONS "SD_HID_SD_SLIDE_TRANSITIONS" + +#define HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT "SD_HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT" +#define HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT "SD_HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT" +#define HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT "SD_HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT" +#define HID_SD_CUSTOMANIMATIONPANE_LB_START "SD_HID_SD_CUSTOMANIMATIONPANE_LB_START" +#define HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY "SD_HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY" +#define HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE "SD_HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE" +#define HID_SD_CUSTOMANIMATIONPANE_CB_SPEED "SD_HID_SD_CUSTOMANIMATIONPANE_CB_SPEED" +#define HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST "SD_HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST" +#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP "SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP" +#define HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN "SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN" +#define HID_SD_CUSTOMANIMATIONPANE_PB_PLAY "SD_HID_SD_CUSTOMANIMATIONPANE_PB_PLAY" +#define HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW "SD_HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW" +#define HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW "SD_HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW" + +#define HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES "SD_HID_SD_ANIMATIONSCHEMESPANE_LB_ANIMATION_SCHEMES" +#define HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_APPLY_TO_ALL" +#define HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_PLAY" +#define HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW "SD_HID_SD_ANIMATIONSCHEMESPANE_PB_SLIDE_SHOW" +#define HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW "SD_HID_SD_ANIMATIONSCHEMESPANE_CB_AUTO_PREVIEW" + +#define HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS "SD_HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS" +#define HID_SD_SLIDETRANSITIONPANE_LB_SPEED "SD_HID_SD_SLIDETRANSITIONPANE_LB_SPEED" +#define HID_SD_SLIDETRANSITIONPANE_LB_SOUND "SD_HID_SD_SLIDETRANSITIONPANE_LB_SOUND" +#define HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND "SD_HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND" +#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE" +#define HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO "SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO" +#define HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER "SD_HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER" +#define HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL "SD_HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL" +#define HID_SD_SLIDETRANSITIONPANE_PB_PLAY "SD_HID_SD_SLIDETRANSITIONPANE_PB_PLAY" +#define HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW "SD_HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW" +#define HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW "SD_HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW" + +#define HID_SD_TASK_PANE_VIEW_MENU "SD_HID_SD_TASK_PANE_VIEW_MENU" +#define HID_SD_TASK_PANE_PREVIEW_CURRENT "SD_HID_SD_TASK_PANE_PREVIEW_CURRENT" +#define HID_SD_TASK_PANE_PREVIEW_RECENT "SD_HID_SD_TASK_PANE_PREVIEW_RECENT" +#define HID_SD_TASK_PANE_PREVIEW_ALL "SD_HID_SD_TASK_PANE_PREVIEW_ALL" +#define HID_SD_TASK_PANE_PREVIEW_LAYOUTS "SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS" + +#define HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE "SD_HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE" +#define HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS "SD_HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS" +#define HID_SD_CUSTOMANIMATIONDIALOG_EXIT "SD_HID_SD_CUSTOMANIMATIONDIALOG_EXIT" +#define HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH "SD_HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH" +#define HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS "SD_HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS" + +#define HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX" +#define HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX "SD_HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX" + +#define HID_SD_SLIDESHOW_DISPLAY "SD_HID_SD_SLIDESHOW_DISPLAY" + +#define HID_SD_RULER_HORIZONTAL "SD_HID_SD_RULER_HORIZONTAL" +#define HID_SD_RULER_VERTICAL "SD_HID_SD_RULER_VERTICAL" #define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194) #define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195) @@ -276,6 +291,26 @@ #define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198) #define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199) -#define HID_SD_TABLE_DESIGN (HID_SD_START + 200) -#define HID_SD_ANNOTATIONS (HID_SD_START + 201) +#define HID_SD_TABLE_DESIGN "SD_HID_SD_TABLE_DESIGN" +#define HID_SD_ANNOTATIONS "SD_HID_SD_ANNOTATIONS" + +#define HID_DLG_INSERT_PAGES_OBJS "SD_HID_DLG_INSERT_PAGES_OBJS" +#define HID_TABPAGE_PARA_NUMBERING "SD_HID_TABPAGE_PARA_NUMBERING" +#define HID_VECTORIZE_DLG "SD_HID_VECTORIZE_DLG" +#define HID_UNDO_DELETE_WARNING "SD_HID_UNDO_DELETE_WARNING" + +#define HID_MN_SUB_GROUP "SD_HID_MN_SUB_GROUP" +#define HID_MN_SUB_GRAPHIC "SD_HID_MN_SUB_GRAPHIC" +#define HID_MN_SUB_SEND "SD_HID_MN_SUB_SEND" +#define HID_MN_SUB_MASTER_LAYOUTS "SD_HID_MN_SUB_MASTER_LAYOUTS" +#define HID_MN_SUB_VIEW "SD_HID_MN_SUB_VIEW" +#define HID_MN_SUB_MASTERPAGE "SD_HID_MN_SUB_MASTERPAGE" +#define HID_MN_SUB_FIELD "SD_HID_MN_SUB_FIELD" +#define HID_MN_SUB_TEMPLATES "SD_HID_MN_SUB_TEMPLATES" +#define HID_MN_SUB_SPELLING "SD_HID_MN_SUB_SPELLING" +#define HID_MN_SUB_POSITION "SD_HID_MN_SUB_POSITION" +#define HID_MN_SUB_OUTPUT_QUALITY "SD_HID_MN_SUB_OUTPUT_QUALITY" +#define HID_MN_SUB_PREVIEW_OUTPUT_QUALITY "SD_HID_MN_SUB_PREVIEW_OUTPUT_QUALITY" +#define HID_MN_SUB_CONVERT "SD_HID_MN_SUB_CONVERT" +#define HID_MN_SUB_MIRROR "SD_HID_MN_SUB_MIRROR" diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index e9ae8df1a192..28736c0d4f80 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -120,7 +120,7 @@ class AbstractSdInsertLayerDlg : public VclAbstractDialog //add for SdInsertLay public: virtual void GetAttr( SfxItemSet& rOutAttrs ) = 0; //from class ::Window - virtual void SetHelpId( ULONG nHelpId ) = 0; + virtual void SetHelpId( const rtl::OString& rHelpId ) = 0; }; class AbstractSdInsertPasteDlg : public VclAbstractDialog //add for SdInsertPasteDlg diff --git a/sd/inc/sdcommands.h b/sd/inc/sdcommands.h new file mode 100644 index 000000000000..d0c1c059cdbe --- /dev/null +++ b/sd/inc/sdcommands.h @@ -0,0 +1,310 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SD_SDCOMMANDS_HRC +#define SD_SDCOMMANDS_HRC + +#define CMD_SID_OBJECT_MIRROR ".uno:Mirror" +#define CMD_SID_OBJECT_CHOOSE_MODE ".uno:AdvancedMode" +#define CMD_SID_ANIMATION_EFFECTS ".uno:AnimationEffects" +#define CMD_SID_ANIMATION_OBJECTS ".uno:AnimationObjects" +#define CMD_SID_ANIMATOR_ADD ".uno:AnimatorAddObject" +#define CMD_SID_ANIMATOR_CREATE ".uno:AnimatorCreateObject" +#define CMD_SID_ANIMATOR_INIT ".uno:AnimatorInit" +#define CMD_SID_ANIMATOR_STATE ".uno:AnimatorState" +#define CMD_SID_DRAWTBX_ARROWS ".uno:ArrowsToolbox" +#define CMD_SID_MOREBACK ".uno:Backward" +#define CMD_SID_BEFORE_OBJ ".uno:BeforeObject" +#define CMD_SID_BEHIND_OBJ ".uno:BehindObject" +#define CMD_SID_BIG_HANDLES ".uno:BigHandles" +#define CMD_SID_BREAK ".uno:Break" +#define CMD_SID_CAPTUREPOINT ".uno:CapturePoint" +#define CMD_SID_CHANGEBEZIER ".uno:ChangeBezier" +#define CMD_SID_CHANGEPOLYGON ".uno:ChangePolygon" +#define CMD_SID_CLICK_CHANGE_ROTATION ".uno:ClickChangeRotation" +#define CMD_SID_OBJECT_CLOSE ".uno:CloseObject" +#define CMD_SID_COLORVIEW ".uno:ColorView" +#define CMD_SID_COMBINE ".uno:Combine" +#define CMD_SID_3D_CONE ".uno:Cone" +#define CMD_SID_CONNECT ".uno:Connect" +#define CMD_SID_TOOL_CONNECTOR ".uno:Connector" +#define CMD_SID_CONNECTOR_ARROW_END ".uno:ConnectorArrowEnd" +#define CMD_SID_CONNECTOR_ARROWS ".uno:ConnectorArrows" +#define CMD_SID_CONNECTOR_ARROW_START ".uno:ConnectorArrowStart" +#define CMD_SID_CONNECTION_DLG ".uno:ConnectorAttributes" +#define CMD_SID_CONNECTOR_CIRCLE_END ".uno:ConnectorCircleEnd" +#define CMD_SID_CONNECTOR_CIRCLES ".uno:ConnectorCircles" +#define CMD_SID_CONNECTOR_CIRCLE_START ".uno:ConnectorCircleStart" +#define CMD_SID_CONNECTOR_CURVE ".uno:ConnectorCurve" +#define CMD_SID_CONNECTOR_CURVE_ARROW_END ".uno:ConnectorCurveArrowEnd" +#define CMD_SID_CONNECTOR_CURVE_ARROWS ".uno:ConnectorCurveArrows" +#define CMD_SID_CONNECTOR_CURVE_ARROW_START ".uno:ConnectorCurveArrowStart" +#define CMD_SID_CONNECTOR_CURVE_CIRCLE_END ".uno:ConnectorCurveCircleEnd" +#define CMD_SID_CONNECTOR_CURVE_CIRCLES ".uno:ConnectorCurveCircles" +#define CMD_SID_CONNECTOR_CURVE_CIRCLE_START ".uno:ConnectorCurveCircleStart" +#define CMD_SID_CONNECTOR_LINE ".uno:ConnectorLine" +#define CMD_SID_CONNECTOR_LINE_ARROW_END ".uno:ConnectorLineArrowEnd" +#define CMD_SID_CONNECTOR_LINE_ARROWS ".uno:ConnectorLineArrows" +#define CMD_SID_CONNECTOR_LINE_ARROW_START ".uno:ConnectorLineArrowStart" +#define CMD_SID_CONNECTOR_LINE_CIRCLE_END ".uno:ConnectorLineCircleEnd" +#define CMD_SID_CONNECTOR_LINE_CIRCLES ".uno:ConnectorLineCircles" +#define CMD_SID_CONNECTOR_LINE_CIRCLE_START ".uno:ConnectorLineCircleStart" +#define CMD_SID_CONNECTOR_LINES ".uno:ConnectorLines" +#define CMD_SID_CONNECTOR_LINES_ARROW_END ".uno:ConnectorLinesArrowEnd" +#define CMD_SID_CONNECTOR_LINES_ARROWS ".uno:ConnectorLinesArrows" +#define CMD_SID_CONNECTOR_LINES_ARROW_START ".uno:ConnectorLinesArrowStart" +#define CMD_SID_CONNECTOR_LINES_CIRCLE_END ".uno:ConnectorLinesCircleEnd" +#define CMD_SID_CONNECTOR_LINES_CIRCLES ".uno:ConnectorLinesCircles" +#define CMD_SID_CONNECTOR_LINES_CIRCLE_START ".uno:ConnectorLinesCircleStart" +#define CMD_SID_DRAWTBX_CONNECTORS ".uno:ConnectorToolbox" +#define CMD_SID_CONVERT_TO_CONTOUR ".uno:convert_to_contour" +#define CMD_SID_CONVERT_TO_3D ".uno:ConvertInto3D" +#define CMD_SID_CONVERT_TO_3D_LATHE ".uno:ConvertInto3DLathe" +#define CMD_SID_CONVERT_TO_3D_LATHE_FAST ".uno:ConvertInto3DLatheFast" +#define CMD_SID_CONVERT_TO_BITMAP ".uno:ConvertIntoBitmap" +#define CMD_SID_CONVERT_TO_METAFILE ".uno:ConvertIntoMetaFile" +#define CMD_SID_CONVERT_TO_1BIT_MATRIX ".uno:ConvertTo1BitMatrix" +#define CMD_SID_CONVERT_TO_1BIT_THRESHOLD ".uno:ConvertTo1BitThreshold" +#define CMD_SID_CONVERT_TO_4BIT_COLORS ".uno:ConvertTo4BitColors" +#define CMD_SID_CONVERT_TO_4BIT_GRAYS ".uno:ConvertTo4BitGrays" +#define CMD_SID_CONVERT_TO_8BIT_COLORS ".uno:ConvertTo8BitColors" +#define CMD_SID_CONVERT_TO_8BIT_GRAYS ".uno:ConvertTo8BitGrays" +#define CMD_SID_CONVERT_TO_24BIT ".uno:ConvertToTrueColor" +#define CMD_SID_COPYOBJECTS ".uno:CopyObjects" +#define CMD_SID_OBJECT_CROOK_ROTATE ".uno:CrookRotate" +#define CMD_SID_OBJECT_CROOK_SLANT ".uno:CrookSlant" +#define CMD_SID_OBJECT_CROOK_STRETCH ".uno:CrookStretch" +#define CMD_SID_3D_CUBE ".uno:Cube" +#define CMD_SID_CUSTOMSHOW_DLG ".uno:CustomShowDialog" +#define CMD_SID_3D_CYLINDER ".uno:Cylinder" +#define CMD_SID_3D_PYRAMID ".uno:Cyramid" +#define CMD_SID_DELETE_LAYER ".uno:DeleteLayer" +#define CMD_SID_DELETE_PAGE ".uno:DeletePage" +#define CMD_SID_DELETE_SNAPITEM ".uno:DeleteSnapItem" +#define CMD_SID_UNSELECT ".uno:DeSelect" +#define CMD_SID_DIAMODE ".uno:DiaMode" +#define CMD_SID_DISMANTLE ".uno:Dismantle" +#define CMD_SID_DOUBLECLICK_TEXTEDIT ".uno:DoubleClickTextEdit" +#define CMD_SID_DRAWINGMODE ".uno:DrawingMode" +#define CMD_SID_DUPLICATE_PAGE ".uno:DuplicatePage" +#define CMD_SID_EDIT_HYPERLINK ".uno:EditHyperlink" +#define CMD_SID_EDIT_OUTLINER ".uno:EditOutline" +#define CMD_SID_CUSTOM_ANIMATION_PANEL ".uno:CustomAnimation" +#define CMD_SID_CUSTOM_ANIMATION_SCHEMES_PANEL ".uno:CustomAnimationSchemes" +#define CMD_SID_DRAWTBX_ELLIPSES ".uno:EllipseToolbox" +#define CMD_SID_EXPAND_PAGE ".uno:ExpandPage" +#define CMD_SID_SETFILLCOLOR ".uno:SetFillColor" +#define CMD_SID_MOREFRONT ".uno:Forward" +#define CMD_SID_GETBLUE ".uno:GetBlue" +#define CMD_SID_GETFILLSTYLE ".uno:GetFillStyle" +#define CMD_SID_GETGREEN ".uno:GetGreen" +#define CMD_SID_GETLINESTYLE ".uno:GetLineStyle" +#define CMD_SID_GETLINEWIDTH ".uno:GetLineWidth" +#define CMD_SID_GETRED ".uno:GetRed" +#define CMD_SID_GLUE_EDITMODE ".uno:GlueEditMode" +#define CMD_SID_GLUE_ESCDIR ".uno:GlueEscapeDirection" +#define CMD_SID_GLUE_ESCDIR_BOTTOM ".uno:GlueEscapeDirectionBottom" +#define CMD_SID_GLUE_ESCDIR_LEFT ".uno:GlueEscapeDirectionLeft" +#define CMD_SID_GLUE_ESCDIR_RIGHT ".uno:GlueEscapeDirectionRight" +#define CMD_SID_GLUE_ESCDIR_TOP ".uno:GlueEscapeDirectionTop" +#define CMD_SID_GLUE_HORZALIGN_CENTER ".uno:GlueHorzAlignCenter" +#define CMD_SID_GLUE_HORZALIGN_LEFT ".uno:GlueHorzAlignLeft" +#define CMD_SID_GLUE_HORZALIGN_RIGHT ".uno:GlueHorzAlignRight" +#define CMD_SID_GLUE_INSERT_POINT ".uno:GlueInsertPoint" +#define CMD_SID_GLUE_PERCENT ".uno:GluePercent" +#define CMD_SID_GLUE_VERTALIGN_BOTTOM ".uno:GlueVertAlignBottom" +#define CMD_SID_GLUE_VERTALIGN_CENTER ".uno:GlueVertAlignCenter" +#define CMD_SID_GLUE_VERTALIGN_TOP ".uno:GlueVertAlignTop" +#define CMD_SID_GRADIENT ".uno:Gradient" +#define CMD_SID_SETGRADENDCOLOR ".uno:GradientEndColor" +#define CMD_SID_SETGRADSTARTCOLOR ".uno:GradientStartColor" +#define CMD_SID_GRAPHIC_EXPORT ".uno:GraphicExport" +#define CMD_SID_GRID_FRONT ".uno:GridFront" +#define CMD_SID_3D_HALF_SPHERE ".uno:HalfSphere" +#define CMD_SID_HANDLES_DRAFT ".uno:HandlesDraft" +#define CMD_SID_HANDOUT_MASTERPAGE ".uno:HandoutMasterPage" +#define CMD_SID_HANDOUTMODE ".uno:HandoutMode" +#define CMD_SID_HATCH ".uno:Hatch" +#define CMD_SID_SETHATCHCOLOR ".uno:HatchColor" +#define CMD_SID_HELPLINES_FRONT ".uno:HelplinesFront" +#define CMD_SID_HELPLINES_USE ".uno:HelplinesUse" +#define CMD_SID_HELPLINES_VISIBLE ".uno:HelplinesVisible" +#define CMD_SID_HIDE_SLIDE ".uno:HideSlide" +#define CMD_SID_SHOW_SLIDE ".uno:ShowSlide" +#define CMD_SID_HYPHENATION ".uno:Hyphenation" +#define CMD_SID_INSERTFILE ".uno:ImportFromFile" +#define CMD_SID_INSERT_FLD_AUTHOR ".uno:InsertAuthorField" +#define CMD_SID_INSERT_FLD_DATE_FIX ".uno:InsertDateFieldFix" +#define CMD_SID_INSERT_FLD_DATE_VAR ".uno:InsertDateFieldVar" +#define CMD_SID_INSERT_FLD_FILE ".uno:InsertFileField" +#define CMD_SID_INSERTLAYER ".uno:InsertLayer" +#define CMD_SID_INSERTPAGE ".uno:InsertPage" +#define CMD_SID_INSERT_FLD_PAGE ".uno:InsertPageField" +#define CMD_SID_INSERT_FLD_PAGES ".uno:InsertPagesField" +#define CMD_SID_INSERTPAGE_QUICK ".uno:InsertPageQuick" +#define CMD_SID_INSERT_FLD_TIME_FIX ".uno:InsertTimeFieldFix" +#define CMD_SID_INSERT_FLD_TIME_VAR ".uno:InsertTimeFieldVar" +#define CMD_SID_DRAWTBX_INSERT ".uno:InsertToolbox" +#define CMD_SID_OBJECT_GRADIENT ".uno:InteractiveGradient" +#define CMD_SID_OBJECT_TRANSPARENCE ".uno:InteractiveTransparence" +#define CMD_SID_LAYERMODE ".uno:LayerMode" +#define CMD_SID_STATUS_LAYOUT ".uno:LayoutStatus" +#define CMD_SID_LEAVE_ALL_GROUPS ".uno:LeaveAllGroups" +#define CMD_SID_LINE_ARROW_CIRCLE ".uno:LineArrowCircle" +#define CMD_SID_LINE_ARROW_END ".uno:LineArrowEnd" +#define CMD_SID_LINE_ARROWS ".uno:LineArrows" +#define CMD_SID_LINE_ARROW_SQUARE ".uno:LineArrowSquare" +#define CMD_SID_LINE_ARROW_START ".uno:LineArrowStart" +#define CMD_SID_LINE_CIRCLE_ARROW ".uno:LineCircleArrow" +#define CMD_SID_SETLINECOLOR ".uno:LineColor" +#define CMD_SID_LINEEND_POLYGON ".uno:LineEndPolygon" +#define CMD_SID_LINE_SQUARE_ARROW ".uno:LineSquareArrow" +#define CMD_SID_LINETO ".uno:LineTo" +#define CMD_SID_DRAWTBX_LINES ".uno:LineToolbox" +#define CMD_SID_MANAGE_LINKS ".uno:ManageLinks" +#define CMD_SID_MASTERPAGE ".uno:MasterPage" +#define CMD_SID_MEASURE_DLG ".uno:MeasureAttributes" +#define CMD_SID_DRAW_MEASURELINE ".uno:MeasureLine" +#define CMD_SID_HORIZONTAL ".uno:MirrorHorz" +#define CMD_SID_VERTICAL ".uno:MirrorVert" +#define CMD_SID_MODIFY_FIELD ".uno:ModifyField" +#define CMD_SID_MODIFYLAYER ".uno:ModifyLayer" +#define CMD_SID_MODIFYPAGE ".uno:ModifyPage" +#define CMD_SID_ASSIGN_LAYOUT ".uno:AssignLayout" +#define CMD_SID_PRESENTATIONOBJECT ".uno:ModifyPresentationObject" +#define CMD_SID_POLYGON_MORPHING ".uno:Morphing" +#define CMD_SID_MOVETO ".uno:MoveTo" +#define CMD_SID_NAME_GROUP ".uno:NameGroup" +#define CMD_SID_OBJECT_TITLE_DESCRIPTION ".uno:ObjectTitleDescription" +#define CMD_SID_NAVIGATOR_INIT ".uno:NavigatorInit" +#define CMD_SID_NAVIGATOR_OBJECT ".uno:NavigatorObject" +#define CMD_SID_NAVIGATOR_PAGE ".uno:NavigatorPage" +#define CMD_SID_NAVIGATOR_PAGENAME ".uno:NavigatorPageName" +#define CMD_SID_NAVIGATOR_PEN ".uno:NavigatorPen" +#define CMD_SID_NAVIGATOR_STATE ".uno:NavigatorState" +#define CMD_SID_CONNECTION_NEW_ROUTING ".uno:NewRouting" +#define CMD_SID_NOTES_MASTERPAGE ".uno:NotesMasterPage" +#define CMD_SID_NOTESMODE ".uno:NotesMode" +#define CMD_SID_POSITION ".uno:ObjectPosition" +#define CMD_SID_DRAWTBX_3D_OBJECTS ".uno:Objects3DToolbox" +#define CMD_SID_ORIGINAL_SIZE ".uno:OriginalSize" +#define CMD_SID_SAVEGRAPHIC ".uno:SaveGraphic" +#define CMD_SID_OUTLINEMODE ".uno:OutlineMode" +#define CMD_SID_OUTPUT_QUALITY_BLACKWHITE ".uno:OutputQualityBlackWhite" +#define CMD_SID_OUTPUT_QUALITY_COLOR ".uno:OutputQualityColor" +#define CMD_SID_OUTPUT_QUALITY_CONTRAST ".uno:OutputQualityContrast" +#define CMD_SID_OUTPUT_QUALITY_GRAYSCALE ".uno:OutputQualityGrayscale" +#define CMD_SID_PACKNGO ".uno:PackAndGo" +#define CMD_SID_PAGEMARGIN ".uno:PageMargin" +#define CMD_SID_PAGEMODE ".uno:PageMode" +#define CMD_SID_PAGESETUP ".uno:PageSetup" +#define CMD_SID_PAGESIZE ".uno:PageSize" +#define CMD_SID_PAGES_PER_ROW ".uno:PagesPerRow" +#define CMD_SID_STATUS_PAGE ".uno:PageStatus" +#define CMD_SID_PARASPACE_DECREASE ".uno:ParaspaceDecrease" +#define CMD_SID_PARASPACE_INCREASE ".uno:ParaspaceIncrease" +#define CMD_SID_PICK_THROUGH ".uno:PickThrough" +#define CMD_SID_DRAW_POLYGON ".uno:Polygon" +#define CMD_SID_PRESENTATION ".uno:Presentation" +#define CMD_SID_PRESENTATION_DLG ".uno:PresentationDialog" +#define CMD_SID_PRESENTATION_END ".uno:PresentationEnd" +#define CMD_SID_CLEAR_UNDO_STACK ".uno:ClearUndoStack" +#define CMD_SID_PRESENTATION_LAYOUT ".uno:PresentationLayout" +#define CMD_SID_PREVIEW_STATE ".uno:PreviewState" +#define CMD_SID_PREVIEW_WIN ".uno:PreviewWindow" +#define CMD_SID_QUICKEDIT ".uno:QuickEdit" +#define CMD_SID_DRAWTBX_RECTANGLES ".uno:RectangleToolbox" +#define CMD_SID_REHEARSE_TIMINGS ".uno:RehearseTimings" +#define CMD_SID_RENAMELAYER ".uno:RenameLayer" +#define CMD_SID_RENAMEPAGE ".uno:RenamePage" +#define CMD_SID_RENAMEPAGE_QUICK ".uno:RenamePageQuick" +#define CMD_SID_REVERSE_ORDER ".uno:ReverseOrder" +#define CMD_SID_RULER_OBJECT ".uno:RulerObject" +#define CMD_SID_SELECTAT ".uno:SelectAt" +#define CMD_SID_SELECTGRADIENT ".uno:SelectGradient" +#define CMD_SID_SELECTHATCH ".uno:SelectHatch" +#define CMD_SID_SETFILLSTYLE ".uno:SetFillStyle" +#define CMD_SID_SETLINESTYLE ".uno:SetLineStyle" +#define CMD_SID_SETLINEWIDTH ".uno:SetLineWidth" +#define CMD_SID_SET_SNAPITEM ".uno:SetSnapItem" +#define CMD_SID_OBJECT_SHEAR ".uno:Shear" +#define CMD_SID_3D_SHELL ".uno:Shell3D" +#define CMD_SID_SLIDE_TRANSITIONS_PANEL ".uno:SlideChangeWindow" +#define CMD_SID_SLIDE_MASTERPAGE ".uno:SlideMasterPage" +#define CMD_SID_SNAP_BORDER ".uno:SnapBorder" +#define CMD_SID_SNAP_FRAME ".uno:SnapFrame" +#define CMD_SID_SNAP_POINTS ".uno:SnapPoints" +#define CMD_SID_SOLID_CREATE ".uno:SolidCreate" +#define CMD_SID_3D_SPHERE ".uno:Sphere" +#define CMD_SID_STARTAPP ".uno:StartApplication" +#define CMD_SID_SUMMARY_PAGE ".uno:SummaryPage" +#define CMD_SID_SWITCHLAYER ".uno:SwitchLayer" +#define CMD_SID_SWITCHPAGE ".uno:SwitchPage" +#define CMD_SID_SWITCH_POINTEDIT ".uno:SwitchPointEdit" +#define CMD_SID_TEXTALIGNMENT ".uno:TextAlignment" +#define CMD_SID_TEXTATTR_DLG ".uno:TextAttributes" +#define CMD_SID_TEXT_FITTOSIZE ".uno:TextFitToSizeTool" +#define CMD_SID_DRAWTBX_TEXT ".uno:TextToolbox" +#define CMD_SID_TITLE_MASTERPAGE ".uno:TitleMasterPage" +#define CMD_SID_3D_TORUS ".uno:Torus" +#define CMD_SID_TEXT_FITTOSIZE_VERTICAL ".uno:VerticalTextFitToSizeTool" +#define CMD_SID_ZOOM_PANNING ".uno:ZoomPanning" +#define CMD_SID_OBJECT_CROP ".uno:Crop" +#define CMD_SID_HEADER_AND_FOOTER ".uno:HeaderAndFooter" +#define CMD_SID_INSERT_PAGE_NUMBER ".uno:InsertPageNumber" +#define CMD_SID_INSERT_DATE_TIME ".uno:InsertDateAndTime" +#define CMD_SID_MASTER_LAYOUTS ".uno:MasterLayouts" +#define CMD_SID_DRAW_FONTWORK ".uno:DrawFontwork" +#define CMD_SID_DRAW_FONTWORK_VERTICAL ".uno:DrawFontworkVertical" +#define CMD_SID_LAYER_DIALOG_WIN ".uno:LayerDialogChildWindow" +#define CMD_SID_INSERT_MASTER_PAGE ".uno:InsertMasterPage" +#define CMD_SID_DELETE_MASTER_PAGE ".uno:DeleteMasterPage" +#define CMD_SID_RENAME_MASTER_PAGE ".uno:RenameMasterPage" +#define CMD_SID_CLOSE_MASTER_VIEW ".uno:CloseMasterView" +#define CMD_SID_SELECT_BACKGROUND ".uno:SelectBackground" +#define CMD_SID_DISPLAY_MASTER_BACKGROUND ".uno:DisplayMasterBackground" +#define CMD_SID_DISPLAY_MASTER_OBJECTS ".uno:DisplayMasterObjects" +#define CMD_SID_TABLE_TOOLBOX ".uno:TableToolBox" +#define CMD_SID_TABLE_DISTRIBUTE_COLUMNS ".uno:DistributeColumns" +#define CMD_SID_TABLE_DISTRIBUTE_ROWS ".uno:DistributeRows" +#define CMD_SID_TP_APPLY_TO_ALL_SLIDES ".uno:TaskPaneApplyToAllSlides" +#define CMD_SID_TP_APPLY_TO_SELECTED_SLIDES ".uno:TaskPaneApplyToSelectedSlides" +#define CMD_SID_TP_USE_FOR_NEW_PRESENTATIONS ".uno:TaskPaneUseForNewPresentations" +#define CMD_SID_TP_SHOW_SMALL_PREVIEW ".uno:TaskPaneShowSmallPreview" +#define CMD_SID_TP_SHOW_LARGE_PREVIEW ".uno:TaskPaneShowLargePreview" +#define CMD_SID_TP_EDIT_MASTER ".uno:TaskPaneEditMaster" +#define CMD_SID_INSERTPAGE_LAYOUT_MENU ".uno:TaskPaneInsertPage" +#define CMD_SID_SWITCH_SHELL ".uno:SwitchViewShell" +#define CMD_SID_SWITCH_SHELL_PANE ".uno:SwitchViewShellPane" +#define CMD_SID_LEFT_PANE_IMPRESS ".uno:LeftPaneImpress" +#define CMD_SID_LEFT_PANE_DRAW ".uno:LeftPaneDraw" +#define CMD_SID_RIGHT_PANE ".uno:RightPane" +#define CMD_SID_NOTES_WINDOW ".uno:NotesChildWindow" +#define CMD_SID_NORMAL_MULTI_PANE_GUI ".uno:NormalMultiPaneGUI" +#define CMD_SID_SLIDE_SORTER_MULTI_PANE_GUI ".uno:SlideSorterMultiPaneGUI" +#define CMD_SID_TASK_PANE ".uno:TaskPaneShowPanel" + +#endif diff --git a/sd/inc/sdmod.hxx b/sd/inc/sdmod.hxx index 0dad3ca237cb..568d855af5b9 100644 --- a/sd/inc/sdmod.hxx +++ b/sd/inc/sdmod.hxx @@ -114,8 +114,6 @@ public: void Execute(SfxRequest& rReq); void GetState(SfxItemSet&); - virtual void FillStatusBar(StatusBar& rBar); - SdOptions* GetSdOptions(DocumentType eDocType); SD_DLLPUBLIC SvStorageStreamRef GetOptionStream( const String& rOptionName, SdOptionStreamMode eMode ); diff --git a/sd/sdi/TaskPaneViewShell.sdi b/sd/sdi/TaskPaneViewShell.sdi index 22f0fba21265..8fcad18dbc22 100644 --- a/sd/sdi/TaskPaneViewShell.sdi +++ b/sd/sdi/TaskPaneViewShell.sdi @@ -24,184 +24,6 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ - -SfxVoidItem TaskPaneApplyToAllSlides SID_TP_APPLY_TO_ALL_SLIDES -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - -SfxVoidItem TaskPaneApplyToSelectedSlides SID_TP_APPLY_TO_SELECTED_SLIDES -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - -SfxVoidItem TaskPaneUseForNewPresentations SID_TP_USE_FOR_NEW_PRESENTATIONS -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - -SfxVoidItem TaskPaneShowSmallPreview SID_TP_SHOW_SMALL_PREVIEW -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - - -SfxVoidItem TaskPaneShowLargePreview SID_TP_SHOW_LARGE_PREVIEW -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - -SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - -SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - Readonly = TRUE, - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_INSERT; -] - - interface MasterPagesSelectorInterface { SID_TP_APPLY_TO_ALL_SLIDES diff --git a/sd/sdi/ViewShellBase.sdi b/sd/sdi/ViewShellBase.sdi index e9cb7119fa89..063c2307c220 100644 --- a/sd/sdi/ViewShellBase.sdi +++ b/sd/sdi/ViewShellBase.sdi @@ -25,245 +25,6 @@ * ************************************************************************/ -/** This item holds the requested type of view shell when calling the - SID_SWITCH_SHELL slot. -*/ -SfxInt32Item SwitchViewShell SID_SWITCH_SHELL -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - - -/** This item holds the requested pane of the multi pane GUI in which a - change of the view shell is requested by a call to the SID_SWITCH_SHELL - slot. -*/ -SfxInt32Item SwitchViewShellPane SID_SWITCH_SHELL_PANE -[ - // flags: - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - Readonly = FALSE, - - // config: - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - -SfxBoolItem LeftPaneImpress SID_LEFT_PANE_IMPRESS - -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_MODIFY; -] - -SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW - -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_MODIFY; -] - -SfxBoolItem RightPane SID_RIGHT_PANE - -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_MODIFY; -] - -SfxVoidItem NotesChildWindow SID_NOTES_WINDOW - -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = TRUE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - -SfxBoolItem NormalMultiPaneGUI SID_NORMAL_MULTI_PANE_GUI - -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = TRUE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_MODIFY; -] - -SfxBoolItem SlideSorterMultiPaneGUI SID_SLIDE_SORTER_MULTI_PANE_GUI - -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - Readonly = FALSE, - - /* config: */ - AccelConfig = TRUE, - MenuConfig = TRUE, - StatusBarConfig = FALSE, - ToolBoxConfig = TRUE, - GroupId = GID_MODIFY; -] - -SfxVoidItem TaskPaneShowPanel SID_TASK_PANE ( - SfxBoolItem IsPanelVisible ID_VAL_ISVISIBLE, - SfxUInt32Item PanelId ID_VAL_PANEL_INDEX) -[ - /* flags: */ - AutoUpdate = TRUE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = FALSE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = TRUE, - RecordAbsolute = FALSE, - RecordPerSet; - Synchron; - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_VIEW; -] - interface ViewShellBaseView { SID_SWITCH_SHELL diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi index 7c37e455276c..e619f3b9986b 100644 --- a/sd/sdi/sdraw.sdi +++ b/sd/sdi/sdraw.sdi @@ -6956,3 +6956,420 @@ SfxVoidItem DistributeRows SID_TABLE_DISTRIBUTE_ROWS ToolBoxConfig = TRUE, GroupId = GID_TABLE; ] + +SfxVoidItem TaskPaneApplyToAllSlides SID_TP_APPLY_TO_ALL_SLIDES +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + +SfxVoidItem TaskPaneApplyToSelectedSlides SID_TP_APPLY_TO_SELECTED_SLIDES +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + +SfxVoidItem TaskPaneUseForNewPresentations SID_TP_USE_FOR_NEW_PRESENTATIONS +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + +SfxVoidItem TaskPaneShowSmallPreview SID_TP_SHOW_SMALL_PREVIEW +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + + +SfxVoidItem TaskPaneShowLargePreview SID_TP_SHOW_LARGE_PREVIEW +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + +SfxVoidItem TaskPaneEditMaster SID_TP_EDIT_MASTER +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + +SfxVoidItem TaskPaneInsertPage SID_INSERTPAGE_LAYOUT_MENU +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + Readonly = TRUE, + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_INSERT; +] + +/** This item holds the requested type of view shell when calling the + SID_SWITCH_SHELL slot. +*/ +SfxInt32Item SwitchViewShell SID_SWITCH_SHELL +[ + /* flags: */ + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + + +/** This item holds the requested pane of the multi pane GUI in which a + change of the view shell is requested by a call to the SID_SWITCH_SHELL + slot. +*/ +SfxInt32Item SwitchViewShellPane SID_SWITCH_SHELL_PANE +[ + // flags: + AutoUpdate = FALSE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + Readonly = FALSE, + + // config: + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + +SfxBoolItem LeftPaneImpress SID_LEFT_PANE_IMPRESS + +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_MODIFY; +] + +SfxBoolItem LeftPaneDraw SID_LEFT_PANE_DRAW + +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_MODIFY; +] + +SfxBoolItem RightPane SID_RIGHT_PANE + +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_MODIFY; +] + +SfxVoidItem NotesChildWindow SID_NOTES_WINDOW + +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = TRUE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + +SfxBoolItem NormalMultiPaneGUI SID_NORMAL_MULTI_PANE_GUI + +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = TRUE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_MODIFY; +] + +SfxBoolItem SlideSorterMultiPaneGUI SID_SLIDE_SORTER_MULTI_PANE_GUI + +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = TRUE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = FALSE, + RecordAbsolute = FALSE, + RecordPerSet; + Asynchron; + + Readonly = FALSE, + + /* config: */ + AccelConfig = TRUE, + MenuConfig = TRUE, + StatusBarConfig = FALSE, + ToolBoxConfig = TRUE, + GroupId = GID_MODIFY; +] + +SfxVoidItem TaskPaneShowPanel SID_TASK_PANE ( + SfxBoolItem IsPanelVisible ID_VAL_ISVISIBLE, + SfxUInt32Item PanelId ID_VAL_PANEL_INDEX) +[ + /* flags: */ + AutoUpdate = TRUE, + Cachable = Cachable, + FastCall = FALSE, + HasCoreId = FALSE, + HasDialog = FALSE, + ReadOnlyDoc = FALSE, + Toggle = FALSE, + Container = TRUE, + RecordAbsolute = FALSE, + RecordPerSet; + Synchron; + + /* config: */ + AccelConfig = FALSE, + MenuConfig = FALSE, + StatusBarConfig = FALSE, + ToolBoxConfig = FALSE, + GroupId = GID_VIEW; +] + + diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index c2d975cb9429..99d04ffcf10a 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -81,7 +81,7 @@ const UINT16 nMagic = (UINT16)0x1977; #define KEY_QUALITY "JPG-EXPORT-QUALITY" // Die Help Ids der einzelnen Seiten -ULONG aPageHelpIds[NOOFPAGES] = +const char* aPageHelpIds[NOOFPAGES] = { HID_SD_HTMLEXPORT_PAGE1, HID_SD_HTMLEXPORT_PAGE2, @@ -478,8 +478,7 @@ SdPublishingDlg::SdPublishingDlg(Window* pWindow, DocumentType eDocType) SetDefaults(); - // FIXME: HELPID - SetHelpId(""/*aPageHelpIds[0]*/); + SetHelpId(aPageHelpIds[0]); aNextPageButton.GrabFocus(); } @@ -1287,9 +1286,7 @@ IMPL_LINK( SdPublishingDlg, FinishHdl, OKButton *, EMPTYARG ) void SdPublishingDlg::ChangePage() { int nPage = aAssistentFunc.GetCurrentPage(); - // FIXME: HELPID - (void)nPage; - SetHelpId(""/*aPageHelpIds[nPage-1]*/); + SetHelpId(aPageHelpIds[nPage-1]); UpdatePage(); diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 217bdd4267cb..3ac3d1f24a07 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -542,24 +542,19 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, Custo const CustomAnimationPresets& rPresets = CustomAnimationPresets::getCustomAnimationPresets(); mpTabPages[ENTRANCE] = new CustomAnimationCreateTabPage( mpTabControl, this, ENTRANCE, rPresets.getEntrancePresets(), bHasText ); - // FIXME: HELPID - mpTabPages[ENTRANCE]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE*/ ); + mpTabPages[ENTRANCE]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_ENTRANCE, mpTabPages[ENTRANCE] ); mpTabPages[EMPHASIS] = new CustomAnimationCreateTabPage( mpTabControl, this, EMPHASIS, rPresets.getEmphasisPresets(), bHasText ); - // FIXME: HELPID - mpTabPages[EMPHASIS]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS*/ ); + mpTabPages[EMPHASIS]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_EMPHASIS, mpTabPages[EMPHASIS] ); mpTabPages[EXIT] = new CustomAnimationCreateTabPage( mpTabControl, this, EXIT, rPresets.getExitPresets(), bHasText ); - // FIXME: HELPID - mpTabPages[EXIT]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_EXIT*/ ); + mpTabPages[EXIT]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_EXIT ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_EXIT, mpTabPages[EXIT] ); mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, this, MOTIONPATH, rPresets.getMotionPathsPresets(), bHasText ); - // FIXME: HELPID - mpTabPages[MOTIONPATH]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH*/ ); + mpTabPages[MOTIONPATH]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_MOTIONPATH, mpTabPages[MOTIONPATH] ); mpTabPages[MISCEFFECTS] = new CustomAnimationCreateTabPage( mpTabControl, this, MISCEFFECTS, rPresets.getMiscPresets(), bHasText ); - // FIXME: HELPID - mpTabPages[MISCEFFECTS]->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS*/ ); + mpTabPages[MISCEFFECTS]->SetHelpId( HID_SD_CUSTOMANIMATIONDIALOG_MISCEFFECTS ); mpTabControl->SetTabPage( RID_TP_CUSTOMANIMATION_MISCEFFECTS, mpTabPages[MISCEFFECTS] ); getCurrentPage()->setDuration( mfDuration ); diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index b1efd1cf1904..7f942562b951 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -144,8 +144,7 @@ PresetPropertyBox::PresetPropertyBox( sal_Int32 nControlType, Window* pParent, c mpControl = new ListBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); mpControl->SetDropDownLineCount( 10 ); mpControl->SetSelectHdl( rModifyHdl ); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX ); setValue( rValue, aPresetId ); @@ -231,8 +230,7 @@ ColorPropertyBox::ColorPropertyBox( sal_Int32 nControlType, Window* pParent, con mpControl = new ColorListBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); mpControl->SetDropDownLineCount( 10 ); mpControl->SetSelectHdl( rModifyHdl ); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_COLORPROPERTYBOX ); SfxObjectShell* pDocSh = SfxObjectShell::Current(); DBG_ASSERT( pDocSh, "DocShell not found!" ); @@ -324,8 +322,7 @@ FontPropertyBox::FontPropertyBox( sal_Int32 nControlType, Window* pParent, const mpControl = new FontNameBox( pParent, WB_BORDER|WB_TABSTOP|WB_DROPDOWN ); mpControl->SetDropDownLineCount( 10 ); mpControl->SetSelectHdl( rModifyHdl ); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_FONTPROPERTYBOX ); SfxObjectShell* pDocSh = SfxObjectShell::Current(); const SfxPoolItem* pItem; @@ -504,8 +501,7 @@ CharHeightPropertyBox::CharHeightPropertyBox( sal_Int32 nControlType, Window* pP mpControl = new DropdownMenuBox( pParent, mpMetric, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, CharHeightPropertyBox, implMenuSelectHdl )); mpControl->SetModifyHdl( rModifyHdl ); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_CHARHEIGHTPROPERTYBOX ); OUString aPresetId; setValue( rValue, aPresetId ); @@ -607,8 +603,7 @@ TransparencyPropertyBox::TransparencyPropertyBox( sal_Int32 nControlType, Window mpControl = new DropdownMenuBox( pParent, mpMetric, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, TransparencyPropertyBox, implMenuSelectHdl )); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX ); Link aLink( LINK( this, TransparencyPropertyBox, implModifyHdl ) ); mpControl->SetModifyHdl( aLink ); @@ -724,8 +719,7 @@ RotationPropertyBox::RotationPropertyBox( sal_Int32 nControlType, Window* pParen mpMenu = new PopupMenu(SdResId( RID_CUSTOMANIMATION_ROTATION_POPUP ) ); mpControl = new DropdownMenuBox( pParent, mpMetric, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, RotationPropertyBox, implMenuSelectHdl )); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_ROTATIONPROPERTYBOX ); Link aLink( LINK( this, RotationPropertyBox, implModifyHdl ) ); mpControl->SetModifyHdl( aLink ); @@ -866,8 +860,7 @@ ScalePropertyBox::ScalePropertyBox( sal_Int32 nControlType, Window* pParent, con mpMenu = new PopupMenu(SdResId( RID_CUSTOMANIMATION_SCALE_POPUP ) ); mpControl = new DropdownMenuBox( pParent, mpMetric, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, ScalePropertyBox, implMenuSelectHdl )); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX ); Link aLink( LINK( this, ScalePropertyBox, implModifyHdl ) ); mpControl->SetModifyHdl( aLink ); @@ -1046,8 +1039,7 @@ FontStylePropertyBox::FontStylePropertyBox( sal_Int32 nControlType, Window* pPar mpMenu = new PopupMenu(SdResId( RID_CUSTOMANIMATION_FONTSTYLE_POPUP ) ); mpControl = new DropdownMenuBox( pParent, mpEdit, mpMenu ); mpControl->SetMenuSelectHdl( LINK( this, FontStylePropertyBox, implMenuSelectHdl )); - // FIXME: HELPID - mpControl->SetHelpId( ""/*HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX*/ ); + mpControl->SetHelpId( HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX ); OUString aPresetId; setValue( rValue, aPresetId ); diff --git a/sd/source/ui/annotations/annotations.src b/sd/source/ui/annotations/annotations.src index 0ca43731d6b0..536d10f9a417 100644 --- a/sd/source/ui/annotations/annotations.src +++ b/sd/source/ui/annotations/annotations.src @@ -28,6 +28,7 @@ #include "annotations.hrc" #include "glob.hrc" #include +#include "helpids.h" Menu RID_ANNOTATION_CONTEXTMENU { @@ -36,7 +37,7 @@ Menu RID_ANNOTATION_CONTEXTMENU MenuItem { Identifier = SID_REPLYTO_POSTIT; - HelpID = SID_REPLYTO_POSTIT ; + HelpId = CMD_SID_REPLYTO_POSTIT ; Text [ en-US ] = "~Reply"; }; MenuItem @@ -46,25 +47,25 @@ Menu RID_ANNOTATION_CONTEXTMENU MenuItem { Identifier = SID_ATTR_CHAR_WEIGHT; - HelpID = SID_ATTR_CHAR_WEIGHT ; + HelpId = CMD_SID_ATTR_CHAR_WEIGHT ; Text [ en-US ] = "~Bold"; }; MenuItem { Identifier = SID_ATTR_CHAR_POSTURE; - HelpID = SID_ATTR_CHAR_POSTURE; + HelpId = CMD_SID_ATTR_CHAR_POSTURE; Text [ en-US ] = "~Italic"; }; MenuItem { Identifier = SID_ATTR_CHAR_UNDERLINE; - HelpID = SID_ATTR_CHAR_UNDERLINE; + HelpId = CMD_SID_ATTR_CHAR_UNDERLINE; Text [ en-US ] = "~Underline"; }; MenuItem { Identifier = SID_ATTR_CHAR_STRIKEOUT; - HelpID = SID_ATTR_CHAR_STRIKEOUT; + HelpId = CMD_SID_ATTR_CHAR_STRIKEOUT; Text [ en-US ] = "~Strikethrough"; }; MenuItem @@ -74,13 +75,13 @@ Menu RID_ANNOTATION_CONTEXTMENU MenuItem { Identifier = SID_COPY ; - HelpID = SID_COPY ; + HelpId = CMD_SID_COPY ; Text [ en-US ] = "~Copy" ; }; MenuItem { Identifier = SID_PASTE ; - HelpID = SID_PASTE ; + HelpId = CMD_SID_PASTE ; Text [ en-US ] = "~Paste" ; }; MenuItem @@ -90,19 +91,19 @@ Menu RID_ANNOTATION_CONTEXTMENU MenuItem { Identifier = SID_DELETE_POSTIT ; - HelpID = SID_DELETE_POSTIT; + HelpId = CMD_SID_DELETE_POSTIT; Text [ en-US ] = "~Delete Comment" ; }; MenuItem { Identifier = SID_DELETEALLBYAUTHOR_POSTIT ; - HelpID = SID_DELETEALLBYAUTHOR_POSTIT; + HelpId = CMD_SID_DELETEALLBYAUTHOR_POSTIT; Text [ en-US ] = "Delete All Comments b~y %1" ; }; MenuItem { Identifier = SID_DELETEALL_POSTIT; - HelpID = SID_DELETEALL_POSTIT; + HelpId = CMD_SID_DELETEALL_POSTIT; Text [ en-US ] = "Delete ~All Comments" ; }; }; @@ -115,7 +116,7 @@ Menu RID_ANNOTATION_TAG_CONTEXTMENU MenuItem { Identifier = SID_REPLYTO_POSTIT; - HelpID = SID_REPLYTO_POSTIT; + HelpId = CMD_SID_REPLYTO_POSTIT; Text [ en-US ] = "~Reply"; }; MenuItem @@ -125,19 +126,19 @@ Menu RID_ANNOTATION_TAG_CONTEXTMENU MenuItem { Identifier = SID_DELETE_POSTIT ; - HelpID = SID_DELETE_POSTIT ; + HelpId = CMD_SID_DELETE_POSTIT ; Text [ en-US ] = "~Delete Comment" ; }; MenuItem { Identifier = SID_DELETEALLBYAUTHOR_POSTIT ; - HelpID = SID_DELETEALLBYAUTHOR_POSTIT ; + HelpId = CMD_SID_DELETEALLBYAUTHOR_POSTIT ; Text [ en-US ] = "Delete All Comments ~by %1" ; }; MenuItem { Identifier = SID_DELETEALL_POSTIT; - HelpID = SID_DELETEALL_POSTIT; + HelpId = CMD_SID_DELETEALL_POSTIT; Text [ en-US ] = "Delete ~All Comments" ; }; }; diff --git a/sd/source/ui/app/makefile.mk b/sd/source/ui/app/makefile.mk index d64d9b672f7e..84d1d02e45f8 100644 --- a/sd/source/ui/app/makefile.mk +++ b/sd/source/ui/app/makefile.mk @@ -50,7 +50,6 @@ SRC1FILES = \ toolbox.src \ strings.src \ res_bmp.src \ - tbx_ww.src \ popup.src \ sdstring.src diff --git a/sd/source/ui/app/menuids2_tmpl.src b/sd/source/ui/app/menuids2_tmpl.src index 54b9ed6ba44c..9a7c7f39fae6 100644 --- a/sd/source/ui/app/menuids2_tmpl.src +++ b/sd/source/ui/app/menuids2_tmpl.src @@ -61,7 +61,7 @@ MenuItem\ {\ Identifier = SID_NEWDOCDIRECT ; \ - HelpID = SID_NEWDOCDIRECT ; \ + HelpId = CMD_SID_NEWDOCDIRECT ; \ Text [ en-US ] = "~New" ; \ }; @@ -69,7 +69,7 @@ MenuItem\ {\ Identifier = SID_EXPORTDOC ; \ - HelpID = SID_EXPORTDOC ; \ + HelpId = CMD_SID_EXPORTDOC ; \ Text [ en-US ] = "~Export..." ; \ }; @@ -77,7 +77,7 @@ MenuItem\ {\ Identifier = SID_EXPORTDOCASPDF ; \ - HelpID = SID_EXPORTDOCASPDF ; \ + HelpId = CMD_SID_EXPORTDOCASPDF ; \ Text [ en-US ] = "Export as PDF..." ; \ }; @@ -85,7 +85,7 @@ MenuItem\ {\ Identifier = MN_SUB_SEND ; \ - HelpID = MN_SUB_SEND ; \ + HelpID = HID_MN_SUB_SEND ; \ Command = ".uno:SendMenu" ; \ Text [ en-US ] = "Sen~d" ; \ SubMenu = Menu\ @@ -102,7 +102,7 @@ MenuItem\ {\ Identifier = SID_PAGESETUP ; \ - HelpID = SID_PAGESETUP ; \ + HelpId = CMD_SID_PAGESETUP ; \ Text [ en-US ] = "~Page..." ; \ }; // @@ -110,7 +110,7 @@ // #define MN_EDIT \ Identifier = 20 ; \ - HelpID = 20 ; \ + HelpID = "what a hack!" ; \ Command = ".uno:EditMenu"; \ Text [ en-US ] = "~Edit" ; \ @@ -118,7 +118,7 @@ MenuItem\ {\ Identifier = SID_PASTE2 ; \ - HelpID = SID_PASTE2 ; \ + HelpId = CMD_SID_PASTE2 ; \ Text [ en-US ] = "Paste ~Special..." ; \ }; @@ -126,7 +126,7 @@ MenuItem\ {\ Identifier = SID_COPYOBJECTS ; \ - HelpID = SID_COPYOBJECTS ; \ + HelpId = CMD_SID_COPYOBJECTS ; \ Text [ en-US ] = "Duplicat~e..." ; \ }; @@ -134,7 +134,7 @@ MenuItem\ {\ Identifier = SID_POLYGON_MORPHING ; \ - HelpID = SID_POLYGON_MORPHING ; \ + HelpId = CMD_SID_POLYGON_MORPHING ; \ Text [ en-US ] = "Cross-fading..." ; \ }; @@ -142,7 +142,7 @@ MenuItem\ {\ Identifier = SID_MODIFY_FIELD ; \ - HelpID = SID_MODIFY_FIELD ; \ + HelpId = CMD_SID_MODIFY_FIELD ; \ Text [ en-US ] = "F~ields..." ; \ }; @@ -150,7 +150,7 @@ MenuItem\ {\ Identifier = SID_DELETE_LAYER ; \ - HelpID = SID_DELETE_LAYER ; \ + HelpId = CMD_SID_DELETE_LAYER ; \ Text [ en-US ] = "Delete ~Layer..." ; \ }; @@ -158,7 +158,7 @@ MenuItem\ {\ Identifier = SID_MANAGE_LINKS ; \ - HelpID = SID_MANAGE_LINKS ; \ + HelpId = CMD_SID_MANAGE_LINKS ; \ Text [ en-US ] = "Lin~ks..." ; \ }; // @@ -166,7 +166,7 @@ // #define MN_VIEW \ Identifier = 23 ; \ - HelpID = 23 ; \ + HelpID = "what a hack!" ; \ Command = ".uno:ViewMenu" ; \ Text [ en-US ] = "~View" ; \ @@ -174,7 +174,7 @@ MenuItem\ {\ Identifier = SID_TOGGLETOOLBAR ; \ - HelpID = SID_TOGGLETOOLBAR ; \ + HelpId = CMD_SID_TOGGLETOOLBAR ; \ Text [ en-US ] = "Main ~Toolbar" ; \ }; @@ -182,7 +182,7 @@ MenuItem\ {\ Identifier = SID_TOGGLEOPTIONBAR ; \ - HelpID = SID_TOGGLEOPTIONBAR ; \ + HelpId = CMD_SID_TOGGLEOPTIONBAR ; \ Text [ en-US ] = "Optio~n Bar" ; \ }; @@ -190,7 +190,7 @@ MenuItem\ {\ Identifier = SID_TOGGLECOMMONTASKBAR ; \ - HelpID = SID_TOGGLECOMMONTASKBAR ; \ + HelpId = CMD_SID_TOGGLECOMMONTASKBAR ; \ Text [ en-US ] = "~Presentation" ; \ }; @@ -198,7 +198,7 @@ MenuItem\ {\ Identifier = SID_CUSTOMIZETOOLBOX ; \ - HelpID = SID_CUSTOMIZETOOLBOX ; \ + HelpId = CMD_SID_CUSTOMIZETOOLBOX ; \ Text [ en-US ] = "Customi~ze..." ; \ }; @@ -206,7 +206,7 @@ MenuItem\ {\ Identifier = SID_RULER ; \ - HelpID = SID_RULER ; \ + HelpId = CMD_SID_RULER ; \ Command = ".uno:ShowRuler" ; \ Text [ en-US ] = "~Rulers" ; \ }; @@ -216,7 +216,7 @@ MenuItem\ {\ Identifier = SID_NOTESMODE ; \ - HelpID = SID_NOTESMODE ; \ + HelpId = CMD_SID_NOTESMODE ; \ Check = TRUE ; \ Text [ en-US ] = "~Notes View" ; \ }; @@ -226,7 +226,7 @@ MenuItem\ {\ Identifier = SID_HANDOUTMODE ; \ - HelpID = SID_HANDOUTMODE ; \ + HelpId = CMD_SID_HANDOUTMODE ; \ Check = TRUE ; \ Text [ en-US ] = "~Handout View" ; \ }; @@ -235,7 +235,7 @@ MenuItem\ {\ Identifier = SID_PREVIEW_WIN ; \ - HelpID = SID_PREVIEW_WIN ; \ + HelpId = CMD_SID_PREVIEW_WIN ; \ Text [ en-US ] = "~Preview" ; \ }; @@ -243,7 +243,7 @@ MenuItem\ {\ Identifier = SID_PAGEMODE ; \ - HelpID = SID_PAGEMODE ; \ + HelpId = CMD_SID_PAGEMODE ; \ Check = TRUE ; \ Text [ en-US ] = "S~lide" ; \ }; @@ -252,7 +252,7 @@ MenuItem\ {\ Identifier = SID_SLIDE_MASTERPAGE ; \ - HelpID = SID_SLIDE_MASTERPAGE ; \ + HelpId = CMD_SID_SLIDE_MASTERPAGE ; \ Check = TRUE ; \ Text [ en-US ] = "~Slide Master" ; \ }; @@ -261,7 +261,7 @@ MenuItem\ {\ Identifier = SID_TITLE_MASTERPAGE ; \ - HelpID = SID_TITLE_MASTERPAGE ; \ + HelpId = CMD_SID_TITLE_MASTERPAGE ; \ Check = TRUE ; \ Text [ en-US ] = "~Title" ; \ }; @@ -270,7 +270,7 @@ MenuItem\ {\ Identifier = SID_NOTES_MASTERPAGE ; \ - HelpID = SID_NOTES_MASTERPAGE ; \ + HelpId = CMD_SID_NOTES_MASTERPAGE ; \ Check = TRUE ; \ Text [ en-US ] = "~Notes" ; \ }; @@ -279,7 +279,7 @@ MenuItem\ {\ Identifier = SID_HANDOUT_MASTERPAGE ; \ - HelpID = SID_HANDOUT_MASTERPAGE ; \ + HelpId = CMD_SID_HANDOUT_MASTERPAGE ; \ Check = TRUE ; \ Text [ en-US ] = "~Handout" ; \ }; @@ -288,7 +288,7 @@ MenuItem\ {\ Identifier = SID_LAYERMODE ; \ - HelpID = SID_LAYERMODE ; \ + HelpId = CMD_SID_LAYERMODE ; \ Check = TRUE ; \ Text [ en-US ] = "La~yer" ; \ }; @@ -297,7 +297,7 @@ MenuItem\ {\ Identifier = SID_HEADER_AND_FOOTER ; \ - HelpID = SID_HEADER_AND_FOOTER ; \ + HelpId = CMD_SID_HEADER_AND_FOOTER ; \ Text = "Kopf- und Fußzeile.."; \ }; @@ -305,7 +305,7 @@ MenuItem\ {\ Identifier = SID_INSERT_PAGE_NUMBER ; \ - HelpID = SID_INSERT_PAGE_NUMBER ; \ + HelpId = CMD_SID_INSERT_PAGE_NUMBER ; \ Text = "Seitenzahl..." ; \ }; @@ -313,7 +313,7 @@ MenuItem\ {\ Identifier = SID_INSERT_DATE_TIME ; \ - HelpID = SID_INSERT_DATE_TIME ; \ + HelpId = CMD_SID_INSERT_DATE_TIME ; \ Text = "Datum und Uhrzeit..." ; \ }; @@ -321,7 +321,7 @@ MenuItem\ {\ Identifier = MN_SUB_MASTER_LAYOUTS ; \ - HelpId = MN_SUB_MASTER_LAYOUTS; \ + HelpId = HID_MN_SUB_MASTER_LAYOUTS; \ Text = "Masterlayouts";\ SubMenu = Menu\ {\ @@ -330,19 +330,19 @@ MenuItem\ {\ Identifier = SID_MASTER_LAYOUTS_SLIDE ; \ - HelpID = SID_MASTER_LAYOUTS_SLIDE ; \ + HelpId = CMD_SID_MASTER_LAYOUTS_SLIDE ; \ Text = "Masterlayout..." ; \ };\ MenuItem\ {\ Identifier = SID_MASTER_LAYOUTS_NOTES ; \ - HelpID = SID_MASTER_LAYOUTS_NOTES ; \ + HelpId = CMD_SID_MASTER_LAYOUTS_NOTES ; \ Text = "Notizenmasterlayout..." ; \ };\ MenuItem\ {\ Identifier = SID_MASTER_LAYOUTS_HANDOUTS ; \ - HelpID = SID_MASTER_LAYOUTS_HANDOUTS ; \ + HelpId = CMD_SID_MASTER_LAYOUTS_HANDOUTS ; \ Text = "Handzettelmasterlayout..." ; \ };\ };\ @@ -354,7 +354,7 @@ MenuItem\ {\ Identifier = MN_SUB_VIEW ; \ - HelpID = MN_SUB_VIEW ; \ + HelpID = HID_MN_SUB_VIEW ; \ Command = ".uno:WorkspaceMenu" ; \ Text [ en-US ] = "Wor~kspace" ; \ SubMenu = Menu\ @@ -374,7 +374,7 @@ MenuItem\ {\ Identifier = MN_SUB_MASTERPAGE ; \ - HelpID = MN_SUB_MASTERPAGE ; \ + HelpID = HID_MN_SUB_MASTERPAGE ; \ Command = ".uno:MasterPageMenu" ; \ Text [ en-US ] = "~Master" ; \ SubMenu = Menu\ @@ -393,7 +393,7 @@ // #define MN_INSERT \ Identifier = 21 ; \ - HelpID = 21 ; \ + HelpID = "what a hack" ; \ Command = ".uno:InsertMenu" ; \ Text [ en-US ] = "~Insert" ; \ @@ -401,7 +401,7 @@ MenuItem\ {\ Identifier = SID_INSERTPAGE ; \ - HelpID = SID_INSERTPAGE ; \ + HelpId = CMD_SID_INSERTPAGE ; \ Text [ en-US ] = "Slid~e..." ; \ }; @@ -409,7 +409,7 @@ MenuItem\ {\ Identifier = SID_INSERTPAGE ; \ - HelpID = SID_INSERTPAGE ; \ + HelpId = CMD_SID_INSERTPAGE ; \ Text [ en-US ] = "Slid~e" ; \ }; @@ -417,7 +417,7 @@ MenuItem\ {\ Identifier = SID_DUPLICATE_PAGE ; \ - HelpID = SID_DUPLICATE_PAGE ; \ + HelpId = CMD_SID_DUPLICATE_PAGE ; \ Text [ en-US ] = "D~uplicate Slide" ; \ }; @@ -425,7 +425,7 @@ MenuItem\ {\ Identifier = SID_EXPAND_PAGE ; \ - HelpID = SID_EXPAND_PAGE ; \ + HelpId = CMD_SID_EXPAND_PAGE ; \ Text [ en-US ] = "E~xpand Slide" ; \ }; @@ -433,7 +433,7 @@ MenuItem\ {\ Identifier = SID_SUMMARY_PAGE ; \ - HelpID = SID_SUMMARY_PAGE ; \ + HelpId = CMD_SID_SUMMARY_PAGE ; \ Text [ en-US ] = "Su~mmary Slide" ; \ }; @@ -441,7 +441,7 @@ MenuItem\ {\ Identifier = SID_INSERTLAYER ; \ - HelpID = SID_INSERTLAYER ; \ + HelpId = CMD_SID_INSERTLAYER ; \ Text [ en-US ] = "~Layer..." ; \ }; @@ -449,7 +449,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_DATE_FIX ; \ - HelpID = SID_INSERT_FLD_DATE_FIX ; \ + HelpId = CMD_SID_INSERT_FLD_DATE_FIX ; \ Text [ en-US ] = "~Date (fixed)" ; \ }; @@ -457,7 +457,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_DATE_VAR ; \ - HelpID = SID_INSERT_FLD_DATE_VAR ; \ + HelpId = CMD_SID_INSERT_FLD_DATE_VAR ; \ Text [ en-US ] = "Dat~e (variable)" ; \ }; @@ -465,7 +465,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_TIME_FIX ; \ - HelpID = SID_INSERT_FLD_TIME_FIX ; \ + HelpId = CMD_SID_INSERT_FLD_TIME_FIX ; \ Text [ en-US ] = "~Time (fixed)" ; \ }; @@ -473,7 +473,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_TIME_VAR ; \ - HelpID = SID_INSERT_FLD_TIME_VAR ; \ + HelpId = CMD_SID_INSERT_FLD_TIME_VAR ; \ Text [ en-US ] = "T~ime (variable)" ; \ }; @@ -481,7 +481,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_PAGE ; \ - HelpID = SID_INSERT_FLD_PAGE ; \ + HelpId = CMD_SID_INSERT_FLD_PAGE ; \ Text [ en-US ] = "~Page Number" ; \ }; @@ -489,7 +489,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_FILE ; \ - HelpID = SID_INSERT_FLD_FILE ; \ + HelpId = CMD_SID_INSERT_FLD_FILE ; \ Text [ en-US ] = "~File Name" ; \ }; @@ -497,7 +497,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLD_AUTHOR ; \ - HelpID = SID_INSERT_FLD_AUTHOR ; \ + HelpId = CMD_SID_INSERT_FLD_AUTHOR ; \ Text [ en-US ] = "~Author" ; \ }; @@ -505,7 +505,7 @@ MenuItem\ {\ Identifier = SID_TWAIN_SELECT ; \ - HelpID = SID_TWAIN_SELECT ; \ + HelpId = CMD_SID_TWAIN_SELECT ; \ Text [ en-US ] = "~Select Source..." ; \ }; @@ -513,7 +513,7 @@ MenuItem\ {\ Identifier = SID_TWAIN_TRANSFER ; \ - HelpID = SID_TWAIN_TRANSFER ; \ + HelpId = CMD_SID_TWAIN_TRANSFER ; \ Text [ en-US ] = "~Request..." ; \ }; @@ -521,7 +521,7 @@ MenuItem\ {\ Identifier = SID_ATTR_TABLE ; \ - HelpID = SID_ATTR_TABLE ; \ + HelpId = CMD_SID_ATTR_TABLE ; \ Text [ en-US ] = "Sp~readsheet" ; \ }; @@ -536,7 +536,7 @@ MenuItem\ {\ Identifier = SID_INSERT_DIAGRAM ; \ - HelpID = SID_INSERT_DIAGRAM ; \ + HelpId = CMD_SID_INSERT_DIAGRAM ; \ Text [ en-US ] = "Chart" ; \ }; @@ -544,7 +544,7 @@ MenuItem\ {\ Identifier = SID_INSERT_FLOATINGFRAME ; \ - HelpID = SID_INSERT_FLOATINGFRAME ; \ + HelpId = CMD_SID_INSERT_FLOATINGFRAME ; \ Text [ en-US ] = "Float~ing Frame..." ; \ }; @@ -552,7 +552,7 @@ MenuItem\ {\ Identifier = SID_INSERTFILE ; \ - HelpID = SID_INSERTFILE ; \ + HelpId = CMD_SID_INSERTFILE ; \ Text [ en-US ] = "~File..." ; \ }; @@ -560,7 +560,7 @@ MenuItem\ {\ Identifier = MN_SUB_FIELD ; \ - HelpID = MN_SUB_FIELD ; \ + HelpID = HID_MN_SUB_FIELD ; \ Command = ".uno:FieldMenu" ; \ Text [ en-US ] = "Fiel~ds" ; \ SubMenu = Menu\ @@ -594,7 +594,7 @@ // #define MN_FORMAT \ Identifier = 22 ; \ - HelpID = 22 ; \ + HelpID = "what a hack!" ; \ Command = ".uno:FormatMenu" ; \ Text [ en-US ] = "F~ormat" ; \ @@ -602,7 +602,7 @@ MenuItem\ {\ Identifier = SID_TEXTATTR_DLG ; \ - HelpID = SID_TEXTATTR_DLG ; \ + HelpId = CMD_SID_TEXTATTR_DLG ; \ Text [ en-US ] = "Te~xt..." ; \ }; @@ -610,7 +610,7 @@ MenuItem\ {\ Identifier = SID_MEASURE_DLG ; \ - HelpID = SID_MEASURE_DLG ; \ + HelpId = CMD_SID_MEASURE_DLG ; \ Text [ en-US ] = "Dimen~sions..." ; \ }; @@ -618,7 +618,7 @@ MenuItem\ {\ Identifier = SID_CONNECTION_DLG ; \ - HelpID = SID_CONNECTION_DLG ; \ + HelpId = CMD_SID_CONNECTION_DLG ; \ Text [ en-US ] = "~Connector..." ; \ }; @@ -626,7 +626,7 @@ MenuItem\ {\ Identifier = SID_MODIFYLAYER ; \ - HelpID = SID_MODIFYLAYER ; \ + HelpId = CMD_SID_MODIFYLAYER ; \ Text [ en-US ] = "~Layer..." ; \ }; @@ -635,7 +635,7 @@ MenuItem\ {\ Identifier = SID_MODIFYPAGE ; \ - HelpID = SID_MODIFYPAGE ; \ + HelpId = CMD_SID_MODIFYPAGE ; \ Text [ en-US ] = "Modify ~Layout..." ; \ }; @@ -643,7 +643,7 @@ MenuItem\ {\ Identifier = MN_SUB_TEMPLATES ; \ - HelpID = MN_SUB_TEMPLATES ; \ + HelpID = HID_MN_SUB_TEMPLATES ; \ Command = ".uno:TemplatesMenu" ; \ Text [ en-US ] = "Styl~es" ; \ SubMenu = Menu\ @@ -661,7 +661,7 @@ // #define MN_EXTRAS \ Identifier = ITEM_TOOLS_ID ; \ - HelpID = 25 ; \ + HelpID = "what a hack!" ; \ Command = ".uno:ToolsMenu" ; \ Text [ en-US ] = "~Tools" ; \ @@ -671,7 +671,7 @@ /* ### ACHTUNG: Neuer Text in Resource! */ #define MN_SLIDESHOW \ Identifier = 26 ; \ - HelpID = 26 ; \ + HelpID = "what a hack!" ; \ Command = ".uno:SlideShowMenu" ; \ Text [ en-US ] = "~Slide Show" ; \ @@ -679,7 +679,7 @@ MenuItem\ {\ Identifier = SID_SPELL_DIALOG ; \ - HelpID = SID_SPELL_DIALOG ; \ + HelpId = CMD_SID_SPELL_DIALOG ; \ Text [ en-US ] = "~Check..." ; \ }; @@ -687,7 +687,7 @@ MenuItem\ {\ Identifier = SID_AUTOSPELL_CHECK ; \ - HelpID = SID_AUTOSPELL_CHECK ; \ + HelpId = CMD_SID_AUTOSPELL_CHECK ; \ Text [ en-US ] = "~AutoSpellcheck" ; \ }; @@ -695,7 +695,7 @@ MenuItem\ {\ Identifier = SID_THESAURUS ; \ - HelpID = SID_THESAURUS ; \ + HelpId = CMD_SID_THESAURUS ; \ Text [ en-US ] = "~Thesaurus..." ; \ }; @@ -703,7 +703,7 @@ MenuItem\ {\ Identifier = SID_HYPHENATION ; \ - HelpID = SID_HYPHENATION ; \ + HelpId = CMD_SID_HYPHENATION ; \ Text [ en-US ] = "~Hyphenation" ; \ }; @@ -711,7 +711,7 @@ MenuItem\ {\ Identifier = SID_AUTO_CORRECT_DLG ; \ - HelpID = SID_AUTO_CORRECT_DLG ; \ + HelpId = CMD_SID_AUTO_CORRECT_DLG ; \ Text [ en-US ] = "~AutoCorrect..." ; \ }; @@ -720,7 +720,7 @@ MenuItem\ {\ Identifier = SID_PRESENTATION_DLG ; \ - HelpID = SID_PRESENTATION_DLG ; \ + HelpId = CMD_SID_PRESENTATION_DLG ; \ Text [ en-US ] = "~Slide Show Settings..." ; \ }; @@ -729,7 +729,7 @@ MenuItem\ {\ Identifier = SID_CUSTOMSHOW_DLG ; \ - HelpID = SID_CUSTOMSHOW_DLG ; \ + HelpId = CMD_SID_CUSTOMSHOW_DLG ; \ Text [ en-US ] = "~Custom Slide Show..." ; \ }; @@ -737,7 +737,7 @@ MenuItem\ {\ Identifier = SID_ANIMATION_OBJECTS ; \ - HelpID = SID_ANIMATION_OBJECTS ; \ + HelpId = CMD_SID_ANIMATION_OBJECTS ; \ Text [ en-US ] = "~Animation" ; \ }; @@ -745,7 +745,7 @@ MenuItem\ {\ Identifier = SID_ANIMATION_EFFECTS ; \ - HelpID = SID_ANIMATION_EFFECTS ; \ + HelpId = CMD_SID_ANIMATION_EFFECTS ; \ Text [ en-US ] = "~Interaction..." ; \ }; @@ -753,7 +753,7 @@ MenuItem\ {\ Identifier = MN_SUB_SPELLING ; \ - HelpID = MN_SUB_SPELLING ; \ + HelpID = HID_MN_SUB_SPELLING ; \ Command = ".uno:SpellingMenu" ; \ Text [ en-US ] = "~Spellcheck" ; \ SubMenu = Menu\ @@ -770,7 +770,7 @@ // #define MN_MODIFY \ Identifier = 24 ; \ - HelpID = 24 ; \ + HelpID = "what a hack!" ; \ Command = ".uno:ModifyMenu" ; \ Text [ en-US ] = "~Modify" ; \ @@ -778,7 +778,7 @@ MenuItem\ {\ Identifier = SID_MOREFRONT ; \ - HelpID = SID_MOREFRONT ; \ + HelpId = CMD_SID_MOREFRONT ; \ Text [ en-US ] = "Bring ~Forward" ; \ }; @@ -786,7 +786,7 @@ MenuItem\ {\ Identifier = SID_MOREBACK ; \ - HelpID = SID_MOREBACK ; \ + HelpId = CMD_SID_MOREBACK ; \ Text [ en-US ] = "Send Back~ward" ; \ }; @@ -794,7 +794,7 @@ MenuItem\ {\ Identifier = SID_BEFORE_OBJ ; \ - HelpID = SID_BEFORE_OBJ ; \ + HelpId = CMD_SID_BEFORE_OBJ ; \ Text [ en-US ] = "In Front of ~Object" ; \ }; @@ -802,7 +802,7 @@ MenuItem\ {\ Identifier = SID_BEHIND_OBJ ; \ - HelpID = SID_BEHIND_OBJ ; \ + HelpId = CMD_SID_BEHIND_OBJ ; \ Text [ en-US ] = "Be~hind Object" ; \ }; @@ -810,7 +810,7 @@ MenuItem\ {\ Identifier = SID_REVERSE_ORDER ; \ - HelpID = SID_REVERSE_ORDER ; \ + HelpId = CMD_SID_REVERSE_ORDER ; \ Text [ en-US ] = "~Reverse" ; \ }; @@ -818,7 +818,7 @@ MenuItem\ {\ Identifier = SID_BMPMASK ; \ - HelpID = SID_BMPMASK ; \ + HelpId = CMD_SID_BMPMASK ; \ Text [ en-US ] = "~Eyedropper" ; \ }; @@ -826,7 +826,7 @@ MenuItem\ {\ Identifier = SID_GALLERY; \ - HelpID = SID_GALLERY; \ + HelpId = CMD_SID_GALLERY; \ Text [ en-US ] = "~Gallery" ; \ }; @@ -834,7 +834,7 @@ MenuItem\ {\ Identifier = SID_OUTPUT_QUALITY_COLOR ; \ - HelpID = SID_OUTPUT_QUALITY_COLOR ; \ + HelpId = CMD_SID_OUTPUT_QUALITY_COLOR ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Color" ; \ }; @@ -843,7 +843,7 @@ MenuItem\ {\ Identifier = SID_OUTPUT_QUALITY_GRAYSCALE ; \ - HelpID = SID_OUTPUT_QUALITY_GRAYSCALE ; \ + HelpId = CMD_SID_OUTPUT_QUALITY_GRAYSCALE ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Grayscale" ; \ }; @@ -852,7 +852,7 @@ MenuItem\ {\ Identifier = SID_OUTPUT_QUALITY_BLACKWHITE ; \ - HelpID = SID_OUTPUT_QUALITY_BLACKWHITE ; \ + HelpId = CMD_SID_OUTPUT_QUALITY_BLACKWHITE ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Black and White" ; \ }; @@ -861,7 +861,7 @@ MenuItem\ {\ Identifier = SID_OUTPUT_QUALITY_CONTRAST ; \ - HelpID = SID_OUTPUT_QUALITY_CONTRAST ; \ + HelpId = CMD_SID_OUTPUT_QUALITY_CONTRAST ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~High Contrast";\ }; @@ -870,7 +870,7 @@ MenuItem\ {\ Identifier = SID_PREVIEW_QUALITY_COLOR ; \ - HelpID = SID_PREVIEW_QUALITY_COLOR ; \ + HelpId = CMD_SID_PREVIEW_QUALITY_COLOR ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Color" ; \ }; @@ -879,7 +879,7 @@ MenuItem\ {\ Identifier = SID_PREVIEW_QUALITY_GRAYSCALE ; \ - HelpID = SID_PREVIEW_QUALITY_GRAYSCALE ; \ + HelpId = CMD_SID_PREVIEW_QUALITY_GRAYSCALE ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Grayscale" ; \ }; @@ -888,7 +888,7 @@ MenuItem\ {\ Identifier = SID_PREVIEW_QUALITY_BLACKWHITE ; \ - HelpID = SID_PREVIEW_QUALITY_BLACKWHITE ; \ + HelpId = CMD_SID_PREVIEW_QUALITY_BLACKWHITE ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Black and White" ; \ }; @@ -897,7 +897,7 @@ MenuItem\ {\ Identifier = SID_PREVIEW_QUALITY_CONTRAST ; \ - HelpID = SID_PREVIEW_QUALITY_CONTRAST ; \ + HelpId = CMD_SID_PREVIEW_QUALITY_CONTRAST ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~High Contrast";\ }; @@ -906,7 +906,7 @@ MenuItem\ {\ Identifier = MN_SUB_POSITION ; \ - HelpID = MN_SUB_POSITION ; \ + HelpID = HID_MN_SUB_POSITION ; \ Command = ".uno:ArrangeMenu" ; \ Text [ en-US ] = "~Arrange" ; \ SubMenu = Menu\ @@ -949,7 +949,7 @@ MenuItem\ {\ Identifier = MN_SUB_OUTPUT_QUALITY ; \ - HelpID = MN_SUB_OUTPUT_QUALITY ; \ + HelpID = HID_MN_SUB_OUTPUT_QUALITY ; \ Command = ".uno:DisplayQualityMenu" ; \ SubMenu = Menu\ {\ @@ -968,7 +968,7 @@ MenuItem\ {\ Identifier = MN_SUB_PREVIEW_OUTPUT_QUALITY ; \ - HelpID = MN_SUB_PREVIEW_OUTPUT_QUALITY ; \ + HelpID = HID_MN_SUB_PREVIEW_OUTPUT_QUALITY ; \ Command = ".uno:PreviewDisplayQualityMenu" ; \ SubMenu = Menu\ {\ @@ -987,7 +987,7 @@ MenuItem\ {\ Identifier = SID_MULTI_PANE_GUI ; \ - HelpID = SID_MULTI_PANE_GUI ; \ + HelpId = CMD_SID_MULTI_PANE_GUI ; \ Text = "Multi Pane GUI" ; \ SubMenu = Menu \ {\ @@ -996,21 +996,21 @@ MenuItem\ {\ Identifier = SID_TOOLPANEL ; \ - HelpID = SID_TOOLPANEL ; \ + HelpId = CMD_SID_TOOLPANEL ; \ Check = TRUE ; \ Text = "Tool Panel" ; \ };\ MenuItem\ {\ Identifier = SID_SLIDE_BROWSER ; \ - HelpID = SID_SLIDE_BROWSER ; \ + HelpId = CMD_SID_SLIDE_BROWSER ; \ Check = TRUE ; \ Text = "Slide Browser" ; \ };\ MenuItem\ {\ Identifier = SID_NOTES_WINDOW ; \ - HelpID = SID_NOTES_WINDOW ; \ + HelpId = CMD_SID_NOTES_WINDOW ; \ Check = TRUE ; \ Text = "Notes Window" ; \ };\ diff --git a/sd/source/ui/app/menuids3_tmpl.src b/sd/source/ui/app/menuids3_tmpl.src index 09a90fdc0649..aae782b5fe1e 100644 --- a/sd/source/ui/app/menuids3_tmpl.src +++ b/sd/source/ui/app/menuids3_tmpl.src @@ -32,7 +32,7 @@ MenuItem\ {\ Identifier = SID_CHANGEBEZIER ; \ - HelpID = SID_CHANGEBEZIER ; \ + HelpId = CMD_SID_CHANGEBEZIER ; \ Text [ en-US ] = "To ~Curve" ; \ }; @@ -40,7 +40,7 @@ MenuItem\ {\ Identifier = SID_CHANGEPOLYGON ; \ - HelpID = SID_CHANGEPOLYGON ; \ + HelpId = CMD_SID_CHANGEPOLYGON ; \ Text [ en-US ] = "To ~Polygon" ; \ }; @@ -48,7 +48,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_CONTOUR ; \ - HelpID = SID_CONVERT_TO_CONTOUR ; \ + HelpId = CMD_SID_CONVERT_TO_CONTOUR ; \ Text [ en-US ] = "To C~ontour";\ }; @@ -56,7 +56,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_3D ; \ - HelpID = SID_CONVERT_TO_3D ; \ + HelpId = CMD_SID_CONVERT_TO_3D ; \ Text [ en-US ] = "To 3~D" ; \ }; @@ -64,7 +64,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_BITMAP ; \ - HelpID = SID_CONVERT_TO_BITMAP ; \ + HelpId = CMD_SID_CONVERT_TO_BITMAP ; \ Text [ en-US ] = "To ~Bitmap" ; \ }; @@ -72,7 +72,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_METAFILE ; \ - HelpID = SID_CONVERT_TO_METAFILE ; \ + HelpId = CMD_SID_CONVERT_TO_METAFILE ; \ Text [ en-US ] = "To ~Metafile" ; \ }; @@ -80,7 +80,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_3D_LATHE_FAST ; \ - HelpID = SID_CONVERT_TO_3D_LATHE_FAST ; \ + HelpId = CMD_SID_CONVERT_TO_3D_LATHE_FAST ; \ /* ### ACHTUNG: Neuer Text in Resource? In 3~D-Rotationskörper : In 3~D-Rotationsk÷rper */\ Text [ en-US ] = "To 3D ~Rotation Object" ; \ }; @@ -89,7 +89,7 @@ MenuItem\ {\ Identifier = SID_VERTICAL ; \ - HelpID = SID_VERTICAL ; \ + HelpId = CMD_SID_VERTICAL ; \ Text [ en-US ] = "~Vertically" ; \ }; @@ -97,7 +97,7 @@ MenuItem\ {\ Identifier = SID_HORIZONTAL ; \ - HelpID = SID_HORIZONTAL ; \ + HelpId = CMD_SID_HORIZONTAL ; \ Text [ en-US ] = "~Horizontally" ; \ }; @@ -105,7 +105,7 @@ MenuItem\ {\ Identifier = SID_3D_WIN ; \ - HelpID = SID_3D_WIN ; \ + HelpId = CMD_SID_3D_WIN ; \ Text [ en-US ] = "~3D Effects" ; \ }; @@ -113,7 +113,7 @@ MenuItem\ {\ Identifier = SID_PRESENTATION_LAYOUT ; \ - HelpID = SID_PRESENTATION_LAYOUT ; \ + HelpId = CMD_SID_PRESENTATION_LAYOUT ; \ Text [ en-US ] = "~Slide Design" ; \ }; @@ -121,7 +121,7 @@ MenuItem\ {\ Identifier = SID_SLIDE_TRANSITIONS_PANEL ; \ - HelpID = SID_SLIDE_TRANSITIONS_PANEL ; \ + HelpId = CMD_SID_SLIDE_TRANSITIONS_PANEL ; \ Text [ en-US ] = "Slide ~Transition" ; \ }; @@ -129,7 +129,7 @@ MenuItem\ {\ Identifier = SID_SHOW_SLIDE ; \ - HelpID = SID_SHOW_SLIDE ; \ + HelpId = CMD_SID_SHOW_SLIDE ; \ Text [ en-US ] = "~Show Slide" ; \ }; @@ -137,7 +137,7 @@ MenuItem\ {\ Identifier = SID_HIDE_SLIDE ; \ - HelpID = SID_HIDE_SLIDE ; \ + HelpId = CMD_SID_HIDE_SLIDE ; \ Text [ en-US ] = "~Hide Slide" ; \ }; @@ -145,7 +145,7 @@ MenuItem\ {\ Identifier = SID_GROUP ; \ - HelpID = SID_GROUP ; \ + HelpId = CMD_SID_GROUP ; \ Text [ en-US ] = "~Group" ; \ }; @@ -153,7 +153,7 @@ MenuItem\ {\ Identifier = SID_UNGROUP ; \ - HelpID = SID_UNGROUP ; \ + HelpId = CMD_SID_UNGROUP ; \ Text [ en-US ] = "~Ungroup" ; \ }; @@ -161,7 +161,7 @@ MenuItem\ {\ Identifier = SID_ENTER_GROUP ; \ - HelpID = SID_ENTER_GROUP ; \ + HelpId = CMD_SID_ENTER_GROUP ; \ Text [ en-US ] = "~Edit Group" ; \ }; @@ -169,7 +169,7 @@ MenuItem\ {\ Identifier = SID_LEAVE_GROUP ; \ - HelpID = SID_LEAVE_GROUP ; \ + HelpId = CMD_SID_LEAVE_GROUP ; \ Text [ en-US ] = "E~xit group" ; \ }; @@ -177,7 +177,7 @@ MenuItem\ {\ Identifier = MN_SUB_GROUP ; \ - HelpID = MN_SUB_GROUP ; \ + HelpID = HID_MN_SUB_GROUP ; \ Command = ".uno:GroupMenu" ; \ Text [ en-US ] = "~Group" ; \ SubMenu = Menu\ diff --git a/sd/source/ui/app/menuids4_tmpl.src b/sd/source/ui/app/menuids4_tmpl.src index 9b077db8f22f..61a43aa6d8ba 100644 --- a/sd/source/ui/app/menuids4_tmpl.src +++ b/sd/source/ui/app/menuids4_tmpl.src @@ -36,7 +36,7 @@ MenuItem\ {\ Identifier = MN_SUB_GRAPHIC ; \ - HelpID = MN_SUB_GRAPHIC ; \ + HelpID = HID_MN_SUB_GRAPHIC ; \ Text [ en-US ] = "~Graphics" ; \ SubMenu = Menu\ {\ diff --git a/sd/source/ui/app/menuids_tmpl.src b/sd/source/ui/app/menuids_tmpl.src index e21caafaa739..1e313bbee2fc 100644 --- a/sd/source/ui/app/menuids_tmpl.src +++ b/sd/source/ui/app/menuids_tmpl.src @@ -27,6 +27,8 @@ #include #include "app.hrc" #include "res_bmp.hrc" +#include "helpids.h" + #define SEPARATOR MenuItem { Separator = TRUE; }; // DUMMY ist eine ID wo ein SubMenu folgt // (muss jeweils immer erhoeht werden!) @@ -37,7 +39,7 @@ MenuItem\ {\ Identifier = SID_DISTRIBUTE_DLG ; \ - HelpID = SID_DISTRIBUTE_DLG ; \ + HelpId = CMD_SID_DISTRIBUTE_DLG ; \ Text [ en-US ] = "~Distribution..." ; \ }; @@ -46,7 +48,7 @@ MenuItem\ {\ Identifier = SID_DRAWINGMODE ; \ - HelpID = SID_DRAWINGMODE ; \ + HelpId = CMD_SID_DRAWINGMODE ; \ Check = TRUE ; \ Text [ en-US ] = "~Drawing View" ; \ }; @@ -55,7 +57,7 @@ MenuItem\ {\ Identifier = SID_OUTLINEMODE ; \ - HelpID = SID_OUTLINEMODE ; \ + HelpId = CMD_SID_OUTLINEMODE ; \ Check = TRUE ; \ Text [ en-US ] = "~Outline View" ; \ }; @@ -64,7 +66,7 @@ MenuItem\ {\ Identifier = SID_DIAMODE ; \ - HelpID = SID_DIAMODE ; \ + HelpId = CMD_SID_DIAMODE ; \ Check = TRUE ; \ Text [ en-US ] = "~Slide Sorter" ; \ }; @@ -73,7 +75,7 @@ MenuItem\ {\ Identifier = SID_PRESENTATION ; \ - HelpID = SID_PRESENTATION ; \ + HelpId = CMD_SID_PRESENTATION ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Bildschirmpräsentation : ~Bildschirmpräsentation... */\ /* ### ACHTUNG: Neuer Text in Resource? ~Bildschirmpräsentation : ~Bildschirmpräsentation... */\ /* ### ACHTUNG: Neuer Text in Resource? ~Bildschirmpräsentation : ~Bildschirmprõsentation */\ @@ -85,7 +87,7 @@ MenuItem\ {\ Identifier = SID_CAPTUREPOINT ; \ - HelpID = SID_CAPTUREPOINT ; \ + HelpId = CMD_SID_CAPTUREPOINT ; \ /* ### ACHTUNG: Neuer Text in Resource? F~angpunkt/-linie einfügen... : F~angpunkt/-linie einf³gen... */\ /* ### ACHTUNG: Neuer Text in Resource? Fangpunkt oder -linie einfügen : Fangpunkt oder -linie einf³gen */\ Text [ en-US ] = "~Insert Snap Point/Line..." ; \ @@ -95,7 +97,7 @@ MenuItem\ {\ Identifier = SID_SET_SNAPITEM ; \ - HelpID = SID_SET_SNAPITEM ; \ + HelpId = CMD_SID_SET_SNAPITEM ; \ /* ### ACHTUNG: Neuer Text in Resource? Fangobjekt bearbeiten oder löschen : Fangobjekt bearbeiten oder l÷schen */\ Text [ en-US ] = "~Edit..." ; \ }; @@ -104,7 +106,7 @@ MenuItem\ {\ Identifier = SID_DELETE_SNAPITEM ; \ - HelpID = SID_DELETE_SNAPITEM ; \ + HelpId = CMD_SID_DELETE_SNAPITEM ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */\ /* ### ACHTUNG: Neuer Text in Resource? Fangobjekt löschen : Fangobjekt l÷schen */\ Text [ en-US ] = "~Delete" ; \ @@ -115,7 +117,7 @@ MenuItem\ {\ Identifier = SID_MODIFYPAGE ; \ - HelpID = SID_MODIFYPAGE ; \ + HelpId = CMD_SID_MODIFYPAGE ; \ Text [ en-US ] = "Slide ~Layout" ; \ }; @@ -123,7 +125,7 @@ MenuItem\ {\ Identifier = SID_PAGESETUP ; \ - HelpID = SID_PAGESETUP ; \ + HelpId = CMD_SID_PAGESETUP ; \ /* ### ACHTUNG: Neuer Text in Resource? Seitengröße, Ausrichtung, Rahmen festlegen : Seitengr÷˜e, Ausrichtung, Rahmen festlegen */\ Text [ en-US ] = "~Page Setup..." ; \ }; @@ -133,7 +135,7 @@ MenuItem\ {\ Identifier = SID_INSERTPAGE ; \ - HelpID = SID_INSERTPAGE ; \ + HelpId = CMD_SID_INSERTPAGE ; \ Text [ en-US ] = "~New Slide" ; \ }; @@ -141,7 +143,7 @@ MenuItem\ {\ Identifier = SID_INSERT_MASTER_PAGE ; \ - HelpID = SID_INSERT_MASTER_PAGE ; \ + HelpId = CMD_SID_INSERT_MASTER_PAGE ; \ Text [ en-US ] = "~New Master" ; \ }; @@ -149,28 +151,28 @@ MenuItem\ {\ Identifier = SID_INSERTPAGE ; \ - HelpID = SID_INSERTPAGE ; \ + HelpId = CMD_SID_INSERTPAGE ; \ Text [ en-US ] = "~New Page" ; \ }; #define MN_SELECT_BACKGROUND \ MenuItem\ {\ Identifier = SID_SELECT_BACKGROUND ; \ - HelpID = SID_SELECT_BACKGROUND ; \ + HelpId = CMD_SID_SELECT_BACKGROUND ; \ Text [ en-US ] = "Set Background Picture for Slide ..." ; \ }; #define MN_DISPLAY_MASTER_BACKGROUND \ MenuItem\ {\ Identifier = SID_DISPLAY_MASTER_BACKGROUND ; \ - HelpID = SID_DISPLAY_MASTER_BACKGROUND ; \ + HelpId = CMD_SID_DISPLAY_MASTER_BACKGROUND ; \ Text [ en-US ] = "Display Background of Master" ; \ }; #define MN_DISPLAY_MASTER_OBJECTS \ MenuItem\ {\ Identifier = SID_DISPLAY_MASTER_OBJECTS ; \ - HelpID = SID_DISPLAY_MASTER_OBJECTS ; \ + HelpId = CMD_SID_DISPLAY_MASTER_OBJECTS ; \ Text [ en-US ] = "Display Objects from Master" ; \ }; @@ -225,7 +227,7 @@ MenuItem\ {\ Identifier = SID_RENAMELAYER ; \ - HelpID = SID_RENAMELAYER ; \ + HelpId = CMD_SID_RENAMELAYER ; \ Text [ en-US ] = "~Rename Layer..." ; \ }; @@ -233,7 +235,7 @@ MenuItem\ {\ Identifier = SID_DELETE_PAGE ; \ - HelpID = SID_DELETE_PAGE ; \ + HelpId = CMD_SID_DELETE_PAGE ; \ Text [ en-US ] = "D~elete Slide" ; \ }; @@ -241,7 +243,7 @@ MenuItem\ {\ Identifier = SID_DELETE_MASTER_PAGE ; \ - HelpID = SID_DELETE_MASTER_PAGE ; \ + HelpId = CMD_SID_DELETE_MASTER_PAGE ; \ Text [ en-US ] = "D~elete Master" ; \ }; @@ -251,7 +253,7 @@ MenuItem\ {\ Identifier = SID_DELETE_PAGE ; \ - HelpID = SID_DELETE_PAGE ; \ + HelpId = CMD_SID_DELETE_PAGE ; \ Text [ en-US ] = "D~elete Page" ; \ }; @@ -259,7 +261,7 @@ MenuItem\ {\ Identifier = SID_RENAMEPAGE ; \ - HelpID = SID_RENAMEPAGE ; \ + HelpId = CMD_SID_RENAMEPAGE ; \ Text [ en-US ] = "~Rename Slide" ; \ }; @@ -267,7 +269,7 @@ MenuItem\ {\ Identifier = SID_RENAME_MASTER_PAGE ; \ - HelpID = SID_RENAME_MASTER_PAGE ; \ + HelpId = CMD_SID_RENAME_MASTER_PAGE ; \ Text [ en-US ] = "~Rename Master" ; \ }; @@ -275,7 +277,7 @@ MenuItem\ {\ Identifier = SID_RENAMEPAGE ; \ - HelpID = SID_RENAMEPAGE ; \ + HelpId = CMD_SID_RENAMEPAGE ; \ Text [ en-US ] = "~Rename Page" ; \ }; @@ -284,7 +286,7 @@ MenuItem\ {\ Identifier = SID_ATTRIBUTES_LINE ; \ - HelpID = SID_ATTRIBUTES_LINE ; \ + HelpId = CMD_SID_ATTRIBUTES_LINE ; \ Text [ en-US ] = "L~ine..." ; \ }; @@ -292,7 +294,7 @@ MenuItem\ {\ Identifier = SID_ATTRIBUTES_AREA ; \ - HelpID = SID_ATTRIBUTES_AREA ; \ + HelpId = CMD_SID_ATTRIBUTES_AREA ; \ Text [ en-US ] = "~Area..." ; \ }; @@ -300,7 +302,7 @@ MenuItem\ {\ Identifier = SID_TEXTATTR_DLG ; \ - HelpID = SID_TEXTATTR_DLG ; \ + HelpId = CMD_SID_TEXTATTR_DLG ; \ Text [ en-US ] = "~Text..." ; \ }; @@ -308,7 +310,7 @@ MenuItem\ {\ Identifier = SID_CONNECTION_DLG ; \ - HelpID = SID_CONNECTION_DLG ; \ + HelpId = CMD_SID_CONNECTION_DLG ; \ Text [ en-US ] = "~Connector..." ; \ }; @@ -316,7 +318,7 @@ MenuItem\ {\ Identifier = SID_CONNECTION_NEW_ROUTING ; \ - HelpID = SID_CONNECTION_NEW_ROUTING ; \ + HelpId = CMD_SID_CONNECTION_NEW_ROUTING ; \ /* ### ACHTUNG: Neuer Text in Resource? Linienverlauf ~zurücksetzen : Linienverlauf ~zur³cksetzen */\ Text [ en-US ] = "Reset ~Routing" ; \ }; @@ -325,7 +327,7 @@ MenuItem\ {\ Identifier = SID_MEASURE_DLG ; \ - HelpID = SID_MEASURE_DLG ; \ + HelpId = CMD_SID_MEASURE_DLG ; \ /* ### ACHTUNG: Neuer Text in Resource? Bema~ßung... : Bema~˜ung... */\ Text [ en-US ] = "Dimen~sions..." ; \ }; @@ -334,7 +336,7 @@ MenuItem\ {\ Identifier = SID_ATTR_TRANSFORM ; \ - HelpID = SID_ATTR_TRANSFORM ; \ + HelpId = CMD_SID_ATTR_TRANSFORM ; \ Text [ en-US ] = "Position and Si~ze..." ; \ }; @@ -342,7 +344,7 @@ MenuItem\ {\ Identifier = SID_BEZIER_EDIT ; \ - HelpID = SID_BEZIER_EDIT ; \ + HelpId = CMD_SID_BEZIER_EDIT ; \ Text [ en-US ] = "Edit ~Points" ; \ }; @@ -351,7 +353,7 @@ MenuItem\ {\ Identifier = SID_POSITION ; \ - HelpID = SID_POSITION ; \ + HelpId = CMD_SID_POSITION ; \ Command = ".uno:ObjectPosition"; \ Text [ en-US ] = "Arra~nge" ; \ SubMenu = Menu\ @@ -361,25 +363,25 @@ MenuItem\ {\ Identifier = SID_FRAME_TO_TOP ; \ - HelpID = SID_FRAME_TO_TOP ; \ + HelpId = CMD_SID_FRAME_TO_TOP ; \ Text [ en-US ] = "~Bring to Front" ; \ };\ MenuItem\ {\ Identifier = SID_MOREFRONT ; \ - HelpID = SID_MOREFRONT ; \ + HelpId = CMD_SID_MOREFRONT ; \ Text [ en-US ] = "Bring ~Forward" ; \ };\ MenuItem\ {\ Identifier = SID_MOREBACK ; \ - HelpID = SID_MOREBACK ; \ + HelpId = CMD_SID_MOREBACK ; \ Text [ en-US ] = "Send Back~ward" ; \ };\ MenuItem\ {\ Identifier = SID_FRAME_TO_BOTTOM ; \ - HelpID = SID_FRAME_TO_BOTTOM ; \ + HelpId = CMD_SID_FRAME_TO_BOTTOM ; \ Text [ en-US ] = "~Send to Back" ; \ };\ MenuItem\ @@ -389,13 +391,13 @@ MenuItem\ {\ Identifier = SID_BEFORE_OBJ ; \ - HelpID = SID_BEFORE_OBJ ; \ + HelpId = CMD_SID_BEFORE_OBJ ; \ Text [ en-US ] = "In Front of ~Object" ; \ };\ MenuItem\ {\ Identifier = SID_BEHIND_OBJ ; \ - HelpID = SID_BEHIND_OBJ ; \ + HelpId = CMD_SID_BEHIND_OBJ ; \ Text [ en-US ] = "Be~hind Object" ; \ };\ MenuItem\ @@ -405,7 +407,7 @@ MenuItem\ {\ Identifier = SID_REVERSE_ORDER ; \ - HelpID = SID_REVERSE_ORDER ; \ + HelpId = CMD_SID_REVERSE_ORDER ; \ Text [ en-US ] = "~Reverse" ; \ };\ };\ @@ -417,7 +419,7 @@ MenuItem\ {\ Identifier = SID_CHAR_DLG ; \ - HelpID = SID_CHAR_DLG ; \ + HelpId = CMD_SID_CHAR_DLG ; \ Text [ en-US ] = "C~haracter..." ; \ /* ### ACHTUNG: Neuer Text in Resource? Zeichenattribute für den selektierten Bereich auswählen : Zeichenattribute f³r den selektierten Bereich auswõhlen */\ }; @@ -426,7 +428,7 @@ MN_CHAR \ MenuItem {\ Identifier = SID_PARA_DLG;\ - HelpID = SID_PARA_DLG;\ + HelpId = CMD_SID_PARA_DLG;\ Text [ en-US ] = "P~aragraph...";\ }; @@ -434,13 +436,13 @@ MenuItem\ {\ Identifier = SID_ATTR_CHAR_FONT ; \ - HelpID = SID_ATTR_CHAR_FONT ; \ + HelpId = CMD_SID_ATTR_CHAR_FONT ; \ Text [ en-US ] = "~Font" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_FONTHEIGHT ; \ - HelpID = SID_ATTR_CHAR_FONTHEIGHT ; \ + HelpId = CMD_SID_ATTR_CHAR_FONTHEIGHT ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Größe : ~Gr÷˜e */\ Text [ en-US ] = "~Size" ; \ };\ @@ -456,43 +458,43 @@ MenuItem\ {\ Identifier = SID_ATTR_CHAR_WEIGHT ; \ - HelpID = SID_ATTR_CHAR_WEIGHT ; \ + HelpId = CMD_SID_ATTR_CHAR_WEIGHT ; \ Text [ en-US ] = "Bold" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_POSTURE ; \ - HelpID = SID_ATTR_CHAR_POSTURE ; \ + HelpId = CMD_SID_ATTR_CHAR_POSTURE ; \ Text [ en-US ] = "Italic" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_OVERLINE ; \ - HelpID = SID_ATTR_CHAR_OVERLINE ; \ + HelpId = CMD_SID_ATTR_CHAR_OVERLINE ; \ Text [ en-US ] = "Overline" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_UNDERLINE ; \ - HelpID = SID_ATTR_CHAR_UNDERLINE ; \ + HelpId = CMD_SID_ATTR_CHAR_UNDERLINE ; \ Text [ en-US ] = "Underline" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_STRIKEOUT ; \ - HelpID = SID_ATTR_CHAR_STRIKEOUT ; \ + HelpId = CMD_SID_ATTR_CHAR_STRIKEOUT ; \ Text [ en-US ] = "Strikethrough" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_SHADOWED ; \ - HelpID = SID_ATTR_CHAR_SHADOWED ; \ + HelpId = CMD_SID_ATTR_CHAR_SHADOWED ; \ Text [ en-US ] = "Shadow" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_CHAR_CONTOUR ; \ - HelpID = SID_ATTR_CHAR_CONTOUR ; \ + HelpId = CMD_SID_ATTR_CHAR_CONTOUR ; \ Text [ en-US ] = "~Contour" ; \ };\ };\ @@ -512,21 +514,21 @@ MenuItem\ {\ Identifier = SID_ATTR_PARA_LINESPACE_10 ; \ - HelpID = SID_ATTR_PARA_LINESPACE_10 ; \ + HelpId = CMD_SID_ATTR_PARA_LINESPACE_10 ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Single Line Spacing" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_PARA_LINESPACE_15 ; \ - HelpID = SID_ATTR_PARA_LINESPACE_15 ; \ + HelpId = CMD_SID_ATTR_PARA_LINESPACE_15 ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "1.5 Lines" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_PARA_LINESPACE_20 ; \ - HelpID = SID_ATTR_PARA_LINESPACE_20 ; \ + HelpId = CMD_SID_ATTR_PARA_LINESPACE_20 ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Double" ; \ };\ @@ -538,7 +540,7 @@ MenuItem\ {\ Identifier = SID_CHARMAP ; \ - HelpID = SID_CHARMAP ; \ + HelpId = CMD_SID_CHARMAP ; \ Text [ en-US ] = "S~pecial Character..." ; \ }; @@ -556,28 +558,28 @@ MenuItem\ {\ Identifier = SID_ATTR_PARA_ADJUST_LEFT ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ + HelpId = CMD_SID_ATTR_PARA_ADJUST_LEFT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Left" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_PARA_ADJUST_RIGHT ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ + HelpId = CMD_SID_ATTR_PARA_ADJUST_RIGHT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Right" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_PARA_ADJUST_CENTER ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ + HelpId = CMD_SID_ATTR_PARA_ADJUST_CENTER ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Centered" ; \ };\ MenuItem\ {\ Identifier = SID_ATTR_PARA_ADJUST_BLOCK ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ + HelpId = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Justified" ; \ };\ @@ -591,7 +593,7 @@ {\ Identifier = SID_OBJECT_ALIGN ; \ Command = ".uno:AlignObjetMenu" ; \ - HelpID = SID_OBJECT_ALIGN ; \ + HelpId = CMD_SID_OBJECT_ALIGN ; \ Text [ en-US ] = "Al~ignment" ; \ SubMenu = Menu\ {\ @@ -600,38 +602,38 @@ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN_LEFT ; \ - HelpID = SID_OBJECT_ALIGN_LEFT ; \ + HelpId = CMD_SID_OBJECT_ALIGN_LEFT ; \ Text [ en-US ] = "~Left" ; \ };\ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN_CENTER ; \ - HelpID = SID_OBJECT_ALIGN_CENTER ; \ + HelpId = CMD_SID_OBJECT_ALIGN_CENTER ; \ Text [ en-US ] = "~Centered" ; \ };\ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN_RIGHT ; \ - HelpID = SID_OBJECT_ALIGN_RIGHT ; \ + HelpId = CMD_SID_OBJECT_ALIGN_RIGHT ; \ Text [ en-US ] = "~Right" ; \ };\ SEPARATOR\ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN_UP ; \ - HelpID = SID_OBJECT_ALIGN_UP ; \ + HelpId = CMD_SID_OBJECT_ALIGN_UP ; \ Text [ en-US ] = "~Top" ; \ };\ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN_MIDDLE ; \ - HelpID = SID_OBJECT_ALIGN_MIDDLE ; \ + HelpId = CMD_SID_OBJECT_ALIGN_MIDDLE ; \ Text [ en-US ] = "C~enter" ; \ };\ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN_DOWN ; \ - HelpID = SID_OBJECT_ALIGN_DOWN ; \ + HelpId = CMD_SID_OBJECT_ALIGN_DOWN ; \ Text [ en-US ] = "~Bottom" ; \ };\ };\ @@ -643,7 +645,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_CLOSE ; \ - HelpID = SID_OBJECT_CLOSE ; \ + HelpId = CMD_SID_OBJECT_CLOSE ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Objekt schließen : ~Objekt schlie˜en */\ Text [ en-US ] = "Close ~Object" ; \ }; @@ -652,27 +654,27 @@ MenuItem\ {\ Identifier = SID_BEZIER_EDIT ; \ - HelpID = SID_BEZIER_EDIT ; \ + HelpId = CMD_SID_BEZIER_EDIT ; \ Text [ en-US ] = "Edit ~Points" ; \ };\ SEPARATOR\ MenuItem\ {\ Identifier = SID_BEZIER_MOVE ; \ - HelpID = SID_BEZIER_MOVE ; \ + HelpId = CMD_SID_BEZIER_MOVE ; \ Text [ en-US ] = "~Move Points" ; \ };\ MenuItem\ {\ Identifier = SID_BEZIER_INSERT ; \ - HelpID = SID_BEZIER_INSERT ; \ + HelpId = CMD_SID_BEZIER_INSERT ; \ /* ### ACHTUNG: Neuer Text in Resource? Punkte ~einfügen : Punkte ~einf³gen */\ Text [ en-US ] = "Insert ~Points" ; \ };\ MenuItem\ {\ Identifier = SID_BEZIER_DELETE ; \ - HelpID = SID_BEZIER_DELETE ; \ + HelpId = CMD_SID_BEZIER_DELETE ; \ /* ### ACHTUNG: Neuer Text in Resource? Punkte l~öschen : Punkte l~÷schen */\ Text [ en-US ] = "~Delete Points" ; \ };\ @@ -680,46 +682,46 @@ MenuItem\ {\ Identifier = SID_BEZIER_CLOSE ; \ - HelpID = SID_BEZIER_CLOSE ; \ + HelpId = CMD_SID_BEZIER_CLOSE ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Objekt schließen : ~Objekt schlie˜en */\ Text [ en-US ] = "Close ~Object" ; \ };\ MenuItem\ {\ Identifier = SID_BEZIER_CUTLINE ; \ - HelpID = SID_BEZIER_CUTLINE ; \ + HelpId = CMD_SID_BEZIER_CUTLINE ; \ Text [ en-US ] = "~Split Curve" ; \ };\ MenuItem\ {\ Identifier = SID_BEZIER_CONVERT ; \ - HelpID = SID_BEZIER_CONVERT ; \ + HelpId = CMD_SID_BEZIER_CONVERT ; \ Text [ en-US ] = "Con~vert to Curve" ; \ };\ SEPARATOR\ MenuItem\ {\ Identifier = SID_BEZIER_EDGE ; \ - HelpID = SID_BEZIER_EDGE ; \ + HelpId = CMD_SID_BEZIER_EDGE ; \ Text [ en-US ] = "~Corner" ; \ };\ MenuItem\ {\ Identifier = SID_BEZIER_SMOOTH ; \ - HelpID = SID_BEZIER_SMOOTH ; \ + HelpId = CMD_SID_BEZIER_SMOOTH ; \ Text [ en-US ] = "Smoot~h" ; \ };\ MenuItem\ {\ Identifier = SID_BEZIER_SYMMTR ; \ - HelpID = SID_BEZIER_SYMMTR ; \ + HelpId = CMD_SID_BEZIER_SYMMTR ; \ Text [ en-US ] = "S~ymmetric" ; \ };\ SEPARATOR\ MenuItem\ {\ Identifier = SID_BEZIER_ELIMINATE_POINTS ; \ - HelpID = SID_BEZIER_ELIMINATE_POINTS ; \ + HelpId = CMD_SID_BEZIER_ELIMINATE_POINTS ; \ Text [ en-US ] = "~Reduce Points" ; \ }; @@ -728,7 +730,7 @@ MenuItem\ {\ Identifier = SID_GROUP ; \ - HelpID = SID_GROUP ; \ + HelpId = CMD_SID_GROUP ; \ Text [ en-US ] = "~Group" ; \ /* ### ACHTUNG: Neuer Text in Resource? Ausgewählte Objekte gruppieren : Ausgewõhlte Objekte gruppieren */\ }; @@ -737,7 +739,7 @@ MenuItem\ {\ Identifier = SID_UNGROUP ; \ - HelpID = SID_UNGROUP ; \ + HelpId = CMD_SID_UNGROUP ; \ Text [ en-US ] = "~Ungroup" ; \ }; @@ -745,7 +747,7 @@ MenuItem\ {\ Identifier = SID_COMBINE ; \ - HelpID = SID_COMBINE ; \ + HelpId = CMD_SID_COMBINE ; \ Text [ en-US ] = "Comb~ine" ; \ /* ### ACHTUNG: Neuer Text in Resource? Ausgewählte Objekte kombinieren : Ausgewõhlte Objekte kombinieren */\ }; @@ -754,7 +756,7 @@ MenuItem\ {\ Identifier = SID_DISMANTLE ; \ - HelpID = SID_DISMANTLE ; \ + HelpId = CMD_SID_DISMANTLE ; \ Text [ en-US ] = "~Split" ; \ }; @@ -762,7 +764,7 @@ MenuItem\ {\ Identifier = SID_ENTER_GROUP ; \ - HelpID = SID_ENTER_GROUP ; \ + HelpId = CMD_SID_ENTER_GROUP ; \ Text [ en-US ] = "~Enter Group" ; \ /* ### ACHTUNG: Neuer Text in Resource? Objekte der Gruppierung können bearbeitet werden : Objekte der Gruppierung k÷nnen bearbeitet werden */\ }; @@ -771,7 +773,7 @@ MenuItem\ {\ Identifier = SID_LEAVE_GROUP ; \ - HelpID = SID_LEAVE_GROUP ; \ + HelpId = CMD_SID_LEAVE_GROUP ; \ Text [ en-US ] = "E~xit Group" ; \ /* ### ACHTUNG: Neuer Text in Resource? Objekte der Gruppierung können nicht mehr bearbeitet werden : Objekte der Gruppierung k÷nnen nicht mehr bearbeitet werden */\ }; @@ -780,7 +782,7 @@ MenuItem\ {\ Identifier = SID_NAME_GROUP ; \ - HelpID = SID_NAME_GROUP ; \ + HelpId = CMD_SID_NAME_GROUP ; \ Text [ en-US ] = "Name..." ; \ }; @@ -789,7 +791,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_TITLE_DESCRIPTION; \ - HelpID = SID_OBJECT_TITLE_DESCRIPTION; \ + HelpId = CMD_SID_OBJECT_TITLE_DESCRIPTION; \ Text [ en-US ] = "Description..." ; \ }; @@ -798,7 +800,7 @@ MenuItem\ {\ Identifier = SID_REHEARSE_TIMINGS ; \ - HelpID = SID_REHEARSE_TIMINGS ; \ + HelpId = CMD_SID_REHEARSE_TIMINGS ; \ Text [ en-US ] = "~Rehearse Timings" ; \ }; @@ -806,7 +808,7 @@ MenuItem\ {\ Identifier = SID_CUSTOM_ANIMATION_PANEL ; \ - HelpID = SID_CUSTOM_ANIMATION_PANEL ; \ + HelpId = CMD_SID_CUSTOM_ANIMATION_PANEL ; \ Text [ en-US ] = "Custom Animation..." ; \ }; @@ -814,7 +816,7 @@ MenuItem\ {\ Identifier = SID_ANIMATION_EFFECTS ; \ - HelpID = SID_ANIMATION_EFFECTS ; \ + HelpId = CMD_SID_ANIMATION_EFFECTS ; \ Text [ en-US ] = "Int~eraction..." ; \ }; @@ -822,7 +824,7 @@ MenuItem\ {\ Identifier = SID_PRESENTATIONOBJECT ; \ - HelpID = SID_PRESENTATIONOBJECT ; \ + HelpId = CMD_SID_PRESENTATIONOBJECT ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Präsentationsobjekt... : ~Prõsentationsobjekt... */\ /* ### ACHTUNG: Neuer Text in Resource? Selektiertes Präsentationsobjekt bearbeiten : Selektiertes Prõsentationsobjekt bearbeiten */\ Text [ en-US ] = "Presentation ~Object..." ; \ @@ -833,7 +835,7 @@ MenuItem\ {\ Identifier = SID_DELETE ; \ - HelpID = SID_DELETE ; \ + HelpId = CMD_SID_DELETE ; \ /* ### ACHTUNG: Neuer Text in Resource? L~öschen : L~÷schen */\ Text [ en-US ] = "~Delete" ; \ /* ### ACHTUNG: Neuer Text in Resource? Alle selektierten Objekte löschen : Alle selektierten Objekte l÷schen */\ @@ -844,7 +846,7 @@ MenuItem\ {\ Identifier = SID_SET_DEFAULT ; \ - HelpID = SID_SET_DEFAULT ; \ + HelpId = CMD_SID_SET_DEFAULT ; \ Text [ en-US ] = "~Default" ; \ }; @@ -852,7 +854,7 @@ MenuItem\ {\ Identifier = SID_FONTWORK ; \ - HelpID = SID_FONTWORK ; \ + HelpId = CMD_SID_FONTWORK ; \ Text [ en-US ] = "F~ontwork" ; \ }; @@ -860,7 +862,7 @@ MenuItem\ {\ Identifier = SID_OBJECT ; \ - HelpID = SID_OBJECT ; \ + HelpId = CMD_SID_OBJECT ; \ Text [ en-US ] = "~OLE Object" ; \ }; @@ -868,7 +870,7 @@ MenuItem\ {\ Identifier = SID_ORIGINAL_SIZE ; \ - HelpID = SID_ORIGINAL_SIZE ; \ + HelpId = CMD_SID_ORIGINAL_SIZE ; \ Text [ en-US ] = "~Original Size" ; \ }; @@ -876,7 +878,7 @@ MenuItem\ {\ Identifier = SID_SAVEGRAPHIC ; \ - HelpID = SID_SAVEGRAPHIC ; \ + HelpId = CMD_SID_SAVEGRAPHIC ; \ Text [ en-US ] = "Save as Picture..." ; \ }; @@ -884,7 +886,7 @@ MenuItem\ {\ Identifier = SID_ATTR_GRAF_CROP ; \ - HelpID = SID_ATTR_GRAF_CROP ; \ + HelpId = CMD_SID_ATTR_GRAF_CROP ; \ Text [ en-US ] = "Crop Picture..." ; \ }; @@ -893,7 +895,7 @@ {\ Identifier = SID_NAVIGATOR ; \ Command = ".uno:Navigator" ; \ - HelpID = SID_NAVIGATOR ; \ + HelpId = CMD_SID_NAVIGATOR ; \ Text [ en-US ] = "Na~vigator" ; \ }; @@ -901,7 +903,7 @@ MenuItem\ {\ Identifier = SID_GLUE_INSERT_POINT ; \ - HelpID = SID_GLUE_INSERT_POINT ; \ + HelpId = CMD_SID_GLUE_INSERT_POINT ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Punkt einfügen : ~Punkt einf³gen */\ Text [ en-US ] = "Insert ~Point" ; \ }; @@ -910,7 +912,7 @@ MenuItem\ {\ Identifier = SID_GLUE_ESCDIR_LEFT ; \ - HelpID = SID_GLUE_ESCDIR_LEFT ; \ + HelpId = CMD_SID_GLUE_ESCDIR_LEFT ; \ Text [ en-US ] = "~Left" ; \ }; @@ -918,7 +920,7 @@ MenuItem\ {\ Identifier = SID_GLUE_ESCDIR_TOP ; \ - HelpID = SID_GLUE_ESCDIR_TOP ; \ + HelpId = CMD_SID_GLUE_ESCDIR_TOP ; \ Text [ en-US ] = "~Top" ; \ }; @@ -926,7 +928,7 @@ MenuItem\ {\ Identifier = SID_GLUE_ESCDIR_RIGHT ; \ - HelpID = SID_GLUE_ESCDIR_RIGHT ; \ + HelpId = CMD_SID_GLUE_ESCDIR_RIGHT ; \ Text [ en-US ] = "~Right" ; \ }; @@ -934,7 +936,7 @@ MenuItem\ {\ Identifier = SID_GLUE_ESCDIR_BOTTOM ; \ - HelpID = SID_GLUE_ESCDIR_BOTTOM ; \ + HelpId = CMD_SID_GLUE_ESCDIR_BOTTOM ; \ Text [ en-US ] = "~Bottom" ; \ }; @@ -942,7 +944,7 @@ MenuItem\ {\ Identifier = SID_GLUE_PERCENT ; \ - HelpID = SID_GLUE_PERCENT ; \ + HelpId = CMD_SID_GLUE_PERCENT ; \ Text [ en-US ] = "~Adapt Position to Object" ; \ }; @@ -950,7 +952,7 @@ MenuItem\ {\ Identifier = SID_GLUE_HORZALIGN_LEFT ; \ - HelpID = SID_GLUE_HORZALIGN_LEFT ; \ + HelpId = CMD_SID_GLUE_HORZALIGN_LEFT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Fixed ~Horizontal Left" ; \ }; @@ -959,7 +961,7 @@ MenuItem\ {\ Identifier = SID_GLUE_HORZALIGN_CENTER ; \ - HelpID = SID_GLUE_HORZALIGN_CENTER ; \ + HelpId = CMD_SID_GLUE_HORZALIGN_CENTER ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Fixed Horizontal ~Center" ; \ }; @@ -968,7 +970,7 @@ MenuItem\ {\ Identifier = SID_GLUE_HORZALIGN_RIGHT ; \ - HelpID = SID_GLUE_HORZALIGN_RIGHT ; \ + HelpId = CMD_SID_GLUE_HORZALIGN_RIGHT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Fixed Hori~zontal Right" ; \ }; @@ -977,7 +979,7 @@ MenuItem\ {\ Identifier = SID_GLUE_VERTALIGN_TOP ; \ - HelpID = SID_GLUE_VERTALIGN_TOP ; \ + HelpId = CMD_SID_GLUE_VERTALIGN_TOP ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Fixed ~Vertical Top" ; \ }; @@ -986,7 +988,7 @@ MenuItem\ {\ Identifier = SID_GLUE_VERTALIGN_CENTER ; \ - HelpID = SID_GLUE_VERTALIGN_CENTER ; \ + HelpId = CMD_SID_GLUE_VERTALIGN_CENTER ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Fixed V~ertical Center" ; \ }; @@ -995,7 +997,7 @@ MenuItem\ {\ Identifier = SID_GLUE_VERTALIGN_BOTTOM ; \ - HelpID = SID_GLUE_VERTALIGN_BOTTOM ; \ + HelpId = CMD_SID_GLUE_VERTALIGN_BOTTOM ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "Fixed Ver~tical Bottom" ; \ }; @@ -1004,7 +1006,7 @@ MenuItem\ {\ Identifier = SID_GRID_VISIBLE ; \ - HelpID = SID_GRID_VISIBLE ; \ + HelpId = CMD_SID_GRID_VISIBLE ; \ Text [ en-US ] = "~Visible Grid" ; \ }; @@ -1012,7 +1014,7 @@ MenuItem\ {\ Identifier = SID_GRID_USE ; \ - HelpID = SID_GRID_USE; \ + HelpId = CMD_SID_GRID_USE; \ Text [ en-US ] = "Snap to Grid"; \ }; @@ -1020,7 +1022,7 @@ MenuItem\ {\ Identifier = SID_GRID_FRONT ; \ - HelpID = SID_GRID_FRONT ; \ + HelpId = CMD_SID_GRID_FRONT ; \ Text [ en-US ] = "Grid to ~Front" ; \ }; @@ -1045,7 +1047,7 @@ MenuItem\ {\ Identifier = SID_HELPLINES_VISIBLE ; \ - HelpID = SID_HELPLINES_VISIBLE ; \ + HelpId = CMD_SID_HELPLINES_VISIBLE ; \ /* ### ACHTUNG: Neuer Text in Resource? ~Fanglinien sichtbar : ~Hilfslinien sichtbar */\ Text [ en-US ] = "~Snap Lines Visible" ; \ }; @@ -1054,7 +1056,7 @@ MenuItem\ {\ Identifier = SID_HELPLINES_USE ; \ - HelpID = SID_HELPLINES_USE ; \ + HelpId = CMD_SID_HELPLINES_USE ; \ Text [ en-US ] = "Snap to Snap Lines"; \ }; @@ -1062,7 +1064,7 @@ MenuItem\ {\ Identifier = SID_HELPLINES_FRONT ; \ - HelpID = SID_HELPLINES_FRONT ; \ + HelpId = CMD_SID_HELPLINES_FRONT ; \ /* ### ACHTUNG: Neuer Text in Resource? Fanglini~en vorn : H~ilfslinien vorn */\ Text [ en-US ] = "Snap Lines to Front" ; \ }; @@ -1088,7 +1090,7 @@ MenuItem\ {\ Identifier = SID_SHOW_BROWSER ; \ - HelpID = SID_SHOW_BROWSER ; \ + HelpId = CMD_SID_SHOW_BROWSER ; \ Text [ en-US ] = "Propert~ies..." ; \ }; @@ -1096,7 +1098,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_1BIT_THRESHOLD ; \ - HelpID = SID_CONVERT_TO_1BIT_THRESHOLD ; \ + HelpId = CMD_SID_CONVERT_TO_1BIT_THRESHOLD ; \ Text [ en-US ] = "1Bit ~Threshold" ; \ }; @@ -1104,7 +1106,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_1BIT_MATRIX ; \ - HelpID = SID_CONVERT_TO_1BIT_MATRIX ; \ + HelpId = CMD_SID_CONVERT_TO_1BIT_MATRIX ; \ Text [ en-US ] = "1 Bit ~Dithering" ; \ }; @@ -1112,7 +1114,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_4BIT_GRAYS ; \ - HelpID = SID_CONVERT_TO_4BIT_GRAYS ; \ + HelpId = CMD_SID_CONVERT_TO_4BIT_GRAYS ; \ Text [ en-US ] = "4 Bit G~rayscales" ; \ }; @@ -1120,7 +1122,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_4BIT_COLORS ; \ - HelpID = SID_CONVERT_TO_4BIT_COLORS ; \ + HelpId = CMD_SID_CONVERT_TO_4BIT_COLORS ; \ Text [ en-US ] = "4 Bit ~Color Palette" ; \ }; @@ -1128,7 +1130,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_8BIT_GRAYS ; \ - HelpID = SID_CONVERT_TO_8BIT_GRAYS ; \ + HelpId = CMD_SID_CONVERT_TO_8BIT_GRAYS ; \ Text [ en-US ] = "8 Bit Gr~ayscales" ; \ }; @@ -1136,7 +1138,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_8BIT_COLORS ; \ - HelpID = SID_CONVERT_TO_8BIT_COLORS ; \ + HelpId = CMD_SID_CONVERT_TO_8BIT_COLORS ; \ Text [ en-US ] = "8 Bit C~olor Palette" ; \ }; @@ -1144,7 +1146,7 @@ MenuItem\ {\ Identifier = SID_CONVERT_TO_24BIT ; \ - HelpID = SID_CONVERT_TO_24BIT ; \ + HelpId = CMD_SID_CONVERT_TO_24BIT ; \ Text [ en-US ] = "24 Bit ~True Colors" ; \ }; @@ -1175,7 +1177,7 @@ {\ Identifier = SID_CONVERT ; \ Command = ".uno:ConvertMenu" ; \ - HelpID = SID_CONVERT ; \ + HelpId = HID_MN_SUB_CONVERT ; \ Text [ en-US ] = "Con~vert" ; \ SubMenu = Menu\ {\ @@ -1196,7 +1198,7 @@ MenuItem\ {\ Identifier = SID_MIRROR ; \ - HelpID = SID_MIRROR ; \ + HelpId = HID_MN_SUB_MIRROR ; \ Command = ".uno:MirrorMenu" ; \ Text [ en-US ] = "~Flip" ; \ SubMenu = Menu\ @@ -1213,7 +1215,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_ROTATE ; \ - HelpID = SID_OBJECT_ROTATE ; \ + HelpId = CMD_SID_OBJECT_ROTATE ; \ Text [ en-US ] = "~Rotate";\ }; @@ -1221,7 +1223,7 @@ MenuItem\ {\ Identifier = SID_CONNECT ; \ - HelpID = SID_CONNECT ; \ + HelpId = CMD_SID_CONNECT ; \ Text [ en-US ] = "C~onnect" ; \ }; @@ -1229,7 +1231,7 @@ MenuItem\ {\ Identifier = SID_BREAK ; \ - HelpID = SID_BREAK ; \ + HelpId = CMD_SID_BREAK ; \ Text [ en-US ] = "~Break" ; \ }; @@ -1237,7 +1239,7 @@ MenuItem\ {\ Identifier = SID_STYLE_EDIT ; \ - HelpID = SID_STYLE_EDIT ; \ + HelpId = CMD_SID_STYLE_EDIT ; \ Text [ en-US ] = "Edit Style..." ; \ }; @@ -1245,7 +1247,7 @@ MenuItem\ {\ Identifier = SID_EDIT_HYPERLINK ; \ - HelpID = SID_EDIT_HYPERLINK ; \ + HelpId = CMD_SID_EDIT_HYPERLINK ; \ Text [ en-US ] = "H~yperlink..." ; \ }; @@ -1253,7 +1255,7 @@ MenuItem\ {\ Identifier = SID_BEZIER_EDIT ; \ - HelpID = SID_BEZIER_EDIT ; \ + HelpId = CMD_SID_BEZIER_EDIT ; \ Text [ en-US ] = "Poi~nts";\ }; @@ -1261,7 +1263,7 @@ MenuItem\ {\ Identifier = SID_GLUE_EDITMODE ; \ - HelpID = SID_GLUE_EDITMODE ; \ + HelpId = CMD_SID_GLUE_EDITMODE ; \ Text [ en-US ] = "~Glue Points";\ }; @@ -1278,25 +1280,25 @@ MenuItem \ {\ Identifier = SID_INSERTLAYER ; \ - HelpID = SID_INSERTLAYER ; \ + HelpId = CMD_SID_INSERTLAYER ; \ Text [ en-US ] = "~Insert";\ };\ MenuItem \ {\ Identifier = SID_MODIFYLAYER ; \ - HelpID = SID_MODIFYLAYER ; \ + HelpId = CMD_SID_MODIFYLAYER ; \ Text [ en-US ] = "~Modify";\ };\ MenuItem \ {\ Identifier = SID_DELETE_LAYER ; \ - HelpID = SID_DELETE_LAYER ; \ + HelpId = CMD_SID_DELETE_LAYER ; \ Text [ en-US ] = "Delete";\ };\ MenuItem \ {\ Identifier = SID_RENAMELAYER ; \ - HelpID = SID_RENAMELAYER ; \ + HelpId = CMD_SID_RENAMELAYER ; \ Text [ en-US ] = "~Rename";\ }; \ };\ diff --git a/sd/source/ui/app/popup.src b/sd/source/ui/app/popup.src index 54d25c998ff5..27f91bab3c6d 100644 --- a/sd/source/ui/app/popup.src +++ b/sd/source/ui/app/popup.src @@ -35,6 +35,7 @@ #ifndef _GLOBLMN_HRC #include #endif +#include "helpids.h" #define DEFINE_SLOTID_FOR_NUMBER_BULLETS SID_OUTLINE_BULLET @@ -82,7 +83,7 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP MenuItem { Identifier = SID_FORMAT_TABLE_DLG; - HelpID = SID_FORMAT_TABLE_DLG; + HelpId = CMD_SID_FORMAT_TABLE_DLG; Text [ en-US ] = "~Table..."; }; MenuItem @@ -97,32 +98,32 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP MenuItem { Identifier = SID_TABLE_MERGE_CELLS; - HelpID = SID_TABLE_MERGE_CELLS; + HelpId = CMD_SID_TABLE_MERGE_CELLS; Text [ en-US ] = "~Merge"; }; MenuItem { Identifier = SID_TABLE_SPLIT_CELLS; - HelpID = SID_TABLE_SPLIT_CELLS; + HelpId = CMD_SID_TABLE_SPLIT_CELLS; Text [ en-US ] = "~Split..."; }; SEPARATOR MenuItem { Identifier = SID_TABLE_VERT_NONE; - HelpID = SID_TABLE_VERT_NONE; + HelpId = CMD_SID_TABLE_VERT_NONE; Text [ en-US ] = "~Top"; }; MenuItem { Identifier = SID_TABLE_VERT_CENTER; - HelpID = SID_TABLE_VERT_CENTER; + HelpId = CMD_SID_TABLE_VERT_CENTER; Text [ en-US ] = "C~enter"; }; MenuItem { Identifier = SID_TABLE_VERT_BOTTOM; - HelpID = SID_TABLE_VERT_BOTTOM; + HelpId = CMD_SID_TABLE_VERT_BOTTOM; Text [ en-US ] = "~Bottom"; }; }; @@ -140,26 +141,26 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP MenuItem { Identifier = SID_TABLE_DISTRIBUTE_ROWS; - HelpID = SID_TABLE_DISTRIBUTE_ROWS; + HelpId = CMD_SID_TABLE_DISTRIBUTE_ROWS; Text [ en-US ] = "Space ~Equally"; }; SEPARATOR MenuItem { Identifier = SID_TABLE_SELECT_ROW; - HelpID = SID_TABLE_SELECT_ROW; + HelpId = CMD_SID_TABLE_SELECT_ROW; Text [ en-US ] = "~Select"; }; MenuItem { Identifier = SID_TABLE_INSERT_ROW_DLG; - HelpID = SID_TABLE_INSERT_ROW_DLG; + HelpId = CMD_SID_TABLE_INSERT_ROW_DLG; Text [ en-US ] = "~Insert..."; }; MenuItem { Identifier = SID_TABLE_DELETE_ROW; - HelpID = SID_TABLE_DELETE_ROW; + HelpId = CMD_SID_TABLE_DELETE_ROW; Text [ en-US ] = "~Delete"; }; }; @@ -177,26 +178,26 @@ Menu RID_DRAW_TABLEOBJ_INSIDE_POPUP MenuItem { Identifier = SID_TABLE_DISTRIBUTE_COLUMNS; - HelpID = SID_TABLE_DISTRIBUTE_COLUMNS; + HelpId = CMD_SID_TABLE_DISTRIBUTE_COLUMNS; Text [ en-US ] = "Space ~Equally"; }; SEPARATOR MenuItem { Identifier = SID_TABLE_SELECT_COL; - HelpID = SID_TABLE_SELECT_COL; + HelpId = CMD_SID_TABLE_SELECT_COL; Text [ en-US ] = "~Select"; }; MenuItem { Identifier = SID_TABLE_INSERT_COL_DLG; - HelpID = SID_TABLE_INSERT_COL_DLG; + HelpId = CMD_SID_TABLE_INSERT_COL_DLG; Text [ en-US ] = "~Insert..."; }; MenuItem { Identifier = SID_TABLE_DELETE_COL; - HelpID = SID_TABLE_DELETE_COL; + HelpId = CMD_SID_TABLE_DELETE_COL; Text [ en-US ] = "~Delete"; }; }; @@ -428,21 +429,21 @@ Menu RID_LAYERTAB_POPUP MenuItem { Identifier = SID_INSERTLAYER ; - HelpID = SID_INSERTLAYER ; + HelpId = CMD_SID_INSERTLAYER ; /* ### ACHTUNG: Neuer Text in Resource? ~Ebene einfügen... : ~Ebene einf³gen... */ Text [ en-US ] = "~Insert Layer..." ; }; MenuItem { Identifier = SID_MODIFYLAYER ; - HelpID = SID_MODIFYLAYER ; + HelpId = CMD_SID_MODIFYLAYER ; /* ### ACHTUNG: Neuer Text in Resource? E~bene ändern... : E~bene õndern... */ Text [ en-US ] = "Modify La~yer..." ; }; MenuItem { Identifier = SID_DELETE_LAYER ; - HelpID = SID_DELETE_LAYER ; + HelpId = CMD_SID_DELETE_LAYER ; /* ### ACHTUNG: Neuer Text in Resource? Ebe~ne löschen... : Ebe~ne l÷schen... */ Text [ en-US ] = "Delete ~Layer..." ; }; @@ -457,13 +458,13 @@ Menu RID_TASKPANE_MASTERPAGESSELECTOR_POPUP MenuItem { Identifier = SID_TP_APPLY_TO_ALL_SLIDES; - HelpID = SID_TP_APPLY_TO_ALL_SLIDES; + HelpId = CMD_SID_TP_APPLY_TO_ALL_SLIDES; Text [ en-US ] = "~Apply to All Slides"; }; MenuItem { Identifier = SID_TP_APPLY_TO_SELECTED_SLIDES; - HelpID = SID_TP_APPLY_TO_SELECTED_SLIDES; + HelpId = CMD_SID_TP_APPLY_TO_SELECTED_SLIDES; Text [ en-US ] = "Apply to ~Selected Slides"; }; @@ -472,13 +473,13 @@ Menu RID_TASKPANE_MASTERPAGESSELECTOR_POPUP MenuItem { Identifier = SID_TP_SHOW_LARGE_PREVIEW; - HelpID = SID_TP_SHOW_LARGE_PREVIEW; + HelpId = CMD_SID_TP_SHOW_LARGE_PREVIEW; Text[ en-US ] = "Show ~Large Preview"; }; MenuItem { Identifier = SID_TP_SHOW_SMALL_PREVIEW; - HelpID = SID_TP_SHOW_SMALL_PREVIEW; + HelpId = CMD_SID_TP_SHOW_SMALL_PREVIEW; Text[ en-US ] = "Show S~mall Preview"; }; }; @@ -491,13 +492,13 @@ Menu RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP MenuItem { Identifier = SID_TP_APPLY_TO_ALL_SLIDES; - HelpID = SID_TP_APPLY_TO_ALL_SLIDES; + HelpId = CMD_SID_TP_APPLY_TO_ALL_SLIDES; Text [ en-US ] = "~Apply to All Slides"; }; MenuItem { Identifier = SID_TP_APPLY_TO_SELECTED_SLIDES; - HelpID = SID_TP_APPLY_TO_SELECTED_SLIDES; + HelpId = CMD_SID_TP_APPLY_TO_SELECTED_SLIDES; Text [ en-US ] = "Apply to ~Selected Slides"; }; @@ -507,7 +508,7 @@ Menu RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP MenuItem { Identifier = SID_TP_EDIT_MASTER; - HelpID = SID_TP_EDIT_MASTER; + HelpId = CMD_SID_TP_EDIT_MASTER; Text[ en-US ] = "~Edit Master..."; }; @@ -518,13 +519,13 @@ Menu RID_TASKPANE_CURRENT_MASTERPAGESSELECTOR_POPUP MenuItem { Identifier = SID_TP_SHOW_LARGE_PREVIEW; - HelpID = SID_TP_SHOW_LARGE_PREVIEW; + HelpId = CMD_SID_TP_SHOW_LARGE_PREVIEW; Text[ en-US ] = "Show ~Large Preview"; }; MenuItem { Identifier = SID_TP_SHOW_SMALL_PREVIEW; - HelpID = SID_TP_SHOW_SMALL_PREVIEW; + HelpId = CMD_SID_TP_SHOW_SMALL_PREVIEW; Text[ en-US ] = "Show S~mall Preview"; }; }; @@ -537,7 +538,7 @@ Menu RID_TASKPANE_LAYOUTMENU_POPUP MenuItem { Identifier = SID_TP_APPLY_TO_SELECTED_SLIDES; - HelpID = SID_TP_APPLY_TO_SELECTED_SLIDES; + HelpId = CMD_SID_TP_APPLY_TO_SELECTED_SLIDES; Text [ en-US ] = "Apply to ~Selected Slides"; }; @@ -546,7 +547,7 @@ Menu RID_TASKPANE_LAYOUTMENU_POPUP MenuItem { Identifier = SID_INSERTPAGE_LAYOUT_MENU; - HelpID = SID_INSERTPAGE_LAYOUT_MENU; + HelpId = CMD_SID_INSERTPAGE_LAYOUT_MENU; Text [ en-US ] = "~Insert Slide"; }; }; diff --git a/sd/source/ui/app/popup2_tmpl.src b/sd/source/ui/app/popup2_tmpl.src index 5ee8fb5e4d6a..c76c09df62e6 100644 --- a/sd/source/ui/app/popup2_tmpl.src +++ b/sd/source/ui/app/popup2_tmpl.src @@ -733,7 +733,7 @@ MenuItem { Identifier = SID_FORMAT_TABLE_DLG; - HelpID = SID_FORMAT_TABLE_DLG; + HelpId = CMD_SID_FORMAT_TABLE_DLG; Text [ en-US ] = "~Table..."; }; MenuItem @@ -748,32 +748,32 @@ MenuItem { Identifier = SID_TABLE_MERGE_CELLS; - HelpID = SID_TABLE_MERGE_CELLS; + HelpId = CMD_SID_TABLE_MERGE_CELLS; Text [ en-US ] = "~Merge"; }; MenuItem { Identifier = SID_TABLE_SPLIT_CELLS; - HelpID = SID_TABLE_SPLIT_CELLS; + HelpId = CMD_SID_TABLE_SPLIT_CELLS; Text [ en-US ] = "~Split..."; }; SEPARATOR MenuItem { Identifier = SID_TABLE_VERT_NONE; - HelpID = SID_TABLE_VERT_NONE; + HelpId = CMD_SID_TABLE_VERT_NONE; Text [ en-US ] = "~Top"; }; MenuItem { Identifier = SID_TABLE_VERT_CENTER; - HelpID = SID_TABLE_VERT_CENTER; + HelpId = CMD_SID_TABLE_VERT_CENTER; Text [ en-US ] = "C~enter"; }; MenuItem { Identifier = SID_TABLE_VERT_BOTTOM; - HelpID = SID_TABLE_VERT_BOTTOM; + HelpId = CMD_SID_TABLE_VERT_BOTTOM; Text [ en-US ] = "~Bottom"; }; }; @@ -791,26 +791,26 @@ MenuItem { Identifier = SID_TABLE_DISTRIBUTE_ROWS; - HelpID = SID_TABLE_DISTRIBUTE_ROWS; + HelpId = CMD_SID_TABLE_DISTRIBUTE_ROWS; Text [ en-US ] = "Space ~Equally"; }; SEPARATOR MenuItem { Identifier = SID_TABLE_SELECT_ROW; - HelpID = SID_TABLE_SELECT_ROW; + HelpId = CMD_SID_TABLE_SELECT_ROW; Text [ en-US ] = "~Select"; }; MenuItem { Identifier = SID_TABLE_INSERT_ROW_DLG; - HelpID = SID_TABLE_INSERT_ROW_DLG; + HelpId = CMD_SID_TABLE_INSERT_ROW_DLG; Text [ en-US ] = "~Insert..."; }; MenuItem { Identifier = SID_TABLE_DELETE_ROW; - HelpID = SID_TABLE_DELETE_ROW; + HelpId = CMD_SID_TABLE_DELETE_ROW; Text [ en-US ] = "~Delete"; }; }; @@ -828,26 +828,26 @@ MenuItem { Identifier = SID_TABLE_DISTRIBUTE_COLUMNS; - HelpID = SID_TABLE_DISTRIBUTE_COLUMNS; + HelpId = CMD_SID_TABLE_DISTRIBUTE_COLUMNS; Text [ en-US ] = "Space ~Equally"; }; SEPARATOR MenuItem { Identifier = SID_TABLE_SELECT_COL; - HelpID = SID_TABLE_SELECT_COL; + HelpId = CMD_SID_TABLE_SELECT_COL; Text [ en-US ] = "~Select"; }; MenuItem { Identifier = SID_TABLE_INSERT_COL_DLG; - HelpID = SID_TABLE_INSERT_COL_DLG; + HelpId = CMD_SID_TABLE_INSERT_COL_DLG; Text [ en-US ] = "~Insert..."; }; MenuItem { Identifier = SID_TABLE_DELETE_COL; - HelpID = SID_TABLE_DELETE_COL; + HelpId = CMD_SID_TABLE_DELETE_COL; Text [ en-US ] = "~Delete"; }; }; diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index 32087f993e62..a1b91d0ac832 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -156,58 +156,6 @@ SdModule::~SdModule() } -/************************************************************************* -|* -|* Statusbar erzeugen -|* -\************************************************************************/ - -#define AUTOSIZE_WIDTH 180 -#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s)) - -void SdModule::FillStatusBar(StatusBar& rStatusBar) -{ - // Hinweis - rStatusBar.InsertItem( SID_CONTEXT, TEXT_WIDTH( String().Fill( 30, 'x' ) ), // vorher 52 - SIB_IN | SIB_LEFT | SIB_AUTOSIZE ); - - // Groesse und Position - rStatusBar.InsertItem( SID_ATTR_SIZE, SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar), // vorher 42 - SIB_IN | SIB_USERDRAW ); - // SIB_AUTOSIZE | SIB_LEFT | SIB_OWNERDRAW ); - - // Massstab - rStatusBar.InsertItem( SID_ATTR_ZOOM, SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar), SIB_IN | SIB_CENTER ); -/* - // Einfuege- / Uberschreibmodus - rStatusBar.InsertItem( SID_ATTR_INSERT, TEXT_WIDTH( "EINFG" ), - SIB_IN | SIB_CENTER ); - - // Selektionsmodus - rStatusBar.InsertItem( SID_STATUS_SELMODE, TEXT_WIDTH( "ERG" ), - SIB_IN | SIB_CENTER ); -*/ - // Dokument geaendert - rStatusBar.InsertItem( SID_DOC_MODIFIED, SvxModifyControl::GetDefItemWidth(rStatusBar) ); - - // signatures - rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); - // FIXME: HELPID - rStatusBar.SetHelpId(SID_SIGNATURE, ""/*SID_SIGNATURE*/); - - - - // Seite - rStatusBar.InsertItem( SID_STATUS_PAGE, TEXT_WIDTH( String().Fill( 24, 'X' ) ), - SIB_IN | SIB_LEFT ); - - // Praesentationslayout - rStatusBar.InsertItem( SID_STATUS_LAYOUT, TEXT_WIDTH( String().Fill( 10, 'X' ) ), - SIB_IN | SIB_LEFT | SIB_AUTOSIZE ); -} - - - /************************************************************************* |* |* get notifications diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src index 3066355ef95e..7b977836297a 100644 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -26,6 +26,8 @@ ************************************************************************/ #include "strings.hrc" #include "glob.hrc" +#include "helpids.h" + String STR_DRAW_TOOLBOX { Text [ en-US ] = "Drawings Toolbar" ; @@ -483,7 +485,7 @@ ModalDialog RID_UNDO_DELETE_WARNING Moveable = TRUE; Closeable = TRUE; - HelpID = RID_UNDO_DELETE_WARNING; + HelpID = HID_UNDO_DELETE_WARNING; FixedImage IMG_UNDO_DELETE_WARNING { diff --git a/sd/source/ui/app/tbx_ww.src b/sd/source/ui/app/tbx_ww.src deleted file mode 100644 index 67e62be0f1be..000000000000 --- a/sd/source/ui/app/tbx_ww.src +++ /dev/null @@ -1,1124 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include -#include -#include "app.hrc" -#include "res_bmp.hrc" -#include "helpids.h" - -FloatingWindow RID_ALIGNMENT -{ - HelpId = HID_SD_FW_ALIGNMENT ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Alignment" ; - ToolBox RID_ALIGNMENT_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - ITEM_FORMAT_OBJECT_ALIGN_LEFT - }; - ToolBoxItem - { - ITEM_FORMAT_OBJECT_ALIGN_CENTER - }; - ToolBoxItem - { - ITEM_FORMAT_OBJECT_ALIGN_RIGHT - }; - ToolBoxItem - { - ITEM_FORMAT_OBJECT_ALIGN_UP - }; - ToolBoxItem - { - ITEM_FORMAT_OBJECT_ALIGN_MIDDLE - }; - ToolBoxItem - { - ITEM_FORMAT_OBJECT_ALIGN_DOWN - }; - }; - }; -}; -FloatingWindow RID_ZOOM -{ - HelpId = HID_SD_FW_ZOOM ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Zoom" ; - ToolBox RID_ZOOM_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_ZOOM_OUT ; - HelpID = SID_ZOOM_OUT ; - }; - ToolBoxItem - { - Identifier = SID_ZOOM_IN ; - HelpID = SID_ZOOM_IN ; - }; - ToolBoxItem - { - Identifier = SID_SIZE_REAL ; - HelpID = SID_SIZE_REAL ; - }; - ToolBoxItem - { - Identifier = SID_ZOOM_PREV ; - HelpID = SID_ZOOM_PREV ; - }; - ToolBoxItem - { - Identifier = SID_ZOOM_NEXT ; - HelpID = SID_ZOOM_NEXT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - Identifier = SID_SIZE_PAGE ; - HelpID = SID_SIZE_PAGE ; - }; - ToolBoxItem - { - Identifier = SID_SIZE_PAGE_WIDTH ; - HelpID = SID_SIZE_PAGE_WIDTH ; - }; - ToolBoxItem - { - Identifier = SID_SIZE_ALL ; - HelpID = SID_SIZE_ALL ; - }; - ToolBoxItem - { - Identifier = SID_SIZE_OPTIMAL ; - HelpID = SID_SIZE_OPTIMAL ; - }; - ToolBoxItem - { - Identifier = SID_ZOOM_PANNING ; - HelpID = SID_ZOOM_PANNING ; - }; - }; - }; -}; -FloatingWindow RID_CHOOSE_MODE -{ - HelpId = HID_SD_FW_CHOOSE_MODE ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Effects" ; - ToolBox RID_CHOOSE_MODE_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - ITEM_TOOLBAR_OBJECT_ROTATE - Checkable = TRUE ; - RadioCheck = TRUE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_OBJECT_MIRROR ; - HelpID = SID_OBJECT_MIRROR ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONVERT_TO_3D_LATHE ; - HelpID = SID_CONVERT_TO_3D_LATHE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_OBJECT_CROOK_ROTATE ; - HelpID = SID_OBJECT_CROOK_ROTATE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_OBJECT_CROOK_SLANT ; - HelpID = SID_OBJECT_CROOK_SLANT ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_OBJECT_SHEAR ; - HelpID = SID_OBJECT_SHEAR ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_OBJECT_TRANSPARENCE ; - HelpID = SID_OBJECT_TRANSPARENCE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_OBJECT_GRADIENT ; - HelpID = SID_OBJECT_GRADIENT ; - }; - }; - }; -}; -FloatingWindow RID_TEXT -{ - HelpId = HID_SD_FW_TEXT ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - ToolBox RID_TEXT_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_ATTR_CHAR ; - HelpID = SID_ATTR_CHAR ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_TEXT_FITTOSIZE ; - HelpID = SID_TEXT_FITTOSIZE ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CAPTION ; - HelpId = SID_DRAW_CAPTION ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_FONTWORK ; - HelpId = SID_DRAW_FONTWORK ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_ATTR_CHAR_VERTICAL ; - HelpID = SID_ATTR_CHAR_VERTICAL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_TEXT_FITTOSIZE_VERTICAL ; - HelpID = SID_TEXT_FITTOSIZE_VERTICAL ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_CAPTION_VERTICAL ; - HelpId = SID_DRAW_CAPTION_VERTICAL ; - }; - ToolBoxItem - { - Identifier = SID_DRAW_FONTWORK_VERTICAL ; - HelpId = SID_DRAW_FONTWORK_VERTICAL ; - }; - }; - }; - Text [ en-US ] = "Text" ; -}; -FloatingWindow RID_RECTANGLES -{ - HelpId = HID_SD_FW_RECTANGLES ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Rectangles" ; - ToolBox RID_RECTANGLES_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_RECT ; - HelpID = SID_DRAW_RECT ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_SQUARE ; - HelpID = SID_DRAW_SQUARE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_RECT_ROUND ; - HelpID = SID_DRAW_RECT_ROUND ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_SQUARE_ROUND ; - HelpID = SID_DRAW_SQUARE_ROUND ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_RECT_NOFILL ; - HelpID = SID_DRAW_RECT_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_SQUARE_NOFILL ; - HelpID = SID_DRAW_SQUARE_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_RECT_ROUND_NOFILL ; - HelpID = SID_DRAW_RECT_ROUND_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_SQUARE_ROUND_NOFILL ; - HelpID = SID_DRAW_SQUARE_ROUND_NOFILL ; - }; - }; - }; -}; -FloatingWindow RID_ELLIPSES -{ - HelpId = HID_SD_FW_ELLIPSES ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Ellipses" ; - ToolBox RID_ELLIPSES_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_ELLIPSE ; - HelpID = SID_DRAW_ELLIPSE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLE ; - HelpID = SID_DRAW_CIRCLE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_PIE ; - HelpID = SID_DRAW_PIE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLEPIE ; - HelpID = SID_DRAW_CIRCLEPIE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_ELLIPSECUT ; - HelpID = SID_DRAW_ELLIPSECUT ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLECUT ; - HelpID = SID_DRAW_CIRCLECUT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_ELLIPSE_NOFILL ; - HelpID = SID_DRAW_ELLIPSE_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLE_NOFILL ; - HelpID = SID_DRAW_CIRCLE_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_PIE_NOFILL ; - HelpID = SID_DRAW_PIE_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLEPIE_NOFILL ; - HelpID = SID_DRAW_CIRCLEPIE_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_ELLIPSECUT_NOFILL ; - HelpID = SID_DRAW_ELLIPSECUT_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLECUT_NOFILL ; - HelpID = SID_DRAW_CIRCLECUT_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_ARC ; - HelpID = SID_DRAW_ARC ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_CIRCLEARC ; - HelpID = SID_DRAW_CIRCLEARC ; - }; - }; - }; -}; -FloatingWindow RID_LINES -{ - HelpId = HID_SD_FW_LINES ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Curves" ; - ToolBox RID_LINES_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - HelpID = 1 ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_BEZIER_FILL ; - HelpID = SID_DRAW_BEZIER_FILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_POLYGON ; - HelpID = SID_DRAW_POLYGON ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_XPOLYGON ; - HelpID = SID_DRAW_XPOLYGON ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_FREELINE ; - HelpID = SID_DRAW_FREELINE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_BEZIER_NOFILL ; - HelpID = SID_DRAW_BEZIER_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_POLYGON_NOFILL ; - HelpID = SID_DRAW_POLYGON_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_XPOLYGON_NOFILL ; - HelpID = SID_DRAW_XPOLYGON_NOFILL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_DRAW_FREELINE_NOFILL ; - HelpID = SID_DRAW_FREELINE_NOFILL ; - }; - }; - }; -}; -FloatingWindow RID_ARROWS -{ - HelpId = HID_SD_FW_ARROWS ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Lines" ; - ToolBox RID_ARROWS_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 3 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_LINE ; - HelpID = SID_DRAW_LINE ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_ARROW_END ; - HelpID = SID_LINE_ARROW_END ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_ARROW_CIRCLE ; - HelpID = SID_LINE_ARROW_CIRCLE ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_ARROW_SQUARE ; - HelpID = SID_LINE_ARROW_SQUARE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_XLINE ; - HelpID = SID_DRAW_XLINE ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_ARROW_START ; - HelpID = SID_LINE_ARROW_START ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_CIRCLE_ARROW ; - HelpID = SID_LINE_CIRCLE_ARROW ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_SQUARE_ARROW ; - HelpID = SID_LINE_SQUARE_ARROW ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_DRAW_MEASURELINE ; - HelpID = SID_DRAW_MEASURELINE ; - }; - ToolBoxItem - { - Checkable = TRUE ; - RadioCheck = TRUE ; - Identifier = SID_LINE_ARROWS ; - HelpID = SID_LINE_ARROWS ; - }; - }; - }; -}; -FloatingWindow RID_3D_OBJECTS -{ - HelpId = HID_SD_FW_3D_OBJECTS ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "3D Objects" ; - ToolBox RID_3D_OBJECTS_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - HelpID = 1 ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_CUBE ; - HelpID = SID_3D_CUBE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_SPHERE ; - HelpID = SID_3D_SPHERE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_CYLINDER ; - HelpID = SID_3D_CYLINDER ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_CONE ; - HelpID = SID_3D_CONE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_PYRAMID ; - HelpID = SID_3D_PYRAMID ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_TORUS ; - HelpID = SID_3D_TORUS ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_SHELL ; - HelpID = SID_3D_SHELL ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Identifier = SID_3D_HALF_SPHERE ; - HelpID = SID_3D_HALF_SPHERE ; - }; - }; - }; -}; -FloatingWindow RID_CONNECTORS -{ - HelpId = HID_SD_FW_CONNECTORS ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Connectors" ; - ToolBox RID_CONNECTORS_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 4 ; - ItemList = - { - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_TOOL_CONNECTOR ; - HelpID = SID_TOOL_CONNECTOR ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_ARROW_START ; - HelpID = SID_CONNECTOR_ARROW_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_ARROW_END ; - HelpID = SID_CONNECTOR_ARROW_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_ARROWS ; - HelpID = SID_CONNECTOR_ARROWS ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CIRCLE_START ; - HelpID = SID_CONNECTOR_CIRCLE_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CIRCLE_END ; - HelpID = SID_CONNECTOR_CIRCLE_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CIRCLES ; - HelpID = SID_CONNECTOR_CIRCLES ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES ; - HelpID = SID_CONNECTOR_LINES ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES_ARROW_START ; - HelpID = SID_CONNECTOR_LINES_ARROW_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES_ARROW_END ; - HelpID = SID_CONNECTOR_LINES_ARROW_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES_ARROWS ; - HelpID = SID_CONNECTOR_LINES_ARROWS ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES_CIRCLE_START ; - HelpID = SID_CONNECTOR_LINES_CIRCLE_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES_CIRCLE_END ; - HelpID = SID_CONNECTOR_LINES_CIRCLE_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINES_CIRCLES ; - HelpID = SID_CONNECTOR_LINES_CIRCLES ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE ; - HelpID = SID_CONNECTOR_LINE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE_ARROW_START ; - HelpID = SID_CONNECTOR_LINE_ARROW_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE_ARROW_END ; - HelpID = SID_CONNECTOR_LINE_ARROW_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE_ARROWS ; - HelpID = SID_CONNECTOR_LINE_ARROWS ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE_CIRCLE_START ; - HelpID = SID_CONNECTOR_LINE_CIRCLE_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE_CIRCLE_END ; - HelpID = SID_CONNECTOR_LINE_CIRCLE_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_LINE_CIRCLES ; - HelpID = SID_CONNECTOR_LINE_CIRCLES ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE ; - HelpID = SID_CONNECTOR_CURVE ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE_ARROW_START ; - HelpID = SID_CONNECTOR_CURVE_ARROW_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE_ARROW_END ; - HelpID = SID_CONNECTOR_CURVE_ARROW_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE_ARROWS ; - HelpID = SID_CONNECTOR_CURVE_ARROWS ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE_CIRCLE_START ; - HelpID = SID_CONNECTOR_CURVE_CIRCLE_START ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE_CIRCLE_END ; - HelpID = SID_CONNECTOR_CURVE_CIRCLE_END ; - }; - ToolBoxItem - { - RadioCheck = TRUE ; - Checkable = TRUE ; - Identifier = SID_CONNECTOR_CURVE_CIRCLES ; - HelpID = SID_CONNECTOR_CURVE_CIRCLES ; - }; - }; - }; -}; -FloatingWindow RID_INSERT -{ - HelpId = HID_SD_FW_INSERT ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - /* ### ACHTUNG: Neuer Text in Resource? Einfügen : Einf³gen */ - Text [ en-US ] = "Insert" ; - ToolBox RID_INSERT_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - HelpID = 1 ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_INSERT_DIAGRAM ; - HelpID = SID_INSERT_DIAGRAM; - }; - ToolBoxItem - { - Identifier = SID_INSERT_MATH ; - HelpID = SID_INSERT_MATH ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_FLOATINGFRAME ; - HelpID = SID_INSERT_FLOATINGFRAME ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_OBJECT ; - HelpID = SID_INSERT_OBJECT ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_PLUGIN ; - HelpID = SID_INSERT_PLUGIN ; - }; -#ifdef SOLAR_JAVA - ToolBoxItem - { - Identifier = SID_INSERT_APPLET ; - HelpID = SID_INSERT_APPLET ; - }; -#endif - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_TABLE ; - HelpID = SID_ATTR_TABLE ; - }; - ToolBoxItem - { - Identifier = SID_INSERTFILE ; - HelpID = SID_INSERTFILE ; - }; - ToolBoxItem - { - Identifier = SID_INSERTPAGE ; - HelpID = SID_INSERTPAGE ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_GRAPHIC ; - HelpID = SID_INSERT_GRAPHIC ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_SOUND ; - HelpID = SID_INSERT_SOUND ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_VIDEO ; - HelpID = SID_INSERT_VIDEO ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_AVMEDIA ; - HelpID = SID_INSERT_AVMEDIA ; - }; - }; - }; -}; -FloatingWindow RID_POSITION -{ - HelpId = HID_SD_FW_POSITION ; - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - Text [ en-US ] = "Arrange" ; - ToolBox RID_POSITION_TBX - { - SVLook = TRUE ; - MenuStrings = TRUE ; - LineCount = 2 ; - ItemList = - { - ToolBoxItem - { - ITEM_FORMAT_FRAME_TO_TOP - }; - ToolBoxItem - { - Identifier = SID_MOREFRONT ; - HelpID = SID_MOREFRONT ; - }; - ToolBoxItem - { - Identifier = SID_MOREBACK ; - HelpID = SID_MOREBACK ; - }; - ToolBoxItem - { - ITEM_FORMAT_FRAME_TO_BOTTOM - }; - ToolBoxItem - { - Type = TOOLBOXITEM_BREAK ; - }; - ToolBoxItem - { - Identifier = SID_BEFORE_OBJ ; - HelpID = SID_BEFORE_OBJ ; - }; - ToolBoxItem - { - Identifier = SID_BEHIND_OBJ ; - HelpID = SID_BEHIND_OBJ ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SPACE ; - }; - ToolBoxItem - { - Identifier = SID_REVERSE_ORDER ; - HelpID = SID_REVERSE_ORDER ; - }; - }; - }; -}; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/sd/source/ui/app/toolbox.src b/sd/source/ui/app/toolbox.src index a3446a2c58b4..0f3b3c69aeef 100644 --- a/sd/source/ui/app/toolbox.src +++ b/sd/source/ui/app/toolbox.src @@ -27,758 +27,23 @@ #include "app.hrc" #include "cfgids.hxx" -#include "helpids.h" #include - // Werkzeugleiste (Impress) - // Objektleiste (Impress) - // Optionsleiste (Impress) -#include "toolbox2_tmpl.src" - // Werkzeugleiste (Draw (Graphic)) - // Objektleiste (Draw (Graphic)) - // Optionsleiste (Draw (Graphic)) -#undef SD_TOOLBOX -#define SD_TOOLBOX RID_GRAPHIC_TOOLBOX -#include "toolbox2_tmpl.src" - -ToolBox RID_SLIDE_TOOLBOX -{ - HelpId = HID_SD_SLIDE_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_LEFT ; - ItemList = - { - ToolBoxItem - { - Checkable = TRUE ; - Identifier = SID_OBJECT_SELECT ; - HelpID = SID_OBJECT_SELECT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ZOOM_TOOLBOX ; - HelpID = SID_ZOOM_TOOLBOX ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_PRESENTATION ; - HelpID = SID_PRESENTATION ; - }; - TBI_ZOOM_IN - TBI_ZOOM_OUT - }; -}; -ToolBox RID_OUTLINE_TOOLBOX -{ - HelpId = HID_SD_OUTLINE_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_LEFT ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_ZOOM_TOOLBOX ; - HelpID = SID_ZOOM_TOOLBOX ; - DropDown = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_OUTLINE_COLLAPSE_ALL ; - HelpID = SID_OUTLINE_COLLAPSE_ALL ; - }; - ToolBoxItem - { - Identifier = SID_OUTLINE_EXPAND_ALL ; - HelpID = SID_OUTLINE_EXPAND_ALL ; - }; - ToolBoxItem - { - Identifier = SID_OUTLINE_COLLAPSE ; - HelpID = SID_OUTLINE_COLLAPSE ; - }; - ToolBoxItem - { - Identifier = SID_OUTLINE_EXPAND ; - HelpID = SID_OUTLINE_EXPAND ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_OUTLINE_FORMAT ; - HelpID = SID_OUTLINE_FORMAT ; - }; - ToolBoxItem - { - Identifier = SID_COLORVIEW ; - HelpID = SID_COLORVIEW ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_PRESENTATION ; - HelpID = SID_PRESENTATION ; - }; - TBI_ZOOM_IN - TBI_ZOOM_OUT - }; -}; -ToolBox RID_DRAW_COMMONTASK_TOOLBOX -{ - HelpId = HID_SD_DRAW_COMMONTASK_TOOLBOX ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_INSERTPAGE ; - HelpID = SID_INSERTPAGE ; - }; - ToolBoxItem - { - Identifier = SID_MODIFYPAGE ; - HelpID = SID_MODIFYPAGE ; - }; - ToolBoxItem - { - Identifier = SID_PRESENTATION_LAYOUT ; - HelpID = SID_PRESENTATION_LAYOUT ; - }; - ToolBoxItem - { - Identifier = SID_DUPLICATE_PAGE ; - HelpID = SID_DUPLICATE_PAGE ; - }; - ToolBoxItem - { - Identifier = SID_EXPAND_PAGE ; - HelpID = SID_EXPAND_PAGE ; - }; - }; -}; -ToolBox RID_BEZIER_TOOLBOX -{ - HelpId = HID_SD_BEZIER_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - ItemList = - { - ToolBoxItem - { - ITEM_FORMAT_BEZIER_EDIT - AutoCheck = TRUE ; - Checkable = TRUE ; - RadioCheck = TRUE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_MOVE ; - HelpID = SID_BEZIER_MOVE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_INSERT ; - HelpID = SID_BEZIER_INSERT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_DELETE ; - HelpID = SID_BEZIER_DELETE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_CUTLINE ; - HelpID = SID_BEZIER_CUTLINE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_CONVERT ; - HelpID = SID_BEZIER_CONVERT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_EDGE ; - HelpID = SID_BEZIER_EDGE ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_SMOOTH ; - HelpID = SID_BEZIER_SMOOTH ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_SYMMTR ; - HelpID = SID_BEZIER_SYMMTR ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_CLOSE ; - HelpID = SID_BEZIER_CLOSE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_BEZIER_ELIMINATE_POINTS ; - HelpID = SID_BEZIER_ELIMINATE_POINTS ; - }; - }; -}; -ToolBox RID_GLUEPOINTS_TOOLBOX -{ - HelpId = HID_SD_GLUEPOINTS_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_GLUE_INSERT_POINT ; - HelpID = SID_GLUE_INSERT_POINT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_ESCDIR_LEFT ; - HelpID = SID_GLUE_ESCDIR_LEFT ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_ESCDIR_TOP ; - HelpID = SID_GLUE_ESCDIR_TOP ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_ESCDIR_RIGHT ; - HelpID = SID_GLUE_ESCDIR_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_ESCDIR_BOTTOM ; - HelpID = SID_GLUE_ESCDIR_BOTTOM ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_PERCENT ; - HelpID = SID_GLUE_PERCENT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_HORZALIGN_LEFT ; - HelpID = SID_GLUE_HORZALIGN_LEFT ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_HORZALIGN_CENTER ; - HelpID = SID_GLUE_HORZALIGN_CENTER ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_HORZALIGN_RIGHT ; - HelpID = SID_GLUE_HORZALIGN_RIGHT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_VERTALIGN_TOP ; - HelpID = SID_GLUE_VERTALIGN_TOP ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_VERTALIGN_CENTER ; - HelpID = SID_GLUE_VERTALIGN_CENTER ; - }; - ToolBoxItem - { - Identifier = SID_GLUE_VERTALIGN_BOTTOM ; - HelpID = SID_GLUE_VERTALIGN_BOTTOM ; - }; - }; -}; -ToolBox RID_SLIDE_OBJ_TOOLBOX -{ - HelpId = HID_SD_SLIDE_OBJ_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_REHEARSE_TIMINGS ; - HelpID = SID_REHEARSE_TIMINGS ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_HIDE_SLIDE ; - HelpID = SID_HIDE_SLIDE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_PAGES_PER_ROW ; - HelpID = SID_PAGES_PER_ROW ; - }; - }; -}; -ToolBox RID_DRAW_GRAF_TOOLBOX -{ - HelpId = HID_SD_DRAW_GRAF_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_GRFFILTER; - HelpID = SID_GRFFILTER; - DropDown = TRUE ; - Checkable = FALSE ; - RadioCheck = FALSE ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_MODE; - HelpID = SID_ATTR_GRAF_MODE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_RED; - HelpID = SID_ATTR_GRAF_RED; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_GREEN; - HelpID = SID_ATTR_GRAF_GREEN; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_BLUE; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_LUMINANCE; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_CONTRAST; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_GAMMA; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_TRANSPARENCE; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - // #i25616# - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_LINE; - HelpID = SID_ATTRIBUTES_LINE; - }; - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_AREA; - HelpID = SID_ATTRIBUTES_AREA; - }; - ToolBoxItem - { - Identifier = SID_ATTR_FILL_SHADOW; - HelpID = SID_ATTR_FILL_SHADOW; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_CROP; - HelpID = SID_ATTR_GRAF_CROP; - }; - }; -}; String RID_DRAW_VIEWER_TOOLBOX { Text [ en-US ] = "Function Bar (viewing mode)" ; }; -ToolBox RID_DRAW_VIEWER_TOOLBOX -{ - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - HideWhenDeactivate = TRUE ; - LineSpacing = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_SAVEASDOC ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_EDITDOC ; - }; - ToolBoxItem - { - Identifier = SID_MAIL_SENDDOC ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_DIRECTEXPORTDOCASPDF ; - }; - ToolBoxItem - { - Identifier = SID_PRINTDOCDIRECT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_COPY ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_SEARCH_DLG ; - }; - ToolBoxItem - { - Identifier = SID_NAVIGATOR ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_ZOOM ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_PRESENTATION; - }; - }; - Scroll = TRUE ; -}; - String RID_GRAPHIC_VIEWER_TOOLBOX { Text [ en-US ] = "Function Bar (viewing mode)" ; }; -ToolBox RID_GRAPHIC_VIEWER_TOOLBOX -{ - Border = TRUE ; - SVLook = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - HideWhenDeactivate = TRUE ; - LineSpacing = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Hide = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_SAVEASDOC ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_EDITDOC ; - }; - ToolBoxItem - { - Identifier = SID_MAIL_SENDDOC ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_DIRECTEXPORTDOCASPDF ; - }; - ToolBoxItem - { - Identifier = SID_PRINTDOCDIRECT ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_COPY ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_SEARCH_DLG ; - }; - ToolBoxItem - { - Identifier = SID_NAVIGATOR ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_ZOOM ; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - }; - Scroll = TRUE ; -}; - -ToolBox RID_DRAW_MEDIA_TOOLBOX -{ - HelpId = HID_SD_DRAW_MEDIA_TOOLBOX ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Customize = TRUE ; - MenuStrings = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_AVMEDIA_TOOLBOX; - HelpID = SID_AVMEDIA_TOOLBOX; - }; - }; -}; String RID_DRAW_MEDIA_TOOLBOX { Text [ en-US ] = "Media Playback" ; }; + String RID_DRAW_TABLE_TOOLBOX { TEXT [ de ] = "Tabelle" ; diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index a5053617288d..29425a3bda71 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -71,8 +71,7 @@ LayerTabBar::LayerTabBar(DrawViewShell* pViewSh, Window* pParent) EnableEditMode(); SetSizePixel(Size(0, 0)); SetMaxPageWidth( 150 ); - // FIXME: HELPID - SetHelpId( ""/*HID_SD_TABBAR_LAYERS*/ ); + SetHelpId( HID_SD_TABBAR_LAYERS ); } diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx index e545d832b1d9..e64e18697a77 100644 --- a/sd/source/ui/dlg/PaneDockingWindow.cxx +++ b/sd/source/ui/dlg/PaneDockingWindow.cxx @@ -271,7 +271,7 @@ void PaneDockingWindow::InitializeTitleToolBox (void) USHORT PaneDockingWindow::AddMenu ( const String& rsMenuName, - ULONG nHelpId, + const rtl::OString& rHelpId, const Link& rCallback) { // Add the menu before the closer button. @@ -282,9 +282,7 @@ USHORT PaneDockingWindow::AddMenu ( rsMenuName, TIB_DROPDOWNONLY, nItemCount>0 ? nItemCount-1 : (USHORT)-1); - // FIXME: HELPID - mpTitleToolBox->SetHelpId( nItemId, ""/*nHelpId*/ ); - (void)nHelpId; + mpTitleToolBox->SetHelpId( nItemId, rHelpId ); mpTitleToolBox->SetClickHdl (rCallback); mpTitleToolBox->SetDropdownClickHdl (rCallback); diff --git a/sd/source/ui/dlg/animobjs.src b/sd/source/ui/dlg/animobjs.src index d631dcaba2b2..58fb31137e34 100644 --- a/sd/source/ui/dlg/animobjs.src +++ b/sd/source/ui/dlg/animobjs.src @@ -28,6 +28,8 @@ #include "res_bmp.hrc" #include "app.hrc" #include "animobjs.hrc" +#include "helpids.h" + #define BUTTON_WIDTH 16 #define BUTTON_HEIGHT 14 #define BUTTON_SIZE MAP_APPFONT( BUTTON_WIDTH, BUTTON_HEIGHT ); @@ -36,7 +38,7 @@ #define MIN_BUTTON_SIZE MAP_APPFONT( MIN_BUTTON_WIDTH, MIN_BUTTON_HEIGHT ); DockingWindow FLT_WIN_ANIMATION { - HelpID = SID_ANIMATION_OBJECTS ; + HelpID = CMD_SID_ANIMATION_OBJECTS ; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src index 920be5e8df70..6cb04804ea9e 100644 --- a/sd/source/ui/dlg/copydlg.src +++ b/sd/source/ui/dlg/copydlg.src @@ -28,9 +28,11 @@ #include "app.hrc" #include "res_bmp.hrc" #include "copydlg.hrc" +#include "helpids.h" + ModalDialog DLG_COPY { - HelpID = SID_COPYOBJECTS ; + HelpID = CMD_SID_COPYOBJECTS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 204 , 177 ) ; diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src index c8c49e9c0d48..871781ad5fa3 100644 --- a/sd/source/ui/dlg/custsdlg.src +++ b/sd/source/ui/dlg/custsdlg.src @@ -32,7 +32,7 @@ #define DIFF_Y 17 ModalDialog DLG_CUSTOMSHOW { - HelpID = SID_CUSTOMSHOW_DLG ; + HelpID = CMD_SID_CUSTOMSHOW_DLG ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 175 + DIFF , 114 + DIFF_Y ) ; diff --git a/sd/source/ui/dlg/dlgass.cxx b/sd/source/ui/dlg/dlgass.cxx index 455cca1d281a..0fa644e3ac95 100644 --- a/sd/source/ui/dlg/dlgass.cxx +++ b/sd/source/ui/dlg/dlgass.cxx @@ -102,7 +102,7 @@ void InterpolateFixedBitmap( FixedBitmap * pBitmap ) // ==================================================================== // ==================================================================== -UINT32 PageHelpIds[] = +const char* PageHelpIds[] = { HID_SD_AUTOPILOT_PAGE1, HID_SD_AUTOPILOT_PAGE2, @@ -1120,9 +1120,7 @@ void AssistentDlgImpl::ChangePage() if( mpWindow ) { - // FIXME: HELPID - (void)nPage; - mpWindow->SetHelpId( ""/*PageHelpIds[nPage-1]*/); + mpWindow->SetHelpId( PageHelpIds[nPage-1]); } UpdatePage(); diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src index 631034dd5879..2cc106db4b75 100644 --- a/sd/source/ui/dlg/dlgsnap.src +++ b/sd/source/ui/dlg/dlgsnap.src @@ -28,9 +28,11 @@ #include "app.hrc" #include "res_bmp.hrc" #include "dlgsnap.hrc" +#include "helpids.h" + ModalDialog DLG_SNAPLINE { - HelpID = SID_CAPTUREPOINT ; + HelpID = CMD_SID_CAPTUREPOINT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 140 , 125 ) ; diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 6669b98c6818..294e61f3fe40 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -240,8 +240,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent maTabCtrl.Show(); mpSlideTabPage = new HeaderFooterTabPage( this, &maTabCtrl, pDoc, pSlide, false ); - // FIXME: HELPID - mpSlideTabPage->SetHelpId( ""/*HID_SD_TABPAGE_HEADERFOOTER_SLIDE*/ ); + mpSlideTabPage->SetHelpId( HID_SD_TABPAGE_HEADERFOOTER_SLIDE ); maTabCtrl.SetTabPage( RID_SD_TABPAGE_HEADERFOOTER_SLIDE, mpSlideTabPage ); Size aSiz = mpSlideTabPage->GetSizePixel(); @@ -254,8 +253,7 @@ HeaderFooterDialog::HeaderFooterDialog( ViewShell* pViewShell, ::Window* pParent } mpNotesHandoutsTabPage = new HeaderFooterTabPage( this, &maTabCtrl, pDoc, pNotes, true ); - // FIXME: HELPID - mpNotesHandoutsTabPage->SetHelpId( ""/*HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT*/ ); + mpNotesHandoutsTabPage->SetHelpId( HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT ); maTabCtrl.SetTabPage( RID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT, mpNotesHandoutsTabPage ); aSiz = mpNotesHandoutsTabPage->GetSizePixel(); diff --git a/sd/source/ui/dlg/inspagob.src b/sd/source/ui/dlg/inspagob.src index 4eae011a9ba2..99cfee3de049 100644 --- a/sd/source/ui/dlg/inspagob.src +++ b/sd/source/ui/dlg/inspagob.src @@ -30,7 +30,7 @@ ModalDialog DLG_INSERT_PAGES_OBJS { - HelpID = DLG_INSERT_PAGES_OBJS ; + HelpID = HID_DLG_INSERT_PAGES_OBJS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 128 ) ; diff --git a/sd/source/ui/dlg/layeroptionsdlg.src b/sd/source/ui/dlg/layeroptionsdlg.src index cd50a810d3fd..e57876093570 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.src +++ b/sd/source/ui/dlg/layeroptionsdlg.src @@ -27,10 +27,11 @@ #include "app.hrc" #include "layeroptionsdlg.hrc" +#include "helpids.h" ModalDialog DLG_INSERT_LAYER { - HelpID = SID_INSERTLAYER ; + HelpID = CMD_SID_INSERTLAYER ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 172 ) ; diff --git a/sd/source/ui/dlg/morphdlg.src b/sd/source/ui/dlg/morphdlg.src index 64e63a33cd59..7bdebec16bf7 100644 --- a/sd/source/ui/dlg/morphdlg.src +++ b/sd/source/ui/dlg/morphdlg.src @@ -27,6 +27,8 @@ #include "app.hrc" #include "morphdlg.hrc" +#include "helpids.h" + /****************************************************************************** |* |* @@ -34,7 +36,8 @@ \******************************************************************************/ ModalDialog DLG_MORPH { - HelpID = SID_POLYGON_MORPHING ; + HelpID = CMD_SID_POLYGON_MORPHING ; + HelpID = ".uno:Morphing" ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 196 , 68 ) ; diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index c019ab330c71..2b21802b7a9e 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -309,6 +309,14 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) // gespeichert ist oder nicht PopupMenu *pMenu = new PopupMenu; + static const char* aHIDs[] = + { + HID_SD_NAVIGATOR_MENU1, + HID_SD_NAVIGATOR_MENU2, + HID_SD_NAVIGATOR_MENU3, + 0 + }; + for( USHORT nID = NAVIGATOR_DRAGTYPE_URL; nID < NAVIGATOR_DRAGTYPE_COUNT; nID++ ) @@ -316,10 +324,9 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox ) USHORT nRId = GetDragTypeSdResId( (NavigatorDragType)nID ); if( nRId > 0 ) { + DBG_ASSERT(aHIDs[nID-NAVIGATOR_DRAGTYPE_URL],"HelpId not added!"); pMenu->InsertItem( nID, String( SdResId( nRId ) ) ); - // FIXME: HELPID - pMenu->SetHelpId( nID, ""/*HID_SD_NAVIGATOR_MENU1 + - nID - NAVIGATOR_DRAGTYPE_URL*/ ); + pMenu->SetHelpId( nID, aHIDs[nID - NAVIGATOR_DRAGTYPE_URL] ); } } diff --git a/sd/source/ui/dlg/paragr.src b/sd/source/ui/dlg/paragr.src index 041a4524a705..65ac21c5142f 100644 --- a/sd/source/ui/dlg/paragr.src +++ b/sd/source/ui/dlg/paragr.src @@ -27,6 +27,7 @@ #include #include "glob.hrc" +#include "helpids.h" #include "paragr.hrc" TabDialog TAB_PARAGRAPH @@ -105,7 +106,7 @@ TabDialog TAB_PARAGRAPH TabPage RID_TABPAGE_PARA_NUMBERING { - HelpId = RID_TABPAGE_PARA_NUMBERING ; + HelpId = HID_TABPAGE_PARA_NUMBERING ; Hide = TRUE ; Text = "Numbering" ; Size = MAP_APPFONT ( 260 , 185 ) ; diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src index 830e320ca4ba..74f6db89fe55 100644 --- a/sd/source/ui/dlg/present.src +++ b/sd/source/ui/dlg/present.src @@ -33,7 +33,7 @@ ModalDialog DLG_START_PRESENTATION { - HelpID = SID_PRESENTATION ; + HelpID = CMD_SID_PRESENTATION ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 256, 205 ) ; diff --git a/sd/source/ui/dlg/sddlgfact.cxx b/sd/source/ui/dlg/sddlgfact.cxx index f95c4027d7f8..c8bc8f49a28e 100644 --- a/sd/source/ui/dlg/sddlgfact.cxx +++ b/sd/source/ui/dlg/sddlgfact.cxx @@ -268,11 +268,9 @@ void AbstractSdInsertLayerDlg_Impl::GetAttr( SfxItemSet& rOutAttrs ) { pDlg->GetAttr( rOutAttrs ); } -void AbstractSdInsertLayerDlg_Impl::SetHelpId( ULONG nHelpId ) +void AbstractSdInsertLayerDlg_Impl::SetHelpId( const rtl::OString& rHelpId ) { - // FIXME: HELPID - (void)nHelpId; - pDlg->SetHelpId( ""/*nHelpId*/ ); + pDlg->SetHelpId( rHelpId ); } // AbstractSdInsertLayerDlg_Impl end diff --git a/sd/source/ui/dlg/sddlgfact.hxx b/sd/source/ui/dlg/sddlgfact.hxx index 44f5b0813a04..c5c1489d0529 100644 --- a/sd/source/ui/dlg/sddlgfact.hxx +++ b/sd/source/ui/dlg/sddlgfact.hxx @@ -169,7 +169,7 @@ class AbstractSdInsertLayerDlg_Impl : public AbstractSdInsertLayerDlg DECL_ABSTDLG_BASE(AbstractSdInsertLayerDlg_Impl,SdInsertLayerDlg) virtual void GetAttr( SfxItemSet& rOutAttrs ) ; //from class Window - virtual void SetHelpId( ULONG nHelpId ) ; + virtual void SetHelpId( const rtl::OString& rHelpId ) ; }; // add for SdInsertPasteDlg diff --git a/sd/source/ui/dlg/sdpreslt.src b/sd/source/ui/dlg/sdpreslt.src index 3aad51674a46..c8b0ee73b135 100644 --- a/sd/source/ui/dlg/sdpreslt.src +++ b/sd/source/ui/dlg/sdpreslt.src @@ -27,9 +27,11 @@ #include "app.hrc" #include "sdpreslt.hrc" +#include "sdcommands.h" + ModalDialog DLG_PRESLT { - HelpID = SID_PRESENTATION_LAYOUT ; + HelpID = CMD_SID_PRESENTATION_LAYOUT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 212 , 185 ) ; diff --git a/sd/source/ui/dlg/tpaction.src b/sd/source/ui/dlg/tpaction.src index fa951644c580..92516026884b 100644 --- a/sd/source/ui/dlg/tpaction.src +++ b/sd/source/ui/dlg/tpaction.src @@ -32,7 +32,7 @@ TabPage TP_ANIMATION { - HelpID = SID_ANIMATION_EFFECTS ; + HelpID = CMD_SID_ANIMATION_EFFECTS ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 260 , 164 ) ; Hide = TRUE; diff --git a/sd/source/ui/dlg/vectdlg.src b/sd/source/ui/dlg/vectdlg.src index 53b77ad49eab..757233d9d33b 100644 --- a/sd/source/ui/dlg/vectdlg.src +++ b/sd/source/ui/dlg/vectdlg.src @@ -28,6 +28,7 @@ #include "app.hrc" #include "vectdlg.hrc" +#include "helpids.h" /****************************************************************************** |* @@ -37,7 +38,7 @@ ModalDialog DLG_VECTORIZE { - HelpID = SID_VECTORIZE; + HelpID = HID_VECTORIZE_DLG; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200, 237 ) ; diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx index 931ff3a10cb8..d28ac5afc1b8 100644 --- a/sd/source/ui/func/fuinsert.cxx +++ b/sd/source/ui/func/fuinsert.cxx @@ -42,7 +42,7 @@ #include #include - +#include #include #include #include @@ -431,12 +431,11 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq ) // intentionally no break! } case SID_INSERT_PLUGIN : - case SID_INSERT_APPLET : case SID_INSERT_FLOATINGFRAME : { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractInsertObjectDialog* pDlg = - pFact->CreateInsertObjectDialog( mpViewShell->GetActiveWindow(), nSlotId, + pFact->CreateInsertObjectDialog( mpViewShell->GetActiveWindow(), SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommandString(), xStorage, &aServerLst ); if ( pDlg ) { diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index 03e6cf96c0f0..f469e51c6826 100644 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -91,7 +91,7 @@ public: callback to the value of GetCurItemId() when called at the given tool box. */ - USHORT AddMenu (const String& rsMenuName, ULONG nHelpId, const Link& rCallback); + USHORT AddMenu (const String& rsMenuName, const rtl::OString& rHelpId, const Link& rCallback); /** Set the title of the docking window to the given string. Use this method when the title is not yet known at the time of construction diff --git a/sd/source/ui/inc/taskpane/ScrollPanel.hxx b/sd/source/ui/inc/taskpane/ScrollPanel.hxx index 019e06d9dd44..b22b7bfbccbc 100644 --- a/sd/source/ui/inc/taskpane/ScrollPanel.hxx +++ b/sd/source/ui/inc/taskpane/ScrollPanel.hxx @@ -76,7 +76,7 @@ public: TitledControl* AddControl ( ::std::auto_ptr pControl, const String& rTitle, - ULONG nHelpId); + const rtl::OString& sHelpId); /** Add a control to the sub panel without a title bar. */ diff --git a/sd/source/ui/inc/taskpane/SubToolPanel.hxx b/sd/source/ui/inc/taskpane/SubToolPanel.hxx index 9524cdddf748..c9d691161b4d 100644 --- a/sd/source/ui/inc/taskpane/SubToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/SubToolPanel.hxx @@ -79,7 +79,7 @@ public: void AddControl ( ::std::auto_ptr pControl, const String& rTitle, - ULONG nHelpId); + const rtl::OString& sHelpId); void AddControl (::std::auto_ptr pControl); virtual void Paint (const Rectangle& rRect); diff --git a/sd/source/ui/inc/taskpane/ToolPanel.hxx b/sd/source/ui/inc/taskpane/ToolPanel.hxx index f2c573a21c06..76d153b04de7 100644 --- a/sd/source/ui/inc/taskpane/ToolPanel.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanel.hxx @@ -79,7 +79,7 @@ public: sal_uInt32 AddControl ( ::std::auto_ptr pControlFactory, const String& rTitle, - ULONG nHelpId, + const rtl::OString& sHelpId, const TitledControl::ClickHandler& rClickHandler); virtual void Resize (void); diff --git a/sd/source/ui/notes/NotesChildWindow.src b/sd/source/ui/notes/NotesChildWindow.src index f01a258bf812..14ac956ce9e3 100755 --- a/sd/source/ui/notes/NotesChildWindow.src +++ b/sd/source/ui/notes/NotesChildWindow.src @@ -27,10 +27,11 @@ #include "app.hrc" #include "NotesChildWindow.hrc" +#include "sdcommands.h" DockingWindow FLT_WIN_NOTES { - HelpID = SID_NOTES_WINDOW ; + HelpID = CMD_SID_NOTES_WINDOW ; Border = TRUE ; Hide = FALSE ; SVLook = TRUE ; diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index c81abe4b0931..fe6f9483b8b6 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -76,10 +76,8 @@ ShowWindow::ShowWindow( const ::rtl::Reference< SlideshowImpl >& xController, :: SetMapMode(aMap); // HelpId setzen - // FIXME: HELPID - SetHelpId( ""/*HID_SD_WIN_PRESENTATION*/ ); - // FIXME: HELPID - SetUniqueId( ""/*HID_SD_WIN_PRESENTATION*/ ); + SetHelpId( HID_SD_WIN_PRESENTATION ); + SetUniqueId( HID_SD_WIN_PRESENTATION ); maPauseTimer.SetTimeoutHdl( LINK( this, ShowWindow, PauseTimeoutHdl ) ); maPauseTimer.SetTimeout( 1000 ); diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index b46090f1e7eb..854009b00c7e 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -35,7 +35,7 @@ #include #include #include - +#include #include #include #include @@ -166,7 +166,7 @@ void TableObjectBar::Execute( SfxRequest& rReq ) case SID_TABLE_INSERT_COL_DLG: { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); - ::std::auto_ptr pDlg( pFact ? pFact->CreateSvxInsRowColDlg( mpView->GetViewShell()->GetParentWindow(), nSlotId == SID_TABLE_INSERT_COL_DLG, nSlotId) : 0); + ::std::auto_ptr pDlg( pFact ? pFact->CreateSvxInsRowColDlg( mpView->GetViewShell()->GetParentWindow(), nSlotId == SID_TABLE_INSERT_COL_DLG, SD_MOD()->GetSlotPool()->GetSlot(nSlotId)->GetCommand()) : 0); if( pDlg.get() && (pDlg->Execute() == 1) ) { diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx index 2ba3ac742d18..57db3e7c1345 100644 --- a/sd/source/ui/toolpanel/LayoutMenu.cxx +++ b/sd/source/ui/toolpanel/LayoutMenu.cxx @@ -261,8 +261,7 @@ LayoutMenu::LayoutMenu ( | ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_NORMAL | ::sd::tools::EventMultiplexerEvent::EID_EDIT_MODE_MASTER); - // FIXME: HELPID - Window::SetHelpId(""/*HID_SD_TASK_PANE_PREVIEW_LAYOUTS*/); + Window::SetHelpId(HID_SD_TASK_PANE_PREVIEW_LAYOUTS); SetAccessibleName(SdResId(STR_TASKPANEL_LAYOUT_MENU_TITLE)); Link aStateChangeLink (LINK(this,LayoutMenu,StateChangeHandler)); @@ -272,7 +271,7 @@ LayoutMenu::LayoutMenu ( ::rtl::OUString::createFromAscii(".uno:VerticalTextState")); // Add this new object as shell to the shell factory. - GetShellManager()->AddSubShell(HID_SD_TASK_PANE_PREVIEW_LAYOUTS,this,this); + GetShellManager()->AddSubShell(SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS,this,this); } diff --git a/sd/source/ui/toolpanel/ScrollPanel.cxx b/sd/source/ui/toolpanel/ScrollPanel.cxx index 72b40e57e611..582c975dfbb8 100644 --- a/sd/source/ui/toolpanel/ScrollPanel.cxx +++ b/sd/source/ui/toolpanel/ScrollPanel.cxx @@ -122,7 +122,7 @@ void ScrollPanel::ListHasChanged (void) TitledControl* ScrollPanel::AddControl ( ::std::auto_ptr pControl, const String& rTitle, - ULONG nHelpId) + const rtl::OString& rHelpId) { // We are interested only in the title. The control itself is // managed by the content object. @@ -132,9 +132,7 @@ TitledControl* ScrollPanel::AddControl ( rTitle, TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE), TitleBar::TBT_SUB_CONTROL_HEADLINE); - // FIXME: HELPID - pTitledControl->GetTitleBar()->SetHelpId(""/*nHelpId*/); - (void)nHelpId; + pTitledControl->GetTitleBar()->SetHelpId(rHelpId); AddControl(::std::auto_ptr(pTitledControl)); diff --git a/sd/source/ui/toolpanel/SubToolPanel.cxx b/sd/source/ui/toolpanel/SubToolPanel.cxx index bb9a65a5b728..ecd5ac3b3b48 100644 --- a/sd/source/ui/toolpanel/SubToolPanel.cxx +++ b/sd/source/ui/toolpanel/SubToolPanel.cxx @@ -98,7 +98,7 @@ void SubToolPanel::ListHasChanged (void) void SubToolPanel::AddControl ( ::std::auto_ptr pControl, const String& rTitle, - ULONG nHelpId) + const rtl::OString& sHelpId) { pControl->GetWindow()->AddEventListener ( LINK(this,SubToolPanel,WindowEventListener)); @@ -112,9 +112,7 @@ void SubToolPanel::AddControl ( TitledControlStandardClickHandler(GetControlContainer(), ControlContainer::ES_TOGGLE), TitleBar::TBT_SUB_CONTROL_HEADLINE); pTitledControl->GetWindow()->SetParent(this); - // FIXME: HELPID - pTitledControl->GetWindow()->SetHelpId(""/*nHelpId*/); - (void)nHelpId; + pTitledControl->GetWindow()->SetHelpId(sHelpId); ::std::auto_ptr pChild (pTitledControl); // Add a down link only for the first control so that when diff --git a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx index a00142fa81c1..d80beba7cd10 100644 --- a/sd/source/ui/toolpanel/TaskPaneViewShell.cxx +++ b/sd/source/ui/toolpanel/TaskPaneViewShell.cxx @@ -362,8 +362,7 @@ TaskPaneViewShell::TaskPaneViewShell ( GetParentWindow()->SetBackground(Wallpaper()); mpContentWindow->SetBackground(Wallpaper()); - // FIXME: HELPID - GetParentWindow()->SetHelpId(""/*HID_SD_TASK_PANE*/); + GetParentWindow()->SetHelpId(HID_SD_TASK_PANE); PaneDockingWindow* pDockingWindow = dynamic_cast(GetDockingWindow()); if (pDockingWindow != NULL) diff --git a/sd/source/ui/toolpanel/TestPanel.cxx b/sd/source/ui/toolpanel/TestPanel.cxx index e2786e23a0c5..dd11e025f285 100644 --- a/sd/source/ui/toolpanel/TestPanel.cxx +++ b/sd/source/ui/toolpanel/TestPanel.cxx @@ -128,7 +128,7 @@ TestPanel::TestPanel (TreeNode* pParent) ::std::auto_ptr(new Wrapper ( pScrollPanel, Size (200,300), pBox, true)), String::CreateFromAscii ("First ListBox"), - 0); + ""); pBox = new ListBox (pScrollPanel->GetWindow()); for (i=1; i<=20; i++) @@ -142,7 +142,7 @@ TestPanel::TestPanel (TreeNode* pParent) ::std::auto_ptr(new Wrapper ( pScrollPanel, Size (200,300), pBox, true)), String::CreateFromAscii ("Second ListBox"), - 0); + ""); AddControl (::std::auto_ptr(pScrollPanel)); @@ -152,7 +152,7 @@ TestPanel::TestPanel (TreeNode* pParent) ::std::auto_ptr(new Wrapper ( this, Size (100,30), pButton, false)), String::CreateFromAscii ("Button Area"), - 0); + ""); } diff --git a/sd/source/ui/toolpanel/ToolPanel.cxx b/sd/source/ui/toolpanel/ToolPanel.cxx index 7a640788f9c7..15747aeb9476 100644 --- a/sd/source/ui/toolpanel/ToolPanel.cxx +++ b/sd/source/ui/toolpanel/ToolPanel.cxx @@ -75,7 +75,7 @@ ToolPanel::~ToolPanel (void) sal_uInt32 ToolPanel::AddControl ( ::std::auto_ptr pControlFactory, const String& rTitle, - ULONG nHelpId, + const rtl::OString& sHelpId, const TitledControl::ClickHandler& rClickHandler) { TitledControl* pTitledControl = new TitledControl ( @@ -117,9 +117,7 @@ sal_uInt32 ToolPanel::AddControl ( rFocusManager.RegisterLink(pChild->GetWindow(),pFirst, KEY_DOWN); } - // FIXME: HELPID - pTitledControl->GetWindow()->SetHelpId(""/*nHelpId*/); - (void)nHelpId; + pTitledControl->GetWindow()->SetHelpId(sHelpId); return mpControlContainer->AddControl (pChild); } diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx index b2e0048af64a..d2b63045c960 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx @@ -66,10 +66,9 @@ MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase) rBase, pContainer)); pSelector->LateInit(); - // FIXME: HELPID - pSelector->SetHelpId( ""/*HID_SD_TASK_PANE_PREVIEW_CURRENT*/ ); + pSelector->SetHelpId( HID_SD_TASK_PANE_PREVIEW_CURRENT ); GetShellManager()->AddSubShell( - HID_SD_TASK_PANE_PREVIEW_CURRENT, + SHELLID_SD_TASK_PANE_PREVIEW_CURRENT, pSelector.get(), pSelector->GetWindow()); pTitledControl = AddControl ( @@ -84,10 +83,9 @@ MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase) rBase, pContainer)); pSelector->LateInit(); - // FIXME: HELPID - pSelector->SetHelpId( ""/*HID_SD_TASK_PANE_PREVIEW_RECENT*/ ); + pSelector->SetHelpId( HID_SD_TASK_PANE_PREVIEW_RECENT ); GetShellManager()->AddSubShell( - HID_SD_TASK_PANE_PREVIEW_RECENT, + SHELLID_SD_TASK_PANE_PREVIEW_RECENT, pSelector.get(), pSelector->GetWindow()); pTitledControl = AddControl ( @@ -103,10 +101,9 @@ MasterPagesPanel::MasterPagesPanel (TreeNode* pParent, ViewShellBase& rBase) *pDrawViewShell, pContainer)); pSelector->LateInit(); - // FIXME: HELPID - pSelector->SetHelpId( ""/*HID_SD_TASK_PANE_PREVIEW_ALL*/ ); + pSelector->SetHelpId( HID_SD_TASK_PANE_PREVIEW_ALL ); GetShellManager()->AddSubShell( - HID_SD_TASK_PANE_PREVIEW_ALL, + SHELLID_SD_TASK_PANE_PREVIEW_ALL, pSelector.get(), pSelector->GetWindow()); pTitledControl = AddControl ( diff --git a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx index d94e1dfd2b1f..ad12cbcf7870 100644 --- a/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesSelector.cxx @@ -791,7 +791,6 @@ void MasterPagesSelector::SetHelpId( const rtl::OString& aId ) { const ::osl::MutexGuard aGuard (maMutex); - // FIXME: HELPID mpPageSet->SetHelpId( aId ); } diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx index c076b6680501..8193ae3004d2 100644 --- a/sd/source/ui/view/ViewShellImplementation.cxx +++ b/sd/source/ui/view/ViewShellImplementation.cxx @@ -95,10 +95,8 @@ ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent) { FreeResource(); - // FIXME: HELPID - SetHelpId( ""/*HID_SD_UNDODELETEWARNING_DLG*/ ); - // FIXME: HELPID - maDisableCB.SetHelpId( ""/*HID_SD_UNDODELETEWARNING_CBX*/ ); + SetHelpId( HID_SD_UNDODELETEWARNING_DLG ); + maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX ); maYesBtn.SetText(Button::GetStandardText(BUTTON_YES)); maNoBtn.SetText(Button::GetStandardText(BUTTON_NO)); diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index f6591b15188c..aa1a0f53c15a 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -133,10 +133,8 @@ ImpUndoDeleteWarning::ImpUndoDeleteWarning(Window* pParent) { FreeResource(); - // FIXME: HELPID - SetHelpId( ""/*HID_SD_UNDODELETEWARNING_DLG*/ ); - // FIXME: HELPID - maDisableCB.SetHelpId( ""/*HID_SD_UNDODELETEWARNING_CBX*/ ); + SetHelpId( HID_SD_UNDODELETEWARNING_DLG ); + maDisableCB.SetHelpId( HID_SD_UNDODELETEWARNING_CBX ); maYesBtn.SetText(Button::GetStandardText(BUTTON_YES)); maNoBtn.SetText(Button::GetStandardText(BUTTON_NO)); diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx index 54d8fa0bcd94..8d932c4be047 100644 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -51,7 +51,7 @@ #include "res_bmp.hrc" #include "glob.hrc" #include "app.hrc" - +#include "helpids.h" #include "optsitem.hxx" #include "app.hxx" #include "FrameView.hxx" @@ -597,26 +597,20 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence if (mePageKind == PK_NOTES) { SetHelpId( SID_NOTESMODE ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SID_NOTESMODE*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SID_NOTESMODE*/ ); + GetActiveWindow()->SetHelpId( HID_NOTESMODE ); + GetActiveWindow()->SetUniqueId( HID_NOTESMODE ); } else if (mePageKind == PK_HANDOUT) { SetHelpId( SID_HANDOUTMODE ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SID_HANDOUTMODE*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SID_HANDOUTMODE*/ ); + GetActiveWindow()->SetHelpId( HID_HANDOUTMODE ); + GetActiveWindow()->SetUniqueId( HID_HANDOUTMODE ); } else { SetHelpId( SD_IF_SDDRAWVIEWSHELL ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SD_IF_SDDRAWVIEWSHELL*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SD_IF_SDDRAWVIEWSHELL*/ ); + GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL ); + GetActiveWindow()->SetUniqueId( HID_SDDRAWVIEWSHELL ); } } diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 7071ea522002..629b712e4ad2 100644 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -61,7 +61,7 @@ #include #include #include - +#include "helpids.h" #include "app.hrc" #include "helpids.h" #include "strings.hrc" @@ -347,20 +347,16 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) if( eDocType == DOCUMENT_TYPE_DRAW ) { SetHelpId( SD_IF_SDGRAPHICVIEWSHELL ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SD_IF_SDGRAPHICVIEWSHELL*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SD_IF_SDGRAPHICVIEWSHELL*/ ); + GetActiveWindow()->SetHelpId( HID_SDGRAPHICVIEWSHELL ); + GetActiveWindow()->SetUniqueId( HID_SDGRAPHICVIEWSHELL ); } else { if (mePageKind == PK_NOTES) { SetHelpId( SID_NOTESMODE ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SID_NOTESMODE*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SID_NOTESMODE*/ ); + GetActiveWindow()->SetHelpId( HID_NOTESMODE ); + GetActiveWindow()->SetUniqueId( HID_NOTESMODE ); // AutoLayouts muessen erzeugt sein GetDoc()->StopWorkStartupDelay(); @@ -368,10 +364,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) else if (mePageKind == PK_HANDOUT) { SetHelpId( SID_HANDOUTMODE ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SID_HANDOUTMODE*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SID_HANDOUTMODE*/ ); + GetActiveWindow()->SetHelpId( HID_HANDOUTMODE ); + GetActiveWindow()->SetUniqueId( HID_HANDOUTMODE ); // AutoLayouts muessen erzeugt sein GetDoc()->StopWorkStartupDelay(); @@ -379,10 +373,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) else { SetHelpId( SD_IF_SDDRAWVIEWSHELL ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SD_IF_SDDRAWVIEWSHELL*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SD_IF_SDDRAWVIEWSHELL*/ ); + GetActiveWindow()->SetHelpId( HID_SDDRAWVIEWSHELL ); + GetActiveWindow()->SetUniqueId( HID_SDDRAWVIEWSHELL ); } } diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx index 2574032e3d99..d7cc1fc1d84a 100644 --- a/sd/source/ui/view/drviewsb.cxx +++ b/sd/source/ui/view/drviewsb.cxx @@ -33,7 +33,7 @@ #ifndef _SVXIDS_HXX #include #endif - +#include #include #include #include @@ -127,7 +127,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) AbstractSdInsertLayerDlg* pDlg = pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, true, String( SdResId( STR_INSERTLAYER ) ) ) : 0; if( pDlg ) { - pDlg->SetHelpId( SID_INSERTLAYER ); + pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_INSERTLAYER )->GetCommand() ); // Ueberpruefung auf schon vorhandene Namen BOOL bLoop = TRUE; @@ -293,7 +293,7 @@ void DrawViewShell::FuTemp02(SfxRequest& rReq) AbstractSdInsertLayerDlg* pDlg = pFact ? pFact->CreateSdInsertLayerDlg(NULL, aNewAttr, bDelete, String( SdResId( STR_MODIFYLAYER ) ) ) : 0; if( pDlg ) { - pDlg->SetHelpId( SID_MODIFYLAYER ); + pDlg->SetHelpId( SD_MOD()->GetSlotPool()->GetSlot( SID_MODIFYLAYER )->GetCommand() ); // Ueberpruefung auf schon vorhandene Namen BOOL bLoop = TRUE; diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx index 53afc793786e..7feca5213a24 100644 --- a/sd/source/ui/view/outlnvsh.cxx +++ b/sd/source/ui/view/outlnvsh.cxx @@ -32,7 +32,7 @@ #include "ViewShellImplementation.hxx" #include - +#include "helpids.h" #include "app.hrc" #include #include @@ -179,10 +179,8 @@ void OutlineViewShell::Construct(DrawDocShell* ) SetName (aName); SetHelpId( SD_IF_SDOUTLINEVIEWSHELL ); - // FIXME: HELPID - GetActiveWindow()->SetHelpId( ""/*SD_IF_SDOUTLINEVIEWSHELL*/ ); - // FIXME: HELPID - GetActiveWindow()->SetUniqueId( ""/*SD_IF_SDOUTLINEVIEWSHELL*/ ); + GetActiveWindow()->SetHelpId( HID_SDOUTLINEVIEWSHELL ); + GetActiveWindow()->SetUniqueId( HID_SDOUTLINEVIEWSHELL ); } diff --git a/sd/source/ui/view/sdruler.cxx b/sd/source/ui/view/sdruler.cxx index 68ea51a9a914..679c28bb3a93 100644 --- a/sd/source/ui/view/sdruler.cxx +++ b/sd/source/ui/view/sdruler.cxx @@ -113,14 +113,12 @@ Ruler::Ruler( DrawViewShell& rViewSh, ::Window* pParent, ::sd::Window* pWin, USH if ( nWinStyle & WB_HSCROLL ) { bHorz = TRUE; - // FIXME: HELPID - SetHelpId( ""/*HID_SD_RULER_HORIZONTAL*/ ); + SetHelpId( HID_SD_RULER_HORIZONTAL ); } else { bHorz = FALSE; - // FIXME: HELPID - SetHelpId( ""/*HID_SD_RULER_VERTICAL*/ ); + SetHelpId( HID_SD_RULER_VERTICAL ); } } diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx index 7092fcfc0b7e..7cae5d452a1b 100644 --- a/sd/source/ui/view/sdwindow.cxx +++ b/sd/source/ui/view/sdwindow.cxx @@ -100,8 +100,7 @@ Window::Window(::Window* pParent) // Hilfe-ID setzen // SetHelpId(HID_SD_WIN_DOCUMENT); - // FIXME: HELPID - SetUniqueId(""/*HID_SD_WIN_DOCUMENT*/); + SetUniqueId(HID_SD_WIN_DOCUMENT); // #i78183# Added after discussed with AF EnableRTL(FALSE); diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 1350054bcdb5..d9d074eee395 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -102,8 +102,7 @@ TabControl::TabControl(DrawViewShell* pViewSh, Window* pParent) : EnableEditMode(); SetSizePixel(Size(0, 0)); SetMaxPageWidth( 150 ); - // FIXME: HELPID - SetHelpId( ""/*HID_SD_TABBAR_PAGES*/ ); + SetHelpId( HID_SD_TABBAR_PAGES ); } /************************************************************************* -- cgit From 4a02c63d1431b2e8686a035e119c4a2f5c972592 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 10 Jul 2010 18:21:24 +0200 Subject: CWS changehid: #i111874#: change code to support HelpIds as byte strings --- .../dialogs/ChartTypeDialogController.cxx | 3 +- chart2/source/controller/dialogs/DataBrowser.cxx | 3 +- chart2/source/controller/dialogs/dlg_ChartType.src | 2 +- .../controller/dialogs/dlg_CreationWizard.cxx | 3 +- .../source/controller/dialogs/dlg_DataEditor.src | 2 +- .../source/controller/dialogs/dlg_DataSource.cxx | 3 +- .../controller/dialogs/dlg_InsertAxis_Grid.cxx | 21 +- .../controller/dialogs/dlg_InsertAxis_Grid.src | 2 +- .../controller/dialogs/dlg_InsertDataLabel.src | 2 +- .../controller/dialogs/dlg_InsertErrorBars.src | 1 - .../source/controller/dialogs/dlg_InsertLegend.src | 2 +- .../source/controller/dialogs/dlg_InsertTitle.src | 2 +- .../controller/dialogs/dlg_InsertTrendline.src | 2 +- chart2/source/controller/dialogs/dlg_View3D.src | 3 +- .../controller/dialogs/tp_3D_SceneGeometry.src | 3 +- chart2/source/controller/dialogs/tp_ChartType.src | 2 +- chart2/source/controller/dialogs/tp_ErrorBars.src | 1 - .../source/controller/dialogs/tp_PointGeometry.src | 1 - .../source/controller/dialogs/tp_SeriesToAxis.src | 1 - .../source/controller/dialogs/tp_TitleRotation.cxx | 3 +- chart2/source/controller/dialogs/tp_Trendline.src | 1 - .../dialogs/tp_Wizard_TitlesAndObjects.cxx | 9 +- chart2/source/controller/inc/HelpIds.hrc | 266 +++--- chart2/source/controller/main/ChartWindow.cxx | 3 +- sc/inc/addincol.hxx | 7 +- sc/inc/funcdesc.hxx | 4 +- sc/inc/sc.hrc | 661 +++++++-------- sc/inc/scabstdlg.hxx | 4 +- sc/inc/sccommands.h | 333 ++++++++ sc/inc/scdll.hxx | 1 - sc/inc/scfuncs.hrc | 557 +++++++------ sc/inc/scmod.hxx | 1 - sc/source/core/data/global.cxx | 9 +- sc/source/core/inc/addinhelpid.hxx | 4 +- sc/source/core/tool/addincol.cxx | 14 +- sc/source/core/tool/addinhelpid.cxx | 10 +- sc/source/ui/app/inputwin.cxx | 30 +- sc/source/ui/app/scdll.cxx | 54 -- sc/source/ui/app/scmod.cxx | 71 -- sc/source/ui/attrdlg/scdlgfact.cxx | 8 +- sc/source/ui/attrdlg/scdlgfact.hxx | 4 +- sc/source/ui/dbgui/consdlg.src | 2 +- sc/source/ui/dbgui/dpgroupdlg.cxx | 3 +- sc/source/ui/dbgui/pivot.src | 2 +- sc/source/ui/dbgui/pvfundlg.cxx | 3 +- sc/source/ui/dbgui/pvlaydlg.cxx | 15 +- sc/source/ui/docshell/docsh4.cxx | 8 +- sc/source/ui/drawfunc/drformsh.src | 18 +- sc/source/ui/drawfunc/fuins2.cxx | 5 +- sc/source/ui/drawfunc/objdraw.src | 896 +-------------------- sc/source/ui/inc/shtabdlg.hxx | 2 +- sc/source/ui/inc/strindlg.hxx | 2 +- sc/source/ui/miscdlgs/acredlin.src | 2 +- sc/source/ui/miscdlgs/anyrefdg.cxx | 5 +- sc/source/ui/miscdlgs/highred.src | 2 +- sc/source/ui/miscdlgs/linkarea.cxx | 3 +- sc/source/ui/miscdlgs/scuiautofmt.cxx | 4 +- sc/source/ui/miscdlgs/sharedocdlg.src | 2 +- sc/source/ui/miscdlgs/shtabdlg.cxx | 10 +- sc/source/ui/miscdlgs/solveroptions.cxx | 3 +- sc/source/ui/miscdlgs/strindlg.cxx | 31 +- sc/source/ui/miscdlgs/warnbox.cxx | 3 +- sc/source/ui/navipi/scenwnd.cxx | 6 +- sc/source/ui/pagedlg/hfedtdlg.src | 48 +- sc/source/ui/pagedlg/tphf.cxx | 6 +- sc/source/ui/src/autofmt.src | 2 +- sc/source/ui/src/dbnamdlg.src | 2 +- sc/source/ui/src/filter.src | 4 +- sc/source/ui/src/hdrcont.src | 40 +- sc/source/ui/src/miscdlgs.src | 32 +- sc/source/ui/src/namedlg.src | 2 +- sc/source/ui/src/opredlin.src | 2 +- sc/source/ui/src/optsolver.src | 2 +- sc/source/ui/src/popup.src | 102 +-- sc/source/ui/src/scfuncs.src | 3 +- sc/source/ui/src/solvrdlg.src | 2 +- sc/source/ui/src/tabopdlg.src | 2 +- sc/source/ui/src/toolbox.src | 130 --- sc/source/ui/view/gridwin.cxx | 6 +- sc/source/ui/view/preview.cxx | 6 +- sc/source/ui/view/tabvwsh3.cxx | 30 +- sc/source/ui/view/tabvwshf.cxx | 13 +- 82 files changed, 1352 insertions(+), 2222 deletions(-) create mode 100644 sc/inc/sccommands.h diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index bd50a4144d9b..5e8bd7336b86 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -1156,8 +1156,7 @@ void CombiColumnLineChartDialogController::showExtraControls( Window* pParent, c m_pMF_NumberOfLines->SetLast( 100, FUNIT_CUSTOM ); m_pMF_NumberOfLines->SetMin( 1, FUNIT_CUSTOM ); m_pMF_NumberOfLines->SetMax( 100, FUNIT_CUSTOM ); - // FIXME: HELPID - m_pMF_NumberOfLines->SetHelpId( ""/*HID_SCH_NUM_OF_LINES*/ ); + m_pMF_NumberOfLines->SetHelpId( HID_SCH_NUM_OF_LINES ); m_pMF_NumberOfLines->SetModifyHdl( LINK( this, CombiColumnLineChartDialogController, ChangeLineCountHdl ) ); } diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 74ab52795f32..513d49b6aad8 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -241,8 +241,7 @@ SeriesHeader::SeriesHeader( Window * pParent ) : m_spSeriesName->EnableUpdateData( 4 * EDIT_UPDATEDATA_TIMEOUT ); // define is in vcl/edit.hxx m_spSeriesName->SetUpdateDataHdl( LINK( this, SeriesHeader, SeriesNameChanged )); m_spSeriesName->SetModifyHdl( LINK( this, SeriesHeader, SeriesNameEdited )); - // FIXME: HELPID - m_spSeriesName->SetHelpId( ""/*HID_SCH_DATA_SERIES_LABEL*/ ); + m_spSeriesName->SetHelpId( HID_SCH_DATA_SERIES_LABEL ); Show(); } diff --git a/chart2/source/controller/dialogs/dlg_ChartType.src b/chart2/source/controller/dialogs/dlg_ChartType.src index 5523ad8956db..57e1f281a613 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType.src +++ b/chart2/source/controller/dialogs/dlg_ChartType.src @@ -38,7 +38,7 @@ ModalDialog DLG_DIAGRAM_TYPE { - HelpID = SID_DIAGRAM_TYPE ; + HelpID = HID_DIAGRAM_TYPE ; Size = MAP_APPFONT ( CHART_TYPE_DLG_WIDTH , CHART_TYPE_DLG_HEIGHT ) ; diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx index 88974a501dc7..e7a7a8bd43d8 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard.cxx @@ -117,8 +117,7 @@ CreationWizard::CreationWizard( Window* pParent, const uno::Reference< frame::XM #endif , WZS_INVALID_STATE ); - // FIXME: HELPID - this->SetRoadmapHelpId( ""/*HID_SCH_WIZARD_ROADMAP*/ ); + this->SetRoadmapHelpId( HID_SCH_WIZARD_ROADMAP ); this->SetRoadmapInteractive( sal_True ); Size aAdditionalRoadmapSize( LogicToPixel( Size( 85, 0 ), MAP_APPFONT ) ); Size aSize( this->GetSizePixel() ); diff --git a/chart2/source/controller/dialogs/dlg_DataEditor.src b/chart2/source/controller/dialogs/dlg_DataEditor.src index dadd1ac3098d..02ccc98b7a82 100644 --- a/chart2/source/controller/dialogs/dlg_DataEditor.src +++ b/chart2/source/controller/dialogs/dlg_DataEditor.src @@ -38,7 +38,7 @@ ModalDialog DLG_DIAGRAM_DATA { - HelpID = SID_DIAGRAM_DATA ; + HelpID = HID_DIAGRAM_DATA ; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx index b9d0b842e836..9469293ae1c5 100644 --- a/chart2/source/controller/dialogs/dlg_DataSource.cxx +++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx @@ -187,8 +187,7 @@ DataSourceDialog::DataSourceDialog( m_pTabControl->SelectTabPage( m_nLastPageId ); - // FIXME: HELPID - SetHelpId( ""/*HID_SCH_DLG_RANGES*/ ); + SetHelpId( HID_SCH_DLG_RANGES ); } DataSourceDialog::~DataSourceDialog() diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx index ca4c21a3ba01..0a250b5bf874 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx @@ -88,22 +88,15 @@ SchAxisDlg::SchAxisDlg( Window* pWindow FreeResource(); if(!bAxisDlg) { - // FIXME: HELPID - SetHelpId( ""/*SID_INSERT_GRIDS*/ ); + SetHelpId( HID_INSERT_GRIDS ); SetText( ObjectNameProvider::getName(OBJECTTYPE_GRID,true) ); - // FIXME: HELPID - aCbPrimaryX.SetHelpId( ""/*HID_SCH_CB_XGRID*/ ); - // FIXME: HELPID - aCbPrimaryY.SetHelpId( ""/*HID_SCH_CB_YGRID*/ ); - // FIXME: HELPID - aCbPrimaryZ.SetHelpId( ""/*HID_SCH_CB_ZGRID*/ ); - // FIXME: HELPID - aCbSecondaryX.SetHelpId( ""/*HID_SCH_CB_SECONDARY_XGRID*/ ); - // FIXME: HELPID - aCbSecondaryY.SetHelpId( ""/*HID_SCH_CB_SECONDARY_YGRID*/ ); - // FIXME: HELPID - aCbSecondaryZ.SetHelpId( ""/*HID_SCH_CB_SECONDARY_ZGRID*/ ); + aCbPrimaryX.SetHelpId( HID_SCH_CB_XGRID ); + aCbPrimaryY.SetHelpId( HID_SCH_CB_YGRID ); + aCbPrimaryZ.SetHelpId( HID_SCH_CB_ZGRID ); + aCbSecondaryX.SetHelpId( HID_SCH_CB_SECONDARY_XGRID ); + aCbSecondaryY.SetHelpId( HID_SCH_CB_SECONDARY_YGRID ); + aCbSecondaryZ.SetHelpId( HID_SCH_CB_SECONDARY_ZGRID ); aFlPrimary.Hide(); aFlSecondary.Hide(); diff --git a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src index 11eec47d0996..0ee3f219c12c 100644 --- a/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src +++ b/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src @@ -33,7 +33,7 @@ ModalDialog DLG_AXIS_OR_GRID { - HelpID = SID_INSERT_AXIS ; + HelpID = HID_INSERT_AXIS ; OutputSize = TRUE ; SVLook = TRUE ; //Size = MAP_APPFONT ( 160 , 99 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertDataLabel.src b/chart2/source/controller/dialogs/dlg_InsertDataLabel.src index 8f8a64485778..24ae2f63fce1 100644 --- a/chart2/source/controller/dialogs/dlg_InsertDataLabel.src +++ b/chart2/source/controller/dialogs/dlg_InsertDataLabel.src @@ -32,7 +32,7 @@ ModalDialog DLG_DATA_DESCR { - HelpID = SID_INSERT_DESCRIPTION ; + HelpID = HID_INSERT_DESCRIPTION ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 316 , 185 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src index 08230207b007..f7a61cf1e283 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src @@ -33,7 +33,6 @@ ModalDialog DLG_DATA_YERRORBAR { -// HelpID = SID_INSERT_STATISTICS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 300 , 156 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertLegend.src b/chart2/source/controller/dialogs/dlg_InsertLegend.src index 9e957b4b203b..cfe8ab3493e0 100644 --- a/chart2/source/controller/dialogs/dlg_InsertLegend.src +++ b/chart2/source/controller/dialogs/dlg_InsertLegend.src @@ -36,7 +36,7 @@ ModalDialog DLG_LEGEND { - HelpID = SID_INSERT_CHART_LEGEND ; + HelpID = HID_INSERT_CHART_LEGEND ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 135 , 80 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertTitle.src b/chart2/source/controller/dialogs/dlg_InsertTitle.src index f84ff2c6acd7..446763e93b9e 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTitle.src +++ b/chart2/source/controller/dialogs/dlg_InsertTitle.src @@ -32,7 +32,7 @@ ModalDialog DLG_TITLE { - HelpID = SID_INSERT_TITLE ; + HelpID = HID_INSERT_TITLE ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 220 , 156 ) ; diff --git a/chart2/source/controller/dialogs/dlg_InsertTrendline.src b/chart2/source/controller/dialogs/dlg_InsertTrendline.src index 54c490d4a2d1..e7abd803fd87 100644 --- a/chart2/source/controller/dialogs/dlg_InsertTrendline.src +++ b/chart2/source/controller/dialogs/dlg_InsertTrendline.src @@ -37,7 +37,7 @@ ModalDialog DLG_DATA_TRENDLINE { - HelpID = SID_INSERT_STATISTICS ; + HelpID = HID_INSERT_STATISTICS ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT( DLG_DATA_TRENDLINE_RES_WIDTH + DLG_DATA_TRENDLINE_ADD_TO_RES, 172 ); diff --git a/chart2/source/controller/dialogs/dlg_View3D.src b/chart2/source/controller/dialogs/dlg_View3D.src index 5b1802ecfb3d..7be2dd60b324 100644 --- a/chart2/source/controller/dialogs/dlg_View3D.src +++ b/chart2/source/controller/dialogs/dlg_View3D.src @@ -28,10 +28,11 @@ #include "dlg_View3D.hrc" #include "SchSlotIds.hxx" #include "CommonResources.hrc" +#include "HelpIds.hrc" TabDialog DLG_3D_VIEW { - HelpID = SID_3D_VIEW ; + HelpID = HID_3D_VIEW ; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src index 329eb25e0e51..e27ce72535a4 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src @@ -28,6 +28,7 @@ #include "tp_3D_SceneGeometry.hrc" #include "dlg_View3D.hrc" #include "SchSlotIds.hxx" +#include "HelpIds.hrc" #ifndef _SVT_CONTROLDIMS_HRC_ #include @@ -68,7 +69,7 @@ CustomUnitText [ en-US ] = " degrees" ; TabPage TP_3D_SCENEGEOMETRY { - HelpID = SID_3D_VIEW ; + HelpID = HID_3D_VIEW ; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src index a9bb2a039f3c..c127cc184cba 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.src +++ b/chart2/source/controller/dialogs/tp_ChartType.src @@ -69,7 +69,7 @@ TabPage TP_CHARTTYPE { Hide = TRUE ; - HelpID = SID_DIAGRAM_TYPE; + HelpID = HID_DIAGRAM_TYPE; SVLook = TRUE ; Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT ) ; diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src index 03748914255f..aede04751907 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.src +++ b/chart2/source/controller/dialogs/tp_ErrorBars.src @@ -31,7 +31,6 @@ TabPage TP_YERRORBAR { Hide = TRUE ; -// HelpID = HID_SCH_STAT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; RESOURCE_ERRORBARS( 260 - 12, 0 ) diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.src b/chart2/source/controller/dialogs/tp_PointGeometry.src index 54c591c0865d..39e1e1e9e21d 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.src +++ b/chart2/source/controller/dialogs/tp_PointGeometry.src @@ -30,7 +30,6 @@ TabPage TP_LAYOUT { Hide = TRUE ; -// HelpID = HID_LAYOUT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; }; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src index bc434be7ef07..994a44ec39ef 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src @@ -30,7 +30,6 @@ TabPage TP_OPTIONS { Hide = TRUE ; -// HelpID = HID_LAYOUT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; FixedLine 1 diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index a1915c4b9583..5b1d5647dc6c 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -68,8 +68,7 @@ SchAlignmentTabPage::SchAlignmentTabPage(Window* pWindow, aFtTextDirection.SetPosPixel( aFtTextDirection.GetPosPixel() + aMove ); aLbTextDirection.SetPosPixel( aLbTextDirection.GetPosPixel() + aMove ); - // FIXME: HELPID - aLbTextDirection.SetHelpId( ""/*HID_SCH_TEXTDIRECTION_EQUATION*/ ); + aLbTextDirection.SetHelpId( HID_SCH_TEXTDIRECTION_EQUATION ); } } diff --git a/chart2/source/controller/dialogs/tp_Trendline.src b/chart2/source/controller/dialogs/tp_Trendline.src index efa11d3e2d67..f7a3fa33a6d8 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.src +++ b/chart2/source/controller/dialogs/tp_Trendline.src @@ -31,7 +31,6 @@ TabPage TP_TRENDLINE { Hide = TRUE ; -// HelpID = HID_SCH_STAT ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; RESOURCE_TRENDLINE( 260 - 12, 0 ) diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx index 40ea37d217a7..8c97de81dd5d 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx @@ -75,12 +75,9 @@ TitlesAndObjectsTabPage::TitlesAndObjectsTabPage( svt::OWizardMachine* pParent aFont.SetWeight( WEIGHT_BOLD ); m_aFT_TitleDescription.SetControlFont( aFont ); - // FIXME: HELPID - m_aCB_Grid_X.SetHelpId( ""/*HID_SCH_CB_XGRID*/ ); - // FIXME: HELPID - m_aCB_Grid_Y.SetHelpId( ""/*HID_SCH_CB_YGRID*/ ); - // FIXME: HELPID - m_aCB_Grid_Z.SetHelpId( ""/*HID_SCH_CB_ZGRID*/ ); + m_aCB_Grid_X.SetHelpId( HID_SCH_CB_XGRID ); + m_aCB_Grid_Y.SetHelpId( HID_SCH_CB_YGRID ); + m_aCB_Grid_Z.SetHelpId( HID_SCH_CB_ZGRID ); m_apTitleResources->SetUpdateDataHdl( LINK( this, TitlesAndObjectsTabPage, ChangeHdl )); m_apLegendPositionResources->SetChangeHdl( LINK( this, TitlesAndObjectsTabPage, ChangeHdl )); diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index 1052b7ea962f..c6b5f456b059 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -28,155 +28,137 @@ #define CHART_HELPIDS_HRC #include -//next is 120 -//free: 20, 21, 22, 30, 31, 32, 33 -//see old chart: schhids.h +#define HID_SCH_ALIGNMENT "CHART2_HID_SCH_ALIGNMENT" +#define HID_SCH_LEGEND_POS "CHART2_HID_SCH_LEGEND_POS" +#define HID_SCH_DATA_DESCR "CHART2_HID_SCH_DATA_DESCR" -/* -#define HID_SCH_DATA_ROW (HID_SCH_START + 0) -#define HID_SCH_DATA_LINE (HID_SCH_START + 1) -#define HID_SCH_DATA_POINT (HID_SCH_START + 2) -#define HID_SCH_DIAGRAM_X_AXIS (HID_SCH_START + 3) -*/ -#define HID_SCH_ALIGNMENT (HID_SCH_START + 4) -#define HID_SCH_LEGEND_POS (HID_SCH_START + 5) -#define HID_SCH_DATA_DESCR (HID_SCH_START + 6) +#define HID_SCH_STAT "CHART2_HID_SCH_STAT" +#define HID_SCH_WIN_DOCUMENT "CHART2_HID_SCH_WIN_DOCUMENT" +#define HID_SCH_CTL_DATA "CHART2_HID_SCH_CTL_DATA" -#define HID_SCH_STAT (HID_SCH_START + 8) -#define HID_SCH_WIN_DOCUMENT (HID_SCH_START + 9) -#define HID_SCH_CTL_DATA (HID_SCH_START + 10) - -#define HID_SCH_CT_INDICATE (HID_SCH_START + 11) -// #define HID_SCH_CT_REGRESS (HID_SCH_START + 12) +#define HID_SCH_CT_INDICATE "CHART2_HID_SCH_CT_INDICATE" //for chart type dialog: -#define HID_SCH_CTL_TYPE (HID_SCH_START + 13) -#define HID_SCH_CTL_VARIANT (HID_SCH_START + 14) -#define HID_SCH_NUM_OF_LINES (HID_SCH_START + 43) -#define HID_SCH_SERIES_LIST (HID_SCH_START + 15) -#define HID_SCH_DATA_RANGES_LIST (HID_SCH_START + 16) +#define HID_SCH_CTL_TYPE "CHART2_HID_SCH_CTL_TYPE" +#define HID_SCH_CTL_VARIANT "CHART2_HID_SCH_CTL_VARIANT" +#define HID_SCH_NUM_OF_LINES "CHART2_HID_SCH_NUM_OF_LINES" +#define HID_SCH_SERIES_LIST "CHART2_HID_SCH_SERIES_LIST" +#define HID_SCH_DATA_RANGES_LIST "CHART2_HID_SCH_DATA_RANGES_LIST" // -//#define HID_SCH_CTL_LIGHT (HID_SCH_START + 17) -//#define HID_SCH_CT_INDICATE2 (HID_SCH_START + 18) -//#define HID_SCH_CT_REGRESS2 (HID_SCH_START + 19) - -#define HID_SCH_TBI_DATA_INSERT_ROW (HID_SCH_START + 23) -#define HID_SCH_TBI_DATA_INSERT_COL (HID_SCH_START + 24) -#define HID_SCH_TBI_DATA_DELETE_ROW (HID_SCH_START + 25) -#define HID_SCH_TBI_DATA_DELETE_COL (HID_SCH_START + 26) -#define HID_SCH_TBI_DATA_SWAP_COL (HID_SCH_START + 27) -#define HID_SCH_TBI_DATA_SWAP_ROW (HID_SCH_START + 28) -#define HID_SCH_TBI_DATA_INSERT_TEXT_COL (HID_SCH_START + 29) -#define HID_SCH_TBX_DATA (HID_SCH_START + 34) - -#define HID_SCH_ALIGNMENT_CTR_DIAL (HID_SCH_START + 35) -#define HID_SCH_ALIGNMENT_STACKED (HID_SCH_START + 36) -#define HID_SCH_ALIGNMENT_DEGREES (HID_SCH_START + 37) -/* -#define HID_SCH_LAYOUT (HID_SCH_START + 38) - -#define HID_SCH_TBX_EDIT_FIELD (HID_SCH_START + 39) -#define HID_SCH_DIAGRAM_Y_AXIS (HID_SCH_START + 40)//war mal 3 - -#define HID_SCH_DEF_COLOR (HID_SCH_START + 41) -*/ -#define HID_SCH_TP_AXIS_LABEL (HID_SCH_START + 42) - -#define HID_SCH_CHART_AUTO_FORMAT (HID_SCH_START + 44) -#define HID_SCH_LB_BAR_GEOMETRY (HID_SCH_START + 45) -#define HID_SCH_DLG_SPLINE_PROPERTIES (HID_SCH_START + 46) -#define HID_SCH_DLG_RANGES (HID_SCH_START + 47) - -#define HID_SCH_CB_XAXIS (HID_SCH_START + 48) -#define HID_SCH_CB_YAXIS (HID_SCH_START + 49) -#define HID_SCH_CB_ZAXIS (HID_SCH_START + 50) -#define HID_SCH_CB_SECONDARY_XAXIS (HID_SCH_START + 51) -#define HID_SCH_CB_SECONDARY_YAXIS (HID_SCH_START + 52) -#define HID_SCH_CB_SECONDARY_ZAXIS (HID_SCH_START + 53) - -#define HID_SCH_CB_XGRID (HID_SCH_START + 54) -#define HID_SCH_CB_YGRID (HID_SCH_START + 55) -#define HID_SCH_CB_ZGRID (HID_SCH_START + 56) -#define HID_SCH_CB_SECONDARY_XGRID (HID_SCH_START + 57) -#define HID_SCH_CB_SECONDARY_YGRID (HID_SCH_START + 58) -#define HID_SCH_CB_SECONDARY_ZGRID (HID_SCH_START + 59) - -#define HID_SCH_LEGEND_POS_LEFT (HID_SCH_START + 60) -#define HID_SCH_LEGEND_POS_TOP (HID_SCH_START + 61) -#define HID_SCH_LEGEND_POS_RIGHT (HID_SCH_START + 62) -#define HID_SCH_LEGEND_POS_BOTTOM (HID_SCH_START + 63) - -#define HID_SCH_STATISTIK_MEANVALUE (HID_SCH_START + 64) -#define HID_SCH_STATISTIK_NO_ERROR (HID_SCH_START + 65) -#define HID_SCH_STATISTIK_VARIANT (HID_SCH_START + 66) -#define HID_SCH_STATISTIK_SIGMA (HID_SCH_START + 67) -#define HID_SCH_STATISTIK_PERCENT (HID_SCH_START + 68) -#define HID_SCH_STATISTIK_BIGERROR (HID_SCH_START + 69) -#define HID_SCH_STATISTIK_CONSTERROR (HID_SCH_START + 70) -#define HID_SCH_STATISTIK_PERCENT_VALUE (HID_SCH_START + 71) -#define HID_SCH_STATISTIK_BIGERROR_VALUE (HID_SCH_START + 72) -#define HID_SCH_STATISTIK_PLUS_VALUE (HID_SCH_START + 73) -#define HID_SCH_STATISTIK_MINUS_VALUE (HID_SCH_START + 74) - -#define HID_SCH_DATALABEL_VALUE (HID_SCH_START + 75) -#define HID_SCH_DATALABEL_NUMBER (HID_SCH_START + 76) -#define HID_SCH_DATALABEL_PERCENT (HID_SCH_START + 77) -#define HID_SCH_DATALABEL_TEXT (HID_SCH_START + 78) -#define HID_SCH_DATALABEL_SYMBOL (HID_SCH_START + 79) -#define HID_SCH_PB_NUMBERFORMAT (HID_SCH_START + 88) -#define HID_SCH_PB_PERCENT_NUMBERFORMAT (HID_SCH_START + 89) -#define HID_SCH_DATALABEL_SEPARATOR (HID_SCH_START + 90) -#define HID_SCH_DATALABEL_PLACEMENT (HID_SCH_START + 91) -#define HID_SCH_TEXTDIRECTION (HID_SCH_START + 115) -#define HID_SCH_TEXTDIRECTION_TITLE (HID_SCH_START + 116) -#define HID_SCH_TEXTDIRECTION_EQUATION (HID_SCH_START + 117) -#define HID_SCH_DATALABEL_ROTATION_KNOB (HID_SCH_START + 118) -#define HID_SCH_DATALABEL_ROTATION_EDIT (HID_SCH_START + 119) - -#define HID_SCH_TITLE_MAIN (HID_SCH_START + 80) -#define HID_SCH_TITLE_SUB (HID_SCH_START + 81) -#define HID_SCH_TITLE_X (HID_SCH_START + 82) -#define HID_SCH_TITLE_Y (HID_SCH_START + 83) -#define HID_SCH_TITLE_Z (HID_SCH_START + 84) -#define HID_SCH_TITLE_SECONDARY_X (HID_SCH_START + 92) -#define HID_SCH_TITLE_SECONDARY_Y (HID_SCH_START + 93) - -#define HID_SCH_WIZARD_ROADMAP (HID_SCH_START + 85) -#define HID_SCH_LEGEND_SHOW (HID_SCH_START + 86) -#define HID_SCH_DATA_SERIES_LABEL (HID_SCH_START + 87) - -#define HID_SCH_STARTING_ANGLE_DIAL (HID_SCH_START + 94) - -#define HID_SCH_TRENDLINE_RB_NONE (HID_SCH_START + 95) -#define HID_SCH_TRENDLINE_RB_LINEAR (HID_SCH_START + 96) -#define HID_SCH_TRENDLINE_RB_LOGARITHMIC (HID_SCH_START + 97) -#define HID_SCH_TRENDLINE_RB_EXPONENTIAL (HID_SCH_START + 98) -#define HID_SCH_TRENDLINE_RB_POWER (HID_SCH_START + 99) -#define HID_SCH_TRENDLINE_SHOW_EQUATION (HID_SCH_START + 100) -#define HID_SCH_TRENDLINE_SHOW_R_SQUARED (HID_SCH_START + 101) - -#define HID_SCH_STATISTIK_FUNCTION (HID_SCH_START + 102) -#define HID_SCH_STATISTIK_RANGE (HID_SCH_START + 103) -#define HID_SCH_STATISTIK_FUNCTION_LB (HID_SCH_START + 104) -#define HID_SCH_STATISTIK_POSITIVE_VALUE (HID_SCH_START + 105) -#define HID_SCH_STATISTIK_POSITIVE_RANGE (HID_SCH_START + 106) -#define HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER (HID_SCH_START + 107) -#define HID_SCH_STATISTIK_NEGATIVE_VALUE (HID_SCH_START + 108) -#define HID_SCH_STATISTIK_NEGATIVE_RANGE (HID_SCH_START + 109) -#define HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER (HID_SCH_START + 110) -#define HID_SCH_STATISTIK_SAME_FOR_BOTH (HID_SCH_START + 111) -#define HID_SCH_STATISTIK_SHOW_BOTH (HID_SCH_START + 112) -#define HID_SCH_STATISTIK_SHOW_POSITIVE (HID_SCH_START + 113) -#define HID_SCH_STATISTIK_SHOW_NEGATIVE (HID_SCH_START + 114) - - -// HID_SCH_START should be 63280 (checked 25.Nov 2002) - -// 453 == SCH_IF_CHARTVIEWSHELL, da SFX_INTERFACE_LIB kein -// Define sondern neuerdings ein Enum ist -//#define HID_SCH_VIEWSHELL_DOCUMENT (453) +#define HID_SCH_TBI_DATA_INSERT_ROW "CHART2_HID_SCH_TBI_DATA_INSERT_ROW" +#define HID_SCH_TBI_DATA_INSERT_COL "CHART2_HID_SCH_TBI_DATA_INSERT_COL" +#define HID_SCH_TBI_DATA_DELETE_ROW "CHART2_HID_SCH_TBI_DATA_DELETE_ROW" +#define HID_SCH_TBI_DATA_DELETE_COL "CHART2_HID_SCH_TBI_DATA_DELETE_COL" +#define HID_SCH_TBI_DATA_SWAP_COL "CHART2_HID_SCH_TBI_DATA_SWAP_COL" +#define HID_SCH_TBI_DATA_SWAP_ROW "CHART2_HID_SCH_TBI_DATA_SWAP_ROW" +#define HID_SCH_TBI_DATA_INSERT_TEXT_COL "CHART2_HID_SCH_TBI_DATA_INSERT_TEXT_COL" +#define HID_SCH_TBX_DATA "CHART2_HID_SCH_TBX_DATA" + +#define HID_SCH_ALIGNMENT_CTR_DIAL "CHART2_HID_SCH_ALIGNMENT_CTR_DIAL" +#define HID_SCH_ALIGNMENT_STACKED "CHART2_HID_SCH_ALIGNMENT_STACKED" +#define HID_SCH_ALIGNMENT_DEGREES "CHART2_HID_SCH_ALIGNMENT_DEGREES" + +#define HID_SCH_TP_AXIS_LABEL "CHART2_HID_SCH_TP_AXIS_LABEL" + +#define HID_SCH_CHART_AUTO_FORMAT "CHART2_HID_SCH_CHART_AUTO_FORMAT" +#define HID_SCH_LB_BAR_GEOMETRY "CHART2_HID_SCH_LB_BAR_GEOMETRY" +#define HID_SCH_DLG_SPLINE_PROPERTIES "CHART2_HID_SCH_DLG_SPLINE_PROPERTIES" +#define HID_SCH_DLG_RANGES "CHART2_HID_SCH_DLG_RANGES" + +#define HID_SCH_CB_XAXIS "CHART2_HID_SCH_CB_XAXIS" +#define HID_SCH_CB_YAXIS "CHART2_HID_SCH_CB_YAXIS" +#define HID_SCH_CB_ZAXIS "CHART2_HID_SCH_CB_ZAXIS" +#define HID_SCH_CB_SECONDARY_XAXIS "CHART2_HID_SCH_CB_SECONDARY_XAXIS" +#define HID_SCH_CB_SECONDARY_YAXIS "CHART2_HID_SCH_CB_SECONDARY_YAXIS" +#define HID_SCH_CB_SECONDARY_ZAXIS "CHART2_HID_SCH_CB_SECONDARY_ZAXIS" + +#define HID_SCH_CB_XGRID "CHART2_HID_SCH_CB_XGRID" +#define HID_SCH_CB_YGRID "CHART2_HID_SCH_CB_YGRID" +#define HID_SCH_CB_ZGRID "CHART2_HID_SCH_CB_ZGRID" +#define HID_SCH_CB_SECONDARY_XGRID "CHART2_HID_SCH_CB_SECONDARY_XGRID" +#define HID_SCH_CB_SECONDARY_YGRID "CHART2_HID_SCH_CB_SECONDARY_YGRID" +#define HID_SCH_CB_SECONDARY_ZGRID "CHART2_HID_SCH_CB_SECONDARY_ZGRID" + +#define HID_SCH_LEGEND_POS_LEFT "CHART2_HID_SCH_LEGEND_POS_LEFT" +#define HID_SCH_LEGEND_POS_TOP "CHART2_HID_SCH_LEGEND_POS_TOP" +#define HID_SCH_LEGEND_POS_RIGHT "CHART2_HID_SCH_LEGEND_POS_RIGHT" +#define HID_SCH_LEGEND_POS_BOTTOM "CHART2_HID_SCH_LEGEND_POS_BOTTOM" + +#define HID_SCH_STATISTIK_MEANVALUE "CHART2_HID_SCH_STATISTIK_MEANVALUE" +#define HID_SCH_STATISTIK_NO_ERROR "CHART2_HID_SCH_STATISTIK_NO_ERROR" +#define HID_SCH_STATISTIK_VARIANT "CHART2_HID_SCH_STATISTIK_VARIANT" +#define HID_SCH_STATISTIK_SIGMA "CHART2_HID_SCH_STATISTIK_SIGMA" +#define HID_SCH_STATISTIK_PERCENT "CHART2_HID_SCH_STATISTIK_PERCENT" +#define HID_SCH_STATISTIK_BIGERROR "CHART2_HID_SCH_STATISTIK_BIGERROR" +#define HID_SCH_STATISTIK_CONSTERROR "CHART2_HID_SCH_STATISTIK_CONSTERROR" +#define HID_SCH_STATISTIK_PERCENT_VALUE "CHART2_HID_SCH_STATISTIK_PERCENT_VALUE" +#define HID_SCH_STATISTIK_BIGERROR_VALUE "CHART2_HID_SCH_STATISTIK_BIGERROR_VALUE" +#define HID_SCH_STATISTIK_PLUS_VALUE "CHART2_HID_SCH_STATISTIK_PLUS_VALUE" +#define HID_SCH_STATISTIK_MINUS_VALUE "CHART2_HID_SCH_STATISTIK_MINUS_VALUE" + +#define HID_SCH_DATALABEL_VALUE "CHART2_HID_SCH_DATALABEL_VALUE" +#define HID_SCH_DATALABEL_NUMBER "CHART2_HID_SCH_DATALABEL_NUMBER" +#define HID_SCH_DATALABEL_PERCENT "CHART2_HID_SCH_DATALABEL_PERCENT" +#define HID_SCH_DATALABEL_TEXT "CHART2_HID_SCH_DATALABEL_TEXT" +#define HID_SCH_DATALABEL_SYMBOL "CHART2_HID_SCH_DATALABEL_SYMBOL" +#define HID_SCH_PB_NUMBERFORMAT "CHART2_HID_SCH_PB_NUMBERFORMAT" +#define HID_SCH_PB_PERCENT_NUMBERFORMAT "CHART2_HID_SCH_PB_PERCENT_NUMBERFORMAT" +#define HID_SCH_DATALABEL_SEPARATOR "CHART2_HID_SCH_DATALABEL_SEPARATOR" +#define HID_SCH_DATALABEL_PLACEMENT "CHART2_HID_SCH_DATALABEL_PLACEMENT" +#define HID_SCH_TEXTDIRECTION "CHART2_HID_SCH_TEXTDIRECTION" +#define HID_SCH_TEXTDIRECTION_TITLE "CHART2_HID_SCH_TEXTDIRECTION_TITLE" +#define HID_SCH_TEXTDIRECTION_EQUATION "CHART2_HID_SCH_TEXTDIRECTION_EQUATION" +#define HID_SCH_DATALABEL_ROTATION_KNOB "CHART2_HID_SCH_DATALABEL_ROTATION_KNOB" +#define HID_SCH_DATALABEL_ROTATION_EDIT "CHART2_HID_SCH_DATALABEL_ROTATION_EDIT" + +#define HID_SCH_TITLE_MAIN "CHART2_HID_SCH_TITLE_MAIN" +#define HID_SCH_TITLE_SUB "CHART2_HID_SCH_TITLE_SUB" +#define HID_SCH_TITLE_X "CHART2_HID_SCH_TITLE_X" +#define HID_SCH_TITLE_Y "CHART2_HID_SCH_TITLE_Y" +#define HID_SCH_TITLE_Z "CHART2_HID_SCH_TITLE_Z" +#define HID_SCH_TITLE_SECONDARY_X "CHART2_HID_SCH_TITLE_SECONDARY_X" +#define HID_SCH_TITLE_SECONDARY_Y "CHART2_HID_SCH_TITLE_SECONDARY_Y" + +#define HID_SCH_WIZARD_ROADMAP "CHART2_HID_SCH_WIZARD_ROADMAP" +#define HID_SCH_LEGEND_SHOW "CHART2_HID_SCH_LEGEND_SHOW" +#define HID_SCH_DATA_SERIES_LABEL "CHART2_HID_SCH_DATA_SERIES_LABEL" + +#define HID_SCH_STARTING_ANGLE_DIAL "CHART2_HID_SCH_STARTING_ANGLE_DIAL" + +#define HID_SCH_TRENDLINE_RB_NONE "CHART2_HID_SCH_TRENDLINE_RB_NONE" +#define HID_SCH_TRENDLINE_RB_LINEAR "CHART2_HID_SCH_TRENDLINE_RB_LINEAR" +#define HID_SCH_TRENDLINE_RB_LOGARITHMIC "CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC" +#define HID_SCH_TRENDLINE_RB_EXPONENTIAL "CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL" +#define HID_SCH_TRENDLINE_RB_POWER "CHART2_HID_SCH_TRENDLINE_RB_POWER" +#define HID_SCH_TRENDLINE_SHOW_EQUATION "CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION" +#define HID_SCH_TRENDLINE_SHOW_R_SQUARED "CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED" + +#define HID_SCH_STATISTIK_FUNCTION "CHART2_HID_SCH_STATISTIK_FUNCTION" +#define HID_SCH_STATISTIK_RANGE "CHART2_HID_SCH_STATISTIK_RANGE" +#define HID_SCH_STATISTIK_FUNCTION_LB "CHART2_HID_SCH_STATISTIK_FUNCTION_LB" +#define HID_SCH_STATISTIK_POSITIVE_VALUE "CHART2_HID_SCH_STATISTIK_POSITIVE_VALUE" +#define HID_SCH_STATISTIK_POSITIVE_RANGE "CHART2_HID_SCH_STATISTIK_POSITIVE_RANGE" +#define HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER "CHART2_HID_SCH_STATISTIK_POSITIVE_RANGE_CHOOSER" +#define HID_SCH_STATISTIK_NEGATIVE_VALUE "CHART2_HID_SCH_STATISTIK_NEGATIVE_VALUE" +#define HID_SCH_STATISTIK_NEGATIVE_RANGE "CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE" +#define HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER "CHART2_HID_SCH_STATISTIK_NEGATIVE_RANGE_CHOOSER" +#define HID_SCH_STATISTIK_SAME_FOR_BOTH "CHART2_HID_SCH_STATISTIK_SAME_FOR_BOTH" +#define HID_SCH_STATISTIK_SHOW_BOTH "CHART2_HID_SCH_STATISTIK_SHOW_BOTH" +#define HID_SCH_STATISTIK_SHOW_POSITIVE "CHART2_HID_SCH_STATISTIK_SHOW_POSITIVE" +#define HID_SCH_STATISTIK_SHOW_NEGATIVE "CHART2_HID_SCH_STATISTIK_SHOW_NEGATIVE" + +#define HID_INSERT_GRIDS "CHART2_HID_INSERT_GRIDS" + +#define HID_DIAGRAM_TYPE "CHART2_HID_DIAGRAM_TYPE" +#define HID_3D_VIEW "CHART2_HID_3D_VIEW" +#define HID_DIAGRAM_DATA "CHART2_HID_DIAGRAM_DATA" +#define HID_INSERT_AXIS "CHART2_HID_INSERT_AXIS" +#define HID_INSERT_STATISTICS "CHART2_HID_INSERT_STATISTICS" +#define HID_INSERT_TITLE "CHART2_HID_INSERT_TITLE" +#define HID_INSERT_CHART_LEGEND "CHART2_HID_INSERT_CHART_LEGEND" +#define HID_INSERT_DESCRIPTION "CHART2_HID_INSERT_DESCRIPTION" #endif diff --git a/chart2/source/controller/main/ChartWindow.cxx b/chart2/source/controller/main/ChartWindow.cxx index 5400524e8a1e..54add217fb76 100644 --- a/chart2/source/controller/main/ChartWindow.cxx +++ b/chart2/source/controller/main/ChartWindow.cxx @@ -59,8 +59,7 @@ ChartWindow::ChartWindow( WindowController* pWindowController, Window* pParent, , m_pWindowController( pWindowController ) , m_bInPaint(false) { - // FIXME: HELPID - this->SetHelpId( ""/*HID_SCH_WIN_DOCUMENT*/ ); + this->SetHelpId( HID_SCH_WIN_DOCUMENT ); this->SetMapMode( MapMode(MAP_100TH_MM) ); adjustHighContrastMode(); // chart does not depend on exact pixel painting => enable antialiased drawing diff --git a/sc/inc/addincol.hxx b/sc/inc/addincol.hxx index fbc1444cc6de..f8c47ab24446 100644 --- a/sc/inc/addincol.hxx +++ b/sc/inc/addincol.hxx @@ -40,6 +40,7 @@ #include #include #include "scdllapi.h" +#include #ifndef SC_SCMATRIX_HXX #include "scmatrix.hxx" @@ -99,14 +100,14 @@ private: ScAddInArgDesc* pArgDescs; long nCallerPos; USHORT nCategory; - USHORT nHelpId; + rtl::OString sHelpId; mutable com::sun::star::uno::Sequence< com::sun::star::sheet::LocalizedName> aCompNames; mutable BOOL bCompInitialized; public: ScUnoAddInFuncData( const String& rNam, const String& rLoc, const String& rDesc, - USHORT nCat, USHORT nHelp, + USHORT nCat, const rtl::OString&, const com::sun::star::uno::Reference< com::sun::star::reflection::XIdlMethod>& rFunc, const com::sun::star::uno::Any& rO, @@ -126,7 +127,7 @@ public: long GetCallerPos() const { return nCallerPos; } const String& GetDescription() const { return aDescription; } USHORT GetCategory() const { return nCategory; } - USHORT GetHelpId() const { return nHelpId; } + const rtl::OString GetHelpId() const { return sHelpId; } const com::sun::star::uno::Sequence< com::sun::star::sheet::LocalizedName>& GetCompNames() const; BOOL GetExcelName( LanguageType eDestLang, String& rRetExcelName ) const; diff --git a/sc/inc/funcdesc.hxx b/sc/inc/funcdesc.hxx index a8f495440554..a46b8f52a638 100644 --- a/sc/inc/funcdesc.hxx +++ b/sc/inc/funcdesc.hxx @@ -57,7 +57,7 @@ public: virtual void fillVisibleArgumentMapping(::std::vector& _rArguments) const ; virtual void initArgumentInfo() const; virtual ::rtl::OUString getSignature() const ; - virtual long getHelpId() const ; + virtual rtl::OString getHelpId() const ; // parameter virtual sal_uInt32 getParameterCount() const ; @@ -100,7 +100,7 @@ public: USHORT nFIndex; // Unique function index USHORT nCategory; // Function category USHORT nArgCount; // All parameter count, suppressed and unsuppressed - USHORT nHelpId; // HelpID of function + rtl::OString sHelpId; // HelpID of function bool bIncomplete :1; // Incomplete argument info (set for add-in info from configuration) bool bHasSuppressedArgs :1; // Whether there is any suppressed parameter. }; diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index a7d05925957a..10d61b783c18 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -35,6 +35,10 @@ #include // ->Svx-IDs #endif +#include "sfx2/sfxcommands.h" +#include "svx/svxcommands.h" +#include "sccommands.h" + #define VAR_ARGS 30 // variable Parameter in scfuncs.src #define RID_HANDLEBITMAP 10005 @@ -59,28 +63,28 @@ // Calc hat einen Bereich von 2000 IDs // Die Funktionen brauchen 11*90 = 990 IDs -#define HID_SC_FUNC_START (HID_SC_START + 0) -#define HID_INSWIN_START (HID_SC_START + 1000) +//#define HID_SC_FUNC_START (HID_SC_START + 0) +//#define HID_INSWIN_START (HID_SC_START + 1000) #define HID_SC_SHEET_START (HID_SC_START + 1010) #define HID_SC_SHELL_START (HID_SC_START + 1030) -#define HID_SC_WIN_START (HID_SC_START + 1050) -#define HID_SC_CONTROL_START (HID_SC_START + 1070) -#define HID_SC_DLG_START (HID_SC_START + 1100) -#define HID_SC_TOOLBOX_START (HID_SC_START + 1170) -#define HID_SC_MENU_START (HID_SC_START + 1180) -#define HID_SC_OTHER_START (HID_SC_START + 1230) -#define HID_SC_AAI_FUNCS_START (HID_SC_START + 1300) // Analysis Addin Functions -#define HID_SC_DAI_FUNCS_START (HID_SC_START + 1420) // DateFunc Addin Functions +//#define HID_SC_WIN_START (HID_SC_START + 1050) +//#define HID_SC_CONTROL_START (HID_SC_START + 1070) +#define HID_SC_DLG_HACK_START (HID_SC_START + 1100) +//#define HID_SC_TOOLBOX_START (HID_SC_START + 1170) +//#define HID_SC_MENU_START (HID_SC_START + 1180) +//#define HID_SC_OTHER_START (HID_SC_START + 1230) +//#define HID_SC_AAI_FUNCS_START (HID_SC_START + 1300) // Analysis Addin Functions +//#define HID_SC_DAI_FUNCS_START (HID_SC_START + 1420) // DateFunc Addin Functions // --------------------------------------------------------------------------- -#define HID_INSWIN_POS (HID_INSWIN_START + 0 ) -#define HID_INSWIN_CALC (HID_INSWIN_START + 1 ) -#define HID_INSWIN_CANCEL (HID_INSWIN_START + 2 ) -#define HID_INSWIN_OK (HID_INSWIN_START + 3 ) -#define HID_INSWIN_SUMME (HID_INSWIN_START + 4 ) -#define HID_INSWIN_FUNC (HID_INSWIN_START + 5 ) -#define HID_INSWIN_INPUT (HID_INSWIN_START + 6 ) +#define HID_INSWIN_POS "SC_HID_INSWIN_POS" +#define HID_INSWIN_CALC "SC_HID_INSWIN_CALC" +#define HID_INSWIN_CANCEL "SC_HID_INSWIN_CANCEL" +#define HID_INSWIN_OK "SC_HID_INSWIN_OK" +#define HID_INSWIN_SUMME "SC_HID_INSWIN_SUMME" +#define HID_INSWIN_FUNC "SC_HID_INSWIN_FUNC" +#define HID_INSWIN_INPUT "SC_HID_INSWIN_INPUT" // Hilfe IDs fuer Vorlagen --------------------------------------------------- #define HID_SC_SHEET_CELL_STD (HID_SC_SHEET_START +0 ) @@ -109,361 +113,368 @@ #define HID_SCSHELL_PAGEBREAK (HID_SC_SHELL_START +14) #define HID_SCSHELL_MEDIA (HID_SC_SHELL_START +15) + // Hilfe IDs fuer Dokumentfenster -------------------------------------------- -#define HID_SC_WIN_GRIDWIN ( HID_SC_WIN_START ) -#define HID_SC_WIN_PREVIEW ( HID_SC_WIN_START + 1 ) +#define HID_SC_WIN_GRIDWIN "SC_HID_SC_WIN_GRIDWIN" +#define HID_SC_WIN_PREVIEW "SC_HID_SC_WIN_PREVIEW" // Hilfe IDs fuer einzelne Controls (max.30) --------------------------------- // Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts -#define HID_SC_HF_HLL ( HID_SC_CONTROL_START + 0 ) -#define HID_SC_HF_HLC ( HID_SC_CONTROL_START + 1 ) -#define HID_SC_HF_HLR ( HID_SC_CONTROL_START + 2 ) -#define HID_SC_HF_HRL ( HID_SC_CONTROL_START + 3 ) -#define HID_SC_HF_HRC ( HID_SC_CONTROL_START + 4 ) -#define HID_SC_HF_HRR ( HID_SC_CONTROL_START + 5 ) -#define HID_SC_HF_FLL ( HID_SC_CONTROL_START + 6 ) -#define HID_SC_HF_FLC ( HID_SC_CONTROL_START + 7 ) -#define HID_SC_HF_FLR ( HID_SC_CONTROL_START + 8 ) -#define HID_SC_HF_FRL ( HID_SC_CONTROL_START + 9 ) -#define HID_SC_HF_FRC ( HID_SC_CONTROL_START + 10 ) -#define HID_SC_HF_FRR ( HID_SC_CONTROL_START + 11 ) +#define HID_SC_HF_HLL "SC_HID_SC_HF_HLL" +#define HID_SC_HF_HLC "SC_HID_SC_HF_HLC" +#define HID_SC_HF_HLR "SC_HID_SC_HF_HLR" +#define HID_SC_HF_HRL "SC_HID_SC_HF_HRL" +#define HID_SC_HF_HRC "SC_HID_SC_HF_HRC" +#define HID_SC_HF_HRR "SC_HID_SC_HF_HRR" +#define HID_SC_HF_FLL "SC_HID_SC_HF_FLL" +#define HID_SC_HF_FLC "SC_HID_SC_HF_FLC" +#define HID_SC_HF_FLR "SC_HID_SC_HF_FLR" +#define HID_SC_HF_FRL "SC_HID_SC_HF_FRL" +#define HID_SC_HF_FRC "SC_HID_SC_HF_FRC" +#define HID_SC_HF_FRR "SC_HID_SC_HF_FRR" // "Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr! -//#define HID_SC_SUBT_COLS_1 ( HID_SC_CONTROL_START + 12 ) -//#define HID_SC_SUBT_COLS_2 ( HID_SC_CONTROL_START + 13 ) -//#define HID_SC_SUBT_COLS_3 ( HID_SC_CONTROL_START + 14 ) +#define HID_SC_SUBT_COLS_1 "SC_HID_SC_SUBT_COLS_1" +#define HID_SC_SUBT_COLS_2 "SC_HID_SC_SUBT_COLS_2" +#define HID_SC_SUBT_COLS_3 "SC_HID_SC_SUBT_COLS_3" // Eintraege im Navigator -#define HID_SC_NAVIPI_ENTRIES ( HID_SC_CONTROL_START + 15 ) -#define HID_SC_NAVIPI_ROW ( HID_SC_CONTROL_START + 16 ) -#define HID_SC_NAVIPI_COL ( HID_SC_CONTROL_START + 17 ) -#define HID_SC_NAVIPI_DOC ( HID_SC_CONTROL_START + 18 ) -#define HID_SC_NAVIPI_DATA ( HID_SC_CONTROL_START + 19 ) -#define HID_SC_NAVIPI_UP ( HID_SC_CONTROL_START + 20 ) -#define HID_SC_NAVIPI_DOWN ( HID_SC_CONTROL_START + 21 ) -#define HID_SC_NAVIPI_ZOOM ( HID_SC_CONTROL_START + 22 ) -#define HID_SC_NAVIPI_ROOT ( HID_SC_CONTROL_START + 23 ) -#define HID_SC_NAVIPI_SCEN ( HID_SC_CONTROL_START + 24 ) -#define HID_SC_NAVIPI_DROP ( HID_SC_CONTROL_START + 25 ) +#define HID_SC_NAVIPI_ENTRIES "SC_HID_SC_NAVIPI_ENTRIES" +#define HID_SC_NAVIPI_ROW "SC_HID_SC_NAVIPI_ROW" +#define HID_SC_NAVIPI_COL "SC_HID_SC_NAVIPI_COL" +#define HID_SC_NAVIPI_DOC "SC_HID_SC_NAVIPI_DOC" +#define HID_SC_NAVIPI_DATA "SC_HID_SC_NAVIPI_DATA" +#define HID_SC_NAVIPI_UP "SC_HID_SC_NAVIPI_UP" +#define HID_SC_NAVIPI_DOWN "SC_HID_SC_NAVIPI_DOWN" +#define HID_SC_NAVIPI_ZOOM "SC_HID_SC_NAVIPI_ZOOM" +#define HID_SC_NAVIPI_ROOT "SC_HID_SC_NAVIPI_ROOT" +#define HID_SC_NAVIPI_SCEN "SC_HID_SC_NAVIPI_SCEN" +#define HID_SC_NAVIPI_DROP "SC_HID_SC_NAVIPI_DROP" // Teilergebnisse -#define HID_SC_SUBT_GROUP ( HID_SC_CONTROL_START + 26 ) -#define HID_SC_SUBT_COLS ( HID_SC_CONTROL_START + 27 ) -#define HID_SC_SUBT_FUNC ( HID_SC_CONTROL_START + 28 ) +#define HID_SC_SUBT_GROUP "SC_HID_SC_SUBT_GROUP" +#define HID_SC_SUBT_COLS "SC_HID_SC_SUBT_COLS" +#define HID_SC_SUBT_FUNC "SC_HID_SC_SUBT_FUNC" // -#define HID_SC_NAVIPI_TOOLBOX ( HID_SC_CONTROL_START + 29 ) +#define HID_SC_NAVIPI_TOOLBOX "SC_HID_SC_NAVIPI_TOOLBOX" // Bereich ist voll! // Hilfe IDs fuer Dialoge / Pages (max.70) ----------------------------------- -#define HID_SC_AUTOFORMAT (HID_SC_DLG_START ) -#define HID_SC_PIVOTFILTER (HID_SC_DLG_START +1 ) -#define HID_SC_INPORTOPT (HID_SC_DLG_START +2 ) -#define HID_SC_PIVOTSUBT (HID_SC_DLG_START +3 ) -#define HID_SC_FORM_ARGS (HID_SC_DLG_START +4 ) -#define HID_SCPAGE_SORT_FIELDS (HID_SC_DLG_START +5 ) -#define HID_SCPAGE_SORT_OPTIONS (HID_SC_DLG_START +6 ) -#define HID_SCPAGE_SUBT_OPTIONS (HID_SC_DLG_START +7 ) -#define HID_SCPAGE_SUBT_GROUP (HID_SC_DLG_START +8 ) -#define HID_SCPAGE_PROTECTION (HID_SC_DLG_START +9 ) -#define HID_SCPAGE_VIEW (HID_SC_DLG_START +10 ) -#define HID_SCPAGE_CALC (HID_SC_DLG_START +11 ) -#define HID_SCPAGE_USERLISTS (HID_SC_DLG_START +12 ) -#define HID_SCPAGE_HFEDIT (HID_SC_DLG_START +13 ) -#define HID_SCPAGE_AREAS (HID_SC_DLG_START +14 ) -#define HID_SCPAGE_TABLE (HID_SC_DLG_START +15 ) -#define HID_SCPAGE_PRINT (HID_SC_DLG_START +16 ) - -#define HID_SCPAGE_SUBT_GROUP1 (HID_SC_DLG_START +17 ) -#define HID_SCPAGE_SUBT_GROUP2 (HID_SC_DLG_START +18 ) -#define HID_SCPAGE_SUBT_GROUP3 (HID_SC_DLG_START +19 ) - -#define HID_SCPAGE_HFED_HL (HID_SC_DLG_START +20 ) -#define HID_SCPAGE_HFED_HR (HID_SC_DLG_START +21 ) -#define HID_SCPAGE_HFED_FL (HID_SC_DLG_START +22 ) -#define HID_SCPAGE_HFED_FR (HID_SC_DLG_START +23 ) - -#define HID_SCPAGE_CONTENT (HID_SC_DLG_START +24 ) -#define HID_SCPAGE_LAYOUT (HID_SC_DLG_START +25 ) -#define HID_SCPAGE_INPUT (HID_SC_DLG_START +26 ) - -#define HID_SC_NAVIGATOR (HID_SC_DLG_START +27 ) - -#define HID_SC_MTRIN_VAL (HID_SC_DLG_START +28 ) -#define HID_SC_MTRIN_DEF (HID_SC_DLG_START +29 ) -#define HID_SC_SELENTRY_LIST (HID_SC_DLG_START +30 ) -#define HID_SC_GROUP_COLS (HID_SC_DLG_START +31 ) -#define HID_SC_GROUP_ROWS (HID_SC_DLG_START +32 ) - -#define HID_SC_HF_TEXT (HID_SC_DLG_START +33 ) -#define HID_SC_HF_FILE (HID_SC_DLG_START +34 ) -#define HID_SC_HF_TABLE (HID_SC_DLG_START +35 ) -#define HID_SC_HF_PAGE (HID_SC_DLG_START +36 ) -#define HID_SC_HF_PAGES (HID_SC_DLG_START +37 ) -#define HID_SC_HF_DATE (HID_SC_DLG_START +38 ) -#define HID_SC_HF_TIME (HID_SC_DLG_START +39 ) - -#define HID_SC_HEADER_EDIT (HID_SC_DLG_START +40 ) -#define HID_SC_FOOTER_EDIT (HID_SC_DLG_START +41 ) - -#define HID_SC_SCENWIN_TOP (HID_SC_DLG_START +42 ) -#define HID_SC_SCENWIN_BOTTOM (HID_SC_DLG_START +43 ) - -#define HID_SC_INPUTWIN (HID_SC_DLG_START +44 ) - -#define HID_SC_RENAME_NAME (HID_SC_DLG_START +45 ) -#define HID_SC_APPEND_NAME (HID_SC_DLG_START +46 ) +#define HID_SC_AUTOFORMAT "SC_HID_SC_AUTOFORMAT" +#define HID_SC_PIVOTFILTER "SC_HID_SC_PIVOTFILTER" +#define HID_SC_INPORTOPT "SC_HID_SC_INPORTOPT" +#define HID_SC_PIVOTSUBT "SC_HID_SC_PIVOTSUBT" +#define HID_SC_FORM_ARGS "SC_HID_SC_FORM_ARGS" +#define HID_SCPAGE_SORT_FIELDS "SC_HID_SCPAGE_SORT_FIELDS" +#define HID_SCPAGE_SORT_OPTIONS "SC_HID_SCPAGE_SORT_OPTIONS" +#define HID_SCPAGE_SUBT_OPTIONS "SC_HID_SCPAGE_SUBT_OPTIONS" +#define HID_SCPAGE_SUBT_GROUP "SC_HID_SCPAGE_SUBT_GROUP" +#define HID_SCPAGE_PROTECTION "SC_HID_SCPAGE_PROTECTION" +#define HID_SCPAGE_VIEW "SC_HID_SCPAGE_VIEW" +#define HID_SCPAGE_CALC "SC_HID_SCPAGE_CALC" +#define HID_SCPAGE_USERLISTS "SC_HID_SCPAGE_USERLISTS" +#define HID_SCPAGE_HFEDIT "SC_HID_SCPAGE_HFEDIT" +#define HID_SCPAGE_AREAS "SC_HID_SCPAGE_AREAS" +#define HID_SCPAGE_TABLE "SC_HID_SCPAGE_TABLE" +#define HID_SCPAGE_PRINT "SC_HID_SCPAGE_PRINT" + +#define HID_SCPAGE_SUBT_GROUP1 "SC_HID_SCPAGE_SUBT_GROUP1" +#define HID_SCPAGE_SUBT_GROUP2 "SC_HID_SCPAGE_SUBT_GROUP2" +#define HID_SCPAGE_SUBT_GROUP3 "SC_HID_SCPAGE_SUBT_GROUP3" + +#define HID_SCPAGE_HFED_HL "SC_HID_SCPAGE_HFED_HL" +#define HID_SCPAGE_HFED_HR "SC_HID_SCPAGE_HFED_HR" +#define HID_SCPAGE_HFED_FL "SC_HID_SCPAGE_HFED_FL" +#define HID_SCPAGE_HFED_FR "SC_HID_SCPAGE_HFED_FR" + +#define HID_SCPAGE_CONTENT "SC_HID_SCPAGE_CONTENT" +#define HID_SCPAGE_LAYOUT "SC_HID_SCPAGE_LAYOUT" +#define HID_SCPAGE_INPUT "SC_HID_SCPAGE_INPUT" + +#define HID_SC_NAVIGATOR "SC_HID_SC_NAVIGATOR" + +#define HID_SC_MTRIN_VAL "SC_HID_SC_MTRIN_VAL" +#define HID_SC_MTRIN_DEF "SC_HID_SC_MTRIN_DEF" +#define HID_SC_SELENTRY_LIST "SC_HID_SC_SELENTRY_LIST" +#define HID_SC_GROUP_COLS "SC_HID_SC_GROUP_COLS" +#define HID_SC_GROUP_ROWS "SC_HID_SC_GROUP_ROWS" + +#define HID_SC_HF_TEXT "SC_HID_SC_HF_TEXT" +#define HID_SC_HF_FILE "SC_HID_SC_HF_FILE" +#define HID_SC_HF_TABLE "SC_HID_SC_HF_TABLE" +#define HID_SC_HF_PAGE "SC_HID_SC_HF_PAGE" +#define HID_SC_HF_PAGES "SC_HID_SC_HF_PAGES" +#define HID_SC_HF_DATE "SC_HID_SC_HF_DATE" +#define HID_SC_HF_TIME "SC_HID_SC_HF_TIME" + +#define HID_SC_HEADER_EDIT "SC_HID_SC_HEADER_EDIT" +#define HID_SC_FOOTER_EDIT "SC_HID_SC_FOOTER_EDIT" + +#define HID_SC_SCENWIN_TOP "SC_HID_SC_SCENWIN_TOP" +#define HID_SC_SCENWIN_BOTTOM "SC_HID_SC_SCENWIN_BOTTOM" + +#define HID_SC_INPUTWIN "SC_HID_SC_INPUTWIN" + +#define HID_SC_RENAME_NAME "SC_HID_SC_RENAME_NAME" +#define HID_SC_APPEND_NAME "SC_HID_SC_APPEND_NAME" // Funktionsautopilot: nur als Unique-IDs -#define HID_SC_FAP_PAGE (HID_SC_DLG_START +47 ) -#define HID_SC_FAP_EDIT1 (HID_SC_DLG_START +48 ) -#define HID_SC_FAP_EDIT2 (HID_SC_DLG_START +49 ) -#define HID_SC_FAP_EDIT3 (HID_SC_DLG_START +50 ) -#define HID_SC_FAP_EDIT4 (HID_SC_DLG_START +51 ) +#define HID_SC_FAP_PAGE "SC_HID_SC_FAP_PAGE" +#define HID_SC_FAP_EDIT1 "SC_HID_SC_FAP_EDIT1" +#define HID_SC_FAP_EDIT2 "SC_HID_SC_FAP_EDIT2" +#define HID_SC_FAP_EDIT3 "SC_HID_SC_FAP_EDIT3" +#define HID_SC_FAP_EDIT4 "SC_HID_SC_FAP_EDIT4" -#define HID_SC_ADD_AUTOFMT (HID_SC_DLG_START +52 ) -#define HID_SC_AUTOFMT_NAME (HID_SC_DLG_START +53 ) +#define HID_SC_ADD_AUTOFMT "SC_HID_SC_ADD_AUTOFMT" +#define HID_SC_AUTOFMT_NAME "SC_HID_SC_AUTOFMT_NAME" -#define HID_SC_DROPMODE_URL (HID_SC_DLG_START +54 ) -#define HID_SC_DROPMODE_LINK (HID_SC_DLG_START +55 ) -#define HID_SC_DROPMODE_COPY (HID_SC_DLG_START +56 ) +#define HID_SC_DROPMODE_URL "SC_HID_SC_DROPMODE_URL" +#define HID_SC_DROPMODE_LINK "SC_HID_SC_DROPMODE_LINK" +#define HID_SC_DROPMODE_COPY "SC_HID_SC_DROPMODE_COPY" -#define HID_SC_FAP_STRUCT (HID_SC_DLG_START +57 ) -#define HID_SC_ASCII_TABCTR (HID_SC_DLG_START +58 ) +#define HID_SC_FAP_STRUCT "SC_HID_SC_FAP_STRUCT" +#define HID_SC_ASCII_TABCTR "SC_HID_SC_ASCII_TABCTR" -#define HID_SC_SCENARIO_DELETE (HID_SC_DLG_START +59 ) -#define HID_SC_SCENARIO_EDIT (HID_SC_DLG_START +60 ) +#define HID_SC_SCENARIO_DELETE "SC_HID_SC_SCENARIO_DELETE" +#define HID_SC_SCENARIO_EDIT "SC_HID_SC_SCENARIO_EDIT" -#define HID_SCDLG_FORMULA (HID_SC_DLG_START +61 ) -#define HID_SCDLG_CONDFORMAT (HID_SC_DLG_START +62 ) -#define HID_COLROWNAMERANGES (HID_SC_DLG_START +63 ) +#define HID_SCDLG_FORMULA "SC_HID_SCDLG_FORMULA" +#define HID_SCDLG_CONDFORMAT "SC_HID_SCDLG_CONDFORMAT" +#define HID_COLROWNAMERANGES "SC_HID_COLROWNAMERANGES" -#define HID_FUNCTION_BOX (HID_SC_DLG_START +64 ) -#define HID_SCPAGE_OPREDLINE (HID_SC_DLG_START +65 ) -#define HID_SC_REDLIN_CTR (HID_SC_DLG_START +66 ) +#define HID_FUNCTION_BOX "SC_HID_FUNCTION_BOX" +#define HID_SCPAGE_OPREDLINE "SC_HID_SCPAGE_OPREDLINE" +#define HID_SC_REDLIN_CTR "SC_HID_SC_REDLIN_CTR" //Kopf/FusszeilenDlg: Contextmenue fuer Dateiname -#define HID_FCOMMAND_TITEL (HID_SC_DLG_START +67 ) -#define HID_FCOMMAND_FILENAME (HID_SC_DLG_START +68 ) -#define HID_FCOMMAND_PATH (HID_SC_DLG_START +69 ) +#define HID_FCOMMAND_TITEL "SC_HID_FCOMMAND_TITEL" +#define HID_FCOMMAND_FILENAME "SC_HID_FCOMMAND_FILENAME" +#define HID_FCOMMAND_PATH "SC_HID_FCOMMAND_PATH" // Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) ----------------------- -#define HID_SC_TOOLBOX_TOOLS ( HID_SC_TOOLBOX_START ) -#define HID_SC_TOOLBOX_TABLE ( HID_SC_TOOLBOX_START + 1 ) -#define HID_SC_TOOLBOX_DRAW ( HID_SC_TOOLBOX_START + 2 ) -#define HID_SC_TOOLBOX_DRTEXT ( HID_SC_TOOLBOX_START + 3 ) -#define HID_SC_TOOLBOX_PREVIEW ( HID_SC_TOOLBOX_START + 4 ) +#define HID_SC_TOOLBOX_TOOLS "SC_HID_SC_TOOLBOX_TOOLS" +#define HID_SC_TOOLBOX_TABLE "SC_HID_SC_TOOLBOX_TABLE" +#define HID_SC_TOOLBOX_DRAW "SC_HID_SC_TOOLBOX_DRAW" +#define HID_SC_TOOLBOX_DRTEXT "SC_HID_SC_TOOLBOX_DRTEXT" +#define HID_SC_TOOLBOX_PREVIEW "SC_HID_SC_TOOLBOX_PREVIEW" // wrong group - HID_SC_DLG_START is full -#define HID_SC_RENAME_AUTOFMT ( HID_SC_TOOLBOX_START + 5 ) -#define HID_SC_REN_AFMT_NAME ( HID_SC_TOOLBOX_START + 6 ) +#define HID_SC_RENAME_AUTOFMT "SC_HID_SC_RENAME_AUTOFMT" +#define HID_SC_REN_AFMT_NAME "SC_HID_SC_REN_AFMT_NAME" -#define HID_SC_TOOLBOX_GRAPHIC ( HID_SC_TOOLBOX_START + 7 ) +#define HID_SC_TOOLBOX_GRAPHIC "SC_HID_SC_TOOLBOX_GRAPHIC" -#define HID_CHG_PROTECT ( HID_SC_TOOLBOX_START + 8 ) +#define HID_CHG_PROTECT "SC_HID_CHG_PROTECT" -#define HID_SC_RENAME_OBJECT ( HID_SC_TOOLBOX_START + 9 ) +#define HID_SC_RENAME_OBJECT "SC_HID_SC_RENAME_OBJECT" -#define HID_SC_REN_AFMT_DLG ( HID_SC_TOOLBOX_START + 10 ) +#define HID_SC_REN_AFMT_DLG "SC_HID_SC_REN_AFMT_DLG" // Hilfe IDs fuer Submenus (max.50) ------------------------------------------ -#define HID_SCMENU_EDIT ( HID_SC_MENU_START ) -#define HID_SCMENU_FILL ( HID_SC_MENU_START + 1 ) -#define HID_SCMENU_DELBREAK ( HID_SC_MENU_START + 2 ) -#define HID_SCMENU_VIEW ( HID_SC_MENU_START + 3 ) -#define HID_SCMENU_TOOLBARS ( HID_SC_MENU_START + 4 ) -#define HID_SCMENU_INSERT ( HID_SC_MENU_START + 5 ) -#define HID_SCMENU_INSBREAK ( HID_SC_MENU_START + 6 ) -#define HID_SCMENU_NAME ( HID_SC_MENU_START + 7 ) -#define HID_SCMENU_GRAPHIC ( HID_SC_MENU_START + 8 ) -#define HID_SCMENU_DATA ( HID_SC_MENU_START + 9 ) -#define HID_SCMENU_FILTER ( HID_SC_MENU_START + 10 ) -#define HID_SCMENU_OUTLINE ( HID_SC_MENU_START + 11 ) -#define HID_SCMENU_PIVOT ( HID_SC_MENU_START + 12 ) -#define HID_SCMENU_EXTRA ( HID_SC_MENU_START + 13 ) -#define HID_SCMENU_SPELLING ( HID_SC_MENU_START + 14 ) -#define HID_SCMENU_AUDIT ( HID_SC_MENU_START + 15 ) -#define HID_SCMENU_PROTECT ( HID_SC_MENU_START + 16 ) -#define HID_SCMENU_CELLCONT ( HID_SC_MENU_START + 17 ) -#define HID_SCMENU_ROW ( HID_SC_MENU_START + 18 ) -#define HID_SCMENU_COL ( HID_SC_MENU_START + 19 ) -#define HID_SCMENU_TAB ( HID_SC_MENU_START + 20 ) -#define HID_SCMENU_MERGE ( HID_SC_MENU_START + 21 ) -#define HID_SCMENU_AREA ( HID_SC_MENU_START + 22 ) -#define HID_SCMENU_OBJMIRROR ( HID_SC_MENU_START + 23 ) -#define HID_SCMENU_OBJARRANGE ( HID_SC_MENU_START + 24 ) -#define HID_SCMENU_ANCHOR ( HID_SC_MENU_START + 25 ) -#define HID_SCMENU_SENDTO ( HID_SC_MENU_START + 26 ) -#define HID_SCMENU_CHANGES ( HID_SC_MENU_START + 27 ) - -#define HID_SC_FAP_BTN_FX1 ( HID_SC_MENU_START + 28 ) -#define HID_SC_FAP_BTN_FX2 ( HID_SC_MENU_START + 29 ) -#define HID_SC_FAP_BTN_FX3 ( HID_SC_MENU_START + 30 ) -#define HID_SC_FAP_BTN_FX4 ( HID_SC_MENU_START + 31 ) -#define HID_SC_FAP_BTN_REF1 ( HID_SC_MENU_START + 32 ) -#define HID_SC_FAP_BTN_REF2 ( HID_SC_MENU_START + 33 ) -#define HID_SC_FAP_BTN_REF3 ( HID_SC_MENU_START + 34 ) -#define HID_SC_FAP_BTN_REF4 ( HID_SC_MENU_START + 35 ) -#define HID_SC_FAP_FORMULA ( HID_SC_MENU_START + 36 ) - -#define HID_SC_SORT_ACTION ( HID_SC_MENU_START + 37 ) -#define HID_SC_SORT_AUTHOR ( HID_SC_MENU_START + 38 ) -#define HID_SC_SORT_DATE ( HID_SC_MENU_START + 39 ) -#define HID_SC_SORT_COMMENT ( HID_SC_MENU_START + 40 ) -#define HID_SORT_POSITION ( HID_SC_MENU_START + 41 ) -#define HID_SC_CHANGES_COMMENT ( HID_SC_MENU_START + 42 ) -#define HID_SC_FUNCTIONLIST ( HID_SC_MENU_START + 43 ) -#define HID_SCPAGE_OPTLOAD ( HID_SC_MENU_START + 44 ) -#define HID_PASSWD_TABLE ( HID_SC_MENU_START + 45 ) -#define HID_PASSWD_DOC ( HID_SC_MENU_START + 46 ) - -#define HID_DATAPILOT_TYPE ( HID_SC_MENU_START + 47 ) -#define HID_DATAPILOT_DATABASE ( HID_SC_MENU_START + 48 ) -#define HID_DATAPILOT_SERVICE ( HID_SC_MENU_START + 49 ) +#define HID_SCMENU_EDIT "SC_HID_SCMENU_EDIT" +#define HID_SCMENU_FILL "SC_HID_SCMENU_FILL" +#define HID_SCMENU_DELBREAK "SC_HID_SCMENU_DELBREAK" +#define HID_SCMENU_VIEW "SC_HID_SCMENU_VIEW" +#define HID_SCMENU_TOOLBARS "SC_HID_SCMENU_TOOLBARS" +#define HID_SCMENU_INSERT "SC_HID_SCMENU_INSERT" +#define HID_SCMENU_INSBREAK "SC_HID_SCMENU_INSBREAK" +#define HID_SCMENU_NAME "SC_HID_SCMENU_NAME" +#define HID_SCMENU_GRAPHIC "SC_HID_SCMENU_GRAPHIC" +#define HID_SCMENU_DATA "SC_HID_SCMENU_DATA" +#define HID_SCMENU_FILTER "SC_HID_SCMENU_FILTER" +#define HID_SCMENU_OUTLINE "SC_HID_SCMENU_OUTLINE" +#define HID_SCMENU_PIVOT "SC_HID_SCMENU_PIVOT" +#define HID_SCMENU_EXTRA "SC_HID_SCMENU_EXTRA" +#define HID_SCMENU_SPELLING "SC_HID_SCMENU_SPELLING" +#define HID_SCMENU_AUDIT "SC_HID_SCMENU_AUDIT" +#define HID_SCMENU_PROTECT "SC_HID_SCMENU_PROTECT" +#define HID_SCMENU_CELLCONT "SC_HID_SCMENU_CELLCONT" +#define HID_SCMENU_ROW "SC_HID_SCMENU_ROW" +#define HID_SCMENU_COL "SC_HID_SCMENU_COL" +#define HID_SCMENU_TAB "SC_HID_SCMENU_TAB" +#define HID_SCMENU_MERGE "SC_HID_SCMENU_MERGE" +#define HID_SCMENU_AREA "SC_HID_SCMENU_AREA" +#define HID_SCMENU_OBJMIRROR "SC_HID_SCMENU_OBJMIRROR" +#define HID_SCMENU_OBJARRANGE "SC_HID_SCMENU_OBJARRANGE" +#define HID_SCMENU_ANCHOR "SC_HID_SCMENU_ANCHOR" +#define HID_SCMENU_SENDTO "SC_HID_SCMENU_SENDTO" +#define HID_SCMENU_CHANGES "SC_HID_SCMENU_CHANGES" + +#define HID_SC_FAP_BTN_FX1 "SC_HID_SC_FAP_BTN_FX1" +#define HID_SC_FAP_BTN_FX2 "SC_HID_SC_FAP_BTN_FX2" +#define HID_SC_FAP_BTN_FX3 "SC_HID_SC_FAP_BTN_FX3" +#define HID_SC_FAP_BTN_FX4 "SC_HID_SC_FAP_BTN_FX4" +#define HID_SC_FAP_BTN_REF1 "SC_HID_SC_FAP_BTN_REF1" +#define HID_SC_FAP_BTN_REF2 "SC_HID_SC_FAP_BTN_REF2" +#define HID_SC_FAP_BTN_REF3 "SC_HID_SC_FAP_BTN_REF3" +#define HID_SC_FAP_BTN_REF4 "SC_HID_SC_FAP_BTN_REF4" +#define HID_SC_FAP_FORMULA "SC_HID_SC_FAP_FORMULA" + +#define HID_SC_SORT_ACTION "SC_HID_SC_SORT_ACTION" +#define HID_SC_SORT_AUTHOR "SC_HID_SC_SORT_AUTHOR" +#define HID_SC_SORT_DATE "SC_HID_SC_SORT_DATE" +#define HID_SC_SORT_COMMENT "SC_HID_SC_SORT_COMMENT" +#define HID_SORT_POSITION "SC_HID_SORT_POSITION" +#define HID_SC_CHANGES_COMMENT "SC_HID_SC_CHANGES_COMMENT" +#define HID_SC_FUNCTIONLIST "SC_HID_SC_FUNCTIONLIST" +#define HID_SCPAGE_OPTLOAD "SC_HID_SCPAGE_OPTLOAD" +#define HID_PASSWD_TABLE "SC_HID_PASSWD_TABLE" +#define HID_PASSWD_DOC "SC_HID_PASSWD_DOC" + +#define HID_DATAPILOT_TYPE "SC_HID_DATAPILOT_TYPE" +#define HID_DATAPILOT_DATABASE "SC_HID_DATAPILOT_DATABASE" +#define HID_DATAPILOT_SERVICE "SC_HID_DATAPILOT_SERVICE" // Other help IDs (max.70) --------------------------------------------------- -#define HID_SCDLG_LINKAREAURL ( HID_SC_OTHER_START ) -#define HID_SCMENU_EDIT_TABLE ( HID_SC_OTHER_START + 1 ) +#define HID_SCDLG_LINKAREAURL "SC_HID_SCDLG_LINKAREAURL" +#define HID_SCMENU_EDIT_TABLE "SC_HID_SCMENU_EDIT_TABLE" -#define HID_SELECTTABLES ( HID_SC_OTHER_START + 2 ) -#define HID_SC_REPLCELLSWARN ( HID_SC_OTHER_START + 3 ) +#define HID_SELECTTABLES "SC_HID_SELECTTABLES" +#define HID_SC_REPLCELLSWARN "SC_HID_SC_REPLCELLSWARN" // data pilot layout dialog -#define HID_SC_DPLAY_PAGE ( HID_SC_OTHER_START + 4 ) -#define HID_SC_DPLAY_COLUMN ( HID_SC_OTHER_START + 5 ) -#define HID_SC_DPLAY_ROW ( HID_SC_OTHER_START + 6 ) -#define HID_SC_DPLAY_DATA ( HID_SC_OTHER_START + 7 ) -#define HID_SC_DPLAY_SELECT ( HID_SC_OTHER_START + 8 ) - -#define HID_SC_DRAW_RENAME ( HID_SC_OTHER_START + 9 ) - -#define HID_SC_DPDATAFIELD ( HID_SC_OTHER_START + 10 ) -#define HID_SC_DPSUBT_OPT ( HID_SC_OTHER_START + 11 ) -#define HID_SC_DPSUBT_HIDE ( HID_SC_OTHER_START + 12 ) -#define HID_SC_DPNUMGROUP ( HID_SC_OTHER_START + 13 ) -#define HID_SC_DPDATEGROUP ( HID_SC_OTHER_START + 14 ) -#define HID_SC_DPDATEGROUP_LB ( HID_SC_OTHER_START + 15 ) -#define HID_SC_DPSHOWDETAIL ( HID_SC_OTHER_START + 16 ) +#define HID_SC_DPLAY_PAGE "SC_HID_SC_DPLAY_PAGE" +#define HID_SC_DPLAY_COLUMN "SC_HID_SC_DPLAY_COLUMN" +#define HID_SC_DPLAY_ROW "SC_HID_SC_DPLAY_ROW" +#define HID_SC_DPLAY_DATA "SC_HID_SC_DPLAY_DATA" +#define HID_SC_DPLAY_SELECT "SC_HID_SC_DPLAY_SELECT" + +#define HID_SC_DRAW_RENAME "SC_HID_SC_DRAW_RENAME" + +#define HID_SC_DPDATAFIELD "SC_HID_SC_DPDATAFIELD" +#define HID_SC_DPSUBT_OPT "SC_HID_SC_DPSUBT_OPT" +#define HID_SC_DPSUBT_HIDE "SC_HID_SC_DPSUBT_HIDE" +#define HID_SC_DPNUMGROUP "SC_HID_SC_DPNUMGROUP" +#define HID_SC_DPDATEGROUP "SC_HID_SC_DPDATEGROUP" +#define HID_SC_DPDATEGROUP_LB "SC_HID_SC_DPDATEGROUP_LB" +#define HID_SC_DPSHOWDETAIL "SC_HID_SC_DPSHOWDETAIL" // #i68101# -#define HID_SC_TITLE_DESCRIPTION_OBJECT ( HID_SC_OTHER_START + 17 ) +#define HID_SC_TITLE_DESCRIPTION_OBJECT "SC_HID_SC_TITLE_DESCRIPTION_OBJECT" -#define HID_SC_SOLVEROPTIONS ( HID_SC_OTHER_START + 18 ) -#define HID_SC_SOLVEROPTIONS_LB ( HID_SC_OTHER_START + 19 ) -#define HID_SC_SOLVER_INTEGER ( HID_SC_OTHER_START + 20 ) -#define HID_SC_SOLVER_DOUBLE ( HID_SC_OTHER_START + 21 ) -#define HID_SC_SOLVER_PROGRESS ( HID_SC_OTHER_START + 22 ) -#define HID_SC_SOLVER_NOSOLUTION ( HID_SC_OTHER_START + 23 ) -#define HID_SC_SOLVER_SUCCESS ( HID_SC_OTHER_START + 24 ) +#define HID_SC_SOLVEROPTIONS "SC_HID_SC_SOLVEROPTIONS" +#define HID_SC_SOLVEROPTIONS_LB "SC_HID_SC_SOLVEROPTIONS_LB" +#define HID_SC_SOLVER_INTEGER "SC_HID_SC_SOLVER_INTEGER" +#define HID_SC_SOLVER_DOUBLE "SC_HID_SC_SOLVER_DOUBLE" +#define HID_SC_SOLVER_PROGRESS "SC_HID_SC_SOLVER_PROGRESS" +#define HID_SC_SOLVER_NOSOLUTION "SC_HID_SC_SOLVER_NOSOLUTION" +#define HID_SC_SOLVER_SUCCESS "SC_HID_SC_SOLVER_SUCCESS" -#define HID_SCDLG_CONFLICTS ( HID_SC_OTHER_START + 25 ) +#define HID_SCDLG_CONFLICTS "SC_HID_SCDLG_CONFLICTS" -#define HID_SC_HF_HL_DEFINED ( HID_SC_OTHER_START + 26 ) -#define HID_SC_HF_HR_DEFINED ( HID_SC_OTHER_START + 27 ) -#define HID_SC_HF_FL_DEFINED ( HID_SC_OTHER_START + 28 ) -#define HID_SC_HF_FR_DEFINED ( HID_SC_OTHER_START + 29 ) +#define HID_SC_HF_HL_DEFINED "SC_HID_SC_HF_HL_DEFINED" +#define HID_SC_HF_HR_DEFINED "SC_HID_SC_HF_HR_DEFINED" +#define HID_SC_HF_FL_DEFINED "SC_HID_SC_HF_FL_DEFINED" +#define HID_SC_HF_FR_DEFINED "SC_HID_SC_HF_FR_DEFINED" // Analysis Addin Functions (max.120) ---------------------------------------- -#define HID_AAI_FUNC_WORKDAY ( HID_SC_AAI_FUNCS_START ) -#define HID_AAI_FUNC_YEARFRAC ( HID_SC_AAI_FUNCS_START + 1 ) -#define HID_AAI_FUNC_EDATE ( HID_SC_AAI_FUNCS_START + 2 ) -#define HID_AAI_FUNC_WEEKNUM ( HID_SC_AAI_FUNCS_START + 3 ) -#define HID_AAI_FUNC_EOMONTH ( HID_SC_AAI_FUNCS_START + 4 ) -#define HID_AAI_FUNC_NETWORKDAYS ( HID_SC_AAI_FUNCS_START + 5 ) -#define HID_AAI_FUNC_AMORDEGRC ( HID_SC_AAI_FUNCS_START + 6 ) -#define HID_AAI_FUNC_AMORLINC ( HID_SC_AAI_FUNCS_START + 7 ) -#define HID_AAI_FUNC_ACCRINT ( HID_SC_AAI_FUNCS_START + 8 ) -#define HID_AAI_FUNC_ACCRINTM ( HID_SC_AAI_FUNCS_START + 9 ) -#define HID_AAI_FUNC_RECEIVED ( HID_SC_AAI_FUNCS_START + 10 ) -#define HID_AAI_FUNC_DISC ( HID_SC_AAI_FUNCS_START + 11 ) -#define HID_AAI_FUNC_DURATION ( HID_SC_AAI_FUNCS_START + 12 ) -#define HID_AAI_FUNC_EFFECT ( HID_SC_AAI_FUNCS_START + 13 ) -#define HID_AAI_FUNC_CUMPRINC ( HID_SC_AAI_FUNCS_START + 14 ) -#define HID_AAI_FUNC_CUMIPMT ( HID_SC_AAI_FUNCS_START + 15 ) -#define HID_AAI_FUNC_PRICE ( HID_SC_AAI_FUNCS_START + 16 ) -#define HID_AAI_FUNC_PRICEDISC ( HID_SC_AAI_FUNCS_START + 17 ) -#define HID_AAI_FUNC_PRICEMAT ( HID_SC_AAI_FUNCS_START + 18 ) -#define HID_AAI_FUNC_MDURATION ( HID_SC_AAI_FUNCS_START + 19 ) -#define HID_AAI_FUNC_NOMINAL ( HID_SC_AAI_FUNCS_START + 20 ) -#define HID_AAI_FUNC_DOLLARFR ( HID_SC_AAI_FUNCS_START + 21 ) -#define HID_AAI_FUNC_DOLLARDE ( HID_SC_AAI_FUNCS_START + 22 ) -#define HID_AAI_FUNC_YIELD ( HID_SC_AAI_FUNCS_START + 23 ) -#define HID_AAI_FUNC_YIELDDISC ( HID_SC_AAI_FUNCS_START + 24 ) -#define HID_AAI_FUNC_YIELDMAT ( HID_SC_AAI_FUNCS_START + 25 ) -#define HID_AAI_FUNC_TBILLEQ ( HID_SC_AAI_FUNCS_START + 26 ) -#define HID_AAI_FUNC_TBILLPRICE ( HID_SC_AAI_FUNCS_START + 27 ) -#define HID_AAI_FUNC_TBILLYIELD ( HID_SC_AAI_FUNCS_START + 28 ) -#define HID_AAI_FUNC_ODDFPRICE ( HID_SC_AAI_FUNCS_START + 29 ) -#define HID_AAI_FUNC_ODDFYIELD ( HID_SC_AAI_FUNCS_START + 30 ) -#define HID_AAI_FUNC_ODDLPRICE ( HID_SC_AAI_FUNCS_START + 31 ) -#define HID_AAI_FUNC_ODDLYIELD ( HID_SC_AAI_FUNCS_START + 32 ) -#define HID_AAI_FUNC_XIRR ( HID_SC_AAI_FUNCS_START + 33 ) -#define HID_AAI_FUNC_XNPV ( HID_SC_AAI_FUNCS_START + 34 ) -#define HID_AAI_FUNC_INTRATE ( HID_SC_AAI_FUNCS_START + 35 ) -#define HID_AAI_FUNC_COUPNCD ( HID_SC_AAI_FUNCS_START + 36 ) -#define HID_AAI_FUNC_COUPDAYS ( HID_SC_AAI_FUNCS_START + 37 ) -#define HID_AAI_FUNC_COUPDAYSNC ( HID_SC_AAI_FUNCS_START + 38 ) -#define HID_AAI_FUNC_COUPDAYBS ( HID_SC_AAI_FUNCS_START + 39 ) -#define HID_AAI_FUNC_COUPPCD ( HID_SC_AAI_FUNCS_START + 40 ) -#define HID_AAI_FUNC_COUPNUM ( HID_SC_AAI_FUNCS_START + 41 ) -#define HID_AAI_FUNC_FVSCHEDULE ( HID_SC_AAI_FUNCS_START + 42 ) -#define HID_AAI_FUNC_ISEVEN ( HID_SC_AAI_FUNCS_START + 43 ) -#define HID_AAI_FUNC_ISODD ( HID_SC_AAI_FUNCS_START + 44 ) -#define HID_AAI_FUNC_GCD ( HID_SC_AAI_FUNCS_START + 45 ) -#define HID_AAI_FUNC_LCM ( HID_SC_AAI_FUNCS_START + 46 ) -#define HID_AAI_FUNC_MULTINOMIAL ( HID_SC_AAI_FUNCS_START + 47 ) -#define HID_AAI_FUNC_SERIESSUM ( HID_SC_AAI_FUNCS_START + 48 ) -#define HID_AAI_FUNC_QUOTIENT ( HID_SC_AAI_FUNCS_START + 49 ) -#define HID_AAI_FUNC_MROUND ( HID_SC_AAI_FUNCS_START + 50 ) -#define HID_AAI_FUNC_SQRTPI ( HID_SC_AAI_FUNCS_START + 51 ) -#define HID_AAI_FUNC_RANDBETWEEN ( HID_SC_AAI_FUNCS_START + 52 ) -#define HID_AAI_FUNC_BESSELI ( HID_SC_AAI_FUNCS_START + 53 ) -#define HID_AAI_FUNC_BESSELJ ( HID_SC_AAI_FUNCS_START + 54 ) -#define HID_AAI_FUNC_BESSELK ( HID_SC_AAI_FUNCS_START + 55 ) -#define HID_AAI_FUNC_BESSELY ( HID_SC_AAI_FUNCS_START + 56 ) -#define HID_AAI_FUNC_BIN2DEC ( HID_SC_AAI_FUNCS_START + 57 ) -#define HID_AAI_FUNC_BIN2HEX ( HID_SC_AAI_FUNCS_START + 58 ) -#define HID_AAI_FUNC_BIN2OCT ( HID_SC_AAI_FUNCS_START + 59 ) -#define HID_AAI_FUNC_DELTA ( HID_SC_AAI_FUNCS_START + 60 ) -#define HID_AAI_FUNC_DEC2BIN ( HID_SC_AAI_FUNCS_START + 61 ) -#define HID_AAI_FUNC_DEC2HEX ( HID_SC_AAI_FUNCS_START + 62 ) -#define HID_AAI_FUNC_DEC2OCT ( HID_SC_AAI_FUNCS_START + 63 ) -#define HID_AAI_FUNC_ERF ( HID_SC_AAI_FUNCS_START + 64 ) -#define HID_AAI_FUNC_ERFC ( HID_SC_AAI_FUNCS_START + 65 ) -#define HID_AAI_FUNC_GESTEP ( HID_SC_AAI_FUNCS_START + 66 ) -#define HID_AAI_FUNC_HEX2BIN ( HID_SC_AAI_FUNCS_START + 67 ) -#define HID_AAI_FUNC_HEX2DEC ( HID_SC_AAI_FUNCS_START + 68 ) -#define HID_AAI_FUNC_HEX2OCT ( HID_SC_AAI_FUNCS_START + 69 ) -#define HID_AAI_FUNC_IMABS ( HID_SC_AAI_FUNCS_START + 70 ) -#define HID_AAI_FUNC_IMAGINARY ( HID_SC_AAI_FUNCS_START + 71 ) -#define HID_AAI_FUNC_IMPOWER ( HID_SC_AAI_FUNCS_START + 72 ) -#define HID_AAI_FUNC_IMARGUMENT ( HID_SC_AAI_FUNCS_START + 73 ) -#define HID_AAI_FUNC_IMCOS ( HID_SC_AAI_FUNCS_START + 74 ) -#define HID_AAI_FUNC_IMDIV ( HID_SC_AAI_FUNCS_START + 75 ) -#define HID_AAI_FUNC_IMEXP ( HID_SC_AAI_FUNCS_START + 76 ) -#define HID_AAI_FUNC_IMCONJUGATE ( HID_SC_AAI_FUNCS_START + 77 ) -#define HID_AAI_FUNC_IMLN ( HID_SC_AAI_FUNCS_START + 78 ) -#define HID_AAI_FUNC_IMLOG10 ( HID_SC_AAI_FUNCS_START + 79 ) -#define HID_AAI_FUNC_IMLOG2 ( HID_SC_AAI_FUNCS_START + 80 ) -#define HID_AAI_FUNC_IMPRODUCT ( HID_SC_AAI_FUNCS_START + 81 ) -#define HID_AAI_FUNC_IMREAL ( HID_SC_AAI_FUNCS_START + 82 ) -#define HID_AAI_FUNC_IMSIN ( HID_SC_AAI_FUNCS_START + 83 ) -#define HID_AAI_FUNC_IMSUB ( HID_SC_AAI_FUNCS_START + 84 ) -#define HID_AAI_FUNC_IMSUM ( HID_SC_AAI_FUNCS_START + 85 ) -#define HID_AAI_FUNC_IMSQRT ( HID_SC_AAI_FUNCS_START + 86 ) -#define HID_AAI_FUNC_COMPLEX ( HID_SC_AAI_FUNCS_START + 87 ) -#define HID_AAI_FUNC_OCT2BIN ( HID_SC_AAI_FUNCS_START + 88 ) -#define HID_AAI_FUNC_OCT2DEZ ( HID_SC_AAI_FUNCS_START + 89 ) -#define HID_AAI_FUNC_OCT2HEX ( HID_SC_AAI_FUNCS_START + 90 ) -#define HID_AAI_FUNC_CONVERT ( HID_SC_AAI_FUNCS_START + 91 ) -#define HID_AAI_FUNC_FACTDOUBLE ( HID_SC_AAI_FUNCS_START + 92 ) +#define HID_AAI_FUNC_WORKDAY "SC_HID_AAI_FUNC_WORKDAY" +#define HID_AAI_FUNC_YEARFRAC "SC_HID_AAI_FUNC_YEARFRAC" +#define HID_AAI_FUNC_EDATE "SC_HID_AAI_FUNC_EDATE" +#define HID_AAI_FUNC_WEEKNUM "SC_HID_AAI_FUNC_WEEKNUM" +#define HID_AAI_FUNC_EOMONTH "SC_HID_AAI_FUNC_EOMONTH" +#define HID_AAI_FUNC_NETWORKDAYS "SC_HID_AAI_FUNC_NETWORKDAYS" +#define HID_AAI_FUNC_AMORDEGRC "SC_HID_AAI_FUNC_AMORDEGRC" +#define HID_AAI_FUNC_AMORLINC "SC_HID_AAI_FUNC_AMORLINC" +#define HID_AAI_FUNC_ACCRINT "SC_HID_AAI_FUNC_ACCRINT" +#define HID_AAI_FUNC_ACCRINTM "SC_HID_AAI_FUNC_ACCRINTM" +#define HID_AAI_FUNC_RECEIVED "SC_HID_AAI_FUNC_RECEIVED" +#define HID_AAI_FUNC_DISC "SC_HID_AAI_FUNC_DISC" +#define HID_AAI_FUNC_DURATION "SC_HID_AAI_FUNC_DURATION" +#define HID_AAI_FUNC_EFFECT "SC_HID_AAI_FUNC_EFFECT" +#define HID_AAI_FUNC_CUMPRINC "SC_HID_AAI_FUNC_CUMPRINC" +#define HID_AAI_FUNC_CUMIPMT "SC_HID_AAI_FUNC_CUMIPMT" +#define HID_AAI_FUNC_PRICE "SC_HID_AAI_FUNC_PRICE" +#define HID_AAI_FUNC_PRICEDISC "SC_HID_AAI_FUNC_PRICEDISC" +#define HID_AAI_FUNC_PRICEMAT "SC_HID_AAI_FUNC_PRICEMAT" +#define HID_AAI_FUNC_MDURATION "SC_HID_AAI_FUNC_MDURATION" +#define HID_AAI_FUNC_NOMINAL "SC_HID_AAI_FUNC_NOMINAL" +#define HID_AAI_FUNC_DOLLARFR "SC_HID_AAI_FUNC_DOLLARFR" +#define HID_AAI_FUNC_DOLLARDE "SC_HID_AAI_FUNC_DOLLARDE" +#define HID_AAI_FUNC_YIELD "SC_HID_AAI_FUNC_YIELD" +#define HID_AAI_FUNC_YIELDDISC "SC_HID_AAI_FUNC_YIELDDISC" +#define HID_AAI_FUNC_YIELDMAT "SC_HID_AAI_FUNC_YIELDMAT" +#define HID_AAI_FUNC_TBILLEQ "SC_HID_AAI_FUNC_TBILLEQ" +#define HID_AAI_FUNC_TBILLPRICE "SC_HID_AAI_FUNC_TBILLPRICE" +#define HID_AAI_FUNC_TBILLYIELD "SC_HID_AAI_FUNC_TBILLYIELD" +#define HID_AAI_FUNC_ODDFPRICE "SC_HID_AAI_FUNC_ODDFPRICE" +#define HID_AAI_FUNC_ODDFYIELD "SC_HID_AAI_FUNC_ODDFYIELD" +#define HID_AAI_FUNC_ODDLPRICE "SC_HID_AAI_FUNC_ODDLPRICE" +#define HID_AAI_FUNC_ODDLYIELD "SC_HID_AAI_FUNC_ODDLYIELD" +#define HID_AAI_FUNC_XIRR "SC_HID_AAI_FUNC_XIRR" +#define HID_AAI_FUNC_XNPV "SC_HID_AAI_FUNC_XNPV" +#define HID_AAI_FUNC_INTRATE "SC_HID_AAI_FUNC_INTRATE" +#define HID_AAI_FUNC_COUPNCD "SC_HID_AAI_FUNC_COUPNCD" +#define HID_AAI_FUNC_COUPDAYS "SC_HID_AAI_FUNC_COUPDAYS" +#define HID_AAI_FUNC_COUPDAYSNC "SC_HID_AAI_FUNC_COUPDAYSNC" +#define HID_AAI_FUNC_COUPDAYBS "SC_HID_AAI_FUNC_COUPDAYBS" +#define HID_AAI_FUNC_COUPPCD "SC_HID_AAI_FUNC_COUPPCD" +#define HID_AAI_FUNC_COUPNUM "SC_HID_AAI_FUNC_COUPNUM" +#define HID_AAI_FUNC_FVSCHEDULE "SC_HID_AAI_FUNC_FVSCHEDULE" +#define HID_AAI_FUNC_ISEVEN "SC_HID_AAI_FUNC_ISEVEN" +#define HID_AAI_FUNC_ISODD "SC_HID_AAI_FUNC_ISODD" +#define HID_AAI_FUNC_GCD "SC_HID_AAI_FUNC_GCD" +#define HID_AAI_FUNC_LCM "SC_HID_AAI_FUNC_LCM" +#define HID_AAI_FUNC_MULTINOMIAL "SC_HID_AAI_FUNC_MULTINOMIAL" +#define HID_AAI_FUNC_SERIESSUM "SC_HID_AAI_FUNC_SERIESSUM" +#define HID_AAI_FUNC_QUOTIENT "SC_HID_AAI_FUNC_QUOTIENT" +#define HID_AAI_FUNC_MROUND "SC_HID_AAI_FUNC_MROUND" +#define HID_AAI_FUNC_SQRTPI "SC_HID_AAI_FUNC_SQRTPI" +#define HID_AAI_FUNC_RANDBETWEEN "SC_HID_AAI_FUNC_RANDBETWEEN" +#define HID_AAI_FUNC_BESSELI "SC_HID_AAI_FUNC_BESSELI" +#define HID_AAI_FUNC_BESSELJ "SC_HID_AAI_FUNC_BESSELJ" +#define HID_AAI_FUNC_BESSELK "SC_HID_AAI_FUNC_BESSELK" +#define HID_AAI_FUNC_BESSELY "SC_HID_AAI_FUNC_BESSELY" +#define HID_AAI_FUNC_BIN2DEC "SC_HID_AAI_FUNC_BIN2DEC" +#define HID_AAI_FUNC_BIN2HEX "SC_HID_AAI_FUNC_BIN2HEX" +#define HID_AAI_FUNC_BIN2OCT "SC_HID_AAI_FUNC_BIN2OCT" +#define HID_AAI_FUNC_DELTA "SC_HID_AAI_FUNC_DELTA" +#define HID_AAI_FUNC_DEC2BIN "SC_HID_AAI_FUNC_DEC2BIN" +#define HID_AAI_FUNC_DEC2HEX "SC_HID_AAI_FUNC_DEC2HEX" +#define HID_AAI_FUNC_DEC2OCT "SC_HID_AAI_FUNC_DEC2OCT" +#define HID_AAI_FUNC_ERF "SC_HID_AAI_FUNC_ERF" +#define HID_AAI_FUNC_ERFC "SC_HID_AAI_FUNC_ERFC" +#define HID_AAI_FUNC_GESTEP "SC_HID_AAI_FUNC_GESTEP" +#define HID_AAI_FUNC_HEX2BIN "SC_HID_AAI_FUNC_HEX2BIN" +#define HID_AAI_FUNC_HEX2DEC "SC_HID_AAI_FUNC_HEX2DEC" +#define HID_AAI_FUNC_HEX2OCT "SC_HID_AAI_FUNC_HEX2OCT" +#define HID_AAI_FUNC_IMABS "SC_HID_AAI_FUNC_IMABS" +#define HID_AAI_FUNC_IMAGINARY "SC_HID_AAI_FUNC_IMAGINARY" +#define HID_AAI_FUNC_IMPOWER "SC_HID_AAI_FUNC_IMPOWER" +#define HID_AAI_FUNC_IMARGUMENT "SC_HID_AAI_FUNC_IMARGUMENT" +#define HID_AAI_FUNC_IMCOS "SC_HID_AAI_FUNC_IMCOS" +#define HID_AAI_FUNC_IMDIV "SC_HID_AAI_FUNC_IMDIV" +#define HID_AAI_FUNC_IMEXP "SC_HID_AAI_FUNC_IMEXP" +#define HID_AAI_FUNC_IMCONJUGATE "SC_HID_AAI_FUNC_IMCONJUGATE" +#define HID_AAI_FUNC_IMLN "SC_HID_AAI_FUNC_IMLN" +#define HID_AAI_FUNC_IMLOG10 "SC_HID_AAI_FUNC_IMLOG10" +#define HID_AAI_FUNC_IMLOG2 "SC_HID_AAI_FUNC_IMLOG2" +#define HID_AAI_FUNC_IMPRODUCT "SC_HID_AAI_FUNC_IMPRODUCT" +#define HID_AAI_FUNC_IMREAL "SC_HID_AAI_FUNC_IMREAL" +#define HID_AAI_FUNC_IMSIN "SC_HID_AAI_FUNC_IMSIN" +#define HID_AAI_FUNC_IMSUB "SC_HID_AAI_FUNC_IMSUB" +#define HID_AAI_FUNC_IMSUM "SC_HID_AAI_FUNC_IMSUM" +#define HID_AAI_FUNC_IMSQRT "SC_HID_AAI_FUNC_IMSQRT" +#define HID_AAI_FUNC_COMPLEX "SC_HID_AAI_FUNC_COMPLEX" +#define HID_AAI_FUNC_OCT2BIN "SC_HID_AAI_FUNC_OCT2BIN" +#define HID_AAI_FUNC_OCT2DEZ "SC_HID_AAI_FUNC_OCT2DEZ" +#define HID_AAI_FUNC_OCT2HEX "SC_HID_AAI_FUNC_OCT2HEX" +#define HID_AAI_FUNC_CONVERT "SC_HID_AAI_FUNC_CONVERT" +#define HID_AAI_FUNC_FACTDOUBLE "SC_HID_AAI_FUNC_FACTDOUBLE" // DateFunc Addin Functions (max.20) ----------------------------------------- -#define HID_DAI_FUNC_DAYSINMONTH ( HID_SC_DAI_FUNCS_START ) -#define HID_DAI_FUNC_DAYSINYEAR ( HID_SC_DAI_FUNCS_START + 1 ) -#define HID_DAI_FUNC_WEEKSINYEAR ( HID_SC_DAI_FUNCS_START + 2 ) -#define HID_DAI_FUNC_DIFFMONTHS ( HID_SC_DAI_FUNCS_START + 3 ) -#define HID_DAI_FUNC_DIFFWEEKS ( HID_SC_DAI_FUNCS_START + 4 ) -#define HID_DAI_FUNC_DIFFYEARS ( HID_SC_DAI_FUNCS_START + 5 ) -#define HID_DAI_FUNC_ROT13 ( HID_SC_DAI_FUNCS_START + 6 ) +#define HID_DAI_FUNC_DAYSINMONTH "SC_HID_DAI_FUNC_DAYSINMONTH" +#define HID_DAI_FUNC_DAYSINYEAR "SC_HID_DAI_FUNC_DAYSINYEAR" +#define HID_DAI_FUNC_WEEKSINYEAR "SC_HID_DAI_FUNC_WEEKSINYEAR" +#define HID_DAI_FUNC_DIFFMONTHS "SC_HID_DAI_FUNC_DIFFMONTHS" +#define HID_DAI_FUNC_DIFFWEEKS "SC_HID_DAI_FUNC_DIFFWEEKS" +#define HID_DAI_FUNC_DIFFYEARS "SC_HID_DAI_FUNC_DIFFYEARS" +#define HID_DAI_FUNC_ROT13 "SC_HID_DAI_FUNC_ROT13" + +#define HID_SCPAGE_OPREDLINBE_FT_CONTENT "SC_HID_SCPAGE_OPREDLINBE_FT_CONTENT" +#define HID_MN_FORMAT_STYLE "SC_HID_MN_FORMAT_STYLE" +#define HID_MN_FORMAT_ALGN "SC_HID_MN_FORMAT_ALGN" +#define HID_MN_FORMAT_LINESPACE "SC_HID_MN_FORMAT_LINESPACE" + // Ende Hilfe IDs ------------------------------------------------------------ // --------------------------------------------------------------------------- diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index d3c19bb539d5..d91ada912058 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -275,7 +275,7 @@ class AbstractScShowTabDlg : public VclAbstractDialog //add for ScShowTabDlg public: virtual void Insert( const String& rString, BOOL bSelected ) = 0; virtual USHORT GetSelectEntryCount() const = 0; - virtual void SetDescription(const String& rTitle, const String& rFixedText,ULONG nDlgHelpId, ULONG nLbHelpId ) = 0; + virtual void SetDescription(const String& rTitle, const String& rFixedText, const rtl::OString& nDlgHelpId, const rtl::OString& nLbHelpId ) = 0; virtual String GetSelectEntry(USHORT nPos) const = 0; virtual USHORT GetSelectEntryPos(USHORT nPos) const = 0; }; @@ -433,7 +433,7 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - ULONG nHelpId , + const rtl::OString& sHelpId, const rtl::OString& sEditHelpId, int nId ) = 0; virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg int nId, diff --git a/sc/inc/sccommands.h b/sc/inc/sccommands.h new file mode 100644 index 000000000000..7a1581f96627 --- /dev/null +++ b/sc/inc/sccommands.h @@ -0,0 +1,333 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef SC_SCCOMMANDS_HRC +#define SC_SCCOMMANDS_HRC + +#define CMD_FID_CHG_ACCEPT ".uno:AcceptChanges" +#define CMD_SID_OLE_ACTIVATE ".uno:ActivateOLE" +#define CMD_SID_TABLE_ACTIVATE ".uno:ActivateTable" +#define CMD_SID_SC_ACTIVECELL ".uno:ActiveCell" +#define CMD_SID_SC_ACTIVETAB ".uno:ActiveTable" +#define CMD_FID_TAB_APPEND ".uno:Add" +#define CMD_SID_CHART_ADDSOURCE ".uno:AddChartData" +#define CMD_SID_ADD_IN_MANAGER ".uno:AddInManager" +#define CMD_SID_ADD_PRINTAREA ".uno:AddPrintArea" +#define CMD_SID_RANGE_ADDRESS ".uno:Address" +#define CMD_FID_ADJUST_PRINTZOOM ".uno:AdjustPrintZoom" +#define CMD_SID_ALIGNBLOCK ".uno:AlignBlock" +#define CMD_SID_ALIGNBOTTOM ".uno:AlignBottom" +#define CMD_SID_ALIGNCENTERHOR ".uno:AlignHorizontalCenter" +#define CMD_SID_ALIGNLEFT ".uno:AlignLeft" +#define CMD_SID_ALIGNRIGHT ".uno:AlignRight" +#define CMD_SID_ALIGNTOP ".uno:AlignTop" +#define CMD_SID_ALIGNCENTERVER ".uno:AlignVCenter" +#define CMD_FID_APPLY_NAME ".uno:ApplyNames" +#define CMD_SID_DETECTIVE_FILLMODE ".uno:AuditingFillMode" +#define CMD_FID_AUTOCOMPLETE ".uno:AutoComplete" +#define CMD_FID_FILL_AUTO ".uno:AutoFill" +#define CMD_FID_AUTO_CALC ".uno:AutomaticCalculation" +#define CMD_SID_AUTO_OUTLINE ".uno:AutoOutline" +#define CMD_SID_DETECTIVE_AUTO ".uno:AutoRefreshArrows" +#define CMD_SID_AUTO_STYLE ".uno:AutoStyle" +#define CMD_FID_RECALC ".uno:Calculate" +#define CMD_FID_HARD_RECALC ".uno:CalculateHard" +#define CMD_SID_CANCEL ".uno:Cancel" +#define CMD_SID_SC_CELLS ".uno:Cells" +#define CMD_SID_SC_CELLTEXT ".uno:CellText" +#define CMD_SID_CHART_SOURCE ".uno:ChangeChartData" +#define CMD_SID_CHANGE_PRINTAREA ".uno:ChangePrintArea" +#define CMD_SID_CHOOSE_DESIGN ".uno:ChooseDesign" +#define CMD_SID_DETECTIVE_DEL_SUCC ".uno:ClearArrowDependents" +#define CMD_SID_DETECTIVE_DEL_PRED ".uno:ClearArrowPrecedents" +#define CMD_SID_DETECTIVE_DEL_ALL ".uno:ClearArrows" +#define CMD_SID_DELETE_CONTENTS ".uno:ClearContents" +#define CMD_SID_RANGE_COL ".uno:Column" +#define CMD_FID_COL_WIDTH ".uno:ColumnWidth" +#define CMD_FID_CHG_COMMENT ".uno:CommentChange" +#define CMD_FID_CONDITIONAL_FORMAT ".uno:ConditionalFormat" +#define CMD_SID_OPENDLG_CONDFRMT ".uno:ConditionalFormatDialog" +#define CMD_SID_CONSOLIDATE ".uno:ConsolidateExec" +#define CMD_FID_USE_NAME ".uno:CreateNames" +#define CMD_SID_CREATE_SW_DRAWVIEW ".uno:CreateSWDrawView" +#define CMD_SID_RANGE_REGION ".uno:CurrentRegion" +#define CMD_SID_REFRESH_DBAREA ".uno:DataAreaRefresh" +#define CMD_SID_OPENDLG_CONSOLIDATE ".uno:DataConsolidate" +#define CMD_SID_OPENDLG_PIVOTTABLE ".uno:DataDataPilotRun" +#define CMD_SID_AUTO_FILTER ".uno:DataFilterAutoFilter" +#define CMD_SID_AUTOFILTER_HIDE ".uno:DataFilterHideAutoFilter" +#define CMD_SID_UNFILTER ".uno:DataFilterRemoveFilter" +#define CMD_SID_SPECIAL_FILTER ".uno:DataFilterSpecialFilter" +#define CMD_SID_FILTER ".uno:DataFilterStandardFilter" +#define CMD_SID_IMPORT_DATA ".uno:DataImport" +#define CMD_SID_PIVOT_CREATE ".uno:DataPilotCreate" +#define CMD_SID_PIVOT_TABLE ".uno:DataPilotExec" +#define CMD_SID_PIVOT_GET ".uno:DataPilotTables" +#define CMD_SID_REIMPORT_DATA ".uno:DataReImport" +#define CMD_SID_DATA_SELECT ".uno:DataSelect" +#define CMD_SID_SORT ".uno:DataSort" +#define CMD_SID_SUBTOTALS ".uno:DataSubTotals" +#define CMD_SID_OLE_DEACTIVATE ".uno:Deactivate" +#define CMD_SID_DEFINE_DBNAME ".uno:DefineDBName" +#define CMD_SID_DEFINE_COLROWNAMERANGES ".uno:DefineLabelRange" +#define CMD_FID_DEFINE_NAME ".uno:DefineName" +#define CMD_SID_DEFINE_PRINTAREA ".uno:DefinePrintArea" +#define CMD_FID_DELETE_CELL ".uno:DeleteCell" +#define CMD_FID_DEL_MANUALBREAKS ".uno:DeleteAllBreaks" +#define CMD_FID_DEL_COLBRK ".uno:DeleteColumnbreak" +#define CMD_SID_DEL_COLS ".uno:DeleteColumns" +#define CMD_SID_PIVOT_KILL ".uno:DeletePivotTable" +#define CMD_SID_DELETE_PRINTAREA ".uno:DeletePrintArea" +#define CMD_FID_DEL_ROWBRK ".uno:DeleteRowbreak" +#define CMD_SID_DEL_ROWS ".uno:DeleteRows" +#define CMD_SID_DELETE_SCENARIO ".uno:DeleteScenario" +#define CMD_SID_SELECT_NONE ".uno:Deselect" +#define CMD_SID_DRAW_CHART ".uno:DrawChart" +#define CMD_SID_DRAW_NOTEEDIT ".uno:DrawEditNote" +#define CMD_SID_HFEDIT ".uno:EditHeaderAndFooter" +#define CMD_SID_LINKS ".uno:EditLinks" +#define CMD_SID_SC_EDIT_OBJECT ".uno:EditObject" +#define CMD_SID_OPENDLG_EDIT_PRINTAREA ".uno:EditPrintArea" +#define CMD_SID_EDIT_SCENARIO ".uno:EditScenario" +#define CMD_SID_EURO_CONVERTER ".uno:EuroConverter" +#define CMD_FID_FILL_TO_BOTTOM ".uno:FillDown" +#define CMD_FID_FILL_TO_LEFT ".uno:FillLeft" +#define CMD_SID_FILL_NONE ".uno:FillModeEnd" +#define CMD_SID_FILL_DEL_PRED ".uno:FillModeRemovePredescessor" +#define CMD_SID_FILL_DEL_SUCC ".uno:FillModeRemoveSuccessor" +#define CMD_SID_FILL_SELECT ".uno:FillModeSelect" +#define CMD_SID_FILL_ADD_PRED ".uno:FillModeTracePredescessor" +#define CMD_SID_FILL_ADD_SUCC ".uno:FillModeTraceSuccessor" +#define CMD_FID_FILL_TO_RIGHT ".uno:FillRight" +#define CMD_FID_FILL_SERIES ".uno:FillSeries" +#define CMD_FID_FILL_TAB ".uno:FillTable" +#define CMD_FID_FILL_TO_TOP ".uno:FillUp" +#define CMD_FID_FILTER_OK ".uno:FilterExecute" +#define CMD_SID_PREVIEW_FIRST ".uno:FirstPage" +#define CMD_FID_FOCUS_POSWND ".uno:FocusCellAddress" +#define CMD_FID_CELL_FORMAT ".uno:FormatCellDialog" +#define CMD_SID_RANGE_FORMULA ".uno:Formula" +#define CMD_SID_WINDOW_FIX ".uno:FreezePanes" +#define CMD_FID_FUNCTION_BOX ".uno:FunctionBox" +#define CMD_SID_OPENDLG_FUNCTION ".uno:FunctionDialog" +#define CMD_SID_SOLVE ".uno:GoalSeek" +#define CMD_SID_OPENDLG_SOLVE ".uno:GoalSeekDialog" +#define CMD_SID_OPENDLG_OPTSOLVER ".uno:SolverDialog" +#define CMD_SID_VALIDITY_REFERENCE ".uno:ValidityReference" +#define CMD_SID_CURSORBLKDOWN ".uno:GoDownToEndOfData" +#define CMD_SID_CURSORBLKDOWN_SEL ".uno:GoDownToEndOfDataSel" +#define CMD_SID_CURSORPAGELEFT_ ".uno:GoLeftBlock" +#define CMD_SID_CURSORBLKLEFT ".uno:GoLeftToStartOfData" +#define CMD_SID_CURSORBLKLEFT_SEL ".uno:GoLeftToStartOfDataSel" +#define CMD_SID_CURSORPAGERIGHT_ ".uno:GoRightBlock" +#define CMD_SID_CURSORPAGERIGHT_SEL ".uno:GoRightBlockSel" +#define CMD_SID_CURSORBLKRIGHT ".uno:GoRightToEndOfData" +#define CMD_SID_CURSORBLKRIGHT_SEL ".uno:GoRightToEndOfDataSel" +#define CMD_SID_CURRENTCELL ".uno:GoToCell" +#define CMD_SID_ALIGNCURSOR ".uno:GoToCurrentCell" +#define CMD_SID_CURRENTDOC ".uno:GotoDocument" +#define CMD_SID_CURRENTOBJECT ".uno:GoToObject" +#define CMD_SID_CURSORBLKUP ".uno:GoUpToStartOfData" +#define CMD_SID_CURSORBLKUP_SEL ".uno:GoUpToStartOfDataSel" +#define CMD_FID_TABLE_HIDE ".uno:Hide" +#define CMD_FID_COL_HIDE ".uno:HideColumn" +#define CMD_FID_ROW_HIDE ".uno:HideRow" +#define CMD_SID_H_ALIGNCELL ".uno:HorizontalAlignment" +#define CMD_SID_ENABLE_HYPHENATION ".uno:Hyphenate" +#define CMD_FID_INPUTLINE_BLOCK ".uno:InputLineBlock" +#define CMD_FID_INPUTLINE_ENTER ".uno:InputLineEnter" +#define CMD_FID_INPUTLINE_MATRIX ".uno:InputLineMatrix" +#define CMD_SID_TBXCTL_INSCELLS ".uno:InsCellsCtrl" +#define CMD_FID_INS_TABLE ".uno:Insert" +#define CMD_FID_INS_TABLE_EXT ".uno:InsertSheetFromFile" +#define CMD_FID_INS_CELL ".uno:InsertCell" +#define CMD_FID_INS_CELLSDOWN ".uno:InsertCellsDown" +#define CMD_FID_INS_CELLSRIGHT ".uno:InsertCellsRight" +#define CMD_FID_INS_COLBRK ".uno:InsertColumnBreak" +#define CMD_FID_INS_COLUMN ".uno:InsertColumns" +#define CMD_FID_INS_CELL_CONTENTS ".uno:InsertContents" +#define CMD_SID_TBXCTL_INSERT ".uno:InsertCtrl" +#define CMD_SID_EXTERNAL_SOURCE ".uno:InsertExternalDataSource" +#define CMD_FID_INSERT_FILE ".uno:InsertFile" +#define CMD_SID_INS_FUNCTION ".uno:InsertFunction" +#define CMD_SID_INSERT_MATRIX ".uno:InsertMatrix" +#define CMD_FID_INSERT_NAME ".uno:InsertName" +#define CMD_SID_INSERT_SIMAGE ".uno:InsertObjectStarImage" +#define CMD_SID_INSERT_SMATH ".uno:InsertObjectStarMath" +#define CMD_FID_INS_ROWBRK ".uno:InsertRowBreak" +#define CMD_FID_INS_ROW ".uno:InsertRows" +#define CMD_SID_TBXCTL_INSOBJ ".uno:InsObjCtrl" +#define CMD_SID_CURSORENTERDOWN ".uno:JumpToNextCell" +#define CMD_SID_NEXT_TABLE ".uno:JumpToNextTable" +#define CMD_SID_NEXT_TABLE_SEL ".uno:JumpToNextTableSel" +#define CMD_SID_NEXT_UNPROTECT ".uno:JumpToNextUnprotected" +#define CMD_SID_CURSORENTERUP ".uno:JumpToPreviousCell" +#define CMD_SID_PREV_UNPROTECT ".uno:JumpToPreviousUnprotected" +#define CMD_SID_PREV_TABLE ".uno:JumpToPrevTable" +#define CMD_SID_PREV_TABLE_SEL ".uno:JumpToPrevTableSel" +#define CMD_SID_CURRENTTAB ".uno:JumpToTable" +#define CMD_SID_PREVIEW_LAST ".uno:LastPage" +#define CMD_FID_MERGE_ON ".uno:MergeCells" +#define CMD_FID_MERGE_TOGGLE ".uno:ToggleMergeCells" +#define CMD_SID_OBJECT_MIRROR ".uno:Mirror" +#define CMD_FID_TAB_MOVE ".uno:Move" +#define CMD_FID_TAB_RENAME ".uno:Name" +#define CMD_SID_PREVIEW_NEXT ".uno:NextPage" +#define CMD_SID_RANGE_NOTETEXT ".uno:NoteText" +#define CMD_FID_NOTE_VISIBLE ".uno:NoteVisible" +#define CMD_SID_DELETE_NOTE ".uno:DeleteNote" +#define CMD_SID_NUMBER_FORMAT ".uno:NumberFormat" +#define CMD_SID_NUMBER_CURRENCY ".uno:NumberFormatCurrency" +#define CMD_SID_NUMBER_DATE ".uno:NumberFormatDate" +#define CMD_SID_NUMBER_DECDEC ".uno:NumberFormatDecDecimals" +#define CMD_SID_NUMBER_TWODEC ".uno:NumberFormatDecimal" +#define CMD_SID_NUMBER_INCDEC ".uno:NumberFormatIncDecimals" +#define CMD_SID_NUMBER_PERCENT ".uno:NumberFormatPercent" +#define CMD_SID_NUMBER_SCIENTIFIC ".uno:NumberFormatScientific" +#define CMD_SID_NUMBER_STANDARD ".uno:NumberFormatStandard" +#define CMD_SID_NUMBER_TIME ".uno:NumberFormatTime" +#define CMD_SID_OBJECT_HEIGHT ".uno:ObjectHeight" +#define CMD_SID_OBJECT_LEFT ".uno:ObjectLeft" +#define CMD_SID_MIRROR_HORIZONTAL ".uno:ObjectMirrorHorizontal" +#define CMD_SID_MIRROR_VERTICAL ".uno:ObjectMirrorVertical" +#define CMD_SID_OBJECT_TOP ".uno:ObjectTop" +#define CMD_SID_OBJECT_WIDTH ".uno:ObjectWidth" +#define CMD_SID_RANGE_OFFSET ".uno:Offset" +#define CMD_SID_OLE_OBJECT ".uno:OleObject" +#define CMD_SID_ORIGINALSIZE ".uno:OriginalSize" +#define CMD_FID_NORMALVIEWMODE ".uno:NormalViewMode" +#define CMD_FID_PAGEBREAKMODE ".uno:PagebreakMode" +#define CMD_SID_FORMATPAGE ".uno:PageFormatDialog" +#define CMD_SID_PREVIEW_PREVIOUS ".uno:PreviousPage" +#define CMD_FID_PROTECT_TABLE ".uno:Protect" +#define CMD_SID_CHG_PROTECT ".uno:ProtectTraceChangeMode" +#define CMD_SID_SC_SETTEXT ".uno:PutCell" +#define CMD_SID_SC_RANGE ".uno:Range" +#define CMD_SID_PIVOT_RECALC ".uno:RecalcPivotTable" +#define CMD_SID_DETECTIVE_REFRESH ".uno:RefreshArrows" +#define CMD_SID_REIMPORT_AFTER_LOAD ".uno:ReImportAfterLoad" +#define CMD_FID_DELETE_TABLE ".uno:Remove" +#define CMD_SID_TITLE_DESCRIPTION_OBJECT ".uno:ObjectTitleDescription" +#define CMD_SID_RENAME_OBJECT ".uno:RenameObject" +#define CMD_FID_REPEAT_SEARCH ".uno:RepeatSearch" +#define CMD_FID_REPLACE ".uno:Replace" +#define CMD_FID_REPLACE_ALL ".uno:ReplaceAll" +#define CMD_SID_CELL_FORMAT_RESET ".uno:ResetAttributes" +#define CMD_FID_RESET_PRINTZOOM ".uno:ResetPrintZoom" +#define CMD_SID_RANGE_ROW ".uno:Row" +#define CMD_FID_ROW_HEIGHT ".uno:RowHeight" +#define CMD_SID_SBA_IMPORT ".uno:SbaImport" +#define CMD_FID_SCALE ".uno:Scale" +#define CMD_SID_SCENARIOS ".uno:ScenarioManager" +#define CMD_FID_SEARCH ".uno:Search" +#define CMD_FID_SEARCH_ALL ".uno:SearchAll" +#define CMD_SID_MARKAREA ".uno:SelectArea" +#define CMD_SID_OLE_SELECT ".uno:SelectOLE" +#define CMD_SID_SELECT_COL ".uno:SelectColumn" +#define CMD_SID_MARKDATAAREA ".uno:SelectData" +#define CMD_SID_SELECT_DB ".uno:SelectDB" +#define CMD_SID_SC_ACTIVEOBJECT ".uno:SelectedObject" +#define CMD_SID_ACTIVE_OBJ_NAME ".uno:SelectedObjectName" +#define CMD_SID_SC_SELECTION ".uno:Selection" +#define CMD_SID_SELECT_ROW ".uno:SelectRow" +#define CMD_SID_SELECT_SCENARIO ".uno:SelectScenario" +#define CMD_SID_ANCHOR_CELL ".uno:SetAnchorToCell" +#define CMD_SID_ANCHOR_PAGE ".uno:SetAnchorToPage" +#define CMD_SID_SETINPUTMODE ".uno:SetInputMode" +#define CMD_FID_COL_OPT_WIDTH ".uno:SetOptimalColumnWidth" +#define CMD_FID_COL_OPT_DIRECT ".uno:SetOptimalColumnWidthDirect" +#define CMD_FID_ROW_OPT_HEIGHT ".uno:SetOptimalRowHeight" +#define CMD_FID_TABLE_SHOW ".uno:Show" +#define CMD_FID_CHG_SHOW ".uno:ShowChanges" +#define CMD_FID_COL_SHOW ".uno:ShowColumn" +#define CMD_SID_DETECTIVE_ADD_SUCC ".uno:ShowDependents" +#define CMD_SID_DETECTIVE_ADD_ERR ".uno:ShowErrors" +#define CMD_SID_DETECTIVE_INVALID ".uno:ShowInvalid" +#define CMD_SID_DETECTIVE_ADD_PRED ".uno:ShowPrecedents" +#define CMD_FID_ROW_SHOW ".uno:ShowRow" +#define CMD_WID_SIMPLE_REF ".uno:SimpleReferenz" +#define CMD_SID_SORT_ASCENDING ".uno:SortAscending" +#define CMD_SID_SORT_DESCENDING ".uno:SortDescending" +#define CMD_FID_MERGE_OFF ".uno:SplitCell" +#define CMD_SID_WINDOW_SPLIT ".uno:SplitWindow" +#define CMD_SID_STANDARD_FONTS ".uno:StandardFonts" +#define CMD_SID_TEXT_STANDARD ".uno:StandardTextAttributes" +#define CMD_SID_PSZ_FUNCTION ".uno:StatusBarFunc" +#define CMD_SID_STATUS_DOCPOS ".uno:StatusDocPos" +#define CMD_SID_STATUS_SUM ".uno:StatusFunction" +#define CMD_FID_INPUTLINE_STATUS ".uno:StatusInputLine" +#define CMD_SID_STATUS_PAGESTYLE ".uno:StatusPageStyle" +#define CMD_FID_SCALESTATUS ".uno:StatusScale" +#define CMD_SID_STATUS_SELMODE ".uno:StatusSelectionMode" +#define CMD_SID_STATUS_SELMODE_ERG ".uno:StatusSelectionModeExp" +#define CMD_SID_STATUS_SELMODE_ERW ".uno:StatusSelectionModeExt" +#define CMD_SID_STATUS_SELMODE_NORM ".uno:StatusSelectionModeNorm" +#define CMD_SID_RANGE_TABLE ".uno:Table" +#define CMD_SID_TABLES_COUNT ".uno:TableCount" +#define CMD_SID_TABOP ".uno:TableOperation" +#define CMD_SID_OPENDLG_TABOP ".uno:TableOperationDialog" +#define CMD_FID_TAB_MENU_RENAME ".uno:RenameTable" +#define CMD_SID_TABLES_GET ".uno:Tables" +#define CMD_FID_TAB_SELECTALL ".uno:TableSelectAll" +#define CMD_FID_TAB_DESELECTALL ".uno:TableDeselectAll" +#define CMD_SID_DRAWTEXT_ATTR_DLG ".uno:TextAttributes" +#define CMD_SID_ASSIGNMACRO ".uno:AssignMacro" +#define CMD_SID_TEXT_TO_COLUMNS ".uno:TextToColumns" +#define CMD_SID_RANGE_TEXTVALUE ".uno:TextValue" +#define CMD_SID_ANCHOR_TOGGLE ".uno:ToggleAnchorType" +#define CMD_SID_TOGGLE_REL ".uno:ToggleRelative" +#define CMD_FID_PROTECT_DOC ".uno:ToolProtectionDocument" +#define CMD_SID_SCOPTIONS ".uno:ToolsOptions" +#define CMD_FID_CHG_RECORD ".uno:TraceChangeMode" +#define CMD_SID_ULINE_VAL_DOTTED ".uno:UnderlineDotted" +#define CMD_SID_ULINE_VAL_DOUBLE ".uno:UnderlineDouble" +#define CMD_SID_ULINE_VAL_NONE ".uno:UnderlineNone" +#define CMD_SID_ULINE_VAL_SINGLE ".uno:UnderlineSingle" +#define CMD_SID_UPDATECHART ".uno:UpdateChart" +#define CMD_SID_UPDATETABLINKS ".uno:UpdateTableLinks" +#define CMD_FID_VALIDATION ".uno:Validation" +#define CMD_SID_RANGE_VALUE ".uno:Value" +#define CMD_SID_V_ALIGNCELL ".uno:VerticalAlignment" +#define CMD_FID_TOGGLEINPUTLINE ".uno:InputLineVisible" +#define CMD_FID_TOGGLEHEADERS ".uno:ViewRowColumnHeaders" +#define CMD_FID_TOGGLEFORMULA ".uno:ToggleFormula" +#define CMD_FID_TOGGLESYNTAX ".uno:ViewValueHighlighting" +#define CMD_FID_TABLE_VISIBLE ".uno:Visible" +#define CMD_SID_ATTR_ALIGN_LINEBREAK ".uno:WrapText" +#define CMD_SID_PREVIEW_ZOOMIN ".uno:ZoomIn" +#define CMD_SID_PREVIEW_ZOOMOUT ".uno:ZoomOut" +#define CMD_SID_FOCUS_INPUTLINE ".uno:FocusInputLine" +#define CMD_SID_PREVIEW_CLOSE ".uno:ClosePreview" +#define CMD_SID_PREVIEW_MARGIN ".uno:Margins" +#define CMD_SID_PREVIEW_SCALINGFACTOR ".uno:ScalingFactor" +#define CMD_SID_SELECT_TABLES ".uno:SelectTables" +#define CMD_SID_DP_FILTER ".uno:DataPilotFilter" +#define CMD_SID_SCATTR_PROTECTION ".uno:Protection" +#define CMD_SID_MARKARRAYFORMULA ".uno:SelectArrayFormula" +#define CMD_FID_TAB_RTL ".uno:SheetRightToLeft" +#define CMD_SID_SHARE_DOC ".uno:ShareDocument" + +#endif diff --git a/sc/inc/scdll.hxx b/sc/inc/scdll.hxx index 1d2304c2a0f2..a10c794b9c43 100644 --- a/sc/inc/scdll.hxx +++ b/sc/inc/scdll.hxx @@ -67,7 +67,6 @@ public: static void Init(); // called directly after loading the DLL static void Exit(); // called directly befor unloading the DLL -//UNUSED2008-05 static void FillStatusBar(StatusBar &rBar); static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter, SfxFilterFlags nMust, SfxFilterFlags nDont ); }; diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc index 8188deca5f40..6a31f883678f 100644 --- a/sc/inc/scfuncs.hrc +++ b/sc/inc/scfuncs.hrc @@ -40,293 +40,292 @@ #define ID_FUNCTION_OFFSET 90 -// ID zaehlt ab 1, Hilfe-IDs muessen aber bei HID_SC_FUNC_START anfangen -#define HID_SC_FUNC_DUMMY (HID_SC_FUNC_START-ID_FUNCTION_OFFSET) +#define HID_SC_FUNC_DUMMY "SC_HID_SC_FUNC_DUMMY" -#define HID_FUNC_DBANZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_DBANZAHL2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_DBMITTELWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_DBAUSZUG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_DBMAX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_DBMIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_DBPRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_DBSTDABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_DBSTDABWN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_DBSUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_DBVARIANZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_DBVARIANZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATABASE*ID_FUNCTION_OFFSET)+12) +#define HID_FUNC_DBANZAHL "SC_HID_FUNC_DBANZAHL" +#define HID_FUNC_DBANZAHL2 "SC_HID_FUNC_DBANZAHL2" +#define HID_FUNC_DBMITTELWERT "SC_HID_FUNC_DBMITTELWERT" +#define HID_FUNC_DBAUSZUG "SC_HID_FUNC_DBAUSZUG" +#define HID_FUNC_DBMAX "SC_HID_FUNC_DBMAX" +#define HID_FUNC_DBMIN "SC_HID_FUNC_DBMIN" +#define HID_FUNC_DBPRODUKT "SC_HID_FUNC_DBPRODUKT" +#define HID_FUNC_DBSTDABW "SC_HID_FUNC_DBSTDABW" +#define HID_FUNC_DBSTDABWN "SC_HID_FUNC_DBSTDABWN" +#define HID_FUNC_DBSUMME "SC_HID_FUNC_DBSUMME" +#define HID_FUNC_DBVARIANZ "SC_HID_FUNC_DBVARIANZ" +#define HID_FUNC_DBVARIANZEN "SC_HID_FUNC_DBVARIANZEN" -#define HID_FUNC_DATUM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_DATWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_TAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_TAGE360 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_STUNDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_MINUTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_MONAT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_JETZT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_SEKUNDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_ZEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_ZEITWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_HEUTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_WOCHENTAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_JAHR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_TAGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_KALENDERWOCHE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_OSTERSONNTAG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_DATETIME*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_DATUM "SC_HID_FUNC_DATUM" +#define HID_FUNC_DATWERT "SC_HID_FUNC_DATWERT" +#define HID_FUNC_TAG "SC_HID_FUNC_TAG" +#define HID_FUNC_TAGE360 "SC_HID_FUNC_TAGE360" +#define HID_FUNC_STUNDE "SC_HID_FUNC_STUNDE" +#define HID_FUNC_MINUTE "SC_HID_FUNC_MINUTE" +#define HID_FUNC_MONAT "SC_HID_FUNC_MONAT" +#define HID_FUNC_JETZT "SC_HID_FUNC_JETZT" +#define HID_FUNC_SEKUNDE "SC_HID_FUNC_SEKUNDE" +#define HID_FUNC_ZEIT "SC_HID_FUNC_ZEIT" +#define HID_FUNC_ZEITWERT "SC_HID_FUNC_ZEITWERT" +#define HID_FUNC_HEUTE "SC_HID_FUNC_HEUTE" +#define HID_FUNC_WOCHENTAG "SC_HID_FUNC_WOCHENTAG" +#define HID_FUNC_JAHR "SC_HID_FUNC_JAHR" +#define HID_FUNC_TAGE "SC_HID_FUNC_TAGE" +#define HID_FUNC_KALENDERWOCHE "SC_HID_FUNC_KALENDERWOCHE" +#define HID_FUNC_OSTERSONNTAG "SC_HID_FUNC_OSTERSONNTAG" -#define HID_FUNC_BW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_ZW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ZZR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_RMZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ZINS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_ZINSZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_KAPZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_KUMKAPITAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_KUMZINSZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_DIA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_LIA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_GDA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_GDA2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_VDB (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_EFFEKTIV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_NOMINAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_NBW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_IKV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_LAUFZEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_ZGZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_QIKV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_ISPMT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_FINANZ*ID_FUNCTION_OFFSET)+22) +#define HID_FUNC_BW "SC_HID_FUNC_BW" +#define HID_FUNC_ZW "SC_HID_FUNC_ZW" +#define HID_FUNC_ZZR "SC_HID_FUNC_ZZR" +#define HID_FUNC_RMZ "SC_HID_FUNC_RMZ" +#define HID_FUNC_ZINS "SC_HID_FUNC_ZINS" +#define HID_FUNC_ZINSZ "SC_HID_FUNC_ZINSZ" +#define HID_FUNC_KAPZ "SC_HID_FUNC_KAPZ" +#define HID_FUNC_KUMKAPITAL "SC_HID_FUNC_KUMKAPITAL" +#define HID_FUNC_KUMZINSZ "SC_HID_FUNC_KUMZINSZ" +#define HID_FUNC_DIA "SC_HID_FUNC_DIA" +#define HID_FUNC_LIA "SC_HID_FUNC_LIA" +#define HID_FUNC_GDA "SC_HID_FUNC_GDA" +#define HID_FUNC_GDA2 "SC_HID_FUNC_GDA2" +#define HID_FUNC_VDB "SC_HID_FUNC_VDB" +#define HID_FUNC_EFFEKTIV "SC_HID_FUNC_EFFEKTIV" +#define HID_FUNC_NOMINAL "SC_HID_FUNC_NOMINAL" +#define HID_FUNC_NBW "SC_HID_FUNC_NBW" +#define HID_FUNC_IKV "SC_HID_FUNC_IKV" +#define HID_FUNC_LAUFZEIT "SC_HID_FUNC_LAUFZEIT" +#define HID_FUNC_ZGZ "SC_HID_FUNC_ZGZ" +#define HID_FUNC_QIKV "SC_HID_FUNC_QIKV" +#define HID_FUNC_ISPMT "SC_HID_FUNC_ISPMT" -#define HID_FUNC_ISTBEZUG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_ISTFEHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ISTFEHLER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_ISTLEER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ISTLOG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_ISTNV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_ISTKTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_ISTTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_ISTZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_ISTFORMEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_N (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_NV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_TYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_AKTUELL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_FORMEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_ZELLE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_INFO (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_INFO*ID_FUNCTION_OFFSET)+17) +#define HID_FUNC_ISTBEZUG "SC_HID_FUNC_ISTBEZUG" +#define HID_FUNC_ISTFEHL "SC_HID_FUNC_ISTFEHL" +#define HID_FUNC_ISTFEHLER "SC_HID_FUNC_ISTFEHLER" +#define HID_FUNC_ISTLEER "SC_HID_FUNC_ISTLEER" +#define HID_FUNC_ISTLOG "SC_HID_FUNC_ISTLOG" +#define HID_FUNC_ISTNV "SC_HID_FUNC_ISTNV" +#define HID_FUNC_ISTKTEXT "SC_HID_FUNC_ISTKTEXT" +#define HID_FUNC_ISTTEXT "SC_HID_FUNC_ISTTEXT" +#define HID_FUNC_ISTZAHL "SC_HID_FUNC_ISTZAHL" +#define HID_FUNC_ISTFORMEL "SC_HID_FUNC_ISTFORMEL" +#define HID_FUNC_N "SC_HID_FUNC_N" +#define HID_FUNC_NV "SC_HID_FUNC_NV" +#define HID_FUNC_TYP "SC_HID_FUNC_TYP" +#define HID_FUNC_AKTUELL "SC_HID_FUNC_AKTUELL" +#define HID_FUNC_FORMEL "SC_HID_FUNC_FORMEL" +#define HID_FUNC_ZELLE "SC_HID_FUNC_ZELLE" +#define HID_FUNC_INFO "SC_HID_FUNC_INFO" -#define HID_FUNC_FALSCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_NICHT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_WAHR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_WENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ODER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_UND (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_LOGIC*ID_FUNCTION_OFFSET)+6) +#define HID_FUNC_FALSCH "SC_HID_FUNC_FALSCH" +#define HID_FUNC_NICHT "SC_HID_FUNC_NICHT" +#define HID_FUNC_WAHR "SC_HID_FUNC_WAHR" +#define HID_FUNC_WENN "SC_HID_FUNC_WENN" +#define HID_FUNC_ODER "SC_HID_FUNC_ODER" +#define HID_FUNC_UND "SC_HID_FUNC_UND" -#define HID_FUNC_ABS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_POTENZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ANZAHLLEEREZELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_PI (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_SUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_QUADRATESUMME (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_PRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_SUMMEWENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_ZAEHLENWENN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_WURZEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_ZUFALLSZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_ISTGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_ISTUNGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_KOMBINATIONEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_KOMBINATIONEN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_ARCCOS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_ARCSIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_ARCOSHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_ARSINHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_ARCCOT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_ARCTAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_ARCOTHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_ARTANHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+23) -#define HID_FUNC_COS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+24) -#define HID_FUNC_SIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+25) -#define HID_FUNC_COT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+26) -#define HID_FUNC_TAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+27) -#define HID_FUNC_COSHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+28) -#define HID_FUNC_SINHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+29) -#define HID_FUNC_COTHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+30) -#define HID_FUNC_TANHYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+31) -#define HID_FUNC_ARCTAN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+32) -#define HID_FUNC_DEG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+33) -#define HID_FUNC_RAD (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+34) -#define HID_FUNC_EXP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+35) -#define HID_FUNC_LOG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+36) -#define HID_FUNC_LN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+37) -#define HID_FUNC_LOG10 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+38) -#define HID_FUNC_FAKULTAET (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+39) -#define HID_FUNC_REST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+40) -#define HID_FUNC_VORZEICHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+41) -#define HID_FUNC_TEILERGEBNIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+42) -#define HID_FUNC_GANZZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+43) -#define HID_FUNC_KUERZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+44) -#define HID_FUNC_RUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+45) -#define HID_FUNC_AUFRUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+46) -#define HID_FUNC_ABRUNDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+47) -#define HID_FUNC_GERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+48) -#define HID_FUNC_UNGERADE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+49) -#define HID_FUNC_OBERGRENZE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+50) -#define HID_FUNC_UNTERGRENZE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+51) -#define HID_FUNC_GGT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+52) -#define HID_FUNC_KGV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+53) -#define HID_FUNC_UMRECHNEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+54) -#define HID_FUNC_EUROCONVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATH*ID_FUNCTION_OFFSET)+55) +#define HID_FUNC_ABS "SC_HID_FUNC_ABS" +#define HID_FUNC_POTENZ "SC_HID_FUNC_POTENZ" +#define HID_FUNC_ANZAHLLEEREZELLEN "SC_HID_FUNC_ANZAHLLEEREZELLEN" +#define HID_FUNC_PI "SC_HID_FUNC_PI" +#define HID_FUNC_SUMME "SC_HID_FUNC_SUMME" +#define HID_FUNC_QUADRATESUMME "SC_HID_FUNC_QUADRATESUMME" +#define HID_FUNC_PRODUKT "SC_HID_FUNC_PRODUKT" +#define HID_FUNC_SUMMEWENN "SC_HID_FUNC_SUMMEWENN" +#define HID_FUNC_ZAEHLENWENN "SC_HID_FUNC_ZAEHLENWENN" +#define HID_FUNC_WURZEL "SC_HID_FUNC_WURZEL" +#define HID_FUNC_ZUFALLSZAHL "SC_HID_FUNC_ZUFALLSZAHL" +#define HID_FUNC_ISTGERADE "SC_HID_FUNC_ISTGERADE" +#define HID_FUNC_ISTUNGERADE "SC_HID_FUNC_ISTUNGERADE" +#define HID_FUNC_KOMBINATIONEN "SC_HID_FUNC_KOMBINATIONEN" +#define HID_FUNC_KOMBINATIONEN2 "SC_HID_FUNC_KOMBINATIONEN2" +#define HID_FUNC_ARCCOS "SC_HID_FUNC_ARCCOS" +#define HID_FUNC_ARCSIN "SC_HID_FUNC_ARCSIN" +#define HID_FUNC_ARCOSHYP "SC_HID_FUNC_ARCOSHYP" +#define HID_FUNC_ARSINHYP "SC_HID_FUNC_ARSINHYP" +#define HID_FUNC_ARCCOT "SC_HID_FUNC_ARCCOT" +#define HID_FUNC_ARCTAN "SC_HID_FUNC_ARCTAN" +#define HID_FUNC_ARCOTHYP "SC_HID_FUNC_ARCOTHYP" +#define HID_FUNC_ARTANHYP "SC_HID_FUNC_ARTANHYP" +#define HID_FUNC_COS "SC_HID_FUNC_COS" +#define HID_FUNC_SIN "SC_HID_FUNC_SIN" +#define HID_FUNC_COT "SC_HID_FUNC_COT" +#define HID_FUNC_TAN "SC_HID_FUNC_TAN" +#define HID_FUNC_COSHYP "SC_HID_FUNC_COSHYP" +#define HID_FUNC_SINHYP "SC_HID_FUNC_SINHYP" +#define HID_FUNC_COTHYP "SC_HID_FUNC_COTHYP" +#define HID_FUNC_TANHYP "SC_HID_FUNC_TANHYP" +#define HID_FUNC_ARCTAN2 "SC_HID_FUNC_ARCTAN2" +#define HID_FUNC_DEG "SC_HID_FUNC_DEG" +#define HID_FUNC_RAD "SC_HID_FUNC_RAD" +#define HID_FUNC_EXP "SC_HID_FUNC_EXP" +#define HID_FUNC_LOG "SC_HID_FUNC_LOG" +#define HID_FUNC_LN "SC_HID_FUNC_LN" +#define HID_FUNC_LOG10 "SC_HID_FUNC_LOG10" +#define HID_FUNC_FAKULTAET "SC_HID_FUNC_FAKULTAET" +#define HID_FUNC_REST "SC_HID_FUNC_REST" +#define HID_FUNC_VORZEICHEN "SC_HID_FUNC_VORZEICHEN" +#define HID_FUNC_TEILERGEBNIS "SC_HID_FUNC_TEILERGEBNIS" +#define HID_FUNC_GANZZAHL "SC_HID_FUNC_GANZZAHL" +#define HID_FUNC_KUERZEN "SC_HID_FUNC_KUERZEN" +#define HID_FUNC_RUNDEN "SC_HID_FUNC_RUNDEN" +#define HID_FUNC_AUFRUNDEN "SC_HID_FUNC_AUFRUNDEN" +#define HID_FUNC_ABRUNDEN "SC_HID_FUNC_ABRUNDEN" +#define HID_FUNC_GERADE "SC_HID_FUNC_GERADE" +#define HID_FUNC_UNGERADE "SC_HID_FUNC_UNGERADE" +#define HID_FUNC_OBERGRENZE "SC_HID_FUNC_OBERGRENZE" +#define HID_FUNC_UNTERGRENZE "SC_HID_FUNC_UNTERGRENZE" +#define HID_FUNC_GGT "SC_HID_FUNC_GGT" +#define HID_FUNC_KGV "SC_HID_FUNC_KGV" +#define HID_FUNC_UMRECHNEN "SC_HID_FUNC_UMRECHNEN" +#define HID_FUNC_EUROCONVERT "SC_HID_FUNC_EUROCONVERT" -#define HID_FUNC_MTRANS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_MMULT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_MDET (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_MINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_EINHEITSMATRIX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_SUMMENPRODUKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_SUMMEX2MY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_SUMMEX2PY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_SUMMEXMY2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_HAEUFIGKEIT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_RGP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_RKP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_TREND (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_VARIATION (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_MATRIX*ID_FUNCTION_OFFSET)+14) +#define HID_FUNC_MTRANS "SC_HID_FUNC_MTRANS" +#define HID_FUNC_MMULT "SC_HID_FUNC_MMULT" +#define HID_FUNC_MDET "SC_HID_FUNC_MDET" +#define HID_FUNC_MINV "SC_HID_FUNC_MINV" +#define HID_FUNC_EINHEITSMATRIX "SC_HID_FUNC_EINHEITSMATRIX" +#define HID_FUNC_SUMMENPRODUKT "SC_HID_FUNC_SUMMENPRODUKT" +#define HID_FUNC_SUMMEX2MY2 "SC_HID_FUNC_SUMMEX2MY2" +#define HID_FUNC_SUMMEX2PY2 "SC_HID_FUNC_SUMMEX2PY2" +#define HID_FUNC_SUMMEXMY2 "SC_HID_FUNC_SUMMEXMY2" +#define HID_FUNC_HAEUFIGKEIT "SC_HID_FUNC_HAEUFIGKEIT" +#define HID_FUNC_RGP "SC_HID_FUNC_RGP" +#define HID_FUNC_RKP "SC_HID_FUNC_RKP" +#define HID_FUNC_TREND "SC_HID_FUNC_TREND" +#define HID_FUNC_VARIATION "SC_HID_FUNC_VARIATION" -#define HID_FUNC_ANZAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_ANZAHL2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_MAX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_MIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_VARIANZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_VARIANZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_STABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_STABWN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_MITTELWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_SUMQUADABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_MITTELABW (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_SCHIEFE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_KURT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_GEOMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_HARMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_MODALWERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_MEDIAN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_QUANTIL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_QUARTILE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_KGROESSTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_KKLEINSTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_QUANTILSRANG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_RANG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+23) -#define HID_FUNC_GESTUTZTMITTEL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+24) -#define HID_FUNC_WAHRSCHBEREICH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+25) -#define HID_FUNC_B (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+26) -#define HID_FUNC_PHI (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+27) -#define HID_FUNC_GAUSS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+28) -#define HID_FUNC_FISHER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+29) -#define HID_FUNC_FISHERINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+30) -#define HID_FUNC_BINOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+31) -#define HID_FUNC_NEGBINOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+32) -#define HID_FUNC_KRITBINOM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+33) -#define HID_FUNC_POISSON (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+34) -#define HID_FUNC_NORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+35) -#define HID_FUNC_NORMINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+36) -#define HID_FUNC_STANDNORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+37) -#define HID_FUNC_STANDNORMINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+38) -#define HID_FUNC_LOGNORMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+39) -#define HID_FUNC_LOGINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+40) -#define HID_FUNC_EXPONVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+41) -#define HID_FUNC_GAMMAVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+42) -#define HID_FUNC_GAMMAINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+43) -#define HID_FUNC_GAMMALN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+44) -#define HID_FUNC_BETAVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+45) -#define HID_FUNC_BETAINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+46) -#define HID_FUNC_WEIBULL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+47) -#define HID_FUNC_HYPGEOMVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+48) -#define HID_FUNC_TVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+49) -#define HID_FUNC_TINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+50) -#define HID_FUNC_FVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+51) -#define HID_FUNC_FINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+52) -#define HID_FUNC_CHIVERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+53) -#define HID_FUNC_CHIINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+54) -#define HID_FUNC_STANDARDISIERUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+55) -#define HID_FUNC_VARIATIONEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+56) -#define HID_FUNC_VARIATIONEN2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+57) -#define HID_FUNC_KONFIDENZ (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+58) -#define HID_FUNC_GTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+59) -#define HID_FUNC_CHITEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+60) -#define HID_FUNC_FTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+61) -#define HID_FUNC_TTEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+62) -#define HID_FUNC_BESTIMMTHEITSMASS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+63) -#define HID_FUNC_ACHSENABSCHNITT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+64) -#define HID_FUNC_STEIGUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+65) -#define HID_FUNC_STFEHLERYX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+66) -#define HID_FUNC_PEARSON (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+67) -#define HID_FUNC_KORREL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+68) -#define HID_FUNC_KOVAR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+69) -#define HID_FUNC_SCHAETZER (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+70) -#define HID_FUNC_MINA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+71) -#define HID_FUNC_MAXA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+72) -#define HID_FUNC_MITTELWERTA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+73) -#define HID_FUNC_STABWA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+74) -#define HID_FUNC_STABWNA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+75) -#define HID_FUNC_VARIANZA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+76) -#define HID_FUNC_VARIANZENA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+77) -#define HID_FUNC_CHISQDIST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+78) -#define HID_FUNC_CHISQINV (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+79) -#define HID_FUNC_GAMMA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_STATISTIC*ID_FUNCTION_OFFSET)+80) +#define HID_FUNC_ANZAHL "SC_HID_FUNC_ANZAHL" +#define HID_FUNC_ANZAHL2 "SC_HID_FUNC_ANZAHL2" +#define HID_FUNC_MAX "SC_HID_FUNC_MAX" +#define HID_FUNC_MIN "SC_HID_FUNC_MIN" +#define HID_FUNC_VARIANZ "SC_HID_FUNC_VARIANZ" +#define HID_FUNC_VARIANZEN "SC_HID_FUNC_VARIANZEN" +#define HID_FUNC_STABW "SC_HID_FUNC_STABW" +#define HID_FUNC_STABWN "SC_HID_FUNC_STABWN" +#define HID_FUNC_MITTELWERT "SC_HID_FUNC_MITTELWERT" +#define HID_FUNC_SUMQUADABW "SC_HID_FUNC_SUMQUADABW" +#define HID_FUNC_MITTELABW "SC_HID_FUNC_MITTELABW" +#define HID_FUNC_SCHIEFE "SC_HID_FUNC_SCHIEFE" +#define HID_FUNC_KURT "SC_HID_FUNC_KURT" +#define HID_FUNC_GEOMITTEL "SC_HID_FUNC_GEOMITTEL" +#define HID_FUNC_HARMITTEL "SC_HID_FUNC_HARMITTEL" +#define HID_FUNC_MODALWERT "SC_HID_FUNC_MODALWERT" +#define HID_FUNC_MEDIAN "SC_HID_FUNC_MEDIAN" +#define HID_FUNC_QUANTIL "SC_HID_FUNC_QUANTIL" +#define HID_FUNC_QUARTILE "SC_HID_FUNC_QUARTILE" +#define HID_FUNC_KGROESSTE "SC_HID_FUNC_KGROESSTE" +#define HID_FUNC_KKLEINSTE "SC_HID_FUNC_KKLEINSTE" +#define HID_FUNC_QUANTILSRANG "SC_HID_FUNC_QUANTILSRANG" +#define HID_FUNC_RANG "SC_HID_FUNC_RANG" +#define HID_FUNC_GESTUTZTMITTEL "SC_HID_FUNC_GESTUTZTMITTEL" +#define HID_FUNC_WAHRSCHBEREICH "SC_HID_FUNC_WAHRSCHBEREICH" +#define HID_FUNC_B "SC_HID_FUNC_B" +#define HID_FUNC_PHI "SC_HID_FUNC_PHI" +#define HID_FUNC_GAUSS "SC_HID_FUNC_GAUSS" +#define HID_FUNC_FISHER "SC_HID_FUNC_FISHER" +#define HID_FUNC_FISHERINV "SC_HID_FUNC_FISHERINV" +#define HID_FUNC_BINOMVERT "SC_HID_FUNC_BINOMVERT" +#define HID_FUNC_NEGBINOMVERT "SC_HID_FUNC_NEGBINOMVERT" +#define HID_FUNC_KRITBINOM "SC_HID_FUNC_KRITBINOM" +#define HID_FUNC_POISSON "SC_HID_FUNC_POISSON" +#define HID_FUNC_NORMVERT "SC_HID_FUNC_NORMVERT" +#define HID_FUNC_NORMINV "SC_HID_FUNC_NORMINV" +#define HID_FUNC_STANDNORMVERT "SC_HID_FUNC_STANDNORMVERT" +#define HID_FUNC_STANDNORMINV "SC_HID_FUNC_STANDNORMINV" +#define HID_FUNC_LOGNORMVERT "SC_HID_FUNC_LOGNORMVERT" +#define HID_FUNC_LOGINV "SC_HID_FUNC_LOGINV" +#define HID_FUNC_EXPONVERT "SC_HID_FUNC_EXPONVERT" +#define HID_FUNC_GAMMAVERT "SC_HID_FUNC_GAMMAVERT" +#define HID_FUNC_GAMMAINV "SC_HID_FUNC_GAMMAINV" +#define HID_FUNC_GAMMALN "SC_HID_FUNC_GAMMALN" +#define HID_FUNC_BETAVERT "SC_HID_FUNC_BETAVERT" +#define HID_FUNC_BETAINV "SC_HID_FUNC_BETAINV" +#define HID_FUNC_WEIBULL "SC_HID_FUNC_WEIBULL" +#define HID_FUNC_HYPGEOMVERT "SC_HID_FUNC_HYPGEOMVERT" +#define HID_FUNC_TVERT "SC_HID_FUNC_TVERT" +#define HID_FUNC_TINV "SC_HID_FUNC_TINV" +#define HID_FUNC_FVERT "SC_HID_FUNC_FVERT" +#define HID_FUNC_FINV "SC_HID_FUNC_FINV" +#define HID_FUNC_CHIVERT "SC_HID_FUNC_CHIVERT" +#define HID_FUNC_CHIINV "SC_HID_FUNC_CHIINV" +#define HID_FUNC_STANDARDISIERUNG "SC_HID_FUNC_STANDARDISIERUNG" +#define HID_FUNC_VARIATIONEN "SC_HID_FUNC_VARIATIONEN" +#define HID_FUNC_VARIATIONEN2 "SC_HID_FUNC_VARIATIONEN2" +#define HID_FUNC_KONFIDENZ "SC_HID_FUNC_KONFIDENZ" +#define HID_FUNC_GTEST "SC_HID_FUNC_GTEST" +#define HID_FUNC_CHITEST "SC_HID_FUNC_CHITEST" +#define HID_FUNC_FTEST "SC_HID_FUNC_FTEST" +#define HID_FUNC_TTEST "SC_HID_FUNC_TTEST" +#define HID_FUNC_BESTIMMTHEITSMASS "SC_HID_FUNC_BESTIMMTHEITSMASS" +#define HID_FUNC_ACHSENABSCHNITT "SC_HID_FUNC_ACHSENABSCHNITT" +#define HID_FUNC_STEIGUNG "SC_HID_FUNC_STEIGUNG" +#define HID_FUNC_STFEHLERYX "SC_HID_FUNC_STFEHLERYX" +#define HID_FUNC_PEARSON "SC_HID_FUNC_PEARSON" +#define HID_FUNC_KORREL "SC_HID_FUNC_KORREL" +#define HID_FUNC_KOVAR "SC_HID_FUNC_KOVAR" +#define HID_FUNC_SCHAETZER "SC_HID_FUNC_SCHAETZER" +#define HID_FUNC_MINA "SC_HID_FUNC_MINA" +#define HID_FUNC_MAXA "SC_HID_FUNC_MAXA" +#define HID_FUNC_MITTELWERTA "SC_HID_FUNC_MITTELWERTA" +#define HID_FUNC_STABWA "SC_HID_FUNC_STABWA" +#define HID_FUNC_STABWNA "SC_HID_FUNC_STABWNA" +#define HID_FUNC_VARIANZA "SC_HID_FUNC_VARIANZA" +#define HID_FUNC_VARIANZENA "SC_HID_FUNC_VARIANZENA" +#define HID_FUNC_CHISQDIST "SC_HID_FUNC_CHISQDIST" +#define HID_FUNC_CHISQINV "SC_HID_FUNC_CHISQINV" +#define HID_FUNC_GAMMA "SC_HID_FUNC_GAMMA" -#define HID_FUNC_ADRESSE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_BEREICHE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_WAHL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_SPALTE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_ZEILE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_SPALTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_ZEILEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_WVERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_SVERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_INDEX (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_INDIREKT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_VERWEIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_VERGLEICH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_VERSCHIEBUNG (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_FEHLERTYP (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_VORLAGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_DDE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_TABELLE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_TABELLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_HYPERLINK (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_GETPIVOTDATA (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TABLE*ID_FUNCTION_OFFSET)+21) +#define HID_FUNC_ADRESSE "SC_HID_FUNC_ADRESSE" +#define HID_FUNC_BEREICHE "SC_HID_FUNC_BEREICHE" +#define HID_FUNC_WAHL "SC_HID_FUNC_WAHL" +#define HID_FUNC_SPALTE "SC_HID_FUNC_SPALTE" +#define HID_FUNC_ZEILE "SC_HID_FUNC_ZEILE" +#define HID_FUNC_SPALTEN "SC_HID_FUNC_SPALTEN" +#define HID_FUNC_ZEILEN "SC_HID_FUNC_ZEILEN" +#define HID_FUNC_WVERWEIS "SC_HID_FUNC_WVERWEIS" +#define HID_FUNC_SVERWEIS "SC_HID_FUNC_SVERWEIS" +#define HID_FUNC_INDEX "SC_HID_FUNC_INDEX" +#define HID_FUNC_INDIREKT "SC_HID_FUNC_INDIREKT" +#define HID_FUNC_VERWEIS "SC_HID_FUNC_VERWEIS" +#define HID_FUNC_VERGLEICH "SC_HID_FUNC_VERGLEICH" +#define HID_FUNC_VERSCHIEBUNG "SC_HID_FUNC_VERSCHIEBUNG" +#define HID_FUNC_FEHLERTYP "SC_HID_FUNC_FEHLERTYP" +#define HID_FUNC_VORLAGE "SC_HID_FUNC_VORLAGE" +#define HID_FUNC_DDE "SC_HID_FUNC_DDE" +#define HID_FUNC_TABELLE "SC_HID_FUNC_TABELLE" +#define HID_FUNC_TABELLEN "SC_HID_FUNC_TABELLEN" +#define HID_FUNC_HYPERLINK "SC_HID_FUNC_HYPERLINK" +#define HID_FUNC_GETPIVOTDATA "SC_HID_FUNC_GETPIVOTDATA" -#define HID_FUNC_CODE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+1) -#define HID_FUNC_DM (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+2) -#define HID_FUNC_ZEICHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+3) -#define HID_FUNC_SAEUBERN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+4) -#define HID_FUNC_VERKETTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+5) -#define HID_FUNC_IDENTISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+6) -#define HID_FUNC_FINDEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+7) -#define HID_FUNC_SUCHEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+8) -#define HID_FUNC_GLAETTEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+9) -#define HID_FUNC_GROSS2 (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+10) -#define HID_FUNC_GROSS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+11) -#define HID_FUNC_KLEIN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+12) -#define HID_FUNC_WERT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+13) -#define HID_FUNC_TEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+14) -#define HID_FUNC_T (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+15) -#define HID_FUNC_ERSETZEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+16) -#define HID_FUNC_FEST (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+17) -#define HID_FUNC_LAENGE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+18) -#define HID_FUNC_LINKS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+19) -#define HID_FUNC_RECHTS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+20) -#define HID_FUNC_TEIL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+21) -#define HID_FUNC_WIEDERHOLEN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+22) -#define HID_FUNC_WECHSELN (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+23) -#define HID_FUNC_BASIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+24) -#define HID_FUNC_DEZIMAL (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+25) -#define HID_FUNC_ROEMISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+26) -#define HID_FUNC_ARABISCH (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+27) -#define HID_FUNC_BAHTTEXT (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+28) -#define HID_FUNC_JIS (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+29) -#define HID_FUNC_ASC (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+30) -#define HID_FUNC_UNICODE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+31) -#define HID_FUNC_UNICHAR (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+32) -#define HID_FUNC_NUMBERVALUE (HID_SC_FUNC_DUMMY+(ID_FUNCTION_GRP_TEXT*ID_FUNCTION_OFFSET)+33) +#define HID_FUNC_CODE "SC_HID_FUNC_CODE" +#define HID_FUNC_DM "SC_HID_FUNC_DM" +#define HID_FUNC_ZEICHEN "SC_HID_FUNC_ZEICHEN" +#define HID_FUNC_SAEUBERN "SC_HID_FUNC_SAEUBERN" +#define HID_FUNC_VERKETTEN "SC_HID_FUNC_VERKETTEN" +#define HID_FUNC_IDENTISCH "SC_HID_FUNC_IDENTISCH" +#define HID_FUNC_FINDEN "SC_HID_FUNC_FINDEN" +#define HID_FUNC_SUCHEN "SC_HID_FUNC_SUCHEN" +#define HID_FUNC_GLAETTEN "SC_HID_FUNC_GLAETTEN" +#define HID_FUNC_GROSS2 "SC_HID_FUNC_GROSS2" +#define HID_FUNC_GROSS "SC_HID_FUNC_GROSS" +#define HID_FUNC_KLEIN "SC_HID_FUNC_KLEIN" +#define HID_FUNC_WERT "SC_HID_FUNC_WERT" +#define HID_FUNC_TEXT "SC_HID_FUNC_TEXT" +#define HID_FUNC_T "SC_HID_FUNC_T" +#define HID_FUNC_ERSETZEN "SC_HID_FUNC_ERSETZEN" +#define HID_FUNC_FEST "SC_HID_FUNC_FEST" +#define HID_FUNC_LAENGE "SC_HID_FUNC_LAENGE" +#define HID_FUNC_LINKS "SC_HID_FUNC_LINKS" +#define HID_FUNC_RECHTS "SC_HID_FUNC_RECHTS" +#define HID_FUNC_TEIL "SC_HID_FUNC_TEIL" +#define HID_FUNC_WIEDERHOLEN "SC_HID_FUNC_WIEDERHOLEN" +#define HID_FUNC_WECHSELN "SC_HID_FUNC_WECHSELN" +#define HID_FUNC_BASIS "SC_HID_FUNC_BASIS" +#define HID_FUNC_DEZIMAL "SC_HID_FUNC_DEZIMAL" +#define HID_FUNC_ROEMISCH "SC_HID_FUNC_ROEMISCH" +#define HID_FUNC_ARABISCH "SC_HID_FUNC_ARABISCH" +#define HID_FUNC_BAHTTEXT "SC_HID_FUNC_BAHTTEXT" +#define HID_FUNC_JIS "SC_HID_FUNC_JIS" +#define HID_FUNC_ASC "SC_HID_FUNC_ASC" +#define HID_FUNC_UNICODE "SC_HID_FUNC_UNICODE" +#define HID_FUNC_UNICHAR "SC_HID_FUNC_UNICHAR" +#define HID_FUNC_NUMBERVALUE "SC_HID_FUNC_NUMBERVALUE" diff --git a/sc/inc/scmod.hxx b/sc/inc/scmod.hxx index ee2c956e7742..e9fbf493da02 100644 --- a/sc/inc/scmod.hxx +++ b/sc/inc/scmod.hxx @@ -157,7 +157,6 @@ public: ScModule( SfxObjectFactory* pFact ); virtual ~ScModule(); - virtual void FillStatusBar(StatusBar &rBar); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ); virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, sal_uInt32 ); void DeleteCfg(); diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx index 2081181b7537..e38dc73eeac5 100644 --- a/sc/source/core/data/global.cxx +++ b/sc/source/core/data/global.cxx @@ -1138,7 +1138,7 @@ ScFuncRes::ScFuncRes( ResId &aRes, ScFuncDesc* pDesc, bool & rbSuppressed ) { rbSuppressed = (bool)GetNum(); pDesc->nCategory = GetNum(); - pDesc->nHelpId = GetNum() + 32768; //! Hack, see scfuncs.src + pDesc->sHelpId = ReadByteStringRes(); //! Hack, see scfuncs.src pDesc->nArgCount = GetNum(); USHORT nArgs = pDesc->nArgCount; if (nArgs >= VAR_ARGS) @@ -1428,7 +1428,6 @@ ScFuncDesc::ScFuncDesc() : nFIndex (0), nCategory (0), nArgCount (0), - nHelpId (0), bIncomplete (false), bHasSuppressedArgs(false) {} @@ -1470,7 +1469,7 @@ void ScFuncDesc::Clear() nFIndex = 0; nCategory = 0; - nHelpId = 0; + sHelpId = ""; bIncomplete = false; bHasSuppressedArgs = false; } @@ -1704,9 +1703,9 @@ void ScFuncDesc::initArgumentInfo() const return GetSignature(); } // ----------------------------------------------------------------------------- -long ScFuncDesc::getHelpId() const +rtl::OString ScFuncDesc::getHelpId() const { - return nHelpId; + return sHelpId; } // ----------------------------------------------------------------------------- diff --git a/sc/source/core/inc/addinhelpid.hxx b/sc/source/core/inc/addinhelpid.hxx index b2f085ed64e5..f5186daf0dac 100644 --- a/sc/source/core/inc/addinhelpid.hxx +++ b/sc/source/core/inc/addinhelpid.hxx @@ -29,7 +29,7 @@ #define SC_ADDINHELPID_HXX #include - +#include // ============================================================================ @@ -50,7 +50,7 @@ public: void SetServiceName( const ::rtl::OUString& rServiceName ); /** @return The help ID of the function with given built-in name or 0 if not found. */ - sal_uInt16 GetHelpId( const ::rtl::OUString& rFuncName ) const; + rtl::OString GetHelpId( const ::rtl::OUString& rFuncName ) const; }; diff --git a/sc/source/core/tool/addincol.cxx b/sc/source/core/tool/addincol.cxx index c0ae60f13841..9fc1a7aa25cc 100644 --- a/sc/source/core/tool/addincol.cxx +++ b/sc/source/core/tool/addincol.cxx @@ -82,7 +82,7 @@ using namespace com::sun::star; ScUnoAddInFuncData::ScUnoAddInFuncData( const String& rNam, const String& rLoc, const String& rDesc, - USHORT nCat, USHORT nHelp, + USHORT nCat, const rtl::OString& sHelp, const uno::Reference& rFunc, const uno::Any& rO, long nAC, const ScAddInArgDesc* pAD, @@ -97,7 +97,7 @@ ScUnoAddInFuncData::ScUnoAddInFuncData( const String& rNam, const String& rLoc, nArgCount( nAC ), nCallerPos( nCP ), nCategory( nCat ), - nHelpId( nHelp ), + sHelpId( sHelp ), bCompInitialized( FALSE ) { if ( nArgCount ) @@ -607,7 +607,7 @@ void ScUnoAddInCollection::ReadConfiguration() } } - USHORT nHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); + rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( pFuncNameArray[nFuncPos] ); uno::Reference xFunc; // remains empty uno::Any aObject; // also empty @@ -616,7 +616,7 @@ void ScUnoAddInCollection::ReadConfiguration() ScUnoAddInFuncData* pData = new ScUnoAddInFuncData( aFuncName, aLocalName, aDescription, - nCategory, nHelpId, + nCategory, sHelpId, xFunc, aObject, nVisibleCount, pVisibleArgs, nCallerPos ); @@ -935,7 +935,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference& xAddIn->getProgrammaticCategoryName( aFuncU ) ) ); - USHORT nHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); + rtl::OString sHelpId = aHelpIdGenerator.GetHelpId( aFuncU ); rtl::OUString aLocalU; try @@ -1014,7 +1014,7 @@ void ScUnoAddInCollection::ReadFromAddIn( const uno::Reference& ppFuncData[nFuncPos+nOld] = new ScUnoAddInFuncData( aFuncName, aLocalName, aDescription, - nCategory, nHelpId, + nCategory, sHelpId, xFunc, aObject, nVisibleCount, pVisibleArgs, nCallerPos ); @@ -1337,7 +1337,7 @@ BOOL ScUnoAddInCollection::FillFunctionDescFromData( const ScUnoAddInFuncData& r rDesc.pFuncName = new String( rFuncData.GetUpperLocal() ); //! upper? rDesc.nCategory = rFuncData.GetCategory(); - rDesc.nHelpId = rFuncData.GetHelpId(); + rDesc.sHelpId = rFuncData.GetHelpId(); String aDesc = rFuncData.GetDescription(); if (!aDesc.Len()) diff --git a/sc/source/core/tool/addinhelpid.cxx b/sc/source/core/tool/addinhelpid.cxx index a4de52e27b1b..3f261fd3917c 100644 --- a/sc/source/core/tool/addinhelpid.cxx +++ b/sc/source/core/tool/addinhelpid.cxx @@ -37,7 +37,7 @@ struct ScUnoAddInHelpId { const sal_Char* pFuncName; - sal_uInt16 nHelpId; + const sal_Char* sHelpId; }; @@ -189,10 +189,10 @@ void ScUnoAddInHelpIdGenerator::SetServiceName( const ::rtl::OUString& rServiceN nArrayCount = nSize / sizeof( ScUnoAddInHelpId ); } -sal_uInt16 ScUnoAddInHelpIdGenerator::GetHelpId( const ::rtl::OUString& rFuncName ) const +rtl::OString ScUnoAddInHelpIdGenerator::GetHelpId( const ::rtl::OUString& rFuncName ) const { if( !pCurrHelpIds || !nArrayCount ) - return 0; + return rtl::OString(); const ScUnoAddInHelpId* pFirst = pCurrHelpIds; const ScUnoAddInHelpId* pLast = pCurrHelpIds + nArrayCount - 1; @@ -202,14 +202,14 @@ sal_uInt16 ScUnoAddInHelpIdGenerator::GetHelpId( const ::rtl::OUString& rFuncNam const ScUnoAddInHelpId* pMiddle = pFirst + (pLast - pFirst) / 2; sal_Int32 nResult = rFuncName.compareToAscii( pMiddle->pFuncName ); if( !nResult ) - return pMiddle->nHelpId; + return pMiddle->sHelpId; else if( nResult < 0 ) pLast = pMiddle - 1; else pFirst = pMiddle + 1; } - return 0; + return rtl::OString(); } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 484734acc888..f6fc2cb27b71 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -177,28 +177,22 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) : InsertWindow ( 7, &aTextWindow, 0, 6 ); aWndPos .SetQuickHelpText( ScResId( SCSTR_QHELP_POSWND ) ); - // FIXME: HELPID - aWndPos .SetHelpId ( ""/*HID_INSWIN_POS*/ ); + aWndPos .SetHelpId ( HID_INSWIN_POS ); aTextWindow.SetQuickHelpText( ScResId( SCSTR_QHELP_INPUTWND ) ); - // FIXME: HELPID - aTextWindow.SetHelpId ( ""/*HID_INSWIN_INPUT*/ ); + aTextWindow.SetHelpId ( HID_INSWIN_INPUT ); // kein SetHelpText, die Hilfetexte kommen aus der Hilfe SetItemText ( SID_INPUT_FUNCTION, ScResId( SCSTR_QHELP_BTNCALC ) ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_FUNCTION, ""/*HID_INSWIN_CALC*/ ); + SetHelpId ( SID_INPUT_FUNCTION, HID_INSWIN_CALC ); SetItemText ( SID_INPUT_SUM, aTextSum ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_SUM, ""/*HID_INSWIN_SUMME*/ ); + SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME ); SetItemText ( SID_INPUT_EQUAL, aTextEqual ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_EQUAL, ""/*HID_INSWIN_FUNC*/ ); + SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC ); - // FIXME: HELPID - SetHelpId( ""/*HID_SC_INPUTWIN*/ ); // fuer die ganze Eingabezeile + SetHelpId( HID_SC_INPUTWIN ); // fuer die ganze Eingabezeile aWndPos .Show(); aTextWindow .Show(); @@ -566,11 +560,9 @@ void ScInputWindow::SetOkCancelMode() InsertItem( SID_INPUT_CANCEL, IMAGE( SID_INPUT_CANCEL ), 0, 3 ); InsertItem( SID_INPUT_OK, IMAGE( SID_INPUT_OK ), 0, 4 ); SetItemText ( SID_INPUT_CANCEL, aTextCancel ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_CANCEL, ""/*HID_INSWIN_CANCEL*/ ); + SetHelpId ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL ); SetItemText ( SID_INPUT_OK, aTextOk ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_OK, ""/*HID_INSWIN_OK*/ ); + SetHelpId ( SID_INPUT_OK, HID_INSWIN_OK ); bIsOkCancelMode = TRUE; } } @@ -593,11 +585,9 @@ void ScInputWindow::SetSumAssignMode() InsertItem( SID_INPUT_SUM, IMAGE( SID_INPUT_SUM ), 0, 3 ); InsertItem( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), 0, 4 ); SetItemText ( SID_INPUT_SUM, aTextSum ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_SUM, ""/*HID_INSWIN_SUMME*/ ); + SetHelpId ( SID_INPUT_SUM, HID_INSWIN_SUMME ); SetItemText ( SID_INPUT_EQUAL, aTextEqual ); - // FIXME: HELPID - SetHelpId ( SID_INPUT_EQUAL, ""/*HID_INSWIN_FUNC*/ ); + SetHelpId ( SID_INPUT_EQUAL, HID_INSWIN_FUNC ); bIsOkCancelMode = FALSE; SetFormulaMode(FALSE); // kein editieren -> keine Formel diff --git a/sc/source/ui/app/scdll.cxx b/sc/source/ui/app/scdll.cxx index 11e33a8892e8..4a460eb7e4ad 100644 --- a/sc/source/ui/app/scdll.cxx +++ b/sc/source/ui/app/scdll.cxx @@ -364,59 +364,5 @@ void ScDLL::Exit() // ScGlobal::Clear ist schon im Module-dtor } -//------------------------------------------------------------------ -// Statusbar -//------------------------------------------------------------------ - -#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s)) - -//UNUSED2008-05 void ScDLL::FillStatusBar(StatusBar &rStatusBar) -//UNUSED2008-05 { -//UNUSED2008-05 // Dokumentposition (Tabelle x / y) -//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_DOCPOS, -//UNUSED2008-05 TEXT_WIDTH( String().Fill( 10, 'X' ) ), -//UNUSED2008-05 SIB_LEFT|SIB_AUTOSIZE ); -//UNUSED2008-05 -//UNUSED2008-05 // Seitenvorlage -//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_PAGESTYLE, -//UNUSED2008-05 TEXT_WIDTH( String().Fill( 15, 'X' ) ), -//UNUSED2008-05 SIB_LEFT|SIB_AUTOSIZE ); -//UNUSED2008-05 -//UNUSED2008-05 // Ma"sstab -//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_ZOOM, -//UNUSED2008-05 SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar), -//UNUSED2008-05 SIB_CENTER ); -//UNUSED2008-05 -//UNUSED2008-05 // Einfuege-/Ueberschreibmodus -//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_INSERT, -//UNUSED2008-05 SvxInsertStatusBarControl::GetDefItemWidth(rStatusBar), -//UNUSED2008-05 SIB_CENTER ); -//UNUSED2008-05 -//UNUSED2008-05 // Selektionsmodus -//UNUSED2008-05 rStatusBar.InsertItem( SID_STATUS_SELMODE, -//UNUSED2008-05 SvxSelectionModeControl::GetDefItemWidth(rStatusBar), -//UNUSED2008-05 SIB_CENTER ); -//UNUSED2008-05 -//UNUSED2008-05 // Dokument geaendert -//UNUSED2008-05 rStatusBar.InsertItem( SID_DOC_MODIFIED, -//UNUSED2008-05 SvxModifyControl::GetDefItemWidth(rStatusBar)); -//UNUSED2008-05 -//UNUSED2008-05 // signatures -//UNUSED2008-05 rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); -//UNUSED2008-05 rStatusBar.SetHelpId(SID_SIGNATURE, SID_SIGNATURE); -//UNUSED2008-05 -//UNUSED2008-05 // Mail -//UNUSED2008-05 rStatusBar.InsertItem( SID_MAIL_NOTIFY, -//UNUSED2008-05 TEXT_WIDTH( String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM("Mail")) ), -//UNUSED2008-05 SIB_CENTER ); -//UNUSED2008-05 -//UNUSED2008-05 // den aktuellen Kontext anzeigen Uhrzeit / FramePos / TabellenInfo / Errors -//UNUSED2008-05 rStatusBar.InsertItem( SID_ATTR_SIZE, -//UNUSED2008-05 SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar), -//UNUSED2008-05 SIB_AUTOSIZE|SIB_LEFT|SIB_USERDRAW); -//UNUSED2008-05 } - -#undef TEXT_WIDTH - // DetectFilter functionality has moved - please update your bookmarks // see sc/source/ui/unoobj/scdetect.cxx, have a nice day. diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx index 6bd2dcdba209..9c3ae8ce805e 100644 --- a/sc/source/ui/app/scmod.cxx +++ b/sc/source/ui/app/scmod.cxx @@ -373,77 +373,6 @@ void ScModule::DeleteCfg() } } -//------------------------------------------------------------------ - -#define TEXT_WIDTH(s) rStatusBar.GetTextWidth((s)) - -void ScModule::FillStatusBar(StatusBar& rStatusBar) -{ - // Dokumentposition (Tabelle x / y) - rStatusBar.InsertItem( SID_STATUS_DOCPOS, - TEXT_WIDTH( String().Fill( 10, 'X' ) ), - SIB_LEFT|SIB_AUTOSIZE ); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_STATUS_DOCPOS, ""/*SID_STATUS_DOCPOS*/ ); - - // Seitenvorlage - rStatusBar.InsertItem( SID_STATUS_PAGESTYLE, - TEXT_WIDTH( String().Fill( 15, 'X' ) ), - SIB_LEFT|SIB_AUTOSIZE ); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_STATUS_PAGESTYLE, ""/*SID_STATUS_PAGESTYLE*/ ); - - // Einfuege-/Ueberschreibmodus - rStatusBar.InsertItem( SID_ATTR_INSERT, - SvxInsertStatusBarControl::GetDefItemWidth(rStatusBar), - SIB_CENTER ); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_ATTR_INSERT, ""/*SID_ATTR_INSERT*/ ); - - // Selektionsmodus - rStatusBar.InsertItem( SID_STATUS_SELMODE, - SvxSelectionModeControl::GetDefItemWidth(rStatusBar), - SIB_CENTER ); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_STATUS_SELMODE, ""/*SID_STATUS_SELMODE*/ ); - - // Dokument geaendert - rStatusBar.InsertItem( SID_DOC_MODIFIED, - SvxModifyControl::GetDefItemWidth(rStatusBar)); - - // signatures - rStatusBar.InsertItem( SID_SIGNATURE, XmlSecStatusBarControl::GetDefItemWidth( rStatusBar ), SIB_USERDRAW ); - // FIXME: HELPID - rStatusBar.SetHelpId(SID_SIGNATURE, ""/*SID_SIGNATURE*/); - - - // FIXME: HELPID - rStatusBar.SetHelpId( SID_DOC_MODIFIED, ""/*SID_DOC_MODIFIED*/ ); - - // den aktuellen Kontext anzeigen Uhrzeit / FramePos / TabellenInfo / Errors - rStatusBar.InsertItem( SID_ATTR_SIZE, - SvxPosSizeStatusBarControl::GetDefItemWidth(rStatusBar), - SIB_AUTOSIZE|SIB_LEFT|SIB_USERDRAW); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_ATTR_SIZE, ""/*SID_ATTR_SIZE*/ ); - - // Ma"sstab - rStatusBar.InsertItem( SID_ATTR_ZOOM, - SvxZoomStatusBarControl::GetDefItemWidth(rStatusBar), - SIB_CENTER ); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_ATTR_ZOOM, ""/*SID_ATTR_ZOOM*/ ); - - // ZoomSlider - rStatusBar.InsertItem( SID_ATTR_ZOOMSLIDER, - TEXT_WIDTH( String().Fill( 15, 'X' ) ), - SIB_CENTER ); - // FIXME: HELPID - rStatusBar.SetHelpId( SID_ATTR_ZOOMSLIDER, ""/*SID_ATTR_ZOOMSLIDER*/ ); -} - -#undef TEXT_WIDTH - //------------------------------------------------------------------ // // von der Applikation verschoben: diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 0af2c30d628f..7bb0a94c9d58 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -597,9 +597,9 @@ USHORT AbstractScShowTabDlg_Impl::GetSelectEntryCount() const } void AbstractScShowTabDlg_Impl::SetDescription( const String& rTitle, const String& rFixedText, - ULONG nDlgHelpId, ULONG nLbHelpId ) + const rtl::OString& sDlgHelpId, const rtl::OString& sLbHelpId ) { - pDlg->SetDescription( rTitle, rFixedText,nDlgHelpId, nLbHelpId ); + pDlg->SetDescription( rTitle, rFixedText, sDlgHelpId, sLbHelpId ); } USHORT AbstractScShowTabDlg_Impl::GetSelectEntryPos(USHORT nPos) const { @@ -1274,14 +1274,14 @@ AbstractScShowTabDlg * ScAbstractDialogFactory_Impl::CreateScShowTabDlg ( Window const String& rTitle, const String& rEditTitle, const String& rDefault, - ULONG nHelpId , + const rtl::OString& sHelpId, const rtl::OString& sEditHelpId, int nId ) { ScStringInputDlg * pDlg=NULL; switch ( nId ) { case RID_SCDLG_STRINPUT : - pDlg = new ScStringInputDlg( pParent, rTitle, rEditTitle,rDefault, nHelpId ); + pDlg = new ScStringInputDlg( pParent, rTitle, rEditTitle, rDefault, sHelpId, sEditHelpId ); break; default: break; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index d9752c83da9a..9cd77cc61878 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -325,7 +325,7 @@ class AbstractScShowTabDlg_Impl : public AbstractScShowTabDlg //add for ScShowT DECL_ABSTDLG_BASE(AbstractScShowTabDlg_Impl,ScShowTabDlg) virtual void Insert( const String& rString, BOOL bSelected ); virtual USHORT GetSelectEntryCount() const; - virtual void SetDescription(const String& rTitle, const String& rFixedText,ULONG nDlgHelpId, ULONG nLbHelpId ); + virtual void SetDescription(const String& rTitle, const String& rFixedText, const rtl::OString& sDlgHelpId, const rtl::OString& sLbHelpId ); virtual String GetSelectEntry(USHORT nPos) const; virtual USHORT GetSelectEntryPos(USHORT nPos) const; }; @@ -517,7 +517,7 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - ULONG nHelpId , + const rtl::OString& sHelpId, const rtl::OString& sEditHelpId, int nId ); virtual AbstractScImportOptionsDlg * CreateScImportOptionsDlg ( Window* pParent, //add for ScImportOptionsDlg int nId, diff --git a/sc/source/ui/dbgui/consdlg.src b/sc/source/ui/dbgui/consdlg.src index 5226c22629c6..0ba15ee43445 100644 --- a/sc/source/ui/dbgui/consdlg.src +++ b/sc/source/ui/dbgui/consdlg.src @@ -28,7 +28,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE { OutputSize = TRUE ; - HelpId = SID_OPENDLG_CONSOLIDATE ; + HelpId = CMD_SID_OPENDLG_CONSOLIDATE ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 280 , 154 ) ; diff --git a/sc/source/ui/dbgui/dpgroupdlg.cxx b/sc/source/ui/dbgui/dpgroupdlg.cxx index ad88d7501663..4ac3fb8d68ad 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.cxx +++ b/sc/source/ui/dbgui/dpgroupdlg.cxx @@ -240,8 +240,7 @@ ScDPDateGroupDlg::ScDPDateGroupDlg( Window* pParent, maStartHelper ( maRbAutoStart, maRbManStart, maEdStart, rNullDate ), maEndHelper ( maRbAutoEnd, maRbManEnd, maEdEnd, rNullDate ) { - // FIXME: HELPID - maLbUnits.SetHelpId( ""/*HID_SC_DPDATEGROUP_LB*/ ); + maLbUnits.SetHelpId( HID_SC_DPDATEGROUP_LB ); ResStringArray aArr( ScResId( STR_UNITS ) ); for( USHORT nIdx = 0, nCount = sal::static_int_cast(aArr.Count()); nIdx < nCount; ++nIdx ) maLbUnits.InsertEntry( aArr.GetString( nIdx ) ); diff --git a/sc/source/ui/dbgui/pivot.src b/sc/source/ui/dbgui/pivot.src index 359c8a92d8e5..2379d15d3eac 100644 --- a/sc/source/ui/dbgui/pivot.src +++ b/sc/source/ui/dbgui/pivot.src @@ -30,7 +30,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT { OutputSize = TRUE ; - HelpId = SID_OPENDLG_PIVOTTABLE ; + HelpId = CMD_SID_OPENDLG_PIVOTTABLE ; Size = MAP_APPFONT ( 336 , 190 ) ; Hide = TRUE ; SVLook = TRUE ; diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx index dfc4e771e637..6b04993ba0bc 100644 --- a/sc/source/ui/dbgui/pvfundlg.cxx +++ b/sc/source/ui/dbgui/pvfundlg.cxx @@ -651,8 +651,7 @@ void ScDPSubtotalOptDlg::Init( const ScDPNameVec& rDataFields, bool bEnableLayou // *** HIDDEN ITEMS *** - // FIXME: HELPID - maLbHide.SetHelpId( ""/*HID_SC_DPSUBT_HIDE*/ ); + maLbHide.SetHelpId( HID_SC_DPSUBT_HIDE ); InitHideListBox(); // *** HIERARCHY *** diff --git a/sc/source/ui/dbgui/pvlaydlg.cxx b/sc/source/ui/dbgui/pvlaydlg.cxx index 221b7781893b..1eca44a787ed 100644 --- a/sc/source/ui/dbgui/pvlaydlg.cxx +++ b/sc/source/ui/dbgui/pvlaydlg.cxx @@ -332,16 +332,11 @@ void __EXPORT ScDPLayoutDlg::Init() aBtnDrillDown.Check(); } - // FIXME: HELPID - aWndPage.SetHelpId( ""/*HID_SC_DPLAY_PAGE*/ ); - // FIXME: HELPID - aWndCol.SetHelpId( ""/*HID_SC_DPLAY_COLUMN*/ ); - // FIXME: HELPID - aWndRow.SetHelpId( ""/*HID_SC_DPLAY_ROW*/ ); - // FIXME: HELPID - aWndData.SetHelpId( ""/*HID_SC_DPLAY_DATA*/ ); - // FIXME: HELPID - aWndSelect.SetHelpId( ""/*HID_SC_DPLAY_SELECT*/ ); + aWndPage.SetHelpId( HID_SC_DPLAY_PAGE ); + aWndCol.SetHelpId( HID_SC_DPLAY_COLUMN ); + aWndRow.SetHelpId( HID_SC_DPLAY_ROW ); + aWndData.SetHelpId( HID_SC_DPLAY_DATA ); + aWndSelect.SetHelpId( HID_SC_DPLAY_SELECT ); InitFocus(); diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx index 0e998ae92732..3ab0cc62bdd2 100644 --- a/sc/source/ui/docshell/docsh4.cxx +++ b/sc/source/ui/docshell/docsh4.cxx @@ -43,7 +43,7 @@ using namespace ::com::sun::star; #include "scitems.hxx" #include #include - +#include #include #include #include @@ -1182,10 +1182,8 @@ BOOL ScDocShell::ExecuteChangeProtectionDialog( Window* _pParent, BOOL bJustQuer _pParent ? _pParent : GetActiveDialogParent(), &aText ); pDlg->SetText( aTitle ); pDlg->SetMinLen( 1 ); - // FIXME: HELPID - pDlg->SetHelpId( ""/*SID_CHG_PROTECT*/ ); - // FIXME: HELPID - pDlg->SetEditHelpId( ""/*HID_CHG_PROTECT*/ ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(SID_CHG_PROTECT)->GetCommand() ); + pDlg->SetEditHelpId( HID_CHG_PROTECT ); if ( !bProtected ) pDlg->ShowExtras( SHOWEXTRAS_CONFIRM ); if ( pDlg->Execute() == RET_OK ) diff --git a/sc/source/ui/drawfunc/drformsh.src b/sc/source/ui/drawfunc/drformsh.src index b20ceb9841a5..a00665b58189 100644 --- a/sc/source/ui/drawfunc/drformsh.src +++ b/sc/source/ui/drawfunc/drformsh.src @@ -35,19 +35,19 @@ ToolBoxItem\ {\ Identifier = SID_FRAME_TO_TOP ; \ - HelpID = SID_FRAME_TO_TOP ; \ + HelpID = CMD_SID_FRAME_TO_TOP ; \ };\ ToolBoxItem\ {\ Identifier = SID_FRAME_TO_BOTTOM ; \ - HelpID = SID_FRAME_TO_BOTTOM ; \ + HelpID = CMD_SID_FRAME_TO_BOTTOM ; \ }; #define MN_RENAME_OBJECT \ MenuItem\ {\ Identifier = SID_RENAME_OBJECT ; \ - HelpId = SID_RENAME_OBJECT ; \ + HelpId = CMD_SID_RENAME_OBJECT ; \ Text [ en-US ] = "Name...";\ }; @@ -56,7 +56,7 @@ MenuItem\ {\ Identifier = SID_TITLE_DESCRIPTION_OBJECT; \ - HelpId = SID_TITLE_DESCRIPTION_OBJECT; \ + HelpId = CMD_SID_TITLE_DESCRIPTION_OBJECT; \ Text [ en-US ] = "Description...";\ }; @@ -77,14 +77,14 @@ MenuItem\ {\ Identifier = SID_FRAME_UP ; \ - HelpId = SID_FRAME_UP ; \ + HelpId = CMD_SID_FRAME_UP ; \ /* ### ACHTUNG: Neuer Text in Resource? W~eiter nach vorn : Weiter nach vorn */\ Text [ en-US ] = "Bring ~Forward" ; \ };\ MenuItem\ {\ Identifier = SID_FRAME_DOWN ; \ - HelpId = SID_FRAME_DOWN ; \ + HelpId = CMD_SID_FRAME_DOWN ; \ /* ### ACHTUNG: Neuer Text in Resource? Weiter ~nach hinten : Weiter nach hinten */\ Text [ en-US ] = "Send Back~ward" ; \ };\ @@ -118,13 +118,13 @@ MenuItem\ {\ Identifier = SID_ANCHOR_PAGE ; \ - HelpId = SID_ANCHOR_PAGE ; \ + HelpId = CMD_SID_ANCHOR_PAGE ; \ Text [ en-US ] = "To P~age" ; \ };\ MenuItem\ {\ Identifier = SID_ANCHOR_CELL ; \ - HelpId = SID_ANCHOR_CELL ; \ + HelpId = CMD_SID_ANCHOR_CELL ; \ Text [ en-US ] = "To ~Cell" ; \ };\ };\ @@ -135,7 +135,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN ; \ - HelpId = SID_OBJECT_ALIGN ; \ + HelpId = CMD_SID_OBJECT_ALIGN ; \ Text [ en-US ] = "A~lignment" ; \ SubMenu = Menu\ {\ diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index f648a1484e8e..9582bac97ba7 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -54,7 +54,8 @@ #include #include #include - +#include +#include // BM/IHA -- #include @@ -266,7 +267,7 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); SfxAbstractInsertObjectDialog* pDlg = - pFact->CreateInsertObjectDialog( pViewShell->GetWindow(), nSlot, + pFact->CreateInsertObjectDialog( pViewShell->GetWindow(), SC_MOD()->GetSlotPool()->GetSlot(nSlot)->GetCommandString(), xStorage, &aServerLst ); if ( pDlg ) { diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src index 0cd8fdd54e4b..4eda5beca4c3 100644 --- a/sc/source/ui/drawfunc/objdraw.src +++ b/sc/source/ui/drawfunc/objdraw.src @@ -35,7 +35,7 @@ MenuItem\ {\ Identifier = SID_TEXT_STANDARD ; \ - HelpID = SID_TEXT_STANDARD ; \ + HelpID = CMD_SID_TEXT_STANDARD ; \ Text [ en-US ] = "~Default" ; \ Text [ x-comment ] = " ";\ }; @@ -46,7 +46,7 @@ MenuItem\ {\ Identifier = RID_MN_FORMAT_STYLE ; \ - HelpID = RID_MN_FORMAT_STYLE ; \ + HelpID = HID_MN_FORMAT_STYLE ; \ Text [ en-US ] = "~Style" ; \ SubMenu = Menu\ {\ @@ -87,14 +87,14 @@ MenuItem\ {\ Identifier = SID_SET_SUPER_SCRIPT ; \ - HelpID = SID_SET_SUPER_SCRIPT ; \ + HelpID = CMD_SID_SET_SUPER_SCRIPT ; \ Text [ en-US ] = "~Superscript" ; \ Text [ x-comment ] = " ";\ };\ MenuItem\ {\ Identifier = SID_SET_SUB_SCRIPT ; \ - HelpID = SID_SET_SUB_SCRIPT ; \ + HelpID = CMD_SID_SET_SUB_SCRIPT ; \ Text [ en-US ] = "S~ubscript" ; \ Text [ x-comment ] = " ";\ };\ @@ -105,7 +105,7 @@ MenuItem\ {\ Identifier = RID_MN_FORMAT_ALGN ; \ - HelpID = RID_MN_FORMAT_ALGN ; \ + HelpID = HID_MN_FORMAT_ALGN ; \ Text [ en-US ] = "~Alignment" ; \ RadioCheck = TRUE ; \ SubMenu = Menu\ @@ -115,7 +115,7 @@ MenuItem\ {\ Identifier = SID_ALIGNLEFT ; \ - HelpID = SID_ATTR_PARA_ADJUST_LEFT ; \ + HelpID = CMD_SID_ATTR_PARA_ADJUST_LEFT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Left" ;\ Text [ x-comment ] = " "; \ @@ -123,21 +123,21 @@ MenuItem\ {\ Identifier = SID_ALIGNRIGHT ; \ - HelpID = SID_ATTR_PARA_ADJUST_RIGHT ; \ + HelpID = CMD_SID_ATTR_PARA_ADJUST_RIGHT ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Right" ;\ };\ MenuItem\ {\ Identifier = SID_ALIGNCENTERHOR ; \ - HelpID = SID_ATTR_PARA_ADJUST_CENTER ; \ + HelpID = CMD_SID_ATTR_PARA_ADJUST_CENTER ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Centered" ;\ };\ MenuItem\ {\ Identifier = SID_ALIGNBLOCK ; \ - HelpID = SID_ATTR_PARA_ADJUST_BLOCK ; \ + HelpID = CMD_SID_ATTR_PARA_ADJUST_BLOCK ; \ RadioCheck = TRUE ; \ Text [ en-US ] = "~Justified" ; \ Text [ x-comment ] = " ";\ @@ -149,7 +149,7 @@ MenuItem\ {\ Identifier = RID_MN_FORMAT_LINESPACE ; \ - HelpID = RID_MN_FORMAT_LINESPACE ; \ + HelpID = HID_MN_FORMAT_LINESPACE ; \ Text [ en-US ] = "~Line Spacing" ; \ _MenuItemFlags = MIB_RADIOCHECK ; \ SubMenu = Menu\ @@ -191,7 +191,7 @@ MenuItem\ {\ Identifier = SID_DRAW_HLINK_EDIT ; \ - HelpID = SID_DRAW_HLINK_EDIT ; \ + HelpID = CMD_SID_DRAW_HLINK_EDIT ; \ Text [ en-US ] = "~Hyperlink..." ; \ }; @@ -199,7 +199,7 @@ MenuItem\ {\ Identifier = SID_DRAW_HLINK_DELETE ; \ - HelpID = SID_DRAW_HLINK_DELETE ; \ + HelpID = CMD_SID_DRAW_HLINK_DELETE ; \ Text [ en-US ] = "~Remove Hyperlink" ; \ }; #endif @@ -208,7 +208,7 @@ MenuItem\ {\ Identifier = SID_DRAWTEXT_ATTR_DLG ; \ - HelpID = SID_DRAWTEXT_ATTR_DLG ; \ + HelpID = CMD_SID_DRAWTEXT_ATTR_DLG ; \ Text [ en-US ] = "Te~xt..." ; \ /* ### ACHTUNG: Neuer Text in Resource? Textattribute für die selektierten Textobjekte festlegen : Textattribute f³r die selektierten Textobjekte festlegen */\ Text [ x-comment ] = " ";\ @@ -218,7 +218,7 @@ MenuItem\ {\ Identifier = SID_ASSIGNMACRO ; \ - HelpID = SID_ASSIGNMACRO ; \ + HelpID = CMD_SID_ASSIGNMACRO ; \ Text [ en-US ] = "Assig~n Macro..." ; \ Text [ x-comment ] = " ";\ }; @@ -227,7 +227,7 @@ MenuItem\ {\ Identifier = SID_ORIGINALSIZE ; \ - HelpId = SID_ORIGINALSIZE ; \ + HelpId = CMD_SID_ORIGINALSIZE ; \ /* ### ACHTUNG: Neuer Text in Resource? Originalgröße : Originalgr÷˜e */\ Text [ en-US ] = "~Original Size" ; \ Text [ x-comment ] = " ";\ @@ -237,7 +237,7 @@ MenuItem\ {\ Identifier = SID_RENAME_OBJECT ; \ - HelpId = SID_RENAME_OBJECT ; \ + HelpId = CMD_SID_RENAME_OBJECT ; \ Text [ en-US ] = "Name...";\ }; @@ -246,7 +246,7 @@ MenuItem\ {\ Identifier = SID_TITLE_DESCRIPTION_OBJECT; \ - HelpId = SID_TITLE_DESCRIPTION_OBJECT; \ + HelpId = CMD_SID_TITLE_DESCRIPTION_OBJECT; \ Text [ en-US ] = "Description...";\ }; @@ -263,14 +263,14 @@ MenuItem\ {\ Identifier = SID_MIRROR_VERTICAL ; \ - HelpId = SID_MIRROR_VERTICAL ; \ + HelpId = CMD_SID_MIRROR_VERTICAL ; \ Text [ en-US ] = "~Vertically" ; \ Text [ x-comment ] = " ";\ };\ MenuItem\ {\ Identifier = SID_MIRROR_HORIZONTAL ; \ - HelpId = SID_MIRROR_HORIZONTAL ; \ + HelpId = CMD_SID_MIRROR_HORIZONTAL ; \ Text [ en-US ] = "~Horizontal" ; \ Text [ x-comment ] = " ";\ };\ @@ -296,7 +296,7 @@ MenuItem\ {\ Identifier = SID_FRAME_UP ; \ - HelpId = SID_FRAME_UP ; \ + HelpId = CMD_SID_FRAME_UP ; \ /* ### ACHTUNG: Neuer Text in Resource? W~eiter nach vorn : Weiter nach vorn */\ Text [ en-US ] = "Bring ~Forward" ; \ Text [ x-comment ] = " ";\ @@ -304,7 +304,7 @@ MenuItem\ {\ Identifier = SID_FRAME_DOWN ; \ - HelpId = SID_FRAME_DOWN ; \ + HelpId = CMD_SID_FRAME_DOWN ; \ /* ### ACHTUNG: Neuer Text in Resource? Weiter ~nach hinten : Weiter nach hinten */\ Text [ en-US ] = "Send Back~ward" ; \ Text [ x-comment ] = " ";\ @@ -340,14 +340,14 @@ MenuItem\ {\ Identifier = SID_ANCHOR_PAGE ; \ - HelpId = SID_ANCHOR_PAGE ; \ + HelpId = CMD_SID_ANCHOR_PAGE ; \ Text [ en-US ] = "To P~age" ; \ Text [ x-comment ] = " ";\ };\ MenuItem\ {\ Identifier = SID_ANCHOR_CELL ; \ - HelpId = SID_ANCHOR_CELL ; \ + HelpId = CMD_SID_ANCHOR_CELL ; \ Text [ en-US ] = "To ~Cell" ; \ Text [ x-comment ] = " ";\ };\ @@ -360,7 +360,7 @@ MenuItem\ {\ Identifier = SID_OBJECT_ALIGN ; \ - HelpId = SID_OBJECT_ALIGN ; \ + HelpId = CMD_SID_OBJECT_ALIGN ; \ Text [ en-US ] = "A~lignment" ; \ SubMenu = Menu\ {\ @@ -409,150 +409,6 @@ String RID_DRAW_OBJECTBAR { Text [ en-US ] = "Drawing Object Bar" ; Text [ x-comment ] = " "; -}; -ToolBox RID_DRAW_OBJECTBAR -{ - HelpId = HID_SC_TOOLBOX_DRAW ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - LineSpacing = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_BEZIER_EDIT ; - HelpID = SID_BEZIER_EDIT ; - - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - // Linien - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_LINE ; - HelpId = SID_ATTRIBUTES_LINE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_LINEEND_STYLE ; - HelpID = SID_ATTR_LINEEND_STYLE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_LINE_STYLE ; - HelpId = SID_ATTR_LINE_STYLE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_LINE_WIDTH ; - HelpId = SID_ATTR_LINE_WIDTH ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_LINE_COLOR ; - HelpId = SID_ATTR_LINE_COLOR ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_AREA ; - HelpId = SID_ATTRIBUTES_AREA ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_FILL_STYLE ; - HelpId = SID_ATTR_FILL_STYLE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - // Rest - ToolBoxItem - { - Identifier = SID_OBJECT_ROTATE ; - HelpId = SID_OBJECT_ROTATE ; - }; - ToolBoxItem - { - Identifier = SID_ANCHOR_TOGGLE ; - HelpId = SID_ANCHOR_TOGGLE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_FRAME_TO_TOP ; - HelpId = SID_FRAME_TO_TOP ; - }; - ToolBoxItem - { - Identifier = SID_FRAME_TO_BOTTOM ; - HelpId = SID_FRAME_TO_BOTTOM ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HEAVEN ; - HelpID = SID_OBJECT_HEAVEN ; - - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HELL ; - HelpID = SID_OBJECT_HELL ; - - }; - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - - ToolBoxItem - { - Identifier = SID_GRID_VISIBLE; - HelpID = SID_GRID_VISIBLE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_GRID_USE; - HelpID = SID_GRID_USE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_HELPLINES_MOVE; - HelpID = SID_HELPLINES_MOVE; - Hide = TRUE; - }; - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN ; - HelpId = SID_OBJECT_ALIGN ; - }; - }; - Scroll = TRUE ; }; // // Text-Toolbox @@ -561,504 +417,6 @@ String RID_TEXT_TOOLBOX { Text [ en-US ] = "Text Object Bar" ; Text [ x-comment ] = " "; -}; -ToolBox RID_TEXT_TOOLBOX -{ - HelpId = HID_SC_TOOLBOX_DRTEXT ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONT ; - HelpId = SID_ATTR_CHAR_FONT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONTHEIGHT ; - HelpId = SID_ATTR_CHAR_FONTHEIGHT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_WEIGHT ; - HelpId = SID_ATTR_CHAR_WEIGHT ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_POSTURE ; - HelpId = SID_ATTR_CHAR_POSTURE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_UNDERLINE ; - HelpId = SID_ATTR_CHAR_UNDERLINE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ULINE_VAL_DOUBLE; - HelpId = SID_ULINE_VAL_DOUBLE; - AutoCheck = TRUE ; - Hide=TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_COLOR ; - HelpId = SID_ATTR_CHAR_COLOR ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_10 ; - HelpId = SID_ATTR_PARA_LINESPACE_10 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_15 ; - HelpId = SID_ATTR_PARA_LINESPACE_15 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_20 ; - HelpId = SID_ATTR_PARA_LINESPACE_20 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ALIGNLEFT ; - HelpId = SID_ATTR_PARA_ADJUST_LEFT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNCENTERHOR ; - HelpId = SID_ATTR_PARA_ADJUST_CENTER ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNRIGHT ; - HelpId = SID_ATTR_PARA_ADJUST_RIGHT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNBLOCK ; - HelpId = SID_ATTR_PARA_ADJUST_BLOCK ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; - RadioCheck = TRUE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; - RadioCheck = TRUE; - Hide = TRUE; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_SET_SUPER_SCRIPT ; - HelpID = SID_SET_SUPER_SCRIPT ; - }; - ToolBoxItem - { - Identifier = SID_SET_SUB_SCRIPT ; - HelpID = SID_SET_SUB_SCRIPT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_CHAR_DLG ; - HelpID = SID_CHAR_DLG ; - }; - ToolBoxItem - { - Identifier = SID_PARA_DLG ; - HelpID = SID_PARA_DLG ; - }; - }; - ItemList[ ar ] = - { - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONT ; - HelpId = SID_ATTR_CHAR_FONT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONTHEIGHT ; - HelpId = SID_ATTR_CHAR_FONTHEIGHT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_WEIGHT ; - HelpId = SID_ATTR_CHAR_WEIGHT ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_POSTURE ; - HelpId = SID_ATTR_CHAR_POSTURE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_UNDERLINE ; - HelpId = SID_ATTR_CHAR_UNDERLINE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ULINE_VAL_DOUBLE; - HelpId = SID_ULINE_VAL_DOUBLE; - AutoCheck = TRUE ; - Hide=TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_COLOR ; - HelpId = SID_ATTR_CHAR_COLOR ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_10 ; - HelpId = SID_ATTR_PARA_LINESPACE_10 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_15 ; - HelpId = SID_ATTR_PARA_LINESPACE_15 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_20 ; - HelpId = SID_ATTR_PARA_LINESPACE_20 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ALIGNRIGHT ; - HelpId = SID_ATTR_PARA_ADJUST_RIGHT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNCENTERHOR ; - HelpId = SID_ATTR_PARA_ADJUST_CENTER ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNLEFT ; - HelpId = SID_ATTR_PARA_ADJUST_LEFT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNBLOCK ; - HelpId = SID_ATTR_PARA_ADJUST_BLOCK ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; - RadioCheck = TRUE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; - RadioCheck = TRUE; - Hide = TRUE; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_SET_SUPER_SCRIPT ; - HelpID = SID_SET_SUPER_SCRIPT ; - }; - ToolBoxItem - { - Identifier = SID_SET_SUB_SCRIPT ; - HelpID = SID_SET_SUB_SCRIPT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_CHAR_DLG ; - HelpID = SID_CHAR_DLG ; - }; - ToolBoxItem - { - Identifier = SID_PARA_DLG ; - HelpID = SID_PARA_DLG ; - }; - }; - ItemList[ he ] = - { - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONT ; - HelpId = SID_ATTR_CHAR_FONT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_FONTHEIGHT ; - HelpId = SID_ATTR_CHAR_FONTHEIGHT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_WEIGHT ; - HelpId = SID_ATTR_CHAR_WEIGHT ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_POSTURE ; - HelpId = SID_ATTR_CHAR_POSTURE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_UNDERLINE ; - HelpId = SID_ATTR_CHAR_UNDERLINE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ULINE_VAL_DOUBLE; - HelpId = SID_ULINE_VAL_DOUBLE; - AutoCheck = TRUE ; - Hide=TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_CHAR_COLOR ; - HelpId = SID_ATTR_CHAR_COLOR ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_10 ; - HelpId = SID_ATTR_PARA_LINESPACE_10 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_15 ; - HelpId = SID_ATTR_PARA_LINESPACE_15 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LINESPACE_20 ; - HelpId = SID_ATTR_PARA_LINESPACE_20 ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ALIGNRIGHT ; - HelpId = SID_ATTR_PARA_ADJUST_RIGHT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNCENTERHOR ; - HelpId = SID_ATTR_PARA_ADJUST_CENTER ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNLEFT ; - HelpId = SID_ATTR_PARA_ADJUST_LEFT ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - ToolBoxItem - { - Identifier = SID_ALIGNBLOCK ; - HelpId = SID_ATTR_PARA_ADJUST_BLOCK ; - RadioCheck = TRUE ; - AutoCheck = TRUE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ATTR_PARA_RIGHT_TO_LEFT; - HelpID = SID_ATTR_PARA_RIGHT_TO_LEFT; - RadioCheck = TRUE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_ATTR_PARA_LEFT_TO_RIGHT; - HelpID = SID_ATTR_PARA_LEFT_TO_RIGHT; - RadioCheck = TRUE; - Hide = TRUE; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_SET_SUPER_SCRIPT ; - HelpID = SID_SET_SUPER_SCRIPT ; - }; - ToolBoxItem - { - Identifier = SID_SET_SUB_SCRIPT ; - HelpID = SID_SET_SUB_SCRIPT ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - HelpID = SID_TEXTDIRECTION_LEFT_TO_RIGHT ; - }; - ToolBoxItem - { - Identifier = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - HelpID = SID_TEXTDIRECTION_TOP_TO_BOTTOM ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_CHAR_DLG ; - HelpID = SID_CHAR_DLG ; - }; - ToolBoxItem - { - Identifier = SID_PARA_DLG ; - HelpID = SID_PARA_DLG ; - }; - }; }; // // Graphics toolbox @@ -1066,182 +424,6 @@ ToolBox RID_TEXT_TOOLBOX String RID_GRAPHIC_OBJECTBAR { Text [ en-US ] = "Graphics Object Bar"; -}; -ToolBox RID_GRAPHIC_OBJECTBAR -{ - HelpId = HID_SC_TOOLBOX_GRAPHIC ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_GRFFILTER; - HelpID = SID_GRFFILTER; - DropDown = TRUE ; - Checkable = FALSE ; - RadioCheck = FALSE ; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_MODE; - HelpID = SID_ATTR_GRAF_MODE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_RED; - HelpID = SID_ATTR_GRAF_RED; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_GREEN; - HelpID = SID_ATTR_GRAF_GREEN; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_BLUE; - HelpID = SID_ATTR_GRAF_BLUE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_LUMINANCE; - HelpID = SID_ATTR_GRAF_LUMINANCE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_CONTRAST; - HelpID = SID_ATTR_GRAF_CONTRAST; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_GAMMA; - HelpID = SID_ATTR_GRAF_GAMMA; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_TRANSPARENCE; - HelpID = SID_ATTR_GRAF_TRANSPARENCE; - }; - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - - // #i25616# - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_LINE; - HelpID = SID_ATTRIBUTES_LINE; - }; - ToolBoxItem - { - Identifier = SID_ATTRIBUTES_AREA; - HelpID = SID_ATTRIBUTES_AREA; - }; - ToolBoxItem - { - Identifier = SID_ATTR_FILL_SHADOW; - HelpID = SID_ATTR_FILL_SHADOW; - }; - ToolBoxItem - { - Type = TOOLBOXITEM_SEPARATOR ; - }; - - ToolBoxItem - { - Identifier = SID_ATTR_GRAF_CROP; - HelpID = SID_ATTR_GRAF_CROP; - }; - - // copied from the "normal" drawing toolbar: - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_ANCHOR_TOGGLE ; - HelpId = SID_ANCHOR_TOGGLE ; - }; - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_FRAME_TO_TOP ; - HelpId = SID_FRAME_TO_TOP ; - }; - ToolBoxItem - { - Identifier = SID_FRAME_TO_BOTTOM ; - HelpId = SID_FRAME_TO_BOTTOM ; - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HEAVEN ; - HelpID = SID_OBJECT_HEAVEN ; - - }; - ToolBoxItem - { - Identifier = SID_OBJECT_HELL ; - HelpID = SID_OBJECT_HELL ; - - }; - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - - ToolBoxItem - { - Identifier = SID_GRID_VISIBLE; - HelpID = SID_GRID_VISIBLE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_GRID_USE; - HelpID = SID_GRID_USE; - Hide = TRUE; - }; - ToolBoxItem - { - Identifier = SID_HELPLINES_MOVE; - HelpID = SID_HELPLINES_MOVE; - Hide = TRUE; - }; - - //--------------------------------------------- - ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; }; - //--------------------------------------------- - ToolBoxItem - { - Identifier = SID_OBJECT_ALIGN ; - HelpId = SID_OBJECT_ALIGN ; - }; - }; }; // // Popup-Menues --------------------------------------------------------------------- @@ -1413,36 +595,6 @@ Menu RID_POPUP_MEDIA }; }; -ToolBox RID_MEDIA_OBJECTBAR -{ - //HelpId = HID_SC_TOOLBOX_MEDIA ; - LineSpacing = TRUE ; - Dockable = TRUE ; - Moveable = TRUE ; - Sizeable = TRUE ; - Closeable = TRUE ; - Zoomable = TRUE ; - Scroll = TRUE ; - Customize = TRUE ; - HideWhenDeactivate = TRUE ; - Border = TRUE ; - SVLook = TRUE ; - Size = MAP_APPFONT ( 0 , 0 ) ; - Align = BOXALIGN_TOP ; - MenuStrings = TRUE ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_AVMEDIA_TOOLBOX; - HelpID = SID_AVMEDIA_TOOLBOX; - DropDown = FALSE ; - Checkable = FALSE ; - RadioCheck = FALSE ; - }; - }; -}; - // // Ole-Objekt // diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 6c89c43b3a51..00ebb8a7c480 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -59,7 +59,7 @@ public: /** Sets dialog title, fixed text for listbox and help IDs. */ void SetDescription( const String& rTitle, const String& rFixedText, - ULONG nDlgHelpId, ULONG nLbHelpId ); + const ::rtl::OString& nDlgHelpId, const rtl::OString& nLbHelpId ); /** Inserts a string into the ListBox. */ void Insert( const String& rString, BOOL bSelected ); diff --git a/sc/source/ui/inc/strindlg.hxx b/sc/source/ui/inc/strindlg.hxx index f84d8e4e2b51..b5dd140a4109 100644 --- a/sc/source/ui/inc/strindlg.hxx +++ b/sc/source/ui/inc/strindlg.hxx @@ -46,7 +46,7 @@ public: const String& rTitle, const String& rEditTitle, const String& rDefault, - ULONG nHelpId ); + const rtl::OString& sHelpId, const rtl::OString& sEditHelpId ); ~ScStringInputDlg(); void GetInputString( String& rString ) const; diff --git a/sc/source/ui/miscdlgs/acredlin.src b/sc/source/ui/miscdlgs/acredlin.src index cad4747acb63..87bec60a63b5 100644 --- a/sc/source/ui/miscdlgs/acredlin.src +++ b/sc/source/ui/miscdlgs/acredlin.src @@ -29,7 +29,7 @@ ModelessDialog RID_SCDLG_CHANGES { OutputSize = TRUE ; - HelpId = FID_CHG_ACCEPT ; + HelpId = CMD_FID_CHG_ACCEPT ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 282 , 142 ) ; diff --git a/sc/source/ui/miscdlgs/anyrefdg.cxx b/sc/source/ui/miscdlgs/anyrefdg.cxx index 19aedcece154..4c544954b2bc 100644 --- a/sc/source/ui/miscdlgs/anyrefdg.cxx +++ b/sc/source/ui/miscdlgs/anyrefdg.cxx @@ -690,13 +690,10 @@ ScRefHandler::ScRefHandler( Window &rWindow, SfxBindings* pB/*, SfxChildWindow* pActiveWin(NULL) { m_aHelper.SetWindow(/*this*/&m_rWindow); - // FIXME: HELPID - #if 0 - if(m_rWindow.GetHelpId()==0) //Hack, da im SfxModelessDialog die HelpId + if(m_rWindow.GetHelpId().getLength()==0) //Hack, da im SfxModelessDialog die HelpId m_rWindow.SetHelpId(m_rWindow.GetUniqueId()); //fuer einen ModelessDialog entfernt und //in eine UniqueId gewandelt wird, machen //wir das an dieser Stelle rueckgaengig. - #endif aTimer.SetTimeout(200); aTimer.SetTimeoutHdl(LINK( this, ScRefHandler, UpdateFocusHdl)); diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src index a244a3e2a44e..6a3c4ce1da5e 100644 --- a/sc/source/ui/miscdlgs/highred.src +++ b/sc/source/ui/miscdlgs/highred.src @@ -29,7 +29,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES { OutputSize = TRUE ; - HelpId = FID_CHG_ACCEPT ; + HelpId = CMD_FID_CHG_ACCEPT ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 318 , 148 ) ; diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index f01779730fbf..48e33622e99f 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -76,8 +76,7 @@ ScLinkedAreaDlg::ScLinkedAreaDlg( Window* pParent ) : { FreeResource(); - // FIXME: HELPID - aCbUrl.SetHelpId( ""/*HID_SCDLG_LINKAREAURL*/ ); // SvtURLBox ctor always sets SID_OPENURL + aCbUrl.SetHelpId( HID_SCDLG_LINKAREAURL ); // SvtURLBox ctor always sets SID_OPENURL aCbUrl.SetSelectHdl( LINK( this, ScLinkedAreaDlg, FileHdl ) ); aBtnBrowse.SetClickHdl( LINK( this, ScLinkedAreaDlg, BrowseHdl ) ); aLbRanges.SetSelectHdl( LINK( this, ScLinkedAreaDlg, RangeHdl ) ); diff --git a/sc/source/ui/miscdlgs/scuiautofmt.cxx b/sc/source/ui/miscdlgs/scuiautofmt.cxx index b2f837db4cb4..1b14b15e24c8 100644 --- a/sc/source/ui/miscdlgs/scuiautofmt.cxx +++ b/sc/source/ui/miscdlgs/scuiautofmt.cxx @@ -262,7 +262,7 @@ IMPL_LINK( ScAutoFormatDlg, AddHdl, void *, EMPTYARG ) aStrTitle, aStrLabel, aFormatName, - HID_SC_ADD_AUTOFMT ); + HID_SC_ADD_AUTOFMT, HID_SC_AUTOFMT_NAME ); if ( pDlg->Execute() == RET_OK ) { @@ -369,7 +369,7 @@ IMPL_LINK( ScAutoFormatDlg, RenameHdl, void *, EMPTYARG ) aStrRename, aStrLabel, aFormatName, - HID_SC_REN_AFMT_DLG ); + HID_SC_REN_AFMT_DLG, HID_SC_REN_AFMT_NAME ); if( pDlg->Execute() == RET_OK ) { BOOL bFmtRenamed = FALSE; diff --git a/sc/source/ui/miscdlgs/sharedocdlg.src b/sc/source/ui/miscdlgs/sharedocdlg.src index fe55ee58c8e4..05be4a5506dc 100644 --- a/sc/source/ui/miscdlgs/sharedocdlg.src +++ b/sc/source/ui/miscdlgs/sharedocdlg.src @@ -30,7 +30,7 @@ ModalDialog RID_SCDLG_SHAREDOCUMENT { OutputSize = TRUE ; - HelpId = SID_SHARE_DOC ; + HelpId = CMD_SID_SHARE_DOC ; SVLook = TRUE ; Size = MAP_APPFONT ( 204 , 186 ) ; Text [ en-US ] = "Share Document" ; diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 46807c6754a7..99f3ba5ad444 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -62,16 +62,12 @@ ScShowTabDlg::ScShowTabDlg( Window* pParent ) : void ScShowTabDlg::SetDescription( const String& rTitle, const String& rFixedText, - ULONG nDlgHelpId, ULONG nLbHelpId ) + const rtl::OString& rDlgHelpId, const rtl::OString& sLbHelpId ) { SetText( rTitle ); aFtLbTitle.SetText( rFixedText ); - // FIXME: HELPID - SetHelpId( ""/*nDlgHelpId*/ ); - (void)nDlgHelpId; - // FIXME: HELPID - aLb.SetHelpId( ""/*nLbHelpId*/ ); - (void)nLbHelpId; + SetHelpId( rDlgHelpId ); + aLb.SetHelpId( sLbHelpId ); } void ScShowTabDlg::Insert( const String& rString, BOOL bSelected ) diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 8b209665606c..418a88b3cbea 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -146,8 +146,7 @@ ScSolverOptionsDialog::ScSolverOptionsDialog( Window* pParent, maBtnEdit.SetClickHdl( LINK( this, ScSolverOptionsDialog, ButtonHdl ) ); maLbSettings.SetWindowBits( WB_CLIPCHILDREN|WB_FORCE_MAKEVISIBLE ); - // FIXME: HELPID - maLbSettings.SetHelpId( ""/*HID_SC_SOLVEROPTIONS_LB*/ ); + maLbSettings.SetHelpId( HID_SC_SOLVEROPTIONS_LB ); maLbSettings.SetHighlightRange(); maLbSettings.SetSelectHdl( LINK( this, ScSolverOptionsDialog, SettingsSelHdl ) ); diff --git a/sc/source/ui/miscdlgs/strindlg.cxx b/sc/source/ui/miscdlgs/strindlg.cxx index 1d625d81cf7c..db042d9b3a6d 100644 --- a/sc/source/ui/miscdlgs/strindlg.cxx +++ b/sc/source/ui/miscdlgs/strindlg.cxx @@ -55,7 +55,7 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, const String& rTitle, const String& rEditTitle, const String& rDefault, - ULONG nHelpId ) : + const rtl::OString& sHelpId, const rtl::OString& sEditHelpId ) : ModalDialog ( pParent, ScResId( RID_SCDLG_STRINPUT ) ), // aFtEditTitle ( this, ScResId( FT_LABEL ) ), @@ -64,37 +64,12 @@ ScStringInputDlg::ScStringInputDlg( Window* pParent, aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ) { - // FIXME: HELPID - SetHelpId( ""/*nHelpId*/ ); + SetHelpId( sHelpId ); SetText( rTitle ); aFtEditTitle.SetText( rEditTitle ); aEdInput.SetText( rDefault ); aEdInput.SetSelection(Selection(SELECTION_MIN, SELECTION_MAX)); - - // HelpId for Edit different for different uses - - if ( nHelpId == FID_TAB_APPEND ) - // FIXME: HELPID - aEdInput.SetHelpId( ""/*HID_SC_APPEND_NAME*/ ); - else if ( nHelpId == FID_TAB_RENAME ) - // FIXME: HELPID - aEdInput.SetHelpId( ""/*HID_SC_RENAME_NAME*/ ); - else if ( nHelpId == HID_SC_ADD_AUTOFMT ) - // FIXME: HELPID - aEdInput.SetHelpId( ""/*HID_SC_AUTOFMT_NAME*/ ); - else if ( nHelpId == HID_SC_REN_AFMT_DLG ) - // FIXME: HELPID - aEdInput.SetHelpId( ""/*HID_SC_REN_AFMT_NAME*/ ); - else if ( nHelpId == SID_RENAME_OBJECT ) - // FIXME: HELPID - aEdInput.SetHelpId( ""/* HID_SC_RENAME_OBJECT*/ ); - // #i68101# - else if ( nHelpId == SID_TITLE_DESCRIPTION_OBJECT ) - // FIXME: HELPID - aEdInput.SetHelpId( ""/*HID_SC_TITLE_DESCRIPTION_OBJECT*/ ); - else - DBG_ERRORFILE( "unknown ID" ); - + aEdInput.SetHelpId( sEditHelpId ); //------------- FreeResource(); } diff --git a/sc/source/ui/miscdlgs/warnbox.cxx b/sc/source/ui/miscdlgs/warnbox.cxx index b03db3c35286..24b2e62a1c78 100644 --- a/sc/source/ui/miscdlgs/warnbox.cxx +++ b/sc/source/ui/miscdlgs/warnbox.cxx @@ -70,8 +70,7 @@ void ScCbWarningBox::DisableDialog() ScReplaceWarnBox::ScReplaceWarnBox( Window* pParent ) : ScCbWarningBox( pParent, String( ScResId( STR_REPLCELLSWARN ) ), true ) { - // FIXME: HELPID - SetHelpId( ""/*HID_SC_REPLCELLSWARN*/ ); + SetHelpId( HID_SC_REPLCELLSWARN ); } bool ScReplaceWarnBox::IsDialogEnabled() diff --git a/sc/source/ui/navipi/scenwnd.cxx b/sc/source/ui/navipi/scenwnd.cxx index 38ff9760b742..e7dff0bf37c7 100644 --- a/sc/source/ui/navipi/scenwnd.cxx +++ b/sc/source/ui/navipi/scenwnd.cxx @@ -225,10 +225,8 @@ ScScenarioWindow::ScScenarioWindow( Window* pParent,const String& aQH_List, aEdComment.SetFont( aFont ); aEdComment.SetMaxTextLen( 512 ); aLbScenario.SetPosPixel( Point(0,0) ); - // FIXME: HELPID - aLbScenario.SetHelpId(""/*HID_SC_SCENWIN_TOP*/); - // FIXME: HELPID - aEdComment.SetHelpId(""/*HID_SC_SCENWIN_BOTTOM*/); + aLbScenario.SetHelpId(HID_SC_SCENWIN_TOP); + aEdComment.SetHelpId(HID_SC_SCENWIN_BOTTOM); aLbScenario.Show(); aEdComment.Show(); diff --git a/sc/source/ui/pagedlg/hfedtdlg.src b/sc/source/ui/pagedlg/hfedtdlg.src index 1445636e8cc6..7e70dd9bfe66 100644 --- a/sc/source/ui/pagedlg/hfedtdlg.src +++ b/sc/source/ui/pagedlg/hfedtdlg.src @@ -70,13 +70,13 @@ TabDialog RID_SCDLG_HFED_HEADER { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; }; }; @@ -101,13 +101,13 @@ TabDialog RID_SCDLG_HFED_FOOTER { Identifier = 1 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; PageItem { Identifier = 2 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; @@ -135,25 +135,25 @@ TabDialog RID_SCDLG_HFEDIT_ALL { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; PageItem { Identifier = 3 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; PageItem { Identifier = 4 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; @@ -178,19 +178,19 @@ TabDialog RID_SCDLG_HFEDIT_SHDR { Identifier = 1 ; HEADER - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; PageItem { Identifier = 3 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; @@ -215,19 +215,19 @@ TabDialog RID_SCDLG_HFEDIT_SFTR { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; PageItem { Identifier = 3 ; FOOTER - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; }; }; @@ -252,13 +252,13 @@ TabDialog RID_SCDLG_HFEDIT { Identifier = 1 ; HEADER - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; FOOTER - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; }; }; @@ -283,13 +283,13 @@ TabDialog RID_SCDLG_HFEDIT_HEADER { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; PageItem { Identifier = 2 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; }; }; @@ -314,13 +314,13 @@ TabDialog RID_SCDLG_HFEDIT_FOOTER { Identifier = 1 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; PageItem { Identifier = 2 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; @@ -345,7 +345,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTHEADER { Identifier = 1 ; HEADER_RIGHT - PageResID = HID_SCPAGE_HFED_HR ; + PageResID = RID_SCPAGE_HFED_HR ; }; }; }; @@ -370,7 +370,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTHEADER { Identifier = 1 ; HEADER_LEFT - PageResID = HID_SCPAGE_HFED_HL ; + PageResID = RID_SCPAGE_HFED_HL ; }; }; }; @@ -395,7 +395,7 @@ TabDialog RID_SCDLG_HFEDIT_RIGHTFOOTER { Identifier = 1 ; FOOTER_RIGHT - PageResID = HID_SCPAGE_HFED_FR ; + PageResID = RID_SCPAGE_HFED_FR ; }; }; }; @@ -420,7 +420,7 @@ TabDialog RID_SCDLG_HFEDIT_LEFTFOOTER { Identifier = 1 ; FOOTER_LEFT - PageResID = HID_SCPAGE_HFED_FL ; + PageResID = RID_SCPAGE_HFED_FL ; }; }; }; diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 86f06246794e..de647cf5f82a 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -98,11 +98,9 @@ ScHFPage::ScHFPage( Window* pParent, USHORT nResId, aTurnOnBox.SetClickHdl ( LINK( this, ScHFPage, TurnOnHdl ) ); if ( nId == SID_ATTR_PAGE_HEADERSET ) - // FIXME: HELPID - aBtnEdit.SetHelpId( ""/*HID_SC_HEADER_EDIT*/ ); + aBtnEdit.SetHelpId( HID_SC_HEADER_EDIT ); else - // FIXME: HELPID - aBtnEdit.SetHelpId( ""/*HID_SC_FOOTER_EDIT*/ ); + aBtnEdit.SetHelpId( HID_SC_FOOTER_EDIT ); } //------------------------------------------------------------------ diff --git a/sc/source/ui/src/autofmt.src b/sc/source/ui/src/autofmt.src index cb56f6ac85a4..7846b79cc32f 100644 --- a/sc/source/ui/src/autofmt.src +++ b/sc/source/ui/src/autofmt.src @@ -30,7 +30,7 @@ ModalDialog RID_SCDLG_AUTOFORMAT { OutputSize = TRUE ; - HelpId = SID_AUTOFORMAT ; + HelpId = CMD_SID_AUTOFORMAT ; SVLook = TRUE ; Size = MAP_APPFONT ( 312 , 121 ) ; /* ### ACHTUNG: Neuer Text in Resource? AutoFormat : Autoformat */ diff --git a/sc/source/ui/src/dbnamdlg.src b/sc/source/ui/src/dbnamdlg.src index 50152d95d9d5..0ca03ec8b78b 100644 --- a/sc/source/ui/src/dbnamdlg.src +++ b/sc/source/ui/src/dbnamdlg.src @@ -28,7 +28,7 @@ ModelessDialog RID_SCDLG_DBNAMES { OutputSize = TRUE ; - HelpId = SID_DEFINE_DBNAME ; + HelpId = CMD_SID_DEFINE_DBNAME ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 222 , 142 ) ; diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src index 52ce38db1516..7be3461cf4af 100644 --- a/sc/source/ui/src/filter.src +++ b/sc/source/ui/src/filter.src @@ -28,7 +28,7 @@ ModelessDialog RID_SCDLG_FILTER { OutputSize = TRUE ; - HelpId = SID_FILTER ; + HelpId = CMD_SID_FILTER ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 279 , 121 ) ; @@ -423,7 +423,7 @@ ModelessDialog RID_SCDLG_FILTER ModelessDialog RID_SCDLG_SPEC_FILTER { OutputSize = TRUE ; - HelpId = SID_SPECIAL_FILTER ; + HelpId = CMD_SID_SPECIAL_FILTER ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 278 , 83 ) ; diff --git a/sc/source/ui/src/hdrcont.src b/sc/source/ui/src/hdrcont.src index e4a82d38ec98..c4edc13e2f6f 100644 --- a/sc/source/ui/src/hdrcont.src +++ b/sc/source/ui/src/hdrcont.src @@ -32,7 +32,7 @@ MenuItem\ {\ Identifier = FID_CELL_FORMAT ; \ - HelpId = FID_CELL_FORMAT ; \ + HelpId = CMD_FID_CELL_FORMAT ; \ Text [ en-US ] = "~Format Cells..." ; \ }; @@ -41,20 +41,20 @@ MenuItem\ {\ Identifier = SID_CUT ; \ - HelpId = SID_CUT ; \ + HelpId = CMD_SID_CUT ; \ Text [ en-US ] = "Cu~t" ; \ /* ### ACHTUNG: Neuer Text in Resource? Die Selektion in die Zwischenablage kopieren und löschen : Die Selektion in die Zwischenablage kopieren und l÷schen */\ };\ MenuItem\ {\ Identifier = SID_COPY ; \ - HelpId = SID_COPY ; \ + HelpId = CMD_SID_COPY ; \ Text [ en-US ] = "~Copy" ; \ };\ MenuItem\ {\ Identifier = SID_PASTE ; \ - HelpId = SID_PASTE ; \ + HelpId = CMD_SID_PASTE ; \ /* ### ACHTUNG: Neuer Text in Resource? Einfügen : Einf³gen */\ Text [ en-US ] = "~Paste" ; \ /* ### ACHTUNG: Neuer Text in Resource? Den Inhalt der Zwischenablage einfügen : Den Inhalt der Zwischenablage einf³gen */\ @@ -73,14 +73,14 @@ Menu RID_POPUP_ROWHEADER MenuItem { Identifier = FID_ROW_HEIGHT ; - HelpId = FID_ROW_HEIGHT ; + HelpId = CMD_FID_ROW_HEIGHT ; /* ### ACHTUNG: Neuer Text in Resource? Zeilenhöhe... : Zeilenh÷he... */ Text [ en-US ] = "Row Hei~ght..." ; }; MenuItem { Identifier = FID_ROW_OPT_HEIGHT ; - HelpId = FID_ROW_OPT_HEIGHT ; + HelpId = CMD_FID_ROW_OPT_HEIGHT ; /* ### ACHTUNG: Neuer Text in Resource? Optimale Zeilenhöhe... : Optimale Zeilenh÷he... */ Text [ en-US ] = "Optimal ~Row Height..." ; /* ### ACHTUNG: Neuer Text in Resource? Optimale Zeilenhöhe einstellen : Optimale Zeilenh÷he einstellen */ @@ -91,7 +91,7 @@ Menu RID_POPUP_ROWHEADER MenuItem { Identifier = FID_INS_ROW ; - HelpId = FID_INS_ROW ; + HelpId = CMD_FID_INS_ROW ; /* ### ACHTUNG: Neuer Text in Resource? Zeilen einfügen : Zeilen einf³gen */ Text [ en-US ] = "~Insert Rows" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Zeilen einfügen : Ganze Zeilen einf³gen */ @@ -99,7 +99,7 @@ Menu RID_POPUP_ROWHEADER MenuItem { Identifier = SID_DEL_ROWS ; - HelpId = SID_DEL_ROWS ; + HelpId = CMD_SID_DEL_ROWS ; /* ### ACHTUNG: Neuer Text in Resource? Zeilen löschen : Zeilen l÷schen */ Text [ en-US ] = "~Delete Rows" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Zeilen löschen : Ganze Zeilen l÷schen */ @@ -107,7 +107,7 @@ Menu RID_POPUP_ROWHEADER MenuItem { Identifier = SID_DELETE ; - HelpId = SID_DELETE ; + HelpId = CMD_SID_DELETE ; /* ### ACHTUNG: Neuer Text in Resource? Inhalte l~öschen... : Inhalte l~÷schen... */ Text [ en-US ] = "De~lete Contents..." ; /* ### ACHTUNG: Neuer Text in Resource? Ausgewählte Inhalte löschen (Formeln, Formate etc.) : Ausgewõhlte Inhalte l÷schen (Formeln, Formate etc.) */ @@ -118,13 +118,13 @@ Menu RID_POPUP_ROWHEADER MenuItem { Identifier = FID_ROW_HIDE ; - HelpId = FID_ROW_HIDE ; + HelpId = CMD_FID_ROW_HIDE ; Text [ en-US ] = "~Hide" ; }; MenuItem { Identifier = FID_ROW_SHOW ; - HelpId = FID_ROW_SHOW ; + HelpId = CMD_FID_ROW_SHOW ; Text [ en-US ] = "~Show" ; }; //------------------------------ @@ -134,7 +134,7 @@ Menu RID_POPUP_ROWHEADER MenuItem { Identifier = SID_PASTE_SPECIAL ; - HelpId = SID_PASTE_SPECIAL ; + HelpId = CMD_SID_PASTE_SPECIAL ; Text [ en-US ] = "P~aste Special..." ; }; }; @@ -153,14 +153,14 @@ Menu RID_POPUP_COLHEADER MenuItem { Identifier = FID_COL_WIDTH ; - HelpId = FID_COL_WIDTH ; + HelpId = CMD_FID_COL_WIDTH ; Text [ en-US ] = "Col~umn Width..." ; /* ### ACHTUNG: Neuer Text in Resource? Spaltenbreite ändern : Spaltenbreite õndern */ }; MenuItem { Identifier = FID_COL_OPT_WIDTH ; - HelpId = FID_COL_OPT_WIDTH ; + HelpId = CMD_FID_COL_OPT_WIDTH ; Text [ en-US ] = "O~ptimal Column Width..." ; }; //------------------------------ @@ -169,7 +169,7 @@ Menu RID_POPUP_COLHEADER MenuItem { Identifier = FID_INS_COLUMN ; - HelpId = FID_INS_COLUMN ; + HelpId = CMD_FID_INS_COLUMN ; /* ### ACHTUNG: Neuer Text in Resource? Spalten einfügen : Spalten einf³gen */ Text [ en-US ] = "~Insert Columns" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Spalten einfügen : Ganze Spalten einf³gen */ @@ -177,7 +177,7 @@ Menu RID_POPUP_COLHEADER MenuItem { Identifier = SID_DEL_COLS ; - HelpId = SID_DEL_COLS ; + HelpId = CMD_SID_DEL_COLS ; /* ### ACHTUNG: Neuer Text in Resource? Spalten löschen : Spalten l÷schen */ Text [ en-US ] = "~Delete Columns" ; /* ### ACHTUNG: Neuer Text in Resource? Ganze Spalten löschen : Ganze Spalten l÷schen */ @@ -185,7 +185,7 @@ Menu RID_POPUP_COLHEADER MenuItem { Identifier = SID_DELETE ; - HelpId = SID_DELETE ; + HelpId = CMD_SID_DELETE ; /* ### ACHTUNG: Neuer Text in Resource? Inhalte l~öschen... : Inhalte l~÷schen... */ Text [ en-US ] = "D~elete Contents..." ; /* ### ACHTUNG: Neuer Text in Resource? Ausgewählte Inhalte löschen (Formeln, Formate etc.) : Ausgewõhlte Inhalte l÷schen (Formeln, Formate etc.) */ @@ -196,13 +196,13 @@ Menu RID_POPUP_COLHEADER MenuItem { Identifier = FID_COL_HIDE ; - HelpId = FID_COL_HIDE ; + HelpId = CMD_FID_COL_HIDE ; Text [ en-US ] = "~Hide" ; }; MenuItem { Identifier = FID_COL_SHOW ; - HelpId = FID_COL_SHOW ; + HelpId = CMD_FID_COL_SHOW ; Text [ en-US ] = "~Show" ; }; //------------------------------ @@ -212,7 +212,7 @@ Menu RID_POPUP_COLHEADER MenuItem { Identifier = SID_PASTE_SPECIAL ; - HelpId = SID_PASTE_SPECIAL ; + HelpId = CMD_SID_PASTE_SPECIAL ; Text [ en-US ] = "Paste ~Special..." ; }; }; diff --git a/sc/source/ui/src/miscdlgs.src b/sc/source/ui/src/miscdlgs.src index 8c9279a602c1..efa6760d5079 100644 --- a/sc/source/ui/src/miscdlgs.src +++ b/sc/source/ui/src/miscdlgs.src @@ -30,7 +30,7 @@ ModalDialog RID_SCDLG_DELCELL { OutputSize = TRUE ; - HelpId = FID_DELETE_CELL ; + HelpId = CMD_FID_DELETE_CELL ; SVLook = TRUE ; Size = MAP_APPFONT ( 191 , 70 ) ; Text [ en-US ] = "Delete Cells" ; @@ -93,7 +93,7 @@ ModalDialog RID_SCDLG_DELCELL ModalDialog RID_SCDLG_INSCELL { OutputSize = TRUE ; - HelpId = FID_INS_CELL ; + HelpId = CMD_FID_INS_CELL ; SVLook = TRUE ; Size = MAP_APPFONT ( 191 , 70 ) ; Text [ en-US ] = "Insert Cells" ; @@ -162,7 +162,7 @@ Bitmap RID_SCTEAMDLGBMP1 ModalDialog RID_SCDLG_DELCONT { OutputSize = TRUE ; - HelpId = SID_DELETE ; + HelpId = CMD_SID_DELETE ; SVLook = TRUE ; Size = MAP_APPFONT ( 161 , 130 ) ; Text [ en-US ] = "Delete Contents" ; @@ -255,7 +255,7 @@ ModalDialog RID_SCDLG_DELCONT ModalDialog RID_SCDLG_INSCONT { OutputSize = TRUE ; - HelpId = FID_INS_CELL_CONTENTS ; + HelpId = CMD_FID_INS_CELL_CONTENTS ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 187 ) ; Text [ en-US ] = "Paste Special" ; @@ -440,7 +440,7 @@ ModalDialog RID_SCDLG_INSCONT ModalDialog RID_SCDLG_MOVETAB { OutputSize = TRUE ; - HelpId = FID_TAB_MOVE ; + HelpId = CMD_FID_TAB_MOVE ; SVLook = TRUE ; Size = MAP_APPFONT ( 168 , 130 ) ; Text [ en-US ] = "Move/Copy Sheet" ; @@ -601,7 +601,7 @@ ModalDialog RID_SCDLG_COL_MAN { Text [ en-US ] = "Column Width" ; - HelpId = FID_COL_WIDTH ; + HelpId = CMD_FID_COL_WIDTH ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 190 , 63 ) ; @@ -655,7 +655,7 @@ ModalDialog RID_SCDLG_COL_OPT { Text [ en-US ] = "Optimal Column Width" ; - HelpId = FID_COL_OPT_WIDTH ; + HelpId = CMD_FID_COL_OPT_WIDTH ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 190 , 63 ) ; @@ -710,7 +710,7 @@ ModalDialog RID_SCDLG_ROW_MAN { Text [ en-US ] = "Row Height" ; - HelpId = FID_ROW_HEIGHT ; + HelpId = CMD_FID_ROW_HEIGHT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 190 , 63 ) ; @@ -765,7 +765,7 @@ ModalDialog RID_SCDLG_ROW_OPT { Text [ en-US ] = "Optimal Row Height" ; - HelpId = FID_ROW_OPT_HEIGHT ; + HelpId = CMD_FID_ROW_OPT_HEIGHT ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 190 , 63 ) ; @@ -821,7 +821,7 @@ ModalDialog RID_SCDLG_ROW_OPT ModalDialog RID_SCDLG_SELECTDB { - HelpId = SID_SELECT_DB ; + HelpId = CMD_SID_SELECT_DB ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 168 , 100 ) ; @@ -866,7 +866,7 @@ ModalDialog RID_SCDLG_SELECTDB ModalDialog RID_SCDLG_SHOW_TAB { - HelpId = FID_TABLE_SHOW ; + HelpId = CMD_FID_TABLE_SHOW ; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 168 , 100 ) ; @@ -913,7 +913,7 @@ ModalDialog RID_SCDLG_SHOW_TAB ModalDialog RID_SCDLG_FILLSERIES { OutputSize = TRUE ; - HelpId = FID_FILL_SERIES ; + HelpId = CMD_FID_FILL_SERIES ; SVLook = TRUE ; Size = MAP_APPFONT ( 290 , 122 ) ; Text [ en-US ] = "Fill Series" ; @@ -1165,8 +1165,8 @@ ModalDialog RID_SCDLG_GROUP }; // Ableitungen -ModalDialog RID_SCDLG_GRP_MAKE < RID_SCDLG_GROUP { HelpId = SID_OUTLINE_MAKE ; }; -ModalDialog RID_SCDLG_GRP_KILL < RID_SCDLG_GROUP { HelpId = SID_OUTLINE_REMOVE ; }; +ModalDialog RID_SCDLG_GRP_MAKE < RID_SCDLG_GROUP { HelpId = CMD_SID_OUTLINE_MAKE ; }; +ModalDialog RID_SCDLG_GRP_KILL < RID_SCDLG_GROUP { HelpId = CMD_SID_OUTLINE_REMOVE ; }; // RID_SCDLG_COLORROW wird nur in der Optionen-Sortierlisten-Seite benutzt @@ -1221,7 +1221,7 @@ ModalDialog RID_SCDLG_NAMES_CREATE { OutputSize = TRUE ; SVLook = TRUE ; - HelpID = FID_USE_NAME ; + HelpID = CMD_FID_USE_NAME ; Size = MAP_APPFONT ( 174 , 72 ) ; Moveable = TRUE ; CheckBox BTN_TOP @@ -1283,7 +1283,7 @@ ModalDialog RID_SCDLG_NAMES_CREATE ModalDialog RID_SCDLG_NAMES_PASTE { OutputSize = TRUE ; - HelpId = FID_INSERT_NAME ; + HelpId = CMD_FID_INSERT_NAME ; SVLook = TRUE ; Size = MAP_APPFONT ( 228 , 85 ) ; Moveable = TRUE ; diff --git a/sc/source/ui/src/namedlg.src b/sc/source/ui/src/namedlg.src index 38e1271b2959..b7a23fb69b65 100644 --- a/sc/source/ui/src/namedlg.src +++ b/sc/source/ui/src/namedlg.src @@ -29,7 +29,7 @@ ModelessDialog RID_SCDLG_NAMES { OutputSize = TRUE ; - HelpId = FID_DEFINE_NAME ; + HelpId = CMD_FID_DEFINE_NAME ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 222 , 142 ) ; diff --git a/sc/source/ui/src/opredlin.src b/sc/source/ui/src/opredlin.src index a8c2daf4892a..a0258fc0c029 100644 --- a/sc/source/ui/src/opredlin.src +++ b/sc/source/ui/src/opredlin.src @@ -35,7 +35,7 @@ TabPage RID_SCPAGE_OPREDLINE Size = MAP_APPFONT ( 260 , 185 ) ; FixedText FT_CONTENT { - HelpID = 1 ; + HelpID = HID_SCPAGE_OPREDLINBE_FT_CONTENT ; Pos = MAP_APPFONT ( 12 , 15 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Chan~ges" ; diff --git a/sc/source/ui/src/optsolver.src b/sc/source/ui/src/optsolver.src index 2fc5cf3a3c54..e0c8ba382bc6 100644 --- a/sc/source/ui/src/optsolver.src +++ b/sc/source/ui/src/optsolver.src @@ -30,7 +30,7 @@ ModelessDialog RID_SCDLG_OPTSOLVER { OutputSize = TRUE ; - HelpId = SID_OPENDLG_OPTSOLVER ; + HelpId = CMD_SID_OPENDLG_OPTSOLVER ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 230 , 210 ) ; diff --git a/sc/source/ui/src/popup.src b/sc/source/ui/src/popup.src index abda5c9a0994..079c4d538c4c 100644 --- a/sc/source/ui/src/popup.src +++ b/sc/source/ui/src/popup.src @@ -43,7 +43,7 @@ Menu RID_POPUP_CELLS MenuItem { Identifier = SID_CELL_FORMAT_RESET ; - HelpId = SID_CELL_FORMAT_RESET ; + HelpId = CMD_SID_CELL_FORMAT_RESET ; Text [ en-US ] = "~Default Formatting" ; }; //------------------------------ @@ -52,7 +52,7 @@ Menu RID_POPUP_CELLS MenuItem { Identifier = FID_CELL_FORMAT ; - HelpId = FID_CELL_FORMAT ; + HelpId = CMD_FID_CELL_FORMAT ; Text [ en-US ] = "~Format Cells..." ; }; //------------------------------ @@ -61,19 +61,19 @@ Menu RID_POPUP_CELLS MenuItem { Identifier = FID_INS_CELL ; - HelpId = FID_INS_CELL ; + HelpId = CMD_FID_INS_CELL ; Text [ en-US ] = "~Insert..." ; }; MenuItem { Identifier = FID_DELETE_CELL ; - HelpId = FID_DELETE_CELL ; + HelpId = CMD_FID_DELETE_CELL ; Text [ en-US ] = "De~lete..." ; }; MenuItem { Identifier = SID_DELETE ; - HelpId = SID_DELETE ; + HelpId = CMD_SID_DELETE ; Text [ en-US ] = "Delete C~ontents..." ; }; //------------------------------ @@ -82,19 +82,19 @@ Menu RID_POPUP_CELLS MenuItem { Identifier = SID_INSERT_POSTIT ; - HelpId = SID_INSERT_POSTIT ; + HelpId = CMD_SID_INSERT_POSTIT ; Text [ en-US ] = "Insert Co~mment" ; }; MenuItem { Identifier = SID_DELETE_NOTE ; - HelpId = SID_DELETE_NOTE ; + HelpId = CMD_SID_DELETE_NOTE ; Text [ en-US ] = "D~elete Comment" ; }; MenuItem { Identifier = FID_NOTE_VISIBLE ; - HelpId = FID_NOTE_VISIBLE ; + HelpId = CMD_FID_NOTE_VISIBLE ; Text [ en-US ] = "Sho~w Comment" ; }; //------------------------------ @@ -104,27 +104,27 @@ Menu RID_POPUP_CELLS MenuItem { Identifier = SID_CUT ; - HelpId = SID_CUT ; + HelpId = CMD_SID_CUT ; Text [ en-US ] = "Cu~t" ; }; MenuItem { Identifier = SID_COPY ; - HelpId = SID_COPY ; + HelpId = CMD_SID_COPY ; Text [ en-US ] = "~Copy" ; }; MenuItem { Identifier = SID_PASTE ; - HelpID = SID_PASTE ; + HelpID = CMD_SID_PASTE ; Text [ en-US ] = "~Paste" ; }; MenuItem { Identifier = SID_PASTE_SPECIAL ; - HelpId = SID_PASTE_SPECIAL ; + HelpId = CMD_SID_PASTE_SPECIAL ; Text [ en-US ] = "P~aste Special..." ; }; //------------------------------ @@ -133,7 +133,7 @@ Menu RID_POPUP_CELLS MenuItem { Identifier = SID_DATA_SELECT ; - HelpId = SID_DATA_SELECT ; + HelpId = CMD_SID_DATA_SELECT ; Text [ en-US ] = "~Selection List..." ; }; }; @@ -151,43 +151,43 @@ Menu RID_POPUP_TAB MenuItem { Identifier = FID_INS_TABLE ; - HelpId = FID_INS_TABLE ; + HelpId = CMD_FID_INS_TABLE ; Text [ en-US ] = "~Insert Sheet..." ; }; MenuItem { Identifier = FID_DELETE_TABLE ; - HelpId = FID_DELETE_TABLE ; + HelpId = CMD_FID_DELETE_TABLE ; Text [ en-US ] = "~Delete Sheet..." ; }; MenuItem { Identifier = FID_TAB_MENU_RENAME ; - HelpId = FID_TAB_MENU_RENAME ; + HelpId = CMD_FID_TAB_MENU_RENAME ; Text [ en-US ] = "~Rename Sheet..." ; }; MenuItem { Identifier = FID_TAB_MOVE ; - HelpId = FID_TAB_MOVE ; + HelpId = CMD_FID_TAB_MOVE ; Text [ en-US ] = "~Move/Copy Sheet..." ; }; MenuItem { Identifier = FID_TAB_SELECTALL ; - HelpId = FID_TAB_SELECTALL ; + HelpId = CMD_FID_TAB_SELECTALL ; Text [ en-US ] = "Select All S~heets" ; }; MenuItem { Identifier = FID_TAB_DESELECTALL ; - HelpId = FID_TAB_DESELECTALL ; + HelpId = CMD_FID_TAB_DESELECTALL ; Text [ en-US ] = "D~eselect All Sheets" ; }; MenuItem { Identifier = FID_TAB_RTL ; - HelpId = FID_TAB_RTL ; + HelpId = CMD_FID_TAB_RTL ; Text [ en-US ] = "S~heet Right-To-Left" ; }; }; @@ -205,25 +205,25 @@ Menu RID_POPUP_PIVOT MenuItem { Identifier = SID_OPENDLG_PIVOTTABLE ; - HelpId = SID_OPENDLG_PIVOTTABLE ; + HelpId = CMD_SID_OPENDLG_PIVOTTABLE ; Text [ en-US ] = "~Start..." ; }; MenuItem { Identifier = SID_PIVOT_RECALC ; - HelpId = SID_PIVOT_RECALC ; + HelpId = CMD_SID_PIVOT_RECALC ; Text [ en-US ] = "~Refresh" ; }; MenuItem { Identifier = SID_DP_FILTER ; - HelpId = SID_DP_FILTER ; + HelpId = CMD_SID_DP_FILTER ; Text [ en-US ] = "~Filter..." ; }; MenuItem { Identifier = SID_PIVOT_KILL ; - HelpId = SID_PIVOT_KILL ; + HelpId = CMD_SID_PIVOT_KILL ; Text [ en-US ] = "~Delete" ; }; }; @@ -241,32 +241,32 @@ Menu RID_POPUP_PREVIEW MenuItem { Identifier = SID_PREVIEW_PREVIOUS ; - HelpId = SID_PREVIEW_PREVIOUS ; + HelpId = CMD_SID_PREVIEW_PREVIOUS ; Text [ en-US ] = "~Previous Page" ; }; MenuItem { Identifier = SID_PREVIEW_NEXT ; - HelpId = SID_PREVIEW_NEXT ; + HelpId = CMD_SID_PREVIEW_NEXT ; Text [ en-US ] = "~Next Page" ; }; MenuItem { Identifier = SID_FORMATPAGE ; - HelpId = SID_FORMATPAGE ; + HelpId = CMD_SID_FORMATPAGE ; Text [ en-US ] = "Pa~ge Layout..." ; }; MenuItem { Identifier = SID_CLOSEWIN ; - HelpId = SID_CLOSEWIN ; + HelpId = CMD_SID_CLOSEWIN ; Text [ en-US ] = "~Close" ; }; MenuItem { Separator = TRUE; }; MenuItem { Identifier = SID_PREVIEW_CLOSE ; - HelpId = SID_PRINTPREVIEW ; + HelpId = CMD_SID_PRINTPREVIEW ; Text [ en-US ] = "Close Pre~view" ; }; }; @@ -285,7 +285,7 @@ Menu RID_POPUP_EDIT MenuItem { Identifier = SID_CELL_FORMAT_RESET ; - HelpId = SID_CELL_FORMAT_RESET ; + HelpId = CMD_SID_CELL_FORMAT_RESET ; Text [ en-US ] = "~Default" ; }; //------------------------------ @@ -309,7 +309,7 @@ Menu RID_POPUP_EDIT { Text [ en-US ] = "Style" ; Identifier = RID_MN_FORMAT_STYLE ; - HelpID = RID_MN_FORMAT_STYLE ; + HelpID = HID_MN_FORMAT_STYLE ; SubMenu = Menu { ItemList = @@ -333,7 +333,7 @@ Menu RID_POPUP_EDIT MenuItem { Identifier = SID_ULINE_VAL_DOUBLE ; - HelpID = SID_ULINE_VAL_DOUBLE ; + HelpID = CMD_SID_ULINE_VAL_DOUBLE ; Text [ en-US ] = "Do~uble Underline" ; }; MenuItem @@ -355,13 +355,13 @@ Menu RID_POPUP_EDIT MenuItem { Identifier = SID_SET_SUPER_SCRIPT ; - HelpID = SID_SET_SUPER_SCRIPT ; + HelpID = CMD_SID_SET_SUPER_SCRIPT ; Text [ en-US ] = "Su~perscript" ; }; MenuItem { Identifier = SID_SET_SUB_SCRIPT ; - HelpID = SID_SET_SUB_SCRIPT ; + HelpID = CMD_SID_SET_SUB_SCRIPT ; Text [ en-US ] = "Su~bscript" ; }; }; @@ -397,37 +397,37 @@ Menu RID_POPUP_AUDIT MenuItem { Identifier = SID_FILL_ADD_PRED ; - HelpId = SID_FILL_ADD_PRED ; + HelpId = CMD_SID_FILL_ADD_PRED ; Text [ en-US ] = "Trace ~Precedent" ; }; MenuItem { Identifier = SID_FILL_DEL_PRED ; - HelpId = SID_FILL_DEL_PRED ; + HelpId = CMD_SID_FILL_DEL_PRED ; Text [ en-US ] = "~Remove Precedent" ; }; MenuItem { Identifier = SID_FILL_ADD_SUCC ; - HelpId = SID_FILL_ADD_SUCC ; + HelpId = CMD_SID_FILL_ADD_SUCC ; Text [ en-US ] = "~Trace Dependent" ; }; MenuItem { Identifier = SID_FILL_DEL_SUCC ; - HelpId = SID_FILL_DEL_SUCC ; + HelpId = CMD_SID_FILL_DEL_SUCC ; Text [ en-US ] = "Remove Dependent" ; }; MenuItem { Identifier = SID_DETECTIVE_DEL_ALL ; - HelpId = SID_DETECTIVE_DEL_ALL ; + HelpId = CMD_SID_DETECTIVE_DEL_ALL ; Text [ en-US ] = "Remove ~All Traces" ; }; MenuItem { Identifier = SID_FILL_NONE ; - HelpId = SID_FILL_NONE ; + HelpId = CMD_SID_FILL_NONE ; Text [ en-US ] = "Exit Fill Mode" ; }; }; @@ -445,7 +445,7 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = SID_CELL_FORMAT_RESET ; - HelpId = SID_CELL_FORMAT_RESET ; + HelpId = CMD_SID_CELL_FORMAT_RESET ; Text [ en-US ] = "~Default" ; }; //------------------------------ @@ -454,7 +454,7 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = FID_CELL_FORMAT ; - HelpId = FID_CELL_FORMAT ; + HelpId = CMD_FID_CELL_FORMAT ; Text [ en-US ] = "~Format Cells..." ; }; //------------------------------ @@ -463,25 +463,25 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = FID_INS_ROWBRK ; - HelpId = FID_INS_ROWBRK ; + HelpId = CMD_FID_INS_ROWBRK ; Text [ en-US ] = "Insert ~Row Break" ; }; MenuItem { Identifier = FID_INS_COLBRK ; - HelpId = FID_INS_COLBRK ; + HelpId = CMD_FID_INS_COLBRK ; Text [ en-US ] = "Insert ~Column Break" ; }; MenuItem { Identifier = FID_DEL_MANUALBREAKS ; - HelpId = FID_DEL_MANUALBREAKS ; + HelpId = CMD_FID_DEL_MANUALBREAKS ; Text [ en-US ] = "Delete All Manual Breaks" ; }; MenuItem { Identifier = FID_RESET_PRINTZOOM ; - HelpId = FID_RESET_PRINTZOOM ; + HelpId = CMD_FID_RESET_PRINTZOOM ; Text [ en-US ] = "Reset Scale" ; }; //------------------------------ @@ -490,19 +490,19 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = SID_DEFINE_PRINTAREA ; - HelpId = SID_DEFINE_PRINTAREA ; + HelpId = CMD_SID_DEFINE_PRINTAREA ; Text [ en-US ] = "Define Print Range" ; }; MenuItem { Identifier = SID_ADD_PRINTAREA ; - HelpId = SID_ADD_PRINTAREA ; + HelpId = CMD_SID_ADD_PRINTAREA ; Text [ en-US ] = "Add Print Range" ; }; MenuItem { Identifier = SID_DELETE_PRINTAREA ; - HelpId = SID_DELETE_PRINTAREA ; + HelpId = CMD_SID_DELETE_PRINTAREA ; Text [ en-US ] = "Undo Print Range" ; }; //------------------------------ @@ -511,7 +511,7 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = SID_FORMATPAGE ; - HelpId = SID_FORMATPAGE ; + HelpId = CMD_SID_FORMATPAGE ; Text [ en-US ] = "Page Format..." ; }; //------------------------------ @@ -520,7 +520,7 @@ Menu RID_POPUP_PAGEBREAK MenuItem { Identifier = FID_NOTE_VISIBLE ; - HelpId = FID_NOTE_VISIBLE ; + HelpId = CMD_FID_NOTE_VISIBLE ; Text [ en-US ] = "Sho~w Comment" ; }; }; diff --git a/sc/source/ui/src/scfuncs.src b/sc/source/ui/src/scfuncs.src index 2f5a2d8c88fb..129ed62a6c15 100644 --- a/sc/source/ui/src/scfuncs.src +++ b/sc/source/ui/src/scfuncs.src @@ -72,7 +72,8 @@ */ // Hack: -#define U2S(x) ((x)-HID_START) +//#define U2S(x) ((x)-HID_START) +#define U2S(x) x // Macro U2S: unsigned to signed // is needed because the resource compiler only knows signed short int in // ExtraData, but the HID_XXX are unsigned and exceed 32k. Code reading the diff --git a/sc/source/ui/src/solvrdlg.src b/sc/source/ui/src/solvrdlg.src index 6a8a3d955644..d93bc714ae9b 100644 --- a/sc/source/ui/src/solvrdlg.src +++ b/sc/source/ui/src/solvrdlg.src @@ -29,7 +29,7 @@ ModelessDialog RID_SCDLG_SOLVER { OutputSize = TRUE ; - HelpId = SID_OPENDLG_SOLVE ; + HelpId = CMD_SID_OPENDLG_SOLVE ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 222 , 64 ) ; diff --git a/sc/source/ui/src/tabopdlg.src b/sc/source/ui/src/tabopdlg.src index 25af654f4147..1145474255ba 100644 --- a/sc/source/ui/src/tabopdlg.src +++ b/sc/source/ui/src/tabopdlg.src @@ -29,7 +29,7 @@ ModelessDialog RID_SCDLG_TABOP { OutputSize = TRUE ; - HelpId = SID_OPENDLG_TABOP ; + HelpId = CMD_SID_OPENDLG_TABOP ; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 240 , 64 ) ; diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src index 6e4b89e5faa0..83ab7338970d 100644 --- a/sc/source/ui/src/toolbox.src +++ b/sc/source/ui/src/toolbox.src @@ -123,136 +123,6 @@ String SCSTR_QHELP_BTNEQUAL Text [ en-US ] = "Function" ; }; - // -------------------------------------------------------------------- - // PopUp's fuer Werkzeugleiste - // -------------------------------------------------------------------- - -FloatingWindow RID_TBXCTL_INSERT -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpID = RID_TBXCTL_INSERT ; - /* ### ACHTUNG: Neuer Text in Resource? Einfügen : Einf³gen */ - Text [ en-US ] = "Insert" ; - - ToolBox RID_TOOLBOX_INSERT - { - MenuStrings = TRUE ; - SVLook = TRUE ; - HelpID = RID_TOOLBOX_INSERT ; - ItemList = - { - ToolBoxItem - { - Identifier = SID_INSERT_GRAPHIC ; - HelpID = SID_INSERT_GRAPHIC ; - }; - ToolBoxItem - { - Identifier = SID_CHARMAP ; - HelpId = SID_CHARMAP ; - }; - }; - }; -}; - -FloatingWindow RID_TBXCTL_INSCELLS -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE ; - HelpID = RID_TBXCTL_INSCELLS ; - /* ### ACHTUNG: Neuer Text in Resource? Zellen einfügen : Zellen einf³gen */ - Text [ en-US ] = "Insert Cells" ; - - ToolBox RID_TOOLBOX_INSCELLS - { - MenuStrings = TRUE ; - SVLook = TRUE ; - HelpID = RID_TOOLBOX_INSCELLS ; - ItemList = - { - ToolBoxItem - { - Identifier = FID_INS_CELLSDOWN ; - HelpId = FID_INS_CELLSDOWN ; - }; - ToolBoxItem - { - Identifier = FID_INS_CELLSRIGHT ; - HelpId = FID_INS_CELLSRIGHT ; - }; - ToolBoxItem - { - Identifier = FID_INS_ROW ; - HelpId = FID_INS_ROW ; - }; - ToolBoxItem - { - Identifier = FID_INS_COLUMN ; - HelpId = FID_INS_COLUMN ; - }; - }; - }; -}; - -FloatingWindow RID_TBXCTL_INSOBJ -{ - Moveable = TRUE ; - Closeable = TRUE ; - Hide = TRUE ; - SVLook = TRUE; - HelpID = RID_TBXCTL_INSOBJ ; - /* ### ACHTUNG: Neuer Text in Resource? Objekt einfügen : Objekt einf³gen */ - Text [ en-US ] = "Insert Object" ; - ToolBox RID_TOOLBOX_INSOBJ - { - MenuStrings = TRUE ; - SVLook = TRUE ; - HelpID = RID_TOOLBOX_INSOBJ ; - ItemList = - { - ToolBoxItem - { - // mit Aufziehen des Zielbereichs - ITEM_TOOLBAR_DRAW_CHART - }; - ToolBoxItem - { - Identifier = SID_INSERT_SMATH ; - HelpId = SID_INSERT_SMATH ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_FLOATINGFRAME ; - HelpID = SID_INSERT_FLOATINGFRAME ; - }; - ToolBoxItem - { - Identifier = SID_INSERT_OBJECT ; - HelpId = SID_INSERT_OBJECT ; - }; -#ifdef SOLAR_PLUGIN - ToolBoxItem - { - Identifier = SID_INSERT_PLUGIN ; - HelpId = SID_INSERT_PLUGIN ; - }; -#endif -#ifdef SOLAR_JAVA - ToolBoxItem - { - Identifier = SID_INSERT_APPLET ; - HelpId = SID_INSERT_APPLET ; - }; -#endif - }; - }; -}; - // Don't use this image list for normal toolbar images. We have now our commandimagelist // folder in default_images. This list is now only used for special toolboxes that are // used in floating windows. diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx index 43eb2879236f..87740a88e4df 100644 --- a/sc/source/ui/view/gridwin.cxx +++ b/sc/source/ui/view/gridwin.cxx @@ -425,10 +425,8 @@ ScGridWindow::ScGridWindow( Window* pParent, ScViewData* pData, ScSplitPos eWhic EnableChildTransparentMode(); SetDialogControlFlags( WINDOW_DLGCTRL_RETURN | WINDOW_DLGCTRL_WANTFOCUS ); - // FIXME: HELPID - SetHelpId( ""/*HID_SC_WIN_GRIDWIN*/ ); - // FIXME: HELPID - SetUniqueId( ""/*HID_SC_WIN_GRIDWIN*/ ); + SetHelpId( HID_SC_WIN_GRIDWIN ); + SetUniqueId( HID_SC_WIN_GRIDWIN ); SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() ); EnableRTL( FALSE ); diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index 27c82967b9e6..83fdab9000e6 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -135,10 +135,8 @@ ScPreview::ScPreview( Window* pParent, ScDocShell* pDocSh, ScPreviewShell* pView SetOutDevViewType( OUTDEV_VIEWTYPE_PRINTPREVIEW ); //#106611# SetBackground(); - // FIXME: HELPID - SetHelpId( ""/*HID_SC_WIN_PREVIEW*/ ); - // FIXME: HELPID - SetUniqueId( ""/*HID_SC_WIN_PREVIEW*/ ); + SetHelpId( HID_SC_WIN_PREVIEW ); + SetUniqueId( HID_SC_WIN_PREVIEW ); SetDigitLanguage( SC_MOD()->GetOptDigitLanguage() ); } diff --git a/sc/source/ui/view/tabvwsh3.cxx b/sc/source/ui/view/tabvwsh3.cxx index 29cdac803d5c..ea06c1fe6c0c 100644 --- a/sc/source/ui/view/tabvwsh3.cxx +++ b/sc/source/ui/view/tabvwsh3.cxx @@ -44,7 +44,7 @@ #include #include #include - +#include #include #include @@ -818,7 +818,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg->SetDescription( String( ScResId( STR_DLG_SELECTTABLES_TITLE ) ), String( ScResId( STR_DLG_SELECTTABLES_LBNAME ) ), - SID_SELECT_TABLES, HID_SELECTTABLES ); + GetStaticInterface()->GetSlot(SID_SELECT_TABLES)->GetCommand(), HID_SELECTTABLES ); // fill all table names with selection state String aTabName; @@ -1015,10 +1015,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_UNPROTECTDOC) ); pDlg->SetMinLen( 0 ); - // FIXME: HELPID - pDlg->SetHelpId( ""/*FID_PROTECT_DOC*/ ); - // FIXME: HELPID - pDlg->SetEditHelpId( ""/*HID_PASSWD_DOC*/ ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_DOC)->GetCommand() ); + pDlg->SetEditHelpId( HID_PASSWD_DOC ); if (pDlg->Execute() == RET_OK) aPassword = pDlg->GetPassword(); @@ -1040,10 +1038,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg = new SfxPasswordDialog( GetDialogParent(), &aText ); pDlg->SetText( ScResId(SCSTR_PROTECTDOC) ); pDlg->SetMinLen( 0 ); - // FIXME: HELPID - pDlg->SetHelpId( ""/*FID_PROTECT_DOC*/ ); - // FIXME: HELPID - pDlg->SetEditHelpId( ""/*HID_PASSWD_DOC*/ ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_DOC)->GetCommand() ); + pDlg->SetEditHelpId( HID_PASSWD_DOC ); pDlg->ShowExtras( SHOWEXTRAS_CONFIRM ); if (pDlg->Execute() == RET_OK) @@ -1093,7 +1089,7 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) auto_ptr pDlg(new SfxPasswordDialog(GetDialogParent(), &aText)); pDlg->SetText( ScResId(SCSTR_UNPROTECTTAB) ); pDlg->SetMinLen( 0 ); - pDlg->SetHelpId( FID_PROTECT_TABLE ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_TABLE)->GetCommand() ); pDlg->SetEditHelpId( HID_PASSWD_TABLE ); if (pDlg->Execute() == RET_OK) @@ -1165,10 +1161,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg.reset(new SfxPasswordDialog(GetDialogParent(), &aText)); pDlg->SetText( ScResId(SCSTR_UNPROTECTTAB) ); pDlg->SetMinLen( 0 ); - // FIXME: HELPID - pDlg->SetHelpId( ""/*FID_PROTECT_TABLE*/ ); - // FIXME: HELPID - pDlg->SetEditHelpId( ""/*HID_PASSWD_TABLE*/ ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_TABLE)->GetCommand() ); + pDlg->SetEditHelpId( HID_PASSWD_TABLE ); if (pDlg->Execute() == RET_OK) aPassword = pDlg->GetPassword(); @@ -1189,10 +1183,8 @@ void ScTabViewShell::Execute( SfxRequest& rReq ) pDlg.reset(new SfxPasswordDialog(GetDialogParent(), &aText)); pDlg->SetText( ScResId(SCSTR_PROTECTTAB) ); pDlg->SetMinLen( 0 ); - // FIXME: HELPID - pDlg->SetHelpId( ""/*FID_PROTECT_TABLE*/ ); - // FIXME: HELPID - pDlg->SetEditHelpId( ""/*HID_PASSWD_TABLE*/ ); + pDlg->SetHelpId( GetStaticInterface()->GetSlot(FID_PROTECT_TABLE)->GetCommand() ); + pDlg->SetEditHelpId( HID_PASSWD_TABLE ); pDlg->ShowExtras( SHOWEXTRAS_CONFIRM ); if (pDlg->Execute() == RET_OK) diff --git a/sc/source/ui/view/tabvwshf.cxx b/sc/source/ui/view/tabvwshf.cxx index 68a852c4a3b7..144e90367252 100644 --- a/sc/source/ui/view/tabvwshf.cxx +++ b/sc/source/ui/view/tabvwshf.cxx @@ -40,7 +40,7 @@ #include #include #include - +#include #include "tabvwsh.hxx" #include "sc.hrc" #include "docsh.hxx" @@ -411,26 +411,23 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) String aErrMsg ( ScGlobal::GetRscString( STR_INVALIDTABNAME ) ); String aName; String aDlgTitle; + const sal_Char* pHelpId = 0; switch ( nSlot ) { case FID_TAB_APPEND: aDlgTitle = String(ScResId(SCSTR_APDTABLE)); pDoc->CreateValidTabName( aName ); + pHelpId = HID_SC_APPEND_NAME; break; case FID_TAB_RENAME: aDlgTitle = String(ScResId(SCSTR_RENAMETAB)); pDoc->GetName( pViewData->GetTabNo(), aName ); + pHelpId = HID_SC_RENAME_NAME; break; } -//CHINA001 ScStringInputDlg* pDlg = -//CHINA001 new ScStringInputDlg( GetDialogParent(), -//CHINA001 aDlgTitle, -//CHINA001 String(ScResId(SCSTR_NAME)), -//CHINA001 aName, -//CHINA001 nSlot ); ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create(); DBG_ASSERT(pFact, "ScAbstractFactory create fail!");//CHINA001 @@ -438,7 +435,7 @@ void ScTabViewShell::ExecuteTable( SfxRequest& rReq ) aDlgTitle, String(ScResId(SCSTR_NAME)), aName, - nSlot,RID_SCDLG_STRINPUT); + GetStaticInterface()->GetSlot(nSlot)->GetCommand(), pHelpId, RID_SCDLG_STRINPUT); DBG_ASSERT(pDlg, "Dialog create fail!");//CHINA001 while ( !bDone && nRet == RET_OK ) -- cgit From c61aa274cb5631305cfbaea6f1894db756e911c8 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 10 Jul 2010 18:21:24 +0200 Subject: CWS changehid: #i111874#: change code to support HelpIds as byte strings --- automation/source/miniapp/servres.src | 4 - automation/source/miniapp/servuid.hxx | 22 +- basctl/inc/helpid.hrc | 78 +-- basctl/source/basicide/basdoc.cxx | 37 -- basctl/source/basicide/basdoc.hxx | 1 - basctl/source/basicide/baside2b.cxx | 18 +- basctl/source/basicide/baside3.cxx | 3 +- basctl/source/basicide/basides1.cxx | 9 +- basctl/source/basicide/basidesh.src | 16 +- basctl/source/basicide/bastypes.cxx | 3 +- basctl/source/basicide/makefile.mk | 2 +- basctl/source/basicide/tbxctl.src | 273 -------- basctl/source/dlged/managelang.cxx | 3 +- cui/source/customize/cfg.cxx | 112 +--- cui/source/customize/eventdlg.cxx | 3 +- cui/source/customize/macropg.cxx | 6 +- cui/source/dialogs/SpellDialog.cxx | 21 +- cui/source/dialogs/charmap.src | 24 +- cui/source/dialogs/cuigaldlg.cxx | 3 +- cui/source/dialogs/grfflt.src | 10 +- cui/source/dialogs/hangulhanjadlg.cxx | 30 +- cui/source/dialogs/hldoctp.cxx | 3 +- cui/source/dialogs/hlinettp.cxx | 3 +- cui/source/dialogs/hlmailtp.cxx | 3 +- cui/source/dialogs/hyperdlg.src | 2 +- cui/source/dialogs/iconcdlg.cxx | 12 +- cui/source/dialogs/insrc.cxx | 6 +- cui/source/dialogs/linkdlg.cxx | 3 +- cui/source/dialogs/pastedlg.cxx | 6 +- cui/source/dialogs/postdlg.cxx | 12 +- cui/source/dialogs/postdlg.src | 3 +- cui/source/dialogs/thesdlg.src | 2 +- cui/source/dialogs/zoom.cxx | 2 +- cui/source/dialogs/zoom.src | 3 +- cui/source/factory/dlgfact.cxx | 56 +- cui/source/factory/dlgfact.hxx | 12 +- cui/source/inc/cfg.hxx | 3 +- cui/source/inc/dlgname.hxx | 3 +- cui/source/inc/helpid.hrc | 698 ++++++++++----------- cui/source/inc/insrc.hxx | 2 +- cui/source/options/connpooloptions.cxx | 6 +- cui/source/options/dbregister.cxx | 6 +- cui/source/options/fontsubs.cxx | 3 +- cui/source/options/optcolor.cxx | 102 ++- cui/source/options/optfltr.cxx | 3 +- cui/source/options/optjava.cxx | 3 +- cui/source/options/optlingu.cxx | 12 +- cui/source/options/optpath.cxx | 6 +- cui/source/options/treeopt.cxx | 3 +- cui/source/tabpages/autocdlg.cxx | 15 +- cui/source/tabpages/autocdlg.src | 2 +- cui/source/tabpages/numpages.cxx | 12 +- cui/source/tabpages/tpbitmap.cxx | 9 +- cui/source/tabpages/tpcolor.cxx | 24 +- cui/source/tabpages/tpgradnt.cxx | 6 +- cui/source/tabpages/tphatch.cxx | 6 +- cui/source/tabpages/tplnedef.cxx | 6 +- cui/source/tabpages/tplneend.cxx | 6 +- extensions/inc/abpilot.hrc | 18 +- extensions/inc/bibliography.hrc | 100 ++- extensions/inc/dbpilots.hrc | 38 +- extensions/inc/propctrlr.hrc | 599 +++++++++--------- extensions/inc/update.hrc | 26 +- extensions/source/abpilot/abspilot.cxx | 15 +- extensions/source/bibliography/datman.cxx | 4 +- extensions/source/bibliography/framectr.cxx | 3 +- extensions/source/bibliography/general.cxx | 17 +- extensions/source/bibliography/general.hxx | 4 +- extensions/source/bibliography/toolbar.src | 77 +-- extensions/source/dbpilots/gridwizard.cxx | 12 +- extensions/source/dbpilots/groupboxwiz.cxx | 12 +- extensions/source/dbpilots/listcombowizard.cxx | 12 +- extensions/source/propctrlr/browserline.cxx | 13 +- extensions/source/propctrlr/browserline.hxx | 3 +- extensions/source/propctrlr/browserlistbox.cxx | 4 +- extensions/source/propctrlr/browserview.cxx | 3 +- .../source/propctrlr/defaultforminspection.cxx | 2 +- .../source/propctrlr/eformspropertyhandler.cxx | 12 +- extensions/source/propctrlr/eventhandler.cxx | 16 +- extensions/source/propctrlr/eventhandler.hxx | 12 +- .../source/propctrlr/formcomponenthandler.cxx | 36 +- extensions/source/propctrlr/formmetadata.cxx | 14 +- extensions/source/propctrlr/formmetadata.hxx | 2 +- extensions/source/propctrlr/pcrcommon.cxx | 16 +- extensions/source/propctrlr/pcrcommon.hxx | 3 +- extensions/source/propctrlr/propcontroller.cxx | 1 - extensions/source/propctrlr/propertyeditor.cxx | 15 +- extensions/source/propctrlr/propertyeditor.hxx | 2 +- extensions/source/propctrlr/propertyinfo.hxx | 3 +- .../propctrlr/xsdvalidationpropertyhandler.cxx | 4 +- extensions/source/update/check/updatehdl.cxx | 20 +- .../source/dialogs/digitalsignaturesdialog.cxx | 3 +- xmlsecurity/source/dialogs/helpids.hrc | 44 +- 93 files changed, 1156 insertions(+), 1751 deletions(-) delete mode 100644 basctl/source/basicide/tbxctl.src diff --git a/automation/source/miniapp/servres.src b/automation/source/miniapp/servres.src index 426be8b81532..8ba7d4923973 100644 --- a/automation/source/miniapp/servres.src +++ b/automation/source/miniapp/servres.src @@ -54,7 +54,6 @@ ModalDialog GROSSER_TEST_DLG }; OKButton 1 { - HelpID = 1 ; Pos = MAP_APPFONT ( 132 , 92 ) ; Size = MAP_APPFONT ( 64 , 12 ) ; TabStop = TRUE ; @@ -176,7 +175,6 @@ Menu MENU_CLIENT MenuItem { Identifier = IDM_FILE ; - HelpID = IDM_FILE_HELP ; Text = "~File" ; SubMenu = Menu { @@ -185,7 +183,6 @@ Menu MENU_CLIENT MenuItem { Identifier = IDM_FILE_OPEN_TEST ; - HelpID = IDM_FILE_OPEN_TEST_HELP ; Text = "~Open Test Window" ; }; MenuItem @@ -196,7 +193,6 @@ Menu MENU_CLIENT MenuItem { Identifier = IDM_FILE_EXIT ; - HelpID = IDM_FILE_EXIT_HELP ; Text = "~Beenden" ; AccelKey = KeyCode { diff --git a/automation/source/miniapp/servuid.hxx b/automation/source/miniapp/servuid.hxx index 7d66c5473fac..c1ba920f3667 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/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc index 0f666941e57e..4a303a8dc549 100644 --- a/basctl/inc/helpid.hrc +++ b/basctl/inc/helpid.hrc @@ -33,53 +33,53 @@ // Help-Ids -------------------------------------------------------------- -#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_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" -#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_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" -#define HID_BASICIDE_PROP_BROWSER (HID_BASICIDE_START + 15) +#define HID_BASICIDE_PROP_BROWSER "BASCTL_HID_BASICIDE_PROP_BROWSER" -#define HID_BASICIDE_PROP_BROWSER_LBOX (HID_BASICIDE_START + 16) +#define HID_BASICIDE_PROP_BROWSER_LBOX "BASCTL_HID_BASICIDE_PROP_BROWSER_LBOX" -#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_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_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_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_MODULWINDOW (HID_BASICIDE_START + 25) -#define HID_BASICIDE_DIALOGWINDOW (HID_BASICIDE_START + 26) +#define HID_BASICIDE_MODULWINDOW "BASCTL_HID_BASICIDE_MODULWINDOW" +#define HID_BASICIDE_DIALOGWINDOW "BASCTL_HID_BASICIDE_DIALOGWINDOW" -#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_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_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/source/basicide/basdoc.cxx b/basctl/source/basicide/basdoc.cxx index 69db90a10024..7b91d7c3a7d8 100644 --- a/basctl/source/basicide/basdoc.cxx +++ b/basctl/source/basicide/basdoc.cxx @@ -88,43 +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 ); - // FIXME: HELPID - 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 1ef5991cfab4..a2ec0917ceb5 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/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index d2b227319e60..b6b4accb7dd6 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -177,8 +177,7 @@ EditorWindow::EditorWindow( Window* pParent ) : Wallpaper(GetSettings().GetStyleSettings().GetFieldColor())); SetPointer( Pointer( POINTER_TEXT ) ); - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_EDITORWINDOW*/ ); + SetHelpId( HID_BASICIDE_EDITORWINDOW ); pSourceViewConfig->AddListener(this); } @@ -949,8 +948,7 @@ BreakPointWindow::BreakPointWindow( Window* pParent ) : // Falls in EditEngine autom. gescrollt wurde, wuesste ich sonst nicht, // wo ich gerade stehe. - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_BREAKPOINTWINDOW*/ ); + SetHelpId( HID_BASICIDE_BREAKPOINTWINDOW ); } @@ -1189,8 +1187,7 @@ WatchWindow::WatchWindow( Window* pParent ) : nVirtToolBoxHeight = aXEdit.GetSizePixel().Height() + 7; nHeaderBarHeight = 16; - // FIXME: HELPID - aTreeListBox.SetHelpId(""/*HID_BASICIDE_WATCHWINDOW_LIST*/); + aTreeListBox.SetHelpId(HID_BASICIDE_WATCHWINDOW_LIST); aTreeListBox.EnableInplaceEditing( TRUE ); aTreeListBox.SetSelectHdl( LINK( this, WatchWindow, TreeListHdl ) ); aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight + nHeaderBarHeight ) ); @@ -1242,8 +1239,7 @@ WatchWindow::WatchWindow( Window* pParent ) : SetText( String( IDEResId( RID_STR_WATCHNAME ) ) ); - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_WATCHWINDOW*/ ); + SetHelpId( HID_BASICIDE_WATCHWINDOW ); // make watch window keyboard accessible GetSystemWindow()->GetTaskPaneList()->AddWindow( this ); @@ -1526,8 +1522,7 @@ StackWindow::StackWindow( Window* pParent ) : aGotoCallButton( this, IDEResId( RID_IMGBTN_GOTOCALL ) ), aStackStr( IDEResId( RID_STR_STACK ) ) { - // FIXME: HELPID - aTreeListBox.SetHelpId(""/*HID_BASICIDE_STACKWINDOW_LIST*/); + aTreeListBox.SetHelpId(HID_BASICIDE_STACKWINDOW_LIST); aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight ) ); aTreeListBox.SetHighlightRange(); aTreeListBox.SetSelectionMode( NO_SELECTION ); @@ -1536,8 +1531,7 @@ StackWindow::StackWindow( Window* pParent ) : SetText( String( IDEResId( RID_STR_STACKNAME ) ) ); - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_STACKWINDOW*/ ); + SetHelpId( HID_BASICIDE_STACKWINDOW ); aGotoCallButton.SetClickHdl( LINK( this, StackWindow, ButtonHdl ) ); aGotoCallButton.SetPosPixel( Point( DWBORDER, 2 ) ); diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 9e84a7d36adf..afbe3daf5be1 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -124,8 +124,7 @@ DialogWindow::DialogWindow( Window* pParent, const ScriptDocument& rDocument, St pEditor->GetModel()->SetNotifyUndoActionHdl( LINK(this, DialogWindow, NotifyUndoActionHdl)); - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_DIALOGWINDOW*/ ); + SetHelpId( HID_BASICIDE_DIALOGWINDOW ); // set readonly mode for readonly libraries ::rtl::OUString aOULibName( aLibName ); diff --git a/basctl/source/basicide/basides1.cxx b/basctl/source/basicide/basides1.cxx index 7ae1f9528bb2..4432de9aa282 100644 --- a/basctl/source/basicide/basides1.cxx +++ b/basctl/source/basicide/basides1.cxx @@ -1065,16 +1065,14 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO AdjustPosSizePixel( Point( 0, 0 ), GetViewFrame()->GetWindow().GetOutputSizePixel() ); if( pCurWin->IsA( TYPE( ModulWindow ) ) ) { - // FIXME: HELPID - GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_MODULWINDOW*/ ); + GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW ); pModulLayout->SetModulWindow( (ModulWindow*)pCurWin ); pModulLayout->Show(); } else { pModulLayout->Hide(); - // FIXME: HELPID - GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_DIALOGWINDOW*/ ); + GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_DIALOGWINDOW ); } if ( bRememberAsCurrent ) @@ -1123,8 +1121,7 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO else { SetWindow( pModulLayout ); - // FIXME: HELPID - GetViewFrame()->GetWindow().SetHelpId( ""/*HID_BASICIDE_MODULWINDOW*/ ); + GetViewFrame()->GetWindow().SetHelpId( HID_BASICIDE_MODULWINDOW ); SfxObjectShell::SetCurrentComponent( NULL ); } SetUndoManager( pCurWin ? pCurWin->GetUndoManager() : 0 ); diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src index f0c0727cd22f..949732389709 100644 --- a/basctl/source/basicide/basidesh.src +++ b/basctl/source/basicide/basidesh.src @@ -31,6 +31,8 @@ #include #endif #include "dlgresid.hrc" +#include +#include #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/bastypes.cxx b/basctl/source/basicide/bastypes.cxx index cd2f155528e0..af42503a5dae 100644 --- a/basctl/source/basicide/bastypes.cxx +++ b/basctl/source/basicide/bastypes.cxx @@ -521,8 +521,7 @@ BasicIDETabBar::BasicIDETabBar( Window* pParent ) : { EnableEditMode( TRUE ); - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_TABBAR*/ ); + SetHelpId( HID_BASICIDE_TABBAR ); } void __EXPORT BasicIDETabBar::MouseButtonDown( const MouseEvent& rMEvt ) diff --git a/basctl/source/basicide/makefile.mk b/basctl/source/basicide/makefile.mk index 62c4755112d1..8854e6bfc927 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/tbxctl.src b/basctl/source/basicide/tbxctl.src deleted file mode 100644 index 89d839619238..000000000000 --- 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 - * - * 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.cxx b/basctl/source/dlged/managelang.cxx index 1b39a568b23b..41c86699203b 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -323,8 +323,7 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog( Window* pParent, Localizatio if ( m_pLocalizationMgr->isLibraryLocalized() ) { // change to "Add Interface Language" mode - // FIXME: HELPID - SetHelpId( ""/*HID_BASICIDE_ADDNEW_LANGUAGE*/ ); + SetHelpId( HID_BASICIDE_ADDNEW_LANGUAGE ); m_pCheckLangLB = new SvxCheckListBox( this, IDEResId( LB_ADD_LANGUAGE ) ); SetText( String( IDEResId( STR_ADDLANG_TITLE ) ) ); m_aLanguageFT.SetText( String( IDEResId( STR_ADDLANG_LABEL ) ) ); diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 154e79811186..b21671b344e5 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"; @@ -518,7 +517,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 +532,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 +560,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 +581,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 +623,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 +684,6 @@ ConvertSvxConfigEntry( aPropSeq[2].Value <<= rtl::OUString( pEntry->GetName() ); } - aPropSeq[3].Name = aDescriptorHelpURL; - aPropSeq[3].Value <<= rtl::OUString( pEntry->GetHelpURL() ); - return aPropSeq; } @@ -718,16 +701,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 +765,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; } @@ -1183,14 +1160,13 @@ bool MenuSaveInData::LoadSubMenus( { 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 +1208,6 @@ bool MenuSaveInData::LoadSubMenus( aLabel, aCommandURL, TRUE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntries->push_back( pEntry ); @@ -1257,7 +1232,6 @@ bool MenuSaveInData::LoadSubMenus( SvxConfigEntry* pEntry = new SvxConfigEntry( aLabel, aCommandURL, FALSE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntries->push_back( pEntry ); } } @@ -2154,7 +2128,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(); @@ -2629,8 +2602,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_MENU*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) ); bool ret = pNameDialog->Execute(); @@ -2688,8 +2660,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_SUBMENU_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_NAME_SUBMENU*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_NAME_SUBMENU ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_ADD_SUBMENU ) ); bool ret = pNameDialog->Execute(); @@ -2735,8 +2706,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_MENU_ITEM*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_MENU_ITEM ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_MENU ) ); bool ret = pNameDialog->Execute(); @@ -3073,7 +3043,6 @@ SvxConfigEntry::SvxConfigEntry( pEntries( 0 ) { sal_uInt16 nType( css::ui::ItemType::DEFAULT ); - OUString aHelpURL_; for ( sal_Int32 i = 0; i < rProperties.getLength(); i++ ) { @@ -3081,10 +3050,6 @@ SvxConfigEntry::SvxConfigEntry( { 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; @@ -3132,26 +3097,9 @@ SvxConfigEntry::GetHelpText() { if ( aHelpText.getLength() == 0 ) { - #if 0 - OUString helpid = OUString::createFromAscii( "helpid:" ); - if ( aHelpURL.indexOf( helpid ) != -1 ) - { - aHelpURL = aHelpURL.copy( helpid.getLength() ); - } - #endif - - Help* pHelp = Application::GetHelp(); - #if 0 - if ( aHelpURL.toInt32() != 0 ) - #endif - { - // FIXME: HELPID - 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 ); } } @@ -3182,10 +3130,7 @@ SvxConfigEntry::GetProperties( 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 ); + uno::Sequence< beans::PropertyValue > aPropSeq( 3 ); aPropSeq[0].Name = aDescriptorCommandURL; aPropSeq[0].Value <<= rtl::OUString( GetCommand() ); @@ -3243,9 +3188,6 @@ SvxConfigEntry::GetProperties( aPropSeq[2].Value <<= rtl::OUString( GetName() ); } - aPropSeq[3].Name = aDescriptorHelpURL; - aPropSeq[3].Value <<= rtl::OUString( GetHelpURL() ); - return aPropSeq; } @@ -3351,26 +3293,19 @@ SvxToolbarConfigPage::SvxToolbarConfigPage( : SvxConfigPage( pParent, rSet ) { - // FIXME: HELPID - SetHelpId( ""/*HID_SVX_CONFIG_TOOLBAR*/ ); + SetHelpId( HID_SVX_CONFIG_TOOLBAR ); aContentsListBox = new SvxToolbarEntriesListBox(this, CUI_RES(BOX_ENTRIES)); FreeResource(); PositionContentsListBox(); aContentsListBox->SetZOrder( &aAddCommandsButton, WINDOW_ZORDER_BEFOR ); - // FIXME: HELPID - aContentsListBox->SetHelpId( ""/*HID_SVX_CONFIG_TOOLBAR_CONTENTS*/ ); - // FIXME: HELPID - aNewTopLevelButton.SetHelpId( ""/*HID_SVX_NEW_TOOLBAR*/ ); - // FIXME: HELPID - aModifyTopLevelButton.SetHelpId( ""/*HID_SVX_MODIFY_TOOLBAR*/ ); - // FIXME: HELPID - aAddCommandsButton.SetHelpId( ""/*HID_SVX_NEW_TOOLBAR_ITEM*/ ); - // FIXME: HELPID - aModifyCommandButton.SetHelpId( ""/*HID_SVX_MODIFY_TOOLBAR_ITEM*/ ); - // FIXME: HELPID - aSaveInListBox.SetHelpId( ""/*HID_SVX_SAVE_IN*/ ); + aContentsListBox->SetHelpId( HID_SVX_CONFIG_TOOLBAR_CONTENTS ); + aNewTopLevelButton.SetHelpId( HID_SVX_NEW_TOOLBAR ); + aModifyTopLevelButton.SetHelpId( HID_SVX_MODIFY_TOOLBAR ); + aAddCommandsButton.SetHelpId( HID_SVX_NEW_TOOLBAR_ITEM ); + aModifyCommandButton.SetHelpId( HID_SVX_MODIFY_TOOLBAR_ITEM ); + aSaveInListBox.SetHelpId( HID_SVX_SAVE_IN ); aTopLevelSeparator.SetText( CUI_RES ( RID_SVXSTR_PRODUCTNAME_TOOLBARS ) ); @@ -3586,8 +3521,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_TOOLBAR*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) ); bool ret = pNameDialog->Execute(); @@ -3678,8 +3612,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton ) String aDesc = CUI_RESSSTR( RID_SVXSTR_LABEL_NEW_NAME ); SvxNameDialog* pNameDialog = new SvxNameDialog( this, aNewName, aDesc ); - // FIXME: HELPID - pNameDialog->SetHelpId( ""/*HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM*/ ); + pNameDialog->SetHelpId( HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM ); pNameDialog->SetText( CUI_RESSTR( RID_SVXSTR_RENAME_TOOLBAR ) ); bool ret = pNameDialog->Execute(); @@ -4767,7 +4700,6 @@ bool ToolbarSaveInData::LoadToolbar( { uno::Reference< container::XIndexAccess > xSubMenu; OUString aCommandURL; - OUString aHelpURL; OUString aLabel; bool bIsUserDefined = TRUE; sal_Bool bIsVisible; @@ -4776,7 +4708,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 ) { @@ -4817,7 +4749,6 @@ bool ToolbarSaveInData::LoadToolbar( aLabel, aCommandURL, TRUE ); pEntry->SetUserDefined( bIsUserDefined ); - pEntry->SetHelpURL( aHelpURL ); pEntry->SetVisible( bIsVisible ); pEntries->push_back( pEntry ); @@ -4829,7 +4760,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/eventdlg.cxx b/cui/source/customize/eventdlg.cxx index 5a6cc5505d94..8592dbaded5f 100644 --- a/cui/source/customize/eventdlg.cxx +++ b/cui/source/customize/eventdlg.cxx @@ -89,8 +89,7 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet, // must be done after FreeResource is called InitResources(); - // FIXME: HELPID - mpImpl->pEventLB->GetListBox().SetHelpId( ""/*HID_SVX_MACRO_LB_EVENT*/ ); + mpImpl->pEventLB->GetListBox().SetHelpId( HID_SVX_MACRO_LB_EVENT ); aSaveInListBox.SetSelectHdl( LINK( this, SvxEventConfigPage, SelectHdl_Impl ) ); diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx index 944fd10f8533..e7d70dd9d396 100644 --- a/cui/source/customize/macropg.cxx +++ b/cui/source/customize/macropg.cxx @@ -170,8 +170,7 @@ _HeaderTabListBox::_HeaderTabListBox( Window* pParent, const ResId& rId ) : maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP ), maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER ) { - // FIXME: HELPID - maListBox.SetHelpId( ""/*HID_MACRO_HEADERTABLISTBOX*/ ); + maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX ); } _HeaderTabListBox::~_HeaderTabListBox() @@ -875,8 +874,7 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram // must be done after FreeResource is called InitResources(); - // FIXME: HELPID - mpImpl->pEventLB->GetListBox().SetHelpId( ""/*HID_SVX_MACRO_LB_EVENT*/ ); + mpImpl->pEventLB->GetListBox().SetHelpId( HID_SVX_MACRO_LB_EVENT ); InitAndSetHandler( xNameReplace, Reference< container::XNameReplace>(0), Reference< util::XModifiable >(0)); DisplayAppEvents(true); diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 052809d07bd8..d243ce96f27c 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -249,20 +249,13 @@ SpellDialog::SpellDialog( pImpl = new SpellDialog_Impl; //HelpIds - // FIXME: HELPID - aClosePB. SetHelpId(""/*HID_SPLDLG_BUTTON_CLOSE*/ ); - // FIXME: HELPID - aIgnorePB. SetHelpId(""/*HID_SPLDLG_BUTTON_IGNORE*/ ); - // FIXME: HELPID - aIgnoreAllPB. SetHelpId(""/*HID_SPLDLG_BUTTON_IGNOREALL*/); - // FIXME: HELPID - aIgnoreRulePB. SetHelpId(""/*HID_SPLDLG_BUTTON_IGNORERULE*/); - // FIXME: HELPID - aChangePB. SetHelpId(""/*HID_SPLDLG_BUTTON_CHANGE*/ ); - // FIXME: HELPID - aChangeAllPB. SetHelpId(""/*HID_SPLDLG_BUTTON_CHANGEALL*/); - // FIXME: HELPID - aExplainPB. SetHelpId(""/*HID_SPLDLG_BUTTON_EXPLAIN*/ ); + aClosePB. SetHelpId(HID_SPLDLG_BUTTON_CLOSE ); + aIgnorePB. SetHelpId(HID_SPLDLG_BUTTON_IGNORE ); + aIgnoreAllPB. SetHelpId(HID_SPLDLG_BUTTON_IGNOREALL); + aIgnoreRulePB. SetHelpId(HID_SPLDLG_BUTTON_IGNORERULE); + aChangePB. SetHelpId(HID_SPLDLG_BUTTON_CHANGE ); + aChangeAllPB. SetHelpId(HID_SPLDLG_BUTTON_CHANGEALL); + aExplainPB. SetHelpId(HID_SPLDLG_BUTTON_EXPLAIN ); Init_Impl(); // disable controls if service is missing diff --git a/cui/source/dialogs/charmap.src b/cui/source/dialogs/charmap.src index 02e2e728f412..3605eee00ed6 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 ; @@ -92,7 +91,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 ; }; @@ -134,26 +132,6 @@ ModalDialog RID_SVXDLG_CHARMAP 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/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 58962c458281..a205db2a28c9 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -678,8 +678,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData ) String aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) ); BOOL bReadOnly = pThm->IsReadOnly() && !pThm->IsImported(); - // FIXME: HELPID - aEdtMSName.SetHelpId( ""/*HID_GALLERY_EDIT_MSNAME*/ ); + aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME ); aEdtMSName.SetText( pThm->GetName() ); aEdtMSName.SetReadOnly( bReadOnly ); diff --git a/cui/source/dialogs/grfflt.src b/cui/source/dialogs/grfflt.src index a94161c0a1ed..19fac6b9a4cd 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 ; @@ -141,7 +141,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 ; @@ -218,7 +218,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 ; @@ -290,7 +290,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 ; @@ -365,7 +365,7 @@ TabPage RID_SVX_GRFFILTER_DLG_EMBOSS_TAB 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 f59a64879c87..2198a42c3fcf 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -511,12 +511,9 @@ namespace svx } void SuggestionDisplay::SetHelpIds() { - // FIXME: HELPID - this->SetHelpId( ""/*HID_HANGULDLG_SUGGESTIONS*/ ); - // FIXME: HELPID - m_aValueSet.SetHelpId( ""/*HID_HANGULDLG_SUGGESTIONS_GRID*/ ); - // FIXME: HELPID - m_aListBox.SetHelpId( ""/*HID_HANGULDLG_SUGGESTIONS_LIST*/ ); + this->SetHelpId( HID_HANGULDLG_SUGGESTIONS ); + m_aValueSet.SetHelpId( HID_HANGULDLG_SUGGESTIONS_GRID ); + m_aListBox.SetHelpId( HID_HANGULDLG_SUGGESTIONS_LIST ); } //========================================================================= @@ -622,20 +619,13 @@ namespace svx // initial control values m_aSimpleConversion.Check(); - // FIXME: HELPID - m_pPlayground->GetButton(SvxCommonLinguisticControl::eClose )->SetHelpId(""/*HID_HANGULDLG_BUTTON_CLOSE*/ ); - // FIXME: HELPID - m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnore )->SetHelpId(""/*HID_HANGULDLG_BUTTON_IGNORE*/ ); - // FIXME: HELPID - m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnoreAll )->SetHelpId(""/*HID_HANGULDLG_BUTTON_IGNOREALL*/); - // FIXME: HELPID - m_pPlayground->GetButton(SvxCommonLinguisticControl::eChange )->SetHelpId(""/*HID_HANGULDLG_BUTTON_CHANGE*/ ); - // FIXME: HELPID - m_pPlayground->GetButton(SvxCommonLinguisticControl::eChangeAll )->SetHelpId(""/*HID_HANGULDLG_BUTTON_CHANGEALL*/); - // FIXME: HELPID - m_pPlayground->GetButton(SvxCommonLinguisticControl::eOptions )->SetHelpId(""/*HID_HANGULDLG_BUTTON_OPTIONS*/ ); - // FIXME: HELPID - m_pPlayground->GetWordInputControl().SetHelpId(""/*HID_HANGULDLG_EDIT_NEWWORD*/); + m_pPlayground->GetButton(SvxCommonLinguisticControl::eClose )->SetHelpId(HID_HANGULDLG_BUTTON_CLOSE ); + m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnore )->SetHelpId(HID_HANGULDLG_BUTTON_IGNORE ); + m_pPlayground->GetButton(SvxCommonLinguisticControl::eIgnoreAll )->SetHelpId(HID_HANGULDLG_BUTTON_IGNOREALL); + m_pPlayground->GetButton(SvxCommonLinguisticControl::eChange )->SetHelpId(HID_HANGULDLG_BUTTON_CHANGE ); + m_pPlayground->GetButton(SvxCommonLinguisticControl::eChangeAll )->SetHelpId(HID_HANGULDLG_BUTTON_CHANGEALL); + m_pPlayground->GetButton(SvxCommonLinguisticControl::eOptions )->SetHelpId(HID_HANGULDLG_BUTTON_OPTIONS ); + m_pPlayground->GetWordInputControl().SetHelpId(HID_HANGULDLG_EDIT_NEWWORD); FreeResource(); diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx index f4f1dfefb352..a87d7710f484 100644 --- a/cui/source/dialogs/hldoctp.cxx +++ b/cui/source/dialogs/hldoctp.cxx @@ -78,8 +78,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS maCbbPath.Show(); String aFileScheme( INET_FILE_SCHEME, RTL_TEXTENCODING_ASCII_US ); maCbbPath.SetBaseURL(aFileScheme); - // FIXME: HELPID - maCbbPath.SetHelpId( ""/*HID_HYPERDLG_DOC_PATH*/ ); + maCbbPath.SetHelpId( HID_HYPERDLG_DOC_PATH ); SetExchangeSupport (); diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx index bc932dba7a78..79fde6c7a64c 100644 --- a/cui/source/dialogs/hlinettp.cxx +++ b/cui/source/dialogs/hlinettp.cxx @@ -83,8 +83,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent, maCbbTarget.SetPosSizePixel ( LogicToPixel( Point( COL_2, 25 ), MAP_APPFONT ), LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbTarget.Show(); - // FIXME: HELPID - maCbbTarget.SetHelpId( ""/*HID_HYPERDLG_INET_PATH*/ ); + maCbbTarget.SetHelpId( HID_HYPERDLG_INET_PATH ); // Find Path to Std-Doc String aStrBasePaths( SvtPathOptions().GetTemplatePath() ); diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx index e60716483526..5ea43e165883 100644 --- a/cui/source/dialogs/hlmailtp.cxx +++ b/cui/source/dialogs/hlmailtp.cxx @@ -74,8 +74,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte LogicToPixel( Size ( 176 - COL_DIFF, 60), MAP_APPFONT ) ); maCbbReceiver.Show(); - // FIXME: HELPID - maCbbReceiver.SetHelpId( ""/*HID_HYPERDLG_MAIL_PATH*/ ); + maCbbReceiver.SetHelpId( HID_HYPERDLG_MAIL_PATH ); SetExchangeSupport (); diff --git a/cui/source/dialogs/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index 4ed7d1419bba..8f9f7a54adbe 100644 --- a/cui/source/dialogs/hyperdlg.src +++ b/cui/source/dialogs/hyperdlg.src @@ -746,7 +746,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/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx index 97d1f83a6dd2..adea20068499 100644 --- a/cui/source/dialogs/iconcdlg.cxx +++ b/cui/source/dialogs/iconcdlg.cxx @@ -300,8 +300,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, maIconCtrl.Show(); maIconCtrl.SetChoiceWithCursor ( TRUE ); maIconCtrl.SetSelectionMode( SINGLE_SELECTION ); - // FIXME: HELPID - maIconCtrl.SetHelpId( ""/*HID_ICCDIALOG_CHOICECTRL*/ ); + maIconCtrl.SetHelpId( HID_ICCDIALOG_CHOICECTRL ); // ItemSet if ( pSet ) @@ -312,14 +311,11 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId, // Buttons aOKBtn.SetClickHdl ( LINK( this, IconChoiceDialog, OkHdl ) ); - // FIXME: HELPID - aOKBtn.SetHelpId( ""/*HID_ICCDIALOG_OK_BTN*/ ); - // FIXME: HELPID - aCancelBtn.SetHelpId( ""/*HID_ICCDIALOG_CANCEL_BTN*/ ); + aOKBtn.SetHelpId( HID_ICCDIALOG_OK_BTN ); + aCancelBtn.SetHelpId( HID_ICCDIALOG_CANCEL_BTN ); aResetBtn.SetClickHdl( LINK( this, IconChoiceDialog, ResetHdl ) ); aResetBtn.SetText( CUI_RESSTR(RID_SVXSTR_ICONCHOICEDLG_RESETBUT) ); - // FIXME: HELPID - aResetBtn.SetHelpId( ""/*HID_ICCDIALOG_RESET_BTN*/ ); + aResetBtn.SetHelpId( HID_ICCDIALOG_RESET_BTN ); aOKBtn.Show(); aCancelBtn.Show(); aHelpBtn.Show(); diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 6e0cd2881161..4929c45b93e8 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,9 +70,7 @@ SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, ULONG nHelpId ) aTmp += aRow; } SetText( aTmp ); - // FIXME: HELPID - SetHelpId( ""/*nHelpId*/ ); - (void)nHelpId; + SetHelpId( sHelpId ); } short SvxInsRowColDlg::Execute(void) diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index e571e94880c9..0193cefa2964 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -109,8 +109,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml { FreeResource(); - // FIXME: HELPID - aTbLinks.SetHelpId(""/*HID_LINKDLG_TABLB*/); + aTbLinks.SetHelpId(HID_LINKDLG_TABLB); aTbLinks.SetSelectionMode( MULTIPLE_SELECTION ); aTbLinks.SetTabs( &nTabs[0], MAP_APPFONT ); aTbLinks.Resize(); // OS: Hack fuer richtige Selektion diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx index d5e023e33da4..2fe952b9197a 100644 --- a/cui/source/dialogs/pastedlg.cxx +++ b/cui/source/dialogs/pastedlg.cxx @@ -63,10 +63,8 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent ) aSObject( CUI_RES( S_OBJECT ) ) { FreeResource(); - // FIXME: HELPID - SetHelpId( ""/*HID_PASTE_DLG*/ ); - // FIXME: HELPID - SetUniqueId( ""/*HID_PASTE_DLG*/ ); + SetHelpId( HID_PASTE_DLG ); + SetUniqueId( HID_PASTE_DLG ); Font aFont = aFtObjectSource.GetFont(); aFont.SetWeight( WEIGHT_LIGHT ); diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx index 6b9038b0949f..8ff20084f591 100644 --- a/cui/source/dialogs/postdlg.cxx +++ b/cui/source/dialogs/postdlg.cxx @@ -89,14 +89,10 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent, { if (bRedline) // HelpIDs fuer Redlining { - // FIXME: HELPID - SetHelpId(""/*HID_REDLINING_DLG*/); - // FIXME: HELPID - aEditED.SetHelpId(""/*HID_REDLINING_EDIT*/); - // FIXME: HELPID - aPrevBtn.SetHelpId(""/*HID_REDLINING_PREV*/); - // FIXME: HELPID - aNextBtn.SetHelpId(""/*HID_REDLINING_NEXT*/); + SetHelpId(HID_REDLINING_DLG); + aEditED.SetHelpId(HID_REDLINING_EDIT); + aPrevBtn.SetHelpId(HID_REDLINING_PREV); + aNextBtn.SetHelpId(HID_REDLINING_NEXT); } aPrevBtn.SetClickHdl( LINK( this, SvxPostItDialog, PrevHdl ) ); diff --git a/cui/source/dialogs/postdlg.src b/cui/source/dialogs/postdlg.src index 904319d45355..e1ff3b32d98b 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -27,12 +27,13 @@ // include --------------------------------------------------------------- #include #include "postdlg.hrc" +#include "helpid.hrc" #include // 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 ) ; diff --git a/cui/source/dialogs/thesdlg.src b/cui/source/dialogs/thesdlg.src index c7caa659b1c0..84671c050e9a 100644 --- a/cui/source/dialogs/thesdlg.src +++ b/cui/source/dialogs/thesdlg.src @@ -35,7 +35,7 @@ // RID_SVXDLG_THES ------------------------------------------------------- ModalDialog RID_SVXDLG_THESAURUS { - HelpId = SID_THESAURUS ; + HelpId = CMD_SID_THESAURUS ; OutputSize = TRUE ; Size = MAP_APPFONT ( 285 , 116 ) ; Text [ en-US ] = "Thesaurus" ; diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx index 1b6d1c37651e..bfb3320d7ac6 100644 --- a/cui/source/dialogs/zoom.cxx +++ b/cui/source/dialogs/zoom.cxx @@ -218,7 +218,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 ); diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 8137b1c7bb89..3abf0f4d557b 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -28,11 +28,12 @@ #include #include "zoom.hrc" #include // 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 ) ; diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx index 91ec831ab5dc..00412e7bf400 100644 --- a/cui/source/factory/dlgfact.cxx +++ b/cui/source/factory/dlgfact.cxx @@ -723,15 +723,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 ) { - // FIXME: HELPID - pDlg->SetHelpId( ""/*nHelpId*/ ); - (void)nHelpId; + pDlg->SetHelpId( aHelpId ); } void AbstractSvxNameDialog_Impl::SetText( const XubString& rStr ) { @@ -843,11 +841,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 ) { - // FIXME: HELPID - pDlg->SetHelpId( ""/*nHelpId*/ ); - (void)nHelpId; + pDlg->SetHelpId( aHelpId ); } Window * AbstractSvxHpLinkDlg_Impl::GetWindow() @@ -1877,49 +1873,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 ) { - // FIXME: HELPID - 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" ) ) { - // FIXME: HELPID - 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 ) ); @@ -1954,7 +1942,7 @@ 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 ); } diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx index 844439efbf61..d57057501fe0 100644 --- a/cui/source/factory/dlgfact.hxx +++ b/cui/source/factory/dlgfact.hxx @@ -414,9 +414,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 +486,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 @@ -636,10 +636,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 ); @@ -795,7 +795,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 ); }; #endif diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx index 875a06ce332f..daff47bdf0af 100644 --- a/cui/source/inc/cfg.hxx +++ b/cui/source/inc/cfg.hxx @@ -744,8 +744,7 @@ public: aBtnOK.Enable( rLink.Call( this ) > 0 ); } - // FIXME: HELPID - 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/dlgname.hxx b/cui/source/inc/dlgname.hxx index 593a3045b592..173ef8e45139 100644 --- a/cui/source/inc/dlgname.hxx +++ b/cui/source/inc/dlgname.hxx @@ -91,8 +91,7 @@ public: aBtnOK.Enable( rLink.Call( this ) > 0 ); } - // FIXME: HELPID - void SetEditHelpId(ULONG /*nHelpId*/) {aEdtName.SetHelpId(""/*nHelpId*/);} + void SetEditHelpId( const rtl::OString& aHelpId) {aEdtName.SetHelpId(aHelpId);} }; /////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 1d98daa179e1..1a5bd8562f20 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -29,362 +29,352 @@ // include --------------------------------------------------------------- #include +#include +#include // 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) - -// please adjust ACT_SVX_HID_END2 below if you add entries here! - -// ----------------------------------------------------------------------- -// Overrun check --------------------------------------------------------- -// ----------------------------------------------------------------------- - -#define ACT_CUI_HID_END HID_CUI_START + 340 - -#if ACT_CUI_HID_END > HID_CUI_END -#error Resource-Ueberlauf in #line, #file -#endif - +#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" #endif diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index b0c678009093..f75ab2471923 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/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx index 585839b45fe8..76bbafa54faa 100644 --- a/cui/source/options/connpooloptions.cxx +++ b/cui/source/options/connpooloptions.cxx @@ -114,10 +114,8 @@ namespace offapp { SetStyle((GetStyle() & ~WB_HSCROLL) | WB_AUTOHSCROLL); - // FIXME: HELPID - SetUniqueId(""/*UID_OFA_CONNPOOL_DRIVERLIST_BACK*/); - // FIXME: HELPID - GetDataWindow().SetHelpId(""/*HID_OFA_CONNPOOL_DRIVERLIST*/); + SetUniqueId(UID_OFA_CONNPOOL_DRIVERLIST_BACK); + GetDataWindow().SetHelpId(HID_OFA_CONNPOOL_DRIVERLIST); } //-------------------------------------------------------------------- diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 555bc5290f37..c617a3e4c515 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -169,10 +169,8 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx pPathBox->InitHeaderBar( pHeaderBar ); pPathBox->SetHighlightRange(); - // FIXME: HELPID - pPathBox->SetHelpId( ""/*HID_DBPATH_CTL_PATH*/ ); - // FIXME: HELPID - pHeaderBar->SetHelpId( ""/*HID_DBPATH_HEADERBAR*/ ); + pPathBox->SetHelpId( HID_DBPATH_CTL_PATH ); + pHeaderBar->SetHelpId( HID_DBPATH_HEADERBAR ); pPathBox->Show(); pHeaderBar->Show(); diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 6903cae224d0..36e43a88ecce 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -97,8 +97,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, aNewPnt.Y() += nDelta; aNewDelTBX.SetPosPixel( aNewPnt ); - // FIXME: HELPID - aCheckLB.SetHelpId(""/*HID_OFA_FONT_SUBST_CLB*/); + aCheckLB.SetHelpId(HID_OFA_FONT_SUBST_CLB); aCheckLB.SetWindowBits(aCheckLB.GetStyle()|WB_HSCROLL|WB_VSCROLL); aCheckLB.SetSelectionMode(MULTIPLE_SELECTION); aCheckLB.SortByCol(2); diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx index 3de833cfd814..ff10e2744533 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,8 +903,7 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe else aCheckBoxes[i]->Hide(); aCheckBoxes[i]->SetBackground(aTransparentWall); - // FIXME: HELPID - aCheckBoxes[i]->SetHelpId(""/*HID_COLORPAGE_CHECKBOX_START + i*/); + aCheckBoxes[i]->SetHelpId( aColorCBHids[i] ); if(bSetTextColor) aCheckBoxes[i]->SetTextColor(aRCheckCol); } @@ -855,15 +942,15 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe XColorEntry* pEntry = aColorTable.GetColor(i); aColorBoxes[0]->InsertEntry( pEntry->GetColor(), pEntry->GetName() ); } - // FIXME: HELPID - 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] ); - // FIXME: HELPID - aColorBoxes[i]->SetHelpId(""/*HID_COLORPAGE_LISTBOX_START + i*/); + aColorBoxes[i]->SetHelpId( aColorLBHids[i] ); } } } @@ -1021,8 +1108,7 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl( const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); aScrollWindow.SetBackground(Wallpaper(rStyleSettings.GetFieldColor())); - // FIXME: HELPID - aScrollWindow.SetHelpId( ""/*HID_OPTIONS_COLORCONFIG_COLORLIST_WIN*/ ); + aScrollWindow.SetHelpId( HID_OPTIONS_COLORCONFIG_COLORLIST_WIN ); aVScroll.EnableDrag(); aVScroll.Show(); aHeaderHB.SetPosSizePixel( diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 06e4bdb16bba..637230587e6b 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -164,8 +164,7 @@ OfaMSFilterTabPage2::OfaMSFilterTabPage2( Window* pParent, aCheckLB.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_CENTER | HIB_VCENTER | HIB_FIXEDPOS | HIB_FIXED ); - // FIXME: HELPID - aCheckLB.SetHelpId( ""/*HID_OFAPAGE_MSFLTR2_CLB*/ ); + aCheckLB.SetHelpId( HID_OFAPAGE_MSFLTR2_CLB ); aCheckLB.SetWindowBits( WB_HSCROLL| WB_VSCROLL ); } diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index c1c864f6c831..31a40f2cd221 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -197,8 +197,7 @@ SvxJavaOptionsPage::SvxJavaOptionsPage( Window* pParent, const SfxItemSet& rSet sHeader += '\t'; m_aJavaList.InsertHeaderEntry( sHeader, HEADERBAR_APPEND, HIB_LEFT ); - // FIXME: HELPID - m_aJavaList.SetHelpId( ""/*HID_OPTIONS_JAVA_LIST*/ ); + m_aJavaList.SetHelpId( HID_OPTIONS_JAVA_LIST ); FreeResource(); diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 29a4376a1a54..f5bfd351ae45 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -1141,8 +1141,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, pCheckButtonData = NULL; aLinguModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - // FIXME: HELPID - aLinguModulesCLB.SetHelpId(""/*HID_CLB_LINGU_MODULES*/ ); + aLinguModulesCLB.SetHelpId(HID_CLB_LINGU_MODULES ); aLinguModulesCLB.SetHighlightRange(); aLinguModulesCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguModulesCLB.SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl)); @@ -1152,8 +1151,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, aLinguOptionsEditPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl )); aLinguDicsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - // FIXME: HELPID - aLinguDicsCLB.SetHelpId(""/*HID_CLB_EDIT_MODULES_DICS*/ ); + aLinguDicsCLB.SetHelpId(HID_CLB_EDIT_MODULES_DICS ); aLinguDicsCLB.SetHighlightRange(); aLinguDicsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguDicsCLB.SetCheckButtonHdl(LINK(this, SvxLinguTabPage, BoxCheckButtonHdl_Impl)); @@ -1163,8 +1161,7 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent, aLinguDicsDelPB.SetClickHdl( LINK( this, SvxLinguTabPage, ClickHdl_Impl )); aLinguOptionsCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); - // FIXME: HELPID - aLinguOptionsCLB.SetHelpId(""/*HID_CLB_LINGU_OPTIONS*/ ); + aLinguOptionsCLB.SetHelpId(HID_CLB_LINGU_OPTIONS ); aLinguOptionsCLB.SetHighlightRange(); aLinguOptionsCLB.SetSelectHdl( LINK( this, SvxLinguTabPage, SelectHdl_Impl )); aLinguOptionsCLB.SetDoubleClickHdl(LINK(this, SvxLinguTabPage, BoxDoubleClickHdl_Impl)); @@ -2055,8 +2052,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(Window* pParent, SvxLinguData_Impl& rData) aModulesCLB.SetWindowBits( WB_CLIPCHILDREN|WB_HSCROLL|WB_FORCE_MAKEVISIBLE ); aModulesCLB.SetHighlightRange(); - // FIXME: HELPID - aModulesCLB.SetHelpId(""/*HID_CLB_EDIT_MODULES_MODULES*/ ); + aModulesCLB.SetHelpId(HID_CLB_EDIT_MODULES_MODULES ); aModulesCLB.SetSelectHdl( LINK( this, SvxEditModulesDlg, SelectHdl_Impl )); aModulesCLB.SetCheckButtonHdl( LINK( this, SvxEditModulesDlg, BoxCheckButtonHdl_Impl) ); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index feb0b35efe41..f3d31aa33025 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -263,10 +263,8 @@ SvxPathTabPage::SvxPathTabPage( Window* pParent, const SfxItemSet& rSet ) : pPathBox->SetTabs( &nTabs[0], MAP_APPFONT ); pPathBox->InitHeaderBar( pHeaderBar ); pPathBox->SetHighlightRange(); - // FIXME: HELPID - pPathBox->SetHelpId( ""/*HID_OPTPATH_CTL_PATH*/ ); - // FIXME: HELPID - pHeaderBar->SetHelpId( ""/*HID_OPTPATH_HEADERBAR*/ ); + pPathBox->SetHelpId( HID_OPTPATH_CTL_PATH ); + pHeaderBar->SetHelpId( HID_OPTPATH_HEADERBAR ); pPathBox->Show(); pHeaderBar->Show(); diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index bbdb4bb17a1f..b63d9afc647e 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -889,8 +889,7 @@ void OfaTreeOptionsDialog::InitTreeAndHandler() aPageImagesHC = ImageList( ResId( RID_IMGLIST_TREEOPT_HC, *pIsoRes ) ); delete pIsoRes; - // FIXME: HELPID - aTreeLB.SetHelpId( ""/*HID_OFADLG_TREELISTBOX*/ ); + aTreeLB.SetHelpId( HID_OFADLG_TREELISTBOX ); aTreeLB.SetWindowBits( WB_HASBUTTONS | WB_HASBUTTONSATROOT | WB_HASLINES | WB_HASLINESATROOT | WB_CLIPCHILDREN | WB_HSCROLL | WB_FORCE_MAKEVISIBLE ); diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 3b01ba9c0e1f..0ee3c38c1e1d 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -105,8 +105,7 @@ OfaAutoCorrDlg::OfaAutoCorrDlg(Window* pParent, const SfxItemSet* _pSet ) : aLanguageFT.SetZOrder(0, WINDOW_ZORDER_FIRST); aLanguageLB.SetZOrder(&aLanguageFT, WINDOW_ZORDER_BEHIND); - // FIXME: HELPID - aLanguageLB.SetHelpId(""/*HID_AUTOCORR_LANGUAGE*/); + aLanguageLB.SetHelpId(HID_AUTOCORR_LANGUAGE); FreeResource(); AddTabPage(RID_OFAPAGE_AUTOCORR_OPTIONS, OfaAutocorrOptionsPage::Create, 0); @@ -229,8 +228,7 @@ OfaAutocorrOptionsPage::OfaAutocorrOptionsPage( Window* pParent, { FreeResource(); - // FIXME: HELPID - aCheckLB.SetHelpId(""/*HID_OFAPAGE_AUTOCORR_CLB*/); + aCheckLB.SetHelpId(HID_OFAPAGE_AUTOCORR_CLB); } /*-----------------14.10.96 15.58------------------- @@ -494,8 +492,7 @@ OfaSwAutoFmtOptionsPage::OfaSwAutoFmtOptionsPage( Window* pParent, //typ. Anfuehrungszeichen einsetzen SvtSysLocale aSysLcl; - // FIXME: HELPID - aCheckLB.SetHelpId(""/*HID_OFAPAGE_AUTOFORMAT_CLB*/); + aCheckLB.SetHelpId(HID_OFAPAGE_AUTOFORMAT_CLB); aCheckLB.SetWindowBits(WB_HSCROLL| WB_VSCROLL); aCheckLB.SetSelectHdl(LINK(this, OfaSwAutoFmtOptionsPage, SelectHdl)); @@ -2065,10 +2062,8 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) : BOOL bShowSWOptions = FALSE; - // FIXME: HELPID - aCheckLB.SetHelpId( ""/*HID_OFAPAGE_QUOTE_CLB*/ ); - // FIXME: HELPID - aSwCheckLB.SetHelpId( ""/*HID_OFAPAGE_QUOTE_SW_CLB*/ ); + aCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_CLB ); + aSwCheckLB.SetHelpId( HID_OFAPAGE_QUOTE_SW_CLB ); SFX_ITEMSET_ARG( &rSet, pItem, SfxBoolItem, SID_AUTO_CORRECT_DLG, FALSE ); if ( pItem && pItem->GetValue() ) diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src index 9db3dbeb43b4..2fb063ede772 100644 --- a/cui/source/tabpages/autocdlg.src +++ b/cui/source/tabpages/autocdlg.src @@ -247,7 +247,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 ) ; diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index e531c2ccda55..9bf88e151770 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -243,8 +243,7 @@ SvxSingleNumPickTabPage::SvxSingleNumPickTabPage(Window* pParent, SetExchangeSupport(); pExamplesVS->SetSelectHdl(LINK(this, SvxSingleNumPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxSingleNumPickTabPage, DoubleClickHdl_Impl)); - // FIXME: HELPID - pExamplesVS->SetHelpId(""/*HID_VALUESET_SINGLENUM*/ ); + pExamplesVS->SetHelpId(HID_VALUESET_SINGLENUM ); Reference xDefNum = lcl_GetNumberingProvider(); if(xDefNum.is()) @@ -473,8 +472,7 @@ SvxBulletPickTabPage::SvxBulletPickTabPage(Window* pParent, SetExchangeSupport(); pExamplesVS->SetSelectHdl(LINK(this, SvxBulletPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxBulletPickTabPage, DoubleClickHdl_Impl)); - // FIXME: HELPID - pExamplesVS->SetHelpId(""/*HID_VALUESET_BULLET*/ ); + pExamplesVS->SetHelpId(HID_VALUESET_BULLET ); } /*-----------------07.02.97 12.10------------------- @@ -677,8 +675,7 @@ SvxNumPickTabPage::SvxNumPickTabPage(Window* pParent, pExamplesVS->SetSelectHdl(LINK(this, SvxNumPickTabPage, NumSelectHdl_Impl)); pExamplesVS->SetDoubleClickHdl(LINK(this, SvxNumPickTabPage, DoubleClickHdl_Impl)); - // FIXME: HELPID - pExamplesVS->SetHelpId(""/*HID_VALUESET_NUM*/ ); + pExamplesVS->SetHelpId(HID_VALUESET_NUM ); Reference xDefNum = lcl_GetNumberingProvider(); if(xDefNum.is()) @@ -994,8 +991,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent, // Grafiknamen ermitteln GalleryExplorer::FillObjList(GALLERY_THEME_BULLETS, aGrfNames); - // FIXME: HELPID - pExamplesVS->SetHelpId(""/*HID_VALUESET_NUMBMP*/ ); + pExamplesVS->SetHelpId(HID_VALUESET_NUMBMP ); for(USHORT i = 0; i < aGrfNames.Count(); i++) { pExamplesVS->InsertItem( i + 1, i); diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx index 14c51452feeb..9060b6fb013e 100644 --- a/cui/source/tabpages/tpbitmap.cxx +++ b/cui/source/tabpages/tpbitmap.cxx @@ -645,8 +645,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - // FIXME: HELPID - pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } if( pWarnBox->Execute() != RET_OK ) @@ -776,8 +775,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickImportHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - // FIXME: HELPID - pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } @@ -889,8 +887,7 @@ IMPL_LINK( SvxBitmapTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 48178ca4d0e7..5152bd0e9478 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -488,8 +488,7 @@ IMPL_LINK( SvxColorTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -575,8 +574,7 @@ IMPL_LINK( SvxColorTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -1038,12 +1036,9 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG ) aMtrFldColorModel4.Hide(); aMtrFldColorModel4.SetValue( 0L ); - // FIXME: HELPID - aMtrFldColorModel1.SetHelpId( ""/*HID_TPCOLOR_RGB_1*/ ); - // FIXME: HELPID - aMtrFldColorModel2.SetHelpId( ""/*HID_TPCOLOR_RGB_2*/ ); - // FIXME: HELPID - aMtrFldColorModel3.SetHelpId( ""/*HID_TPCOLOR_RGB_3*/ ); + aMtrFldColorModel1.SetHelpId( HID_TPCOLOR_RGB_1 ); + aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_RGB_2 ); + aMtrFldColorModel3.SetHelpId( HID_TPCOLOR_RGB_3 ); // Da der alte HelpText noch am Control steht wuerde // ein Umsetzen der HelpID alleine nichts bewirken @@ -1087,12 +1082,9 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG ) aFtColorModel4.Show(); aMtrFldColorModel4.Show(); - // FIXME: HELPID - aMtrFldColorModel1.SetHelpId( ""/*HID_TPCOLOR_CMYK_1*/ ); - // FIXME: HELPID - aMtrFldColorModel2.SetHelpId( ""/*HID_TPCOLOR_CMYK_2*/ ); - // FIXME: HELPID - aMtrFldColorModel3.SetHelpId( ""/*HID_TPCOLOR_CMYK_3*/ ); + aMtrFldColorModel1.SetHelpId( HID_TPCOLOR_CMYK_1 ); + aMtrFldColorModel2.SetHelpId( HID_TPCOLOR_CMYK_2 ); + aMtrFldColorModel3.SetHelpId( HID_TPCOLOR_CMYK_3 ); // s.o. aMtrFldColorModel1.SetHelpText( String() ); diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx index f7f8d2319846..1de256416b9d 100644 --- a/cui/source/tabpages/tpgradnt.cxx +++ b/cui/source/tabpages/tpgradnt.cxx @@ -482,8 +482,7 @@ IMPL_LINK( SvxGradientTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - // FIXME: HELPID - pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } if( pWarnBox->Execute() != RET_OK ) @@ -600,8 +599,7 @@ IMPL_LINK( SvxGradientTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx index 70de87806a78..4fa65d95221a 100644 --- a/cui/source/tabpages/tphatch.cxx +++ b/cui/source/tabpages/tphatch.cxx @@ -546,8 +546,7 @@ IMPL_LINK( SvxHatchTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) pWarnBox = new WarningBox( DLGWIN, WinBits( WB_OK_CANCEL ), String( ResId( nError, rMgr ) ) ); - // FIXME: HELPID - pWarnBox->SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + pWarnBox->SetHelpId( HID_WARN_NAME_DUPLICATE ); } if( pWarnBox->Execute() != RET_OK ) @@ -660,8 +659,7 @@ IMPL_LINK( SvxHatchTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx index dd105e0ed682..5f1b385e8137 100644 --- a/cui/source/tabpages/tplnedef.cxx +++ b/cui/source/tabpages/tplnedef.cxx @@ -639,8 +639,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } @@ -721,8 +720,7 @@ IMPL_LINK( SvxLineDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx index ed7ff628060f..4949ce4da6fa 100644 --- a/cui/source/tabpages/tplneend.cxx +++ b/cui/source/tabpages/tplneend.cxx @@ -372,8 +372,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickModifyHdl_Impl, void *, EMPTYARG ) { WarningBox aWarningBox( DLGWIN, WinBits( WB_OK ), String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aWarningBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aWarningBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aWarningBox.Execute(); SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); @@ -521,8 +520,7 @@ IMPL_LINK( SvxLineEndDefTabPage, ClickAddHdl_Impl, void *, EMPTYARG ) else { WarningBox aBox( DLGWIN, WinBits( WB_OK ),String( ResId( RID_SVXSTR_WARN_NAME_DUPLICATE, rMgr ) ) ); - // FIXME: HELPID - aBox.SetHelpId( ""/*HID_WARN_NAME_DUPLICATE*/ ); + aBox.SetHelpId( HID_WARN_NAME_DUPLICATE ); aBox.Execute(); } } diff --git a/extensions/inc/abpilot.hrc b/extensions/inc/abpilot.hrc index ad2c4b1115c2..3e26ad3435fa 100644 --- a/extensions/inc/abpilot.hrc +++ b/extensions/inc/abpilot.hrc @@ -29,17 +29,11 @@ #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 c67060e18edf..f6d601d63f20 100644 --- a/extensions/inc/bibliography.hrc +++ b/extensions/inc/bibliography.hrc @@ -29,58 +29,52 @@ #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 46ee01805938..acc02b64d82a 100644 --- a/extensions/inc/dbpilots.hrc +++ b/extensions/inc/dbpilots.hrc @@ -29,27 +29,21 @@ #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 6961319f4dda..0b2b48eede67 100644 --- a/extensions/inc/propctrlr.hrc +++ b/extensions/inc/propctrlr.hrc @@ -29,309 +29,304 @@ #include "extensio.hrc" -#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_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_LAST_PROPC_ID HID_FM_PROPDLG_TAB_EVT +#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" -#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 2cd1f8f69f12..7624978ebb82 100644 --- a/extensions/inc/update.hrc +++ b/extensions/inc/update.hrc @@ -29,21 +29,15 @@ #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/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index a596143fac0f..b315893b6447 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -106,16 +106,11 @@ namespace abp WZS_INVALID_STATE ); - // FIXME: HELPID - m_pPrevPage->SetHelpId(""/*HID_ABSPILOT_PREVIOUS*/); - // FIXME: HELPID - m_pNextPage->SetHelpId(""/*HID_ABSPILOT_NEXT*/); - // FIXME: HELPID - m_pCancel->SetHelpId(""/*HID_ABSPILOT_CANCEL*/); - // FIXME: HELPID - m_pFinish->SetHelpId(""/*HID_ABSPILOT_FINISH*/); - // FIXME: HELPID - m_pHelp->SetUniqueId(""/*UID_ABSPILOT_HELP*/); + m_pPrevPage->SetHelpId(HID_ABSPILOT_PREVIOUS); + m_pNextPage->SetHelpId(HID_ABSPILOT_NEXT); + m_pCancel->SetHelpId(HID_ABSPILOT_CANCEL); + m_pFinish->SetHelpId(HID_ABSPILOT_FINISH); + m_pHelp->SetUniqueId(UID_ABSPILOT_HELP); m_pCancel->SetClickHdl( LINK( this, OAddessBookSourcePilot, OnCancelClicked) ); diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 9fa401a1620c..6a9290ee59b9 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -1437,8 +1437,8 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS 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 ) ) ); + sId += ::rtl::OUString::createFromAscii( HID_BIB_DB_GRIDCTRL ); + xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } } catch(Exception& e ) diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 72a018650e6b..4489fad70161 100644 --- a/extensions/source/bibliography/framectr.cxx +++ b/extensions/source/bibliography/framectr.cxx @@ -198,8 +198,7 @@ BibFrameController_Impl::BibFrameController_Impl( const uno::Reference< awt::XWi ,pBibMod(NULL) { Window* pParent = VCLUnoHelper::GetWindow( xWindow ); - // FIXME: HELPID - pParent->SetUniqueId(""/*UID_BIB_FRAME_WINDOW*/); + pParent->SetUniqueId(UID_BIB_FRAME_WINDOW); bDisposing=sal_False; bHierarchical=sal_True; pImp = new BibFrameCtrl_Impl; diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index aed795d37c15..156c82673213 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -245,8 +245,7 @@ BibGeneralPage::BibGeneralPage(Window* pParent, BibDataManager* pMan): pDatMan(pMan) { aControlParentWin.Show(); - // FIXME: HELPID - aControlParentWin.SetHelpId(""/*HID_BIB_CONTROL_PARENT*/); + aControlParentWin.SetHelpId(HID_BIB_CONTROL_PARENT); aStdSize = GetOutputSizePixel(); aBibTypeArr[0] = String(BibResId(ST_TYPE_ARTICLE)); @@ -464,12 +463,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!" ); @@ -488,7 +487,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 @@ -510,11 +509,9 @@ 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( "HID:" ); + 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 fdcb97c9e177..27074404929a 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/toolbar.src b/extensions/source/bibliography/toolbar.src index b8a604587bc4..a08fe44d04bd 100644 --- a/extensions/source/bibliography/toolbar.src +++ b/extensions/source/bibliography/toolbar.src @@ -27,6 +27,7 @@ #include #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/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index ef9f4088028b..6e28567aef62 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -65,14 +65,10 @@ namespace dbp { initControlSettings(&m_aSettings); - // FIXME: HELPID - m_pPrevPage->SetHelpId(""/*HID_GRIDWIZARD_PREVIOUS*/); - // FIXME: HELPID - m_pNextPage->SetHelpId(""/*HID_GRIDWIZARD_NEXT*/); - // FIXME: HELPID - m_pCancel->SetHelpId(""/*HID_GRIDWIZARD_CANCEL*/); - // FIXME: HELPID - m_pFinish->SetHelpId(""/*HID_GRIDWIZARD_FINISH*/); + m_pPrevPage->SetHelpId(HID_GRIDWIZARD_PREVIOUS); + m_pNextPage->SetHelpId(HID_GRIDWIZARD_NEXT); + m_pCancel->SetHelpId(HID_GRIDWIZARD_CANCEL); + m_pFinish->SetHelpId(HID_GRIDWIZARD_FINISH); // if we do not need the data source selection page ... if (!needDatasourceSelection()) diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx index d98a23046e69..7bf3138bf5fe 100644 --- a/extensions/source/dbpilots/groupboxwiz.cxx +++ b/extensions/source/dbpilots/groupboxwiz.cxx @@ -66,14 +66,10 @@ namespace dbp { initControlSettings(&m_aSettings); - // FIXME: HELPID - m_pPrevPage->SetHelpId(""/*HID_GROUPWIZARD_PREVIOUS*/); - // FIXME: HELPID - m_pNextPage->SetHelpId(""/*HID_GROUPWIZARD_NEXT*/); - // FIXME: HELPID - m_pCancel->SetHelpId(""/*HID_GROUPWIZARD_CANCEL*/); - // FIXME: HELPID - m_pFinish->SetHelpId(""/*HID_GROUPWIZARD_FINISH*/); + m_pPrevPage->SetHelpId(HID_GROUPWIZARD_PREVIOUS); + m_pNextPage->SetHelpId(HID_GROUPWIZARD_NEXT); + m_pCancel->SetHelpId(HID_GROUPWIZARD_CANCEL); + m_pFinish->SetHelpId(HID_GROUPWIZARD_FINISH); } //--------------------------------------------------------------------- diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 135fc3721982..2e810654baa4 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -67,14 +67,10 @@ namespace dbp { initControlSettings(&m_aSettings); - // FIXME: HELPID - m_pPrevPage->SetHelpId(""/*HID_LISTWIZARD_PREVIOUS*/); - // FIXME: HELPID - m_pNextPage->SetHelpId(""/*HID_LISTWIZARD_NEXT*/); - // FIXME: HELPID - m_pCancel->SetHelpId(""/*HID_LISTWIZARD_CANCEL*/); - // FIXME: HELPID - m_pFinish->SetHelpId(""/*HID_LISTWIZARD_FINISH*/); + m_pPrevPage->SetHelpId(HID_LISTWIZARD_PREVIOUS); + m_pNextPage->SetHelpId(HID_LISTWIZARD_NEXT); + m_pCancel->SetHelpId(HID_LISTWIZARD_CANCEL); + m_pFinish->SetHelpId(HID_LISTWIZARD_FINISH); // if we do not need the data source selection page ... if (!needDatasourceSelection()) diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 142b112032fe..b678f15515a7 100644 --- a/extensions/source/propctrlr/browserline.cxx +++ b/extensions/source/propctrlr/browserline.cxx @@ -105,27 +105,20 @@ namespace pcr } //------------------------------------------------------------------ - void OBrowserLine::SetComponentHelpIds( const rtl::OString& _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 ) - // FIXME: HELPID m_pControlWindow->SetHelpId( _rHelpId ); if ( m_pBrowseButton ) { - // FIXME: HELPID m_pBrowseButton->SetHelpId( _rHelpId ); - // FIXME: HELPID - m_pBrowseButton->SetUniqueId( ""/*_bPrimaryButtonId*/ ); - (void)_bPrimaryButtonId; + m_pBrowseButton->SetUniqueId( _sPrimaryButtonId ); if ( m_pAdditionalBrowseButton ) { - // FIXME: HELPID m_pAdditionalBrowseButton->SetHelpId( _rHelpId ); - // FIXME: HELPID - m_pAdditionalBrowseButton->SetUniqueId( ""/*_nSecondaryButtonId*/ ); - (void)_nSecondaryButtonId; + m_pAdditionalBrowseButton->SetUniqueId( _sSecondaryButtonId ); } } } diff --git a/extensions/source/propctrlr/browserline.hxx b/extensions/source/propctrlr/browserline.hxx index 5ac0d4c9758d..565f2516fbe2 100644 --- a/extensions/source/propctrlr/browserline.hxx +++ b/extensions/source/propctrlr/browserline.hxx @@ -92,8 +92,7 @@ namespace pcr const ::rtl::OUString& GetEntryName() const { return m_sEntryName; } - // FIXME: HELPID - void SetComponentHelpIds( const rtl::OString& _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 67257f960f5b..55afa4ac0043 100644 --- a/extensions/source/propctrlr/browserlistbox.cxx +++ b/extensions/source/propctrlr/browserlistbox.cxx @@ -1215,8 +1215,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/browserview.cxx b/extensions/source/propctrlr/browserview.cxx index aceb3982054e..a023c5ef6b01 100644 --- a/extensions/source/propctrlr/browserview.cxx +++ b/extensions/source/propctrlr/browserview.cxx @@ -56,8 +56,7 @@ namespace pcr DBG_CTOR(OPropertyBrowserView,NULL); m_pPropBox = new OPropertyEditor( this ); - // FIXME: HELPID - m_pPropBox->SetHelpId(""/*HID_FM_PROPDLG_TABCTR*/); + m_pPropBox->SetHelpId(HID_FM_PROPDLG_TABCTR); m_pPropBox->setPageActivationHandler(LINK(this, OPropertyBrowserView, OnPageActivation)); m_pPropBox->Show(); diff --git a/extensions/source/propctrlr/defaultforminspection.cxx b/extensions/source/propctrlr/defaultforminspection.cxx index f477c4deaa1e..ace7be265fb1 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 cfa93bb35d7d..e2d57aaee57e 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 5c3fdba085c3..8afe4c889c92 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 b8b50e4b4a5f..a2d9003a75f4 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 ) + :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 fbf2cc38b63e..99eabba56275 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/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx index 9d8becfbd923..d9fe180c1ac7 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 294a43e4a9e7..82a313a70105 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/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index 317a42d56425..3067c67fc76d 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -53,23 +53,19 @@ namespace pcr //------------------------------------------------------------------------ rtl::OString HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) { - // FIXME: HELPID - #if 0 - SmartId aSmartHelpId( _rHelpURL ); + rtl::OString aHelpId( _rHelpURL, _rHelpURL.getLength(), RTL_TEXTENCODING_UTF8 ); if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) ) - aSmartHelpId = SmartId( _rHelpURL.copy( sizeof( "HID:" ) - 1 ).toInt32() ); - return aSmartHelpId; - #else - return rtl::OUStringToOString( _rHelpURL, RTL_TEXTENCODING_UTF8 ); - #endif + aHelpId = aHelpId.copy( sizeof( "HID:" ) - 1 ); + return aHelpId; } //------------------------------------------------------------------------ - ::rtl::OUString HelpIdUrl::getHelpURL( sal_uInt32 _nHelpId ) + ::rtl::OUString HelpIdUrl::getHelpURL( const rtl::OString& sHelpId ) { ::rtl::OUStringBuffer aBuffer; + ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); aBuffer.appendAscii( "HID:" ); - aBuffer.append( (sal_Int32)_nHelpId ); + aBuffer.append( aTmp.getStr() ); return aBuffer.makeStringAndClear(); } //............................................................................ diff --git a/extensions/source/propctrlr/pcrcommon.hxx b/extensions/source/propctrlr/pcrcommon.hxx index 162b9780ca30..69e508ca8d87 100644 --- a/extensions/source/propctrlr/pcrcommon.hxx +++ b/extensions/source/propctrlr/pcrcommon.hxx @@ -77,9 +77,8 @@ namespace pcr class HelpIdUrl { public: - // FIXME: HELPID static rtl::OString getHelpId( const ::rtl::OUString& _rHelpURL ); - static ::rtl::OUString getHelpURL( sal_uInt32 _nHelpId ); + static ::rtl::OUString getHelpURL( const rtl::OString& ); }; //==================================================================== diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 2bb73f06490d..814b7475fbae 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -1273,7 +1273,6 @@ 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 ] = - // FIXME: HELPID 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 5abcf155cc2e..2d81566d8fbb 100644 --- a/extensions/source/propctrlr/propertyeditor.cxx +++ b/extensions/source/propctrlr/propertyeditor.cxx @@ -236,7 +236,6 @@ namespace pcr pPage->getListBox().SetObserver(m_pObserver); pPage->getListBox().EnableHelpSection( m_bHasHelpSection ); pPage->getListBox().SetHelpLineLimites( m_nMinHelpLines, m_nMaxHelpLines ); - // FIXME: HELPID pPage->SetHelpId( _rHelpId ); // immediately activate the page @@ -246,20 +245,12 @@ namespace pcr return nId; } -// FIXME: HELPID -#if 0 //------------------------------------------------------------------ - void OPropertyEditor::SetHelpId( sal_uInt32 nHelpId ) + void OPropertyEditor::SetHelpId( const rtl::OString& rHelpId ) { Control::SetHelpId(""); - // FIXME: HELPID - #if 0 - m_aTabControl.SetHelpId(nHelpId); - #else - (void)nHelpId; - #endif - } -#endif + m_aTabControl.SetHelpId(rHelpId); + } //------------------------------------------------------------------ void OPropertyEditor::RemovePage(sal_uInt16 nID) diff --git a/extensions/source/propctrlr/propertyeditor.hxx b/extensions/source/propctrlr/propertyeditor.hxx index 10b4b73fe54c..6affea7376d3 100644 --- a/extensions/source/propctrlr/propertyeditor.hxx +++ b/extensions/source/propctrlr/propertyeditor.hxx @@ -97,7 +97,7 @@ namespace pcr void SetHelpText( const ::rtl::OUString& _rHelpText ); void SetHelpLineLimites( sal_Int32 _nMinLines, sal_Int32 _nMaxLines ); - // FIXME: HELPID + 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); diff --git a/extensions/source/propctrlr/propertyinfo.hxx b/extensions/source/propctrlr/propertyinfo.hxx index e389c3282460..3e188c25fe06 100644 --- a/extensions/source/propctrlr/propertyinfo.hxx +++ b/extensions/source/propctrlr/propertyinfo.hxx @@ -31,6 +31,7 @@ #include #include #include +#include #include //............................................................................ @@ -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/xsdvalidationpropertyhandler.cxx b/extensions/source/propctrlr/xsdvalidationpropertyhandler.cxx index 7af9166510da..a7a6844973ea 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/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index cd1c5f1f721a..78ebae14b31b 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -156,7 +156,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( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DOWNLOAD2 ) ) ); mbDownloadBtnHasDots = bAppendDots; } @@ -1071,7 +1071,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( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DLG ) ) ); } { // Label (fixed text) uno::Sequence< beans::NamedValue > aProps(1); @@ -1098,7 +1098,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( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_STATUS ) ) ); insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_STATUS, awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET, @@ -1129,7 +1129,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( "HID:" ) + 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 ), @@ -1142,7 +1142,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( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_RESUME ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[RESUME_BUTTON], awt::Rectangle( BOX1_BTN_X, @@ -1158,7 +1158,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( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_CANCEL ) ) ); insertControlModel ( xControlModel, BUTTON_MODEL, msButtonIDs[CANCEL_BUTTON], awt::Rectangle( BOX1_BTN_X, @@ -1192,7 +1192,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( "HID:" ) + rtl::OUString::createFromAscii( HID_CHECK_FOR_UPD_DESCRIPTION ) ) ); insertControlModel( xControlModel, EDIT_FIELD_MODEL, TEXT_DESCRIPTION, awt::Rectangle( DIALOG_BORDER + TEXT_OFFSET, @@ -1222,7 +1222,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( "HID:" ) + 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 ), @@ -1235,7 +1235,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( "HID:" ) + 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 ), @@ -1248,7 +1248,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( "HID:" ) + 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/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx index 0947db14cbb7..5ea3fbb47a38 100644 --- a/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx +++ b/xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx @@ -210,8 +210,7 @@ DigitalSignaturesDialog::DigitalSignaturesDialog( ,m_bWarningShowSignMacro(false) { // --> PB #i48253 the tablistbox needs its own unique id - // FIXME: HELPID - maSignaturesLB.Window::SetUniqueId( ""/*HID_XMLSEC_TREE_SIGNATURESDLG*/ ); + maSignaturesLB.Window::SetUniqueId( HID_XMLSEC_TREE_SIGNATURESDLG ); // <-- static long nTabs[] = { 4, 0, 6*DS_LB_WIDTH/100, 36*DS_LB_WIDTH/100, 74*DS_LB_WIDTH/100 }; maSignaturesLB.SetTabs( &nTabs[ 0 ] ); diff --git a/xmlsecurity/source/dialogs/helpids.hrc b/xmlsecurity/source/dialogs/helpids.hrc index 6456dddb47b9..7c4514607f57 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 -- cgit From bf035be9001dff17650418326df102b1fea22651 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 10 Jul 2010 18:21:24 +0200 Subject: CWS changehid: #i111874#: change code to support HelpIds as byte strings --- filter/inc/filter.hrc | 13 ++-- filter/source/xsltdialog/xmlfileview.cxx | 6 +- filter/source/xsltdialog/xmlfilterhelpids.hrc | 89 +++++++++++----------- .../source/xsltdialog/xmlfiltersettingsdialog.cxx | 3 +- filter/source/xsltdialog/xmlfiltertabdialog.cxx | 3 +- filter/source/xsltdialog/xmlfiltertabpagebasic.cxx | 6 +- filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 12 +-- 7 files changed, 59 insertions(+), 73 deletions(-) diff --git a/filter/inc/filter.hrc b/filter/inc/filter.hrc index 4bea3330f617..2bbf94ed50c7 100644 --- a/filter/inc/filter.hrc +++ b/filter/inc/filter.hrc @@ -55,12 +55,11 @@ // warning, next range is RID_FILTER_START + 100 ! -#define HID_FILTER_XSLT_START (HID_FILTER_START + 0) // see source/xsltdialog/xmlfilterhelpids.hrc for range -#define HID_FILTER_XSLT_END (HID_FILTER_START + 99) -#define HID_FILTER_PDF_OPTIONS (HID_FILTER_START + 100) -#define HID_FILTER_PDF_INITIAL_VIEW (HID_FILTER_START + 101) -#define HID_FILTER_PDF_USER_INTERFACE (HID_FILTER_START + 102) -#define HID_FILTER_PDF_SECURITY (HID_FILTER_START + 103) -#define HID_FILTER_PDF_LINKS (HID_FILTER_START + 104) +#define HID_FILTER_PDF_OPTIONS "HID_FILTER_PDF_OPTIONS" +#define HID_FILTER_PDF_INITIAL_VIEW "HID_FILTER_PDF_INITIAL_VIEW" +#define HID_FILTER_PDF_USER_INTERFACE "HID_FILTER_PDF_USER_INTERFACE" +#define HID_FILTER_PDF_SECURITY "HID_FILTER_PDF_SECURITY" +#define HID_FILTER_PDF_LINKS "HID_FILTER_PDF_LINKS" + #endif diff --git a/filter/source/xsltdialog/xmlfileview.cxx b/filter/source/xsltdialog/xmlfileview.cxx index ea7e41dd8ed3..a9cb18bed8d2 100644 --- a/filter/source/xsltdialog/xmlfileview.cxx +++ b/filter/source/xsltdialog/xmlfileview.cxx @@ -524,10 +524,8 @@ XMLSourceFileDialog::XMLSourceFileDialog( Window* pParent, ResMgr& rResMgr, cons maPBValidate.SetClickHdl(LINK( this, XMLSourceFileDialog, ClickHdl_Impl ) ); maLBOutput.SetSelectHdl(LINK(this, XMLSourceFileDialog, SelectHdl_Impl ) ); mpTextWindow = new XMLFileWindow( this ); - // FIXME: HELPID - mpTextWindow->SetHelpId( ""/*HID_XML_FILTER_OUTPUT_WINDOW*/ ); - // FIXME: HELPID - maLBOutput.SetHelpId( ""/*HID_XML_FILTER_TEST_VALIDATE_OUPUT*/ ); + mpTextWindow->SetHelpId( HID_XML_FILTER_OUTPUT_WINDOW ); + maLBOutput.SetHelpId( HID_XML_FILTER_TEST_VALIDATE_OUPUT ); Resize(); } diff --git a/filter/source/xsltdialog/xmlfilterhelpids.hrc b/filter/source/xsltdialog/xmlfilterhelpids.hrc index 9c49d0537723..9029c58513d6 100644 --- a/filter/source/xsltdialog/xmlfilterhelpids.hrc +++ b/filter/source/xsltdialog/xmlfilterhelpids.hrc @@ -31,58 +31,55 @@ #include "filter.hrc" #endif -#define HID_XML_SOURCE_FILE_DIALOG (HID_FILTER_XSLT_START + 0) -#define HID_XML_SOURCE_FILE_VALIDATE (HID_FILTER_XSLT_START + 1) -#define HID_XML_FILTER_SETTINGS_DIALOG (HID_FILTER_XSLT_START + 2) -#define HID_XML_FILTER_LIST (HID_FILTER_XSLT_START + 3) -#define HID_XML_FILTER_NEW (HID_FILTER_XSLT_START + 4) -#define HID_XML_FILTER_EDIT (HID_FILTER_XSLT_START + 5) -#define HID_XML_FILTER_TEST (HID_FILTER_XSLT_START + 6) -#define HID_XML_FILTER_DELETE (HID_FILTER_XSLT_START + 7) -#define HID_XML_FILTER_SAVE (HID_FILTER_XSLT_START + 8) -#define HID_XML_FILTER_OPEN (HID_FILTER_XSLT_START + 9) -#define HID_XML_FILTER_CLOSE (HID_FILTER_XSLT_START + 10) +#define HID_XML_SOURCE_FILE_DIALOG "FILTER_HID_XML_SOURCE_FILE_DIALOG" +#define HID_XML_SOURCE_FILE_VALIDATE "FILTER_HID_XML_SOURCE_FILE_VALIDATE" +#define HID_XML_FILTER_SETTINGS_DIALOG "FILTER_HID_XML_FILTER_SETTINGS_DIALOG" +#define HID_XML_FILTER_LIST "FILTER_HID_XML_FILTER_LIST" +#define HID_XML_FILTER_NEW "FILTER_HID_XML_FILTER_NEW" +#define HID_XML_FILTER_EDIT "FILTER_HID_XML_FILTER_EDIT" +#define HID_XML_FILTER_TEST "FILTER_HID_XML_FILTER_TEST" +#define HID_XML_FILTER_DELETE "FILTER_HID_XML_FILTER_DELETE" +#define HID_XML_FILTER_SAVE "FILTER_HID_XML_FILTER_SAVE" +#define HID_XML_FILTER_OPEN "FILTER_HID_XML_FILTER_OPEN" +#define HID_XML_FILTER_CLOSE "FILTER_HID_XML_FILTER_CLOSE" -#define HID_XML_FILTER_TABDIALOG (HID_FILTER_XSLT_START + 11) -#define HID_XML_FILTER_TABPAGE_BASIC (HID_FILTER_XSLT_START + 12) -#define HID_XML_FILTER_TABPAGE_XSLT (HID_FILTER_XSLT_START + 13) -#define HID_XML_FILTER_NAME (HID_FILTER_XSLT_START + 14) -#define HID_XML_FILTER_APPLICATION (HID_FILTER_XSLT_START + 15) -#define HID_XML_FILTER_INTERFACE_NAME (HID_FILTER_XSLT_START + 16) -#define HID_XML_FILTER_EXTENSION (HID_FILTER_XSLT_START + 17) -#define HID_XML_FILTER_DESCRIPTION (HID_FILTER_XSLT_START + 18) -#define HID_XML_FILTER_DOCTYPE (HID_FILTER_XSLT_START + 19) -#define HID_XML_FILTER_DTD (HID_FILTER_XSLT_START + 20) -#define HID_XML_FILTER_DTD_BROWSE (HID_FILTER_XSLT_START + 21) -#define HID_XML_FILTER_EXPORT_XSLT (HID_FILTER_XSLT_START + 22) -#define HID_XML_FILTER_EXPORT_XSLT_BROWSE (HID_FILTER_XSLT_START + 23) -#define HID_XML_FILTER_IMPORT_XSLT (HID_FILTER_XSLT_START + 24) -#define HID_XML_FILTER_IMPORT_XSLT_BROWSE (HID_FILTER_XSLT_START + 25) -#define HID_XML_FILTER_IMPORT_TEMPLATE (HID_FILTER_XSLT_START + 26) -#define HID_XML_FILTER_TEST_DIALOG (HID_FILTER_XSLT_START + 27) +#define HID_XML_FILTER_TABDIALOG "FILTER_HID_XML_FILTER_TABDIALOG" +#define HID_XML_FILTER_TABPAGE_BASIC "FILTER_HID_XML_FILTER_TABPAGE_BASIC" +#define HID_XML_FILTER_TABPAGE_XSLT "FILTER_HID_XML_FILTER_TABPAGE_XSLT" +#define HID_XML_FILTER_NAME "FILTER_HID_XML_FILTER_NAME" +#define HID_XML_FILTER_APPLICATION "FILTER_HID_XML_FILTER_APPLICATION" +#define HID_XML_FILTER_INTERFACE_NAME "FILTER_HID_XML_FILTER_INTERFACE_NAME" +#define HID_XML_FILTER_EXTENSION "FILTER_HID_XML_FILTER_EXTENSION" +#define HID_XML_FILTER_DESCRIPTION "FILTER_HID_XML_FILTER_DESCRIPTION" +#define HID_XML_FILTER_DOCTYPE "FILTER_HID_XML_FILTER_DOCTYPE" +#define HID_XML_FILTER_DTD "FILTER_HID_XML_FILTER_DTD" +#define HID_XML_FILTER_DTD_BROWSE "FILTER_HID_XML_FILTER_DTD_BROWSE" +#define HID_XML_FILTER_EXPORT_XSLT "FILTER_HID_XML_FILTER_EXPORT_XSLT" +#define HID_XML_FILTER_EXPORT_XSLT_BROWSE "FILTER_HID_XML_FILTER_EXPORT_XSLT_BROWSE" +#define HID_XML_FILTER_IMPORT_XSLT "FILTER_HID_XML_FILTER_IMPORT_XSLT" +#define HID_XML_FILTER_IMPORT_XSLT_BROWSE "FILTER_HID_XML_FILTER_IMPORT_XSLT_BROWSE" +#define HID_XML_FILTER_IMPORT_TEMPLATE "FILTER_HID_XML_FILTER_IMPORT_TEMPLATE" +#define HID_XML_FILTER_TEST_DIALOG "FILTER_HID_XML_FILTER_TEST_DIALOG" -#define HID_XML_FILTER_TEST_EXPORT_BROWSE (HID_FILTER_XSLT_START + 28) -#define HID_XML_FILTER_TEST_EXPORT_CURRENT (HID_FILTER_XSLT_START + 29) -#define HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE (HID_FILTER_XSLT_START + 30) +#define HID_XML_FILTER_TEST_EXPORT_BROWSE "FILTER_HID_XML_FILTER_TEST_EXPORT_BROWSE" +#define HID_XML_FILTER_TEST_EXPORT_CURRENT "FILTER_HID_XML_FILTER_TEST_EXPORT_CURRENT" +#define HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE "FILTER_HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE" -#define HID_XML_FILTER_TEST_IMPORT_XSLT_FILE (HID_FILTER_XSLT_START + 31) -#define HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE (HID_FILTER_XSLT_START + 32) -#define HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE (HID_FILTER_XSLT_START + 33) -#define HID_XML_FILTER_TEST_IMPORT_BROWSE (HID_FILTER_XSLT_START + 34) -#define HID_XML_FILTER_TEST_IMPORT_RECENT (HID_FILTER_XSLT_START + 35) -#define HID_XML_FILTER_TEST_IMPORT_RECENT_FILE (HID_FILTER_XSLT_START + 36) -#define HID_XML_FILTER_TEST_CLOSE (HID_FILTER_XSLT_START + 37) +#define HID_XML_FILTER_TEST_IMPORT_XSLT_FILE "FILTER_HID_XML_FILTER_TEST_IMPORT_XSLT_FILE" +#define HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE "FILTER_HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE" +#define HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE "FILTER_HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE" +#define HID_XML_FILTER_TEST_IMPORT_BROWSE "FILTER_HID_XML_FILTER_TEST_IMPORT_BROWSE" +#define HID_XML_FILTER_TEST_IMPORT_RECENT "FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT" +#define HID_XML_FILTER_TEST_IMPORT_RECENT_FILE "FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT_FILE" +#define HID_XML_FILTER_TEST_CLOSE "FILTER_HID_XML_FILTER_TEST_CLOSE" -#define HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE (HID_FILTER_XSLT_START + 38) +#define HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE "FILTER_HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE" -#define HID_XML_FILTER_TEST_VALIDATE_OUPUT (HID_FILTER_XSLT_START + 39) -#define HID_XML_FILTER_OUTPUT_WINDOW (HID_FILTER_XSLT_START + 40) +#define HID_XML_FILTER_TEST_VALIDATE_OUPUT "FILTER_HID_XML_FILTER_TEST_VALIDATE_OUPUT" +#define HID_XML_FILTER_OUTPUT_WINDOW "FILTER_HID_XML_FILTER_OUTPUT_WINDOW" -#define HID_XML_FILTER_TEST_EXPORT_XSLT_FILE (HID_FILTER_XSLT_START + 41) +#define HID_XML_FILTER_TEST_EXPORT_XSLT_FILE "FILTER_HID_XML_FILTER_TEST_EXPORT_XSLT_FILE" -#define HID_XML_FILTER_TABPAGE_CTRL (HID_FILTER_XSLT_START + 42) - -// last help id is HID_FILTER_XSLT_END ! -// #define HID_FILTER_XSLT_END (HID_FILTER_START + 99) +#define HID_XML_FILTER_TABPAGE_CTRL "FILTER_HID_XML_FILTER_TABPAGE_CTRL" #endif diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx index 931181e3fffb..46cab18f6c77 100644 --- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx @@ -91,8 +91,7 @@ XMLFilterSettingsDialog::XMLFilterSettingsDialog( Window* pParent, ResMgr& rResM mpFilterListBox->SetSelectHdl( LINK( this, XMLFilterSettingsDialog, SelectionChangedHdl_Impl ) ); mpFilterListBox->SetDeselectHdl( LINK( this, XMLFilterSettingsDialog, SelectionChangedHdl_Impl ) ); mpFilterListBox->SetDoubleClickHdl( LINK( this, XMLFilterSettingsDialog, DoubleClickHdl_Impl ) ); - // FIXME: HELPID - mpFilterListBox->SetHelpId( ""/*HID_XML_FILTER_LIST*/ ); + mpFilterListBox->SetHelpId( HID_XML_FILTER_LIST ); maPBNew.SetClickHdl(LINK( this, XMLFilterSettingsDialog, ClickHdl_Impl ) ); maPBEdit.SetClickHdl(LINK( this, XMLFilterSettingsDialog, ClickHdl_Impl ) ); diff --git a/filter/source/xsltdialog/xmlfiltertabdialog.cxx b/filter/source/xsltdialog/xmlfiltertabdialog.cxx index b74adb0bd69c..63c369610295 100644 --- a/filter/source/xsltdialog/xmlfiltertabdialog.cxx +++ b/filter/source/xsltdialog/xmlfiltertabdialog.cxx @@ -63,8 +63,7 @@ XMLFilterTabDialog::XMLFilterTabDialog( Window *pParent, ResMgr& rResMgr, const { FreeResource(); - // FIXME: HELPID - maTabCtrl.SetHelpId( ""/*HID_XML_FILTER_TABPAGE_CTRL*/ ); + maTabCtrl.SetHelpId( HID_XML_FILTER_TABPAGE_CTRL ); mpOldInfo = pInfo; mpNewInfo = new filter_info_impl( *mpOldInfo ); diff --git a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx index 1c4642e743e9..b88e9ff802a4 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagebasic.cxx @@ -50,10 +50,8 @@ XMLFilterTabPageBasic::XMLFilterTabPageBasic( Window* pParent, ResMgr& rResMgr ) maFTDescription( this, ResId( FT_XML_DESCRIPTION, rResMgr ) ), maEDDescription( this, ResId( ED_XML_DESCRIPTION, rResMgr ) ) { - // FIXME: HELPID - maCBApplication.SetHelpId( ""/*HID_XML_FILTER_APPLICATION*/ ); - // FIXME: HELPID - maEDDescription.SetHelpId( ""/*HID_XML_FILTER_DESCRIPTION*/ ); + maCBApplication.SetHelpId( HID_XML_FILTER_APPLICATION ); + maEDDescription.SetHelpId( HID_XML_FILTER_DESCRIPTION ); FreeResource(); diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx index 95485951ae0a..17743a09d321 100644 --- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx +++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx @@ -91,14 +91,10 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent, ResMgr& rResMgr, co maPBImportXSLT.SetClickHdl( LINK ( this, XMLFilterTabPageXSLT, ClickBrowseHdl_Impl ) ); maPBImportTemplate.SetClickHdl( LINK ( this, XMLFilterTabPageXSLT, ClickBrowseHdl_Impl ) ); - // FIXME: HELPID - maEDDTDSchema.SetHelpId( ""/*HID_XML_FILTER_DTD*/ ); - // FIXME: HELPID - maEDExportXSLT.SetHelpId( ""/*HID_XML_FILTER_EXPORT_XSLT*/ ); - // FIXME: HELPID - maEDImportXSLT.SetHelpId( ""/*HID_XML_FILTER_IMPORT_XSLT*/ ); - // FIXME: HELPID - maEDImportTemplate.SetHelpId( ""/*HID_XML_FILTER_IMPORT_TEMPLATE*/ ); + maEDDTDSchema.SetHelpId( HID_XML_FILTER_DTD ); + maEDExportXSLT.SetHelpId( HID_XML_FILTER_EXPORT_XSLT ); + maEDImportXSLT.SetHelpId( HID_XML_FILTER_IMPORT_XSLT ); + maEDImportTemplate.SetHelpId( HID_XML_FILTER_IMPORT_TEMPLATE ); } XMLFilterTabPageXSLT::~XMLFilterTabPageXSLT() -- cgit From 1a3ab0a0693f161d8e92b28933ecd45c04ff3eea Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 10 Jul 2010 18:21:24 +0200 Subject: CWS changehid: #i111874#: change code to support HelpIds as byte strings --- offapi/com/sun/star/inspection/LineDescriptor.idl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/offapi/com/sun/star/inspection/LineDescriptor.idl b/offapi/com/sun/star/inspection/LineDescriptor.idl index 5bf9486f82ee..df8d72c9edd2 100644 --- a/offapi/com/sun/star/inspection/LineDescriptor.idl +++ b/offapi/com/sun/star/inspection/LineDescriptor.idl @@ -94,7 +94,7 @@ struct LineDescriptor

If a primary button exists for a property's UI representation (HasPrimaryButton), it gets the ID specified herein.

*/ - long PrimaryButtonId; + string PrimaryButtonId; /** describes the URL of an image to display on the primary button, if any. @@ -139,7 +139,7 @@ struct LineDescriptor @see PrimaryButtonId */ - long SecondaryButtonId; + string SecondaryButtonId; /** describes the URL of an image to display on the secondary button, if any. -- cgit From 4d5f552378c194e195c7d20f3b90d2e582a70c7c Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 15 Jul 2010 15:24:06 +0200 Subject: CWS changehid: #i111874#: fix warning --- framework/inc/uielement/commandinfo.hxx | 2 +- framework/source/uielement/toolbarmanager.cxx | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx index 5b9822af86e6..58aa382bc6eb 100644 --- a/framework/inc/uielement/commandinfo.hxx +++ b/framework/inc/uielement/commandinfo.hxx @@ -53,7 +53,7 @@ struct CommandInfo bRotated( false ) {} USHORT nId; - sal_uInt32 nWidth; + sal_uInt16 nWidth; ::std::vector< USHORT > aIds; sal_Int16 nImageInfo; sal_Bool bMirrored : 1, diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 7010fe1de8be..cae11097a7be 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -953,7 +953,7 @@ void ToolBarManager::CreateControllers() sal_Bool bCreate( sal_True ); Reference< XStatusListener > xController; CommandToInfoMap::iterator pCommandIter = m_aCommandMap.find( aCommandURL ); - sal_Int32 nWidth = ( pCommandIter != m_aCommandMap.end() ? pCommandIter->second.nWidth : 0 ); + sal_Int16 nWidth = ( pCommandIter != m_aCommandMap.end() ? pCommandIter->second.nWidth : 0 ); svt::ToolboxController* pController( 0 ); @@ -1299,7 +1299,7 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine rtl::OUString aHelpURL; rtl::OUString aTooltip; sal_uInt16 nType( ::com::sun::star::ui::ItemType::DEFAULT ); - sal_uInt32 nWidth( 0 ); + sal_uInt16 nWidth( 0 ); sal_Bool bIsVisible( sal_True ); sal_uInt32 nStyle( 0 ); -- cgit From d3d0fc1c0e22460fdb1ba902654d4dc861c91658 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 15 Jul 2010 15:24:55 +0200 Subject: CWS changehid: #i111874#: remove unnecessary HelpIds --- soldep/source/soldlg.src | 6 ------ 1 file changed, 6 deletions(-) diff --git a/soldep/source/soldlg.src b/soldep/source/soldlg.src index 0f5035fcee6e..6a20ea8c7b86 100644 --- a/soldep/source/soldlg.src +++ b/soldep/source/soldlg.src @@ -272,7 +272,6 @@ ToolBox TID_SOLDEP_MAIN Identifier = TID_SOLDEP_OPEN; Type = TOOLBOXITEM_BUTTON; Text = "Load"; - HelpId = TID_SOLDEP_OPEN; HelpText = "Load"; Checkable = TRUE; ItemBitmap = Bitmap @@ -285,7 +284,6 @@ ToolBox TID_SOLDEP_MAIN Identifier = TID_SOLDEP_SAVE; Type = TOOLBOXITEM_BUTTON; Text = "Save"; - HelpId = TID_SOLDEP_SAVE; HelpText = "Save"; Checkable = TRUE; ItemBitmap = Bitmap @@ -302,7 +300,6 @@ ToolBox TID_SOLDEP_MAIN Identifier = TID_SOLDEP_SELECT_WORKSPACE; Type = TOOLBOXITEM_BUTTON; Text = "Select Workspace"; - HelpId = TID_SOLDEP_HIDE_INDEPENDEND; HelpText = "Select Workspace"; Checkable = TRUE; ItemBitmap = Bitmap @@ -315,7 +312,6 @@ ToolBox TID_SOLDEP_MAIN Identifier = TID_SOLDEP_FIND; Type = TOOLBOXITEM_BUTTON; Text = "Find Module"; - HelpId = TID_SOLDEP_FIND; HelpText = "Find Module"; Checkable = TRUE; ItemBitmap = Bitmap @@ -328,7 +324,6 @@ ToolBox TID_SOLDEP_MAIN Identifier = TID_SOLDEP_BACK; Type = TOOLBOXITEM_BUTTON; Text = "Back to Overview"; - HelpId = TID_SOLDEP_BACK; HelpText = "Back to Overview"; Checkable = TRUE; ItemBitmap = Bitmap @@ -341,7 +336,6 @@ ToolBox TID_SOLDEP_MAIN Identifier = TID_SOLDEP_HIDE_INDEPENDEND; Type = TOOLBOXITEM_BUTTON; Text = "Hide Independend Modules"; - HelpId = TID_SOLDEP_HIDE_INDEPENDEND; HelpText = "Hide Independend Modules"; Checkable = TRUE; ItemBitmap = Bitmap -- cgit From f63122a36c49fddb002aa366c656baace37c25d8 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 15 Jul 2010 15:24:55 +0200 Subject: CWS changehid: #i111874#: remove unnecessary HelpIds --- sfx2/util/hidother.src | 1 - 1 file changed, 1 deletion(-) diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src index 38e5577a72be..262bfdf4639d 100644 --- a/sfx2/util/hidother.src +++ b/sfx2/util/hidother.src @@ -159,7 +159,6 @@ hidspecial HID_HELP_TOOLBOXITEM_PRINT { HelpID = HID_HELP_TOOLBOXITEM_ hidspecial HID_HELP_TOOLBOXITEM_BOOKMARKS { HelpID = HID_HELP_TOOLBOXITEM_BOOKMARKS; }; hidspecial HID_HELP_TOOLBOXITEM_SEARCHDIALOG { HelpID = HID_HELP_TOOLBOXITEM_SEARCHDIALOG; }; hidspecial HID_TBXCONTROL_FILENEW { HelpID = HID_TBXCONTROL_FILENEW; }; -hidspecial HID_GLOBAL_FALLBACK { HelpID = HID_GLOBAL_FALLBACK; }; hidspecial HID_CLOSE_WARNING { HelpID = HID_CLOSE_WARNING; }; hidspecial HID_DID_SAVE_PACKED_XML { HelpID = HID_DID_SAVE_PACKED_XML; }; hidspecial HID_HELP_ONHELP { HelpID = HID_HELP_ONHELP; }; -- cgit From 9112377ffbadc543be19dd2b09ca283759d7a469 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 15 Jul 2010 15:24:55 +0200 Subject: CWS changehid: #i111874#: remove unnecessary HelpIds --- dbaccess/util/hidother.src | 1 - 1 file changed, 1 deletion(-) diff --git a/dbaccess/util/hidother.src b/dbaccess/util/hidother.src index bc49f49b87e6..2971f9e443e0 100644 --- a/dbaccess/util/hidother.src +++ b/dbaccess/util/hidother.src @@ -301,7 +301,6 @@ hidspecial UID_APP_VIEW_VERT_SPLIT { HelpId = UID_APP_VIEW_ hidspecial UID_APP_VIEW_BORDER_WIN { HelpId = UID_APP_VIEW_BORDER_WIN ; }; hidspecial HID_APP_CREATION_LIST { HelpId = HID_APP_CREATION_LIST ; }; hidspecial UID_APP_SWAP_VIEW { HelpId = UID_APP_SWAP_VIEW ; }; -hidspecial UID_DLG_TABLE_FILTER { HelpId = UID_DLG_TABLE_FILTER ; }; hidspecial HID_APP_SWAP_ICONCONTROL { HelpId = HID_APP_SWAP_ICONCONTROL ; }; hidspecial HID_DSADMIN_APPENDTABLEALIAS { HelpId = HID_DSADMIN_APPENDTABLEALIAS ; }; -- cgit From 8a5421776a0637baf250df56a9834cbe610ec055 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 15 Jul 2010 15:25:26 +0200 Subject: CWS changehid: #i111874#: HelpIds now are byte strings --- toolkit/source/layout/core/import.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/source/layout/core/import.cxx b/toolkit/source/layout/core/import.cxx index daaa8c239f50..50bfd8656008 100644 --- a/toolkit/source/layout/core/import.cxx +++ b/toolkit/source/layout/core/import.cxx @@ -101,7 +101,7 @@ SAL_THROW (()) if ( findAndRemove( "help-id", aProps, aHelpId ) ) { OSL_TRACE("Setting help-id: %s", OUSTRING_CSTR( aHelpId ) ); - xDialog->setHelpId( aHelpId.toInt32 () ); + xDialog->setHelpId( aHelpId ); } } // DEBUG: else if ( pParent == NULL ) -- cgit From 5528106113daa7490f3461b644f1089b872b8802 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 15 Jul 2010 15:25:53 +0200 Subject: CWS changehid: #i111874#: handle HID protocol in URLObject --- tools/inc/tools/urlobj.hxx | 4 +++- tools/source/fsys/urlobj.cxx | 9 ++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/tools/inc/tools/urlobj.hxx b/tools/inc/tools/urlobj.hxx index 17d52432e206..cb9c7e407bcc 100644 --- a/tools/inc/tools/urlobj.hxx +++ b/tools/inc/tools/urlobj.hxx @@ -81,6 +81,7 @@ namespace com { namespace sun { namespace star { namespace util { #define INET_DB_SCHEME "db:" #define INET_BUGID_SCHEME "bugid:" #define INET_TELNET_SCHEME "telnet://" +#define INET_HID_SCHEME "hid:" #define URL_PREFIX_PRIV_SOFFICE "private:" enum @@ -139,7 +140,8 @@ enum INetProtocol INET_PROT_VND_SUN_STAR_TDOC = 29, INET_PROT_GENERIC = 30, INET_PROT_SMB = 31, - INET_PROT_END = 32 + INET_PROT_HID = 32, + INET_PROT_END = 33 }; //============================================================================ diff --git a/tools/source/fsys/urlobj.cxx b/tools/source/fsys/urlobj.cxx index a6d7bc6fd04e..56e6b8ef47cc 100644 --- a/tools/source/fsys/urlobj.cxx +++ b/tools/source/fsys/urlobj.cxx @@ -424,7 +424,9 @@ static INetURLObject::SchemeInfo const aSchemeInfoMap[INET_PROT_END] false, false, false, true, false }, { "", "", 0, false, false, false, false, true, true, true, false }, { "smb", "smb://", 139, true, true, false, true, true, true, true, - true } }; + true }, + { "hid", "hid:", 0, false, false, false, false, false, false, + false, true } }; // static inline INetURLObject::SchemeInfo const & @@ -2094,6 +2096,8 @@ INetURLObject::getPrefix(sal_Unicode const *& rBegin, { "db:", "staroffice.db:", INET_PROT_DB, PrefixInfo::INTERNAL }, { "file:", 0, INET_PROT_FILE, PrefixInfo::OFFICIAL }, { "ftp:", 0, INET_PROT_FTP, PrefixInfo::OFFICIAL }, + { "hid:", "staroffice.hid:", INET_PROT_HID, + PrefixInfo::INTERNAL }, { "http:", 0, INET_PROT_HTTP, PrefixInfo::OFFICIAL }, { "https:", 0, INET_PROT_HTTPS, PrefixInfo::OFFICIAL }, { "imap:", 0, INET_PROT_IMAP, PrefixInfo::OFFICIAL }, @@ -2129,6 +2133,8 @@ INetURLObject::getPrefix(sal_Unicode const *& rBegin, INET_PROT_PRIV_SOFFICE, PrefixInfo::EXTERNAL }, { "staroffice.helpid:", "private:helpid/", INET_PROT_PRIV_SOFFICE, PrefixInfo::EXTERNAL }, + { "staroffice.hid:", "hid:", INET_PROT_HID, + PrefixInfo::EXTERNAL }, { "staroffice.java:", "private:java/", INET_PROT_PRIV_SOFFICE, PrefixInfo::EXTERNAL }, { "staroffice.macro:", "macro:", INET_PROT_MACRO, @@ -3120,6 +3126,7 @@ bool INetURLObject::parsePath(INetProtocol eScheme, case INET_PROT_PRIV_SOFFICE: case INET_PROT_SLOT: + case INET_PROT_HID: case INET_PROT_MACRO: case INET_PROT_UNO: case INET_PROT_COMPONENT: -- cgit From 86bfc8c31eaf79bc5b2d28d1025e7e104155eb54 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 15 Jul 2010 15:26:26 +0200 Subject: CWS changehid: #i111874#: use HID generation to create conversion list for testtool and help --- soltools/HIDCompiler/hidclex.l | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soltools/HIDCompiler/hidclex.l b/soltools/HIDCompiler/hidclex.l index e99618f30225..565e42960462 100755 --- a/soltools/HIDCompiler/hidclex.l +++ b/soltools/HIDCompiler/hidclex.l @@ -697,7 +697,7 @@ num4tag (([Pp][Oo][Ss][Ss][Ii][Zz][Ee])) globsuffix = globsuffix==NULL ? glob:globsuffix+1; if( ares->helpID ) { - fprintf( outfile,"\n\t printf(\"%s \\t %cs %cu \\n\",\n", + fprintf( outfile,"\n\t printf(\"%s \\t %cs %cs \\n\",\n", ares->helpID,'%','%'); fprintf(outfile,"\t\"HelpID\", (%s) ); \n", ares->helpID); } -- cgit From f1482b059a1906c9098e0c37df315ad1ca8a83b1 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Jul 2010 15:51:02 +0200 Subject: CWS changehid: #i111784#: helpid fallback on command name used --- framework/source/uielement/macrosmenucontroller.cxx | 2 -- framework/source/uielement/toolbarmanager.cxx | 1 - 2 files changed, 3 deletions(-) diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 44f968a45788..afe2e7173086 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -102,7 +102,6 @@ void MacrosMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPo String aDisplayName = RetrieveLabelFromCommand( aCommand ); pPopupMenu->InsertItem( 2, aDisplayName ); pPopupMenu->SetItemCommand( 2, aCommand ); - pPopupMenu->SetHelpId( 2, ".uno:MacroDialog" ); // insert providers but not basic or java addScriptItems( pPopupMenu, 4); @@ -222,7 +221,6 @@ void MacrosMenuController::addScriptItems( PopupMenu* pPopupMenu, USHORT startIt aDisplayName.Append( ellipsis ); pPopupMenu->InsertItem( itemId, aDisplayName ); pPopupMenu->SetItemCommand( itemId, aCommand ); - pPopupMenu->SetHelpId( itemId, rtl::OString( aCommand.GetBuffer(), aCommand.Len(), RTL_TEXTENCODING_UTF8 ) ); itemId++; break; } diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index cae11097a7be..ebaf097bb79f 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -957,7 +957,6 @@ void ToolBarManager::CreateControllers() svt::ToolboxController* pController( 0 ); - m_pToolBar->SetHelpId( nId, "" ); // reset value again if ( bHasDisabledEntries ) { aURL.Complete = aCommandURL; -- cgit From 2d07734f316c1795bc59ed0974b3dc6612ed3f24 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Jul 2010 15:51:27 +0200 Subject: CWS changehid: #i111784#: remve wrong commit --- idl/source/prj/command.cxx | 2 -- 1 file changed, 2 deletions(-) diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx index 9509219eb99a..4b2535a7e61b 100644 --- a/idl/source/prj/command.cxx +++ b/idl/source/prj/command.cxx @@ -276,8 +276,6 @@ SvCommand::SvCommand( int argc, char ** argv ) if( 's' == aFirstChar ) { // Name der Slot-Ausgabe aSlotMapFile = aName; - aName += String::CreateFromAscii(".csv"); - aCSVFile = aName; } else if( 'l' == aFirstChar ) { // Name der Listing -- cgit From e01eb5f2ebce908c95205d3328342fd42a0eee3f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Jul 2010 15:52:05 +0200 Subject: CWS changehid: #i111784#: SID_FRAME_UP/DOWN already existed as commands --- reportdesign/inc/helpids.hrc | 3 --- reportdesign/source/ui/report/report.src | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc index 410e11337147..9904d5428ae8 100644 --- a/reportdesign/inc/helpids.hrc +++ b/reportdesign/inc/helpids.hrc @@ -122,8 +122,5 @@ #define HID_RPT_GROUPSORT_MOVE_DOWN "REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_DOWN" #define HID_RPT_GROUPSORT_DELETE "REPORTDESIGN_HID_RPT_GROUPSORT_DELETE" -#define HID_FRAME_UP "REPORTDESIGN_HID_FRAME_UP" -#define HID_FRAME_DOWN "REPORTDESIGN_HID_FRAME_DOWN" - #endif //RTPUI_REPORTDESIGN_HELPID_HRC diff --git a/reportdesign/source/ui/report/report.src b/reportdesign/source/ui/report/report.src index f9f8afcbcb9a..95d1629d13ac 100644 --- a/reportdesign/source/ui/report/report.src +++ b/reportdesign/source/ui/report/report.src @@ -361,13 +361,13 @@ Menu RID_MENU_REPORT MenuItem { Identifier = SID_FRAME_UP ; - HelpId = HID_FRAME_UP; + HelpId = ".uno:ObjectForwardOne"; Text [ en-US ] = "Bring ~Forward" ; }; MenuItem { Identifier = SID_FRAME_DOWN ; - HelpId = HID_FRAME_DOWN; + HelpId = ".uno:ObjectBackOne"; Text [ en-US ] = "Send Back~ward" ; }; MenuItem -- cgit From 700856ce780f2a2ed56635c0a0463be554f5262f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Jul 2010 15:52:33 +0200 Subject: CWS changehid: #i111784#: corrected mistake --- vcl/source/window/status.cxx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 1fbfcd7344d7..44c656fc13c8 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -1533,7 +1533,14 @@ rtl::OString StatusBar::GetHelpId( USHORT nItemId ) const rtl::OString aRet; if ( nPos != STATUSBAR_ITEM_NOTFOUND ) - aRet = mpItemList->GetObject( nPos )->maHelpId; + { + ImplStatusItem* pItem = mpItemList->GetObject( nPos ); + if ( pItem->maHelpId.getLength() ) + aRet = pItem->maHelpId; + else + aRet = ::rtl::OUStringToOString( pItem->maCommand, RTL_TEXTENCODING_UTF8 ); + } + return aRet; } -- cgit From 0d57686448dd908fad2650f6eee75482a27c9b6a Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 16 Jul 2010 16:10:51 +0200 Subject: CWS changehid: #i111784#: remove superfluous PatchResIds --- svtools/inc/svtools/svtdata.hxx | 17 +--- svtools/source/java/javainteractionhandler.cxx | 109 +++---------------------- svtools/source/misc/svtdata.cxx | 18 ---- 3 files changed, 11 insertions(+), 133 deletions(-) diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtdata.hxx index 9faadaff7305..cf3c259e3e31 100644 --- a/svtools/inc/svtools/svtdata.hxx +++ b/svtools/inc/svtools/svtdata.hxx @@ -40,11 +40,10 @@ class ImpSvtData public: SfxItemDesruptorList_Impl * pItemDesruptList; ResMgr * pResMgr; - ResMgr * pPatchResMgr; private: ImpSvtData(): - pItemDesruptList(0), pResMgr(0), pPatchResMgr(0) + pItemDesruptList(0), pResMgr(0) {} ~ImpSvtData(); @@ -52,24 +51,10 @@ private: public: ResMgr * GetResMgr(const ::com::sun::star::lang::Locale aLocale); ResMgr * GetResMgr(); // VCL dependant, only available in SVT, not in SVL! - ResMgr * GetPatchResMgr(); - ResMgr * GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale); static ImpSvtData & GetSvtData(); }; -//============================================================================ - -class SvpResId: public ResId -{ -public: - SvpResId( USHORT nId, const ::com::sun::star::lang::Locale aLocale ): - ResId( nId, *ImpSvtData::GetSvtData().GetResMgr( aLocale ) ) {} - - // VCL dependant, only available in SVT, not in SVL! - SvpResId( USHORT nId ); -}; - class SvtResId: public ResId { diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index ec34ed07f25d..499d2c1f502c 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -147,28 +147,10 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // No suitable JRE found vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bJavaNotFound_Handled = true; - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idWBX = SvtResId(WARNINGBOX_JAVANOTFOUND); - SvpResId pidPatchWBX(WARNINGBOX_JAVANOTFOUND); - pidPatchWBX.SetRT(RSC_WARNINGBOX); - ResMgr *pMgrWB = pidPatchWBX.GetResMgr(); - if (pMgrWB && pMgrWB->IsAvailable(pidPatchWBX)) - idWBX = pidPatchWBX; - WarningBox aWarningBox( NULL, idWBX); - - String aTitle; - SvpResId pidString(STR_WARNING_JAVANOTFOUND); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND )); - + WarningBox aWarningBox( NULL, SvtResId(WARNINGBOX_JAVANOTFOUND)); + String aTitle = String( SvtResId( STR_WARNING_JAVANOTFOUND )); aWarningBox.SetText( aTitle ); nResult = aWarningBox.Execute(); - } else { @@ -182,25 +164,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // javavendors.xml was updated and Java has not been configured yet vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bInvalidSettings_Handled = true; - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idWBX = SvtResId(WARNINGBOX_INVALIDJAVASETTINGS); - SvpResId pidPatchWBX(WARNINGBOX_INVALIDJAVASETTINGS); - pidPatchWBX.SetRT(RSC_WARNINGBOX); - ResMgr *pMgrWB = pidPatchWBX.GetResMgr(); - if (pMgrWB && pMgrWB->IsAvailable(pidPatchWBX)) - idWBX = pidPatchWBX; - WarningBox aWarningBox( NULL, idWBX); - - String aTitle; - SvpResId pidString(STR_WARNING_INVALIDJAVASETTINGS); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId(STR_WARNING_INVALIDJAVASETTINGS)); - + WarningBox aWarningBox( NULL, SvtResId(WARNINGBOX_INVALIDJAVASETTINGS)); + String aTitle = String( SvtResId(STR_WARNING_INVALIDJAVASETTINGS)); aWarningBox.SetText( aTitle ); nResult = aWarningBox.Execute(); } @@ -216,28 +181,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bJavaDisabled_Handled = true; // Java disabled. Give user a chance to enable Java inside Office. - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idQBX = SvtResId( QBX_JAVADISABLED ); - SvpResId pidPatchQBX(QBX_JAVADISABLED); - pidPatchQBX.SetRT(RSC_QUERYBOX); - ResMgr *pMgrQB = pidPatchQBX.GetResMgr(); - - if (pMgrQB && pMgrQB->IsAvailable(pidPatchQBX)) - idQBX = pidPatchQBX; - - QueryBox aQueryBox(NULL, idQBX); - - String aTitle; - - SvpResId pidString(STR_QUESTION_JAVADISABLED); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId( STR_QUESTION_JAVADISABLED )); - + QueryBox aQueryBox(NULL, SvtResId( QBX_JAVADISABLED )); + String aTitle = String( SvtResId( STR_QUESTION_JAVADISABLED )); aQueryBox.SetText( aTitle ); nResult = aQueryBox.Execute(); if ( nResult == RET_YES ) @@ -260,25 +205,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque // Java not correctly installed, or damaged vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bVMCreationFailure_Handled = true; - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idEBX = SvtResId(ERRORBOX_JVMCREATIONFAILED); - SvpResId pidPatchEBX(ERRORBOX_JVMCREATIONFAILED); - pidPatchEBX.SetRT(RSC_ERRORBOX); - ResMgr *pMgrEB = pidPatchEBX.GetResMgr(); - if (pMgrEB && pMgrEB->IsAvailable(pidPatchEBX)) - idEBX = pidPatchEBX; - ErrorBox aErrorBox( NULL, idEBX); - - String aTitle; - SvpResId pidString(STR_ERROR_JVMCREATIONFAILED); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId(STR_ERROR_JVMCREATIONFAILED)); - + ErrorBox aErrorBox( NULL, SvtResId(ERRORBOX_JVMCREATIONFAILED)); + String aTitle = String( SvtResId(STR_ERROR_JVMCREATIONFAILED)); aErrorBox.SetText( aTitle ); nResult = aErrorBox.Execute(); } @@ -295,25 +223,8 @@ void SAL_CALL JavaInteractionHandler::handle( const Reference< XInteractionReque //before it can be used. vos::OGuard aSolarGuard( Application::GetSolarMutex() ); m_bRestartRequired_Handled = true; - //We first try to get the patch resource svp680xxx.res - //If the resource is not found then svt680xxx.res is used - ResId idEBX = SvtResId(ERRORBOX_RESTARTREQUIRED); - SvpResId pidPatchEBX(ERRORBOX_RESTARTREQUIRED); - pidPatchEBX.SetRT(RSC_ERRORBOX); - ResMgr *pMgrEB = pidPatchEBX.GetResMgr(); - if (pMgrEB && pMgrEB->IsAvailable(pidPatchEBX)) - idEBX = pidPatchEBX; - ErrorBox aErrorBox(NULL, idEBX); - - String aTitle; - SvpResId pidString(STR_ERROR_RESTARTREQUIRED); - pidString.SetRT(RSC_STRING); - ResMgr *pmgr = pidString.GetResMgr(); - if ( pmgr && pmgr->IsAvailable(pidString)) - aTitle = String(pidString); - else - aTitle = String( SvtResId(STR_ERROR_RESTARTREQUIRED)); - + ErrorBox aErrorBox(NULL, SvtResId(ERRORBOX_RESTARTREQUIRED)); + String aTitle = String( SvtResId(STR_ERROR_RESTARTREQUIRED)); aErrorBox.SetText( aTitle ); nResult = aErrorBox.Execute(); } diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtdata.cxx index 65715f635883..4d00eeca2c07 100644 --- a/svtools/source/misc/svtdata.cxx +++ b/svtools/source/misc/svtdata.cxx @@ -61,24 +61,6 @@ ResMgr * ImpSvtData::GetResMgr() return GetResMgr(Application::GetSettings().GetUILocale()); } -ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale) -{ - if (!pPatchResMgr) - { - pPatchResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svp), aLocale); - } - return pPatchResMgr; -} - -ResMgr * ImpSvtData::GetPatchResMgr() -{ - return GetPatchResMgr(Application::GetSettings().GetUILocale()); -} - -SvpResId::SvpResId( USHORT nId ) : - ResId( nId, *ImpSvtData::GetSvtData().GetPatchResMgr() ) -{ -} //============================================================================ // static -- cgit From fc36d6a80a11f89c6a155f737e6a42665c039564 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- avmedia/inc/helpids.hrc | 2 -- desktop/source/inc/helpid.hrc | 2 -- editeng/inc/helpid.hrc | 5 ----- formula/inc/helpids.hrc | 4 ---- formula/util/hidother.src | 4 ---- framework/inc/helpid.hrc | 6 ------ sfx2/source/inc/helpid.hrc | 1 - sfx2/util/hidother.src | 41 ----------------------------------------- svx/inc/fmhelp.hrc | 3 --- svx/inc/helpid.hrc | 3 --- svx/inc/svx/exthelpid.hrc | 4 ---- svx/util/hidother.src | 5 ----- 12 files changed, 80 deletions(-) diff --git a/avmedia/inc/helpids.hrc b/avmedia/inc/helpids.hrc index 902230466053..4b1d2e04d628 100644 --- a/avmedia/inc/helpids.hrc +++ b/avmedia/inc/helpids.hrc @@ -28,8 +28,6 @@ #ifndef _AVMEDIA_HELPIDS_HRC #define _AVMEDIA_HELPIDS_HRC -#include - #define HID_AVMEDIA_TOOLBOXITEM_PLAY "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY" #define HID_AVMEDIA_TOOLBOXITEM_PAUSE "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE" #define HID_AVMEDIA_TOOLBOXITEM_STOP "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP" diff --git a/desktop/source/inc/helpid.hrc b/desktop/source/inc/helpid.hrc index 1dfae71768b3..d96b12196342 100644 --- a/desktop/source/inc/helpid.hrc +++ b/desktop/source/inc/helpid.hrc @@ -28,8 +28,6 @@ #if ! defined INCLUDED_DESKTOP_HELPID_HRC #define INCLUDED_DESKTOP_HELPID_HRC -#include "svl/solar.hrc" - #define HID_PACKAGE_MANAGER "DESKTOP_HID_PACKAGE_MANAGER" #define HID_PACKAGE_MANAGER_TREELISTBOX "DESKTOP_HID_PACKAGE_MANAGER_TREELISTBOX" #define HID_PACKAGE_MANAGER_PROGRESS "DESKTOP_HID_PACKAGE_MANAGER_PROGRESS" diff --git a/editeng/inc/helpid.hrc b/editeng/inc/helpid.hrc index 4b6a745c4415..6d6c4822b037 100644 --- a/editeng/inc/helpid.hrc +++ b/editeng/inc/helpid.hrc @@ -30,11 +30,6 @@ #ifndef _EDITENG_HELPID_HRC #define _EDITENG_HELPID_HRC -// include --------------------------------------------------------------- - -#include - -// Help-Ids -------------------------------------------------------------- #define HID_EDITENG_SPELLER_WORDLANGUAGE "EDITENG_HID_EDITENG_SPELLER_WORDLANGUAGE" #define HID_EDITENG_SPELLER_PARALANGUAGE "EDITENG_HID_EDITENG_SPELLER_PARALANGUAGE" #define HID_EDITENG_SPELLER_ADDWORD "EDITENG_HID_EDITENG_SPELLER_ADDWORD" diff --git a/formula/inc/helpids.hrc b/formula/inc/helpids.hrc index 796f46752411..5502c4370d58 100644 --- a/formula/inc/helpids.hrc +++ b/formula/inc/helpids.hrc @@ -27,10 +27,6 @@ #ifndef FORMULA_HELPID_HRC #define FORMULA_HELPID_HRC -#ifndef _SOLAR_HRC -#include // HID_FORMULA_START -#endif - #define HID_FORMULADLG_FORMULA "FORMULA_HID_FORMULADLG_FORMULA" #define HID_FORMULA_FAP_FORMULA "FORMULA_HID_FORMULA_FAP_FORMULA" #define HID_FORMULA_FAP_STRUCT "FORMULA_HID_FORMULA_FAP_STRUCT" diff --git a/formula/util/hidother.src b/formula/util/hidother.src index 8cf49660e919..09a79b694e87 100644 --- a/formula/util/hidother.src +++ b/formula/util/hidother.src @@ -27,10 +27,6 @@ #include "../inc/helpids.hrc" -#ifndef _SBASLTID_HRC -#include -#endif - hidspecial HID_FORMULADLG_FORMULA { HelpId = HID_FORMULADLG_FORMULA; }; hidspecial HID_FORMULA_FAP_FORMULA { HelpId = HID_FORMULA_FAP_FORMULA; }; hidspecial HID_FORMULA_FAP_STRUCT { HelpId = HID_FORMULA_FAP_STRUCT; }; diff --git a/framework/inc/helpid.hrc b/framework/inc/helpid.hrc index 3f9068e65d26..b5cd1f6a4ac1 100644 --- a/framework/inc/helpid.hrc +++ b/framework/inc/helpid.hrc @@ -27,12 +27,6 @@ #ifndef _FRAMEWORK_HELPID_HRC #define _FRAMEWORK_HELPID_HRC -// include ------------------------------------------------------------------ - -#include - -// Help-Ids ----------------------------------------------------------------- - #define HID_BACKINGWINDOW "FWK_HID_BACKINGWINDOW" #define HID_LICENSEDIALOG "FWK_HID_LICENSEDIALOG" #define HID_STATUSBAR "FWK_HID_STATUSBAR" diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index d15a8b0f9962..c9054643fc11 100755 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc @@ -29,7 +29,6 @@ // include ------------------------------------------------------------------ -#include #include // Help-Ids ----------------------------------------------------------------- diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src index 262bfdf4639d..ccce4820cf2f 100644 --- a/sfx2/util/hidother.src +++ b/sfx2/util/hidother.src @@ -26,9 +26,6 @@ ************************************************************************/ #include "../source/inc/helpid.hrc" // HID_XXX -#include "../inc/sfx2/sfxsids.hrc" // SID_XXX -#include "../inc/sfx2/sfx.hrc" - hidspecial HID_APP_WIN { HelpID = HID_APP_WIN; }; hidspecial HID_DESKTOP { HelpID = HID_DESKTOP; }; @@ -40,27 +37,15 @@ hidspecial HID_FILEDLG_READ_ONLY { HelpID = HID_FILEDLG_READ_ONLY hidspecial HID_FILEDLG_STANDARD { HelpID = HID_FILEDLG_STANDARD; }; hidspecial HID_FILEDLG_URL { HelpID = HID_FILEDLG_URL; }; hidspecial HID_FILEDLG_USE_PASSWD { HelpID = HID_FILEDLG_USE_PASSWD; }; -hidspecial HID_INTERFACE_SFXMAILVIEW { HelpID = HID_INTERFACE_SFXMAILVIEW; }; -hidspecial HID_INTERFACE_SFXEXPLVIEWSH { HelpID = HID_INTERFACE_SFXEXPLVIEWSH; }; -hidspecial HID_INTERFACE_SFXFRAMESETVIEW { HelpID = HID_INTERFACE_SFXFRAMESETVIEW; }; -hidspecial HID_INTERFACE_SFXFRAMESETSOURCEVIEW { HelpID = HID_INTERFACE_SFXFRAMESETSOURCEVIEW; }; -hidspecial HID_INTERFACE_SFXHELP_VIEWSH { HelpID = HID_INTERFACE_SFXHELP_VIEWSH; }; hidspecial HID_PREVIEW_FRAME { HelpID = HID_PREVIEW_FRAME; }; hidspecial HID_PRINT_OPTIONS { HelpID = HID_PRINT_OPTIONS; }; hidspecial HID_TEMPLATE_FILTER { HelpID = HID_TEMPLATE_FILTER; }; hidspecial HID_TEMPLATE_FMT { HelpID = HID_TEMPLATE_FMT; }; hidspecial HID_SEARCH_DLG_TABLB { HelpID = HID_SEARCH_DLG_TABLB; }; -hidspecial SID_STYLE_FAMILY1 { HelpID = SID_STYLE_FAMILY1; }; -hidspecial SID_STYLE_FAMILY2 { HelpID = SID_STYLE_FAMILY2; }; -hidspecial SID_STYLE_FAMILY3 { HelpID = SID_STYLE_FAMILY3; }; -hidspecial SID_STYLE_FAMILY4 { HelpID = SID_STYLE_FAMILY4; }; -hidspecial SID_STYLE_FAMILY5 { HelpID = SID_STYLE_FAMILY5; }; -hidspecial SID_FILTER_NAME { HelpID = SID_FILTER_NAME; }; hidspecial HID_NAVIGATOR_WINDOW { HelpID = HID_NAVIGATOR_WINDOW; }; hidspecial HID_HELPAGENT_TIP_BOX { HelpId = HID_HELPAGENT_TIP_BOX; }; hidspecial HID_TEMPLDLG_TOOLBOX_LEFT { HelpId = HID_TEMPLDLG_TOOLBOX_LEFT;}; hidspecial HID_EXPLORER_SRCH_COUNT { HelpId = HID_EXPLORER_SRCH_COUNT;}; -hidspecial HID_INTERFACE_SFXPLUGINVIEW { HelpID = HID_INTERFACE_SFXPLUGINVIEW; }; hidspecial HID_TABDLG_RESET_BTN { HelpID = HID_TABDLG_RESET_BTN; }; hidspecial HID_TABDLG_STANDARD_BTN { HelpID = HID_TABDLG_STANDARD_BTN; }; hidspecial HID_CONFIG_EVENT_OFFICE_BASED { HelpID = HID_CONFIG_EVENT_OFFICE_BASED; }; @@ -70,35 +55,10 @@ hidspecial HID_EXPLORERMENU_ARRANGEICONS { HelpID = HID_EXPLORERMENU_ARRA hidspecial HID_EXPLORERMENU_STDTEMPLATE { HelpID = HID_EXPLORERMENU_STDTEMPLATE; }; hidspecial HID_EXPLORER_DOCVIEW_ICON { HelpID = HID_EXPLORER_DOCVIEW_ICON; }; hidspecial HID_EXPLORER_DOCVIEW_DETAILS { HelpID = HID_EXPLORER_DOCVIEW_DETAILS; }; -hidspecial HID_CHAOSDOC_WIN { HelpID = HID_CHAOSDOC_WIN; }; -hidspecial HID_CHAOSDOC_WIN_HEADER { HelpID = HID_CHAOSDOC_WIN_HEADER; }; -hidspecial HID_CHAOSDOC_WIN_PARTS { HelpID = HID_CHAOSDOC_WIN_PARTS; }; -hidspecial HID_CHAOSDOC_WIN_BODY { HelpID = HID_CHAOSDOC_WIN_BODY; }; hidspecial HID_BRWBOX_HEADERBAR { HelpID = HID_BRWBOX_HEADERBAR; }; hidspecial HID_TASKBAR { HelpID = HID_TASKBAR; }; hidspecial HID_TASKBUTTONBAR { HelpID = HID_TASKBUTTONBAR; }; hidspecial HID_TASKTOOLBAR { HelpID = HID_TASKTOOLBAR; }; -hidspecial HID_CHAOS_NEW_IMAP_BOX { HelpID = HID_CHAOS_NEW_IMAP_BOX; }; -hidspecial HID_CHAOS_NEW_IMAP_MSG { HelpID = HID_CHAOS_NEW_IMAP_MSG; }; -hidspecial HID_CHAOS_NEW_IMAP_FLD { HelpID = HID_CHAOS_NEW_IMAP_FLD; }; -hidspecial HID_CHAOS_NEW_NEWS_BOX { HelpID = HID_CHAOS_NEW_NEWS_BOX; }; -hidspecial HID_CHAOS_NEW_NEWS_MSG { HelpID = HID_CHAOS_NEW_NEWS_MSG; }; -hidspecial HID_CHAOS_NEW_IMAP_BOX { HelpID = HID_CHAOS_NEW_IMAP_BOX; }; -hidspecial HID_CHAOS_NEW_FSYS_FLD { HelpID = HID_CHAOS_NEW_FSYS_FLD; }; -hidspecial HID_CHAOS_NEW_FSYS_LNK { HelpID = HID_CHAOS_NEW_FSYS_LNK; }; -hidspecial HID_CHAOS_NEW_FTP_BOX { HelpID = HID_CHAOS_NEW_FTP_BOX; }; -hidspecial HID_CHAOS_NEW_FTP_FLD { HelpID = HID_CHAOS_NEW_FTP_FLD; }; -hidspecial HID_CHAOS_NEW_OUT_BOX { HelpID = HID_CHAOS_NEW_OUT_BOX; }; -hidspecial HID_CHAOS_NEW_OUT_MSG { HelpID = HID_CHAOS_NEW_OUT_MSG; }; -hidspecial HID_CHAOS_NEW_POP3_BOX { HelpID = HID_CHAOS_NEW_POP3_BOX; }; -hidspecial HID_CHAOS_NEW_POP3_MSG { HelpID = HID_CHAOS_NEW_POP3_MSG; }; -hidspecial HID_CHAOS_NEW_SEARCH { HelpID = HID_CHAOS_NEW_SEARCH; }; -hidspecial HID_CHAOS_NEW_VIM_BOX { HelpID = HID_CHAOS_NEW_VIM_BOX; }; -hidspecial HID_CHAOS_NEW_VIM_MSG { HelpID = HID_CHAOS_NEW_VIM_MSG; }; -hidspecial HID_CHAOS_NEW_SUBSCR_BOX { HelpID = HID_CHAOS_NEW_SUBSCR_BOX; }; -hidspecial HID_CHAOS_NEW_BOOKMARK { HelpID = HID_CHAOS_NEW_BOOKMARK; }; -hidspecial HID_CHAOS_NEW_PUB_BOX { HelpID = HID_CHAOS_NEW_PUB_BOX; }; -hidspecial HID_UUI_END { HelpID = HID_UUI_END; }; // aka HID_CHAOS_NEW_DATABASE hidspecial HID_CNT_DLG_SEARCH_BT_SHOW { HelpID = HID_CNT_DLG_SEARCH_BT_SHOW; }; hidspecial HID_CNT_DLG_SEARCH_BT_UPDATE { HelpID = HID_CNT_DLG_SEARCH_BT_UPDATE; }; hidspecial HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE { HelpID = HID_CNT_DLG_SEARCH_BT_SYNCHRONIZE; }; @@ -107,7 +67,6 @@ hidspecial HID_CNT_PAGE_HEADER { HelpID = HID_CNT_PAGE_HEADER; hidspecial HID_CNT_PAGE_DESCRIPTION { HelpID = HID_CNT_PAGE_DESCRIPTION; }; hidspecial HID_CNT_LB_HEADER { HelpID = HID_CNT_LB_HEADER; }; hidspecial HID_CNT_LB_DESCRIPTION { HelpID = HID_CNT_LB_DESCRIPTION; }; -hidspecial SID_GROUPVIEW { HelpID = SID_GROUPVIEW; }; hidspecial HID_GROUPVIEW_CONTENT_BIG { HelpID = HID_GROUPVIEW_CONTENT_BIG; }; hidspecial HID_GROUPVIEW_CONTENT_SMALL { HelpID = HID_GROUPVIEW_CONTENT_SMALL; }; hidspecial HID_GROUPVIEW_CONTENT_TREE { HelpID = HID_GROUPVIEW_CONTENT_TREE; }; diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 6c4787cd1fbc..1222145655c1 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -27,9 +27,6 @@ #ifndef _SVX_FMHELP_HRC #define _SVX_FMHELP_HRC -// include ----------------------------------------------------------- -#include - // Help-Ids -------------------------------------------------------------- #define HID_DLG_DBMSG "SVX_HID_DLG_DBMSG" #define HID_FORM_NAVIGATOR "SVX_HID_FORM_NAVIGATOR" diff --git a/svx/inc/helpid.hrc b/svx/inc/helpid.hrc index 21912fdc2829..be75fe019f96 100644 --- a/svx/inc/helpid.hrc +++ b/svx/inc/helpid.hrc @@ -26,9 +26,6 @@ ************************************************************************/ #ifndef _SVX_HELPID_HRC #define _SVX_HELPID_HRC -// include --------------------------------------------------------------- - -#include #include #include diff --git a/svx/inc/svx/exthelpid.hrc b/svx/inc/svx/exthelpid.hrc index 4d885e422b70..360a4914c10e 100644 --- a/svx/inc/svx/exthelpid.hrc +++ b/svx/inc/svx/exthelpid.hrc @@ -28,8 +28,6 @@ #define _SVX_EXTHELPID_HRC // include --------------------------------------------------------------- -#include - // these HIDs are used in SVX and also in other modules, mainly CUI // the reason is that different controls have the same help texts assigned // but are implemented in different libraries @@ -40,7 +38,5 @@ #define HID_GALLERY_ACTUALIZE "SVX_HID_GALLERY_ACTUALIZE" #define HID_GALLERY_TITLE "SVX_HID_GALLERY_TITLE" -// please adjust ACT_SVX_EXT_HID_END2 below if you add entries here! - #endif diff --git a/svx/util/hidother.src b/svx/util/hidother.src index dd566cf9abdc..e3c1f72cce4d 100644 --- a/svx/util/hidother.src +++ b/svx/util/hidother.src @@ -25,8 +25,6 @@ * ************************************************************************/ #include "../inc/helpid.hrc" // HID_XXX -#include "hidother.hrc" -#include #include "../inc/fmhelp.hrc" /* #define HID_AUTOCORR_HELP_CHGNONBRKSPACE HID_AUTOCORR_HELP_START+20 */ @@ -54,7 +52,6 @@ hidspecial HID_GRID_TRAVEL_LAST { HelpID = HID_GRID_TRAVEL_LAST ;}; hidspecial HID_GRID_TRAVEL_NEW { HelpID = HID_GRID_TRAVEL_NEW ;}; hidspecial HID_GRID_TRAVEL_NEXT { HelpID = HID_GRID_TRAVEL_NEXT ;}; hidspecial HID_GRID_TRAVEL_PREV { HelpID = HID_GRID_TRAVEL_PREV ;}; -hidspecial HID_INTERFACE_BASIDE_VIEWSH { HelpID = HID_INTERFACE_BASIDE_VIEWSH; }; hidspecial HID_POPUP_COLOR { HelpID = HID_POPUP_COLOR; }; hidspecial HID_POPUP_COLOR_CTRL { HelpID = HID_POPUP_COLOR_CTRL; }; hidspecial HID_POPUP_FRAME { HelpID = HID_POPUP_FRAME; }; @@ -74,6 +71,4 @@ hidspecial HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL { HelpId = HI hidspecial HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS { HelpId = HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS; }; hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED; }; hidspecial HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL { HelpId = HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL; }; -hidspecial SID_DSBROWSER_EXPLORER { HelpID = SID_DSBROWSER_EXPLORER ;}; -hidspecial SID_GALLERY_IMPORTTHEME { HelpID = SID_GALLERY_IMPORTTHEME; }; hidspecial UID_FORMPROPBROWSER_FRAME { HelpID = UID_FORMPROPBROWSER_FRAME ;}; -- cgit From ec8cfe27fa5d2c7041c0895a0ef8f3a2483b8a3e Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- starmath/inc/helpids.h | 325 +++++++++++++++++++++++++++++++++++++++++++++ starmath/inc/starmath.hrc | 295 +--------------------------------------- starmath/util/hidother.src | 3 +- sw/inc/helpid.h | 18 +-- sw/util/hidother.src | 19 --- 5 files changed, 333 insertions(+), 327 deletions(-) create mode 100644 starmath/inc/helpids.h diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h new file mode 100644 index 000000000000..b33cb304679a --- /dev/null +++ b/starmath/inc/helpids.h @@ -0,0 +1,325 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef STARMATH_HELPIDS_H +#define STARMATH_HELPIDS_H + +#define HID_SMA_OPTIONSDIALOG "STARMATH_HID_SMA_OPTIONSDIALOG" +#define HID_SMA_FONTDIALOG "STARMATH_HID_SMA_FONTDIALOG" +#define HID_SMA_FONTSIZEDIALOG "STARMATH_HID_SMA_FONTSIZEDIALOG" +#define HID_SMA_FONTTYPEDIALOG "STARMATH_HID_SMA_FONTTYPEDIALOG" +#define HID_SMA_DISTANCEDIALOG "STARMATH_HID_SMA_DISTANCEDIALOG" +#define HID_SMA_ALIGNDIALOG "STARMATH_HID_SMA_ALIGNDIALOG" +#define HID_SMA_PRINTOPTIONPAGE "STARMATH_HID_SMA_PRINTOPTIONPAGE" +#define HID_SMA_SYMBOLDIALOG "STARMATH_HID_SMA_SYMBOLDIALOG" +#define HID_SMA_SYMDEFINEDIALOG "STARMATH_HID_SMA_SYMDEFINEDIALOG" +#define HID_SMA_EXTRAOPTIONPAGE "STARMATH_HID_SMA_EXTRAOPTIONPAGE" +#define HID_SMA_DOCSAVEQUERY "STARMATH_HID_SMA_DOCSAVEQUERY" +#define HID_SMA_OBJECTSAVEQUERY "STARMATH_HID_SMA_OBJECTSAVEQUERY" +#define HID_SMA_DEFAULTSAVEQUERY "STARMATH_HID_SMA_DEFAULTSAVEQUERY" +#define HID_SMA_ILLEGALOBJECTERROR "STARMATH_HID_SMA_ILLEGALOBJECTERROR" +#define HID_SMA_ILLEGALFILEERROR "STARMATH_HID_SMA_ILLEGALFILEERROR" +#define HID_SMA_WRITESYMBOLERROR "STARMATH_HID_SMA_WRITESYMBOLERROR" +#define HID_SMA_READSYMBOLERROR "STARMATH_HID_SMA_READSYMBOLERROR" +#define HID_SMA_NOMATHTYPEFACEWARNING "STARMATH_HID_SMA_NOMATHTYPEFACEWARNING" +#define HID_SMA_OBJECTNAME "STARMATH_HID_SMA_OBJECTNAME" +#define HID_SMA_VIEWNAME "STARMATH_HID_SMA_VIEWNAME" +#define HID_SMA_UNDOEDITNAME "STARMATH_HID_SMA_UNDOEDITNAME" +#define HID_SMA_UNDOFORMATNAME "STARMATH_HID_SMA_UNDOFORMATNAME" +#define HID_SMA_APPICO "STARMATH_HID_SMA_APPICO" +#define HID_SMA_DOCICO "STARMATH_HID_SMA_DOCICO" +#define HID_SMA_TMPICO "STARMATH_HID_SMA_TMPICO" +#define HID_SMA_COMMANDMENU "STARMATH_HID_SMA_COMMANDMENU" +#define HID_SMA_VIEWMENU "STARMATH_HID_SMA_VIEWMENU" +#define HID_SMA_DISTANCEMENU "STARMATH_HID_SMA_DISTANCEMENU" +#define HID_SMA_FONTMENU "STARMATH_HID_SMA_FONTMENU" +#define HID_SMA_STARTUPWINDOW "STARMATH_HID_SMA_STARTUPWINDOW" +#define HID_SMA_TOOLBOXWINDOW "STARMATH_HID_SMA_TOOLBOXWINDOW" +#define HID_SMA_CMDBOXWINDOW "STARMATH_HID_SMA_CMDBOXWINDOW" +#define HID_SMA_UPDATEOBJECT "STARMATH_HID_SMA_UPDATEOBJECT" +#define HID_SMA_FONTREGULAR "STARMATH_HID_SMA_FONTREGULAR" +#define HID_SMA_FONTITALIC "STARMATH_HID_SMA_FONTITALIC" +#define HID_SMA_FONTBOLD "STARMATH_HID_SMA_FONTBOLD" +#define HID_SMA_PRINTOPTION "STARMATH_HID_SMA_PRINTOPTION" +#define HID_SMA_DOCUMENTSTR "STARMATH_HID_SMA_DOCUMENTSTR" +#define HID_SMA_SYMBOLFILESSTR "STARMATH_HID_SMA_SYMBOLFILESSTR" +#define HID_SMA_ALLFILESSTR "STARMATH_HID_SMA_ALLFILESSTR" +#define HID_SMA_CREATORSTR "STARMATH_HID_SMA_CREATORSTR" +#define HID_SMA_FILESMFTYP "STARMATH_HID_SMA_FILESMFTYP" +#define HID_SMA_FILESYMTYP "STARMATH_HID_SMA_FILESYMTYP" +#define HID_SMA_WIN_DOCUMENT "STARMATH_HID_SMA_WIN_DOCUMENT" +#define HID_SMA_COMMAND_WIN_EDIT "STARMATH_HID_SMA_COMMAND_WIN_EDIT" + +#define HID_SMA_PLUSX "STARMATH_HID_SMA_PLUSX" +#define HID_SMA_MINUSX "STARMATH_HID_SMA_MINUSX" +#define HID_SMA_PLUSMINUSX "STARMATH_HID_SMA_PLUSMINUSX" +#define HID_SMA_MINUSPLUSX "STARMATH_HID_SMA_MINUSPLUSX" +#define HID_SMA_NEGX "STARMATH_HID_SMA_NEGX" +#define HID_SMA_XPLUSY "STARMATH_HID_SMA_XPLUSY" +#define HID_SMA_XMINUSY "STARMATH_HID_SMA_XMINUSY" +#define HID_SMA_XCDOTY "STARMATH_HID_SMA_XCDOTY" +#define HID_SMA_XTIMESY "STARMATH_HID_SMA_XTIMESY" +#define HID_SMA_XSYMTIMESY "STARMATH_HID_SMA_XSYMTIMESY" +#define HID_SMA_XSYMDIVIDEY "STARMATH_HID_SMA_XSYMDIVIDEY" +#define HID_SMA_XDIVY "STARMATH_HID_SMA_XDIVY" +#define HID_SMA_XOVERY "STARMATH_HID_SMA_XOVERY" +#define HID_SMA_XODIVIDEY "STARMATH_HID_SMA_XODIVIDEY" +#define HID_SMA_XODOTY "STARMATH_HID_SMA_XODOTY" +#define HID_SMA_XOMINUSY "STARMATH_HID_SMA_XOMINUSY" +#define HID_SMA_XOPLUSY "STARMATH_HID_SMA_XOPLUSY" +#define HID_SMA_XOTIMESY "STARMATH_HID_SMA_XOTIMESY" +#define HID_SMA_XANDY "STARMATH_HID_SMA_XANDY" +#define HID_SMA_XORY "STARMATH_HID_SMA_XORY" +#define HID_SMA_XEQY "STARMATH_HID_SMA_XEQY" +#define HID_SMA_XNEQY "STARMATH_HID_SMA_XNEQY" +#define HID_SMA_XLTY "STARMATH_HID_SMA_XLTY" +#define HID_SMA_XGTY "STARMATH_HID_SMA_XGTY" +#define HID_SMA_XLEY "STARMATH_HID_SMA_XLEY" +#define HID_SMA_XGEY "STARMATH_HID_SMA_XGEY" +#define HID_SMA_XLESLANTY "STARMATH_HID_SMA_XLESLANTY" +#define HID_SMA_XGESLANTY "STARMATH_HID_SMA_XGESLANTY" +#define HID_SMA_XLLY "STARMATH_HID_SMA_XLLY" +#define HID_SMA_XGGY "STARMATH_HID_SMA_XGGY" +#define HID_SMA_XDEFY "STARMATH_HID_SMA_XDEFY" +#define HID_SMA_XEQUIVY "STARMATH_HID_SMA_XEQUIVY" +#define HID_SMA_XAPPROXY "STARMATH_HID_SMA_XAPPROXY" +#define HID_SMA_XSIMY "STARMATH_HID_SMA_XSIMY" +#define HID_SMA_XSIMEQY "STARMATH_HID_SMA_XSIMEQY" +#define HID_SMA_XPROPY "STARMATH_HID_SMA_XPROPY" +#define HID_SMA_XORTHOY "STARMATH_HID_SMA_XORTHOY" +#define HID_SMA_XPARALLELY "STARMATH_HID_SMA_XPARALLELY" +#define HID_SMA_XTOWARDY "STARMATH_HID_SMA_XTOWARDY" +#define HID_SMA_XTRANSLY "STARMATH_HID_SMA_XTRANSLY" +#define HID_SMA_XTRANSRY "STARMATH_HID_SMA_XTRANSRY" +#define HID_SMA_XINY "STARMATH_HID_SMA_XINY" +#define HID_SMA_XNOTINY "STARMATH_HID_SMA_XNOTINY" +#define HID_SMA_XOWNSY "STARMATH_HID_SMA_XOWNSY" +#define HID_SMA_XUNIONY "STARMATH_HID_SMA_XUNIONY" +#define HID_SMA_XINTERSECTIONY "STARMATH_HID_SMA_XINTERSECTIONY" +#define HID_SMA_XSETMINUSY "STARMATH_HID_SMA_XSETMINUSY" +#define HID_SMA_XSLASHY "STARMATH_HID_SMA_XSLASHY" +#define HID_SMA_XSUBSETY "STARMATH_HID_SMA_XSUBSETY" +#define HID_SMA_XSUBSETEQY "STARMATH_HID_SMA_XSUBSETEQY" +#define HID_SMA_XSUPSETY "STARMATH_HID_SMA_XSUPSETY" +#define HID_SMA_XSUPSETEQY "STARMATH_HID_SMA_XSUPSETEQY" +#define HID_SMA_XNSUBSETY "STARMATH_HID_SMA_XNSUBSETY" +#define HID_SMA_XNSUBSETEQY "STARMATH_HID_SMA_XNSUBSETEQY" +#define HID_SMA_XNSUPSETY "STARMATH_HID_SMA_XNSUPSETY" +#define HID_SMA_XNSUPSETEQY "STARMATH_HID_SMA_XNSUPSETEQY" +#define HID_SMA_ABSX "STARMATH_HID_SMA_ABSX" +#define HID_SMA_FACTX "STARMATH_HID_SMA_FACTX" +#define HID_SMA_SQRTX "STARMATH_HID_SMA_SQRTX" +#define HID_SMA_NROOTXY "STARMATH_HID_SMA_NROOTXY" +#define HID_SMA_EX "STARMATH_HID_SMA_EX" +#define HID_SMA_EXPX "STARMATH_HID_SMA_EXPX" +#define HID_SMA_LNX "STARMATH_HID_SMA_LNX" +#define HID_SMA_LOGX "STARMATH_HID_SMA_LOGX" +#define HID_SMA_SINX "STARMATH_HID_SMA_SINX" +#define HID_SMA_COSX "STARMATH_HID_SMA_COSX" +#define HID_SMA_TANX "STARMATH_HID_SMA_TANX" +#define HID_SMA_COTX "STARMATH_HID_SMA_COTX" +#define HID_SMA_ARCSINX "STARMATH_HID_SMA_ARCSINX" +#define HID_SMA_ARCCOSX "STARMATH_HID_SMA_ARCCOSX" +#define HID_SMA_ARCTANX "STARMATH_HID_SMA_ARCTANX" +#define HID_SMA_ARCCOTX "STARMATH_HID_SMA_ARCCOTX" +#define HID_SMA_SINHX "STARMATH_HID_SMA_SINHX" +#define HID_SMA_COSHX "STARMATH_HID_SMA_COSHX" +#define HID_SMA_TANHX "STARMATH_HID_SMA_TANHX" +#define HID_SMA_COTHX "STARMATH_HID_SMA_COTHX" +#define HID_SMA_ARSINHX "STARMATH_HID_SMA_ARSINHX" +#define HID_SMA_ARCOSHX "STARMATH_HID_SMA_ARCOSHX" +#define HID_SMA_ARTANHX "STARMATH_HID_SMA_ARTANHX" +#define HID_SMA_ARCOTHX "STARMATH_HID_SMA_ARCOTHX" +#define HID_SMA_SUMX "STARMATH_HID_SMA_SUMX" +#define HID_SMA_PRODX "STARMATH_HID_SMA_PRODX" +#define HID_SMA_COPRODX "STARMATH_HID_SMA_COPRODX" +#define HID_SMA_LIMX "STARMATH_HID_SMA_LIMX" +#define HID_SMA_LIMINFX "STARMATH_HID_SMA_LIMINFX" +#define HID_SMA_LIMSUPX "STARMATH_HID_SMA_LIMSUPX" +#define HID_SMA_EXISTS "STARMATH_HID_SMA_EXISTS" +#define HID_SMA_FORALL "STARMATH_HID_SMA_FORALL" +#define HID_SMA_NABLA "STARMATH_HID_SMA_NABLA" +#define HID_SMA_INTX "STARMATH_HID_SMA_INTX" +#define HID_SMA_IINTX "STARMATH_HID_SMA_IINTX" +#define HID_SMA_IIINTX "STARMATH_HID_SMA_IIINTX" +#define HID_SMA_LINTX "STARMATH_HID_SMA_LINTX" +#define HID_SMA_LLINTX "STARMATH_HID_SMA_LLINTX" +#define HID_SMA_LLLINTX "STARMATH_HID_SMA_LLLINTX" +#define HID_SMA_FROMX "STARMATH_HID_SMA_FROMX" +#define HID_SMA_TOX "STARMATH_HID_SMA_TOX" +#define HID_SMA_FROMXTOY "STARMATH_HID_SMA_FROMXTOY" +#define HID_SMA_XCIRCY "STARMATH_HID_SMA_XCIRCY" +#define HID_SMA_XDIVIDESY "STARMATH_HID_SMA_XDIVIDESY" +#define HID_SMA_XNDIVIDESY "STARMATH_HID_SMA_XNDIVIDESY" +#define HID_SMA_DLARROW "STARMATH_HID_SMA_DLARROW" +#define HID_SMA_DLRARROW "STARMATH_HID_SMA_DLRARROW" +#define HID_SMA_DRARROW "STARMATH_HID_SMA_DRARROW" + +#define HID_SMA_MISC_CAT "STARMATH_HID_SMA_MISC_CAT" +#define HID_SMA_UNBINOPS_CAT "STARMATH_HID_SMA_UNBINOPS_CAT" +#define HID_SMA_RELATIONS_CAT "STARMATH_HID_SMA_RELATIONS_CAT" +#define HID_SMA_SETOPERATIONS_CAT "STARMATH_HID_SMA_SETOPERATIONS_CAT" +#define HID_SMA_FUNCTIONS_CAT "STARMATH_HID_SMA_FUNCTIONS_CAT" +#define HID_SMA_OPERATORS_CAT "STARMATH_HID_SMA_OPERATORS_CAT" +#define HID_SMA_ATTRIBUTES_CAT "STARMATH_HID_SMA_ATTRIBUTES_CAT" +#define HID_SMA_BRACKETS_CAT "STARMATH_HID_SMA_BRACKETS_CAT" +#define HID_SMA_FORMAT_CAT "STARMATH_HID_SMA_FORMAT_CAT" + +#define HID_SMA_OPERATOR_WIN "STARMATH_HID_SMA_OPERATOR_WIN" +#define HID_SMA_UNBINOPS_TBX "STARMATH_HID_SMA_UNBINOPS_TBX" +#define HID_SMA_RELATIONS_TBX "STARMATH_HID_SMA_RELATIONS_TBX" +#define HID_SMA_SETOPERATIONS_TBX "STARMATH_HID_SMA_SETOPERATIONS_TBX" +#define HID_SMA_FUNCTIONS_TBX "STARMATH_HID_SMA_FUNCTIONS_TBX" +#define HID_SMA_OPERATORS_TBX "STARMATH_HID_SMA_OPERATORS_TBX" +#define HID_SMA_ATTRIBUTES_TBX "STARMATH_HID_SMA_ATTRIBUTES_TBX" +#define HID_SMA_BRACKETS_TBX "STARMATH_HID_SMA_BRACKETS_TBX" +#define HID_SMA_FORMAT_TBX "STARMATH_HID_SMA_FORMAT_TBX" +#define HID_SMA_SELECTION_TBX "STARMATH_HID_SMA_SELECTION_TBX" +#define HID_SMA_COMMAND_WIN "STARMATH_HID_SMA_COMMAND_WIN" +#define HID_SMA_MISC_MENU "STARMATH_HID_SMA_MISC_MENU" +#define HID_SMA_FUNCTIONSOTHER1_MENU "STARMATH_HID_SMA_FUNCTIONSOTHER1_MENU" + +#define HID_SMA_ACUTEX "STARMATH_HID_SMA_ACUTEX" +#define HID_SMA_BARX "STARMATH_HID_SMA_BARX" +#define HID_SMA_BREVEX "STARMATH_HID_SMA_BREVEX" +#define HID_SMA_CHECKX "STARMATH_HID_SMA_CHECKX" +#define HID_SMA_CIRCLEX "STARMATH_HID_SMA_CIRCLEX" +#define HID_SMA_DOTX "STARMATH_HID_SMA_DOTX" +#define HID_SMA_DDOTX "STARMATH_HID_SMA_DDOTX" +#define HID_SMA_DDDOTX "STARMATH_HID_SMA_DDDOTX" +#define HID_SMA_GRAVEX "STARMATH_HID_SMA_GRAVEX" +#define HID_SMA_HATX "STARMATH_HID_SMA_HATX" +#define HID_SMA_TILDEX "STARMATH_HID_SMA_TILDEX" +#define HID_SMA_VECX "STARMATH_HID_SMA_VECX" +#define HID_SMA_UNDERLINEX "STARMATH_HID_SMA_UNDERLINEX" +#define HID_SMA_OVERLINEX "STARMATH_HID_SMA_OVERLINEX" +#define HID_SMA_OVERSTRIKEX "STARMATH_HID_SMA_OVERSTRIKEX" +#define HID_SMA_PHANTOMX "STARMATH_HID_SMA_PHANTOMX" +#define HID_SMA_BOLDX "STARMATH_HID_SMA_BOLDX" +#define HID_SMA_ITALX "STARMATH_HID_SMA_ITALX" +#define HID_SMA_SIZEXY "STARMATH_HID_SMA_SIZEXY" +#define HID_SMA_FONTXY "STARMATH_HID_SMA_FONTXY" +#define HID_SMA_COLORX "STARMATH_HID_SMA_COLORX" +#define HID_SMA_LRGROUPX "STARMATH_HID_SMA_LRGROUPX" +#define HID_SMA_LRPARENTX "STARMATH_HID_SMA_LRPARENTX" +#define HID_SMA_LRBRACKETX "STARMATH_HID_SMA_LRBRACKETX" +#define HID_SMA_LRBRACEX "STARMATH_HID_SMA_LRBRACEX" +#define HID_SMA_LRANGLEX "STARMATH_HID_SMA_LRANGLEX" +#define HID_SMA_LRCEILX "STARMATH_HID_SMA_LRCEILX" +#define HID_SMA_LRFLOORX "STARMATH_HID_SMA_LRFLOORX" +#define HID_SMA_LRLINEX "STARMATH_HID_SMA_LRLINEX" +#define HID_SMA_LRDLINEX "STARMATH_HID_SMA_LRDLINEX" +#define HID_SMA_SLRPARENTX "STARMATH_HID_SMA_SLRPARENTX" +#define HID_SMA_SLRBRACKETX "STARMATH_HID_SMA_SLRBRACKETX" +#define HID_SMA_SLRBRACEX "STARMATH_HID_SMA_SLRBRACEX" +#define HID_SMA_SLRANGLEX "STARMATH_HID_SMA_SLRANGLEX" +#define HID_SMA_SLRCEILX "STARMATH_HID_SMA_SLRCEILX" +#define HID_SMA_SLRFLOORX "STARMATH_HID_SMA_SLRFLOORX" +#define HID_SMA_SLRLINEX "STARMATH_HID_SMA_SLRLINEX" +#define HID_SMA_SLRDLINEX "STARMATH_HID_SMA_SLRDLINEX" +#define HID_SMA_RSUBX "STARMATH_HID_SMA_RSUBX" +#define HID_SMA_RSUPX "STARMATH_HID_SMA_RSUPX" +#define HID_SMA_LSUBX "STARMATH_HID_SMA_LSUBX" +#define HID_SMA_LSUPX "STARMATH_HID_SMA_LSUPX" +#define HID_SMA_SBLANK "STARMATH_HID_SMA_SBLANK" +#define HID_SMA_BLANK "STARMATH_HID_SMA_BLANK" +#define HID_SMA_NEWLINE "STARMATH_HID_SMA_NEWLINE" +#define HID_SMA_BINOMXY "STARMATH_HID_SMA_BINOMXY" +#define HID_SMA_STACK "STARMATH_HID_SMA_STACK" +#define HID_SMA_MATRIX "STARMATH_HID_SMA_MATRIX" +#define HID_SMA_ALIGNLX "STARMATH_HID_SMA_ALIGNLX" +#define HID_SMA_ALIGNCX "STARMATH_HID_SMA_ALIGNCX" +#define HID_SMA_ALIGNRX "STARMATH_HID_SMA_ALIGNRX" +#define HID_SMA_ALEPH "STARMATH_HID_SMA_ALEPH" +#define HID_SMA_EMPTYSET "STARMATH_HID_SMA_EMPTYSET" +#define HID_SMA_RE "STARMATH_HID_SMA_RE" +#define HID_SMA_IM "STARMATH_HID_SMA_IM" +#define HID_SMA_INFINITY "STARMATH_HID_SMA_INFINITY" +#define HID_SMA_PARTIAL "STARMATH_HID_SMA_PARTIAL" +#define HID_SMA_WP "STARMATH_HID_SMA_WP" +#define HID_SMA_DOTSAXIS "STARMATH_HID_SMA_DOTSAXIS" +#define HID_SMA_DOTSUP "STARMATH_HID_SMA_DOTSUP" +#define HID_SMA_DOTSDOWN "STARMATH_HID_SMA_DOTSDOWN" +#define HID_SMA_DOTSLOW "STARMATH_HID_SMA_DOTSLOW" +#define HID_SMA_DOTSVERT "STARMATH_HID_SMA_DOTSVERT" + +#define HID_SMA_SETN "STARMATH_HID_SMA_SETN" +#define HID_SMA_SETZ "STARMATH_HID_SMA_SETZ" +#define HID_SMA_SETQ "STARMATH_HID_SMA_SETQ" +#define HID_SMA_SETR "STARMATH_HID_SMA_SETR" +#define HID_SMA_SETC "STARMATH_HID_SMA_SETC" +#define HID_SMA_WIDEHATX "STARMATH_HID_SMA_WIDEHATX" +#define HID_SMA_WIDETILDEX "STARMATH_HID_SMA_WIDETILDEX" +#define HID_SMA_WIDEVECX "STARMATH_HID_SMA_WIDEVECX" +#define HID_SMA_CSUBX "STARMATH_HID_SMA_CSUBX" +#define HID_SMA_CSUPX "STARMATH_HID_SMA_CSUPX" +#define HID_SMA_HBAR "STARMATH_HID_SMA_HBAR" +#define HID_SMA_LAMBDABAR "STARMATH_HID_SMA_LAMBDABAR" +#define HID_SMA_LEFTARROW "STARMATH_HID_SMA_LEFTARROW" +#define HID_SMA_RIGHTARROW "STARMATH_HID_SMA_RIGHTARROW" +#define HID_SMA_UPARROW "STARMATH_HID_SMA_UPARROW" +#define HID_SMA_DOWNARROW "STARMATH_HID_SMA_DOWNARROW" + +#define HID_SMA_DEFAULT_DIST "STARMATH_HID_SMA_DEFAULT_DIST" +#define HID_SMA_LINE_DIST "STARMATH_HID_SMA_LINE_DIST" +#define HID_SMA_ROOT_DIST "STARMATH_HID_SMA_ROOT_DIST" +#define HID_SMA_SUP_DIST "STARMATH_HID_SMA_SUP_DIST" +#define HID_SMA_SUB_DIST "STARMATH_HID_SMA_SUB_DIST" +#define HID_SMA_NUMERATOR_DIST "STARMATH_HID_SMA_NUMERATOR_DIST" +#define HID_SMA_DENOMINATOR_DIST "STARMATH_HID_SMA_DENOMINATOR_DIST" +#define HID_SMA_FRACLINE_EXCWIDTH "STARMATH_HID_SMA_FRACLINE_EXCWIDTH" +#define HID_SMA_FRACLINE_LINEWIDTH "STARMATH_HID_SMA_FRACLINE_LINEWIDTH" +#define HID_SMA_UPPERLIMIT_DIST "STARMATH_HID_SMA_UPPERLIMIT_DIST" +#define HID_SMA_LOWERLIMIT_DIST "STARMATH_HID_SMA_LOWERLIMIT_DIST" +#define HID_SMA_BRACKET_EXCHEIGHT "STARMATH_HID_SMA_BRACKET_EXCHEIGHT" +#define HID_SMA_BRACKET_DIST "STARMATH_HID_SMA_BRACKET_DIST" +#define HID_SMA_MATRIXROW_DIST "STARMATH_HID_SMA_MATRIXROW_DIST" +#define HID_SMA_MATRIXCOL_DIST "STARMATH_HID_SMA_MATRIXCOL_DIST" +#define HID_SMA_ATTRIBUT_DIST "STARMATH_HID_SMA_ATTRIBUT_DIST" +#define HID_SMA_INTERATTRIBUT_DIST "STARMATH_HID_SMA_INTERATTRIBUT_DIST" +#define HID_SMA_OPERATOR_EXCHEIGHT "STARMATH_HID_SMA_OPERATOR_EXCHEIGHT" +#define HID_SMA_OPERATOR_DIST "STARMATH_HID_SMA_OPERATOR_DIST" +#define HID_SMA_LEFTBORDER_DIST "STARMATH_HID_SMA_LEFTBORDER_DIST" +#define HID_SMA_RIGHTBORDER_DIST "STARMATH_HID_SMA_RIGHTBORDER_DIST" +#define HID_SMA_UPPERBORDER_DIST "STARMATH_HID_SMA_UPPERBORDER_DIST" +#define HID_SMA_LOWERBORDER_DIST "STARMATH_HID_SMA_LOWERBORDER_DIST" +#define HID_SMA_SCALE_ALL_BRACKETS "STARMATH_HID_SMA_SCALE_ALL_BRACKETS" +#define HID_SMA_BRACKET_EXCHEIGHT2 "STARMATH_HID_SMA_BRACKET_EXCHEIGHT2" +#define HID_SMA_LMRANGLEXY "STARMATH_HID_SMA_LMRANGLEXY" +#define HID_SMA_SLMRANGLEXY "STARMATH_HID_SMA_SLMRANGLEXY" +#define HID_SMA_XWIDESLASHY "STARMATH_HID_SMA_XWIDESLASHY" +#define HID_SMA_XWIDEBSLASHY "STARMATH_HID_SMA_XWIDEBSLASHY" +#define HID_SMA_XOVERBRACEY "STARMATH_HID_SMA_XOVERBRACEY" +#define HID_SMA_XUNDERBRACEY "STARMATH_HID_SMA_XUNDERBRACEY" +#define HID_SMA_LRDBRACKETX "STARMATH_HID_SMA_LRDBRACKETX" +#define HID_SMA_SLRDBRACKETX "STARMATH_HID_SMA_SLRDBRACKETX" + +#define HID_SMA_CONTROL_SYMBOLSET_VIEW "STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW" +#define HID_SMA_CONTROL_FONTCHAR_VIEW "STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW" + +#define HID_SMA_NOSPACE "STARMATH_HID_SMA_NOSPACE" + +#endif \ No newline at end of file diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 9f3777e7512c..f83ae0fc8c23 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -30,6 +30,7 @@ #include #include #include +#include "helpids.h" #define SID_NEXTERR (SID_SMA_START + 1) #define SID_PREVERR (SID_SMA_START + 2) @@ -457,300 +458,6 @@ #define MN_SUB_SENDTO (RID_APP_START + 3120) -#define HID_SMA_OPTIONSDIALOG "STARMATH_HID_SMA_OPTIONSDIALOG" -#define HID_SMA_FONTDIALOG "STARMATH_HID_SMA_FONTDIALOG" -#define HID_SMA_FONTSIZEDIALOG "STARMATH_HID_SMA_FONTSIZEDIALOG" -#define HID_SMA_FONTTYPEDIALOG "STARMATH_HID_SMA_FONTTYPEDIALOG" -#define HID_SMA_DISTANCEDIALOG "STARMATH_HID_SMA_DISTANCEDIALOG" -#define HID_SMA_ALIGNDIALOG "STARMATH_HID_SMA_ALIGNDIALOG" -#define HID_SMA_PRINTOPTIONPAGE "STARMATH_HID_SMA_PRINTOPTIONPAGE" -#define HID_SMA_SYMBOLDIALOG "STARMATH_HID_SMA_SYMBOLDIALOG" -#define HID_SMA_SYMDEFINEDIALOG "STARMATH_HID_SMA_SYMDEFINEDIALOG" -#define HID_SMA_EXTRAOPTIONPAGE "STARMATH_HID_SMA_EXTRAOPTIONPAGE" -#define HID_SMA_DOCSAVEQUERY "STARMATH_HID_SMA_DOCSAVEQUERY" -#define HID_SMA_OBJECTSAVEQUERY "STARMATH_HID_SMA_OBJECTSAVEQUERY" -#define HID_SMA_DEFAULTSAVEQUERY "STARMATH_HID_SMA_DEFAULTSAVEQUERY" -#define HID_SMA_ILLEGALOBJECTERROR "STARMATH_HID_SMA_ILLEGALOBJECTERROR" -#define HID_SMA_ILLEGALFILEERROR "STARMATH_HID_SMA_ILLEGALFILEERROR" -#define HID_SMA_WRITESYMBOLERROR "STARMATH_HID_SMA_WRITESYMBOLERROR" -#define HID_SMA_READSYMBOLERROR "STARMATH_HID_SMA_READSYMBOLERROR" -#define HID_SMA_NOMATHTYPEFACEWARNING "STARMATH_HID_SMA_NOMATHTYPEFACEWARNING" -#define HID_SMA_OBJECTNAME "STARMATH_HID_SMA_OBJECTNAME" -#define HID_SMA_VIEWNAME "STARMATH_HID_SMA_VIEWNAME" -#define HID_SMA_UNDOEDITNAME "STARMATH_HID_SMA_UNDOEDITNAME" -#define HID_SMA_UNDOFORMATNAME "STARMATH_HID_SMA_UNDOFORMATNAME" -#define HID_SMA_APPICO "STARMATH_HID_SMA_APPICO" -#define HID_SMA_DOCICO "STARMATH_HID_SMA_DOCICO" -#define HID_SMA_TMPICO "STARMATH_HID_SMA_TMPICO" -#define HID_SMA_COMMANDMENU "STARMATH_HID_SMA_COMMANDMENU" -#define HID_SMA_VIEWMENU "STARMATH_HID_SMA_VIEWMENU" -#define HID_SMA_DISTANCEMENU "STARMATH_HID_SMA_DISTANCEMENU" -#define HID_SMA_FONTMENU "STARMATH_HID_SMA_FONTMENU" -#define HID_SMA_STARTUPWINDOW "STARMATH_HID_SMA_STARTUPWINDOW" -#define HID_SMA_TOOLBOXWINDOW "STARMATH_HID_SMA_TOOLBOXWINDOW" -#define HID_SMA_CMDBOXWINDOW "STARMATH_HID_SMA_CMDBOXWINDOW" -#define HID_SMA_UPDATEOBJECT "STARMATH_HID_SMA_UPDATEOBJECT" -#define HID_SMA_FONTREGULAR "STARMATH_HID_SMA_FONTREGULAR" -#define HID_SMA_FONTITALIC "STARMATH_HID_SMA_FONTITALIC" -#define HID_SMA_FONTBOLD "STARMATH_HID_SMA_FONTBOLD" -#define HID_SMA_PRINTOPTION "STARMATH_HID_SMA_PRINTOPTION" -#define HID_SMA_DOCUMENTSTR "STARMATH_HID_SMA_DOCUMENTSTR" -#define HID_SMA_SYMBOLFILESSTR "STARMATH_HID_SMA_SYMBOLFILESSTR" -#define HID_SMA_ALLFILESSTR "STARMATH_HID_SMA_ALLFILESSTR" -#define HID_SMA_CREATORSTR "STARMATH_HID_SMA_CREATORSTR" -#define HID_SMA_FILESMFTYP "STARMATH_HID_SMA_FILESMFTYP" -#define HID_SMA_FILESYMTYP "STARMATH_HID_SMA_FILESYMTYP" -#define HID_SMA_WIN_DOCUMENT "STARMATH_HID_SMA_WIN_DOCUMENT" -#define HID_SMA_COMMAND_WIN_EDIT "STARMATH_HID_SMA_COMMAND_WIN_EDIT" - -#define HID_SMA_PLUSX "STARMATH_HID_SMA_PLUSX" -#define HID_SMA_MINUSX "STARMATH_HID_SMA_MINUSX" -#define HID_SMA_PLUSMINUSX "STARMATH_HID_SMA_PLUSMINUSX" -#define HID_SMA_MINUSPLUSX "STARMATH_HID_SMA_MINUSPLUSX" -#define HID_SMA_NEGX "STARMATH_HID_SMA_NEGX" -#define HID_SMA_XPLUSY "STARMATH_HID_SMA_XPLUSY" -#define HID_SMA_XMINUSY "STARMATH_HID_SMA_XMINUSY" -#define HID_SMA_XCDOTY "STARMATH_HID_SMA_XCDOTY" -#define HID_SMA_XTIMESY "STARMATH_HID_SMA_XTIMESY" -#define HID_SMA_XSYMTIMESY "STARMATH_HID_SMA_XSYMTIMESY" -#define HID_SMA_XSYMDIVIDEY "STARMATH_HID_SMA_XSYMDIVIDEY" -#define HID_SMA_XDIVY "STARMATH_HID_SMA_XDIVY" -#define HID_SMA_XOVERY "STARMATH_HID_SMA_XOVERY" -#define HID_SMA_XODIVIDEY "STARMATH_HID_SMA_XODIVIDEY" -#define HID_SMA_XODOTY "STARMATH_HID_SMA_XODOTY" -#define HID_SMA_XOMINUSY "STARMATH_HID_SMA_XOMINUSY" -#define HID_SMA_XOPLUSY "STARMATH_HID_SMA_XOPLUSY" -#define HID_SMA_XOTIMESY "STARMATH_HID_SMA_XOTIMESY" -#define HID_SMA_XANDY "STARMATH_HID_SMA_XANDY" -#define HID_SMA_XORY "STARMATH_HID_SMA_XORY" -#define HID_SMA_XEQY "STARMATH_HID_SMA_XEQY" -#define HID_SMA_XNEQY "STARMATH_HID_SMA_XNEQY" -#define HID_SMA_XLTY "STARMATH_HID_SMA_XLTY" -#define HID_SMA_XGTY "STARMATH_HID_SMA_XGTY" -#define HID_SMA_XLEY "STARMATH_HID_SMA_XLEY" -#define HID_SMA_XGEY "STARMATH_HID_SMA_XGEY" -#define HID_SMA_XLESLANTY "STARMATH_HID_SMA_XLESLANTY" -#define HID_SMA_XGESLANTY "STARMATH_HID_SMA_XGESLANTY" -#define HID_SMA_XLLY "STARMATH_HID_SMA_XLLY" -#define HID_SMA_XGGY "STARMATH_HID_SMA_XGGY" -#define HID_SMA_XDEFY "STARMATH_HID_SMA_XDEFY" -#define HID_SMA_XEQUIVY "STARMATH_HID_SMA_XEQUIVY" -#define HID_SMA_XAPPROXY "STARMATH_HID_SMA_XAPPROXY" -#define HID_SMA_XSIMY "STARMATH_HID_SMA_XSIMY" -#define HID_SMA_XSIMEQY "STARMATH_HID_SMA_XSIMEQY" -#define HID_SMA_XPROPY "STARMATH_HID_SMA_XPROPY" -#define HID_SMA_XORTHOY "STARMATH_HID_SMA_XORTHOY" -#define HID_SMA_XPARALLELY "STARMATH_HID_SMA_XPARALLELY" -#define HID_SMA_XTOWARDY "STARMATH_HID_SMA_XTOWARDY" -#define HID_SMA_XTRANSLY "STARMATH_HID_SMA_XTRANSLY" -#define HID_SMA_XTRANSRY "STARMATH_HID_SMA_XTRANSRY" -#define HID_SMA_XINY "STARMATH_HID_SMA_XINY" -#define HID_SMA_XNOTINY "STARMATH_HID_SMA_XNOTINY" -#define HID_SMA_XOWNSY "STARMATH_HID_SMA_XOWNSY" -#define HID_SMA_XUNIONY "STARMATH_HID_SMA_XUNIONY" -#define HID_SMA_XINTERSECTIONY "STARMATH_HID_SMA_XINTERSECTIONY" -#define HID_SMA_XSETMINUSY "STARMATH_HID_SMA_XSETMINUSY" -#define HID_SMA_XSLASHY "STARMATH_HID_SMA_XSLASHY" -#define HID_SMA_XSUBSETY "STARMATH_HID_SMA_XSUBSETY" -#define HID_SMA_XSUBSETEQY "STARMATH_HID_SMA_XSUBSETEQY" -#define HID_SMA_XSUPSETY "STARMATH_HID_SMA_XSUPSETY" -#define HID_SMA_XSUPSETEQY "STARMATH_HID_SMA_XSUPSETEQY" -#define HID_SMA_XNSUBSETY "STARMATH_HID_SMA_XNSUBSETY" -#define HID_SMA_XNSUBSETEQY "STARMATH_HID_SMA_XNSUBSETEQY" -#define HID_SMA_XNSUPSETY "STARMATH_HID_SMA_XNSUPSETY" -#define HID_SMA_XNSUPSETEQY "STARMATH_HID_SMA_XNSUPSETEQY" -#define HID_SMA_ABSX "STARMATH_HID_SMA_ABSX" -#define HID_SMA_FACTX "STARMATH_HID_SMA_FACTX" -#define HID_SMA_SQRTX "STARMATH_HID_SMA_SQRTX" -#define HID_SMA_NROOTXY "STARMATH_HID_SMA_NROOTXY" -#define HID_SMA_EX "STARMATH_HID_SMA_EX" -#define HID_SMA_EXPX "STARMATH_HID_SMA_EXPX" -#define HID_SMA_LNX "STARMATH_HID_SMA_LNX" -#define HID_SMA_LOGX "STARMATH_HID_SMA_LOGX" -#define HID_SMA_SINX "STARMATH_HID_SMA_SINX" -#define HID_SMA_COSX "STARMATH_HID_SMA_COSX" -#define HID_SMA_TANX "STARMATH_HID_SMA_TANX" -#define HID_SMA_COTX "STARMATH_HID_SMA_COTX" -#define HID_SMA_ARCSINX "STARMATH_HID_SMA_ARCSINX" -#define HID_SMA_ARCCOSX "STARMATH_HID_SMA_ARCCOSX" -#define HID_SMA_ARCTANX "STARMATH_HID_SMA_ARCTANX" -#define HID_SMA_ARCCOTX "STARMATH_HID_SMA_ARCCOTX" -#define HID_SMA_SINHX "STARMATH_HID_SMA_SINHX" -#define HID_SMA_COSHX "STARMATH_HID_SMA_COSHX" -#define HID_SMA_TANHX "STARMATH_HID_SMA_TANHX" -#define HID_SMA_COTHX "STARMATH_HID_SMA_COTHX" -#define HID_SMA_ARSINHX "STARMATH_HID_SMA_ARSINHX" -#define HID_SMA_ARCOSHX "STARMATH_HID_SMA_ARCOSHX" -#define HID_SMA_ARTANHX "STARMATH_HID_SMA_ARTANHX" -#define HID_SMA_ARCOTHX "STARMATH_HID_SMA_ARCOTHX" -#define HID_SMA_SUMX "STARMATH_HID_SMA_SUMX" -#define HID_SMA_PRODX "STARMATH_HID_SMA_PRODX" -#define HID_SMA_COPRODX "STARMATH_HID_SMA_COPRODX" -#define HID_SMA_LIMX "STARMATH_HID_SMA_LIMX" -#define HID_SMA_LIMINFX "STARMATH_HID_SMA_LIMINFX" -#define HID_SMA_LIMSUPX "STARMATH_HID_SMA_LIMSUPX" -#define HID_SMA_EXISTS "STARMATH_HID_SMA_EXISTS" -#define HID_SMA_FORALL "STARMATH_HID_SMA_FORALL" -#define HID_SMA_NABLA "STARMATH_HID_SMA_NABLA" -#define HID_SMA_INTX "STARMATH_HID_SMA_INTX" -#define HID_SMA_IINTX "STARMATH_HID_SMA_IINTX" -#define HID_SMA_IIINTX "STARMATH_HID_SMA_IIINTX" -#define HID_SMA_LINTX "STARMATH_HID_SMA_LINTX" -#define HID_SMA_LLINTX "STARMATH_HID_SMA_LLINTX" -#define HID_SMA_LLLINTX "STARMATH_HID_SMA_LLLINTX" -#define HID_SMA_FROMX "STARMATH_HID_SMA_FROMX" -#define HID_SMA_TOX "STARMATH_HID_SMA_TOX" -#define HID_SMA_FROMXTOY "STARMATH_HID_SMA_FROMXTOY" -#define HID_SMA_XCIRCY "STARMATH_HID_SMA_XCIRCY" -#define HID_SMA_XDIVIDESY "STARMATH_HID_SMA_XDIVIDESY" -#define HID_SMA_XNDIVIDESY "STARMATH_HID_SMA_XNDIVIDESY" -#define HID_SMA_DLARROW "STARMATH_HID_SMA_DLARROW" -#define HID_SMA_DLRARROW "STARMATH_HID_SMA_DLRARROW" -#define HID_SMA_DRARROW "STARMATH_HID_SMA_DRARROW" - -#define HID_SMA_MISC_CAT "STARMATH_HID_SMA_MISC_CAT" -#define HID_SMA_UNBINOPS_CAT "STARMATH_HID_SMA_UNBINOPS_CAT" -#define HID_SMA_RELATIONS_CAT "STARMATH_HID_SMA_RELATIONS_CAT" -#define HID_SMA_SETOPERATIONS_CAT "STARMATH_HID_SMA_SETOPERATIONS_CAT" -#define HID_SMA_FUNCTIONS_CAT "STARMATH_HID_SMA_FUNCTIONS_CAT" -#define HID_SMA_OPERATORS_CAT "STARMATH_HID_SMA_OPERATORS_CAT" -#define HID_SMA_ATTRIBUTES_CAT "STARMATH_HID_SMA_ATTRIBUTES_CAT" -#define HID_SMA_BRACKETS_CAT "STARMATH_HID_SMA_BRACKETS_CAT" -#define HID_SMA_FORMAT_CAT "STARMATH_HID_SMA_FORMAT_CAT" - -#define HID_SMA_OPERATOR_WIN "STARMATH_HID_SMA_OPERATOR_WIN" -#define HID_SMA_UNBINOPS_TBX "STARMATH_HID_SMA_UNBINOPS_TBX" -#define HID_SMA_RELATIONS_TBX "STARMATH_HID_SMA_RELATIONS_TBX" -#define HID_SMA_SETOPERATIONS_TBX "STARMATH_HID_SMA_SETOPERATIONS_TBX" -#define HID_SMA_FUNCTIONS_TBX "STARMATH_HID_SMA_FUNCTIONS_TBX" -#define HID_SMA_OPERATORS_TBX "STARMATH_HID_SMA_OPERATORS_TBX" -#define HID_SMA_ATTRIBUTES_TBX "STARMATH_HID_SMA_ATTRIBUTES_TBX" -#define HID_SMA_BRACKETS_TBX "STARMATH_HID_SMA_BRACKETS_TBX" -#define HID_SMA_FORMAT_TBX "STARMATH_HID_SMA_FORMAT_TBX" -#define HID_SMA_SELECTION_TBX "STARMATH_HID_SMA_SELECTION_TBX" -#define HID_SMA_COMMAND_WIN "STARMATH_HID_SMA_COMMAND_WIN" -#define HID_SMA_MISC_MENU "STARMATH_HID_SMA_MISC_MENU" -#define HID_SMA_FUNCTIONSOTHER1_MENU "STARMATH_HID_SMA_FUNCTIONSOTHER1_MENU" - -#define HID_SMA_ACUTEX "STARMATH_HID_SMA_ACUTEX" -#define HID_SMA_BARX "STARMATH_HID_SMA_BARX" -#define HID_SMA_BREVEX "STARMATH_HID_SMA_BREVEX" -#define HID_SMA_CHECKX "STARMATH_HID_SMA_CHECKX" -#define HID_SMA_CIRCLEX "STARMATH_HID_SMA_CIRCLEX" -#define HID_SMA_DOTX "STARMATH_HID_SMA_DOTX" -#define HID_SMA_DDOTX "STARMATH_HID_SMA_DDOTX" -#define HID_SMA_DDDOTX "STARMATH_HID_SMA_DDDOTX" -#define HID_SMA_GRAVEX "STARMATH_HID_SMA_GRAVEX" -#define HID_SMA_HATX "STARMATH_HID_SMA_HATX" -#define HID_SMA_TILDEX "STARMATH_HID_SMA_TILDEX" -#define HID_SMA_VECX "STARMATH_HID_SMA_VECX" -#define HID_SMA_UNDERLINEX "STARMATH_HID_SMA_UNDERLINEX" -#define HID_SMA_OVERLINEX "STARMATH_HID_SMA_OVERLINEX" -#define HID_SMA_OVERSTRIKEX "STARMATH_HID_SMA_OVERSTRIKEX" -#define HID_SMA_PHANTOMX "STARMATH_HID_SMA_PHANTOMX" -#define HID_SMA_BOLDX "STARMATH_HID_SMA_BOLDX" -#define HID_SMA_ITALX "STARMATH_HID_SMA_ITALX" -#define HID_SMA_SIZEXY "STARMATH_HID_SMA_SIZEXY" -#define HID_SMA_FONTXY "STARMATH_HID_SMA_FONTXY" -#define HID_SMA_COLORX "STARMATH_HID_SMA_COLORX" -#define HID_SMA_LRGROUPX "STARMATH_HID_SMA_LRGROUPX" -#define HID_SMA_LRPARENTX "STARMATH_HID_SMA_LRPARENTX" -#define HID_SMA_LRBRACKETX "STARMATH_HID_SMA_LRBRACKETX" -#define HID_SMA_LRBRACEX "STARMATH_HID_SMA_LRBRACEX" -#define HID_SMA_LRANGLEX "STARMATH_HID_SMA_LRANGLEX" -#define HID_SMA_LRCEILX "STARMATH_HID_SMA_LRCEILX" -#define HID_SMA_LRFLOORX "STARMATH_HID_SMA_LRFLOORX" -#define HID_SMA_LRLINEX "STARMATH_HID_SMA_LRLINEX" -#define HID_SMA_LRDLINEX "STARMATH_HID_SMA_LRDLINEX" -#define HID_SMA_SLRPARENTX "STARMATH_HID_SMA_SLRPARENTX" -#define HID_SMA_SLRBRACKETX "STARMATH_HID_SMA_SLRBRACKETX" -#define HID_SMA_SLRBRACEX "STARMATH_HID_SMA_SLRBRACEX" -#define HID_SMA_SLRANGLEX "STARMATH_HID_SMA_SLRANGLEX" -#define HID_SMA_SLRCEILX "STARMATH_HID_SMA_SLRCEILX" -#define HID_SMA_SLRFLOORX "STARMATH_HID_SMA_SLRFLOORX" -#define HID_SMA_SLRLINEX "STARMATH_HID_SMA_SLRLINEX" -#define HID_SMA_SLRDLINEX "STARMATH_HID_SMA_SLRDLINEX" -#define HID_SMA_RSUBX "STARMATH_HID_SMA_RSUBX" -#define HID_SMA_RSUPX "STARMATH_HID_SMA_RSUPX" -#define HID_SMA_LSUBX "STARMATH_HID_SMA_LSUBX" -#define HID_SMA_LSUPX "STARMATH_HID_SMA_LSUPX" -#define HID_SMA_SBLANK "STARMATH_HID_SMA_SBLANK" -#define HID_SMA_BLANK "STARMATH_HID_SMA_BLANK" -#define HID_SMA_NEWLINE "STARMATH_HID_SMA_NEWLINE" -#define HID_SMA_BINOMXY "STARMATH_HID_SMA_BINOMXY" -#define HID_SMA_STACK "STARMATH_HID_SMA_STACK" -#define HID_SMA_MATRIX "STARMATH_HID_SMA_MATRIX" -#define HID_SMA_ALIGNLX "STARMATH_HID_SMA_ALIGNLX" -#define HID_SMA_ALIGNCX "STARMATH_HID_SMA_ALIGNCX" -#define HID_SMA_ALIGNRX "STARMATH_HID_SMA_ALIGNRX" -#define HID_SMA_ALEPH "STARMATH_HID_SMA_ALEPH" -#define HID_SMA_EMPTYSET "STARMATH_HID_SMA_EMPTYSET" -#define HID_SMA_RE "STARMATH_HID_SMA_RE" -#define HID_SMA_IM "STARMATH_HID_SMA_IM" -#define HID_SMA_INFINITY "STARMATH_HID_SMA_INFINITY" -#define HID_SMA_PARTIAL "STARMATH_HID_SMA_PARTIAL" -#define HID_SMA_WP "STARMATH_HID_SMA_WP" -#define HID_SMA_DOTSAXIS "STARMATH_HID_SMA_DOTSAXIS" -#define HID_SMA_DOTSUP "STARMATH_HID_SMA_DOTSUP" -#define HID_SMA_DOTSDOWN "STARMATH_HID_SMA_DOTSDOWN" -#define HID_SMA_DOTSLOW "STARMATH_HID_SMA_DOTSLOW" -#define HID_SMA_DOTSVERT "STARMATH_HID_SMA_DOTSVERT" - -#define HID_SMA_SETN "STARMATH_HID_SMA_SETN" -#define HID_SMA_SETZ "STARMATH_HID_SMA_SETZ" -#define HID_SMA_SETQ "STARMATH_HID_SMA_SETQ" -#define HID_SMA_SETR "STARMATH_HID_SMA_SETR" -#define HID_SMA_SETC "STARMATH_HID_SMA_SETC" -#define HID_SMA_WIDEHATX "STARMATH_HID_SMA_WIDEHATX" -#define HID_SMA_WIDETILDEX "STARMATH_HID_SMA_WIDETILDEX" -#define HID_SMA_WIDEVECX "STARMATH_HID_SMA_WIDEVECX" -#define HID_SMA_CSUBX "STARMATH_HID_SMA_CSUBX" -#define HID_SMA_CSUPX "STARMATH_HID_SMA_CSUPX" -#define HID_SMA_HBAR "STARMATH_HID_SMA_HBAR" -#define HID_SMA_LAMBDABAR "STARMATH_HID_SMA_LAMBDABAR" -#define HID_SMA_LEFTARROW "STARMATH_HID_SMA_LEFTARROW" -#define HID_SMA_RIGHTARROW "STARMATH_HID_SMA_RIGHTARROW" -#define HID_SMA_UPARROW "STARMATH_HID_SMA_UPARROW" -#define HID_SMA_DOWNARROW "STARMATH_HID_SMA_DOWNARROW" - -#define HID_SMA_DEFAULT_DIST "STARMATH_HID_SMA_DEFAULT_DIST" -#define HID_SMA_LINE_DIST "STARMATH_HID_SMA_LINE_DIST" -#define HID_SMA_ROOT_DIST "STARMATH_HID_SMA_ROOT_DIST" -#define HID_SMA_SUP_DIST "STARMATH_HID_SMA_SUP_DIST" -#define HID_SMA_SUB_DIST "STARMATH_HID_SMA_SUB_DIST" -#define HID_SMA_NUMERATOR_DIST "STARMATH_HID_SMA_NUMERATOR_DIST" -#define HID_SMA_DENOMINATOR_DIST "STARMATH_HID_SMA_DENOMINATOR_DIST" -#define HID_SMA_FRACLINE_EXCWIDTH "STARMATH_HID_SMA_FRACLINE_EXCWIDTH" -#define HID_SMA_FRACLINE_LINEWIDTH "STARMATH_HID_SMA_FRACLINE_LINEWIDTH" -#define HID_SMA_UPPERLIMIT_DIST "STARMATH_HID_SMA_UPPERLIMIT_DIST" -#define HID_SMA_LOWERLIMIT_DIST "STARMATH_HID_SMA_LOWERLIMIT_DIST" -#define HID_SMA_BRACKET_EXCHEIGHT "STARMATH_HID_SMA_BRACKET_EXCHEIGHT" -#define HID_SMA_BRACKET_DIST "STARMATH_HID_SMA_BRACKET_DIST" -#define HID_SMA_MATRIXROW_DIST "STARMATH_HID_SMA_MATRIXROW_DIST" -#define HID_SMA_MATRIXCOL_DIST "STARMATH_HID_SMA_MATRIXCOL_DIST" -#define HID_SMA_ATTRIBUT_DIST "STARMATH_HID_SMA_ATTRIBUT_DIST" -#define HID_SMA_INTERATTRIBUT_DIST "STARMATH_HID_SMA_INTERATTRIBUT_DIST" -#define HID_SMA_OPERATOR_EXCHEIGHT "STARMATH_HID_SMA_OPERATOR_EXCHEIGHT" -#define HID_SMA_OPERATOR_DIST "STARMATH_HID_SMA_OPERATOR_DIST" -#define HID_SMA_LEFTBORDER_DIST "STARMATH_HID_SMA_LEFTBORDER_DIST" -#define HID_SMA_RIGHTBORDER_DIST "STARMATH_HID_SMA_RIGHTBORDER_DIST" -#define HID_SMA_UPPERBORDER_DIST "STARMATH_HID_SMA_UPPERBORDER_DIST" -#define HID_SMA_LOWERBORDER_DIST "STARMATH_HID_SMA_LOWERBORDER_DIST" -#define HID_SMA_SCALE_ALL_BRACKETS "STARMATH_HID_SMA_SCALE_ALL_BRACKETS" -#define HID_SMA_BRACKET_EXCHEIGHT2 "STARMATH_HID_SMA_BRACKET_EXCHEIGHT2" -#define HID_SMA_LMRANGLEXY "STARMATH_HID_SMA_LMRANGLEXY" -#define HID_SMA_SLMRANGLEXY "STARMATH_HID_SMA_SLMRANGLEXY" -#define HID_SMA_XWIDESLASHY "STARMATH_HID_SMA_XWIDESLASHY" -#define HID_SMA_XWIDEBSLASHY "STARMATH_HID_SMA_XWIDEBSLASHY" -#define HID_SMA_XOVERBRACEY "STARMATH_HID_SMA_XOVERBRACEY" -#define HID_SMA_XUNDERBRACEY "STARMATH_HID_SMA_XUNDERBRACEY" -#define HID_SMA_LRDBRACKETX "STARMATH_HID_SMA_LRDBRACKETX" -#define HID_SMA_SLRDBRACKETX "STARMATH_HID_SMA_SLRDBRACKETX" - -#define HID_SMA_CONTROL_SYMBOLSET_VIEW "STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW" -#define HID_SMA_CONTROL_FONTCHAR_VIEW "STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW" - -#define HID_SMA_NOSPACE "STARMATH_HID_SMA_NOSPACE" #define BMP_ARROW_RIGHT 1 #define MN_WIN 60 diff --git a/starmath/util/hidother.src b/starmath/util/hidother.src index e55a97852b62..23a4aab1eb76 100644 --- a/starmath/util/hidother.src +++ b/starmath/util/hidother.src @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "../inc/starmath.hrc" +#include "../inc/helpids.h" hidspecial HID_SMA_OPTIONSDIALOG { HelpId = HID_SMA_OPTIONSDIALOG; }; hidspecial HID_SMA_FONTDIALOG { HelpId = HID_SMA_FONTDIALOG; }; @@ -70,7 +70,6 @@ hidspecial HID_SMA_CREATORSTR { HelpId = HID_SMA_CREATORSTR; }; hidspecial HID_SMA_FILESMFTYP { HelpId = HID_SMA_FILESMFTYP; }; hidspecial HID_SMA_FILESYMTYP { HelpId = HID_SMA_FILESYMTYP; }; hidspecial HID_SMA_WIN_DOCUMENT { HelpId = HID_SMA_WIN_DOCUMENT; }; -hidspecial HID_SMA_VIEWSHELL_DOCUMENT { HelpId = HID_SMA_VIEWSHELL_DOCUMENT; }; hidspecial HID_SMA_COMMAND_WIN_EDIT { HelpId = HID_SMA_COMMAND_WIN_EDIT; }; hidspecial HID_SMA_DEFAULT_DIST { HelpId = HID_SMA_DEFAULT_DIST; }; diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index 24a795aec551..38b50dfdab3e 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -24,16 +24,10 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SOLAR_HRC -#include -#endif - #include "swcommands.h" #include #include -#define HID_BASE HID_APP_START - #define HID_BIB_BASE "SW_HID_BIB_BASE" #define HID_DBSEL "SW_HID_DBSEL" #define HID_DBEDIT "SW_HID_DBEDIT" @@ -91,7 +85,7 @@ #define HID_DRAW_WIN "SW_HID_DRAW_WIN" #define HID_EDIT_WIN "SW_HID_EDIT_WIN" -#define HID_INSERT_CTRL "SW_HID_INSERT_CTRL" // TbxControl Einfuegen +#define HID_INSERT_CTRL "SW_HID_INSERT_CTRL" // TbxControl Einfuegen #define HID_INSERT_OBJ_CTRL "SW_HID_INSERT_OBJ_CTRL" #define HID_INSERT_FIELD_CTRL "SW_HID_INSERT_FIELD_CTRL" @@ -213,7 +207,7 @@ #define HID_FILEDLG_LOADTEMPLATE "SW_HID_FILEDLG_LOADTEMPLATE" #define HID_FILEDLG_ROMENU "SW_HID_FILEDLG_ROMENU" #define HID_FILEDLG_MAILMRGE1 "SW_HID_FILEDLG_MAILMRGE1" -#define HID_FILEDLG_MAILMRGE2 "SW_HID_FILEDLG_MAILMRGE2" +#define HID_FILEDLG_MAILMRGE2 "SW_HID_FILEDLG_MAILMRGE2" #define HID_FILEDLG_FRMPAGE "SW_HID_FILEDLG_FRMPAGE" #define HID_FILEDLG_SRCVIEW "SW_HID_FILEDLG_SRCVIEW" #define HID_FILEDLG_WIZDOKU "SW_HID_FILEDLG_WIZDOKU" @@ -223,8 +217,8 @@ #define HID_MULTI_TOX_DLG "SW_HID_MULTI_TOX_DLG" #define HID_ASCII_FILTER "SW_HID_ASCII_FILTER" #define HID_GLBLTREE_EDIT_LINK "SW_HID_GLBLTREE_EDIT_LINK" -#define HID_FORMAT_NAME_OBJECT_NAME "SW_HID_FORMAT_NAME_OBJECT_NAME"// #100286# -#define HID_REFSELECTION_TOOLTIP "SW_HID_REFSELECTION_TOOLTIP" // #i83479# +#define HID_FORMAT_NAME_OBJECT_NAME "SW_HID_FORMAT_NAME_OBJECT_NAME"// #100286# +#define HID_REFSELECTION_TOOLTIP "SW_HID_REFSELECTION_TOOLTIP" // #i83479# // TabPage Help-IDs ********************************************************* @@ -431,8 +425,8 @@ #define HID_DLG_PASSWD_SECTION "SW_HID_DLG_PASSWD_SECTION" #define HID_MD_COPY_TO_CLIPBOARD "SW_HID_MD_COPY_TO_CLIPBOARD" #define HID_MD_GLOS_IMPORT "SW_HID_MD_GLOS_IMPORT" -#define HID_SMARTTAG_MAIN "SW_HID_SMARTTAG_MAIN" // SMARTTAGS -#define HID_LINGU_IGNORE_SELECTION "SW_HID_LINGU_IGNORE_SELECTION" // grammar check context menu +#define HID_SMARTTAG_MAIN "SW_HID_SMARTTAG_MAIN" // SMARTTAGS +#define HID_LINGU_IGNORE_SELECTION "SW_HID_LINGU_IGNORE_SELECTION" // grammar check context menu // Weiter Help-IDs ********************************************************** diff --git a/sw/util/hidother.src b/sw/util/hidother.src index b07855af625f..364377611fdc 100644 --- a/sw/util/hidother.src +++ b/sw/util/hidother.src @@ -25,8 +25,6 @@ * ************************************************************************/ #include "../inc/helpid.h" // HID_FUNC_XXX -//#include "shellid.hxx" // HID_FUNC_XXX da kommen sie eigentlich her -#include "hidother.hrc" // Help-IDs fuer Dokument-Fenster hidspecial HID_EDIT_WIN { HelpID = HID_EDIT_WIN; }; @@ -72,23 +70,6 @@ hidspecial HID_VS_NUM { HelpId = HID_VS_NUM ;}; hidspecial HID_VS_BULLET { HelpId = HID_VS_BULLET ;}; hidspecial HID_VS_NUMBMP { HelpId = HID_VS_NUMBMP ;}; -//Wegen Helferlein jetzt auch die ShellIds hier -hidspecial SW_TEXTSHELL { HelpId = SW_TEXTSHELL ;}; -hidspecial SW_LISTSHELL { HelpId = SW_LISTSHELL ;}; -hidspecial SW_TABSHELL { HelpId = SW_TABSHELL ;}; -hidspecial SW_FRAMESHELL { HelpId = SW_FRAMESHELL ;}; -hidspecial SW_GRFSHELL { HelpId = SW_GRFSHELL ;}; -hidspecial SW_OLESHELL { HelpId = SW_OLESHELL ;}; -hidspecial SW_DRAWSHELL { HelpId = SW_DRAWSHELL ;}; -hidspecial SW_DRWTXTSHELL { HelpId = SW_DRWTXTSHELL ;}; -hidspecial SW_PAGEPREVIEW { HelpId = SW_PAGEPREVIEW ;}; -hidspecial SW_SRC_VIEWSHELL { HelpId = SW_SRC_VIEWSHELL ;}; -hidspecial SW_BEZIERSHELL { HelpId = SW_BEZIERSHELL ;}; -hidspecial SW_DRAWFORMSHELL { HelpId = SW_DRAWFORMSHELL ;}; -hidspecial SW_WEBTEXTSHELL { HelpId = SW_WEBTEXTSHELL ;}; -hidspecial SW_WEBFRAMESHELL { HelpId = SW_WEBFRAMESHELL ;}; -hidspecial SW_MEDIASHELL { HelpId = SW_MEDIASHELL ;}; - // Navigator hidspecial HID_NAVIGATOR_TOOLBOX { HelpId = HID_NAVIGATOR_TOOLBOX;}; hidspecial HID_NAVI_TBX16 { HelpId = HID_NAVI_TBX16;}; -- cgit From 66be8992043f8728beb915ce13475ffd93d370fa Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- sd/inc/app.hrc | 44 ++++++++++++++ sd/inc/helpids.h | 69 +--------------------- sd/source/core/drawdoc4.cxx | 1 + sd/source/core/sdpage.cxx | 2 +- sd/source/core/stlpool.cxx | 1 + sd/source/ui/func/futempl.cxx | 2 +- .../ui/toolpanel/controls/MasterPagesPanel.cxx | 1 + sd/util/hidother.src | 26 +------- 8 files changed, 53 insertions(+), 93 deletions(-) mode change 100644 => 100755 sd/inc/helpids.h mode change 100644 => 100755 sd/source/ui/func/futempl.cxx mode change 100644 => 100755 sd/util/hidother.src diff --git a/sd/inc/app.hrc b/sd/inc/app.hrc index 65aec562f084..9a18f184363b 100755 --- a/sd/inc/app.hrc +++ b/sd/inc/app.hrc @@ -32,6 +32,50 @@ #include #endif +// HelpIDs fuer Vorlagen +#define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70) +#define HID_POOLSHEET_OBJWITHARROW (HID_SD_START + 71) +#define HID_POOLSHEET_OBJWITHSHADOW (HID_SD_START + 72) +#define HID_POOLSHEET_OBJWITHOUTFILL (HID_SD_START + 73) +#define HID_POOLSHEET_TEXT (HID_SD_START + 74) +#define HID_POOLSHEET_TEXTBODY (HID_SD_START + 75) +#define HID_POOLSHEET_TEXTBODY_JUSTIFY (HID_SD_START + 76) +#define HID_POOLSHEET_TEXTBODY_INDENT (HID_SD_START + 77) +#define HID_POOLSHEET_TITLE (HID_SD_START + 78) +#define HID_POOLSHEET_TITLE1 (HID_SD_START + 79) +#define HID_POOLSHEET_TITLE2 (HID_SD_START + 80) +#define HID_POOLSHEET_HEADLINE (HID_SD_START + 81) +#define HID_POOLSHEET_HEADLINE1 (HID_SD_START + 82) +#define HID_POOLSHEET_HEADLINE2 (HID_SD_START + 83) +#define HID_POOLSHEET_MEASURE (HID_SD_START + 84) +#define HID_PSEUDOSHEET_TITLE (HID_SD_START + 85) +#define HID_PSEUDOSHEET_OUTLINE (HID_SD_START + 86) +#define HID_PSEUDOSHEET_OUTLINE1 (HID_SD_START + 87) +#define HID_PSEUDOSHEET_OUTLINE2 (HID_SD_START + 88) +#define HID_PSEUDOSHEET_OUTLINE3 (HID_SD_START + 89) +#define HID_PSEUDOSHEET_OUTLINE4 (HID_SD_START + 90) +#define HID_PSEUDOSHEET_OUTLINE5 (HID_SD_START + 91) +#define HID_PSEUDOSHEET_OUTLINE6 (HID_SD_START + 92) +#define HID_PSEUDOSHEET_OUTLINE7 (HID_SD_START + 93) +#define HID_PSEUDOSHEET_OUTLINE8 (HID_SD_START + 94) +#define HID_PSEUDOSHEET_OUTLINE9 (HID_SD_START + 95) +#define HID_PSEUDOSHEET_BACKGROUNDOBJECTS (HID_SD_START + 96) +#define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97) +#define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98) +#define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101) + +#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194) +#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195) +#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196) +#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197) +#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198) +#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199) + +#define SHELLID_SD_TASK_PANE_PREVIEW_CURRENT (HID_SD_START + 174) +#define SHELLID_SD_TASK_PANE_PREVIEW_RECENT (HID_SD_START + 175) +#define SHELLID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176) +#define SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177) + #define SID_BACKGROUND (SID_SD_START) #define SID_LASTVERSION (SID_SD_START+1) #define SID_PAGESETUP (SID_SD_START+2) diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h old mode 100644 new mode 100755 index d9e0f5561a6b..2dabcc43db45 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -24,68 +24,47 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#ifndef _SOLAR_HRC -#include -#endif - #include #include #include "sdcommands.h" -#define SHELLID_SD_TASK_PANE_PREVIEW_CURRENT (HID_SD_START + 174) -#define SHELLID_SD_TASK_PANE_PREVIEW_RECENT (HID_SD_START + 175) -#define SHELLID_SD_TASK_PANE_PREVIEW_ALL (HID_SD_START + 176) -#define SHELLID_SD_TASK_PANE_PREVIEW_LAYOUTS (HID_SD_START + 177) - #define HID_NOTESMODE "SD_HID_NOTESMODE" #define HID_HANDOUTMODE "SD_HID_HANDOUTMODE" #define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL" #define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL" #define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL" - #define HID_SD_PRINT_OPTIONS "SD_HID_SD_PRINT_OPTIONS" #define HID_SD_OPTIONS_SNAP "SD_HID_SD_OPTIONS_SNAP" #define HID_SD_OPTIONS_VIEW "SD_HID_SD_OPTIONS_VIEW" - #define HID_SD_AUTOPILOT_PAGE1 "SD_HID_SD_AUTOPILOT_PAGE1" #define HID_SD_AUTOPILOT_PAGE2 "SD_HID_SD_AUTOPILOT_PAGE2" #define HID_SD_AUTOPILOT_PAGE3 "SD_HID_SD_AUTOPILOT_PAGE3" #define HID_SD_AUTOPILOT_PAGE4 "SD_HID_SD_AUTOPILOT_PAGE4" #define HID_SD_AUTOPILOT_PAGE5 "SD_HID_SD_AUTOPILOT_PAGE5" #define HID_SD_AUTOPILOT_PAGE6 "SD_HID_SD_AUTOPILOT_PAGE6" - #define HID_SD_CBX_ONLYSELECTED "SD_HID_SD_CBX_ONLYSELECTED" #define HID_SD_BTN_FILTERDIALOG "SD_HID_SD_BTN_FILTERDIALOG" - #define HID_SD_BTN_PAGE "SD_HID_SD_BTN_PAGE" #define HID_SD_BTN_MASTERPAGE "SD_HID_SD_BTN_MASTERPAGE" #define HID_SD_BTN_LAYER "SD_HID_SD_BTN_LAYER" - #define HID_SD_BTN_DRAW "SD_HID_SD_BTN_DRAW" #define HID_SD_BTN_SLIDE "SD_HID_SD_BTN_SLIDE" #define HID_SD_BTN_OUTLINE "SD_HID_SD_BTN_OUTLINE" #define HID_SD_BTN_NOTES "SD_HID_SD_BTN_NOTES" #define HID_SD_BTN_HANDOUT "SD_HID_SD_BTN_HANDOUT" - #define HID_SD_WIN_DOCUMENT "SD_HID_SD_WIN_DOCUMENT" - #define HID_SD_OPTIONS_LAYOUT "SD_HID_SD_OPTIONS_LAYOUT" #define HID_SD_OPTIONS_CONTENTS "SD_HID_SD_OPTIONS_CONTENTS" #define HID_SD_OPTIONS_MISC "SD_HID_SD_OPTIONS_MISC" - #define HID_SD_EFFECT_PREVIEW "SD_HID_SD_EFFECT_PREVIEW" #define HID_SD_CTL_NEWFOIL "SD_HID_SD_CTL_NEWFOIL" #define HID_SD_NAVIGATOR_TLB "SD_HID_SD_NAVIGATOR_TLB" #define HID_SD_NAVIGATOR "SD_HID_SD_NAVIGATOR" - #define HID_SD_CTL_EFFECTS "SD_HID_SD_CTL_EFFECTS" #define HID_SD_CTL_TEXT_EFFECTS "SD_HID_SD_CTL_TEXT_EFFECTS" - #define HID_SD_CTL_SLIDE_CHANGE "SD_HID_SD_CTL_SLIDE_CHANGE" - #define HID_SD_NAVIGATOR_TBX "SD_HID_SD_NAVIGATOR_TBX" #define HID_SD_NAVIGATOR_LB "SD_HID_SD_NAVIGATOR_LB" - #define HID_SD_NAVIGATOR_TBI_PEN "SD_HID_SD_NAVIGATOR_TBI_PEN" #define HID_SD_NAVIGATOR_TBI_FIRST "SD_HID_SD_NAVIGATOR_TBI_FIRST" #define HID_SD_NAVIGATOR_TBI_PREV "SD_HID_SD_NAVIGATOR_TBI_PREV" @@ -130,40 +109,6 @@ #define HID_SD_WIN_PRESENTATION "SD_HID_SD_WIN_PRESENTATION" -// HelpIDs fuer Vorlagen -#define HID_STANDARD_STYLESHEET_NAME (HID_SD_START + 70) -#define HID_POOLSHEET_OBJWITHARROW (HID_SD_START + 71) -#define HID_POOLSHEET_OBJWITHSHADOW (HID_SD_START + 72) -#define HID_POOLSHEET_OBJWITHOUTFILL (HID_SD_START + 73) -#define HID_POOLSHEET_TEXT (HID_SD_START + 74) -#define HID_POOLSHEET_TEXTBODY (HID_SD_START + 75) -#define HID_POOLSHEET_TEXTBODY_JUSTIFY (HID_SD_START + 76) -#define HID_POOLSHEET_TEXTBODY_INDENT (HID_SD_START + 77) -#define HID_POOLSHEET_TITLE (HID_SD_START + 78) -#define HID_POOLSHEET_TITLE1 (HID_SD_START + 79) -#define HID_POOLSHEET_TITLE2 (HID_SD_START + 80) -#define HID_POOLSHEET_HEADLINE (HID_SD_START + 81) -#define HID_POOLSHEET_HEADLINE1 (HID_SD_START + 82) -#define HID_POOLSHEET_HEADLINE2 (HID_SD_START + 83) -#define HID_POOLSHEET_MEASURE (HID_SD_START + 84) - -#define HID_PSEUDOSHEET_TITLE (HID_SD_START + 85) -#define HID_PSEUDOSHEET_OUTLINE (HID_SD_START + 86) -#define HID_PSEUDOSHEET_OUTLINE1 (HID_SD_START + 87) -#define HID_PSEUDOSHEET_OUTLINE2 (HID_SD_START + 88) -#define HID_PSEUDOSHEET_OUTLINE3 (HID_SD_START + 89) -#define HID_PSEUDOSHEET_OUTLINE4 (HID_SD_START + 90) -#define HID_PSEUDOSHEET_OUTLINE5 (HID_SD_START + 91) -#define HID_PSEUDOSHEET_OUTLINE6 (HID_SD_START + 92) -#define HID_PSEUDOSHEET_OUTLINE7 (HID_SD_START + 93) -#define HID_PSEUDOSHEET_OUTLINE8 (HID_SD_START + 94) -#define HID_PSEUDOSHEET_OUTLINE9 (HID_SD_START + 95) -#define HID_PSEUDOSHEET_BACKGROUNDOBJECTS (HID_SD_START + 96) -#define HID_PSEUDOSHEET_BACKGROUND (HID_SD_START + 97) -#define HID_PSEUDOSHEET_NOTES (HID_SD_START + 98) - -#define HID_PSEUDOSHEET_SUBTITLE (HID_SD_START + 101) - #define HID_DLG_DEFINE_CUSTOMSHOW "SD_HID_DLG_DEFINE_CUSTOMSHOW" #define HID_DLG_DEFINE_CUSTOMSHOW_CTL "SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL" @@ -205,9 +150,9 @@ #define HID_SD_PAGEOBJSTLB "SD_HID_SD_PAGEOBJSTLB" -#define HID_SD_NAMEDIALOG_OBJECT "SD_HID_SD_NAMEDIALOG_OBJECT" -#define HID_SD_NAMEDIALOG_PAGE "SD_HID_SD_NAMEDIALOG_PAGE" -#define HID_SD_NAMEDIALOG_LINEEND "SD_HID_SD_NAMEDIALOG_LINEEND" +#define HID_SD_NAMEDIALOG_OBJECT "SD_HID_SD_NAMEDIALOG_OBJECT" +#define HID_SD_NAMEDIALOG_PAGE "SD_HID_SD_NAMEDIALOG_PAGE" +#define HID_SD_NAMEDIALOG_LINEEND "SD_HID_SD_NAMEDIALOG_LINEEND" #define HID_SD_DRAW_3D_TOOLBOX "SD_HID_SD_DRAW_3D_TOOLBOX" #define HID_SD_DRAW_FONTWORK_TOOLBOX "SD_HID_SD_DRAW_FONTWORK_TOOLBOX" @@ -284,13 +229,6 @@ #define HID_SD_RULER_HORIZONTAL "SD_HID_SD_RULER_HORIZONTAL" #define HID_SD_RULER_VERTICAL "SD_HID_SD_RULER_VERTICAL" -#define HID_SD_CELL_STYLE_DEFAULT (HID_SD_START + 194) -#define HID_SD_CELL_STYLE_BANDED (HID_SD_START + 195) -#define HID_SD_CELL_STYLE_HEADER (HID_SD_START + 196) -#define HID_SD_CELL_STYLE_TOTAL (HID_SD_START + 197) -#define HID_SD_CELL_STYLE_FIRST_COLUMN (HID_SD_START + 198) -#define HID_SD_CELL_STYLE_LAST_COLUMN (HID_SD_START + 199) - #define HID_SD_TABLE_DESIGN "SD_HID_SD_TABLE_DESIGN" #define HID_SD_ANNOTATIONS "SD_HID_SD_ANNOTATIONS" @@ -313,4 +251,3 @@ #define HID_MN_SUB_PREVIEW_OUTPUT_QUALITY "SD_HID_MN_SUB_PREVIEW_OUTPUT_QUALITY" #define HID_MN_SUB_CONVERT "SD_HID_MN_SUB_CONVERT" #define HID_MN_SUB_MIRROR "SD_HID_MN_SUB_MIRROR" - diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx index 89f74de30494..a58577458a67 100755 --- a/sd/source/core/drawdoc4.cxx +++ b/sd/source/core/drawdoc4.cxx @@ -117,6 +117,7 @@ #include #include #include +#include "app.hrc" using ::rtl::OUString; using namespace ::com::sun::star; diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 76450cf76760..739966c9baf2 100755 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -66,7 +66,7 @@ #include "../ui/inc/DrawDocShell.hxx" #include "Outliner.hxx" - +#include "app.hrc" #include "misc.hxx" #include "eetext.hxx" #include "drawdoc.hxx" diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx index 138863cc313a..205e007d9e97 100755 --- a/sd/source/core/stlpool.cxx +++ b/sd/source/core/stlpool.cxx @@ -76,6 +76,7 @@ #include "sdpage.hxx" #include "helpids.h" #include +#include "app.hrc" using ::rtl::OUString; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx old mode 100644 new mode 100755 index 43572c2af8a4..437d4bc246a6 --- a/sd/source/ui/func/futempl.cxx +++ b/sd/source/ui/func/futempl.cxx @@ -54,7 +54,7 @@ #include #include #include - +#include "app.hrc" #include "stlsheet.hxx" #include "sdpage.hxx" #include "stlpool.hxx" diff --git a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx index d87dfbd24f0e..d7c96252136c 100755 --- a/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx +++ b/sd/source/ui/toolpanel/controls/MasterPagesPanel.cxx @@ -45,6 +45,7 @@ #include "sdresid.hxx" #include "helpids.h" #include +#include "app.hrc" namespace sd { namespace toolpanel { namespace controls { diff --git a/sd/util/hidother.src b/sd/util/hidother.src old mode 100644 new mode 100755 index 1a15c421b419..bd378fb6d75f --- a/sd/util/hidother.src +++ b/sd/util/hidother.src @@ -24,28 +24,8 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ + #include "../inc/helpids.h" -#include "hidother.hrc" -#include "../inc/app.hrc" - -hidspecial SID_NOTESMODE { HelpId = SID_NOTESMODE; }; -hidspecial SID_HANDOUTMODE { HelpId = SID_HANDOUTMODE; }; - -hidspecial SD_IF_SDAPP { HelpId = SD_IF_SDAPP; }; -hidspecial SD_IF_SDDRAWDOCSHELL { HelpId = SD_IF_SDDRAWDOCSHELL; }; -hidspecial SD_IF_SDVIEWSHELL { HelpId = SD_IF_SDVIEWSHELL; }; -hidspecial SD_IF_SDDRAWVIEWSHELL { HelpId = SD_IF_SDDRAWVIEWSHELL; }; -hidspecial SD_IF_SDSLIDEVIEWSHELL { HelpId = SD_IF_SDSLIDEVIEWSHELL; }; -hidspecial SD_IF_SDOUTLINEVIEWSHELL { HelpId = SD_IF_SDOUTLINEVIEWSHELL; }; -hidspecial SD_IF_SDDRAWSTDOBJECTBAR { HelpId = SD_IF_SDDRAWSTDOBJECTBAR; }; -hidspecial SD_IF_SDDRAWTEXTOBJECTBAR { HelpId = SD_IF_SDDRAWTEXTOBJECTBAR; }; -hidspecial SD_IF_SDDRAWBEZIEROBJECTBAR { HelpId = SD_IF_SDDRAWBEZIEROBJECTBAR; }; -hidspecial SD_IF_SDDRAWGLUEPOINTSOBJECTBAR { HelpId = SD_IF_SDDRAWGLUEPOINTSOBJECTBAR; }; -hidspecial SD_IF_SDGRAPHICDOCSHELL { HelpId = SD_IF_SDGRAPHICDOCSHELL; }; -hidspecial SD_IF_SDGRAPHICVIEWSHELL { HelpId = SD_IF_SDGRAPHICVIEWSHELL; }; -hidspecial SD_IF_SDGRAPHICSTDOBJECTBAR { HelpId = SD_IF_SDGRAPHICSTDOBJECTBAR; }; -hidspecial SD_IF_SDDRAWGRAFOBJECTBAR { HelpId = SD_IF_SDDRAWGRAFOBJECTBAR; }; -hidspecial SD_IF_SDPRESVIEWSHELL { HelpId = SD_IF_SDPRESVIEWSHELL; }; hidspecial HID_SD_PRINT_OPTIONS { HelpId = HID_SD_PRINT_OPTIONS; }; hidspecial HID_SD_OPTIONS_SNAP { HelpId = HID_SD_OPTIONS_SNAP; }; @@ -130,8 +110,6 @@ hidspecial HID_SD_NAMEDIALOG_LINEEND { HelpId = HID_SD_NAMEDIALOG_LINEEND; }; hidspecial HID_SD_TABPAGE_HEADERFOOTER_SLIDE { HelpId = HID_SD_TABPAGE_HEADERFOOTER_SLIDE; }; hidspecial HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT { HelpId = HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT; }; -hidspecial SD_IF_SDDRAWMEDIAOBJECTBAR { HelpId = SD_IF_SDDRAWMEDIAOBJECTBAR; }; - hidspecial HID_SD_TASK_PANE { HelpId = HID_SD_TASK_PANE; }; hidspecial HID_SD_SLIDE_DESIGNS { HelpId = HID_SD_SLIDE_DESIGNS; }; hidspecial HID_SD_CURRENT_MASTERS { HelpId = HID_SD_CURRENT_MASTERS; }; @@ -194,8 +172,6 @@ hidspecial HID_SD_CUSTOMANIMATIONPANE_TRANSPARENCYPROPERTYBOX { HelpId = HID_S hidspecial HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_SCALEPROPERTYBOX; }; hidspecial HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX { HelpId = HID_SD_CUSTOMANIMATIONPANE_FONTSTYLEPROPERTYBOX; }; -hidspecial SID_SAVEGRAPHIC { HelpId = SID_SAVEGRAPHIC; }; - hidspecial HID_SD_SLIDESHOW_DISPLAY { HelpId = HID_SD_SLIDESHOW_DISPLAY; }; hidspecial HID_SD_RULER_HORIZONTAL { HelpId = HID_SD_RULER_HORIZONTAL; }; -- cgit From 13afa75fa7892d82f7eeb47b52fdf17fd2a97681 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- chart2/source/controller/dialogs/hidother.src | 3 - chart2/source/controller/inc/HelpIds.hrc | 2 - sc/inc/helpids.h | 692 ++++++++++++++++++++++++++ sc/inc/sc.hrc | 383 +------------- sc/inc/scfuncs.hrc | 289 ----------- sc/source/ui/drawfunc/fuins2.cxx | 1 - sc/util/hidother.src | 34 +- 7 files changed, 694 insertions(+), 710 deletions(-) create mode 100644 sc/inc/helpids.h diff --git a/chart2/source/controller/dialogs/hidother.src b/chart2/source/controller/dialogs/hidother.src index 4b006f0f1f93..195115e93bd1 100644 --- a/chart2/source/controller/dialogs/hidother.src +++ b/chart2/source/controller/dialogs/hidother.src @@ -25,9 +25,6 @@ * ************************************************************************/ #include "HelpIds.hrc" -#include "SchSlotIds.hxx" - -hidspecial SID_INSERT_GRIDS {HelpId= SID_INSERT_GRIDS; }; hidspecial HID_SCH_CB_XAXIS {HelpId= HID_SCH_CB_XAXIS; }; hidspecial HID_SCH_CB_YAXIS {HelpId= HID_SCH_CB_YAXIS; }; diff --git a/chart2/source/controller/inc/HelpIds.hrc b/chart2/source/controller/inc/HelpIds.hrc index c6b5f456b059..5e20b7980c8b 100644 --- a/chart2/source/controller/inc/HelpIds.hrc +++ b/chart2/source/controller/inc/HelpIds.hrc @@ -27,8 +27,6 @@ #ifndef CHART_HELPIDS_HRC #define CHART_HELPIDS_HRC -#include - #define HID_SCH_ALIGNMENT "CHART2_HID_SCH_ALIGNMENT" #define HID_SCH_LEGEND_POS "CHART2_HID_SCH_LEGEND_POS" #define HID_SCH_DATA_DESCR "CHART2_HID_SCH_DATA_DESCR" diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h new file mode 100644 index 000000000000..1d89f07e49a7 --- /dev/null +++ b/sc/inc/helpids.h @@ -0,0 +1,692 @@ +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "sfx2/sfxcommands.h" +#include "svx/svxcommands.h" +#include "sccommands.h" + +#define HID_INSWIN_POS "SC_HID_INSWIN_POS" +#define HID_INSWIN_CALC "SC_HID_INSWIN_CALC" +#define HID_INSWIN_CANCEL "SC_HID_INSWIN_CANCEL" +#define HID_INSWIN_OK "SC_HID_INSWIN_OK" +#define HID_INSWIN_SUMME "SC_HID_INSWIN_SUMME" +#define HID_INSWIN_FUNC "SC_HID_INSWIN_FUNC" +#define HID_INSWIN_INPUT "SC_HID_INSWIN_INPUT" + +// Hilfe IDs fuer Dokumentfenster -------------------------------------------- +#define HID_SC_WIN_GRIDWIN "SC_HID_SC_WIN_GRIDWIN" +#define HID_SC_WIN_PREVIEW "SC_HID_SC_WIN_PREVIEW" + +// Hilfe IDs fuer einzelne Controls (max.30) --------------------------------- +// Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts +#define HID_SC_HF_HLL "SC_HID_SC_HF_HLL" +#define HID_SC_HF_HLC "SC_HID_SC_HF_HLC" +#define HID_SC_HF_HLR "SC_HID_SC_HF_HLR" +#define HID_SC_HF_HRL "SC_HID_SC_HF_HRL" +#define HID_SC_HF_HRC "SC_HID_SC_HF_HRC" +#define HID_SC_HF_HRR "SC_HID_SC_HF_HRR" +#define HID_SC_HF_FLL "SC_HID_SC_HF_FLL" +#define HID_SC_HF_FLC "SC_HID_SC_HF_FLC" +#define HID_SC_HF_FLR "SC_HID_SC_HF_FLR" +#define HID_SC_HF_FRL "SC_HID_SC_HF_FRL" +#define HID_SC_HF_FRC "SC_HID_SC_HF_FRC" +#define HID_SC_HF_FRR "SC_HID_SC_HF_FRR" +// "Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr! +#define HID_SC_SUBT_COLS_1 "SC_HID_SC_SUBT_COLS_1" +#define HID_SC_SUBT_COLS_2 "SC_HID_SC_SUBT_COLS_2" +#define HID_SC_SUBT_COLS_3 "SC_HID_SC_SUBT_COLS_3" +// Eintraege im Navigator +#define HID_SC_NAVIPI_ENTRIES "SC_HID_SC_NAVIPI_ENTRIES" +#define HID_SC_NAVIPI_ROW "SC_HID_SC_NAVIPI_ROW" +#define HID_SC_NAVIPI_COL "SC_HID_SC_NAVIPI_COL" +#define HID_SC_NAVIPI_DOC "SC_HID_SC_NAVIPI_DOC" +#define HID_SC_NAVIPI_DATA "SC_HID_SC_NAVIPI_DATA" +#define HID_SC_NAVIPI_UP "SC_HID_SC_NAVIPI_UP" +#define HID_SC_NAVIPI_DOWN "SC_HID_SC_NAVIPI_DOWN" +#define HID_SC_NAVIPI_ZOOM "SC_HID_SC_NAVIPI_ZOOM" +#define HID_SC_NAVIPI_ROOT "SC_HID_SC_NAVIPI_ROOT" +#define HID_SC_NAVIPI_SCEN "SC_HID_SC_NAVIPI_SCEN" +#define HID_SC_NAVIPI_DROP "SC_HID_SC_NAVIPI_DROP" +// Teilergebnisse +#define HID_SC_SUBT_GROUP "SC_HID_SC_SUBT_GROUP" +#define HID_SC_SUBT_COLS "SC_HID_SC_SUBT_COLS" +#define HID_SC_SUBT_FUNC "SC_HID_SC_SUBT_FUNC" +// +#define HID_SC_NAVIPI_TOOLBOX "SC_HID_SC_NAVIPI_TOOLBOX" +// Bereich ist voll! + +// Hilfe IDs fuer Dialoge / Pages (max.70) ----------------------------------- +#define HID_SC_AUTOFORMAT "SC_HID_SC_AUTOFORMAT" +#define HID_SC_PIVOTFILTER "SC_HID_SC_PIVOTFILTER" +#define HID_SC_INPORTOPT "SC_HID_SC_INPORTOPT" +#define HID_SC_PIVOTSUBT "SC_HID_SC_PIVOTSUBT" +#define HID_SC_FORM_ARGS "SC_HID_SC_FORM_ARGS" +#define HID_SCPAGE_SORT_FIELDS "SC_HID_SCPAGE_SORT_FIELDS" +#define HID_SCPAGE_SORT_OPTIONS "SC_HID_SCPAGE_SORT_OPTIONS" +#define HID_SCPAGE_SUBT_OPTIONS "SC_HID_SCPAGE_SUBT_OPTIONS" +#define HID_SCPAGE_SUBT_GROUP "SC_HID_SCPAGE_SUBT_GROUP" +#define HID_SCPAGE_PROTECTION "SC_HID_SCPAGE_PROTECTION" +#define HID_SCPAGE_VIEW "SC_HID_SCPAGE_VIEW" +#define HID_SCPAGE_CALC "SC_HID_SCPAGE_CALC" +#define HID_SCPAGE_USERLISTS "SC_HID_SCPAGE_USERLISTS" +#define HID_SCPAGE_HFEDIT "SC_HID_SCPAGE_HFEDIT" +#define HID_SCPAGE_AREAS "SC_HID_SCPAGE_AREAS" +#define HID_SCPAGE_TABLE "SC_HID_SCPAGE_TABLE" +#define HID_SCPAGE_PRINT "SC_HID_SCPAGE_PRINT" + +#define HID_SCPAGE_SUBT_GROUP1 "SC_HID_SCPAGE_SUBT_GROUP1" +#define HID_SCPAGE_SUBT_GROUP2 "SC_HID_SCPAGE_SUBT_GROUP2" +#define HID_SCPAGE_SUBT_GROUP3 "SC_HID_SCPAGE_SUBT_GROUP3" + +#define HID_SCPAGE_HFED_HL "SC_HID_SCPAGE_HFED_HL" +#define HID_SCPAGE_HFED_HR "SC_HID_SCPAGE_HFED_HR" +#define HID_SCPAGE_HFED_FL "SC_HID_SCPAGE_HFED_FL" +#define HID_SCPAGE_HFED_FR "SC_HID_SCPAGE_HFED_FR" + +#define HID_SCPAGE_CONTENT "SC_HID_SCPAGE_CONTENT" +#define HID_SCPAGE_LAYOUT "SC_HID_SCPAGE_LAYOUT" +#define HID_SCPAGE_INPUT "SC_HID_SCPAGE_INPUT" + +#define HID_SC_NAVIGATOR "SC_HID_SC_NAVIGATOR" + +#define HID_SC_MTRIN_VAL "SC_HID_SC_MTRIN_VAL" +#define HID_SC_MTRIN_DEF "SC_HID_SC_MTRIN_DEF" +#define HID_SC_SELENTRY_LIST "SC_HID_SC_SELENTRY_LIST" +#define HID_SC_GROUP_COLS "SC_HID_SC_GROUP_COLS" +#define HID_SC_GROUP_ROWS "SC_HID_SC_GROUP_ROWS" + +#define HID_SC_HF_TEXT "SC_HID_SC_HF_TEXT" +#define HID_SC_HF_FILE "SC_HID_SC_HF_FILE" +#define HID_SC_HF_TABLE "SC_HID_SC_HF_TABLE" +#define HID_SC_HF_PAGE "SC_HID_SC_HF_PAGE" +#define HID_SC_HF_PAGES "SC_HID_SC_HF_PAGES" +#define HID_SC_HF_DATE "SC_HID_SC_HF_DATE" +#define HID_SC_HF_TIME "SC_HID_SC_HF_TIME" + +#define HID_SC_HEADER_EDIT "SC_HID_SC_HEADER_EDIT" +#define HID_SC_FOOTER_EDIT "SC_HID_SC_FOOTER_EDIT" + +#define HID_SC_SCENWIN_TOP "SC_HID_SC_SCENWIN_TOP" +#define HID_SC_SCENWIN_BOTTOM "SC_HID_SC_SCENWIN_BOTTOM" + +#define HID_SC_INPUTWIN "SC_HID_SC_INPUTWIN" + +#define HID_SC_RENAME_NAME "SC_HID_SC_RENAME_NAME" +#define HID_SC_APPEND_NAME "SC_HID_SC_APPEND_NAME" + +// Funktionsautopilot: nur als Unique-IDs +#define HID_SC_FAP_PAGE "SC_HID_SC_FAP_PAGE" +#define HID_SC_FAP_EDIT1 "SC_HID_SC_FAP_EDIT1" +#define HID_SC_FAP_EDIT2 "SC_HID_SC_FAP_EDIT2" +#define HID_SC_FAP_EDIT3 "SC_HID_SC_FAP_EDIT3" +#define HID_SC_FAP_EDIT4 "SC_HID_SC_FAP_EDIT4" + +#define HID_SC_ADD_AUTOFMT "SC_HID_SC_ADD_AUTOFMT" +#define HID_SC_AUTOFMT_NAME "SC_HID_SC_AUTOFMT_NAME" + +#define HID_SC_DROPMODE_URL "SC_HID_SC_DROPMODE_URL" +#define HID_SC_DROPMODE_LINK "SC_HID_SC_DROPMODE_LINK" +#define HID_SC_DROPMODE_COPY "SC_HID_SC_DROPMODE_COPY" + +#define HID_SC_FAP_STRUCT "SC_HID_SC_FAP_STRUCT" +#define HID_SC_ASCII_TABCTR "SC_HID_SC_ASCII_TABCTR" + +#define HID_SC_SCENARIO_DELETE "SC_HID_SC_SCENARIO_DELETE" +#define HID_SC_SCENARIO_EDIT "SC_HID_SC_SCENARIO_EDIT" + +#define HID_SCDLG_FORMULA "SC_HID_SCDLG_FORMULA" +#define HID_SCDLG_CONDFORMAT "SC_HID_SCDLG_CONDFORMAT" +#define HID_COLROWNAMERANGES "SC_HID_COLROWNAMERANGES" + +#define HID_FUNCTION_BOX "SC_HID_FUNCTION_BOX" +#define HID_SCPAGE_OPREDLINE "SC_HID_SCPAGE_OPREDLINE" +#define HID_SC_REDLIN_CTR "SC_HID_SC_REDLIN_CTR" + +//Kopf/FusszeilenDlg: Contextmenue fuer Dateiname +#define HID_FCOMMAND_TITEL "SC_HID_FCOMMAND_TITEL" +#define HID_FCOMMAND_FILENAME "SC_HID_FCOMMAND_FILENAME" +#define HID_FCOMMAND_PATH "SC_HID_FCOMMAND_PATH" + + +// Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) ----------------------- + +#define HID_SC_TOOLBOX_TOOLS "SC_HID_SC_TOOLBOX_TOOLS" +#define HID_SC_TOOLBOX_TABLE "SC_HID_SC_TOOLBOX_TABLE" +#define HID_SC_TOOLBOX_DRAW "SC_HID_SC_TOOLBOX_DRAW" +#define HID_SC_TOOLBOX_DRTEXT "SC_HID_SC_TOOLBOX_DRTEXT" +#define HID_SC_TOOLBOX_PREVIEW "SC_HID_SC_TOOLBOX_PREVIEW" + +// wrong group - HID_SC_DLG_START is full +#define HID_SC_RENAME_AUTOFMT "SC_HID_SC_RENAME_AUTOFMT" +#define HID_SC_REN_AFMT_NAME "SC_HID_SC_REN_AFMT_NAME" + +#define HID_SC_TOOLBOX_GRAPHIC "SC_HID_SC_TOOLBOX_GRAPHIC" + +#define HID_CHG_PROTECT "SC_HID_CHG_PROTECT" + +#define HID_SC_RENAME_OBJECT "SC_HID_SC_RENAME_OBJECT" + +#define HID_SC_REN_AFMT_DLG "SC_HID_SC_REN_AFMT_DLG" + +// Hilfe IDs fuer Submenus (max.50) ------------------------------------------ +#define HID_SCMENU_EDIT "SC_HID_SCMENU_EDIT" +#define HID_SCMENU_FILL "SC_HID_SCMENU_FILL" +#define HID_SCMENU_DELBREAK "SC_HID_SCMENU_DELBREAK" +#define HID_SCMENU_VIEW "SC_HID_SCMENU_VIEW" +#define HID_SCMENU_TOOLBARS "SC_HID_SCMENU_TOOLBARS" +#define HID_SCMENU_INSERT "SC_HID_SCMENU_INSERT" +#define HID_SCMENU_INSBREAK "SC_HID_SCMENU_INSBREAK" +#define HID_SCMENU_NAME "SC_HID_SCMENU_NAME" +#define HID_SCMENU_GRAPHIC "SC_HID_SCMENU_GRAPHIC" +#define HID_SCMENU_DATA "SC_HID_SCMENU_DATA" +#define HID_SCMENU_FILTER "SC_HID_SCMENU_FILTER" +#define HID_SCMENU_OUTLINE "SC_HID_SCMENU_OUTLINE" +#define HID_SCMENU_PIVOT "SC_HID_SCMENU_PIVOT" +#define HID_SCMENU_EXTRA "SC_HID_SCMENU_EXTRA" +#define HID_SCMENU_SPELLING "SC_HID_SCMENU_SPELLING" +#define HID_SCMENU_AUDIT "SC_HID_SCMENU_AUDIT" +#define HID_SCMENU_PROTECT "SC_HID_SCMENU_PROTECT" +#define HID_SCMENU_CELLCONT "SC_HID_SCMENU_CELLCONT" +#define HID_SCMENU_ROW "SC_HID_SCMENU_ROW" +#define HID_SCMENU_COL "SC_HID_SCMENU_COL" +#define HID_SCMENU_TAB "SC_HID_SCMENU_TAB" +#define HID_SCMENU_MERGE "SC_HID_SCMENU_MERGE" +#define HID_SCMENU_AREA "SC_HID_SCMENU_AREA" +#define HID_SCMENU_OBJMIRROR "SC_HID_SCMENU_OBJMIRROR" +#define HID_SCMENU_OBJARRANGE "SC_HID_SCMENU_OBJARRANGE" +#define HID_SCMENU_ANCHOR "SC_HID_SCMENU_ANCHOR" +#define HID_SCMENU_SENDTO "SC_HID_SCMENU_SENDTO" +#define HID_SCMENU_CHANGES "SC_HID_SCMENU_CHANGES" + +#define HID_SC_FAP_BTN_FX1 "SC_HID_SC_FAP_BTN_FX1" +#define HID_SC_FAP_BTN_FX2 "SC_HID_SC_FAP_BTN_FX2" +#define HID_SC_FAP_BTN_FX3 "SC_HID_SC_FAP_BTN_FX3" +#define HID_SC_FAP_BTN_FX4 "SC_HID_SC_FAP_BTN_FX4" +#define HID_SC_FAP_BTN_REF1 "SC_HID_SC_FAP_BTN_REF1" +#define HID_SC_FAP_BTN_REF2 "SC_HID_SC_FAP_BTN_REF2" +#define HID_SC_FAP_BTN_REF3 "SC_HID_SC_FAP_BTN_REF3" +#define HID_SC_FAP_BTN_REF4 "SC_HID_SC_FAP_BTN_REF4" +#define HID_SC_FAP_FORMULA "SC_HID_SC_FAP_FORMULA" + +#define HID_SC_SORT_ACTION "SC_HID_SC_SORT_ACTION" +#define HID_SC_SORT_AUTHOR "SC_HID_SC_SORT_AUTHOR" +#define HID_SC_SORT_DATE "SC_HID_SC_SORT_DATE" +#define HID_SC_SORT_COMMENT "SC_HID_SC_SORT_COMMENT" +#define HID_SORT_POSITION "SC_HID_SORT_POSITION" +#define HID_SC_CHANGES_COMMENT "SC_HID_SC_CHANGES_COMMENT" +#define HID_SC_FUNCTIONLIST "SC_HID_SC_FUNCTIONLIST" +#define HID_SCPAGE_OPTLOAD "SC_HID_SCPAGE_OPTLOAD" +#define HID_PASSWD_TABLE "SC_HID_PASSWD_TABLE" +#define HID_PASSWD_DOC "SC_HID_PASSWD_DOC" + +#define HID_DATAPILOT_TYPE "SC_HID_DATAPILOT_TYPE" +#define HID_DATAPILOT_DATABASE "SC_HID_DATAPILOT_DATABASE" +#define HID_DATAPILOT_SERVICE "SC_HID_DATAPILOT_SERVICE" + +// Other help IDs (max.70) --------------------------------------------------- +#define HID_SCDLG_LINKAREAURL "SC_HID_SCDLG_LINKAREAURL" +#define HID_SCMENU_EDIT_TABLE "SC_HID_SCMENU_EDIT_TABLE" + +#define HID_SELECTTABLES "SC_HID_SELECTTABLES" +#define HID_SC_REPLCELLSWARN "SC_HID_SC_REPLCELLSWARN" + +// data pilot layout dialog +#define HID_SC_DPLAY_PAGE "SC_HID_SC_DPLAY_PAGE" +#define HID_SC_DPLAY_COLUMN "SC_HID_SC_DPLAY_COLUMN" +#define HID_SC_DPLAY_ROW "SC_HID_SC_DPLAY_ROW" +#define HID_SC_DPLAY_DATA "SC_HID_SC_DPLAY_DATA" +#define HID_SC_DPLAY_SELECT "SC_HID_SC_DPLAY_SELECT" + +#define HID_SC_DRAW_RENAME "SC_HID_SC_DRAW_RENAME" + +#define HID_SC_DPDATAFIELD "SC_HID_SC_DPDATAFIELD" +#define HID_SC_DPSUBT_OPT "SC_HID_SC_DPSUBT_OPT" +#define HID_SC_DPSUBT_HIDE "SC_HID_SC_DPSUBT_HIDE" +#define HID_SC_DPNUMGROUP "SC_HID_SC_DPNUMGROUP" +#define HID_SC_DPDATEGROUP "SC_HID_SC_DPDATEGROUP" +#define HID_SC_DPDATEGROUP_LB "SC_HID_SC_DPDATEGROUP_LB" +#define HID_SC_DPSHOWDETAIL "SC_HID_SC_DPSHOWDETAIL" + +// #i68101# +#define HID_SC_TITLE_DESCRIPTION_OBJECT "SC_HID_SC_TITLE_DESCRIPTION_OBJECT" + +#define HID_SC_SOLVEROPTIONS "SC_HID_SC_SOLVEROPTIONS" +#define HID_SC_SOLVEROPTIONS_LB "SC_HID_SC_SOLVEROPTIONS_LB" +#define HID_SC_SOLVER_INTEGER "SC_HID_SC_SOLVER_INTEGER" +#define HID_SC_SOLVER_DOUBLE "SC_HID_SC_SOLVER_DOUBLE" +#define HID_SC_SOLVER_PROGRESS "SC_HID_SC_SOLVER_PROGRESS" +#define HID_SC_SOLVER_NOSOLUTION "SC_HID_SC_SOLVER_NOSOLUTION" +#define HID_SC_SOLVER_SUCCESS "SC_HID_SC_SOLVER_SUCCESS" + +#define HID_SCDLG_CONFLICTS "SC_HID_SCDLG_CONFLICTS" + +#define HID_SC_HF_HL_DEFINED "SC_HID_SC_HF_HL_DEFINED" +#define HID_SC_HF_HR_DEFINED "SC_HID_SC_HF_HR_DEFINED" +#define HID_SC_HF_FL_DEFINED "SC_HID_SC_HF_FL_DEFINED" +#define HID_SC_HF_FR_DEFINED "SC_HID_SC_HF_FR_DEFINED" + +// Analysis Addin Functions (max.120) ---------------------------------------- +#define HID_AAI_FUNC_WORKDAY "SC_HID_AAI_FUNC_WORKDAY" +#define HID_AAI_FUNC_YEARFRAC "SC_HID_AAI_FUNC_YEARFRAC" +#define HID_AAI_FUNC_EDATE "SC_HID_AAI_FUNC_EDATE" +#define HID_AAI_FUNC_WEEKNUM "SC_HID_AAI_FUNC_WEEKNUM" +#define HID_AAI_FUNC_EOMONTH "SC_HID_AAI_FUNC_EOMONTH" +#define HID_AAI_FUNC_NETWORKDAYS "SC_HID_AAI_FUNC_NETWORKDAYS" +#define HID_AAI_FUNC_AMORDEGRC "SC_HID_AAI_FUNC_AMORDEGRC" +#define HID_AAI_FUNC_AMORLINC "SC_HID_AAI_FUNC_AMORLINC" +#define HID_AAI_FUNC_ACCRINT "SC_HID_AAI_FUNC_ACCRINT" +#define HID_AAI_FUNC_ACCRINTM "SC_HID_AAI_FUNC_ACCRINTM" +#define HID_AAI_FUNC_RECEIVED "SC_HID_AAI_FUNC_RECEIVED" +#define HID_AAI_FUNC_DISC "SC_HID_AAI_FUNC_DISC" +#define HID_AAI_FUNC_DURATION "SC_HID_AAI_FUNC_DURATION" +#define HID_AAI_FUNC_EFFECT "SC_HID_AAI_FUNC_EFFECT" +#define HID_AAI_FUNC_CUMPRINC "SC_HID_AAI_FUNC_CUMPRINC" +#define HID_AAI_FUNC_CUMIPMT "SC_HID_AAI_FUNC_CUMIPMT" +#define HID_AAI_FUNC_PRICE "SC_HID_AAI_FUNC_PRICE" +#define HID_AAI_FUNC_PRICEDISC "SC_HID_AAI_FUNC_PRICEDISC" +#define HID_AAI_FUNC_PRICEMAT "SC_HID_AAI_FUNC_PRICEMAT" +#define HID_AAI_FUNC_MDURATION "SC_HID_AAI_FUNC_MDURATION" +#define HID_AAI_FUNC_NOMINAL "SC_HID_AAI_FUNC_NOMINAL" +#define HID_AAI_FUNC_DOLLARFR "SC_HID_AAI_FUNC_DOLLARFR" +#define HID_AAI_FUNC_DOLLARDE "SC_HID_AAI_FUNC_DOLLARDE" +#define HID_AAI_FUNC_YIELD "SC_HID_AAI_FUNC_YIELD" +#define HID_AAI_FUNC_YIELDDISC "SC_HID_AAI_FUNC_YIELDDISC" +#define HID_AAI_FUNC_YIELDMAT "SC_HID_AAI_FUNC_YIELDMAT" +#define HID_AAI_FUNC_TBILLEQ "SC_HID_AAI_FUNC_TBILLEQ" +#define HID_AAI_FUNC_TBILLPRICE "SC_HID_AAI_FUNC_TBILLPRICE" +#define HID_AAI_FUNC_TBILLYIELD "SC_HID_AAI_FUNC_TBILLYIELD" +#define HID_AAI_FUNC_ODDFPRICE "SC_HID_AAI_FUNC_ODDFPRICE" +#define HID_AAI_FUNC_ODDFYIELD "SC_HID_AAI_FUNC_ODDFYIELD" +#define HID_AAI_FUNC_ODDLPRICE "SC_HID_AAI_FUNC_ODDLPRICE" +#define HID_AAI_FUNC_ODDLYIELD "SC_HID_AAI_FUNC_ODDLYIELD" +#define HID_AAI_FUNC_XIRR "SC_HID_AAI_FUNC_XIRR" +#define HID_AAI_FUNC_XNPV "SC_HID_AAI_FUNC_XNPV" +#define HID_AAI_FUNC_INTRATE "SC_HID_AAI_FUNC_INTRATE" +#define HID_AAI_FUNC_COUPNCD "SC_HID_AAI_FUNC_COUPNCD" +#define HID_AAI_FUNC_COUPDAYS "SC_HID_AAI_FUNC_COUPDAYS" +#define HID_AAI_FUNC_COUPDAYSNC "SC_HID_AAI_FUNC_COUPDAYSNC" +#define HID_AAI_FUNC_COUPDAYBS "SC_HID_AAI_FUNC_COUPDAYBS" +#define HID_AAI_FUNC_COUPPCD "SC_HID_AAI_FUNC_COUPPCD" +#define HID_AAI_FUNC_COUPNUM "SC_HID_AAI_FUNC_COUPNUM" +#define HID_AAI_FUNC_FVSCHEDULE "SC_HID_AAI_FUNC_FVSCHEDULE" +#define HID_AAI_FUNC_ISEVEN "SC_HID_AAI_FUNC_ISEVEN" +#define HID_AAI_FUNC_ISODD "SC_HID_AAI_FUNC_ISODD" +#define HID_AAI_FUNC_GCD "SC_HID_AAI_FUNC_GCD" +#define HID_AAI_FUNC_LCM "SC_HID_AAI_FUNC_LCM" +#define HID_AAI_FUNC_MULTINOMIAL "SC_HID_AAI_FUNC_MULTINOMIAL" +#define HID_AAI_FUNC_SERIESSUM "SC_HID_AAI_FUNC_SERIESSUM" +#define HID_AAI_FUNC_QUOTIENT "SC_HID_AAI_FUNC_QUOTIENT" +#define HID_AAI_FUNC_MROUND "SC_HID_AAI_FUNC_MROUND" +#define HID_AAI_FUNC_SQRTPI "SC_HID_AAI_FUNC_SQRTPI" +#define HID_AAI_FUNC_RANDBETWEEN "SC_HID_AAI_FUNC_RANDBETWEEN" +#define HID_AAI_FUNC_BESSELI "SC_HID_AAI_FUNC_BESSELI" +#define HID_AAI_FUNC_BESSELJ "SC_HID_AAI_FUNC_BESSELJ" +#define HID_AAI_FUNC_BESSELK "SC_HID_AAI_FUNC_BESSELK" +#define HID_AAI_FUNC_BESSELY "SC_HID_AAI_FUNC_BESSELY" +#define HID_AAI_FUNC_BIN2DEC "SC_HID_AAI_FUNC_BIN2DEC" +#define HID_AAI_FUNC_BIN2HEX "SC_HID_AAI_FUNC_BIN2HEX" +#define HID_AAI_FUNC_BIN2OCT "SC_HID_AAI_FUNC_BIN2OCT" +#define HID_AAI_FUNC_DELTA "SC_HID_AAI_FUNC_DELTA" +#define HID_AAI_FUNC_DEC2BIN "SC_HID_AAI_FUNC_DEC2BIN" +#define HID_AAI_FUNC_DEC2HEX "SC_HID_AAI_FUNC_DEC2HEX" +#define HID_AAI_FUNC_DEC2OCT "SC_HID_AAI_FUNC_DEC2OCT" +#define HID_AAI_FUNC_ERF "SC_HID_AAI_FUNC_ERF" +#define HID_AAI_FUNC_ERFC "SC_HID_AAI_FUNC_ERFC" +#define HID_AAI_FUNC_GESTEP "SC_HID_AAI_FUNC_GESTEP" +#define HID_AAI_FUNC_HEX2BIN "SC_HID_AAI_FUNC_HEX2BIN" +#define HID_AAI_FUNC_HEX2DEC "SC_HID_AAI_FUNC_HEX2DEC" +#define HID_AAI_FUNC_HEX2OCT "SC_HID_AAI_FUNC_HEX2OCT" +#define HID_AAI_FUNC_IMABS "SC_HID_AAI_FUNC_IMABS" +#define HID_AAI_FUNC_IMAGINARY "SC_HID_AAI_FUNC_IMAGINARY" +#define HID_AAI_FUNC_IMPOWER "SC_HID_AAI_FUNC_IMPOWER" +#define HID_AAI_FUNC_IMARGUMENT "SC_HID_AAI_FUNC_IMARGUMENT" +#define HID_AAI_FUNC_IMCOS "SC_HID_AAI_FUNC_IMCOS" +#define HID_AAI_FUNC_IMDIV "SC_HID_AAI_FUNC_IMDIV" +#define HID_AAI_FUNC_IMEXP "SC_HID_AAI_FUNC_IMEXP" +#define HID_AAI_FUNC_IMCONJUGATE "SC_HID_AAI_FUNC_IMCONJUGATE" +#define HID_AAI_FUNC_IMLN "SC_HID_AAI_FUNC_IMLN" +#define HID_AAI_FUNC_IMLOG10 "SC_HID_AAI_FUNC_IMLOG10" +#define HID_AAI_FUNC_IMLOG2 "SC_HID_AAI_FUNC_IMLOG2" +#define HID_AAI_FUNC_IMPRODUCT "SC_HID_AAI_FUNC_IMPRODUCT" +#define HID_AAI_FUNC_IMREAL "SC_HID_AAI_FUNC_IMREAL" +#define HID_AAI_FUNC_IMSIN "SC_HID_AAI_FUNC_IMSIN" +#define HID_AAI_FUNC_IMSUB "SC_HID_AAI_FUNC_IMSUB" +#define HID_AAI_FUNC_IMSUM "SC_HID_AAI_FUNC_IMSUM" +#define HID_AAI_FUNC_IMSQRT "SC_HID_AAI_FUNC_IMSQRT" +#define HID_AAI_FUNC_COMPLEX "SC_HID_AAI_FUNC_COMPLEX" +#define HID_AAI_FUNC_OCT2BIN "SC_HID_AAI_FUNC_OCT2BIN" +#define HID_AAI_FUNC_OCT2DEZ "SC_HID_AAI_FUNC_OCT2DEZ" +#define HID_AAI_FUNC_OCT2HEX "SC_HID_AAI_FUNC_OCT2HEX" +#define HID_AAI_FUNC_CONVERT "SC_HID_AAI_FUNC_CONVERT" +#define HID_AAI_FUNC_FACTDOUBLE "SC_HID_AAI_FUNC_FACTDOUBLE" + +// DateFunc Addin Functions (max.20) ----------------------------------------- +#define HID_DAI_FUNC_DAYSINMONTH "SC_HID_DAI_FUNC_DAYSINMONTH" +#define HID_DAI_FUNC_DAYSINYEAR "SC_HID_DAI_FUNC_DAYSINYEAR" +#define HID_DAI_FUNC_WEEKSINYEAR "SC_HID_DAI_FUNC_WEEKSINYEAR" +#define HID_DAI_FUNC_DIFFMONTHS "SC_HID_DAI_FUNC_DIFFMONTHS" +#define HID_DAI_FUNC_DIFFWEEKS "SC_HID_DAI_FUNC_DIFFWEEKS" +#define HID_DAI_FUNC_DIFFYEARS "SC_HID_DAI_FUNC_DIFFYEARS" +#define HID_DAI_FUNC_ROT13 "SC_HID_DAI_FUNC_ROT13" + +#define HID_SCPAGE_OPREDLINBE_FT_CONTENT "SC_HID_SCPAGE_OPREDLINBE_FT_CONTENT" +#define HID_MN_FORMAT_STYLE "SC_HID_MN_FORMAT_STYLE" +#define HID_MN_FORMAT_ALGN "SC_HID_MN_FORMAT_ALGN" +#define HID_MN_FORMAT_LINESPACE "SC_HID_MN_FORMAT_LINESPACE" + + +// Ende Hilfe IDs ------------------------------------------------------------ + +#define HID_SC_FUNC_DUMMY "SC_HID_SC_FUNC_DUMMY" + +#define HID_FUNC_DBANZAHL "SC_HID_FUNC_DBANZAHL" +#define HID_FUNC_DBANZAHL2 "SC_HID_FUNC_DBANZAHL2" +#define HID_FUNC_DBMITTELWERT "SC_HID_FUNC_DBMITTELWERT" +#define HID_FUNC_DBAUSZUG "SC_HID_FUNC_DBAUSZUG" +#define HID_FUNC_DBMAX "SC_HID_FUNC_DBMAX" +#define HID_FUNC_DBMIN "SC_HID_FUNC_DBMIN" +#define HID_FUNC_DBPRODUKT "SC_HID_FUNC_DBPRODUKT" +#define HID_FUNC_DBSTDABW "SC_HID_FUNC_DBSTDABW" +#define HID_FUNC_DBSTDABWN "SC_HID_FUNC_DBSTDABWN" +#define HID_FUNC_DBSUMME "SC_HID_FUNC_DBSUMME" +#define HID_FUNC_DBVARIANZ "SC_HID_FUNC_DBVARIANZ" +#define HID_FUNC_DBVARIANZEN "SC_HID_FUNC_DBVARIANZEN" + +#define HID_FUNC_DATUM "SC_HID_FUNC_DATUM" +#define HID_FUNC_DATWERT "SC_HID_FUNC_DATWERT" +#define HID_FUNC_TAG "SC_HID_FUNC_TAG" +#define HID_FUNC_TAGE360 "SC_HID_FUNC_TAGE360" +#define HID_FUNC_STUNDE "SC_HID_FUNC_STUNDE" +#define HID_FUNC_MINUTE "SC_HID_FUNC_MINUTE" +#define HID_FUNC_MONAT "SC_HID_FUNC_MONAT" +#define HID_FUNC_JETZT "SC_HID_FUNC_JETZT" +#define HID_FUNC_SEKUNDE "SC_HID_FUNC_SEKUNDE" +#define HID_FUNC_ZEIT "SC_HID_FUNC_ZEIT" +#define HID_FUNC_ZEITWERT "SC_HID_FUNC_ZEITWERT" +#define HID_FUNC_HEUTE "SC_HID_FUNC_HEUTE" +#define HID_FUNC_WOCHENTAG "SC_HID_FUNC_WOCHENTAG" +#define HID_FUNC_JAHR "SC_HID_FUNC_JAHR" +#define HID_FUNC_TAGE "SC_HID_FUNC_TAGE" +#define HID_FUNC_KALENDERWOCHE "SC_HID_FUNC_KALENDERWOCHE" +#define HID_FUNC_OSTERSONNTAG "SC_HID_FUNC_OSTERSONNTAG" + +#define HID_FUNC_BW "SC_HID_FUNC_BW" +#define HID_FUNC_ZW "SC_HID_FUNC_ZW" +#define HID_FUNC_ZZR "SC_HID_FUNC_ZZR" +#define HID_FUNC_RMZ "SC_HID_FUNC_RMZ" +#define HID_FUNC_ZINS "SC_HID_FUNC_ZINS" +#define HID_FUNC_ZINSZ "SC_HID_FUNC_ZINSZ" +#define HID_FUNC_KAPZ "SC_HID_FUNC_KAPZ" +#define HID_FUNC_KUMKAPITAL "SC_HID_FUNC_KUMKAPITAL" +#define HID_FUNC_KUMZINSZ "SC_HID_FUNC_KUMZINSZ" +#define HID_FUNC_DIA "SC_HID_FUNC_DIA" +#define HID_FUNC_LIA "SC_HID_FUNC_LIA" +#define HID_FUNC_GDA "SC_HID_FUNC_GDA" +#define HID_FUNC_GDA2 "SC_HID_FUNC_GDA2" +#define HID_FUNC_VDB "SC_HID_FUNC_VDB" +#define HID_FUNC_EFFEKTIV "SC_HID_FUNC_EFFEKTIV" +#define HID_FUNC_NOMINAL "SC_HID_FUNC_NOMINAL" +#define HID_FUNC_NBW "SC_HID_FUNC_NBW" +#define HID_FUNC_IKV "SC_HID_FUNC_IKV" +#define HID_FUNC_LAUFZEIT "SC_HID_FUNC_LAUFZEIT" +#define HID_FUNC_ZGZ "SC_HID_FUNC_ZGZ" +#define HID_FUNC_QIKV "SC_HID_FUNC_QIKV" +#define HID_FUNC_ISPMT "SC_HID_FUNC_ISPMT" + +#define HID_FUNC_ISTBEZUG "SC_HID_FUNC_ISTBEZUG" +#define HID_FUNC_ISTFEHL "SC_HID_FUNC_ISTFEHL" +#define HID_FUNC_ISTFEHLER "SC_HID_FUNC_ISTFEHLER" +#define HID_FUNC_ISTLEER "SC_HID_FUNC_ISTLEER" +#define HID_FUNC_ISTLOG "SC_HID_FUNC_ISTLOG" +#define HID_FUNC_ISTNV "SC_HID_FUNC_ISTNV" +#define HID_FUNC_ISTKTEXT "SC_HID_FUNC_ISTKTEXT" +#define HID_FUNC_ISTTEXT "SC_HID_FUNC_ISTTEXT" +#define HID_FUNC_ISTZAHL "SC_HID_FUNC_ISTZAHL" +#define HID_FUNC_ISTFORMEL "SC_HID_FUNC_ISTFORMEL" +#define HID_FUNC_N "SC_HID_FUNC_N" +#define HID_FUNC_NV "SC_HID_FUNC_NV" +#define HID_FUNC_TYP "SC_HID_FUNC_TYP" +#define HID_FUNC_AKTUELL "SC_HID_FUNC_AKTUELL" +#define HID_FUNC_FORMEL "SC_HID_FUNC_FORMEL" +#define HID_FUNC_ZELLE "SC_HID_FUNC_ZELLE" +#define HID_FUNC_INFO "SC_HID_FUNC_INFO" + + +#define HID_FUNC_FALSCH "SC_HID_FUNC_FALSCH" +#define HID_FUNC_NICHT "SC_HID_FUNC_NICHT" +#define HID_FUNC_WAHR "SC_HID_FUNC_WAHR" +#define HID_FUNC_WENN "SC_HID_FUNC_WENN" +#define HID_FUNC_ODER "SC_HID_FUNC_ODER" +#define HID_FUNC_UND "SC_HID_FUNC_UND" + +#define HID_FUNC_ABS "SC_HID_FUNC_ABS" +#define HID_FUNC_POTENZ "SC_HID_FUNC_POTENZ" +#define HID_FUNC_ANZAHLLEEREZELLEN "SC_HID_FUNC_ANZAHLLEEREZELLEN" +#define HID_FUNC_PI "SC_HID_FUNC_PI" +#define HID_FUNC_SUMME "SC_HID_FUNC_SUMME" +#define HID_FUNC_QUADRATESUMME "SC_HID_FUNC_QUADRATESUMME" +#define HID_FUNC_PRODUKT "SC_HID_FUNC_PRODUKT" +#define HID_FUNC_SUMMEWENN "SC_HID_FUNC_SUMMEWENN" +#define HID_FUNC_ZAEHLENWENN "SC_HID_FUNC_ZAEHLENWENN" +#define HID_FUNC_WURZEL "SC_HID_FUNC_WURZEL" +#define HID_FUNC_ZUFALLSZAHL "SC_HID_FUNC_ZUFALLSZAHL" +#define HID_FUNC_ISTGERADE "SC_HID_FUNC_ISTGERADE" +#define HID_FUNC_ISTUNGERADE "SC_HID_FUNC_ISTUNGERADE" +#define HID_FUNC_KOMBINATIONEN "SC_HID_FUNC_KOMBINATIONEN" +#define HID_FUNC_KOMBINATIONEN2 "SC_HID_FUNC_KOMBINATIONEN2" +#define HID_FUNC_ARCCOS "SC_HID_FUNC_ARCCOS" +#define HID_FUNC_ARCSIN "SC_HID_FUNC_ARCSIN" +#define HID_FUNC_ARCOSHYP "SC_HID_FUNC_ARCOSHYP" +#define HID_FUNC_ARSINHYP "SC_HID_FUNC_ARSINHYP" +#define HID_FUNC_ARCCOT "SC_HID_FUNC_ARCCOT" +#define HID_FUNC_ARCTAN "SC_HID_FUNC_ARCTAN" +#define HID_FUNC_ARCOTHYP "SC_HID_FUNC_ARCOTHYP" +#define HID_FUNC_ARTANHYP "SC_HID_FUNC_ARTANHYP" +#define HID_FUNC_COS "SC_HID_FUNC_COS" +#define HID_FUNC_SIN "SC_HID_FUNC_SIN" +#define HID_FUNC_COT "SC_HID_FUNC_COT" +#define HID_FUNC_TAN "SC_HID_FUNC_TAN" +#define HID_FUNC_COSHYP "SC_HID_FUNC_COSHYP" +#define HID_FUNC_SINHYP "SC_HID_FUNC_SINHYP" +#define HID_FUNC_COTHYP "SC_HID_FUNC_COTHYP" +#define HID_FUNC_TANHYP "SC_HID_FUNC_TANHYP" +#define HID_FUNC_ARCTAN2 "SC_HID_FUNC_ARCTAN2" +#define HID_FUNC_DEG "SC_HID_FUNC_DEG" +#define HID_FUNC_RAD "SC_HID_FUNC_RAD" +#define HID_FUNC_EXP "SC_HID_FUNC_EXP" +#define HID_FUNC_LOG "SC_HID_FUNC_LOG" +#define HID_FUNC_LN "SC_HID_FUNC_LN" +#define HID_FUNC_LOG10 "SC_HID_FUNC_LOG10" +#define HID_FUNC_FAKULTAET "SC_HID_FUNC_FAKULTAET" +#define HID_FUNC_REST "SC_HID_FUNC_REST" +#define HID_FUNC_VORZEICHEN "SC_HID_FUNC_VORZEICHEN" +#define HID_FUNC_TEILERGEBNIS "SC_HID_FUNC_TEILERGEBNIS" +#define HID_FUNC_GANZZAHL "SC_HID_FUNC_GANZZAHL" +#define HID_FUNC_KUERZEN "SC_HID_FUNC_KUERZEN" +#define HID_FUNC_RUNDEN "SC_HID_FUNC_RUNDEN" +#define HID_FUNC_AUFRUNDEN "SC_HID_FUNC_AUFRUNDEN" +#define HID_FUNC_ABRUNDEN "SC_HID_FUNC_ABRUNDEN" +#define HID_FUNC_GERADE "SC_HID_FUNC_GERADE" +#define HID_FUNC_UNGERADE "SC_HID_FUNC_UNGERADE" +#define HID_FUNC_OBERGRENZE "SC_HID_FUNC_OBERGRENZE" +#define HID_FUNC_UNTERGRENZE "SC_HID_FUNC_UNTERGRENZE" +#define HID_FUNC_GGT "SC_HID_FUNC_GGT" +#define HID_FUNC_KGV "SC_HID_FUNC_KGV" +#define HID_FUNC_UMRECHNEN "SC_HID_FUNC_UMRECHNEN" +#define HID_FUNC_EUROCONVERT "SC_HID_FUNC_EUROCONVERT" + +#define HID_FUNC_MTRANS "SC_HID_FUNC_MTRANS" +#define HID_FUNC_MMULT "SC_HID_FUNC_MMULT" +#define HID_FUNC_MDET "SC_HID_FUNC_MDET" +#define HID_FUNC_MINV "SC_HID_FUNC_MINV" +#define HID_FUNC_EINHEITSMATRIX "SC_HID_FUNC_EINHEITSMATRIX" +#define HID_FUNC_SUMMENPRODUKT "SC_HID_FUNC_SUMMENPRODUKT" +#define HID_FUNC_SUMMEX2MY2 "SC_HID_FUNC_SUMMEX2MY2" +#define HID_FUNC_SUMMEX2PY2 "SC_HID_FUNC_SUMMEX2PY2" +#define HID_FUNC_SUMMEXMY2 "SC_HID_FUNC_SUMMEXMY2" +#define HID_FUNC_HAEUFIGKEIT "SC_HID_FUNC_HAEUFIGKEIT" +#define HID_FUNC_RGP "SC_HID_FUNC_RGP" +#define HID_FUNC_RKP "SC_HID_FUNC_RKP" +#define HID_FUNC_TREND "SC_HID_FUNC_TREND" +#define HID_FUNC_VARIATION "SC_HID_FUNC_VARIATION" + +#define HID_FUNC_ANZAHL "SC_HID_FUNC_ANZAHL" +#define HID_FUNC_ANZAHL2 "SC_HID_FUNC_ANZAHL2" +#define HID_FUNC_MAX "SC_HID_FUNC_MAX" +#define HID_FUNC_MIN "SC_HID_FUNC_MIN" +#define HID_FUNC_VARIANZ "SC_HID_FUNC_VARIANZ" +#define HID_FUNC_VARIANZEN "SC_HID_FUNC_VARIANZEN" +#define HID_FUNC_STABW "SC_HID_FUNC_STABW" +#define HID_FUNC_STABWN "SC_HID_FUNC_STABWN" +#define HID_FUNC_MITTELWERT "SC_HID_FUNC_MITTELWERT" +#define HID_FUNC_SUMQUADABW "SC_HID_FUNC_SUMQUADABW" +#define HID_FUNC_MITTELABW "SC_HID_FUNC_MITTELABW" +#define HID_FUNC_SCHIEFE "SC_HID_FUNC_SCHIEFE" +#define HID_FUNC_KURT "SC_HID_FUNC_KURT" +#define HID_FUNC_GEOMITTEL "SC_HID_FUNC_GEOMITTEL" +#define HID_FUNC_HARMITTEL "SC_HID_FUNC_HARMITTEL" +#define HID_FUNC_MODALWERT "SC_HID_FUNC_MODALWERT" +#define HID_FUNC_MEDIAN "SC_HID_FUNC_MEDIAN" +#define HID_FUNC_QUANTIL "SC_HID_FUNC_QUANTIL" +#define HID_FUNC_QUARTILE "SC_HID_FUNC_QUARTILE" +#define HID_FUNC_KGROESSTE "SC_HID_FUNC_KGROESSTE" +#define HID_FUNC_KKLEINSTE "SC_HID_FUNC_KKLEINSTE" +#define HID_FUNC_QUANTILSRANG "SC_HID_FUNC_QUANTILSRANG" +#define HID_FUNC_RANG "SC_HID_FUNC_RANG" +#define HID_FUNC_GESTUTZTMITTEL "SC_HID_FUNC_GESTUTZTMITTEL" +#define HID_FUNC_WAHRSCHBEREICH "SC_HID_FUNC_WAHRSCHBEREICH" +#define HID_FUNC_B "SC_HID_FUNC_B" +#define HID_FUNC_PHI "SC_HID_FUNC_PHI" +#define HID_FUNC_GAUSS "SC_HID_FUNC_GAUSS" +#define HID_FUNC_FISHER "SC_HID_FUNC_FISHER" +#define HID_FUNC_FISHERINV "SC_HID_FUNC_FISHERINV" +#define HID_FUNC_BINOMVERT "SC_HID_FUNC_BINOMVERT" +#define HID_FUNC_NEGBINOMVERT "SC_HID_FUNC_NEGBINOMVERT" +#define HID_FUNC_KRITBINOM "SC_HID_FUNC_KRITBINOM" +#define HID_FUNC_POISSON "SC_HID_FUNC_POISSON" +#define HID_FUNC_NORMVERT "SC_HID_FUNC_NORMVERT" +#define HID_FUNC_NORMINV "SC_HID_FUNC_NORMINV" +#define HID_FUNC_STANDNORMVERT "SC_HID_FUNC_STANDNORMVERT" +#define HID_FUNC_STANDNORMINV "SC_HID_FUNC_STANDNORMINV" +#define HID_FUNC_LOGNORMVERT "SC_HID_FUNC_LOGNORMVERT" +#define HID_FUNC_LOGINV "SC_HID_FUNC_LOGINV" +#define HID_FUNC_EXPONVERT "SC_HID_FUNC_EXPONVERT" +#define HID_FUNC_GAMMAVERT "SC_HID_FUNC_GAMMAVERT" +#define HID_FUNC_GAMMAINV "SC_HID_FUNC_GAMMAINV" +#define HID_FUNC_GAMMALN "SC_HID_FUNC_GAMMALN" +#define HID_FUNC_BETAVERT "SC_HID_FUNC_BETAVERT" +#define HID_FUNC_BETAINV "SC_HID_FUNC_BETAINV" +#define HID_FUNC_WEIBULL "SC_HID_FUNC_WEIBULL" +#define HID_FUNC_HYPGEOMVERT "SC_HID_FUNC_HYPGEOMVERT" +#define HID_FUNC_TVERT "SC_HID_FUNC_TVERT" +#define HID_FUNC_TINV "SC_HID_FUNC_TINV" +#define HID_FUNC_FVERT "SC_HID_FUNC_FVERT" +#define HID_FUNC_FINV "SC_HID_FUNC_FINV" +#define HID_FUNC_CHIVERT "SC_HID_FUNC_CHIVERT" +#define HID_FUNC_CHIINV "SC_HID_FUNC_CHIINV" +#define HID_FUNC_STANDARDISIERUNG "SC_HID_FUNC_STANDARDISIERUNG" +#define HID_FUNC_VARIATIONEN "SC_HID_FUNC_VARIATIONEN" +#define HID_FUNC_VARIATIONEN2 "SC_HID_FUNC_VARIATIONEN2" +#define HID_FUNC_KONFIDENZ "SC_HID_FUNC_KONFIDENZ" +#define HID_FUNC_GTEST "SC_HID_FUNC_GTEST" +#define HID_FUNC_CHITEST "SC_HID_FUNC_CHITEST" +#define HID_FUNC_FTEST "SC_HID_FUNC_FTEST" +#define HID_FUNC_TTEST "SC_HID_FUNC_TTEST" +#define HID_FUNC_BESTIMMTHEITSMASS "SC_HID_FUNC_BESTIMMTHEITSMASS" +#define HID_FUNC_ACHSENABSCHNITT "SC_HID_FUNC_ACHSENABSCHNITT" +#define HID_FUNC_STEIGUNG "SC_HID_FUNC_STEIGUNG" +#define HID_FUNC_STFEHLERYX "SC_HID_FUNC_STFEHLERYX" +#define HID_FUNC_PEARSON "SC_HID_FUNC_PEARSON" +#define HID_FUNC_KORREL "SC_HID_FUNC_KORREL" +#define HID_FUNC_KOVAR "SC_HID_FUNC_KOVAR" +#define HID_FUNC_SCHAETZER "SC_HID_FUNC_SCHAETZER" +#define HID_FUNC_MINA "SC_HID_FUNC_MINA" +#define HID_FUNC_MAXA "SC_HID_FUNC_MAXA" +#define HID_FUNC_MITTELWERTA "SC_HID_FUNC_MITTELWERTA" +#define HID_FUNC_STABWA "SC_HID_FUNC_STABWA" +#define HID_FUNC_STABWNA "SC_HID_FUNC_STABWNA" +#define HID_FUNC_VARIANZA "SC_HID_FUNC_VARIANZA" +#define HID_FUNC_VARIANZENA "SC_HID_FUNC_VARIANZENA" +#define HID_FUNC_CHISQDIST "SC_HID_FUNC_CHISQDIST" +#define HID_FUNC_CHISQINV "SC_HID_FUNC_CHISQINV" +#define HID_FUNC_GAMMA "SC_HID_FUNC_GAMMA" + +#define HID_FUNC_ADRESSE "SC_HID_FUNC_ADRESSE" +#define HID_FUNC_BEREICHE "SC_HID_FUNC_BEREICHE" +#define HID_FUNC_WAHL "SC_HID_FUNC_WAHL" +#define HID_FUNC_SPALTE "SC_HID_FUNC_SPALTE" +#define HID_FUNC_ZEILE "SC_HID_FUNC_ZEILE" +#define HID_FUNC_SPALTEN "SC_HID_FUNC_SPALTEN" +#define HID_FUNC_ZEILEN "SC_HID_FUNC_ZEILEN" +#define HID_FUNC_WVERWEIS "SC_HID_FUNC_WVERWEIS" +#define HID_FUNC_SVERWEIS "SC_HID_FUNC_SVERWEIS" +#define HID_FUNC_INDEX "SC_HID_FUNC_INDEX" +#define HID_FUNC_INDIREKT "SC_HID_FUNC_INDIREKT" +#define HID_FUNC_VERWEIS "SC_HID_FUNC_VERWEIS" +#define HID_FUNC_VERGLEICH "SC_HID_FUNC_VERGLEICH" +#define HID_FUNC_VERSCHIEBUNG "SC_HID_FUNC_VERSCHIEBUNG" +#define HID_FUNC_FEHLERTYP "SC_HID_FUNC_FEHLERTYP" +#define HID_FUNC_VORLAGE "SC_HID_FUNC_VORLAGE" +#define HID_FUNC_DDE "SC_HID_FUNC_DDE" +#define HID_FUNC_TABELLE "SC_HID_FUNC_TABELLE" +#define HID_FUNC_TABELLEN "SC_HID_FUNC_TABELLEN" +#define HID_FUNC_HYPERLINK "SC_HID_FUNC_HYPERLINK" +#define HID_FUNC_GETPIVOTDATA "SC_HID_FUNC_GETPIVOTDATA" + +#define HID_FUNC_CODE "SC_HID_FUNC_CODE" +#define HID_FUNC_DM "SC_HID_FUNC_DM" +#define HID_FUNC_ZEICHEN "SC_HID_FUNC_ZEICHEN" +#define HID_FUNC_SAEUBERN "SC_HID_FUNC_SAEUBERN" +#define HID_FUNC_VERKETTEN "SC_HID_FUNC_VERKETTEN" +#define HID_FUNC_IDENTISCH "SC_HID_FUNC_IDENTISCH" +#define HID_FUNC_FINDEN "SC_HID_FUNC_FINDEN" +#define HID_FUNC_SUCHEN "SC_HID_FUNC_SUCHEN" +#define HID_FUNC_GLAETTEN "SC_HID_FUNC_GLAETTEN" +#define HID_FUNC_GROSS2 "SC_HID_FUNC_GROSS2" +#define HID_FUNC_GROSS "SC_HID_FUNC_GROSS" +#define HID_FUNC_KLEIN "SC_HID_FUNC_KLEIN" +#define HID_FUNC_WERT "SC_HID_FUNC_WERT" +#define HID_FUNC_TEXT "SC_HID_FUNC_TEXT" +#define HID_FUNC_T "SC_HID_FUNC_T" +#define HID_FUNC_ERSETZEN "SC_HID_FUNC_ERSETZEN" +#define HID_FUNC_FEST "SC_HID_FUNC_FEST" +#define HID_FUNC_LAENGE "SC_HID_FUNC_LAENGE" +#define HID_FUNC_LINKS "SC_HID_FUNC_LINKS" +#define HID_FUNC_RECHTS "SC_HID_FUNC_RECHTS" +#define HID_FUNC_TEIL "SC_HID_FUNC_TEIL" +#define HID_FUNC_WIEDERHOLEN "SC_HID_FUNC_WIEDERHOLEN" +#define HID_FUNC_WECHSELN "SC_HID_FUNC_WECHSELN" +#define HID_FUNC_BASIS "SC_HID_FUNC_BASIS" +#define HID_FUNC_DEZIMAL "SC_HID_FUNC_DEZIMAL" +#define HID_FUNC_ROEMISCH "SC_HID_FUNC_ROEMISCH" +#define HID_FUNC_ARABISCH "SC_HID_FUNC_ARABISCH" +#define HID_FUNC_BAHTTEXT "SC_HID_FUNC_BAHTTEXT" +#define HID_FUNC_JIS "SC_HID_FUNC_JIS" +#define HID_FUNC_ASC "SC_HID_FUNC_ASC" +#define HID_FUNC_UNICODE "SC_HID_FUNC_UNICODE" +#define HID_FUNC_UNICHAR "SC_HID_FUNC_UNICHAR" +#define HID_FUNC_NUMBERVALUE "SC_HID_FUNC_NUMBERVALUE" diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 9fd04cadf751..159da72a34d2 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -38,6 +38,7 @@ #include "sfx2/sfxcommands.h" #include "svx/svxcommands.h" #include "sccommands.h" +#include "helpids.h" #define VAR_ARGS 30 // variable Parameter in scfuncs.src @@ -63,29 +64,11 @@ // Calc hat einen Bereich von 2000 IDs // Die Funktionen brauchen 11*90 = 990 IDs -//#define HID_SC_FUNC_START (HID_SC_START + 0) -//#define HID_INSWIN_START (HID_SC_START + 1000) #define HID_SC_SHEET_START (HID_SC_START + 1010) #define HID_SC_SHELL_START (HID_SC_START + 1030) -//#define HID_SC_WIN_START (HID_SC_START + 1050) -//#define HID_SC_CONTROL_START (HID_SC_START + 1070) -#define HID_SC_DLG_HACK_START (HID_SC_START + 1100) -//#define HID_SC_TOOLBOX_START (HID_SC_START + 1170) -//#define HID_SC_MENU_START (HID_SC_START + 1180) -//#define HID_SC_OTHER_START (HID_SC_START + 1230) -//#define HID_SC_AAI_FUNCS_START (HID_SC_START + 1300) // Analysis Addin Functions -//#define HID_SC_DAI_FUNCS_START (HID_SC_START + 1420) // DateFunc Addin Functions // --------------------------------------------------------------------------- -#define HID_INSWIN_POS "SC_HID_INSWIN_POS" -#define HID_INSWIN_CALC "SC_HID_INSWIN_CALC" -#define HID_INSWIN_CANCEL "SC_HID_INSWIN_CANCEL" -#define HID_INSWIN_OK "SC_HID_INSWIN_OK" -#define HID_INSWIN_SUMME "SC_HID_INSWIN_SUMME" -#define HID_INSWIN_FUNC "SC_HID_INSWIN_FUNC" -#define HID_INSWIN_INPUT "SC_HID_INSWIN_INPUT" - // Hilfe IDs fuer Vorlagen --------------------------------------------------- #define HID_SC_SHEET_CELL_STD (HID_SC_SHEET_START +0 ) #define HID_SC_SHEET_CELL_ERG (HID_SC_SHEET_START +1 ) @@ -113,370 +96,6 @@ #define HID_SCSHELL_PAGEBREAK (HID_SC_SHELL_START +14) #define HID_SCSHELL_MEDIA (HID_SC_SHELL_START +15) - -// Hilfe IDs fuer Dokumentfenster -------------------------------------------- -#define HID_SC_WIN_GRIDWIN "SC_HID_SC_WIN_GRIDWIN" -#define HID_SC_WIN_PREVIEW "SC_HID_SC_WIN_PREVIEW" - -// Hilfe IDs fuer einzelne Controls (max.30) --------------------------------- -// Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts -#define HID_SC_HF_HLL "SC_HID_SC_HF_HLL" -#define HID_SC_HF_HLC "SC_HID_SC_HF_HLC" -#define HID_SC_HF_HLR "SC_HID_SC_HF_HLR" -#define HID_SC_HF_HRL "SC_HID_SC_HF_HRL" -#define HID_SC_HF_HRC "SC_HID_SC_HF_HRC" -#define HID_SC_HF_HRR "SC_HID_SC_HF_HRR" -#define HID_SC_HF_FLL "SC_HID_SC_HF_FLL" -#define HID_SC_HF_FLC "SC_HID_SC_HF_FLC" -#define HID_SC_HF_FLR "SC_HID_SC_HF_FLR" -#define HID_SC_HF_FRL "SC_HID_SC_HF_FRL" -#define HID_SC_HF_FRC "SC_HID_SC_HF_FRC" -#define HID_SC_HF_FRR "SC_HID_SC_HF_FRR" -// "Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr! -#define HID_SC_SUBT_COLS_1 "SC_HID_SC_SUBT_COLS_1" -#define HID_SC_SUBT_COLS_2 "SC_HID_SC_SUBT_COLS_2" -#define HID_SC_SUBT_COLS_3 "SC_HID_SC_SUBT_COLS_3" -// Eintraege im Navigator -#define HID_SC_NAVIPI_ENTRIES "SC_HID_SC_NAVIPI_ENTRIES" -#define HID_SC_NAVIPI_ROW "SC_HID_SC_NAVIPI_ROW" -#define HID_SC_NAVIPI_COL "SC_HID_SC_NAVIPI_COL" -#define HID_SC_NAVIPI_DOC "SC_HID_SC_NAVIPI_DOC" -#define HID_SC_NAVIPI_DATA "SC_HID_SC_NAVIPI_DATA" -#define HID_SC_NAVIPI_UP "SC_HID_SC_NAVIPI_UP" -#define HID_SC_NAVIPI_DOWN "SC_HID_SC_NAVIPI_DOWN" -#define HID_SC_NAVIPI_ZOOM "SC_HID_SC_NAVIPI_ZOOM" -#define HID_SC_NAVIPI_ROOT "SC_HID_SC_NAVIPI_ROOT" -#define HID_SC_NAVIPI_SCEN "SC_HID_SC_NAVIPI_SCEN" -#define HID_SC_NAVIPI_DROP "SC_HID_SC_NAVIPI_DROP" -// Teilergebnisse -#define HID_SC_SUBT_GROUP "SC_HID_SC_SUBT_GROUP" -#define HID_SC_SUBT_COLS "SC_HID_SC_SUBT_COLS" -#define HID_SC_SUBT_FUNC "SC_HID_SC_SUBT_FUNC" -// -#define HID_SC_NAVIPI_TOOLBOX "SC_HID_SC_NAVIPI_TOOLBOX" -// Bereich ist voll! - -// Hilfe IDs fuer Dialoge / Pages (max.70) ----------------------------------- -#define HID_SC_AUTOFORMAT "SC_HID_SC_AUTOFORMAT" -#define HID_SC_PIVOTFILTER "SC_HID_SC_PIVOTFILTER" -#define HID_SC_INPORTOPT "SC_HID_SC_INPORTOPT" -#define HID_SC_PIVOTSUBT "SC_HID_SC_PIVOTSUBT" -#define HID_SC_FORM_ARGS "SC_HID_SC_FORM_ARGS" -#define HID_SCPAGE_SORT_FIELDS "SC_HID_SCPAGE_SORT_FIELDS" -#define HID_SCPAGE_SORT_OPTIONS "SC_HID_SCPAGE_SORT_OPTIONS" -#define HID_SCPAGE_SUBT_OPTIONS "SC_HID_SCPAGE_SUBT_OPTIONS" -#define HID_SCPAGE_SUBT_GROUP "SC_HID_SCPAGE_SUBT_GROUP" -#define HID_SCPAGE_PROTECTION "SC_HID_SCPAGE_PROTECTION" -#define HID_SCPAGE_VIEW "SC_HID_SCPAGE_VIEW" -#define HID_SCPAGE_CALC "SC_HID_SCPAGE_CALC" -#define HID_SCPAGE_USERLISTS "SC_HID_SCPAGE_USERLISTS" -#define HID_SCPAGE_HFEDIT "SC_HID_SCPAGE_HFEDIT" -#define HID_SCPAGE_AREAS "SC_HID_SCPAGE_AREAS" -#define HID_SCPAGE_TABLE "SC_HID_SCPAGE_TABLE" -#define HID_SCPAGE_PRINT "SC_HID_SCPAGE_PRINT" - -#define HID_SCPAGE_SUBT_GROUP1 "SC_HID_SCPAGE_SUBT_GROUP1" -#define HID_SCPAGE_SUBT_GROUP2 "SC_HID_SCPAGE_SUBT_GROUP2" -#define HID_SCPAGE_SUBT_GROUP3 "SC_HID_SCPAGE_SUBT_GROUP3" - -#define HID_SCPAGE_HFED_HL "SC_HID_SCPAGE_HFED_HL" -#define HID_SCPAGE_HFED_HR "SC_HID_SCPAGE_HFED_HR" -#define HID_SCPAGE_HFED_FL "SC_HID_SCPAGE_HFED_FL" -#define HID_SCPAGE_HFED_FR "SC_HID_SCPAGE_HFED_FR" - -#define HID_SCPAGE_CONTENT "SC_HID_SCPAGE_CONTENT" -#define HID_SCPAGE_LAYOUT "SC_HID_SCPAGE_LAYOUT" -#define HID_SCPAGE_INPUT "SC_HID_SCPAGE_INPUT" - -#define HID_SC_NAVIGATOR "SC_HID_SC_NAVIGATOR" - -#define HID_SC_MTRIN_VAL "SC_HID_SC_MTRIN_VAL" -#define HID_SC_MTRIN_DEF "SC_HID_SC_MTRIN_DEF" -#define HID_SC_SELENTRY_LIST "SC_HID_SC_SELENTRY_LIST" -#define HID_SC_GROUP_COLS "SC_HID_SC_GROUP_COLS" -#define HID_SC_GROUP_ROWS "SC_HID_SC_GROUP_ROWS" - -#define HID_SC_HF_TEXT "SC_HID_SC_HF_TEXT" -#define HID_SC_HF_FILE "SC_HID_SC_HF_FILE" -#define HID_SC_HF_TABLE "SC_HID_SC_HF_TABLE" -#define HID_SC_HF_PAGE "SC_HID_SC_HF_PAGE" -#define HID_SC_HF_PAGES "SC_HID_SC_HF_PAGES" -#define HID_SC_HF_DATE "SC_HID_SC_HF_DATE" -#define HID_SC_HF_TIME "SC_HID_SC_HF_TIME" - -#define HID_SC_HEADER_EDIT "SC_HID_SC_HEADER_EDIT" -#define HID_SC_FOOTER_EDIT "SC_HID_SC_FOOTER_EDIT" - -#define HID_SC_SCENWIN_TOP "SC_HID_SC_SCENWIN_TOP" -#define HID_SC_SCENWIN_BOTTOM "SC_HID_SC_SCENWIN_BOTTOM" - -#define HID_SC_INPUTWIN "SC_HID_SC_INPUTWIN" - -#define HID_SC_RENAME_NAME "SC_HID_SC_RENAME_NAME" -#define HID_SC_APPEND_NAME "SC_HID_SC_APPEND_NAME" - -// Funktionsautopilot: nur als Unique-IDs -#define HID_SC_FAP_PAGE "SC_HID_SC_FAP_PAGE" -#define HID_SC_FAP_EDIT1 "SC_HID_SC_FAP_EDIT1" -#define HID_SC_FAP_EDIT2 "SC_HID_SC_FAP_EDIT2" -#define HID_SC_FAP_EDIT3 "SC_HID_SC_FAP_EDIT3" -#define HID_SC_FAP_EDIT4 "SC_HID_SC_FAP_EDIT4" - -#define HID_SC_ADD_AUTOFMT "SC_HID_SC_ADD_AUTOFMT" -#define HID_SC_AUTOFMT_NAME "SC_HID_SC_AUTOFMT_NAME" - -#define HID_SC_DROPMODE_URL "SC_HID_SC_DROPMODE_URL" -#define HID_SC_DROPMODE_LINK "SC_HID_SC_DROPMODE_LINK" -#define HID_SC_DROPMODE_COPY "SC_HID_SC_DROPMODE_COPY" - -#define HID_SC_FAP_STRUCT "SC_HID_SC_FAP_STRUCT" -#define HID_SC_ASCII_TABCTR "SC_HID_SC_ASCII_TABCTR" - -#define HID_SC_SCENARIO_DELETE "SC_HID_SC_SCENARIO_DELETE" -#define HID_SC_SCENARIO_EDIT "SC_HID_SC_SCENARIO_EDIT" - -#define HID_SCDLG_FORMULA "SC_HID_SCDLG_FORMULA" -#define HID_SCDLG_CONDFORMAT "SC_HID_SCDLG_CONDFORMAT" -#define HID_COLROWNAMERANGES "SC_HID_COLROWNAMERANGES" - -#define HID_FUNCTION_BOX "SC_HID_FUNCTION_BOX" -#define HID_SCPAGE_OPREDLINE "SC_HID_SCPAGE_OPREDLINE" -#define HID_SC_REDLIN_CTR "SC_HID_SC_REDLIN_CTR" - -//Kopf/FusszeilenDlg: Contextmenue fuer Dateiname -#define HID_FCOMMAND_TITEL "SC_HID_FCOMMAND_TITEL" -#define HID_FCOMMAND_FILENAME "SC_HID_FCOMMAND_FILENAME" -#define HID_FCOMMAND_PATH "SC_HID_FCOMMAND_PATH" - - -// Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) ----------------------- - -#define HID_SC_TOOLBOX_TOOLS "SC_HID_SC_TOOLBOX_TOOLS" -#define HID_SC_TOOLBOX_TABLE "SC_HID_SC_TOOLBOX_TABLE" -#define HID_SC_TOOLBOX_DRAW "SC_HID_SC_TOOLBOX_DRAW" -#define HID_SC_TOOLBOX_DRTEXT "SC_HID_SC_TOOLBOX_DRTEXT" -#define HID_SC_TOOLBOX_PREVIEW "SC_HID_SC_TOOLBOX_PREVIEW" - -// wrong group - HID_SC_DLG_START is full -#define HID_SC_RENAME_AUTOFMT "SC_HID_SC_RENAME_AUTOFMT" -#define HID_SC_REN_AFMT_NAME "SC_HID_SC_REN_AFMT_NAME" - -#define HID_SC_TOOLBOX_GRAPHIC "SC_HID_SC_TOOLBOX_GRAPHIC" - -#define HID_CHG_PROTECT "SC_HID_CHG_PROTECT" - -#define HID_SC_RENAME_OBJECT "SC_HID_SC_RENAME_OBJECT" - -#define HID_SC_REN_AFMT_DLG "SC_HID_SC_REN_AFMT_DLG" - -// Hilfe IDs fuer Submenus (max.50) ------------------------------------------ -#define HID_SCMENU_EDIT "SC_HID_SCMENU_EDIT" -#define HID_SCMENU_FILL "SC_HID_SCMENU_FILL" -#define HID_SCMENU_DELBREAK "SC_HID_SCMENU_DELBREAK" -#define HID_SCMENU_VIEW "SC_HID_SCMENU_VIEW" -#define HID_SCMENU_TOOLBARS "SC_HID_SCMENU_TOOLBARS" -#define HID_SCMENU_INSERT "SC_HID_SCMENU_INSERT" -#define HID_SCMENU_INSBREAK "SC_HID_SCMENU_INSBREAK" -#define HID_SCMENU_NAME "SC_HID_SCMENU_NAME" -#define HID_SCMENU_GRAPHIC "SC_HID_SCMENU_GRAPHIC" -#define HID_SCMENU_DATA "SC_HID_SCMENU_DATA" -#define HID_SCMENU_FILTER "SC_HID_SCMENU_FILTER" -#define HID_SCMENU_OUTLINE "SC_HID_SCMENU_OUTLINE" -#define HID_SCMENU_PIVOT "SC_HID_SCMENU_PIVOT" -#define HID_SCMENU_EXTRA "SC_HID_SCMENU_EXTRA" -#define HID_SCMENU_SPELLING "SC_HID_SCMENU_SPELLING" -#define HID_SCMENU_AUDIT "SC_HID_SCMENU_AUDIT" -#define HID_SCMENU_PROTECT "SC_HID_SCMENU_PROTECT" -#define HID_SCMENU_CELLCONT "SC_HID_SCMENU_CELLCONT" -#define HID_SCMENU_ROW "SC_HID_SCMENU_ROW" -#define HID_SCMENU_COL "SC_HID_SCMENU_COL" -#define HID_SCMENU_TAB "SC_HID_SCMENU_TAB" -#define HID_SCMENU_MERGE "SC_HID_SCMENU_MERGE" -#define HID_SCMENU_AREA "SC_HID_SCMENU_AREA" -#define HID_SCMENU_OBJMIRROR "SC_HID_SCMENU_OBJMIRROR" -#define HID_SCMENU_OBJARRANGE "SC_HID_SCMENU_OBJARRANGE" -#define HID_SCMENU_ANCHOR "SC_HID_SCMENU_ANCHOR" -#define HID_SCMENU_SENDTO "SC_HID_SCMENU_SENDTO" -#define HID_SCMENU_CHANGES "SC_HID_SCMENU_CHANGES" - -#define HID_SC_FAP_BTN_FX1 "SC_HID_SC_FAP_BTN_FX1" -#define HID_SC_FAP_BTN_FX2 "SC_HID_SC_FAP_BTN_FX2" -#define HID_SC_FAP_BTN_FX3 "SC_HID_SC_FAP_BTN_FX3" -#define HID_SC_FAP_BTN_FX4 "SC_HID_SC_FAP_BTN_FX4" -#define HID_SC_FAP_BTN_REF1 "SC_HID_SC_FAP_BTN_REF1" -#define HID_SC_FAP_BTN_REF2 "SC_HID_SC_FAP_BTN_REF2" -#define HID_SC_FAP_BTN_REF3 "SC_HID_SC_FAP_BTN_REF3" -#define HID_SC_FAP_BTN_REF4 "SC_HID_SC_FAP_BTN_REF4" -#define HID_SC_FAP_FORMULA "SC_HID_SC_FAP_FORMULA" - -#define HID_SC_SORT_ACTION "SC_HID_SC_SORT_ACTION" -#define HID_SC_SORT_AUTHOR "SC_HID_SC_SORT_AUTHOR" -#define HID_SC_SORT_DATE "SC_HID_SC_SORT_DATE" -#define HID_SC_SORT_COMMENT "SC_HID_SC_SORT_COMMENT" -#define HID_SORT_POSITION "SC_HID_SORT_POSITION" -#define HID_SC_CHANGES_COMMENT "SC_HID_SC_CHANGES_COMMENT" -#define HID_SC_FUNCTIONLIST "SC_HID_SC_FUNCTIONLIST" -#define HID_SCPAGE_OPTLOAD "SC_HID_SCPAGE_OPTLOAD" -#define HID_PASSWD_TABLE "SC_HID_PASSWD_TABLE" -#define HID_PASSWD_DOC "SC_HID_PASSWD_DOC" - -#define HID_DATAPILOT_TYPE "SC_HID_DATAPILOT_TYPE" -#define HID_DATAPILOT_DATABASE "SC_HID_DATAPILOT_DATABASE" -#define HID_DATAPILOT_SERVICE "SC_HID_DATAPILOT_SERVICE" - -// Other help IDs (max.70) --------------------------------------------------- -#define HID_SCDLG_LINKAREAURL "SC_HID_SCDLG_LINKAREAURL" -#define HID_SCMENU_EDIT_TABLE "SC_HID_SCMENU_EDIT_TABLE" - -#define HID_SELECTTABLES "SC_HID_SELECTTABLES" -#define HID_SC_REPLCELLSWARN "SC_HID_SC_REPLCELLSWARN" - -// data pilot layout dialog -#define HID_SC_DPLAY_PAGE "SC_HID_SC_DPLAY_PAGE" -#define HID_SC_DPLAY_COLUMN "SC_HID_SC_DPLAY_COLUMN" -#define HID_SC_DPLAY_ROW "SC_HID_SC_DPLAY_ROW" -#define HID_SC_DPLAY_DATA "SC_HID_SC_DPLAY_DATA" -#define HID_SC_DPLAY_SELECT "SC_HID_SC_DPLAY_SELECT" - -#define HID_SC_DRAW_RENAME "SC_HID_SC_DRAW_RENAME" - -#define HID_SC_DPDATAFIELD "SC_HID_SC_DPDATAFIELD" -#define HID_SC_DPSUBT_OPT "SC_HID_SC_DPSUBT_OPT" -#define HID_SC_DPSUBT_HIDE "SC_HID_SC_DPSUBT_HIDE" -#define HID_SC_DPNUMGROUP "SC_HID_SC_DPNUMGROUP" -#define HID_SC_DPDATEGROUP "SC_HID_SC_DPDATEGROUP" -#define HID_SC_DPDATEGROUP_LB "SC_HID_SC_DPDATEGROUP_LB" -#define HID_SC_DPSHOWDETAIL "SC_HID_SC_DPSHOWDETAIL" - -// #i68101# -#define HID_SC_TITLE_DESCRIPTION_OBJECT "SC_HID_SC_TITLE_DESCRIPTION_OBJECT" - -#define HID_SC_SOLVEROPTIONS "SC_HID_SC_SOLVEROPTIONS" -#define HID_SC_SOLVEROPTIONS_LB "SC_HID_SC_SOLVEROPTIONS_LB" -#define HID_SC_SOLVER_INTEGER "SC_HID_SC_SOLVER_INTEGER" -#define HID_SC_SOLVER_DOUBLE "SC_HID_SC_SOLVER_DOUBLE" -#define HID_SC_SOLVER_PROGRESS "SC_HID_SC_SOLVER_PROGRESS" -#define HID_SC_SOLVER_NOSOLUTION "SC_HID_SC_SOLVER_NOSOLUTION" -#define HID_SC_SOLVER_SUCCESS "SC_HID_SC_SOLVER_SUCCESS" - -#define HID_SCDLG_CONFLICTS "SC_HID_SCDLG_CONFLICTS" - -#define HID_SC_HF_HL_DEFINED "SC_HID_SC_HF_HL_DEFINED" -#define HID_SC_HF_HR_DEFINED "SC_HID_SC_HF_HR_DEFINED" -#define HID_SC_HF_FL_DEFINED "SC_HID_SC_HF_FL_DEFINED" -#define HID_SC_HF_FR_DEFINED "SC_HID_SC_HF_FR_DEFINED" - -// Analysis Addin Functions (max.120) ---------------------------------------- -#define HID_AAI_FUNC_WORKDAY "SC_HID_AAI_FUNC_WORKDAY" -#define HID_AAI_FUNC_YEARFRAC "SC_HID_AAI_FUNC_YEARFRAC" -#define HID_AAI_FUNC_EDATE "SC_HID_AAI_FUNC_EDATE" -#define HID_AAI_FUNC_WEEKNUM "SC_HID_AAI_FUNC_WEEKNUM" -#define HID_AAI_FUNC_EOMONTH "SC_HID_AAI_FUNC_EOMONTH" -#define HID_AAI_FUNC_NETWORKDAYS "SC_HID_AAI_FUNC_NETWORKDAYS" -#define HID_AAI_FUNC_AMORDEGRC "SC_HID_AAI_FUNC_AMORDEGRC" -#define HID_AAI_FUNC_AMORLINC "SC_HID_AAI_FUNC_AMORLINC" -#define HID_AAI_FUNC_ACCRINT "SC_HID_AAI_FUNC_ACCRINT" -#define HID_AAI_FUNC_ACCRINTM "SC_HID_AAI_FUNC_ACCRINTM" -#define HID_AAI_FUNC_RECEIVED "SC_HID_AAI_FUNC_RECEIVED" -#define HID_AAI_FUNC_DISC "SC_HID_AAI_FUNC_DISC" -#define HID_AAI_FUNC_DURATION "SC_HID_AAI_FUNC_DURATION" -#define HID_AAI_FUNC_EFFECT "SC_HID_AAI_FUNC_EFFECT" -#define HID_AAI_FUNC_CUMPRINC "SC_HID_AAI_FUNC_CUMPRINC" -#define HID_AAI_FUNC_CUMIPMT "SC_HID_AAI_FUNC_CUMIPMT" -#define HID_AAI_FUNC_PRICE "SC_HID_AAI_FUNC_PRICE" -#define HID_AAI_FUNC_PRICEDISC "SC_HID_AAI_FUNC_PRICEDISC" -#define HID_AAI_FUNC_PRICEMAT "SC_HID_AAI_FUNC_PRICEMAT" -#define HID_AAI_FUNC_MDURATION "SC_HID_AAI_FUNC_MDURATION" -#define HID_AAI_FUNC_NOMINAL "SC_HID_AAI_FUNC_NOMINAL" -#define HID_AAI_FUNC_DOLLARFR "SC_HID_AAI_FUNC_DOLLARFR" -#define HID_AAI_FUNC_DOLLARDE "SC_HID_AAI_FUNC_DOLLARDE" -#define HID_AAI_FUNC_YIELD "SC_HID_AAI_FUNC_YIELD" -#define HID_AAI_FUNC_YIELDDISC "SC_HID_AAI_FUNC_YIELDDISC" -#define HID_AAI_FUNC_YIELDMAT "SC_HID_AAI_FUNC_YIELDMAT" -#define HID_AAI_FUNC_TBILLEQ "SC_HID_AAI_FUNC_TBILLEQ" -#define HID_AAI_FUNC_TBILLPRICE "SC_HID_AAI_FUNC_TBILLPRICE" -#define HID_AAI_FUNC_TBILLYIELD "SC_HID_AAI_FUNC_TBILLYIELD" -#define HID_AAI_FUNC_ODDFPRICE "SC_HID_AAI_FUNC_ODDFPRICE" -#define HID_AAI_FUNC_ODDFYIELD "SC_HID_AAI_FUNC_ODDFYIELD" -#define HID_AAI_FUNC_ODDLPRICE "SC_HID_AAI_FUNC_ODDLPRICE" -#define HID_AAI_FUNC_ODDLYIELD "SC_HID_AAI_FUNC_ODDLYIELD" -#define HID_AAI_FUNC_XIRR "SC_HID_AAI_FUNC_XIRR" -#define HID_AAI_FUNC_XNPV "SC_HID_AAI_FUNC_XNPV" -#define HID_AAI_FUNC_INTRATE "SC_HID_AAI_FUNC_INTRATE" -#define HID_AAI_FUNC_COUPNCD "SC_HID_AAI_FUNC_COUPNCD" -#define HID_AAI_FUNC_COUPDAYS "SC_HID_AAI_FUNC_COUPDAYS" -#define HID_AAI_FUNC_COUPDAYSNC "SC_HID_AAI_FUNC_COUPDAYSNC" -#define HID_AAI_FUNC_COUPDAYBS "SC_HID_AAI_FUNC_COUPDAYBS" -#define HID_AAI_FUNC_COUPPCD "SC_HID_AAI_FUNC_COUPPCD" -#define HID_AAI_FUNC_COUPNUM "SC_HID_AAI_FUNC_COUPNUM" -#define HID_AAI_FUNC_FVSCHEDULE "SC_HID_AAI_FUNC_FVSCHEDULE" -#define HID_AAI_FUNC_ISEVEN "SC_HID_AAI_FUNC_ISEVEN" -#define HID_AAI_FUNC_ISODD "SC_HID_AAI_FUNC_ISODD" -#define HID_AAI_FUNC_GCD "SC_HID_AAI_FUNC_GCD" -#define HID_AAI_FUNC_LCM "SC_HID_AAI_FUNC_LCM" -#define HID_AAI_FUNC_MULTINOMIAL "SC_HID_AAI_FUNC_MULTINOMIAL" -#define HID_AAI_FUNC_SERIESSUM "SC_HID_AAI_FUNC_SERIESSUM" -#define HID_AAI_FUNC_QUOTIENT "SC_HID_AAI_FUNC_QUOTIENT" -#define HID_AAI_FUNC_MROUND "SC_HID_AAI_FUNC_MROUND" -#define HID_AAI_FUNC_SQRTPI "SC_HID_AAI_FUNC_SQRTPI" -#define HID_AAI_FUNC_RANDBETWEEN "SC_HID_AAI_FUNC_RANDBETWEEN" -#define HID_AAI_FUNC_BESSELI "SC_HID_AAI_FUNC_BESSELI" -#define HID_AAI_FUNC_BESSELJ "SC_HID_AAI_FUNC_BESSELJ" -#define HID_AAI_FUNC_BESSELK "SC_HID_AAI_FUNC_BESSELK" -#define HID_AAI_FUNC_BESSELY "SC_HID_AAI_FUNC_BESSELY" -#define HID_AAI_FUNC_BIN2DEC "SC_HID_AAI_FUNC_BIN2DEC" -#define HID_AAI_FUNC_BIN2HEX "SC_HID_AAI_FUNC_BIN2HEX" -#define HID_AAI_FUNC_BIN2OCT "SC_HID_AAI_FUNC_BIN2OCT" -#define HID_AAI_FUNC_DELTA "SC_HID_AAI_FUNC_DELTA" -#define HID_AAI_FUNC_DEC2BIN "SC_HID_AAI_FUNC_DEC2BIN" -#define HID_AAI_FUNC_DEC2HEX "SC_HID_AAI_FUNC_DEC2HEX" -#define HID_AAI_FUNC_DEC2OCT "SC_HID_AAI_FUNC_DEC2OCT" -#define HID_AAI_FUNC_ERF "SC_HID_AAI_FUNC_ERF" -#define HID_AAI_FUNC_ERFC "SC_HID_AAI_FUNC_ERFC" -#define HID_AAI_FUNC_GESTEP "SC_HID_AAI_FUNC_GESTEP" -#define HID_AAI_FUNC_HEX2BIN "SC_HID_AAI_FUNC_HEX2BIN" -#define HID_AAI_FUNC_HEX2DEC "SC_HID_AAI_FUNC_HEX2DEC" -#define HID_AAI_FUNC_HEX2OCT "SC_HID_AAI_FUNC_HEX2OCT" -#define HID_AAI_FUNC_IMABS "SC_HID_AAI_FUNC_IMABS" -#define HID_AAI_FUNC_IMAGINARY "SC_HID_AAI_FUNC_IMAGINARY" -#define HID_AAI_FUNC_IMPOWER "SC_HID_AAI_FUNC_IMPOWER" -#define HID_AAI_FUNC_IMARGUMENT "SC_HID_AAI_FUNC_IMARGUMENT" -#define HID_AAI_FUNC_IMCOS "SC_HID_AAI_FUNC_IMCOS" -#define HID_AAI_FUNC_IMDIV "SC_HID_AAI_FUNC_IMDIV" -#define HID_AAI_FUNC_IMEXP "SC_HID_AAI_FUNC_IMEXP" -#define HID_AAI_FUNC_IMCONJUGATE "SC_HID_AAI_FUNC_IMCONJUGATE" -#define HID_AAI_FUNC_IMLN "SC_HID_AAI_FUNC_IMLN" -#define HID_AAI_FUNC_IMLOG10 "SC_HID_AAI_FUNC_IMLOG10" -#define HID_AAI_FUNC_IMLOG2 "SC_HID_AAI_FUNC_IMLOG2" -#define HID_AAI_FUNC_IMPRODUCT "SC_HID_AAI_FUNC_IMPRODUCT" -#define HID_AAI_FUNC_IMREAL "SC_HID_AAI_FUNC_IMREAL" -#define HID_AAI_FUNC_IMSIN "SC_HID_AAI_FUNC_IMSIN" -#define HID_AAI_FUNC_IMSUB "SC_HID_AAI_FUNC_IMSUB" -#define HID_AAI_FUNC_IMSUM "SC_HID_AAI_FUNC_IMSUM" -#define HID_AAI_FUNC_IMSQRT "SC_HID_AAI_FUNC_IMSQRT" -#define HID_AAI_FUNC_COMPLEX "SC_HID_AAI_FUNC_COMPLEX" -#define HID_AAI_FUNC_OCT2BIN "SC_HID_AAI_FUNC_OCT2BIN" -#define HID_AAI_FUNC_OCT2DEZ "SC_HID_AAI_FUNC_OCT2DEZ" -#define HID_AAI_FUNC_OCT2HEX "SC_HID_AAI_FUNC_OCT2HEX" -#define HID_AAI_FUNC_CONVERT "SC_HID_AAI_FUNC_CONVERT" -#define HID_AAI_FUNC_FACTDOUBLE "SC_HID_AAI_FUNC_FACTDOUBLE" - -// DateFunc Addin Functions (max.20) ----------------------------------------- -#define HID_DAI_FUNC_DAYSINMONTH "SC_HID_DAI_FUNC_DAYSINMONTH" -#define HID_DAI_FUNC_DAYSINYEAR "SC_HID_DAI_FUNC_DAYSINYEAR" -#define HID_DAI_FUNC_WEEKSINYEAR "SC_HID_DAI_FUNC_WEEKSINYEAR" -#define HID_DAI_FUNC_DIFFMONTHS "SC_HID_DAI_FUNC_DIFFMONTHS" -#define HID_DAI_FUNC_DIFFWEEKS "SC_HID_DAI_FUNC_DIFFWEEKS" -#define HID_DAI_FUNC_DIFFYEARS "SC_HID_DAI_FUNC_DIFFYEARS" -#define HID_DAI_FUNC_ROT13 "SC_HID_DAI_FUNC_ROT13" - -#define HID_SCPAGE_OPREDLINBE_FT_CONTENT "SC_HID_SCPAGE_OPREDLINBE_FT_CONTENT" -#define HID_MN_FORMAT_STYLE "SC_HID_MN_FORMAT_STYLE" -#define HID_MN_FORMAT_ALGN "SC_HID_MN_FORMAT_ALGN" -#define HID_MN_FORMAT_LINESPACE "SC_HID_MN_FORMAT_LINESPACE" - - -// Ende Hilfe IDs ------------------------------------------------------------ // --------------------------------------------------------------------------- // View-Funktionen (max. 100) ------------------------------------------------ diff --git a/sc/inc/scfuncs.hrc b/sc/inc/scfuncs.hrc index 6a31f883678f..c44e34fb46cd 100644 --- a/sc/inc/scfuncs.hrc +++ b/sc/inc/scfuncs.hrc @@ -40,292 +40,3 @@ #define ID_FUNCTION_OFFSET 90 -#define HID_SC_FUNC_DUMMY "SC_HID_SC_FUNC_DUMMY" - -#define HID_FUNC_DBANZAHL "SC_HID_FUNC_DBANZAHL" -#define HID_FUNC_DBANZAHL2 "SC_HID_FUNC_DBANZAHL2" -#define HID_FUNC_DBMITTELWERT "SC_HID_FUNC_DBMITTELWERT" -#define HID_FUNC_DBAUSZUG "SC_HID_FUNC_DBAUSZUG" -#define HID_FUNC_DBMAX "SC_HID_FUNC_DBMAX" -#define HID_FUNC_DBMIN "SC_HID_FUNC_DBMIN" -#define HID_FUNC_DBPRODUKT "SC_HID_FUNC_DBPRODUKT" -#define HID_FUNC_DBSTDABW "SC_HID_FUNC_DBSTDABW" -#define HID_FUNC_DBSTDABWN "SC_HID_FUNC_DBSTDABWN" -#define HID_FUNC_DBSUMME "SC_HID_FUNC_DBSUMME" -#define HID_FUNC_DBVARIANZ "SC_HID_FUNC_DBVARIANZ" -#define HID_FUNC_DBVARIANZEN "SC_HID_FUNC_DBVARIANZEN" - -#define HID_FUNC_DATUM "SC_HID_FUNC_DATUM" -#define HID_FUNC_DATWERT "SC_HID_FUNC_DATWERT" -#define HID_FUNC_TAG "SC_HID_FUNC_TAG" -#define HID_FUNC_TAGE360 "SC_HID_FUNC_TAGE360" -#define HID_FUNC_STUNDE "SC_HID_FUNC_STUNDE" -#define HID_FUNC_MINUTE "SC_HID_FUNC_MINUTE" -#define HID_FUNC_MONAT "SC_HID_FUNC_MONAT" -#define HID_FUNC_JETZT "SC_HID_FUNC_JETZT" -#define HID_FUNC_SEKUNDE "SC_HID_FUNC_SEKUNDE" -#define HID_FUNC_ZEIT "SC_HID_FUNC_ZEIT" -#define HID_FUNC_ZEITWERT "SC_HID_FUNC_ZEITWERT" -#define HID_FUNC_HEUTE "SC_HID_FUNC_HEUTE" -#define HID_FUNC_WOCHENTAG "SC_HID_FUNC_WOCHENTAG" -#define HID_FUNC_JAHR "SC_HID_FUNC_JAHR" -#define HID_FUNC_TAGE "SC_HID_FUNC_TAGE" -#define HID_FUNC_KALENDERWOCHE "SC_HID_FUNC_KALENDERWOCHE" -#define HID_FUNC_OSTERSONNTAG "SC_HID_FUNC_OSTERSONNTAG" - -#define HID_FUNC_BW "SC_HID_FUNC_BW" -#define HID_FUNC_ZW "SC_HID_FUNC_ZW" -#define HID_FUNC_ZZR "SC_HID_FUNC_ZZR" -#define HID_FUNC_RMZ "SC_HID_FUNC_RMZ" -#define HID_FUNC_ZINS "SC_HID_FUNC_ZINS" -#define HID_FUNC_ZINSZ "SC_HID_FUNC_ZINSZ" -#define HID_FUNC_KAPZ "SC_HID_FUNC_KAPZ" -#define HID_FUNC_KUMKAPITAL "SC_HID_FUNC_KUMKAPITAL" -#define HID_FUNC_KUMZINSZ "SC_HID_FUNC_KUMZINSZ" -#define HID_FUNC_DIA "SC_HID_FUNC_DIA" -#define HID_FUNC_LIA "SC_HID_FUNC_LIA" -#define HID_FUNC_GDA "SC_HID_FUNC_GDA" -#define HID_FUNC_GDA2 "SC_HID_FUNC_GDA2" -#define HID_FUNC_VDB "SC_HID_FUNC_VDB" -#define HID_FUNC_EFFEKTIV "SC_HID_FUNC_EFFEKTIV" -#define HID_FUNC_NOMINAL "SC_HID_FUNC_NOMINAL" -#define HID_FUNC_NBW "SC_HID_FUNC_NBW" -#define HID_FUNC_IKV "SC_HID_FUNC_IKV" -#define HID_FUNC_LAUFZEIT "SC_HID_FUNC_LAUFZEIT" -#define HID_FUNC_ZGZ "SC_HID_FUNC_ZGZ" -#define HID_FUNC_QIKV "SC_HID_FUNC_QIKV" -#define HID_FUNC_ISPMT "SC_HID_FUNC_ISPMT" - -#define HID_FUNC_ISTBEZUG "SC_HID_FUNC_ISTBEZUG" -#define HID_FUNC_ISTFEHL "SC_HID_FUNC_ISTFEHL" -#define HID_FUNC_ISTFEHLER "SC_HID_FUNC_ISTFEHLER" -#define HID_FUNC_ISTLEER "SC_HID_FUNC_ISTLEER" -#define HID_FUNC_ISTLOG "SC_HID_FUNC_ISTLOG" -#define HID_FUNC_ISTNV "SC_HID_FUNC_ISTNV" -#define HID_FUNC_ISTKTEXT "SC_HID_FUNC_ISTKTEXT" -#define HID_FUNC_ISTTEXT "SC_HID_FUNC_ISTTEXT" -#define HID_FUNC_ISTZAHL "SC_HID_FUNC_ISTZAHL" -#define HID_FUNC_ISTFORMEL "SC_HID_FUNC_ISTFORMEL" -#define HID_FUNC_N "SC_HID_FUNC_N" -#define HID_FUNC_NV "SC_HID_FUNC_NV" -#define HID_FUNC_TYP "SC_HID_FUNC_TYP" -#define HID_FUNC_AKTUELL "SC_HID_FUNC_AKTUELL" -#define HID_FUNC_FORMEL "SC_HID_FUNC_FORMEL" -#define HID_FUNC_ZELLE "SC_HID_FUNC_ZELLE" -#define HID_FUNC_INFO "SC_HID_FUNC_INFO" - - -#define HID_FUNC_FALSCH "SC_HID_FUNC_FALSCH" -#define HID_FUNC_NICHT "SC_HID_FUNC_NICHT" -#define HID_FUNC_WAHR "SC_HID_FUNC_WAHR" -#define HID_FUNC_WENN "SC_HID_FUNC_WENN" -#define HID_FUNC_ODER "SC_HID_FUNC_ODER" -#define HID_FUNC_UND "SC_HID_FUNC_UND" - -#define HID_FUNC_ABS "SC_HID_FUNC_ABS" -#define HID_FUNC_POTENZ "SC_HID_FUNC_POTENZ" -#define HID_FUNC_ANZAHLLEEREZELLEN "SC_HID_FUNC_ANZAHLLEEREZELLEN" -#define HID_FUNC_PI "SC_HID_FUNC_PI" -#define HID_FUNC_SUMME "SC_HID_FUNC_SUMME" -#define HID_FUNC_QUADRATESUMME "SC_HID_FUNC_QUADRATESUMME" -#define HID_FUNC_PRODUKT "SC_HID_FUNC_PRODUKT" -#define HID_FUNC_SUMMEWENN "SC_HID_FUNC_SUMMEWENN" -#define HID_FUNC_ZAEHLENWENN "SC_HID_FUNC_ZAEHLENWENN" -#define HID_FUNC_WURZEL "SC_HID_FUNC_WURZEL" -#define HID_FUNC_ZUFALLSZAHL "SC_HID_FUNC_ZUFALLSZAHL" -#define HID_FUNC_ISTGERADE "SC_HID_FUNC_ISTGERADE" -#define HID_FUNC_ISTUNGERADE "SC_HID_FUNC_ISTUNGERADE" -#define HID_FUNC_KOMBINATIONEN "SC_HID_FUNC_KOMBINATIONEN" -#define HID_FUNC_KOMBINATIONEN2 "SC_HID_FUNC_KOMBINATIONEN2" -#define HID_FUNC_ARCCOS "SC_HID_FUNC_ARCCOS" -#define HID_FUNC_ARCSIN "SC_HID_FUNC_ARCSIN" -#define HID_FUNC_ARCOSHYP "SC_HID_FUNC_ARCOSHYP" -#define HID_FUNC_ARSINHYP "SC_HID_FUNC_ARSINHYP" -#define HID_FUNC_ARCCOT "SC_HID_FUNC_ARCCOT" -#define HID_FUNC_ARCTAN "SC_HID_FUNC_ARCTAN" -#define HID_FUNC_ARCOTHYP "SC_HID_FUNC_ARCOTHYP" -#define HID_FUNC_ARTANHYP "SC_HID_FUNC_ARTANHYP" -#define HID_FUNC_COS "SC_HID_FUNC_COS" -#define HID_FUNC_SIN "SC_HID_FUNC_SIN" -#define HID_FUNC_COT "SC_HID_FUNC_COT" -#define HID_FUNC_TAN "SC_HID_FUNC_TAN" -#define HID_FUNC_COSHYP "SC_HID_FUNC_COSHYP" -#define HID_FUNC_SINHYP "SC_HID_FUNC_SINHYP" -#define HID_FUNC_COTHYP "SC_HID_FUNC_COTHYP" -#define HID_FUNC_TANHYP "SC_HID_FUNC_TANHYP" -#define HID_FUNC_ARCTAN2 "SC_HID_FUNC_ARCTAN2" -#define HID_FUNC_DEG "SC_HID_FUNC_DEG" -#define HID_FUNC_RAD "SC_HID_FUNC_RAD" -#define HID_FUNC_EXP "SC_HID_FUNC_EXP" -#define HID_FUNC_LOG "SC_HID_FUNC_LOG" -#define HID_FUNC_LN "SC_HID_FUNC_LN" -#define HID_FUNC_LOG10 "SC_HID_FUNC_LOG10" -#define HID_FUNC_FAKULTAET "SC_HID_FUNC_FAKULTAET" -#define HID_FUNC_REST "SC_HID_FUNC_REST" -#define HID_FUNC_VORZEICHEN "SC_HID_FUNC_VORZEICHEN" -#define HID_FUNC_TEILERGEBNIS "SC_HID_FUNC_TEILERGEBNIS" -#define HID_FUNC_GANZZAHL "SC_HID_FUNC_GANZZAHL" -#define HID_FUNC_KUERZEN "SC_HID_FUNC_KUERZEN" -#define HID_FUNC_RUNDEN "SC_HID_FUNC_RUNDEN" -#define HID_FUNC_AUFRUNDEN "SC_HID_FUNC_AUFRUNDEN" -#define HID_FUNC_ABRUNDEN "SC_HID_FUNC_ABRUNDEN" -#define HID_FUNC_GERADE "SC_HID_FUNC_GERADE" -#define HID_FUNC_UNGERADE "SC_HID_FUNC_UNGERADE" -#define HID_FUNC_OBERGRENZE "SC_HID_FUNC_OBERGRENZE" -#define HID_FUNC_UNTERGRENZE "SC_HID_FUNC_UNTERGRENZE" -#define HID_FUNC_GGT "SC_HID_FUNC_GGT" -#define HID_FUNC_KGV "SC_HID_FUNC_KGV" -#define HID_FUNC_UMRECHNEN "SC_HID_FUNC_UMRECHNEN" -#define HID_FUNC_EUROCONVERT "SC_HID_FUNC_EUROCONVERT" - -#define HID_FUNC_MTRANS "SC_HID_FUNC_MTRANS" -#define HID_FUNC_MMULT "SC_HID_FUNC_MMULT" -#define HID_FUNC_MDET "SC_HID_FUNC_MDET" -#define HID_FUNC_MINV "SC_HID_FUNC_MINV" -#define HID_FUNC_EINHEITSMATRIX "SC_HID_FUNC_EINHEITSMATRIX" -#define HID_FUNC_SUMMENPRODUKT "SC_HID_FUNC_SUMMENPRODUKT" -#define HID_FUNC_SUMMEX2MY2 "SC_HID_FUNC_SUMMEX2MY2" -#define HID_FUNC_SUMMEX2PY2 "SC_HID_FUNC_SUMMEX2PY2" -#define HID_FUNC_SUMMEXMY2 "SC_HID_FUNC_SUMMEXMY2" -#define HID_FUNC_HAEUFIGKEIT "SC_HID_FUNC_HAEUFIGKEIT" -#define HID_FUNC_RGP "SC_HID_FUNC_RGP" -#define HID_FUNC_RKP "SC_HID_FUNC_RKP" -#define HID_FUNC_TREND "SC_HID_FUNC_TREND" -#define HID_FUNC_VARIATION "SC_HID_FUNC_VARIATION" - -#define HID_FUNC_ANZAHL "SC_HID_FUNC_ANZAHL" -#define HID_FUNC_ANZAHL2 "SC_HID_FUNC_ANZAHL2" -#define HID_FUNC_MAX "SC_HID_FUNC_MAX" -#define HID_FUNC_MIN "SC_HID_FUNC_MIN" -#define HID_FUNC_VARIANZ "SC_HID_FUNC_VARIANZ" -#define HID_FUNC_VARIANZEN "SC_HID_FUNC_VARIANZEN" -#define HID_FUNC_STABW "SC_HID_FUNC_STABW" -#define HID_FUNC_STABWN "SC_HID_FUNC_STABWN" -#define HID_FUNC_MITTELWERT "SC_HID_FUNC_MITTELWERT" -#define HID_FUNC_SUMQUADABW "SC_HID_FUNC_SUMQUADABW" -#define HID_FUNC_MITTELABW "SC_HID_FUNC_MITTELABW" -#define HID_FUNC_SCHIEFE "SC_HID_FUNC_SCHIEFE" -#define HID_FUNC_KURT "SC_HID_FUNC_KURT" -#define HID_FUNC_GEOMITTEL "SC_HID_FUNC_GEOMITTEL" -#define HID_FUNC_HARMITTEL "SC_HID_FUNC_HARMITTEL" -#define HID_FUNC_MODALWERT "SC_HID_FUNC_MODALWERT" -#define HID_FUNC_MEDIAN "SC_HID_FUNC_MEDIAN" -#define HID_FUNC_QUANTIL "SC_HID_FUNC_QUANTIL" -#define HID_FUNC_QUARTILE "SC_HID_FUNC_QUARTILE" -#define HID_FUNC_KGROESSTE "SC_HID_FUNC_KGROESSTE" -#define HID_FUNC_KKLEINSTE "SC_HID_FUNC_KKLEINSTE" -#define HID_FUNC_QUANTILSRANG "SC_HID_FUNC_QUANTILSRANG" -#define HID_FUNC_RANG "SC_HID_FUNC_RANG" -#define HID_FUNC_GESTUTZTMITTEL "SC_HID_FUNC_GESTUTZTMITTEL" -#define HID_FUNC_WAHRSCHBEREICH "SC_HID_FUNC_WAHRSCHBEREICH" -#define HID_FUNC_B "SC_HID_FUNC_B" -#define HID_FUNC_PHI "SC_HID_FUNC_PHI" -#define HID_FUNC_GAUSS "SC_HID_FUNC_GAUSS" -#define HID_FUNC_FISHER "SC_HID_FUNC_FISHER" -#define HID_FUNC_FISHERINV "SC_HID_FUNC_FISHERINV" -#define HID_FUNC_BINOMVERT "SC_HID_FUNC_BINOMVERT" -#define HID_FUNC_NEGBINOMVERT "SC_HID_FUNC_NEGBINOMVERT" -#define HID_FUNC_KRITBINOM "SC_HID_FUNC_KRITBINOM" -#define HID_FUNC_POISSON "SC_HID_FUNC_POISSON" -#define HID_FUNC_NORMVERT "SC_HID_FUNC_NORMVERT" -#define HID_FUNC_NORMINV "SC_HID_FUNC_NORMINV" -#define HID_FUNC_STANDNORMVERT "SC_HID_FUNC_STANDNORMVERT" -#define HID_FUNC_STANDNORMINV "SC_HID_FUNC_STANDNORMINV" -#define HID_FUNC_LOGNORMVERT "SC_HID_FUNC_LOGNORMVERT" -#define HID_FUNC_LOGINV "SC_HID_FUNC_LOGINV" -#define HID_FUNC_EXPONVERT "SC_HID_FUNC_EXPONVERT" -#define HID_FUNC_GAMMAVERT "SC_HID_FUNC_GAMMAVERT" -#define HID_FUNC_GAMMAINV "SC_HID_FUNC_GAMMAINV" -#define HID_FUNC_GAMMALN "SC_HID_FUNC_GAMMALN" -#define HID_FUNC_BETAVERT "SC_HID_FUNC_BETAVERT" -#define HID_FUNC_BETAINV "SC_HID_FUNC_BETAINV" -#define HID_FUNC_WEIBULL "SC_HID_FUNC_WEIBULL" -#define HID_FUNC_HYPGEOMVERT "SC_HID_FUNC_HYPGEOMVERT" -#define HID_FUNC_TVERT "SC_HID_FUNC_TVERT" -#define HID_FUNC_TINV "SC_HID_FUNC_TINV" -#define HID_FUNC_FVERT "SC_HID_FUNC_FVERT" -#define HID_FUNC_FINV "SC_HID_FUNC_FINV" -#define HID_FUNC_CHIVERT "SC_HID_FUNC_CHIVERT" -#define HID_FUNC_CHIINV "SC_HID_FUNC_CHIINV" -#define HID_FUNC_STANDARDISIERUNG "SC_HID_FUNC_STANDARDISIERUNG" -#define HID_FUNC_VARIATIONEN "SC_HID_FUNC_VARIATIONEN" -#define HID_FUNC_VARIATIONEN2 "SC_HID_FUNC_VARIATIONEN2" -#define HID_FUNC_KONFIDENZ "SC_HID_FUNC_KONFIDENZ" -#define HID_FUNC_GTEST "SC_HID_FUNC_GTEST" -#define HID_FUNC_CHITEST "SC_HID_FUNC_CHITEST" -#define HID_FUNC_FTEST "SC_HID_FUNC_FTEST" -#define HID_FUNC_TTEST "SC_HID_FUNC_TTEST" -#define HID_FUNC_BESTIMMTHEITSMASS "SC_HID_FUNC_BESTIMMTHEITSMASS" -#define HID_FUNC_ACHSENABSCHNITT "SC_HID_FUNC_ACHSENABSCHNITT" -#define HID_FUNC_STEIGUNG "SC_HID_FUNC_STEIGUNG" -#define HID_FUNC_STFEHLERYX "SC_HID_FUNC_STFEHLERYX" -#define HID_FUNC_PEARSON "SC_HID_FUNC_PEARSON" -#define HID_FUNC_KORREL "SC_HID_FUNC_KORREL" -#define HID_FUNC_KOVAR "SC_HID_FUNC_KOVAR" -#define HID_FUNC_SCHAETZER "SC_HID_FUNC_SCHAETZER" -#define HID_FUNC_MINA "SC_HID_FUNC_MINA" -#define HID_FUNC_MAXA "SC_HID_FUNC_MAXA" -#define HID_FUNC_MITTELWERTA "SC_HID_FUNC_MITTELWERTA" -#define HID_FUNC_STABWA "SC_HID_FUNC_STABWA" -#define HID_FUNC_STABWNA "SC_HID_FUNC_STABWNA" -#define HID_FUNC_VARIANZA "SC_HID_FUNC_VARIANZA" -#define HID_FUNC_VARIANZENA "SC_HID_FUNC_VARIANZENA" -#define HID_FUNC_CHISQDIST "SC_HID_FUNC_CHISQDIST" -#define HID_FUNC_CHISQINV "SC_HID_FUNC_CHISQINV" -#define HID_FUNC_GAMMA "SC_HID_FUNC_GAMMA" - -#define HID_FUNC_ADRESSE "SC_HID_FUNC_ADRESSE" -#define HID_FUNC_BEREICHE "SC_HID_FUNC_BEREICHE" -#define HID_FUNC_WAHL "SC_HID_FUNC_WAHL" -#define HID_FUNC_SPALTE "SC_HID_FUNC_SPALTE" -#define HID_FUNC_ZEILE "SC_HID_FUNC_ZEILE" -#define HID_FUNC_SPALTEN "SC_HID_FUNC_SPALTEN" -#define HID_FUNC_ZEILEN "SC_HID_FUNC_ZEILEN" -#define HID_FUNC_WVERWEIS "SC_HID_FUNC_WVERWEIS" -#define HID_FUNC_SVERWEIS "SC_HID_FUNC_SVERWEIS" -#define HID_FUNC_INDEX "SC_HID_FUNC_INDEX" -#define HID_FUNC_INDIREKT "SC_HID_FUNC_INDIREKT" -#define HID_FUNC_VERWEIS "SC_HID_FUNC_VERWEIS" -#define HID_FUNC_VERGLEICH "SC_HID_FUNC_VERGLEICH" -#define HID_FUNC_VERSCHIEBUNG "SC_HID_FUNC_VERSCHIEBUNG" -#define HID_FUNC_FEHLERTYP "SC_HID_FUNC_FEHLERTYP" -#define HID_FUNC_VORLAGE "SC_HID_FUNC_VORLAGE" -#define HID_FUNC_DDE "SC_HID_FUNC_DDE" -#define HID_FUNC_TABELLE "SC_HID_FUNC_TABELLE" -#define HID_FUNC_TABELLEN "SC_HID_FUNC_TABELLEN" -#define HID_FUNC_HYPERLINK "SC_HID_FUNC_HYPERLINK" -#define HID_FUNC_GETPIVOTDATA "SC_HID_FUNC_GETPIVOTDATA" - -#define HID_FUNC_CODE "SC_HID_FUNC_CODE" -#define HID_FUNC_DM "SC_HID_FUNC_DM" -#define HID_FUNC_ZEICHEN "SC_HID_FUNC_ZEICHEN" -#define HID_FUNC_SAEUBERN "SC_HID_FUNC_SAEUBERN" -#define HID_FUNC_VERKETTEN "SC_HID_FUNC_VERKETTEN" -#define HID_FUNC_IDENTISCH "SC_HID_FUNC_IDENTISCH" -#define HID_FUNC_FINDEN "SC_HID_FUNC_FINDEN" -#define HID_FUNC_SUCHEN "SC_HID_FUNC_SUCHEN" -#define HID_FUNC_GLAETTEN "SC_HID_FUNC_GLAETTEN" -#define HID_FUNC_GROSS2 "SC_HID_FUNC_GROSS2" -#define HID_FUNC_GROSS "SC_HID_FUNC_GROSS" -#define HID_FUNC_KLEIN "SC_HID_FUNC_KLEIN" -#define HID_FUNC_WERT "SC_HID_FUNC_WERT" -#define HID_FUNC_TEXT "SC_HID_FUNC_TEXT" -#define HID_FUNC_T "SC_HID_FUNC_T" -#define HID_FUNC_ERSETZEN "SC_HID_FUNC_ERSETZEN" -#define HID_FUNC_FEST "SC_HID_FUNC_FEST" -#define HID_FUNC_LAENGE "SC_HID_FUNC_LAENGE" -#define HID_FUNC_LINKS "SC_HID_FUNC_LINKS" -#define HID_FUNC_RECHTS "SC_HID_FUNC_RECHTS" -#define HID_FUNC_TEIL "SC_HID_FUNC_TEIL" -#define HID_FUNC_WIEDERHOLEN "SC_HID_FUNC_WIEDERHOLEN" -#define HID_FUNC_WECHSELN "SC_HID_FUNC_WECHSELN" -#define HID_FUNC_BASIS "SC_HID_FUNC_BASIS" -#define HID_FUNC_DEZIMAL "SC_HID_FUNC_DEZIMAL" -#define HID_FUNC_ROEMISCH "SC_HID_FUNC_ROEMISCH" -#define HID_FUNC_ARABISCH "SC_HID_FUNC_ARABISCH" -#define HID_FUNC_BAHTTEXT "SC_HID_FUNC_BAHTTEXT" -#define HID_FUNC_JIS "SC_HID_FUNC_JIS" -#define HID_FUNC_ASC "SC_HID_FUNC_ASC" -#define HID_FUNC_UNICODE "SC_HID_FUNC_UNICODE" -#define HID_FUNC_UNICHAR "SC_HID_FUNC_UNICHAR" -#define HID_FUNC_NUMBERVALUE "SC_HID_FUNC_NUMBERVALUE" diff --git a/sc/source/ui/drawfunc/fuins2.cxx b/sc/source/ui/drawfunc/fuins2.cxx index 9582bac97ba7..297e8fa38651 100644 --- a/sc/source/ui/drawfunc/fuins2.cxx +++ b/sc/source/ui/drawfunc/fuins2.cxx @@ -262,7 +262,6 @@ FuInsertOLE::FuInsertOLE(ScTabViewShell* pViewSh, Window* pWin, ScDrawView* pVie aServerLst.Remove( ScDocShell::Factory().GetClassId() ); // Starcalc nicht anzeigen //TODO/LATER: currently no inserting of ClassId into SfxRequest! case SID_INSERT_PLUGIN : - case SID_INSERT_APPLET : case SID_INSERT_FLOATINGFRAME : { SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); diff --git a/sc/util/hidother.src b/sc/util/hidother.src index ffdb5c329399..d575580228bd 100644 --- a/sc/util/hidother.src +++ b/sc/util/hidother.src @@ -24,40 +24,13 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "../inc/scfuncs.hrc" // HID_FUNC_XXX +#include "../inc/helpids.h" // Help-IDs fuer Dokument-Fenster hidspecial HID_SC_WIN_GRIDWIN { HelpID = HID_SC_WIN_GRIDWIN; }; hidspecial HID_SC_WIN_PREVIEW { HelpID = HID_SC_WIN_PREVIEW; }; -// Help-IDs fuer Shells (Helferlein) - -hidspecial HID_SCSHELL_TABVWSH { HelpID = HID_SCSHELL_TABVWSH; }; -hidspecial HID_SCSHELL_PREVWSH { HelpID = HID_SCSHELL_PREVWSH; }; -hidspecial HID_SCSHELL_AUDIT { HelpID = HID_SCSHELL_AUDIT; }; -hidspecial HID_SCSHELL_PIVOTSH { HelpID = HID_SCSHELL_PIVOTSH; }; -hidspecial HID_SCSHELL_DRAWSH { HelpID = HID_SCSHELL_DRAWSH; }; -hidspecial HID_SCSHELL_DRTXTOB { HelpID = HID_SCSHELL_DRTXTOB; }; -hidspecial HID_SCSHELL_DRAWFORMSH{ HelpID = HID_SCSHELL_DRAWFORMSH ; }; - -hidspecial HID_SCSHELL_CELLSH { HelpID = HID_SCSHELL_CELLSH ; }; -hidspecial HID_SCSHELL_FORMATSH { HelpID = HID_SCSHELL_FORMATSH ; }; -hidspecial HID_SCSHELL_OLEOBEJCTSH { HelpID = HID_SCSHELL_OLEOBEJCTSH ; }; -hidspecial HID_SCSHELL_CHARTSH { HelpID = HID_SCSHELL_CHARTSH ; }; -hidspecial HID_SCSHELL_GRAPHIC { HelpID = HID_SCSHELL_GRAPHIC ; }; -hidspecial HID_SCSHELL_PAGEBREAK { HelpID = HID_SCSHELL_PAGEBREAK ; }; - -// Help-IDs fuer Standard-Vorlagen - -hidspecial HID_SC_SHEET_CELL_STD { HelpID = HID_SC_SHEET_CELL_STD; }; -hidspecial HID_SC_SHEET_CELL_ERG { HelpID = HID_SC_SHEET_CELL_ERG; }; -hidspecial HID_SC_SHEET_CELL_ERG1 { HelpID = HID_SC_SHEET_CELL_ERG1; }; -hidspecial HID_SC_SHEET_CELL_UEB { HelpID = HID_SC_SHEET_CELL_UEB; }; -hidspecial HID_SC_SHEET_CELL_UEB1 { HelpID = HID_SC_SHEET_CELL_UEB1; }; -hidspecial HID_SC_SHEET_PAGE_STD { HelpID = HID_SC_SHEET_PAGE_STD; }; -hidspecial HID_SC_SHEET_PAGE_REP { HelpID = HID_SC_SHEET_PAGE_REP; }; - // Elemente in der Eingabezeile hidspecial HID_INSWIN_POS { HelpID = HID_INSWIN_POS; }; @@ -497,8 +470,3 @@ hidspecial HID_DAI_FUNC_DIFFWEEKS { HelpID = HID_DAI_FUNC_DIFFWEEKS; }; hidspecial HID_DAI_FUNC_DIFFYEARS { HelpID = HID_DAI_FUNC_DIFFYEARS; }; hidspecial HID_DAI_FUNC_ROT13 { HelpID = HID_DAI_FUNC_ROT13; }; -// These HelpIDs do appear in resources, but don't have hid list entries -// generated from there, because of the use of macros (#95943#): - -hidspecial SID_RENAME_OBJECT { HelpID = SID_RENAME_OBJECT; }; - -- cgit From e05c938a71a1e9698d036a8e6dae5d2a208ddd07 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- svtools/inc/svtools/helpid.hrc | 6 ------ 1 file changed, 6 deletions(-) diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc index 3c9a38d94bff..f19cf1a17aa3 100644 --- a/svtools/inc/svtools/helpid.hrc +++ b/svtools/inc/svtools/helpid.hrc @@ -28,12 +28,6 @@ #ifndef _SVT_HELPID_HRC #define _SVT_HELPID_HRC -// include --------------------------------------------------------------- - -#include - -// Help-Ids -------------------------------------------------------------- - #define HID_FILEDLG_OPENDLG "SVT_HID_FILEDLG_OPENDLG" #define HID_FILEDLG_PATHDLG "SVT_HID_FILEDLG_PATHDLG" #define HID_FILEDLG_DIR "SVT_HID_FILEDLG_DIR" -- cgit From c737e5bb650e3efbb6bf08fa85a1474d80c8d558 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- basctl/inc/helpid.hrc | 6 ------ basctl/util/hidother.src | 1 - cui/source/inc/helpid.hrc | 1 - extensions/inc/abpilot.hrc | 2 -- extensions/inc/bibliography.hrc | 2 -- extensions/inc/dbpilots.hrc | 2 -- extensions/inc/propctrlr.hrc | 2 -- extensions/inc/update.hrc | 2 -- extensions/source/abpilot/abpresid.hrc | 1 + extensions/source/bibliography/bib.hrc | 2 +- extensions/source/dbpilots/dbpresid.hrc | 1 + 11 files changed, 3 insertions(+), 19 deletions(-) diff --git a/basctl/inc/helpid.hrc b/basctl/inc/helpid.hrc index 4a303a8dc549..4b2f2ba90952 100644 --- a/basctl/inc/helpid.hrc +++ b/basctl/inc/helpid.hrc @@ -27,12 +27,6 @@ #ifndef _BASCTL_HELPID_HRC #define _BASCTL_HELPID_HRC -// include --------------------------------------------------------------- - -#include - -// Help-Ids -------------------------------------------------------------- - #define HID_BASICIDE_TOOLBOX "BASCTL_HID_BASICIDE_TOOLBOX" #define HID_BASICIDE_OBJECTS "BASCTL_HID_BASICIDE_OBJECTS" #define HID_MACRO_OPTIONS "BASCTL_HID_MACRO_OPTIONS" diff --git a/basctl/util/hidother.src b/basctl/util/hidother.src index cd8fe7b26bf5..ce2607b3296d 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/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc index 22a2b92f32bd..dff73253b086 100644 --- a/cui/source/inc/helpid.hrc +++ b/cui/source/inc/helpid.hrc @@ -28,7 +28,6 @@ #define _CUI_HELPID_HRC // include --------------------------------------------------------------- -#include #include #include diff --git a/extensions/inc/abpilot.hrc b/extensions/inc/abpilot.hrc index 3e26ad3435fa..f7275afe4440 100644 --- a/extensions/inc/abpilot.hrc +++ b/extensions/inc/abpilot.hrc @@ -27,8 +27,6 @@ #ifndef EXTENSIONS_ABPILOT_HRC #define EXTENSIONS_ABPILOT_HRC -#include "extensio.hrc" - #define HID_ABSPILOT_PREVIOUS "EXTENSIONS_HID_ABSPILOT_PREVIOUS" #define HID_ABSPILOT_NEXT "EXTENSIONS_HID_ABSPILOT_NEXT" #define HID_ABSPILOT_CANCEL "EXTENSIONS_HID_ABSPILOT_CANCEL" diff --git a/extensions/inc/bibliography.hrc b/extensions/inc/bibliography.hrc index f6d601d63f20..0a94f1da40cb 100644 --- a/extensions/inc/bibliography.hrc +++ b/extensions/inc/bibliography.hrc @@ -27,8 +27,6 @@ #ifndef EXTENSIONS_BIBLIOGRAPHY_HRC #define EXTENSIONS_BIBLIOGRAPHY_HRC -#include "extensio.hrc" - #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" diff --git a/extensions/inc/dbpilots.hrc b/extensions/inc/dbpilots.hrc index acc02b64d82a..214601662283 100644 --- a/extensions/inc/dbpilots.hrc +++ b/extensions/inc/dbpilots.hrc @@ -27,8 +27,6 @@ #ifndef EXTENSIONS_DBPILOT_HRC #define EXTENSIONS_DBPILOT_HRC -#include "extensio.hrc" - #define HID_GHIDWIZARD_PREVIOUS "EXTENSIONS_HID_GHIDWIZARD_PREVIOUS" #define HID_GHIDWIZARD_NEXT "EXTENSIONS_HID_GHIDWIZARD_NEXT" #define HID_GHIDWIZARD_CANCEL "EXTENSIONS_HID_GHIDWIZARD_CANCEL" diff --git a/extensions/inc/propctrlr.hrc b/extensions/inc/propctrlr.hrc index 0b2b48eede67..584dc469a7f5 100644 --- a/extensions/inc/propctrlr.hrc +++ b/extensions/inc/propctrlr.hrc @@ -27,8 +27,6 @@ #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" diff --git a/extensions/inc/update.hrc b/extensions/inc/update.hrc index 7624978ebb82..45203dd1f005 100644 --- a/extensions/inc/update.hrc +++ b/extensions/inc/update.hrc @@ -27,8 +27,6 @@ #ifndef EXTENSIONS_UPDATE_HRC #define EXTENSIONS_UPDATE_HRC -#include "extensio.hrc" - #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" diff --git a/extensions/source/abpilot/abpresid.hrc b/extensions/source/abpilot/abpresid.hrc index 1afc6e88a2f0..e6a648a28423 100644 --- a/extensions/source/abpilot/abpresid.hrc +++ b/extensions/source/abpilot/abpresid.hrc @@ -29,6 +29,7 @@ #define EXTENSIONS_ABPRESID_HRC #include "abpilot.hrc" +#include "extensio.hrc" //======================================================================== // basics diff --git a/extensions/source/bibliography/bib.hrc b/extensions/source/bibliography/bib.hrc index 319c58d509ad..14c5259489fd 100644 --- a/extensions/source/bibliography/bib.hrc +++ b/extensions/source/bibliography/bib.hrc @@ -28,7 +28,7 @@ #define BIB_HRC #include "bibliography.hrc" - +#include #ifndef RID_BIB_START #define RID_BIB_START RID_EXTENSIONS_START #endif diff --git a/extensions/source/dbpilots/dbpresid.hrc b/extensions/source/dbpilots/dbpresid.hrc index ecb424c5e3b7..74b71bf35007 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 -- cgit From 27fba42a0f22c518c6b759d5bcf9961496b788ed Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- dbaccess/inc/dbaccess_helpid.hrc | 4 ---- dbaccess/util/hidother.src | 36 +++++++++++------------------------- reportdesign/inc/helpids.hrc | 4 ---- reportdesign/util/hidother.src | 22 +++++++++++++--------- 4 files changed, 24 insertions(+), 42 deletions(-) diff --git a/dbaccess/inc/dbaccess_helpid.hrc b/dbaccess/inc/dbaccess_helpid.hrc index 88a7da731d63..6bbf59dfc7e4 100644 --- a/dbaccess/inc/dbaccess_helpid.hrc +++ b/dbaccess/inc/dbaccess_helpid.hrc @@ -28,10 +28,6 @@ #ifndef _DBA_DBACCESS_HELPID_HRC_ #define _DBA_DBACCESS_HELPID_HRC_ -#ifndef _SOLAR_HRC -#include // HID_DBACCESS_START -#endif - #define HID_DSADMIN_CHARSET "DBACCESS_HID_DSADMIN_CHARSET" #define HID_DLG_FILTERCRIT "DBACCESS_HID_DLG_FILTERCRIT" diff --git a/dbaccess/util/hidother.src b/dbaccess/util/hidother.src index 2971f9e443e0..094b4fbfecd0 100644 --- a/dbaccess/util/hidother.src +++ b/dbaccess/util/hidother.src @@ -26,10 +26,6 @@ ************************************************************************/ #include "../inc/dbaccess_helpid.hrc" -#include "../inc/dbaccess_slotid.hrc" -#ifndef _SBASLTID_HRC -#include -#endif hidspecial HID_DLG_FILTERCRIT { HelpId = HID_DLG_FILTERCRIT; }; hidspecial HID_DLG_ORDERCRIT { HelpId = HID_DLG_ORDERCRIT; }; @@ -148,8 +144,11 @@ hidspecial HID_TABDESIGN_TYPECELL { HelpId = HID_TABDESIGN hidspecial HID_TABDESIGN_COMMENTCELL { HelpId = HID_TABDESIGN_COMMENTCELL; }; hidspecial HID_TABDESIGN_HELPTEXT { HelpId = HID_TABDESIGN_HELPTEXT; }; +/* hidspecial SID_TABLEDESIGN_INSERTROWS { HelpId = SID_TABLEDESIGN_INSERTROWS; }; hidspecial SID_TABLEDESIGN_TABED_PRIMARYKEY { HelpId = SID_TABLEDESIGN_TABED_PRIMARYKEY; }; +*/ + hidspecial HID_TLB_TABLEDESIGN { HelpId = HID_TLB_TABLEDESIGN; }; hidspecial HID_TAB_DESIGN_HELP_TEXT_FRAME { HelpId = HID_TAB_DESIGN_HELP_TEXT_FRAME; }; hidspecial HID_TABLE_DESIGN_TABPAGE_GENERAL { HelpId = HID_TABLE_DESIGN_TABPAGE_GENERAL; }; @@ -169,7 +168,6 @@ hidspecial HID_BROWSER_TABLE_CREATE_DESIGN { HelpId = HID_BROWSER_T hidspecial HID_BROWSER_TABLE_EDIT { HelpId = HID_BROWSER_TABLE_EDIT; }; hidspecial HID_BROWSER_TABLE_DELETE { HelpId = HID_BROWSER_TABLE_DELETE; }; hidspecial HID_SQLERROR_EXCHAIN_ERRORS { HelpId = HID_SQLERROR_EXCHAIN_ERRORS; }; -hidspecial HID_DBACCESS_START { HelpId = HID_DBACCESS_START; }; hidspecial HID_SQLERROR_EXCHAIN_TEXT { HelpId = HID_SQLERROR_EXCHAIN_TEXT; }; hidspecial HID_TAB_WIZ_COLUMN_SELECT { HelpId = HID_TAB_WIZ_COLUMN_SELECT; }; hidspecial HID_TAB_WIZ_TYPE_SELECT { HelpId = HID_TAB_WIZ_TYPE_SELECT; }; @@ -254,11 +252,13 @@ hidspecial HID_DLG_REL_CASC_UPD_DEFAULT { HelpId = HID_DLG_REL_C hidspecial HID_BROWSER_SAVE_RECORD { HelpId = HID_BROWSER_SAVE_RECORD ; }; hidspecial HID_BROWSER_UNDO_RECORD { HelpId = HID_BROWSER_UNDO_RECORD ; }; +/* // missing pre processor for helpids so we have to include them here hidspecial SID_RELATION_ADD_RELATION { HelpId = SID_RELATION_ADD_RELATION ; }; hidspecial SID_FM_NATIVESQL { HelpId = SID_FM_NATIVESQL ; }; hidspecial SID_FM_ADDTABLE { HelpId = SID_FM_ADDTABLE ; }; hidspecial SID_FM_EXECUTE { HelpId = SID_FM_EXECUTE ; }; +*/ hidspecial HID_DSADMIN_SQL92CHECK { HelpId = HID_DSADMIN_SQL92CHECK ; }; hidspecial HID_DSADMIN_AUTOINCREMENTVALUE { HelpId = HID_DSADMIN_AUTOINCREMENTVALUE ; }; @@ -349,13 +349,13 @@ hidspecial HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE { HelpId = HID_P hidspecial HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION { HelpId = HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION ; }; hidspecial HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION { HelpId = HID_PAGE_DBWIZARD_DBASE_PB_DBASELOCATION ; }; +/* hidspecial SID_INDEXDESIGN { HelpId = SID_INDEXDESIGN; }; hidspecial SID_DOCUMENT_DATA_SOURCE { HelpId = SID_DOCUMENT_DATA_SOURCE; }; hidspecial SID_DB_NEW { HelpId = SID_DB_NEW; }; hidspecial SID_DB_APP_DISABLE_PREVIEW { HelpId = SID_DB_APP_DISABLE_PREVIEW; }; hidspecial SID_DB_APP_DSCONNECTION_TYPE { HelpId = SID_DB_APP_DSCONNECTION_TYPE; }; hidspecial SID_DB_APP_DSADVANCED_SETTINGS { HelpId = SID_DB_APP_DSADVANCED_SETTINGS; }; - hidspecial SID_DB_APP_VIEW_DOCINFO_PREVIEW { HelpId = SID_DB_APP_VIEW_DOCINFO_PREVIEW; }; hidspecial SID_DB_APP_VIEW_DOC_PREVIEW { HelpId = SID_DB_APP_VIEW_DOC_PREVIEW; }; hidspecial SID_DB_APP_VIEW_TABLES { HelpId = SID_DB_APP_VIEW_TABLES; }; @@ -368,38 +368,31 @@ hidspecial SID_DB_APP_TABLEFILTER { HelpId = SID_DB_APP_TABLEFILTER; }; hidspecial SID_DB_APP_CLOSECONNECTION { HelpId = SID_DB_APP_CLOSECONNECTION; }; hidspecial SID_DB_APP_DSPROPS { HelpId = SID_DB_APP_DSPROPS; }; hidspecial SID_DB_APP_DBADMIN { HelpId = SID_DB_APP_DBADMIN; }; - hidspecial SID_DB_APP_CONVERTTOVIEW { HelpId = SID_DB_APP_CONVERTTOVIEW; }; hidspecial SID_DB_APP_REFRESH_TABLES { HelpId = SID_DB_APP_REFRESH_TABLES; }; hidspecial SID_DB_APP_VIEW_REPORTS { HelpId = SID_DB_APP_VIEW_REPORTS; }; hidspecial SID_DB_APP_DSEXPORT { HelpId = SID_DB_APP_DSEXPORT; }; - hidspecial SID_DB_APP_TABLE_DELETE { HelpId = SID_DB_APP_TABLE_DELETE; }; hidspecial SID_DB_APP_TABLE_RENAME { HelpId = SID_DB_APP_TABLE_RENAME; }; hidspecial SID_DB_APP_TABLE_EDIT { HelpId = SID_DB_APP_TABLE_EDIT; }; hidspecial SID_DB_APP_TABLE_OPEN { HelpId = SID_DB_APP_TABLE_OPEN; }; - hidspecial SID_DB_APP_QUERY_DELETE { HelpId = SID_DB_APP_QUERY_DELETE; }; hidspecial SID_DB_APP_QUERY_RENAME { HelpId = SID_DB_APP_QUERY_RENAME; }; hidspecial SID_DB_APP_QUERY_EDIT { HelpId = SID_DB_APP_QUERY_EDIT; }; hidspecial SID_DB_APP_QUERY_OPEN { HelpId = SID_DB_APP_QUERY_OPEN; }; - hidspecial SID_DB_APP_FORM_DELETE { HelpId = SID_DB_APP_FORM_DELETE; }; hidspecial SID_DB_APP_FORM_RENAME { HelpId = SID_DB_APP_FORM_RENAME; }; hidspecial SID_DB_APP_FORM_EDIT { HelpId = SID_DB_APP_FORM_EDIT; }; hidspecial SID_DB_APP_FORM_OPEN { HelpId = SID_DB_APP_FORM_OPEN; }; - hidspecial SID_DB_APP_REPORT_DELETE { HelpId = SID_DB_APP_REPORT_DELETE; }; hidspecial SID_DB_APP_REPORT_RENAME { HelpId = SID_DB_APP_REPORT_RENAME; }; hidspecial SID_DB_APP_REPORT_EDIT { HelpId = SID_DB_APP_REPORT_EDIT; }; hidspecial SID_DB_APP_REPORT_OPEN { HelpId = SID_DB_APP_REPORT_OPEN; }; - hidspecial SID_DB_APP_DELETE { HelpId = SID_DB_APP_DELETE; }; hidspecial SID_DB_APP_RENAME { HelpId = SID_DB_APP_RENAME; }; hidspecial SID_DB_APP_EDIT { HelpId = SID_DB_APP_EDIT; }; hidspecial SID_DB_APP_EDIT_SQL_VIEW { HelpId = SID_DB_APP_EDIT_SQL_VIEW; }; hidspecial SID_DB_APP_OPEN { HelpId = SID_DB_APP_OPEN; }; - hidspecial SID_BROWSER_CLEAR_QUERY { HelpId = SID_BROWSER_CLEAR_QUERY; }; hidspecial SID_RELATION_ADD_RELATION { HelpId = SID_RELATION_ADD_RELATION; }; hidspecial SID_QUERY_VIEW_FUNCTIONS { HelpId = SID_QUERY_VIEW_FUNCTIONS; }; @@ -409,58 +402,47 @@ hidspecial SID_QUERY_DISTINCT_VALUES { HelpId = SID_QUERY_DISTINCT_VALUES; }; hidspecial SID_FORM_CREATE_REPWIZ_PRE_SEL { HelpId = SID_FORM_CREATE_REPWIZ_PRE_SEL; }; hidspecial SID_REPORT_CREATE_REPWIZ_PRE_SEL { HelpId = SID_REPORT_CREATE_REPWIZ_PRE_SEL; }; hidspecial SID_APP_NEW_REPORT_PRE_SEL { HelpId = SID_APP_NEW_REPORT_PRE_SEL; }; - hidspecial SID_APP_NEW_FOLDER { HelpId = SID_APP_NEW_FOLDER; }; hidspecial SID_APP_NEW_FORM { HelpId = SID_APP_NEW_FORM; }; hidspecial SID_DB_APP_PASTE_SPECIAL { HelpId = SID_DB_APP_PASTE_SPECIAL; }; hidspecial SID_DB_QUERY_PREVIEW { HelpId = SID_DB_QUERY_PREVIEW; }; - hidspecial SID_DB_APP_STATUS_TYPE { HelpId = SID_DB_APP_STATUS_TYPE; }; hidspecial SID_DB_APP_STATUS_DBNAME { HelpId = SID_DB_APP_STATUS_DBNAME; }; hidspecial SID_DB_APP_STATUS_USERNAME { HelpId = SID_DB_APP_STATUS_USERNAME; }; hidspecial SID_DB_APP_STATUS_HOSTNAME { HelpId = SID_DB_APP_STATUS_HOSTNAME; }; - hidspecial SID_DB_APP_SENDREPORTASMAIL { HelpId = SID_DB_APP_SENDREPORTASMAIL; }; hidspecial SID_DB_APP_SENDREPORTTOWRITER { HelpId = SID_DB_APP_SENDREPORTTOWRITER; }; hidspecial SID_DB_NEW_VIEW_SQL { HelpId = SID_DB_NEW_VIEW_SQL; }; +*/ hidspecial HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE { HelpId = HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE { HelpId = HID_PAGE_DBWIZARD_TEXT_PB_LOCATIONTEXTFILE ; }; - hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES { HelpId = HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION { HelpId = HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION ; }; - hidspecial HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_FIELDSEPARATOR ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_TEXTSEPARATOR ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_DECIMALSEPARATOR ; }; hidspecial HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR { HelpId = HID_PAGE_DBWIZARD_TEXT_CB_THOUSANDSSEPARATOR ; }; - hidspecial HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION { HelpId = HID_PAGE_DBWIZARD_MSACCESS_ET_MSACCESSLOCATION ; }; hidspecial HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION { HelpId = HID_PAGE_DBWIZARD_MSACCESS_PB_MSACCESSLOCATION ; }; - hidspecial HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER ; }; hidspecial HID_PAGE_DBWIZARD_LDAP_ET_BASEDN { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_BASEDN ; }; hidspecial HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER { HelpId = HID_PAGE_DBWIZARD_LDAP_ET_PORTNUMBER ; }; hidspecial HID_PAGE_DBWIZARD_LDAP_CB_USESSL { HelpId = HID_PAGE_DBWIZARD_LDAP_CB_USESSL ; }; hidspecial HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION { HelpId = HID_PAGE_DBWIZARD_LDAP_PB_TESTLDAPCONNECTION ; }; - hidspecial HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME { HelpId = HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME ; }; hidspecial HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME { HelpId = HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME ; }; - hidspecial HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC { HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC ; }; hidspecial HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC { HelpId = HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC ; }; - hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEDBNAME ; }; hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEHOSTSERVER ; }; hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLEPORT ; }; hidspecial HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS { HelpId = HID_PAGE_DBWIZARD_ORACLE_ET_ORACLECLASS ; }; hidspecial HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS { HelpId = HID_PAGE_DBWIZARD_ORACLE_PB_TESTORACLECLASS ; }; - hidspecial HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_JDBCURL ; }; hidspecial HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL { HelpId = HID_PAGE_DBWIZARD_JDBC_PB_JDBCURL ; }; - hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME ; }; hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER ; }; hidspecial HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT { HelpId = HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT ; }; @@ -486,7 +468,11 @@ hidspecial HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD { He hidspecial HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS { HelpId = HID_PAGE_DBWIZARD_FINAL_CB_OPENAFTERWARDS ; }; hidspecial HID_DSADMIN_USESSL_LDAP { HelpId = HID_DSADMIN_USESSL_LDAP ; }; hidspecial HID_DSADMIN_DOSLINEENDS { HelpId = HID_DSADMIN_DOSLINEENDS ; }; + +/* hidspecial SID_DB_QUERY_PREVIEW { HelpId = SID_DB_QUERY_PREVIEW ; }; +*/ + hidspecial HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE { HelpId = HID_PAGE_DBWIZARD_USERDEFINED_ET_BROWSE ; }; hidspecial HID_PAGE_DBWIZARD_USERDEFINED_BROWSE { HelpId = HID_PAGE_DBWIZARD_USERDEFINED_BROWSE ; }; hidspecial HID_DLG_DATABASE_WIZARD { HelpId = HID_DLG_DATABASE_WIZARD ; }; diff --git a/reportdesign/inc/helpids.hrc b/reportdesign/inc/helpids.hrc index 9904d5428ae8..7b543169e032 100644 --- a/reportdesign/inc/helpids.hrc +++ b/reportdesign/inc/helpids.hrc @@ -27,10 +27,6 @@ #ifndef RTPUI_REPORTDESIGN_HELPID_HRC #define RTPUI_REPORTDESIGN_HELPID_HRC -#ifndef _SOLAR_HRC -#include // HID_RPT_DBACCESS_START -#endif - #define UID_RPT_PROP_FORMULA "REPORTDESIGN_UID_RPT_PROP_FORMULA" #define UID_RPT_RPT_PROP_DLG_FONT_TYPE "REPORTDESIGN_UID_RPT_RPT_PROP_DLG_FONT_TYPE" #define UID_RPT_RPT_PROP_DLG_AREA "REPORTDESIGN_UID_RPT_RPT_PROP_DLG_AREA" diff --git a/reportdesign/util/hidother.src b/reportdesign/util/hidother.src index f7e08f34442e..3c52ed77c852 100644 --- a/reportdesign/util/hidother.src +++ b/reportdesign/util/hidother.src @@ -26,11 +26,6 @@ ************************************************************************/ #include "../inc/helpids.hrc" -#include "../inc/rptui_slotid.hrc" - -#ifndef _SBASLTID_HRC -#include -#endif hidspecial UID_RPT_RPT_APP_VIEW { HelpId = UID_RPT_RPT_APP_VIEW ; }; hidspecial UID_RPT_SCROLLWINDOW { HelpId = UID_RPT_SCROLLWINDOW ; }; @@ -45,6 +40,7 @@ hidspecial HID_RPT_HORZ_SCROLLBAR { HelpId = HID_R hidspecial HID_RPT_VERT_SCROLLBAR { HelpId = HID_RPT_VERT_SCROLLBAR ; }; hidspecial HID_RPT_STARTMARKER { HelpId = HID_RPT_STARTMARKER ; }; +/* hidspecial SID_RPT_SHOWREPORTEXPLORER { HelpId = SID_RPT_SHOWREPORTEXPLORER ; }; hidspecial SID_PAGEHEADERFOOTER { HelpId = SID_PAGEHEADERFOOTER ; }; hidspecial SID_REPORTHEADERFOOTER { HelpId = SID_REPORTHEADERFOOTER ; }; @@ -54,6 +50,9 @@ hidspecial SID_CONDITIONALFORMATTING { HelpId = SID_CONDI hidspecial SID_PAGEDIALOG { HelpId = SID_PAGEDIALOG ; }; hidspecial SID_SETCONTROLDEFAULTS { HelpId = SID_SETCONTROLDEFAULTS ; }; hidspecial SID_INSERTBREAK { HelpId = SID_INSERTBREAK ; }; +hidspecial SID_ESCAPE { HelpId = SID_ESCAPE ; }; +*/ + hidspecial HID_RPT_FIELDEXPRESSION { HelpId = HID_RPT_FIELDEXPRESSION ; }; hidspecial HID_RPT_SORTORDER { HelpId = HID_RPT_SORTORDER ; }; hidspecial HID_RPT_GROUPSBRW { HelpId = HID_RPT_GROUPSBRW ; }; @@ -65,7 +64,6 @@ hidspecial HID_RPT_CRTL_FORMAT_PREVIEW { HelpId = HID_R hidspecial HID_RPT_COND_DLG { HelpId = HID_RPT_COND_DLG ; }; hidspecial HID_RPT_POPUP_COLOR_CTRL { HelpId = HID_RPT_POPUP_COLOR_CTRL ; }; hidspecial HID_RPT_POPUP_COLOR { HelpId = HID_RPT_POPUP_COLOR ; }; -hidspecial SID_ESCAPE { HelpId = SID_ESCAPE ; }; hidspecial HID_RPT_PROPDLG_TAB_GENERAL { HelpId = HID_RPT_PROPDLG_TAB_GENERAL ; }; hidspecial HID_RPT_PROPDLG_TAB_DATA { HelpId = HID_RPT_PROPDLG_TAB_DATA ; }; @@ -93,15 +91,18 @@ hidspecial HID_RPT_PROP_RPT_WIDTH { HelpId = HID_RPT_PROP_RPT_WIDTH; }; hidspecial HID_RPT_PROP_RPT_HEIGHT { HelpId = HID_RPT_PROP_RPT_HEIGHT; }; hidspecial HID_RPT_START_TITLE { HelpId = HID_RPT_START_TITLE; }; hidspecial HID_RPT_START_IMAGE { HelpId = HID_RPT_START_IMAGE; }; -hidspecial SID_EXECUTE_REPORT { HelpId = SID_EXECUTE_REPORT; }; +/* +hidspecial SID_EXECUTE_REPORT { HelpId = SID_EXECUTE_REPORT; }; hidspecial SID_RPT_TEXTDOCUMENT { HelpId = SID_RPT_TEXTDOCUMENT; }; hidspecial SID_RPT_SPREADSHEET { HelpId = SID_RPT_SPREADSHEET; }; +hidspecial SID_RPT_NEW_FUNCTION { HelpId = SID_RPT_NEW_FUNCTION; }; +*/ + hidspecial HID_RPT_PROP_DEEPTRAVERSING { HelpId = HID_RPT_PROP_DEEPTRAVERSING; }; hidspecial HID_RPT_PROP_PREEVALUATED { HelpId = HID_RPT_PROP_PREEVALUATED; }; hidspecial HID_RPT_NAVIGATOR_DLG { HelpId = HID_RPT_NAVIGATOR_DLG; }; hidspecial HID_REPORT_NAVIGATOR_TREE { HelpId = HID_REPORT_NAVIGATOR_TREE; }; -hidspecial SID_RPT_NEW_FUNCTION { HelpId = SID_RPT_NEW_FUNCTION; }; hidspecial HID_RPT_PROP_FORMULA { HelpId = HID_RPT_PROP_FORMULA; }; hidspecial HID_RPT_PROP_INITIALFORMULA { HelpId = HID_RPT_PROP_INITIALFORMULA; };x hidspecial HID_RPT_PROP_DATAFIELD { HelpId = HID_RPT_PROP_DATAFIELD; }; @@ -110,14 +111,17 @@ hidspecial UID_RPT_RPT_PROP_DLG_FONT_TYPE { HelpId = UID_RPT_RPT_PROP_DLG_FONT_T hidspecial HID_RPT_PROP_BACKCOLOR { HelpId = HID_RPT_PROP_BACKCOLOR; }; hidspecial HID_RPT_PROP_PRESERVEIRI { HelpId = HID_RPT_PROP_PRESERVEIRI; }; +/* hidspecial SID_OBJECT_SMALLESTWIDTH { HelpId = SID_OBJECT_SMALLESTWIDTH; }; hidspecial SID_OBJECT_SMALLESTHEIGHT { HelpId = SID_OBJECT_SMALLESTHEIGHT; }; hidspecial SID_OBJECT_GREATESTWIDTH { HelpId = SID_OBJECT_GREATESTWIDTH; }; hidspecial SID_OBJECT_GREATESTHEIGHT { HelpId = SID_OBJECT_GREATESTHEIGHT; }; +*/ hidspecial HID_RPT_PROP_BACKTRANSPARENT { HelpId = HID_RPT_PROP_BACKTRANSPARENT; }; hidspecial HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT { HelpId = HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT; }; +/* hidspecial SID_ARRANGEMENU { HelpId = SID_ARRANGEMENU; }; hidspecial SID_SELECTALL_IN_SECTION { HelpId = SID_SELECTALL_IN_SECTION; }; hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; }; @@ -129,10 +133,10 @@ hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; }; hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; }; hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; }; hidspecial SID_PREV_MARK { HelpId = SID_PREV_MARK; }; - hidspecial SID_SECTION_SHRINK { HelpId = SID_SECTION_SHRINK; }; hidspecial SID_SECTION_SHRINK_TOP { HelpId = SID_SECTION_SHRINK_TOP; }; hidspecial SID_SECTION_SHRINK_BOTTOM { HelpId = SID_SECTION_SHRINK_BOTTOM; }; +*/ hidspecial UID_RPT_PROP_CHARTTYPE_DLG { HelpId = UID_RPT_PROP_CHARTTYPE_DLG; }; hidspecial HID_RPT_PROP_CHARTTYPE { HelpId = HID_RPT_PROP_CHARTTYPE; }; -- cgit From c4ac5d0800bdc069901474a0dc9eb8d5f36c093e Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- solenv/bin/mhids.pl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl index f0abf2e5cdca..e26a68c22b79 100644 --- a/solenv/bin/mhids.pl +++ b/solenv/bin/mhids.pl @@ -266,7 +266,6 @@ if ( !open HID,">$srs/$filebase.hid.$ENV{INPATH}" ) { while () { @fields = split /\s+/; - if ( $fields[1] eq "HelpID" ) { print HID "$fields[0] $fields[2]\n"; @@ -373,10 +372,10 @@ while () $nHID -= 2000000000; $x=2; } - if( $x != 0) - { printf HID "%s %d%u \n",$helpIDString,$x, $nHID; } + if ( $LID != 0) + { printf HID "%s %s:%s:%s:%s \n", $helpIDString, $arr[0], $arr[1], $GID, $LID; } else - { printf HID "%s %u \n",$helpIDString, $nHID; } + { printf HID "%s %s:%s:%s \n", $helpIDString, $arr[0], $arr[1], $GID } } } -- cgit From 9452551161461ed78bd2b89edbeae89451b03abe Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- filter/source/xsltdialog/xmlfilterhelpids.hrc | 4 ---- 1 file changed, 4 deletions(-) diff --git a/filter/source/xsltdialog/xmlfilterhelpids.hrc b/filter/source/xsltdialog/xmlfilterhelpids.hrc index 9029c58513d6..cced0609f5f4 100644 --- a/filter/source/xsltdialog/xmlfilterhelpids.hrc +++ b/filter/source/xsltdialog/xmlfilterhelpids.hrc @@ -27,10 +27,6 @@ #ifndef _XMLFILTERHELPIDS_HRC_ #define _XMLFILTERHELPIDS_HRC_ -#ifndef _FILTER_HRC -#include "filter.hrc" -#endif - #define HID_XML_SOURCE_FILE_DIALOG "FILTER_HID_XML_SOURCE_FILE_DIALOG" #define HID_XML_SOURCE_FILE_VALIDATE "FILTER_HID_XML_SOURCE_FILE_VALIDATE" #define HID_XML_FILTER_SETTINGS_DIALOG "FILTER_HID_XML_FILTER_SETTINGS_DIALOG" -- cgit From 6a93822823705fe15f18bdbae75210f74955bd90 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:13:56 +0200 Subject: CWS changehid: #i111784#: use mhids.pl to generate conversion list for HIDs --- reportbuilder/util/hidother.src | 146 ---------------------------------------- 1 file changed, 146 deletions(-) delete mode 100644 reportbuilder/util/hidother.src diff --git a/reportbuilder/util/hidother.src b/reportbuilder/util/hidother.src deleted file mode 100644 index a06b9d89a4ec..000000000000 --- a/reportbuilder/util/hidother.src +++ /dev/null @@ -1,146 +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 - * - * for a copy of the LGPLv3 License. - * -************************************************************************/ - -#include "../inc/helpids.hrc" -#include "../inc/rptui_slotid.hrc" - -#ifndef _SBASLTID_HRC -#include -#endif - -hidspecial UID_RPT_RPT_APP_VIEW { HelpId = UID_RPT_RPT_APP_VIEW ; }; -hidspecial UID_RPT_SCROLLWINDOW { HelpId = UID_RPT_SCROLLWINDOW ; }; -hidspecial UID_RPT_REPORTWINDOW { HelpId = UID_RPT_REPORTWINDOW ; }; -hidspecial HID_RPT_HORZ_RULER { HelpId = HID_RPT_HORZ_RULER ; }; -hidspecial UID_RPT_SECTIONSWINDOW { HelpId = UID_RPT_SECTIONSWINDOW ; }; -hidspecial UID_RPT_VIEWSWINDOW { HelpId = UID_RPT_VIEWSWINDOW ; }; -hidspecial HID_RPT_ENDMARKER { HelpId = HID_RPT_ENDMARKER ; }; -hidspecial HID_RPT_SPLITTER { HelpId = HID_RPT_SPLITTER ; }; -hidspecial HID_REPORTSECTION { HelpId = HID_REPORTSECTION ; }; -hidspecial HID_RPT_HORZ_SCROLLBAR { HelpId = HID_RPT_HORZ_SCROLLBAR ; }; -hidspecial HID_RPT_VERT_SCROLLBAR { HelpId = HID_RPT_VERT_SCROLLBAR ; }; -hidspecial HID_RPT_STARTMARKER { HelpId = HID_RPT_STARTMARKER ; }; - -hidspecial SID_RPT_SHOWREPORTEXPLORER { HelpId = SID_RPT_SHOWREPORTEXPLORER ; }; -hidspecial SID_PAGEHEADERFOOTER { HelpId = SID_PAGEHEADERFOOTER ; }; -hidspecial SID_REPORTHEADERFOOTER { HelpId = SID_REPORTHEADERFOOTER ; }; -hidspecial SID_SORTINGANDGROUPING { HelpId = SID_SORTINGANDGROUPING ; }; -hidspecial SID_INSERT_FLD_PGNUMBER { HelpId = SID_INSERT_FLD_PGNUMBER ; }; -hidspecial SID_CONDITIONALFORMATTING { HelpId = SID_CONDITIONALFORMATTING ; }; -hidspecial SID_PAGEDIALOG { HelpId = SID_PAGEDIALOG ; }; -hidspecial SID_SETCONTROLDEFAULTS { HelpId = SID_SETCONTROLDEFAULTS ; }; -hidspecial SID_INSERTBREAK { HelpId = SID_INSERTBREAK ; }; -hidspecial HID_RPT_FIELDEXPRESSION { HelpId = HID_RPT_FIELDEXPRESSION ; }; -hidspecial HID_RPT_SORTORDER { HelpId = HID_RPT_SORTORDER ; }; -hidspecial HID_RPT_GROUPSBRW { HelpId = HID_RPT_GROUPSBRW ; }; -hidspecial HID_RPT_GROUPSSORTING_DLG { HelpId = HID_RPT_GROUPSSORTING_DLG ; }; -hidspecial HID_RPT_PAGENUMBERS_DLG { HelpId = HID_RPT_PAGENUMBERS_DLG ; }; -hidspecial HID_RPT_DATETIME_DLG { HelpId = HID_RPT_DATETIME_DLG ; }; -hidspecial HID_RPT_CONDFORMAT_DLG { HelpId = HID_RPT_CONDFORMAT_DLG ; }; -hidspecial HID_RPT_CRTL_FORMAT_PREVIEW { HelpId = HID_RPT_CRTL_FORMAT_PREVIEW ; }; -hidspecial HID_RPT_COND_DLG { HelpId = HID_RPT_COND_DLG ; }; -hidspecial HID_RPT_POPUP_COLOR_CTRL { HelpId = HID_RPT_POPUP_COLOR_CTRL ; }; -hidspecial HID_RPT_POPUP_COLOR { HelpId = HID_RPT_POPUP_COLOR ; }; -hidspecial SID_ESCAPE { HelpId = SID_ESCAPE ; }; -hidspecial HID_RPT_PROPDLG_TAB_GENERAL { HelpId = HID_RPT_PROPDLG_TAB_GENERAL ; }; -hidspecial HID_RPT_PROPDLG_TAB_DATA { HelpId = HID_RPT_PROPDLG_TAB_DATA ; }; - -hidspecial HID_RPT_PROP_FORCENEWPAGE { HelpId = HID_RPT_PROP_FORCENEWPAGE; }; -hidspecial HID_RPT_PROP_NEWROWORCOL { HelpId = HID_RPT_PROP_NEWROWORCOL; }; -hidspecial HID_RPT_PROP_KEEPTOGETHER { HelpId = HID_RPT_PROP_KEEPTOGETHER; }; -hidspecial HID_RPT_PROP_CANGROW { HelpId = HID_RPT_PROP_CANGROW; }; -hidspecial HID_RPT_PROP_CANSHRINK { HelpId = HID_RPT_PROP_CANSHRINK; }; -hidspecial HID_RPT_PROP_REPEATSECTION { HelpId = HID_RPT_PROP_REPEATSECTION; }; -hidspecial HID_RPT_PROP_PRINTREPEATEDVALUES { HelpId = HID_RPT_PROP_PRINTREPEATEDVALUES; }; -hidspecial HID_RPT_PROP_CONDITIONALPRINTEXPRESSION { HelpId = HID_RPT_PROP_CONDITIONALPRINTEXPRESSION; }; -hidspecial HID_RPT_PROP_STARTNEWCOLUMN { HelpId = HID_RPT_PROP_STARTNEWCOLUMN; }; -hidspecial HID_RPT_PROP_STARTNEWPAGE { HelpId = HID_RPT_PROP_STARTNEWPAGE; }; -hidspecial HID_RPT_PROP_RESETPAGENUMBER { HelpId = HID_RPT_PROP_RESETPAGENUMBER; }; -hidspecial HID_RPT_PROP_MINHEIGHTNEWPAGE { HelpId = HID_RPT_PROP_MINHEIGHTNEWPAGE; }; -hidspecial HID_RPT_PROP_PRINTWHENGROUPCHANGE { HelpId = HID_RPT_PROP_PRINTWHENGROUPCHANGE; }; -hidspecial HID_RPT_PROP_VISIBLE { HelpId = HID_RPT_PROP_VISIBLE; }; -hidspecial HID_RPT_PROP_GROUPKEEPTOGETHER { HelpId = HID_RPT_PROP_GROUPKEEPTOGETHER; }; -hidspecial HID_RPT_PROP_PAGEHEADEROPTION { HelpId = HID_RPT_PROP_PAGEHEADEROPTION; }; -hidspecial HID_RPT_PROP_PAGEFOOTEROPTION { HelpId = HID_RPT_PROP_PAGEFOOTEROPTION; }; -hidspecial UID_RPT_PROP_DLG_LINE_STYLE { HelpId = UID_RPT_PROP_DLG_LINE_STYLE; }; -hidspecial HID_RPT_PROP_RPT_POSITIONX { HelpId = HID_RPT_PROP_RPT_POSITIONX; }; -hidspecial HID_RPT_PROP_RPT_POSITIONY { HelpId = HID_RPT_PROP_RPT_POSITIONY; }; -hidspecial HID_RPT_PROP_RPT_WIDTH { HelpId = HID_RPT_PROP_RPT_WIDTH; }; -hidspecial HID_RPT_PROP_RPT_HEIGHT { HelpId = HID_RPT_PROP_RPT_HEIGHT; }; -hidspecial HID_RPT_START_TITLE { HelpId = HID_RPT_START_TITLE; }; -hidspecial HID_RPT_START_IMAGE { HelpId = HID_RPT_START_IMAGE; }; -hidspecial SID_EXECUTE_REPORT { HelpId = SID_EXECUTE_REPORT; }; - -hidspecial SID_RPT_TEXTDOCUMENT { HelpId = SID_RPT_TEXTDOCUMENT; }; -hidspecial SID_RPT_SPREADSHEET { HelpId = SID_RPT_SPREADSHEET; }; -hidspecial HID_RPT_PROP_DEEPTRAVERSING { HelpId = HID_RPT_PROP_DEEPTRAVERSING; }; -hidspecial HID_RPT_PROP_PREEVALUATED { HelpId = HID_RPT_PROP_PREEVALUATED; }; -hidspecial HID_RPT_NAVIGATOR_DLG { HelpId = HID_RPT_NAVIGATOR_DLG; }; -hidspecial HID_REPORT_NAVIGATOR_TREE { HelpId = HID_REPORT_NAVIGATOR_TREE; }; -hidspecial SID_RPT_NEW_FUNCTION { HelpId = SID_RPT_NEW_FUNCTION; }; -hidspecial HID_RPT_PROP_FORMULA { HelpId = HID_RPT_PROP_FORMULA; }; -hidspecial HID_RPT_PROP_INITIALFORMULA { HelpId = HID_RPT_PROP_INITIALFORMULA; };x -hidspecial HID_RPT_PROP_DATAFIELD { HelpId = HID_RPT_PROP_DATAFIELD; }; -hidspecial HID_RPT_PROP_RPT_FONT { HelpId = HID_RPT_PROP_RPT_FONT; }; -hidspecial UID_RPT_RPT_PROP_DLG_FONT_TYPE { HelpId = UID_RPT_RPT_PROP_DLG_FONT_TYPE; }; -hidspecial HID_RPT_PROP_BACKCOLOR { HelpId = HID_RPT_PROP_BACKCOLOR; }; -hidspecial HID_RPT_PROP_PRESERVEIRI { HelpId = HID_RPT_PROP_PRESERVEIRI; }; - -hidspecial SID_OBJECT_SMALLESTWIDTH { HelpId = SID_OBJECT_SMALLESTWIDTH; }; -hidspecial SID_OBJECT_SMALLESTHEIGHT { HelpId = SID_OBJECT_SMALLESTHEIGHT; }; -hidspecial SID_OBJECT_GREATESTWIDTH { HelpId = SID_OBJECT_GREATESTWIDTH; }; -hidspecial SID_OBJECT_GREATESTHEIGHT { HelpId = SID_OBJECT_GREATESTHEIGHT; }; - -hidspecial HID_RPT_PROP_BACKTRANSPARENT { HelpId = HID_RPT_PROP_BACKTRANSPARENT; }; -hidspecial HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT { HelpId = HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT; }; - -hidspecial SID_ARRANGEMENU { HelpId = SID_ARRANGEMENU; }; -hidspecial SID_SELECTALL_IN_SECTION { HelpId = SID_SELECTALL_IN_SECTION; }; -hidspecial SID_SECTION_ALIGN { HelpId = SID_SECTION_ALIGN; }; -hidspecial SID_SECTION_ALIGN_LEFT { HelpId = SID_SECTION_ALIGN_LEFT; }; -hidspecial SID_SECTION_ALIGN_CENTER { HelpId = SID_SECTION_ALIGN_CENTER; }; -hidspecial SID_SECTION_ALIGN_RIGHT { HelpId = SID_SECTION_ALIGN_RIGHT; }; -hidspecial SID_SECTION_ALIGN_UP { HelpId = SID_SECTION_ALIGN_UP; }; -hidspecial SID_SECTION_ALIGN_MIDDLE { HelpId = SID_SECTION_ALIGN_MIDDLE; }; -hidspecial SID_SECTION_ALIGN_DOWN { HelpId = SID_SECTION_ALIGN_DOWN; }; -hidspecial SID_NEXT_MARK { HelpId = SID_NEXT_MARK; }; -hidspecial SID_PREV_MARK { HelpId = SID_PREV_MARK; }; - -hidspecial UID_RPT_PROP_CHARTTYPE_DLG { HelpId = UID_RPT_PROP_CHARTTYPE_DLG; }; -hidspecial HID_RPT_PROP_CHARTTYPE { HelpId = HID_RPT_PROP_CHARTTYPE; }; -hidspecial HID_RPT_FIELD_SEL_WIN { HelpId = HID_RPT_FIELD_SEL_WIN; }; -hidspecial HID_RPT_FIELD_SEL { HelpId = HID_RPT_FIELD_SEL; }; -hidspecial HID_RPT_PROP_FORMULALIST { HelpId = HID_RPT_PROP_FORMULALIST; }; -hidspecial HID_RPT_PROP_SCOPE { HelpId = HID_RPT_PROP_SCOPE; }; -hidspecial HID_RPT_PROP_TYPE { HelpId = HID_RPT_PROP_TYPE; }; -hidspecial UID_RPT_PROP_DLG_LINKFIELDS { HelpId = UID_RPT_PROP_DLG_LINKFIELDS; }; -hidspecial HID_RPT_PROP_MASTERFIELDS { HelpId = HID_RPT_PROP_MASTERFIELDS; }; -hidspecial HID_RPT_PROP_DETAILFIELDS { HelpId = HID_RPT_PROP_DETAILFIELDS; }; -hidspecial HID_RPT_PROP_PREVIEW_COUNT { HelpId = HID_RPT_PROP_PREVIEW_COUNT; }; -hidspecial HID_RPT_PROP_AREA { HelpId = HID_RPT_PROP_AREA; }; -hidspecial UID_RPT_RPT_PROP_DLG_AREA { HelpId = UID_RPT_RPT_PROP_DLG_AREA; }; -hidspecial HID_RPT_PROP_MIMETYPE { HelpId = HID_RPT_PROP_MIMETYPE; }; \ No newline at end of file -- cgit From ab22ac073431af69a5c59cecbff92db6737bd3db Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 17:20:31 +0200 Subject: CWS changehid: #i111784#: fix error in fpicker HelpURL --- fpicker/source/office/OfficeControlAccess.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 1e34b2eee840..7d33030ed2a9 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -224,7 +224,8 @@ namespace svt // the file view "overloaded" the SetHelpId aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( ); - rtl::OUString sHelpURL( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) ); + ::rtl::OUString sHelpURL( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); + sHelpURL += rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ); return sHelpURL; } -- cgit From 61fbf48ab38bb3b3a6cc41de3435f327ccccf830 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 22:04:23 +0200 Subject: CWS changehid: remove code dealing with obsolete SID_INSERT_APPLET --- sfx2/inc/sfx2/sfxsids.hrc | 1 - sfx2/source/appl/appcfg.cxx | 18 --- sfx2/source/appl/appuno.cxx | 1 - sfx2/source/doc/applet.cxx | 383 -------------------------------------------- sfx2/source/doc/makefile.mk | 2 - sfx2/source/inc/applet.hxx | 122 -------------- svx/inc/globlmn_tmpl.hrc | 12 -- svx/sdi/svx.sdi | 27 ---- 8 files changed, 566 deletions(-) delete mode 100644 sfx2/source/doc/applet.cxx delete mode 100644 sfx2/source/inc/applet.hxx diff --git a/sfx2/inc/sfx2/sfxsids.hrc b/sfx2/inc/sfx2/sfxsids.hrc index 26e1991c24b8..9ab4a50b63d8 100644 --- a/sfx2/inc/sfx2/sfxsids.hrc +++ b/sfx2/inc/sfx2/sfxsids.hrc @@ -421,7 +421,6 @@ #define SID_INSERT_PLUGIN (SID_SFX_START + 672) #define SID_INSERT_SOUND (SID_SFX_START + 676) #define SID_INSERT_VIDEO (SID_SFX_START + 677) -#define SID_INSERT_APPLET (SID_SFX_START + 673) #define SID_HYPERLINK_DIALOG (SID_SFX_START + 678) diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 6afa8c68ed83..0b5e94ea24f0 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -58,8 +58,6 @@ #include #include -//#include -//#include #include #include @@ -828,22 +826,6 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) #endif } - // INet Session neu aufsetzen - if ( bResetSession ) - { - // no more sj2 - #if 0 - try - { - SjApplet2::settingsChanged(); - } - catch ( ... ) - { - DBG_ERRORFILE( "SjApplet2::settingsChanged() throws an exception" ); - } - #endif - } - // geaenderte Daten speichern aInetOptions.flush(); } diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 6f9d3b258745..a9c6bd5630ae 100755 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -134,7 +134,6 @@ using namespace ::com::sun::star::io; #include "brokenpackageint.hxx" #include "eventsupplier.hxx" #include "xpackcreator.hxx" -// #include "applet.hxx" #include "plugin.hxx" #include "iframe.hxx" #include diff --git a/sfx2/source/doc/applet.cxx b/sfx2/source/doc/applet.cxx deleted file mode 100644 index 844eb5726b1a..000000000000 --- a/sfx2/source/doc/applet.cxx +++ /dev/null @@ -1,383 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_sfx2.hxx" - -#include "applet.hxx" -#include -#include - -#include "com/sun/star/uno/XComponentContext.hpp" -#include "cppuhelper/factory.hxx" -#include -#include -#include -#include -#include -#include -#include -#include -#include - -using namespace ::com::sun::star; -using namespace ::comphelper; - -namespace sfx2 -{ -class AppletWindow_Impl : public SystemChildWindow -{ -public: - SjApplet2* pApplet; - AppletWindow_Impl( Window* pParent, SjApplet2* pApp ) - : SystemChildWindow( pParent, WB_CLIPCHILDREN ) - , pApplet(pApp) - {} - - virtual void Resize(); -}; - -void AppletWindow_Impl::Resize() -{ - Size aSize( GetOutputSizePixel() ); - if ( pApplet ) - pApplet->setSizePixel( aSize ); -} - -class AppletWrapper_Impl : public SjApplet2 -{ - virtual void appletResize( const Size & ); - virtual void showDocument( const INetURLObject &, const XubString & ); - virtual void showStatus( const XubString & ); -}; - -void AppletWrapper_Impl::appletResize( const Size & ) {} -void AppletWrapper_Impl::showDocument( const INetURLObject &, const XubString & ) {} -void AppletWrapper_Impl::showStatus( const XubString & ) {} - -#define PROPERTY_UNBOUND 0 -#define PROPERTY_MAYBEVOID ::com::sun::star::beans::PropertyAttribute::MAYBEVOID - -#define WID_APPLET_CODE 1 -#define WID_APPLET_CODEBASE 2 -#define WID_APPLET_COMMANDS 3 -#define WID_APPLET_DOCBASE 4 -#define WID_APPLET_ISSCRIPT 5 -#define WID_APPLET_NAME 6 -const SfxItemPropertyMapEntry* lcl_GetAppletPropertyMap_Impl() -{ - static SfxItemPropertyMapEntry aAppletPropertyMap_Impl[] = - { - { MAP_CHAR_LEN("AppletCode") , WID_APPLET_CODE , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("AppletCodeBase"), WID_APPLET_CODEBASE , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("AppletCommands"), WID_APPLET_COMMANDS , CPPU_E2T(CPPUTYPE_PROPERTYVALUE), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("AppletDocBase"), WID_APPLET_DOCBASE , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("AppletIsScript"), WID_APPLET_ISSCRIPT , CPPU_E2T(CPPUTYPE_BOOLEAN), PROPERTY_UNBOUND, 0 }, - { MAP_CHAR_LEN("AppletName") , WID_APPLET_NAME , CPPU_E2T(CPPUTYPE_OUSTRING), PROPERTY_UNBOUND, 0 }, - {0,0,0,0,0,0} - }; -return aAppletPropertyMap_Impl; -} - -::rtl::OUString AppletObject::getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ) -{ - return impl_getStaticImplementationName(); -} - -::sal_Bool AppletObject::supportsService( const ::rtl::OUString& sServiceName ) - throw( ::com::sun::star::uno::RuntimeException ) -{ - ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames = - getSupportedServiceNames(); - const ::rtl::OUString* pArray = seqServiceNames.getConstArray(); - for ( ::sal_Int32 nCounter=0; nCounter -AppletObject::getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ) -{ - return impl_getStaticSupportedServiceNames(); -} - -::com::sun::star::uno::Sequence< ::rtl::OUString > -AppletObject::impl_getStaticSupportedServiceNames() -{ - ::com::sun::star::uno::Sequence< ::rtl::OUString > seqServiceNames( 1 ); - seqServiceNames.getArray() [0] = ::rtl::OUString::createFromAscii( - "com.sun.star.embed.SpecialEmbeddedObject" ); - return seqServiceNames ; -} - -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > -AppletObject::impl_createInstance( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ) - throw( ::com::sun::star::uno::Exception ) -{ - return static_cast< ::cppu::OWeakObject * >( new AppletObject( xContext ) ); -} - -::rtl::OUString AppletObject::impl_getStaticImplementationName() -{ - return ::rtl::OUString::createFromAscii( - "com.sun.star.comp.sfx2.AppletObject" ); -} - -::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > -AppletObject::impl_createFactory() -{ - return uno::Reference< uno::XInterface >( - cppu::createSingleComponentFactory( - impl_createInstance, impl_getStaticImplementationName(), - impl_getStaticSupportedServiceNames() ), - uno::UNO_QUERY_THROW ); -} - -AppletObject::AppletObject( - const uno::Reference < uno::XComponentContext >& rContext ) - : mxContext( rContext ) - , maPropMap( lcl_GetAppletPropertyMap_Impl() ) - , mpApplet( NULL ) - , mbMayScript( FALSE ) -{ -} - -AppletObject::~AppletObject() -{ -} - -void SAL_CALL AppletObject::initialize( const uno::Sequence< uno::Any >& aArguments ) throw ( uno::Exception, uno::RuntimeException ) -{ - if ( aArguments.getLength() ) - aArguments[0] >>= mxObj; -} - -sal_Bool SAL_CALL AppletObject::load( - const uno::Sequence < com::sun::star::beans::PropertyValue >& /*lDescriptor*/, - const uno::Reference < frame::XFrame >& xFrame ) -throw( uno::RuntimeException ) -{ - if ( SvtJavaOptions().IsExecuteApplets() && SvtMiscOptions().IsPluginsEnabled() ) - { - mpApplet = new AppletWrapper_Impl; - - Window* pParent = VCLUnoHelper::GetWindow( xFrame->getContainerWindow() ); - Window* pWin = new AppletWindow_Impl( pParent, mpApplet ); - pWin->SetBackground(); - pWin->Show(); - - // aCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "width" ) ), String( aPosSize.GetWidth() ) ); - // aCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "height" ) ), String( aPosSize.GetHeight() ) ); - - if( maName.getLength() ) - maCmdList.Append( String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "name" ) ), maName ); - - if( maCodeBase.getLength() ) - { - for ( sal_uInt32 nParams=0; nParamsInit( mxContext, pWin, aDocBase, maCmdList ); - uno::Reference < awt::XWindow > xWindow( pWin->GetComponentInterface(), uno::UNO_QUERY ); - - // we must destroy the applet before the parent is destroyed - xWindow->addEventListener( this ); - - xFrame->setComponent( xWindow, uno::Reference < frame::XController >() ); - return TRUE; - } - - return FALSE; -} - -void SAL_CALL AppletObject::cancel() throw( com::sun::star::uno::RuntimeException ) -{ - if ( mpApplet ) - { - mpApplet->appletClose(); // reparenting window - DELETEZ( mpApplet ); - } -} - -void SAL_CALL AppletObject::close( sal_Bool /*bDeliverOwnership*/ ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException ) -{ -} - -void SAL_CALL AppletObject::addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException ) -{ -} - -void SAL_CALL AppletObject::removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& ) throw( com::sun::star::uno::RuntimeException ) -{ -} - -void SAL_CALL AppletObject::disposing( const com::sun::star::lang::EventObject& ) throw (com::sun::star::uno::RuntimeException) -{ - cancel(); -} - -uno::Reference< beans::XPropertySetInfo > SAL_CALL AppletObject::getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException ) -{ - static uno::Reference< beans::XPropertySetInfo > xInfo = new SfxItemPropertySetInfo( &maPropMap ); - return xInfo; -} - -void SAL_CALL AppletObject::setPropertyValue(const ::rtl::OUString& aPropertyName, const uno::Any& aAny) - throw ( beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) -{ - - const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); - if( !pEntry ) - throw beans::UnknownPropertyException(); - switch( pEntry->nWID ) - { - case WID_APPLET_CODE : - aAny >>= maClass; - break; - case WID_APPLET_CODEBASE : - //pImpl->aCodeBase = rURL.GetMainURL( INetURLObject::NO_DECODE ); - //if( rURL.GetProtocol() == INET_PROT_FILE - // && pImpl->aCodeBase.GetChar( 9 ) == INET_ENC_DELIM_TOKEN ) - // // Laufwerksbuchstabe auf ':' patchen - // pImpl->aCodeBase.SetChar( 9, INET_DELIM_TOKEN ); - - aAny >>= maCodeBase; - break; - case WID_APPLET_COMMANDS : - { - maCmdList.Clear(); - uno::Sequence < beans::PropertyValue > aCommandSequence; - if( aAny >>= aCommandSequence ) - maCmdList.FillFromSequence( aCommandSequence ); - } - break; - case WID_APPLET_DOCBASE : - aAny >>= maDocBase; - break; - case WID_APPLET_ISSCRIPT : - aAny >>= mbMayScript; - break; - case WID_APPLET_NAME : - aAny >>= maName; - break; - default:; - - } -} - -uno::Any SAL_CALL AppletObject::getPropertyValue(const ::rtl::OUString& aPropertyName) throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) -{ - uno::Any aAny; - const SfxItemPropertySimpleEntry* pEntry = maPropMap.getByName( aPropertyName ); - if( !pEntry ) - throw beans::UnknownPropertyException(); - switch( pEntry->nWID ) - { - case WID_APPLET_CODE : - aAny <<= maClass; - break; - case WID_APPLET_CODEBASE : - aAny <<= maCodeBase; - break; - case WID_APPLET_COMMANDS : - { - uno::Sequence< beans::PropertyValue > aCommandSequence; - maCmdList.FillSequence( aCommandSequence ); - aAny <<= aCommandSequence; - } - break; - case WID_APPLET_DOCBASE : - break; - case WID_APPLET_ISSCRIPT : - aAny <<= mbMayScript; - break; - case WID_APPLET_NAME : - aAny <<= maName; - break; - default:; - - } - return aAny; -} - -void SAL_CALL AppletObject::addPropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) -{ -} - -void SAL_CALL AppletObject::removePropertyChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) -{ -} - -void SAL_CALL AppletObject::addVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) -{ -} - -void SAL_CALL AppletObject::removeVetoableChangeListener(const ::rtl::OUString&, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & ) throw( ::com::sun::star::uno::RuntimeException ) -{ -} - -::sal_Int16 SAL_CALL AppletObject::execute() throw (::com::sun::star::uno::RuntimeException) -{ - SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create(); - uno::Reference < beans::XPropertySet > xSet( this ); - VclAbstractDialog* pDlg = pFact->CreateEditObjectDialog( NULL, SID_INSERT_APPLET, mxObj ); - if ( pDlg ) - pDlg->Execute(); - return 0; -} - -void SAL_CALL AppletObject::setTitle( const ::rtl::OUString& ) throw (::com::sun::star::uno::RuntimeException) -{ -} - -} diff --git a/sfx2/source/doc/makefile.mk b/sfx2/source/doc/makefile.mk index b1bddf82e428..d663d34cf5ba 100644 --- a/sfx2/source/doc/makefile.mk +++ b/sfx2/source/doc/makefile.mk @@ -87,8 +87,6 @@ SLOFILES = \ $(SLO)$/syspath.obj \ $(SLO)$/syspathw32.obj -# $(SLO)$/applet.obj \ - .IF "$(GUI)" == "WNT" #HACK TO DISABLE PCH diff --git a/sfx2/source/inc/applet.hxx b/sfx2/source/inc/applet.hxx deleted file mode 100644 index 5b7d61ebe314..000000000000 --- a/sfx2/source/inc/applet.hxx +++ /dev/null @@ -1,122 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _SFX_APPLET_HXX -#define _SFX_APPLET_HXX - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -namespace com { namespace sun { namespace star { namespace uno { - class XComponentContext; - class XInterface; -} } } } - -class SjApplet2; -namespace sfx2 -{ - -class AppletObject : public ::cppu::WeakImplHelper6 < - com::sun::star::util::XCloseable, - com::sun::star::lang::XEventListener, - com::sun::star::frame::XSynchronousFrameLoader, - com::sun::star::ui::dialogs::XExecutableDialog, - com::sun::star::lang::XInitialization, - com::sun::star::beans::XPropertySet > -{ - com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext > - mxContext; - com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > mxObj; - SfxItemPropertyMap maPropMap; - SvCommandList maCmdList; - ::rtl::OUString maClass; - ::rtl::OUString maName; - ::rtl::OUString maCodeBase; - ::rtl::OUString maDocBase; - SjApplet2* mpApplet; - sal_Bool mbMayScript; - - AppletObject( AppletObject & ); // not defined - void operator =( AppletObject & ); // not defined - - AppletObject( const com::sun::star::uno::Reference < com::sun::star::uno::XComponentContext >& rContext ); - ~AppletObject(); - - virtual sal_Bool SAL_CALL load( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& lDescriptor, - const com::sun::star::uno::Reference < com::sun::star::frame::XFrame >& xFrame ) throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL cancel() throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw( com::sun::star::util::CloseVetoException, com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeCloseListener( const com::sun::star::uno::Reference < com::sun::star::util::XCloseListener >& xListener ) throw( com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL disposing( const com::sun::star::lang::EventObject& aEvent ) throw (com::sun::star::uno::RuntimeException) ; - virtual void SAL_CALL setTitle( const ::rtl::OUString& aTitle ) throw (::com::sun::star::uno::RuntimeException); - virtual ::sal_Int16 SAL_CALL execute( ) throw (::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL addVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL removeVetoableChangeListener(const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener > & aListener) throw( ::com::sun::star::uno::RuntimeException ); - virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException); - - virtual ::rtl::OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::sal_Bool SAL_CALL supportsService( - const ::rtl::OUString& sServiceName ) - throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL - getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); - - static ::com::sun::star::uno::Sequence< ::rtl::OUString > - impl_getStaticSupportedServiceNames(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - SAL_CALL impl_createInstance( - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& xContext ) - throw( ::com::sun::star::uno::Exception ); - -public: - static ::rtl::OUString impl_getStaticImplementationName(); - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > - impl_createFactory(); -}; - -} -#endif diff --git a/svx/inc/globlmn_tmpl.hrc b/svx/inc/globlmn_tmpl.hrc index b71e872ffd92..e86a684d93f2 100644 --- a/svx/inc/globlmn_tmpl.hrc +++ b/svx/inc/globlmn_tmpl.hrc @@ -601,17 +601,6 @@ Text [ en-US ] = "~Video..." ; \ }; -#ifdef SOLAR_JAVA -#define TMP_SID_INSERT_APPLET \ - MenuItem\ - {\ - Identifier = SID_INSERT_APPLET ; \ - Command = ".uno:InsertApplet" ; \ - Text [ en-US ] = "~Applet..." ; \ - }; -#else -#define TMP_SID_INSERT_APPLET -#endif #define ITEM_INSERT_OBJECT_MN \ MenuItem\ {\ @@ -631,7 +620,6 @@ TMP_SID_INSERT_PLUGIN\ TMP_SID_INSERT_SOUND\ TMP_SID_INSERT_VIDEO\ - TMP_SID_INSERT_APPLET\ MenuItem\ {\ Identifier = SID_INSERT_MATH ; \ diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi index 240ca9cbd4e1..87eb3062833b 100644 --- a/svx/sdi/svx.sdi +++ b/svx/sdi/svx.sdi @@ -6204,33 +6204,6 @@ SfxVoidItem PreviousAnnotation SID_PREVIOUS_POSTIT GroupId = GID_VIEW; ] -//-------------------------------------------------------------------------- -SfxVoidItem InsertApplet SID_INSERT_APPLET -(SfxStringItem Class FN_PARAM_1, - SfxStringItem ClassLocation FN_PARAM_2, - SfxStringItem Commands FN_PARAM_3) -[ - /* flags: */ - AutoUpdate = FALSE, - Cachable = Cachable, - FastCall = FALSE, - HasCoreId = FALSE, - HasDialog = TRUE, - ReadOnlyDoc = FALSE, - Toggle = FALSE, - Container = FALSE, - RecordAbsolute = FALSE, - RecordPerSet; - Asynchron; - - /* config: */ - AccelConfig = FALSE, - MenuConfig = FALSE, - StatusBarConfig = FALSE, - ToolBoxConfig = FALSE, - GroupId = GID_INSERT; -] - //-------------------------------------------------------------------------- SfxUInt32Item InsertGalleryPic SID_GALLERY_FORMATS () -- cgit From f60b366882b4281061199daf2df24055f94f1ba0 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 22:04:23 +0200 Subject: CWS changehid: remove code dealing with obsolete SID_INSERT_APPLET --- sw/sdi/_textsh.sdi | 6 ------ sw/source/ui/shells/textsh.cxx | 41 ++--------------------------------------- sw/source/ui/wrtsh/wrtsh1.cxx | 10 ---------- 3 files changed, 2 insertions(+), 55 deletions(-) diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi index e264aec28c28..994077d9552b 100644 --- a/sw/sdi/_textsh.sdi +++ b/sw/sdi/_textsh.sdi @@ -325,12 +325,6 @@ interface BaseText StateMethod = StateInsert ; DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; ] - SID_INSERT_APPLET // status(final|play) - [ - ExecMethod = ExecInsert ; - StateMethod = StateInsert ; - DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR"; - ] FN_INSERT_TABLE // status(final|play) [ ExecMethod = ExecInsert ; diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 0de14dc3dacb..2e39e1ebd6d4 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -282,7 +282,6 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) break; case SID_INSERT_OBJECT: case SID_INSERT_PLUGIN: - case SID_INSERT_APPLET: { SFX_REQUEST_ARG( rReq, pNameItem, SfxGlobalNameItem, SID_INSERT_OBJECT, sal_False ); SvGlobalName *pName = NULL; @@ -298,8 +297,7 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) SFX_REQUEST_ARG( rReq, pCommandsItem, SfxStringItem, FN_PARAM_3, sal_False ); //TODO/LATER: recording currently not working, need code for Commandlist svt::EmbeddedObjectRef xObj; - if((SID_INSERT_APPLET == nSlot || SID_INSERT_PLUGIN) - && (pClassItem || pClassLocationItem || pCommandsItem)) + if( pClassItem || pClassLocationItem || pCommandsItem ) { String sClass; String sClassLocation; @@ -315,36 +313,6 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) aCommandList.AppendCommands( pCommandsItem->GetValue(), &nTemp ); } - if(SID_INSERT_APPLET == nSlot) - { - SwApplet_Impl aApplImpl( rSh.GetAttrPool(), - RES_FRMATR_BEGIN, RES_FRMATR_END-1 ); - String sBaseURL; - SfxMedium* pMedium = GetView().GetDocShell()->GetMedium(); - if(pMedium) - sBaseURL = pMedium->GetURLObject().GetMainURL(INetURLObject::NO_DECODE); - - aApplImpl.CreateApplet(sClass, aEmptyStr, FALSE, sClassLocation, sBaseURL ); - aApplImpl.FinishApplet(); - xObj.Assign( aApplImpl.GetApplet(), embed::Aspects::MSOLE_CONTENT ); - if( aCommandList.Count() ) - { - uno::Reference < beans::XPropertySet > xSet( xObj->getComponent(), uno::UNO_QUERY ); - if ( xSet.is() ) - { - uno::Sequence < beans::PropertyValue > aSeq; - aCommandList.FillSequence( aSeq ); - try - { - xSet->setPropertyValue( ::rtl::OUString::createFromAscii("AppletCommands"), uno::makeAny( aSeq ) ); - } - catch ( uno::Exception& ) - { - } - } - } - } - else { comphelper::EmbeddedObjectContainer aCnt; ::rtl::OUString sName; @@ -851,13 +819,8 @@ void SwTextShell::StateInsert( SfxItemSet &rSet ) case SID_INSERT_FLOATINGFRAME: case SID_INSERT_OBJECT: case SID_INSERT_PLUGIN: - case SID_INSERT_APPLET: { - if( -#ifndef SOLAR_JAVA - nWhich == SID_INSERT_APPLET || -#endif - eCreateMode == SFX_CREATE_MODE_EMBEDDED || bCrsrInHidden ) + if( eCreateMode == SFX_CREATE_MODE_EMBEDDED || bCrsrInHidden ) { rSet.DisableItem( nWhich ); } diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx index efbb5f161cd2..64199404687c 100644 --- a/sw/source/ui/wrtsh/wrtsh1.cxx +++ b/sw/source/ui/wrtsh/wrtsh1.cxx @@ -443,16 +443,6 @@ void SwWrtShell::InsertObject( const svt::EmbeddedObjectRef& xRef, SvGlobalName pReq->AppendItem(SfxStringItem(FN_PARAM_2, pURL->GetMainURL(INetURLObject::NO_DECODE))); pReq->AppendItem(SfxStringItem(FN_PARAM_3 , aDlg.GetCommands())); } */ - case SID_INSERT_APPLET: - /* - if(pReq) - { - SvAppletObjectRef xApplet ( xIPObj ); - if(xApplet.Is()) - pReq->AppendItem(SfxStringItem(FN_PARAM_1 , xApplet->GetCodeBase())); - pReq->AppendItem(SfxStringItem(FN_PARAM_2 , aDlg.GetClass())); - pReq->AppendItem(SfxStringItem(FN_PARAM_3 , aDlg.GetCommands())); - }*/ case SID_INSERT_FLOATINGFRAME: /* if(pReq && xFloatingFrame.Is()) -- cgit From 6ab9b3d3978cd90025986dc5dde3a42e0f602340 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 22:04:23 +0200 Subject: CWS changehid: remove code dealing with obsolete SID_INSERT_APPLET --- sd/sdi/_drvwsh.sdi | 5 ----- sd/source/ui/view/drviews7.cxx | 14 -------------- sd/source/ui/view/drviews8.cxx | 1 - sd/source/ui/view/drviewsc.cxx | 4 ---- 4 files changed, 24 deletions(-) mode change 100644 => 100755 sd/source/ui/view/drviewsc.cxx diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi index 6d0d3ef33ce9..db06520a7513 100755 --- a/sd/sdi/_drvwsh.sdi +++ b/sd/sdi/_drvwsh.sdi @@ -336,11 +336,6 @@ interface DrawView ExecMethod = FuTemporary ; StateMethod = GetMenuState ; ] - SID_INSERT_APPLET // ole : yes, status : ? - [ - ExecMethod = FuTemporary ; - StateMethod = GetMenuState ; - ] SID_INSERT_PLUGIN // ole : yes, status : ? [ ExecMethod = FuTemporary ; diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index e853d3944ce0..2855bacb7069 100755 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -957,11 +957,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_INSERT_PLUGIN ); rSet.DisableItem( SID_INSERT_SOUND ); rSet.DisableItem( SID_INSERT_VIDEO ); - rSet.DisableItem( SID_INSERT_APPLET ); rSet.DisableItem( SID_INSERT_FLOATINGFRAME ); -#ifdef STARIMAGE_AVAILABLE - rSet.DisableItem( SID_INSERT_IMAGE ); -#endif rSet.DisableItem( SID_INSERT_MATH ); rSet.DisableItem( SID_INSERT_DIAGRAM ); rSet.DisableItem( SID_ATTR_TABLE ); @@ -970,7 +966,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_SIZE_ALL ); rSet.DisableItem( SID_SIZE_PAGE_WIDTH ); rSet.DisableItem( SID_SIZE_PAGE ); -// rSet.DisableItem( SID_INSERTPAGE ); rSet.DisableItem( SID_DUPLICATE_PAGE ); rSet.DisableItem( SID_ZOOM_TOOLBOX ); } @@ -1061,12 +1056,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) rSet.DisableItem( SID_INSERT_PLUGIN ); rSet.DisableItem( SID_INSERT_SOUND ); rSet.DisableItem( SID_INSERT_VIDEO ); - rSet.DisableItem( SID_INSERT_APPLET ); rSet.DisableItem( SID_INSERT_FLOATINGFRAME ); -#ifdef STARIMAGE_AVAILABLE - rSet.DisableItem( SID_INSERT_IMAGE ); -#endif rSet.DisableItem( SID_INSERT_MATH ); rSet.DisableItem( SID_INSERT_FRAME ); rSet.DisableItem( SID_INSERTFILE ); @@ -1573,11 +1564,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet ) } #endif -// Fuer Win16 -#ifndef SOLAR_JAVA - rSet.DisableItem( SID_INSERT_APPLET ); -#endif - // Set the state of two entries in the 'Slide' context sub-menu // concerning the visibility of master page background and master page // shapes. diff --git a/sd/source/ui/view/drviews8.cxx b/sd/source/ui/view/drviews8.cxx index 54cd0c792c94..f4d8ca90687b 100755 --- a/sd/source/ui/view/drviews8.cxx +++ b/sd/source/ui/view/drviews8.cxx @@ -196,7 +196,6 @@ void DrawViewShell::FuTemp01(SfxRequest& rReq) case SID_INSERT_PLUGIN: case SID_INSERT_SOUND: case SID_INSERT_VIDEO: - case SID_INSERT_APPLET: case SID_INSERT_FLOATINGFRAME: case SID_INSERT_MATH: case SID_INSERT_DIAGRAM: diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx old mode 100644 new mode 100755 index eefe0680d2d4..ae47111c8200 --- a/sd/source/ui/view/drviewsc.cxx +++ b/sd/source/ui/view/drviewsc.cxx @@ -788,9 +788,6 @@ USHORT DrawViewShell::GetIdBySubId( USHORT nSId ) break; case SID_INSERT_DIAGRAM: -#ifdef STARIMAGE_AVAILABLE - case SID_INSERT_IMAGE: -#endif case SID_ATTR_TABLE: case SID_INSERTFILE: case SID_INSERT_GRAPHIC: @@ -802,7 +799,6 @@ USHORT DrawViewShell::GetIdBySubId( USHORT nSId ) case SID_INSERT_PLUGIN: case SID_INSERT_SOUND: case SID_INSERT_VIDEO: - case SID_INSERT_APPLET: case SID_INSERT_TABLE: { nMappedSId = SID_DRAWTBX_INSERT; -- cgit From 2d2d7121ccac4f35d397aebfc010b88b247644e1 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 22:04:23 +0200 Subject: CWS changehid: remove code dealing with obsolete SID_INSERT_APPLET --- sc/sdi/tabvwsh.sdi | 1 - sc/source/ui/view/tabvwshb.cxx | 9 --------- 2 files changed, 10 deletions(-) diff --git a/sc/sdi/tabvwsh.sdi b/sc/sdi/tabvwsh.sdi index fac67839e656..84c895b8fa3a 100644 --- a/sc/sdi/tabvwsh.sdi +++ b/sc/sdi/tabvwsh.sdi @@ -76,7 +76,6 @@ interface BaseSelection SID_INSERT_PLUGIN [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] SID_INSERT_SOUND [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] SID_INSERT_VIDEO [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] - SID_INSERT_APPLET [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] SID_INSERT_FLOATINGFRAME [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] SID_INSERT_AVMEDIA [ ExecMethod = ExecDrawIns; StateMethod = GetDrawInsState; ] diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx index 8f4a203ea14d..c6d9b004b9ba 100644 --- a/sc/source/ui/view/tabvwshb.cxx +++ b/sc/source/ui/view/tabvwshb.cxx @@ -312,7 +312,6 @@ void ScTabViewShell::ExecDrawIns(SfxRequest& rReq) case SID_INSERT_PLUGIN: case SID_INSERT_SOUND: case SID_INSERT_VIDEO: - case SID_INSERT_APPLET: case SID_INSERT_SMATH: case SID_INSERT_FLOATINGFRAME: FuInsertOLE(this, pWin, pView, pDrModel, rReq); @@ -469,14 +468,6 @@ void ScTabViewShell::GetDrawInsState(SfxItemSet &rSet) rSet.DisableItem( nWhich ); break; - case SID_INSERT_APPLET: - // wenn SOLAR_JAVA nicht definiert ist, immer disablen -#ifdef SOLAR_JAVA - if (bOle || bTabProt) -#endif - rSet.DisableItem( nWhich ); - break; - case SID_INSERT_GRAPHIC: case SID_INSERT_AVMEDIA: case SID_FONTWORK_GALLERY_FLOATER: -- cgit From 5bcae43bb026375f167b26d219b13a3d4715c5d2 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 22:04:23 +0200 Subject: CWS changehid: remove code dealing with obsolete SID_INSERT_APPLET --- testautomation/global/sid/all.sid | 1 - testautomation/global/sid/bars.sid | 2 -- testautomation/global/win/dial_a_c.win | 6 ------ 3 files changed, 9 deletions(-) mode change 100755 => 100644 testautomation/global/sid/bars.sid diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid index 5ee1c157235f..6c0efa150459 100644 --- a/testautomation/global/sid/all.sid +++ b/testautomation/global/sid/all.sid @@ -223,7 +223,6 @@ EinfuegenGrafikAusDatei SID_INSERT_GRAPHIC EinfuegenGrafikDiagramm SID_INSERT_DIAGRAM EinfuegenObjektOLEObjekt SID_INSERT_OBJECT EinfuegenObjektPlugIn SID_INSERT_PLUGIN -EinfuegenObjektApplet SID_INSERT_APPLET EinfuegenObjektKlang SID_INSERT_SOUND EinfuegenObjektVideo SID_INSERT_VIDEO EinfuegenFrame SID_INSERT_FLOATINGFRAME diff --git a/testautomation/global/sid/bars.sid b/testautomation/global/sid/bars.sid old mode 100755 new mode 100644 index 2c26b9cb0845..328c308ffac7 --- a/testautomation/global/sid/bars.sid +++ b/testautomation/global/sid/bars.sid @@ -696,7 +696,6 @@ WL_TB_SD_EINFUEGEN_Diagramm SID_INSERT_DIAGRAM WL_TB_SD_EINFUEGEN_Formel SID_INSERT_MATH WL_TB_SD_EINFUEGEN_Objekt SID_INSERT_OBJECT WL_TB_SD_EINFUEGEN_Plugin SID_INSERT_PLUGIN -WL_TB_SD_EINFUEGEN_Applet SID_INSERT_APPLET WL_TB_SD_EINFUEGEN_Tabelle SID_ATTR_TABLE WL_TB_SD_EINFUEGEN_Datei SID_INSERTFILE WL_TB_SD_EINFUEGEN_Seite SID_INSERTPAGE @@ -715,7 +714,6 @@ WL_TB_SC_OBJEKT_Formel SID_INSERT_SMATH WL_TB_SC_OBJEKT_Frame SID_INSERT_FLOATINGFRAME WL_TB_SC_OBJEKT_Objekt SID_INSERT_OBJECT WL_TB_SC_OBJEKT_Plugin SID_INSERT_PLUGIN -WL_TB_SC_OBJEKT_Applet SID_INSERT_APPLET ' ** ' ** Einfuegen Zellen im Calc diff --git a/testautomation/global/win/dial_a_c.win b/testautomation/global/win/dial_a_c.win index dfb4686ad750..f3c5879154ff 100755 --- a/testautomation/global/win/dial_a_c.win +++ b/testautomation/global/win/dial_a_c.win @@ -53,12 +53,6 @@ Stopp sd:ImageButton:FLT_WIN_ANIMATION:BTN_STOP Abspielen sd:ImageButton:FLT_WIN_ANIMATION:BTN_PLAY LetztesBild sd:ImageButton:FLT_WIN_ANIMATION:BTN_LAST -*AppletEinfuegen SID_INSERT_APPLET -Klasse cui:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE -ClassLocation cui:EDIT:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION -Suchen cui:PUSHBUTTON:MD_INSERT_OBJECT_APPLET:BTN_CLASS -Optionen cui:MULTILINEEDIT:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS - *AsciiFilterOptionen HID_ASCII_FILTER Zeichensatz sw:ListBox:DLG_ASCII_FILTER:LB_CHARSET Schriftart sw:ListBox:DLG_ASCII_FILTER:LB_FONT -- cgit From 6b7cfcf20984092bb9907083bcf089709d005da5 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 22:05:23 +0200 Subject: CWS changehid: #i111784#: SetDialogHelpId changed --- sfx2/inc/sfx2/filedlghelper.hxx | 2 +- sfx2/inc/sfx2/opengrf.hxx | 2 +- sfx2/source/appl/opengrf.cxx | 2 +- sfx2/source/dialog/filedlghelper.cxx | 4 ++-- sfx2/source/dialog/filedlgimpl.hxx | 2 +- svx/inc/pfiledlg.hxx | 2 +- svx/source/dialog/pfiledlg.cxx | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index 392c5d47d3ca..e56aea052d18 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -282,7 +282,7 @@ public: a corresponding element herein. */ void SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); - void SetDialogHelpId( const sal_Int32 _nHelpId ); + void SetDialogHelpId( const rtl::OString& _nHelpId ); void CreateMatcher( const String& rName ); /** sets the context of the dialog and trigger necessary actions e.g. loading config, setting help id diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx index a041f6687c62..1c307111cdd0 100644 --- a/sfx2/inc/sfx2/opengrf.hxx +++ b/sfx2/inc/sfx2/opengrf.hxx @@ -57,7 +57,7 @@ public: /// Set dialog help id at FileDlgHelper void SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId ); /// Set control help ids at FileDlgHelper - void SetDialogHelpId( const INT32 _nHelpId ); + void SetDialogHelpId( const rtl::OString& _rHelpId ); private: // disable copy and assignment SFX2_DLLPRIVATE SvxOpenGraphicDialog (const SvxOpenGraphicDialog&); diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index 23fb100c7895..d83e93157902 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -289,7 +289,7 @@ void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const ch mpImpl->aFileDlg.SetControlHelpIds( _pControlId, _pHelpId ); } -void SvxOpenGraphicDialog::SetDialogHelpId( const INT32 _nHelpId ) +void SvxOpenGraphicDialog::SetDialogHelpId( const rtl::OString& _nHelpId ) { mpImpl->aFileDlg.SetDialogHelpId( _nHelpId ); } diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 870e521f3849..552dc8f11fc9 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1235,7 +1235,7 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con } // ------------------------------------------------------------------------ -void FileDialogHelper_Impl::setDialogHelpId( sal_Int32 _nHelpId ) +void FileDialogHelper_Impl::setDialogHelpId( const rtl::OString& _nHelpId ) { svt::SetDialogHelpId( mxFileDlg, _nHelpId ); } @@ -2498,7 +2498,7 @@ void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const ch } // ------------------------------------------------------------------------ -void FileDialogHelper::SetDialogHelpId( const sal_Int32 _nHelpId ) +void FileDialogHelper::SetDialogHelpId( const rtl::OString& _nHelpId ) { mpImp->setDialogHelpId( _nHelpId ); } diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 5f4782e72bfb..30b516a84ac5 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -143,7 +143,7 @@ namespace sfx2 void correctVirtualDialogType(); void setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); - void setDialogHelpId( sal_Int32 nId ); + void setDialogHelpId( const rtl::OString& ); sal_Bool CheckFilterOptionsCapability( const SfxFilter* _pFilter ); diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/pfiledlg.hxx index 646575ac4e0c..694881920f8d 100644 --- a/svx/inc/pfiledlg.hxx +++ b/svx/inc/pfiledlg.hxx @@ -55,7 +55,7 @@ public: static bool IsAvailable (USHORT nKind); // setting HelpId and/or context of FileDialogHelper - void SetDialogHelpId( const sal_Int32 nHelpId ); + void SetDialogHelpId( const rtl::OString& nHelpId ); void SetContext( sfx2::FileDialogHelper::Context eNewContext ); }; diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index aa6e0b835e2c..f53ba885f2a0 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -274,7 +274,7 @@ bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind) return bFound; } -void SvxPluginFileDlg::SetDialogHelpId( const sal_Int32 _nHelpId ) +void SvxPluginFileDlg::SetDialogHelpId( const rtl::OString& _nHelpId ) { maFileDlg.SetDialogHelpId( _nHelpId ); } -- cgit From a3cfa6f635948c67ccb34ad4040230de2ec38da1 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 19 Jul 2010 22:05:23 +0200 Subject: CWS changehid: #i111784#: SetDialogHelpId changed --- svl/inc/pickerhelper.hxx | 4 ++-- svl/source/filepicker/pickerhelper.cxx | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/svl/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx index 307031b578d1..0c4215a1fb83 100644 --- a/svl/inc/pickerhelper.hxx +++ b/svl/inc/pickerhelper.hxx @@ -56,11 +56,11 @@ namespace svt SVL_DLLPUBLIC void SetDialogHelpId( ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > _mxFileDlg, - sal_Int32 _nHelpId ); + const rtl::OString& _nHelpId ); SVL_DLLPUBLIC void SetDialogHelpId( ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFolderPicker > _mxFileDlg, - sal_Int32 _nHelpId ); + const rtl::OString& _nHelpId ); } diff --git a/svl/source/filepicker/pickerhelper.cxx b/svl/source/filepicker/pickerhelper.cxx index 72096c1bc56a..2d38d395f8f7 100644 --- a/svl/source/filepicker/pickerhelper.cxx +++ b/svl/source/filepicker/pickerhelper.cxx @@ -45,7 +45,7 @@ using rtl::OUString; namespace svt { void SetDialogHelpId( - Reference < css::ui::dialogs::XFilePicker > _mxFileDlg, sal_Int32 _nHelpId ) + Reference < css::ui::dialogs::XFilePicker > _mxFileDlg, const rtl::OString& _nHelpId ) { try { @@ -60,7 +60,7 @@ namespace svt if( xInfo.is() && xInfo->hasPropertyByName( sHelpURLPropertyName ) ) { // yep OUString sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - sId += OUString::valueOf( _nHelpId ); + sId += rtl::OStringToOUString( _nHelpId, RTL_TEXTENCODING_UTF8 ); xDialogProps->setPropertyValue( sHelpURLPropertyName, css::uno::makeAny( sId ) ); } } @@ -71,7 +71,7 @@ namespace svt } void SetDialogHelpId( - Reference< css::ui::dialogs::XFolderPicker > _mxFileDlg, sal_Int32 _nHelpId ) + Reference< css::ui::dialogs::XFolderPicker > _mxFileDlg, const rtl::OString& _nHelpId ) { try { @@ -86,7 +86,7 @@ namespace svt if( xInfo.is() && xInfo->hasPropertyByName( sHelpURLPropertyName ) ) { // yep OUString sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - sId += OUString::valueOf( _nHelpId ); + sId += rtl::OStringToOUString( _nHelpId, RTL_TEXTENCODING_UTF8 ); xDialogProps->setPropertyValue( sHelpURLPropertyName, css::uno::makeAny( sId ) ); } } -- cgit From 37500bb0ef4cd6dfb83802af53f4a45b397768f2 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Jul 2010 14:50:49 +0200 Subject: CWS changehid: #i111784#: consolidate usage of HID schema; remove unused SetDialogHelpId methods --- cui/inc/pch/precompiled_cui.hxx | 1 - cui/source/customize/acccfg.cxx | 1 - cui/source/dialogs/cuigaldlg.cxx | 3 --- cui/source/options/optpath.cxx | 3 --- cui/source/tabpages/numpages.cxx | 1 - extensions/source/bibliography/datman.cxx | 2 +- extensions/source/bibliography/general.cxx | 4 +++- extensions/source/propctrlr/pcrcommon.cxx | 14 +++++++++----- extensions/source/update/check/updatehdl.cxx | 21 +++++++++++---------- xmlsecurity/source/dialogs/macrosecurity.cxx | 1 - 10 files changed, 24 insertions(+), 27 deletions(-) diff --git a/cui/inc/pch/precompiled_cui.hxx b/cui/inc/pch/precompiled_cui.hxx index d6dd418d30d6..de24ee12e98a 100644 --- a/cui/inc/pch/precompiled_cui.hxx +++ b/cui/inc/pch/precompiled_cui.hxx @@ -806,7 +806,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 a75a7cf1f24d..98e3fe21a53b 100644 --- a/cui/source/customize/acccfg.cxx +++ b/cui/source/customize/acccfg.cxx @@ -1504,7 +1504,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" ) ); diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index a205db2a28c9..a773c1a84b31 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -40,7 +40,6 @@ #include #include #include "cuigaldlg.hxx" -#include #include "helpid.hrc" #include #include @@ -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/options/optpath.cxx b/cui/source/options/optpath.cxx index f3d31aa33025..d4997cc6f4f9 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -35,7 +35,6 @@ #include #include #include -#include #include #include #include @@ -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/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx index 9bf88e151770..e12a03eb71c0 100644 --- a/cui/source/tabpages/numpages.cxx +++ b/cui/source/tabpages/numpages.cxx @@ -2269,7 +2269,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/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index 6a9290ee59b9..e338eeff3b2e 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -1436,7 +1436,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const ::rtl::OUS Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo(); if (xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId = ::rtl::OUString::createFromAscii( "HID:" ); + ::rtl::OUString sId = ::rtl::OUString::createFromAscii( INET_HID_SCHEME ); sId += ::rtl::OUString::createFromAscii( HID_BIB_DB_GRIDCTRL ); xPropSet->setPropertyValue( uProp, makeAny( sId ) ); } diff --git a/extensions/source/bibliography/general.cxx b/extensions/source/bibliography/general.cxx index 156c82673213..63c813fe2a99 100644 --- a/extensions/source/bibliography/general.cxx +++ b/extensions/source/bibliography/general.cxx @@ -57,6 +57,7 @@ #include #include #include +#include using namespace ::com::sun::star; using namespace ::com::sun::star::uno; @@ -509,7 +510,8 @@ uno::Reference< awt::XControlModel > BibGeneralPage::AddXControl( rtl::OUString uProp(C2U("HelpURL")); if(xPropInfo->hasPropertyByName(uProp)) { - ::rtl::OUString sId = ::rtl::OUString::createFromAscii( "HID:" ); + ::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 ) ); } diff --git a/extensions/source/propctrlr/pcrcommon.cxx b/extensions/source/propctrlr/pcrcommon.cxx index 3067c67fc76d..d04ece5dc06f 100644 --- a/extensions/source/propctrlr/pcrcommon.cxx +++ b/extensions/source/propctrlr/pcrcommon.cxx @@ -39,6 +39,7 @@ #include /** === end UNO includes === **/ #include +#include //............................................................................ namespace pcr @@ -53,10 +54,11 @@ namespace pcr //------------------------------------------------------------------------ rtl::OString HelpIdUrl::getHelpId( const ::rtl::OUString& _rHelpURL ) { - rtl::OString aHelpId( _rHelpURL, _rHelpURL.getLength(), RTL_TEXTENCODING_UTF8 ); - if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) ) - aHelpId = aHelpId.copy( sizeof( "HID:" ) - 1 ); - return aHelpId; + 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 ); } //------------------------------------------------------------------------ @@ -64,7 +66,9 @@ namespace pcr { ::rtl::OUStringBuffer aBuffer; ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); - aBuffer.appendAscii( "HID:" ); + 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/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx index 97bca3cc4c98..581c6d81c6fa 100644 --- a/extensions/source/update/check/updatehdl.cxx +++ b/extensions/source/update/check/updatehdl.cxx @@ -69,6 +69,7 @@ #include #include "updatehdl.hrc" +#include #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::createFromAscii( 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::createFromAscii( 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) 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::createFromAscii( 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::createFromAscii( 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::createFromAscii( 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::createFromAscii( 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::createFromAscii( 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::createFromAscii( 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::createFromAscii( 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::createFromAscii( 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/xmlsecurity/source/dialogs/macrosecurity.cxx b/xmlsecurity/source/dialogs/macrosecurity.cxx index 0bee4e2011e7..9c554d023018 100644 --- a/xmlsecurity/source/dialogs/macrosecurity.cxx +++ b/xmlsecurity/source/dialogs/macrosecurity.cxx @@ -41,7 +41,6 @@ #include #include #include -#include #include #include #include -- cgit From db369db99b2f897b1a304a4c010dfd1998e2fa40 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Jul 2010 14:50:49 +0200 Subject: CWS changehid: #i111784#: consolidate usage of HID schema; remove unused SetDialogHelpId methods --- editeng/inc/pch/precompiled_editeng.hxx | 1 - fpicker/source/office/OfficeControlAccess.cxx | 22 +++++++++++++--------- sfx2/inc/pch/precompiled_sfx2.hxx | 1 - sfx2/inc/sfx2/filedlghelper.hxx | 1 - sfx2/inc/sfx2/opengrf.hxx | 3 --- sfx2/source/appl/opengrf.cxx | 5 +---- sfx2/source/dialog/filedlghelper.cxx | 18 ++---------------- sfx2/source/dialog/filedlgimpl.hxx | 1 - sfx2/source/dialog/taskpane.cxx | 11 ++++++----- svx/inc/pch/precompiled_svx.hxx | 1 - svx/inc/pfiledlg.hxx | 2 -- svx/source/dialog/docrecovery.cxx | 1 - svx/source/dialog/pfiledlg.cxx | 5 ----- svx/source/fmcomp/fmgridif.cxx | 10 +++++----- 14 files changed, 27 insertions(+), 55 deletions(-) diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index d82ecc6cb6b5..9d432f73a731 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -739,7 +739,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/fpicker/source/office/OfficeControlAccess.cxx b/fpicker/source/office/OfficeControlAccess.cxx index 7d33030ed2a9..50e99f2b590b 100644 --- a/fpicker/source/office/OfficeControlAccess.cxx +++ b/fpicker/source/office/OfficeControlAccess.cxx @@ -33,9 +33,8 @@ #include #include #include -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HPP_ #include -#endif +#include #include #include @@ -201,14 +200,15 @@ namespace svt } //--------------------------------------------------------------------- - void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& _rURL, sal_Bool _bFileView ) + void OControlAccess::setHelpURL( Window* _pControl, const ::rtl::OUString& sHelpURL, sal_Bool _bFileView ) { - String sHelpURL( _rURL ); - if ( COMPARE_EQUAL == sHelpURL.CompareIgnoreCaseToAscii( "HID:", sizeof( "HID:" ) - 1 ) ) - sHelpURL = sHelpURL.Copy( sizeof( "HID:" ) - 1 ); + rtl::OUString sHelpID( sHelpURL ); + INetURLObject aHID( sHelpURL ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + sHelpID = aHID.GetURLPath(); // URLs should always be UTF8 encoded and escaped - rtl::OString sID( rtl::OUStringToOString( sHelpURL, RTL_TEXTENCODING_UTF8 ) ); + rtl::OString sID( rtl::OUStringToOString( sHelpID, RTL_TEXTENCODING_UTF8 ) ); if ( _bFileView ) // the file view "overloaded" the SetHelpId static_cast< SvtFileView* >( _pControl )->SetHelpId( sID ); @@ -224,8 +224,12 @@ namespace svt // the file view "overloaded" the SetHelpId aHelpId = static_cast< SvtFileView* >( _pControl )->GetHelpId( ); - ::rtl::OUString sHelpURL( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - sHelpURL += rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ); + ::rtl::OUString sHelpURL; + ::rtl::OUString aTmp( rtl::OStringToOUString( aHelpId, RTL_TEXTENCODING_UTF8 ) ); + INetURLObject aHID( aTmp ); + if ( aHID.GetProtocol() == INET_PROT_NOT_VALID ) + sHelpURL = rtl::OUString::createFromAscii( INET_HID_SCHEME ); + sHelpURL += aTmp; return sHelpURL; } diff --git a/sfx2/inc/pch/precompiled_sfx2.hxx b/sfx2/inc/pch/precompiled_sfx2.hxx index b43dba7d6673..1d4003fa44e6 100644 --- a/sfx2/inc/pch/precompiled_sfx2.hxx +++ b/sfx2/inc/pch/precompiled_sfx2.hxx @@ -543,7 +543,6 @@ #include "svl/ownlist.hxx" #include "svtools/parhtml.hxx" #include "unotools/pathoptions.hxx" -#include "svl/pickerhelper.hxx" #include "svl/poolitem.hxx" #include "svtools/printoptions.hxx" #include "unotools/printwarningoptions.hxx" diff --git a/sfx2/inc/sfx2/filedlghelper.hxx b/sfx2/inc/sfx2/filedlghelper.hxx index e56aea052d18..619358f077ac 100644 --- a/sfx2/inc/sfx2/filedlghelper.hxx +++ b/sfx2/inc/sfx2/filedlghelper.hxx @@ -282,7 +282,6 @@ public: a corresponding element herein. */ void SetControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); - void SetDialogHelpId( const rtl::OString& _nHelpId ); void CreateMatcher( const String& rName ); /** sets the context of the dialog and trigger necessary actions e.g. loading config, setting help id diff --git a/sfx2/inc/sfx2/opengrf.hxx b/sfx2/inc/sfx2/opengrf.hxx index 1c307111cdd0..df8ae09f90a3 100644 --- a/sfx2/inc/sfx2/opengrf.hxx +++ b/sfx2/inc/sfx2/opengrf.hxx @@ -54,10 +54,7 @@ public: String GetCurrentFilter() const; void SetCurrentFilter(const String&); - /// Set dialog help id at FileDlgHelper void SetControlHelpIds( const INT16* _pControlId, const char** _pHelpId ); - /// Set control help ids at FileDlgHelper - void SetDialogHelpId( const rtl::OString& _rHelpId ); private: // disable copy and assignment SFX2_DLLPRIVATE SvxOpenGraphicDialog (const SvxOpenGraphicDialog&); diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index d83e93157902..fd2043a9a431 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -289,7 +289,4 @@ void SvxOpenGraphicDialog::SetControlHelpIds( const INT16* _pControlId, const ch mpImpl->aFileDlg.SetControlHelpIds( _pControlId, _pHelpId ); } -void SvxOpenGraphicDialog::SetDialogHelpId( const rtl::OString& _nHelpId ) -{ - mpImpl->aFileDlg.SetDialogHelpId( _nHelpId ); -} + diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 552dc8f11fc9..874a430b6bda 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -1213,13 +1213,14 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con // forward these ids to the file picker try { - const ::rtl::OUString sHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); + const ::rtl::OUString sHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME ) ); // the ids for the single controls uno::Reference< XFilePickerControlAccess > xControlAccess( mxFileDlg, UNO_QUERY ); if ( xControlAccess.is() ) { while ( *_pControlId ) { + DBG_ASSERT( INetURLObject( rtl::OStringToOUString( *_pHelpId, RTL_TEXTENCODING_UTF8 ) ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); ::rtl::OUString sId( sHelpIdPrefix ); sId += ::rtl::OUString( *_pHelpId, strlen( *_pHelpId ), RTL_TEXTENCODING_UTF8 ); xControlAccess->setValue( *_pControlId, ControlActions::SET_HELP_URL, makeAny( sId ) ); @@ -1234,12 +1235,6 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con } } -// ------------------------------------------------------------------------ -void FileDialogHelper_Impl::setDialogHelpId( const rtl::OString& _nHelpId ) -{ - svt::SetDialogHelpId( mxFileDlg, _nHelpId ); -} - // ------------------------------------------------------------------------ IMPL_LINK( FileDialogHelper_Impl, InitControls, void*, NOTINTERESTEDIN ) { @@ -2344,9 +2339,6 @@ void FileDialogHelper_Impl::SetContext( FileDialogHelper::Context _eNewContext ) const OUString* pConfigId = GetLastFilterConfigId( _eNewContext ); if( pConfigId ) LoadLastUsedFilter( *pConfigId ); - -// if( nNewHelpId ) -// this->setDialogHelpId( nNewHelpId ); } // ------------------------------------------------------------------------ @@ -2497,12 +2489,6 @@ void FileDialogHelper::SetControlHelpIds( const sal_Int16* _pControlId, const ch mpImp->setControlHelpIds( _pControlId, _pHelpId ); } -// ------------------------------------------------------------------------ -void FileDialogHelper::SetDialogHelpId( const rtl::OString& _nHelpId ) -{ - mpImp->setDialogHelpId( _nHelpId ); -} - void FileDialogHelper::SetContext( Context _eNewContext ) { mpImp->SetContext( _eNewContext ); diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index 30b516a84ac5..91190b575e1c 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -143,7 +143,6 @@ namespace sfx2 void correctVirtualDialogType(); void setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); - void setDialogHelpId( const rtl::OString& ); sal_Bool CheckFilterOptionsCapability( const SfxFilter* _pFilter ); diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index d684e3cf124a..3ef6a96bdaf4 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -60,7 +60,7 @@ #include #include #include - +#include #include //...................................................................................................................... @@ -410,10 +410,11 @@ namespace sfx2 static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL ) { - rtl::OString aHelpId( _rHelpURL, _rHelpURL.getLength(), RTL_TEXTENCODING_UTF8 ); - if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) ) - aHelpId = aHelpId.copy( sizeof( "HID:" ) - 1 ); - return aHelpId; + 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 ); } //------------------------------------------------------------------------------------------------------------------ diff --git a/svx/inc/pch/precompiled_svx.hxx b/svx/inc/pch/precompiled_svx.hxx index 95ed1449c846..b53064312a38 100644 --- a/svx/inc/pch/precompiled_svx.hxx +++ b/svx/inc/pch/precompiled_svx.hxx @@ -805,7 +805,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/svx/inc/pfiledlg.hxx b/svx/inc/pfiledlg.hxx index 694881920f8d..93d99c4774a2 100644 --- a/svx/inc/pfiledlg.hxx +++ b/svx/inc/pfiledlg.hxx @@ -54,8 +54,6 @@ public: static bool IsAvailable (USHORT nKind); - // setting HelpId and/or context of FileDialogHelper - void SetDialogHelpId( const rtl::OString& nHelpId ); void SetContext( sfx2::FileDialogHelper::Context eNewContext ); }; diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index b4ee4dd2956f..1b77364b6c7e 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -1585,7 +1585,6 @@ void BrokenRecoveryDialog::impl_askForSavePath() { css::uno::Reference< css::ui::dialogs::XFolderPicker > xFolderPicker( m_pCore->getSMGR()->createInstance(SERVICENAME_FOLDERPICKER), css::uno::UNO_QUERY_THROW); -// svt::SetDialogHelpId( xFolderPicker, HID_OPTIONS_PATHS_SELECTFOLDER ); INetURLObject aURL(m_sSavePath, INET_PROT_FILE); xFolderPicker->setDisplayDirectory(aURL.GetMainURL(INetURLObject::NO_DECODE)); diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index f53ba885f2a0..af8d283185a6 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -274,11 +274,6 @@ bool SvxPluginFileDlg::IsAvailable (sal_uInt16 nKind) return bFound; } -void SvxPluginFileDlg::SetDialogHelpId( const rtl::OString& _nHelpId ) -{ - maFileDlg.SetDialogHelpId( _nHelpId ); -} - void SvxPluginFileDlg::SetContext( sfx2::FileDialogHelper::Context _eNewContext ) { maFileDlg.SetContext( _eNewContext ); diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 9d596d529774..5a033cd77d44 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -38,6 +38,7 @@ #include "sdbdatacolumn.hxx" #include "svx/fmgridcl.hxx" #include "svx/svxids.hrc" +#include /** === begin UNO includes === **/ #include @@ -1973,11 +1974,10 @@ void FmXGridPeer::setProperty( const ::rtl::OUString& PropertyName, const Any& V } else if ( 0 == PropertyName.compareTo( FM_PROP_HELPURL ) ) { - String sHelpURL(::comphelper::getString(Value)); - String sPattern; - sPattern.AssignAscii("HID:"); - if (sHelpURL.Equals(sPattern, 0, sPattern.Len())) - pGrid->SetHelpId(rtl::OUStringToOString(sHelpURL, RTL_TEXTENCODING_UTF8)); + INetURLObject aHID( ::comphelper::getString(Value) ); + DBG_ASSERT( aHID.GetProtocol() == INET_PROT_HID, "Wrong HelpURL!" ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + pGrid->SetHelpId( rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); } else if ( 0 == PropertyName.compareTo( FM_PROP_DISPLAYSYNCHRON ) ) { -- cgit From a929816d90303defcded933ef0337f2191fa2cec Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Jul 2010 14:50:49 +0200 Subject: CWS changehid: #i111784#: consolidate usage of HID schema; remove unused SetDialogHelpId methods --- svl/inc/pickerhelper.hxx | 69 ----------------------- svl/source/filepicker/makefile.mk | 1 - svl/source/filepicker/pickerhelper.cxx | 99 --------------------------------- svtools/source/dialogs/printdlg.cxx | 8 --- svtools/source/uno/wizard/unowizard.cxx | 14 +++-- toolkit/source/awt/vclxwindow.cxx | 10 +--- 6 files changed, 12 insertions(+), 189 deletions(-) delete mode 100644 svl/inc/pickerhelper.hxx delete mode 100644 svl/source/filepicker/pickerhelper.cxx diff --git a/svl/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx deleted file mode 100644 index 0c4215a1fb83..000000000000 --- a/svl/inc/pickerhelper.hxx +++ /dev/null @@ -1,69 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _PICKERHELPER_HXX -#define _PICKERHELPER_HXX - -#include "svl/svldllapi.h" -#include "sal/types.h" -#include "com/sun/star/uno/Reference.hxx" - -namespace com -{ - namespace sun - { - namespace star - { - namespace ui - { - namespace dialogs - { - class XFilePicker; - class XFolderPicker; - } - } - } - } -} - - -namespace svt -{ - - SVL_DLLPUBLIC void SetDialogHelpId( - ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFilePicker > _mxFileDlg, - const rtl::OString& _nHelpId ); - - SVL_DLLPUBLIC void SetDialogHelpId( - ::com::sun::star::uno::Reference < ::com::sun::star::ui::dialogs::XFolderPicker > _mxFileDlg, - const rtl::OString& _nHelpId ); - -} - -//----------------------------------------------------------------------------- - -#endif diff --git a/svl/source/filepicker/makefile.mk b/svl/source/filepicker/makefile.mk index a4c97ea41aa1..b3c2a829cf54 100644 --- a/svl/source/filepicker/makefile.mk +++ b/svl/source/filepicker/makefile.mk @@ -38,7 +38,6 @@ ENABLE_EXCEPTIONS=TRUE # --- Files -------------------------------------------------------------- SLOFILES =\ - $(SLO)$/pickerhelper.obj \ $(SLO)$/pickerhistory.obj # --- Targets ------------------------------------------------------- diff --git a/svl/source/filepicker/pickerhelper.cxx b/svl/source/filepicker/pickerhelper.cxx deleted file mode 100644 index 2d38d395f8f7..000000000000 --- a/svl/source/filepicker/pickerhelper.cxx +++ /dev/null @@ -1,99 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svl.hxx" - -#include "pickerhelper.hxx" -#include "rtl/ustring.hxx" -#include "com/sun/star/ui/dialogs/XFilePicker.hpp" -#include "com/sun/star/ui/dialogs/XFolderPicker.hpp" -#include "com/sun/star/beans/XPropertySet.hpp" -#include "com/sun/star/beans/XPropertySetInfo.hpp" -#include "com/sun/star/uno/Any.hxx" -#include "tools/debug.hxx" - -namespace css = com::sun::star; - -using css::uno::Reference; -using rtl::OUString; - -namespace svt -{ - void SetDialogHelpId( - Reference < css::ui::dialogs::XFilePicker > _mxFileDlg, const rtl::OString& _nHelpId ) - { - try - { - // does the dialog haver a help URL property? - Reference< css::beans::XPropertySet > xDialogProps( _mxFileDlg, css::uno::UNO_QUERY ); - Reference< css::beans::XPropertySetInfo > xInfo; - if( xDialogProps.is() ) - xInfo = xDialogProps->getPropertySetInfo( ); - - const OUString sHelpURLPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) ); - - if( xInfo.is() && xInfo->hasPropertyByName( sHelpURLPropertyName ) ) - { // yep - OUString sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - sId += rtl::OStringToOUString( _nHelpId, RTL_TEXTENCODING_UTF8 ); - xDialogProps->setPropertyValue( sHelpURLPropertyName, css::uno::makeAny( sId ) ); - } - } - catch( const css::uno::Exception& ) - { - DBG_ERROR( "svt::SetDialogHelpId(): caught an exception while setting the help id!" ); - } - } - - void SetDialogHelpId( - Reference< css::ui::dialogs::XFolderPicker > _mxFileDlg, const rtl::OString& _nHelpId ) - { - try - { - // does the dialog haver a help URL property? - Reference< css::beans::XPropertySet > xDialogProps( _mxFileDlg, css::uno::UNO_QUERY ); - Reference< css::beans::XPropertySetInfo > xInfo; - if( xDialogProps.is() ) - xInfo = xDialogProps->getPropertySetInfo( ); - - const OUString sHelpURLPropertyName( RTL_CONSTASCII_USTRINGPARAM( "HelpURL" ) ); - - if( xInfo.is() && xInfo->hasPropertyByName( sHelpURLPropertyName ) ) - { // yep - OUString sId( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - sId += rtl::OStringToOUString( _nHelpId, RTL_TEXTENCODING_UTF8 ); - xDialogProps->setPropertyValue( sHelpURLPropertyName, css::uno::makeAny( sId ) ); - } - } - catch( const css::uno::Exception& ) - { - DBG_ERROR( "svt::SetDialogHelpId(): caught an exception while setting the help id!" ); - } - } -} - diff --git a/svtools/source/dialogs/printdlg.cxx b/svtools/source/dialogs/printdlg.cxx index 532fd3f61bb2..dba5ed627952 100644 --- a/svtools/source/dialogs/printdlg.cxx +++ b/svtools/source/dialogs/printdlg.cxx @@ -28,26 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svtools.hxx" #include -#ifndef _SV_APP_HXX #include -#endif -#ifndef _VCL_PRINT_HXX #include -#endif #include #include #include - #include "printdlg.hrc" #include "controldims.hrc" #include #include #include #include -#include "svl/pickerhelper.hxx" -#ifndef _SVT_HELPID_HRC #include -#endif #include #include #include diff --git a/svtools/source/uno/wizard/unowizard.cxx b/svtools/source/uno/wizard/unowizard.cxx index 8b1ac67a8cfc..3316b05fb98b 100644 --- a/svtools/source/uno/wizard/unowizard.cxx +++ b/svtools/source/uno/wizard/unowizard.cxx @@ -42,6 +42,7 @@ #include #include #include +#include //...................................................................................................................... namespace svt { namespace uno @@ -208,10 +209,11 @@ namespace svt { namespace uno static rtl::OString lcl_getHelpId( const ::rtl::OUString& _rHelpURL ) { - rtl::OString aHelpId( _rHelpURL, _rHelpURL.getLength(), RTL_TEXTENCODING_UTF8 ); - if ( 0 == _rHelpURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( "HID:" ) ) ) - aHelpId = aHelpId.copy( sizeof( "HID:" ) - 1 ); - return aHelpId; + 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 ); } //------------------------------------------------------------------------ @@ -219,7 +221,9 @@ namespace svt { namespace uno { ::rtl::OUStringBuffer aBuffer; ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); - aBuffer.appendAscii( "HID:" ); + 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/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index 9e97b3821df0..73022aacedf2 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -1585,13 +1585,9 @@ void VCLXWindow::setProperty( const ::rtl::OUString& PropertyName, const ::com:: ::rtl::OUString aURL; if ( Value >>= aURL ) { - String aHelpURL( aURL ); - String aPattern( RTL_CONSTASCII_USTRINGPARAM( "HID:" ) ); - if ( aHelpURL.CompareIgnoreCaseToAscii( aPattern, aPattern.Len() ) == COMPARE_EQUAL ) - { - String aID = aHelpURL.Copy( aPattern.Len() ); - pWindow->SetHelpId( rtl::OUStringToOString( aID, RTL_TEXTENCODING_UTF8 ) ); - } + INetURLObject aHelpURL( aURL ); + if ( aHelpURL.GetProtocol() == INET_PROT_HID ) + pWindow->SetHelpId( rtl::OUStringToOString( aHelpURL.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); else pWindow->SetHelpId( rtl::OUStringToOString( aURL, RTL_TEXTENCODING_UTF8 ) ); } -- cgit From 659fb7a4ae2d2ac140f328959b98944c43a094aa Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Jul 2010 14:50:49 +0200 Subject: CWS changehid: #i111784#: consolidate usage of HID schema; remove unused SetDialogHelpId methods --- sw/source/ui/app/docsh2.cxx | 2 -- sw/source/ui/uno/unomod.cxx | 13 ++++++------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 685de346be52..ebdbf91a6281 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -1238,8 +1238,6 @@ void SwDocShell::Execute(SfxRequest& rReq) const char** pHelpIds = bCreateHtml ? aHTMLHelpIds : aMasterHelpIds; aDlgHelper.SetControlHelpIds( nControlIds, pHelpIds ); -// aDlgHelper.SetDialogHelpId( bCreateHtml ? HID_SEND_HTML_DIALOG : HID_SEND_MASTER_DIALOG ); - uno::Reference < XFilePicker > xFP = aDlgHelper.GetFilePicker(); const SfxFilter* pFlt; diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx index 272e7033ceeb..45df3b9646d8 100644 --- a/sw/source/ui/uno/unomod.cxx +++ b/sw/source/ui/uno/unomod.cxx @@ -799,13 +799,12 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c OUString sHelpURL; if ( ! ( rValue >>= sHelpURL ) ) throw IllegalArgumentException(); - SwEditWin &rEditWin = pView->GetEditWin(); - OUString sPrefix = sHelpURL.copy ( 0, 4 ); - // Make sure we have a valid string...should be in the format HID:12345 - if ( ! sPrefix.equalsAsciiL ( RTL_CONSTASCII_STRINGPARAM ( "HID:" ) ) ) + + INetURLObject aHID( sHelpURL ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + pView->GetEditWin().SetHelpId( rtl::OUStringToOString( aHID.GetURLPath(), RTL_TEXTENCODING_UTF8 ) ); + else throw IllegalArgumentException (); - OUString aID = sHelpURL.copy ( 4 ); - rEditWin.SetHelpId ( rtl::OUStringToOString( aID, RTL_TEXTENCODING_UTF8 ) ); } else throw UnknownPropertyException(); @@ -984,7 +983,7 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u { bBool = sal_False; OUStringBuffer sHelpURL; - sHelpURL.appendAscii ( "HID:" ); + sHelpURL.appendAscii ( INET_HID_SCHEME ); SwEditWin &rEditWin = pView->GetEditWin(); sHelpURL.append( rtl::OStringToOUString( rEditWin.GetHelpId(), RTL_TEXTENCODING_UTF8 ) ); rValue <<= sHelpURL.makeStringAndClear(); -- cgit From d09117abd835a579e7361babedd62e88fa535e69 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 20 Jul 2010 14:50:49 +0200 Subject: CWS changehid: #i111784#: consolidate usage of HID schema; remove unused SetDialogHelpId methods --- dbaccess/source/ui/dlg/sqlmessage.cxx | 7 +++++-- reportdesign/source/ui/inspection/DefaultInspection.cxx | 4 +++- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dbaccess/source/ui/dlg/sqlmessage.cxx b/dbaccess/source/ui/dlg/sqlmessage.cxx index 5dd0ccda31b0..9015704d2878 100644 --- a/dbaccess/source/ui/dlg/sqlmessage.cxx +++ b/dbaccess/source/ui/dlg/sqlmessage.cxx @@ -77,6 +77,8 @@ #include "moduledbu.hxx" #endif +#include + #define BUTTONID_MORE BUTTONID_RETRY + 1 #define DIALOG_WIDTH 220 @@ -690,8 +692,9 @@ void OSQLMessageBox::impl_createStandardButtons( WinBits _nStyle ) lcl_addButton( *this, BUTTON_HELP, false ); rtl::OUString aTmp; - if ( m_sHelpURL.indexOfAsciiL( "HID:", 4 ) == 0 ) - aTmp = m_sHelpURL.copy( 4 ); + INetURLObject aHID( m_sHelpURL ); + if ( aHID.GetProtocol() == INET_PROT_HID ) + aTmp = aHID.GetURLPath(); else aTmp = m_sHelpURL; diff --git a/reportdesign/source/ui/inspection/DefaultInspection.cxx b/reportdesign/source/ui/inspection/DefaultInspection.cxx index 60ff62578b1b..48d8c74e0c01 100644 --- a/reportdesign/source/ui/inspection/DefaultInspection.cxx +++ b/reportdesign/source/ui/inspection/DefaultInspection.cxx @@ -41,6 +41,7 @@ #include #include #include "metadata.hxx" +#include //........................................................................ namespace rptui @@ -51,7 +52,8 @@ namespace rptui { ::rtl::OUStringBuffer aBuffer; ::rtl::OUString aTmp( sHelpId, sHelpId.getLength(), RTL_TEXTENCODING_UTF8 ); - aBuffer.appendAscii( "HID:" ); + DBG_ASSERT( INetURLObject( aTmp ).GetProtocol() == INET_PROT_NOT_VALID, "Wrong HelpId!" ); + aBuffer.appendAscii( INET_HID_SCHEME ); aBuffer.append( aTmp.getStr() ); return aBuffer.makeStringAndClear(); } -- cgit From 8bf98bbf911e637db7984a6af3186ff233a506ca Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 21 Jul 2010 11:47:52 +0200 Subject: CWS changehid: make hidother.src easier to handle --- wizards/util/helpids.h | 859 ++++++++++++++++++++++++++++++ wizards/util/hidother.src | 1279 +++++++++++++++++++++++---------------------- 2 files changed, 1499 insertions(+), 639 deletions(-) create mode 100644 wizards/util/helpids.h diff --git a/wizards/util/helpids.h b/wizards/util/helpids.h new file mode 100644 index 000000000000..b42e82d97995 --- /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 + * + * 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 "HID:34200" +#define HID0_HELP "HID:34201" +#define HID0_NEXT "HID:34202" +#define HID0_PREV "HID:34203" +#define HID0_CREATE "HID:34204" +#define HID0_CANCEL "HID:34205" +#define HID0_STATUS_DIALOG "HID:34206" + + +//step1 +#define HID1_LST_SESSIONS "HID:34207" +#define HID1_BTN_DEL_SES "HID:34209" + +//step2 +#define HID2_LST_DOCS "HID:34210" +#define HID2_BTN_ADD_DOC "HID:34211" +#define HID2_BTN_REM_DOC "HID:34212" +#define HID2_BTN_DOC_UP "HID:34213" +#define HID2_BTN_DOC_DOWN "HID:34214" +#define HID2_TXT_DOC_TITLE "HID:34215" +#define HID2_TXT_DOC_DESC "HID:34216" +#define HID2_TXT_DOC_AUTHOR "HID:34217" +#define HID2_LST_DOC_EXPORT "HID:34218" +#define HID2_STATUS_ADD_DOCS "HID:34219" + +//step3 +#define HID3_IL_LAYOUTS_IMG1 "HID:34220" +#define HID3_IL_LAYOUTS_IMG2 "HID:34221" +#define HID3_IL_LAYOUTS_IMG3 "HID:34222" +#define HID3_IL_LAYOUTS_IMG4 "HID:34223" +#define HID3_IL_LAYOUTS_IMG5 "HID:34224" +#define HID3_IL_LAYOUTS_IMG6 "HID:34225" +#define HID3_IL_LAYOUTS_IMG7 "HID:34226" +#define HID3_IL_LAYOUTS_IMG8 "HID:34227" +#define HID3_IL_LAYOUTS_IMG9 "HID:34228" +#define HID3_IL_LAYOUTS_IMG10 "HID:34229" +#define HID3_IL_LAYOUTS_IMG11 "HID:34230" +#define HID3_IL_LAYOUTS_IMG12 "HID:34231" +#define HID3_IL_LAYOUTS_IMG13 "HID:34232" +#define HID3_IL_LAYOUTS_IMG14 "HID:34233" +#define HID3_IL_LAYOUTS_IMG15 "HID:34234" + +//step4 +#define HID4_CHK_DISPLAY_FILENAME "HID:34235" +#define HID4_CHK_DISPLAY_DESCRIPTION "HID:34236" +#define HID4_CHK_DISPLAY_AUTHOR "HID:34237" +#define HID4_CHK_DISPLAY_CR_DATE "HID:34238" +#define HID4_CHK_DISPLAY_UP_DATE "HID:34239" +#define HID4_CHK_DISPLAY_FORMAT "HID:34240" +#define HID4_CHK_DISPLAY_F_ICON "HID:34241" +#define HID4_CHK_DISPLAY_PAGES "HID:34242" +#define HID4_CHK_DISPLAY_SIZE "HID:34243" + +#define HID4_GRP_OPTIMAIZE_640 "HID:34244" +#define HID4_GRP_OPTIMAIZE_800 "HID:34245" +#define HID4_GRP_OPTIMAIZE_1024 "HID:34246" + + +//step5 +#define HID5_LST_STYLES "HID:34247" +#define HID5_BTN_BACKGND "HID:34248" +#define HID5_BTN_ICONS "HID:34249" + +//step6 +#define HID6_TXT_SITE_TITLE "HID:34250" +#define HID6_TXT_SITE_DESC "HID:34253" +#define HID6_DATE_SITE_CREATED "HID:34255" +#define HID6_DATE_SITE_UPDATED "HID:34256" +#define HID6_TXT_SITE_EMAIL "HID:34258" +#define HID6_TXT_SITE_COPYRIGHT "HID:34259" + +//step7 +#define HID7_BTN_PREVIEW "HID:34260" +#define HID7_CHK_PUBLISH_LOCAL "HID:34261" +#define HID7_TXT_LOCAL "HID:34262" +#define HID7_BTN_LOCAL "HID:34263" +#define HID7_CHK_PUBLISH_ZIP "HID:34264" +#define HID7_TXT_ZIP "HID:34265" +#define HID7_BTN_ZIP "HID:34266" +#define HID7_CHK_PUBLISH_FTP "HID:34267" +#define HID7_TXT_FTP "HID:34268" +#define HID7_BTN_FTP "HID:34269" +#define HID7_CHK_SAVE "HID:34270" +#define HID7_TXT_SAVE "HID:34271" + +//web wizard backgrounds dialog +#define HID_BG "HID:34290" +#define HID_BG_BTN_OTHER "HID:34291" +#define HID_BG_BTN_NONE "HID:34292" +#define HID_BG_BTN_OK "HID:34293" +#define HID_BG_BTN_CANCEL "HID:34294" + +#define HID_BG_BTN_BACK "HID:34295" +#define HID_BG_BTN_FW "HID:34296" +#define HID_BG_BTN_IMG1 "HID:34297" +#define HID_BG_BTN_IMG2 "HID:34298" +#define HID_BG_BTN_IMG3 "HID:34299" +#define HID_BG_BTN_IMG4 "HID:34300" +#define HID_BG_BTN_IMG5 "HID:34301" +#define HID_BG_BTN_IMG6 "HID:34302" +#define HID_BG_BTN_IMG7 "HID:34303" +#define HID_BG_BTN_IMG8 "HID:34304" +#define HID_BG_BTN_IMG9 "HID:34305" +#define HID_BG_BTN_IMG10 "HID:34306" +#define HID_BG_BTN_IMG11 "HID:34307" +#define HID_BG_BTN_IMG12 "HID:34308" +#define HID_BG_BTN_IMG13 "HID:34309" +#define HID_BG_BTN_IMG14 "HID:34300" +#define HID_BG_BTN_IMG15 "HID:34311" +#define HID_BG_BTN_IMG16 "HID:34312" + +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++ +// Note: Web Wizard continues on 41000 later in this file. +// ++++++++++++++++++++++++++++++++++++++++++++++++++++++ + + +// ************* +// REPORT WIZARD +// ************* + +#define HID_DLGREPORT_DIALOG "HID:34320" +#define HID_DLGREPORT_0_CMDPREV "HID:34322" +#define HID_DLGREPORT_0_CMDNEXT "HID:34323" +#define HID_DLGREPORT_0_CMDFINISH "HID:34324" +#define HID_DLGREPORT_0_CMDCANCEL "HID:34325" + +#define HID_DLGREPORT_1_LBTABLES "HID:34330" +#define HID_DLGREPORT_1_FIELDSAVAILABLE "HID:34331" +#define HID_DLGREPORT_1_CMDMOVESELECTED "HID:34332" +#define HID_DLGREPORT_1_CMDMOVEALL "HID:34333" +#define HID_DLGREPORT_1_CMDREMOVESELECTED "HID:34334" +#define HID_DLGREPORT_1_CMDREMOVEALL "HID:34335" +#define HID_DLGREPORT_1_FIELDSSELECTED "HID:34336" +#define HID_DLGREPORT_1_CMDMOVEUP "HID:34337" +#define HID_DLGREPORT_1_CMDMOVEDOWN "HID:34338" + + +#define HID_DLGREPORT_2_GROUPING "HID:34340" +#define HID_DLGREPORT_2_CMDGROUP "HID:34341" +#define HID_DLGREPORT_2_CMDUNGROUP "HID:34342" +#define HID_DLGREPORT_2_PREGROUPINGDEST "HID:34343" +#define HID_DLGREPORT_2_CMDMOVEUPGROUP "HID:34344" +#define HID_DLGREPORT_2_CMDMOVEDOWNGROUP "HID:34345" + + +#define HID_DLGREPORT_3_SORT1 "HID:34346" +#define HID_DLGREPORT_3_OPTASCEND1 "HID:34347" +#define HID_DLGREPORT_3_OPTDESCEND1 "HID:34348" +#define HID_DLGREPORT_3_SORT2 "HID:34349" +#define HID_DLGREPORT_3_OPTASCEND2 "HID:34350" +#define HID_DLGREPORT_3_OPTDESCEND2 "HID:34351" +#define HID_DLGREPORT_3_SORT3 "HID:34352" +#define HID_DLGREPORT_3_OPTASCEND3 "HID:34353" +#define HID_DLGREPORT_3_OPTDESCEND3 "HID:34354" +#define HID_DLGREPORT_3_SORT4 "HID:34355" +#define HID_DLGREPORT_3_OPTASCEND4 "HID:34356" +#define HID_DLGREPORT_3_OPTDESCEND4 "HID:34357" + +#define HID_DLGREPORT_4_TITLE "HID:34362" +#define HID_DLGREPORT_4_DATALAYOUT "HID:34363" +#define HID_DLGREPORT_4_PAGELAYOUT "HID:34364" +#define HID_DLGREPORT_4_LANDSCAPE "HID:34365" +#define HID_DLGREPORT_4_PORTRAIT "HID:34366" + +#define HID_DLGREPORT_5_OPTDYNTEMPLATE "HID:34370" +#define HID_DLGREPORT_5_OPTSTATDOCUMENT "HID:34371" +#define HID_DLGREPORT_5_TXTTEMPLATEPATH "HID:34372" +#define HID_DLGREPORT_5_CMDTEMPLATEPATH "HID:34373" +#define HID_DLGREPORT_5_OPTEDITTEMPLATE "HID:34374" +#define HID_DLGREPORT_5_OPTUSETEMPLATE "HID:34375" +#define HID_DLGREPORT_5_TXTDOCUMENTPATH "HID:34376" +#define HID_DLGREPORT_5_CMDDOCUMENTPATH "HID:34377" +#define HID_DLGREPORT_5_CHKLINKTODB "HID:34378" +#define HID_DLGREPORT_6_TXTTITLE_1 "HID:34381" +#define HID_DLGREPORT_6_TXTTITLE_2 "HID:34382" +#define HID_DLGREPORT_6_TXTTITLE_3 "HID:34383" +#define HID_DLGREPORT_6_TXTTITLE_4 "HID:34384" +#define HID_DLGREPORT_6_TXTTITLE_5 "HID:34385" +#define HID_DLGREPORT_6_TXTTITLE_6 "HID:34386" +#define HID_DLGREPORT_6_TXTTITLE_7 "HID:34387" + + +/* ==================================== + * FormWizard + * ==================================== + */ + + +#define HID_DLGFORM_DIALOG "HID:34400" +#define HID_DLGFORM_CMDPREV "HID:34402" +#define HID_DLGFORM_CMDNEXT "HID:34403" +#define HID_DLGFORM_CMDFINISH "HID:34404" +#define HID_DLGFORM_CMDCANCEL "HID:34405" + +#define HID_DLGFORM_MASTER_LBTABLES "HID:34411" +#define HID_DLGFORM_MASTER_FIELDSAVAILABLE "HID:34412" +#define HID_DLGFORM_MASTER_CMDMOVESELECTED "HID:34413" +#define HID_DLGFORM_MASTER_CMDMOVEALL "HID:34414" +#define HID_DLGFORM_MASTER_CMDREMOVESELECTED "HID:34415" +#define HID_DLGFORM_MASTER_CMDREMOVEALL "HID:34416" +#define HID_DLGFORM_MASTER_FIELDSSELECTED "HID:34417" +#define HID_DLGFORM_MASTER_CMDMOVEUP "HID:34418" +#define HID_DLGFORM_MASTER_CMDMOVEDOWN "HID:34419" + + +#define HID_DLGFORM_CHKCREATESUBFORM "HID:34421" +#define HID_DLGFORM_OPTONEXISTINGRELATION "HID:34422" +#define HID_DLGFORM_OPTSELECTMANUALLY "HID:34423" +#define HID_DLGFORM_lstRELATIONS "HID:34424" + + +#define HID_DLGFORM_SUB_LBTABLES "HID:34431" +#define HID_DLGFORM_SUB_FIELDSAVAILABLE "HID:34432" +#define HID_DLGFORM_SUB_CMDMOVESELECTED "HID:34433" +#define HID_DLGFORM_SUB_CMDMOVEALL "HID:34434" +#define HID_DLGFORM_SUB_CMDREMOVESELECTED "HID:34435" +#define HID_DLGFORM_SUB_CMDREMOVEALL "HID:34436" +#define HID_DLGFORM_SUB_FIELDSSELECTED "HID:34437" +#define HID_DLGFORM_SUB_CMDMOVEUP "HID:34438" +#define HID_DLGFORM_SUB_CMDMOVEDOWN "HID:34439" + + +#define HID_DLGFORM_LINKER_LSTSLAVELINK1 "HID:34441" +#define HID_DLGFORM_LINKER_LSTMASTERLINK1 "HID:34442" +#define HID_DLGFORM_LINKER_LSTSLAVELINK2 "HID:34443" +#define HID_DLGFORM_LINKER_LSTMASTERLINK2 "HID:34444" +#define HID_DLGFORM_LINKER_LSTSLAVELINK3 "HID:34445" +#define HID_DLGFORM_LINKER_LSTMASTERLINK3 "HID:34446" +#define HID_DLGFORM_LINKER_LSTSLAVELINK4 "HID:34447" +#define HID_DLGFORM_LINKER_LSTMASTERLINK4 "HID:34448" + +#define HID_DLGFORM_CMDALIGNLEFT "HID:34451" +#define HID_DLGFORM_CMDALIGNRIGHT "HID:34452" + + +#define HID_DLGFORM_CMDLEFTLABELED "HID:34453" +#define HID_DLGFORM_CMDTOPLABELED "HID:34454" +#define HID_DLGFORM_CMDTABLESTYLE "HID:34455" +#define HID_DLGFORM_CMDTOPJUSTIFIED "HID:34456" + +#define HID_DLGFORM_CMDLEFTLABELED2 "HID:34457" +#define HID_DLGFORM_CMDTOPLABELED2 "HID:34458" +#define HID_DLGFORM_CMDTABLESTYLE2 "HID:34459" +#define HID_DLGFORM_CMDTOPJUSTIFIED2 "HID:34460" + +#define HID_DLGFORM_OPTNEWDATAONLY "HID:34461" +#define HID_DLGFORM_OPTDISPLAYALLDATA "HID:34462" +#define HID_DLGFORM_CHKNOMODIFICATION "HID:34463" +#define HID_DLGFORM_CHKNODELETION "HID:34464" +#define HID_DLGFORM_CHKNOADDITION "HID:34465" + + +#define HID_DLGFORM_LSTSTYLES "HID:34471" +#define HID_DLGFORM_CMDNOBORDER "HID:34472" +#define HID_DLGFORM_CMD3DBORDER "HID:34473" +#define HID_DLGFORM_CMDSIMPLEBORDER "HID:34474" + +#define HID_DLGFORM_TXTPATH "HID:34481" +#define HID_DLGFORM_OPTWORKWITHFORM "HID:34482" +#define HID_DLGFORM_OPTMODIFYFORM "HID:34483" + + +#define HID_DLGNEWSLTR_DIALOG "HID:34500" +#define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT "HID:34501" +#define HID_DLGNEWSLTR_OPTPARTYLAYOUT "HID:34502" +#define HID_DLGNEWSLTR_OPTBROCHURELAYOUT "HID:34503" +#define HID_DLGNEWSLTR_OPTSINGLESIDED "HID:34504" +#define HID_DLGNEWSLTR_OPTDOUBLESIDED "HID:34505" +#define HID_DLGNEWSLTR_CMDGOON "HID:34506" + + +#define HID_DLGDEPOT_DIALOG_SELLBUY "HID:34520" +#define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY "HID:34521" +#define HID_DLGDEPOT_0_TXTQUANTITY "HID:34522" +#define HID_DLGDEPOT_0_TXTRATE "HID:34523" +#define HID_DLGDEPOT_0_TXTDATE "HID:34524" +#define HID_DLGDEPOT_0_TXTCOMMISSION "HID:34525" +#define HID_DLGDEPOT_0_TXTFIX "HID:34526" +#define HID_DLGDEPOT_0_TXTMINIMUM "HID:34527" +#define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY "HID:34528" +#define HID_DLGDEPOT_0_CMDGOON_SELLBUY "HID:34529" +#define HID_DLGDEPOT_1_LSTSELLSTOCKS "HID:34530" +#define HID_DLGDEPOT_2_LSTBUYSTOCKS "HID:34531" +#define HID_DLGDEPOT_DIALOG_SPLIT "HID:34532" +#define HID_DLGDEPOT_0_LSTSTOCKNAMES "HID:34533" +#define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT "HID:34534" +#define HID_DLGDEPOT_0_CMDCANCEL_SPLIT "HID:34535" +#define HID_DLGDEPOT_0_CMDGOON_SPLIT "HID:34536" +#define HID_DLGDEPOT_1_OPTPERSHARE "HID:34537" +#define HID_DLGDEPOT_1_OPTTOTAL "HID:34538" +#define HID_DLGDEPOT_1_TXTDIVIDEND "HID:34539" +#define HID_DLGDEPOT_2_TXTOLDRATE "HID:34540" +#define HID_DLGDEPOT_2_TXTNEWRATE "HID:34541" +#define HID_DLGDEPOT_2_TXTDATE "HID:34542" +#define HID_DLGDEPOT_3_TXTSTARTDATE "HID:34543" +#define HID_DLGDEPOT_3_TXTENDDATE "HID:34544" +#define HID_DLGDEPOT_3_OPTDAILY "HID:34545" +#define HID_DLGDEPOT_3_OPTWEEKLY "HID:34546" +#define HID_DLGDEPOT_DIALOG_HISTORY "HID:34547" +#define HID_DLGDEPOT_LSTMARKETS "HID:34548" +#define HID_DLGDEPOT_0_CMDCANCEL_HISTORY "HID:34549" +#define HID_DLGDEPOT_0_CMDGOON_HISTORY "HID:34550" + +#define HID_DLGIMPORT_DIALOG "HID:34570" +#define HID_DLGIMPORT_0_CMDHELP "HID:34571" +#define HID_DLGIMPORT_0_CMDCANCEL "HID:34572" +#define HID_DLGIMPORT_0_CMDPREV "HID:34573" +#define HID_DLGIMPORT_0_CMDNEXT "HID:34574" +#define HID_DLGIMPORT_0_OPTSODOCUMENTS "HID:34575" +#define HID_DLGIMPORT_0_OPTMSDOCUMENTS "HID:34576" +#define HID_DLGIMPORT_0_CHKLOGFILE "HID:34577" +#define HID_DLGIMPORT_2_CHKWORD "HID:34578" +#define HID_DLGIMPORT_2_CHKEXCEL "HID:34579" +#define HID_DLGIMPORT_2_CHKPOWERPOINT "HID:34580" +#define HID_DLGIMPORT_2_CBTEMPLATE "HID:34581" +#define HID_DLGIMPORT_2_CBTEMPLATERECURSE "HID:34582" +#define HID_DLGIMPORT_2_LBTEMPLATEPATH "HID:34583" +#define HID_DLGIMPORT_2_EDTEMPLATEPATH "HID:34584" +#define HID_DLGIMPORT_2_CBDOCUMENT "HID:34586" +#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT "HID:34585" +#define HID_DLGIMPORT_2_CBDOCUMENT "HID:34586" +#define HID_DLGIMPORT_2_CBDOCUMENTRECURSE "HID:34587" +#define HID_DLGIMPORT_2_LBDOCUMENTPATH "HID:34588" +#define HID_DLGIMPORT_2_EDDOCUMENTPATH "HID:34589" +#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT "HID:34590" +#define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH "HID:34591" +#define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH "HID:34592" +#define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT "HID:34593" +#define HID_DLGIMPORT_3_TBSUMMARY "HID:34595" + +#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 "HID:34600" +#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 "HID:34601" + + +#define HID_DLGIMPORT_0_CHKWRITER "HID:34596" +#define HID_DLGIMPORT_0_CHKCALC "HID:34597" +#define HID_DLGIMPORT_0_CHKIMPRESS "HID:34598" +#define HID_DLGIMPORT_0_CHKMATHGLOBAL "HID:34599" + + +#define HID_DLGCORRESPONDENCE_DIALOG "HID:34630" +#define HID_DLGCORRESPONDENCE_CANCEL "HID:34631" +#define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 "HID:34632" +#define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 "HID:34633" +#define HID_DLGCORRESPONDENCE_AGENDAOKAY "HID:34634" +#define HID_DLGCORRESPONDENCE_OPTIONLETTER1 "HID:34635" +#define HID_DLGCORRESPONDENCE_OPTIONLETTER2 "HID:34636" +#define HID_DLGCORRESPONDENCE_LETTEROKAY "HID:34637" + +#define HID_DLGSTYLES_DIALOG "HID:34650" +#define HID_DLGSTYLES_LISTBOX "HID:34651" +#define HID_DLGSTYLES_CANCEL "HID:34652" +#define HID_DLGSTYLES_OKAY "HID:34653" + +#define HID_DLGCONVERT_DIALOG "HID:34660" +#define HID_DLGCONVERT_CHECKBOX1 "HID:34661" +#define HID_DLGCONVERT_OPTIONBUTTON1 "HID:34662" +#define HID_DLGCONVERT_OPTIONBUTTON2 "HID:34663" +#define HID_DLGCONVERT_OPTIONBUTTON3 "HID:34664" +#define HID_DLGCONVERT_OPTIONBUTTON4 "HID:34665" +#define HID_DLGCONVERT_LISTBOX1 "HID:34666" +#define HID_DLGCONVERT_OBFILE "HID:34667" +#define HID_DLGCONVERT_OBDIR "HID:34668" +#define HID_DLGCONVERT_COMBOBOX1 "HID:34669" +#define HID_DLGCONVERT_TBSOURCE "HID:34670" +#define HID_DLGCONVERT_CHECKRECURSIVE "HID:34671" +#define HID_DLGCONVERT_TBTARGET "HID:34672" +#define HID_DLGCONVERT_CBCANCEL "HID:34673" +#define HID_DLGCONVERT_CBHELP "HID:34674" +#define HID_DLGCONVERT_CBBACK "HID:34675" +#define HID_DLGCONVERT_CBGOON "HID:34676" +#define HID_DLGCONVERT_CBSOURCEOPEN "HID:34677" +#define HID_DLGCONVERT_CBTARGETOPEN "HID:34678" +#define HID_DLGCONVERT_CHKPROTECT "HID:34679" +#define HID_DLGCONVERT_CHKTEXTDOCUMENTS "HID:34680" + +#define HID_DLGPASSWORD_CMDGOON "HID:34690" +#define HID_DLGPASSWORD_CMDCANCEL "HID:34691" +#define HID_DLGPASSWORD_CMDHELP "HID:34692" +#define HID_DLGPASSWORD_TXTPASSWORD "HID:34693" + +#define HID_DLGHOLIDAYCAL_DIALOG "HID:34700" +#define HID_DLGHOLIDAYCAL_1_PREVIEW "HID:34701" +#define HID_DLGHOLIDAYCAL_1_OPYEAR "HID:34702" +#define HID_DLGHOLIDAYCAL_1_OPMONTH "HID:34703" +#define HID_DLGHOLIDAYCAL_1_EDYEAR "HID:34704" +#define HID_DLGHOLIDAYCAL_1_EDMONTH "HID:34705" +#define HID_DLGHOLIDAYCAL_1_SPINYEAR "HID:34706" +#define HID_DLGHOLIDAYCAL_1_SPINMONTH "HID:34707" +#define HID_DLGHOLIDAYCAL_1_CMBSTATE "HID:34708" +#define HID_DLGHOLIDAYCAL_2_LBOWNDATA "HID:34709" +#define HID_DLGHOLIDAYCAL_2_CMDINSERT "HID:34710" +#define HID_DLGHOLIDAYCAL_2_CMDDELETE "HID:34711" +#define HID_DLGHOLIDAYCAL_2_EDEVENT "HID:34712" +#define HID_DLGHOLIDAYCAL_2_CHKEVENT "HID:34713" +#define HID_DLGHOLIDAYCAL_2_EDEVENTDAY "HID:34714" +#define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY "HID:34715" +#define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH "HID:34716" +#define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH "HID:34717" +#define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR "HID:34718" +#define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR "HID:34719" +#define HID_DLGHOLIDAYCAL_0_CMDOWNDATA "HID:34720" +#define HID_DLGHOLIDAYCAL_0_CMDCANCEL "HID:34721" +#define HID_DLGHOLIDAYCAL_0_CMDOK "HID:34722" +//End at 34767 + +//Start at 40768 + +//LetterWizard--------------------------- + +#define HID_LTRWIZ_OPTBUSINESSLETTER "HID:40769" +#define HID_LTRWIZ_OPTPRIVOFFICIALLETTER "HID:40770" +#define HID_LTRWIZ_OPTPRIVATELETTER "HID:40771" +#define HID_LTRWIZ_LSTBUSINESSSTYLE "HID:40772" +#define HID_LTRWIZ_CHKBUSINESSPAPER "HID:40773" +#define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE "HID:40774" +#define HID_LTRWIZ_LSTPRIVATESTYLE "HID:40775" +#define HID_LTRWIZ_CHKPAPERCOMPANYLOGO "HID:40776" +#define HID_LTRWIZ_NUMLOGOHEIGHT "HID:40777" +#define HID_LTRWIZ_NUMLOGOX "HID:40778" +#define HID_LTRWIZ_NUMLOGOWIDTH "HID:40779" +#define HID_LTRWIZ_NUMLOGOY "HID:40780" +#define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS "HID:40781" +#define HID_LTRWIZ_NUMADDRESSHEIGHT "HID:40782" +#define HID_LTRWIZ_NUMADDRESSX "HID:40783" +#define HID_LTRWIZ_NUMADDRESSWIDTH "HID:40784" +#define HID_LTRWIZ_NUMADDRESSY "HID:40785" +#define HID_LTRWIZ_CHKCOMPANYRECEIVER "HID:40786" +#define HID_LTRWIZ_CHKPAPERFOOTER "HID:40787" +#define HID_LTRWIZ_NUMFOOTERHEIGHT "HID:40788" +#define HID_LTRWIZ_LSTLETTERNORM "HID:40789" +#define HID_LTRWIZ_CHKUSELOGO "HID:40790" +#define HID_LTRWIZ_CHKUSEADDRESSRECEIVER "HID:40791" +#define HID_LTRWIZ_CHKUSESIGNS "HID:40792" +#define HID_LTRWIZ_CHKUSESUBJECT "HID:40793" +#define HID_LTRWIZ_CHKUSESALUTATION "HID:40794" +#define HID_LTRWIZ_LSTSALUTATION "HID:40795" +#define HID_LTRWIZ_CHKUSEBENDMARKS "HID:40796" +#define HID_LTRWIZ_CHKUSEGREETING "HID:40797" +#define HID_LTRWIZ_LSTGREETING "HID:40798" +#define HID_LTRWIZ_CHKUSEFOOTER "HID:40799" +#define HID_LTRWIZ_OPTSENDERPLACEHOLDER "HID:40800" +#define HID_LTRWIZ_OPTSENDERDEFINE "HID:40801" +#define HID_LTRWIZ_TXTSENDERNAME "HID:40802" +#define HID_LTRWIZ_TXTSENDERSTREET "HID:40803" +#define HID_LTRWIZ_TXTSENDERPOSTCODE "HID:40804" +#define HID_LTRWIZ_TXTSENDERSTATE_TEXT "HID:40805" +#define HID_LTRWIZ_TXTSENDERCITY "HID:40806" +#define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER "HID:40807" +#define HID_LTRWIZ_OPTRECEIVERDATABASE "HID:40808" +#define HID_LTRWIZ_TXTFOOTER "HID:40809" +#define HID_LTRWIZ_CHKFOOTERNEXTPAGES "HID:40810" +#define HID_LTRWIZ_CHKFOOTERPAGENUMBERS "HID:40811" +#define HID_LTRWIZ_TXTTEMPLATENAME "HID:40812" +#define HID_LTRWIZ_OPTCREATELETTER "HID:40813" +#define HID_LTRWIZ_OPTMAKECHANGES "HID:40814" +#define HID_LTRWIZ_TXTPATH "HID:40815" +#define HID_LTRWIZ_CMDPATH "HID:40816" + +#define HID_LTRWIZARD "HID:40820" +#define HID_LTRWIZARD_HELP "HID:40821" +#define HID_LTRWIZARD_BACK "HID:40822" +#define HID_LTRWIZARD_NEXT "HID:40823" +#define HID_LTRWIZARD_CREATE "HID:40824" +#define HID_LTRWIZARD_CANCEL "HID:40825" + +#define HID_QUERYWIZARD_LSTTABLES "HID:40850" +#define HID_QUERYWIZARD_LSTFIELDS "HID:40851" +#define HID_QUERYWIZARD_CMDMOVESELECTED "HID:40852" +#define HID_QUERYWIZARD_CMDMOVEALL "HID:40853" +#define HID_QUERYWIZARD_CMDREMOVESELECTED "HID:40854" +#define HID_QUERYWIZARD_CMDREMOVEALL "HID:40855" +#define HID_QUERYWIZARD_LSTSELFIELDS "HID:40856" +#define HID_QUERYWIZARD_CMDMOVEUP "HID:40857" +#define HID_QUERYWIZARD_CMDMOVEDOWN "HID:40858" + +#define HID_QUERYWIZARD_SORT1 "HID:40865" +#define HID_QUERYWIZARD_OPTASCEND1 "HID:40866" +#define HID_QUERYWIZARD_OPTDESCEND1 "HID:40867" +#define HID_QUERYWIZARD_SORT2 "HID:40868" +#define HID_QUERYWIZARD_OPTASCEND2 "HID:40869" +#define HID_QUERYWIZARD_OPTDESCEND2 "HID:40870" +#define HID_QUERYWIZARD_SORT3 "HID:40871" +#define HID_QUERYWIZARD_OPTASCEND3 "HID:40872" +#define HID_QUERYWIZARD_OPTDESCEND3 "HID:40873" +#define HID_QUERYWIZARD_SORT4 "HID:40874" +#define HID_QUERYWIZARD_OPTASCEND4 "HID:40875" +#define HID_QUERYWIZARD_OPTDESCEND4 "HID:40876" + +#define HID_QUERYWIZARD_OPTMATCHALL "HID:40878" +#define HID_QUERYWIZARD_OPTMATCHANY "HID:40879" + +#define HID_QUERYWIZARD_LSTFIELDNAME_1 "HID:40880" +#define HID_QUERYWIZARD_LSTOPERATOR_1 "HID:40881" +#define HID_QUERYWIZARD_TXTVALUE_1 "HID:40882" +#define HID_QUERYWIZARD_LSTFIELDNAME_2 "HID:40883" +#define HID_QUERYWIZARD_LSTOPERATOR_2 "HID:40884" +#define HID_QUERYWIZARD_TXTVALUE_2 "HID:40885" +#define HID_QUERYWIZARD_LSTFIELDNAME_3 "HID:40886" +#define HID_QUERYWIZARD_LSTOPERATOR_3 "HID:40887" +#define HID_QUERYWIZARD_TXTVALUE_3 "HID:40888" + +#define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY "HID:40895" +#define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY "HID:40896" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 "HID:40897" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 "HID:40898" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 "HID:40899" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 "HID:40900" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 "HID:40901" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 "HID:40902" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 "HID:40903" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 "HID:40904" +#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 "HID:40905" +#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 "HID:40906" +#define HID_QUERYWIZARD_BTNAGGREGATEPLUS "HID:40907" +#define HID_QUERYWIZARD_BTNAGGREGATEMINUS "HID:40908" + +#define HID_QUERYWIZARD_LSTFILTERFIELDS "HID:40915" +#define HID_QUERYWIZARD_CMDFILTERMOVESELECTED "HID:40916" +#define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED "HID:40917" +#define HID_QUERYWIZARD_LSTFILTERSELFIELDS "HID:40918" +#define HID_QUERYWIZARD_CMDFILTERMOVEUP "HID:40919" +#define HID_QUERYWIZARD_CMDFILTERMOVEDOWN "HID:40920" + +#define HID_QUERYWIZARD_OPTGROUPMATCHALL "HID:40923" +#define HID_QUERYWIZARD_OPTGROUPMATCHANY "HID:40924" + +#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 "HID:40925" +#define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 "HID:40926" +#define HID_QUERYWIZARD_TXTFILTERVALUE_1 "HID:40927" +#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 "HID:40928" +#define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 "HID:40929" +#define HID_QUERYWIZARD_TXTFILTERVALUE_2 "HID:40930" +#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 "HID:40931" +#define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 "HID:40932" +#define HID_QUERYWIZARD_TXTFILTERVALUE_3 "HID:40933" + +#define HID_QUERYWIZARD_TXTTITLE_1 "HID:40940" +#define HID_QUERYWIZARD_TXTTITLE_2 "HID:40941" +#define HID_QUERYWIZARD_TXTTITLE_3 "HID:40942" +#define HID_QUERYWIZARD_TXTTITLE_4 "HID:40943" +#define HID_QUERYWIZARD_TXTTITLE_5 "HID:40944" +#define HID_QUERYWIZARD_TXTTITLE_6 "HID:40945" +#define HID_QUERYWIZARD_TXTTITLE_7 "HID:40946" + +#define HID_QUERYWIZARD_TXTQUERYTITLE "HID:40955" +#define HID_QUERYWIZARD_OPTDISPLAYQUERY "HID:40956" +#define HID_QUERYWIZARD_OPTMODIFYQUERY "HID:40957" +#define HID_QUERYWIZARD_TXTSUMMARY "HID:40958" + +#define HID_QUERYWIZARD "HID:40970" +#define HID_QUERYWIZARD_BACK "HID:40972" +#define HID_QUERYWIZARD_NEXT "HID:40973" +#define HID_QUERYWIZARD_CREATE "HID:40974" +#define HID_QUERYWIZARD_CANCEL "HID:40975" + +// ++++++++++++++++++++++++++++++++++++++ +// +++ Web Wizard : Continued from 34312 +// ++++++++++++++++++++++++++++++++++++++ +// web wizard iconssets dialog +#define HID_IS "HID:41000" +#define HID_IS_BTN_NONE "HID:41002" +#define HID_IS_BTN_OK "HID:41003" +#define HID_IS_BTN_CANCEL "HID:41004" + +#define HID_IS_BTN_IMG1 "HID:41005" +#define HID_IS_BTN_IMG2 "HID:41006" +#define HID_IS_BTN_IMG3 "HID:41007" +#define HID_IS_BTN_IMG4 "HID:41008" +#define HID_IS_BTN_IMG5 "HID:41009" +#define HID_IS_BTN_IMG6 "HID:41010" +#define HID_IS_BTN_IMG7 "HID:41011" +#define HID_IS_BTN_IMG8 "HID:41012" +#define HID_IS_BTN_IMG9 "HID:41013" +#define HID_IS_BTN_IMG10 "HID:41014" +#define HID_IS_BTN_IMG11 "HID:41015" +#define HID_IS_BTN_IMG12 "HID:41016" +#define HID_IS_BTN_IMG13 "HID:41017" +#define HID_IS_BTN_IMG14 "HID:41018" +#define HID_IS_BTN_IMG15 "HID:41019" +#define HID_IS_BTN_IMG16 "HID:41020" +#define HID_IS_BTN_IMG17 "HID:41021" +#define HID_IS_BTN_IMG18 "HID:41022" +#define HID_IS_BTN_IMG19 "HID:41023" +#define HID_IS_BTN_IMG20 "HID:41024" +#define HID_IS_BTN_IMG21 "HID:41025" +#define HID_IS_BTN_IMG22 "HID:41026" +#define HID_IS_BTN_IMG23 "HID:41027" +#define HID_IS_BTN_IMG24 "HID:41028" +#define HID_IS_BTN_IMG25 "HID:41029" +#define HID_IS_BTN_IMG26 "HID:41030" +#define HID_IS_BTN_IMG27 "HID:41031" +#define HID_IS_BTN_IMG28 "HID:41032" +#define HID_IS_BTN_IMG29 "HID:41033" +#define HID_IS_BTN_IMG30 "HID:41034" +#define HID_IS_BTN_IMG31 "HID:41035" +#define HID_IS_BTN_IMG32 "HID:41036" + +// web wizard ftp dialog +#define HID_FTP "HID:41040" +#define HID_FTP_SERVER "HID:41041" +#define HID_FTP_USERNAME "HID:41042" +#define HID_FTP_PASS "HID:41043" +#define HID_FTP_TEST "HID:41044" +#define HID_FTP_TXT_PATH "HID:41045" +#define HID_FTP_BTN_PATH "HID:41046" +#define HID_FTP_OK "HID:41047" +#define HID_FTP_CANCEL "HID:41048" + + +/* ==================================== + * AGENDA WIZARD + * 41051 - 41099 + * ==================================== + */ + +// step 0 - navibar + +#define HID_AGWIZ "HID:41051" +#define HID_AGWIZ_HELP "HID:41052" +#define HID_AGWIZ_NEXT "HID:41053" +#define HID_AGWIZ_PREV "HID:41054" +#define HID_AGWIZ_CREATE "HID:41055" +#define HID_AGWIZ_CANCEL "HID:41056" + +//step 1 - design + +#define HID_AGWIZ_1_LIST_PAGEDESIGN "HID:41057" +#define HID_AGWIZ_1_CHK_MINUTES "HID:41058" + +// step 2 - general attributes + +#define HID_AGWIZ_2_TXT_TIME "HID:41059" +#define HID_AGWIZ_2_TXT_DATE "HID:41060" +#define HID_AGWIZ_2_TXT_TITLE "HID:41061" +#define HID_AGWIZ_2_TXT_LOCATION "HID:41062" + +// step 3 - headings + +#define HID_AGWIZ_3_CHK_MEETING_TYPE "HID:41063" +#define HID_AGWIZ_3_CHK_READ "HID:41064" +#define HID_AGWIZ_3_CHK_BRING "HID:41065" +#define HID_AGWIZ_3_CHK_NOTES "HID:41066" + +// step 4 - names + +#define HID_AGWIZ_4_CHK_CALLED_BY "HID:41067" +#define HID_AGWIZ_4_CHK_FACILITATOR "HID:41068" +#define HID_AGWIZ_4_CHK_NOTETAKER "HID:41069" +#define HID_AGWIZ_4_CHK_TIMEKEEPER "HID:41070" +#define HID_AGWIZ_4_CHK_ATTENDEES "HID:41071" +#define HID_AGWIZ_4_CHK_OBSERVERS "HID:41072" +#define HID_AGWIZ_4_CHK_RESOURCEPERSONS "HID:41073" + +// step 5 - topics + +#define HID_AGWIZ_6_TXT_TEMPLATENAME "HID:41074" +#define HID_AGWIZ_6_TXT_TEMPLATEPATH "HID:41075" +#define HID_AGWIZ_6_BTN_TEMPLATEPATH "HID:41076" + +// step 6 - file info + +#define HID_AGWIZ_6_OPT_CREATEAGENDA "HID:41077" +#define HID_AGWIZ_6_OPT_MAKECHANGES "HID:41078" + +// - again step 5 - buttons + +#define HID_AGWIZ_5_BTN_INSERT "HID:41079" +#define HID_AGWIZ_5_BTN_REMOVE "HID:41080" +#define HID_AGWIZ_5_BTN_UP "HID:41081" +#define HID_AGWIZ_5_BTN_DOWN "HID:41082" + +// again step 5 - scroll control + +#define HID_AGWIZ_5_SCROLL_BAR "HID:41083" + +#define HID_AGWIZ_5_TXT_TOPIC_1 "HID:41084" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_1 "HID:41085" +#define HID_AGWIZ_5_TXT_MINUTES_1 "HID:41086" + +#define HID_AGWIZ_5_TXT_TOPIC_2 "HID:41087" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_2 "HID:41088" +#define HID_AGWIZ_5_TXT_MINUTES_2 "HID:41089" + +#define HID_AGWIZ_5_TXT_TOPIC_3 "HID:41090" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_3 "HID:41091" +#define HID_AGWIZ_5_TXT_MINUTES_3 "HID:41092" + +#define HID_AGWIZ_5_TXT_TOPIC_4 "HID:41093" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_4 "HID:41094" +#define HID_AGWIZ_5_TXT_MINUTES_4 "HID:41095" + +#define HID_AGWIZ_5_TXT_TOPIC_5 "HID:41096" +#define HID_AGWIZ_5_TXT_RESPONSIBLE_5 "HID:41097" +#define HID_AGWIZ_5_TXT_MINUTES_5 "HID:41098" + + +//FaxWizard--------------------------- + +#define HID_FAXWIZ_OPTBUSINESSFAX "HID:41120" +#define HID_FAXWIZ_LSTBUSINESSSTYLE "HID:41121" +#define HID_FAXWIZ_OPTPRIVATEFAX "HID:41122" +#define HID_LSTPRIVATESTYLE "HID:41123" +#define HID_IMAGECONTROL3 "HID:41124" +#define HID_CHKUSELOGO "HID:41125" +#define HID_CHKUSEDATE "HID:41126" +#define HID_CHKUSECOMMUNICATIONTYPE "HID:41127" +#define HID_LSTCOMMUNICATIONTYPE "HID:41128" +#define HID_CHKUSESUBJECT "HID:41129" +#define HID_CHKUSESALUTATION "HID:41130" +#define HID_LSTSALUTATION "HID:41131" +#define HID_CHKUSEGREETING "HID:41132" +#define HID_LSTGREETING "HID:41133" +#define HID_CHKUSEFOOTER "HID:41134" +#define HID_OPTSENDERPLACEHOLDER "HID:41135" +#define HID_OPTSENDERDEFINE "HID:41136" +#define HID_TXTSENDERNAME "HID:41137" +#define HID_TXTSENDERSTREET "HID:41138" +#define HID_TXTSENDERPOSTCODE "HID:41139" +#define HID_TXTSENDERSTATE "HID:41140" +#define HID_TXTSENDERCITY "HID:41141" +#define HID_TXTSENDERFAX "HID:41142" +#define HID_OPTRECEIVERPLACEHOLDER "HID:41143" +#define HID_OPTRECEIVERDATABASE "HID:41144" +#define HID_TXTFOOTER "HID:41145" +#define HID_CHKFOOTERNEXTPAGES "HID:41146" +#define HID_CHKFOOTERPAGENUMBERS "HID:41147" +#define HID_TXTTEMPLATENAME "HID:41148" +#define HID_FILETEMPLATEPATH "HID:41149" +#define HID_OPTCREATEFAX "HID:41150" +#define HID_OPTMAKECHANGES "HID:41151" +#define HID_IMAGECONTROL2 "HID:41152" +#define HID_FAXWIZ_TXTPATH "HID:41153" +#define HID_FAXWIZ_CMDPATH "HID:41154" + +#define HID_FAXWIZARD "HID:41180" +#define HID_FAXWIZARD_HELP "HID:41181" +#define HID_FAXWIZARD_BACK "HID:41182" +#define HID_FAXWIZARD_NEXT "HID:41183" +#define HID_FAXWIZARD_CREATE "HID:41184" +#define HID_FAXWIZARD_CANCEL "HID:41185" + + + +/* ==================================== + * TableWizard + * ==================================== + */ + +#define HID_DLGTABLE_DIALOG "HID:41200" +#define HID_DLGTABLE_CMDPREV "HID:41202" +#define HID_DLGTABLE_CMDNEXT "HID:41203" +#define HID_DLGTABLE_CMDFINISH "HID:41204" +#define HID_DLGTABLE_CMDCANCEL "HID:41205" + + +#define HID_DLGTABLE_OPTBUSINESS "HID:41206" +#define HID_DLGTABLE_OPTPRIVATE "HID:41207" + + +#define HID_DLGTABLE_LBTABLES "HID:41208" +#define HID_DLGTABLE_FIELDSAVAILABLE "HID:41209" +#define HID_DLGTABLE_CMDMOVESELECTED "HID:41210" +#define HID_DLGTABLE_CMDMOVEALL "HID:41211" +#define HID_DLGTABLE_CMDREMOVESELECTED "HID:41212" +#define HID_DLGTABLE_CMDREMOVEALL "HID:41213" +#define HID_DLGTABLE_FIELDSSELECTED "HID:41214" + +#define HID_DLGTABLE_CMDMOVEUP "HID:41215" +#define HID_DLGTABLE_CMDMOVEDOWN "HID:41216" + + +#define HID_DLGTABLE_LB_SELFIELDNAMES "HID:41220" +#define HID_DLGTABLE_CMDMOVEFIELDUP "HID:41221" +#define HID_DLGTABLE_CMDMOVEFIELDDOWN "HID:41222" +#define HID_DLGTABLE_CMDMINUS "HID:41223" +#define HID_DLGTABLE_CMDPLUS "HID:41224" +#define HID_DLGTABLE_COLNAME "HID:41225" +#define HID_DLGTABLE_COLMODIFIER "HID:41226" + + +#define HID_DLGTABLE_CHK_USEPRIMEKEY "HID:41227" +#define HID_DLGTABLE_OPT_PK_AUTOMATIC "HID:41228" + +#define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC "HID:41229" + +#define HID_DLGTABLE_OPT_PK_SINGLE "HID:41230" +#define HID_DLGTABLE_LB_PK_FIELDNAME "HID:41231" +#define HID_DLGTABLE_CK_PK_AUTOVALUE "HID:41232" +#define HID_DLGTABLE_OPT_PK_SEVERAL "HID:41233" +#define HID_DLGTABLE_FIELDS_PK_AVAILABLE "HID:41234" +#define HID_DLGTABLE_CMDMOVE_PK_SELECTED "HID:41235" +#define HID_DLGTABLE_CMDREMOVE_PK_SELECTED "HID:41236" +#define HID_DLGTABLE_FIELDS_PK_SELECTED "HID:41237" + +#define HID_DLGTABLE_CMDMOVEUP_PK_SELECTED "HID:41238" +#define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED "HID:41239" + + + + +#define HID_DLGTABLE_TXT_NAME "HID:41240" +#define HID_DLGTABLE_OPT_MODIFYTABLE "HID:41241" +#define HID_DLGTABLE_OPT_WORKWITHTABLE "HID:41242" +#define HID_DLGTABLE_OPT_STARTFORMWIZARD "HID:41243" +#define HID_DLGTABLE_LST_CATALOG "HID:41244" +#define HID_DLGTABLE_LST_SCHEMA "HID:41245" + + + + +//End at 42767 diff --git a/wizards/util/hidother.src b/wizards/util/hidother.src index 7f706a69b657..523dc0afdc6a 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; }; -- cgit From 0b00bc90e43f36485e3ba00eb7f924a935e89b00 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 21 Jul 2010 17:46:17 +0200 Subject: CWS changehid: #i111784#: convert wizards module --- .../star/wizards/agenda/AgendaWizardDialog.java | 3 +- .../wizards/agenda/AgendaWizardDialogConst.java | 66 +- .../wizards/agenda/AgendaWizardDialogImpl.java | 6 +- .../com/sun/star/wizards/agenda/TopicsControl.java | 7 +- wizards/com/sun/star/wizards/common/HelpIds.java | 1016 ++++++++++++++ .../sun/star/wizards/fax/FaxWizardDialogConst.java | 69 +- .../sun/star/wizards/fax/FaxWizardDialogImpl.java | 2 +- .../com/sun/star/wizards/form/DataEntrySetter.java | 10 +- wizards/com/sun/star/wizards/form/FieldLinker.java | 5 +- wizards/com/sun/star/wizards/form/Finalizer.java | 6 +- .../sun/star/wizards/form/FormConfiguration.java | 8 +- .../com/sun/star/wizards/form/StyleApplier.java | 8 +- .../sun/star/wizards/form/UIControlArranger.java | 6 +- .../star/wizards/letter/LetterWizardDialog.java | 94 +- .../wizards/letter/LetterWizardDialogImpl.java | 2 +- wizards/com/sun/star/wizards/makefile.mk | 1 + wizards/com/sun/star/wizards/query/Finalizer.java | 8 +- .../com/sun/star/wizards/report/Dataimport.java | 2 +- .../sun/star/wizards/report/ReportFinalizer.java | 10 +- .../sun/star/wizards/report/ReportLayouter.java | 8 +- .../com/sun/star/wizards/table/FieldFormatter.java | 14 +- wizards/com/sun/star/wizards/table/Finalizer.java | 12 +- .../sun/star/wizards/table/PrimaryKeyHandler.java | 14 +- .../sun/star/wizards/table/ScenarioSelector.java | 6 +- .../sun/star/wizards/ui/AggregateComponent.java | 13 +- wizards/com/sun/star/wizards/ui/ButtonList.java | 9 +- .../sun/star/wizards/ui/CommandFieldSelection.java | 2 +- .../com/sun/star/wizards/ui/ControlScroller.java | 3 +- .../com/sun/star/wizards/ui/FieldSelection.java | 18 +- .../com/sun/star/wizards/ui/FilterComponent.java | 34 +- wizards/com/sun/star/wizards/ui/ImageList.java | 7 +- .../com/sun/star/wizards/ui/SortingComponent.java | 6 +- .../com/sun/star/wizards/ui/TitlesComponent.java | 2 +- wizards/com/sun/star/wizards/ui/WizardDialog.java | 12 +- wizards/com/sun/star/wizards/web/FTPDialog.java | 19 +- .../com/sun/star/wizards/web/ImageListDialog.java | 11 +- wizards/com/sun/star/wizards/web/WWD_General.java | 3 +- .../com/sun/star/wizards/web/WebWizardDialog.java | 89 +- wizards/source/depot/Dialog2.xdl | 24 +- wizards/source/depot/Dialog3.xdl | 30 +- wizards/source/depot/Dialog4.xdl | 8 +- wizards/source/euro/DlgConvert.xdl | 40 +- wizards/source/euro/DlgPassword.xdl | 6 +- wizards/source/formwizard/DlgFormDB.xdl | 40 +- wizards/source/importwizard/ImportDialog.xdl | 54 +- wizards/source/schedule/DlgCalendar.xdl | 32 +- wizards/source/template/DialogStyles.xdl | 8 +- wizards/source/template/TemplateDialog.xdl | 16 +- wizards/source/webwizard/WebWzrd.xdl | 16 +- wizards/util/helpids.h | 1380 ++++++++++---------- 50 files changed, 2135 insertions(+), 1130 deletions(-) create mode 100644 wizards/com/sun/star/wizards/common/HelpIds.java diff --git a/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java b/wizards/com/sun/star/wizards/agenda/AgendaWizardDialog.java index 55119ea28325..86567277da1d 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 08f2fabfb8d9..87d60d916731 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 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 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 TXTTEMPLATENAME_HID = "HID:" + (HID + 23); - final String TXTTEMPLATEPATH_HID = "HID:" + (HID + 24); - final String BTNTEMPLATEPATH_HID = "HID:" + (HID + 25); - - final String OPTCREATEAGENDA_HID = "HID:" + (HID + 26); - final String OPTMAKECHANGES_HID = "HID:" + (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 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 = 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 = 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 = HelpIds.getHelpIdString((HID + 23)); + final String TXTTEMPLATEPATH_HID = HelpIds.getHelpIdString((HID + 24)); + final String BTNTEMPLATEPATH_HID = HelpIds.getHelpIdString((HID + 25)); + + final String OPTCREATEAGENDA_HID = HelpIds.getHelpIdString((HID + 26)); + final String OPTMAKECHANGES_HID = HelpIds.getHelpIdString((HID + 27)); + + 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 4701f27110cd..26aa9d2d8486 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/TopicsControl.java b/wizards/com/sun/star/wizards/agenda/TopicsControl.java index eb13e2f8b65c..3cd1e550e874 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/common/HelpIds.java b/wizards/com/sun/star/wizards/common/HelpIds.java new file mode 100644 index 000000000000..2cd0b8da86de --- /dev/null +++ b/wizards/com/sun/star/wizards/common/HelpIds.java @@ -0,0 +1,1016 @@ +/************************************************************************* + * + * 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 + * + * 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/fax/FaxWizardDialogConst.java b/wizards/com/sun/star/wizards/fax/FaxWizardDialogConst.java index 743173373b54..a3c5c8e488dd 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 dac35cabc04a..0cc5268accc0 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/form/DataEntrySetter.java b/wizards/com/sun/star/wizards/form/DataEntrySetter.java index 2844e0b53104..7fab3dcdd5b1 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 f5555421a4b3..a3b4b7f5b70a 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 fa1f9ce56074..d8ce6262731a 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 8e2c36ae0966..d1f1afdfac54 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 79e0321a3c0b..56337202a213 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 b596efe143ea..0add27db3625 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/letter/LetterWizardDialog.java b/wizards/com/sun/star/wizards/letter/LetterWizardDialog.java index e0b8a8c2579e..ffdec06942a6 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 106fb68a172e..f992ef98b56b 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/makefile.mk b/wizards/com/sun/star/wizards/makefile.mk index fb9c3e18558d..a9ec3e2d5735 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/Finalizer.java b/wizards/com/sun/star/wizards/query/Finalizer.java index 35d1edf37bde..f60422503be3 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/report/Dataimport.java b/wizards/com/sun/star/wizards/report/Dataimport.java index 8547758a08e6..7c3aeaaab073 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 1482e118e516..7c40c01809d2 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 d1532b47dc4a..355188e7e675 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/table/FieldFormatter.java b/wizards/com/sun/star/wizards/table/FieldFormatter.java index 205413bd50f3..1c79b36cba58 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 43c6787a294c..17db2aea61a3 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 d8ecf13a9ad9..2a59ece3e5f1 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 4f985c18e055..8936f43e3250 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/ui/AggregateComponent.java b/wizards/com/sun/star/wizards/ui/AggregateComponent.java index 55a6b35dc7e9..f59d06772a83 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 634261145079..770210e04706 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 ddca1039706a..c239c9fec4d2 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 f42fe81134a9..aff4de7127c9 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 803f85948721..ce3c7c8c4849 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 85b797d3b640..2bb9e8765329 100644 --- a/wizards/com/sun/star/wizards/ui/FilterComponent.java +++ b/wizards/com/sun/star/wizards/ui/FilterComponent.java @@ -50,6 +50,7 @@ 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; @@ -488,7 +489,7 @@ public class FilterComponent new Object[] { Integer.valueOf(9), - "HID:" + curHelpID++, + HelpIds.getHelpIdString(curHelpID++), soptMatchAll, Integer.valueOf(iPosX), Integer.valueOf(iPosY), @@ -512,7 +513,7 @@ public class FilterComponent new Object[] { Integer.valueOf(9), - "HID:" + curHelpID++, + HelpIds.getHelpIdString(curHelpID++), soptMatchAny, Integer.valueOf(iPosX), Integer.valueOf(iPosY + 12), @@ -713,7 +714,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 +744,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,7 +769,7 @@ public class FilterComponent { Boolean.valueOf(isEnabled()), Integer.valueOf(13), - "HID:" + _firstRowHelpID++, + HelpIds.getHelpIdString(_firstRowHelpID++), Integer.valueOf(nPosX3), Integer.valueOf(iCompPosY + 23), IStep, @@ -776,29 +777,6 @@ public class FilterComponent 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) { diff --git a/wizards/com/sun/star/wizards/ui/ImageList.java b/wizards/com/sun/star/wizards/ui/ImageList.java index dcd378369c5f..56e2edb3172f 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 29b646d3e852..75194d21b199 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 d4091c964e14..892a59c669f8 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 f17c44b82aa5..50ff51c5bbd4 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/FTPDialog.java b/wizards/com/sun/star/wizards/web/FTPDialog.java index 1cc68ed8491f..2085704cf359 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.
@@ -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 976d61222e72..c3ea98688c64 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 d4e273f4889b..551a4b1437f2 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 736639972c44..23adc86dfca1 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/source/depot/Dialog2.xdl b/wizards/source/depot/Dialog2.xdl index a46fe9f5b383..652acaa1942a 100644 --- a/wizards/source/depot/Dialog2.xdl +++ b/wizards/source/depot/Dialog2.xdl @@ -1,34 +1,34 @@ - + - + - + - + - - - + + + - + - - + + - + - + diff --git a/wizards/source/depot/Dialog3.xdl b/wizards/source/depot/Dialog3.xdl index 4c6cabd20f96..87bda0197f28 100644 --- a/wizards/source/depot/Dialog3.xdl +++ b/wizards/source/depot/Dialog3.xdl @@ -1,34 +1,34 @@ - + - + - - + + - + - - + + - + - - + + - - + + - + @@ -39,7 +39,7 @@ - - + + \ No newline at end of file diff --git a/wizards/source/depot/Dialog4.xdl b/wizards/source/depot/Dialog4.xdl index 4f71be0da5cb..f5c86ce47355 100644 --- a/wizards/source/depot/Dialog4.xdl +++ b/wizards/source/depot/Dialog4.xdl @@ -1,16 +1,16 @@ - + - + - + - + diff --git a/wizards/source/euro/DlgConvert.xdl b/wizards/source/euro/DlgConvert.xdl index 43bfeea34d9a..18f3caef0454 100644 --- a/wizards/source/euro/DlgConvert.xdl +++ b/wizards/source/euro/DlgConvert.xdl @@ -1,52 +1,52 @@ - + - + - + - + - + - + - + - + - + - + - + - + - - - - - + + + + + @@ -63,14 +63,14 @@ - + - + - + diff --git a/wizards/source/euro/DlgPassword.xdl b/wizards/source/euro/DlgPassword.xdl index def861d97ebe..976891a48d71 100644 --- a/wizards/source/euro/DlgPassword.xdl +++ b/wizards/source/euro/DlgPassword.xdl @@ -2,14 +2,14 @@ - + - + - + \ No newline at end of file diff --git a/wizards/source/formwizard/DlgFormDB.xdl b/wizards/source/formwizard/DlgFormDB.xdl index ade138e06b9a..269b7e61819f 100644 --- a/wizards/source/formwizard/DlgFormDB.xdl +++ b/wizards/source/formwizard/DlgFormDB.xdl @@ -1,30 +1,30 @@ - + - + - + - + - + - + - + @@ -42,34 +42,34 @@ - + - + - + - + - + - + - + - + - + @@ -78,10 +78,10 @@ - + - + @@ -90,10 +90,10 @@ - + - + diff --git a/wizards/source/importwizard/ImportDialog.xdl b/wizards/source/importwizard/ImportDialog.xdl index 082c06bc8970..f28bc1192807 100644 --- a/wizards/source/importwizard/ImportDialog.xdl +++ b/wizards/source/importwizard/ImportDialog.xdl @@ -1,90 +1,90 @@ - + - + - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff --git a/wizards/source/schedule/DlgCalendar.xdl b/wizards/source/schedule/DlgCalendar.xdl index 7f1b68d895e7..2936a5ebe6da 100644 --- a/wizards/source/schedule/DlgCalendar.xdl +++ b/wizards/source/schedule/DlgCalendar.xdl @@ -1,64 +1,64 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + \ No newline at end of file diff --git a/wizards/source/template/DialogStyles.xdl b/wizards/source/template/DialogStyles.xdl index a28beb14cd27..35042849c2f6 100644 --- a/wizards/source/template/DialogStyles.xdl +++ b/wizards/source/template/DialogStyles.xdl @@ -1,14 +1,14 @@ - + - + - + - + diff --git a/wizards/source/template/TemplateDialog.xdl b/wizards/source/template/TemplateDialog.xdl index eb4cc696987a..4b8633f231a3 100644 --- a/wizards/source/template/TemplateDialog.xdl +++ b/wizards/source/template/TemplateDialog.xdl @@ -1,26 +1,26 @@ - + - + - + - + - - + + - + - + diff --git a/wizards/source/webwizard/WebWzrd.xdl b/wizards/source/webwizard/WebWzrd.xdl index be1bec77eb40..ac826e242aa7 100644 --- a/wizards/source/webwizard/WebWzrd.xdl +++ b/wizards/source/webwizard/WebWzrd.xdl @@ -1,25 +1,25 @@ - + - - - + + + - + - + - + - + diff --git a/wizards/util/helpids.h b/wizards/util/helpids.h index b42e82d97995..8b40214ceda6 100644 --- a/wizards/util/helpids.h +++ b/wizards/util/helpids.h @@ -45,116 +45,116 @@ // *************** //webwizardgeneralcontrols -#define HID0_WEBWIZARD "HID:34200" -#define HID0_HELP "HID:34201" -#define HID0_NEXT "HID:34202" -#define HID0_PREV "HID:34203" -#define HID0_CREATE "HID:34204" -#define HID0_CANCEL "HID:34205" -#define HID0_STATUS_DIALOG "HID:34206" +#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 "HID:34207" -#define HID1_BTN_DEL_SES "HID:34209" +#define HID1_LST_SESSIONS "WIZARDS_HID1_LST_SESSIONS" +#define HID1_BTN_DEL_SES "WIZARDS_HID1_BTN_DEL_SES" //step2 -#define HID2_LST_DOCS "HID:34210" -#define HID2_BTN_ADD_DOC "HID:34211" -#define HID2_BTN_REM_DOC "HID:34212" -#define HID2_BTN_DOC_UP "HID:34213" -#define HID2_BTN_DOC_DOWN "HID:34214" -#define HID2_TXT_DOC_TITLE "HID:34215" -#define HID2_TXT_DOC_DESC "HID:34216" -#define HID2_TXT_DOC_AUTHOR "HID:34217" -#define HID2_LST_DOC_EXPORT "HID:34218" -#define HID2_STATUS_ADD_DOCS "HID:34219" +#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 "HID:34220" -#define HID3_IL_LAYOUTS_IMG2 "HID:34221" -#define HID3_IL_LAYOUTS_IMG3 "HID:34222" -#define HID3_IL_LAYOUTS_IMG4 "HID:34223" -#define HID3_IL_LAYOUTS_IMG5 "HID:34224" -#define HID3_IL_LAYOUTS_IMG6 "HID:34225" -#define HID3_IL_LAYOUTS_IMG7 "HID:34226" -#define HID3_IL_LAYOUTS_IMG8 "HID:34227" -#define HID3_IL_LAYOUTS_IMG9 "HID:34228" -#define HID3_IL_LAYOUTS_IMG10 "HID:34229" -#define HID3_IL_LAYOUTS_IMG11 "HID:34230" -#define HID3_IL_LAYOUTS_IMG12 "HID:34231" -#define HID3_IL_LAYOUTS_IMG13 "HID:34232" -#define HID3_IL_LAYOUTS_IMG14 "HID:34233" -#define HID3_IL_LAYOUTS_IMG15 "HID:34234" +#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 "HID:34235" -#define HID4_CHK_DISPLAY_DESCRIPTION "HID:34236" -#define HID4_CHK_DISPLAY_AUTHOR "HID:34237" -#define HID4_CHK_DISPLAY_CR_DATE "HID:34238" -#define HID4_CHK_DISPLAY_UP_DATE "HID:34239" -#define HID4_CHK_DISPLAY_FORMAT "HID:34240" -#define HID4_CHK_DISPLAY_F_ICON "HID:34241" -#define HID4_CHK_DISPLAY_PAGES "HID:34242" -#define HID4_CHK_DISPLAY_SIZE "HID:34243" +#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 "HID:34244" -#define HID4_GRP_OPTIMAIZE_800 "HID:34245" -#define HID4_GRP_OPTIMAIZE_1024 "HID:34246" +#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 "HID:34247" -#define HID5_BTN_BACKGND "HID:34248" -#define HID5_BTN_ICONS "HID:34249" +#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 "HID:34250" -#define HID6_TXT_SITE_DESC "HID:34253" -#define HID6_DATE_SITE_CREATED "HID:34255" -#define HID6_DATE_SITE_UPDATED "HID:34256" -#define HID6_TXT_SITE_EMAIL "HID:34258" -#define HID6_TXT_SITE_COPYRIGHT "HID:34259" +#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 "HID:34260" -#define HID7_CHK_PUBLISH_LOCAL "HID:34261" -#define HID7_TXT_LOCAL "HID:34262" -#define HID7_BTN_LOCAL "HID:34263" -#define HID7_CHK_PUBLISH_ZIP "HID:34264" -#define HID7_TXT_ZIP "HID:34265" -#define HID7_BTN_ZIP "HID:34266" -#define HID7_CHK_PUBLISH_FTP "HID:34267" -#define HID7_TXT_FTP "HID:34268" -#define HID7_BTN_FTP "HID:34269" -#define HID7_CHK_SAVE "HID:34270" -#define HID7_TXT_SAVE "HID:34271" +#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 "HID:34290" -#define HID_BG_BTN_OTHER "HID:34291" -#define HID_BG_BTN_NONE "HID:34292" -#define HID_BG_BTN_OK "HID:34293" -#define HID_BG_BTN_CANCEL "HID:34294" - -#define HID_BG_BTN_BACK "HID:34295" -#define HID_BG_BTN_FW "HID:34296" -#define HID_BG_BTN_IMG1 "HID:34297" -#define HID_BG_BTN_IMG2 "HID:34298" -#define HID_BG_BTN_IMG3 "HID:34299" -#define HID_BG_BTN_IMG4 "HID:34300" -#define HID_BG_BTN_IMG5 "HID:34301" -#define HID_BG_BTN_IMG6 "HID:34302" -#define HID_BG_BTN_IMG7 "HID:34303" -#define HID_BG_BTN_IMG8 "HID:34304" -#define HID_BG_BTN_IMG9 "HID:34305" -#define HID_BG_BTN_IMG10 "HID:34306" -#define HID_BG_BTN_IMG11 "HID:34307" -#define HID_BG_BTN_IMG12 "HID:34308" -#define HID_BG_BTN_IMG13 "HID:34309" -#define HID_BG_BTN_IMG14 "HID:34300" -#define HID_BG_BTN_IMG15 "HID:34311" -#define HID_BG_BTN_IMG16 "HID:34312" +#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. @@ -165,66 +165,66 @@ // REPORT WIZARD // ************* -#define HID_DLGREPORT_DIALOG "HID:34320" -#define HID_DLGREPORT_0_CMDPREV "HID:34322" -#define HID_DLGREPORT_0_CMDNEXT "HID:34323" -#define HID_DLGREPORT_0_CMDFINISH "HID:34324" -#define HID_DLGREPORT_0_CMDCANCEL "HID:34325" - -#define HID_DLGREPORT_1_LBTABLES "HID:34330" -#define HID_DLGREPORT_1_FIELDSAVAILABLE "HID:34331" -#define HID_DLGREPORT_1_CMDMOVESELECTED "HID:34332" -#define HID_DLGREPORT_1_CMDMOVEALL "HID:34333" -#define HID_DLGREPORT_1_CMDREMOVESELECTED "HID:34334" -#define HID_DLGREPORT_1_CMDREMOVEALL "HID:34335" -#define HID_DLGREPORT_1_FIELDSSELECTED "HID:34336" -#define HID_DLGREPORT_1_CMDMOVEUP "HID:34337" -#define HID_DLGREPORT_1_CMDMOVEDOWN "HID:34338" - - -#define HID_DLGREPORT_2_GROUPING "HID:34340" -#define HID_DLGREPORT_2_CMDGROUP "HID:34341" -#define HID_DLGREPORT_2_CMDUNGROUP "HID:34342" -#define HID_DLGREPORT_2_PREGROUPINGDEST "HID:34343" -#define HID_DLGREPORT_2_CMDMOVEUPGROUP "HID:34344" -#define HID_DLGREPORT_2_CMDMOVEDOWNGROUP "HID:34345" - - -#define HID_DLGREPORT_3_SORT1 "HID:34346" -#define HID_DLGREPORT_3_OPTASCEND1 "HID:34347" -#define HID_DLGREPORT_3_OPTDESCEND1 "HID:34348" -#define HID_DLGREPORT_3_SORT2 "HID:34349" -#define HID_DLGREPORT_3_OPTASCEND2 "HID:34350" -#define HID_DLGREPORT_3_OPTDESCEND2 "HID:34351" -#define HID_DLGREPORT_3_SORT3 "HID:34352" -#define HID_DLGREPORT_3_OPTASCEND3 "HID:34353" -#define HID_DLGREPORT_3_OPTDESCEND3 "HID:34354" -#define HID_DLGREPORT_3_SORT4 "HID:34355" -#define HID_DLGREPORT_3_OPTASCEND4 "HID:34356" -#define HID_DLGREPORT_3_OPTDESCEND4 "HID:34357" - -#define HID_DLGREPORT_4_TITLE "HID:34362" -#define HID_DLGREPORT_4_DATALAYOUT "HID:34363" -#define HID_DLGREPORT_4_PAGELAYOUT "HID:34364" -#define HID_DLGREPORT_4_LANDSCAPE "HID:34365" -#define HID_DLGREPORT_4_PORTRAIT "HID:34366" - -#define HID_DLGREPORT_5_OPTDYNTEMPLATE "HID:34370" -#define HID_DLGREPORT_5_OPTSTATDOCUMENT "HID:34371" -#define HID_DLGREPORT_5_TXTTEMPLATEPATH "HID:34372" -#define HID_DLGREPORT_5_CMDTEMPLATEPATH "HID:34373" -#define HID_DLGREPORT_5_OPTEDITTEMPLATE "HID:34374" -#define HID_DLGREPORT_5_OPTUSETEMPLATE "HID:34375" -#define HID_DLGREPORT_5_TXTDOCUMENTPATH "HID:34376" -#define HID_DLGREPORT_5_CMDDOCUMENTPATH "HID:34377" -#define HID_DLGREPORT_5_CHKLINKTODB "HID:34378" -#define HID_DLGREPORT_6_TXTTITLE_1 "HID:34381" -#define HID_DLGREPORT_6_TXTTITLE_2 "HID:34382" -#define HID_DLGREPORT_6_TXTTITLE_3 "HID:34383" -#define HID_DLGREPORT_6_TXTTITLE_4 "HID:34384" -#define HID_DLGREPORT_6_TXTTITLE_5 "HID:34385" -#define HID_DLGREPORT_6_TXTTITLE_6 "HID:34386" -#define HID_DLGREPORT_6_TXTTITLE_7 "HID:34387" +#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" /* ==================================== @@ -233,426 +233,426 @@ */ -#define HID_DLGFORM_DIALOG "HID:34400" -#define HID_DLGFORM_CMDPREV "HID:34402" -#define HID_DLGFORM_CMDNEXT "HID:34403" -#define HID_DLGFORM_CMDFINISH "HID:34404" -#define HID_DLGFORM_CMDCANCEL "HID:34405" - -#define HID_DLGFORM_MASTER_LBTABLES "HID:34411" -#define HID_DLGFORM_MASTER_FIELDSAVAILABLE "HID:34412" -#define HID_DLGFORM_MASTER_CMDMOVESELECTED "HID:34413" -#define HID_DLGFORM_MASTER_CMDMOVEALL "HID:34414" -#define HID_DLGFORM_MASTER_CMDREMOVESELECTED "HID:34415" -#define HID_DLGFORM_MASTER_CMDREMOVEALL "HID:34416" -#define HID_DLGFORM_MASTER_FIELDSSELECTED "HID:34417" -#define HID_DLGFORM_MASTER_CMDMOVEUP "HID:34418" -#define HID_DLGFORM_MASTER_CMDMOVEDOWN "HID:34419" - - -#define HID_DLGFORM_CHKCREATESUBFORM "HID:34421" -#define HID_DLGFORM_OPTONEXISTINGRELATION "HID:34422" -#define HID_DLGFORM_OPTSELECTMANUALLY "HID:34423" -#define HID_DLGFORM_lstRELATIONS "HID:34424" - - -#define HID_DLGFORM_SUB_LBTABLES "HID:34431" -#define HID_DLGFORM_SUB_FIELDSAVAILABLE "HID:34432" -#define HID_DLGFORM_SUB_CMDMOVESELECTED "HID:34433" -#define HID_DLGFORM_SUB_CMDMOVEALL "HID:34434" -#define HID_DLGFORM_SUB_CMDREMOVESELECTED "HID:34435" -#define HID_DLGFORM_SUB_CMDREMOVEALL "HID:34436" -#define HID_DLGFORM_SUB_FIELDSSELECTED "HID:34437" -#define HID_DLGFORM_SUB_CMDMOVEUP "HID:34438" -#define HID_DLGFORM_SUB_CMDMOVEDOWN "HID:34439" - - -#define HID_DLGFORM_LINKER_LSTSLAVELINK1 "HID:34441" -#define HID_DLGFORM_LINKER_LSTMASTERLINK1 "HID:34442" -#define HID_DLGFORM_LINKER_LSTSLAVELINK2 "HID:34443" -#define HID_DLGFORM_LINKER_LSTMASTERLINK2 "HID:34444" -#define HID_DLGFORM_LINKER_LSTSLAVELINK3 "HID:34445" -#define HID_DLGFORM_LINKER_LSTMASTERLINK3 "HID:34446" -#define HID_DLGFORM_LINKER_LSTSLAVELINK4 "HID:34447" -#define HID_DLGFORM_LINKER_LSTMASTERLINK4 "HID:34448" - -#define HID_DLGFORM_CMDALIGNLEFT "HID:34451" -#define HID_DLGFORM_CMDALIGNRIGHT "HID:34452" - - -#define HID_DLGFORM_CMDLEFTLABELED "HID:34453" -#define HID_DLGFORM_CMDTOPLABELED "HID:34454" -#define HID_DLGFORM_CMDTABLESTYLE "HID:34455" -#define HID_DLGFORM_CMDTOPJUSTIFIED "HID:34456" - -#define HID_DLGFORM_CMDLEFTLABELED2 "HID:34457" -#define HID_DLGFORM_CMDTOPLABELED2 "HID:34458" -#define HID_DLGFORM_CMDTABLESTYLE2 "HID:34459" -#define HID_DLGFORM_CMDTOPJUSTIFIED2 "HID:34460" - -#define HID_DLGFORM_OPTNEWDATAONLY "HID:34461" -#define HID_DLGFORM_OPTDISPLAYALLDATA "HID:34462" -#define HID_DLGFORM_CHKNOMODIFICATION "HID:34463" -#define HID_DLGFORM_CHKNODELETION "HID:34464" -#define HID_DLGFORM_CHKNOADDITION "HID:34465" - - -#define HID_DLGFORM_LSTSTYLES "HID:34471" -#define HID_DLGFORM_CMDNOBORDER "HID:34472" -#define HID_DLGFORM_CMD3DBORDER "HID:34473" -#define HID_DLGFORM_CMDSIMPLEBORDER "HID:34474" - -#define HID_DLGFORM_TXTPATH "HID:34481" -#define HID_DLGFORM_OPTWORKWITHFORM "HID:34482" -#define HID_DLGFORM_OPTMODIFYFORM "HID:34483" - - -#define HID_DLGNEWSLTR_DIALOG "HID:34500" -#define HID_DLGNEWSLTR_OPTSTANDARDLAYOUT "HID:34501" -#define HID_DLGNEWSLTR_OPTPARTYLAYOUT "HID:34502" -#define HID_DLGNEWSLTR_OPTBROCHURELAYOUT "HID:34503" -#define HID_DLGNEWSLTR_OPTSINGLESIDED "HID:34504" -#define HID_DLGNEWSLTR_OPTDOUBLESIDED "HID:34505" -#define HID_DLGNEWSLTR_CMDGOON "HID:34506" - - -#define HID_DLGDEPOT_DIALOG_SELLBUY "HID:34520" -#define HID_DLGDEPOT_0_TXTSTOCKID_SELLBUY "HID:34521" -#define HID_DLGDEPOT_0_TXTQUANTITY "HID:34522" -#define HID_DLGDEPOT_0_TXTRATE "HID:34523" -#define HID_DLGDEPOT_0_TXTDATE "HID:34524" -#define HID_DLGDEPOT_0_TXTCOMMISSION "HID:34525" -#define HID_DLGDEPOT_0_TXTFIX "HID:34526" -#define HID_DLGDEPOT_0_TXTMINIMUM "HID:34527" -#define HID_DLGDEPOT_0_CMDCANCEL_SELLBUY "HID:34528" -#define HID_DLGDEPOT_0_CMDGOON_SELLBUY "HID:34529" -#define HID_DLGDEPOT_1_LSTSELLSTOCKS "HID:34530" -#define HID_DLGDEPOT_2_LSTBUYSTOCKS "HID:34531" -#define HID_DLGDEPOT_DIALOG_SPLIT "HID:34532" -#define HID_DLGDEPOT_0_LSTSTOCKNAMES "HID:34533" -#define HID_DLGDEPOT_0_TXTSTOCKID_SPLIT "HID:34534" -#define HID_DLGDEPOT_0_CMDCANCEL_SPLIT "HID:34535" -#define HID_DLGDEPOT_0_CMDGOON_SPLIT "HID:34536" -#define HID_DLGDEPOT_1_OPTPERSHARE "HID:34537" -#define HID_DLGDEPOT_1_OPTTOTAL "HID:34538" -#define HID_DLGDEPOT_1_TXTDIVIDEND "HID:34539" -#define HID_DLGDEPOT_2_TXTOLDRATE "HID:34540" -#define HID_DLGDEPOT_2_TXTNEWRATE "HID:34541" -#define HID_DLGDEPOT_2_TXTDATE "HID:34542" -#define HID_DLGDEPOT_3_TXTSTARTDATE "HID:34543" -#define HID_DLGDEPOT_3_TXTENDDATE "HID:34544" -#define HID_DLGDEPOT_3_OPTDAILY "HID:34545" -#define HID_DLGDEPOT_3_OPTWEEKLY "HID:34546" -#define HID_DLGDEPOT_DIALOG_HISTORY "HID:34547" -#define HID_DLGDEPOT_LSTMARKETS "HID:34548" -#define HID_DLGDEPOT_0_CMDCANCEL_HISTORY "HID:34549" -#define HID_DLGDEPOT_0_CMDGOON_HISTORY "HID:34550" - -#define HID_DLGIMPORT_DIALOG "HID:34570" -#define HID_DLGIMPORT_0_CMDHELP "HID:34571" -#define HID_DLGIMPORT_0_CMDCANCEL "HID:34572" -#define HID_DLGIMPORT_0_CMDPREV "HID:34573" -#define HID_DLGIMPORT_0_CMDNEXT "HID:34574" -#define HID_DLGIMPORT_0_OPTSODOCUMENTS "HID:34575" -#define HID_DLGIMPORT_0_OPTMSDOCUMENTS "HID:34576" -#define HID_DLGIMPORT_0_CHKLOGFILE "HID:34577" -#define HID_DLGIMPORT_2_CHKWORD "HID:34578" -#define HID_DLGIMPORT_2_CHKEXCEL "HID:34579" -#define HID_DLGIMPORT_2_CHKPOWERPOINT "HID:34580" -#define HID_DLGIMPORT_2_CBTEMPLATE "HID:34581" -#define HID_DLGIMPORT_2_CBTEMPLATERECURSE "HID:34582" -#define HID_DLGIMPORT_2_LBTEMPLATEPATH "HID:34583" -#define HID_DLGIMPORT_2_EDTEMPLATEPATH "HID:34584" -#define HID_DLGIMPORT_2_CBDOCUMENT "HID:34586" -#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT "HID:34585" -#define HID_DLGIMPORT_2_CBDOCUMENT "HID:34586" -#define HID_DLGIMPORT_2_CBDOCUMENTRECURSE "HID:34587" -#define HID_DLGIMPORT_2_LBDOCUMENTPATH "HID:34588" -#define HID_DLGIMPORT_2_EDDOCUMENTPATH "HID:34589" -#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT "HID:34590" -#define HID_DLGIMPORT_2_LBEXPORTDOCUMENTPATH "HID:34591" -#define HID_DLGIMPORT_2_EDEXPORTDOCUMENTPATH "HID:34592" -#define HID_DLGIMPORT_2_CMDEXPORTPATHSELECT "HID:34593" -#define HID_DLGIMPORT_3_TBSUMMARY "HID:34595" - -#define HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 "HID:34600" -#define HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 "HID:34601" - - -#define HID_DLGIMPORT_0_CHKWRITER "HID:34596" -#define HID_DLGIMPORT_0_CHKCALC "HID:34597" -#define HID_DLGIMPORT_0_CHKIMPRESS "HID:34598" -#define HID_DLGIMPORT_0_CHKMATHGLOBAL "HID:34599" - - -#define HID_DLGCORRESPONDENCE_DIALOG "HID:34630" -#define HID_DLGCORRESPONDENCE_CANCEL "HID:34631" -#define HID_DLGCORRESPONDENCE_OPTIONAGENDA1 "HID:34632" -#define HID_DLGCORRESPONDENCE_OPTIONAGENDA2 "HID:34633" -#define HID_DLGCORRESPONDENCE_AGENDAOKAY "HID:34634" -#define HID_DLGCORRESPONDENCE_OPTIONLETTER1 "HID:34635" -#define HID_DLGCORRESPONDENCE_OPTIONLETTER2 "HID:34636" -#define HID_DLGCORRESPONDENCE_LETTEROKAY "HID:34637" - -#define HID_DLGSTYLES_DIALOG "HID:34650" -#define HID_DLGSTYLES_LISTBOX "HID:34651" -#define HID_DLGSTYLES_CANCEL "HID:34652" -#define HID_DLGSTYLES_OKAY "HID:34653" - -#define HID_DLGCONVERT_DIALOG "HID:34660" -#define HID_DLGCONVERT_CHECKBOX1 "HID:34661" -#define HID_DLGCONVERT_OPTIONBUTTON1 "HID:34662" -#define HID_DLGCONVERT_OPTIONBUTTON2 "HID:34663" -#define HID_DLGCONVERT_OPTIONBUTTON3 "HID:34664" -#define HID_DLGCONVERT_OPTIONBUTTON4 "HID:34665" -#define HID_DLGCONVERT_LISTBOX1 "HID:34666" -#define HID_DLGCONVERT_OBFILE "HID:34667" -#define HID_DLGCONVERT_OBDIR "HID:34668" -#define HID_DLGCONVERT_COMBOBOX1 "HID:34669" -#define HID_DLGCONVERT_TBSOURCE "HID:34670" -#define HID_DLGCONVERT_CHECKRECURSIVE "HID:34671" -#define HID_DLGCONVERT_TBTARGET "HID:34672" -#define HID_DLGCONVERT_CBCANCEL "HID:34673" -#define HID_DLGCONVERT_CBHELP "HID:34674" -#define HID_DLGCONVERT_CBBACK "HID:34675" -#define HID_DLGCONVERT_CBGOON "HID:34676" -#define HID_DLGCONVERT_CBSOURCEOPEN "HID:34677" -#define HID_DLGCONVERT_CBTARGETOPEN "HID:34678" -#define HID_DLGCONVERT_CHKPROTECT "HID:34679" -#define HID_DLGCONVERT_CHKTEXTDOCUMENTS "HID:34680" - -#define HID_DLGPASSWORD_CMDGOON "HID:34690" -#define HID_DLGPASSWORD_CMDCANCEL "HID:34691" -#define HID_DLGPASSWORD_CMDHELP "HID:34692" -#define HID_DLGPASSWORD_TXTPASSWORD "HID:34693" - -#define HID_DLGHOLIDAYCAL_DIALOG "HID:34700" -#define HID_DLGHOLIDAYCAL_1_PREVIEW "HID:34701" -#define HID_DLGHOLIDAYCAL_1_OPYEAR "HID:34702" -#define HID_DLGHOLIDAYCAL_1_OPMONTH "HID:34703" -#define HID_DLGHOLIDAYCAL_1_EDYEAR "HID:34704" -#define HID_DLGHOLIDAYCAL_1_EDMONTH "HID:34705" -#define HID_DLGHOLIDAYCAL_1_SPINYEAR "HID:34706" -#define HID_DLGHOLIDAYCAL_1_SPINMONTH "HID:34707" -#define HID_DLGHOLIDAYCAL_1_CMBSTATE "HID:34708" -#define HID_DLGHOLIDAYCAL_2_LBOWNDATA "HID:34709" -#define HID_DLGHOLIDAYCAL_2_CMDINSERT "HID:34710" -#define HID_DLGHOLIDAYCAL_2_CMDDELETE "HID:34711" -#define HID_DLGHOLIDAYCAL_2_EDEVENT "HID:34712" -#define HID_DLGHOLIDAYCAL_2_CHKEVENT "HID:34713" -#define HID_DLGHOLIDAYCAL_2_EDEVENTDAY "HID:34714" -#define HID_DLGHOLIDAYCAL_2_SPINEVENTDAY "HID:34715" -#define HID_DLGHOLIDAYCAL_2_EDEVENTMONTH "HID:34716" -#define HID_DLGHOLIDAYCAL_2_SPINEVENTMONTH "HID:34717" -#define HID_DLGHOLIDAYCAL_2_EDEVENTYEAR "HID:34718" -#define HID_DLGHOLIDAYCAL_2_SPINEVENTYEAR "HID:34719" -#define HID_DLGHOLIDAYCAL_0_CMDOWNDATA "HID:34720" -#define HID_DLGHOLIDAYCAL_0_CMDCANCEL "HID:34721" -#define HID_DLGHOLIDAYCAL_0_CMDOK "HID:34722" +#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 "HID:40769" -#define HID_LTRWIZ_OPTPRIVOFFICIALLETTER "HID:40770" -#define HID_LTRWIZ_OPTPRIVATELETTER "HID:40771" -#define HID_LTRWIZ_LSTBUSINESSSTYLE "HID:40772" -#define HID_LTRWIZ_CHKBUSINESSPAPER "HID:40773" -#define HID_LTRWIZ_LSTPRIVOFFICIALSTYLE "HID:40774" -#define HID_LTRWIZ_LSTPRIVATESTYLE "HID:40775" -#define HID_LTRWIZ_CHKPAPERCOMPANYLOGO "HID:40776" -#define HID_LTRWIZ_NUMLOGOHEIGHT "HID:40777" -#define HID_LTRWIZ_NUMLOGOX "HID:40778" -#define HID_LTRWIZ_NUMLOGOWIDTH "HID:40779" -#define HID_LTRWIZ_NUMLOGOY "HID:40780" -#define HID_LTRWIZ_CHKPAPERCOMPANYADDRESS "HID:40781" -#define HID_LTRWIZ_NUMADDRESSHEIGHT "HID:40782" -#define HID_LTRWIZ_NUMADDRESSX "HID:40783" -#define HID_LTRWIZ_NUMADDRESSWIDTH "HID:40784" -#define HID_LTRWIZ_NUMADDRESSY "HID:40785" -#define HID_LTRWIZ_CHKCOMPANYRECEIVER "HID:40786" -#define HID_LTRWIZ_CHKPAPERFOOTER "HID:40787" -#define HID_LTRWIZ_NUMFOOTERHEIGHT "HID:40788" -#define HID_LTRWIZ_LSTLETTERNORM "HID:40789" -#define HID_LTRWIZ_CHKUSELOGO "HID:40790" -#define HID_LTRWIZ_CHKUSEADDRESSRECEIVER "HID:40791" -#define HID_LTRWIZ_CHKUSESIGNS "HID:40792" -#define HID_LTRWIZ_CHKUSESUBJECT "HID:40793" -#define HID_LTRWIZ_CHKUSESALUTATION "HID:40794" -#define HID_LTRWIZ_LSTSALUTATION "HID:40795" -#define HID_LTRWIZ_CHKUSEBENDMARKS "HID:40796" -#define HID_LTRWIZ_CHKUSEGREETING "HID:40797" -#define HID_LTRWIZ_LSTGREETING "HID:40798" -#define HID_LTRWIZ_CHKUSEFOOTER "HID:40799" -#define HID_LTRWIZ_OPTSENDERPLACEHOLDER "HID:40800" -#define HID_LTRWIZ_OPTSENDERDEFINE "HID:40801" -#define HID_LTRWIZ_TXTSENDERNAME "HID:40802" -#define HID_LTRWIZ_TXTSENDERSTREET "HID:40803" -#define HID_LTRWIZ_TXTSENDERPOSTCODE "HID:40804" -#define HID_LTRWIZ_TXTSENDERSTATE_TEXT "HID:40805" -#define HID_LTRWIZ_TXTSENDERCITY "HID:40806" -#define HID_LTRWIZ_OPTRECEIVERPLACEHOLDER "HID:40807" -#define HID_LTRWIZ_OPTRECEIVERDATABASE "HID:40808" -#define HID_LTRWIZ_TXTFOOTER "HID:40809" -#define HID_LTRWIZ_CHKFOOTERNEXTPAGES "HID:40810" -#define HID_LTRWIZ_CHKFOOTERPAGENUMBERS "HID:40811" -#define HID_LTRWIZ_TXTTEMPLATENAME "HID:40812" -#define HID_LTRWIZ_OPTCREATELETTER "HID:40813" -#define HID_LTRWIZ_OPTMAKECHANGES "HID:40814" -#define HID_LTRWIZ_TXTPATH "HID:40815" -#define HID_LTRWIZ_CMDPATH "HID:40816" - -#define HID_LTRWIZARD "HID:40820" -#define HID_LTRWIZARD_HELP "HID:40821" -#define HID_LTRWIZARD_BACK "HID:40822" -#define HID_LTRWIZARD_NEXT "HID:40823" -#define HID_LTRWIZARD_CREATE "HID:40824" -#define HID_LTRWIZARD_CANCEL "HID:40825" - -#define HID_QUERYWIZARD_LSTTABLES "HID:40850" -#define HID_QUERYWIZARD_LSTFIELDS "HID:40851" -#define HID_QUERYWIZARD_CMDMOVESELECTED "HID:40852" -#define HID_QUERYWIZARD_CMDMOVEALL "HID:40853" -#define HID_QUERYWIZARD_CMDREMOVESELECTED "HID:40854" -#define HID_QUERYWIZARD_CMDREMOVEALL "HID:40855" -#define HID_QUERYWIZARD_LSTSELFIELDS "HID:40856" -#define HID_QUERYWIZARD_CMDMOVEUP "HID:40857" -#define HID_QUERYWIZARD_CMDMOVEDOWN "HID:40858" - -#define HID_QUERYWIZARD_SORT1 "HID:40865" -#define HID_QUERYWIZARD_OPTASCEND1 "HID:40866" -#define HID_QUERYWIZARD_OPTDESCEND1 "HID:40867" -#define HID_QUERYWIZARD_SORT2 "HID:40868" -#define HID_QUERYWIZARD_OPTASCEND2 "HID:40869" -#define HID_QUERYWIZARD_OPTDESCEND2 "HID:40870" -#define HID_QUERYWIZARD_SORT3 "HID:40871" -#define HID_QUERYWIZARD_OPTASCEND3 "HID:40872" -#define HID_QUERYWIZARD_OPTDESCEND3 "HID:40873" -#define HID_QUERYWIZARD_SORT4 "HID:40874" -#define HID_QUERYWIZARD_OPTASCEND4 "HID:40875" -#define HID_QUERYWIZARD_OPTDESCEND4 "HID:40876" - -#define HID_QUERYWIZARD_OPTMATCHALL "HID:40878" -#define HID_QUERYWIZARD_OPTMATCHANY "HID:40879" - -#define HID_QUERYWIZARD_LSTFIELDNAME_1 "HID:40880" -#define HID_QUERYWIZARD_LSTOPERATOR_1 "HID:40881" -#define HID_QUERYWIZARD_TXTVALUE_1 "HID:40882" -#define HID_QUERYWIZARD_LSTFIELDNAME_2 "HID:40883" -#define HID_QUERYWIZARD_LSTOPERATOR_2 "HID:40884" -#define HID_QUERYWIZARD_TXTVALUE_2 "HID:40885" -#define HID_QUERYWIZARD_LSTFIELDNAME_3 "HID:40886" -#define HID_QUERYWIZARD_LSTOPERATOR_3 "HID:40887" -#define HID_QUERYWIZARD_TXTVALUE_3 "HID:40888" - -#define HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY "HID:40895" -#define HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY "HID:40896" -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 "HID:40897" -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 "HID:40898" -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 "HID:40899" -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 "HID:40900" -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 "HID:40901" -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 "HID:40902" -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 "HID:40903" -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 "HID:40904" -#define HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 "HID:40905" -#define HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 "HID:40906" -#define HID_QUERYWIZARD_BTNAGGREGATEPLUS "HID:40907" -#define HID_QUERYWIZARD_BTNAGGREGATEMINUS "HID:40908" - -#define HID_QUERYWIZARD_LSTFILTERFIELDS "HID:40915" -#define HID_QUERYWIZARD_CMDFILTERMOVESELECTED "HID:40916" -#define HID_QUERYWIZARD_CMDFILTERREMOVESELECTED "HID:40917" -#define HID_QUERYWIZARD_LSTFILTERSELFIELDS "HID:40918" -#define HID_QUERYWIZARD_CMDFILTERMOVEUP "HID:40919" -#define HID_QUERYWIZARD_CMDFILTERMOVEDOWN "HID:40920" - -#define HID_QUERYWIZARD_OPTGROUPMATCHALL "HID:40923" -#define HID_QUERYWIZARD_OPTGROUPMATCHANY "HID:40924" - -#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_1 "HID:40925" -#define HID_QUERYWIZARD_LSTFILTEROPERATOR_1 "HID:40926" -#define HID_QUERYWIZARD_TXTFILTERVALUE_1 "HID:40927" -#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_2 "HID:40928" -#define HID_QUERYWIZARD_LSTFILTEROPERATOR_2 "HID:40929" -#define HID_QUERYWIZARD_TXTFILTERVALUE_2 "HID:40930" -#define HID_QUERYWIZARD_LSTFILTERFIELDNAME_3 "HID:40931" -#define HID_QUERYWIZARD_LSTFILTEROPERATOR_3 "HID:40932" -#define HID_QUERYWIZARD_TXTFILTERVALUE_3 "HID:40933" - -#define HID_QUERYWIZARD_TXTTITLE_1 "HID:40940" -#define HID_QUERYWIZARD_TXTTITLE_2 "HID:40941" -#define HID_QUERYWIZARD_TXTTITLE_3 "HID:40942" -#define HID_QUERYWIZARD_TXTTITLE_4 "HID:40943" -#define HID_QUERYWIZARD_TXTTITLE_5 "HID:40944" -#define HID_QUERYWIZARD_TXTTITLE_6 "HID:40945" -#define HID_QUERYWIZARD_TXTTITLE_7 "HID:40946" - -#define HID_QUERYWIZARD_TXTQUERYTITLE "HID:40955" -#define HID_QUERYWIZARD_OPTDISPLAYQUERY "HID:40956" -#define HID_QUERYWIZARD_OPTMODIFYQUERY "HID:40957" -#define HID_QUERYWIZARD_TXTSUMMARY "HID:40958" - -#define HID_QUERYWIZARD "HID:40970" -#define HID_QUERYWIZARD_BACK "HID:40972" -#define HID_QUERYWIZARD_NEXT "HID:40973" -#define HID_QUERYWIZARD_CREATE "HID:40974" -#define HID_QUERYWIZARD_CANCEL "HID:40975" +#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 "HID:41000" -#define HID_IS_BTN_NONE "HID:41002" -#define HID_IS_BTN_OK "HID:41003" -#define HID_IS_BTN_CANCEL "HID:41004" - -#define HID_IS_BTN_IMG1 "HID:41005" -#define HID_IS_BTN_IMG2 "HID:41006" -#define HID_IS_BTN_IMG3 "HID:41007" -#define HID_IS_BTN_IMG4 "HID:41008" -#define HID_IS_BTN_IMG5 "HID:41009" -#define HID_IS_BTN_IMG6 "HID:41010" -#define HID_IS_BTN_IMG7 "HID:41011" -#define HID_IS_BTN_IMG8 "HID:41012" -#define HID_IS_BTN_IMG9 "HID:41013" -#define HID_IS_BTN_IMG10 "HID:41014" -#define HID_IS_BTN_IMG11 "HID:41015" -#define HID_IS_BTN_IMG12 "HID:41016" -#define HID_IS_BTN_IMG13 "HID:41017" -#define HID_IS_BTN_IMG14 "HID:41018" -#define HID_IS_BTN_IMG15 "HID:41019" -#define HID_IS_BTN_IMG16 "HID:41020" -#define HID_IS_BTN_IMG17 "HID:41021" -#define HID_IS_BTN_IMG18 "HID:41022" -#define HID_IS_BTN_IMG19 "HID:41023" -#define HID_IS_BTN_IMG20 "HID:41024" -#define HID_IS_BTN_IMG21 "HID:41025" -#define HID_IS_BTN_IMG22 "HID:41026" -#define HID_IS_BTN_IMG23 "HID:41027" -#define HID_IS_BTN_IMG24 "HID:41028" -#define HID_IS_BTN_IMG25 "HID:41029" -#define HID_IS_BTN_IMG26 "HID:41030" -#define HID_IS_BTN_IMG27 "HID:41031" -#define HID_IS_BTN_IMG28 "HID:41032" -#define HID_IS_BTN_IMG29 "HID:41033" -#define HID_IS_BTN_IMG30 "HID:41034" -#define HID_IS_BTN_IMG31 "HID:41035" -#define HID_IS_BTN_IMG32 "HID:41036" +#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 "HID:41040" -#define HID_FTP_SERVER "HID:41041" -#define HID_FTP_USERNAME "HID:41042" -#define HID_FTP_PASS "HID:41043" -#define HID_FTP_TEST "HID:41044" -#define HID_FTP_TXT_PATH "HID:41045" -#define HID_FTP_BTN_PATH "HID:41046" -#define HID_FTP_OK "HID:41047" -#define HID_FTP_CANCEL "HID:41048" +#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" /* ==================================== @@ -663,129 +663,129 @@ // step 0 - navibar -#define HID_AGWIZ "HID:41051" -#define HID_AGWIZ_HELP "HID:41052" -#define HID_AGWIZ_NEXT "HID:41053" -#define HID_AGWIZ_PREV "HID:41054" -#define HID_AGWIZ_CREATE "HID:41055" -#define HID_AGWIZ_CANCEL "HID:41056" +#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 "HID:41057" -#define HID_AGWIZ_1_CHK_MINUTES "HID:41058" +#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 "HID:41059" -#define HID_AGWIZ_2_TXT_DATE "HID:41060" -#define HID_AGWIZ_2_TXT_TITLE "HID:41061" -#define HID_AGWIZ_2_TXT_LOCATION "HID:41062" +#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 "HID:41063" -#define HID_AGWIZ_3_CHK_READ "HID:41064" -#define HID_AGWIZ_3_CHK_BRING "HID:41065" -#define HID_AGWIZ_3_CHK_NOTES "HID:41066" +#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 "HID:41067" -#define HID_AGWIZ_4_CHK_FACILITATOR "HID:41068" -#define HID_AGWIZ_4_CHK_NOTETAKER "HID:41069" -#define HID_AGWIZ_4_CHK_TIMEKEEPER "HID:41070" -#define HID_AGWIZ_4_CHK_ATTENDEES "HID:41071" -#define HID_AGWIZ_4_CHK_OBSERVERS "HID:41072" -#define HID_AGWIZ_4_CHK_RESOURCEPERSONS "HID:41073" +#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 "HID:41074" -#define HID_AGWIZ_6_TXT_TEMPLATEPATH "HID:41075" -#define HID_AGWIZ_6_BTN_TEMPLATEPATH "HID:41076" +#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 "HID:41077" -#define HID_AGWIZ_6_OPT_MAKECHANGES "HID:41078" +#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 "HID:41079" -#define HID_AGWIZ_5_BTN_REMOVE "HID:41080" -#define HID_AGWIZ_5_BTN_UP "HID:41081" -#define HID_AGWIZ_5_BTN_DOWN "HID:41082" +#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 "HID:41083" +#define HID_AGWIZ_5_SCROLL_BAR "WIZARDS_HID_AGWIZ_5_SCROLL_BAR" -#define HID_AGWIZ_5_TXT_TOPIC_1 "HID:41084" -#define HID_AGWIZ_5_TXT_RESPONSIBLE_1 "HID:41085" -#define HID_AGWIZ_5_TXT_MINUTES_1 "HID:41086" +#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 "HID:41087" -#define HID_AGWIZ_5_TXT_RESPONSIBLE_2 "HID:41088" -#define HID_AGWIZ_5_TXT_MINUTES_2 "HID:41089" +#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 "HID:41090" -#define HID_AGWIZ_5_TXT_RESPONSIBLE_3 "HID:41091" -#define HID_AGWIZ_5_TXT_MINUTES_3 "HID:41092" +#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 "HID:41093" -#define HID_AGWIZ_5_TXT_RESPONSIBLE_4 "HID:41094" -#define HID_AGWIZ_5_TXT_MINUTES_4 "HID:41095" +#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 "HID:41096" -#define HID_AGWIZ_5_TXT_RESPONSIBLE_5 "HID:41097" -#define HID_AGWIZ_5_TXT_MINUTES_5 "HID:41098" +#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 "HID:41120" -#define HID_FAXWIZ_LSTBUSINESSSTYLE "HID:41121" -#define HID_FAXWIZ_OPTPRIVATEFAX "HID:41122" -#define HID_LSTPRIVATESTYLE "HID:41123" -#define HID_IMAGECONTROL3 "HID:41124" -#define HID_CHKUSELOGO "HID:41125" -#define HID_CHKUSEDATE "HID:41126" -#define HID_CHKUSECOMMUNICATIONTYPE "HID:41127" -#define HID_LSTCOMMUNICATIONTYPE "HID:41128" -#define HID_CHKUSESUBJECT "HID:41129" -#define HID_CHKUSESALUTATION "HID:41130" -#define HID_LSTSALUTATION "HID:41131" -#define HID_CHKUSEGREETING "HID:41132" -#define HID_LSTGREETING "HID:41133" -#define HID_CHKUSEFOOTER "HID:41134" -#define HID_OPTSENDERPLACEHOLDER "HID:41135" -#define HID_OPTSENDERDEFINE "HID:41136" -#define HID_TXTSENDERNAME "HID:41137" -#define HID_TXTSENDERSTREET "HID:41138" -#define HID_TXTSENDERPOSTCODE "HID:41139" -#define HID_TXTSENDERSTATE "HID:41140" -#define HID_TXTSENDERCITY "HID:41141" -#define HID_TXTSENDERFAX "HID:41142" -#define HID_OPTRECEIVERPLACEHOLDER "HID:41143" -#define HID_OPTRECEIVERDATABASE "HID:41144" -#define HID_TXTFOOTER "HID:41145" -#define HID_CHKFOOTERNEXTPAGES "HID:41146" -#define HID_CHKFOOTERPAGENUMBERS "HID:41147" -#define HID_TXTTEMPLATENAME "HID:41148" -#define HID_FILETEMPLATEPATH "HID:41149" -#define HID_OPTCREATEFAX "HID:41150" -#define HID_OPTMAKECHANGES "HID:41151" -#define HID_IMAGECONTROL2 "HID:41152" -#define HID_FAXWIZ_TXTPATH "HID:41153" -#define HID_FAXWIZ_CMDPATH "HID:41154" - -#define HID_FAXWIZARD "HID:41180" -#define HID_FAXWIZARD_HELP "HID:41181" -#define HID_FAXWIZARD_BACK "HID:41182" -#define HID_FAXWIZARD_NEXT "HID:41183" -#define HID_FAXWIZARD_CREATE "HID:41184" -#define HID_FAXWIZARD_CANCEL "HID:41185" +#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" @@ -794,64 +794,64 @@ * ==================================== */ -#define HID_DLGTABLE_DIALOG "HID:41200" -#define HID_DLGTABLE_CMDPREV "HID:41202" -#define HID_DLGTABLE_CMDNEXT "HID:41203" -#define HID_DLGTABLE_CMDFINISH "HID:41204" -#define HID_DLGTABLE_CMDCANCEL "HID:41205" +#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 "HID:41206" -#define HID_DLGTABLE_OPTPRIVATE "HID:41207" +#define HID_DLGTABLE_OPTBUSINESS "WIZARDS_HID_DLGTABLE_OPTBUSINESS" +#define HID_DLGTABLE_OPTPRIVATE "WIZARDS_HID_DLGTABLE_OPTPRIVATE" -#define HID_DLGTABLE_LBTABLES "HID:41208" -#define HID_DLGTABLE_FIELDSAVAILABLE "HID:41209" -#define HID_DLGTABLE_CMDMOVESELECTED "HID:41210" -#define HID_DLGTABLE_CMDMOVEALL "HID:41211" -#define HID_DLGTABLE_CMDREMOVESELECTED "HID:41212" -#define HID_DLGTABLE_CMDREMOVEALL "HID:41213" -#define HID_DLGTABLE_FIELDSSELECTED "HID:41214" +#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 "HID:41215" -#define HID_DLGTABLE_CMDMOVEDOWN "HID:41216" +#define HID_DLGTABLE_CMDMOVEUP "WIZARDS_HID_DLGTABLE_CMDMOVEUP" +#define HID_DLGTABLE_CMDMOVEDOWN "WIZARDS_HID_DLGTABLE_CMDMOVEDOWN" -#define HID_DLGTABLE_LB_SELFIELDNAMES "HID:41220" -#define HID_DLGTABLE_CMDMOVEFIELDUP "HID:41221" -#define HID_DLGTABLE_CMDMOVEFIELDDOWN "HID:41222" -#define HID_DLGTABLE_CMDMINUS "HID:41223" -#define HID_DLGTABLE_CMDPLUS "HID:41224" -#define HID_DLGTABLE_COLNAME "HID:41225" -#define HID_DLGTABLE_COLMODIFIER "HID:41226" +#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 "HID:41227" -#define HID_DLGTABLE_OPT_PK_AUTOMATIC "HID:41228" +#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 "HID:41229" +#define HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC "WIZARDS_HID_DLGTABLE_CK_PK_AUTOVALUE_AUTOMATIC" -#define HID_DLGTABLE_OPT_PK_SINGLE "HID:41230" -#define HID_DLGTABLE_LB_PK_FIELDNAME "HID:41231" -#define HID_DLGTABLE_CK_PK_AUTOVALUE "HID:41232" -#define HID_DLGTABLE_OPT_PK_SEVERAL "HID:41233" -#define HID_DLGTABLE_FIELDS_PK_AVAILABLE "HID:41234" -#define HID_DLGTABLE_CMDMOVE_PK_SELECTED "HID:41235" -#define HID_DLGTABLE_CMDREMOVE_PK_SELECTED "HID:41236" -#define HID_DLGTABLE_FIELDS_PK_SELECTED "HID:41237" +#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 "HID:41238" -#define HID_DLGTABLE_CMDMOVEDOWN_PK_SELECTED "HID:41239" +#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 "HID:41240" -#define HID_DLGTABLE_OPT_MODIFYTABLE "HID:41241" -#define HID_DLGTABLE_OPT_WORKWITHTABLE "HID:41242" -#define HID_DLGTABLE_OPT_STARTFORMWIZARD "HID:41243" -#define HID_DLGTABLE_LST_CATALOG "HID:41244" -#define HID_DLGTABLE_LST_SCHEMA "HID:41245" +#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" -- cgit From e92515df270ea0d52e47d6922a83d968f6445b93 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 21 Jul 2010 17:46:37 +0200 Subject: CWS changehid: #i111784#: rework keyword search --- sfx2/inc/sfxhelp.hxx | 3 +- sfx2/source/appl/sfxhelp.cxx | 92 ++++++++++++++++++++++++++------------------ 2 files changed, 57 insertions(+), 38 deletions(-) diff --git a/sfx2/inc/sfxhelp.hxx b/sfx2/inc/sfxhelp.hxx index 608361a1e777..17589c7cd399 100644 --- a/sfx2/inc/sfxhelp.hxx +++ b/sfx2/inc/sfxhelp.hxx @@ -45,9 +45,10 @@ class SFX2_DLLPUBLIC SfxHelp : public Help SfxHelp_Impl* pImp; private: + SAL_DLLPRIVATE BOOL Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword ); + SAL_DLLPRIVATE virtual BOOL SearchKeyword( const XubString& rKeyWord ); SAL_DLLPRIVATE virtual BOOL Start( const String& rURL, const Window* pWindow ); SAL_DLLPRIVATE virtual void OpenHelpAgent( const rtl::OString& sHelpId ); - SAL_DLLPRIVATE String GetHelpModuleName_Impl(); SAL_DLLPRIVATE String CreateHelpURL_Impl( const String& aCommandURL, const String& rModuleName ); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index a18521e3a289..db3015824134 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -705,8 +705,17 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow return sHelpText; } +BOOL SfxHelp::SearchKeyword( const XubString& rKeyword ) +{ + return Start_Impl( String(), NULL, rKeyword ); +} BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) +{ + return Start_Impl( rURL, pWindow, String() ); +} + +BOOL SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword ) { // check if help is available String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") ); @@ -720,54 +729,63 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) return FALSE; } - // check if it's an URL or a jump mark! - String aHelpURL(rURL ); - INetURLObject aParser (aHelpURL); - ::rtl::OUString sKeyword; + /* rURL may be + - a "real" URL + - a HelpID (formerly a long, now a string) + If rURL is a URL, CreateHelpURL should be called for this URL + If rURL is an arbitrary string, the same should happen, but the URL should be tried out + if it delivers real help content. In case only the Help Error Document is returned, the + parent of the window for that help was called, is asked for its HelpID. + For compatibility reasons this upward search is not implemented for "real" URLs. + Help keyword search now is implemented as own method; in former versions it + was done via Help::Start, but this implementation conflicted with the upward search. + */ + String aHelpURL; + INetURLObject aParser( rURL ); INetProtocol nProtocol = aParser.GetProtocol(); - if ( nProtocol != INET_PROT_VND_SUN_STAR_HELP ) + String aHelpModuleName( GetHelpModuleName_Impl() ); + switch ( nProtocol ) { - String aHelpModuleName( GetHelpModuleName_Impl() ); - aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName ); - if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) + case INET_PROT_NOT_VALID : { - // no help found -> try with parent help id. - Window* pParent = pWindow->GetParent(); - while ( pParent ) + // no URL, just a HelpID (maybe empty in case of keyword search) + aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName ); + if ( pWindow && SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) { - ByteString aHelpId = pParent->GetHelpId(); - aHelpURL = CreateHelpURL( String( aHelpId, RTL_TEXTENCODING_UTF8 ), aHelpModuleName ); - if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) - break; - else + // no help found -> try with parent help id. + Window* pParent = pWindow->GetParent(); + while ( pParent ) { - pParent = pParent->GetParent(); - if ( !pParent ) - // create help url of start page ( helpid == 0 -> start page) - aHelpURL = CreateHelpURL( String(), aHelpModuleName ); + ByteString aHelpId = pParent->GetHelpId(); + aHelpURL = CreateHelpURL( String( aHelpId, RTL_TEXTENCODING_UTF8 ), aHelpModuleName ); + if ( !SfxContentHelper::IsHelpErrorDocument( aHelpURL ) ) + break; + else + { + pParent = pParent->GetParent(); + if ( !pParent ) + // create help url of start page ( helpid == 0 -> start page) + aHelpURL = CreateHelpURL( String(), aHelpModuleName ); + } } } + break; } - - // pb i91715: strings begin with ".HelpId:" are not words of the basic ide - // they are helpid-strings used by the testtool -> so we ignore them - static const String sHelpIdScheme( DEFINE_CONST_OUSTRING(".HelpId:") ); - if ( rURL.Search( sHelpIdScheme ) != 0 ) - sKeyword = ::rtl::OUString( rURL ); + case INET_PROT_VND_SUN_STAR_HELP: + // already a vnd.sun.star.help URL -> nothing to do + aHelpURL = rURL; + break; + default: + aHelpURL = CreateHelpURL_Impl( rURL, aHelpModuleName ); + break; } Reference < XFrame > xDesktop( ::comphelper::getProcessServiceFactory()->createInstance( DEFINE_CONST_UNICODE("com.sun.star.frame.Desktop") ), UNO_QUERY ); - // check if help is still open - // If not - create new one and return acces directly - // to the internal sub frame, which shows the help content. - - // Note further: We search for this sub frame here directly instead of - // the real top level help task ... It's needed to have the same - // sub frame available - so we can use it for loading (which is done - // in both cases)! - + // check if help window is still open + // If not, create a new one and return access directly to the internal sub frame showing the help content + // search must be done here; search one desktop level could return an arbitraty frame Reference< XFrame > xHelp = xDesktop->findFrame( ::rtl::OUString(DEFINE_CONST_UNICODE("OFFICE_HELP_TASK")), FrameSearchFlag::CHILDREN); @@ -791,8 +809,8 @@ BOOL SfxHelp::Start( const String& rURL, const Window* pWindow ) pHelpWindow->SetHelpURL( aHelpURL ); pHelpWindow->loadHelpContent(aHelpURL); - if ( sKeyword.getLength() > 0 ) - pHelpWindow->OpenKeyword( sKeyword ); + if ( rKeyword.Len() ) + pHelpWindow->OpenKeyword( rKeyword ); Reference < ::com::sun::star::awt::XTopWindow > xTopWindow( xHelp->getContainerWindow(), UNO_QUERY ); if ( xTopWindow.is() ) -- cgit From 70146da8808a0aeb48bda3bb837711fa3a812042 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 21 Jul 2010 17:46:37 +0200 Subject: CWS changehid: #i111784#: rework keyword search --- vcl/inc/vcl/help.hxx | 3 ++- vcl/source/app/help.cxx | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/vcl/inc/vcl/help.hxx b/vcl/inc/vcl/help.hxx index baafb92b4b03..1f4ba36d8f43 100644 --- a/vcl/inc/vcl/help.hxx +++ b/vcl/inc/vcl/help.hxx @@ -71,7 +71,8 @@ public: void SetHelpFile( const String& rFileName ) { maHelpFile = rFileName; } const String& GetHelpFile() const { return maHelpFile; } - virtual BOOL Start( const XubString& rKeyWord, const Window* pWindow ); + virtual BOOL Start( const XubString& rHelpId, const Window* pWindow ); + virtual BOOL SearchKeyword( const XubString& rKeyWord ); virtual void OpenHelpAgent( const rtl::OString& rHelpId ); virtual XubString GetHelpText( const String& aHelpURL, const Window* pWindow ); diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx index b09e7746a886..4c2d43e0edff 100644 --- a/vcl/source/app/help.cxx +++ b/vcl/source/app/help.cxx @@ -73,6 +73,11 @@ BOOL Help::Start( const XubString&, const Window* ) return FALSE; } +BOOL Help::SearchKeyword( const XubString& ) +{ + return FALSE; +} + // ----------------------------------------------------------------------- XubString Help::GetHelpText( const String&, const Window* ) -- cgit From a1f5f61d46427b0f6516da9b34c106ca6e870860 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Wed, 21 Jul 2010 17:46:37 +0200 Subject: CWS changehid: #i111784#: rework keyword search --- basctl/source/basicide/baside2b.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index b6b4accb7dd6..ce5e8ee53a14 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 ) -- cgit From 124df99b73b2c0b450bd5c9dd74883e16fc2c3e7 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 22 Jul 2010 15:03:48 +0200 Subject: CWS changehid: #i111874#: pickerhelper.hxx removed --- sfx2/source/dialog/filedlghelper.cxx | 1 - 1 file changed, 1 deletion(-) diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 874a430b6bda..d5a9abe6b597 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -79,7 +79,6 @@ #include #include #include -#include #include #include #include -- cgit From f141d817df67792de77d5805869883f948365d24 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 23 Jul 2010 16:18:22 +0200 Subject: CWS changehid: #i111874#: use '.' instead of ':' as separator for autohelpids; ':' may cause confusion with URL detection --- tools/source/rc/resmgr.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index df8506bb090b..d64d262ea43c 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1811,7 +1811,7 @@ rtl::OString ResMgr::GetAutoHelpId() // prepare HID, start with resource prefix rtl::OStringBuffer aHID( 32 ); aHID.append( rtl::OUStringToOString( pImpRes->aPrefix, RTL_TEXTENCODING_UTF8 ) ); - aHID.append( ':' ); + aHID.append( '.' ); // append type const ImpRCStack *pRC = StackTop(); @@ -1851,7 +1851,7 @@ rtl::OString ResMgr::GetAutoHelpId() // append resource id hierarchy for( int nOff = nCurStack-1; nOff >= 0; nOff-- ) { - aHID.append( ':' ); + aHID.append( '.' ); pRC = StackTop( nOff ); OSL_ENSURE( pRC->pResource, "missing resource in resource stack level !" ); -- cgit From 2572209a92a6ed172f1650f7805f7e5829541ea3 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 23 Jul 2010 16:18:22 +0200 Subject: CWS changehid: #i111874#: use '.' instead of ':' as separator for autohelpids; ':' may cause confusion with URL detection --- solenv/bin/mhids.pl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/solenv/bin/mhids.pl b/solenv/bin/mhids.pl index e26a68c22b79..990e17bb959c 100644 --- a/solenv/bin/mhids.pl +++ b/solenv/bin/mhids.pl @@ -373,9 +373,9 @@ while () $x=2; } if ( $LID != 0) - { printf HID "%s %s:%s:%s:%s \n", $helpIDString, $arr[0], $arr[1], $GID, $LID; } + { printf HID "%s %s.%s.%s.%s \n", $helpIDString, $arr[0], $arr[1], $GID, $LID; } else - { printf HID "%s %s:%s:%s \n", $helpIDString, $arr[0], $arr[1], $GID } + { printf HID "%s %s.%s.%s \n", $helpIDString, $arr[0], $arr[1], $GID } } } -- cgit From 8baaab4f34d4e9a39c554a87ea1699c779d74983 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 23 Jul 2010 16:18:47 +0200 Subject: CWS changehid: #i111874#: some HID cleanup --- framework/inc/uielement/toolbarsmenucontroller.hxx | 2 +- framework/source/uielement/toolbarsmenucontroller.cxx | 15 +++++++-------- svx/inc/fmhelp.hrc | 19 +++++++++++++++++++ svx/source/fmcomp/gridctrl.src | 16 ++++++++-------- svx/source/form/filtnav.src | 6 ++++++ svx/source/form/fmexpl.src | 11 ++++++----- svx/source/form/formshell.src | 7 ++++--- 7 files changed, 51 insertions(+), 25 deletions(-) diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index b46ac233a92c..169923b00e47 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -105,7 +105,7 @@ namespace framework ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue > > getLayoutManagerToolbars( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& rLayoutManager ); rtl::OUString getUINameFromCommand( const rtl::OUString& rCommandURL ); ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > getDispatchFromCommandURL( const rtl::OUString& rCommandURL ); - void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OString& sHelpId, const rtl::OUString& aLabel ); + void addCommand( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OUString& aLabel ); sal_Bool isContextSensitiveToolbarNonVisible(); ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xPersistentWindowState; diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 211df3bee6ab..fffaac0b42df 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -180,7 +180,7 @@ ToolbarsMenuController::~ToolbarsMenuController() } void ToolbarsMenuController::addCommand( - Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OString& sHelpId, const rtl::OUString& rLabel ) + Reference< css::awt::XPopupMenu >& rPopupMenu, const rtl::OUString& rCommandURL, const rtl::OUString& rLabel ) { USHORT nItemId = m_xPopupMenu->getItemCount()+1; @@ -215,7 +215,6 @@ void ToolbarsMenuController::addCommand( PopupMenu* pVCLPopupMenu = (PopupMenu *)pPopupMenu->GetMenu(); if ( !!aImage ) pVCLPopupMenu->SetItemImage( nItemId, aImage ); - pVCLPopupMenu->SetHelpId( nItemId, sHelpId ); } m_aCommandVector.push_back( rCommandURL ); @@ -507,14 +506,14 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" ) || m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" )) { - addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR )), CMD_HYPERLINKBAR, aEmptyString ); + addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_HYPERLINKBAR )), aEmptyString ); if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.drawing.DrawingDocument" ) || m_aModuleIdentifier.equalsAscii( "com.sun.star.presentation.PresentationDocument" )) - addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), CMD_COLORBAR, aEmptyString ); + addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_COLORBAR )), aEmptyString ); else if ( m_aModuleIdentifier.equalsAscii( "com.sun.star.sheet.SpreadsheetDocument" )) - addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), CMD_INPUTLINEBAR, aEmptyString ); + addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_INPUTLINEBAR )), aEmptyString ); else - addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), CMD_FORMULABAR, aEmptyString ); + addCommand( m_xPopupMenu, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( CMD_FORMULABAR )), aEmptyString ); } sal_Bool bAddCommand( sal_True ); @@ -537,7 +536,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r m_xPopupMenu->insertSeparator( nItemCount+1 ); } - addCommand( m_xPopupMenu, aConfigureToolbar, CONFIGURE_TOOLBARS, aEmptyString ); + addCommand( m_xPopupMenu, aConfigureToolbar, aEmptyString ); } // Add separator if no configure has been added @@ -553,7 +552,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r String aLabelStr = String( FwkResId( STR_RESTORE_TOOLBARS )); rtl::OUString aRestoreCmd( RTL_CONSTASCII_USTRINGPARAM( CMD_RESTOREVISIBILITY )); - addCommand( m_xPopupMenu, aRestoreCmd, CMD_RESTOREVISIBILITY, aLabelStr ); + addCommand( m_xPopupMenu, aRestoreCmd, aLabelStr ); } } diff --git a/svx/inc/fmhelp.hrc b/svx/inc/fmhelp.hrc index 1222145655c1..7230df0c6da6 100644 --- a/svx/inc/fmhelp.hrc +++ b/svx/inc/fmhelp.hrc @@ -89,6 +89,25 @@ #define HID_XFORMS_ADDINSTANCE_DLG "SVX_HID_XFORMS_ADDINSTANCE_DLG" #define HID_XFORMS_MID_INSERT_CONTROL "SVX_HID_XFORMS_MID_INSERT_CONTROL" #define HID_XFORMS_TAB_CONTROL "SVX_HID_XFORMS_TAB_CONTROL" +#define HID_FM_DELETEROWS "SVX_HID_FM_DELETEROWS" +#define HID_FM_INSERTCOL "SVX_HID_FM_INSERTCOL" +#define HID_FM_CHANGECOL "SVX_HID_FM_CHANGECOL" +#define HID_FM_DELETECOL "SVX_HID_FM_DELETECOL" +#define HID_FM_HIDECOL "SVX_HID_FM_HIDECOL" +#define HID_FM_SHOWCOLS "SVX_HID_FM_SHOWCOLS" +#define HID_FM_SHOWCOLS_MORE "SVX_HID_FM_SHOWCOLS_MORE" +#define HID_FM_SHOWALLCOLS "SVX_HID_FM_SHOWALLCOLS" +#define HID_FM_DELETE "SVX_HID_FM_DELETE" +#define HID_FM_FILTER_EDIT "SVX_HID_FM_EDIT" +#define HID_FM_FILTER_IS_NULL "SVX_HID_FM_FILTER_IS_NULL" +#define HID_FM_FILTER_IS_NOT_NULL "SVX_HID_FM_IS_NOT_NULL" +#define HID_FM_NEW "SVX_HID_FM_NEW" +#define HID_FM_NEW_FORM "SVX_HID_FM_NEW_FORM" +#define HID_FM_NEW_HIDDEN "SVX_HID_FM_NEW_HIDDEN" +#define HID_FM_RENAME_OBJECT "SVX_HID_FM_RENAME_OBJECT" +#define HID_MENU_FM_TEXTATTRIBUTES_STYLE "SVX_HID_MENU_FM_TEXTATTRIBUTES_STYLE" +#define HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT "SVX_HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT" +#define HID_MENU_FM_TEXTATTRIBUTES_SPACING "SVX_HID_MENU_FM_TEXTATTRIBUTES_SPACING" #endif diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src index 60e43a19f41e..88651ebbe04f 100644 --- a/svx/source/fmcomp/gridctrl.src +++ b/svx/source/fmcomp/gridctrl.src @@ -38,7 +38,7 @@ Menu RID_SVXMNU_ROWS MenuItem { Identifier = SID_FM_DELETEROWS ; -// HelpId = CMD_SID_FM_DELETEROWS ; + HelpId = HID_FM_DELETEROWS ; Text [ en-US ] = "Delete Rows" ; }; MenuItem @@ -62,7 +62,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_INSERTCOL ; -// HelpId = CMD_SID_FM_INSERTCOL ; + HelpId = HID_FM_INSERTCOL ; Text [ en-US ] = "Insert ~Column" ; SubMenu = Menu { @@ -142,25 +142,25 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_CHANGECOL ; -// HelpId = CMD_SID_FM_CHANGECOL ; + HelpId = HID_FM_CHANGECOL ; Text [ en-US ] = "~Replace with" ; }; MenuItem { Identifier = SID_FM_DELETECOL ; -// HelpId = CMD_SID_FM_DELETECOL ; + HelpId = HID_FM_DELETECOL ; Text [ en-US ] = "Delete Column" ; }; MenuItem { Identifier = SID_FM_HIDECOL ; -// HelpId = CMD_SID_FM_HIDECOL ; + HelpId = HID_FM_HIDECOL ; Text [ en-US ] = "~Hide Column"; }; MenuItem { Identifier = SID_FM_SHOWCOLS ; -// HelpId = CMD_SID_FM_SHOWCOLS ; + HelpId = HID_FM_SHOWCOLS ; SubMenu = Menu { ItemList = @@ -168,7 +168,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOWCOLS_MORE ; -// HelpId = CMD_SID_FM_SHOWCOLS_MORE ; + HelpId = HID_FM_SHOWCOLS_MORE ; Text [ en-US ] = "~More..."; }; MenuItem @@ -178,7 +178,7 @@ Menu RID_SVXMNU_COLS MenuItem { Identifier = SID_FM_SHOWALLCOLS ; -// HelpId = CMD_SID_FM_SHOWALLCOLS ; + HelpId = HID_FM_SHOWALLCOLS ; Text [ en-US ] = "~All"; }; }; diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src index c03e90df7130..feaba66729db 100644 --- a/svx/source/form/filtnav.src +++ b/svx/source/form/filtnav.src @@ -27,6 +27,8 @@ #include #include "fmresids.hrc" +#include "fmhelp.hrc" + Menu RID_FM_FILTER_MENU { ItemList = @@ -34,21 +36,25 @@ Menu RID_FM_FILTER_MENU MenuItem { Identifier = SID_FM_DELETE ; + HelpId = HID_FM_DELETE; Text [ en-US ] = "~Delete" ; }; MenuItem { Identifier = SID_FM_FILTER_EDIT ; + HelpId = HID_FM_FILTER_EDIT; Text [ en-US ] = "~Edit" ; }; MenuItem { Identifier = SID_FM_FILTER_IS_NULL ; + HelpId = HID_FM_FILTER_IS_NULL; Text [ en-US ] = "~Is Null" ; }; MenuItem { Identifier = SID_FM_FILTER_IS_NOT_NULL ; + HelpId = HID_FM_FILTER_IS_NOT_NULL; Text [ en-US ] = "I~s not Null" ; }; }; diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index d1d8001eeec0..8aca6d9ad86d 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -30,6 +30,7 @@ #include "fmexpl.hrc" #include "globlmn.hrc" #include +#include "fmhelp.hrc" Menu RID_FMEXPLORER_POPUPMENU { @@ -38,7 +39,7 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_NEW ; -// HelpId = CMD_SID_FM_NEW ; + HelpId = HID_FM_NEW ; Text [ en-US ] = "~New" ; SubMenu = Menu { @@ -47,13 +48,13 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_NEW_FORM ; -// HelpId = CMD_SID_FM_NEW_FORM ; + HelpId = HID_FM_NEW_FORM ; Text [ en-US ] = "Form" ; }; MenuItem { Identifier = SID_FM_NEW_HIDDEN ; -// HelpId = CMD_SID_FM_NEW_HIDDEN ; + HelpId = HID_FM_NEW_HIDDEN ; Text [ en-US ] = "Hidden Control" ; }; }; @@ -71,7 +72,7 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_DELETE ; -// HelpId = CMD_SID_FM_DELETE ; + HelpId = HID_FM_DELETE ; Text [ en-US ] = "~Delete" ; }; MenuItem @@ -83,7 +84,7 @@ Menu RID_FMEXPLORER_POPUPMENU MenuItem { Identifier = SID_FM_RENAME_OBJECT ; -// HelpId = CMD_SID_FM_RENAME_OBJECT ; + HelpId = HID_FM_RENAME_OBJECT ; Text [ en-US ] = "~Rename" ; }; MenuItem diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src index b36590354b17..f7e2419aae7d 100644 --- a/svx/source/form/formshell.src +++ b/svx/source/form/formshell.src @@ -31,6 +31,7 @@ #include #include "globlmn.hrc" #include "helpid.hrc" +#include "fmhelp.hrc" Menu RID_FM_TEXTATTRIBUTE_MENU { @@ -47,7 +48,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_STYLE; -// HelpID = MENU_FM_TEXTATTRIBITES_STYLE; + HelpID = HID_MENU_FM_TEXTATTRIBUTES_STYLE; Text [ en-US ] = "St~yle"; SubMenu = Menu { @@ -96,7 +97,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_ALIGNMENT; -// HelpID = MENU_FM_TEXTATTRIBITES_ALIGNMENT; + HelpID = HID_MENU_FM_TEXTATTRIBUTES_ALIGNMENT; Text [ en-US ] = "~Alignment"; RadioCheck = TRUE; SubMenu = Menu @@ -129,7 +130,7 @@ Menu RID_FM_TEXTATTRIBUTE_MENU MenuItem { Identifier = MENU_FM_TEXTATTRIBITES_SPACING; -// HelpID = MENU_FM_TEXTATTRIBITES_SPACING; + HelpID = HID_MENU_FM_TEXTATTRIBUTES_SPACING; Text [ en-US ] = "~Line Spacing"; _MenuItemFlags = MIB_RADIOCHECK; SubMenu = Menu -- cgit From effc31fbbf24d9b81499acffe29483e764361594 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 23 Jul 2010 16:18:47 +0200 Subject: CWS changehid: #i111874#: some HID cleanup --- sd/inc/helpids.h | 2 -- sd/source/ui/view/drviews5.cxx | 8 ++++---- sd/source/ui/view/drviewsa.cxx | 8 ++++---- 3 files changed, 8 insertions(+), 10 deletions(-) mode change 100644 => 100755 sd/source/ui/view/drviews5.cxx diff --git a/sd/inc/helpids.h b/sd/inc/helpids.h index 2dabcc43db45..b01009f159d6 100755 --- a/sd/inc/helpids.h +++ b/sd/inc/helpids.h @@ -28,8 +28,6 @@ #include #include "sdcommands.h" -#define HID_NOTESMODE "SD_HID_NOTESMODE" -#define HID_HANDOUTMODE "SD_HID_HANDOUTMODE" #define HID_SDDRAWVIEWSHELL "SD_HID_SDDRAWVIEWSHELL" #define HID_SDGRAPHICVIEWSHELL "SD_HID_SDGRAPHICVIEWSHELL" #define HID_SDOUTLINEVIEWSHELL "SD_HID_SDOUTLINEVIEWSHELL" diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx old mode 100644 new mode 100755 index 8d932c4be047..433a4e4fa6c1 --- a/sd/source/ui/view/drviews5.cxx +++ b/sd/source/ui/view/drviews5.cxx @@ -597,14 +597,14 @@ void DrawViewShell::ReadUserDataSequence ( const ::com::sun::star::uno::Sequence if (mePageKind == PK_NOTES) { SetHelpId( SID_NOTESMODE ); - GetActiveWindow()->SetHelpId( HID_NOTESMODE ); - GetActiveWindow()->SetUniqueId( HID_NOTESMODE ); + GetActiveWindow()->SetHelpId( CMD_SID_NOTESMODE ); + GetActiveWindow()->SetUniqueId( CMD_SID_NOTESMODE ); } else if (mePageKind == PK_HANDOUT) { SetHelpId( SID_HANDOUTMODE ); - GetActiveWindow()->SetHelpId( HID_HANDOUTMODE ); - GetActiveWindow()->SetUniqueId( HID_HANDOUTMODE ); + GetActiveWindow()->SetHelpId( CMD_SID_HANDOUTMODE ); + GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUTMODE ); } else { diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx index 394174595696..36e5d96c97ff 100755 --- a/sd/source/ui/view/drviewsa.cxx +++ b/sd/source/ui/view/drviewsa.cxx @@ -343,8 +343,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) if (mePageKind == PK_NOTES) { SetHelpId( SID_NOTESMODE ); - GetActiveWindow()->SetHelpId( HID_NOTESMODE ); - GetActiveWindow()->SetUniqueId( HID_NOTESMODE ); + GetActiveWindow()->SetHelpId( CMD_SID_NOTESMODE ); + GetActiveWindow()->SetUniqueId( CMD_SID_NOTESMODE ); // AutoLayouts muessen erzeugt sein GetDoc()->StopWorkStartupDelay(); @@ -352,8 +352,8 @@ void DrawViewShell::Construct(DrawDocShell* pDocSh, PageKind eInitialPageKind) else if (mePageKind == PK_HANDOUT) { SetHelpId( SID_HANDOUTMODE ); - GetActiveWindow()->SetHelpId( HID_HANDOUTMODE ); - GetActiveWindow()->SetUniqueId( HID_HANDOUTMODE ); + GetActiveWindow()->SetHelpId( CMD_SID_HANDOUTMODE ); + GetActiveWindow()->SetUniqueId( CMD_SID_HANDOUTMODE ); // AutoLayouts muessen erzeugt sein GetDoc()->StopWorkStartupDelay(); -- cgit From d19dc752fe6b9f88c7c6aa4686d8d8c6404cde26 Mon Sep 17 00:00:00 2001 From: Gregor Hartmann Date: Fri, 27 Aug 2010 14:02:22 +0200 Subject: build breakers --- sfx2/source/statbar/stbitem.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 9b5fbd2d5d4e..e5de57d835c3 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -135,8 +135,8 @@ svt::StatusbarController* SAL_CALL SfxStatusBarControllerFactory( { rtl::OString aCmd(".uno:"); aCmd += pSlot->GetUnoName(); - return SfxStatusBarControl::CreateControl( nSlotId, nID, pStatusBar, pModule ); pStatusBar->SetHelpId( nSlotId, aCmd ); + return SfxStatusBarControl::CreateControl( nSlotId, nID, pStatusBar, pModule ); } } -- cgit From eaa4e44cfee19f81a3a3d41982263a3f09e23f06 Mon Sep 17 00:00:00 2001 From: Gregor Hartmann Date: Fri, 27 Aug 2010 14:02:22 +0200 Subject: build breakers --- starmath/inc/helpids.h | 651 +++++++++++++++++++++++++------------------------ 1 file changed, 326 insertions(+), 325 deletions(-) diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h index b33cb304679a..f27b47edcdf3 100644 --- a/starmath/inc/helpids.h +++ b/starmath/inc/helpids.h @@ -1,325 +1,326 @@ -/************************************************************************* - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef STARMATH_HELPIDS_H -#define STARMATH_HELPIDS_H - -#define HID_SMA_OPTIONSDIALOG "STARMATH_HID_SMA_OPTIONSDIALOG" -#define HID_SMA_FONTDIALOG "STARMATH_HID_SMA_FONTDIALOG" -#define HID_SMA_FONTSIZEDIALOG "STARMATH_HID_SMA_FONTSIZEDIALOG" -#define HID_SMA_FONTTYPEDIALOG "STARMATH_HID_SMA_FONTTYPEDIALOG" -#define HID_SMA_DISTANCEDIALOG "STARMATH_HID_SMA_DISTANCEDIALOG" -#define HID_SMA_ALIGNDIALOG "STARMATH_HID_SMA_ALIGNDIALOG" -#define HID_SMA_PRINTOPTIONPAGE "STARMATH_HID_SMA_PRINTOPTIONPAGE" -#define HID_SMA_SYMBOLDIALOG "STARMATH_HID_SMA_SYMBOLDIALOG" -#define HID_SMA_SYMDEFINEDIALOG "STARMATH_HID_SMA_SYMDEFINEDIALOG" -#define HID_SMA_EXTRAOPTIONPAGE "STARMATH_HID_SMA_EXTRAOPTIONPAGE" -#define HID_SMA_DOCSAVEQUERY "STARMATH_HID_SMA_DOCSAVEQUERY" -#define HID_SMA_OBJECTSAVEQUERY "STARMATH_HID_SMA_OBJECTSAVEQUERY" -#define HID_SMA_DEFAULTSAVEQUERY "STARMATH_HID_SMA_DEFAULTSAVEQUERY" -#define HID_SMA_ILLEGALOBJECTERROR "STARMATH_HID_SMA_ILLEGALOBJECTERROR" -#define HID_SMA_ILLEGALFILEERROR "STARMATH_HID_SMA_ILLEGALFILEERROR" -#define HID_SMA_WRITESYMBOLERROR "STARMATH_HID_SMA_WRITESYMBOLERROR" -#define HID_SMA_READSYMBOLERROR "STARMATH_HID_SMA_READSYMBOLERROR" -#define HID_SMA_NOMATHTYPEFACEWARNING "STARMATH_HID_SMA_NOMATHTYPEFACEWARNING" -#define HID_SMA_OBJECTNAME "STARMATH_HID_SMA_OBJECTNAME" -#define HID_SMA_VIEWNAME "STARMATH_HID_SMA_VIEWNAME" -#define HID_SMA_UNDOEDITNAME "STARMATH_HID_SMA_UNDOEDITNAME" -#define HID_SMA_UNDOFORMATNAME "STARMATH_HID_SMA_UNDOFORMATNAME" -#define HID_SMA_APPICO "STARMATH_HID_SMA_APPICO" -#define HID_SMA_DOCICO "STARMATH_HID_SMA_DOCICO" -#define HID_SMA_TMPICO "STARMATH_HID_SMA_TMPICO" -#define HID_SMA_COMMANDMENU "STARMATH_HID_SMA_COMMANDMENU" -#define HID_SMA_VIEWMENU "STARMATH_HID_SMA_VIEWMENU" -#define HID_SMA_DISTANCEMENU "STARMATH_HID_SMA_DISTANCEMENU" -#define HID_SMA_FONTMENU "STARMATH_HID_SMA_FONTMENU" -#define HID_SMA_STARTUPWINDOW "STARMATH_HID_SMA_STARTUPWINDOW" -#define HID_SMA_TOOLBOXWINDOW "STARMATH_HID_SMA_TOOLBOXWINDOW" -#define HID_SMA_CMDBOXWINDOW "STARMATH_HID_SMA_CMDBOXWINDOW" -#define HID_SMA_UPDATEOBJECT "STARMATH_HID_SMA_UPDATEOBJECT" -#define HID_SMA_FONTREGULAR "STARMATH_HID_SMA_FONTREGULAR" -#define HID_SMA_FONTITALIC "STARMATH_HID_SMA_FONTITALIC" -#define HID_SMA_FONTBOLD "STARMATH_HID_SMA_FONTBOLD" -#define HID_SMA_PRINTOPTION "STARMATH_HID_SMA_PRINTOPTION" -#define HID_SMA_DOCUMENTSTR "STARMATH_HID_SMA_DOCUMENTSTR" -#define HID_SMA_SYMBOLFILESSTR "STARMATH_HID_SMA_SYMBOLFILESSTR" -#define HID_SMA_ALLFILESSTR "STARMATH_HID_SMA_ALLFILESSTR" -#define HID_SMA_CREATORSTR "STARMATH_HID_SMA_CREATORSTR" -#define HID_SMA_FILESMFTYP "STARMATH_HID_SMA_FILESMFTYP" -#define HID_SMA_FILESYMTYP "STARMATH_HID_SMA_FILESYMTYP" -#define HID_SMA_WIN_DOCUMENT "STARMATH_HID_SMA_WIN_DOCUMENT" -#define HID_SMA_COMMAND_WIN_EDIT "STARMATH_HID_SMA_COMMAND_WIN_EDIT" - -#define HID_SMA_PLUSX "STARMATH_HID_SMA_PLUSX" -#define HID_SMA_MINUSX "STARMATH_HID_SMA_MINUSX" -#define HID_SMA_PLUSMINUSX "STARMATH_HID_SMA_PLUSMINUSX" -#define HID_SMA_MINUSPLUSX "STARMATH_HID_SMA_MINUSPLUSX" -#define HID_SMA_NEGX "STARMATH_HID_SMA_NEGX" -#define HID_SMA_XPLUSY "STARMATH_HID_SMA_XPLUSY" -#define HID_SMA_XMINUSY "STARMATH_HID_SMA_XMINUSY" -#define HID_SMA_XCDOTY "STARMATH_HID_SMA_XCDOTY" -#define HID_SMA_XTIMESY "STARMATH_HID_SMA_XTIMESY" -#define HID_SMA_XSYMTIMESY "STARMATH_HID_SMA_XSYMTIMESY" -#define HID_SMA_XSYMDIVIDEY "STARMATH_HID_SMA_XSYMDIVIDEY" -#define HID_SMA_XDIVY "STARMATH_HID_SMA_XDIVY" -#define HID_SMA_XOVERY "STARMATH_HID_SMA_XOVERY" -#define HID_SMA_XODIVIDEY "STARMATH_HID_SMA_XODIVIDEY" -#define HID_SMA_XODOTY "STARMATH_HID_SMA_XODOTY" -#define HID_SMA_XOMINUSY "STARMATH_HID_SMA_XOMINUSY" -#define HID_SMA_XOPLUSY "STARMATH_HID_SMA_XOPLUSY" -#define HID_SMA_XOTIMESY "STARMATH_HID_SMA_XOTIMESY" -#define HID_SMA_XANDY "STARMATH_HID_SMA_XANDY" -#define HID_SMA_XORY "STARMATH_HID_SMA_XORY" -#define HID_SMA_XEQY "STARMATH_HID_SMA_XEQY" -#define HID_SMA_XNEQY "STARMATH_HID_SMA_XNEQY" -#define HID_SMA_XLTY "STARMATH_HID_SMA_XLTY" -#define HID_SMA_XGTY "STARMATH_HID_SMA_XGTY" -#define HID_SMA_XLEY "STARMATH_HID_SMA_XLEY" -#define HID_SMA_XGEY "STARMATH_HID_SMA_XGEY" -#define HID_SMA_XLESLANTY "STARMATH_HID_SMA_XLESLANTY" -#define HID_SMA_XGESLANTY "STARMATH_HID_SMA_XGESLANTY" -#define HID_SMA_XLLY "STARMATH_HID_SMA_XLLY" -#define HID_SMA_XGGY "STARMATH_HID_SMA_XGGY" -#define HID_SMA_XDEFY "STARMATH_HID_SMA_XDEFY" -#define HID_SMA_XEQUIVY "STARMATH_HID_SMA_XEQUIVY" -#define HID_SMA_XAPPROXY "STARMATH_HID_SMA_XAPPROXY" -#define HID_SMA_XSIMY "STARMATH_HID_SMA_XSIMY" -#define HID_SMA_XSIMEQY "STARMATH_HID_SMA_XSIMEQY" -#define HID_SMA_XPROPY "STARMATH_HID_SMA_XPROPY" -#define HID_SMA_XORTHOY "STARMATH_HID_SMA_XORTHOY" -#define HID_SMA_XPARALLELY "STARMATH_HID_SMA_XPARALLELY" -#define HID_SMA_XTOWARDY "STARMATH_HID_SMA_XTOWARDY" -#define HID_SMA_XTRANSLY "STARMATH_HID_SMA_XTRANSLY" -#define HID_SMA_XTRANSRY "STARMATH_HID_SMA_XTRANSRY" -#define HID_SMA_XINY "STARMATH_HID_SMA_XINY" -#define HID_SMA_XNOTINY "STARMATH_HID_SMA_XNOTINY" -#define HID_SMA_XOWNSY "STARMATH_HID_SMA_XOWNSY" -#define HID_SMA_XUNIONY "STARMATH_HID_SMA_XUNIONY" -#define HID_SMA_XINTERSECTIONY "STARMATH_HID_SMA_XINTERSECTIONY" -#define HID_SMA_XSETMINUSY "STARMATH_HID_SMA_XSETMINUSY" -#define HID_SMA_XSLASHY "STARMATH_HID_SMA_XSLASHY" -#define HID_SMA_XSUBSETY "STARMATH_HID_SMA_XSUBSETY" -#define HID_SMA_XSUBSETEQY "STARMATH_HID_SMA_XSUBSETEQY" -#define HID_SMA_XSUPSETY "STARMATH_HID_SMA_XSUPSETY" -#define HID_SMA_XSUPSETEQY "STARMATH_HID_SMA_XSUPSETEQY" -#define HID_SMA_XNSUBSETY "STARMATH_HID_SMA_XNSUBSETY" -#define HID_SMA_XNSUBSETEQY "STARMATH_HID_SMA_XNSUBSETEQY" -#define HID_SMA_XNSUPSETY "STARMATH_HID_SMA_XNSUPSETY" -#define HID_SMA_XNSUPSETEQY "STARMATH_HID_SMA_XNSUPSETEQY" -#define HID_SMA_ABSX "STARMATH_HID_SMA_ABSX" -#define HID_SMA_FACTX "STARMATH_HID_SMA_FACTX" -#define HID_SMA_SQRTX "STARMATH_HID_SMA_SQRTX" -#define HID_SMA_NROOTXY "STARMATH_HID_SMA_NROOTXY" -#define HID_SMA_EX "STARMATH_HID_SMA_EX" -#define HID_SMA_EXPX "STARMATH_HID_SMA_EXPX" -#define HID_SMA_LNX "STARMATH_HID_SMA_LNX" -#define HID_SMA_LOGX "STARMATH_HID_SMA_LOGX" -#define HID_SMA_SINX "STARMATH_HID_SMA_SINX" -#define HID_SMA_COSX "STARMATH_HID_SMA_COSX" -#define HID_SMA_TANX "STARMATH_HID_SMA_TANX" -#define HID_SMA_COTX "STARMATH_HID_SMA_COTX" -#define HID_SMA_ARCSINX "STARMATH_HID_SMA_ARCSINX" -#define HID_SMA_ARCCOSX "STARMATH_HID_SMA_ARCCOSX" -#define HID_SMA_ARCTANX "STARMATH_HID_SMA_ARCTANX" -#define HID_SMA_ARCCOTX "STARMATH_HID_SMA_ARCCOTX" -#define HID_SMA_SINHX "STARMATH_HID_SMA_SINHX" -#define HID_SMA_COSHX "STARMATH_HID_SMA_COSHX" -#define HID_SMA_TANHX "STARMATH_HID_SMA_TANHX" -#define HID_SMA_COTHX "STARMATH_HID_SMA_COTHX" -#define HID_SMA_ARSINHX "STARMATH_HID_SMA_ARSINHX" -#define HID_SMA_ARCOSHX "STARMATH_HID_SMA_ARCOSHX" -#define HID_SMA_ARTANHX "STARMATH_HID_SMA_ARTANHX" -#define HID_SMA_ARCOTHX "STARMATH_HID_SMA_ARCOTHX" -#define HID_SMA_SUMX "STARMATH_HID_SMA_SUMX" -#define HID_SMA_PRODX "STARMATH_HID_SMA_PRODX" -#define HID_SMA_COPRODX "STARMATH_HID_SMA_COPRODX" -#define HID_SMA_LIMX "STARMATH_HID_SMA_LIMX" -#define HID_SMA_LIMINFX "STARMATH_HID_SMA_LIMINFX" -#define HID_SMA_LIMSUPX "STARMATH_HID_SMA_LIMSUPX" -#define HID_SMA_EXISTS "STARMATH_HID_SMA_EXISTS" -#define HID_SMA_FORALL "STARMATH_HID_SMA_FORALL" -#define HID_SMA_NABLA "STARMATH_HID_SMA_NABLA" -#define HID_SMA_INTX "STARMATH_HID_SMA_INTX" -#define HID_SMA_IINTX "STARMATH_HID_SMA_IINTX" -#define HID_SMA_IIINTX "STARMATH_HID_SMA_IIINTX" -#define HID_SMA_LINTX "STARMATH_HID_SMA_LINTX" -#define HID_SMA_LLINTX "STARMATH_HID_SMA_LLINTX" -#define HID_SMA_LLLINTX "STARMATH_HID_SMA_LLLINTX" -#define HID_SMA_FROMX "STARMATH_HID_SMA_FROMX" -#define HID_SMA_TOX "STARMATH_HID_SMA_TOX" -#define HID_SMA_FROMXTOY "STARMATH_HID_SMA_FROMXTOY" -#define HID_SMA_XCIRCY "STARMATH_HID_SMA_XCIRCY" -#define HID_SMA_XDIVIDESY "STARMATH_HID_SMA_XDIVIDESY" -#define HID_SMA_XNDIVIDESY "STARMATH_HID_SMA_XNDIVIDESY" -#define HID_SMA_DLARROW "STARMATH_HID_SMA_DLARROW" -#define HID_SMA_DLRARROW "STARMATH_HID_SMA_DLRARROW" -#define HID_SMA_DRARROW "STARMATH_HID_SMA_DRARROW" - -#define HID_SMA_MISC_CAT "STARMATH_HID_SMA_MISC_CAT" -#define HID_SMA_UNBINOPS_CAT "STARMATH_HID_SMA_UNBINOPS_CAT" -#define HID_SMA_RELATIONS_CAT "STARMATH_HID_SMA_RELATIONS_CAT" -#define HID_SMA_SETOPERATIONS_CAT "STARMATH_HID_SMA_SETOPERATIONS_CAT" -#define HID_SMA_FUNCTIONS_CAT "STARMATH_HID_SMA_FUNCTIONS_CAT" -#define HID_SMA_OPERATORS_CAT "STARMATH_HID_SMA_OPERATORS_CAT" -#define HID_SMA_ATTRIBUTES_CAT "STARMATH_HID_SMA_ATTRIBUTES_CAT" -#define HID_SMA_BRACKETS_CAT "STARMATH_HID_SMA_BRACKETS_CAT" -#define HID_SMA_FORMAT_CAT "STARMATH_HID_SMA_FORMAT_CAT" - -#define HID_SMA_OPERATOR_WIN "STARMATH_HID_SMA_OPERATOR_WIN" -#define HID_SMA_UNBINOPS_TBX "STARMATH_HID_SMA_UNBINOPS_TBX" -#define HID_SMA_RELATIONS_TBX "STARMATH_HID_SMA_RELATIONS_TBX" -#define HID_SMA_SETOPERATIONS_TBX "STARMATH_HID_SMA_SETOPERATIONS_TBX" -#define HID_SMA_FUNCTIONS_TBX "STARMATH_HID_SMA_FUNCTIONS_TBX" -#define HID_SMA_OPERATORS_TBX "STARMATH_HID_SMA_OPERATORS_TBX" -#define HID_SMA_ATTRIBUTES_TBX "STARMATH_HID_SMA_ATTRIBUTES_TBX" -#define HID_SMA_BRACKETS_TBX "STARMATH_HID_SMA_BRACKETS_TBX" -#define HID_SMA_FORMAT_TBX "STARMATH_HID_SMA_FORMAT_TBX" -#define HID_SMA_SELECTION_TBX "STARMATH_HID_SMA_SELECTION_TBX" -#define HID_SMA_COMMAND_WIN "STARMATH_HID_SMA_COMMAND_WIN" -#define HID_SMA_MISC_MENU "STARMATH_HID_SMA_MISC_MENU" -#define HID_SMA_FUNCTIONSOTHER1_MENU "STARMATH_HID_SMA_FUNCTIONSOTHER1_MENU" - -#define HID_SMA_ACUTEX "STARMATH_HID_SMA_ACUTEX" -#define HID_SMA_BARX "STARMATH_HID_SMA_BARX" -#define HID_SMA_BREVEX "STARMATH_HID_SMA_BREVEX" -#define HID_SMA_CHECKX "STARMATH_HID_SMA_CHECKX" -#define HID_SMA_CIRCLEX "STARMATH_HID_SMA_CIRCLEX" -#define HID_SMA_DOTX "STARMATH_HID_SMA_DOTX" -#define HID_SMA_DDOTX "STARMATH_HID_SMA_DDOTX" -#define HID_SMA_DDDOTX "STARMATH_HID_SMA_DDDOTX" -#define HID_SMA_GRAVEX "STARMATH_HID_SMA_GRAVEX" -#define HID_SMA_HATX "STARMATH_HID_SMA_HATX" -#define HID_SMA_TILDEX "STARMATH_HID_SMA_TILDEX" -#define HID_SMA_VECX "STARMATH_HID_SMA_VECX" -#define HID_SMA_UNDERLINEX "STARMATH_HID_SMA_UNDERLINEX" -#define HID_SMA_OVERLINEX "STARMATH_HID_SMA_OVERLINEX" -#define HID_SMA_OVERSTRIKEX "STARMATH_HID_SMA_OVERSTRIKEX" -#define HID_SMA_PHANTOMX "STARMATH_HID_SMA_PHANTOMX" -#define HID_SMA_BOLDX "STARMATH_HID_SMA_BOLDX" -#define HID_SMA_ITALX "STARMATH_HID_SMA_ITALX" -#define HID_SMA_SIZEXY "STARMATH_HID_SMA_SIZEXY" -#define HID_SMA_FONTXY "STARMATH_HID_SMA_FONTXY" -#define HID_SMA_COLORX "STARMATH_HID_SMA_COLORX" -#define HID_SMA_LRGROUPX "STARMATH_HID_SMA_LRGROUPX" -#define HID_SMA_LRPARENTX "STARMATH_HID_SMA_LRPARENTX" -#define HID_SMA_LRBRACKETX "STARMATH_HID_SMA_LRBRACKETX" -#define HID_SMA_LRBRACEX "STARMATH_HID_SMA_LRBRACEX" -#define HID_SMA_LRANGLEX "STARMATH_HID_SMA_LRANGLEX" -#define HID_SMA_LRCEILX "STARMATH_HID_SMA_LRCEILX" -#define HID_SMA_LRFLOORX "STARMATH_HID_SMA_LRFLOORX" -#define HID_SMA_LRLINEX "STARMATH_HID_SMA_LRLINEX" -#define HID_SMA_LRDLINEX "STARMATH_HID_SMA_LRDLINEX" -#define HID_SMA_SLRPARENTX "STARMATH_HID_SMA_SLRPARENTX" -#define HID_SMA_SLRBRACKETX "STARMATH_HID_SMA_SLRBRACKETX" -#define HID_SMA_SLRBRACEX "STARMATH_HID_SMA_SLRBRACEX" -#define HID_SMA_SLRANGLEX "STARMATH_HID_SMA_SLRANGLEX" -#define HID_SMA_SLRCEILX "STARMATH_HID_SMA_SLRCEILX" -#define HID_SMA_SLRFLOORX "STARMATH_HID_SMA_SLRFLOORX" -#define HID_SMA_SLRLINEX "STARMATH_HID_SMA_SLRLINEX" -#define HID_SMA_SLRDLINEX "STARMATH_HID_SMA_SLRDLINEX" -#define HID_SMA_RSUBX "STARMATH_HID_SMA_RSUBX" -#define HID_SMA_RSUPX "STARMATH_HID_SMA_RSUPX" -#define HID_SMA_LSUBX "STARMATH_HID_SMA_LSUBX" -#define HID_SMA_LSUPX "STARMATH_HID_SMA_LSUPX" -#define HID_SMA_SBLANK "STARMATH_HID_SMA_SBLANK" -#define HID_SMA_BLANK "STARMATH_HID_SMA_BLANK" -#define HID_SMA_NEWLINE "STARMATH_HID_SMA_NEWLINE" -#define HID_SMA_BINOMXY "STARMATH_HID_SMA_BINOMXY" -#define HID_SMA_STACK "STARMATH_HID_SMA_STACK" -#define HID_SMA_MATRIX "STARMATH_HID_SMA_MATRIX" -#define HID_SMA_ALIGNLX "STARMATH_HID_SMA_ALIGNLX" -#define HID_SMA_ALIGNCX "STARMATH_HID_SMA_ALIGNCX" -#define HID_SMA_ALIGNRX "STARMATH_HID_SMA_ALIGNRX" -#define HID_SMA_ALEPH "STARMATH_HID_SMA_ALEPH" -#define HID_SMA_EMPTYSET "STARMATH_HID_SMA_EMPTYSET" -#define HID_SMA_RE "STARMATH_HID_SMA_RE" -#define HID_SMA_IM "STARMATH_HID_SMA_IM" -#define HID_SMA_INFINITY "STARMATH_HID_SMA_INFINITY" -#define HID_SMA_PARTIAL "STARMATH_HID_SMA_PARTIAL" -#define HID_SMA_WP "STARMATH_HID_SMA_WP" -#define HID_SMA_DOTSAXIS "STARMATH_HID_SMA_DOTSAXIS" -#define HID_SMA_DOTSUP "STARMATH_HID_SMA_DOTSUP" -#define HID_SMA_DOTSDOWN "STARMATH_HID_SMA_DOTSDOWN" -#define HID_SMA_DOTSLOW "STARMATH_HID_SMA_DOTSLOW" -#define HID_SMA_DOTSVERT "STARMATH_HID_SMA_DOTSVERT" - -#define HID_SMA_SETN "STARMATH_HID_SMA_SETN" -#define HID_SMA_SETZ "STARMATH_HID_SMA_SETZ" -#define HID_SMA_SETQ "STARMATH_HID_SMA_SETQ" -#define HID_SMA_SETR "STARMATH_HID_SMA_SETR" -#define HID_SMA_SETC "STARMATH_HID_SMA_SETC" -#define HID_SMA_WIDEHATX "STARMATH_HID_SMA_WIDEHATX" -#define HID_SMA_WIDETILDEX "STARMATH_HID_SMA_WIDETILDEX" -#define HID_SMA_WIDEVECX "STARMATH_HID_SMA_WIDEVECX" -#define HID_SMA_CSUBX "STARMATH_HID_SMA_CSUBX" -#define HID_SMA_CSUPX "STARMATH_HID_SMA_CSUPX" -#define HID_SMA_HBAR "STARMATH_HID_SMA_HBAR" -#define HID_SMA_LAMBDABAR "STARMATH_HID_SMA_LAMBDABAR" -#define HID_SMA_LEFTARROW "STARMATH_HID_SMA_LEFTARROW" -#define HID_SMA_RIGHTARROW "STARMATH_HID_SMA_RIGHTARROW" -#define HID_SMA_UPARROW "STARMATH_HID_SMA_UPARROW" -#define HID_SMA_DOWNARROW "STARMATH_HID_SMA_DOWNARROW" - -#define HID_SMA_DEFAULT_DIST "STARMATH_HID_SMA_DEFAULT_DIST" -#define HID_SMA_LINE_DIST "STARMATH_HID_SMA_LINE_DIST" -#define HID_SMA_ROOT_DIST "STARMATH_HID_SMA_ROOT_DIST" -#define HID_SMA_SUP_DIST "STARMATH_HID_SMA_SUP_DIST" -#define HID_SMA_SUB_DIST "STARMATH_HID_SMA_SUB_DIST" -#define HID_SMA_NUMERATOR_DIST "STARMATH_HID_SMA_NUMERATOR_DIST" -#define HID_SMA_DENOMINATOR_DIST "STARMATH_HID_SMA_DENOMINATOR_DIST" -#define HID_SMA_FRACLINE_EXCWIDTH "STARMATH_HID_SMA_FRACLINE_EXCWIDTH" -#define HID_SMA_FRACLINE_LINEWIDTH "STARMATH_HID_SMA_FRACLINE_LINEWIDTH" -#define HID_SMA_UPPERLIMIT_DIST "STARMATH_HID_SMA_UPPERLIMIT_DIST" -#define HID_SMA_LOWERLIMIT_DIST "STARMATH_HID_SMA_LOWERLIMIT_DIST" -#define HID_SMA_BRACKET_EXCHEIGHT "STARMATH_HID_SMA_BRACKET_EXCHEIGHT" -#define HID_SMA_BRACKET_DIST "STARMATH_HID_SMA_BRACKET_DIST" -#define HID_SMA_MATRIXROW_DIST "STARMATH_HID_SMA_MATRIXROW_DIST" -#define HID_SMA_MATRIXCOL_DIST "STARMATH_HID_SMA_MATRIXCOL_DIST" -#define HID_SMA_ATTRIBUT_DIST "STARMATH_HID_SMA_ATTRIBUT_DIST" -#define HID_SMA_INTERATTRIBUT_DIST "STARMATH_HID_SMA_INTERATTRIBUT_DIST" -#define HID_SMA_OPERATOR_EXCHEIGHT "STARMATH_HID_SMA_OPERATOR_EXCHEIGHT" -#define HID_SMA_OPERATOR_DIST "STARMATH_HID_SMA_OPERATOR_DIST" -#define HID_SMA_LEFTBORDER_DIST "STARMATH_HID_SMA_LEFTBORDER_DIST" -#define HID_SMA_RIGHTBORDER_DIST "STARMATH_HID_SMA_RIGHTBORDER_DIST" -#define HID_SMA_UPPERBORDER_DIST "STARMATH_HID_SMA_UPPERBORDER_DIST" -#define HID_SMA_LOWERBORDER_DIST "STARMATH_HID_SMA_LOWERBORDER_DIST" -#define HID_SMA_SCALE_ALL_BRACKETS "STARMATH_HID_SMA_SCALE_ALL_BRACKETS" -#define HID_SMA_BRACKET_EXCHEIGHT2 "STARMATH_HID_SMA_BRACKET_EXCHEIGHT2" -#define HID_SMA_LMRANGLEXY "STARMATH_HID_SMA_LMRANGLEXY" -#define HID_SMA_SLMRANGLEXY "STARMATH_HID_SMA_SLMRANGLEXY" -#define HID_SMA_XWIDESLASHY "STARMATH_HID_SMA_XWIDESLASHY" -#define HID_SMA_XWIDEBSLASHY "STARMATH_HID_SMA_XWIDEBSLASHY" -#define HID_SMA_XOVERBRACEY "STARMATH_HID_SMA_XOVERBRACEY" -#define HID_SMA_XUNDERBRACEY "STARMATH_HID_SMA_XUNDERBRACEY" -#define HID_SMA_LRDBRACKETX "STARMATH_HID_SMA_LRDBRACKETX" -#define HID_SMA_SLRDBRACKETX "STARMATH_HID_SMA_SLRDBRACKETX" - -#define HID_SMA_CONTROL_SYMBOLSET_VIEW "STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW" -#define HID_SMA_CONTROL_FONTCHAR_VIEW "STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW" - -#define HID_SMA_NOSPACE "STARMATH_HID_SMA_NOSPACE" - -#endif \ No newline at end of file +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ +#ifndef STARMATH_HELPIDS_H +#define STARMATH_HELPIDS_H + +#define HID_SMA_OPTIONSDIALOG "STARMATH_HID_SMA_OPTIONSDIALOG" +#define HID_SMA_FONTDIALOG "STARMATH_HID_SMA_FONTDIALOG" +#define HID_SMA_FONTSIZEDIALOG "STARMATH_HID_SMA_FONTSIZEDIALOG" +#define HID_SMA_FONTTYPEDIALOG "STARMATH_HID_SMA_FONTTYPEDIALOG" +#define HID_SMA_DISTANCEDIALOG "STARMATH_HID_SMA_DISTANCEDIALOG" +#define HID_SMA_ALIGNDIALOG "STARMATH_HID_SMA_ALIGNDIALOG" +#define HID_SMA_PRINTOPTIONPAGE "STARMATH_HID_SMA_PRINTOPTIONPAGE" +#define HID_SMA_SYMBOLDIALOG "STARMATH_HID_SMA_SYMBOLDIALOG" +#define HID_SMA_SYMDEFINEDIALOG "STARMATH_HID_SMA_SYMDEFINEDIALOG" +#define HID_SMA_EXTRAOPTIONPAGE "STARMATH_HID_SMA_EXTRAOPTIONPAGE" +#define HID_SMA_DOCSAVEQUERY "STARMATH_HID_SMA_DOCSAVEQUERY" +#define HID_SMA_OBJECTSAVEQUERY "STARMATH_HID_SMA_OBJECTSAVEQUERY" +#define HID_SMA_DEFAULTSAVEQUERY "STARMATH_HID_SMA_DEFAULTSAVEQUERY" +#define HID_SMA_ILLEGALOBJECTERROR "STARMATH_HID_SMA_ILLEGALOBJECTERROR" +#define HID_SMA_ILLEGALFILEERROR "STARMATH_HID_SMA_ILLEGALFILEERROR" +#define HID_SMA_WRITESYMBOLERROR "STARMATH_HID_SMA_WRITESYMBOLERROR" +#define HID_SMA_READSYMBOLERROR "STARMATH_HID_SMA_READSYMBOLERROR" +#define HID_SMA_NOMATHTYPEFACEWARNING "STARMATH_HID_SMA_NOMATHTYPEFACEWARNING" +#define HID_SMA_OBJECTNAME "STARMATH_HID_SMA_OBJECTNAME" +#define HID_SMA_VIEWNAME "STARMATH_HID_SMA_VIEWNAME" +#define HID_SMA_UNDOEDITNAME "STARMATH_HID_SMA_UNDOEDITNAME" +#define HID_SMA_UNDOFORMATNAME "STARMATH_HID_SMA_UNDOFORMATNAME" +#define HID_SMA_APPICO "STARMATH_HID_SMA_APPICO" +#define HID_SMA_DOCICO "STARMATH_HID_SMA_DOCICO" +#define HID_SMA_TMPICO "STARMATH_HID_SMA_TMPICO" +#define HID_SMA_COMMANDMENU "STARMATH_HID_SMA_COMMANDMENU" +#define HID_SMA_VIEWMENU "STARMATH_HID_SMA_VIEWMENU" +#define HID_SMA_DISTANCEMENU "STARMATH_HID_SMA_DISTANCEMENU" +#define HID_SMA_FONTMENU "STARMATH_HID_SMA_FONTMENU" +#define HID_SMA_STARTUPWINDOW "STARMATH_HID_SMA_STARTUPWINDOW" +#define HID_SMA_TOOLBOXWINDOW "STARMATH_HID_SMA_TOOLBOXWINDOW" +#define HID_SMA_CMDBOXWINDOW "STARMATH_HID_SMA_CMDBOXWINDOW" +#define HID_SMA_UPDATEOBJECT "STARMATH_HID_SMA_UPDATEOBJECT" +#define HID_SMA_FONTREGULAR "STARMATH_HID_SMA_FONTREGULAR" +#define HID_SMA_FONTITALIC "STARMATH_HID_SMA_FONTITALIC" +#define HID_SMA_FONTBOLD "STARMATH_HID_SMA_FONTBOLD" +#define HID_SMA_PRINTOPTION "STARMATH_HID_SMA_PRINTOPTION" +#define HID_SMA_DOCUMENTSTR "STARMATH_HID_SMA_DOCUMENTSTR" +#define HID_SMA_SYMBOLFILESSTR "STARMATH_HID_SMA_SYMBOLFILESSTR" +#define HID_SMA_ALLFILESSTR "STARMATH_HID_SMA_ALLFILESSTR" +#define HID_SMA_CREATORSTR "STARMATH_HID_SMA_CREATORSTR" +#define HID_SMA_FILESMFTYP "STARMATH_HID_SMA_FILESMFTYP" +#define HID_SMA_FILESYMTYP "STARMATH_HID_SMA_FILESYMTYP" +#define HID_SMA_WIN_DOCUMENT "STARMATH_HID_SMA_WIN_DOCUMENT" +#define HID_SMA_COMMAND_WIN_EDIT "STARMATH_HID_SMA_COMMAND_WIN_EDIT" + +#define HID_SMA_PLUSX "STARMATH_HID_SMA_PLUSX" +#define HID_SMA_MINUSX "STARMATH_HID_SMA_MINUSX" +#define HID_SMA_PLUSMINUSX "STARMATH_HID_SMA_PLUSMINUSX" +#define HID_SMA_MINUSPLUSX "STARMATH_HID_SMA_MINUSPLUSX" +#define HID_SMA_NEGX "STARMATH_HID_SMA_NEGX" +#define HID_SMA_XPLUSY "STARMATH_HID_SMA_XPLUSY" +#define HID_SMA_XMINUSY "STARMATH_HID_SMA_XMINUSY" +#define HID_SMA_XCDOTY "STARMATH_HID_SMA_XCDOTY" +#define HID_SMA_XTIMESY "STARMATH_HID_SMA_XTIMESY" +#define HID_SMA_XSYMTIMESY "STARMATH_HID_SMA_XSYMTIMESY" +#define HID_SMA_XSYMDIVIDEY "STARMATH_HID_SMA_XSYMDIVIDEY" +#define HID_SMA_XDIVY "STARMATH_HID_SMA_XDIVY" +#define HID_SMA_XOVERY "STARMATH_HID_SMA_XOVERY" +#define HID_SMA_XODIVIDEY "STARMATH_HID_SMA_XODIVIDEY" +#define HID_SMA_XODOTY "STARMATH_HID_SMA_XODOTY" +#define HID_SMA_XOMINUSY "STARMATH_HID_SMA_XOMINUSY" +#define HID_SMA_XOPLUSY "STARMATH_HID_SMA_XOPLUSY" +#define HID_SMA_XOTIMESY "STARMATH_HID_SMA_XOTIMESY" +#define HID_SMA_XANDY "STARMATH_HID_SMA_XANDY" +#define HID_SMA_XORY "STARMATH_HID_SMA_XORY" +#define HID_SMA_XEQY "STARMATH_HID_SMA_XEQY" +#define HID_SMA_XNEQY "STARMATH_HID_SMA_XNEQY" +#define HID_SMA_XLTY "STARMATH_HID_SMA_XLTY" +#define HID_SMA_XGTY "STARMATH_HID_SMA_XGTY" +#define HID_SMA_XLEY "STARMATH_HID_SMA_XLEY" +#define HID_SMA_XGEY "STARMATH_HID_SMA_XGEY" +#define HID_SMA_XLESLANTY "STARMATH_HID_SMA_XLESLANTY" +#define HID_SMA_XGESLANTY "STARMATH_HID_SMA_XGESLANTY" +#define HID_SMA_XLLY "STARMATH_HID_SMA_XLLY" +#define HID_SMA_XGGY "STARMATH_HID_SMA_XGGY" +#define HID_SMA_XDEFY "STARMATH_HID_SMA_XDEFY" +#define HID_SMA_XEQUIVY "STARMATH_HID_SMA_XEQUIVY" +#define HID_SMA_XAPPROXY "STARMATH_HID_SMA_XAPPROXY" +#define HID_SMA_XSIMY "STARMATH_HID_SMA_XSIMY" +#define HID_SMA_XSIMEQY "STARMATH_HID_SMA_XSIMEQY" +#define HID_SMA_XPROPY "STARMATH_HID_SMA_XPROPY" +#define HID_SMA_XORTHOY "STARMATH_HID_SMA_XORTHOY" +#define HID_SMA_XPARALLELY "STARMATH_HID_SMA_XPARALLELY" +#define HID_SMA_XTOWARDY "STARMATH_HID_SMA_XTOWARDY" +#define HID_SMA_XTRANSLY "STARMATH_HID_SMA_XTRANSLY" +#define HID_SMA_XTRANSRY "STARMATH_HID_SMA_XTRANSRY" +#define HID_SMA_XINY "STARMATH_HID_SMA_XINY" +#define HID_SMA_XNOTINY "STARMATH_HID_SMA_XNOTINY" +#define HID_SMA_XOWNSY "STARMATH_HID_SMA_XOWNSY" +#define HID_SMA_XUNIONY "STARMATH_HID_SMA_XUNIONY" +#define HID_SMA_XINTERSECTIONY "STARMATH_HID_SMA_XINTERSECTIONY" +#define HID_SMA_XSETMINUSY "STARMATH_HID_SMA_XSETMINUSY" +#define HID_SMA_XSLASHY "STARMATH_HID_SMA_XSLASHY" +#define HID_SMA_XSUBSETY "STARMATH_HID_SMA_XSUBSETY" +#define HID_SMA_XSUBSETEQY "STARMATH_HID_SMA_XSUBSETEQY" +#define HID_SMA_XSUPSETY "STARMATH_HID_SMA_XSUPSETY" +#define HID_SMA_XSUPSETEQY "STARMATH_HID_SMA_XSUPSETEQY" +#define HID_SMA_XNSUBSETY "STARMATH_HID_SMA_XNSUBSETY" +#define HID_SMA_XNSUBSETEQY "STARMATH_HID_SMA_XNSUBSETEQY" +#define HID_SMA_XNSUPSETY "STARMATH_HID_SMA_XNSUPSETY" +#define HID_SMA_XNSUPSETEQY "STARMATH_HID_SMA_XNSUPSETEQY" +#define HID_SMA_ABSX "STARMATH_HID_SMA_ABSX" +#define HID_SMA_FACTX "STARMATH_HID_SMA_FACTX" +#define HID_SMA_SQRTX "STARMATH_HID_SMA_SQRTX" +#define HID_SMA_NROOTXY "STARMATH_HID_SMA_NROOTXY" +#define HID_SMA_EX "STARMATH_HID_SMA_EX" +#define HID_SMA_EXPX "STARMATH_HID_SMA_EXPX" +#define HID_SMA_LNX "STARMATH_HID_SMA_LNX" +#define HID_SMA_LOGX "STARMATH_HID_SMA_LOGX" +#define HID_SMA_SINX "STARMATH_HID_SMA_SINX" +#define HID_SMA_COSX "STARMATH_HID_SMA_COSX" +#define HID_SMA_TANX "STARMATH_HID_SMA_TANX" +#define HID_SMA_COTX "STARMATH_HID_SMA_COTX" +#define HID_SMA_ARCSINX "STARMATH_HID_SMA_ARCSINX" +#define HID_SMA_ARCCOSX "STARMATH_HID_SMA_ARCCOSX" +#define HID_SMA_ARCTANX "STARMATH_HID_SMA_ARCTANX" +#define HID_SMA_ARCCOTX "STARMATH_HID_SMA_ARCCOTX" +#define HID_SMA_SINHX "STARMATH_HID_SMA_SINHX" +#define HID_SMA_COSHX "STARMATH_HID_SMA_COSHX" +#define HID_SMA_TANHX "STARMATH_HID_SMA_TANHX" +#define HID_SMA_COTHX "STARMATH_HID_SMA_COTHX" +#define HID_SMA_ARSINHX "STARMATH_HID_SMA_ARSINHX" +#define HID_SMA_ARCOSHX "STARMATH_HID_SMA_ARCOSHX" +#define HID_SMA_ARTANHX "STARMATH_HID_SMA_ARTANHX" +#define HID_SMA_ARCOTHX "STARMATH_HID_SMA_ARCOTHX" +#define HID_SMA_SUMX "STARMATH_HID_SMA_SUMX" +#define HID_SMA_PRODX "STARMATH_HID_SMA_PRODX" +#define HID_SMA_COPRODX "STARMATH_HID_SMA_COPRODX" +#define HID_SMA_LIMX "STARMATH_HID_SMA_LIMX" +#define HID_SMA_LIMINFX "STARMATH_HID_SMA_LIMINFX" +#define HID_SMA_LIMSUPX "STARMATH_HID_SMA_LIMSUPX" +#define HID_SMA_EXISTS "STARMATH_HID_SMA_EXISTS" +#define HID_SMA_FORALL "STARMATH_HID_SMA_FORALL" +#define HID_SMA_NABLA "STARMATH_HID_SMA_NABLA" +#define HID_SMA_INTX "STARMATH_HID_SMA_INTX" +#define HID_SMA_IINTX "STARMATH_HID_SMA_IINTX" +#define HID_SMA_IIINTX "STARMATH_HID_SMA_IIINTX" +#define HID_SMA_LINTX "STARMATH_HID_SMA_LINTX" +#define HID_SMA_LLINTX "STARMATH_HID_SMA_LLINTX" +#define HID_SMA_LLLINTX "STARMATH_HID_SMA_LLLINTX" +#define HID_SMA_FROMX "STARMATH_HID_SMA_FROMX" +#define HID_SMA_TOX "STARMATH_HID_SMA_TOX" +#define HID_SMA_FROMXTOY "STARMATH_HID_SMA_FROMXTOY" +#define HID_SMA_XCIRCY "STARMATH_HID_SMA_XCIRCY" +#define HID_SMA_XDIVIDESY "STARMATH_HID_SMA_XDIVIDESY" +#define HID_SMA_XNDIVIDESY "STARMATH_HID_SMA_XNDIVIDESY" +#define HID_SMA_DLARROW "STARMATH_HID_SMA_DLARROW" +#define HID_SMA_DLRARROW "STARMATH_HID_SMA_DLRARROW" +#define HID_SMA_DRARROW "STARMATH_HID_SMA_DRARROW" + +#define HID_SMA_MISC_CAT "STARMATH_HID_SMA_MISC_CAT" +#define HID_SMA_UNBINOPS_CAT "STARMATH_HID_SMA_UNBINOPS_CAT" +#define HID_SMA_RELATIONS_CAT "STARMATH_HID_SMA_RELATIONS_CAT" +#define HID_SMA_SETOPERATIONS_CAT "STARMATH_HID_SMA_SETOPERATIONS_CAT" +#define HID_SMA_FUNCTIONS_CAT "STARMATH_HID_SMA_FUNCTIONS_CAT" +#define HID_SMA_OPERATORS_CAT "STARMATH_HID_SMA_OPERATORS_CAT" +#define HID_SMA_ATTRIBUTES_CAT "STARMATH_HID_SMA_ATTRIBUTES_CAT" +#define HID_SMA_BRACKETS_CAT "STARMATH_HID_SMA_BRACKETS_CAT" +#define HID_SMA_FORMAT_CAT "STARMATH_HID_SMA_FORMAT_CAT" + +#define HID_SMA_OPERATOR_WIN "STARMATH_HID_SMA_OPERATOR_WIN" +#define HID_SMA_UNBINOPS_TBX "STARMATH_HID_SMA_UNBINOPS_TBX" +#define HID_SMA_RELATIONS_TBX "STARMATH_HID_SMA_RELATIONS_TBX" +#define HID_SMA_SETOPERATIONS_TBX "STARMATH_HID_SMA_SETOPERATIONS_TBX" +#define HID_SMA_FUNCTIONS_TBX "STARMATH_HID_SMA_FUNCTIONS_TBX" +#define HID_SMA_OPERATORS_TBX "STARMATH_HID_SMA_OPERATORS_TBX" +#define HID_SMA_ATTRIBUTES_TBX "STARMATH_HID_SMA_ATTRIBUTES_TBX" +#define HID_SMA_BRACKETS_TBX "STARMATH_HID_SMA_BRACKETS_TBX" +#define HID_SMA_FORMAT_TBX "STARMATH_HID_SMA_FORMAT_TBX" +#define HID_SMA_SELECTION_TBX "STARMATH_HID_SMA_SELECTION_TBX" +#define HID_SMA_COMMAND_WIN "STARMATH_HID_SMA_COMMAND_WIN" +#define HID_SMA_MISC_MENU "STARMATH_HID_SMA_MISC_MENU" +#define HID_SMA_FUNCTIONSOTHER1_MENU "STARMATH_HID_SMA_FUNCTIONSOTHER1_MENU" + +#define HID_SMA_ACUTEX "STARMATH_HID_SMA_ACUTEX" +#define HID_SMA_BARX "STARMATH_HID_SMA_BARX" +#define HID_SMA_BREVEX "STARMATH_HID_SMA_BREVEX" +#define HID_SMA_CHECKX "STARMATH_HID_SMA_CHECKX" +#define HID_SMA_CIRCLEX "STARMATH_HID_SMA_CIRCLEX" +#define HID_SMA_DOTX "STARMATH_HID_SMA_DOTX" +#define HID_SMA_DDOTX "STARMATH_HID_SMA_DDOTX" +#define HID_SMA_DDDOTX "STARMATH_HID_SMA_DDDOTX" +#define HID_SMA_GRAVEX "STARMATH_HID_SMA_GRAVEX" +#define HID_SMA_HATX "STARMATH_HID_SMA_HATX" +#define HID_SMA_TILDEX "STARMATH_HID_SMA_TILDEX" +#define HID_SMA_VECX "STARMATH_HID_SMA_VECX" +#define HID_SMA_UNDERLINEX "STARMATH_HID_SMA_UNDERLINEX" +#define HID_SMA_OVERLINEX "STARMATH_HID_SMA_OVERLINEX" +#define HID_SMA_OVERSTRIKEX "STARMATH_HID_SMA_OVERSTRIKEX" +#define HID_SMA_PHANTOMX "STARMATH_HID_SMA_PHANTOMX" +#define HID_SMA_BOLDX "STARMATH_HID_SMA_BOLDX" +#define HID_SMA_ITALX "STARMATH_HID_SMA_ITALX" +#define HID_SMA_SIZEXY "STARMATH_HID_SMA_SIZEXY" +#define HID_SMA_FONTXY "STARMATH_HID_SMA_FONTXY" +#define HID_SMA_COLORX "STARMATH_HID_SMA_COLORX" +#define HID_SMA_LRGROUPX "STARMATH_HID_SMA_LRGROUPX" +#define HID_SMA_LRPARENTX "STARMATH_HID_SMA_LRPARENTX" +#define HID_SMA_LRBRACKETX "STARMATH_HID_SMA_LRBRACKETX" +#define HID_SMA_LRBRACEX "STARMATH_HID_SMA_LRBRACEX" +#define HID_SMA_LRANGLEX "STARMATH_HID_SMA_LRANGLEX" +#define HID_SMA_LRCEILX "STARMATH_HID_SMA_LRCEILX" +#define HID_SMA_LRFLOORX "STARMATH_HID_SMA_LRFLOORX" +#define HID_SMA_LRLINEX "STARMATH_HID_SMA_LRLINEX" +#define HID_SMA_LRDLINEX "STARMATH_HID_SMA_LRDLINEX" +#define HID_SMA_SLRPARENTX "STARMATH_HID_SMA_SLRPARENTX" +#define HID_SMA_SLRBRACKETX "STARMATH_HID_SMA_SLRBRACKETX" +#define HID_SMA_SLRBRACEX "STARMATH_HID_SMA_SLRBRACEX" +#define HID_SMA_SLRANGLEX "STARMATH_HID_SMA_SLRANGLEX" +#define HID_SMA_SLRCEILX "STARMATH_HID_SMA_SLRCEILX" +#define HID_SMA_SLRFLOORX "STARMATH_HID_SMA_SLRFLOORX" +#define HID_SMA_SLRLINEX "STARMATH_HID_SMA_SLRLINEX" +#define HID_SMA_SLRDLINEX "STARMATH_HID_SMA_SLRDLINEX" +#define HID_SMA_RSUBX "STARMATH_HID_SMA_RSUBX" +#define HID_SMA_RSUPX "STARMATH_HID_SMA_RSUPX" +#define HID_SMA_LSUBX "STARMATH_HID_SMA_LSUBX" +#define HID_SMA_LSUPX "STARMATH_HID_SMA_LSUPX" +#define HID_SMA_SBLANK "STARMATH_HID_SMA_SBLANK" +#define HID_SMA_BLANK "STARMATH_HID_SMA_BLANK" +#define HID_SMA_NEWLINE "STARMATH_HID_SMA_NEWLINE" +#define HID_SMA_BINOMXY "STARMATH_HID_SMA_BINOMXY" +#define HID_SMA_STACK "STARMATH_HID_SMA_STACK" +#define HID_SMA_MATRIX "STARMATH_HID_SMA_MATRIX" +#define HID_SMA_ALIGNLX "STARMATH_HID_SMA_ALIGNLX" +#define HID_SMA_ALIGNCX "STARMATH_HID_SMA_ALIGNCX" +#define HID_SMA_ALIGNRX "STARMATH_HID_SMA_ALIGNRX" +#define HID_SMA_ALEPH "STARMATH_HID_SMA_ALEPH" +#define HID_SMA_EMPTYSET "STARMATH_HID_SMA_EMPTYSET" +#define HID_SMA_RE "STARMATH_HID_SMA_RE" +#define HID_SMA_IM "STARMATH_HID_SMA_IM" +#define HID_SMA_INFINITY "STARMATH_HID_SMA_INFINITY" +#define HID_SMA_PARTIAL "STARMATH_HID_SMA_PARTIAL" +#define HID_SMA_WP "STARMATH_HID_SMA_WP" +#define HID_SMA_DOTSAXIS "STARMATH_HID_SMA_DOTSAXIS" +#define HID_SMA_DOTSUP "STARMATH_HID_SMA_DOTSUP" +#define HID_SMA_DOTSDOWN "STARMATH_HID_SMA_DOTSDOWN" +#define HID_SMA_DOTSLOW "STARMATH_HID_SMA_DOTSLOW" +#define HID_SMA_DOTSVERT "STARMATH_HID_SMA_DOTSVERT" + +#define HID_SMA_SETN "STARMATH_HID_SMA_SETN" +#define HID_SMA_SETZ "STARMATH_HID_SMA_SETZ" +#define HID_SMA_SETQ "STARMATH_HID_SMA_SETQ" +#define HID_SMA_SETR "STARMATH_HID_SMA_SETR" +#define HID_SMA_SETC "STARMATH_HID_SMA_SETC" +#define HID_SMA_WIDEHATX "STARMATH_HID_SMA_WIDEHATX" +#define HID_SMA_WIDETILDEX "STARMATH_HID_SMA_WIDETILDEX" +#define HID_SMA_WIDEVECX "STARMATH_HID_SMA_WIDEVECX" +#define HID_SMA_CSUBX "STARMATH_HID_SMA_CSUBX" +#define HID_SMA_CSUPX "STARMATH_HID_SMA_CSUPX" +#define HID_SMA_HBAR "STARMATH_HID_SMA_HBAR" +#define HID_SMA_LAMBDABAR "STARMATH_HID_SMA_LAMBDABAR" +#define HID_SMA_LEFTARROW "STARMATH_HID_SMA_LEFTARROW" +#define HID_SMA_RIGHTARROW "STARMATH_HID_SMA_RIGHTARROW" +#define HID_SMA_UPARROW "STARMATH_HID_SMA_UPARROW" +#define HID_SMA_DOWNARROW "STARMATH_HID_SMA_DOWNARROW" + +#define HID_SMA_DEFAULT_DIST "STARMATH_HID_SMA_DEFAULT_DIST" +#define HID_SMA_LINE_DIST "STARMATH_HID_SMA_LINE_DIST" +#define HID_SMA_ROOT_DIST "STARMATH_HID_SMA_ROOT_DIST" +#define HID_SMA_SUP_DIST "STARMATH_HID_SMA_SUP_DIST" +#define HID_SMA_SUB_DIST "STARMATH_HID_SMA_SUB_DIST" +#define HID_SMA_NUMERATOR_DIST "STARMATH_HID_SMA_NUMERATOR_DIST" +#define HID_SMA_DENOMINATOR_DIST "STARMATH_HID_SMA_DENOMINATOR_DIST" +#define HID_SMA_FRACLINE_EXCWIDTH "STARMATH_HID_SMA_FRACLINE_EXCWIDTH" +#define HID_SMA_FRACLINE_LINEWIDTH "STARMATH_HID_SMA_FRACLINE_LINEWIDTH" +#define HID_SMA_UPPERLIMIT_DIST "STARMATH_HID_SMA_UPPERLIMIT_DIST" +#define HID_SMA_LOWERLIMIT_DIST "STARMATH_HID_SMA_LOWERLIMIT_DIST" +#define HID_SMA_BRACKET_EXCHEIGHT "STARMATH_HID_SMA_BRACKET_EXCHEIGHT" +#define HID_SMA_BRACKET_DIST "STARMATH_HID_SMA_BRACKET_DIST" +#define HID_SMA_MATRIXROW_DIST "STARMATH_HID_SMA_MATRIXROW_DIST" +#define HID_SMA_MATRIXCOL_DIST "STARMATH_HID_SMA_MATRIXCOL_DIST" +#define HID_SMA_ATTRIBUT_DIST "STARMATH_HID_SMA_ATTRIBUT_DIST" +#define HID_SMA_INTERATTRIBUT_DIST "STARMATH_HID_SMA_INTERATTRIBUT_DIST" +#define HID_SMA_OPERATOR_EXCHEIGHT "STARMATH_HID_SMA_OPERATOR_EXCHEIGHT" +#define HID_SMA_OPERATOR_DIST "STARMATH_HID_SMA_OPERATOR_DIST" +#define HID_SMA_LEFTBORDER_DIST "STARMATH_HID_SMA_LEFTBORDER_DIST" +#define HID_SMA_RIGHTBORDER_DIST "STARMATH_HID_SMA_RIGHTBORDER_DIST" +#define HID_SMA_UPPERBORDER_DIST "STARMATH_HID_SMA_UPPERBORDER_DIST" +#define HID_SMA_LOWERBORDER_DIST "STARMATH_HID_SMA_LOWERBORDER_DIST" +#define HID_SMA_SCALE_ALL_BRACKETS "STARMATH_HID_SMA_SCALE_ALL_BRACKETS" +#define HID_SMA_BRACKET_EXCHEIGHT2 "STARMATH_HID_SMA_BRACKET_EXCHEIGHT2" +#define HID_SMA_LMRANGLEXY "STARMATH_HID_SMA_LMRANGLEXY" +#define HID_SMA_SLMRANGLEXY "STARMATH_HID_SMA_SLMRANGLEXY" +#define HID_SMA_XWIDESLASHY "STARMATH_HID_SMA_XWIDESLASHY" +#define HID_SMA_XWIDEBSLASHY "STARMATH_HID_SMA_XWIDEBSLASHY" +#define HID_SMA_XOVERBRACEY "STARMATH_HID_SMA_XOVERBRACEY" +#define HID_SMA_XUNDERBRACEY "STARMATH_HID_SMA_XUNDERBRACEY" +#define HID_SMA_LRDBRACKETX "STARMATH_HID_SMA_LRDBRACKETX" +#define HID_SMA_SLRDBRACKETX "STARMATH_HID_SMA_SLRDBRACKETX" + +#define HID_SMA_CONTROL_SYMBOLSET_VIEW "STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW" +#define HID_SMA_CONTROL_FONTCHAR_VIEW "STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW" + +#define HID_SMA_NOSPACE "STARMATH_HID_SMA_NOSPACE" + +#endif + -- cgit From ead5358f61ff03ffe454e83e169def3fef715a08 Mon Sep 17 00:00:00 2001 From: Gregor Hartmann Date: Fri, 27 Aug 2010 14:02:22 +0200 Subject: build breakers --- sc/inc/helpids.h | 1384 +++++++++++++++++++++++++++--------------------------- 1 file changed, 692 insertions(+), 692 deletions(-) diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h index 1d89f07e49a7..f1803639cba2 100644 --- a/sc/inc/helpids.h +++ b/sc/inc/helpids.h @@ -1,692 +1,692 @@ -/************************************************************************* - * - * 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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#include "sfx2/sfxcommands.h" -#include "svx/svxcommands.h" -#include "sccommands.h" - -#define HID_INSWIN_POS "SC_HID_INSWIN_POS" -#define HID_INSWIN_CALC "SC_HID_INSWIN_CALC" -#define HID_INSWIN_CANCEL "SC_HID_INSWIN_CANCEL" -#define HID_INSWIN_OK "SC_HID_INSWIN_OK" -#define HID_INSWIN_SUMME "SC_HID_INSWIN_SUMME" -#define HID_INSWIN_FUNC "SC_HID_INSWIN_FUNC" -#define HID_INSWIN_INPUT "SC_HID_INSWIN_INPUT" - -// Hilfe IDs fuer Dokumentfenster -------------------------------------------- -#define HID_SC_WIN_GRIDWIN "SC_HID_SC_WIN_GRIDWIN" -#define HID_SC_WIN_PREVIEW "SC_HID_SC_WIN_PREVIEW" - -// Hilfe IDs fuer einzelne Controls (max.30) --------------------------------- -// Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts -#define HID_SC_HF_HLL "SC_HID_SC_HF_HLL" -#define HID_SC_HF_HLC "SC_HID_SC_HF_HLC" -#define HID_SC_HF_HLR "SC_HID_SC_HF_HLR" -#define HID_SC_HF_HRL "SC_HID_SC_HF_HRL" -#define HID_SC_HF_HRC "SC_HID_SC_HF_HRC" -#define HID_SC_HF_HRR "SC_HID_SC_HF_HRR" -#define HID_SC_HF_FLL "SC_HID_SC_HF_FLL" -#define HID_SC_HF_FLC "SC_HID_SC_HF_FLC" -#define HID_SC_HF_FLR "SC_HID_SC_HF_FLR" -#define HID_SC_HF_FRL "SC_HID_SC_HF_FRL" -#define HID_SC_HF_FRC "SC_HID_SC_HF_FRC" -#define HID_SC_HF_FRR "SC_HID_SC_HF_FRR" -// "Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr! -#define HID_SC_SUBT_COLS_1 "SC_HID_SC_SUBT_COLS_1" -#define HID_SC_SUBT_COLS_2 "SC_HID_SC_SUBT_COLS_2" -#define HID_SC_SUBT_COLS_3 "SC_HID_SC_SUBT_COLS_3" -// Eintraege im Navigator -#define HID_SC_NAVIPI_ENTRIES "SC_HID_SC_NAVIPI_ENTRIES" -#define HID_SC_NAVIPI_ROW "SC_HID_SC_NAVIPI_ROW" -#define HID_SC_NAVIPI_COL "SC_HID_SC_NAVIPI_COL" -#define HID_SC_NAVIPI_DOC "SC_HID_SC_NAVIPI_DOC" -#define HID_SC_NAVIPI_DATA "SC_HID_SC_NAVIPI_DATA" -#define HID_SC_NAVIPI_UP "SC_HID_SC_NAVIPI_UP" -#define HID_SC_NAVIPI_DOWN "SC_HID_SC_NAVIPI_DOWN" -#define HID_SC_NAVIPI_ZOOM "SC_HID_SC_NAVIPI_ZOOM" -#define HID_SC_NAVIPI_ROOT "SC_HID_SC_NAVIPI_ROOT" -#define HID_SC_NAVIPI_SCEN "SC_HID_SC_NAVIPI_SCEN" -#define HID_SC_NAVIPI_DROP "SC_HID_SC_NAVIPI_DROP" -// Teilergebnisse -#define HID_SC_SUBT_GROUP "SC_HID_SC_SUBT_GROUP" -#define HID_SC_SUBT_COLS "SC_HID_SC_SUBT_COLS" -#define HID_SC_SUBT_FUNC "SC_HID_SC_SUBT_FUNC" -// -#define HID_SC_NAVIPI_TOOLBOX "SC_HID_SC_NAVIPI_TOOLBOX" -// Bereich ist voll! - -// Hilfe IDs fuer Dialoge / Pages (max.70) ----------------------------------- -#define HID_SC_AUTOFORMAT "SC_HID_SC_AUTOFORMAT" -#define HID_SC_PIVOTFILTER "SC_HID_SC_PIVOTFILTER" -#define HID_SC_INPORTOPT "SC_HID_SC_INPORTOPT" -#define HID_SC_PIVOTSUBT "SC_HID_SC_PIVOTSUBT" -#define HID_SC_FORM_ARGS "SC_HID_SC_FORM_ARGS" -#define HID_SCPAGE_SORT_FIELDS "SC_HID_SCPAGE_SORT_FIELDS" -#define HID_SCPAGE_SORT_OPTIONS "SC_HID_SCPAGE_SORT_OPTIONS" -#define HID_SCPAGE_SUBT_OPTIONS "SC_HID_SCPAGE_SUBT_OPTIONS" -#define HID_SCPAGE_SUBT_GROUP "SC_HID_SCPAGE_SUBT_GROUP" -#define HID_SCPAGE_PROTECTION "SC_HID_SCPAGE_PROTECTION" -#define HID_SCPAGE_VIEW "SC_HID_SCPAGE_VIEW" -#define HID_SCPAGE_CALC "SC_HID_SCPAGE_CALC" -#define HID_SCPAGE_USERLISTS "SC_HID_SCPAGE_USERLISTS" -#define HID_SCPAGE_HFEDIT "SC_HID_SCPAGE_HFEDIT" -#define HID_SCPAGE_AREAS "SC_HID_SCPAGE_AREAS" -#define HID_SCPAGE_TABLE "SC_HID_SCPAGE_TABLE" -#define HID_SCPAGE_PRINT "SC_HID_SCPAGE_PRINT" - -#define HID_SCPAGE_SUBT_GROUP1 "SC_HID_SCPAGE_SUBT_GROUP1" -#define HID_SCPAGE_SUBT_GROUP2 "SC_HID_SCPAGE_SUBT_GROUP2" -#define HID_SCPAGE_SUBT_GROUP3 "SC_HID_SCPAGE_SUBT_GROUP3" - -#define HID_SCPAGE_HFED_HL "SC_HID_SCPAGE_HFED_HL" -#define HID_SCPAGE_HFED_HR "SC_HID_SCPAGE_HFED_HR" -#define HID_SCPAGE_HFED_FL "SC_HID_SCPAGE_HFED_FL" -#define HID_SCPAGE_HFED_FR "SC_HID_SCPAGE_HFED_FR" - -#define HID_SCPAGE_CONTENT "SC_HID_SCPAGE_CONTENT" -#define HID_SCPAGE_LAYOUT "SC_HID_SCPAGE_LAYOUT" -#define HID_SCPAGE_INPUT "SC_HID_SCPAGE_INPUT" - -#define HID_SC_NAVIGATOR "SC_HID_SC_NAVIGATOR" - -#define HID_SC_MTRIN_VAL "SC_HID_SC_MTRIN_VAL" -#define HID_SC_MTRIN_DEF "SC_HID_SC_MTRIN_DEF" -#define HID_SC_SELENTRY_LIST "SC_HID_SC_SELENTRY_LIST" -#define HID_SC_GROUP_COLS "SC_HID_SC_GROUP_COLS" -#define HID_SC_GROUP_ROWS "SC_HID_SC_GROUP_ROWS" - -#define HID_SC_HF_TEXT "SC_HID_SC_HF_TEXT" -#define HID_SC_HF_FILE "SC_HID_SC_HF_FILE" -#define HID_SC_HF_TABLE "SC_HID_SC_HF_TABLE" -#define HID_SC_HF_PAGE "SC_HID_SC_HF_PAGE" -#define HID_SC_HF_PAGES "SC_HID_SC_HF_PAGES" -#define HID_SC_HF_DATE "SC_HID_SC_HF_DATE" -#define HID_SC_HF_TIME "SC_HID_SC_HF_TIME" - -#define HID_SC_HEADER_EDIT "SC_HID_SC_HEADER_EDIT" -#define HID_SC_FOOTER_EDIT "SC_HID_SC_FOOTER_EDIT" - -#define HID_SC_SCENWIN_TOP "SC_HID_SC_SCENWIN_TOP" -#define HID_SC_SCENWIN_BOTTOM "SC_HID_SC_SCENWIN_BOTTOM" - -#define HID_SC_INPUTWIN "SC_HID_SC_INPUTWIN" - -#define HID_SC_RENAME_NAME "SC_HID_SC_RENAME_NAME" -#define HID_SC_APPEND_NAME "SC_HID_SC_APPEND_NAME" - -// Funktionsautopilot: nur als Unique-IDs -#define HID_SC_FAP_PAGE "SC_HID_SC_FAP_PAGE" -#define HID_SC_FAP_EDIT1 "SC_HID_SC_FAP_EDIT1" -#define HID_SC_FAP_EDIT2 "SC_HID_SC_FAP_EDIT2" -#define HID_SC_FAP_EDIT3 "SC_HID_SC_FAP_EDIT3" -#define HID_SC_FAP_EDIT4 "SC_HID_SC_FAP_EDIT4" - -#define HID_SC_ADD_AUTOFMT "SC_HID_SC_ADD_AUTOFMT" -#define HID_SC_AUTOFMT_NAME "SC_HID_SC_AUTOFMT_NAME" - -#define HID_SC_DROPMODE_URL "SC_HID_SC_DROPMODE_URL" -#define HID_SC_DROPMODE_LINK "SC_HID_SC_DROPMODE_LINK" -#define HID_SC_DROPMODE_COPY "SC_HID_SC_DROPMODE_COPY" - -#define HID_SC_FAP_STRUCT "SC_HID_SC_FAP_STRUCT" -#define HID_SC_ASCII_TABCTR "SC_HID_SC_ASCII_TABCTR" - -#define HID_SC_SCENARIO_DELETE "SC_HID_SC_SCENARIO_DELETE" -#define HID_SC_SCENARIO_EDIT "SC_HID_SC_SCENARIO_EDIT" - -#define HID_SCDLG_FORMULA "SC_HID_SCDLG_FORMULA" -#define HID_SCDLG_CONDFORMAT "SC_HID_SCDLG_CONDFORMAT" -#define HID_COLROWNAMERANGES "SC_HID_COLROWNAMERANGES" - -#define HID_FUNCTION_BOX "SC_HID_FUNCTION_BOX" -#define HID_SCPAGE_OPREDLINE "SC_HID_SCPAGE_OPREDLINE" -#define HID_SC_REDLIN_CTR "SC_HID_SC_REDLIN_CTR" - -//Kopf/FusszeilenDlg: Contextmenue fuer Dateiname -#define HID_FCOMMAND_TITEL "SC_HID_FCOMMAND_TITEL" -#define HID_FCOMMAND_FILENAME "SC_HID_FCOMMAND_FILENAME" -#define HID_FCOMMAND_PATH "SC_HID_FCOMMAND_PATH" - - -// Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) ----------------------- - -#define HID_SC_TOOLBOX_TOOLS "SC_HID_SC_TOOLBOX_TOOLS" -#define HID_SC_TOOLBOX_TABLE "SC_HID_SC_TOOLBOX_TABLE" -#define HID_SC_TOOLBOX_DRAW "SC_HID_SC_TOOLBOX_DRAW" -#define HID_SC_TOOLBOX_DRTEXT "SC_HID_SC_TOOLBOX_DRTEXT" -#define HID_SC_TOOLBOX_PREVIEW "SC_HID_SC_TOOLBOX_PREVIEW" - -// wrong group - HID_SC_DLG_START is full -#define HID_SC_RENAME_AUTOFMT "SC_HID_SC_RENAME_AUTOFMT" -#define HID_SC_REN_AFMT_NAME "SC_HID_SC_REN_AFMT_NAME" - -#define HID_SC_TOOLBOX_GRAPHIC "SC_HID_SC_TOOLBOX_GRAPHIC" - -#define HID_CHG_PROTECT "SC_HID_CHG_PROTECT" - -#define HID_SC_RENAME_OBJECT "SC_HID_SC_RENAME_OBJECT" - -#define HID_SC_REN_AFMT_DLG "SC_HID_SC_REN_AFMT_DLG" - -// Hilfe IDs fuer Submenus (max.50) ------------------------------------------ -#define HID_SCMENU_EDIT "SC_HID_SCMENU_EDIT" -#define HID_SCMENU_FILL "SC_HID_SCMENU_FILL" -#define HID_SCMENU_DELBREAK "SC_HID_SCMENU_DELBREAK" -#define HID_SCMENU_VIEW "SC_HID_SCMENU_VIEW" -#define HID_SCMENU_TOOLBARS "SC_HID_SCMENU_TOOLBARS" -#define HID_SCMENU_INSERT "SC_HID_SCMENU_INSERT" -#define HID_SCMENU_INSBREAK "SC_HID_SCMENU_INSBREAK" -#define HID_SCMENU_NAME "SC_HID_SCMENU_NAME" -#define HID_SCMENU_GRAPHIC "SC_HID_SCMENU_GRAPHIC" -#define HID_SCMENU_DATA "SC_HID_SCMENU_DATA" -#define HID_SCMENU_FILTER "SC_HID_SCMENU_FILTER" -#define HID_SCMENU_OUTLINE "SC_HID_SCMENU_OUTLINE" -#define HID_SCMENU_PIVOT "SC_HID_SCMENU_PIVOT" -#define HID_SCMENU_EXTRA "SC_HID_SCMENU_EXTRA" -#define HID_SCMENU_SPELLING "SC_HID_SCMENU_SPELLING" -#define HID_SCMENU_AUDIT "SC_HID_SCMENU_AUDIT" -#define HID_SCMENU_PROTECT "SC_HID_SCMENU_PROTECT" -#define HID_SCMENU_CELLCONT "SC_HID_SCMENU_CELLCONT" -#define HID_SCMENU_ROW "SC_HID_SCMENU_ROW" -#define HID_SCMENU_COL "SC_HID_SCMENU_COL" -#define HID_SCMENU_TAB "SC_HID_SCMENU_TAB" -#define HID_SCMENU_MERGE "SC_HID_SCMENU_MERGE" -#define HID_SCMENU_AREA "SC_HID_SCMENU_AREA" -#define HID_SCMENU_OBJMIRROR "SC_HID_SCMENU_OBJMIRROR" -#define HID_SCMENU_OBJARRANGE "SC_HID_SCMENU_OBJARRANGE" -#define HID_SCMENU_ANCHOR "SC_HID_SCMENU_ANCHOR" -#define HID_SCMENU_SENDTO "SC_HID_SCMENU_SENDTO" -#define HID_SCMENU_CHANGES "SC_HID_SCMENU_CHANGES" - -#define HID_SC_FAP_BTN_FX1 "SC_HID_SC_FAP_BTN_FX1" -#define HID_SC_FAP_BTN_FX2 "SC_HID_SC_FAP_BTN_FX2" -#define HID_SC_FAP_BTN_FX3 "SC_HID_SC_FAP_BTN_FX3" -#define HID_SC_FAP_BTN_FX4 "SC_HID_SC_FAP_BTN_FX4" -#define HID_SC_FAP_BTN_REF1 "SC_HID_SC_FAP_BTN_REF1" -#define HID_SC_FAP_BTN_REF2 "SC_HID_SC_FAP_BTN_REF2" -#define HID_SC_FAP_BTN_REF3 "SC_HID_SC_FAP_BTN_REF3" -#define HID_SC_FAP_BTN_REF4 "SC_HID_SC_FAP_BTN_REF4" -#define HID_SC_FAP_FORMULA "SC_HID_SC_FAP_FORMULA" - -#define HID_SC_SORT_ACTION "SC_HID_SC_SORT_ACTION" -#define HID_SC_SORT_AUTHOR "SC_HID_SC_SORT_AUTHOR" -#define HID_SC_SORT_DATE "SC_HID_SC_SORT_DATE" -#define HID_SC_SORT_COMMENT "SC_HID_SC_SORT_COMMENT" -#define HID_SORT_POSITION "SC_HID_SORT_POSITION" -#define HID_SC_CHANGES_COMMENT "SC_HID_SC_CHANGES_COMMENT" -#define HID_SC_FUNCTIONLIST "SC_HID_SC_FUNCTIONLIST" -#define HID_SCPAGE_OPTLOAD "SC_HID_SCPAGE_OPTLOAD" -#define HID_PASSWD_TABLE "SC_HID_PASSWD_TABLE" -#define HID_PASSWD_DOC "SC_HID_PASSWD_DOC" - -#define HID_DATAPILOT_TYPE "SC_HID_DATAPILOT_TYPE" -#define HID_DATAPILOT_DATABASE "SC_HID_DATAPILOT_DATABASE" -#define HID_DATAPILOT_SERVICE "SC_HID_DATAPILOT_SERVICE" - -// Other help IDs (max.70) --------------------------------------------------- -#define HID_SCDLG_LINKAREAURL "SC_HID_SCDLG_LINKAREAURL" -#define HID_SCMENU_EDIT_TABLE "SC_HID_SCMENU_EDIT_TABLE" - -#define HID_SELECTTABLES "SC_HID_SELECTTABLES" -#define HID_SC_REPLCELLSWARN "SC_HID_SC_REPLCELLSWARN" - -// data pilot layout dialog -#define HID_SC_DPLAY_PAGE "SC_HID_SC_DPLAY_PAGE" -#define HID_SC_DPLAY_COLUMN "SC_HID_SC_DPLAY_COLUMN" -#define HID_SC_DPLAY_ROW "SC_HID_SC_DPLAY_ROW" -#define HID_SC_DPLAY_DATA "SC_HID_SC_DPLAY_DATA" -#define HID_SC_DPLAY_SELECT "SC_HID_SC_DPLAY_SELECT" - -#define HID_SC_DRAW_RENAME "SC_HID_SC_DRAW_RENAME" - -#define HID_SC_DPDATAFIELD "SC_HID_SC_DPDATAFIELD" -#define HID_SC_DPSUBT_OPT "SC_HID_SC_DPSUBT_OPT" -#define HID_SC_DPSUBT_HIDE "SC_HID_SC_DPSUBT_HIDE" -#define HID_SC_DPNUMGROUP "SC_HID_SC_DPNUMGROUP" -#define HID_SC_DPDATEGROUP "SC_HID_SC_DPDATEGROUP" -#define HID_SC_DPDATEGROUP_LB "SC_HID_SC_DPDATEGROUP_LB" -#define HID_SC_DPSHOWDETAIL "SC_HID_SC_DPSHOWDETAIL" - -// #i68101# -#define HID_SC_TITLE_DESCRIPTION_OBJECT "SC_HID_SC_TITLE_DESCRIPTION_OBJECT" - -#define HID_SC_SOLVEROPTIONS "SC_HID_SC_SOLVEROPTIONS" -#define HID_SC_SOLVEROPTIONS_LB "SC_HID_SC_SOLVEROPTIONS_LB" -#define HID_SC_SOLVER_INTEGER "SC_HID_SC_SOLVER_INTEGER" -#define HID_SC_SOLVER_DOUBLE "SC_HID_SC_SOLVER_DOUBLE" -#define HID_SC_SOLVER_PROGRESS "SC_HID_SC_SOLVER_PROGRESS" -#define HID_SC_SOLVER_NOSOLUTION "SC_HID_SC_SOLVER_NOSOLUTION" -#define HID_SC_SOLVER_SUCCESS "SC_HID_SC_SOLVER_SUCCESS" - -#define HID_SCDLG_CONFLICTS "SC_HID_SCDLG_CONFLICTS" - -#define HID_SC_HF_HL_DEFINED "SC_HID_SC_HF_HL_DEFINED" -#define HID_SC_HF_HR_DEFINED "SC_HID_SC_HF_HR_DEFINED" -#define HID_SC_HF_FL_DEFINED "SC_HID_SC_HF_FL_DEFINED" -#define HID_SC_HF_FR_DEFINED "SC_HID_SC_HF_FR_DEFINED" - -// Analysis Addin Functions (max.120) ---------------------------------------- -#define HID_AAI_FUNC_WORKDAY "SC_HID_AAI_FUNC_WORKDAY" -#define HID_AAI_FUNC_YEARFRAC "SC_HID_AAI_FUNC_YEARFRAC" -#define HID_AAI_FUNC_EDATE "SC_HID_AAI_FUNC_EDATE" -#define HID_AAI_FUNC_WEEKNUM "SC_HID_AAI_FUNC_WEEKNUM" -#define HID_AAI_FUNC_EOMONTH "SC_HID_AAI_FUNC_EOMONTH" -#define HID_AAI_FUNC_NETWORKDAYS "SC_HID_AAI_FUNC_NETWORKDAYS" -#define HID_AAI_FUNC_AMORDEGRC "SC_HID_AAI_FUNC_AMORDEGRC" -#define HID_AAI_FUNC_AMORLINC "SC_HID_AAI_FUNC_AMORLINC" -#define HID_AAI_FUNC_ACCRINT "SC_HID_AAI_FUNC_ACCRINT" -#define HID_AAI_FUNC_ACCRINTM "SC_HID_AAI_FUNC_ACCRINTM" -#define HID_AAI_FUNC_RECEIVED "SC_HID_AAI_FUNC_RECEIVED" -#define HID_AAI_FUNC_DISC "SC_HID_AAI_FUNC_DISC" -#define HID_AAI_FUNC_DURATION "SC_HID_AAI_FUNC_DURATION" -#define HID_AAI_FUNC_EFFECT "SC_HID_AAI_FUNC_EFFECT" -#define HID_AAI_FUNC_CUMPRINC "SC_HID_AAI_FUNC_CUMPRINC" -#define HID_AAI_FUNC_CUMIPMT "SC_HID_AAI_FUNC_CUMIPMT" -#define HID_AAI_FUNC_PRICE "SC_HID_AAI_FUNC_PRICE" -#define HID_AAI_FUNC_PRICEDISC "SC_HID_AAI_FUNC_PRICEDISC" -#define HID_AAI_FUNC_PRICEMAT "SC_HID_AAI_FUNC_PRICEMAT" -#define HID_AAI_FUNC_MDURATION "SC_HID_AAI_FUNC_MDURATION" -#define HID_AAI_FUNC_NOMINAL "SC_HID_AAI_FUNC_NOMINAL" -#define HID_AAI_FUNC_DOLLARFR "SC_HID_AAI_FUNC_DOLLARFR" -#define HID_AAI_FUNC_DOLLARDE "SC_HID_AAI_FUNC_DOLLARDE" -#define HID_AAI_FUNC_YIELD "SC_HID_AAI_FUNC_YIELD" -#define HID_AAI_FUNC_YIELDDISC "SC_HID_AAI_FUNC_YIELDDISC" -#define HID_AAI_FUNC_YIELDMAT "SC_HID_AAI_FUNC_YIELDMAT" -#define HID_AAI_FUNC_TBILLEQ "SC_HID_AAI_FUNC_TBILLEQ" -#define HID_AAI_FUNC_TBILLPRICE "SC_HID_AAI_FUNC_TBILLPRICE" -#define HID_AAI_FUNC_TBILLYIELD "SC_HID_AAI_FUNC_TBILLYIELD" -#define HID_AAI_FUNC_ODDFPRICE "SC_HID_AAI_FUNC_ODDFPRICE" -#define HID_AAI_FUNC_ODDFYIELD "SC_HID_AAI_FUNC_ODDFYIELD" -#define HID_AAI_FUNC_ODDLPRICE "SC_HID_AAI_FUNC_ODDLPRICE" -#define HID_AAI_FUNC_ODDLYIELD "SC_HID_AAI_FUNC_ODDLYIELD" -#define HID_AAI_FUNC_XIRR "SC_HID_AAI_FUNC_XIRR" -#define HID_AAI_FUNC_XNPV "SC_HID_AAI_FUNC_XNPV" -#define HID_AAI_FUNC_INTRATE "SC_HID_AAI_FUNC_INTRATE" -#define HID_AAI_FUNC_COUPNCD "SC_HID_AAI_FUNC_COUPNCD" -#define HID_AAI_FUNC_COUPDAYS "SC_HID_AAI_FUNC_COUPDAYS" -#define HID_AAI_FUNC_COUPDAYSNC "SC_HID_AAI_FUNC_COUPDAYSNC" -#define HID_AAI_FUNC_COUPDAYBS "SC_HID_AAI_FUNC_COUPDAYBS" -#define HID_AAI_FUNC_COUPPCD "SC_HID_AAI_FUNC_COUPPCD" -#define HID_AAI_FUNC_COUPNUM "SC_HID_AAI_FUNC_COUPNUM" -#define HID_AAI_FUNC_FVSCHEDULE "SC_HID_AAI_FUNC_FVSCHEDULE" -#define HID_AAI_FUNC_ISEVEN "SC_HID_AAI_FUNC_ISEVEN" -#define HID_AAI_FUNC_ISODD "SC_HID_AAI_FUNC_ISODD" -#define HID_AAI_FUNC_GCD "SC_HID_AAI_FUNC_GCD" -#define HID_AAI_FUNC_LCM "SC_HID_AAI_FUNC_LCM" -#define HID_AAI_FUNC_MULTINOMIAL "SC_HID_AAI_FUNC_MULTINOMIAL" -#define HID_AAI_FUNC_SERIESSUM "SC_HID_AAI_FUNC_SERIESSUM" -#define HID_AAI_FUNC_QUOTIENT "SC_HID_AAI_FUNC_QUOTIENT" -#define HID_AAI_FUNC_MROUND "SC_HID_AAI_FUNC_MROUND" -#define HID_AAI_FUNC_SQRTPI "SC_HID_AAI_FUNC_SQRTPI" -#define HID_AAI_FUNC_RANDBETWEEN "SC_HID_AAI_FUNC_RANDBETWEEN" -#define HID_AAI_FUNC_BESSELI "SC_HID_AAI_FUNC_BESSELI" -#define HID_AAI_FUNC_BESSELJ "SC_HID_AAI_FUNC_BESSELJ" -#define HID_AAI_FUNC_BESSELK "SC_HID_AAI_FUNC_BESSELK" -#define HID_AAI_FUNC_BESSELY "SC_HID_AAI_FUNC_BESSELY" -#define HID_AAI_FUNC_BIN2DEC "SC_HID_AAI_FUNC_BIN2DEC" -#define HID_AAI_FUNC_BIN2HEX "SC_HID_AAI_FUNC_BIN2HEX" -#define HID_AAI_FUNC_BIN2OCT "SC_HID_AAI_FUNC_BIN2OCT" -#define HID_AAI_FUNC_DELTA "SC_HID_AAI_FUNC_DELTA" -#define HID_AAI_FUNC_DEC2BIN "SC_HID_AAI_FUNC_DEC2BIN" -#define HID_AAI_FUNC_DEC2HEX "SC_HID_AAI_FUNC_DEC2HEX" -#define HID_AAI_FUNC_DEC2OCT "SC_HID_AAI_FUNC_DEC2OCT" -#define HID_AAI_FUNC_ERF "SC_HID_AAI_FUNC_ERF" -#define HID_AAI_FUNC_ERFC "SC_HID_AAI_FUNC_ERFC" -#define HID_AAI_FUNC_GESTEP "SC_HID_AAI_FUNC_GESTEP" -#define HID_AAI_FUNC_HEX2BIN "SC_HID_AAI_FUNC_HEX2BIN" -#define HID_AAI_FUNC_HEX2DEC "SC_HID_AAI_FUNC_HEX2DEC" -#define HID_AAI_FUNC_HEX2OCT "SC_HID_AAI_FUNC_HEX2OCT" -#define HID_AAI_FUNC_IMABS "SC_HID_AAI_FUNC_IMABS" -#define HID_AAI_FUNC_IMAGINARY "SC_HID_AAI_FUNC_IMAGINARY" -#define HID_AAI_FUNC_IMPOWER "SC_HID_AAI_FUNC_IMPOWER" -#define HID_AAI_FUNC_IMARGUMENT "SC_HID_AAI_FUNC_IMARGUMENT" -#define HID_AAI_FUNC_IMCOS "SC_HID_AAI_FUNC_IMCOS" -#define HID_AAI_FUNC_IMDIV "SC_HID_AAI_FUNC_IMDIV" -#define HID_AAI_FUNC_IMEXP "SC_HID_AAI_FUNC_IMEXP" -#define HID_AAI_FUNC_IMCONJUGATE "SC_HID_AAI_FUNC_IMCONJUGATE" -#define HID_AAI_FUNC_IMLN "SC_HID_AAI_FUNC_IMLN" -#define HID_AAI_FUNC_IMLOG10 "SC_HID_AAI_FUNC_IMLOG10" -#define HID_AAI_FUNC_IMLOG2 "SC_HID_AAI_FUNC_IMLOG2" -#define HID_AAI_FUNC_IMPRODUCT "SC_HID_AAI_FUNC_IMPRODUCT" -#define HID_AAI_FUNC_IMREAL "SC_HID_AAI_FUNC_IMREAL" -#define HID_AAI_FUNC_IMSIN "SC_HID_AAI_FUNC_IMSIN" -#define HID_AAI_FUNC_IMSUB "SC_HID_AAI_FUNC_IMSUB" -#define HID_AAI_FUNC_IMSUM "SC_HID_AAI_FUNC_IMSUM" -#define HID_AAI_FUNC_IMSQRT "SC_HID_AAI_FUNC_IMSQRT" -#define HID_AAI_FUNC_COMPLEX "SC_HID_AAI_FUNC_COMPLEX" -#define HID_AAI_FUNC_OCT2BIN "SC_HID_AAI_FUNC_OCT2BIN" -#define HID_AAI_FUNC_OCT2DEZ "SC_HID_AAI_FUNC_OCT2DEZ" -#define HID_AAI_FUNC_OCT2HEX "SC_HID_AAI_FUNC_OCT2HEX" -#define HID_AAI_FUNC_CONVERT "SC_HID_AAI_FUNC_CONVERT" -#define HID_AAI_FUNC_FACTDOUBLE "SC_HID_AAI_FUNC_FACTDOUBLE" - -// DateFunc Addin Functions (max.20) ----------------------------------------- -#define HID_DAI_FUNC_DAYSINMONTH "SC_HID_DAI_FUNC_DAYSINMONTH" -#define HID_DAI_FUNC_DAYSINYEAR "SC_HID_DAI_FUNC_DAYSINYEAR" -#define HID_DAI_FUNC_WEEKSINYEAR "SC_HID_DAI_FUNC_WEEKSINYEAR" -#define HID_DAI_FUNC_DIFFMONTHS "SC_HID_DAI_FUNC_DIFFMONTHS" -#define HID_DAI_FUNC_DIFFWEEKS "SC_HID_DAI_FUNC_DIFFWEEKS" -#define HID_DAI_FUNC_DIFFYEARS "SC_HID_DAI_FUNC_DIFFYEARS" -#define HID_DAI_FUNC_ROT13 "SC_HID_DAI_FUNC_ROT13" - -#define HID_SCPAGE_OPREDLINBE_FT_CONTENT "SC_HID_SCPAGE_OPREDLINBE_FT_CONTENT" -#define HID_MN_FORMAT_STYLE "SC_HID_MN_FORMAT_STYLE" -#define HID_MN_FORMAT_ALGN "SC_HID_MN_FORMAT_ALGN" -#define HID_MN_FORMAT_LINESPACE "SC_HID_MN_FORMAT_LINESPACE" - - -// Ende Hilfe IDs ------------------------------------------------------------ - -#define HID_SC_FUNC_DUMMY "SC_HID_SC_FUNC_DUMMY" - -#define HID_FUNC_DBANZAHL "SC_HID_FUNC_DBANZAHL" -#define HID_FUNC_DBANZAHL2 "SC_HID_FUNC_DBANZAHL2" -#define HID_FUNC_DBMITTELWERT "SC_HID_FUNC_DBMITTELWERT" -#define HID_FUNC_DBAUSZUG "SC_HID_FUNC_DBAUSZUG" -#define HID_FUNC_DBMAX "SC_HID_FUNC_DBMAX" -#define HID_FUNC_DBMIN "SC_HID_FUNC_DBMIN" -#define HID_FUNC_DBPRODUKT "SC_HID_FUNC_DBPRODUKT" -#define HID_FUNC_DBSTDABW "SC_HID_FUNC_DBSTDABW" -#define HID_FUNC_DBSTDABWN "SC_HID_FUNC_DBSTDABWN" -#define HID_FUNC_DBSUMME "SC_HID_FUNC_DBSUMME" -#define HID_FUNC_DBVARIANZ "SC_HID_FUNC_DBVARIANZ" -#define HID_FUNC_DBVARIANZEN "SC_HID_FUNC_DBVARIANZEN" - -#define HID_FUNC_DATUM "SC_HID_FUNC_DATUM" -#define HID_FUNC_DATWERT "SC_HID_FUNC_DATWERT" -#define HID_FUNC_TAG "SC_HID_FUNC_TAG" -#define HID_FUNC_TAGE360 "SC_HID_FUNC_TAGE360" -#define HID_FUNC_STUNDE "SC_HID_FUNC_STUNDE" -#define HID_FUNC_MINUTE "SC_HID_FUNC_MINUTE" -#define HID_FUNC_MONAT "SC_HID_FUNC_MONAT" -#define HID_FUNC_JETZT "SC_HID_FUNC_JETZT" -#define HID_FUNC_SEKUNDE "SC_HID_FUNC_SEKUNDE" -#define HID_FUNC_ZEIT "SC_HID_FUNC_ZEIT" -#define HID_FUNC_ZEITWERT "SC_HID_FUNC_ZEITWERT" -#define HID_FUNC_HEUTE "SC_HID_FUNC_HEUTE" -#define HID_FUNC_WOCHENTAG "SC_HID_FUNC_WOCHENTAG" -#define HID_FUNC_JAHR "SC_HID_FUNC_JAHR" -#define HID_FUNC_TAGE "SC_HID_FUNC_TAGE" -#define HID_FUNC_KALENDERWOCHE "SC_HID_FUNC_KALENDERWOCHE" -#define HID_FUNC_OSTERSONNTAG "SC_HID_FUNC_OSTERSONNTAG" - -#define HID_FUNC_BW "SC_HID_FUNC_BW" -#define HID_FUNC_ZW "SC_HID_FUNC_ZW" -#define HID_FUNC_ZZR "SC_HID_FUNC_ZZR" -#define HID_FUNC_RMZ "SC_HID_FUNC_RMZ" -#define HID_FUNC_ZINS "SC_HID_FUNC_ZINS" -#define HID_FUNC_ZINSZ "SC_HID_FUNC_ZINSZ" -#define HID_FUNC_KAPZ "SC_HID_FUNC_KAPZ" -#define HID_FUNC_KUMKAPITAL "SC_HID_FUNC_KUMKAPITAL" -#define HID_FUNC_KUMZINSZ "SC_HID_FUNC_KUMZINSZ" -#define HID_FUNC_DIA "SC_HID_FUNC_DIA" -#define HID_FUNC_LIA "SC_HID_FUNC_LIA" -#define HID_FUNC_GDA "SC_HID_FUNC_GDA" -#define HID_FUNC_GDA2 "SC_HID_FUNC_GDA2" -#define HID_FUNC_VDB "SC_HID_FUNC_VDB" -#define HID_FUNC_EFFEKTIV "SC_HID_FUNC_EFFEKTIV" -#define HID_FUNC_NOMINAL "SC_HID_FUNC_NOMINAL" -#define HID_FUNC_NBW "SC_HID_FUNC_NBW" -#define HID_FUNC_IKV "SC_HID_FUNC_IKV" -#define HID_FUNC_LAUFZEIT "SC_HID_FUNC_LAUFZEIT" -#define HID_FUNC_ZGZ "SC_HID_FUNC_ZGZ" -#define HID_FUNC_QIKV "SC_HID_FUNC_QIKV" -#define HID_FUNC_ISPMT "SC_HID_FUNC_ISPMT" - -#define HID_FUNC_ISTBEZUG "SC_HID_FUNC_ISTBEZUG" -#define HID_FUNC_ISTFEHL "SC_HID_FUNC_ISTFEHL" -#define HID_FUNC_ISTFEHLER "SC_HID_FUNC_ISTFEHLER" -#define HID_FUNC_ISTLEER "SC_HID_FUNC_ISTLEER" -#define HID_FUNC_ISTLOG "SC_HID_FUNC_ISTLOG" -#define HID_FUNC_ISTNV "SC_HID_FUNC_ISTNV" -#define HID_FUNC_ISTKTEXT "SC_HID_FUNC_ISTKTEXT" -#define HID_FUNC_ISTTEXT "SC_HID_FUNC_ISTTEXT" -#define HID_FUNC_ISTZAHL "SC_HID_FUNC_ISTZAHL" -#define HID_FUNC_ISTFORMEL "SC_HID_FUNC_ISTFORMEL" -#define HID_FUNC_N "SC_HID_FUNC_N" -#define HID_FUNC_NV "SC_HID_FUNC_NV" -#define HID_FUNC_TYP "SC_HID_FUNC_TYP" -#define HID_FUNC_AKTUELL "SC_HID_FUNC_AKTUELL" -#define HID_FUNC_FORMEL "SC_HID_FUNC_FORMEL" -#define HID_FUNC_ZELLE "SC_HID_FUNC_ZELLE" -#define HID_FUNC_INFO "SC_HID_FUNC_INFO" - - -#define HID_FUNC_FALSCH "SC_HID_FUNC_FALSCH" -#define HID_FUNC_NICHT "SC_HID_FUNC_NICHT" -#define HID_FUNC_WAHR "SC_HID_FUNC_WAHR" -#define HID_FUNC_WENN "SC_HID_FUNC_WENN" -#define HID_FUNC_ODER "SC_HID_FUNC_ODER" -#define HID_FUNC_UND "SC_HID_FUNC_UND" - -#define HID_FUNC_ABS "SC_HID_FUNC_ABS" -#define HID_FUNC_POTENZ "SC_HID_FUNC_POTENZ" -#define HID_FUNC_ANZAHLLEEREZELLEN "SC_HID_FUNC_ANZAHLLEEREZELLEN" -#define HID_FUNC_PI "SC_HID_FUNC_PI" -#define HID_FUNC_SUMME "SC_HID_FUNC_SUMME" -#define HID_FUNC_QUADRATESUMME "SC_HID_FUNC_QUADRATESUMME" -#define HID_FUNC_PRODUKT "SC_HID_FUNC_PRODUKT" -#define HID_FUNC_SUMMEWENN "SC_HID_FUNC_SUMMEWENN" -#define HID_FUNC_ZAEHLENWENN "SC_HID_FUNC_ZAEHLENWENN" -#define HID_FUNC_WURZEL "SC_HID_FUNC_WURZEL" -#define HID_FUNC_ZUFALLSZAHL "SC_HID_FUNC_ZUFALLSZAHL" -#define HID_FUNC_ISTGERADE "SC_HID_FUNC_ISTGERADE" -#define HID_FUNC_ISTUNGERADE "SC_HID_FUNC_ISTUNGERADE" -#define HID_FUNC_KOMBINATIONEN "SC_HID_FUNC_KOMBINATIONEN" -#define HID_FUNC_KOMBINATIONEN2 "SC_HID_FUNC_KOMBINATIONEN2" -#define HID_FUNC_ARCCOS "SC_HID_FUNC_ARCCOS" -#define HID_FUNC_ARCSIN "SC_HID_FUNC_ARCSIN" -#define HID_FUNC_ARCOSHYP "SC_HID_FUNC_ARCOSHYP" -#define HID_FUNC_ARSINHYP "SC_HID_FUNC_ARSINHYP" -#define HID_FUNC_ARCCOT "SC_HID_FUNC_ARCCOT" -#define HID_FUNC_ARCTAN "SC_HID_FUNC_ARCTAN" -#define HID_FUNC_ARCOTHYP "SC_HID_FUNC_ARCOTHYP" -#define HID_FUNC_ARTANHYP "SC_HID_FUNC_ARTANHYP" -#define HID_FUNC_COS "SC_HID_FUNC_COS" -#define HID_FUNC_SIN "SC_HID_FUNC_SIN" -#define HID_FUNC_COT "SC_HID_FUNC_COT" -#define HID_FUNC_TAN "SC_HID_FUNC_TAN" -#define HID_FUNC_COSHYP "SC_HID_FUNC_COSHYP" -#define HID_FUNC_SINHYP "SC_HID_FUNC_SINHYP" -#define HID_FUNC_COTHYP "SC_HID_FUNC_COTHYP" -#define HID_FUNC_TANHYP "SC_HID_FUNC_TANHYP" -#define HID_FUNC_ARCTAN2 "SC_HID_FUNC_ARCTAN2" -#define HID_FUNC_DEG "SC_HID_FUNC_DEG" -#define HID_FUNC_RAD "SC_HID_FUNC_RAD" -#define HID_FUNC_EXP "SC_HID_FUNC_EXP" -#define HID_FUNC_LOG "SC_HID_FUNC_LOG" -#define HID_FUNC_LN "SC_HID_FUNC_LN" -#define HID_FUNC_LOG10 "SC_HID_FUNC_LOG10" -#define HID_FUNC_FAKULTAET "SC_HID_FUNC_FAKULTAET" -#define HID_FUNC_REST "SC_HID_FUNC_REST" -#define HID_FUNC_VORZEICHEN "SC_HID_FUNC_VORZEICHEN" -#define HID_FUNC_TEILERGEBNIS "SC_HID_FUNC_TEILERGEBNIS" -#define HID_FUNC_GANZZAHL "SC_HID_FUNC_GANZZAHL" -#define HID_FUNC_KUERZEN "SC_HID_FUNC_KUERZEN" -#define HID_FUNC_RUNDEN "SC_HID_FUNC_RUNDEN" -#define HID_FUNC_AUFRUNDEN "SC_HID_FUNC_AUFRUNDEN" -#define HID_FUNC_ABRUNDEN "SC_HID_FUNC_ABRUNDEN" -#define HID_FUNC_GERADE "SC_HID_FUNC_GERADE" -#define HID_FUNC_UNGERADE "SC_HID_FUNC_UNGERADE" -#define HID_FUNC_OBERGRENZE "SC_HID_FUNC_OBERGRENZE" -#define HID_FUNC_UNTERGRENZE "SC_HID_FUNC_UNTERGRENZE" -#define HID_FUNC_GGT "SC_HID_FUNC_GGT" -#define HID_FUNC_KGV "SC_HID_FUNC_KGV" -#define HID_FUNC_UMRECHNEN "SC_HID_FUNC_UMRECHNEN" -#define HID_FUNC_EUROCONVERT "SC_HID_FUNC_EUROCONVERT" - -#define HID_FUNC_MTRANS "SC_HID_FUNC_MTRANS" -#define HID_FUNC_MMULT "SC_HID_FUNC_MMULT" -#define HID_FUNC_MDET "SC_HID_FUNC_MDET" -#define HID_FUNC_MINV "SC_HID_FUNC_MINV" -#define HID_FUNC_EINHEITSMATRIX "SC_HID_FUNC_EINHEITSMATRIX" -#define HID_FUNC_SUMMENPRODUKT "SC_HID_FUNC_SUMMENPRODUKT" -#define HID_FUNC_SUMMEX2MY2 "SC_HID_FUNC_SUMMEX2MY2" -#define HID_FUNC_SUMMEX2PY2 "SC_HID_FUNC_SUMMEX2PY2" -#define HID_FUNC_SUMMEXMY2 "SC_HID_FUNC_SUMMEXMY2" -#define HID_FUNC_HAEUFIGKEIT "SC_HID_FUNC_HAEUFIGKEIT" -#define HID_FUNC_RGP "SC_HID_FUNC_RGP" -#define HID_FUNC_RKP "SC_HID_FUNC_RKP" -#define HID_FUNC_TREND "SC_HID_FUNC_TREND" -#define HID_FUNC_VARIATION "SC_HID_FUNC_VARIATION" - -#define HID_FUNC_ANZAHL "SC_HID_FUNC_ANZAHL" -#define HID_FUNC_ANZAHL2 "SC_HID_FUNC_ANZAHL2" -#define HID_FUNC_MAX "SC_HID_FUNC_MAX" -#define HID_FUNC_MIN "SC_HID_FUNC_MIN" -#define HID_FUNC_VARIANZ "SC_HID_FUNC_VARIANZ" -#define HID_FUNC_VARIANZEN "SC_HID_FUNC_VARIANZEN" -#define HID_FUNC_STABW "SC_HID_FUNC_STABW" -#define HID_FUNC_STABWN "SC_HID_FUNC_STABWN" -#define HID_FUNC_MITTELWERT "SC_HID_FUNC_MITTELWERT" -#define HID_FUNC_SUMQUADABW "SC_HID_FUNC_SUMQUADABW" -#define HID_FUNC_MITTELABW "SC_HID_FUNC_MITTELABW" -#define HID_FUNC_SCHIEFE "SC_HID_FUNC_SCHIEFE" -#define HID_FUNC_KURT "SC_HID_FUNC_KURT" -#define HID_FUNC_GEOMITTEL "SC_HID_FUNC_GEOMITTEL" -#define HID_FUNC_HARMITTEL "SC_HID_FUNC_HARMITTEL" -#define HID_FUNC_MODALWERT "SC_HID_FUNC_MODALWERT" -#define HID_FUNC_MEDIAN "SC_HID_FUNC_MEDIAN" -#define HID_FUNC_QUANTIL "SC_HID_FUNC_QUANTIL" -#define HID_FUNC_QUARTILE "SC_HID_FUNC_QUARTILE" -#define HID_FUNC_KGROESSTE "SC_HID_FUNC_KGROESSTE" -#define HID_FUNC_KKLEINSTE "SC_HID_FUNC_KKLEINSTE" -#define HID_FUNC_QUANTILSRANG "SC_HID_FUNC_QUANTILSRANG" -#define HID_FUNC_RANG "SC_HID_FUNC_RANG" -#define HID_FUNC_GESTUTZTMITTEL "SC_HID_FUNC_GESTUTZTMITTEL" -#define HID_FUNC_WAHRSCHBEREICH "SC_HID_FUNC_WAHRSCHBEREICH" -#define HID_FUNC_B "SC_HID_FUNC_B" -#define HID_FUNC_PHI "SC_HID_FUNC_PHI" -#define HID_FUNC_GAUSS "SC_HID_FUNC_GAUSS" -#define HID_FUNC_FISHER "SC_HID_FUNC_FISHER" -#define HID_FUNC_FISHERINV "SC_HID_FUNC_FISHERINV" -#define HID_FUNC_BINOMVERT "SC_HID_FUNC_BINOMVERT" -#define HID_FUNC_NEGBINOMVERT "SC_HID_FUNC_NEGBINOMVERT" -#define HID_FUNC_KRITBINOM "SC_HID_FUNC_KRITBINOM" -#define HID_FUNC_POISSON "SC_HID_FUNC_POISSON" -#define HID_FUNC_NORMVERT "SC_HID_FUNC_NORMVERT" -#define HID_FUNC_NORMINV "SC_HID_FUNC_NORMINV" -#define HID_FUNC_STANDNORMVERT "SC_HID_FUNC_STANDNORMVERT" -#define HID_FUNC_STANDNORMINV "SC_HID_FUNC_STANDNORMINV" -#define HID_FUNC_LOGNORMVERT "SC_HID_FUNC_LOGNORMVERT" -#define HID_FUNC_LOGINV "SC_HID_FUNC_LOGINV" -#define HID_FUNC_EXPONVERT "SC_HID_FUNC_EXPONVERT" -#define HID_FUNC_GAMMAVERT "SC_HID_FUNC_GAMMAVERT" -#define HID_FUNC_GAMMAINV "SC_HID_FUNC_GAMMAINV" -#define HID_FUNC_GAMMALN "SC_HID_FUNC_GAMMALN" -#define HID_FUNC_BETAVERT "SC_HID_FUNC_BETAVERT" -#define HID_FUNC_BETAINV "SC_HID_FUNC_BETAINV" -#define HID_FUNC_WEIBULL "SC_HID_FUNC_WEIBULL" -#define HID_FUNC_HYPGEOMVERT "SC_HID_FUNC_HYPGEOMVERT" -#define HID_FUNC_TVERT "SC_HID_FUNC_TVERT" -#define HID_FUNC_TINV "SC_HID_FUNC_TINV" -#define HID_FUNC_FVERT "SC_HID_FUNC_FVERT" -#define HID_FUNC_FINV "SC_HID_FUNC_FINV" -#define HID_FUNC_CHIVERT "SC_HID_FUNC_CHIVERT" -#define HID_FUNC_CHIINV "SC_HID_FUNC_CHIINV" -#define HID_FUNC_STANDARDISIERUNG "SC_HID_FUNC_STANDARDISIERUNG" -#define HID_FUNC_VARIATIONEN "SC_HID_FUNC_VARIATIONEN" -#define HID_FUNC_VARIATIONEN2 "SC_HID_FUNC_VARIATIONEN2" -#define HID_FUNC_KONFIDENZ "SC_HID_FUNC_KONFIDENZ" -#define HID_FUNC_GTEST "SC_HID_FUNC_GTEST" -#define HID_FUNC_CHITEST "SC_HID_FUNC_CHITEST" -#define HID_FUNC_FTEST "SC_HID_FUNC_FTEST" -#define HID_FUNC_TTEST "SC_HID_FUNC_TTEST" -#define HID_FUNC_BESTIMMTHEITSMASS "SC_HID_FUNC_BESTIMMTHEITSMASS" -#define HID_FUNC_ACHSENABSCHNITT "SC_HID_FUNC_ACHSENABSCHNITT" -#define HID_FUNC_STEIGUNG "SC_HID_FUNC_STEIGUNG" -#define HID_FUNC_STFEHLERYX "SC_HID_FUNC_STFEHLERYX" -#define HID_FUNC_PEARSON "SC_HID_FUNC_PEARSON" -#define HID_FUNC_KORREL "SC_HID_FUNC_KORREL" -#define HID_FUNC_KOVAR "SC_HID_FUNC_KOVAR" -#define HID_FUNC_SCHAETZER "SC_HID_FUNC_SCHAETZER" -#define HID_FUNC_MINA "SC_HID_FUNC_MINA" -#define HID_FUNC_MAXA "SC_HID_FUNC_MAXA" -#define HID_FUNC_MITTELWERTA "SC_HID_FUNC_MITTELWERTA" -#define HID_FUNC_STABWA "SC_HID_FUNC_STABWA" -#define HID_FUNC_STABWNA "SC_HID_FUNC_STABWNA" -#define HID_FUNC_VARIANZA "SC_HID_FUNC_VARIANZA" -#define HID_FUNC_VARIANZENA "SC_HID_FUNC_VARIANZENA" -#define HID_FUNC_CHISQDIST "SC_HID_FUNC_CHISQDIST" -#define HID_FUNC_CHISQINV "SC_HID_FUNC_CHISQINV" -#define HID_FUNC_GAMMA "SC_HID_FUNC_GAMMA" - -#define HID_FUNC_ADRESSE "SC_HID_FUNC_ADRESSE" -#define HID_FUNC_BEREICHE "SC_HID_FUNC_BEREICHE" -#define HID_FUNC_WAHL "SC_HID_FUNC_WAHL" -#define HID_FUNC_SPALTE "SC_HID_FUNC_SPALTE" -#define HID_FUNC_ZEILE "SC_HID_FUNC_ZEILE" -#define HID_FUNC_SPALTEN "SC_HID_FUNC_SPALTEN" -#define HID_FUNC_ZEILEN "SC_HID_FUNC_ZEILEN" -#define HID_FUNC_WVERWEIS "SC_HID_FUNC_WVERWEIS" -#define HID_FUNC_SVERWEIS "SC_HID_FUNC_SVERWEIS" -#define HID_FUNC_INDEX "SC_HID_FUNC_INDEX" -#define HID_FUNC_INDIREKT "SC_HID_FUNC_INDIREKT" -#define HID_FUNC_VERWEIS "SC_HID_FUNC_VERWEIS" -#define HID_FUNC_VERGLEICH "SC_HID_FUNC_VERGLEICH" -#define HID_FUNC_VERSCHIEBUNG "SC_HID_FUNC_VERSCHIEBUNG" -#define HID_FUNC_FEHLERTYP "SC_HID_FUNC_FEHLERTYP" -#define HID_FUNC_VORLAGE "SC_HID_FUNC_VORLAGE" -#define HID_FUNC_DDE "SC_HID_FUNC_DDE" -#define HID_FUNC_TABELLE "SC_HID_FUNC_TABELLE" -#define HID_FUNC_TABELLEN "SC_HID_FUNC_TABELLEN" -#define HID_FUNC_HYPERLINK "SC_HID_FUNC_HYPERLINK" -#define HID_FUNC_GETPIVOTDATA "SC_HID_FUNC_GETPIVOTDATA" - -#define HID_FUNC_CODE "SC_HID_FUNC_CODE" -#define HID_FUNC_DM "SC_HID_FUNC_DM" -#define HID_FUNC_ZEICHEN "SC_HID_FUNC_ZEICHEN" -#define HID_FUNC_SAEUBERN "SC_HID_FUNC_SAEUBERN" -#define HID_FUNC_VERKETTEN "SC_HID_FUNC_VERKETTEN" -#define HID_FUNC_IDENTISCH "SC_HID_FUNC_IDENTISCH" -#define HID_FUNC_FINDEN "SC_HID_FUNC_FINDEN" -#define HID_FUNC_SUCHEN "SC_HID_FUNC_SUCHEN" -#define HID_FUNC_GLAETTEN "SC_HID_FUNC_GLAETTEN" -#define HID_FUNC_GROSS2 "SC_HID_FUNC_GROSS2" -#define HID_FUNC_GROSS "SC_HID_FUNC_GROSS" -#define HID_FUNC_KLEIN "SC_HID_FUNC_KLEIN" -#define HID_FUNC_WERT "SC_HID_FUNC_WERT" -#define HID_FUNC_TEXT "SC_HID_FUNC_TEXT" -#define HID_FUNC_T "SC_HID_FUNC_T" -#define HID_FUNC_ERSETZEN "SC_HID_FUNC_ERSETZEN" -#define HID_FUNC_FEST "SC_HID_FUNC_FEST" -#define HID_FUNC_LAENGE "SC_HID_FUNC_LAENGE" -#define HID_FUNC_LINKS "SC_HID_FUNC_LINKS" -#define HID_FUNC_RECHTS "SC_HID_FUNC_RECHTS" -#define HID_FUNC_TEIL "SC_HID_FUNC_TEIL" -#define HID_FUNC_WIEDERHOLEN "SC_HID_FUNC_WIEDERHOLEN" -#define HID_FUNC_WECHSELN "SC_HID_FUNC_WECHSELN" -#define HID_FUNC_BASIS "SC_HID_FUNC_BASIS" -#define HID_FUNC_DEZIMAL "SC_HID_FUNC_DEZIMAL" -#define HID_FUNC_ROEMISCH "SC_HID_FUNC_ROEMISCH" -#define HID_FUNC_ARABISCH "SC_HID_FUNC_ARABISCH" -#define HID_FUNC_BAHTTEXT "SC_HID_FUNC_BAHTTEXT" -#define HID_FUNC_JIS "SC_HID_FUNC_JIS" -#define HID_FUNC_ASC "SC_HID_FUNC_ASC" -#define HID_FUNC_UNICODE "SC_HID_FUNC_UNICODE" -#define HID_FUNC_UNICHAR "SC_HID_FUNC_UNICHAR" -#define HID_FUNC_NUMBERVALUE "SC_HID_FUNC_NUMBERVALUE" +/************************************************************************* + * + * 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 + * + * for a copy of the LGPLv3 License. + * + ************************************************************************/ + +#include "sfx2/sfxcommands.h" +#include "svx/svxcommands.h" +#include "sccommands.h" + +#define HID_INSWIN_POS "SC_HID_INSWIN_POS" +#define HID_INSWIN_CALC "SC_HID_INSWIN_CALC" +#define HID_INSWIN_CANCEL "SC_HID_INSWIN_CANCEL" +#define HID_INSWIN_OK "SC_HID_INSWIN_OK" +#define HID_INSWIN_SUMME "SC_HID_INSWIN_SUMME" +#define HID_INSWIN_FUNC "SC_HID_INSWIN_FUNC" +#define HID_INSWIN_INPUT "SC_HID_INSWIN_INPUT" + +// Hilfe IDs fuer Dokumentfenster -------------------------------------------- +#define HID_SC_WIN_GRIDWIN "SC_HID_SC_WIN_GRIDWIN" +#define HID_SC_WIN_PREVIEW "SC_HID_SC_WIN_PREVIEW" + +// Hilfe IDs fuer einzelne Controls (max.30) --------------------------------- +// Kopf/Fusszeilen Editfenster: Header/Footer links/rechts links/mitte/rechts +#define HID_SC_HF_HLL "SC_HID_SC_HF_HLL" +#define HID_SC_HF_HLC "SC_HID_SC_HF_HLC" +#define HID_SC_HF_HLR "SC_HID_SC_HF_HLR" +#define HID_SC_HF_HRL "SC_HID_SC_HF_HRL" +#define HID_SC_HF_HRC "SC_HID_SC_HF_HRC" +#define HID_SC_HF_HRR "SC_HID_SC_HF_HRR" +#define HID_SC_HF_FLL "SC_HID_SC_HF_FLL" +#define HID_SC_HF_FLC "SC_HID_SC_HF_FLC" +#define HID_SC_HF_FLR "SC_HID_SC_HF_FLR" +#define HID_SC_HF_FRL "SC_HID_SC_HF_FRL" +#define HID_SC_HF_FRC "SC_HID_SC_HF_FRC" +#define HID_SC_HF_FRR "SC_HID_SC_HF_FRR" +// "Spalten" in Teilergebnissen: Gruppe 1/2/3 - nicht mehr! +#define HID_SC_SUBT_COLS_1 "SC_HID_SC_SUBT_COLS_1" +#define HID_SC_SUBT_COLS_2 "SC_HID_SC_SUBT_COLS_2" +#define HID_SC_SUBT_COLS_3 "SC_HID_SC_SUBT_COLS_3" +// Eintraege im Navigator +#define HID_SC_NAVIPI_ENTRIES "SC_HID_SC_NAVIPI_ENTRIES" +#define HID_SC_NAVIPI_ROW "SC_HID_SC_NAVIPI_ROW" +#define HID_SC_NAVIPI_COL "SC_HID_SC_NAVIPI_COL" +#define HID_SC_NAVIPI_DOC "SC_HID_SC_NAVIPI_DOC" +#define HID_SC_NAVIPI_DATA "SC_HID_SC_NAVIPI_DATA" +#define HID_SC_NAVIPI_UP "SC_HID_SC_NAVIPI_UP" +#define HID_SC_NAVIPI_DOWN "SC_HID_SC_NAVIPI_DOWN" +#define HID_SC_NAVIPI_ZOOM "SC_HID_SC_NAVIPI_ZOOM" +#define HID_SC_NAVIPI_ROOT "SC_HID_SC_NAVIPI_ROOT" +#define HID_SC_NAVIPI_SCEN "SC_HID_SC_NAVIPI_SCEN" +#define HID_SC_NAVIPI_DROP "SC_HID_SC_NAVIPI_DROP" +// Teilergebnisse +#define HID_SC_SUBT_GROUP "SC_HID_SC_SUBT_GROUP" +#define HID_SC_SUBT_COLS "SC_HID_SC_SUBT_COLS" +#define HID_SC_SUBT_FUNC "SC_HID_SC_SUBT_FUNC" +// +#define HID_SC_NAVIPI_TOOLBOX "SC_HID_SC_NAVIPI_TOOLBOX" +// Bereich ist voll! + +// Hilfe IDs fuer Dialoge / Pages (max.70) ----------------------------------- +#define HID_SC_AUTOFORMAT "SC_HID_SC_AUTOFORMAT" +#define HID_SC_PIVOTFILTER "SC_HID_SC_PIVOTFILTER" +#define HID_SC_INPORTOPT "SC_HID_SC_INPORTOPT" +#define HID_SC_PIVOTSUBT "SC_HID_SC_PIVOTSUBT" +#define HID_SC_FORM_ARGS "SC_HID_SC_FORM_ARGS" +#define HID_SCPAGE_SORT_FIELDS "SC_HID_SCPAGE_SORT_FIELDS" +#define HID_SCPAGE_SORT_OPTIONS "SC_HID_SCPAGE_SORT_OPTIONS" +#define HID_SCPAGE_SUBT_OPTIONS "SC_HID_SCPAGE_SUBT_OPTIONS" +#define HID_SCPAGE_SUBT_GROUP "SC_HID_SCPAGE_SUBT_GROUP" +#define HID_SCPAGE_PROTECTION "SC_HID_SCPAGE_PROTECTION" +#define HID_SCPAGE_VIEW "SC_HID_SCPAGE_VIEW" +#define HID_SCPAGE_CALC "SC_HID_SCPAGE_CALC" +#define HID_SCPAGE_USERLISTS "SC_HID_SCPAGE_USERLISTS" +#define HID_SCPAGE_HFEDIT "SC_HID_SCPAGE_HFEDIT" +#define HID_SCPAGE_AREAS "SC_HID_SCPAGE_AREAS" +#define HID_SCPAGE_TABLE "SC_HID_SCPAGE_TABLE" +#define HID_SCPAGE_PRINT "SC_HID_SCPAGE_PRINT" + +#define HID_SCPAGE_SUBT_GROUP1 "SC_HID_SCPAGE_SUBT_GROUP1" +#define HID_SCPAGE_SUBT_GROUP2 "SC_HID_SCPAGE_SUBT_GROUP2" +#define HID_SCPAGE_SUBT_GROUP3 "SC_HID_SCPAGE_SUBT_GROUP3" + +#define HID_SCPAGE_HFED_HL "SC_HID_SCPAGE_HFED_HL" +#define HID_SCPAGE_HFED_HR "SC_HID_SCPAGE_HFED_HR" +#define HID_SCPAGE_HFED_FL "SC_HID_SCPAGE_HFED_FL" +#define HID_SCPAGE_HFED_FR "SC_HID_SCPAGE_HFED_FR" + +#define HID_SCPAGE_CONTENT "SC_HID_SCPAGE_CONTENT" +#define HID_SCPAGE_LAYOUT "SC_HID_SCPAGE_LAYOUT" +#define HID_SCPAGE_INPUT "SC_HID_SCPAGE_INPUT" + +#define HID_SC_NAVIGATOR "SC_HID_SC_NAVIGATOR" + +#define HID_SC_MTRIN_VAL "SC_HID_SC_MTRIN_VAL" +#define HID_SC_MTRIN_DEF "SC_HID_SC_MTRIN_DEF" +#define HID_SC_SELENTRY_LIST "SC_HID_SC_SELENTRY_LIST" +#define HID_SC_GROUP_COLS "SC_HID_SC_GROUP_COLS" +#define HID_SC_GROUP_ROWS "SC_HID_SC_GROUP_ROWS" + +#define HID_SC_HF_TEXT "SC_HID_SC_HF_TEXT" +#define HID_SC_HF_FILE "SC_HID_SC_HF_FILE" +#define HID_SC_HF_TABLE "SC_HID_SC_HF_TABLE" +#define HID_SC_HF_PAGE "SC_HID_SC_HF_PAGE" +#define HID_SC_HF_PAGES "SC_HID_SC_HF_PAGES" +#define HID_SC_HF_DATE "SC_HID_SC_HF_DATE" +#define HID_SC_HF_TIME "SC_HID_SC_HF_TIME" + +#define HID_SC_HEADER_EDIT "SC_HID_SC_HEADER_EDIT" +#define HID_SC_FOOTER_EDIT "SC_HID_SC_FOOTER_EDIT" + +#define HID_SC_SCENWIN_TOP "SC_HID_SC_SCENWIN_TOP" +#define HID_SC_SCENWIN_BOTTOM "SC_HID_SC_SCENWIN_BOTTOM" + +#define HID_SC_INPUTWIN "SC_HID_SC_INPUTWIN" + +#define HID_SC_RENAME_NAME "SC_HID_SC_RENAME_NAME" +#define HID_SC_APPEND_NAME "SC_HID_SC_APPEND_NAME" + +// Funktionsautopilot: nur als Unique-IDs +#define HID_SC_FAP_PAGE "SC_HID_SC_FAP_PAGE" +#define HID_SC_FAP_EDIT1 "SC_HID_SC_FAP_EDIT1" +#define HID_SC_FAP_EDIT2 "SC_HID_SC_FAP_EDIT2" +#define HID_SC_FAP_EDIT3 "SC_HID_SC_FAP_EDIT3" +#define HID_SC_FAP_EDIT4 "SC_HID_SC_FAP_EDIT4" + +#define HID_SC_ADD_AUTOFMT "SC_HID_SC_ADD_AUTOFMT" +#define HID_SC_AUTOFMT_NAME "SC_HID_SC_AUTOFMT_NAME" + +#define HID_SC_DROPMODE_URL "SC_HID_SC_DROPMODE_URL" +#define HID_SC_DROPMODE_LINK "SC_HID_SC_DROPMODE_LINK" +#define HID_SC_DROPMODE_COPY "SC_HID_SC_DROPMODE_COPY" + +#define HID_SC_FAP_STRUCT "SC_HID_SC_FAP_STRUCT" +#define HID_SC_ASCII_TABCTR "SC_HID_SC_ASCII_TABCTR" + +#define HID_SC_SCENARIO_DELETE "SC_HID_SC_SCENARIO_DELETE" +#define HID_SC_SCENARIO_EDIT "SC_HID_SC_SCENARIO_EDIT" + +#define HID_SCDLG_FORMULA "SC_HID_SCDLG_FORMULA" +#define HID_SCDLG_CONDFORMAT "SC_HID_SCDLG_CONDFORMAT" +#define HID_COLROWNAMERANGES "SC_HID_COLROWNAMERANGES" + +#define HID_FUNCTION_BOX "SC_HID_FUNCTION_BOX" +#define HID_SCPAGE_OPREDLINE "SC_HID_SCPAGE_OPREDLINE" +#define HID_SC_REDLIN_CTR "SC_HID_SC_REDLIN_CTR" + +//Kopf/FusszeilenDlg: Contextmenue fuer Dateiname +#define HID_FCOMMAND_TITEL "SC_HID_FCOMMAND_TITEL" +#define HID_FCOMMAND_FILENAME "SC_HID_FCOMMAND_FILENAME" +#define HID_FCOMMAND_PATH "SC_HID_FCOMMAND_PATH" + + +// Hilfe IDs fuer Objekt- und Werkzeugleisten (max.10) ----------------------- + +#define HID_SC_TOOLBOX_TOOLS "SC_HID_SC_TOOLBOX_TOOLS" +#define HID_SC_TOOLBOX_TABLE "SC_HID_SC_TOOLBOX_TABLE" +#define HID_SC_TOOLBOX_DRAW "SC_HID_SC_TOOLBOX_DRAW" +#define HID_SC_TOOLBOX_DRTEXT "SC_HID_SC_TOOLBOX_DRTEXT" +#define HID_SC_TOOLBOX_PREVIEW "SC_HID_SC_TOOLBOX_PREVIEW" + +// wrong group - HID_SC_DLG_START is full +#define HID_SC_RENAME_AUTOFMT "SC_HID_SC_RENAME_AUTOFMT" +#define HID_SC_REN_AFMT_NAME "SC_HID_SC_REN_AFMT_NAME" + +#define HID_SC_TOOLBOX_GRAPHIC "SC_HID_SC_TOOLBOX_GRAPHIC" + +#define HID_CHG_PROTECT "SC_HID_CHG_PROTECT" + +#define HID_SC_RENAME_OBJECT "SC_HID_SC_RENAME_OBJECT" + +#define HID_SC_REN_AFMT_DLG "SC_HID_SC_REN_AFMT_DLG" + +// Hilfe IDs fuer Submenus (max.50) ------------------------------------------ +#define HID_SCMENU_EDIT "SC_HID_SCMENU_EDIT" +#define HID_SCMENU_FILL "SC_HID_SCMENU_FILL" +#define HID_SCMENU_DELBREAK "SC_HID_SCMENU_DELBREAK" +#define HID_SCMENU_VIEW "SC_HID_SCMENU_VIEW" +#define HID_SCMENU_TOOLBARS "SC_HID_SCMENU_TOOLBARS" +#define HID_SCMENU_INSERT "SC_HID_SCMENU_INSERT" +#define HID_SCMENU_INSBREAK "SC_HID_SCMENU_INSBREAK" +#define HID_SCMENU_NAME "SC_HID_SCMENU_NAME" +#define HID_SCMENU_GRAPHIC "SC_HID_SCMENU_GRAPHIC" +#define HID_SCMENU_DATA "SC_HID_SCMENU_DATA" +#define HID_SCMENU_FILTER "SC_HID_SCMENU_FILTER" +#define HID_SCMENU_OUTLINE "SC_HID_SCMENU_OUTLINE" +#define HID_SCMENU_PIVOT "SC_HID_SCMENU_PIVOT" +#define HID_SCMENU_EXTRA "SC_HID_SCMENU_EXTRA" +#define HID_SCMENU_SPELLING "SC_HID_SCMENU_SPELLING" +#define HID_SCMENU_AUDIT "SC_HID_SCMENU_AUDIT" +#define HID_SCMENU_PROTECT "SC_HID_SCMENU_PROTECT" +#define HID_SCMENU_CELLCONT "SC_HID_SCMENU_CELLCONT" +#define HID_SCMENU_ROW "SC_HID_SCMENU_ROW" +#define HID_SCMENU_COL "SC_HID_SCMENU_COL" +#define HID_SCMENU_TAB "SC_HID_SCMENU_TAB" +#define HID_SCMENU_MERGE "SC_HID_SCMENU_MERGE" +#define HID_SCMENU_AREA "SC_HID_SCMENU_AREA" +#define HID_SCMENU_OBJMIRROR "SC_HID_SCMENU_OBJMIRROR" +#define HID_SCMENU_OBJARRANGE "SC_HID_SCMENU_OBJARRANGE" +#define HID_SCMENU_ANCHOR "SC_HID_SCMENU_ANCHOR" +#define HID_SCMENU_SENDTO "SC_HID_SCMENU_SENDTO" +#define HID_SCMENU_CHANGES "SC_HID_SCMENU_CHANGES" + +#define HID_SC_FAP_BTN_FX1 "SC_HID_SC_FAP_BTN_FX1" +#define HID_SC_FAP_BTN_FX2 "SC_HID_SC_FAP_BTN_FX2" +#define HID_SC_FAP_BTN_FX3 "SC_HID_SC_FAP_BTN_FX3" +#define HID_SC_FAP_BTN_FX4 "SC_HID_SC_FAP_BTN_FX4" +#define HID_SC_FAP_BTN_REF1 "SC_HID_SC_FAP_BTN_REF1" +#define HID_SC_FAP_BTN_REF2 "SC_HID_SC_FAP_BTN_REF2" +#define HID_SC_FAP_BTN_REF3 "SC_HID_SC_FAP_BTN_REF3" +#define HID_SC_FAP_BTN_REF4 "SC_HID_SC_FAP_BTN_REF4" +#define HID_SC_FAP_FORMULA "SC_HID_SC_FAP_FORMULA" + +#define HID_SC_SORT_ACTION "SC_HID_SC_SORT_ACTION" +#define HID_SC_SORT_AUTHOR "SC_HID_SC_SORT_AUTHOR" +#define HID_SC_SORT_DATE "SC_HID_SC_SORT_DATE" +#define HID_SC_SORT_COMMENT "SC_HID_SC_SORT_COMMENT" +#define HID_SORT_POSITION "SC_HID_SORT_POSITION" +#define HID_SC_CHANGES_COMMENT "SC_HID_SC_CHANGES_COMMENT" +#define HID_SC_FUNCTIONLIST "SC_HID_SC_FUNCTIONLIST" +#define HID_SCPAGE_OPTLOAD "SC_HID_SCPAGE_OPTLOAD" +#define HID_PASSWD_TABLE "SC_HID_PASSWD_TABLE" +#define HID_PASSWD_DOC "SC_HID_PASSWD_DOC" + +#define HID_DATAPILOT_TYPE "SC_HID_DATAPILOT_TYPE" +#define HID_DATAPILOT_DATABASE "SC_HID_DATAPILOT_DATABASE" +#define HID_DATAPILOT_SERVICE "SC_HID_DATAPILOT_SERVICE" + +// Other help IDs (max.70) --------------------------------------------------- +#define HID_SCDLG_LINKAREAURL "SC_HID_SCDLG_LINKAREAURL" +#define HID_SCMENU_EDIT_TABLE "SC_HID_SCMENU_EDIT_TABLE" + +#define HID_SELECTTABLES "SC_HID_SELECTTABLES" +#define HID_SC_REPLCELLSWARN "SC_HID_SC_REPLCELLSWARN" + +// data pilot layout dialog +#define HID_SC_DPLAY_PAGE "SC_HID_SC_DPLAY_PAGE" +#define HID_SC_DPLAY_COLUMN "SC_HID_SC_DPLAY_COLUMN" +#define HID_SC_DPLAY_ROW "SC_HID_SC_DPLAY_ROW" +#define HID_SC_DPLAY_DATA "SC_HID_SC_DPLAY_DATA" +#define HID_SC_DPLAY_SELECT "SC_HID_SC_DPLAY_SELECT" + +#define HID_SC_DRAW_RENAME "SC_HID_SC_DRAW_RENAME" + +#define HID_SC_DPDATAFIELD "SC_HID_SC_DPDATAFIELD" +#define HID_SC_DPSUBT_OPT "SC_HID_SC_DPSUBT_OPT" +#define HID_SC_DPSUBT_HIDE "SC_HID_SC_DPSUBT_HIDE" +#define HID_SC_DPNUMGROUP "SC_HID_SC_DPNUMGROUP" +#define HID_SC_DPDATEGROUP "SC_HID_SC_DPDATEGROUP" +#define HID_SC_DPDATEGROUP_LB "SC_HID_SC_DPDATEGROUP_LB" +#define HID_SC_DPSHOWDETAIL "SC_HID_SC_DPSHOWDETAIL" + +// #i68101# +#define HID_SC_TITLE_DESCRIPTION_OBJECT "SC_HID_SC_TITLE_DESCRIPTION_OBJECT" + +#define HID_SC_SOLVEROPTIONS "SC_HID_SC_SOLVEROPTIONS" +#define HID_SC_SOLVEROPTIONS_LB "SC_HID_SC_SOLVEROPTIONS_LB" +#define HID_SC_SOLVER_INTEGER "SC_HID_SC_SOLVER_INTEGER" +#define HID_SC_SOLVER_DOUBLE "SC_HID_SC_SOLVER_DOUBLE" +#define HID_SC_SOLVER_PROGRESS "SC_HID_SC_SOLVER_PROGRESS" +#define HID_SC_SOLVER_NOSOLUTION "SC_HID_SC_SOLVER_NOSOLUTION" +#define HID_SC_SOLVER_SUCCESS "SC_HID_SC_SOLVER_SUCCESS" + +#define HID_SCDLG_CONFLICTS "SC_HID_SCDLG_CONFLICTS" + +#define HID_SC_HF_HL_DEFINED "SC_HID_SC_HF_HL_DEFINED" +#define HID_SC_HF_HR_DEFINED "SC_HID_SC_HF_HR_DEFINED" +#define HID_SC_HF_FL_DEFINED "SC_HID_SC_HF_FL_DEFINED" +#define HID_SC_HF_FR_DEFINED "SC_HID_SC_HF_FR_DEFINED" + +// Analysis Addin Functions (max.120) ---------------------------------------- +#define HID_AAI_FUNC_WORKDAY "SC_HID_AAI_FUNC_WORKDAY" +#define HID_AAI_FUNC_YEARFRAC "SC_HID_AAI_FUNC_YEARFRAC" +#define HID_AAI_FUNC_EDATE "SC_HID_AAI_FUNC_EDATE" +#define HID_AAI_FUNC_WEEKNUM "SC_HID_AAI_FUNC_WEEKNUM" +#define HID_AAI_FUNC_EOMONTH "SC_HID_AAI_FUNC_EOMONTH" +#define HID_AAI_FUNC_NETWORKDAYS "SC_HID_AAI_FUNC_NETWORKDAYS" +#define HID_AAI_FUNC_AMORDEGRC "SC_HID_AAI_FUNC_AMORDEGRC" +#define HID_AAI_FUNC_AMORLINC "SC_HID_AAI_FUNC_AMORLINC" +#define HID_AAI_FUNC_ACCRINT "SC_HID_AAI_FUNC_ACCRINT" +#define HID_AAI_FUNC_ACCRINTM "SC_HID_AAI_FUNC_ACCRINTM" +#define HID_AAI_FUNC_RECEIVED "SC_HID_AAI_FUNC_RECEIVED" +#define HID_AAI_FUNC_DISC "SC_HID_AAI_FUNC_DISC" +#define HID_AAI_FUNC_DURATION "SC_HID_AAI_FUNC_DURATION" +#define HID_AAI_FUNC_EFFECT "SC_HID_AAI_FUNC_EFFECT" +#define HID_AAI_FUNC_CUMPRINC "SC_HID_AAI_FUNC_CUMPRINC" +#define HID_AAI_FUNC_CUMIPMT "SC_HID_AAI_FUNC_CUMIPMT" +#define HID_AAI_FUNC_PRICE "SC_HID_AAI_FUNC_PRICE" +#define HID_AAI_FUNC_PRICEDISC "SC_HID_AAI_FUNC_PRICEDISC" +#define HID_AAI_FUNC_PRICEMAT "SC_HID_AAI_FUNC_PRICEMAT" +#define HID_AAI_FUNC_MDURATION "SC_HID_AAI_FUNC_MDURATION" +#define HID_AAI_FUNC_NOMINAL "SC_HID_AAI_FUNC_NOMINAL" +#define HID_AAI_FUNC_DOLLARFR "SC_HID_AAI_FUNC_DOLLARFR" +#define HID_AAI_FUNC_DOLLARDE "SC_HID_AAI_FUNC_DOLLARDE" +#define HID_AAI_FUNC_YIELD "SC_HID_AAI_FUNC_YIELD" +#define HID_AAI_FUNC_YIELDDISC "SC_HID_AAI_FUNC_YIELDDISC" +#define HID_AAI_FUNC_YIELDMAT "SC_HID_AAI_FUNC_YIELDMAT" +#define HID_AAI_FUNC_TBILLEQ "SC_HID_AAI_FUNC_TBILLEQ" +#define HID_AAI_FUNC_TBILLPRICE "SC_HID_AAI_FUNC_TBILLPRICE" +#define HID_AAI_FUNC_TBILLYIELD "SC_HID_AAI_FUNC_TBILLYIELD" +#define HID_AAI_FUNC_ODDFPRICE "SC_HID_AAI_FUNC_ODDFPRICE" +#define HID_AAI_FUNC_ODDFYIELD "SC_HID_AAI_FUNC_ODDFYIELD" +#define HID_AAI_FUNC_ODDLPRICE "SC_HID_AAI_FUNC_ODDLPRICE" +#define HID_AAI_FUNC_ODDLYIELD "SC_HID_AAI_FUNC_ODDLYIELD" +#define HID_AAI_FUNC_XIRR "SC_HID_AAI_FUNC_XIRR" +#define HID_AAI_FUNC_XNPV "SC_HID_AAI_FUNC_XNPV" +#define HID_AAI_FUNC_INTRATE "SC_HID_AAI_FUNC_INTRATE" +#define HID_AAI_FUNC_COUPNCD "SC_HID_AAI_FUNC_COUPNCD" +#define HID_AAI_FUNC_COUPDAYS "SC_HID_AAI_FUNC_COUPDAYS" +#define HID_AAI_FUNC_COUPDAYSNC "SC_HID_AAI_FUNC_COUPDAYSNC" +#define HID_AAI_FUNC_COUPDAYBS "SC_HID_AAI_FUNC_COUPDAYBS" +#define HID_AAI_FUNC_COUPPCD "SC_HID_AAI_FUNC_COUPPCD" +#define HID_AAI_FUNC_COUPNUM "SC_HID_AAI_FUNC_COUPNUM" +#define HID_AAI_FUNC_FVSCHEDULE "SC_HID_AAI_FUNC_FVSCHEDULE" +#define HID_AAI_FUNC_ISEVEN "SC_HID_AAI_FUNC_ISEVEN" +#define HID_AAI_FUNC_ISODD "SC_HID_AAI_FUNC_ISODD" +#define HID_AAI_FUNC_GCD "SC_HID_AAI_FUNC_GCD" +#define HID_AAI_FUNC_LCM "SC_HID_AAI_FUNC_LCM" +#define HID_AAI_FUNC_MULTINOMIAL "SC_HID_AAI_FUNC_MULTINOMIAL" +#define HID_AAI_FUNC_SERIESSUM "SC_HID_AAI_FUNC_SERIESSUM" +#define HID_AAI_FUNC_QUOTIENT "SC_HID_AAI_FUNC_QUOTIENT" +#define HID_AAI_FUNC_MROUND "SC_HID_AAI_FUNC_MROUND" +#define HID_AAI_FUNC_SQRTPI "SC_HID_AAI_FUNC_SQRTPI" +#define HID_AAI_FUNC_RANDBETWEEN "SC_HID_AAI_FUNC_RANDBETWEEN" +#define HID_AAI_FUNC_BESSELI "SC_HID_AAI_FUNC_BESSELI" +#define HID_AAI_FUNC_BESSELJ "SC_HID_AAI_FUNC_BESSELJ" +#define HID_AAI_FUNC_BESSELK "SC_HID_AAI_FUNC_BESSELK" +#define HID_AAI_FUNC_BESSELY "SC_HID_AAI_FUNC_BESSELY" +#define HID_AAI_FUNC_BIN2DEC "SC_HID_AAI_FUNC_BIN2DEC" +#define HID_AAI_FUNC_BIN2HEX "SC_HID_AAI_FUNC_BIN2HEX" +#define HID_AAI_FUNC_BIN2OCT "SC_HID_AAI_FUNC_BIN2OCT" +#define HID_AAI_FUNC_DELTA "SC_HID_AAI_FUNC_DELTA" +#define HID_AAI_FUNC_DEC2BIN "SC_HID_AAI_FUNC_DEC2BIN" +#define HID_AAI_FUNC_DEC2HEX "SC_HID_AAI_FUNC_DEC2HEX" +#define HID_AAI_FUNC_DEC2OCT "SC_HID_AAI_FUNC_DEC2OCT" +#define HID_AAI_FUNC_ERF "SC_HID_AAI_FUNC_ERF" +#define HID_AAI_FUNC_ERFC "SC_HID_AAI_FUNC_ERFC" +#define HID_AAI_FUNC_GESTEP "SC_HID_AAI_FUNC_GESTEP" +#define HID_AAI_FUNC_HEX2BIN "SC_HID_AAI_FUNC_HEX2BIN" +#define HID_AAI_FUNC_HEX2DEC "SC_HID_AAI_FUNC_HEX2DEC" +#define HID_AAI_FUNC_HEX2OCT "SC_HID_AAI_FUNC_HEX2OCT" +#define HID_AAI_FUNC_IMABS "SC_HID_AAI_FUNC_IMABS" +#define HID_AAI_FUNC_IMAGINARY "SC_HID_AAI_FUNC_IMAGINARY" +#define HID_AAI_FUNC_IMPOWER "SC_HID_AAI_FUNC_IMPOWER" +#define HID_AAI_FUNC_IMARGUMENT "SC_HID_AAI_FUNC_IMARGUMENT" +#define HID_AAI_FUNC_IMCOS "SC_HID_AAI_FUNC_IMCOS" +#define HID_AAI_FUNC_IMDIV "SC_HID_AAI_FUNC_IMDIV" +#define HID_AAI_FUNC_IMEXP "SC_HID_AAI_FUNC_IMEXP" +#define HID_AAI_FUNC_IMCONJUGATE "SC_HID_AAI_FUNC_IMCONJUGATE" +#define HID_AAI_FUNC_IMLN "SC_HID_AAI_FUNC_IMLN" +#define HID_AAI_FUNC_IMLOG10 "SC_HID_AAI_FUNC_IMLOG10" +#define HID_AAI_FUNC_IMLOG2 "SC_HID_AAI_FUNC_IMLOG2" +#define HID_AAI_FUNC_IMPRODUCT "SC_HID_AAI_FUNC_IMPRODUCT" +#define HID_AAI_FUNC_IMREAL "SC_HID_AAI_FUNC_IMREAL" +#define HID_AAI_FUNC_IMSIN "SC_HID_AAI_FUNC_IMSIN" +#define HID_AAI_FUNC_IMSUB "SC_HID_AAI_FUNC_IMSUB" +#define HID_AAI_FUNC_IMSUM "SC_HID_AAI_FUNC_IMSUM" +#define HID_AAI_FUNC_IMSQRT "SC_HID_AAI_FUNC_IMSQRT" +#define HID_AAI_FUNC_COMPLEX "SC_HID_AAI_FUNC_COMPLEX" +#define HID_AAI_FUNC_OCT2BIN "SC_HID_AAI_FUNC_OCT2BIN" +#define HID_AAI_FUNC_OCT2DEZ "SC_HID_AAI_FUNC_OCT2DEZ" +#define HID_AAI_FUNC_OCT2HEX "SC_HID_AAI_FUNC_OCT2HEX" +#define HID_AAI_FUNC_CONVERT "SC_HID_AAI_FUNC_CONVERT" +#define HID_AAI_FUNC_FACTDOUBLE "SC_HID_AAI_FUNC_FACTDOUBLE" + +// DateFunc Addin Functions (max.20) ----------------------------------------- +#define HID_DAI_FUNC_DAYSINMONTH "SC_HID_DAI_FUNC_DAYSINMONTH" +#define HID_DAI_FUNC_DAYSINYEAR "SC_HID_DAI_FUNC_DAYSINYEAR" +#define HID_DAI_FUNC_WEEKSINYEAR "SC_HID_DAI_FUNC_WEEKSINYEAR" +#define HID_DAI_FUNC_DIFFMONTHS "SC_HID_DAI_FUNC_DIFFMONTHS" +#define HID_DAI_FUNC_DIFFWEEKS "SC_HID_DAI_FUNC_DIFFWEEKS" +#define HID_DAI_FUNC_DIFFYEARS "SC_HID_DAI_FUNC_DIFFYEARS" +#define HID_DAI_FUNC_ROT13 "SC_HID_DAI_FUNC_ROT13" + +#define HID_SCPAGE_OPREDLINBE_FT_CONTENT "SC_HID_SCPAGE_OPREDLINBE_FT_CONTENT" +#define HID_MN_FORMAT_STYLE "SC_HID_MN_FORMAT_STYLE" +#define HID_MN_FORMAT_ALGN "SC_HID_MN_FORMAT_ALGN" +#define HID_MN_FORMAT_LINESPACE "SC_HID_MN_FORMAT_LINESPACE" + + +// Ende Hilfe IDs ------------------------------------------------------------ + +#define HID_SC_FUNC_DUMMY "SC_HID_SC_FUNC_DUMMY" + +#define HID_FUNC_DBANZAHL "SC_HID_FUNC_DBANZAHL" +#define HID_FUNC_DBANZAHL2 "SC_HID_FUNC_DBANZAHL2" +#define HID_FUNC_DBMITTELWERT "SC_HID_FUNC_DBMITTELWERT" +#define HID_FUNC_DBAUSZUG "SC_HID_FUNC_DBAUSZUG" +#define HID_FUNC_DBMAX "SC_HID_FUNC_DBMAX" +#define HID_FUNC_DBMIN "SC_HID_FUNC_DBMIN" +#define HID_FUNC_DBPRODUKT "SC_HID_FUNC_DBPRODUKT" +#define HID_FUNC_DBSTDABW "SC_HID_FUNC_DBSTDABW" +#define HID_FUNC_DBSTDABWN "SC_HID_FUNC_DBSTDABWN" +#define HID_FUNC_DBSUMME "SC_HID_FUNC_DBSUMME" +#define HID_FUNC_DBVARIANZ "SC_HID_FUNC_DBVARIANZ" +#define HID_FUNC_DBVARIANZEN "SC_HID_FUNC_DBVARIANZEN" + +#define HID_FUNC_DATUM "SC_HID_FUNC_DATUM" +#define HID_FUNC_DATWERT "SC_HID_FUNC_DATWERT" +#define HID_FUNC_TAG "SC_HID_FUNC_TAG" +#define HID_FUNC_TAGE360 "SC_HID_FUNC_TAGE360" +#define HID_FUNC_STUNDE "SC_HID_FUNC_STUNDE" +#define HID_FUNC_MINUTE "SC_HID_FUNC_MINUTE" +#define HID_FUNC_MONAT "SC_HID_FUNC_MONAT" +#define HID_FUNC_JETZT "SC_HID_FUNC_JETZT" +#define HID_FUNC_SEKUNDE "SC_HID_FUNC_SEKUNDE" +#define HID_FUNC_ZEIT "SC_HID_FUNC_ZEIT" +#define HID_FUNC_ZEITWERT "SC_HID_FUNC_ZEITWERT" +#define HID_FUNC_HEUTE "SC_HID_FUNC_HEUTE" +#define HID_FUNC_WOCHENTAG "SC_HID_FUNC_WOCHENTAG" +#define HID_FUNC_JAHR "SC_HID_FUNC_JAHR" +#define HID_FUNC_TAGE "SC_HID_FUNC_TAGE" +#define HID_FUNC_KALENDERWOCHE "SC_HID_FUNC_KALENDERWOCHE" +#define HID_FUNC_OSTERSONNTAG "SC_HID_FUNC_OSTERSONNTAG" + +#define HID_FUNC_BW "SC_HID_FUNC_BW" +#define HID_FUNC_ZW "SC_HID_FUNC_ZW" +#define HID_FUNC_ZZR "SC_HID_FUNC_ZZR" +#define HID_FUNC_RMZ "SC_HID_FUNC_RMZ" +#define HID_FUNC_ZINS "SC_HID_FUNC_ZINS" +#define HID_FUNC_ZINSZ "SC_HID_FUNC_ZINSZ" +#define HID_FUNC_KAPZ "SC_HID_FUNC_KAPZ" +#define HID_FUNC_KUMKAPITAL "SC_HID_FUNC_KUMKAPITAL" +#define HID_FUNC_KUMZINSZ "SC_HID_FUNC_KUMZINSZ" +#define HID_FUNC_DIA "SC_HID_FUNC_DIA" +#define HID_FUNC_LIA "SC_HID_FUNC_LIA" +#define HID_FUNC_GDA "SC_HID_FUNC_GDA" +#define HID_FUNC_GDA2 "SC_HID_FUNC_GDA2" +#define HID_FUNC_VDB "SC_HID_FUNC_VDB" +#define HID_FUNC_EFFEKTIV "SC_HID_FUNC_EFFEKTIV" +#define HID_FUNC_NOMINAL "SC_HID_FUNC_NOMINAL" +#define HID_FUNC_NBW "SC_HID_FUNC_NBW" +#define HID_FUNC_IKV "SC_HID_FUNC_IKV" +#define HID_FUNC_LAUFZEIT "SC_HID_FUNC_LAUFZEIT" +#define HID_FUNC_ZGZ "SC_HID_FUNC_ZGZ" +#define HID_FUNC_QIKV "SC_HID_FUNC_QIKV" +#define HID_FUNC_ISPMT "SC_HID_FUNC_ISPMT" + +#define HID_FUNC_ISTBEZUG "SC_HID_FUNC_ISTBEZUG" +#define HID_FUNC_ISTFEHL "SC_HID_FUNC_ISTFEHL" +#define HID_FUNC_ISTFEHLER "SC_HID_FUNC_ISTFEHLER" +#define HID_FUNC_ISTLEER "SC_HID_FUNC_ISTLEER" +#define HID_FUNC_ISTLOG "SC_HID_FUNC_ISTLOG" +#define HID_FUNC_ISTNV "SC_HID_FUNC_ISTNV" +#define HID_FUNC_ISTKTEXT "SC_HID_FUNC_ISTKTEXT" +#define HID_FUNC_ISTTEXT "SC_HID_FUNC_ISTTEXT" +#define HID_FUNC_ISTZAHL "SC_HID_FUNC_ISTZAHL" +#define HID_FUNC_ISTFORMEL "SC_HID_FUNC_ISTFORMEL" +#define HID_FUNC_N "SC_HID_FUNC_N" +#define HID_FUNC_NV "SC_HID_FUNC_NV" +#define HID_FUNC_TYP "SC_HID_FUNC_TYP" +#define HID_FUNC_AKTUELL "SC_HID_FUNC_AKTUELL" +#define HID_FUNC_FORMEL "SC_HID_FUNC_FORMEL" +#define HID_FUNC_ZELLE "SC_HID_FUNC_ZELLE" +#define HID_FUNC_INFO "SC_HID_FUNC_INFO" + + +#define HID_FUNC_FALSCH "SC_HID_FUNC_FALSCH" +#define HID_FUNC_NICHT "SC_HID_FUNC_NICHT" +#define HID_FUNC_WAHR "SC_HID_FUNC_WAHR" +#define HID_FUNC_WENN "SC_HID_FUNC_WENN" +#define HID_FUNC_ODER "SC_HID_FUNC_ODER" +#define HID_FUNC_UND "SC_HID_FUNC_UND" + +#define HID_FUNC_ABS "SC_HID_FUNC_ABS" +#define HID_FUNC_POTENZ "SC_HID_FUNC_POTENZ" +#define HID_FUNC_ANZAHLLEEREZELLEN "SC_HID_FUNC_ANZAHLLEEREZELLEN" +#define HID_FUNC_PI "SC_HID_FUNC_PI" +#define HID_FUNC_SUMME "SC_HID_FUNC_SUMME" +#define HID_FUNC_QUADRATESUMME "SC_HID_FUNC_QUADRATESUMME" +#define HID_FUNC_PRODUKT "SC_HID_FUNC_PRODUKT" +#define HID_FUNC_SUMMEWENN "SC_HID_FUNC_SUMMEWENN" +#define HID_FUNC_ZAEHLENWENN "SC_HID_FUNC_ZAEHLENWENN" +#define HID_FUNC_WURZEL "SC_HID_FUNC_WURZEL" +#define HID_FUNC_ZUFALLSZAHL "SC_HID_FUNC_ZUFALLSZAHL" +#define HID_FUNC_ISTGERADE "SC_HID_FUNC_ISTGERADE" +#define HID_FUNC_ISTUNGERADE "SC_HID_FUNC_ISTUNGERADE" +#define HID_FUNC_KOMBINATIONEN "SC_HID_FUNC_KOMBINATIONEN" +#define HID_FUNC_KOMBINATIONEN2 "SC_HID_FUNC_KOMBINATIONEN2" +#define HID_FUNC_ARCCOS "SC_HID_FUNC_ARCCOS" +#define HID_FUNC_ARCSIN "SC_HID_FUNC_ARCSIN" +#define HID_FUNC_ARCOSHYP "SC_HID_FUNC_ARCOSHYP" +#define HID_FUNC_ARSINHYP "SC_HID_FUNC_ARSINHYP" +#define HID_FUNC_ARCCOT "SC_HID_FUNC_ARCCOT" +#define HID_FUNC_ARCTAN "SC_HID_FUNC_ARCTAN" +#define HID_FUNC_ARCOTHYP "SC_HID_FUNC_ARCOTHYP" +#define HID_FUNC_ARTANHYP "SC_HID_FUNC_ARTANHYP" +#define HID_FUNC_COS "SC_HID_FUNC_COS" +#define HID_FUNC_SIN "SC_HID_FUNC_SIN" +#define HID_FUNC_COT "SC_HID_FUNC_COT" +#define HID_FUNC_TAN "SC_HID_FUNC_TAN" +#define HID_FUNC_COSHYP "SC_HID_FUNC_COSHYP" +#define HID_FUNC_SINHYP "SC_HID_FUNC_SINHYP" +#define HID_FUNC_COTHYP "SC_HID_FUNC_COTHYP" +#define HID_FUNC_TANHYP "SC_HID_FUNC_TANHYP" +#define HID_FUNC_ARCTAN2 "SC_HID_FUNC_ARCTAN2" +#define HID_FUNC_DEG "SC_HID_FUNC_DEG" +#define HID_FUNC_RAD "SC_HID_FUNC_RAD" +#define HID_FUNC_EXP "SC_HID_FUNC_EXP" +#define HID_FUNC_LOG "SC_HID_FUNC_LOG" +#define HID_FUNC_LN "SC_HID_FUNC_LN" +#define HID_FUNC_LOG10 "SC_HID_FUNC_LOG10" +#define HID_FUNC_FAKULTAET "SC_HID_FUNC_FAKULTAET" +#define HID_FUNC_REST "SC_HID_FUNC_REST" +#define HID_FUNC_VORZEICHEN "SC_HID_FUNC_VORZEICHEN" +#define HID_FUNC_TEILERGEBNIS "SC_HID_FUNC_TEILERGEBNIS" +#define HID_FUNC_GANZZAHL "SC_HID_FUNC_GANZZAHL" +#define HID_FUNC_KUERZEN "SC_HID_FUNC_KUERZEN" +#define HID_FUNC_RUNDEN "SC_HID_FUNC_RUNDEN" +#define HID_FUNC_AUFRUNDEN "SC_HID_FUNC_AUFRUNDEN" +#define HID_FUNC_ABRUNDEN "SC_HID_FUNC_ABRUNDEN" +#define HID_FUNC_GERADE "SC_HID_FUNC_GERADE" +#define HID_FUNC_UNGERADE "SC_HID_FUNC_UNGERADE" +#define HID_FUNC_OBERGRENZE "SC_HID_FUNC_OBERGRENZE" +#define HID_FUNC_UNTERGRENZE "SC_HID_FUNC_UNTERGRENZE" +#define HID_FUNC_GGT "SC_HID_FUNC_GGT" +#define HID_FUNC_KGV "SC_HID_FUNC_KGV" +#define HID_FUNC_UMRECHNEN "SC_HID_FUNC_UMRECHNEN" +#define HID_FUNC_EUROCONVERT "SC_HID_FUNC_EUROCONVERT" + +#define HID_FUNC_MTRANS "SC_HID_FUNC_MTRANS" +#define HID_FUNC_MMULT "SC_HID_FUNC_MMULT" +#define HID_FUNC_MDET "SC_HID_FUNC_MDET" +#define HID_FUNC_MINV "SC_HID_FUNC_MINV" +#define HID_FUNC_EINHEITSMATRIX "SC_HID_FUNC_EINHEITSMATRIX" +#define HID_FUNC_SUMMENPRODUKT "SC_HID_FUNC_SUMMENPRODUKT" +#define HID_FUNC_SUMMEX2MY2 "SC_HID_FUNC_SUMMEX2MY2" +#define HID_FUNC_SUMMEX2PY2 "SC_HID_FUNC_SUMMEX2PY2" +#define HID_FUNC_SUMMEXMY2 "SC_HID_FUNC_SUMMEXMY2" +#define HID_FUNC_HAEUFIGKEIT "SC_HID_FUNC_HAEUFIGKEIT" +#define HID_FUNC_RGP "SC_HID_FUNC_RGP" +#define HID_FUNC_RKP "SC_HID_FUNC_RKP" +#define HID_FUNC_TREND "SC_HID_FUNC_TREND" +#define HID_FUNC_VARIATION "SC_HID_FUNC_VARIATION" + +#define HID_FUNC_ANZAHL "SC_HID_FUNC_ANZAHL" +#define HID_FUNC_ANZAHL2 "SC_HID_FUNC_ANZAHL2" +#define HID_FUNC_MAX "SC_HID_FUNC_MAX" +#define HID_FUNC_MIN "SC_HID_FUNC_MIN" +#define HID_FUNC_VARIANZ "SC_HID_FUNC_VARIANZ" +#define HID_FUNC_VARIANZEN "SC_HID_FUNC_VARIANZEN" +#define HID_FUNC_STABW "SC_HID_FUNC_STABW" +#define HID_FUNC_STABWN "SC_HID_FUNC_STABWN" +#define HID_FUNC_MITTELWERT "SC_HID_FUNC_MITTELWERT" +#define HID_FUNC_SUMQUADABW "SC_HID_FUNC_SUMQUADABW" +#define HID_FUNC_MITTELABW "SC_HID_FUNC_MITTELABW" +#define HID_FUNC_SCHIEFE "SC_HID_FUNC_SCHIEFE" +#define HID_FUNC_KURT "SC_HID_FUNC_KURT" +#define HID_FUNC_GEOMITTEL "SC_HID_FUNC_GEOMITTEL" +#define HID_FUNC_HARMITTEL "SC_HID_FUNC_HARMITTEL" +#define HID_FUNC_MODALWERT "SC_HID_FUNC_MODALWERT" +#define HID_FUNC_MEDIAN "SC_HID_FUNC_MEDIAN" +#define HID_FUNC_QUANTIL "SC_HID_FUNC_QUANTIL" +#define HID_FUNC_QUARTILE "SC_HID_FUNC_QUARTILE" +#define HID_FUNC_KGROESSTE "SC_HID_FUNC_KGROESSTE" +#define HID_FUNC_KKLEINSTE "SC_HID_FUNC_KKLEINSTE" +#define HID_FUNC_QUANTILSRANG "SC_HID_FUNC_QUANTILSRANG" +#define HID_FUNC_RANG "SC_HID_FUNC_RANG" +#define HID_FUNC_GESTUTZTMITTEL "SC_HID_FUNC_GESTUTZTMITTEL" +#define HID_FUNC_WAHRSCHBEREICH "SC_HID_FUNC_WAHRSCHBEREICH" +#define HID_FUNC_B "SC_HID_FUNC_B" +#define HID_FUNC_PHI "SC_HID_FUNC_PHI" +#define HID_FUNC_GAUSS "SC_HID_FUNC_GAUSS" +#define HID_FUNC_FISHER "SC_HID_FUNC_FISHER" +#define HID_FUNC_FISHERINV "SC_HID_FUNC_FISHERINV" +#define HID_FUNC_BINOMVERT "SC_HID_FUNC_BINOMVERT" +#define HID_FUNC_NEGBINOMVERT "SC_HID_FUNC_NEGBINOMVERT" +#define HID_FUNC_KRITBINOM "SC_HID_FUNC_KRITBINOM" +#define HID_FUNC_POISSON "SC_HID_FUNC_POISSON" +#define HID_FUNC_NORMVERT "SC_HID_FUNC_NORMVERT" +#define HID_FUNC_NORMINV "SC_HID_FUNC_NORMINV" +#define HID_FUNC_STANDNORMVERT "SC_HID_FUNC_STANDNORMVERT" +#define HID_FUNC_STANDNORMINV "SC_HID_FUNC_STANDNORMINV" +#define HID_FUNC_LOGNORMVERT "SC_HID_FUNC_LOGNORMVERT" +#define HID_FUNC_LOGINV "SC_HID_FUNC_LOGINV" +#define HID_FUNC_EXPONVERT "SC_HID_FUNC_EXPONVERT" +#define HID_FUNC_GAMMAVERT "SC_HID_FUNC_GAMMAVERT" +#define HID_FUNC_GAMMAINV "SC_HID_FUNC_GAMMAINV" +#define HID_FUNC_GAMMALN "SC_HID_FUNC_GAMMALN" +#define HID_FUNC_BETAVERT "SC_HID_FUNC_BETAVERT" +#define HID_FUNC_BETAINV "SC_HID_FUNC_BETAINV" +#define HID_FUNC_WEIBULL "SC_HID_FUNC_WEIBULL" +#define HID_FUNC_HYPGEOMVERT "SC_HID_FUNC_HYPGEOMVERT" +#define HID_FUNC_TVERT "SC_HID_FUNC_TVERT" +#define HID_FUNC_TINV "SC_HID_FUNC_TINV" +#define HID_FUNC_FVERT "SC_HID_FUNC_FVERT" +#define HID_FUNC_FINV "SC_HID_FUNC_FINV" +#define HID_FUNC_CHIVERT "SC_HID_FUNC_CHIVERT" +#define HID_FUNC_CHIINV "SC_HID_FUNC_CHIINV" +#define HID_FUNC_STANDARDISIERUNG "SC_HID_FUNC_STANDARDISIERUNG" +#define HID_FUNC_VARIATIONEN "SC_HID_FUNC_VARIATIONEN" +#define HID_FUNC_VARIATIONEN2 "SC_HID_FUNC_VARIATIONEN2" +#define HID_FUNC_KONFIDENZ "SC_HID_FUNC_KONFIDENZ" +#define HID_FUNC_GTEST "SC_HID_FUNC_GTEST" +#define HID_FUNC_CHITEST "SC_HID_FUNC_CHITEST" +#define HID_FUNC_FTEST "SC_HID_FUNC_FTEST" +#define HID_FUNC_TTEST "SC_HID_FUNC_TTEST" +#define HID_FUNC_BESTIMMTHEITSMASS "SC_HID_FUNC_BESTIMMTHEITSMASS" +#define HID_FUNC_ACHSENABSCHNITT "SC_HID_FUNC_ACHSENABSCHNITT" +#define HID_FUNC_STEIGUNG "SC_HID_FUNC_STEIGUNG" +#define HID_FUNC_STFEHLERYX "SC_HID_FUNC_STFEHLERYX" +#define HID_FUNC_PEARSON "SC_HID_FUNC_PEARSON" +#define HID_FUNC_KORREL "SC_HID_FUNC_KORREL" +#define HID_FUNC_KOVAR "SC_HID_FUNC_KOVAR" +#define HID_FUNC_SCHAETZER "SC_HID_FUNC_SCHAETZER" +#define HID_FUNC_MINA "SC_HID_FUNC_MINA" +#define HID_FUNC_MAXA "SC_HID_FUNC_MAXA" +#define HID_FUNC_MITTELWERTA "SC_HID_FUNC_MITTELWERTA" +#define HID_FUNC_STABWA "SC_HID_FUNC_STABWA" +#define HID_FUNC_STABWNA "SC_HID_FUNC_STABWNA" +#define HID_FUNC_VARIANZA "SC_HID_FUNC_VARIANZA" +#define HID_FUNC_VARIANZENA "SC_HID_FUNC_VARIANZENA" +#define HID_FUNC_CHISQDIST "SC_HID_FUNC_CHISQDIST" +#define HID_FUNC_CHISQINV "SC_HID_FUNC_CHISQINV" +#define HID_FUNC_GAMMA "SC_HID_FUNC_GAMMA" + +#define HID_FUNC_ADRESSE "SC_HID_FUNC_ADRESSE" +#define HID_FUNC_BEREICHE "SC_HID_FUNC_BEREICHE" +#define HID_FUNC_WAHL "SC_HID_FUNC_WAHL" +#define HID_FUNC_SPALTE "SC_HID_FUNC_SPALTE" +#define HID_FUNC_ZEILE "SC_HID_FUNC_ZEILE" +#define HID_FUNC_SPALTEN "SC_HID_FUNC_SPALTEN" +#define HID_FUNC_ZEILEN "SC_HID_FUNC_ZEILEN" +#define HID_FUNC_WVERWEIS "SC_HID_FUNC_WVERWEIS" +#define HID_FUNC_SVERWEIS "SC_HID_FUNC_SVERWEIS" +#define HID_FUNC_INDEX "SC_HID_FUNC_INDEX" +#define HID_FUNC_INDIREKT "SC_HID_FUNC_INDIREKT" +#define HID_FUNC_VERWEIS "SC_HID_FUNC_VERWEIS" +#define HID_FUNC_VERGLEICH "SC_HID_FUNC_VERGLEICH" +#define HID_FUNC_VERSCHIEBUNG "SC_HID_FUNC_VERSCHIEBUNG" +#define HID_FUNC_FEHLERTYP "SC_HID_FUNC_FEHLERTYP" +#define HID_FUNC_VORLAGE "SC_HID_FUNC_VORLAGE" +#define HID_FUNC_DDE "SC_HID_FUNC_DDE" +#define HID_FUNC_TABELLE "SC_HID_FUNC_TABELLE" +#define HID_FUNC_TABELLEN "SC_HID_FUNC_TABELLEN" +#define HID_FUNC_HYPERLINK "SC_HID_FUNC_HYPERLINK" +#define HID_FUNC_GETPIVOTDATA "SC_HID_FUNC_GETPIVOTDATA" + +#define HID_FUNC_CODE "SC_HID_FUNC_CODE" +#define HID_FUNC_DM "SC_HID_FUNC_DM" +#define HID_FUNC_ZEICHEN "SC_HID_FUNC_ZEICHEN" +#define HID_FUNC_SAEUBERN "SC_HID_FUNC_SAEUBERN" +#define HID_FUNC_VERKETTEN "SC_HID_FUNC_VERKETTEN" +#define HID_FUNC_IDENTISCH "SC_HID_FUNC_IDENTISCH" +#define HID_FUNC_FINDEN "SC_HID_FUNC_FINDEN" +#define HID_FUNC_SUCHEN "SC_HID_FUNC_SUCHEN" +#define HID_FUNC_GLAETTEN "SC_HID_FUNC_GLAETTEN" +#define HID_FUNC_GROSS2 "SC_HID_FUNC_GROSS2" +#define HID_FUNC_GROSS "SC_HID_FUNC_GROSS" +#define HID_FUNC_KLEIN "SC_HID_FUNC_KLEIN" +#define HID_FUNC_WERT "SC_HID_FUNC_WERT" +#define HID_FUNC_TEXT "SC_HID_FUNC_TEXT" +#define HID_FUNC_T "SC_HID_FUNC_T" +#define HID_FUNC_ERSETZEN "SC_HID_FUNC_ERSETZEN" +#define HID_FUNC_FEST "SC_HID_FUNC_FEST" +#define HID_FUNC_LAENGE "SC_HID_FUNC_LAENGE" +#define HID_FUNC_LINKS "SC_HID_FUNC_LINKS" +#define HID_FUNC_RECHTS "SC_HID_FUNC_RECHTS" +#define HID_FUNC_TEIL "SC_HID_FUNC_TEIL" +#define HID_FUNC_WIEDERHOLEN "SC_HID_FUNC_WIEDERHOLEN" +#define HID_FUNC_WECHSELN "SC_HID_FUNC_WECHSELN" +#define HID_FUNC_BASIS "SC_HID_FUNC_BASIS" +#define HID_FUNC_DEZIMAL "SC_HID_FUNC_DEZIMAL" +#define HID_FUNC_ROEMISCH "SC_HID_FUNC_ROEMISCH" +#define HID_FUNC_ARABISCH "SC_HID_FUNC_ARABISCH" +#define HID_FUNC_BAHTTEXT "SC_HID_FUNC_BAHTTEXT" +#define HID_FUNC_JIS "SC_HID_FUNC_JIS" +#define HID_FUNC_ASC "SC_HID_FUNC_ASC" +#define HID_FUNC_UNICODE "SC_HID_FUNC_UNICODE" +#define HID_FUNC_UNICHAR "SC_HID_FUNC_UNICHAR" +#define HID_FUNC_NUMBERVALUE "SC_HID_FUNC_NUMBERVALUE" -- cgit From e6010b5e704d62471fada5ea63c5d240507e8a3a Mon Sep 17 00:00:00 2001 From: Gregor Hartmann Date: Fri, 27 Aug 2010 14:05:36 +0200 Subject: testtool: fix libsts to work with old testtool --- automation/inc/automation/commtypes.hxx | 2 +- automation/source/inc/cmdbasestream.hxx | 8 +- automation/source/inc/rcontrol.hxx | 4 +- automation/source/miniapp/servres.hrc | 6 +- automation/source/miniapp/servres.src | 4 + automation/source/server/XMLParser.cxx | 42 +-- automation/source/server/cmdbasestream.cxx | 37 ++ automation/source/server/recorder.cxx | 79 +---- automation/source/server/retstrm.cxx | 44 +-- automation/source/server/retstrm.hxx | 13 +- automation/source/server/server.cxx | 6 + automation/source/server/sta_list.cxx | 37 +- automation/source/server/statemnt.cxx | 524 +++++++++++------------------ automation/source/server/statemnt.hxx | 7 +- automation/source/testtool/objtest.cxx | 9 +- automation/util/manually_added_ids.hid | 0 16 files changed, 335 insertions(+), 487 deletions(-) mode change 100755 => 100644 automation/util/manually_added_ids.hid diff --git a/automation/inc/automation/commtypes.hxx b/automation/inc/automation/commtypes.hxx index a5a5437f0343..72a362e5e052 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 * ************************************************************************/ diff --git a/automation/source/inc/cmdbasestream.hxx b/automation/source/inc/cmdbasestream.hxx index e192b66ed8b6..408492cd8ac9 100644 --- a/automation/source/inc/cmdbasestream.hxx +++ b/automation/source/inc/cmdbasestream.hxx @@ -38,7 +38,6 @@ #include #include "icommstream.hxx" -#include "rtl/string.hxx" class CmdBaseStream { @@ -57,8 +56,13 @@ public: 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, rtl::OString *pUId, comm_USHORT nMethod ); + 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 ); diff --git a/automation/source/inc/rcontrol.hxx b/automation/source/inc/rcontrol.hxx index 7313603096b4..cf13fdadd469 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/miniapp/servres.hrc b/automation/source/miniapp/servres.hrc index 2f95a34a60b6..6efd2ce57460 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 8ba7d4923973..c1af1caa775a 100644 --- a/automation/source/miniapp/servres.src +++ b/automation/source/miniapp/servres.src @@ -54,6 +54,7 @@ ModalDialog GROSSER_TEST_DLG }; OKButton 1 { + HelpID = "hid1" ; Pos = MAP_APPFONT ( 132 , 92 ) ; Size = MAP_APPFONT ( 64 , 12 ) ; TabStop = TRUE ; @@ -175,6 +176,7 @@ Menu MENU_CLIENT MenuItem { Identifier = IDM_FILE ; + HelpID = IDM_FILE_HELP ; Text = "~File" ; SubMenu = Menu { @@ -183,6 +185,7 @@ Menu MENU_CLIENT MenuItem { Identifier = IDM_FILE_OPEN_TEST ; + HelpID = IDM_FILE_OPEN_TEST_HELP ; Text = "~Open Test Window" ; }; MenuItem @@ -193,6 +196,7 @@ Menu MENU_CLIENT MenuItem { Identifier = IDM_FILE_EXIT ; + HelpID = IDM_FILE_EXIT_HELP ; Text = "~Beenden" ; AccelKey = KeyCode { diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx index 6e6c3dc859a7..e07f1654ecd5 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 bd9f429b9e75..827ea93a4796 100644 --- a/automation/source/server/cmdbasestream.cxx +++ b/automation/source/server/cmdbasestream.cxx @@ -102,6 +102,43 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG Write(bBool); } +void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr ) +{ + Write(comm_USHORT(SIReturn)); + Write(nRet); + Write(nMethod); + 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(nMethod); + 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(nMethod); + 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(nMethod); + Write(comm_USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter + Write(nNr); +} + + // MacroRecorder void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod ) { diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx index 06446952f318..ac0b9db9aaf8 100644 --- a/automation/source/server/recorder.cxx +++ b/automation/source/server/recorder.cxx @@ -107,20 +107,17 @@ IMPL_LINK( MacroRecorder, HookRefreshHdl, void*, EMPTYARG ) void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod, USHORT nParam ) { - // FIXME: HELPID - ::comphelper::UiEventsLogger::logVcl( rtl::OStringToOUString( aParentID, RTL_TEXTENCODING_UTF8 ), nVCLWindowType, rtl::OStringToOUString( aID, RTL_TEXTENCODING_UTF8 ), aMethod, nParam ); + ::comphelper::UiEventsLogger::logVcl( Id2Str( aParentID ), nVCLWindowType, Id2Str( aID ), aMethod, nParam ); } void MacroRecorder::LogVCL( rtl::OString aParentID, USHORT nVCLWindowType, rtl::OString aID, String aMethod ) { - // FIXME: HELPID - ::comphelper::UiEventsLogger::logVcl( rtl::OStringToOUString( aParentID, RTL_TEXTENCODING_UTF8 ), nVCLWindowType, rtl::OStringToOUString( aID, RTL_TEXTENCODING_UTF8 ), aMethod ); + ::comphelper::UiEventsLogger::logVcl( Id2Str( aParentID ), nVCLWindowType, Id2Str( aID ), aMethod ); } Window* MacroRecorder::GetParentWithID( Window* pThis ) { Window *pOverlap = pThis->GetWindow( WINDOW_OVERLAP ); - // FIXME: HELPID while ( pOverlap != pThis && !pThis->GetUniqueOrHelpId().getLength() && pThis->GET_REAL_PARENT() ) pThis = pThis->GET_REAL_PARENT(); return pThis; @@ -128,7 +125,6 @@ Window* MacroRecorder::GetParentWithID( Window* pThis ) rtl::OString MacroRecorder::GetParentID( Window* pThis ) { - // FIXME: HELPID if ( pThis->GetParent() ) return pThis->GetParent()->GetUniqueOrHelpId(); else @@ -197,15 +193,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_WINDOW_ACTIVATE: if ( m_bRecord ) { - // FIXME: HELPID - #if 0 - StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), static_cast(pWin->GetUniqueOrHelpId().GetNum()) ); //GetNum() ULONG != comm_ULONG on 64bit - #endif + StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), Id2Str( pWin->GetUniqueOrHelpId() ) ); bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("SetPage") ); } break; @@ -221,15 +213,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { if ( m_bRecord ) { - // FIXME: HELPID - #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Check ); - #endif bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Check") ); } } @@ -255,15 +243,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - // FIXME: HELPID - #if 0 - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod ); - #endif + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod ); bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); } } @@ -293,15 +277,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_LISTBOX_SELECT: if ( m_bRecord ) { - // FIXME: HELPID - #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) ); - #endif bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() ); } break; @@ -332,16 +312,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) Sound::Beep(); else { - // FIXME: HELPID - #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 ); - #endif bSendData = TRUE; } } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), nPos ); } } @@ -358,7 +334,6 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_BUTTON_CLICK: Window* pParent = pWin->GetParent(); BOOL bDone = FALSE; - // FIXME: HELPID if ( pParent->IsDialog() && !pWin->GetUniqueOrHelpId().getLength() ) { switch ( pParent->GetType() ) @@ -398,22 +373,17 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - // FIXME: HELPID - #if 0 if ( nMethod != M_Click ) - StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( 0 ), nMethod ); + StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod ); else - StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( 0 ), nMethod, (comm_ULONG)nCurrentButtonId ); - #endif + StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod, (comm_ULONG)nCurrentButtonId ); bSendData = TRUE; } if ( m_bLog ) { if ( nMethod != M_Click ) - // FIXME: HELPID LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); else - // FIXME: HELPID LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod, nCurrentButtonId ); bDone = TRUE; } @@ -433,15 +403,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - // FIXME: HELPID - #if 0 - StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetSmartUniqueOrHelpId(), nMethod ); - #endif + StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetUniqueOrHelpId(), nMethod ); bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); bDone = TRUE; } @@ -451,20 +417,15 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - // FIXME: HELPID if ( !bSendData && pWin->GetUniqueOrHelpId().getLength() ) { - // FIXME: HELPID - #if 0 - StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click ); - #endif + StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click ); bSendData = TRUE; } } if ( m_bLog ) { if ( !bDone ) - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") ); } } @@ -519,15 +480,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) } if ( m_bRecord ) { - // FIXME: HELPID - #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod ); - #endif bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod ); } } @@ -545,15 +502,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) case VCLEVENT_BUTTON_CLICK: if ( m_bRecord ) { - // FIXME: HELPID - #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click ); - #endif bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") ); } break; @@ -587,15 +540,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // compare to 1 for floating ToolBoxes if ( m_bRecord ) { - // FIXME: HELPID - #if 0 - if ( !pWin->GetUniqueOrHelpId().getLength() || pWin->GetUniqueOrHelpId().Matches( 1 ) ) + if ( !pWin->GetUniqueOrHelpId().getLength() /* || pWin->GetUniqueOrHelpId().Matches( 1 ) */ ) // generate direct Button access - StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString( 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->GetUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), static_cast(pTB->GetHelpId( pTB->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit - #endif + 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 ) @@ -624,7 +574,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) // } // if ( m_bLog ) // { -// LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), rtl::OString( pActionParent->GetHelpId( pActionParent->GetCurItemId() ) ), CUniString("TearOff") ); +// LogVCL( pActionParent->GetSmartUniqueOrHelpId(), pWin->GetType(), pActionParent->GetHelpId( pActionParent->GetCurItemId() ), CUniString("TearOff") ); // } // } // pActionParent = NULL; @@ -726,7 +676,6 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) Window *pIdWin = GetParentWithID( pWin ); if ( pIdWin != pWin ) bKeyFollowFocus = TRUE; - // FIXME: HELPID aKeyUniqueID = pIdWin->GetUniqueOrHelpId(); if ( m_bLog ) { @@ -1075,15 +1024,11 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent ) { if ( m_bRecord ) { - // FIXME: HELPID - #if 0 StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), M_SetText, aEditModifyString ); - #endif bSendData = TRUE; } if ( m_bLog ) { - // FIXME: HELPID LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Modify") ); } pEditModify = NULL; diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx index 43776af565e5..d1cd5d2327f1 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 +#include #include "retstrm.hxx" #include "rcontrol.hxx" @@ -57,20 +58,12 @@ void RetStream::GenReturn ( USHORT nRet, rtl::OString aUId, String aString ) CmdBaseStream::GenReturn ( nRet, &aUId, &aString ); } -void RetStream::GenReturn ( USHORT nRet, rtl::OString 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, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool ) { CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool ); } +// MacroRecorder void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, String aString ) { CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString ); @@ -82,6 +75,23 @@ void RetStream::GenReturn( USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, } +void RetStream::GenReturn ( USHORT nRet, USHORT nMethod, SbxValue &aValue ) +{ + Write(USHORT(SIReturn)); + Write(nRet); + Write((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() ); @@ -95,19 +105,9 @@ void RetStream::Write( SbxValue &aValue ) void RetStream::Write( rtl::OString* pId ) { - // FIXME: HELPID - #if 0 - DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "rtl::OString contains Number and String. using String only." ); - if ( pId->HasString() ) - { - String aTmp( pId->GetStr() ); - Write( &aTmp ); - } - else - Write( static_cast(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit - #else - (void)pId; - #endif + //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 0a340ee41a4a..0771664e0158 100644 --- a/automation/source/server/retstrm.hxx +++ b/automation/source/server/retstrm.hxx @@ -48,15 +48,24 @@ public: void GenReturn( comm_USHORT nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );} 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 );} + +// needed for RemoteCommand and Profiling + void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nMethod, nNr );} + void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, nMethod, bBool );} + // MacroRecorder - void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} + 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, rtl::OString aUId, String aString ); - void GenReturn( USHORT nRet, rtl::OString aUId, SbxValue &aValue ); void GenReturn( USHORT nRet, rtl::OString aUId, comm_ULONG nNr, String aString, BOOL bBool ); + + void GenReturn( USHORT nRet, USHORT nMethod, SbxValue &aValue ); +// and Profiling + void GenReturn( USHORT nRet, USHORT nMethod, String aString ); + // MacroRecorder 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 ); diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index 5a27e2b3b71b..069f9253f10f 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -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 @@ -869,6 +872,7 @@ ImplRemoteControl::ImplRemoteControl() #else pServiceMgr = new RemoteControlCommunicationManager(); #endif + fprintf(stderr, "%s\n", "Start RemoteControlCommunicationManager"); pServiceMgr->SetDataReceivedHdl( LINK( this, ImplRemoteControl, QueCommandsEvent ) ); pServiceMgr->StartCommunication(); @@ -882,6 +886,7 @@ ImplRemoteControl::ImplRemoteControl() } if ( RemoteControlCommunicationManager::nComm ) new ExtraIdle( this ); // Setzt die Bearbeitung wieder auf + fprintf(stderr, "%s\n", "end of ImplRemoteControl::ImplRemoteControl()"); } ImplRemoteControl::~ImplRemoteControl() @@ -951,6 +956,7 @@ static ::osl::Mutex aMutex; static RemoteControl* pRemoteControl = 0; extern "C" void CreateRemoteControl() { + fprintf(stderr, "%s\n", "CreateRemoteControl"); if ( !pRemoteControl ) { ::osl::MutexGuard aGuard( aMutex ); diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index 9d7fb5597068..c491e66885cc 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -84,9 +84,9 @@ rtl::OString StatementList::aWindowWaitOldHelpId = rtl::OString(); rtl::OString StatementList::aWindowWaitOldUniqueId = rtl::OString(); USHORT StatementList::nUseBindings = 0; -rtl::OString StatementList::aSubMenuId1 = rtl::OString(); // Untermenüs bei PopupMenus -rtl::OString StatementList::aSubMenuId2 = rtl::OString(); // erstmal 2-Stufig -rtl::OString StatementList::aSubMenuId3 = rtl::OString(); // 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; @@ -131,7 +131,7 @@ TTSettings* GetTTSettings() // FIXME: HELPID -#define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "4321" ) && pWin->GetUniqueId().equals( "1234" )) +#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 ); } @@ -156,7 +156,7 @@ void StatementList::InitProfile() #if OSL_DEBUG_LEVEL > 1 if ( pCurrentProfileStatement != NULL && pCurrentProfileStatement != this ) - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), 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; } @@ -172,19 +172,19 @@ void StatementList::SendProfile( String aText ) pProfiler->EndProfileInterval(); if ( pProfiler->IsProfilingPerCommand() ) - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileLine( aText ) ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileLine( aText ) ); if ( pProfiler->IsPartitioning() ) // FIXME: HELPID - pRet->GenReturn( RET_ProfileInfo, rtl::OString( /*S_ProfileTime*/ ), static_cast(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit + pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit } if ( pProfiler->IsAutoProfiling() ) - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() ); #if OSL_DEBUG_LEVEL > 1 if ( pCurrentProfileStatement == NULL ) - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), CUniString("SendProfile ohne InitProfile\n") ); + pRet->GenReturn( RET_ProfileInfo, 0, CUniString("SendProfile ohne InitProfile\n") ); #endif pCurrentProfileStatement = NULL; } @@ -392,9 +392,7 @@ Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL May BOOL SearchUID::IsWinOK( Window *pWin ) { - // FIXME: HELPID - #if 0 - if ( aUId.Matches( pWin->GetUniqueOrHelpId() ) ) + if ( aUId.equals( pWin->GetUniqueOrHelpId() ) ) { if ( ( pWin->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pWin->IsVisible() ) return TRUE; @@ -411,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 ) ); @@ -456,9 +454,6 @@ BOOL SearchUID::IsWinOK( Window *pWin ) return FALSE; } else - #else - (void)pWin; - #endif return FALSE; } @@ -981,8 +976,7 @@ String StatementList::ClientTree(Window *pBase, int Indent) WRITE(sIndent); WRITEc("UId : "); - // FIXME: HELPID - WRITE(String(rtl::OStringToOUString(pBase->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8))); + WRITE(Id2Str(pBase->GetUniqueOrHelpId())); WRITEc(":0x"); WRITE( String::CreateFromInt64( @@ -1039,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 @@ -1049,7 +1043,6 @@ BOOL StatementList::CheckWindowWait() #if OSL_DEBUG_LEVEL > 1 m_pDbgWin->AddText( "Close timed out. Going on!! " ); #endif - // FIXME: HELPID pWindowWaitPointer->SetHelpId(aWindowWaitOldHelpId); pWindowWaitPointer->SetUniqueId(aWindowWaitOldUniqueId); @@ -1090,9 +1083,7 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever) void StatementList::DirectLog( ULONG nType, String aMessage ) { if ( pRet ) - // FIXME: HELPID - pRet->GenReturn( RET_DirectLoging, rtl::OString(/*nType*/), aMessage ); - (void) nType; + pRet->GenReturn( RET_DirectLoging, nType, aMessage ); } diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx index 56f1871791fd..a7320b6948e0 100644 --- a/automation/source/server/statemnt.cxx +++ b/automation/source/server/statemnt.cxx @@ -155,14 +155,13 @@ pfunc_osl_printDebugMessage StatementCommand::pOriginal_osl_DebugMessageFunc = N #define RESET_APPLICATION_TO_BACKING_WINDOW -// FIXME: HELPID #define SET_WINP_CLOSING(pWin) \ pWindowWaitPointer = pWin; \ aWindowWaitUId = pControl->GetUniqueOrHelpId(); \ aWindowWaitOldHelpId = pWin->GetHelpId(); \ aWindowWaitOldUniqueId = pWin->GetUniqueId(); \ - pWin->SetHelpId( rtl::OString("4321") ); \ - pWin->SetUniqueId( rtl::OString("1234") ); + pWin->SetHelpId( rtl::OString("TT_Win_is_closing_HID") ); \ + pWin->SetUniqueId( rtl::OString("TT_Win_is_closing_UID") ); // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= @@ -303,39 +302,9 @@ BOOL StatementFlow::Execute() // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-= // neue Hilfsfunktion, die stetig erweitert werden muss -static short ImpGetRType( Window *pWin, rtl::OString aUId ) +static short ImpGetRType( Window *pWin ) { - // FIXME: HELPID - #if 0 - 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 - } - } - #else - short nRT = 0; - (void)aUId; - #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; @@ -401,15 +370,6 @@ static short ImpGetRType( Window *pWin, rtl::OString 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; } @@ -598,9 +558,9 @@ BOOL StatementSlot::Execute() if ( !bMenuClosed ) { pPopup->EndExecute(0); - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; bMenuClosed = TRUE; #if OSL_DEBUG_LEVEL > 1 @@ -722,12 +682,12 @@ BOOL StatementSlot::Execute() { case TT_PR_ERR_NODISPATCHER: { - ReportError( rtl::OString(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(rtl::OString(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) ); + ReportError( rtl::OString::valueOf((sal_Int32)nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) ); } break; } @@ -766,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) @@ -779,12 +738,11 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, , bBool2(FALSE) { QueStatement( pAfterThis ); - aSmartMethodId = rtl::OString( 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 ) );} @@ -802,7 +760,6 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, StatementCommand::StatementCommand( SCmdStream *pCmdIn ) : nMethodId(0) -, aSmartMethodId() , nParams(0) , nNr1(0) , nNr2(0) @@ -816,7 +773,6 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn ) { QueStatement( NULL ); pCmdIn->Read( nMethodId ); - aSmartMethodId = rtl::OString( nMethodId ); pCmdIn->Read( nParams ); if( nParams & PARAM_USHORT_1 ) pCmdIn->Read( nNr1 ); @@ -832,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 ) );} @@ -950,11 +906,8 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst break; default: - // FIXME: HELPID - #if 0 - if ( pBase->GetSmartUniqueOrHelpId().Equals( rtl::OString() ) && !( nConf & DH_MODE_ALLWIN ) ) + if ( ( pBase->GetUniqueOrHelpId().getLength() == 0 ) && !( nConf & DH_MODE_ALLWIN ) ) bSkip = TRUE; - #endif break; } @@ -985,16 +938,9 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst aTypeSuffix.AppendAscii( "/Unknown", 8 ); } - // FIXME: HELPID rtl::OString aId = pBase->GetUniqueOrHelpId(); - #if 0 - if ( aId.HasString() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, rtl::OString( 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, rtl::OString( aId.GetNum() ), (comm_ULONG)pBase->GetType(), - TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE ); - #endif + 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. @@ -1015,32 +961,26 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst pItemWin = pTB->GetItemWindow( pTB->GetItemId( i ) ); if ( pTB->GetItemType( i ) == TOOLBOXITEM_BUTTON && ( !pItemWin || !pItemWin->IsVisible() ) ) { - // FIXME: HELPID - #if 0 if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, rtl::OString( 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, rtl::OString( 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 ); - #endif } else { if ( pItemWin ) { - // FIXME: HELPID - #if 0 if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, rtl::OString( 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, rtl::OString( 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++ ) WriteControlData( pItemWin->GetChild(ii), nConf, FALSE ); - #endif } else { @@ -1067,15 +1007,12 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst default: DBG_ERROR1( "Unknown TOOLBOXITEM %i", pTB->GetItemType( i ) ); } - // FIXME: HELPID - #if 0 if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, rtl::OString( 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, rtl::OString( 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 ); - #endif } } } @@ -1099,38 +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; } - // FIXME: HELPID - #if 0 - pRet->GenReturn ( RET_WinInfo, rtl::OString( 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 ); - #endif + .AppendAscii(" ButtonId = ").AppendAscii( aID.GetBuffer() ), FALSE ); } return; // ButtonDialog ist hier schon komplett abgehandelt. @@ -1176,15 +1110,12 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst default: DBG_ERROR1( "Unknown MENUITEM %i", pMenu->GetItemType( i ) ); } - // FIXME: HELPID - #if 0 if ( pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) ) - pRet->GenReturn ( RET_WinInfo, rtl::OString( 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, rtl::OString( nID ), (comm_ULONG)0, + pRet->GenReturn ( RET_WinInfo, rtl::OString::valueOf( (sal_Int32)nID ), (comm_ULONG)0, aMenuItemType.AppendAscii(": ").Append(aName), FALSE ); - #endif } } @@ -1600,15 +1531,12 @@ BOOL StatementCommand::DisplayHID() if ( GetTTSettings()->Act ) { SET_WIN(GetTTSettings()->Act); - // FIXME: HELPID - #if 0 - 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 ); - #endif } else GetTTSettings()->pDisplayHidWin->SetDisplayText(CUniString("Kein Window/Control gefunden")); @@ -1616,13 +1544,11 @@ 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 ) { - // FIXME: HELPID - #if 0 - GetTTSettings()->Act->SetSmartUniqueId( rtl::OString( GetTTSettings()->pDisplayHidWin->GetDisplayText().ToInt32() ) ); + GetTTSettings()->Act->SetUniqueId( Str2Id( GetTTSettings()->pDisplayHidWin->GetDisplayText().GetToken( '|' ) ) ); GetTTSettings()->pDisplayHidWin->ClearDisplayTextModified(); - #endif } } /* if ( Application::GetLastInputInterval() > 5000 ) // 5 Sekunden lang nix geschehen @@ -2157,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( rtl::OString( 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; } @@ -2199,7 +2125,6 @@ void StatementCommand::Translate() { Window* pNew = pTranslationWindow->GetWindow( WINDOW_CLIENT ); // Bei Dockingwindoes das kanze Geraffel von Docking Floating überspringen - // FIXME: HELPID while ( IsDialog( pNew ) && !pNew->GetUniqueOrHelpId().getLength() && pNew->GetChildCount() == 1 ) pNew = pNew->GetChild( 0 ); pTranslationWindow = pNew; @@ -2207,8 +2132,7 @@ void StatementCommand::Translate() aTranslation = CUniString("0;"); - // FIXME: HELPID - aTranslation += String(rtl::OStringToOUString( pTranslationWindow->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8 )); + aTranslation += Id2Str( pTranslationWindow->GetUniqueOrHelpId() ); aTranslation += ';'; aTranslation += TypeString( pTranslationWindow->GetType() ); @@ -2222,8 +2146,7 @@ void StatementCommand::Translate() if ( pParentDialog ) { - // FIXME: HELPID - aTranslation += String(rtl::OStringToOUString(pParentDialog->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8)); + aTranslation += Id2Str(pParentDialog->GetUniqueOrHelpId()); aTranslation += ';'; aTranslation += TypeString( pParentDialog->GetType() ); } @@ -2252,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(); @@ -2268,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; @@ -2276,7 +2199,7 @@ void StatementCommand::Translate() else { GetTTSettings()->pTranslateWin->EnableTranslation(); - pRet->GenReturn ( RET_Value, aSmartMethodId, String() ); + pRet->GenReturn ( RET_Value, nMethodId, String() ); } } @@ -2364,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 @@ -2376,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 @@ -2384,11 +2307,10 @@ BOOL StatementCommand::Execute() -// FIXME: HELPID #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( rtl::OStringToOUString( pControl->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8) ) ); + 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 @@ -2396,7 +2318,6 @@ BOOL StatementCommand::Execute() #define REPORT_WIN_CLOSEDc(pControl, aInfo ) \ REPORT_WIN_CLOSED(pControl, CUniString(aInfo) ) -// FIXME: HELPID #define _REPORT_WIN_CLOSED(pControl, aInfo) \ if ( aString1.Len() ) \ aString1 += '\n'; \ @@ -2406,7 +2327,7 @@ BOOL StatementCommand::Execute() aString1.AppendAscii("\" geschlossen, RType = ");\ aString1 += TypeString(pControl->GetType()); \ aString1.AppendAscii(", UId = "); \ - aString1 += String(rtl::OStringToOUString(pControl->GetUniqueOrHelpId(), RTL_TEXTENCODING_UTF8)); + aString1 += UIdString(pControl->GetUniqueOrHelpId()); switch ( nMethodId ) @@ -2439,9 +2360,9 @@ BOOL StatementCommand::Execute() bCatchGPF = TRUE; bUsePostEvents = TRUE; - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } if ( !nRetryCount ) @@ -2462,14 +2383,12 @@ BOOL StatementCommand::Execute() && pControl->GetType() != WINDOW_BORDERWINDOW && nRetryCount-- ) { - // FIXME: HELPID - short nRT = ImpGetRType( pControl, pControl->GetUniqueOrHelpId() ); + 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(); - // FIXME: HELPID - nRT = ImpGetRType( pControl, pControl->GetUniqueOrHelpId() ); + nRT = ImpGetRType( pControl ); } switch( nRT ) @@ -2637,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: @@ -2651,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; @@ -2708,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: @@ -2747,10 +2666,7 @@ BOOL StatementCommand::Execute() ReportError( GEN_RES_STR0( S_NO_DIALOG_IN_GETACTIVE ) ); else { - // FIXME: HELPID - #if 0 - pRet->GenReturn( RET_Value, aSmartMethodId, static_cast(pWin->GetUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit - #endif + pRet->GenReturn( RET_Value, nMethodId, Id2Str(pWin->GetUniqueOrHelpId()) ); } } break; @@ -2784,7 +2700,7 @@ BOOL StatementCommand::Execute() pProfiler->StartAutoProfiling( nNr1 ); // Der Header ist abhängig vom Modus - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileHeader() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() ); } else if ( nParams & PARAM_USHORT_1 ) { // Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr] @@ -2797,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, rtl::OString( S_ProfileReset ), nAnzahl ); + pRet->GenReturn( RET_ProfileInfo, S_ProfileReset, nAnzahl ); // Und die einzelnen Grenzen - if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileBorder1 ), (comm_ULONG)nNr1 ); }; - if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileBorder2 ), (comm_ULONG)nNr2 ); }; - if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileBorder3 ), (comm_ULONG)nNr3 ); }; - if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, rtl::OString( 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, rtl::OString(), aString1 ); + pRet->GenReturn( RET_ProfileInfo, 0, aString1 ); } else { // Normales Profiling je Kommando: profile if ( pProfiler->IsAutoProfiling() ) { - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() ); pProfiler->StopAutoProfiling(); } pProfiler->StartProfilingPerCommand(); // Der Header ist abhängig vom Modus - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetProfileHeader() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() ); } } else // Profiling wieder ausschalten: Profile false @@ -2833,13 +2749,13 @@ BOOL StatementCommand::Execute() if ( pProfiler->IsAutoProfiling() ) { - pRet->GenReturn( RET_ProfileInfo, rtl::OString(), pProfiler->GetAutoProfiling() ); + pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() ); pProfiler->StopAutoProfiling(); } if ( pProfiler->IsPartitioning() ) { - pRet->GenReturn( RET_ProfileInfo, rtl::OString( S_ProfileDump ), (comm_ULONG)0 ); + pRet->GenReturn( RET_ProfileInfo, S_ProfileDump, (comm_ULONG)0 ); pProfiler->StopPartitioning(); } @@ -2937,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: @@ -2965,53 +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) ) { - // FIXME: HELPID - #if 0 - if ( !aSubMenuId1.GetNum() ) - aSubMenuId1 = rtl::OString(nNr1); - else if ( !aSubMenuId2.GetNum() ) - aSubMenuId2 = rtl::OString(nNr1); - else if ( !aSubMenuId3.GetNum() ) - aSubMenuId3 = rtl::OString(nNr1); - #endif + if ( !aSubMenuId1 ) + aSubMenuId1 = nNr1; + else if ( !aSubMenuId2 ) + aSubMenuId2 = nNr1; + else if ( !aSubMenuId3 ) + aSubMenuId3 = nNr1; if ( pPopup ) pPopup->SelectEntry(nNr1); @@ -3023,17 +2936,17 @@ BOOL StatementCommand::Execute() if ( pPopup ) { pPopup->EndExecute(nNr1); - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } else { pMenuBar->SelectEntry(nNr1); - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } } @@ -3200,7 +3113,7 @@ BOOL StatementCommand::Execute() } if ( !nErrorcode ) { - pRet->GenReturn ( RET_Value, aSmartMethodId, aPath ); + pRet->GenReturn ( RET_Value, nMethodId, aPath ); } @@ -3232,9 +3145,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; } @@ -3249,12 +3162,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++; }*/ } @@ -3266,7 +3179,7 @@ BOOL StatementCommand::Execute() if ( FSYS_ERR_OK == nErrorcode ) { FileStat aFS( aFile ); - pRet->GenReturn ( RET_Value, aSmartMethodId, static_cast(aFS.GetSize()) ); //GetSize() ULONG != comm_ULONG on 64bit + pRet->GenReturn ( RET_Value, nMethodId, static_cast(aFS.GetSize()) ); //GetSize() ULONG != comm_ULONG on 64bit nErrorcode = aFS.GetError(); } } @@ -3293,7 +3206,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; @@ -3409,7 +3322,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: @@ -3478,7 +3391,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: @@ -3519,14 +3432,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 ) @@ -3542,7 +3455,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 : @@ -3561,7 +3474,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 : @@ -3640,18 +3553,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 = 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 ); - // FIXME: HELPID - aUId = rtl::OUStringToOString( aId, RTL_TEXTENCODING_UTF8 ); + aUId = Str2Id( aId ); } else { @@ -3673,7 +3590,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:" ); @@ -3760,14 +3677,11 @@ static Window*ImpGetButton( Window *pBase, WinBits nMask, WinBits nWinBits ) BOOL StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung ) { - // FIXME: HELPID - #if 0 if ( pControl && ( ( ( IsAccessable(pControl) || (nMethodId & M_WITH_RETURN) ) && pControl->IsVisible() ) || - aUId.Matches( UID_ACTIVE ) ) ) + aUId.equals( UID_ACTIVE ) ) ) return TRUE; else - #endif { UniString aBezeichnung( cBezeichnung, RTL_TEXTENCODING_ASCII_US ); if ( aBezeichnung.Len() > 0 ) @@ -3822,29 +3736,23 @@ USHORT StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, if ( !pMenu ) return 1; - // FIXME: HELPID - #if 0 - 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; } - #endif return 0; } @@ -4085,10 +3993,7 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl ) default: return FALSE; } - // FIXME: HELPID - #if 0 SendProfile( UIdString( aUId ).Append('.').Append( MethodString( nMethodId ) ) ); - #endif return TRUE; } return FALSE; @@ -4373,9 +4278,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; case M_OpenContextMenu: { - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; Point aPos; ToolBox* pTB = (ToolBox*)pControl; @@ -4409,9 +4314,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) break; case M_UseMenu: { - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; while ( pControl && !( ( pControl->GetType() == WINDOW_SYSWINDOW || pControl->GetType() == WINDOW_WORKWINDOW ) && ControlOK( pControl, "" ) ) ) @@ -4502,10 +4407,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl ) default: ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) ); } - // FIXME: HELPID - #if 0 SendProfile( UIdString( aUId ).Append('.').Append( MethodString( nMethodId ) ) ); - #endif } break; case M_StatusGetText: @@ -4640,7 +4542,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" ); @@ -4653,19 +4555,16 @@ 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 - // FIXME: HELPID - #if 0 - if ( aUId.Matches( UID_ACTIVE ) ) + if ( aUId.equals( UID_ACTIVE ) ) pControl = GetAnyActive(); else - #endif { BOOL bSearchButtonOnToolbox = (nParams == PARAM_NONE) && ((M_Click == nMethodId) || (M_TearOff == nMethodId) || (M_IsEnabled == nMethodId) || (M_OpenMenu == nMethodId)); bSearchButtonOnToolbox |= (nParams == PARAM_USHORT_1) && (M_GetState == nMethodId); @@ -4684,9 +4583,7 @@ BOOL StatementControl::Execute() if ( pControl && pControl->GetType() == WINDOW_TOOLBOX ) { - // FIXME: HELPID - #if 0 - if ( !aUId.Matches( pControl->GetSmartUniqueOrHelpId() ) ) + if ( !aUId.equals( pControl->GetUniqueOrHelpId() ) ) { // Also wenn wir irgendwas auf einer Toolbox gefunden haben switch ( nMethodId ) { @@ -4702,7 +4599,6 @@ BOOL StatementControl::Execute() pControl = NULL; } } - #endif } @@ -4746,7 +4642,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 ) ); @@ -4889,47 +4785,44 @@ BOOL StatementControl::Execute() } break; case M_GetPage: - // FIXME: HELPID - #if 0 - pRet->GenReturn ( RET_Value, aUId, ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetSmartUniqueOrHelpId().GetText()); - #endif + pRet->GenReturn ( RET_Value, aUId, Id2Str( ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetUniqueOrHelpId() ) ); break; case M_SetPage : { // Wegen lokaler Variablen - // FIXME: HELPID - #if 0 TabControl *pTControl = ((TabControl*)pControl); USHORT nActive = pTControl->GetCurPageId(); USHORT i,anz; rtl::OString aID; rtl::OString aWantedID; + //HELPID BACKWARD (No numbers please (remove PARAM_ULONG_1 part) if ( (nParams & PARAM_ULONG_1) ) { - aWantedID = rtl::OString( 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 = rtl::OString( 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()) @@ -4938,7 +4831,6 @@ BOOL StatementControl::Execute() pTControl->ActivatePage();*/ ReportError( aWantedID, GEN_RES_STR1( S_TABPAGE_NOT_FOUND, MethodString( nMethodId ) ) ); } - #endif } break; default: @@ -5366,9 +5258,9 @@ BOOL StatementControl::Execute() ImplMouseButtonUp ( pControl, aMEvnt, FORCE_DIRECT_CALL ); - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } break; @@ -5377,46 +5269,32 @@ BOOL StatementControl::Execute() break; } break; -#if 0 case C_ToolBox: { ToolBox *pTB = ((ToolBox*)pControl); - // FIXME: HELPID - #if 0 - if ( !aUId.Matches( pTB->GetUniqueOrHelpId() ) ) // 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 ) ) ); } - #endif -// FIXME: HELPID #define FIND_ITEM\ USHORT nItemPos = 0;\ BOOL bItemFound = FALSE;\ {\ rtl::OString aButtonId;\ if( nParams & PARAM_STR_1 )\ - aButtonId = rtlOUStringToOString( aString1, RTL_TEXTENCODING_UTF8 );\ - 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\ @@ -5458,7 +5336,8 @@ BOOL StatementControl::Execute() }\ }\ }\ - }\ + } + switch( nMethodId ) { case M_AnimateMouse : @@ -5477,9 +5356,9 @@ BOOL StatementControl::Execute() MouseEvent aMEvnt(aRect.Center(),1,MOUSE_SIMPLECLICK,MOUSE_LEFT); ImplMouseButtonDown( pTB, aMEvnt );*/ - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; new StatementCommand( this, RC_MenuSelect, PARAM_USHORT_1, pTB->GetItemId(nItemPos) + TOOLBOX_MENUITEM_START ); @@ -5542,9 +5421,9 @@ BOOL StatementControl::Execute() ImplMouseButtonUp( pTB, aMEvnt); // Das Fenster ist offen. - aSubMenuId1 = rtl::OString(); - aSubMenuId2 = rtl::OString(); - aSubMenuId3 = rtl::OString(); + aSubMenuId1 = 0; + aSubMenuId2 = 0; + aSubMenuId3 = 0; pMenuWindow = NULL; } } @@ -5563,27 +5442,26 @@ BOOL StatementControl::Execute() FIND_ITEM; if ( bItemFound ) // FIND_ITEM Erfolgreich { - switch (nNr1) - { - case 0: - // FIXME: HELPID - #if 0 - pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetHelpId(pTB->GetItemId(nItemPos))); - #endif - 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; @@ -5899,7 +5777,6 @@ BOOL StatementControl::Execute() break; } break; -#endif case C_Control: { USHORT nRealControlType = 0; @@ -6459,10 +6336,7 @@ protected: break; case M_Close: //aWindowWaitUId = aUId; - // FIXME: HELPID - #if 0 - DBG_ASSERT( aUId.Matches( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); - #endif + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((DockingWindow*)pControl)->Close(); break; @@ -6538,10 +6412,7 @@ protected: break; } case M_Close: - // FIXME_ HELPID - #if 0 - DBG_ASSERT( aUId.Matches( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); - #endif + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((FloatingWindow*)pControl)->Close(); break; @@ -6564,10 +6435,7 @@ protected: AnimateMouse( pControl, MitteOben); break; case M_Close: - // FIXME: HELPID - #if 0 - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); - #endif + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((SystemWindow*)pControl)->Close(); break; @@ -6576,10 +6444,7 @@ protected: Window *pChild = GetWinByRT( pControl, WINDOW_OKBUTTON ); if( ControlOK( pChild, "OK Button" ) ) { - // FIXME: HELPID - #if 0 - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); - #endif + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((Button*)pChild)->Click(); } @@ -6590,10 +6455,7 @@ protected: Window *pChild = GetWinByRT( pControl, WINDOW_CANCELBUTTON ); if( ControlOK( pChild, "Cancel Button" ) ) { - // FIXME: HELPID - #if 0 - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); - #endif + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((Button*)pChild)->Click(); } @@ -6630,10 +6492,7 @@ protected: AnimateMouse( pControl, MitteOben); break; case M_Close: - // FIXME: HELPID - #if 0 - DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); - #endif + DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId"); SET_WINP_CLOSING(pControl); ((WorkWindow*)pControl)->Close(); break; @@ -6858,10 +6717,7 @@ protected: #endif if ( bStatementDone ) { - // FIXME: HELPID - #if 0 SendProfile( UIdString( aUId ).Append('.').Append( MethodString( nMethodId ) ) ); - #endif delete this; } else diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx index 2014e6d3a4fe..ada6c60a6b35 100644 --- a/automation/source/server/statemnt.hxx +++ b/automation/source/server/statemnt.hxx @@ -293,9 +293,9 @@ public: 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 rtl::OString aSubMenuId1; // Untermenüs bei PopupMenus - static rtl::OString aSubMenuId2; // erstmal 2-Stufig - static rtl::OString 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 @@ -349,7 +349,6 @@ class StatementCommand : public StatementList // Befehl ausf friend class ImplRemoteControl; protected: USHORT nMethodId; - rtl::OString aSmartMethodId; USHORT nParams; comm_USHORT nNr1,nNr2,nNr3,nNr4; comm_ULONG nLNr1; diff --git a/automation/source/testtool/objtest.cxx b/automation/source/testtool/objtest.cxx index efb2294a5549..4f0f5084ad37 100644 --- a/automation/source/testtool/objtest.cxx +++ b/automation/source/testtool/objtest.cxx @@ -3469,11 +3469,9 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) // ULONG nHintUserData = pImpl->pNextReturn->GetParent()->GetUserData(); // pImpl->pNextReturn->GetParent()->SetUserData(0); // if ( nUId == pImpl->pNextReturn->GetParent()->GetULong() ) - // FIXME: HELPID - #if 0 - 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 ); @@ -3483,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 ); @@ -3494,7 +3492,6 @@ BOOL TestToolObj::ReturnResults( SvStream *pIn ) { ADD_ERROR(SbxERR_BAD_ACTION, GEN_RES_STR0(S_RETURNED_VALUE_ID_MISSMATCH) ) } - #endif // pImpl->pNextReturn->GetParent()->SetUserData(nHintUserData); pImpl->pNextReturn = NULL; } diff --git a/automation/util/manually_added_ids.hid b/automation/util/manually_added_ids.hid old mode 100755 new mode 100644 -- cgit From 466bacc3ad07d88c8d947e4f745d9e8f3cdbed89 Mon Sep 17 00:00:00 2001 From: Gregor Hartmann Date: Fri, 27 Aug 2010 14:05:36 +0200 Subject: testtool: fix libsts to work with old testtool --- basic/inc/basic/ttstrhlp.hxx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/basic/inc/basic/ttstrhlp.hxx b/basic/inc/basic/ttstrhlp.hxx index 1827d013c492..06f4939d61c0 100644 --- a/basic/inc/basic/ttstrhlp.hxx +++ b/basic/inc/basic/ttstrhlp.hxx @@ -31,6 +31,8 @@ #define CByteString( constAsciiStr ) ByteString( RTL_CONSTASCII_STRINGPARAM ( constAsciiStr ) ) #define CUniString( constAsciiStr ) UniString( RTL_CONSTASCII_USTRINGPARAM ( constAsciiStr ) ) +#define Str2Id( Str ) rtl::OUStringToOString( Str, RTL_TEXTENCODING_ASCII_US ) +#define Id2Str( Id ) String( rtl::OStringToOUString( Id, RTL_TEXTENCODING_ASCII_US ) ) #define StartKenn CUniString("%") #define EndKenn CUniString("%") @@ -42,7 +44,7 @@ #define TabKenn ( StartKenn.AppendAscii("Tab") ) #define MakeStringParam(Type,aText) ( Type.AppendAscii("=").Append( aText ).Append( EndKenn ) ) #define MakeStringNumber(Type,nNumber) MakeStringParam (Type, UniString::CreateFromInt32(nNumber)) -#define UIdString(aID) MakeStringParam(UIdKenn,aID.GetText()) +#define UIdString(aID) MakeStringParam(UIdKenn,String(rtl::OStringToOUString( aID, RTL_TEXTENCODING_ASCII_US ))) #define MethodString(nNumber) MakeStringNumber(MethodKenn,nNumber) #define TypeString(nNumber) MakeStringNumber(TypeKenn,nNumber) #define SlotString(nNumber) MakeStringNumber(SlotKenn,nNumber) -- cgit From d93f1af562e459899b1c2e41405069d0240644d4 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 9 Sep 2010 13:11:38 +0200 Subject: automationdev300m87: #i112208# - Implemented fuction to work with a local copy of a file which resides anywhere else in the filesystem. The file is then copied to the users work directory and opened from there. This is experimental and the function needs to be called explicitly. The function is another workaround for the paramount problem that we cannot reliably switch a readonly document to edit-mode. Used the opportunity to introduce a new global variable (and fix the case of others, as they are not constants as they were initially planned to be) --- testautomation/global/system/includes/gvariabl.inc | 11 ++- .../global/tools/includes/optional/t_filetools.inc | 93 ------------------- .../global/tools/includes/required/t_dir.inc | 40 ++++++++ .../global/tools/includes/required/t_files.inc | 102 ++++++++++++++++++++- 4 files changed, 148 insertions(+), 98 deletions(-) mode change 100755 => 100644 testautomation/global/system/includes/gvariabl.inc mode change 100755 => 100644 testautomation/global/tools/includes/optional/t_filetools.inc mode change 100755 => 100644 testautomation/global/tools/includes/required/t_dir.inc mode change 100755 => 100644 testautomation/global/tools/includes/required/t_files.inc diff --git a/testautomation/global/system/includes/gvariabl.inc b/testautomation/global/system/includes/gvariabl.inc old mode 100755 new mode 100644 index ca3764a1a51b..d9290ebb2c3c --- a/testautomation/global/system/includes/gvariabl.inc +++ b/testautomation/global/system/includes/gvariabl.inc @@ -171,11 +171,14 @@ Global Const GC_MACRO_SECURITY_LEVEL_DEFAULT = 2 '///+ GC_MACRO_SECURITY_LEVEL '///* OOo Improvement Program Global gOOoImprovementIsEnabled as boolean -'///* Performance flags -Global GLOBAL_USE_NEW_SLEEP as boolean ' keep the old sleep() behavior +'///* Performance flags, set to true to eliminate wait/sleep statements, default is FALSE +Global global_use_new_sleep as boolean -'///* If set to TRUE in master.inc many functions become more talkative -Global GVERBOSE as boolean +'///* If set to TRUE many functions become more talkative, default is FALSE +Global gVerbose as boolean + +'///* When using hFileOpenLocally(...) we do not know the filename under which the file has been saved. +Global gLastWorkFile as string sub OnlyForDocuGVariables '///System for the installed Office diff --git a/testautomation/global/tools/includes/optional/t_filetools.inc b/testautomation/global/tools/includes/optional/t_filetools.inc old mode 100755 new mode 100644 index 070427ef3c5b..7189a8e01a43 --- a/testautomation/global/tools/includes/optional/t_filetools.inc +++ b/testautomation/global/tools/includes/optional/t_filetools.inc @@ -260,80 +260,6 @@ end function '******************************************************************************* -function hGetWorkPath() as string - - '///

Retrieve the users work directory

- '///Uses: Call to UNO service
- '///Errorhandling: Fixes "$(user)"-type path (uses fallback)
- '///Errorhandling: Handles broken UNO connection (uses fallback)
- '///Input: - '///
    - '///+
  1. Nothing
    2. - '///
- '///Returns: - '///
    - '///+
  1. Path to local workdir (string)
    2. - '///
      - '///+
    • Includes trailing slash/backslash
      • - '///
    - '///
- '///Description: - '///
    - - dim sPath as string - dim sDefaultPath as string - sDefaultPath = convertpath( gOfficePath & "user/work" ) - dim oOfficeConnect as object - dim oOfficeConfig as object - dim bPathIsFromAPI as boolean - - const CFN = "hGetWorkPath::" - - '///+
  • Create an UNO service and ask it for the location of "Work"
    • - try - oOfficeConnect = hGetUnoService( true ) - oOfficeConfig = oOfficeConnect.createInstance( "com.sun.star.util.PathSettings" ) - sPath = convertFromURL( oOfficeConfig.Work ) - bPathIsFromAPI = true - catch - '///+
  • Handle broken UNO connection
    • - printlog( CFN & "Could not access service, connection broken?" ) - sPath = "" - bPathIsFromAPI = false - endcatch - - '///+
  • If the path differs from the default do a warnlog
    • - if ( sPath <> sDefaultPath ) then - printlog( CFN & "Default path is: " & sDefaultPath ) - printlog( CFN & "Workpath is not defaultpath: " & sPath ) - printlog( CFN & "Overriding UNO path" ) - sPath = convertpath( gOfficePath & "user\work" ) - bPathIsFromAPI = false - endif - - '///+
  • Apply fallback in case of broken connection or invalid path
    • - if ( instr( sPath , "$(user)" ) > 0 ) then - printlog( CFN & "sPath has $(user)-type string, using fallback" ) - sPath = sDefaultPath - bPathIsFromAPI = false - endif - - '///+
  • Add trailing pathseparator, do convertpath
    • - sPath = sPath & "/" - sPath = convertpath( sPath ) - - '///+
  • Print info to the log and return the path
    • - if ( GVERBOSE ) then - if ( bPathIsFromAPI ) then - printlog( CFN & "(From API): " & sPath ) - else - qaerrorlog( CFN & "(Junked API-Path): " & sPath ) - endif - endif - hGetWorkPath() = sPath - '///
- -end function '******************************************************************************* @@ -389,24 +315,5 @@ end function '******************************************************************************* -function hGetWorkFile( cFileName as string ) as string - - '///

Returns a fully qualified filename to a workfile

- '///Input: - '///
    - '///+
  1. Filename without path (string)
    2. - '///
- '///Returns: - '///
    - '///+
  1. Filename including path to user work directory (string)
    2. - '///
- '///Description: - '///
    - - '///+
  • Concatenate workpath and filename, convertpath
    • - hGetWorkFile() = convertpath( hGetWorkPath() & cFileName ) - '///
- -end function diff --git a/testautomation/global/tools/includes/required/t_dir.inc b/testautomation/global/tools/includes/required/t_dir.inc old mode 100755 new mode 100644 index ee673e6b1c47..a7347d4d498d --- a/testautomation/global/tools/includes/required/t_dir.inc +++ b/testautomation/global/tools/includes/required/t_dir.inc @@ -288,4 +288,44 @@ function GetExtention ( Datei as String ) as string next i% GetExtention = Datei end function +' +'------------------------------------------------------------------------------- +' +function hSplitString( sString as string, sSeparator as string, iIndex as integer ) as string + + ' This function wraps around the "split" command and returns one single + ' item by index. Index = 0 means the *LAST* item is returned as this is + ' probably the most commonly used item. If the index is invalid (out of + ' bounds) we print a warning and return an error string. + + const CFN & "global::tools::includes::required::t_dir.inc:hSplitString(): " + const ERROR_MESSAGE = "Array out of bounds for the requested index in string " + const ARRAY_INDEX_CORRECTION = 1 ' The array lower boundary is zero but + ' function starts to count with one. + + ' Split the string into its fragments into an array with dynamic boundaries + dim sArray() as string: sArray() = split( sString, sSeparator ) + dim sReturnString as string + + ' Special case: Index out of bounds + if ( iIndex > ( ubound( sArray ) + ARRAY_INDEX_CORRECTION ) or iIndex < 0 ) then + warnlog( CFN & ERROR_MESSAGE & sString ) + hSplitString() = ERROR_MESSAGE & sString + exit function + endif + + ' Special case: Last item requested (this usually is the filename from a path) + if ( iIndex = 0 ) then + sReturnString = sArray( ubound( sArray() ) + if ( GVERBOSE ) then printlog( CFN & sReturnString ) + hSplitString() = sReturnString + exit function + endif + + ' Default is to return the requested item. + sReturnString = sArray( iIndex - ARRAY_INDEX_CORRECTION ) + if ( GVERBOSE ) then printlog( CFN & sReturnString ) + hSplitString() = sReturnString + +end function diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc old mode 100755 new mode 100644 index 4b0ddd09318b..e58ff1861ae4 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -103,7 +103,7 @@ end function function hIsNamedDocLoaded( cFileName as string ) as boolean ' Retrieve the current filename from the document properties - which in - ' comparision to the old approach to retrive the name from the file save + ' comparision to the old approach to retrieve the name from the file save ' dialog - gives us the file including its extension. So we only need ' to compare the last characters from a full path to be relatively ' certain that we work with the correct file. There is some small margin of @@ -497,6 +497,106 @@ function hDeleteFile( cFileOrig as string ) as boolean hDeleteFile() = true endif +end function +' +'------------------------------------------------------------------------------- +' +function hGetWorkFile( cFileName as string ) as string + hGetWorkFile() = hGetWorkPath() & cFileName +end function +' +'------------------------------------------------------------------------------- +' +function hGetWorkPath() as string + + ' Retrieve the user's work directory using the API (or fallback) + + dim sPath as string + dim oOfficeConnect as object + dim oOfficeConfig as object + dim bPathIsFromAPI as boolean + + const CFN = "global::tools::includes::required::t_files.inc:hGetWorkPath(): " + + ' Create an UNO service and ask it for the location of Work + try + oOfficeConnect = hGetUnoService( true ) + oOfficeConfig = oOfficeConnect.createInstance( "com.sun.star.util.PathSettings" ) + sPath = convertFromURL( oOfficeConfig.Work ) + bPathIsFromAPI = true + catch + printlog( CFN & "Could not access service, connection broken?" ) + sPath = convertpath( gOfficePath & "user/work" ) + bPathIsFromAPI = false + endcatch + + if ( GVERBOSE ) then + + printlog( CFN & "Path is: " & sPath ) + + ' Check path existence + if ( FileExists( sPath ) ) then + printlog( CFN & "Path exists." ) + else + warnlog( CFN & "Path does not exist." ) + endif + + ' Inform about the location from where the path was taken + if ( bPathIsFromAPI ) then + printlog( CFN & "Path was taken from API" ) + else + warnlog( CFN & "Path was taken from (hardcoded) fallback" ) + endif + + endif + + hGetWorkPath() = sPath & getPathSeparator + +end function +' +'------------------------------------------------------------------------------- +' +function hFileOpenLocally( _sSourcePath as string ) as boolean + + const CFN = "global::tools::includes::required::t_files.inc:hFileOpenLocally(): " + + GVERBOSE = true + + dim sSourcePath as string : sSourcePath = ConvertToURL( _sSourcePath ) + dim sTargetPath as string + dim sTargetFile as string + + ' If the source file does not exist we quit + if ( not FileExists( sSourcePath ) then + warnlog( CFN & "Source path/file does not exist: " & sSourcePath ) + hFileOpenLocally() = false + exit function + endif + + ' Find out what the name of the target file is going to be + sTargetFile = hSplitString( sSourcePath, "/", 0 ) + sTargetPath = hGetWorkFile( sTargetFile ) + + if ( FileExists( sTargetPath ) ) then + warnlog( CFN & "Target file already exists, replacing it!" ) + hFileDelete( sTargetPath ) + endif + + if ( GVERBOSE ) then + printlog( CFN & "Copying file" ) + printlog( CFN & "From: " & sSourcePath ) + printlog( CFN & "To..: " & sTargetPath ) + endif + + FileCopy( sSourcePath, sTargetPath ) + + ' This is a hook that allows to access the filename under which the file + ' has been saved. Due to restrictive coding guidelines we cannot return + ' the new filename. + gLastWorkFile = sTargetPath + + hFileOpenLocally() = hFileOpen( gLastWorkFile ) + end function ' '------------------------------------------------------------------------------- -- cgit From 5f16ce3e8bc1c757256904234fb88ca80e2ed308 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 9 Sep 2010 14:30:45 +0200 Subject: automationdev300m87: #i112208# - Change one single call of hFileOpen() to hFileOpenLocally() for testing purpose --- testautomation/writer/required/includes/w_001_.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 testautomation/writer/required/includes/w_001_.inc diff --git a/testautomation/writer/required/includes/w_001_.inc b/testautomation/writer/required/includes/w_001_.inc old mode 100755 new mode 100644 index 8cd43ccbcbae..fa07a188a07f --- a/testautomation/writer/required/includes/w_001_.inc +++ b/testautomation/writer/required/includes/w_001_.inc @@ -773,9 +773,9 @@ testcase tFileSaveAsExport Call hNewDocument PrintLog "Open document '..\writer\required\input\st1_1.sxw" - Call hFileOpen(xExport) + Call hFileOpenLocally(xExport) - Call sMakeReadOnlyDocumentEditable + 'Call sMakeReadOnlyDocumentEditable PrintLog "Select Save as .. and choose 'Microsoft Word 97/2000/XP' as export-filter" xExportFile = gOfficepath + "user\work\ecksport.doc" -- cgit From b2b84b6cebb9166e3ea9835bdcd0e44fb9726cc3 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 9 Sep 2010 14:40:53 +0200 Subject: automationdev300m87: #i112208# - Added more comments to ease understanding the purpose of the function, removed unnecessary exit function statements --- testautomation/global/tools/includes/required/t_files.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index e58ff1861ae4..23e520f57c16 100644 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -34,7 +34,6 @@ function hGrafikEinfuegen( cFile as string ) as Boolean hGrafikEinfuegen() = hInsertGraphic( cFile, "Static" ) - exit function end function @@ -43,7 +42,6 @@ end function function hGrafikVerknuepftEinfuegen( cFile as string ) as Boolean hGrafikVerknuepftEinfuegen() = hInsertGraphic( cFile, "Linked" ) - exit function end function @@ -556,13 +554,12 @@ end function ' '------------------------------------------------------------------------------- ' -function hFileOpenLocally( _sSourcePath as string ) as boolean +function hFileOpenLocally( byVal sSourcePath as string ) as boolean const CFN = "global::tools::includes::required::t_files.inc:hFileOpenLocally(): " GVERBOSE = true - dim sSourcePath as string : sSourcePath = ConvertToURL( _sSourcePath ) dim sTargetPath as string dim sTargetFile as string @@ -588,6 +585,7 @@ function hFileOpenLocally( _sSourcePath as string ) as boolean printlog( CFN & "To..: " & sTargetPath ) endif + ' Copy the file from anywhere to the local user directory FileCopy( sSourcePath, sTargetPath ) ' This is a hook that allows to access the filename under which the file @@ -595,6 +593,8 @@ function hFileOpenLocally( _sSourcePath as string ) as boolean ' the new filename. gLastWorkFile = sTargetPath + ' Finally open the file from the local work directory. It should open + ' ready for editing hFileOpenLocally() = hFileOpen( gLastWorkFile ) end function -- cgit From faba6731e6f8d0ec5c0eebf555be2ff2286ebc78 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 9 Sep 2010 15:03:28 +0200 Subject: automationdev300m87: #i112208# - Fix two fatal typos --- testautomation/global/tools/includes/required/t_dir.inc | 2 +- testautomation/global/tools/includes/required/t_files.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/testautomation/global/tools/includes/required/t_dir.inc b/testautomation/global/tools/includes/required/t_dir.inc index a7347d4d498d..8e4944ad3313 100644 --- a/testautomation/global/tools/includes/required/t_dir.inc +++ b/testautomation/global/tools/includes/required/t_dir.inc @@ -298,7 +298,7 @@ function hSplitString( sString as string, sSeparator as string, iIndex as intege ' probably the most commonly used item. If the index is invalid (out of ' bounds) we print a warning and return an error string. - const CFN & "global::tools::includes::required::t_dir.inc:hSplitString(): " + const CFN = "global::tools::includes::required::t_dir.inc:hSplitString(): " const ERROR_MESSAGE = "Array out of bounds for the requested index in string " const ARRAY_INDEX_CORRECTION = 1 ' The array lower boundary is zero but ' function starts to count with one. diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index 23e520f57c16..46ff47bfdf1c 100644 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -564,7 +564,7 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean dim sTargetFile as string ' If the source file does not exist we quit - if ( not FileExists( sSourcePath ) then + if ( not FileExists( sSourcePath ) ) then warnlog( CFN & "Source path/file does not exist: " & sSourcePath ) hFileOpenLocally() = false exit function -- cgit From 152b4ab06a6cb6f106b58acb24755411eb1c94f8 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 9 Sep 2010 15:16:59 +0200 Subject: automationdev300m87: #i112208# - Test some more functions in w_007_.inc --- testautomation/writer/required/includes/w_007_.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) mode change 100755 => 100644 testautomation/writer/required/includes/w_007_.inc diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc old mode 100755 new mode 100644 index 94fa0d70f9f9..8f6e3f28d398 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -84,8 +84,8 @@ testcase tToolsSpellcheck Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer." goto endsub end if - hFileOpen ( TheFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( TheFile ) + 'Call sMakeReadOnlyDocumentEditable printlog " Insert some faulty text" select case iSprache @@ -246,8 +246,8 @@ testcase tToolsThesaurus Warnlog "Found no Document for the language you're testing in, Please inform the Test-Developer." goto endsub end if - call hFileOpen( TheFile ) - Call sMakeReadOnlyDocumentEditable + call hFileOpenLocally( TheFile ) + 'Call sMakeReadOnlyDocumentEditable printlog " Insert some faulty text" select case iSprache @@ -337,7 +337,7 @@ testcase tToolsHyphenation Select Case gApplication Case "WRITER" - hFileOpen( DieDatei ) + hFileOpenLocally( DieDatei ) Case "MASTERDOCUMENT" if wInsertDocumentinMasterDoc(DieDatei) = False then @@ -354,7 +354,7 @@ testcase tToolsHyphenation goto endsub end select - Call sMakeReadOnlyDocumentEditable + 'Call sMakeReadOnlyDocumentEditable printlog " Insert file 'writer\required\input\linguistik\0 + [OfficeLanguage] + '.odt'" Sleep 1 Call wTypeKeys ("") @@ -986,8 +986,8 @@ testcase tToolsHangulHanjaConversion bAsianLanguage = ActiveDeactivateAsianSupport(TRUE) printlog " Open the test file" - hFileOpen (sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally(sTestFile) + 'Call sMakeReadOnlyDocumentEditable Call wTypeKeys("") printlog " Tools / HangulHanjaConversion" @@ -1126,8 +1126,8 @@ testcase tHtmlDocToolsHangulHanjaConversion bAsianLanguage = ActiveDeactivateAsianSupport(TRUE) printlog " Open the test file" - hFileOpen (sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally(sTestFile) + 'Call sMakeReadOnlyDocumentEditable Call wTypeKeys("") printlog " Tools / HangulHanjaConversion" -- cgit From fae5b1f735a55183fddc4cad1278d15583730645 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 9 Sep 2010 15:46:24 +0200 Subject: automationdev300m87: #i112208# - Maximize verbosity, for some reason the split-function fails --- testautomation/global/tools/includes/required/t_dir.inc | 17 ++++++++++++++--- .../global/tools/includes/required/t_files.inc | 4 ++-- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/testautomation/global/tools/includes/required/t_dir.inc b/testautomation/global/tools/includes/required/t_dir.inc index 8e4944ad3313..f5aa59e2d78b 100644 --- a/testautomation/global/tools/includes/required/t_dir.inc +++ b/testautomation/global/tools/includes/required/t_dir.inc @@ -304,11 +304,22 @@ function hSplitString( sString as string, sSeparator as string, iIndex as intege ' function starts to count with one. ' Split the string into its fragments into an array with dynamic boundaries - dim sArray() as string: sArray() = split( sString, sSeparator ) - dim sReturnString as string + dim sArray() as string + dim sReturnString as string : sReturnString = "" + + if ( GVERBOSE ) then + printlog( CFN & "Separator is: " & sSeparator ) + printlog( CFN & "Original string is: " & sString ) + endif + + sArray() = split( sString, sSeparator ) + + if ( GVERBOSE ) then + printlog( CFN & "Number of items found: " & ubound( sArray() ) ) + endif ' Special case: Index out of bounds - if ( iIndex > ( ubound( sArray ) + ARRAY_INDEX_CORRECTION ) or iIndex < 0 ) then + if ( iIndex > ( ubound( sArray() ) + ARRAY_INDEX_CORRECTION ) or iIndex < 0 ) then warnlog( CFN & ERROR_MESSAGE & sString ) hSplitString() = ERROR_MESSAGE & sString exit function diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index 46ff47bfdf1c..b0dadeb34ed7 100644 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -509,7 +509,7 @@ function hGetWorkPath() as string ' Retrieve the user's work directory using the API (or fallback) - dim sPath as string + dim sPath as string : sPath = "" dim oOfficeConnect as object dim oOfficeConfig as object dim bPathIsFromAPI as boolean @@ -571,7 +571,7 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean endif ' Find out what the name of the target file is going to be - sTargetFile = hSplitString( sSourcePath, "/", 0 ) + sTargetFile = hSplitString( sSourcePath, getPathSeparator, 0 ) sTargetPath = hGetWorkFile( sTargetFile ) if ( FileExists( sTargetPath ) ) then -- cgit From 267febb8e0a386a746b8095330394ed6986decfb Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 9 Sep 2010 15:56:51 +0200 Subject: automationdev300m87: #i112208# - Make Warnlog to a QAErrorLog for overwriting files --- testautomation/global/tools/includes/required/t_files.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index b0dadeb34ed7..5f9be07c6c96 100644 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -575,7 +575,7 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean sTargetPath = hGetWorkFile( sTargetFile ) if ( FileExists( sTargetPath ) ) then - warnlog( CFN & "Target file already exists, replacing it!" ) + qaerrorlog( CFN & "Target file already exists, replacing it!" ) hFileDelete( sTargetPath ) endif -- cgit From 1e780cc87b4ee0a96a815358019b9e7b74c798f5 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Fri, 10 Sep 2010 14:16:21 +0200 Subject: automationdev300m87: #i112208# - As discussed on IRC we reuse an already existing file instead of deleting/copying it anew. Saves time but also carries a certain but low risk. --- .../global/tools/includes/required/t_files.inc | 34 ++++++++++++++-------- 1 file changed, 22 insertions(+), 12 deletions(-) diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index 5f9be07c6c96..fcdbe5f39c99 100644 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -556,9 +556,19 @@ end function ' function hFileOpenLocally( byVal sSourcePath as string ) as boolean - const CFN = "global::tools::includes::required::t_files.inc:hFileOpenLocally(): " + ' Issue #i112208# - implement a function that copies a file from testautomation + ' into the local work directory to avoid that the document gets opened + ' in read-only mode. See details of the implementation in the issue + ' description. + + ' Parameters + ' 1) Path as string, URLs are untested + ' 2) Separator, usually "getPathSeparator" + ' 3) Item number, 0 = last item which usually is the file name from a path. + ' Begin counting with 1, while the function internally accesses item 0 + ' from the array. - GVERBOSE = true + const CFN = "global::tools::includes::required::t_files.inc:hFileOpenLocally(): " dim sTargetPath as string dim sTargetFile as string @@ -574,19 +584,19 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean sTargetFile = hSplitString( sSourcePath, getPathSeparator, 0 ) sTargetPath = hGetWorkFile( sTargetFile ) + ' Copy the file from anywhere to the local user directory if it does not + ' exist. This behavior was discussed on IRC if ( FileExists( sTargetPath ) ) then - qaerrorlog( CFN & "Target file already exists, replacing it!" ) - hFileDelete( sTargetPath ) - endif - - if ( GVERBOSE ) then - printlog( CFN & "Copying file" ) - printlog( CFN & "From: " & sSourcePath ) - printlog( CFN & "To..: " & sTargetPath ) + printlog( CFN & "Re-using existing local copy of workfile" ) + else + if ( GVERBOSE ) then + printlog( CFN & "Copying file" ) + printlog( CFN & "From: " & sSourcePath ) + printlog( CFN & "To..: " & sTargetPath ) + endif + FileCopy( sSourcePath, sTargetPath ) endif - ' Copy the file from anywhere to the local user directory - FileCopy( sSourcePath, sTargetPath ) ' This is a hook that allows to access the filename under which the file ' has been saved. Due to restrictive coding guidelines we cannot return -- cgit From ae4f862150a0e65096908778b7e21d745d5d0a09 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Fri, 10 Sep 2010 14:19:14 +0200 Subject: automationdev300m87: #i112208# - Polished some comments and added usage information at the top of the function. --- testautomation/global/tools/includes/required/t_files.inc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index fcdbe5f39c99..ef8df3f31312 100644 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -581,8 +581,8 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean endif ' Find out what the name of the target file is going to be - sTargetFile = hSplitString( sSourcePath, getPathSeparator, 0 ) - sTargetPath = hGetWorkFile( sTargetFile ) + sTargetFile = hSplitString( sSourcePath, getPathSeparator, 0 ) ' The file + sTargetPath = hGetWorkFile( sTargetFile ) ' The path + file ' Copy the file from anywhere to the local user directory if it does not ' exist. This behavior was discussed on IRC @@ -597,7 +597,6 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean FileCopy( sSourcePath, sTargetPath ) endif - ' This is a hook that allows to access the filename under which the file ' has been saved. Due to restrictive coding guidelines we cannot return ' the new filename. -- cgit From fda546871f70bab4f351bd0c912bfdb454366763 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 13 Sep 2010 08:09:47 +0200 Subject: automationdev300m87: #i112208# - Changed all sMakeReadOnlyDocumentEditable() statements to hFileOpenLocally() in Spreadsheet update tests --- .../required/includes/c_upd_datamenu.inc | 12 ++++----- .../required/includes/c_upd_editmenu2.inc | 6 ++--- .../required/includes/c_upd_formatmenu2.inc | 12 ++++----- .../required/includes/c_upd_formatmenu3.inc | 26 +++++++++---------- .../required/includes/c_upd_toolsmenu.inc | 29 +++++----------------- 5 files changed, 34 insertions(+), 51 deletions(-) mode change 100755 => 100644 testautomation/spreadsheet/required/includes/c_upd_datamenu.inc mode change 100755 => 100644 testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc mode change 100755 => 100644 testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc mode change 100755 => 100644 testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc mode change 100755 => 100644 testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc diff --git a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc old mode 100755 new mode 100644 index 2975a7b1c9e2..40c42d849d34 --- a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc @@ -885,10 +885,10 @@ testcase tDataDataPilot '/// Open testdocument 'gTesttoolPath + spreadsheet\required\input\datapilot.ods' printlog " Open testdocument 'gTesttoolPath + spreadsheet\required\input\datapilot.ods'" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\datapilot.ods" )) + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\datapilot.ods" ) '/// If the file is not editable, click the edit button on standardbar - printlog " If the file is not editable, click the edit button on standardbar" - Call sMakeReadOnlyDocumentEditable + 'printlog " If the file is not editable, click the edit button on standardbar" + 'Call sMakeReadOnlyDocumentEditable '/// Select cell C34 printlog " Select cell C34" Call fCalcSelectRange ( "C34" ) @@ -1030,10 +1030,10 @@ testcase tDataRefreshRange '/// Load testdocument Database_Refresh printlog " Load testdocument Database_Refresh" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\Database_Refresh.ods" )) + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\Database_Refresh.ods" ) '/// If the file is not editable, click the edit button on standardbar - printlog " If the file is not editable, click the edit button on standardbar" - Call sMakeReadOnlyDocumentEditable + 'printlog " If the file is not editable, click the edit button on standardbar" + 'Call sMakeReadOnlyDocumentEditable '/// Refresh Database by 'Data – Refresh Range' printlog " Refresh Database by 'Data – Refresh Range'" DataRefreshRange diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc old mode 100755 new mode 100644 index fed4fd764f17..361b4ba1c132 --- a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc @@ -638,10 +638,10 @@ testcase tEditObjectEdit '/// Load testdocument 'spreadsheet/required/input/tEditObject.ods' printlog " Load testdocument 'spreadsheet/required/input/tEditObject.ods'" - Call hFileOpen ( ConvertPath ( gTesttoolPath + "spreadsheet\required\input\tEditObject.ods")) + hFileOpenLocally( gTesttoolPath + "spreadsheet\required\input\tEditObject.ods" ) '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - sMakeReadOnlyDocumentEditable() + 'printlog "If the file is not editable, click the edit button on standardbar" + 'sMakeReadOnlyDocumentEditable() '/// Select OLE-object printlog " Select OLE-object" fselectFirstOLE diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc old mode 100755 new mode 100644 index 6ec04a89c260..52a228d58a52 --- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc @@ -635,10 +635,10 @@ testcase tFormatAlignment '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + 'printlog "If the file is not editable, click the edit button on standardbar" + 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -747,10 +747,10 @@ testcase tFormatGroup '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + 'printlog "If the file is not editable, click the edit button on standardbar" + 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc old mode 100755 new mode 100644 index 08ea0cd1a3af..d898f30d03e6 --- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc @@ -58,10 +58,10 @@ testcase tFormatGraphicPositionAndSize '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) + hFileOpenLocally( gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" ) '/// If the file is not editable, click the edit button on standardbar printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -144,10 +144,10 @@ testcase tFormatGraphicLine '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + 'printlog "If the file is not editable, click the edit button on standardbar" + 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -384,10 +384,10 @@ testcase tFormatGraphicArea '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + 'printlog "If the file is not editable, click the edit button on standardbar" + 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -929,10 +929,10 @@ testcase tFormatGraphicText '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) '/// If the file is not editable, click the edit button on standardbar printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -1048,10 +1048,10 @@ testcase tFormatGraphicPoints '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" )) + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + 'printlog "If the file is not editable, click the edit button on standardbar" + 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc old mode 100755 new mode 100644 index 9efc84907b78..2696bbb86624 --- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc @@ -29,23 +29,6 @@ '* '* short description : Resource Test - Tools Menu Part I '* -'************************************************************************ -'* -' #1 tToolsSpellcheck -' #1 tToolsHangulHanjaConversion -' #1 tToolsLanguageChineseTranslation -' #1 tToolsLanguageThesaurus -' #1 tToolsLanguageHyphenation -' #1 tToolsDetective -' #1 tToolsAutoCorrect -' #1 tToolsGoalSeek -' #1 tToolsScenario -' #1 tToolsProtectSheet -' #1 tToolsProtectDocument -' #1 tToolsCellContents -' #1 tToolsGallery -' #1 tToolsMediaPlayer -'* '\*********************************************************************** sub c_upd_toolsmenu @@ -77,10 +60,10 @@ testcase tToolsSpellcheck Dim iDictionaries as integer printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\english.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\english.ods" )) + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\english.ods" ) '/// If the file is not editable, click the edit button on standardbar printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + 'call sMakeReadOnlyDocumentEditable '/// Enter 'fgsdftk' in a cell printlog " Enter 'fgsdftk' in a cell" Kontext "DocumentCalc" @@ -228,10 +211,10 @@ testcase tToolsHangulHanjaConversion bCTLLanguage = ActiveDeactivateCTLSupport(TRUE) '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\korean.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\korean.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\korean.ods" )) + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\korean.ods" ) '/// If the file is not editable, click the edit button on standardbar printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + 'call sMakeReadOnlyDocumentEditable '/// Select cell B1 printlog " Select cell B1" Call fCalcSelectRange ("B1") @@ -392,9 +375,9 @@ testcase tToolsLanguageThesaurus '///Tools – Language – Chinese Translation printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\english.ods" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\required\input\english.ods" )) + hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\english.ods" ) printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + 'call sMakeReadOnlyDocumentEditable Kontext "DocumentCalc" printlog " Enter 'test' in a cell" Call fCalcSelectRange ("B2") -- cgit From 17c7ecaf73182ad6f9aecff5f34d2ee87fe54aad Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 13 Sep 2010 08:49:31 +0200 Subject: automationdev300m87: #i112208# - Eliminate sMakeReadonlyDocumentEditable() calls for spreadsheet tools --- testautomation/spreadsheet/tools/includes/c_l10n_tools.inc | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) mode change 100755 => 100644 testautomation/spreadsheet/tools/includes/c_l10n_tools.inc diff --git a/testautomation/spreadsheet/tools/includes/c_l10n_tools.inc b/testautomation/spreadsheet/tools/includes/c_l10n_tools.inc old mode 100755 new mode 100644 index 382e48f94f86..ff4c508d6c4d --- a/testautomation/spreadsheet/tools/includes/c_l10n_tools.inc +++ b/testautomation/spreadsheet/tools/includes/c_l10n_tools.inc @@ -50,13 +50,11 @@ function fFunctionname ( sFunctionname_en as string ) as string use "global/tools/includes/required/t_doc2.inc" const CFN = "qa:qatesttool:spreadsheet:tools:includes:c_l10n_tools.in:fFunctionname " - sloaddocument = Convertpath (gTesttoolPath + "spreadsheet\tools\input\Functionnames.ods" ) + sloaddocument = gTesttoolPath & "spreadsheet\tools\input\Functionnames.ods" '///Load document with all functions gTestToolPath/spreadsheet/tools/input/Functionnames.ods - call hFileOpen ( sloaddocument ) + hFileOpenLocally( sloaddocument ) sleep (2) - '///Make sure that the file is editable - call sMakeReadOnlyDocumentEditable() '///Setting selection to A1 to avoid messagebox in Search and Replace dialog. call fCalcSelectRange ("A1") @@ -145,13 +143,10 @@ function fError_l10n ( sError_en as string ) as string use "global/tools/includes/required/t_doc2.inc" const CFN = "qa:qatesttool:spreadsheet:tools:includes:c_l10n_tools.in:fError_l10n " - sloaddocument = Convertpath (gTesttoolPath + "spreadsheet\tools\input\Errorcodes.ods" ) + sloaddocument = gTesttoolPath & "spreadsheet\tools\input\Errorcodes.ods" '///Load document with all errorcodes gTestToolPath/spreadsheet/tools/input/Errorcodes.ods - call hFileOpen ( sloaddocument ) - sleep (2) - '///Make sure that the file is editable - call sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sloaddocument ) '///Setting selection to A1 to avoid messagebox in Search and Replace dialog. call fCalcSelectRange ("A1") -- cgit From 021530e4ada218b2cf43cc0f2c11107ab06724f4 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 13 Sep 2010 08:55:03 +0200 Subject: automationdev300m87: #i112208# - Eliminate sMakeReadonlyDocumentEditable() calls for all remaining areas in module spreadsheet --- .../optional/includes/arrayconstants/c_arrayconstants.inc | 6 +----- .../optional/includes/getpivotdata/c_getpivotdata.inc | 12 ++---------- .../spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc | 6 ++---- .../spreadsheet/optional/includes/solver/c_solver.inc | 8 ++------ .../spreadsheet/required/includes/c_upd_datamenu.inc | 6 ------ .../spreadsheet/required/includes/c_upd_editmenu2.inc | 3 --- .../spreadsheet/required/includes/c_upd_formatmenu2.inc | 6 ------ .../spreadsheet/required/includes/c_upd_formatmenu3.inc | 10 +--------- .../spreadsheet/required/includes/c_upd_toolsmenu.inc | 6 ------ 9 files changed, 8 insertions(+), 55 deletions(-) mode change 100755 => 100644 testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc mode change 100755 => 100644 testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc diff --git a/testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc b/testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc old mode 100755 new mode 100644 index ce5652c0ff1e..62057f32c798 --- a/testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc +++ b/testautomation/spreadsheet/optional/includes/arrayconstants/c_arrayconstants.inc @@ -224,11 +224,7 @@ testcase tArrayconstants02 '///Load xls testdocument gTestToolPath/spreadsheet/optional/input/arrayconstants.xls printlog "Load xls testdocument gTestToolPath/spreadsheet/optional/input/arrayconstants.xls" - call hFileOpen ( sImportFile ) - sleep(2) - '///If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + call hFileOpenLocally( sImportFile ) '///Check that the cell contents of B4 is 1 printlog "Check that the cell contents of B4 is 1" diff --git a/testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc b/testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc old mode 100755 new mode 100644 index 216551959ded..e5f5e406ce60 --- a/testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc +++ b/testautomation/spreadsheet/optional/includes/getpivotdata/c_getpivotdata.inc @@ -54,11 +54,7 @@ testcase tgetpivotdata_function_wizard '/// Load testdocument gTestToolPath/spreadsheet/optional/input/datapilot.ods printlog "Load testdocument datapilot.ods" - call hFileOpen ( stestdocument ) - sleep (2) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - sMakeReadOnlyDocumentEditable() + call hFileOpenLocally( stestdocument ) '/// Select cell I8 and open function wizard by INSERT FUNCTION printlog "Select cell I8 and open function wizard by INSERT FUNCTION" @@ -187,11 +183,7 @@ testcase tgetpivotdata_xls_filter '/// Load testdocument gTestToolPath/spreadsheet/optional/input/getpivotdata2.xls printlog "Load testdocument getpivotdata2.xls" - call hFileOpen ( stestdocument ) - sleep (2) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - call sMakeReadOnlyDocumentEditable + call hFileOpenLocally( stestdocument ) '/// Verify that Cell G12 shows 2.5 printlog "Verify that Cell G12 shows 2" & sdecimalseperator & "5" call fCalcCompareCellValue ("G12","2" & sdecimalseperator & "5") diff --git a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc index 186fe00ae9e4..2514945a6d42 100644 --- a/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc +++ b/testautomation/spreadsheet/optional/includes/so7pp1/c_so7_pp1_ibis.inc @@ -44,8 +44,7 @@ testcase tIBIS111099 Printlog "Copy testdocument locally" app.FileCopy convertpath(gTesttoolpath & "spreadsheet\optional\input\111099.xls"),gOfficePath + ConvertPath("user/work/111099.xls") printlog " Open the test document" - Call hFileOpen(testdoc) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally(testdoc) '/// Invoke Control Toolbar '///+ Try to click control 'Push Button' '///+>
  • Click successful - BUG #111099#
    • @@ -76,8 +75,7 @@ testcase tIBIS111158 Printlog "Copy testdocument locally" app.FileCopy convertpath(gTesttoolpath & "spreadsheet\optional\input\111158.xls"),gOfficePath + ConvertPath("user/work/111158.xls") printlog " Open the test document" - Call hFileOpen(testdoc) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally(testdoc) Kontext "Standardbar" '/// If 'Form Controls' toolbar is not visible: View / Toolbars / Form Controls Call hToolbarSelect("CONTROLS", true) diff --git a/testautomation/spreadsheet/optional/includes/solver/c_solver.inc b/testautomation/spreadsheet/optional/includes/solver/c_solver.inc index ba0e77d155be..74db821e9275 100644 --- a/testautomation/spreadsheet/optional/includes/solver/c_solver.inc +++ b/testautomation/spreadsheet/optional/includes/solver/c_solver.inc @@ -43,9 +43,7 @@ testcase tExampleCalculation sDecimalseperator = GetDecimalSeperator printlog " Open testdocument 'gTesttoolPath + spreadsheet\optional\input\Solver_testdoc01.ods'" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\optional\input\Solver_testdoc01.ods" )) - printlog " If the file is not editable, click the edit button on standardbar" - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\optional\input\Solver_testdoc01.ods" ) printlog " Tools - Solver" ToolsSolver Kontext "Solver" @@ -148,9 +146,7 @@ endcase testcase tExampleCalculation2 printlog " Open testdocument 'gTesttoolPath + spreadsheet\optional\input\stest_large.ods'" - Call hFileOpen (Convertpath (gTesttoolPath + "spreadsheet\optional\input\stest_large.ods" )) - printlog " If the file is not editable, click the edit button on standardbar" - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath & "spreadsheet\optional\input\stest_large.ods" ) printlog " Tools - Solver" ToolsSolver Kontext "Solver" diff --git a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc index 40c42d849d34..2c77baeea56d 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_datamenu.inc @@ -886,9 +886,6 @@ testcase tDataDataPilot '/// Open testdocument 'gTesttoolPath + spreadsheet\required\input\datapilot.ods' printlog " Open testdocument 'gTesttoolPath + spreadsheet\required\input\datapilot.ods'" hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\datapilot.ods" ) - '/// If the file is not editable, click the edit button on standardbar - 'printlog " If the file is not editable, click the edit button on standardbar" - 'Call sMakeReadOnlyDocumentEditable '/// Select cell C34 printlog " Select cell C34" Call fCalcSelectRange ( "C34" ) @@ -1031,9 +1028,6 @@ testcase tDataRefreshRange '/// Load testdocument Database_Refresh printlog " Load testdocument Database_Refresh" hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\Database_Refresh.ods" ) - '/// If the file is not editable, click the edit button on standardbar - 'printlog " If the file is not editable, click the edit button on standardbar" - 'Call sMakeReadOnlyDocumentEditable '/// Refresh Database by 'Data – Refresh Range' printlog " Refresh Database by 'Data – Refresh Range'" DataRefreshRange diff --git a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc index 361b4ba1c132..a67502448d9a 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_editmenu2.inc @@ -639,9 +639,6 @@ testcase tEditObjectEdit '/// Load testdocument 'spreadsheet/required/input/tEditObject.ods' printlog " Load testdocument 'spreadsheet/required/input/tEditObject.ods'" hFileOpenLocally( gTesttoolPath + "spreadsheet\required\input\tEditObject.ods" ) - '/// If the file is not editable, click the edit button on standardbar - 'printlog "If the file is not editable, click the edit button on standardbar" - 'sMakeReadOnlyDocumentEditable() '/// Select OLE-object printlog " Select OLE-object" fselectFirstOLE diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc index 52a228d58a52..d405237fe4a7 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu2.inc @@ -636,9 +636,6 @@ testcase tFormatAlignment '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) - '/// If the file is not editable, click the edit button on standardbar - 'printlog "If the file is not editable, click the edit button on standardbar" - 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -748,9 +745,6 @@ testcase tFormatGroup '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) - '/// If the file is not editable, click the edit button on standardbar - 'printlog "If the file is not editable, click the edit button on standardbar" - 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc index d898f30d03e6..c77f2d75b6df 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc @@ -59,9 +59,6 @@ testcase tFormatGraphicPositionAndSize '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" hFileOpenLocally( gTesttoolPath + "spreadsheet\required\input\twoobjects.ods" ) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -145,9 +142,7 @@ testcase tFormatGraphicLine '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) - '/// If the file is not editable, click the edit button on standardbar - 'printlog "If the file is not editable, click the edit button on standardbar" - 'call sMakeReadOnlyDocumentEditable + '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -385,9 +380,6 @@ testcase tFormatGraphicArea '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) - '/// If the file is not editable, click the edit button on standardbar - 'printlog "If the file is not editable, click the edit button on standardbar" - 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc index 2696bbb86624..3b34e695cf3d 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc @@ -61,9 +61,6 @@ testcase tToolsSpellcheck printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\english.ods" hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\english.ods" ) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - 'call sMakeReadOnlyDocumentEditable '/// Enter 'fgsdftk' in a cell printlog " Enter 'fgsdftk' in a cell" Kontext "DocumentCalc" @@ -212,9 +209,6 @@ testcase tToolsHangulHanjaConversion '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\korean.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\korean.ods" hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\korean.ods" ) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - 'call sMakeReadOnlyDocumentEditable '/// Select cell B1 printlog " Select cell B1" Call fCalcSelectRange ("B1") -- cgit From cfd900a204fa167cbb7a24d6998619c59c30c589 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 13 Sep 2010 09:31:31 +0200 Subject: automationdev300m87: #i112208# - Eliminate sMakeReadonlyDocumentEditable() calls for module framework --- .../optional/includes/CJK_CollationDialogue_1.inc | 10 ++++------ .../framework/optional/includes/w_grid_layout1.inc | 21 ++++++--------------- testautomation/writer/required/includes/w_001_.inc | 2 -- testautomation/writer/required/includes/w_007_.inc | 5 ----- 4 files changed, 10 insertions(+), 28 deletions(-) mode change 100755 => 100644 testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc diff --git a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc old mode 100755 new mode 100644 index aaefdcd5bafb..18f0f0de1d2f --- a/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc +++ b/testautomation/framework/optional/includes/CJK_CollationDialogue_1.inc @@ -527,9 +527,8 @@ testcase tStrokeSort Call hNewDocument '/// Open a test file and check No Grid checkbox - Call hFileOpen ( gTesttoolPath + "framework\optional\input\CJK\" + testFile ) - sMakeReadOnlyDocumentEditable - EditSelectAll + hFileOpenLocally( gTesttoolPath + "framework\optional\input\CJK\" + testFile ) + hUseAsyncSlot( "EditSelectAll" ) '/// Open Tools/Sort ToolsSort @@ -617,9 +616,8 @@ testcase tPinyinSort Call hNewDocument '/// Open a test file and check No Grid checkbox - Call hFileOpen ( gTesttoolPath + "framework\optional\input\CJK\" + testFile ) - sMakeReadOnlyDocumentEditable - EditSelectAll + hFileOpenLocally( gTesttoolPath + "framework\optional\input\CJK\" + testFile ) + hUseAsyncSlot( "EditSelectAll" ) '/// Open Tools/Sort ToolsSort diff --git a/testautomation/framework/optional/includes/w_grid_layout1.inc b/testautomation/framework/optional/includes/w_grid_layout1.inc index 16ca31b09fa4..5fa0284a3495 100755 --- a/testautomation/framework/optional/includes/w_grid_layout1.inc +++ b/testautomation/framework/optional/includes/w_grid_layout1.inc @@ -104,8 +104,7 @@ testcase tTextGridDialog_2 Call hNewDocument '/// open a test file , and check No Grid checkbox - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable + Call hFileOpenLocally( gTesttoolPath + SOURCE_PATH + testFile ) hUseAsyncSlot( "FormatPageWriter" ) Kontext @@ -151,8 +150,7 @@ testcase tTextGridDialog_3 '/// open a test file and check Grid(lines onle) checkbox , '/// + set 10 line/page - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable + Call hFileOpenLocally( gTesttoolPath + SOURCE_PATH + testFile ) hUseAsyncSlot( "FormatPageWriter" ) Kontext if active.exists(5) then @@ -198,8 +196,7 @@ testcase tTextGridDialog_4 '/// open a test file and check Grid(lines and characters) checkbox '/// + set 10 line/page and 9 characters/line - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable + Call hFileOpenLocally( gTesttoolPath + SOURCE_PATH + testFile ) hUseAsyncSlot( "FormatPageWriter" ) Kontext if active.exists(5) then @@ -367,8 +364,7 @@ testcase tFontSizeChanges_1 sLinesPerPage = "2" sCharsPerLine = "9" - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + testFile ) - sMakeReadOnlyDocumentEditable + Call hFileOpenLocally( gTesttoolPath + SOURCE_PATH + testFile ) Kontext "DocumentWriter" Call DocumentWriter.TypeKeys "" @@ -433,10 +429,7 @@ testcase tRubyText_1 Call hNewDocument printlog( "Open test file" ) - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + TEST_FILE ) - - printlog( "Remove write protection of document (if set)" ) - Call sMakeReadOnlyDocumentEditable() + hFileOpenLocally( gTesttoolPath + SOURCE_PATH + TEST_FILE ) Kontext "DocumentWriter" printlog( "Mark character to the right of current cursor position" ) @@ -486,9 +479,7 @@ testcase tIndentsTest_1 Call hNewDocument '/// open a test file , and press TAB in second line - Call hFileOpen ( gTesttoolPath + SOURCE_PATH + TEST_FILE ) - - sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + SOURCE_PATH + TEST_FILE ) Kontext "DocumentWriter" Call DocumentWriter.TypeKeys "" diff --git a/testautomation/writer/required/includes/w_001_.inc b/testautomation/writer/required/includes/w_001_.inc index fa07a188a07f..00f7bc4ce77d 100644 --- a/testautomation/writer/required/includes/w_001_.inc +++ b/testautomation/writer/required/includes/w_001_.inc @@ -775,8 +775,6 @@ testcase tFileSaveAsExport PrintLog "Open document '..\writer\required\input\st1_1.sxw" Call hFileOpenLocally(xExport) - 'Call sMakeReadOnlyDocumentEditable - PrintLog "Select Save as .. and choose 'Microsoft Word 97/2000/XP' as export-filter" xExportFile = gOfficepath + "user\work\ecksport.doc" Call hFileSaveAsWithFilterKill (xExportFile, "MS Word 2003 XML") diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index 8f6e3f28d398..e562736b5329 100644 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -85,7 +85,6 @@ testcase tToolsSpellcheck goto endsub end if hFileOpenLocally( TheFile ) - 'Call sMakeReadOnlyDocumentEditable printlog " Insert some faulty text" select case iSprache @@ -247,7 +246,6 @@ testcase tToolsThesaurus goto endsub end if call hFileOpenLocally( TheFile ) - 'Call sMakeReadOnlyDocumentEditable printlog " Insert some faulty text" select case iSprache @@ -354,7 +352,6 @@ testcase tToolsHyphenation goto endsub end select - 'Call sMakeReadOnlyDocumentEditable printlog " Insert file 'writer\required\input\linguistik\0 + [OfficeLanguage] + '.odt'" Sleep 1 Call wTypeKeys ("") @@ -987,7 +984,6 @@ testcase tToolsHangulHanjaConversion printlog " Open the test file" hFileOpenLocally(sTestFile) - 'Call sMakeReadOnlyDocumentEditable Call wTypeKeys("") printlog " Tools / HangulHanjaConversion" @@ -1127,7 +1123,6 @@ testcase tHtmlDocToolsHangulHanjaConversion printlog " Open the test file" hFileOpenLocally(sTestFile) - 'Call sMakeReadOnlyDocumentEditable Call wTypeKeys("") printlog " Tools / HangulHanjaConversion" -- cgit From b7b4868aa5d4247aa436915cf06da40fdf12bc04 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 13 Sep 2010 09:41:36 +0200 Subject: automationdev300m87: #i112208# - Eliminate sMakeReadonlyDocumentEditable() calls in spreadsheet (3 were not fixed in first round) --- testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc | 6 ------ testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc | 2 -- 2 files changed, 8 deletions(-) diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc index c77f2d75b6df..6b305f53a0a3 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu3.inc @@ -922,9 +922,6 @@ testcase tFormatGraphicText '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) - '/// If the file is not editable, click the edit button on standardbar - printlog "If the file is not editable, click the edit button on standardbar" - 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) @@ -1041,9 +1038,6 @@ testcase tFormatGraphicPoints '/// Load document from 'gTesttoolPath + "spreadsheet\required\input\twoobjects.ods"' printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\twoobjects.ods" hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\twoobjects.ods" ) - '/// If the file is not editable, click the edit button on standardbar - 'printlog "If the file is not editable, click the edit button on standardbar" - 'call sMakeReadOnlyDocumentEditable '/// Select first object by Navigator printlog " Select first object by Navigator" Call fNavigatorSelectObject ("drawing objects", 1) diff --git a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc index 3b34e695cf3d..6472e85ee787 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_toolsmenu.inc @@ -370,8 +370,6 @@ testcase tToolsLanguageThesaurus printlog " Load document from 'gTesttoolPath + spreadsheet\required\input\english.ods" hFileOpenLocally( gTesttoolPath & "spreadsheet\required\input\english.ods" ) - printlog "If the file is not editable, click the edit button on standardbar" - 'call sMakeReadOnlyDocumentEditable Kontext "DocumentCalc" printlog " Enter 'test' in a cell" Call fCalcSelectRange ("B2") -- cgit From a09c75aca6bfcc8ff02a3e46ddba3d1a13b7949d Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 13 Sep 2010 09:49:22 +0200 Subject: automationdev300m87: #i112208# - Eliminate sMakeReadonlyDocumentEditable() calls in module chart2 --- .../optional/includes/ch2_flexible_source_range_selection01.inc | 4 +--- testautomation/chart2/tools/ch_tools_common.inc | 8 ++------ 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc index ec2496ecb1f3..071e9146ef78 100644 --- a/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc +++ b/testautomation/chart2/optional/includes/ch2_flexible_source_range_selection01.inc @@ -782,9 +782,7 @@ endcase ' function fOpenWriterTestDocumentAndInsertChart(sInputFile as STRING) as BOOLEAN fOpenWriterTestDocumentAndInsertChart = FALSE - call hFileOpen(sInputFile) - sleep(2) - Call sMakeReadOnlyDocumentEditable() + hFileOpenLocally(sInputFile) '///Menu Insert Object Chart to open chart wizard printlog "Menu Insert Object Chart to open chart wizard" InsertObjectChart diff --git a/testautomation/chart2/tools/ch_tools_common.inc b/testautomation/chart2/tools/ch_tools_common.inc index f6d722fa2a25..ad9f2108f024 100644 --- a/testautomation/chart2/tools/ch_tools_common.inc +++ b/testautomation/chart2/tools/ch_tools_common.inc @@ -162,9 +162,7 @@ end function ' function fOpenTestDocumentAndSelectDataRange(sInputFile as string) as BOOLEAN fOpenTestDocumentAndSelectDataRange = FALSE - call hFileOpen(sInputFile) - sleep(2) - Call sMakeReadOnlyDocumentEditable() + hFileOpenLocally(sInputFile) '/// Select chart using navigator printlog "Select chart using navigator" call fSelectFirstOLE @@ -191,9 +189,7 @@ end function ' function fOpenTestDocumentAndInsertChart(sInputFile as string) as BOOLEAN fOpenTestDocumentAndInsertChart = FALSE - call hFileOpen(sInputFile) - sleep(2) - Call sMakeReadOnlyDocumentEditable() + hFileOpenLocally(sInputFile) Kontext "DocumentCalc" printlog "Type " DocumentCalc.TypeKeys "" -- cgit From ba5bfd3356723ef7a003d41c3402adf79d15235d Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 13 Sep 2010 10:18:48 +0200 Subject: automationdev300m87: #i112208# - Eliminate sMakeReadonlyDocumentEditable() calls in module Writer/Optional (partial remove, many more to go) --- .../formatparagraph/w_formatparagraph2.inc | 107 ++++++--------------- .../hangulhanjaonversion/hhConversion1.inc | 42 ++++---- .../hangulhanjaonversion/hhConversion2.inc | 60 ++++++------ .../hangulhanjaonversion/hhConversion3.inc | 39 +++----- .../optional/includes/textframes/w_textframes1.inc | 32 +++--- .../optional/includes/textframes/w_textframes2.inc | 20 ++-- .../optional/includes/textframes/w_textframes3.inc | 12 +-- .../optional/includes/textframes/w_textframes4.inc | 80 ++++++++------- .../optional/includes/textframes/w_textframes5.inc | 40 +++----- 9 files changed, 174 insertions(+), 258 deletions(-) mode change 100755 => 100644 testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc mode change 100755 => 100644 testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc mode change 100755 => 100644 testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc mode change 100755 => 100644 testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc mode change 100755 => 100644 testautomation/writer/optional/includes/textframes/w_textframes1.inc mode change 100755 => 100644 testautomation/writer/optional/includes/textframes/w_textframes2.inc mode change 100755 => 100644 testautomation/writer/optional/includes/textframes/w_textframes3.inc mode change 100755 => 100644 testautomation/writer/optional/includes/textframes/w_textframes4.inc mode change 100755 => 100644 testautomation/writer/optional/includes/textframes/w_textframes5.inc diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc old mode 100755 new mode 100644 index dccebdcf930e..d204f8f2e02c --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph2.inc @@ -29,31 +29,6 @@ '* '* short description : Test the functionality of Paragraph Formatting - 2 '* -'************************************************************************ -'* -' #1 tParagraphAlignment1 'Test 'Left' alignment -' #1 tParagraphAlignment2 'Test 'Right' alignment -' #1 tParagraphAlignment3 'Test 'Center' alignment -' #1 tParagraphAlignment4 'Test 'Justified' alignment - Default -' #1 tParagraphAlignment5 'Test 'Justified' alignment - Centered -' #1 tParagraphAlignment6 'Test 'Justified' alignment - Justified -' #1 tParagraphAlignment7 'Test 'Expand single word' -' #1 tParagraphAlignment8 'Test Uncheck 'Snap to text grid(if active)' -' #1 tParagraphAlignment9 'Test Check 'Snap to text grid(if active)' -' #1 tParagraphTextFlow1 'Hyphenation must be processed while entering text WITHOUT inquiry -' #1 tParagraphTextFlow2 'Hyphenation - Characters at line end -' #1 tParagraphTextFlow3 'Hyphenation - Characters at line begin -' #1 tParagraphTextFlow4 'Hyphenation - maxinum number of consecutive typhens -' #1 tParagraphTextFlow5 'Paragraph break before Column -' #1 tParagraphTextFlow6 'Paragraph break after Column -' #1 tParagraphTextFlow7 'Paragraph break before Page -' #1 tParagraphTextFlow8 'Paragraph break after Page -' #1 tParagraphTextFlow9 'Do not split paragraph -' #1 tParagraphTextFlow10 'Keep with next paragraph -' #1 tParagraphTextFlow11 'Orphan control -' #1 tParagraphTextFlow12 'widow control -' #1 tParagraphTextFlow13 'Special test for Hyphenation -'* '\*********************************************************************** testcase tParagraphAlignment1 @@ -70,8 +45,7 @@ testcase tParagraphAlignment1 '/// + Open the test file '/// + This file includes 1 paragraphs , and a pic is anchored to the character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) 'Get the original coordinate-X Call wTypeKeys ( "" ) @@ -119,8 +93,7 @@ testcase tParagraphAlignment2 '/// + Open the test file '/// + This file includes 1 paragraphs , and a pic is anchored to the laste character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// + Format/Paragraph / Alignment , choose Right/Bottom option Call fFormatParagraph("TabAusrichtungAbsatz") @@ -156,8 +129,7 @@ testcase tParagraphAlignment3 '/// + Open the test file '/// + This file includes 1 paragraphs , and a pic is anchored to the character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// + Format/Paragraph / Alignment , choose Center option Call fFormatParagraph("TabAusrichtungAbsatz") @@ -196,8 +168,7 @@ testcase tParagraphAlignment4 '/// Open the test file '/// + This file includes 1 paragraphs , and a pic is anchored to the last character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) Call wTypeKeys ( "" ) Sleep 1 @@ -264,8 +235,7 @@ testcase tParagraphAlignment5 '/// Open the test file '/// + This file includes 1 paragraphs , and a pic is anchored to the last character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Format/Paragraph / Alignment , '/// + choose Justified option , and select centered in last line @@ -307,8 +277,7 @@ testcase tParagraphAlignment6 '/// Open the test file '/// + This file includes 1 paragraphs, '/// + and 2 pics are in 2nd line - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) Call wTypeKeys ( "" ) Call wTypeKeys "" @@ -374,8 +343,7 @@ testcase tParagraphAlignment7 '/// + This file includes 1 paragraphs , '/// + there is only 1 word - "That" in last line , '/// + and a drawring object is anchored as character after "That" - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) printlog "Select the object." Sleep 1 @@ -441,8 +409,7 @@ testcase tParagraphAlignment8 '/// Open the test file '/// + This file includes 1 paragraphs , '/// + and a drawring object is anchored as character after "That" - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Get the drawing object original position /// Call wTypeKeys ( "" ) @@ -512,8 +479,7 @@ testcase tParagraphAlignment9 '/// Open the test file '/// + This file includes 1 paragraphs , '/// + and a drawring object is anchored as character after "That" - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Get the drawing object original position /// Call wTypeKeys ( "" ) @@ -578,8 +544,7 @@ testcase tParagraphTextFlow1 '/// Open the test file '/// + This file includes 2 words : AAA and Kilometerhigh - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) 'the focus is in front of Kilometerhigh Call wTypeKeys "" @@ -607,8 +572,7 @@ testcase tParagraphTextFlow1 Call hCloseDocument Call hNewDocument - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// 2. Test there is the Hyphenation configuratioin '/// + Format/Paragraph / Text Flow , @@ -657,8 +621,7 @@ testcase tParagraphTextFlow2 '/// Open the test file '/// + This file includes 2 words : AAA and Kilometerhigh - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// 1.Test Characters at line end ==> 6 '/// + Format/Paragraph / Text Flow , @@ -689,8 +652,7 @@ testcase tParagraphTextFlow2 Call hNewDocument - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// 2.Test Characters at line end ==> 8 '/// + Format/Paragraph / Text Flow , @@ -735,8 +697,7 @@ testcase tParagraphTextFlow3 '/// Open the test file '/// + This file includes 2 words : AAA and Kilometerhigh - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// 1.Test Characters at line begin ==> 4 '/// + Format/Paragraph / Text Flow , @@ -766,8 +727,8 @@ testcase tParagraphTextFlow3 Call hNewDocument - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// 2.Test Characters at line end ==> 6 '/// + Format/Paragraph / Text Flow , @@ -817,8 +778,7 @@ testcase tParagraphTextFlow4 '/// Open the test file '/// + This file includes 4 words : KiloAmterhigh1 kiloAmeterhigh2 kiloAmeterhigh3 kiloAmeterhigh4 '/// + the words' length is longer then page length - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// 1.Test maxinum number of consecutive typhens (default => 0) '/// + Format/Paragraph / Text Flow , @@ -935,8 +895,7 @@ testcase tParagraphTextFlow5 '/// + There are 2 columns/page ,includes 2 paragraph '/// + the 1st paragraph is in 1st and 2nd column '/// + the 2nd paragraph is is 2nd and 3rd column - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set the focus to 2nd paragraph Kontext @@ -987,8 +946,7 @@ testcase tParagraphTextFlow6 '/// + There are 2 columns/page ,includes 1 paragraph '/// + the paragraph is in 1st and 2nd column '/// + and it is NOT full of 2nd column - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Format/Paragraph / Text Flow '/// + Set 'Breaks' enable @@ -1031,8 +989,7 @@ testcase tParagraphTextFlow7 '/// Open the test file '/// + There are 2 paragraphs in 1 page - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set the focus to 2nd paragraph Kontext @@ -1092,8 +1049,7 @@ testcase tParagraphTextFlow8 '/// Open the test file '/// + There is 1 paragraph in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Format/Paragraph / Text Flow '/// + Set 'Breaks' enable @@ -1139,8 +1095,7 @@ testcase tParagraphTextFlow9 '/// Open the test file '/// + There is 1 paragraph which cross 2 pages - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) Call wTypeKeys "" Call fFindWord("She") @@ -1173,8 +1128,7 @@ testcase tParagraphTextFlow9 PrintLog "- Check Don't split paragraph" Call hNewDocument - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) Call wTypeKeys "" @@ -1225,8 +1179,7 @@ testcase tParagraphTextFlow10 '/// Open the test file '/// There are 2 paragraphes in the file , 1st one crosses '/// + 1st and 2nd page , 2nd one is in 2nd page - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) EditSearchAndReplace Kontext "FindAndReplace" SearchFor.SetText "He1" @@ -1269,8 +1222,7 @@ testcase tParagraphTextFlow10 Call hNewDocument - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) PrintLog "- Check Keep with next paragraph" '/// 2. Test checking "Keep with next paragraph" @@ -1331,8 +1283,7 @@ testcase tParagraphTextFlow11 '/// Open the test file '/// + There is 1 paragraph (8 lines) in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Format/Paragraph / Text Flow '/// + Check 'Orphan control' , set 3 in 'Lines' @@ -1385,8 +1336,7 @@ testcase tParagraphTextFlow12 '/// Open the test file '/// + There is 1 paragraph (8 lines) in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Format/Paragraph / Text Flow '/// + Check 'Widow control' , set 3 in 'Lines' @@ -1436,8 +1386,7 @@ testcase tParagraphTextFlow13 '/// Open the test file '/// + There is 1 word TABC in the end of the first line - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Press spaces in the head of the first line , we hope '/// + the whole word - 'TABC' will go to 2nd line at one time diff --git a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc old mode 100755 new mode 100644 index bacd2dd1d8af..a16949d37851 --- a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc +++ b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion1.inc @@ -67,8 +67,7 @@ testcase tHHNoSelction_1 '/// Open a test file , which includes some Korean characters '/// + and some Chinese characters - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + hFileOpenLocally(sTestFile) '/// Set focus before the 3rd character Call wTypeKeys "" @@ -137,8 +136,7 @@ testcase tHHNoSelction_2 '/// Open a test file , which includes some English , '/// + Germany , French , Korean and Chinese characters '/// + (Korean is before Chinese) - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally(sTestFile) '/// Set focus to the beginning Call wTypeKeys "" @@ -195,8 +193,8 @@ testcase tHHNoSelction_3 '/// Open a test file , which includes some English , '/// + Germany , French , Korean and Chinese characters '/// + (Chinese is before Korean) - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Set focus to the beginning Call wTypeKeys "" @@ -250,8 +248,8 @@ testcase tHHNoSelction_4 '/// Open a test file , which includes some English , '/// + Germany , French characters . '/// + There are no Chinese and Korean - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Set focus to the beginning Call wTypeKeys "" @@ -291,8 +289,8 @@ testcase tHHNoSelction_5 Call hNewDocument '/// Open a test file , which includes some Chinese and Korean - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Set focus to the end of the file Call wTypeKeys "" @@ -333,8 +331,8 @@ testcase tHHNoSelction_6 '/// Open a test file , which includes some Chinese and Korean, '/// + the 3rd character in 1st line isn't convertible - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Set focus to the 3rd character (korean) Call wTypeKeys "" @@ -398,8 +396,8 @@ testcase tHHNoSelction_7 '/// Open a test file , which includes some Chinese and Korean, '/// + the 3rd character in 2nd line isn't convertible - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Set focus to the 3rd chinese character Call wTypeKeys "" @@ -466,8 +464,8 @@ testcase tHHSingleSelction_1 Call hNewDocument '/// Open a test file , which includes some Chinese and Korean - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Select from 4th to 7th character Call wTypeKeys "" @@ -527,8 +525,8 @@ testcase tHHMultiSelction_1 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Do a multi Selectiong to the charcters -- ìž…ë ¥ Call fFindWord(sMultiWord) @@ -573,8 +571,8 @@ testcase tHHTextBox_1 '/// Open a test file , which includes a text box and '/// + some Korean chacters in the text box - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Tools / HangulHanjaConversion , the below 4 checkboxes ralated '/// + ruby should be disabled . @@ -645,8 +643,8 @@ testcase tHHDrawBox_1 '/// Open a test file , which includes a draw box and '/// + some Korean chacters in the text box - Call hFileOpen(sTestFile) - sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally( sTestFile ) + () '/// Tools / HangulHanjaConversion , the below 4 checkboxes ralated '/// + ruby should be disabled . '/// -> 'Hanja As Ruby Above Hangul' diff --git a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc old mode 100755 new mode 100644 index 26437f17f920..dface018692f --- a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc +++ b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion2.inc @@ -80,7 +80,7 @@ testcase tHHConversion_1 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , @@ -129,7 +129,7 @@ testcase tHHConversion_2 '/// Open a test file , which includes some '/// + Chinese character and Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check hanja only . @@ -180,7 +180,7 @@ testcase tHHConversion_3 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check Hanja(Hangul) @@ -232,7 +232,7 @@ testcase tHHConversion_4 '/// Open a test file , which includes some '/// + Chinese character and Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check Hanja(Hangul). @@ -284,7 +284,7 @@ testcase tHHConversion_5 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check Hangul(Hanja) , @@ -337,7 +337,7 @@ testcase tHHConversion_6 '/// Open a test file , which includes some '/// + Chinese character and Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check Hangul(Hanja), @@ -390,7 +390,7 @@ testcase tHHConversion_7 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check 'Hanja As Ruby Above Hangul' , @@ -450,7 +450,7 @@ testcase tHHConversion_8 Call hNewDocument '/// Open a test file , which includes some Chinese chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check 'Hanja As Ruby Above Hangul' , @@ -510,7 +510,7 @@ testcase tHHConversion_9 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check 'Hanja As Ruby Below Hangul' , @@ -570,7 +570,7 @@ testcase tHHConversion_10 Call hNewDocument '/// Open a test file , which includes some Chinese chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check 'Hanja As Ruby Below Hangul' , @@ -630,7 +630,7 @@ testcase tHHConversion_11 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check 'Hangul As Ruby Above Hanja' , @@ -690,7 +690,7 @@ testcase tHHConversion_12 Call hNewDocument '/// Open a test file , which includes some Chinese chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check 'Hangul As Ruby Above Hanja' , @@ -750,7 +750,7 @@ testcase tHHConversion_13 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check 'Hangul As Ruby Below Hanja' , @@ -810,7 +810,7 @@ testcase tHHConversion_14 Call hNewDocument '/// Open a test file , which includes some Chinese chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , check 'Hangul As Ruby Below Hanja' , @@ -865,7 +865,7 @@ testcase tHHConversion_15 '/// Open a test file , which includes some Korean chacters . '/// + Set focus before Korean character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , @@ -913,7 +913,7 @@ testcase tHHConversion_16 '/// Open a test file , which includes some Chinese chacters . '/// + Set focus before Chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , @@ -964,7 +964,7 @@ testcase tHHConversion_17 Call hNewDocument '/// Open a test file , which includes some Korean chacters . - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , press Ignore , @@ -1015,7 +1015,7 @@ testcase tHHConversion_18 '/// Open a test file , which includes some Chinese chacters =>. '/// + 山下 上山下乡 山下 - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , press Always Ignore , @@ -1046,7 +1046,7 @@ testcase tHHConversion_18 '/// So far , there is still a StarOffice session exists . '/// Reopen the test file - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , @@ -1097,7 +1097,7 @@ testcase tHHConversion_19 '/// Open a test file , which includes some Chinese chacters =>. '/// + 山下 上山下乡 山下 - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , press Always Ignore , @@ -1120,7 +1120,7 @@ testcase tHHConversion_19 Call hNewDocument '/// Reopen the test file - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , 山下 should be selcted @@ -1159,7 +1159,7 @@ testcase tHHConversion_20 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , select a word in selection @@ -1225,7 +1225,7 @@ testcase tHHConversion_21 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , select a word in selection, @@ -1267,7 +1267,7 @@ testcase tHHConversion_21 Call hNewDocument '/// Reopen this test file - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion @@ -1321,7 +1321,7 @@ testcase tHHConversion_22 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , select a word in selection, @@ -1350,7 +1350,7 @@ testcase tHHConversion_22 Call hStartTheOffice Call hNewDocument '/// Reopen this test file - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion @@ -1389,7 +1389,7 @@ testcase tHHConversion_23 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , select a word in selection, @@ -1454,7 +1454,7 @@ testcase tHHConversion_24 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , the default for 'Replace by character' @@ -1509,7 +1509,7 @@ testcase tHHConversion_25 '/// Open a test file , which includes some Chinese chacters =>. '/// + 山下 上山下乡 山下 - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Check 'Replace by character' , @@ -1573,7 +1573,7 @@ testcase tHHConversion_26 Call hNewDocument '/// Open a test file , which includes some Korean chacters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Check 'Replace by character' , diff --git a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc old mode 100755 new mode 100644 index 0808ccacb3bb..e7b89b0accf0 --- a/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc +++ b/testautomation/writer/optional/includes/hangulhanjaonversion/hhConversion3.inc @@ -29,21 +29,6 @@ '* '* short description : Test of Hangul/Hanja Conversion - 3 '* -'************************************************************************ -'* -' #1 tHHOptions_1 'User defined dictionaries -' #1 tHHOptions_2 'Options - New 1 -' #1 tHHOptions_3 'Options - New 2 -' #1 tHHOptions_4 'Options - New 3 -' #1 tHHOptions_5 'Options - Edit (Book) -' #1 tHHOptions_6 'Options - Edit (Original) -1 -' #1 tHHOptions_7 'Options - Edit (Original) -2 -' #1 tHHOptions_8 'Options - Edit (Original) -3 -' #1 tHHOptions_9 'Options - Edit (Original) -4 -' #1 tHHOptions_10 'Options - Edit (Original) -5 -' #1 tHHOptions_11 'Options - Edit (Original) -6 -' #1 tHHOptions_12 'Options - Edit (Original) -7 -'* '\*********************************************************************** testcase tHHOptions_1 @@ -62,7 +47,7 @@ testcase tHHOptions_1 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" @@ -107,7 +92,7 @@ testcase tHHOptions_2 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Press Options button , @@ -189,7 +174,7 @@ testcase tHHOptions_3 '/// Open a test file , which includes some '/// + Korean chacters and chinese characters - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Press Options button , @@ -254,7 +239,7 @@ warnlog( "#i111911# - Test is broken beyond repait, please rewrite" ) '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Press Options button , @@ -321,7 +306,7 @@ testcase tHHOptions_5 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Press Options button , @@ -396,7 +381,7 @@ testcase tHHOptions_6 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Press Options button , @@ -507,7 +492,7 @@ testcase tHHOptions_7 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Press Options button , @@ -615,7 +600,7 @@ testcase tHHOptions_8 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Press Options button , @@ -705,7 +690,7 @@ testcase tHHOptions_9 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Press Options button , @@ -791,7 +776,7 @@ testcase tHHOptions_10 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Press Options button , @@ -879,7 +864,7 @@ testcase tHHOptions_11 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Press Options button , @@ -962,7 +947,7 @@ testcase tHHOptions_12 '/// Open a test file , which includes some '/// + Korean chacters and chinese character - Call hFileOpen(sTestFile) : sMakeReadOnlyDocumentEditable() + hFileOpenLocally( sTestFile ) Call wTypeKeys "" '/// Tools / HangulHanjaConversion , Press Options button , diff --git a/testautomation/writer/optional/includes/textframes/w_textframes1.inc b/testautomation/writer/optional/includes/textframes/w_textframes1.inc old mode 100755 new mode 100644 index 17eeff80ad95..a3d284438643 --- a/testautomation/writer/optional/includes/textframes/w_textframes1.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes1.inc @@ -408,8 +408,8 @@ testcase tTextframes_6 '/// + This test file is designed for Anchor To Page test. '/// + There are 2 pages in the file , and the frame is in '/// + the bottom of first page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Check1: EditSearchAndReplace @@ -506,8 +506,8 @@ testcase tTextframes_7 '/// + There are 2 paragraphs in the file , and the head of 2nd '/// + paragraph is in the bottom of the first page . '/// + The frame is in the first line of 2nd paragraph - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// check if the frame is in the first page Call wTypeKeys ( "" ) @@ -586,8 +586,8 @@ testcase tTextframes_8 '/// + The frame is anchored to the character 't' of That . '/// + The frame is in the bottom of the first page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// check if the frame is in the first page Call wTypeKeys ( "" ) @@ -643,8 +643,8 @@ testcase tTextframes_8 Call hCloseDocument - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Call wTypeKeys ( "" ) Sleep 1 @@ -718,8 +718,8 @@ testcase tTextframes_9 '/// + This test file is designed for Anchor as Character test. '/// + The frame is anchored as the character. '/// + The frame is in the right and bottom of the first page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'check if the frame is in the first page Call wTypeKeys ( "" ) @@ -775,8 +775,8 @@ testcase tTextframes_9 Call hCloseDocument - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Check2: Kontext @@ -853,7 +853,7 @@ testcase tTextframes_10 '/// + This test file is designed for Anchor in gathering pages&columns test. '/// + There are 2 columns in the page. And the frame is in the second column. Call hFileOpen(sTestFile1,false) - Call sMakeReadOnlyDocumentEditable + 'Press return to ensure the frame is in 2nd column Call wTypeKeys "" @@ -889,7 +889,7 @@ testcase tTextframes_10 '/// + pages&columns test. '/// + There are 2 pages. And the frame is in the second page. Call hFileOpen(sTestFile2,false) - Call sMakeReadOnlyDocumentEditable + 'check if the frame is in the 2nd page Call wTypeKeys ( "" ) @@ -957,8 +957,8 @@ testcase tTextframes_11 '/// + There are 2 paragraph in the file . '/// + The 1st paragraph is in 1st page and the 2nd paragraph is in 2nd page '/// + Two paragraphs, a frame is anchored to the second one. When deleting the paragraph mark, the anchor of the frame has to move the the first paragraph. - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Check1: 'First check diff --git a/testautomation/writer/optional/includes/textframes/w_textframes2.inc b/testautomation/writer/optional/includes/textframes/w_textframes2.inc old mode 100755 new mode 100644 index a316cd19b49c..5f58ba252aa6 --- a/testautomation/writer/optional/includes/textframes/w_textframes2.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes2.inc @@ -212,8 +212,8 @@ testcase tTextframes_20 '/// + There are 1 page in the file. '/// + The frame is ocupied in the whole 1st page and wraped as Through '/// + Some text are behind the frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to frame Call wTypeKeys ( "" ) @@ -282,8 +282,8 @@ testcase tTextframes_21 '/// + The frame is ocupied in the whole 1st page and wraped as None '/// + Some text are in the 2nd page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to frame Call wTypeKeys ( "" ) @@ -353,8 +353,8 @@ testcase tTextframes_22 '/// + there are some space in the left of the frame. '/// + Some text are in the 2nd page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + printlog "- Test wrap - before" @@ -472,8 +472,8 @@ testcase tTextframes_23 '/// + there are some space in the right of the frame. '/// + Some text are in the 2nd page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + printlog "- Test wrap - before" @@ -1075,7 +1075,7 @@ testcase tTextframes_31 Sleep 2 '/// Check if the frame is non-editable - Call hFileOpen(sTestFile,false) + hFileOpenLocally( sTestFile ) Call wTypeKeys ( "" ) @@ -1132,7 +1132,7 @@ testcase tTextframes_32 Sleep 2 '/// Check if the text can be inputed into frame - Call hFileOpen(sTestFile,false) + hFileOpenLocally( sTestFile ) Call wTypeKeys "" Wait 500 diff --git a/testautomation/writer/optional/includes/textframes/w_textframes3.inc b/testautomation/writer/optional/includes/textframes/w_textframes3.inc old mode 100755 new mode 100644 index 28e6f9b7f404..d9db6fa32253 --- a/testautomation/writer/optional/includes/textframes/w_textframes3.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes3.inc @@ -273,8 +273,8 @@ testcase tTextframes_36 '/// + This test file is designed for testing link '/// + frames which are placed on different pages '/// + There are 2 pages in the file and 1 frame/page - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to first frame Call wTypeKeys ( "" ) @@ -364,8 +364,8 @@ testcase tTextframes_37 '/// + frames which are placed on header '/// + There are 2 frames in the header - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to first frame Call wTypeKeys ( "" ) @@ -427,8 +427,8 @@ testcase tTextframes_38 '/// + This test file is designed for testing link '/// + frames which are placed on header '/// + There are 2 frames in the header - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to first frame Call wTypeKeys ( "" ) diff --git a/testautomation/writer/optional/includes/textframes/w_textframes4.inc b/testautomation/writer/optional/includes/textframes/w_textframes4.inc old mode 100755 new mode 100644 index 43af4c5bd532..6da21bcd513f --- a/testautomation/writer/optional/includes/textframes/w_textframes4.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes4.inc @@ -95,8 +95,8 @@ testcase tTextframes_50 '/// Open a test file , which includes a frame and '/// + it is StarOffice 7 format - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to frame Call wTypeKeys ( "" ) @@ -132,8 +132,8 @@ testcase tTextframes_51 '/// Open a test file , which is a Word file and includes '/// + a frame that is in 'in front of text' mode - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to frame Call wTypeKeys ( "" ) @@ -169,8 +169,8 @@ testcase tTextframes_52 '/// Open a test file , which is a Word file and includes '/// + a frame that is in 'behind text' mode - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to the frame Call wTypeKeys ( "" ) @@ -206,8 +206,8 @@ testcase tTextframes_53 '/// Open a test file , which is a Word file and includes '/// + a frame that is in 'tight' mode - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to the frame Call wTypeKeys ( "" ) @@ -222,9 +222,7 @@ testcase tTextframes_53 TabType.Cancel printlog " Close active document " - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop + hFileCloseAll() endcase @@ -243,8 +241,8 @@ testcase tTextframes_54 '/// Open a test file , which is a Word file and includes '/// + a frame that is in 'square' mode - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set focus to the frame Call wTypeKeys ( "" ) @@ -376,8 +374,8 @@ testcase tTextframes_57 '/// Open a test file , which includes a frame in header and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) @@ -455,8 +453,8 @@ testcase tTextframes_58 '/// Open a test file , which includes a frame in header and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) @@ -529,8 +527,8 @@ testcase tTextframes_59 '/// Open a test file , which includes a frame in table and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) @@ -615,8 +613,8 @@ testcase tTextframes_60 '/// Open a test file , which includes a frame in table and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the frame Call wTypeKeys ( "" ) @@ -711,8 +709,8 @@ testcase tTextframes_61 '/// Open a test file , which includes a frame in footer and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) @@ -789,8 +787,8 @@ testcase tTextframes_62 '/// Open a test file , which includes a frame in footer and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) @@ -867,8 +865,8 @@ testcase tTextframes_63 '/// Open a test file , which includes a frame in table and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) @@ -957,8 +955,8 @@ testcase tTextframes_64 '/// Open a test file , which includes a frame in table and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) @@ -1048,8 +1046,8 @@ testcase tTextframes_65 '/// Open a test file , which includes 2 frames , '/// Frame A is anchored Frame B '/// + a picture which is anchored to Frame A - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) @@ -1127,8 +1125,8 @@ testcase tTextframes_66 '/// Open a test file , which includes 2 frames , '/// Frame A is anchored Frame B '/// + a picture which is anchored to Frame A - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) @@ -1205,8 +1203,8 @@ testcase tTextframes_67 '/// Open a test file , which includes a frame in table and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) @@ -1295,8 +1293,8 @@ testcase tTextframes_68 '/// Open a test file , which includes a frame in table and '/// + a picture which is anchored to frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) @@ -1386,8 +1384,8 @@ testcase tTextframes_69 '/// Open a test file , which includes 2 frames , '/// Frame A is anchored Frame B '/// + a picture which is anchored to Frame A - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) @@ -1465,8 +1463,8 @@ testcase tTextframes_70 '/// Open a test file , which includes 2 frames , '/// Frame A is anchored Frame B '/// + a picture which is anchored to Frame A - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set focus to the picture Call wTypeKeys ( "" ) diff --git a/testautomation/writer/optional/includes/textframes/w_textframes5.inc b/testautomation/writer/optional/includes/textframes/w_textframes5.inc old mode 100755 new mode 100644 index f9a9944b4333..7bcba8594a9c --- a/testautomation/writer/optional/includes/textframes/w_textframes5.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes5.inc @@ -115,8 +115,7 @@ testcase tTextframes_72 '/// Open a test file , which includes 2 frames , '/// Frame A is anchored Frame B - Call hFileOpen(( Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInFrame.sxw") ),false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\textframe\frameInFrame.sxw" ) 'Set focus to Frame B Call wTypeKeys ( "" ) @@ -152,8 +151,7 @@ testcase tTextframes_73 Call hNewDocument '/// Open a test file , which includes 1 frame in the document body - Call hFileOpen((Convertpath (gTesttoolpath + "writer\optional\input\textframe\frame.sxw")),false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath & "writer\optional\input\textframe\frame.sxw" ) '/// Set focus to Frame Call wTypeKeys ( "" ) @@ -188,8 +186,7 @@ testcase tTextframes_74 Call hNewDocument '/// Open a test file , which includes 1 frame in the document body - Call hFileOpen((Convertpath (gTesttoolpath + "writer\optional\input\textframe\frameInTable.sxw")),false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\textframe\frameInTable.sxw" ) '/// Set focus to Frame Call wTypeKeys ( "" ) @@ -223,8 +220,7 @@ testcase tTextframes_75 Call hNewDocument '/// Open a test file , which includes 1 frame in the header - Call hFileOpen((Convertpath (gTesttoolpath + "writer\optional\input\textframe\Header.sxw")),false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\textframe\Header.sxw" ) '/// Set focus to Frame Call wTypeKeys ( "" ) @@ -259,8 +255,7 @@ testcase tTextframes_76 Call hNewDocument '/// Open a test file , which includes 1 frame in the footer - Call hFileOpen((gTesttoolpath + "writer\optional\input\textframe\Footer.sxw"),false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\textframe\Footer.sxw" ) '/// Set focus to Frame Call wTypeKeys ( "" ) @@ -295,8 +290,7 @@ testcase tTextframes_77 Call hNewDocument '/// Open a test file , which includes 1 frame in the footnote - Call hFileOpen((Convertpath(gTesttoolpath + "writer\optional\input\textframe\frameInFootnote.sxw")),false) - Call sMakeReadOnlyDocumentEditable + hFileOpen( gTesttoolpath & "writer\optional\input\textframe\frameInFootnote.sxw" ) '/// Set focus to Frame Call wTypeKeys ( "" ) @@ -331,8 +325,7 @@ testcase tTextframes_78 Call hNewDocument '/// Open a test file , which includes 1 frame in the endnote - Call hFileOpen((Convertpath(gTesttoolpath + "writer\optional\input\textframe\frameInEndnote.sxw")),false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath & "writer\optional\input\textframe\frameInEndnote.sxw" ) '/// Set focus to Frame Call wTypeKeys ( "" ) @@ -379,8 +372,7 @@ testcase tTextframes_80 '/// Open a test file , which includes 1 frame which is '/// + anchored 'To Character' and a picture which is anchored '/// + in the frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set focus to Frame Call wTypeKeys ( "" ) @@ -435,8 +427,7 @@ testcase tTextframes_81 '/// Open a test file , which includes 1 frame which is '/// + anchored 'To Character' and a picture which is anchored '/// + in the frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set focus to Frame Call wTypeKeys ( "" ) @@ -491,8 +482,7 @@ testcase tTextframes_82 '/// Open a test file , which includes 1 frame which is '/// + anchored 'To Character' and a picture which is anchored '/// + in the frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set focus to Frame Call wTypeKeys ( "" ) @@ -549,8 +539,7 @@ testcase tTextframes_83 '/// Open a test file , which includes 1 frame which is '/// + anchored 'To Character' and a picture which is anchored '/// + in the frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set focus to Frame Call wTypeKeys ( "" ) @@ -615,8 +604,7 @@ testcase tTextframes_84 '/// Open a test file , which includes 1 frame which is '/// + anchored 'To Character' and a picture which is anchored '/// + in the frame - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) '/// Set focus to Frame Call wTypeKeys ( "" ) @@ -683,9 +671,7 @@ testcase tTextframes_85 '/// + One is top to the line text , '/// + another one is center to the line text , '/// + the 3rd one is bottom to the line text - Call hFileOpen(sTestFile,false) - Call sMakeReadOnlyDocumentEditable - Sleep (2) + hFileOpenLocally( sTestFile ) '/// Set focus to 1st Frame Call wTypeKeys ( "" ) -- cgit From af4863656d0385d0f05a72a2ae1444993e52f05e Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 13 Sep 2010 10:39:49 +0200 Subject: automationdev300m87: #i112208# - Eliminate sMakeReadonlyDocumentEditable() calls in module Writer - Mass renaming/Deletion. Might break things as this was a batch job. --- .../alternative_text/w_alternative_text.inc | 6 +-- .../includes/autocorrection/w_autocorrect2.inc | 32 ++++++------- .../optional/includes/clipboard/clipbrd_func.inc | 4 +- .../writer/optional/includes/clipboard/w_210_.inc | 12 ++--- .../writer/optional/includes/clipboard/w_211_.inc | 18 +++---- .../writer/optional/includes/clipboard/w_212_.inc | 18 +++---- .../writer/optional/includes/clipboard/w_213_.inc | 18 +++---- .../writer/optional/includes/clipboard/w_214_.inc | 18 +++---- .../writer/optional/includes/clipboard/w_215_.inc | 36 +++++++------- .../writer/optional/includes/clipboard/w_216_.inc | 30 ++++++------ .../writer/optional/includes/clipboard/w_217_.inc | 34 ++++++------- .../writer/optional/includes/clipboard/w_218_.inc | 34 ++++++------- .../writer/optional/includes/clipboard/w_219_.inc | 34 ++++++------- .../writer/optional/includes/clipboard/w_220_.inc | 36 +++++++------- .../writer/optional/includes/clipboard/w_221_.inc | 42 ++++++++-------- .../writer/optional/includes/clipboard/w_222_.inc | 42 ++++++++-------- .../optional/includes/drawing/w_drawing_tools2.inc | 4 +- .../optional/includes/dropdownLB/w_dropdownLB1.inc | 4 +- .../writer/optional/includes/fields/w_fields2.inc | 14 +++--- .../writer/optional/includes/fields/w_fields3.inc | 20 ++++---- .../writer/optional/includes/fields/w_fields4.inc | 32 ++++++------- .../writer/optional/includes/fields/w_fields5.inc | 4 +- .../writer/optional/includes/fields/w_fields6.inc | 4 +- .../writer/optional/includes/fields/w_fields7.inc | 8 ++-- .../formatcharacter/w_format_character1.inc | 8 ++-- .../optional/includes/formatpage/w_formatpage1.inc | 18 +++---- .../optional/includes/formatpage/w_formatpage2.inc | 32 ++++++------- .../optional/includes/formatpage/w_formatpage3.inc | 38 +++++++-------- .../optional/includes/formatpage/w_formatpage4.inc | 8 ++-- .../formatparagraph/w_formatparagraph1.inc | 56 +++++++++++----------- .../formatparagraph/w_formatparagraph3.inc | 44 ++++++++--------- .../includes/hyphenation/w_hyphenation.inc | 16 +++---- .../includes/insertgraphic/w_insertgraphic1.inc | 4 +- .../optional/includes/loadsave/w_loadsave.inc | 2 +- .../optional/includes/navigator/w_navigator.inc | 18 +++---- .../writer/optional/includes/number/w_205_.inc | 8 ++-- .../writer/optional/includes/number/w_205a_.inc | 18 +++---- .../writer/optional/includes/number/w_206_.inc | 4 +- .../writer/optional/includes/number/w_207_.inc | 10 ++-- .../writer/optional/includes/option/wh_o_1.inc | 12 ++--- .../writer/optional/includes/option/wh_o_2.inc | 6 +-- .../writer/optional/includes/option/wr_o_1.inc | 16 +++---- .../writer/optional/includes/option/wr_o_2.inc | 14 +++--- .../writer/optional/includes/option/wr_o_3.inc | 8 ++-- .../writer/optional/includes/option/wr_o_4.inc | 2 +- .../writer/optional/includes/option/wr_o_a.inc | 4 +- .../optional/includes/redlining/w_redlining1.inc | 4 +- .../writer/optional/includes/regexp/regular.inc | 4 +- .../writer/optional/includes/regexp/search.inc | 8 ++-- .../issuezilla/w_issuezilla_regression.inc | 22 ++++----- .../optional/includes/section/w_section_3.inc | 4 +- .../optional/includes/section/w_section_4.inc | 12 ++--- .../optional/includes/sorting/w_sorting1.inc | 32 ++++++------- .../optional/includes/sorting/w_sorting2.inc | 8 ++-- .../optional/includes/spellcheck/w_spellcheck.inc | 34 ++++++------- .../optional/includes/spellcheck/w_spellcheck1.inc | 2 +- .../optional/includes/textframes/w_textframes1.inc | 4 +- .../optional/includes/undo/w_undo_history_4.inc | 2 +- testautomation/writer/required/includes/w_001_.inc | 2 +- .../writer/required/includes/w_001b_.inc | 24 +++++----- testautomation/writer/required/includes/w_007_.inc | 2 +- testautomation/writer/tools/includes/w_tool3.inc | 2 +- testautomation/writer/tools/includes/w_tools.inc | 2 +- 63 files changed, 509 insertions(+), 509 deletions(-) mode change 100755 => 100644 testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/clipbrd_func.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_210_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_211_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_212_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_213_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_214_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_215_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_216_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_217_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_218_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_219_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_220_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_221_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/clipboard/w_222_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc mode change 100755 => 100644 testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc mode change 100755 => 100644 testautomation/writer/optional/includes/fields/w_fields2.inc mode change 100755 => 100644 testautomation/writer/optional/includes/fields/w_fields3.inc mode change 100755 => 100644 testautomation/writer/optional/includes/fields/w_fields4.inc mode change 100755 => 100644 testautomation/writer/optional/includes/fields/w_fields5.inc mode change 100755 => 100644 testautomation/writer/optional/includes/fields/w_fields6.inc mode change 100755 => 100644 testautomation/writer/optional/includes/fields/w_fields7.inc mode change 100755 => 100644 testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc mode change 100755 => 100644 testautomation/writer/optional/includes/formatpage/w_formatpage2.inc mode change 100755 => 100644 testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc mode change 100755 => 100644 testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc mode change 100755 => 100644 testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc mode change 100755 => 100644 testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc mode change 100755 => 100644 testautomation/writer/optional/includes/navigator/w_navigator.inc mode change 100755 => 100644 testautomation/writer/optional/includes/number/w_205_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/number/w_205a_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/number/w_206_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/number/w_207_.inc mode change 100755 => 100644 testautomation/writer/optional/includes/option/wh_o_1.inc mode change 100755 => 100644 testautomation/writer/optional/includes/option/wh_o_2.inc mode change 100755 => 100644 testautomation/writer/optional/includes/option/wr_o_1.inc mode change 100755 => 100644 testautomation/writer/optional/includes/option/wr_o_2.inc mode change 100755 => 100644 testautomation/writer/optional/includes/option/wr_o_3.inc mode change 100755 => 100644 testautomation/writer/optional/includes/option/wr_o_4.inc mode change 100755 => 100644 testautomation/writer/optional/includes/option/wr_o_a.inc mode change 100755 => 100644 testautomation/writer/optional/includes/redlining/w_redlining1.inc mode change 100755 => 100644 testautomation/writer/optional/includes/regexp/regular.inc mode change 100755 => 100644 testautomation/writer/optional/includes/regexp/search.inc mode change 100755 => 100644 testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc mode change 100755 => 100644 testautomation/writer/optional/includes/section/w_section_3.inc mode change 100755 => 100644 testautomation/writer/optional/includes/section/w_section_4.inc mode change 100755 => 100644 testautomation/writer/optional/includes/sorting/w_sorting1.inc mode change 100755 => 100644 testautomation/writer/optional/includes/sorting/w_sorting2.inc mode change 100755 => 100644 testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc mode change 100755 => 100644 testautomation/writer/tools/includes/w_tool3.inc diff --git a/testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc b/testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc index 74f65eaa1704..bf14a2dae8e9 100644 --- a/testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc +++ b/testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc @@ -106,7 +106,7 @@ testcase tPictureAlternativeText Call hCloseDocument printlog "- Reload" - Call hFileOpen ( gOfficePath + "user\work\tPictureAlternativeText.odt" ) + hFileOpenLocally( gOfficePath + "user\work\tPictureAlternativeText.odt" ) ' select graphic Call wTypeKeys ("") @@ -190,7 +190,7 @@ testcase tFrameAlternativeText Call hCloseDocument printlog "- Reload" - Call hFileOpen ( gOfficePath + "user\work\tFrameAlternativeText.odt" ) + hFileOpenLocally( gOfficePath + "user\work\tFrameAlternativeText.odt" ) ' select frame Call wTypeKeys ("") @@ -271,7 +271,7 @@ testcase tOLEAlternativeText Call hCloseDocument printlog "- Reload" - Call hFileOpen ( gOfficePath + "user\work\tOLEAlternativeText.odt" ) + hFileOpenLocally( gOfficePath + "user\work\tOLEAlternativeText.odt" ) ' select OLE Call wTypeKeys ("") diff --git a/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc b/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc old mode 100755 new mode 100644 index b15edc69479a..88297c3aa709 --- a/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc +++ b/testautomation/writer/optional/includes/autocorrection/w_autocorrect2.inc @@ -127,8 +127,8 @@ testcase tToolsAutocorrectWordCompletion_2 '/// delete all entries '/// close and reopen dialog, check entries again - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + 'Delete all entries in the list Call fDeleteAllEntries() @@ -196,8 +196,8 @@ testcase tToolsAutocorrectWordCompletion_3 '/// backwards with '/// endless loop test - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + 'Delete all entries in the list Call fDeleteAllEntries() @@ -287,8 +287,8 @@ testcase tToolsAutocorrectWordCompletion_4 MaxEintraege.SetText sTestMaxEntries TabWortergaenzung.OK - Call hFileOpen ( gTesttoolPath + "writer\optional\input\advanced\" + sTestFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\advanced\" + sTestFile ) + Sleep 4 ToolsAutocorrect @@ -337,8 +337,8 @@ testcase tToolsAutocorrectWordCompletion_5 'Test when checkbox is checkec -- default 'Open 1st file - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + 'Delete all entries in the list Call fDeleteAllEntries() @@ -355,8 +355,8 @@ testcase tToolsAutocorrectWordCompletion_5 Call wTypeKeys sTestWord1 'Open 2nd file - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01-01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01-01.odt" ) + Call wTypeKeys sTestWord2 Call wTypeKeys sTestWord3 @@ -386,8 +386,8 @@ testcase tToolsAutocorrectWordCompletion_5 'Test when checkbox is Checked 'Open 1st file - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + 'Delete all entries in the list fDeleteAllEntries() @@ -403,8 +403,8 @@ testcase tToolsAutocorrectWordCompletion_5 Call wTypeKeys sTestWord1 'Open 2nd file - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01-01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01-01.odt" ) + Call wTypeKeys sTestWord2 Call wTypeKeys sTestWord3 @@ -453,8 +453,8 @@ testcase tToolsAutocorrectWordCompletion_6 '/// and a help tip will appear <--- no way to test yet 'Show as Tip -- uncheck (default) - Call hFileOpen ( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\autocorrection\01.odt" ) + Call wTypeKeys sTestWord Call wTypeKeys "" diff --git a/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc b/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc old mode 100755 new mode 100644 index de6a4d0b4fef..0c9f976b187b --- a/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc +++ b/testautomation/writer/optional/includes/clipboard/clipbrd_func.inc @@ -141,8 +141,8 @@ end function function wSetClipboardtestDefaults(ForWhat as string) as boolean printlog " Points cursor to beginning of document " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\writer.sxw") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\writer.sxw") + Kontext "DocumentWriter" printlog " Jump to beginning of document " Call wTypeKeys "" diff --git a/testautomation/writer/optional/includes/clipboard/w_210_.inc b/testautomation/writer/optional/includes/clipboard/w_210_.inc old mode 100755 new mode 100644 index 12926c8a486b..8f744c28fb6e --- a/testautomation/writer/optional/includes/clipboard/w_210_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_210_.inc @@ -225,7 +225,7 @@ testcase WriterToWriterFrame printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_frame.odt",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_frame.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -267,7 +267,7 @@ testcase WriterToWriterDrawingObject printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_draw.odt",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_draw.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -309,7 +309,7 @@ testcase WriterToWriterGraphicLinked printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_graphic1.odt",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_graphic1.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -351,7 +351,7 @@ testcase WriterToWriterGraphicEmbedded printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_graphic2.odt",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_graphic2.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -393,7 +393,7 @@ testcase WriterToWriterOLEObject printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_ole.odt",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_ole.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -435,7 +435,7 @@ testcase WriterToWriterControl printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_control.odt",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_control.odt",false) printlog " + Close saved document " Call hCloseDocument else diff --git a/testautomation/writer/optional/includes/clipboard/w_211_.inc b/testautomation/writer/optional/includes/clipboard/w_211_.inc old mode 100755 new mode 100644 index b385e745cf16..f40021cf38a1 --- a/testautomation/writer/optional/includes/clipboard/w_211_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_211_.inc @@ -79,7 +79,7 @@ testcase WriterToCalcText Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_text.ods",true) + hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_text.ods",true) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -133,7 +133,7 @@ testcase WriterToCalcField Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_field.ods",true) + hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_field.ods",true) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -192,7 +192,7 @@ testcase WriterToCalcTable kontext "navigator" if navigator.exists then navigator.close - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_table.ods",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_table.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -248,7 +248,7 @@ testcase WriterToCalcFrame Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_frame.ods",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_frame.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -302,7 +302,7 @@ testcase WriterToCalcDrawingObject Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_draw.ods",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_draw.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -357,7 +357,7 @@ testcase WriterToCalcGraphicLinked Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_graphic1.ods",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_graphic1.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -412,7 +412,7 @@ testcase WriterToCalcGraphicEmbedded Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_graphic2.ods",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_graphic2.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -466,7 +466,7 @@ testcase WriterToCalcOLEObject Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_ole.ods",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_ole.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -520,7 +520,7 @@ testcase WriterToCalcControl Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_calc_control.ods",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_control.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_212_.inc b/testautomation/writer/optional/includes/clipboard/w_212_.inc old mode 100755 new mode 100644 index 6c2a6e9c175e..8f13f3c46488 --- a/testautomation/writer/optional/includes/clipboard/w_212_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_212_.inc @@ -80,7 +80,7 @@ testcase WriterToImpressText Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_text.odp",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_text.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -134,7 +134,7 @@ testcase WriterToImpressField Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_field.odp",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_field.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -188,7 +188,7 @@ testcase WriterToImpressTable Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_table.odp",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_table.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -242,7 +242,7 @@ testcase WriterToImpressFrame Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_frame.odp",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_frame.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -296,7 +296,7 @@ testcase WriterToImpressDrawingObject Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_draw.odp",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_draw.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -350,7 +350,7 @@ testcase WriterToImpressGraphicLinked Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_graphic1.odp",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_graphic1.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -404,7 +404,7 @@ testcase WriterToImpressGraphicEmbedded Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_graphic2.odp",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_graphic2.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -458,7 +458,7 @@ testcase WriterToImpressOLEObject Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_ole.odp",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_ole.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -512,7 +512,7 @@ testcase WriterToImpressControl Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_impress_control.odp",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_control.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_213_.inc b/testautomation/writer/optional/includes/clipboard/w_213_.inc old mode 100755 new mode 100644 index 1cf8e50fa2de..ac11201662fb --- a/testautomation/writer/optional/includes/clipboard/w_213_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_213_.inc @@ -79,7 +79,7 @@ testcase WriterToDrawText Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_text.odg",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_text.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -133,7 +133,7 @@ testcase WriterToDrawField Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_field.odg",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_field.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -187,7 +187,7 @@ testcase WriterToDrawTable Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_table.odg",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_table.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -241,7 +241,7 @@ testcase WriterToDrawFrame Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_frame.odg",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_frame.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -295,7 +295,7 @@ testcase WriterToDrawDrawingObject Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_draw.odg",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_draw.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -350,7 +350,7 @@ testcase WriterToDrawGraphicLinked Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_graphic1.odg",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_graphic1.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -405,7 +405,7 @@ testcase WriterToDrawGraphicEmbedded Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_graphic2.odg",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_graphic2.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -459,7 +459,7 @@ testcase WriterToDrawOLEObject Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_ole.odg",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_ole.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -513,7 +513,7 @@ testcase WriterToDrawControl Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_draw_control.odg",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_control.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_214_.inc b/testautomation/writer/optional/includes/clipboard/w_214_.inc old mode 100755 new mode 100644 index 5f6521b4ae67..d02caff65d76 --- a/testautomation/writer/optional/includes/clipboard/w_214_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_214_.inc @@ -78,7 +78,7 @@ testcase WriterToHTMLText Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_text.html") + hFileOpenLocally( gOfficepath + "user\work\writer_to_html_text.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -131,7 +131,7 @@ testcase WriterToHTMLField Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_field.html") + hFileOpenLocally( gOfficepath + "user\work\writer_to_html_field.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -184,7 +184,7 @@ testcase WriterToHTMLTable Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_table.html") + hFileOpenLocally( gOfficepath + "user\work\writer_to_html_table.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -237,7 +237,7 @@ testcase WriterToHTMLFrame Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_frame.html") + hFileOpenLocally( gOfficepath + "user\work\writer_to_html_frame.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -290,7 +290,7 @@ testcase WriterToHTMLDrawingObject Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_draw.html") + hFileOpenLocally( gOfficepath + "user\work\writer_to_html_draw.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -343,7 +343,7 @@ testcase WriterToHTMLGraphicLinked Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_graphic1.html") + hFileOpenLocally( gOfficepath + "user\work\writer_to_html_graphic1.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -396,7 +396,7 @@ testcase WriterToHTMLGraphicEmbedded Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_graphic2.html") + hFileOpenLocally( gOfficepath + "user\work\writer_to_html_graphic2.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -449,7 +449,7 @@ testcase WriterToHTMLOLEObject Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_ole.html") + hFileOpenLocally( gOfficepath + "user\work\writer_to_html_ole.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -502,7 +502,7 @@ testcase WriterToHTMLControl Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\writer_to_html_control.html") + hFileOpenLocally( gOfficepath + "user\work\writer_to_html_control.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_215_.inc b/testautomation/writer/optional/includes/clipboard/w_215_.inc old mode 100755 new mode 100644 index 95883f35ae1b..74669a4f29b0 --- a/testautomation/writer/optional/includes/clipboard/w_215_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_215_.inc @@ -50,8 +50,8 @@ testcase CalcToWriterText1 printlog " Jump to beginning of document " printlog " Select cell " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " DocumentCalc.TypeKeys "" @@ -113,8 +113,8 @@ testcase CalcToWriterText2 printlog " Jump to beginning of document " printlog " Select cell , press F2 and select all " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " DocumentCalc.TypeKeys "" @@ -147,7 +147,7 @@ testcase CalcToWriterText2 Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_textformat_cellcontent.odt",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_textformat_cellcontent.odt",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -168,8 +168,8 @@ testcase CalcToWriterCalculation printlog " Jump to beginning of document " printlog " Select cell " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " DocumentCalc.TypeKeys "" @@ -232,8 +232,8 @@ testcase CalcToWriterHyperlink1 printlog " Jump to beginning of document " printlog " Select cell " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " DocumentCalc.TypeKeys "" @@ -295,8 +295,8 @@ testcase CalcToWriterHyperlink2 printlog " Jump to beginning of document " printlog " Select cell " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " DocumentCalc.TypeKeys "" @@ -329,7 +329,7 @@ testcase CalcToWriterHyperlink2 Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_hyperlink_cellcontent.odt",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_hyperlink_cellcontent.odt",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -350,8 +350,8 @@ testcase CalcToWriterDrawObject printlog " Jump to beginning of document " printlog " Select Drawing object " printlog " Copy selected object " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " Call wNavigatorAuswahl(8,1) @@ -381,7 +381,7 @@ testcase CalcToWriterDrawObject Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_draw.odt",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_draw.odt",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -402,8 +402,8 @@ testcase CalcToWriterOLE printlog " Jump to beginning of document " printlog " Select OLE-Object " printlog " Copy selected object " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\calc.sxc") + Kontext "DocumentCalc" printlog " Jump to beginning of document " Call wNavigatorAuswahl(6,1) @@ -433,7 +433,7 @@ testcase CalcToWriterOLE Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\writer_to_writer_ole.odt",false) + hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_ole.odt",false) Wait 500 printlog " Close saved document " Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_216_.inc b/testautomation/writer/optional/includes/clipboard/w_216_.inc old mode 100755 new mode 100644 index 3952ece03e4c..1537d2969692 --- a/testautomation/writer/optional/includes/clipboard/w_216_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_216_.inc @@ -50,8 +50,8 @@ testcase HTMLToWRITERText printlog " Jump to beginning of document " printlog " Select first paragraph " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + sleep (3) if GetDocumentCount() = 2 then Warnlog "#i104365#read only document remains opened" @@ -122,8 +122,8 @@ testcase HTMLToWRITERField printlog " Jump to beginning of document " printlog " Select paragraph with 'Date Field' " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + if GetDocumentCount() = 2 then Warnlog "#i104365#read only document remains opened" endif @@ -192,8 +192,8 @@ testcase HTMLToWRITERTable printlog " Jump to beginning of document " printlog " Select 'Table' " printlog " Copy selected table " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + if GetDocumentCount() = 2 then Warnlog "#i104365#read only document remains opened" endif @@ -262,8 +262,8 @@ testcase HTMLToWRITERGraphicLinked printlog " Jump to beginning of document " printlog " Select 'Linked Graphic' " printlog " Copy selected Linked Graphic " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + if GetDocumentCount() = 2 then Warnlog "#i104365#read only document remains opened" endif @@ -297,7 +297,7 @@ testcase HTMLToWRITERGraphicLinked Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_writer_graphic1.odt",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_writer_graphic1.odt",false) printlog " Reopen saved document " Wait 500 printlog " Close saved document " @@ -321,8 +321,8 @@ testcase HTMLToWRITERControl printlog " Jump to beginning of document " printlog " Select 'Control' " printlog " Copy selected Control " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + if GetDocumentCount() = 2 then Warnlog "#i104365#read only document remains opened" endif @@ -357,7 +357,7 @@ testcase HTMLToWRITERControl Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_writer_control.odt",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_writer_control.odt",false) printlog " Reopen saved document " Wait 500 printlog " Close saved document " @@ -381,8 +381,8 @@ testcase HTMLToWRITERFloatingFrame printlog " Jump to beginning of document " printlog " Select 'Floating Frame' " printlog " Copy selected Floating Frame " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + if GetDocumentCount() = 2 then Warnlog "#i104365#read only document remains opened" endif @@ -423,7 +423,7 @@ testcase HTMLToWRITERFloatingFrame Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_writer_float.odt",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_writer_float.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_217_.inc b/testautomation/writer/optional/includes/clipboard/w_217_.inc old mode 100755 new mode 100644 index fcb6b450803a..de3f78367e24 --- a/testautomation/writer/optional/includes/clipboard/w_217_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_217_.inc @@ -49,8 +49,8 @@ testcase HTMLToCALCText printlog " Jump to beginning of document " printlog " Select first paragraph " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys "" @@ -115,8 +115,8 @@ testcase HTMLToCALCField printlog " Jump to beginning of document " printlog " Select paragraph with 'Date Field' " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys "",2 @@ -149,7 +149,7 @@ testcase HTMLToCALCField Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_calc_field.ods",true) + hFileOpenLocally( gOfficepath + "user\work\html_to_calc_field.ods",true) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -172,8 +172,8 @@ testcase HTMLToCALCTable printlog " Jump to beginning of document " printlog " Select 'Table' " printlog " Copy selected table " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys "",5 @@ -203,7 +203,7 @@ testcase HTMLToCALCTable printlog " Save document as ..\user\work\html_to_calc_table.ods" Call hCloseDocument printlog " Close saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_calc_table.ods",true) + hFileOpenLocally( gOfficepath + "user\work\html_to_calc_table.ods",true) printlog " Reopen saved document " Call hCloseDocument printlog " Close saved document " @@ -226,8 +226,8 @@ testcase HTMLToCALCGraphicLinked printlog " Jump to beginning of document " printlog " Select 'Linked Graphic' " printlog " Copy selected Linked Graphic " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys ( "" ) @@ -260,7 +260,7 @@ testcase HTMLToCALCGraphicLinked Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_calc_graphic1.ods",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_calc_graphic1.ods",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -283,8 +283,8 @@ testcase HTMLToCALCControl printlog " Jump to beginning of document " printlog " Select 'Control' " printlog " Copy selected Control " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys ( "" ) @@ -317,7 +317,7 @@ testcase HTMLToCALCControl Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_calc_control.ods",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_calc_control.ods",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -340,8 +340,8 @@ testcase HTMLToCALCFloatingFrame printlog " Jump to beginning of document " printlog " Select 'Floating Frame' " printlog " Copy selected Floating Frame " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html",false) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html",false) + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys ( "" ) @@ -378,7 +378,7 @@ testcase HTMLToCALCFloatingFrame printlog " Close saved document " Call hCloseDocument printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_calc_float.ods",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_calc_float.ods",false) printlog " Close saved document " Call hCloseDocument else diff --git a/testautomation/writer/optional/includes/clipboard/w_218_.inc b/testautomation/writer/optional/includes/clipboard/w_218_.inc old mode 100755 new mode 100644 index 6788407f6c05..fb8aae68a7ec --- a/testautomation/writer/optional/includes/clipboard/w_218_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_218_.inc @@ -49,8 +49,8 @@ testcase HTMLToDRAWText printlog " + Jump to beginning of document " printlog " + Select first paragraph " printlog " + Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys "" @@ -115,8 +115,8 @@ testcase HTMLToDRAWField printlog " + Jump to beginning of document " printlog " + Select paragraph with 'Date Field' " printlog " + Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys "",2 @@ -154,7 +154,7 @@ testcase HTMLToDRAWField Call hCloseDocument sleep (2) printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_draw_field.odg",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_draw_field.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument @@ -177,8 +177,8 @@ testcase HTMLToDRAWTable printlog " + Jump to beginning of document " printlog " + Select 'Table' " printlog " + Copy selected table " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys "",5 @@ -211,7 +211,7 @@ testcase HTMLToDRAWTable Call hCloseDocument wait 500 printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_draw_table.odg",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_draw_table.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument @@ -234,8 +234,8 @@ testcase HTMLToDRAWGraphicLinked printlog " + Jump to beginning of document " printlog " + Select 'Linked Graphic' " printlog " + Copy selected Linked Graphic " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys ( "" ) @@ -267,7 +267,7 @@ testcase HTMLToDRAWGraphicLinked Call hCloseDocument wait 500 printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_draw_graphic1.odg",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_draw_graphic1.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument @@ -290,8 +290,8 @@ testcase HTMLToDRAWControl printlog " + Jump to beginning of document " printlog " + Select 'Control' " printlog " + Copy selected Control " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys ( "" ) @@ -324,7 +324,7 @@ testcase HTMLToDRAWControl Call hCloseDocument wait 500 printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_draw_control.odg",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_draw_control.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument @@ -347,8 +347,8 @@ testcase HTMLToDRAWFloatingFrame printlog " + Jump to beginning of document " printlog " + Select 'Floating Frame' " printlog " + Copy selected Floating Frame " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys ( "" ) @@ -386,7 +386,7 @@ testcase HTMLToDRAWFloatingFrame Call hCloseDocument wait 500 printlog " + Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_draw_float.odg",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_draw_float.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_219_.inc b/testautomation/writer/optional/includes/clipboard/w_219_.inc old mode 100755 new mode 100644 index 74ca4d7c5f71..8ce54912c15c --- a/testautomation/writer/optional/includes/clipboard/w_219_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_219_.inc @@ -49,8 +49,8 @@ testcase HTMLToIMPRESSText printlog " Jump to beginning of document " printlog " Select first paragraph " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys "" @@ -115,8 +115,8 @@ testcase HTMLToIMPRESSField printlog " Jump to beginning of document " printlog " Select paragraph with 'Date Field' " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys "",2 @@ -149,7 +149,7 @@ testcase HTMLToIMPRESSField Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_impress_field.odp",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_impress_field.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -172,8 +172,8 @@ testcase HTMLToIMPRESSTable printlog " Jump to beginning of document " printlog " Select 'Table' " printlog " Copy selected table " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys "",5 @@ -206,7 +206,7 @@ testcase HTMLToIMPRESSTable Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_impress_table.odp",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_impress_table.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -229,8 +229,8 @@ testcase HTMLToIMPRESSGraphicLinked printlog " Jump to beginning of document " printlog " Select 'Linked Graphic' " printlog " Copy selected Linked Graphic " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys ( "" ) @@ -262,7 +262,7 @@ testcase HTMLToIMPRESSGraphicLinked Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_impress_graphic1.odp",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_impress_graphic1.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -285,8 +285,8 @@ testcase HTMLToIMPRESSControl printlog " Jump to beginning of document " printlog " Select 'Control' " printlog " Copy selected Control " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys ( "" ) @@ -319,7 +319,7 @@ testcase HTMLToIMPRESSControl Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_impress_control.odp",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_impress_control.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -342,8 +342,8 @@ testcase HTMLToIMPRESSFloatingFrame printlog " Jump to beginning of document " printlog " Select 'Floating Frame' " printlog " Copy selected Floating Frame " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys ( "" ) @@ -381,7 +381,7 @@ testcase HTMLToIMPRESSFloatingFrame Call hCloseDocument wait 500 printlog " Reopen saved document " - Call hFileOpen (gOfficepath + "user\work\html_to_impress_float.odp",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_impress_float.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_220_.inc b/testautomation/writer/optional/includes/clipboard/w_220_.inc old mode 100755 new mode 100644 index e938ba027fd1..8e494c0e8af4 --- a/testautomation/writer/optional/includes/clipboard/w_220_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_220_.inc @@ -54,8 +54,8 @@ testcase HTMLToHTMLText printlog " Jump to beginning of document " printlog " Select first paragraph " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys "" @@ -86,7 +86,7 @@ testcase HTMLToHTMLText Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_html_text.html",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_html_text.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -110,8 +110,8 @@ testcase HTMLToHTMLField printlog " Jump to beginning of document " printlog " Select paragraph with 'Date Field' " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys "",2 @@ -143,7 +143,7 @@ testcase HTMLToHTMLField Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_html_field.html",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_html_field.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -167,8 +167,8 @@ testcase HTMLToHTMLTable printlog " Jump to beginning of document " printlog " Select 'Table' " printlog " Copy selected table " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys "",5 @@ -200,7 +200,7 @@ testcase HTMLToHTMLTable Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_html_table.html",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_html_table.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -224,8 +224,8 @@ testcase HTMLToHTMLGraphicLinked printlog " Jump to beginning of document " printlog " Select 'Linked Graphic' " printlog " Copy selected Linked Graphic " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys ( "" ) @@ -256,7 +256,7 @@ testcase HTMLToHTMLGraphicLinked Call hCloseDocument printlog " Close saved document " sleep (2) - Call hFileOpen (gOfficepath + "user\work\html_to_html_graphic1.html",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_html_graphic1.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -280,8 +280,8 @@ testcase HTMLToHTMLControl printlog " Jump to beginning of document " printlog " Select 'Control' " printlog " Copy selected Control " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys ( "" ) @@ -313,7 +313,7 @@ testcase HTMLToHTMLControl Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_html_control.html",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_html_control.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -337,8 +337,8 @@ testcase HTMLToHTMLFloatingFrame printlog " Jump to beginning of document " printlog " Select 'Floating Frame' " printlog " Copy selected Floating Frame " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\html.html") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\html.html") + printlog " Jump to beginning of document " Call wTypeKeys "" Call wTypeKeys ( "" ) @@ -375,7 +375,7 @@ testcase HTMLToHTMLFloatingFrame Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\html_to_html_float.html",false) + hFileOpenLocally( gOfficepath + "user\work\html_to_html_float.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_221_.inc b/testautomation/writer/optional/includes/clipboard/w_221_.inc old mode 100755 new mode 100644 index 4b5818065244..0436ef6531d4 --- a/testautomation/writer/optional/includes/clipboard/w_221_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_221_.inc @@ -50,8 +50,8 @@ testcase DrawToHTMLScrollingText printlog " + Jump to beginning of document " printlog " + Select Scrolling text " printlog " + Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "" @@ -80,7 +80,7 @@ testcase DrawToHTMLScrollingText Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_scrolling_text.html",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_html_scrolling_text.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -105,8 +105,8 @@ testcase DrawToHTMLGroupedObject printlog " + Jump to beginning of document " printlog " + Select Grouped Object " printlog " + Copy selected Object " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "",2 @@ -135,7 +135,7 @@ testcase DrawToHTMLGroupedObject Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_grouped_object.html",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_html_grouped_object.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -160,8 +160,8 @@ testcase DrawToHTML3D printlog " + Jump to beginning of document " printlog " + Select cell " printlog " + Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "",3 @@ -190,7 +190,7 @@ testcase DrawToHTML3D Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_3d.html",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_html_3d.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -215,8 +215,8 @@ testcase DrawToHTMLFontwork printlog " + Jump to beginning of document " printlog " + Select Fontwork " printlog " + Copy selected Fontwork " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "",4 @@ -245,7 +245,7 @@ testcase DrawToHTMLFontwork Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_fontwork.html",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_html_fontwork.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -270,8 +270,8 @@ testcase DrawToHTMLBullets printlog " + Jump to beginning of document " printlog " + Select Bullets " printlog " + Copy selected Bullets " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "",5 @@ -300,7 +300,7 @@ testcase DrawToHTMLBullets Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_bullets.html",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_html_bullets.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -325,8 +325,8 @@ testcase DrawToHTMLDimensionLines printlog " + Jump to beginning of document " printlog " + Select Dimension Lines " printlog " + Copy selected Dimension Lines " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "" @@ -356,7 +356,7 @@ testcase DrawToHTMLDimensionLines Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_dim_lines.html",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_html_dim_lines.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -381,8 +381,8 @@ testcase DrawToHTMLConnectors printlog " + Jump to beginning of document " printlog " + Select Connectors " printlog " + Copy selected Connectors " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "" @@ -412,7 +412,7 @@ testcase DrawToHTMLConnectors Call hCloseDocument printlog " + Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_html_connectors.html",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_html_connectors.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_222_.inc b/testautomation/writer/optional/includes/clipboard/w_222_.inc old mode 100755 new mode 100644 index 1efb0e67fda4..488f0d40ca6d --- a/testautomation/writer/optional/includes/clipboard/w_222_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_222_.inc @@ -51,8 +51,8 @@ testcase DrawToWriterScrollingText printlog " Jump to beginning of document " printlog " Select Scrolling text " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "" @@ -81,7 +81,7 @@ testcase DrawToWriterScrollingText Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_scrolling_text.odt",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_scrolling_text.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -106,8 +106,8 @@ testcase DrawToWriterGroupedObject printlog " Jump to beginning of document " printlog " Select Grouped Object " printlog " Copy selected Object " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "",2 @@ -136,7 +136,7 @@ testcase DrawToWriterGroupedObject Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_grouped_object.odt",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_grouped_object.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -161,8 +161,8 @@ testcase DrawToWriter3D printlog " Jump to beginning of document " printlog " Select cell " printlog " Copy selected text " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "",3 @@ -191,7 +191,7 @@ testcase DrawToWriter3D Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_3d.odt",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_3d.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -216,8 +216,8 @@ testcase DrawToWriterFontwork printlog " Jump to beginning of document " printlog " Select Fontwork " printlog " Copy selected Fontwork " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "",4 @@ -246,7 +246,7 @@ testcase DrawToWriterFontwork Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_fontwork.odt",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_fontwork.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -271,8 +271,8 @@ testcase DrawToWriterBullets printlog " Jump to beginning of document " printlog " Select Bullets " printlog " Copy selected Bullets " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "",5 @@ -301,7 +301,7 @@ testcase DrawToWriterBullets Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_bullets.odt",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_bullets.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -326,8 +326,8 @@ testcase DrawToWriterDimensionLines printlog " Jump to beginning of document " printlog " Select Dimension Lines " printlog " Copy selected Dimension Lines " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "" @@ -357,7 +357,7 @@ testcase DrawToWriterDimensionLines Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_dim_lines.odt",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_dim_lines.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -382,8 +382,8 @@ testcase DrawToWriterConnectors printlog " Jump to beginning of document " printlog " Select Connectors " printlog " Copy selected Connectors " - Call hFileOpen (gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath & "writer\optional\input\clipboard\draw.sxd") + Kontext "DocumentDraw" printlog " Jump to beginning of document " DocumentDraw.TypeKeys "" @@ -413,7 +413,7 @@ testcase DrawToWriterConnectors Call hCloseDocument printlog " Close saved document " wait 500 - Call hFileOpen (gOfficepath + "user\work\draw_to_writer_connectors.odt",false) + hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_connectors.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc old mode 100755 new mode 100644 index 8b6b8e8329e8..43b16a2878a0 --- a/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc +++ b/testautomation/writer/optional/includes/drawing/w_drawing_tools2.inc @@ -636,8 +636,8 @@ testcase tGroup_12 Call hCloseDocument PrintLog "- Open previous saved document " - Call hFileOpen (sDocument) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sDocument) + Kontext "DocumentWriter" Call gMouseClick(34,34) 'set focus in the group diff --git a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc old mode 100755 new mode 100644 index 6c4b39d0263f..7e1eee588127 --- a/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc +++ b/testautomation/writer/optional/includes/dropdownLB/w_dropdownLB1.inc @@ -1024,8 +1024,8 @@ testcase tDropDownLB_17 PrintLog "- Open a new document" Call hNewDocument PrintLog "- Open a word document which includes 2 entries." - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Kontext "EditInputList" if EditInputList.Exists then EditInputList.Cancel diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc old mode 100755 new mode 100644 index 4f2c5c39388c..0f10d2b9ef42 --- a/testautomation/writer/optional/includes/fields/w_fields2.inc +++ b/testautomation/writer/optional/includes/fields/w_fields2.inc @@ -319,8 +319,8 @@ testcase tDocumentChapter Call hNewDocument '/// Open test file chapterTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Call wTypeKeys "" @@ -416,7 +416,7 @@ testcase tDocumentFilename Call hNewDocument '/// Open test file pageTest.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) Call wTypeKeys "" Call wTypeKeys "" @@ -470,8 +470,8 @@ testcase tDocumentPage Call hNewDocument '/// Open test file pageTest.sxw which includes 3 pages - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Go to the 2nd page Call wTypeKeys "" @@ -890,7 +890,7 @@ testcase tDocumentStatistics '/// Open test file statisticsTest.sxw which includes '/// 2 tables , 2 pictures , 22 paragraph , 1 object , '/// 2 words , 12 characters and 2 pages - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) Call wTypeKeys "" @@ -958,7 +958,7 @@ testcase tDocumentTemplate '/// Insert/Fields/Other/Document / Template '/// Open test file diploma.ott - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) Call wTypeKeys "" diff --git a/testautomation/writer/optional/includes/fields/w_fields3.inc b/testautomation/writer/optional/includes/fields/w_fields3.inc old mode 100755 new mode 100644 index 7b4e7f50722b..64261c7e1ac6 --- a/testautomation/writer/optional/includes/fields/w_fields3.inc +++ b/testautomation/writer/optional/includes/fields/w_fields3.inc @@ -94,8 +94,8 @@ testcase tSetReferenceNoSelection Call hNewDocument '/// Open test file pageTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set curson to the 2nd page Call wTypeKeys "" @@ -182,8 +182,8 @@ testcase tInsertReferencePage Call hNewDocument '/// Open test file pageTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set curson to the 2nd page Call wTypeKeys "" @@ -242,8 +242,8 @@ testcase tInsertReferenceChapter Call hNewDocument '/// Open test file chapterTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set curson to the 2nd line Call wTypeKeys "" @@ -685,8 +685,8 @@ testcase tInsertBookmarkPage Call hNewDocument '/// Open test file pageTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set curson to the 2nd page Call wTypeKeys "" @@ -743,8 +743,8 @@ testcase tInsertBookmarkChapter Call hNewDocument '/// Open test file chapterTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Set curson to the 2nd line Call wTypeKeys "" diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc old mode 100755 new mode 100644 index d1e16a1a36be..fb5a67ce8bb7 --- a/testautomation/writer/optional/includes/fields/w_fields4.inc +++ b/testautomation/writer/optional/includes/fields/w_fields4.inc @@ -67,8 +67,8 @@ testcase tDocInformationTitle Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// File / Properties / Description , input some '/// + new text in Title @@ -119,8 +119,8 @@ testcase tDocInformationSubject Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// File / Properties / Description , input some '/// + text in Subject @@ -171,8 +171,8 @@ testcase tDocInformationKeywords Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// File / Properties / Description , input some '/// + text in Keywords @@ -223,8 +223,8 @@ testcase tDocInformationDescription Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// File / Properties / Description , input some '/// + text in Description @@ -301,7 +301,7 @@ testcase tDocInformationUserDefined Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) '/// File / Properties / Description , input some '/// + text in Description @@ -378,8 +378,8 @@ testcase tDocInformationCreated Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Call fFindWord ("Created") Call wTypeKeys "" @@ -495,7 +495,7 @@ testcase tDocInformationModified Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) Call hFileSaveAsKill (sSaveAsFile) Call fFindWord ("Modified") @@ -632,7 +632,7 @@ testcase tDocInformationModifiedSavefile Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) Call fFindWord ("Modified") Call wTypeKeys "" @@ -749,7 +749,7 @@ testcase tDocInformationPrinted Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) Call fFindWord ("Last printed") Call wTypeKeys "" @@ -873,7 +873,7 @@ testcase tDocInformationRevisionnumber Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) '/// Change author to author : Test2 Test1 ToolsOptions @@ -972,7 +972,7 @@ testcase tDocInformationTotaleditingtime Call hNewDocument '/// Open test file fields_docinfos.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) '/// Save the file as another file Call hFileSaveAsKill(sSaveAsFile) diff --git a/testautomation/writer/optional/includes/fields/w_fields5.inc b/testautomation/writer/optional/includes/fields/w_fields5.inc old mode 100755 new mode 100644 index 334d01906307..75f94e8a3351 --- a/testautomation/writer/optional/includes/fields/w_fields5.inc +++ b/testautomation/writer/optional/includes/fields/w_fields5.inc @@ -722,7 +722,7 @@ testcase tVariablesDDEFieldManual '/// Open the test file which you just closed , add something , '/// Save the file - Call hFileOpen(sDDEFile) + hFileOpenLocally( sDDEFile) Call wTypeKeys "" Call wTypeKeys "XYZ" FileSave @@ -818,7 +818,7 @@ testcase tVariablesDDEFieldAutomatic '/// Open the test file which you just closed , add something , '/// Save the file - Call hFileOpen(sDDEFile) + hFileOpenLocally( sDDEFile) Call wTypeKeys "" Call wTypeKeys "XYZ" FileSave diff --git a/testautomation/writer/optional/includes/fields/w_fields6.inc b/testautomation/writer/optional/includes/fields/w_fields6.inc old mode 100755 new mode 100644 index e310b67740af..f29eff451edb --- a/testautomation/writer/optional/includes/fields/w_fields6.inc +++ b/testautomation/writer/optional/includes/fields/w_fields6.inc @@ -795,8 +795,8 @@ testcase tFunctionsCombineCharacter Call hNewDocument '/// Open test file pageTest.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Call wTypeKeys "" Call wTypeKeys "" diff --git a/testautomation/writer/optional/includes/fields/w_fields7.inc b/testautomation/writer/optional/includes/fields/w_fields7.inc old mode 100755 new mode 100644 index 5893e324366b..af3e73c284b1 --- a/testautomation/writer/optional/includes/fields/w_fields7.inc +++ b/testautomation/writer/optional/includes/fields/w_fields7.inc @@ -119,8 +119,8 @@ testcase tL10NtestAboveBelow Call hNewDocument '/// Open test file AboveBelow.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Check if reference above/below is changed after language is changed @@ -248,7 +248,7 @@ testcase tL10NtestDate Call hNewDocument '/// Open test file Date.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) '/// Check if Date is changed after language is changed j = UBound(iCountry) @@ -371,7 +371,7 @@ testcase tL10NtestTime Call hNewDocument '/// Open test file Time.sxw - Call hFileOpen(sTestFile) + hFileOpenLocally( sTestFile ) '/// Check if time is changed after language is changed j = UBound(iCountry) diff --git a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc old mode 100755 new mode 100644 index eb2de884a8cc..7b8b0e61d784 --- a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc +++ b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc @@ -243,9 +243,9 @@ testcase tFormatCharacter3 Call hCloseDocument printlog "reopen previous saved document and check saved character format" if gApplication = "WRITER" then - Call hFileOpen ( gOfficePath + "user\work\format1.odt" ) + hFileOpenLocally( gOfficePath + "user\work\format1.odt" ) else - Call hFileOpen ( gOfficePath + "user\work\format1.odm" ) + hFileOpenLocally( gOfficePath + "user\work\format1.odm" ) end if Call wTypeKeys "" Wait 500 @@ -579,9 +579,9 @@ testcase tFormatCharacter Call hCloseDocument printlog "re-open previous saved document" if gApplication = "WRITER" then - Call hFileOpen ( gOfficePath + "user\work\format1.odt" ) + hFileOpenLocally( gOfficePath + "user\work\format1.odt" ) else - Call hFileOpen ( gOfficePath + "user\work\format1.odm" ) + hFileOpenLocally( gOfficePath + "user\work\format1.odm" ) end if Call wTypeKeys "" Wait 500 diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc index 84a5c5281f8b..c597fef06f87 100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc @@ -348,7 +348,7 @@ testcase tFormatPage_6 Call hNewDocument - Call hFileOpen(gOfficepath + "user\work\tFormatPage_6.odt") + hFileOpenLocally( gOfficepath + "user\work\tFormatPage_6.odt") '/// Check if Pre-defined formats are correct fFormatPageWriter("TabSeite") @@ -602,8 +602,8 @@ testcase tFormatPage_11 '/// Open a test file , '/// + There are 2 pictures in 2 pages separately , '/// + and they are anchored as character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// FormatPage / tabpage Page , Set left margins to 10cm , '/// + and set page layout to "Right to left" @@ -662,8 +662,8 @@ testcase tFormatPage_12 '/// Open a test file , '/// + there are 2 pictures in 2 pages separately , and they are anchored as character - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// FormatPage / tabpage Page , Set left margins to 10cm , '/// + and set page layout to "Mirrored" @@ -724,8 +724,8 @@ testcase tFormatPage_13 '/// Open a test file , '/// + there are 2 pictures in 2 pages separately - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// FormatPage / tabpage Page , Set left margins to 10cm , '/// + and set page layout to "Only right" @@ -781,8 +781,8 @@ testcase tFormatPage_14 '/// Open a test file , '/// + there are 2 pictures in 2 pages separately - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// FormatPage / tabpage Page , Set left margins to 10cm , '/// + and set page layout to "Only left" diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc old mode 100755 new mode 100644 index 290b1a395b94..a191efc726cf --- a/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage2.inc @@ -60,8 +60,8 @@ testcase tFormatPage_16 Call hNewDocument '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -151,8 +151,8 @@ testcase tFormatPage_17 Call hNewDocument '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -255,8 +255,8 @@ testcase tFormatPage_18 Call hNewDocument '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -340,8 +340,8 @@ testcase tFormatPage_19 Call hNewDocument '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -417,8 +417,8 @@ testcase tFormatPage_20 Call hNewDocument '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -507,8 +507,8 @@ testcase tFormatPage_21 '/// AutoFit height - Check (Footer,multiline content) '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -613,8 +613,8 @@ testcase tFormatPage_22 Call hNewDocument '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" @@ -697,8 +697,8 @@ testcase tFormatPage_23 '/// AutoFit height - UnCheck (Footer,multiline content) '/// Open test file testForAutoFit.sxw - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Open Navigator and enter as page number 2 Kontext "Navigator" diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc index 784f6dad28cc..f4954d106df6 100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc @@ -71,8 +71,8 @@ testcase tFormatPage_29 '/// Open test file testHeaderContent29.sxw '/// + (The test file include 2 pages , and the '/// + content in header are different ) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage header , check 'same content left/right' fFormatPageWriter("TabKopfzeile") @@ -159,8 +159,8 @@ testcase tFormatPage_30 '/// Open test file testHeaderContent30.sxw '/// + (The test file include 2 pages , and the '/// + content in header is same ) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage header , Uncheck 'same content left/right' fFormatPageWriter("TabKopfzeile") @@ -226,8 +226,8 @@ testcase tFormatPage_31 '/// Open test file testFooterContent31.sxw '/// + (The test file include 2 pages , and the content '/// + in footer are different ) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// + formatPage , tabpage footer , check 'same content left/right' fFormatPageWriter("TabFusszeile") @@ -314,8 +314,8 @@ testcase tFormatPage_32 '/// Open test file testFooterContent32.sxw '/// + (The test file include 2 pages , and the '/// + content in footer is same ) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage footer , Uncheck 'same content left/right' fFormatPageWriter("TabFusszeile") @@ -743,8 +743,8 @@ testcase tFormatPage_39 '/// Open test file testColumnInPage.sxw '/// + (The test file includes 2 pages , some text '/// + is in 1st page and another is in 2nd page) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage columns , change column to 3 via controls fFormatPageWriter("TabSpalten") @@ -808,8 +808,8 @@ testcase tFormatPage_40 '/// Open test file testColumnInPage.sxw '/// + (The test file includes 2 pages , some text is '/// + in 1st page and another is in 2nd page) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage columns , change column to 3 via spinfield fFormatPageWriter("TabSpalten") @@ -882,8 +882,8 @@ testcase tFormatPage_41 '/// Open test file testColumnInPage2.sxw '/// + (The test file includes 2 pages , some text is '/// + in 1st page and another is in 2nd page) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Create 3 with different columns . formatPage , '/// + tabpage columns , set 3 columns @@ -973,8 +973,8 @@ testcase tFormatPage_42 '/// Open test file testColumnInPage2.sxw '/// + (The test file includes 2 pages , some text is '/// + in 1st page and another is in 2nd page) - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage columns , set 3 columns fFormatPageWriter("TabSpalten") @@ -1136,8 +1136,8 @@ testcase tFormatPage_45 '/// Open test file testSeparatorLine.sxw '/// + (The test file includes 6 columns , some '/// + test text lllll... is in 2nd column - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + Kontext EditSearchAndReplace @@ -1263,7 +1263,7 @@ testcase tFormatPage_46 Call hCloseDocument Call hNewDocument - Call hFileOpen(gOfficepath + "user\work\tFormatPage_46.odt") + hFileOpenLocally( gOfficepath + "user\work\tFormatPage_46.odt") '/// Check if the setting are still kept fFormatPageWriter("TabSpalten") diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc index 9b800e3bad4b..526cf111bc16 100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc @@ -375,8 +375,8 @@ testcase tFormatPage_53 '/// Open test file testColumnVertical.sxw '/// + There are 8 columns in the page , and a test '/// + word is in 3rd column - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// formatPage , tabpage page, select right to left (vertical) Call fFormatPageWriter("TabSeite") @@ -763,8 +763,8 @@ testcase tFormatPage_60 Call hCloseDocument Call hNewDocument - Call hFileOpen(gOfficepath + "user\work\tFormatPage_60.odt") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gOfficepath + "user\work\tFormatPage_60.odt") + '/// check if the configuration is all right fFormatPageWriter("TabUmrandung") diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc old mode 100755 new mode 100644 index 4fa007cfc4b0..7c31482e37af --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph1.inc @@ -366,8 +366,8 @@ testcase tParagraphIndent5 '/// Open the test file '/// This file includes 2 paragraphs , and the end of 2nd paragraph is in 1st page - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set the focus to 2nd paragraph Kontext @@ -426,8 +426,8 @@ testcase tParagraphIndent6 '/// Open the test file '/// This file includes 2 paragraphs , and the end of 2nd paragraph is in 1st page - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set the focus to 1st paragraph Kontext @@ -494,8 +494,8 @@ testcase tParagraphIndent7 '/// if the spacing is adopted 1cm ,2nd paragrahp will be in 1st page '/// if the spacing is adopted 2cm ,2nd paragrahp part will be in 1st page , part will be in 2nd page '/// if the spacing is adopted 3cm ,2nd paragrahp will be in 2nd page - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set the focus to the end of the 1st paragraph Kontext @@ -582,8 +582,8 @@ testcase tParagraphIndent8 '/// if the spacing is adopted 1cm ,2nd paragrahp will be in 1st page '/// if the spacing is adopted 2cm ,2nd paragrahp part will be in 1st page , part will be in 2nd page '/// if the spacing is adopted 3cm ,2nd paragrahp will be in 2nd page - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Set the focus to the end of the 1st paragraph Kontext @@ -642,8 +642,8 @@ testcase tParagraphIndent9 '/// Open the test file '/// This file includes 8 lines , '/// + when the spacing is single line , the 8 lines should be in 1 page as design. - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Indents & Spacing , select single line in Line spacing Call fFormatParagraph("TabEinzuegeUndAbstaende") @@ -683,8 +683,8 @@ testcase tParagraphIndent10 '/// This file includes 8 lines '/// when the spacing is 1.5 lines , '/// + the last 2(or 3) lines should be in 2nd page. - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Indents & Spacing , select 1.5 lines in Line spacing Call fFormatParagraph("TabEinzuegeUndAbstaende") @@ -753,8 +753,8 @@ testcase tParagraphIndent11 '/// This file includes 8 lines '/// when the spacing is Double lines , the first 4 lines should be in 1st page '/// + the last 4 lines should be in 2nd page. - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Indents & Spacing , select Double lines in Line spacing Call fFormatParagraph("TabEinzuegeUndAbstaende") @@ -833,8 +833,8 @@ testcase tParagraphIndent12 '/// This file includes 8 lines '/// when the spacing Proportional is more than 200% , '/// + then it will change to be Double line automatically - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Indents & Spacing , '/// + select Proportional in Line spacing , and input 300% @@ -907,8 +907,8 @@ testcase tParagraphIndent13 '/// This file includes 8 lines and 1 pic is anchored as character in 1st line '/// when the spacing is At least to 4cm, there should be 1 line/page '/// + and the pic should move down - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Get the original coordinate-Y Call wTypeKeys ( "" ) @@ -976,8 +976,8 @@ testcase tParagraphIndent14 '/// This file includes 8 lines and 1 pic is anchored as character in 1st line '/// when the spacing is leading to 4cm, there should be 1 line/page '/// + and the pic should NOT move - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Get the original coordinate-Y Call wTypeKeys ( "" ) @@ -1042,8 +1042,8 @@ testcase tParagraphIndent15 '/// Open the test file '/// + This file includes 8 lines , and font size is 12 - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Indents & Spacing , '/// + select Fixed lines in Line spacing @@ -1112,8 +1112,8 @@ testcase tParagraphIndent16 '/// + You will find out the "He2 heard quiet steps" '/// + isn't at the same line with the context left it . '/// + There is a pic anchored "He2" . - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + 'Get the original location for the pic Call wTypeKeys ( "" ) @@ -1171,8 +1171,8 @@ testcase tParagraphIndent17 '/// In Tools/Optionis/Text Document/Compatibility, '/// + the 'Add spacing between paragarph and talbes' '/// + should be checked - Call hFileOpen(sTestFile1) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile1) + ToolsOptions Call hToolsOptions("WRITER","COMPATIBILITY") @@ -1193,8 +1193,8 @@ testcase tParagraphIndent17 '/// In Tools/Optionis/Text Document/Compatibility, '/// + the 'Add spacing between paragarph and talbes' '/// + should NOT be checked - Call hFileOpen(sTestFile2) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile2) + ToolsOptions Call hToolsOptions("WRITER","COMPATIBILITY") diff --git a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc old mode 100755 new mode 100644 index 77af9b0a0301..37c79948a1cc --- a/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc +++ b/testautomation/writer/optional/includes/formatparagraph/w_formatparagraph3.inc @@ -73,8 +73,8 @@ testcase tParagraphTabs1 '/// Open the test file '/// + There is 1 pic which is anchored as character in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Tabs , '/// + check Left in the type area , and input 3cm in Position @@ -119,8 +119,8 @@ testcase tParagraphTabs2 '/// Open the test file '/// + There is 1 pic which is anchored as character in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Tabs , '/// + check Right in the type area , and input 3cm in Position @@ -165,8 +165,8 @@ testcase tParagraphTabs3 '/// Open the test file '/// + There is 1 pic which is anchored as character in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Tabs , '/// + check Centered in the type area , and input 3cm in Position @@ -212,8 +212,8 @@ testcase tParagraphTabs4 '/// Open the test file '/// + There is 1 pic which is anchored as character in the file , '/// + and there are 1 "." seperator in front of the pic - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Tabs , '/// + check Decimal in the type area , @@ -351,8 +351,8 @@ testcase tParagraphDropCaps1 '/// Open the test file '/// + There is 1 pic which is anchored as character in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Drop Caps , '/// + Check 'Display Drop Caps' , close the dialog @@ -403,8 +403,8 @@ testcase tParagraphDropCaps2 '/// Open the test file '/// + There is 1 pic which is anchored as character in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Drop Caps , '/// + Check 'Display Drop Caps' , then check 'whole word' , then close the dialog @@ -457,8 +457,8 @@ testcase tParagraphDropCaps3 '/// Open the test file '/// + There is 1 pic which is anchored as character in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Drop Caps , '/// + Check 'Display Drop Caps' , then set '6' in 'number of characters' ,then close the dialog @@ -511,8 +511,8 @@ testcase tParagraphDropCaps4 '/// Open the test file '/// + There is 1 pic which is anchored as character in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Drop Caps , '/// + Check 'Display Drop Caps' , then set '6' in 'Lines' ,then close the dialog @@ -562,8 +562,8 @@ testcase tParagraphDropCaps5 '/// Open the test file '/// + There is 1 pic which is anchored as character in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Drop Caps , '/// + Check 'Display Drop Caps' ,then set 'Space to text' to be 1cm , close the dialog @@ -648,8 +648,8 @@ testcase tParagraphDropCaps7 '/// Open the test file '/// + There is 1 pic which is anchored as character in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Format/Paragraph / Drop Caps , '/// + Check 'Display Drop Caps' ,then set Xyz in Contents 'Text' field , close the dialog @@ -779,8 +779,8 @@ testcase tParagraphNumbering1 '/// Open the test file , '/// + there are 2 paragraphes in the file - Call hFileOpen(sTestFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sTestFile ) + '/// Find the test word , set the focus to 1st paragraph Call fFindWord( sTest1 ) diff --git a/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc b/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc old mode 100755 new mode 100644 index 62132356360c..560265c301e8 --- a/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc +++ b/testautomation/writer/optional/includes/hyphenation/w_hyphenation.inc @@ -51,8 +51,8 @@ testcase tHyphenation_1 printlog "Test Hyphenation using ctrl and -" printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + ' we must assure the word 'following' is the first word in second line ' otherwise the test will not work correctly @@ -98,8 +98,8 @@ testcase tHyphenation_2 printlog "Test Hyphenation using ctrl and -" printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + ' we must assure the word 'following' is the first word in second line ' otherwise the test will not work correctly @@ -153,8 +153,8 @@ testcase tHyphenation_3 printlog "Test Hyphenation using Tools/Hyphenation ,test like fol-lowing" printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + ' we must assure the word 'following' is the first word in second line ' otherwise the test will not work correctly @@ -265,8 +265,8 @@ testcase tHyphenation_4 printlog "Test Hyphenation using Tools/Hyphenation ,test like follow-ing" printlog "open a test file" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\hyphenation\" + testFile ) + ' we must assure the word 'following' is the first word in second line ' otherwise the test will not work correctly diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc old mode 100755 new mode 100644 index 4b0a23775f33..bf90c2744768 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc @@ -642,9 +642,9 @@ testcase tInsertGraphic_10 sleep(2) '/// Reload the file - Call hFileOpen(gOfficepath + "user\work\tInsertGraphic_5.odt") + hFileOpenLocally( gOfficepath + "user\work\tInsertGraphic_5.odt") sleep(2) - Call sMakeReadOnlyDocumentEditable + '/// Check if the inserted graphics are still there Kontext "DocumentWriter" diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc index 7454f733665d..3bfd69c481d6 100644 --- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc +++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc @@ -80,7 +80,7 @@ testcase tExportAllReadableFormatsIntoODF if GetExtention ( sExportFile ) = "psw" then QAErrorlog "#i102221#Pocket Word filter puts General I/O Error" else - Call hFileOpen ( ImportFileList(i) ) + hFileOpenLocally( ImportFileList(i) ) printlog "- done" Kontext "TextImport" diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc old mode 100755 new mode 100644 index ec3b6cfd4627..c0f03039176d --- a/testautomation/writer/optional/includes/navigator/w_navigator.inc +++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc @@ -216,8 +216,8 @@ testcase tViewNavigator3 '/// Edit / Navigator : check some Navigator-Functions /// printlog "- Edit / Navigator : check some Navigator-Functions" '/// Open document ( navigator.odt ) /// - Call hFileOpen ( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) + '/// Open Navigator /// Kontext "Navigator" if Navigator.NotExists then ViewNavigator @@ -363,8 +363,8 @@ testcase tViewNavigator4 endif printlog "- Edit / Navigator : check entry's in Navigator Index" '/// File / Open / 'gTesttoolpath + "writer\optional\input\navigator\navigator.odt"' /// - Call hFileOpen ( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) + '/// Open Navigator through Edit / Navigator /// ViewNavigator Kontext "NavigatorWriter" @@ -432,8 +432,8 @@ testcase tViewNavigator5 printlog "- Edit / Navigator : Check Jumpmark from Index in Navigator" '/// File / Open / 'gTesttoolpath + "writer\optional\input\navigator\navigator.odt"' /// - Call hFileOpen ( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\navigator\navigator.odt" ) + '/// Open Navigator /// Kontext "NavigatorWriter" if Not NavigatorWriter.Exists then @@ -617,8 +617,8 @@ testcase tViewNavigator6 printlog "- Edit / Navigator : Rename Objects" '/// File / Open / 'gTesttoolpath + "writer\optional\input\navigator\st1_1.sxw" ' /// - Call hFileOpen ( gTesttoolpath + "writer\optional\input\navigator\st1_1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\navigator\st1_1.sxw" ) + Kontext "Navigator" '/// Open Navigator /// if Navigator.NotExists then ViewNavigator @@ -674,7 +674,7 @@ testcase tViewNavigator6 Sleep 2 printlog "- Saving and Loading the document, check settings" - Call hFileOpen(gOfficePath + "user\work\uvobj.odt") + hFileOpenLocally( gOfficePath + "user\work\uvobj.odt") '/// Navigator has to be opened with document /// Kontext "Navigator" if Navigator.NotExists then diff --git a/testautomation/writer/optional/includes/number/w_205_.inc b/testautomation/writer/optional/includes/number/w_205_.inc old mode 100755 new mode 100644 index 57a56ab80b8c..dafa55b3d9bb --- a/testautomation/writer/optional/includes/number/w_205_.inc +++ b/testautomation/writer/optional/includes/number/w_205_.inc @@ -183,7 +183,7 @@ testcase tFormatNumberingBullets Sleep 2 Call hCloseDocument Sleep 2 - Call hFileOpen ( gOfficePath + "user\work\format4." & WriterFilterExtension(0) ) + hFileOpenLocally( gOfficePath + "user\work\format4." & WriterFilterExtension(0) ) Sleep 2 '/// Close document /// Call hCloseDocument @@ -315,7 +315,7 @@ testcase tFormatNumberingPosition Sleep 2 Call hCloseDocument Sleep 2 - Call hFileOpen ( gOfficePath + "user\work\tFormatNumberingPosition." & WriterFilterExtension(0) ) + hFileOpenLocally( gOfficePath + "user\work\tFormatNumberingPosition." & WriterFilterExtension(0) ) '/// check settings on Format / NumberingBullets /// FormatNumberingBullets @@ -499,7 +499,7 @@ testcase tFormatNumberingOptions Sleep 2 Call hCloseDocument Sleep 2 - Call hFileOpen ( gOfficePath + "user\work\format6." & WriterFilterExtension(0) ) + hFileOpenLocally( gOfficePath + "user\work\format6." & WriterFilterExtension(0) ) For i = 1 to 15 call wTypeKeys "" Wait 500 @@ -713,7 +713,7 @@ testcase tFormatNumberingAll Sleep 2 Call hCloseDocument Sleep 2 - Call hFileOpen ( gOfficePath + "user\work\format7." & WriterFilterExtension(0) ) + hFileOpenLocally( gOfficePath + "user\work\format7." & WriterFilterExtension(0) ) Sleep 2 FormatNumberingBullets '/// reopen Format / NumberingBullets and check saved settings /// diff --git a/testautomation/writer/optional/includes/number/w_205a_.inc b/testautomation/writer/optional/includes/number/w_205a_.inc old mode 100755 new mode 100644 index 0e157368d433..d981dbde812f --- a/testautomation/writer/optional/includes/number/w_205a_.inc +++ b/testautomation/writer/optional/includes/number/w_205a_.inc @@ -47,8 +47,8 @@ testcase tToolsOutlineNumbering1 Dim i as integer PrintLog "- Tools / Outline Numbering: Part 1 - Numbering" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\number\numbering1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\number\numbering1.sxw" ) + ToolsOutlineNumbering Kontext @@ -240,10 +240,10 @@ testcase tToolsOutlineNumbering1 Select Case i Case 1 printlog "- Load sxw and check formattings" - Call hFileOpen ( gOfficePath + "user\work\tToolsOutlineNumbering1.sxw" ) + hFileOpenLocally( gOfficePath + "user\work\tToolsOutlineNumbering1.sxw" ) Case 2 printlog "- Load odt and check formattings" - Call hFileOpen ( gOfficePath + "user\work\tToolsOutlineNumbering1.odt" ) + hFileOpenLocally( gOfficePath + "user\work\tToolsOutlineNumbering1.odt" ) end select call wTypeKeys "", 8 call wTypeKeys "", 10 @@ -343,8 +343,8 @@ testcase tToolsOutlineNumbering2 PrintLog "- Tools / Outline Numbering: Part 2 - Tabpage Position" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\number\numbering1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\number\numbering1.sxw" ) + ToolsOutlineNumbering Kontext @@ -463,7 +463,7 @@ testcase tToolsOutlineNumbering2 printlog " - check saved Numbering" Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\tToolsOutlineNumbering2.odt", "writer8" ) Call hCloseDocument - Call hFileOpen ( gOfficePath + "user\work\tToolsOutlineNumbering2.odt" ) + hFileOpenLocally( gOfficePath + "user\work\tToolsOutlineNumbering2.odt" ) ToolsOutlineNumbering Kontext @@ -638,7 +638,7 @@ testcase tToolsOutlineNumbering3 printlog " - check saved Numbering" Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\tToolsOutlineNumbering3.odt", "writer8" ) Call hCloseDocument - Call hFileOpen ( gOfficePath + "user\work\tToolsOutlineNumbering3.odt" ) + hFileOpenLocally( gOfficePath + "user\work\tToolsOutlineNumbering3.odt" ) ToolsOutlineNumbering Kontext Active.SetPage TabKapitelnumerierung @@ -840,7 +840,7 @@ testcase tToolsFootnoteEndnote printlog " - Save and reload" Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\tToolsFootnoteEndnote.odt", "writer8" ) Call hCloseDocument - Call hFileOpen ( gOfficePath + "user\work\tToolsFootnoteEndnote.odt" ) + hFileOpenLocally( gOfficePath + "user\work\tToolsFootnoteEndnote.odt" ) printlog " - check saved properties" ToolsFootnote Kontext diff --git a/testautomation/writer/optional/includes/number/w_206_.inc b/testautomation/writer/optional/includes/number/w_206_.inc old mode 100755 new mode 100644 index ae7698017216..46cc61715ad9 --- a/testautomation/writer/optional/includes/number/w_206_.inc +++ b/testautomation/writer/optional/includes/number/w_206_.inc @@ -340,7 +340,7 @@ testcase tToolsNumbering6 Call hFileSaveAsKill ( gOfficepath & "user\work\tToolsNumbering6.odt" ) '/// Close and reload document Call hCloseDocument - Call hFileOpen ( gOfficepath & "user\work\tToolsNumbering6.odt" ) + hFileOpenLocally( gOfficepath & "user\work\tToolsNumbering6.odt" ) end if call wTypeKeys ( "" ) EditCopy @@ -448,7 +448,7 @@ testcase tToolsNumbering7 Call hFileSaveAsKill ( gOfficepath & "user\work\tToolsNumbering7.odt" ) '/// Close and reload document Call hCloseDocument - Call hFileOpen ( gOfficepath & "user\work\tToolsNumbering7.odt" ) + hFileOpenLocally( gOfficepath & "user\work\tToolsNumbering7.odt" ) end if call wTypeKeys ( "" ) diff --git a/testautomation/writer/optional/includes/number/w_207_.inc b/testautomation/writer/optional/includes/number/w_207_.inc old mode 100755 new mode 100644 index 634e7c5773a7..f356f1e21e4e --- a/testautomation/writer/optional/includes/number/w_207_.inc +++ b/testautomation/writer/optional/includes/number/w_207_.inc @@ -74,10 +74,10 @@ testcase tToolsNumbering12 end select printlog( "Open file: " & DocFileList( iCurrentDocument ) ) - Call hFileOpen ( DocFileList( iCurrentDocument ) ) + hFileOpenLocally( DocFileList( iCurrentDocument ) ) printlog( "Make a copy if the file is write protected" ) - Call sMakeReadOnlyDocumentEditable + printlog( "Test for unexpected dialog: Filter Selection" ) Kontext "Filterauswahl" @@ -111,7 +111,7 @@ testcase tToolsNumbering12 Call hCloseDocument printlog " - load previous saved document" - Call hFileOpen ( ExportFileName ) + hFileOpenLocally( ExportFileName ) printlog " - close document" hFileCloseAll() @@ -132,8 +132,8 @@ testcase tToolsNumbering13 '/// This testcase loads a Worddocument that lost all formattings printlog "#i73790 regression testing" '/// Load document 'writer\\optional\\input\\number\\regression\\73790.doc' - Call hFileOpen ( gTesttoolPath + "writer\optional\input\number\regression\73790.doc" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\number\regression\73790.doc" ) + '/// Document has Heading1-Heading3 formatted, be sure it is call wTypeKeys ("") '/// Point cursor to top of document with diff --git a/testautomation/writer/optional/includes/option/wh_o_1.inc b/testautomation/writer/optional/includes/option/wh_o_1.inc old mode 100755 new mode 100644 index cbc35f599a4b..4eb667c7dc19 --- a/testautomation/writer/optional/includes/option/wh_o_1.inc +++ b/testautomation/writer/optional/includes/option/wh_o_1.inc @@ -148,8 +148,8 @@ testcase tToolsOptionsHTMLLayout Dim iMasseinheit(3) as integer Dim iTemp(3) as integer '///Open "writer\\optional\\input\\options\\options1.sxw /// - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) + printlog "'///- Tools/Options/Writer: View ///" ToolsOptions @@ -397,8 +397,8 @@ testcase tToolsOptionsHTMLGrid Dim sTempMetricField(4) as string '/// uses: "writer\\optional\\input\\options\\options1.sxw" /// - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) + printlog "'///- Tools/Options/HTML: Grid ///" printlog ("'/// - save states ///") @@ -552,8 +552,8 @@ testcase tToolsOptionsHTMLGrid '/// ( gTesttoolPath + "writer\optional\input\options\gridtst.sxw" ) ///' '/// NOT Possible Without + stuff :-((((( BugID: 84741 ///' '/// uses"writer\optional\input\options\htmltag.html" /// - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\htmltag.html" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\htmltag.html" ) + '/// check if writeable!///' try diff --git a/testautomation/writer/optional/includes/option/wh_o_2.inc b/testautomation/writer/optional/includes/option/wh_o_2.inc old mode 100755 new mode 100644 index bdee49ed7460..6555e741c5e3 --- a/testautomation/writer/optional/includes/option/wh_o_2.inc +++ b/testautomation/writer/optional/includes/option/wh_o_2.inc @@ -48,8 +48,8 @@ testcase tToolsOptionsHTMLPrint dim bRadioBut(4) as boolean ' RadioButtons dim bTempRadioBut(4) as boolean - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\test.html" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\test.html" ) + printlog "- Tools/Options/HTML: PrintHTML " printlog (" - save states ") @@ -163,7 +163,7 @@ testcase tToolsOptionsHTMLPrint ' Is saved with document Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - Call hFileOpen(gOfficepath + "user\work\printtest.html") + hFileOpenLocally( gOfficepath + "user\work\printtest.html") ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) diff --git a/testautomation/writer/optional/includes/option/wr_o_1.inc b/testautomation/writer/optional/includes/option/wr_o_1.inc old mode 100755 new mode 100644 index 26edd589af84..6ca437431ec4 --- a/testautomation/writer/optional/includes/option/wr_o_1.inc +++ b/testautomation/writer/optional/includes/option/wr_o_1.inc @@ -426,8 +426,8 @@ testcase tToolsOptionsWriterView5 Call hNewDocument '/// open document: writer\\optional\\input\\options\\options1.sxw - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) + '///- Tools/Options/Writer: View printlog ("'/// - save states ///") @@ -481,8 +481,8 @@ testcase tToolsOptionsWriterView6 Call hNewDocument '/// open document: writer\\optional\\input\\options\\options1.sxw - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) + '///- Tools/Options/Writer: View printlog ("'/// - save states ///") @@ -542,8 +542,8 @@ testcase tToolsOptionsWriterView7 Call hNewDocument '/// open document: writer\\optional\\input\\options\\options1.sxw - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options1.sxw" ) + '///- Tools/Options/Writer: View printlog ("'/// - save states ///") @@ -867,8 +867,8 @@ testcase tToolsOptionsWriterGrid4 printlog ("'/// Function Test: Grid Resolution ///'") '/// ( gTesttoolPath + "writer\optional\input\options\gridtst.sxw" ) ///' - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\gridtst.sxw", False ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\gridtst.sxw", False ) + ' select grafik element Call wNavigatorAuswahl(4,1) diff --git a/testautomation/writer/optional/includes/option/wr_o_2.inc b/testautomation/writer/optional/includes/option/wr_o_2.inc old mode 100755 new mode 100644 index cdc8dc00de4c..b2a4e72ecec1 --- a/testautomation/writer/optional/includes/option/wr_o_2.inc +++ b/testautomation/writer/optional/includes/option/wr_o_2.inc @@ -102,8 +102,8 @@ testcase tToolsOptionsWriterDefaultfont (WestOrEast as string) '/// use a document to check the font with styles///' '///+ use 'input\\writer\\optional\\options\\options2.sxw' /// - Call hFileOpen ( sFileName ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sFileName ) + printlog "- Tools/Options/Writer: DefaultFont" printlog ("/// - save states ///") @@ -239,8 +239,8 @@ testcase tToolsOptionsWriterDefaultfont (WestOrEast as string) Printlog "'/// - verify global settings don't affect saved Document ///" '///+ use input\\writer\\optional\\options\\options2.sxw /// - Call hFileOpen ( sFileName ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( sFileName ) + Kontext "DocumentWriter" DocumentWriter.TypeKeys "", 5 Call wTypeKeys "" @@ -463,8 +463,8 @@ testcase tToolsOptionsWriterPrint1 '(4) = Seitenende '/// uses "input\\writer\\optional\\options\\options3.sxw" /// - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options3.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options3.sxw" ) + printlog "'///- Tools/Options/Writer: PrintWriter ///" printlog ("'/// - save states ///") @@ -587,7 +587,7 @@ testcase tToolsOptionsWriterPrint1 ExtrasOptionenDlg.OK WaitSlot (2) ' Notify is saved with document - Call hFileOpen(gOfficepath + "user\work\printtest." & WriterFilterExtension(0) ) + hFileOpenLocally( gOfficepath + "user\work\printtest." & WriterFilterExtension(0) ) ToolsOptions Call hToolsOptions ( "WRITER" , "PRINT" ) diff --git a/testautomation/writer/optional/includes/option/wr_o_3.inc b/testautomation/writer/optional/includes/option/wr_o_3.inc old mode 100755 new mode 100644 index 39fd97994e1a..df70dfc52faf --- a/testautomation/writer/optional/includes/option/wr_o_3.inc +++ b/testautomation/writer/optional/includes/option/wr_o_3.inc @@ -938,7 +938,7 @@ testcase tToolsOptionsWriterCompatibility1 printlog "- load previously saved document" Call hNewDocument - Call hFileOpen (gOfficePath + "user\work\tToolsOptionsWriterCompatibility1.odt") + hFileOpenLocally( gOfficePath + "user\work\tToolsOptionsWriterCompatibility1.odt") Printlog "check state of all checkboxes and uncheck all checkboxes" ToolsOptions @@ -1010,8 +1010,8 @@ testcase tToolsOptionsWriterCompatibility2 Call hNewDocument printlog "open document ./writer/leve11/input/options/compatibility1.doc" printlog "check formatting of current opened document" - Call hFileOpen ( gTesttoolpath & "writer\optional\input\options\compatibility1.doc" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath & "writer\optional\input\options\compatibility1.doc" ) + Call wTypeKeys ("") Call wTypeKeys ("") @@ -1253,7 +1253,7 @@ DIM sFoundWord AS string 'variable for word found one line below ExtrasOptionenDLG.Cancel printlog "Reload recently saved document" - Call hFileOpen (sDocument) + hFileOpenLocally( sDocument) printlog "Tools-Options-OOo Writer-Compatibility" ToolsOptions diff --git a/testautomation/writer/optional/includes/option/wr_o_4.inc b/testautomation/writer/optional/includes/option/wr_o_4.inc old mode 100755 new mode 100644 index 83f09e5c7e89..3201411e0e82 --- a/testautomation/writer/optional/includes/option/wr_o_4.inc +++ b/testautomation/writer/optional/includes/option/wr_o_4.inc @@ -217,7 +217,7 @@ testcase tToolsOptionsWriterOther ' load file in this environment '///use "output\\writer\\w95\\tab25cm.odt" /// - Call hFileOpen (gOfficePath + "user\work\tab25cm.odt") + hFileOpenLocally( gOfficePath + "user\work\tab25cm.odt") sleep (2) ' check TabStops, have to be the ones this file was saved with ToolsOptions diff --git a/testautomation/writer/optional/includes/option/wr_o_a.inc b/testautomation/writer/optional/includes/option/wr_o_a.inc old mode 100755 new mode 100644 index ac6084157867..64f60fa7e0f9 --- a/testautomation/writer/optional/includes/option/wr_o_a.inc +++ b/testautomation/writer/optional/includes/option/wr_o_a.inc @@ -45,8 +45,8 @@ testcase tToolsOptionsWriterPrint Dim i as integer printlog "- Tools/Options/Writer: PrintWriter (real print)" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\options\options3.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\options\options3.sxw" ) + Printlog " - check all (real print)" ToolsOptions diff --git a/testautomation/writer/optional/includes/redlining/w_redlining1.inc b/testautomation/writer/optional/includes/redlining/w_redlining1.inc old mode 100755 new mode 100644 index d6983e200a4c..b08faaf6d8d8 --- a/testautomation/writer/optional/includes/redlining/w_redlining1.inc +++ b/testautomation/writer/optional/includes/redlining/w_redlining1.inc @@ -1104,8 +1104,8 @@ testcase tRedlining_16 '/// + Redlining test => OK_2 <-- Numbering style : list 2 '/// + Redlining test => OK_3 <-- Numbering style : list 3 - Call hFileOpen ( gTesttoolPath + "writer\optional\input\redlining\tRedlining_15.sxw" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\redlining\tRedlining_15.sxw" ) + Call wTypeKeys "" , 3 diff --git a/testautomation/writer/optional/includes/regexp/regular.inc b/testautomation/writer/optional/includes/regexp/regular.inc old mode 100755 new mode 100644 index 3a323bce2a49..d53277085b13 --- a/testautomation/writer/optional/includes/regexp/regular.inc +++ b/testautomation/writer/optional/includes/regexp/regular.inc @@ -899,8 +899,8 @@ sub Ausgangszustand_herstellen '///+ Uncheck 'Search for Styles' /// '///+ Uncheck 'Similarity Search' /// '///+ Check 'Regular Expressions' /// - Call hFileOpen ( gtesttoolpath + "writer\optional\input\search\regu_aus.sxw") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gtesttoolpath + "writer\optional\input\search\regu_aus.sxw") + kontext if FindAndReplace.Exists then FindAndReplace.Close kontext "DocumentWriter" diff --git a/testautomation/writer/optional/includes/regexp/search.inc b/testautomation/writer/optional/includes/regexp/search.inc old mode 100755 new mode 100644 index 8121859870ad..163aa230f2e1 --- a/testautomation/writer/optional/includes/regexp/search.inc +++ b/testautomation/writer/optional/includes/regexp/search.inc @@ -1524,11 +1524,11 @@ sub wSetFindAndReplaceToDefault(WhichDocument as integer) Case 0 Call hNewDocument ' empty Document Case 1 - Call hFileOpen ( gTesttoolPath +"writer\optional\input\search\such_u_e.sxw") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath +"writer\optional\input\search\such_u_e.sxw") + case 2 - Call hFileOpen ( gTesttoolPath +"writer\optional\input\search\attrib.sxw") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath +"writer\optional\input\search\attrib.sxw") + end select kontext "FindAndReplace" Sleep 2 diff --git a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc old mode 100755 new mode 100644 index 5e13f9353891..c03cb811e0f0 --- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc +++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc @@ -153,8 +153,8 @@ testcase i65094 Call hNewDocument '/// Open file \\writer\\optional\\input\\regression\\issuezilla\\i65094a.odt printlog "- Open file: i65094a.odt" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\regression\issuezilla\i65094a.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\regression\issuezilla\i65094a.odt" ) + '/// Compare document with other version \\writer\\optional\\input\\regression\\issuezilla\\i65094b.odt ' UseBindings printlog "- Compare document with other version" @@ -165,7 +165,7 @@ testcase i65094 ' Sleep 2 Oeffnen.Click Sleep 5 - Call sMakeReadOnlyDocumentEditable + printlog "- Accept all" '/// In Redlining dialog select 'Accept all' Kontext "Redlining" @@ -205,7 +205,7 @@ testcase i69045 Call hCloseDocument printlog "- Save, close and load document" '/// Open saved document - Call hFileOpen ( gOfficepath & "user\work\i69045.odt" ) + hFileOpenLocally( gOfficepath & "user\work\i69045.odt" ) '/// Check try EditChangesAcceptOrReject @@ -236,8 +236,8 @@ testcase i69521 '/// New writer document Call hNewDocument '/// Load document: \\writer\\optional\\input\\regression\\issuezilla\\i69521.odt - Call hFileOpen (gTesttoolpath & "writer\optional\input\regression\issuezilla\i69521.odt") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath & "writer\optional\input\regression\issuezilla\i69521.odt") + '/// Loaded document should have 5 EPS Graphics iItems = CountItemsInNavigatorGroup(4) if iItems <> 5 then @@ -251,7 +251,7 @@ testcase i69521 '/// close document Call hCloseDocument '/// reload previous saved document - Call hFileOpen (gOfficePath & "user\work\i96521-1.odt") + hFileOpenLocally( gOfficePath & "user\work\i96521-1.odt") '/// Check if all 5 Graphics are still in document iItems = CountItemsInNavigatorGroup(4) if iItems <> 5 then @@ -325,7 +325,7 @@ testcase i75027 Call hFileSaveAsKill (gOfficepath & "user\work\i75027.html") '/// Reload previous saved document Call hCloseDocument - Call hFileOpen (gOfficepath & "user\work\i75027.html") + hFileOpenLocally( gOfficepath & "user\work\i75027.html") '/// Check that the numbering is still the same. printlog "- check numbering (previous saved)" Call wTypeKeys ( "" ) @@ -444,8 +444,8 @@ testcase i103265 printlog "ODF Hyperlinks in TOCs" Call hNewDocument printlog "- Open test document" - Call hFileOpen ( gTesttoolPath + "writer\optional\input\regression\issuezilla\i103265.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\regression\issuezilla\i103265.odt" ) + printlog "- Update TOC" ToolsUpdateAllIndexes @@ -482,7 +482,7 @@ testcase i103265 Call hCloseDocument printlog "- Reload" - Call hFileOpen ( gOfficePath + "user\work\ODFHyperlinksInTOCs.html" ) + hFileOpenLocally( gOfficePath + "user\work\ODFHyperlinksInTOCs.html" ) printlog "Check that every hyperlink jumps correctly to its target" For i = 1 to 3 ' point cursor to beginning of document diff --git a/testautomation/writer/optional/includes/section/w_section_3.inc b/testautomation/writer/optional/includes/section/w_section_3.inc old mode 100755 new mode 100644 index 6dc00cd5c0f3..72963282511e --- a/testautomation/writer/optional/includes/section/w_section_3.inc +++ b/testautomation/writer/optional/includes/section/w_section_3.inc @@ -1064,7 +1064,7 @@ testcase tPasswordProtectSection_2 Call hCloseDocument PrintLog " Reload the file" - Call hFileOpen (gOfficePath + "user\work\tPasswordProtectSection_2.odt") + hFileOpenLocally( gOfficePath + "user\work\tPasswordProtectSection_2.odt") FormatSections Kontext "BereicheBearbeiten" @@ -1200,7 +1200,7 @@ testcase tPasswordProtectSection_4 Call hCloseDocument PrintLog " Reload the file" - Call hFileOpen (gOfficePath + "user\work\tPasswordProtectSection_4.odt") + hFileOpenLocally( gOfficePath + "user\work\tPasswordProtectSection_4.odt") PrintLog " In format/section, PW-Dialogue should appear when clicking 'option' button" FormatSections diff --git a/testautomation/writer/optional/includes/section/w_section_4.inc b/testautomation/writer/optional/includes/section/w_section_4.inc old mode 100755 new mode 100644 index 2c811268f93b..632956e92d17 --- a/testautomation/writer/optional/includes/section/w_section_4.inc +++ b/testautomation/writer/optional/includes/section/w_section_4.inc @@ -856,8 +856,8 @@ testcase tParagraphSection_1 PrintLog " - Keep paragraphs together" '/// Open a file with 4 paragraphs, the 4th paragraph is crossing the page - Call hFileOpen(documentName) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( documentName) + EditSelectAll Call fInsertSection(sectionName) @@ -1198,8 +1198,8 @@ testcase tScenarioSection_1 next i '/// open testdocument (tScenarioSection_1.sxw) /// - Call hFileOpen ( gTesttoolpath + "writer\optional\input\section\tScenarioSection_1.sxw") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\section\tScenarioSection_1.sxw") + '/// Select 'File /Send -> Create Masterdocument /// FileSendCreateMasterdocument @@ -1318,8 +1318,8 @@ testcase tScenarioSection_2 next i '/// open testdocument (tScenarioSection_2.sxw) /// - Call hFileOpen ( gTesttoolpath + "writer\optional\input\section\tScenarioSection_2.sxw") - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolpath + "writer\optional\input\section\tScenarioSection_2.sxw") + '/// Select 'File -> Send -> Create Masterdocument /// FileSendCreateMasterdocument diff --git a/testautomation/writer/optional/includes/sorting/w_sorting1.inc b/testautomation/writer/optional/includes/sorting/w_sorting1.inc old mode 100755 new mode 100644 index d4cb27449cba..ae6fae7345d7 --- a/testautomation/writer/optional/includes/sorting/w_sorting1.inc +++ b/testautomation/writer/optional/includes/sorting/w_sorting1.inc @@ -243,11 +243,11 @@ testcase tToolsSort3 Trennzeichen = "|" end select if gApplication = "WRITER" then - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort2.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort2.odt" ) + else - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort2.odm" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort2.odm" ) + end if if i <> 1 then TrennzeichenSetzen ( Trennzeichen ) @@ -319,11 +319,11 @@ endcase testcase tToolsSort4 PrintLog "- Tools / Sorting in table with header" if gApplication = "WRITER" then - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort1.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort1.odt" ) + else - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort1.odm" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort1.odm" ) + end if Call wTypeKeys "", 2 @@ -444,11 +444,11 @@ endcase testcase tToolsSort5 PrintLog "- Tools / Sorting in table without header" if gApplication = "WRITER" then - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort1.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort1.odt" ) + else - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort1.odm" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort1.odm" ) + end if Call wNavigatorAuswahl (2, 2) @@ -574,11 +574,11 @@ testcase tToolsSort6 PrintLog "- Tools / Sort a sorted table and copy in another one" if gApplication = "WRITER" then - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort3.odt" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort3.odt" ) + else - Call hFileOpen ( gTesttoolPath + "writer\optional\input\sorting\sort3.odm" ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort3.odm" ) + end if Call wTypeKeys "", 2 diff --git a/testautomation/writer/optional/includes/sorting/w_sorting2.inc b/testautomation/writer/optional/includes/sorting/w_sorting2.inc old mode 100755 new mode 100644 index d5d3b49ea61f..c716b597126b --- a/testautomation/writer/optional/includes/sorting/w_sorting2.inc +++ b/testautomation/writer/optional/includes/sorting/w_sorting2.inc @@ -93,8 +93,8 @@ testcase tSort_1 printlog " open a test file" - Call hFileOpen ( TestFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( TestFile ) + printlog " select all table" Call wTypeKeys "", 2 @@ -187,8 +187,8 @@ testcase tSort_2 end select printlog " open a test file" - Call hFileOpen ( TestFile ) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( TestFile ) + printlog " select all table" Call wTypeKeys "", 2 diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index 886f7fa91967..bc73cd945b95 100644 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -59,7 +59,7 @@ testcase tToolsSpellcheckWithShortcut end if call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + printlog " Insert some faulty text" select case iSprache @@ -150,7 +150,7 @@ testcase tToolsSpellcheckCorrect printlog " Open document where the formatting is set to the language we wish to test." call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + printlog " Insert some faulty text" Sleep 1 @@ -285,7 +285,7 @@ testcase tToolsSpellcheck1Mistake printlog " Open document where the formatting is set to the language we wish to test." call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + '/// Insert a sentence with one definded mistake and execute spellcheck /// Call wTypeKeys sErrorSampleText @@ -387,8 +387,8 @@ testcase tToolsSpellcheckForward if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else - Call hFileOpen(InsFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( InsFile) + end if '/// point cursor to beginning of document and execute spellcheck /// Call wTypeKeys "" @@ -561,8 +561,8 @@ testcase tToolsSpellcheckOnlyOneWord if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else - Call hFileOpen(InsFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( InsFile) + end if Call wTypeKeys "" @@ -742,7 +742,7 @@ testcase tToolsSpellcheckAutomatic PrintLog "- Tools / Spellcheck / AutoSpellcheck" printlog " Open document where the formatting is set to the language we wish to test." call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + '/// Enable Auto-Spellcheck in options Call wEnableAutoSpellcheck ( true ) @@ -937,8 +937,8 @@ testcase tToolsSpellcheckChangeLanguageAttribute if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else - Call hFileOpen(InsFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( InsFile) + end if Call wTypeKeys "" @@ -1135,8 +1135,8 @@ testcase tToolsSpellcheckButtonChange if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else - Call hFileOpen(InsFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( InsFile) + end if Call wTypeKeys "" @@ -1202,8 +1202,8 @@ testcase tToolsSpellcheckButtonChangeAll if wInsertDocumentinMasterDoc(InsFile) = False then goto endsub EditPaste else - Call hFileOpen(InsFile) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally( InsFile) + end if Call wTypeKeys "" @@ -1289,7 +1289,7 @@ testcase tToolsThesaurus printlog "Open new preformatted-writerdocument" call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + printlog "- Thesaurus without a word" '/// Call Thesaurus without a written word /// @@ -1323,7 +1323,7 @@ testcase tToolsThesaurus printlog " Open new preformatted-document where the formatting is set to the language we wish to test." call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + Call wTypeKeys sWordInitial Call wTypeKeys "" @@ -1445,7 +1445,7 @@ testcase tToolsThesaurusSynonyms printlog "Open new preformatted-writerdocument" call hFileOpen (TheFile,false) - Call sMakeReadOnlyDocumentEditable + Call wTypeKeys sWordInitial Call wTypeKeys "" diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc old mode 100755 new mode 100644 index 069b133700bd..d2df892a3bc5 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck1.inc @@ -50,7 +50,7 @@ DIM WordLanguageTemp AS string 'variable for checking if Office language is a '///Load test document/// call hFileOpen (ConvertPath ( gTesttoolPath + "writer\optional\input\spellcheck\Language_Guessing_Sample_Texts.odt")) 'loading Test-Doc - Call sMakeReadOnlyDocumentEditable + sleep(5) '---------------------------------------------------------------- '///Enable auto spellcheck/// diff --git a/testautomation/writer/optional/includes/textframes/w_textframes1.inc b/testautomation/writer/optional/includes/textframes/w_textframes1.inc index a3d284438643..ed3ee9b2dd5e 100644 --- a/testautomation/writer/optional/includes/textframes/w_textframes1.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes1.inc @@ -852,7 +852,7 @@ testcase tTextframes_10 '/// Open a test file '/// + This test file is designed for Anchor in gathering pages&columns test. '/// + There are 2 columns in the page. And the frame is in the second column. - Call hFileOpen(sTestFile1,false) + hFileOpenLocally( sTestFile1,false) 'Press return to ensure the frame is in 2nd column @@ -888,7 +888,7 @@ testcase tTextframes_10 '/// + This test file is designed for Anchor in seperating '/// + pages&columns test. '/// + There are 2 pages. And the frame is in the second page. - Call hFileOpen(sTestFile2,false) + hFileOpenLocally( sTestFile2,false) 'check if the frame is in the 2nd page diff --git a/testautomation/writer/optional/includes/undo/w_undo_history_4.inc b/testautomation/writer/optional/includes/undo/w_undo_history_4.inc index e1370f29e541..506c1e1e4335 100755 --- a/testautomation/writer/optional/includes/undo/w_undo_history_4.inc +++ b/testautomation/writer/optional/includes/undo/w_undo_history_4.inc @@ -291,7 +291,7 @@ testcase tUndoSpellcheck printlog "- Spellcheck: Autocheck" '/// new document /// hfileOpen (gTesttoolpath + "writer\optional\input\undo\spellcheck_undo.odt") - Call sMakeReadOnlyDocumentEditable + '/// Type "This is a testp" Call wTypeKeys ( "" ) 'This is a testp '/// Select word' testp' diff --git a/testautomation/writer/required/includes/w_001_.inc b/testautomation/writer/required/includes/w_001_.inc index 00f7bc4ce77d..b5b6b88d1640 100644 --- a/testautomation/writer/required/includes/w_001_.inc +++ b/testautomation/writer/required/includes/w_001_.inc @@ -1027,7 +1027,7 @@ testcase tFileReload Wait (500) PrintLog "Open previous saved document" - Call hFileOpen ( gOfficePath + "user\work\" + sFile$ ) + hFileOpenLocally( gOfficePath + "user\work\" + sFile$ ) PrintLog "Insert a table in document" Call hTabelleEinfuegen PrintLog "File / Reload" diff --git a/testautomation/writer/required/includes/w_001b_.inc b/testautomation/writer/required/includes/w_001b_.inc index e20d497482f0..992396377ba4 100644 --- a/testautomation/writer/required/includes/w_001b_.inc +++ b/testautomation/writer/required/includes/w_001b_.inc @@ -125,7 +125,7 @@ testcase tFileSendOutlineToPresentation goto endsub end select PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile$ ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile$ ) Kontext "Navigator" if Navigator.Exists then Navigator.Close Sleep 1 @@ -176,7 +176,7 @@ testcase tFileSendOutlineToClipboard end select PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile$ ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile$ ) Sleep 1 PrintLog "File / Send / Outline to Clipboard" try @@ -223,7 +223,7 @@ testcase tFileSendCreateAutoabstract end select PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile$ ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile$ ) Kontext "Navigator" if Navigator.Exists then Navigator.Close Sleep 1 @@ -274,7 +274,7 @@ testcase tFileSendAutoabstractToPresentation end select PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile$ ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile$ ) Kontext "Navigator" if Navigator.Exists then Navigator.Close Sleep 1 @@ -399,7 +399,7 @@ testcase tMasterDocFileSaveWithPassword FileClose WaitSlot(2000) PrintLog "Open previous saved document" - Call hFileOpen(Datei$) + hFileOpenLocally( Datei$) Kontext "PasswordFileOpen" PrintLog "Enter a wrong password." @@ -427,7 +427,7 @@ testcase tMasterDocFileSaveWithPassword Sleep 1 PrintLog "File / Open again your previous saved document" - Call hFileOpen(Datei$) + hFileOpenLocally( Datei$) PrintLog "Enter your password in password dialog" Kontext "PasswordFileOpen" if PasswordFileOpen.Exists then @@ -468,7 +468,7 @@ testcase tMasterDocFileSaveWithPassword Sleep 1 FileClose PrintLog "File / Close and open your document again" - Call hFileOpen(Datei$) + hFileOpenLocally( Datei$) Sleep 1 Kontext "PasswordFileOpen" PrintLog "Now the passwort dialog should come up" @@ -517,7 +517,7 @@ testcase tMasterDocFileReload endif PrintLog "Open previous saved document" - Call hFileOpen ( sDocumentPath ) + hFileOpenLocally( sDocumentPath ) PrintLog "Insert a table in document" Call hTabelleEinfuegen @@ -652,7 +652,7 @@ testcase tMasterDocFileSendOutlineToPresentation gApplication = "MASTERDOCUMENT" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile ) Kontext "Navigator" if ( Navigator.Exists ) then @@ -698,7 +698,7 @@ testcase tMasterDocFileSendOutlineToClipboard Dim sFile as string : sFile = "htmltest.sxg" PrintLog "- File / Send / Outline to Clipboard" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile ) PrintLog "File / Send / Outline to Clipboard" try @@ -738,7 +738,7 @@ testcase tMasterDocFileSendCreateAutoabstract Dim sFile as string : sFile = "htmltest.sxg" PrintLog "- File / Send / Create Autoabstract" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile ) Kontext "Navigator" hCloseDialog( Navigator, "Close,optional" ) @@ -788,7 +788,7 @@ testcase tMasterDocFileSendAutoabstractToPresentation PrintLog "- File / Send / Autoabstract to Presentation" PrintLog "Open file ( gTesttoolPath + writer\required\input\ + htmltest.sxw )" - Call hFileOpen ( gTesttoolPath + "writer\required\input\" + sFile ) + hFileOpenLocally( gTesttoolPath + "writer\required\input\" + sFile ) Kontext "Navigator" hCloseDialog( Navigator, "Close,optional" ) diff --git a/testautomation/writer/required/includes/w_007_.inc b/testautomation/writer/required/includes/w_007_.inc index e562736b5329..20b468c9605c 100644 --- a/testautomation/writer/required/includes/w_007_.inc +++ b/testautomation/writer/required/includes/w_007_.inc @@ -1233,7 +1233,7 @@ testcase tMasterDocToolsHyphenation hUseAsyncSlot( "EditPaste" ) end if - Call sMakeReadOnlyDocumentEditable + printlog " Insert file 'writer\required\input\linguistik\0 + [OfficeLanguage] + '.odt'" Sleep 1 Call wTypeKeys ("") diff --git a/testautomation/writer/tools/includes/w_tool3.inc b/testautomation/writer/tools/includes/w_tool3.inc old mode 100755 new mode 100644 index 16fd825f6447..5aa58e2f967c --- a/testautomation/writer/tools/includes/w_tool3.inc +++ b/testautomation/writer/tools/includes/w_tool3.inc @@ -270,7 +270,7 @@ sub UndoRichtigBeiSortierung if Fehler = TRUE then Warnlog "Undo after sorting has not been functioned correctly" Call hCloseDocument - Call hFileOpen ( gTesttoolPath + "writer\optional\input\st1_5.sdw" ) + hFileOpenLocally( gTesttoolPath + "writer\optional\input\st1_5.sdw" ) end if Call wTypeKeys "" Call wTypeKeys "",6 diff --git a/testautomation/writer/tools/includes/w_tools.inc b/testautomation/writer/tools/includes/w_tools.inc index 27b9526bb0de..e6bd4f92afa0 100755 --- a/testautomation/writer/tools/includes/w_tools.inc +++ b/testautomation/writer/tools/includes/w_tools.inc @@ -1042,7 +1042,7 @@ end sub function wInsertDocumentinMasterDoc(DocumentName as string) as boolean Call hNewDocument - Call hFileOpen(DocumentName) + hFileOpenLocally( DocumentName) Sleep 2 Call wTypeKeys "" Sleep 2 -- cgit From c2cb44b197656cf6dbe1c6d650484196d4826ec9 Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Mon, 13 Sep 2010 14:37:08 +0200 Subject: #i114476# No testing for Mac as some Window attributes do not exist --- testautomation/framework/required/includes/window_functions.inc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testautomation/framework/required/includes/window_functions.inc b/testautomation/framework/required/includes/window_functions.inc index 6917639d30f8..efbbacf44b63 100755 --- a/testautomation/framework/required/includes/window_functions.inc +++ b/testautomation/framework/required/includes/window_functions.inc @@ -36,7 +36,7 @@ testcase tWindowFunctions printlog( "Update test for window functions" ) if ( gtSysName = "Mac OS X" ) then - printlog( "No testing for Mac as some Window attributes do not exist" ) + qaErrorLog( "#i114476# No testing for Mac as some Window attributes do not exist" ) goto endsub endif @@ -196,9 +196,6 @@ end sub testcase tCheckWindowTitle( sApplication as string, sReference as string ) - if ( sApplication = "soffice" ) then - - printlog( "Update test for the office window titles" ) ' This is a Testtool-only problem that the product name is not displayed -- cgit From acb32fd8134af541ac82661b49ce1888a2c90350 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 13 Sep 2010 15:08:32 +0200 Subject: automationdev300m87: #i112208# - Eliminate sMakeReadonlyDocumentEditable() and affiliated functions from global, removed any calls to these functions --- .../global/tools/includes/required/t_doc2.inc | 129 --------------------- .../optional/includes/global/g_clipboard.inc | 7 +- .../optional/includes/global/g_demoguide.inc | 4 +- .../graphics/optional/includes/global/g_tools.inc | 22 ++-- .../optional/includes/impress/i_slideshow.inc | 19 +-- .../graphics/required/includes/global/id_006.inc | 5 +- .../writer/optional/includes/fields/w_fields2.inc | 36 +----- .../writer/optional/includes/fields/w_fields4.inc | 81 ++----------- .../writer/optional/includes/fields/w_fields7.inc | 27 +---- 9 files changed, 31 insertions(+), 299 deletions(-) mode change 100755 => 100644 testautomation/global/tools/includes/required/t_doc2.inc diff --git a/testautomation/global/tools/includes/required/t_doc2.inc b/testautomation/global/tools/includes/required/t_doc2.inc old mode 100755 new mode 100644 index 4192563b0eba..0e9af93f287c --- a/testautomation/global/tools/includes/required/t_doc2.inc +++ b/testautomation/global/tools/includes/required/t_doc2.inc @@ -113,135 +113,6 @@ end sub ' '------------------------------------------------------------------------------- ' -function hEnableDocumentEditMode() as boolean - - hEnableDocumentEditMode() = false - - dim iTry as integer - - printlog( "Try to switch document to edit mode" ) - for iTry = 1 to 20 - try - kontext "Standardbar" - if ( Bearbeiten.getState( 2 ) <> 1 ) then - Bearbeiten.click() - - kontext "Active" - if ( Active.exists( 1 ) ) then - printlog( "Handle " ) - hCloseDialog( Active, "yes" ) - wait( 2000 ) - printlog( "Successfully switched to edit mode" ) - hEnableDocumentEditMode() = true - exit for - endif - endif - catch - wait( 200 ) - endcatch - next iTry - -end function - -'******************************************************************************* - -function sMakeReadOnlyDocumentEditable() as boolean - - sMakeReadOnlyDocumentEditable() = hEnableDocumentEditMode() - exit function - - ' Function returns TRUE if document has been made editable and FALSE if - ' no action was required (that is: Document was not read-only) - - dim iTry as integer - dim iWait as integer - dim rc as integer - const CFN = "sMakeReadOnlyDocumentEditable::" - - if ( GVERBOSE ) then printlog( CFN & "Making document editable (create a copy) if it is readonly" ) - - ' We still run into synchronization problems with the "Make document editable" feature - ' because we do not know when this button becomes available and ready for use: The - ' document has to be loaded, then we have to wait for the toolbar to get populated. - ' One thing appears to work though: Try to execute the slot using hUseAsyncSlot. - ' This is a little bit tricky because the state of the document is altered but if - ' the slot has been executed once we know for sure that the button on the toolbar is - ' available and can check its state and - if need be - chenge the document state back. - - ' ========== Workaround begin ========== - hUseAsyncSlot( "EditDoc" ) - kontext "Active" - if ( Active.exists() ) then - if ( GVERBOSE ) then printlog( "Handling create copy message" ) - Active.yes() - wait( 1000 ) - endif - ' ========== Workaround end ========== - Kontext "Standardbar" - iWait = 0 - Do - if ( Bearbeiten.IsEnabled() ) then - try - if Bearbeiten.getState( 2 ) = 0 then - exit do - endif - catch - if ( GVERBOSE ) then printlog "Attempt " & iWait & " to make document readable failed" - iWait = iWait + 1 - wait ( 1000 ) - endcatch - else - if ( GVERBOSE ) then printlog "Attempt " & iWait & " to make document readable failed" - iWait = iWait + 1 - wait ( 1000 ) - end if - if iWait >= 5 then exit do - Loop - - if ( Bearbeiten.IsEnabled() ) then - - if ( Bearbeiten.getState( 2 ) = 0 ) then - - rc = hUseAsyncSlot("editdoc") - - if ( rc >= 0 ) then - for iTry = 1 to 2 - - - Kontext "Active" - if ( Active.exists( 5 ) ) then - - printlog( CFN & "Messagebox: " & Active.getText() ) - - try - if ( GVERBOSE ) then printlog( CFN & "Document was read-only. A copy will be used." ) - Active.Yes() - if ( GVERBOSE ) then printlog( CFN & "Closed 'use copy' message" ) - catch - if ( GVERBOSE ) then printlog( CFN & "Probing for unexpected messagebox..." ) - active.ok() - qaerrorlog( "#i100701 - Object not found message" ) - endcatch - else - printlog( CFN & "No messagebox informing about a copy being used" ) - endif - sMakeReadOnlyDocumentEditable() = TRUE - next iTry - else - printlog( CFN & "Document appears to be editable" ) - endif - else - if ( GVERBOSE ) then printlog( CFN & "Button is pressed, document is editable" ) - sMakeReadOnlyDocumentEditable() = FALSE - endif - else - if ( GVERBOSE ) then printlog( CFN & "Control is not enabled" ) - endif - -end function -' -'------------------------------------------------------------------------------- -' function fSelectFirstOLE() as integer 'Select first visible OLE object using Navigator 'Returns error-code: diff --git a/testautomation/graphics/optional/includes/global/g_clipboard.inc b/testautomation/graphics/optional/includes/global/g_clipboard.inc index 4c1900876565..9d4629f3d262 100644 --- a/testautomation/graphics/optional/includes/global/g_clipboard.inc +++ b/testautomation/graphics/optional/includes/global/g_clipboard.inc @@ -45,7 +45,7 @@ testcase tiEditUndo Dim sDatei as string Dim Ueber_Text_1 as string - if (gApplication = "IMPRESS") then + if ( gApplication = "IMPRESS" ) then ExtensionString = "odp" else ExtensionString = "odg" @@ -53,10 +53,7 @@ testcase tiEditUndo sDatei = gTesttoolPath + "graphics\required\input\leer."+ExtensionString - hFileOpen ConvertPath (sDatei) - sleep 5 - printlog "Checking for readonly state. If so, make it editable." - sMakeReadOnlyDocumentEditable + hFileOpenLocally( sDatei ) hTypeKeys "" sleep 3 diff --git a/testautomation/graphics/optional/includes/global/g_demoguide.inc b/testautomation/graphics/optional/includes/global/g_demoguide.inc index 54a3a67c58d0..71bfb2ac11eb 100644 --- a/testautomation/graphics/optional/includes/global/g_demoguide.inc +++ b/testautomation/graphics/optional/includes/global/g_demoguide.inc @@ -224,10 +224,8 @@ testcase t_Interoperability '///Open PowerPoint presentation printlog "Open PowerPoint presentation" - hFileOpen (Convertpath (gTesttoolPath + "graphics/required/input/dotNetOverview.ppt")) + hFileOpenLocally( gTesttoolPath + "graphics/required/input/dotNetOverview.ppt" ) - Call sMakeReadOnlyDocumentEditable - 'Save the name of the origin background (taken from last slide) Kontext "DocumentImpress" DocumentImpress.TypeKeys "" diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index c54881a0b68e..35b53c07c1cd 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -107,14 +107,13 @@ testcase tiToolsThesaurus PrintLog "Thesaurus with 1 word: " + sWord - if( Ucase(gApplication) = "DRAW" ) then + if( gApplication = "DRAW" ) then sExt = ".odg" - elseif( Ucase(gApplication) = "IMPRESS" ) then + elseif( gApplication = "IMPRESS" ) then sExt = ".odp" endif - Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) - Call sMakeReadOnlyDocumentEditable() + Call hFileOpenLocally(gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) Call hTextrahmenErstellen (sWord,20,20,50,30) sleep 1 @@ -280,16 +279,15 @@ testcase tiToolsThesaurusContextMenu PrintLog "Thesaurus with 1 word: " + sWord - if( Ucase(gApplication) = "DRAW" ) then + if( gApplication = "DRAW" ) then sExt = ".odg" Kontext "DrawDocument" - elseif( Ucase(gApplication) = "IMPRESS" ) then + elseif( gApplication = "IMPRESS" ) then sExt = ".odp" Kontext "ImpressDocument" endif - Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) - Call sMakeReadOnlyDocumentEditable + hFileOpenLocally(gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) Call hTextrahmenErstellen (sWord,20,20,50,30) sleep 1 @@ -384,14 +382,14 @@ testcase tiToolsHyphenation2 dim sDraw as string dim sFile as string PrintLog "- Tools/Hyphenation2" - Select Case Ucase(gApplication) + Select Case gApplication case "DRAW" : sExt = ".odg" case "IMPRESS" : sExt = ".odp" end select if ((not bAsianLan) AND (iSprache <> 07)) then sFile = gTesttoolpath + "graphics\required\input\silben_"+iSprache+sExt - Call hFileOpen (sFile) + hFileOpenLocally( sFile ) endif select case iSprache '/// Open prepared document ///' @@ -411,7 +409,7 @@ testcase tiToolsHyphenation2 case else : if bAsianLan then printlog "For the language " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-)" printlog " :-) will use English instead" - Call hFileOpen (gTesttoolpath + "graphics\required\input\silben_"+"1"+sExt) + hFileOpenLocally( gTesttoolpath + "graphics\required\input\silben_"+"1"+sExt ) DasWort = "ation" : DasWort2 = "tion" : DasWort3 = "ion" : DasWort4 = "on" '+Chr(34) else Warnlog "For the language " + iSprache +" nothing is prepared yet: insert text here and create file: "+sFile @@ -419,8 +417,6 @@ testcase tiToolsHyphenation2 endif end select - Call sMakeReadOnlyDocumentEditable - printlog " - Test hyphenation" EditSelectAll '/// Press CTRL + A to select all ///' '/// press return to go into the edit mode ///' diff --git a/testautomation/graphics/optional/includes/impress/i_slideshow.inc b/testautomation/graphics/optional/includes/impress/i_slideshow.inc index d313f444994b..c9fec2c44ea8 100644 --- a/testautomation/graphics/optional/includes/impress/i_slideshow.inc +++ b/testautomation/graphics/optional/includes/impress/i_slideshow.inc @@ -29,28 +29,17 @@ '* '* short description : '* -'******************************************************************* -'* -' #1 tSlideShowSlideShow -' #1 tSlideShowRehearseTimings -' #1 tSlideShowSlideShowSettings -' #1 tSlideShowCustomSlideShow -' #1 tSlideShowSlideTransition -' #1 tSlideShowShowHideSlide -'* '\****************************************************************** + testcase tSlideShowSlideShow dim bLoaded as boolean dim i as integer '/// open file 'graphics\\input\\diashow.odp' ///' - hFileOpen ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp") + hFileOpenLocally( gTesttoolPath + "graphics\required\input\diashow.odp" ) sleep 30 - printlog "check if the document is writable" - sMakeReadOnlyDocumentEditable - bLoaded = false Kontext "Navigator" @@ -292,10 +281,8 @@ testcase tSlideShowSlideShowSettings bLoaded = false '/// open file 'graphics\\input\\diashow.odp' (Slide Show with 4 Slides) ///' - hFileOpen ConvertPath (gTesttoolPath + "graphics\required\input\diashow.odp") + hFileOpenLocally( gTesttoolPath + "graphics\required\input\diashow.odp" ) sleep 10 - printlog "check if the document is writable" - sMakeReadOnlyDocumentEditable try Kontext "DocumentImpress" diff --git a/testautomation/graphics/required/includes/global/id_006.inc b/testautomation/graphics/required/includes/global/id_006.inc index 434959a7ac2d..ccdfc5eb3e69 100644 --- a/testautomation/graphics/required/includes/global/id_006.inc +++ b/testautomation/graphics/required/includes/global/id_006.inc @@ -167,14 +167,13 @@ testcase tiToolsThesaurus PrintLog "Thesaurus with 1 word: " + sWord - if( Ucase(gApplication) = "DRAW" ) then + if( gApplication = "DRAW" ) then sExt = ".odg" elseif( Ucase(gApplication) = "IMPRESS" ) then sExt = ".odp" endif - Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) - Call sMakeReadOnlyDocumentEditable() + hFileOpenLocally( gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) Call hTextrahmenErstellen (sWord,20,20,50,30) sleep 1 diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc index 0f10d2b9ef42..6c4b0eef2141 100644 --- a/testautomation/writer/optional/includes/fields/w_fields2.inc +++ b/testautomation/writer/optional/includes/fields/w_fields2.inc @@ -391,24 +391,15 @@ testcase tDocumentFilename goto endsub end if - Dim sOriginalFile as String Dim sTestFile as String Dim sFilename(4) as String Dim i as Integer - sTestFile = Convertpath (gOfficepath + "user\work\pageTest.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\pageTest.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile = gTesttoolpath & "writer\optional\input\fields\pageTest.sxw" sFilename(0) = "pageTest.sxw" sFilename(1) = "pageTest" - sFilename(2) = Convertpath (gOfficepath + "user\work\") + sFilename(2) = Convertpath( gOfficepath + "user\work\" ) sFilename(3) = sTestFile printlog "Insert/Fields/Other/Document / File name" @@ -867,22 +858,12 @@ endcase testcase tDocumentStatistics Dim sTestFile as String - Dim sOriginalFile as string Dim sStatistics() as String Dim sType as string Dim i as Integer sStatistics = Array( "2", "2", "3", "13", "2", "2", "1" ) - - sTestFile = Convertpath (gOfficepath + "user\work\statisticsTest.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\statisticsTest.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile= Convertpath (gTesttoolpath + "writer\optional\input\fields\statisticsTest.sxw") printlog "Insert/Fields/Other/Document / Statistics" '/// Insert/Fields/Other/Document / Statistics @@ -928,7 +909,6 @@ endcase testcase tDocumentTemplate Dim sTestFile as String - Dim sOriginalFile as string Dim sDirectory as String Dim oDirectory as String Dim sLanguage as String @@ -937,15 +917,7 @@ testcase tDocumentTemplate Dim i as Integer sLanguage = fGetDirLanguage() - sTestFile = Convertpath (gOfficepath + "user\work\diploma.ott") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\diploma.ott") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile = gTesttoolpath + "writer\optional\input\fields\diploma.ott" sResult(0) = fGetCateGory() sResult(1) = "diploma.ott" diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc index fb5a67ce8bb7..331e8753dc1b 100644 --- a/testautomation/writer/optional/includes/fields/w_fields4.inc +++ b/testautomation/writer/optional/includes/fields/w_fields4.inc @@ -264,23 +264,13 @@ testcase tDocInformationUserDefined QAErrorLog "#i112077#Tabpage 'Custom properties' has no declaration" goto endsub Dim sTestFile as String - Dim sOriginalFile as string Dim sVarResult() as String Dim sFixResult() as String Dim i as integer Dim j as Integer j = UBound(sVarResult) - sTestFile = Convertpath (gOfficepath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if - + sTestFile = gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw" sVarResult = Array( _ "A1" , _ "B2" , _ @@ -344,8 +334,6 @@ endcase testcase tDocInformationCreated - Dim sTestFile as String - Dim sOriginalFile as String Dim sFirstName as String Dim sLastName as String Dim sFirstName1 as String @@ -355,15 +343,7 @@ testcase tDocInformationCreated Dim i as Integer sFirstName1 = "Test1" : sLastName1 = "Test2" - sTestFile = Convertpath (gOfficePath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile = gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw" sVarResult(0) = sFirstName1 + " " + sLastName1 sVarResult(1) = fGetDate1(Date) @@ -458,7 +438,6 @@ endcase testcase tDocInformationModified Dim sTestFile as String - Dim sOriginalFile as String Dim sSaveasFile as String Dim sFirstName as String Dim sLastName as String @@ -469,15 +448,7 @@ testcase tDocInformationModified Dim i as Integer sFirstName1 = "Test1" : sLastName1 = "Test2" - sTestFile = Convertpath (gOfficePath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile = gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw" sSaveasFile = ConvertPath (gOfficePath + "user\work\fields_docinfos1.sxw" ) sVarResult(0) = sFirstName1 + " " + sLastName1 @@ -595,7 +566,6 @@ testcase tDocInformationModifiedSavefile goto endsub Dim sTestFile as String - Dim sOriginalFile as string Dim sSaveasFile as String Dim sFirstName as String Dim sLastName as String @@ -606,15 +576,7 @@ testcase tDocInformationModifiedSavefile Dim i as Integer sFirstName1 = "Test1" : sLastName1 = "Test2" - sTestFile = Convertpath (gOfficePath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile = gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw" sSaveasFile = ConvertPath (gOfficePath + "user\work\fields_docinfos1.sxw" ) sVarResult(0) = sFirstName1 + " " + sLastName1 @@ -715,7 +677,6 @@ endcase testcase tDocInformationPrinted Dim sTestFile as String - Dim sOriginalFile as String Dim sFirstName as String Dim sLastName as String Dim sFirstName1 as String @@ -725,17 +686,7 @@ testcase tDocInformationPrinted Dim i as Integer sFirstName1 = "Test1" : sLastName1 = "Test2" - sTestFile = Convertpath (gOfficePath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if - - + sTestFile = gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw" sVarResult(0) = sFirstName1 + " " + sLastName1 sVarResult(1) = fGetDate1(Date) @@ -842,7 +793,6 @@ endcase testcase tDocInformationRevisionnumber Dim sTestFile as String - Dim sOriginalFile as string Dim sSaveasFile as String Dim sFirstName as String Dim sLastName as String @@ -854,15 +804,7 @@ testcase tDocInformationRevisionnumber sFirstName1 = "Test1" : sLastName1 = "Test2" sVarResult = "17" : sFixResult = "4" - sTestFile = Convertpath (gOfficePath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile = gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw" sSaveasFile = ConvertPath (gOfficePath + "user\work\tDocInformationRevisionnumber.sxw" ) if FileExists ( sSaveAsFile ) then app.kill ( sSaveAsFile ) @@ -947,21 +889,12 @@ endcase testcase tDocInformationTotaleditingtime Dim sTestFile as String - Dim sOriginalFile as string Dim sSaveasFile as String Dim sVarResult as String Dim sFixResult as String sFixResult = "00:29:05" - sTestFile = Convertpath (gOfficePath + "user\work\fields_docinfos.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if + sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\fields_docinfos.sxw") sSaveasFile = ConvertPath (gOfficePath + "user\work\tDocInformationRevisionnumber.sxw" ) if FileExists ( sSaveAsFile ) then app.kill ( sSaveAsFile ) diff --git a/testautomation/writer/optional/includes/fields/w_fields7.inc b/testautomation/writer/optional/includes/fields/w_fields7.inc index af3e73c284b1..c5b21d00d5eb 100644 --- a/testautomation/writer/optional/includes/fields/w_fields7.inc +++ b/testautomation/writer/optional/includes/fields/w_fields7.inc @@ -182,7 +182,6 @@ testcase tL10NtestDate end if Dim sTestFile as String - Dim sOriginalFile as string Dim sDate() as String Dim iCountry() as Integer Dim i , j as Integer @@ -215,17 +214,7 @@ testcase tL10NtestDate ExtrasOptionenDlg.Cancel Call hCloseDocument - sTestFile = Convertpath (gOfficepath + "user\work\Date.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\Date.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if - - + sTestFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\Date.sxw") sDate = Array( _ "Tuesday, August 3, 2004" , _ "mardi 3 août 2004" , _ @@ -304,7 +293,6 @@ testcase tL10NtestTime end if Dim sTestFile as String - Dim sOriginalFile as string Dim sTime() as String Dim iCountry() as Integer Dim i as Integer @@ -338,17 +326,8 @@ testcase tL10NtestTime ExtrasOptionenDlg.Cancel Call hCloseDocument - sTestFile = Convertpath (gOfficepath + "user\work\Time.sxw") - sOriginalFile = Convertpath (gTesttoolpath + "writer\optional\input\fields\Time.sxw") - ' document has to be copied to local file system to avoid opening a read-only file - ' because all field data gets lost if documents write-protection is removed via 'sMakeReadOnlyDocumentEditable' - FileCopy (sOriginalFile, sTestFile) - if FileExists ( sTestFile ) = false then - Warnlog "Test document couldn't be copied to local file system. Test aborted!" - goto endsub - end if - - + + sTestFile = gTesttoolpath + "writer\optional\input\fields\Time.sxw" sTime = Array( _ "04:46:08 PM" , _ "04:46:08 PM" , _ -- cgit From 3f0450eecdf2ae68d014ddae7c34517c8478e0ff Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Tue, 14 Sep 2010 09:24:30 +0200 Subject: automationdev300m87: #i112208# - Revert all to hFileOpen() in all the places where we are working on a local context already. --- .../includes/alternative_text/w_alternative_text.inc | 9 +++------ .../writer/optional/includes/clipboard/w_210_.inc | 12 ++++++------ .../writer/optional/includes/clipboard/w_211_.inc | 18 +++++++++--------- .../writer/optional/includes/clipboard/w_212_.inc | 18 +++++++++--------- .../writer/optional/includes/clipboard/w_213_.inc | 18 +++++++++--------- .../writer/optional/includes/clipboard/w_214_.inc | 18 +++++++++--------- .../writer/optional/includes/clipboard/w_215_.inc | 8 ++++---- .../writer/optional/includes/clipboard/w_216_.inc | 6 +++--- .../writer/optional/includes/clipboard/w_217_.inc | 10 +++++----- .../writer/optional/includes/clipboard/w_218_.inc | 10 +++++----- .../writer/optional/includes/clipboard/w_219_.inc | 10 +++++----- .../writer/optional/includes/clipboard/w_220_.inc | 12 ++++++------ .../writer/optional/includes/clipboard/w_221_.inc | 14 +++++++------- .../writer/optional/includes/clipboard/w_222_.inc | 14 +++++++------- .../includes/formatcharacter/w_format_character1.inc | 8 ++++---- .../optional/includes/formatpage/w_formatpage1.inc | 2 +- .../optional/includes/formatpage/w_formatpage3.inc | 2 +- .../optional/includes/formatpage/w_formatpage4.inc | 2 +- .../includes/insertgraphic/w_insertgraphic1.inc | 2 +- .../writer/optional/includes/navigator/w_navigator.inc | 2 +- .../writer/optional/includes/number/w_205_.inc | 8 ++++---- .../writer/optional/includes/number/w_205a_.inc | 10 +++++----- .../writer/optional/includes/number/w_206_.inc | 4 ++-- .../writer/optional/includes/option/wh_o_2.inc | 2 +- .../writer/optional/includes/option/wr_o_2.inc | 2 +- .../writer/optional/includes/option/wr_o_3.inc | 2 +- .../writer/optional/includes/option/wr_o_4.inc | 2 +- .../regression/issuezilla/w_issuezilla_regression.inc | 8 ++++---- .../writer/optional/includes/section/w_section_3.inc | 4 ++-- 29 files changed, 117 insertions(+), 120 deletions(-) diff --git a/testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc b/testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc index bf14a2dae8e9..a80e5b0e925b 100644 --- a/testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc +++ b/testautomation/writer/optional/includes/alternative_text/w_alternative_text.inc @@ -37,7 +37,6 @@ sub w_alternative_text Call tFrameAlternativeText Call tOLEAlternativeText - end sub '------------------------------------------------------------------------- @@ -106,7 +105,7 @@ testcase tPictureAlternativeText Call hCloseDocument printlog "- Reload" - hFileOpenLocally( gOfficePath + "user\work\tPictureAlternativeText.odt" ) + hFileOpen( gOfficePath + "user\work\tPictureAlternativeText.odt" ) ' select graphic Call wTypeKeys ("") @@ -190,7 +189,7 @@ testcase tFrameAlternativeText Call hCloseDocument printlog "- Reload" - hFileOpenLocally( gOfficePath + "user\work\tFrameAlternativeText.odt" ) + hFileOpen( gOfficePath + "user\work\tFrameAlternativeText.odt" ) ' select frame Call wTypeKeys ("") @@ -271,7 +270,7 @@ testcase tOLEAlternativeText Call hCloseDocument printlog "- Reload" - hFileOpenLocally( gOfficePath + "user\work\tOLEAlternativeText.odt" ) + hFileOpen( gOfficePath + "user\work\tOLEAlternativeText.odt" ) ' select OLE Call wTypeKeys ("") @@ -293,7 +292,5 @@ testcase tOLEAlternativeText printlog "- close document" Call hCloseDocument - - endcase \ No newline at end of file diff --git a/testautomation/writer/optional/includes/clipboard/w_210_.inc b/testautomation/writer/optional/includes/clipboard/w_210_.inc index 8f744c28fb6e..bef3214a1d46 100644 --- a/testautomation/writer/optional/includes/clipboard/w_210_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_210_.inc @@ -225,7 +225,7 @@ testcase WriterToWriterFrame printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_frame.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_frame.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -267,7 +267,7 @@ testcase WriterToWriterDrawingObject printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_draw.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_draw.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -309,7 +309,7 @@ testcase WriterToWriterGraphicLinked printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_graphic1.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_graphic1.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -351,7 +351,7 @@ testcase WriterToWriterGraphicEmbedded printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_graphic2.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_graphic2.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -393,7 +393,7 @@ testcase WriterToWriterOLEObject printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_ole.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_ole.odt",false) printlog " + Close saved document " Call hCloseDocument else @@ -435,7 +435,7 @@ testcase WriterToWriterControl printlog " + Close saved document " Call hCloseDocument printlog " + Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_control.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_control.odt",false) printlog " + Close saved document " Call hCloseDocument else diff --git a/testautomation/writer/optional/includes/clipboard/w_211_.inc b/testautomation/writer/optional/includes/clipboard/w_211_.inc index f40021cf38a1..7c4476eccc92 100644 --- a/testautomation/writer/optional/includes/clipboard/w_211_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_211_.inc @@ -79,7 +79,7 @@ testcase WriterToCalcText Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_text.ods",true) + hFileOpen( gOfficepath + "user\work\writer_to_calc_text.ods",true) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -133,7 +133,7 @@ testcase WriterToCalcField Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_field.ods",true) + hFileOpen( gOfficepath + "user\work\writer_to_calc_field.ods",true) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -192,7 +192,7 @@ testcase WriterToCalcTable kontext "navigator" if navigator.exists then navigator.close - hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_table.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_table.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -248,7 +248,7 @@ testcase WriterToCalcFrame Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_frame.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_frame.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -302,7 +302,7 @@ testcase WriterToCalcDrawingObject Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_draw.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_draw.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -357,7 +357,7 @@ testcase WriterToCalcGraphicLinked Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_graphic1.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_graphic1.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -412,7 +412,7 @@ testcase WriterToCalcGraphicEmbedded Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_graphic2.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_graphic2.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -466,7 +466,7 @@ testcase WriterToCalcOLEObject Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_ole.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_ole.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -520,7 +520,7 @@ testcase WriterToCalcControl Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_calc_control.ods",false) + hFileOpen( gOfficepath + "user\work\writer_to_calc_control.ods",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_212_.inc b/testautomation/writer/optional/includes/clipboard/w_212_.inc index 8f13f3c46488..277a837d42bd 100644 --- a/testautomation/writer/optional/includes/clipboard/w_212_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_212_.inc @@ -80,7 +80,7 @@ testcase WriterToImpressText Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_text.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_text.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -134,7 +134,7 @@ testcase WriterToImpressField Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_field.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_field.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -188,7 +188,7 @@ testcase WriterToImpressTable Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_table.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_table.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -242,7 +242,7 @@ testcase WriterToImpressFrame Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_frame.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_frame.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -296,7 +296,7 @@ testcase WriterToImpressDrawingObject Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_draw.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_draw.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -350,7 +350,7 @@ testcase WriterToImpressGraphicLinked Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_graphic1.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_graphic1.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -404,7 +404,7 @@ testcase WriterToImpressGraphicEmbedded Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_graphic2.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_graphic2.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -458,7 +458,7 @@ testcase WriterToImpressOLEObject Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_ole.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_ole.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -512,7 +512,7 @@ testcase WriterToImpressControl Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_impress_control.odp",false) + hFileOpen( gOfficepath + "user\work\writer_to_impress_control.odp",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_213_.inc b/testautomation/writer/optional/includes/clipboard/w_213_.inc index ac11201662fb..72cdeac69678 100644 --- a/testautomation/writer/optional/includes/clipboard/w_213_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_213_.inc @@ -79,7 +79,7 @@ testcase WriterToDrawText Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_text.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_text.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -133,7 +133,7 @@ testcase WriterToDrawField Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_field.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_field.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -187,7 +187,7 @@ testcase WriterToDrawTable Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_table.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_table.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -241,7 +241,7 @@ testcase WriterToDrawFrame Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_frame.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_frame.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -295,7 +295,7 @@ testcase WriterToDrawDrawingObject Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_draw.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_draw.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -350,7 +350,7 @@ testcase WriterToDrawGraphicLinked Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_graphic1.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_graphic1.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -405,7 +405,7 @@ testcase WriterToDrawGraphicEmbedded Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_graphic2.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_graphic2.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -459,7 +459,7 @@ testcase WriterToDrawOLEObject Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_ole.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_ole.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -513,7 +513,7 @@ testcase WriterToDrawControl Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_draw_control.odg",false) + hFileOpen( gOfficepath + "user\work\writer_to_draw_control.odg",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_214_.inc b/testautomation/writer/optional/includes/clipboard/w_214_.inc index d02caff65d76..12b9b687b426 100644 --- a/testautomation/writer/optional/includes/clipboard/w_214_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_214_.inc @@ -78,7 +78,7 @@ testcase WriterToHTMLText Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_html_text.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_text.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -131,7 +131,7 @@ testcase WriterToHTMLField Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_html_field.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_field.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -184,7 +184,7 @@ testcase WriterToHTMLTable Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_html_table.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_table.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -237,7 +237,7 @@ testcase WriterToHTMLFrame Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_html_frame.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_frame.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -290,7 +290,7 @@ testcase WriterToHTMLDrawingObject Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_html_draw.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_draw.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -343,7 +343,7 @@ testcase WriterToHTMLGraphicLinked Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_html_graphic1.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_graphic1.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -396,7 +396,7 @@ testcase WriterToHTMLGraphicEmbedded Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_html_graphic2.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_graphic2.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -449,7 +449,7 @@ testcase WriterToHTMLOLEObject Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_html_ole.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_ole.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -502,7 +502,7 @@ testcase WriterToHTMLControl Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\writer_to_html_control.html") + hFileOpen( gOfficepath + "user\work\writer_to_html_control.html") printlog " + Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_215_.inc b/testautomation/writer/optional/includes/clipboard/w_215_.inc index 74669a4f29b0..992efb2981ca 100644 --- a/testautomation/writer/optional/includes/clipboard/w_215_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_215_.inc @@ -147,7 +147,7 @@ testcase CalcToWriterText2 Call hCloseDocument wait 500 printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_textformat_cellcontent.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_textformat_cellcontent.odt",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -329,7 +329,7 @@ testcase CalcToWriterHyperlink2 Call hCloseDocument wait 500 printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_hyperlink_cellcontent.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_hyperlink_cellcontent.odt",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -381,7 +381,7 @@ testcase CalcToWriterDrawObject Call hCloseDocument wait 500 printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_draw.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_draw.odt",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -433,7 +433,7 @@ testcase CalcToWriterOLE Call hCloseDocument wait 500 printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\writer_to_writer_ole.odt",false) + hFileOpen( gOfficepath + "user\work\writer_to_writer_ole.odt",false) Wait 500 printlog " Close saved document " Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_216_.inc b/testautomation/writer/optional/includes/clipboard/w_216_.inc index 1537d2969692..bfbbdf637695 100644 --- a/testautomation/writer/optional/includes/clipboard/w_216_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_216_.inc @@ -297,7 +297,7 @@ testcase HTMLToWRITERGraphicLinked Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\html_to_writer_graphic1.odt",false) + hFileOpen( gOfficepath + "user\work\html_to_writer_graphic1.odt",false) printlog " Reopen saved document " Wait 500 printlog " Close saved document " @@ -357,7 +357,7 @@ testcase HTMLToWRITERControl Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\html_to_writer_control.odt",false) + hFileOpen( gOfficepath + "user\work\html_to_writer_control.odt",false) printlog " Reopen saved document " Wait 500 printlog " Close saved document " @@ -423,7 +423,7 @@ testcase HTMLToWRITERFloatingFrame Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\html_to_writer_float.odt",false) + hFileOpen( gOfficepath + "user\work\html_to_writer_float.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_217_.inc b/testautomation/writer/optional/includes/clipboard/w_217_.inc index de3f78367e24..5e81b745f6d8 100644 --- a/testautomation/writer/optional/includes/clipboard/w_217_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_217_.inc @@ -149,7 +149,7 @@ testcase HTMLToCALCField Call hCloseDocument wait 500 printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_calc_field.ods",true) + hFileOpen( gOfficepath + "user\work\html_to_calc_field.ods",true) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -203,7 +203,7 @@ testcase HTMLToCALCTable printlog " Save document as ..\user\work\html_to_calc_table.ods" Call hCloseDocument printlog " Close saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_calc_table.ods",true) + hFileOpen( gOfficepath + "user\work\html_to_calc_table.ods",true) printlog " Reopen saved document " Call hCloseDocument printlog " Close saved document " @@ -260,7 +260,7 @@ testcase HTMLToCALCGraphicLinked Call hCloseDocument wait 500 printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_calc_graphic1.ods",false) + hFileOpen( gOfficepath + "user\work\html_to_calc_graphic1.ods",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -317,7 +317,7 @@ testcase HTMLToCALCControl Call hCloseDocument wait 500 printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_calc_control.ods",false) + hFileOpen( gOfficepath + "user\work\html_to_calc_control.ods",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -378,7 +378,7 @@ testcase HTMLToCALCFloatingFrame printlog " Close saved document " Call hCloseDocument printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_calc_float.ods",false) + hFileOpen( gOfficepath + "user\work\html_to_calc_float.ods",false) printlog " Close saved document " Call hCloseDocument else diff --git a/testautomation/writer/optional/includes/clipboard/w_218_.inc b/testautomation/writer/optional/includes/clipboard/w_218_.inc index fb8aae68a7ec..08f23ef0df96 100644 --- a/testautomation/writer/optional/includes/clipboard/w_218_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_218_.inc @@ -154,7 +154,7 @@ testcase HTMLToDRAWField Call hCloseDocument sleep (2) printlog " + Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_draw_field.odg",false) + hFileOpen( gOfficepath + "user\work\html_to_draw_field.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument @@ -211,7 +211,7 @@ testcase HTMLToDRAWTable Call hCloseDocument wait 500 printlog " + Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_draw_table.odg",false) + hFileOpen( gOfficepath + "user\work\html_to_draw_table.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument @@ -267,7 +267,7 @@ testcase HTMLToDRAWGraphicLinked Call hCloseDocument wait 500 printlog " + Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_draw_graphic1.odg",false) + hFileOpen( gOfficepath + "user\work\html_to_draw_graphic1.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument @@ -324,7 +324,7 @@ testcase HTMLToDRAWControl Call hCloseDocument wait 500 printlog " + Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_draw_control.odg",false) + hFileOpen( gOfficepath + "user\work\html_to_draw_control.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument @@ -386,7 +386,7 @@ testcase HTMLToDRAWFloatingFrame Call hCloseDocument wait 500 printlog " + Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_draw_float.odg",false) + hFileOpen( gOfficepath + "user\work\html_to_draw_float.odg",false) Wait 500 printlog " + Close saved document " Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_219_.inc b/testautomation/writer/optional/includes/clipboard/w_219_.inc index 8ce54912c15c..371e1e127e6e 100644 --- a/testautomation/writer/optional/includes/clipboard/w_219_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_219_.inc @@ -149,7 +149,7 @@ testcase HTMLToIMPRESSField Call hCloseDocument wait 500 printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_impress_field.odp",false) + hFileOpen( gOfficepath + "user\work\html_to_impress_field.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -206,7 +206,7 @@ testcase HTMLToIMPRESSTable Call hCloseDocument wait 500 printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_impress_table.odp",false) + hFileOpen( gOfficepath + "user\work\html_to_impress_table.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -262,7 +262,7 @@ testcase HTMLToIMPRESSGraphicLinked Call hCloseDocument wait 500 printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_impress_graphic1.odp",false) + hFileOpen( gOfficepath + "user\work\html_to_impress_graphic1.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -319,7 +319,7 @@ testcase HTMLToIMPRESSControl Call hCloseDocument wait 500 printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_impress_control.odp",false) + hFileOpen( gOfficepath + "user\work\html_to_impress_control.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument @@ -381,7 +381,7 @@ testcase HTMLToIMPRESSFloatingFrame Call hCloseDocument wait 500 printlog " Reopen saved document " - hFileOpenLocally( gOfficepath + "user\work\html_to_impress_float.odp",false) + hFileOpen( gOfficepath + "user\work\html_to_impress_float.odp",false) Wait 500 printlog " Close saved document " Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_220_.inc b/testautomation/writer/optional/includes/clipboard/w_220_.inc index 8e494c0e8af4..4ae43a6d7124 100644 --- a/testautomation/writer/optional/includes/clipboard/w_220_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_220_.inc @@ -86,7 +86,7 @@ testcase HTMLToHTMLText Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\html_to_html_text.html",false) + hFileOpen( gOfficepath + "user\work\html_to_html_text.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -143,7 +143,7 @@ testcase HTMLToHTMLField Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\html_to_html_field.html",false) + hFileOpen( gOfficepath + "user\work\html_to_html_field.html" ) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -200,7 +200,7 @@ testcase HTMLToHTMLTable Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\html_to_html_table.html",false) + hFileOpen( gOfficepath + "user\work\html_to_html_table.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -256,7 +256,7 @@ testcase HTMLToHTMLGraphicLinked Call hCloseDocument printlog " Close saved document " sleep (2) - hFileOpenLocally( gOfficepath + "user\work\html_to_html_graphic1.html",false) + hFileOpen( gOfficepath + "user\work\html_to_html_graphic1.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -313,7 +313,7 @@ testcase HTMLToHTMLControl Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\html_to_html_control.html",false) + hFileOpen( gOfficepath + "user\work\html_to_html_control.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -375,7 +375,7 @@ testcase HTMLToHTMLFloatingFrame Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\html_to_html_float.html",false) + hFileOpen( gOfficepath + "user\work\html_to_html_float.html",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_221_.inc b/testautomation/writer/optional/includes/clipboard/w_221_.inc index 0436ef6531d4..7b5674d9ca97 100644 --- a/testautomation/writer/optional/includes/clipboard/w_221_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_221_.inc @@ -80,7 +80,7 @@ testcase DrawToHTMLScrollingText Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_html_scrolling_text.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_scrolling_text.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -135,7 +135,7 @@ testcase DrawToHTMLGroupedObject Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_html_grouped_object.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_grouped_object.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -190,7 +190,7 @@ testcase DrawToHTML3D Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_html_3d.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_3d.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -245,7 +245,7 @@ testcase DrawToHTMLFontwork Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_html_fontwork.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_fontwork.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -300,7 +300,7 @@ testcase DrawToHTMLBullets Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_html_bullets.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_bullets.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -356,7 +356,7 @@ testcase DrawToHTMLDimensionLines Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_html_dim_lines.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_dim_lines.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument @@ -412,7 +412,7 @@ testcase DrawToHTMLConnectors Call hCloseDocument printlog " + Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_html_connectors.html",false) + hFileOpen( gOfficepath + "user\work\draw_to_html_connectors.html",false) printlog " + Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/clipboard/w_222_.inc b/testautomation/writer/optional/includes/clipboard/w_222_.inc index 488f0d40ca6d..166ad4b4e38e 100644 --- a/testautomation/writer/optional/includes/clipboard/w_222_.inc +++ b/testautomation/writer/optional/includes/clipboard/w_222_.inc @@ -81,7 +81,7 @@ testcase DrawToWriterScrollingText Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_scrolling_text.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_scrolling_text.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -136,7 +136,7 @@ testcase DrawToWriterGroupedObject Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_grouped_object.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_grouped_object.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -191,7 +191,7 @@ testcase DrawToWriter3D Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_3d.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_3d.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -246,7 +246,7 @@ testcase DrawToWriterFontwork Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_fontwork.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_fontwork.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -301,7 +301,7 @@ testcase DrawToWriterBullets Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_bullets.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_bullets.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -357,7 +357,7 @@ testcase DrawToWriterDimensionLines Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_dim_lines.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_dim_lines.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument @@ -413,7 +413,7 @@ testcase DrawToWriterConnectors Call hCloseDocument printlog " Close saved document " wait 500 - hFileOpenLocally( gOfficepath + "user\work\draw_to_writer_connectors.odt",false) + hFileOpen( gOfficepath + "user\work\draw_to_writer_connectors.odt",false) printlog " Reopen saved document " Wait 500 Call hCloseDocument diff --git a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc index 7b8b0e61d784..87c1d9f47082 100644 --- a/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc +++ b/testautomation/writer/optional/includes/formatcharacter/w_format_character1.inc @@ -243,9 +243,9 @@ testcase tFormatCharacter3 Call hCloseDocument printlog "reopen previous saved document and check saved character format" if gApplication = "WRITER" then - hFileOpenLocally( gOfficePath + "user\work\format1.odt" ) + hFileOpen( gOfficePath & "user\work\format1.odt" ) else - hFileOpenLocally( gOfficePath + "user\work\format1.odm" ) + hFileOpen( gOfficePath & "user\work\format1.odm" ) end if Call wTypeKeys "" Wait 500 @@ -579,9 +579,9 @@ testcase tFormatCharacter Call hCloseDocument printlog "re-open previous saved document" if gApplication = "WRITER" then - hFileOpenLocally( gOfficePath + "user\work\format1.odt" ) + hFileOpen( gOfficePath & "user\work\format1.odt" ) else - hFileOpenLocally( gOfficePath + "user\work\format1.odm" ) + hFileOpen( gOfficePath & "user\work\format1.odm" ) end if Call wTypeKeys "" Wait 500 diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc index c597fef06f87..a7393d50f6df 100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage1.inc @@ -348,7 +348,7 @@ testcase tFormatPage_6 Call hNewDocument - hFileOpenLocally( gOfficepath + "user\work\tFormatPage_6.odt") + hFileOpen( gOfficepath + "user\work\tFormatPage_6.odt") '/// Check if Pre-defined formats are correct fFormatPageWriter("TabSeite") diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc index f4954d106df6..df0f810f9093 100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage3.inc @@ -1263,7 +1263,7 @@ testcase tFormatPage_46 Call hCloseDocument Call hNewDocument - hFileOpenLocally( gOfficepath + "user\work\tFormatPage_46.odt") + hFileOpen( gOfficepath + "user\work\tFormatPage_46.odt") '/// Check if the setting are still kept fFormatPageWriter("TabSpalten") diff --git a/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc b/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc index 526cf111bc16..728cd204ed50 100644 --- a/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc +++ b/testautomation/writer/optional/includes/formatpage/w_formatpage4.inc @@ -763,7 +763,7 @@ testcase tFormatPage_60 Call hCloseDocument Call hNewDocument - hFileOpenLocally( gOfficepath + "user\work\tFormatPage_60.odt") + hFileOpen( gOfficepath + "user\work\tFormatPage_60.odt") '/// check if the configuration is all right diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc index bf90c2744768..fddd341bd9eb 100644 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc @@ -642,7 +642,7 @@ testcase tInsertGraphic_10 sleep(2) '/// Reload the file - hFileOpenLocally( gOfficepath + "user\work\tInsertGraphic_5.odt") + hFileOpen( gOfficepath & "user\work\tInsertGraphic_5.odt") sleep(2) diff --git a/testautomation/writer/optional/includes/navigator/w_navigator.inc b/testautomation/writer/optional/includes/navigator/w_navigator.inc index c0f03039176d..e164bce470be 100644 --- a/testautomation/writer/optional/includes/navigator/w_navigator.inc +++ b/testautomation/writer/optional/includes/navigator/w_navigator.inc @@ -674,7 +674,7 @@ testcase tViewNavigator6 Sleep 2 printlog "- Saving and Loading the document, check settings" - hFileOpenLocally( gOfficePath + "user\work\uvobj.odt") + hFileOpen( gOfficePath & "user\work\uvobj.odt") '/// Navigator has to be opened with document /// Kontext "Navigator" if Navigator.NotExists then diff --git a/testautomation/writer/optional/includes/number/w_205_.inc b/testautomation/writer/optional/includes/number/w_205_.inc index dafa55b3d9bb..ade7afe66ad2 100644 --- a/testautomation/writer/optional/includes/number/w_205_.inc +++ b/testautomation/writer/optional/includes/number/w_205_.inc @@ -183,7 +183,7 @@ testcase tFormatNumberingBullets Sleep 2 Call hCloseDocument Sleep 2 - hFileOpenLocally( gOfficePath + "user\work\format4." & WriterFilterExtension(0) ) + hFileOpen( gOfficePath & "user\work\format4." & WriterFilterExtension(0) ) Sleep 2 '/// Close document /// Call hCloseDocument @@ -315,7 +315,7 @@ testcase tFormatNumberingPosition Sleep 2 Call hCloseDocument Sleep 2 - hFileOpenLocally( gOfficePath + "user\work\tFormatNumberingPosition." & WriterFilterExtension(0) ) + hFileOpen( gOfficePath & "user\work\tFormatNumberingPosition." & WriterFilterExtension(0) ) '/// check settings on Format / NumberingBullets /// FormatNumberingBullets @@ -499,7 +499,7 @@ testcase tFormatNumberingOptions Sleep 2 Call hCloseDocument Sleep 2 - hFileOpenLocally( gOfficePath + "user\work\format6." & WriterFilterExtension(0) ) + hFileOpen( gOfficePath & "user\work\format6." & WriterFilterExtension(0) ) For i = 1 to 15 call wTypeKeys "" Wait 500 @@ -713,7 +713,7 @@ testcase tFormatNumberingAll Sleep 2 Call hCloseDocument Sleep 2 - hFileOpenLocally( gOfficePath + "user\work\format7." & WriterFilterExtension(0) ) + hFileOpen( gOfficePath & "user\work\format7." & WriterFilterExtension(0) ) Sleep 2 FormatNumberingBullets '/// reopen Format / NumberingBullets and check saved settings /// diff --git a/testautomation/writer/optional/includes/number/w_205a_.inc b/testautomation/writer/optional/includes/number/w_205a_.inc index d981dbde812f..385d2a5501f4 100644 --- a/testautomation/writer/optional/includes/number/w_205a_.inc +++ b/testautomation/writer/optional/includes/number/w_205a_.inc @@ -240,10 +240,10 @@ testcase tToolsOutlineNumbering1 Select Case i Case 1 printlog "- Load sxw and check formattings" - hFileOpenLocally( gOfficePath + "user\work\tToolsOutlineNumbering1.sxw" ) + hFileOpen( gOfficePath & "user\work\tToolsOutlineNumbering1.sxw" ) Case 2 printlog "- Load odt and check formattings" - hFileOpenLocally( gOfficePath + "user\work\tToolsOutlineNumbering1.odt" ) + hFileOpen( gOfficePath & "user\work\tToolsOutlineNumbering1.odt" ) end select call wTypeKeys "", 8 call wTypeKeys "", 10 @@ -463,7 +463,7 @@ testcase tToolsOutlineNumbering2 printlog " - check saved Numbering" Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\tToolsOutlineNumbering2.odt", "writer8" ) Call hCloseDocument - hFileOpenLocally( gOfficePath + "user\work\tToolsOutlineNumbering2.odt" ) + hFileOpen( gOfficePath & "user\work\tToolsOutlineNumbering2.odt" ) ToolsOutlineNumbering Kontext @@ -638,7 +638,7 @@ testcase tToolsOutlineNumbering3 printlog " - check saved Numbering" Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\tToolsOutlineNumbering3.odt", "writer8" ) Call hCloseDocument - hFileOpenLocally( gOfficePath + "user\work\tToolsOutlineNumbering3.odt" ) + hFileOpen( gOfficePath & "user\work\tToolsOutlineNumbering3.odt" ) ToolsOutlineNumbering Kontext Active.SetPage TabKapitelnumerierung @@ -840,7 +840,7 @@ testcase tToolsFootnoteEndnote printlog " - Save and reload" Call hFileSaveAsWithFilterKill ( gOfficePath + "user\work\tToolsFootnoteEndnote.odt", "writer8" ) Call hCloseDocument - hFileOpenLocally( gOfficePath + "user\work\tToolsFootnoteEndnote.odt" ) + hFileOpen( gOfficePath & "user\work\tToolsFootnoteEndnote.odt" ) printlog " - check saved properties" ToolsFootnote Kontext diff --git a/testautomation/writer/optional/includes/number/w_206_.inc b/testautomation/writer/optional/includes/number/w_206_.inc index 46cc61715ad9..92958c2d9b18 100644 --- a/testautomation/writer/optional/includes/number/w_206_.inc +++ b/testautomation/writer/optional/includes/number/w_206_.inc @@ -340,7 +340,7 @@ testcase tToolsNumbering6 Call hFileSaveAsKill ( gOfficepath & "user\work\tToolsNumbering6.odt" ) '/// Close and reload document Call hCloseDocument - hFileOpenLocally( gOfficepath & "user\work\tToolsNumbering6.odt" ) + hFileOpen( gOfficepath & "user\work\tToolsNumbering6.odt" ) end if call wTypeKeys ( "" ) EditCopy @@ -448,7 +448,7 @@ testcase tToolsNumbering7 Call hFileSaveAsKill ( gOfficepath & "user\work\tToolsNumbering7.odt" ) '/// Close and reload document Call hCloseDocument - hFileOpenLocally( gOfficepath & "user\work\tToolsNumbering7.odt" ) + hFileOpen( gOfficepath & "user\work\tToolsNumbering7.odt" ) end if call wTypeKeys ( "" ) diff --git a/testautomation/writer/optional/includes/option/wh_o_2.inc b/testautomation/writer/optional/includes/option/wh_o_2.inc index 6555e741c5e3..3163453524ff 100644 --- a/testautomation/writer/optional/includes/option/wh_o_2.inc +++ b/testautomation/writer/optional/includes/option/wh_o_2.inc @@ -163,7 +163,7 @@ testcase tToolsOptionsHTMLPrint ' Is saved with document Kontext "ExtrasOptionenDlg" ExtrasOptionenDlg.OK - hFileOpenLocally( gOfficepath + "user\work\printtest.html") + hFileOpen( gOfficePath & "user\work\printtest.html") ToolsOptions Call hToolsOptions ( "HTML" , "PRINT" ) diff --git a/testautomation/writer/optional/includes/option/wr_o_2.inc b/testautomation/writer/optional/includes/option/wr_o_2.inc index b2a4e72ecec1..7b9322c169d8 100644 --- a/testautomation/writer/optional/includes/option/wr_o_2.inc +++ b/testautomation/writer/optional/includes/option/wr_o_2.inc @@ -587,7 +587,7 @@ testcase tToolsOptionsWriterPrint1 ExtrasOptionenDlg.OK WaitSlot (2) ' Notify is saved with document - hFileOpenLocally( gOfficepath + "user\work\printtest." & WriterFilterExtension(0) ) + hFileOpen( gOfficePath & "user\work\printtest." & WriterFilterExtension(0) ) ToolsOptions Call hToolsOptions ( "WRITER" , "PRINT" ) diff --git a/testautomation/writer/optional/includes/option/wr_o_3.inc b/testautomation/writer/optional/includes/option/wr_o_3.inc index df70dfc52faf..9868740c733c 100644 --- a/testautomation/writer/optional/includes/option/wr_o_3.inc +++ b/testautomation/writer/optional/includes/option/wr_o_3.inc @@ -938,7 +938,7 @@ testcase tToolsOptionsWriterCompatibility1 printlog "- load previously saved document" Call hNewDocument - hFileOpenLocally( gOfficePath + "user\work\tToolsOptionsWriterCompatibility1.odt") + hFileOpen( gOfficePath & "user\work\tToolsOptionsWriterCompatibility1.odt") Printlog "check state of all checkboxes and uncheck all checkboxes" ToolsOptions diff --git a/testautomation/writer/optional/includes/option/wr_o_4.inc b/testautomation/writer/optional/includes/option/wr_o_4.inc index 3201411e0e82..53915f76bc63 100644 --- a/testautomation/writer/optional/includes/option/wr_o_4.inc +++ b/testautomation/writer/optional/includes/option/wr_o_4.inc @@ -217,7 +217,7 @@ testcase tToolsOptionsWriterOther ' load file in this environment '///use "output\\writer\\w95\\tab25cm.odt" /// - hFileOpenLocally( gOfficePath + "user\work\tab25cm.odt") + hFileOpen( gOfficePath & "user\work\tab25cm.odt") sleep (2) ' check TabStops, have to be the ones this file was saved with ToolsOptions diff --git a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc index c03cb811e0f0..dd3b304ad151 100644 --- a/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc +++ b/testautomation/writer/optional/includes/regression/issuezilla/w_issuezilla_regression.inc @@ -205,7 +205,7 @@ testcase i69045 Call hCloseDocument printlog "- Save, close and load document" '/// Open saved document - hFileOpenLocally( gOfficepath & "user\work\i69045.odt" ) + hFileOpen( gOfficepath & "user\work\i69045.odt" ) '/// Check try EditChangesAcceptOrReject @@ -251,7 +251,7 @@ testcase i69521 '/// close document Call hCloseDocument '/// reload previous saved document - hFileOpenLocally( gOfficePath & "user\work\i96521-1.odt") + hFileOpen( gOfficePath & "user\work\i96521-1.odt") '/// Check if all 5 Graphics are still in document iItems = CountItemsInNavigatorGroup(4) if iItems <> 5 then @@ -325,7 +325,7 @@ testcase i75027 Call hFileSaveAsKill (gOfficepath & "user\work\i75027.html") '/// Reload previous saved document Call hCloseDocument - hFileOpenLocally( gOfficepath & "user\work\i75027.html") + hFileOpen( gOfficepath & "user\work\i75027.html") '/// Check that the numbering is still the same. printlog "- check numbering (previous saved)" Call wTypeKeys ( "" ) @@ -482,7 +482,7 @@ testcase i103265 Call hCloseDocument printlog "- Reload" - hFileOpenLocally( gOfficePath + "user\work\ODFHyperlinksInTOCs.html" ) + hFileOpen( gOfficePath & "user\work\ODFHyperlinksInTOCs.html" ) printlog "Check that every hyperlink jumps correctly to its target" For i = 1 to 3 ' point cursor to beginning of document diff --git a/testautomation/writer/optional/includes/section/w_section_3.inc b/testautomation/writer/optional/includes/section/w_section_3.inc index 72963282511e..e23b4c8502d5 100644 --- a/testautomation/writer/optional/includes/section/w_section_3.inc +++ b/testautomation/writer/optional/includes/section/w_section_3.inc @@ -1064,7 +1064,7 @@ testcase tPasswordProtectSection_2 Call hCloseDocument PrintLog " Reload the file" - hFileOpenLocally( gOfficePath + "user\work\tPasswordProtectSection_2.odt") + hFileOpen( gOfficepath + "user\work\tPasswordProtectSection_2.odt") FormatSections Kontext "BereicheBearbeiten" @@ -1200,7 +1200,7 @@ testcase tPasswordProtectSection_4 Call hCloseDocument PrintLog " Reload the file" - hFileOpenLocally( gOfficePath + "user\work\tPasswordProtectSection_4.odt") + hFileOpen( gOfficepath + "user\work\tPasswordProtectSection_4.odt") PrintLog " In format/section, PW-Dialogue should appear when clicking 'option' button" FormatSections -- cgit From 33056e84c7972d6a8a3834b49e339cf7edbbcb04 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 15 Sep 2010 10:14:56 +0200 Subject: automationdev300m87: #i112208# - Some test files rely on other files (e.g. for embedding) which must be copied as well. If the referenced file does not exist we get a warning that the document could not be found. In the current state of development this is bad because the dialog cannot be handled. So i added another dialog to hCloseDocument() which can be closed with either YES() or OK() while issuing a warning. --- .../global/tools/includes/required/t_doc1.inc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc index ff07554bca35..9ddbc2bb42ad 100755 --- a/testautomation/global/tools/includes/required/t_doc1.inc +++ b/testautomation/global/tools/includes/required/t_doc1.inc @@ -252,10 +252,25 @@ function hCloseDocument() try Active.No catch - Active.Click( 202 ) endcatch end if + if ( Active.exists() ) then + try + Active.click( 202 ) + catch + endcatch + endif + + if ( Active.exists() ) then + try + warnlog( "hCloseDocument: Unexpected dialog: " & Active.getText() ) + Active.ok() + catch + Active.yes() + endcatch + endif + '/// Wait for FileClose to complete' WaitSlot( 2000 ) -- cgit From af33379f75415172ce3534d4abd87a21a211ccda Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 15 Sep 2010 10:17:27 +0200 Subject: automationdev300m87: #i112208# - In some cases it is required to copy a list of files from testautomation to the local work directory. To make this as easy as possible i added two functions: hFileGetLocalPath( file ) which returns the fully qualified path that the file is going to have when copied to the local user directory and hFileListCopyLocal( list of files ) which copies a given list of files to the local work directory. --- .../global/tools/includes/required/t_files.inc | 59 +++++++++++++++++++--- 1 file changed, 52 insertions(+), 7 deletions(-) diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index ef8df3f31312..eb1b666fea27 100644 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -550,6 +550,45 @@ function hGetWorkPath() as string hGetWorkPath() = sPath & getPathSeparator +end function +' +'------------------------------------------------------------------------------- +' +function hFileGetLocalPath( sSourcePath as string ) as string + + ' Isolate filename from path, prepend local work directory and return new file path + hFileGetLocalPath() = hGetWorkFile( hSplitString( sSourcePath, getPathSeparator, 0 ) ) + +end function +' +'------------------------------------------------------------------------------- +' +function hFileListCopyLocal( lsSourceList() as string ) as boolean + + ' Copy a list of files from testautomation to the local work directory + + const CFN = "global::tools::includes::required::t_files.inc:hFileListCopyLocal(): " + dim iCurrentPath as integer + dim cTargetPath as string + dim cSourcePath as string + + hFileListCopyLocal() = true + + for iCurrentPath = 1 to listcount( lsSourceList() ) + + cSourcePath = lsSourceList( iCurrentPath ) + cTargetPath = hFileGetLocalPath( cSourcePath ) + + FileCopy( cSourcePath, cTargetPath ) + + ' If any one copy operation fails we + if ( not FileExists( cTargetPath ) ) then + hFileListCopyLocal() = false + warnlog( CFN & "File was not copied: " & cSourcePath ) + endif + + next iCurrentPath + end function ' '------------------------------------------------------------------------------- @@ -557,12 +596,12 @@ end function function hFileOpenLocally( byVal sSourcePath as string ) as boolean ' Issue #i112208# - implement a function that copies a file from testautomation - ' into the local work directory to avoid that the document gets opened - ' in read-only mode. See details of the implementation in the issue - ' description. + ' into the local work directory and opens it from there to avoid that the + ' document gets opened in read-only mode. See details of the implementation + ' in the issue description. ' Parameters - ' 1) Path as string, URLs are untested + ' 1) Path as string, URLs are untested. ' 2) Separator, usually "getPathSeparator" ' 3) Item number, 0 = last item which usually is the file name from a path. ' Begin counting with 1, while the function internally accesses item 0 @@ -571,7 +610,6 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean const CFN = "global::tools::includes::required::t_files.inc:hFileOpenLocally(): " dim sTargetPath as string - dim sTargetFile as string ' If the source file does not exist we quit if ( not FileExists( sSourcePath ) ) then @@ -581,8 +619,7 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean endif ' Find out what the name of the target file is going to be - sTargetFile = hSplitString( sSourcePath, getPathSeparator, 0 ) ' The file - sTargetPath = hGetWorkFile( sTargetFile ) ' The path + file + sTargetPath = hFileGetLocalPath( sSourcePath ) ' The path + file ' Copy the file from anywhere to the local user directory if it does not ' exist. This behavior was discussed on IRC @@ -597,6 +634,14 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean FileCopy( sSourcePath, sTargetPath ) endif + ' Verify that the file has been created. return an empty string and warn + if ( not FileExists( sTargetPath ) ) then + warnlog( CFN & "File was not copied: " & sTargetFile ) + hFileOpenLocally() = false + gLastWorkFile = "" + exit function + endif + ' This is a hook that allows to access the filename under which the file ' has been saved. Due to restrictive coding guidelines we cannot return ' the new filename. -- cgit From 7935c81acc75d652412441419f2bc3b8745ccf40 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 15 Sep 2010 10:19:03 +0200 Subject: automationdev300m87: #i112208# - Modified one test case to copy all files from testautomation/.../input to the local work directory as some files rely on others which are expected to be found at the same location. hFileOpenLocally() cannot do this as it does not know of dependencies to other files. --- .../optional/includes/loadsave/w_loadsave.inc | 615 ++++++++++----------- 1 file changed, 299 insertions(+), 316 deletions(-) diff --git a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc index 3bfd69c481d6..b7a7c7b2dd61 100644 --- a/testautomation/writer/optional/includes/loadsave/w_loadsave.inc +++ b/testautomation/writer/optional/includes/loadsave/w_loadsave.inc @@ -27,22 +27,16 @@ '* '* owner : helge.delfs@oracle.com '* -'* short description : Checks the export to all available Filters from +'* short description : Checks the export to all available Filters from '* -'*********************************************************************** -' -' #1 tExportAllReadableFormatsIntoODF -' #1 tExportAllReadableFormatsIntoThemselves -' #1 tExportTop5FormatsIntoTop5 -' '\*********************************************************************** testcase tExportAllReadableFormatsIntoODF - if iSprache <> 1 then - QAErrorlog "#100970#test only support english language" - goto endsub - end if + if iSprache <> 1 then + QAErrorlog "#100970#test only support english language" + goto endsub + end if Dim AvailableFilters( 35 ) as String Dim ImportFileList ( 300 ) as String @@ -50,8 +44,8 @@ testcase tExportAllReadableFormatsIntoODF Dim WorkDirectory as String Dim ImportDir as String Dim SavedCorrectly as Boolean - Dim sExportFilter as string - Dim sExportFile as string + Dim sExportFilter as string + Dim sExportFile as string Dim i as Integer WorkDirectory = ( ConvertPath ( gOfficePath + "user\work\" + gPlatgroup + "\export\")) @@ -64,7 +58,7 @@ testcase tExportAllReadableFormatsIntoODF for i=1 to FehlerListe(0) printlog " <> " & FehlerListe(i) next i - goto endsub + goto endsub end if end if app.Mkdir WorkDirectory @@ -73,106 +67,107 @@ testcase tExportAllReadableFormatsIntoODF GetFileList ( ImportDir, "*.*", ImportFileList() ) printlog "- Done." + ' Create local copies of all files to be imported + hFileListCopyLocal( ImportFileList() ) + printlog "- Start loading files in list" - For i = 1 to listCount(ImportFileList()) - printlog "- " & i & ". load: " & ImportFileList(i) - sExportFile = ImportFileList(i) - if GetExtention ( sExportFile ) = "psw" then - QAErrorlog "#i102221#Pocket Word filter puts General I/O Error" - else - hFileOpenLocally( ImportFileList(i) ) - printlog "- done" - - Kontext "TextImport" - if TextImport.Exists then - TextImport.Ok - printlog "- Text import dialog passed" - end if - - Kontext "Filterauswahl" - if Filterauswahl.Exists then - Filterauswahl.Cancel - printlog "- Filterdialog passed" - end if - - Kontext "AsciiFilterOptionen" - if AsciiFilterOptionen.Exists then - AsciiFilterOptionen.Ok - printlog "- ASCII-Filter dialog passed" - end if - - Kontext "SecurityWarning" - if SecurityWarning.Exists(3) then - SecurityWarning.Ok - printlog "- Security warning passed" - end if - - Kontext "DocumentWriter" - if DocumentWriter.Exists(3) then - Do until DocumentWriter.StatusIsProgress = false - wait 500 - Loop - else - Kontext "DocumentCalc" - if DocumentCalc.Exists(3) then - Do until DocumentCalc.StatusIsProgress = false - wait 500 - Loop - else - Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" - end if - end if - - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(ImportFileList(i),"sw40") = false then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" - end if - SecurityWarning.Cancel - end if - Sleep 1 - - Kontext "AlienWarning" - if AlienWarning.Exists then - AlienWarning.Ok - printlog "- Alien warning passed" - end if - - ' HTML-File can't be exported as odf this way - if GetExtention(ImportFileList(i)) <> "html" then - - sExportFile = WorkDirectory & "ExportedFile" & i & ".odf" - Printlog "- Save as : " & ConvertPath ( sExportFile ) - if hFileSaveAsWithFilterKill (sExportFile, "writer8") = true then - printlog "- done" - printlog "- close file" - Call hCloseDocument - - Printlog "- Open previous saved file" - Call hFileOpenWithFilter (sExportFile, "writer8") - printlog "- done" - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(ImportFileList(i),"sw40") = false then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" - end if - SecurityWarning.Cancel - end if - Sleep 1 - else - Warnlog "Unable to save file: " & sExportFile - end if - else - printlog "- HTML-file is not exported this way" - end if - - printlog "- Close all open files." - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - endif + For i = 1 to listCount(ImportFileList()) + printlog "- " & i & ". load: " & ImportFileList(i) + sExportFile = ImportFileList(i) + if GetExtention ( sExportFile ) = "psw" then + QAErrorlog "#i102221#Pocket Word filter puts General I/O Error" + else + hFileOpenLocally( ImportFileList(i) ) + printlog "- done" + + Kontext "TextImport" + if TextImport.Exists then + TextImport.Ok + printlog "- Text import dialog passed" + end if + + Kontext "Filterauswahl" + if Filterauswahl.Exists then + Filterauswahl.Cancel + printlog "- Filterdialog passed" + end if + + Kontext "AsciiFilterOptionen" + if AsciiFilterOptionen.Exists then + AsciiFilterOptionen.Ok + printlog "- ASCII-Filter dialog passed" + end if + + Kontext "SecurityWarning" + if SecurityWarning.Exists(3) then + SecurityWarning.Ok + printlog "- Security warning passed" + end if + + Kontext "DocumentWriter" + if DocumentWriter.Exists(3) then + Do until DocumentWriter.StatusIsProgress = false + wait 500 + Loop + else + Kontext "DocumentCalc" + if DocumentCalc.Exists(3) then + Do until DocumentCalc.StatusIsProgress = false + wait 500 + Loop + else + Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" + end if + end if + + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(ImportFileList(i),"sw40") = false then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel + end if + Sleep 1 + + Kontext "AlienWarning" + if AlienWarning.Exists then + AlienWarning.Ok + printlog "- Alien warning passed" + end if + + ' HTML-File can't be exported as odf this way + if GetExtention(ImportFileList(i)) <> "html" then + + sExportFile = WorkDirectory & "ExportedFile" & i & ".odf" + Printlog "- Save as : " & ConvertPath ( sExportFile ) + if hFileSaveAsWithFilterKill (sExportFile, "writer8") = true then + printlog "- done" + printlog "- close file" + Call hCloseDocument + + Printlog "- Open previous saved file" + Call hFileOpenWithFilter (sExportFile, "writer8") + printlog "- done" + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(ImportFileList(i),"sw40") = false then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel + end if + Sleep 1 + else + Warnlog "Unable to save file: " & sExportFile + end if + else + printlog "- HTML-file is not exported this way" + end if + + printlog "- Close all open files." + hFileCloseAll() + endif next i 'File endcase @@ -181,11 +176,11 @@ endcase testcase tExportAllReadableFormatsIntoThemselves - if iSprache <> 1 then - QAErrorlog "#100970#test only support english language" - goto endsub - end if - + if iSprache <> 1 then + QAErrorlog "#100970#test only support english language" + goto endsub + end if + Dim AvailableFilters( 35 ) as String Dim SavedCorrectly as Boolean Dim ImportFileList ( 300 ) as String @@ -217,154 +212,152 @@ testcase tExportAllReadableFormatsIntoThemselves For iCurrentFileIndex = 7 to 7 select case iCurrentFileIndex - case 1 : sCurrentFile = "xml2.odt" - sCurrentFilter = "writer8" - case 2 : sCurrentFile = "wpsfile.wps" - sCurrentFilter = "Text (encoded)" - case 3 : sCurrentFile = "dostext.txt" - sCurrentFilter = "Text (encoded)" - case 4 : sCurrentFile = "sw30.sdw" - sCurrentFilter = "StarWriter 3.0" - case 5 : sCurrentFile = "sw50.vor" - sCurrentFilter = "StarWriter 5.0 Vorlage/Template" - case 6 : sCurrentFile = "sw31.sdw" - sCurrentFilter = "StarWriter 3.0" - case 7 : sCurrentFile = "sw31.vor" - sCurrentFilter = "StarWriter 3.0 Vorlage/Template" - case 8 : sCurrentFile = "sw40.sdw" - sCurrentFilter = "StarWriter 4.0" - case 9 : sCurrentFile = "sw40_sp2.vor" - sCurrentFilter = "StarWriter 4.0 Vorlage/Template" - case 10 : sCurrentFile = "sw50.sdw" - sCurrentFilter = "StarWriter 5.0" - case 11 : sCurrentFile = "html.html" - sCurrentFilter = "HTML (StarWriter)" - case 12 : sCurrentFile = "rtf.rtf" - sCurrentFilter = "Rich Text Format" - case 13 : sCurrentFile = "sw60.sxw" - sCurrentFilter = "StarOffice XML (Writer)" - case 14 : sCurrentFile = "winw97.doc" - sCurrentFilter = "MS Word 97" - case 15 : sCurrentFile = "winword6.doc" - sCurrentFilter = "MS Word 95" - case 16 : sCurrentFile = "wintext.txt" - sCurrentFilter = "Text (encoded)" -' case 17 : sCurrentFile = "pocketword.psw" -' sCurrentFilter = "PocketWord File" -' TODO: 18-23 not applyable. Can be opened, but saving in the format is not supported. -' case 18 : sCurrentFile = "unixtext.txt" -' sCurrentFilter = "Text" -' case 19 : sCurrentFile = "sw2.sdw" -' sCurrentFilter = "StarWriter 2.0" -' case 20 : sCurrentFile = "amipro3.sam" -' sCurrentFilter = "Ami Pro 1.x-3.1 (W4W)" -' case 21 : sCurrentFile = "mactext.txt" -' sCurrentFilter = "Mac Write 4.x 5.0 (W4W)" -' case 22 : sCurrentFile = "sw1.sdw" -' sCurrentFilter = "StarWriter 1.0" -' case 23 : sCurrentFile = "swdoc.txt" -' sCurrentFilter = "Text (encoded) (StarWriter/GlobalDocument)" -' case 24 : sCurrentFile = "hangul.hwp" -' sCurrentFilter = "writer_MIZI_Hwp_97" + case 1 : sCurrentFile = "xml2.odt" + sCurrentFilter = "writer8" + case 2 : sCurrentFile = "wpsfile.wps" + sCurrentFilter = "Text (encoded)" + case 3 : sCurrentFile = "dostext.txt" + sCurrentFilter = "Text (encoded)" + case 4 : sCurrentFile = "sw30.sdw" + sCurrentFilter = "StarWriter 3.0" + case 5 : sCurrentFile = "sw50.vor" + sCurrentFilter = "StarWriter 5.0 Vorlage/Template" + case 6 : sCurrentFile = "sw31.sdw" + sCurrentFilter = "StarWriter 3.0" + case 7 : sCurrentFile = "sw31.vor" + sCurrentFilter = "StarWriter 3.0 Vorlage/Template" + case 8 : sCurrentFile = "sw40.sdw" + sCurrentFilter = "StarWriter 4.0" + case 9 : sCurrentFile = "sw40_sp2.vor" + sCurrentFilter = "StarWriter 4.0 Vorlage/Template" + case 10 : sCurrentFile = "sw50.sdw" + sCurrentFilter = "StarWriter 5.0" + case 11 : sCurrentFile = "html.html" + sCurrentFilter = "HTML (StarWriter)" + case 12 : sCurrentFile = "rtf.rtf" + sCurrentFilter = "Rich Text Format" + case 13 : sCurrentFile = "sw60.sxw" + sCurrentFilter = "StarOffice XML (Writer)" + case 14 : sCurrentFile = "winw97.doc" + sCurrentFilter = "MS Word 97" + case 15 : sCurrentFile = "winword6.doc" + sCurrentFilter = "MS Word 95" + case 16 : sCurrentFile = "wintext.txt" + sCurrentFilter = "Text (encoded)" + ' case 17 : sCurrentFile = "pocketword.psw" + ' sCurrentFilter = "PocketWord File" + ' TODO: 18-23 not applyable. Can be opened, but saving in the format is not supported. + ' case 18 : sCurrentFile = "unixtext.txt" + ' sCurrentFilter = "Text" + ' case 19 : sCurrentFile = "sw2.sdw" + ' sCurrentFilter = "StarWriter 2.0" + ' case 20 : sCurrentFile = "amipro3.sam" + ' sCurrentFilter = "Ami Pro 1.x-3.1 (W4W)" + ' case 21 : sCurrentFile = "mactext.txt" + ' sCurrentFilter = "Mac Write 4.x 5.0 (W4W)" + ' case 22 : sCurrentFile = "sw1.sdw" + ' sCurrentFilter = "StarWriter 1.0" + ' case 23 : sCurrentFile = "swdoc.txt" + ' sCurrentFilter = "Text (encoded) (StarWriter/GlobalDocument)" + ' case 24 : sCurrentFile = "hangul.hwp" + ' sCurrentFilter = "writer_MIZI_Hwp_97" end select sLoadFile = sImportDir & sCurrentFile - sSaveFile = sWorkDirectory & "filenr_" & iCurrentFileIndex & "." & GetExtention ( sCurrentFile ) + sSaveFile = sWorkDirectory & "filenr_" & iCurrentFileIndex & "." & GetExtention ( sCurrentFile ) printlog "- Export of File nr " + iCurrentFileIndex + " started" printlog " - Save file: " & sLoadFile printlog " - to file: " & sSaveFile - ' Load In-file - Call hFileOpenWithFilter(sLoadFile, sCurrentFilter, false) - - kontext "active" - if active.exists(2) then - active.ok - warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." - end if - - Kontext "TextImport" - if TextImport.Exists then - TextImport.Ok - end if - - Kontext "Filterauswahl" - if Filterauswahl.Exists then - Filterauswahl.Cancel - end if - - Kontext "AsciiFilterOptionen" - if AsciiFilterOptionen.Exists then AsciiFilterOptionen.Ok - Kontext "SecurityWarning" - if SecurityWarning.Exists(3) then SecurityWarning.Ok - Kontext "DocumentWriter" - if DocumentWriter.Exists(3) then - Do until DocumentWriter.StatusIsProgress = false - wait 500 - Loop - else - Kontext "DocumentCalc" - if DocumentCalc.Exists(3) then - Do until DocumentCalc.StatusIsProgress = false - wait 500 - Loop - else - Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" - end if - end if - - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(currentfile,"sw40") = false then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" - end if - SecurityWarning.Cancel - end if - Sleep 1 - - Kontext "AlienWarning" - if AlienWarning.Exists then AlienWarning.Ok - - ' Save Out-file - Call hFileSaveAsWithFilterKill(sSaveFile, sCurrentFilter) - - kontext "active" - if active.exists(2) then - active.ok - warnlog "Error saving file " + sLoadFile + " as " + sSaveFile + "." - goto Cleanup - end if - - ' Load Out-file again - Call hFileOpenWithFilter(sSaveFile, sCurrentFilter, false) - - ' Check for macro alert - Kontext "SecurityWarning" - if SecurityWarning.Exists then - if inStr(currentfile,"sw40") > 0 then - QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" - end if - SecurityWarning.Cancel - end if - Sleep 1 + ' Load In-file + Call hFileOpenWithFilter(sLoadFile, sCurrentFilter, false) + + kontext "active" + if active.exists(2) then + active.ok + warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." + end if + + Kontext "TextImport" + if TextImport.Exists then + TextImport.Ok + end if + + Kontext "Filterauswahl" + if Filterauswahl.Exists then + Filterauswahl.Cancel + end if + + Kontext "AsciiFilterOptionen" + if AsciiFilterOptionen.Exists then AsciiFilterOptionen.Ok + Kontext "SecurityWarning" + if SecurityWarning.Exists(3) then SecurityWarning.Ok + Kontext "DocumentWriter" + if DocumentWriter.Exists(3) then + Do until DocumentWriter.StatusIsProgress = false + wait 500 + Loop + else + Kontext "DocumentCalc" + if DocumentCalc.Exists(3) then + Do until DocumentCalc.StatusIsProgress = false + wait 500 + Loop + else + Warnlog "Neither DocumentWriter or DocumentCalc existed? Some other dialogue in focus?" + end if + end if + + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(currentfile,"sw40") = false then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel + end if + Sleep 1 + + Kontext "AlienWarning" + if AlienWarning.Exists then AlienWarning.Ok + + ' Save Out-file + Call hFileSaveAsWithFilterKill(sSaveFile, sCurrentFilter) + + kontext "active" + if active.exists(2) then + active.ok + warnlog "Error saving file " + sLoadFile + " as " + sSaveFile + "." + goto Cleanup + end if + + ' Load Out-file again + Call hFileOpenWithFilter(sSaveFile, sCurrentFilter, false) + + ' Check for macro alert + Kontext "SecurityWarning" + if SecurityWarning.Exists then + if inStr(currentfile,"sw40") > 0 then + QAErrorlog "Macro-Security Warning is up though document should have no macro! Macro disabled" + end if + SecurityWarning.Cancel + end if + Sleep 1 Cleanup: kontext "active" - if active.exists(2) then + if active.exists(2) then active.ok Select Case iCurrentFileIndex - case 7: QAErrorlog "#i106758#Saving StarWriter 3 template corrupts file" - case else - warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." + case 7: QAErrorlog "#i106758#Saving StarWriter 3 template corrupts file" + case else + warnlog "Error with file " + sLoadFile + " as " + sSaveFile + "." end select end if printlog " Close all open files." - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop + hFileCloseAll() printlog " - File nr " + iCurrentFileIndex + " completed." Next iCurrentFileIndex @@ -375,10 +368,10 @@ endcase testcase tExportTop5FormatsIntoTop5 - if iSprache <> 1 then - QAErrorlog "#100970#test only support english language" - goto endsub - end if + if iSprache <> 1 then + QAErrorlog "#100970#test only support english language" + goto endsub + end if Dim ExportFileList(300) as String Dim sWorkDirectory as String @@ -410,76 +403,66 @@ testcase tExportTop5FormatsIntoTop5 '// Start of the LOAD-Loop For iCurrentLoadFileIndex = 1 to 4 Select case iCurrentLoadFileIndex - case 1 : sCurrentLoadFile = sImportDir & "xml2.odt" - sCurrentLoadFilter = "writer8" - case 2 : sCurrentLoadFile = sImportDir & "sw60.sxw" - sCurrentLoadFilter = "StarOffice XML (Writer)" - case 3 : sCurrentLoadFile = sImportDir & "winw97.doc" - sCurrentLoadFilter = "MS Word 97" - case 4 : sCurrentLoadFile = sImportDir & "rtf.rtf" - sCurrentLoadFilter = "Rich Text Format" - case 5 : sCurrentLoadFile = sImportDir & "html.html" - sCurrentLoadFilter = "HTML (StarWriter)" + case 1 : sCurrentLoadFile = sImportDir & "xml2.odt" + sCurrentLoadFilter = "writer8" + case 2 : sCurrentLoadFile = sImportDir & "sw60.sxw" + sCurrentLoadFilter = "StarOffice XML (Writer)" + case 3 : sCurrentLoadFile = sImportDir & "winw97.doc" + sCurrentLoadFilter = "MS Word 97" + case 4 : sCurrentLoadFile = sImportDir & "rtf.rtf" + sCurrentLoadFilter = "Rich Text Format" + case 5 : sCurrentLoadFile = sImportDir & "html.html" + sCurrentLoadFilter = "HTML (StarWriter)" End select printlog "- Export of File nr " + iCurrentLoadFileIndex + " started." printlog " - Save file: " & sCurrentLoadFile - + '/// Here comes the SAVE-Loop For iCurrentSaveFileIndex = 1 to 5 if hFileOpenWithFilter((sCurrentLoadFile), sCurrentLoadFilter) = true then - Select case iCurrentSaveFileIndex - case 1 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s1.odt" - sCurrentSaveFilter = "writer8" - case 2 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s2.sxw" - sCurrentSaveFilter = "StarOffice XML (Writer)" - case 3 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s3.doc" - sCurrentSaveFilter = "MS Word 97" - case 4 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s4.rtf" - sCurrentSaveFilter = "Rich Text Format" - case 5 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s5.html" - sCurrentSaveFilter = "HTML (StarWriter)" - End select - - printlog " - " & iCurrentSaveFileIndex & ". to file: " & sCurrentSaveFile - if hFileSaveAsWithFilterKill(sCurrentSaveFile, sCurrentSaveFilter) = true then - printlog " - close all open documents" - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - printlog " - check if file exists" - if FileExists (sCurrentSaveFile) then - printlog " - success" - printlog " - reload previously saved file" - if hFileOpenWithFilter(sCurrentSaveFile, sCurrentSaveFilter) = true then - printlog " - success" - else - Warnlog "error loading file: " & sCurrentSaveFile - end if - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - else - Warnlog "Saved file doesn't exist" - 'Close the opened file - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - end if - else - Warnlog "Error saving file: " & sCurrentLoadFile - 'Close the opened file - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - end if - else - Warnlog "Error loading file: " & sCurrentLoadFile - 'Close the opened file - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop - end if + Select case iCurrentSaveFileIndex + case 1 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s1.odt" + sCurrentSaveFilter = "writer8" + case 2 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s2.sxw" + sCurrentSaveFilter = "StarOffice XML (Writer)" + case 3 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s3.doc" + sCurrentSaveFilter = "MS Word 97" + case 4 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s4.rtf" + sCurrentSaveFilter = "Rich Text Format" + case 5 : sCurrentSaveFile = sWorkDirectory & "SavedFile_l" + iCurrentLoadFileIndex + "_s5.html" + sCurrentSaveFilter = "HTML (StarWriter)" + End select + + printlog " - " & iCurrentSaveFileIndex & ". to file: " & sCurrentSaveFile + if hFileSaveAsWithFilterKill(sCurrentSaveFile, sCurrentSaveFilter) = true then + printlog " - close all open documents" + hFileCloseAll() + printlog " - check if file exists" + if FileExists (sCurrentSaveFile) then + printlog " - success" + printlog " - reload previously saved file" + if hFileOpenWithFilter(sCurrentSaveFile, sCurrentSaveFilter) = true then + printlog " - success" + else + Warnlog "error loading file: " & sCurrentSaveFile + end if + hFileCloseAll() + else + Warnlog "Saved file doesn't exist" + 'Close the opened file + hFileCloseAll() + end if + else + Warnlog "Error saving file: " & sCurrentLoadFile + 'Close the opened file + hFileCloseAll() + end if + else + Warnlog "Error loading file: " & sCurrentLoadFile + 'Close the opened file + hFileCloseAll() + end if Next iCurrentSaveFileIndex printlog "- Export of File nr " + iCurrentLoadFileIndex + " completed." -- cgit From 6347f601e99733808e2d256ec033083b0ac6eeee Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 15 Sep 2010 10:30:27 +0200 Subject: automationdev300m87: #i112208# - Added a ConvertPath() to hFileOpenLocally() as it might happen that the path is passed in wrong format. --- testautomation/global/tools/includes/required/t_files.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index eb1b666fea27..84dc37b9513b 100644 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -611,6 +611,8 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean dim sTargetPath as string + sSourcePath = convertpath( sSourcePath ) + ' If the source file does not exist we quit if ( not FileExists( sSourcePath ) ) then warnlog( CFN & "Source path/file does not exist: " & sSourcePath ) -- cgit From 139b3696733a1e1bd6b66c32de392331627a63d6 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 15 Sep 2010 13:04:51 +0200 Subject: automationdev300m87: #i112208# - Modified tDocumentFilename and tDocumentTemplate to make them compatible with hFileOpenLocally(). Need to verify on Windows though, Linux is good. --- .../writer/optional/includes/fields/w_fields2.inc | 141 ++++++++++----------- 1 file changed, 70 insertions(+), 71 deletions(-) diff --git a/testautomation/writer/optional/includes/fields/w_fields2.inc b/testautomation/writer/optional/includes/fields/w_fields2.inc index 6c4b0eef2141..168fed204ebe 100644 --- a/testautomation/writer/optional/includes/fields/w_fields2.inc +++ b/testautomation/writer/optional/includes/fields/w_fields2.inc @@ -320,7 +320,7 @@ testcase tDocumentChapter '/// Open test file chapterTest.sxw hFileOpenLocally( sTestFile ) - + Call wTypeKeys "" @@ -357,12 +357,12 @@ endcase testcase tDocumentDate Dim sDate as String - + printlog "Insert/Fields/Other/Document / Date" '/// Insert/Fields/Other/Document / Date - + Call hNewDocument - + '/// Insert/Fields/Other/Document / Date '/// Check if the insertion is correct Call fInsertFieldsOther("TabDokumentFeldbefehle") @@ -371,14 +371,14 @@ testcase tDocumentDate Einfuegen.Click Kontext "TabDokumentFeldbefehle" TabDokumentFeldbefehle.Close - + Call wTypeKeys "" EditCopy Sleep 1 if GetClipboard = "" then Warnlog "Field returns an empty string" end if - + Call hCloseDocument endcase @@ -386,56 +386,57 @@ endcase '----------------------------------------------------------------- testcase tDocumentFilename - if bAsianLan = true then - QaErrorLog "No testing with Asian language. Aborting." - goto endsub - end if - - Dim sTestFile as String - Dim sFilename(4) as String - Dim i as Integer - - sTestFile = gTesttoolpath & "writer\optional\input\fields\pageTest.sxw" - - sFilename(0) = "pageTest.sxw" - sFilename(1) = "pageTest" - sFilename(2) = Convertpath( gOfficepath + "user\work\" ) - sFilename(3) = sTestFile - - printlog "Insert/Fields/Other/Document / File name" - - Call hNewDocument - - '/// Open test file pageTest.sxw - hFileOpenLocally( sTestFile ) - - Call wTypeKeys "" - Call wTypeKeys "" - - printlog "Insert/Fields/Other/Document / File name" - printlog "Insert File name, File name without extension , Path , Path/File name" - printlog "Check if the insertion is correct" - Call fInsertFieldsOther("TabDokumentFeldbefehle") - Feldtyp.Select fGetType("File name") - for i = 0 to 3 - Kontext "TabDokumentFeldbefehle" - Formatliste.Select i+1 - Sleep 1 - Einfuegen.Click - sleep 1 - Call wTypeKeys "" - Sleep 2 - Call wTypeKeys "" 'HOME - Sleep 1 - if fGetFieldContent() <> sFilename(i) then - Warnlog i &" - Should get " & sFilename(i) & " but get " & fGetFieldContent() - end if - Call wTypeKeys "" - next i - Kontext "TabDokumentFeldbefehle" - TabDokumentFeldbefehle.Close - - Call hCloseDocument + + if ( bAsianLan ) then + QaErrorLog "No testing with Asian language. Aborting." + goto endsub + end if + + Dim sTestFile as String + Dim sFilename(4) as String + Dim i as Integer + + sTestFile = convertpath( gTesttoolPath & "writer\optional\input\fields\pageTest.sxw" ) + + sFilename(0) = "pageTest.sxw" + sFilename(1) = "pageTest" + sFilename(2) = hGetWorkPath() + sFilename(3) = hFileGetLocalPath( sTestFile ) + + printlog "Insert/Fields/Other/Document / File name" + + Call hNewDocument + + '/// Open test file pageTest.sxw + hFileOpenLocally( sTestFile ) + + Call wTypeKeys "" + Call wTypeKeys "" + + printlog "Insert/Fields/Other/Document / File name" + printlog "Insert File name, File name without extension , Path , Path/File name" + printlog "Check if the insertion is correct" + Call fInsertFieldsOther("TabDokumentFeldbefehle") + Feldtyp.Select fGetType("File name") + for i = 0 to 3 + Kontext "TabDokumentFeldbefehle" + Formatliste.Select i+1 + Sleep 1 + Einfuegen.Click + sleep 1 + Call wTypeKeys "" + Sleep 2 + Call wTypeKeys "" 'HOME + Sleep 1 + if fGetFieldContent() <> sFilename(i) then + Warnlog i &" - Should get " & sFilename(i) & " but get " & fGetFieldContent() + end if + Call wTypeKeys "" + next i + Kontext "TabDokumentFeldbefehle" + TabDokumentFeldbefehle.Close + + Call hCloseDocument endcase @@ -462,7 +463,7 @@ testcase tDocumentPage '/// Open test file pageTest.sxw which includes 3 pages hFileOpenLocally( sTestFile ) - + '/// Go to the 2nd page Call wTypeKeys "" @@ -915,25 +916,25 @@ testcase tDocumentTemplate Dim sFormat() as String Dim sResult(6) as String Dim i as Integer - + sLanguage = fGetDirLanguage() - sTestFile = gTesttoolpath + "writer\optional\input\fields\diploma.ott" - - sResult(0) = fGetCateGory() + sTestFile = convertpath( gTesttoolpath + "writer\optional\input\fields\diploma.ott" ) + + sResult(0) = fGetCategory() sResult(1) = "diploma.ott" sResult(2) = "diploma" - sResult(3) = Convertpath (gOfficepath + "user\work") - sResult(4) = sTestFile + sResult(3) = convertpath( gOfficePath & "user/work" ) + sResult(4) = hGetWorkFile( sResult( 1 ) ) sResult(5) = fGetStyle() - + printlog "Insert/Fields/Other/Document / Template" '/// Insert/Fields/Other/Document / Template - + '/// Open test file diploma.ott hFileOpenLocally( sTestFile ) - + Call wTypeKeys "" - + '/// Insert/Fields/Other/Document / Template '/// Insert Category , File name , File name without extension , '/// + Path , Path/File name , Style @@ -963,10 +964,8 @@ testcase tDocumentTemplate next i Kontext "TabDokumentFeldbefehle" TabDokumentFeldbefehle.Close - - Do Until GetDocumentCount = 0 - Call hCloseDocument - Loop + + hFileCloseAll() endcase '----------------------------------------------------------------- -- cgit From 9e7c84f288df60da40e6711c7aea6d3e83e363b9 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 15 Sep 2010 13:34:29 +0200 Subject: automationdev300m87: #i112208# - Supplied missing variable --- testautomation/writer/optional/includes/fields/w_fields4.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/testautomation/writer/optional/includes/fields/w_fields4.inc b/testautomation/writer/optional/includes/fields/w_fields4.inc index 331e8753dc1b..315c6b0f96d3 100644 --- a/testautomation/writer/optional/includes/fields/w_fields4.inc +++ b/testautomation/writer/optional/includes/fields/w_fields4.inc @@ -340,6 +340,7 @@ testcase tDocInformationCreated Dim sLastName1 as String Dim sVarResult(3) as String Dim sFixResult(3) as String + dim sTestFile as string Dim i as Integer sFirstName1 = "Test1" : sLastName1 = "Test2" -- cgit From 03767ada715e519b673b3ff5f70c9762001212b4 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 15 Sep 2010 14:23:25 +0200 Subject: automationdev300m87: #i112208# - Moved static filename into a variable, handled Picture dialog --- .../optional/includes/insertgraphic/w_insertgraphic1.inc | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc index fddd341bd9eb..4e670f290f13 100644 --- a/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc +++ b/testautomation/writer/optional/includes/insertgraphic/w_insertgraphic1.inc @@ -520,8 +520,10 @@ endcase testcase tInsertGraphic_10 Dim sTestFile as String + dim sOutFile as string sTestFile = ConvertPath(gOfficepath + "user\work\tInsertGraphic_5.sxw") + sOutFile = gOfficepath + "user\work\tInsertGraphic_5.odt" PrintLog "- Insert linked graphics and break the links via Menu Edit - Link" '/// Insert linked graphics and break the links via Menu Edit - Link @@ -636,13 +638,13 @@ testcase tInsertGraphic_10 PrintLog "- Save and Reload the file" '/// Save the file and close the file - Call hFileSaveAsWithFilterKill(gOfficepath + "user\work\tInsertGraphic_5.odt", "writer8") + Call hFileSaveAsWithFilterKill( sOutFile, "writer8") sleep(2) Call hCloseDocument sleep(2) '/// Reload the file - hFileOpen( gOfficepath & "user\work\tInsertGraphic_5.odt") + hFileOpen( sOutFile ) sleep(2) @@ -652,6 +654,10 @@ testcase tInsertGraphic_10 sleep(1) if fFormatGraphic("TabZusaetze") = false then Warnlog "#i46300#linked JPEG pictures will disappear when doc is modified." + + kontext "TabZusatze" + if ( TabZusaetze.exists() ) then TabZusaetze.close() + kontext "DocumentWriter" Call hCloseDocument goto endsub end if -- cgit From c3541afaf0556eeff0ca9c6b96bae2e8db473757 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 15 Sep 2010 14:28:06 +0200 Subject: automationdev300m87: #i112208# - Reverted hCloseDocument() to its old form. The extensions are no longer required --- .../global/tools/includes/required/t_doc1.inc | 20 +------------------- 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc index 9ddbc2bb42ad..bf9be1029c0e 100755 --- a/testautomation/global/tools/includes/required/t_doc1.inc +++ b/testautomation/global/tools/includes/required/t_doc1.inc @@ -243,35 +243,17 @@ end function ' function hCloseDocument() - '/// Trigger FileClose slot' hUseAsyncSlot( "FileClose") - '/// Accept to lose changes' Kontext "Active" if ( Active.Exists( 2 ) ) then try Active.No catch - endcatch - end if - - if ( Active.exists() ) then - try Active.click( 202 ) - catch - endcatch - endif - - if ( Active.exists() ) then - try - warnlog( "hCloseDocument: Unexpected dialog: " & Active.getText() ) - Active.ok() - catch - Active.yes() endcatch - endif + end if - '/// Wait for FileClose to complete' WaitSlot( 2000 ) end function -- cgit From f3ba020872862f3900cfedfaef3225c5f418bcd8 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Wed, 15 Sep 2010 14:39:32 +0200 Subject: automationdev300m87: #i112208# - Cosmetics --- .../optional/includes/sorting/w_sorting1.inc | 23 +++------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/testautomation/writer/optional/includes/sorting/w_sorting1.inc b/testautomation/writer/optional/includes/sorting/w_sorting1.inc index ae6fae7345d7..70fcbab3f26f 100644 --- a/testautomation/writer/optional/includes/sorting/w_sorting1.inc +++ b/testautomation/writer/optional/includes/sorting/w_sorting1.inc @@ -28,15 +28,6 @@ '* '* short description : Sorting functions in Writer '* -'************************************************************************ -'* -' #1 tToolsSort1 ' Text in one Column and 1 Key -' #1 tToolsSort2 ' Numbers in 1 Column and 1 Key -' #1 tToolsSort3 ' Text in several Columns and 3 Keys -' #1 tToolsSort4 ' Table with Header ( Text and Numbers mixed ) -' #1 tToolsSort5 ' Table without Header ( Text and Numbers mixed ) -' #1 tToolsSort6 ' Copy sorted table in another table -'* '\*********************************************************************** sub w_sorting @@ -236,18 +227,16 @@ testcase tToolsSort3 PrintLog "- Tools / Sorting text in several lines" for i=1 to 3 select case i - case 1: Printlog " - Seperator is a tabulator" - case 2: Printlog " - Seperator is a semicolon" + case 1: Printlog " - Separator is a tabulator" + case 2: Printlog " - Separator is a semicolon" Trennzeichen = ";" - case 3: Printlog " - Seperator is a '|'" + case 3: Printlog " - Separator is a '|'" Trennzeichen = "|" end select if gApplication = "WRITER" then hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort2.odt" ) - else hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort2.odm" ) - end if if i <> 1 then TrennzeichenSetzen ( Trennzeichen ) @@ -320,10 +309,8 @@ testcase tToolsSort4 PrintLog "- Tools / Sorting in table with header" if gApplication = "WRITER" then hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort1.odt" ) - else hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort1.odm" ) - end if Call wTypeKeys "", 2 @@ -445,10 +432,8 @@ testcase tToolsSort5 PrintLog "- Tools / Sorting in table without header" if gApplication = "WRITER" then hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort1.odt" ) - else hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort1.odm" ) - end if Call wNavigatorAuswahl (2, 2) @@ -575,10 +560,8 @@ testcase tToolsSort6 if gApplication = "WRITER" then hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort3.odt" ) - else hFileOpenLocally( gTesttoolPath + "writer\optional\input\sorting\sort3.odm" ) - end if Call wTypeKeys "", 2 -- cgit From e7f25f2f314bd861b46eb2fa04b5326cf9d0df60 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 16 Sep 2010 08:48:09 +0200 Subject: automationdev300m87: #i112208# - add try...catch and a warnlog. --- testautomation/global/tools/includes/required/t_doc1.inc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc index ff07554bca35..d754af06117c 100755 --- a/testautomation/global/tools/includes/required/t_doc1.inc +++ b/testautomation/global/tools/includes/required/t_doc1.inc @@ -357,6 +357,8 @@ end sub ' sub hTypeKeys ( OutputText , optional _iLoop as Integer ) + const CFN & "global::tools::includes::required::t_doc1.inc::hTypeKeys(): " + dim iRepeat as integer dim iLoop as integer dim oDocument as object @@ -371,10 +373,14 @@ sub hTypeKeys ( OutputText , optional _iLoop as Integer ) hSetDocumentContext() ' set kontext to current document type oDocument = hSetDocumentObject() ' Get the document object we want to write to - for iRepeat = 1 to iLoop - oDocument.TypeKeys( OutputText ) - wait( 200 ) - next iRepeat + try + for iRepeat = 1 to iLoop + oDocument.TypeKeys( OutputText ) + wait( 200 ) + next iRepeat + catch + warnlog( CFN & "Failed to send keystroke to given context" ) + endcatch end sub -- cgit From d410e2bd866b0e89858041dcf143ee3ce21b53bf Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 16 Sep 2010 10:58:11 +0200 Subject: automationdev300m87: #i112208# - Do not reuse existing local file, warn instead. --- testautomation/global/tools/includes/required/t_files.inc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index ef8df3f31312..749e4ec47e96 100644 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -587,16 +587,16 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean ' Copy the file from anywhere to the local user directory if it does not ' exist. This behavior was discussed on IRC if ( FileExists( sTargetPath ) ) then - printlog( CFN & "Re-using existing local copy of workfile" ) + 'printlog( CFN & "Re-using existing local copy of workfile" ) + warnlog( CFN & "About to reuse existing file. Please check" ) else if ( GVERBOSE ) then printlog( CFN & "Copying file" ) printlog( CFN & "From: " & sSourcePath ) printlog( CFN & "To..: " & sTargetPath ) endif - FileCopy( sSourcePath, sTargetPath ) endif - + FileCopy( sSourcePath, sTargetPath ) ' This is a hook that allows to access the filename under which the file ' has been saved. Due to restrictive coding guidelines we cannot return ' the new filename. -- cgit From fe6eabe9ec169187c05b8f04b87212f3d211ee1f Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 16 Sep 2010 11:17:46 +0200 Subject: automationdev300m87: #i112208# - Fix one of my favorite & is not = typos. --- testautomation/global/tools/includes/required/t_doc1.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testautomation/global/tools/includes/required/t_doc1.inc b/testautomation/global/tools/includes/required/t_doc1.inc index d2f723c7ac08..0ee504c5432e 100755 --- a/testautomation/global/tools/includes/required/t_doc1.inc +++ b/testautomation/global/tools/includes/required/t_doc1.inc @@ -354,7 +354,7 @@ end sub ' sub hTypeKeys ( OutputText , optional _iLoop as Integer ) - const CFN & "global::tools::includes::required::t_doc1.inc::hTypeKeys(): " + const CFN = "global::tools::includes::required::t_doc1.inc::hTypeKeys(): " dim iRepeat as integer dim iLoop as integer -- cgit From f9b8934ca13e151c75c76482fb55449e0d7dcd17 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 16 Sep 2010 11:53:22 +0200 Subject: automationdev300m87: #i112208# - Put path into a variable, delete file before usage, removed unnecessary UCASE() statements --- .../graphics/optional/includes/global/g_tools.inc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/testautomation/graphics/optional/includes/global/g_tools.inc b/testautomation/graphics/optional/includes/global/g_tools.inc index 35b53c07c1cd..9dc207b481b9 100644 --- a/testautomation/graphics/optional/includes/global/g_tools.inc +++ b/testautomation/graphics/optional/includes/global/g_tools.inc @@ -29,11 +29,6 @@ '* '* short description : will be moved to autocorrection.bas/inc '* -'************************************************************************************** -' #1 tiToolsThesaurus -' #1 tiToolsHyphenation1 -' #1 tiToolsHyphenation2 -' #1 tToolsMacro '\************************************************************************************* ' sFile = gTesttoolpath + "graphics\required\input\silben_"+iSprache+sExt @@ -46,6 +41,7 @@ testcase tiToolsThesaurus Dim sAlternativeText as string Dim sExt as string Dim ZaehlerBedeutung + dim sWorkFile as string 'for normal text, the thesaurus is enabled, 'if the format->character->language of the word has a thesaurus @@ -113,7 +109,10 @@ testcase tiToolsThesaurus sExt = ".odp" endif - Call hFileOpenLocally(gTesttoolpath + "graphics\required\input\recht_" + iSprache + sExt) + sWorkFile = gTesttoolPath & "graphics\required\input\recht_" & iSprache & sExt + hFileDelete( sWorkFile ) + + Call hFileOpenLocally( sWorkFile ) Call hTextrahmenErstellen (sWord,20,20,50,30) sleep 1 @@ -164,9 +163,9 @@ testcase tiToolsThesaurus endif Thesaurus.OK - if(Ucase(gApplication) = "DRAW") then + if( gApplication = "DRAW" ) then Kontext "Draw" - elseif(Ucase(gApplication) = "IMPRESS") then + elseif( gApplication = "IMPRESS") then Kontext "Impress" else ' fallback warnlog "gApplication is wrong" -- cgit From 32ae66f4d352fc4b14e031f4233d2700f0e83b44 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 16 Sep 2010 11:56:19 +0200 Subject: automationdev300m87: #i112208# - Debugging test cases: Enabled debug output for hFileOpenLocally() by default --- testautomation/global/tools/includes/required/t_files.inc | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index 434d125f1c79..585aa3c75e5d 100644 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -627,14 +627,13 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean ' exist. This behavior was discussed on IRC if ( FileExists( sTargetPath ) ) then 'printlog( CFN & "Re-using existing local copy of workfile" ) - warnlog( CFN & "About to reuse existing file. Please check" ) - else - if ( GVERBOSE ) then - printlog( CFN & "Copying file" ) - printlog( CFN & "From: " & sSourcePath ) - printlog( CFN & "To..: " & sTargetPath ) - endif + warnlog( CFN & "Target file exists, it has not been deleted by prior test" ) endif + + printlog( CFN & "Copying file" ) + printlog( CFN & "From: " & sSourcePath ) + printlog( CFN & "To..: " & sTargetPath ) + FileCopy( sSourcePath, sTargetPath ) ' Verify that the file has been created. return an empty string and warn -- cgit From ee51c36c43b17129c911eb9ee9fb65e695971713 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 17 Sep 2010 14:28:41 +0200 Subject: CWS changehid: doesn't compile on 64bit --- automation/source/server/retstrm.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx index d1cd5d2327f1..951237dbcd2f 100644 --- a/automation/source/server/retstrm.cxx +++ b/automation/source/server/retstrm.cxx @@ -79,7 +79,7 @@ void RetStream::GenReturn ( USHORT nRet, USHORT nMethod, SbxValue &aValue ) { Write(USHORT(SIReturn)); Write(nRet); - Write((ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) Write(USHORT(PARAM_SBXVALUE_1)); // Typ der folgenden Parameter Write(aValue); } -- cgit From c8d3b5c7cf80154f7fd78d7de95cb899be567bc9 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 17 Sep 2010 14:29:02 +0200 Subject: CWS changehid: debug statements removed --- automation/source/server/server.cxx | 3 --- 1 file changed, 3 deletions(-) diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx index 069f9253f10f..00d2aaabd197 100644 --- a/automation/source/server/server.cxx +++ b/automation/source/server/server.cxx @@ -872,7 +872,6 @@ ImplRemoteControl::ImplRemoteControl() #else pServiceMgr = new RemoteControlCommunicationManager(); #endif - fprintf(stderr, "%s\n", "Start RemoteControlCommunicationManager"); pServiceMgr->SetDataReceivedHdl( LINK( this, ImplRemoteControl, QueCommandsEvent ) ); pServiceMgr->StartCommunication(); @@ -886,7 +885,6 @@ ImplRemoteControl::ImplRemoteControl() } if ( RemoteControlCommunicationManager::nComm ) new ExtraIdle( this ); // Setzt die Bearbeitung wieder auf - fprintf(stderr, "%s\n", "end of ImplRemoteControl::ImplRemoteControl()"); } ImplRemoteControl::~ImplRemoteControl() @@ -956,7 +954,6 @@ static ::osl::Mutex aMutex; static RemoteControl* pRemoteControl = 0; extern "C" void CreateRemoteControl() { - fprintf(stderr, "%s\n", "CreateRemoteControl"); if ( !pRemoteControl ) { ::osl::MutexGuard aGuard( aMutex ); -- cgit From 9237c2493fb7485a3ec1f755e4f74de7d2aff600 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 21 Sep 2010 10:57:06 +0200 Subject: CWS changehid: use new strings HIDs --- testautomation/global/sid/all.sid | 990 +++++++++++------------ testautomation/global/sid/bars.sid | 1114 +++++++++++++------------- testautomation/global/sid/context.sid | 36 +- testautomation/global/sid/e_all.sid | 1024 +++++++++++------------ testautomation/global/sid/others.sid | 40 +- testautomation/global/win/bars.win | 360 ++++----- testautomation/global/win/dial_a_c.win | 458 +++++------ testautomation/global/win/dial_d_h.win | 910 ++++++++++----------- testautomation/global/win/dial_i_o.win | 740 ++++++++--------- testautomation/global/win/dial_p_s.win | 716 ++++++++--------- testautomation/global/win/dial_t_z.win | 528 ++++++------ testautomation/global/win/dokument.win | 88 +- testautomation/global/win/e_mathop.win | 386 ++++----- testautomation/global/win/edia_a_c.win | 912 ++++++++++----------- testautomation/global/win/edia_d_h.win | 960 +++++++++++----------- testautomation/global/win/edia_i_o.win | 580 +++++++------- testautomation/global/win/edia_p_s.win | 1062 ++++++++++++------------ testautomation/global/win/edia_t_z.win | 514 ++++++------ testautomation/global/win/etab_a_d.win | 910 ++++++++++----------- testautomation/global/win/etab_e_g.win | 676 ++++++++-------- testautomation/global/win/etab_h_o.win | 464 +++++------ testautomation/global/win/etab_p_s.win | 216 ++--- testautomation/global/win/etab_t_z.win | 284 +++---- testautomation/global/win/etoolbox.win | 88 +- testautomation/global/win/mathop.win | 382 ++++----- testautomation/global/win/piloten.win | 130 +-- testautomation/global/win/reportdesigner.win | 126 +-- testautomation/global/win/spadmin.win | 210 ++--- testautomation/global/win/sys_dial.win | 178 ++-- testautomation/global/win/tab_a_d.win | 566 ++++++------- testautomation/global/win/tab_e_g.win | 468 +++++------ testautomation/global/win/tab_h_o.win | 730 ++++++++--------- testautomation/global/win/tab_p_s.win | 456 +++++------ testautomation/global/win/tab_t_z.win | 636 +++++++-------- testautomation/global/win/w_autop.win | 56 +- 35 files changed, 8997 insertions(+), 8997 deletions(-) mode change 100755 => 100644 testautomation/global/win/bars.win mode change 100755 => 100644 testautomation/global/win/dial_a_c.win mode change 100755 => 100644 testautomation/global/win/dial_d_h.win mode change 100755 => 100644 testautomation/global/win/dial_i_o.win mode change 100755 => 100644 testautomation/global/win/dial_p_s.win mode change 100755 => 100644 testautomation/global/win/dial_t_z.win mode change 100755 => 100644 testautomation/global/win/dokument.win mode change 100755 => 100644 testautomation/global/win/e_mathop.win mode change 100755 => 100644 testautomation/global/win/edia_a_c.win mode change 100755 => 100644 testautomation/global/win/edia_d_h.win mode change 100755 => 100644 testautomation/global/win/edia_i_o.win mode change 100755 => 100644 testautomation/global/win/edia_t_z.win mode change 100755 => 100644 testautomation/global/win/etab_a_d.win mode change 100755 => 100644 testautomation/global/win/etab_e_g.win mode change 100755 => 100644 testautomation/global/win/etab_h_o.win mode change 100755 => 100644 testautomation/global/win/etab_p_s.win mode change 100755 => 100644 testautomation/global/win/etab_t_z.win mode change 100755 => 100644 testautomation/global/win/etoolbox.win mode change 100755 => 100644 testautomation/global/win/mathop.win mode change 100755 => 100644 testautomation/global/win/piloten.win mode change 100755 => 100644 testautomation/global/win/reportdesigner.win mode change 100755 => 100644 testautomation/global/win/spadmin.win mode change 100755 => 100644 testautomation/global/win/sys_dial.win mode change 100755 => 100644 testautomation/global/win/tab_a_d.win mode change 100755 => 100644 testautomation/global/win/tab_e_g.win mode change 100755 => 100644 testautomation/global/win/tab_h_o.win mode change 100755 => 100644 testautomation/global/win/tab_p_s.win mode change 100755 => 100644 testautomation/global/win/tab_t_z.win mode change 100755 => 100644 testautomation/global/win/w_autop.win diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid index 6c0efa150459..87ecbf120ae1 100644 --- a/testautomation/global/sid/all.sid +++ b/testautomation/global/sid/all.sid @@ -10,17 +10,17 @@ ' *** Nicht mehr aktuelle Slots, *** ' ** die aber noch verwendet werden ** ' ** -DateiNeu SID_NEWDOC -DateiLetzteVersion SID_RELOAD SID_LASTVERSIONDOC -DateiVersenden SID_MAIL_SENDDOC -DateiScannenQuelleAuswaehlen SID_TWAIN_SELECT -DateiScannenAnfordern SID_TWAIN_SELECT -BearbeitenAllesMarkieren SID_SELECT -EinfuegenObjekt SID_INSERT_OBJECT -EinfuegenObjektObjekte SID_INSERT_OBJECT -EinfuegenObjektWriter FN_INSERT_OBJECT_DLG -EinfuegenRahmenfenster SID_INSERT_FLOATINGFRAME -ExtrasNumerierungAufzaehlung FN_NUMBER_BULLETS +DateiNeu .uno:NewDoc +DateiLetzteVersion .uno:Reload SID_LASTVERSIONDOC +DateiVersenden .uno:SendMail +DateiScannenQuelleAuswaehlen .uno:TwainSelect +DateiScannenAnfordern .uno:TwainSelect +BearbeitenAllesMarkieren .uno:Select +EinfuegenObjekt .uno:InsertObject +EinfuegenObjektObjekte .uno:InsertObject +EinfuegenObjektWriter .uno:InsertObjectDialog +EinfuegenRahmenfenster .uno:InsertObjectFloatingFrame +ExtrasNumerierungAufzaehlung .uno:BulletsAndNumberingDialog ' *************************************************** @@ -28,620 +28,620 @@ ExtrasNumerierungAufzaehlung FN_NUMBER_BULLETS ' ********* DateiMen� ********* ' **** ' **** Alle -DateiNeuAusVorlage SID_NEWDOC -DateiOeffnen SID_OPENDOC +DateiNeuAusVorlage .uno:NewDoc +DateiOeffnen .uno:Open DateiAutopilotBrief service:com.sun.star.wizards.letter.CallWizard?start DateiAutopilotFax service:com.sun.star.wizards.fax.CallWizard?start DateiAutopilotAgenda service:com.sun.star.wizards.agenda.CallWizard?start -DateiAutopilotPraesentation SID_SD_AUTOPILOT -DateiSchliessenUndZurueck SID_CLOSEDOC -DateiKopieAktualisieren SID_SAVEDOC -DateiKopieSpeichern SID_SAVEASDOC -DateiSchliessen SID_CLOSEDOC -DateiSpeichern SID_SAVEDOC -DateiSpeichernUnter SID_SAVEASDOC -DateiAllesSpeichern SID_SAVEDOCS -DateiExportieren SID_EXPORTDOC -DateiSendenDokumentAlseMail SID_MAIL_SENDDOC -DateiVersionen SID_VERSION -DateiNeuLaden SID_RELOAD SID_LASTVERSIONDOC -DateiEigenschaften SID_DOCINFO -DateiDokumentvorlageSpeichern SID_DOCTEMPLATE -DateiDokumentvorlageVerwalten SID_ORGANIZER -DateiDokumentvorlageBearbeiten SID_OPENTEMPLATE -DateiSeitenansicht SID_PRINTPREVIEW -DateiDrucken SID_PRINTDOC -DateiDruckereinstellung SID_SETUPPRINTER -DateiBeenden SID_QUITAPP +DateiAutopilotPraesentation .uno:AutoPilotPresentations +DateiSchliessenUndZurueck .uno:CloseDoc +DateiKopieAktualisieren .uno:Save +DateiKopieSpeichern .uno:SaveAs +DateiSchliessen .uno:CloseDoc +DateiSpeichern .uno:Save +DateiSpeichernUnter .uno:SaveAs +DateiAllesSpeichern .uno:SaveAll +DateiExportieren .uno:ExportTo +DateiSendenDokumentAlseMail .uno:SendMail +DateiVersionen .uno:VersionDialog +DateiNeuLaden .uno:Reload SID_LASTVERSIONDOC +DateiEigenschaften .uno:SetDocumentProperties +DateiDokumentvorlageSpeichern .uno:SaveAsTemplate +DateiDokumentvorlageVerwalten .uno:Organizer +DateiDokumentvorlageBearbeiten .uno:OpenTemplate +DateiSeitenansicht .uno:PrintPreview +DateiDrucken .uno:Print +DateiDruckereinstellung .uno:PrinterSetup +DateiBeenden .uno:Quit ' **** Writer -DateiSendenGliederungAnPraesentation FN_OUTLINE_TO_IMPRESS -DateiSendenGliederungZumClipboard FN_OUTLINE_TO_CLIPBOARD -DateiSendenAutoabstractErzeugen FN_ABSTRACT_NEWDOC -DateiSendenAutoabstractAnPraesentation FN_ABSTRACT_STARIMPRESS -DateiSendenGlobaldokumentErzeugen FN_NEW_GLOBAL_DOC -DateiSendenHTMLDokumentErzeugen FN_NEW_HTML_DOC -DateiSerienbrief FN_QRY_MERGE +DateiSendenGliederungAnPraesentation .uno:SendOutlineToStarImpress +DateiSendenGliederungZumClipboard .uno:SendOutlineToClipboard +DateiSendenAutoabstractErzeugen .uno:CreateAbstract +DateiSendenAutoabstractAnPraesentation .uno:SendAbstractToStarImpress +DateiSendenGlobaldokumentErzeugen .uno:NewGlobalDoc +DateiSendenHTMLDokumentErzeugen .uno:NewHtmlDoc +DateiSerienbrief .uno:MergeDialog ' **** Impress / Draw -DateiSeiteEinrichten SID_PAGESETUP -Dateieinpacken SID_PACKNGO +DateiSeiteEinrichten .uno:PageSetup +Dateieinpacken .uno:PackAndGo ' **** Image / Chart / Math -DateiDokumentAlsEMail SID_MAIL_SENDDOC +DateiDokumentAlsEMail .uno:SendMail ' *********************************** ' ********* Bearbeitenmenue ********* ' **** ' **** Alle -BearbeitenRueckgaengig SID_UNDO -BearbeitenWiederholen SID_REDO -BearbeitenLetzterBefehl SID_REPEAT -BearbeitenAusschneiden SID_CUT -BearbeitenKopieren SID_COPY -BearbeitenEinfuegen SID_PASTE -BearbeitenLoeschen SID_DELETE -BearbeitenAllesAuswaehlen SID_SELECTALL -BearbeitenSuchenErsetzen SID_SEARCH_DLG -BearbeitenNavigator SID_NAVIGATOR -BearbeitenAutoText FN_GLOSSARY_DLG -BearbeitenPlugIn SID_PLUGINS_ACTIVE -BearbeitenImageMap SID_IMAP -BearbeitenLiteraturdatenbank SID_COMP_BIBLIOGRAPHY +BearbeitenRueckgaengig .uno:Undo +BearbeitenWiederholen .uno:Redo +BearbeitenLetzterBefehl .uno:RepeatAction +BearbeitenAusschneiden .uno:Cut +BearbeitenKopieren .uno:Copy +BearbeitenEinfuegen .uno:Paste +BearbeitenLoeschen .uno:Delete +BearbeitenAllesAuswaehlen .uno:SelectAll +BearbeitenSuchenErsetzen .uno:SearchDialog +BearbeitenNavigator .uno:Navigator +BearbeitenAutoText .uno:EditGlossary +BearbeitenPlugIn .uno:PlugInsActive +BearbeitenImageMap .uno:ImageMapDialog +BearbeitenLiteraturdatenbank .uno:BibliographyComponent ' **** Writer BearbeitenInhalteEinfuegenWriter .uno:PasteSpecial -BearbeitenAenderungenAufzeichnen FN_REDLINE_ON -BearbeitenAenderungenAnzeigen FN_REDLINE_SHOW -BearbeitenAenderungenAkzeptierenOderVerwerfen FN_REDLINE_ACCEPT -BearbeitenAenderungenKommentar FN_REDLINE_COMMENT -BearbeitenAenderungenDokumentZusammenfuehren SID_DOCUMENT_MERGE -BearbeitenDokumentVergleichen SID_DOCUMENT_COMPARE -BearbeitenVerknuepfungenWriter FN_EDIT_LINK_DLG -BearbeitenDatenbankAustauschen FN_CHANGE_DBFIELD -BearbeitenFeldbefehl FN_EDIT_FIELD -BearbeitenFussnote FN_EDIT_FOOTNOTE -BearbeitenVerzeichniseintrag FN_EDIT_IDX_ENTRY_DLG -BearbeitenHyperlink FN_EDIT_HYPERLINK +BearbeitenAenderungenAufzeichnen .uno:TrackChanges +BearbeitenAenderungenAnzeigen .uno:ShowTrackedChanges +BearbeitenAenderungenAkzeptierenOderVerwerfen .uno:AcceptTrackedChanges +BearbeitenAenderungenKommentar .uno:CommentChangeTracking +BearbeitenAenderungenDokumentZusammenfuehren .uno:MergeDocuments +BearbeitenDokumentVergleichen .uno:CompareDocuments +BearbeitenVerknuepfungenWriter .uno:LinkDialog +BearbeitenDatenbankAustauschen .uno:ChangeDatabaseField +BearbeitenFeldbefehl .uno:FieldDialog +BearbeitenFussnote .uno:EditFootnote +BearbeitenVerzeichniseintrag .uno:IndexEntryDialog +BearbeitenHyperlink .uno:EditHyperlink ' **** Calc BearbeitenInhalteEinfuegenCalc .uno:PasteSpecial -BearbeitenAenderungenAufzeichnenCalc FID_CHG_RECORD -BearbeitenAenderungenSchuetzen SID_CHG_PROTECT -BearbeitenAenderungenKommentarCalc FID_CHG_COMMENT -BearbeitenAenderungenAnzeigenCalc FID_CHG_SHOW -BearbeitenAenderungenAkzeptierenOderVerwerfenCalc FID_CHG_ACCEPT -BearbeitenAenderungenDokumentZusammenfuehrenCalc SID_DOCUMENT_MERGE -BearbeitenDokumentVergleichenCalc SID_DOCUMENT_COMPARE -BearbeitenVerknuepfungenCalc SID_LINKS -BearbeitenKopfUndFusszeilen SID_HFEDIT -BearbeitenAusfuellenLinks FID_FILL_TO_LEFT -BearbeitenAusfuellenOben FID_FILL_TO_TOP -BearbeitenAusfuellenRechts FID_FILL_TO_RIGHT -BearbeitenAusfuellenReihe FID_FILL_SERIES -BearbeitenAusfuellenTabelle FID_FILL_TAB -BearbeitenAusfuellenUnten FID_FILL_TO_BOTTOM -BearbeitenInhalteLoeschen SID_DELETE -BearbeitenZellenLoeschen FID_DELETE_CELL -BearbeitenTabelleLoeschen FID_DELETE_TABLE -BearbeitenTabelleVerschiebenKopieren FID_TAB_MOVE -BearbeitenManuellenUmbruchLoeschenSpaltenumbruch FID_DEL_COLBRK -BearbeitenManuellenUmbruchLoeschenZeilenumbruch FID_DEL_ROWBRK +BearbeitenAenderungenAufzeichnenCalc .uno:TraceChangeMode +BearbeitenAenderungenSchuetzen .uno:ProtectTraceChangeMode +BearbeitenAenderungenKommentarCalc .uno:CommentChange +BearbeitenAenderungenAnzeigenCalc .uno:ShowChanges +BearbeitenAenderungenAkzeptierenOderVerwerfenCalc .uno:AcceptChanges +BearbeitenAenderungenDokumentZusammenfuehrenCalc .uno:MergeDocuments +BearbeitenDokumentVergleichenCalc .uno:CompareDocuments +BearbeitenVerknuepfungenCalc .uno:EditLinks +BearbeitenKopfUndFusszeilen .uno:EditHeaderAndFooter +BearbeitenAusfuellenLinks .uno:FillLeft +BearbeitenAusfuellenOben .uno:FillUp +BearbeitenAusfuellenRechts .uno:FillRight +BearbeitenAusfuellenReihe .uno:FillSeries +BearbeitenAusfuellenTabelle .uno:FillTable +BearbeitenAusfuellenUnten .uno:FillDown +BearbeitenInhalteLoeschen .uno:Delete +BearbeitenZellenLoeschen .uno:DeleteCell +BearbeitenTabelleLoeschen .uno:Remove +BearbeitenTabelleVerschiebenKopieren .uno:Move +BearbeitenManuellenUmbruchLoeschenSpaltenumbruch .uno:DeleteColumnbreak +BearbeitenManuellenUmbruchLoeschenZeilenumbruch .uno:DeleteRowbreak ' **** Draw / Impress BearbeitenInhalteEinfuegenDraw .uno:PasteSpecial -BearbeitenVerknuepfungenDraw SID_MANAGE_LINKS -BearbeitenDuplizieren SID_COPYOBJECTS -BearbeitenUeberblenden SID_POLYGON_MORPHING -BearbeitenSeiteLoeschen SID_DELETE_PAGE -BearbeitenEbeneLoeschen SID_DELETE_LAYER -BearbeitenFeldbefehlDraw SID_MODIFY_FIELD +BearbeitenVerknuepfungenDraw .uno:ManageLinks +BearbeitenDuplizieren .uno:CopyObjects +BearbeitenUeberblenden .uno:Morphing +BearbeitenSeiteLoeschen .uno:DeletePage +BearbeitenEbeneLoeschen .uno:DeleteLayer +BearbeitenFeldbefehlDraw .uno:ModifyField ' **** Image / Chart / Math -BearbeitenAllesAuswaehlenMath SID_SELECT -BearbeitenNaechsterMarker SID_NEXTMARK -BearbeitenVorherigerMarker SID_PREVMARK -BearbeitenNaechsterFehler SID_NEXTERR -BearbeitenVorherigerFehler SID_PREVERR -BearbeitenDiagrammdaten SID_DIAGRAM_DATA +BearbeitenAllesAuswaehlenMath .uno:Select +BearbeitenNaechsterMarker .uno:NextMark +BearbeitenVorherigerMarker .uno:PrevMark +BearbeitenNaechsterFehler .uno:NextError +BearbeitenVorherigerFehler .uno:PrevError +BearbeitenDiagrammdaten CHART2_HID_DIAGRAM_DATA ' *********************************** ' ********* Ansichtmenue ********* ' **** ' **** Alle -AnsichtMassstab SID_ATTR_ZOOM -AnsichtBrowser SID_BROWSER -AnsichtHyperlinkleiste SID_HYPERLINK_INSERT -AnsichtStatusleiste SID_TOGGLESTATUSBAR SID_TOGGLESTATUSBAR -AnsichtGanzerBildschirm SID_WIN_FULLSCREEN SID_FULLSCREEN +AnsichtMassstab .uno:Zoom +AnsichtBrowser .uno:Beamer +AnsichtHyperlinkleiste .uno:InsertHyperlink +AnsichtStatusleiste .uno:StatusBarVisible .uno:StatusBarVisible +AnsichtGanzerBildschirm .uno:FullScreen SID_FULLSCREEN ' **** Writer -AnsichtLineal FN_RULER -AnsichtAktuelleDatenbank SID_IMPORT_DATA -AnsichtTextbegrenzungen FN_VIEW_BOUNDS -AnsichtMarkierungen FN_VIEW_MARKS -AnsichtFeldbefehle FN_VIEW_FIELDNAME -AnsichtSteuerzeichen FN_VIEW_META_CHARS -AnsichtOnlineLayout SID_BROWSER_MODE -AnsichtVersteckteAbsaetze FN_VIEW_HIDDEN_PARA -AnsichtHTMLBearbeitung SID_HTML_MODE -AnsichtHTMLQuelltextWriter HID_SOURCEVIEW +AnsichtLineal .uno:Ruler +AnsichtAktuelleDatenbank .uno:DataImport +AnsichtTextbegrenzungen .uno:ViewBounds +AnsichtMarkierungen .uno:Marks +AnsichtFeldbefehle .uno:Fieldnames +AnsichtSteuerzeichen .uno:ControlCodes +AnsichtOnlineLayout .uno:BrowseView +AnsichtVersteckteAbsaetze .uno:ShowHiddenParagraphs +AnsichtHTMLBearbeitung .uno:HtmlMode +AnsichtHTMLQuelltextWriter SW_HID_SOURCEVIEW ' **** Calc -AnsichtRechenleiste FID_TOGGLEINPUTLINE -AnsichtSpaltenZeilenkoepfe FID_TOGGLEHEADERS -AnsichtWerteHervorheben FID_TOGGLESYNTAX -AnsichtSeitenumbruchVorschau FID_PAGEBREAKMODE +AnsichtRechenleiste .uno:InputLineVisible +AnsichtSpaltenZeilenkoepfe .uno:ViewRowColumnHeaders +AnsichtWerteHervorheben .uno:ViewValueHighlighting +AnsichtSeitenumbruchVorschau .uno:PagebreakMode ' **** Draw / Impress -AnsichtFarbleiste SID_COLOR_CONTROL -AnsichtLineale SID_RULER -AnsichtZeichnung SID_DRAWINGMODE -AnsichtGliederung SID_OUTLINEMODE -AnsichtDiasortierung SID_DIAMODE -AnsichtNotizen SID_NOTESMODE -AnsichtHandzettel SID_HANDOUTMODE -AnsichtBildschirmpraesentation SID_PRESENTATION -AnsichtVorschau SID_PREVIEW_WIN -AnsichtSeite SID_PAGEMODE -AnsichtHintergrund SID_MASTERPAGE -AnsichtHintergrundZeichnung SID_SLIDE_MASTERPAGE -AnsichtHintergrundTitel SID_TITLE_MASTERPAGE -AnsichtHintergrundNotizen SID_NOTES_MASTERPAGE -AnsichtHintergrundHandzettel SID_HANDOUT_MASTERPAGE -AnsichtEbene SID_LAYERMODE +AnsichtFarbleiste .uno:ColorControl +AnsichtLineale .uno:ShowRuler +AnsichtZeichnung .uno:DrawingMode +AnsichtGliederung .uno:OutlineMode +AnsichtDiasortierung .uno:DiaMode +AnsichtNotizen .uno:NotesMode +AnsichtHandzettel .uno:HandoutMode +AnsichtBildschirmpraesentation .uno:Presentation +AnsichtVorschau .uno:PreviewWindow +AnsichtSeite .uno:PageMode +AnsichtHintergrund .uno:MasterPage +AnsichtHintergrundZeichnung .uno:SlideMasterPage +AnsichtHintergrundTitel .uno:TitleMasterPage +AnsichtHintergrundNotizen .uno:NotesMasterPage +AnsichtHintergrundHandzettel .uno:HandoutMasterPage +AnsichtEbene .uno:LayerMode ' **** Image -AnsichtFuenfzig SID_VIEW050 -AnsichtEinhundert SID_VIEW100 -AnsichtZweihundert SID_VIEW200 -AnsichtVergroessern SID_ZOOMIN -AnsichtVerkleinern SID_ZOOMOUT -AnsichtAllesAnzeigen SID_ADJUST -AnsichtAktualisieren SID_DRAW -AnsichtOperatoren SID_TOOLBOX +AnsichtFuenfzig .uno:View50 +AnsichtEinhundert .uno:View100 +AnsichtZweihundert .uno:View200 +AnsichtVergroessern .uno:ZoomIn +AnsichtVerkleinern .uno:ZoomOut +AnsichtAllesAnzeigen .uno:Adjust +AnsichtAktualisieren .uno:Draw +AnsichtOperatoren .uno:ToolBox ' **** Math -AnsichtAutomatischesNeuzeichnen SID_AUTO_REDRAW +AnsichtAutomatischesNeuzeichnen .uno:RedrawAutomatic ' **** Frameset -AnsichtHTMLQuelltextFrame SID_SOURCEVIEW +AnsichtHTMLQuelltextFrame .uno:SourceView ' **** WriterWeb -AnsichtDruckLayout FN_PRINT_LAYOUT -AnsichtHTMLQuelltext SID_SOURCEVIEW +AnsichtDruckLayout .uno:PrintLayout +AnsichtHTMLQuelltext .uno:SourceView ' *********************************** ' ********* Einfuegenmenue ********** ' **** ' **** Alle -EinfuegenGrafikAusDatei SID_INSERT_GRAPHIC -EinfuegenGrafikDiagramm SID_INSERT_DIAGRAM -EinfuegenObjektOLEObjekt SID_INSERT_OBJECT -EinfuegenObjektPlugIn SID_INSERT_PLUGIN -EinfuegenObjektKlang SID_INSERT_SOUND -EinfuegenObjektVideo SID_INSERT_VIDEO -EinfuegenFrame SID_INSERT_FLOATINGFRAME +EinfuegenGrafikAusDatei .uno:InsertGraphic +EinfuegenGrafikDiagramm .uno:InsertObjectChart +EinfuegenObjektOLEObjekt .uno:InsertObject +EinfuegenObjektPlugIn .uno:InsertPlugin +EinfuegenObjektKlang .uno:InsertSound +EinfuegenObjektVideo .uno:InsertVideo +EinfuegenFrame .uno:InsertObjectFloatingFrame ' **** Writer EinfuegenSonderzeichenWriter .uno:InsertSymbol -EinfuegenFormelWriter FN_INSERT_SMA -EinfuegenTabelleWriter FN_INSERT_TABLE -EinfuegenDateiWriter SID_INSERTDOC -EinfuegenManuellerUmbruch FN_INSERT_BREAK_DLG -EinfuegenFeldbefehlDatum FN_INSERT_FLD_DATE -EinfuegenFeldbefehlUhrzeit FN_INSERT_FLD_TIME -EinfuegenFeldbefehlSeitennummer FN_INSERT_FLD_PGNUMBER -EinfuegenFeldbefehlSeitenanzahl FN_INSERT_FLD_PGCOUNT -EinfuegenFeldbefehlThema FN_INSERT_FLD_TOPIC -EinfuegenFeldbefehlTitel FN_INSERT_FLD_TITLE -EinfuegenFeldbefehlAutor FN_INSERT_FLD_AUTHOR -EinfuegenFeldbefehlAndere FN_INSERT_FIELD -EinfuegenBereich FN_INSERT_REGION -EinfuegenHyperlink SID_HYPERLINK_DIALOG -EinfuegenFussnote FN_INSERT_FOOTNOTE_DLG -EinfuegenBeschriftung FN_INSERT_CAPTION -EinfuegenTextmarke FN_INSERT_BOOKMARK -EinfuegenQuerverweis FN_INSERT_REF_FIELD -EinfuegenNotizWriter FN_POSTIT -EinfuegenScript FN_JAVAEDIT -EinfuegenVerzeichnis FN_INSERT_MULTI_TOX -EinfuegenVerzeichnisseEintrag FN_INSERT_IDX_ENTRY_DLG -EinfuegenVerzeichnisLiteraturverzeichnis FN_INSERT_AUTH_ENTRY_DLG -EinfuegenBriefumschlag FN_ENVELOP -EinfuegenEtiketten FN_LABEL -EinfuegenVisitenkarten FN_BUSINESS_CARD -EinfuegenHorizontaleLinie FN_INSERT_HRULER -EinfuegenRahmen FN_INSERT_FRAME -EinfuegenGrafikScannenQuelleAuswaehlen SID_TWAIN_SELECT -EinfuegenGrafikScannenAnfordern SID_TWAIN_TRANSFER +EinfuegenFormelWriter .uno:InsertObjectStarMath +EinfuegenTabelleWriter .uno:InsertTable +EinfuegenDateiWriter .uno:InsertDoc +EinfuegenManuellerUmbruch .uno:InsertBreak +EinfuegenFeldbefehlDatum .uno:InsertDateField +EinfuegenFeldbefehlUhrzeit .uno:InsertTimeField +EinfuegenFeldbefehlSeitennummer .uno:InsertPageNumberField +EinfuegenFeldbefehlSeitenanzahl .uno:InsertPageCountField +EinfuegenFeldbefehlThema .uno:InsertTopicField +EinfuegenFeldbefehlTitel .uno:InsertTitleField +EinfuegenFeldbefehlAutor .uno:InsertAuthorField +EinfuegenFeldbefehlAndere .uno:InsertField +EinfuegenBereich .uno:InsertSection +EinfuegenHyperlink .uno:HyperlinkDialog +EinfuegenFussnote .uno:InsertFootnoteDialog +EinfuegenBeschriftung .uno:InsertCaptionDialog +EinfuegenTextmarke .uno:InsertBookmark +EinfuegenQuerverweis .uno:InsertReferenceField +EinfuegenNotizWriter .uno:InsertAnnotation +EinfuegenScript .uno:InsertScript +EinfuegenVerzeichnis .uno:InsertMultiIndex +EinfuegenVerzeichnisseEintrag .uno:InsertIndexesEntry +EinfuegenVerzeichnisLiteraturverzeichnis .uno:InsertAuthoritiesEntry +EinfuegenBriefumschlag .uno:InsertEnvelope +EinfuegenEtiketten .uno:InsertLabels +EinfuegenVisitenkarten .uno:InsertBusinessCard +EinfuegenHorizontaleLinie .uno:InsertGraphicRuler +EinfuegenRahmen .uno:InsertFrame +EinfuegenGrafikScannenQuelleAuswaehlen .uno:TwainSelect +EinfuegenGrafikScannenAnfordern .uno:TwainTransfer ' **** Calc -EinfuegenSonderzeichenCalc SID_CHARMAP -EinfuegenGrafikAusBildbearbeitungCalc SID_INSERT_SIMAGE -EinfuegenFormelCalc SID_INSERT_SMATH -EinfuegenTabelleCalc FID_INS_TABLE -EinfuegenManuellerUmbruchSpaltenumbruch FID_INS_COLBRK -EinfuegenManuellerUmbruchZeilenumbruch FID_INS_ROWBRK -EinfuegenZellen FID_INS_CELL -EinfuegenZeilenCalc FID_INS_ROW -EinfuegenSpaltenCalc FID_INS_COLUMN -EinfuegenFunktion SID_OPENDLG_FUNCTION -EinfuegenNamenEinfuegen FID_INSERT_NAME -EinfuegenNamenFestlegen FID_DEFINE_NAME -EinfuegenNamenUebernehmen FID_USE_NAME -EinfuegenNamenBeschriftungen SID_DEFINE_COLROWNAMERANGES -EinfuegenNotizCalc SID_INSERT_POSTIT -EinfuegenExterneDatenQuelle SID_EXTERNAL_SOURCE +EinfuegenSonderzeichenCalc .uno:InsertSymbol +EinfuegenGrafikAusBildbearbeitungCalc .uno:InsertObjectStarImage +EinfuegenFormelCalc .uno:InsertObjectStarMath +EinfuegenTabelleCalc .uno:Insert +EinfuegenManuellerUmbruchSpaltenumbruch .uno:InsertColumnBreak +EinfuegenManuellerUmbruchZeilenumbruch .uno:InsertRowBreak +EinfuegenZellen .uno:InsertCell +EinfuegenZeilenCalc .uno:InsertRows +EinfuegenSpaltenCalc .uno:InsertColumns +EinfuegenFunktion .uno:FunctionDialog +EinfuegenNamenEinfuegen .uno:InsertName +EinfuegenNamenFestlegen .uno:DefineName +EinfuegenNamenUebernehmen .uno:CreateNames +EinfuegenNamenBeschriftungen .uno:DefineLabelRange +EinfuegenNotizCalc .uno:InsertAnnotation +EinfuegenExterneDatenQuelle .uno:InsertExternalDataSource ' **** Einfuegenmenue : Draw EinfuegenSonderzeichenDraw .uno:InsertSymbol -EinfuegenGrafikAusBildbearbeitungDraw SID_INSERT_IMAGE -EinfuegenFormelDraw SID_INSERT_MATH -EinfuegenTabelleDraw SID_ATTR_TABLE -EinfuegenDateiDraw SID_INSERTFILE -EinfuegenSeite SID_INSERTPAGE -EinfuegenSeiteDuplizieren SID_DUPLICATE_PAGE -EinfuegenSeitenAusGliederung SID_EXPAND_PAGE -EinfuegenUebersichtsseite SID_SUMMARY_PAGE -EinfuegenEbene SID_INSERTLAYER -EinfuegenFangliniePunkt SID_CAPTUREPOINT -EinfuegenFeldbefehlDatumFix SID_INSERT_FLD_DATE_FIX -EinfuegenFeldbefehlDatumVariabel SID_INSERT_FLD_DATE_VAR -EinfuegenFeldbefehlUhrzeitFix SID_INSERT_FLD_TIME_FIX -EinfuegenFeldbefehlUhrzeitVariabel SID_INSERT_FLD_TIME_VAR -EinfuegenFeldbefehlAutorDraw SID_INSERT_FLD_AUTHOR -EinfuegenFeldbefehlSeitennummerDraw SID_INSERT_FLD_PAGE -EinfuegenFeldbefehlDateiname SID_INSERT_FLD_FILE -EinfuegenQuelleAuswaehlen SID_TWAIN_SELECT -EinfuegenAnfordern SID_TWAIN_TRANSFER -EinfuegenSymbol SID_CHOOSE_POLYGON +EinfuegenGrafikAusBildbearbeitungDraw .uno:InsertImage +EinfuegenFormelDraw .uno:InsertMath +EinfuegenTabelleDraw .uno:InsertSpreadsheet +EinfuegenDateiDraw .uno:ImportFromFile +EinfuegenSeite .uno:InsertPage +EinfuegenSeiteDuplizieren .uno:DuplicatePage +EinfuegenSeitenAusGliederung .uno:ExpandPage +EinfuegenUebersichtsseite .uno:SummaryPage +EinfuegenEbene .uno:InsertLayer +EinfuegenFangliniePunkt .uno:CapturePoint +EinfuegenFeldbefehlDatumFix .uno:InsertDateFieldFix +EinfuegenFeldbefehlDatumVariabel .uno:InsertDateFieldVar +EinfuegenFeldbefehlUhrzeitFix .uno:InsertTimeFieldFix +EinfuegenFeldbefehlUhrzeitVariabel .uno:InsertTimeFieldVar +EinfuegenFeldbefehlAutorDraw .uno:InsertAuthorField +EinfuegenFeldbefehlSeitennummerDraw .uno:InsertPageField +EinfuegenFeldbefehlDateiname .uno:InsertFileField +EinfuegenQuelleAuswaehlen .uno:TwainSelect +EinfuegenAnfordern .uno:TwainTransfer +EinfuegenSymbol .uno:ChoosePolygon ' *********************************** ' *********** Formatmenue *********** ' **** ' **** Alle -FormatZeichen SID_CHAR_DLG +FormatZeichen .uno:FontDialog FormatLinie .uno:FormatLine FormatFlaeche .uno:FormatArea -FormatAbsatz SID_PARA_DLG -FormatVorlagenkatalog SID_STYLE_CATALOG -FormatVorlagenLaden SID_TEMPLATE_LOAD -FormatGestalter SID_STYLE_DESIGNER -'FormatStylist SID_STYLE_DESIGNER -FormatKontrollfeld SID_FM_CTL_PROPERTIES -FormatFormularEigenschaften SID_FM_PROPERTIES -FormatGrossBuchstaben SID_TRANSLITERATE_UPPER -FormatKleinBuchstaben SID_TRANSLITERATE_LOWER +FormatAbsatz .uno:ParagraphDialog +FormatVorlagenkatalog .uno:StyleCatalog +FormatVorlagenLaden .uno:LoadStyles +FormatGestalter .uno:DesignerDialog +'FormatStylist .uno:DesignerDialog +FormatKontrollfeld .uno:ControlProperties +FormatFormularEigenschaften .uno:FormProperties +FormatGrossBuchstaben .uno:ChangeCaseToUpper +FormatKleinBuchstaben .uno:ChangeCaseToLower ' **** Writer -FormatStandardWriter FN_FORMAT_RESET -FormatSeiteWriter FN_FORMAT_PAGE_DLG -FormatBereiche FN_EDIT_REGION -FormatNumerierungAufzaehlung FN_NUMBER_BULLETS -FormatAutoformatWaehrendDerEingabe FN_AUTOFORMAT_AUTO -FormatAutoFormatAutomatisch FN_AUTOFORMAT_AUTO -FormatAutoformatDokumentFormatieren FN_AUTOFORMAT_APPLY -FormatAutoFormatAutoFormat SID_AUTOFORMAT -FormatAutoFormatEinstellungen SID_AUTOFORMAT -FormatTabelle FN_FORMAT_TABLE_DLG -FormatTabelleAuftrennen FN_TABLE_SPLIT_TABLE -FormatTabellenVerbinden FN_TABLE_MERGE_TABLE -FormatZahlenformat FN_NUM_FORMAT_TABLE_DLG -FormatZelleVerbinden FN_TABLE_MERGE_CELLS -FormatZelleTeilen FN_TABLE_SPLIT_CELLS -FormatZelleOben FN_TABLE_VERT_NONE -FormatZelleMitte FN_TABLE_VERT_CENTER -FormatZelleUnten FN_TABLE_VERT_BOTTOM -FormatZelleSchuetzen FN_TABLE_SET_READ_ONLY_CELLS -FormatZelleSchutzAufheben FN_TABLE_UNSET_READ_ONLY_CELLS -FormatZeileHoehe FN_TABLE_SET_ROW_HEIGHT -FormatZeileOptimaleHoehe FN_TABLE_OPTIMAL_HEIGHT -FormatZeileZeilenGleichmaessigVerteilen FN_TABLE_BALANCE_ROWS -FormatZeileSelektieren FN_TABLE_SELECT_ROW -FormatZeileEinfuegen FN_TABLE_INSERT_ROW_DLG -FormatZeileLoeschen FN_TABLE_DELETE_ROW -FormatSpalteBreiteWriter FN_TABLE_SET_COL_WIDTH -FormatSpalteOptimaleBreiteWriter FN_TABLE_ADJUST_CELLS -FormatSpalteSpaltenGleichmaessigVerteilen FN_TABLE_BALANCE_CELLS -FormatSpalteSelektieren FN_TABLE_SELECT_COL -FormatSpalteEinfuegen FN_TABLE_INSERT_COL_DLG -FormatSpalteLoeschen FN_TABLE_DELETE_COL -FormatGrafik FN_FORMAT_GRAFIC_DLG -FormatRahmen FN_FORMAT_FRAME_DLG -FormatObjekt FN_FORMAT_FRAME_DLG -FormatAnordnungGanzNachVorn SID_FRAME_TO_TOP -FormatAnordnungWeiterNachVorn FN_FRAME_UP -FormatAnordnungWeiterNachHinten FN_FRAME_DOWN -FormatAnordnungGanzNachHinten SID_FRAME_TO_BOTTOM -FormatAnordnungInDenVordergrund SID_OBJECT_HEAVEN -FormatAnordnungInDenHintergrund SID_OBJECT_HELL -FormatAusrichtungLinks FN_FRAME_ALIGN_HORZ_LEFT -FormatAusrichtungZentriert FN_FRAME_ALIGN_HORZ_CENTER -FormatAusrichtungRechts FN_FRAME_ALIGN_HORZ_RIGHT -FormatAusrichtungOben FN_FRAME_ALIGN_VERT_TOP -FormatAusrichtungMitte FN_FRAME_ALIGN_VERT_CENTER -FormatAusrichtungUnten FN_FRAME_ALIGN_VERT_BOTTOM -FormatVerankerungAnDerSeite FN_TOOL_ANKER_PAGE -FormatVerankerungAmAbsatz FN_TOOL_ANKER_PARAGRAPH -FormatVerankerungAmZeichen FN_TOOL_ANKER_CHAR -FormatUmlaufKeinUmlauf FN_FRAME_NOWRAP -FormatUmlaufSeitenumlauf FN_FRAME_WRAP -FormatUmlaufIdealerSeitenumlauf FN_FRAME_WRAP_IDEAL -FormatUmlaufDurchlauf FN_FRAME_WRAPTHRU -FormatUmlaufImHintergrund FN_FRAME_WRAPTHRU_TRANSP -FormatUmlaufKontur FN_FRAME_WRAP_CONTOUR -FormatUmlaufKonturBearbeiten SID_CONTOUR_DLG -FormatUmlaufErsterAbsatz FN_WRAP_ANCHOR_ONLY -FormatUmlaufBearbeiten FN_DRAW_WRAP_DLG -FormatPositionUndGroesse SID_ATTR_TRANSFORM -FormatSpiegelnVertikal FN_FLIP_VERT_GRAFIC -FormatSpiegelnHorizontal FN_FLIP_HORZ_GRAFIC -FormatObjektAusrichtungLinks SID_OBJECT_ALIGN_LEFT -FormatObjektAusrichtungZentriert SID_OBJECT_ALIGN_CENTER -FormatObjektAusrichtungRechts SID_OBJECT_ALIGN_RIGHT -FormatObjektAusrichtungOben SID_OBJECT_ALIGN_UP -FormatObjektAusrichtungMitte SID_OBJECT_ALIGN_MIDDLE -FormatObjektAusrichtungUnten SID_OBJECT_ALIGN_DOWN -FormatPunkteBearbeiten SID_BEZIER_EDIT -FormatGruppeGruppieren SID_GROUP -FormatGruppeAufheben SID_UNGROUP -FormatGruppeBetreten SID_ENTER_GROUP -FormatGruppeVerlassen SID_LEAVE_GROUP -FormatStilFett SID_ATTR_CHAR_WEIGHT -FormatStilKursiv SID_ATTR_CHAR_POSTURE -FormatStilUnterstreichen SID_ATTR_CHAR_UNDERLINE -FormatStilDurchstreichen SID_ATTR_CHAR_STRIKEOUT -FormatStilSchatten SID_ATTR_CHAR_SHADOWED -FormatStilKontur SID_ATTR_CHAR_CONTOUR -FormatStilHochstellen FN_SET_SUPER_SCRIPT -FormatStilTiefstellen FN_SET_SUB_SCRIPT -FormatZeilenabstandEinzeilig SID_ATTR_PARA_LINESPACE_10 -FormatZeilenabstand15Zeilig SID_ATTR_PARA_LINESPACE_15 -FormatZeilenabstandZweizeilig SID_ATTR_PARA_LINESPACE_20 -FormatAusrichtungLinksText SID_ATTR_PARA_ADJUST_LEFT -FormatAusrichtungRechtsText SID_ATTR_PARA_ADJUST_RIGHT -FormatAusrichtungZentriertText SID_ATTR_PARA_ADJUST_CENTER -FormatAusrichtungBlocksatzText SID_ATTR_PARA_ADJUST_BLOCK +FormatStandardWriter .uno:ResetAttributes +FormatSeiteWriter .uno:PageDialog +FormatBereiche .uno:EditRegion +FormatNumerierungAufzaehlung .uno:BulletsAndNumberingDialog +FormatAutoformatWaehrendDerEingabe .uno:OnlineAutoFormat +FormatAutoFormatAutomatisch .uno:OnlineAutoFormat +FormatAutoformatDokumentFormatieren .uno:AutoFormatApply +FormatAutoFormatAutoFormat .uno:AutoFormat +FormatAutoFormatEinstellungen .uno:AutoFormat +FormatTabelle .uno:TableDialog +FormatTabelleAuftrennen .uno:SplitTable +FormatTabellenVerbinden .uno:MergeTable +FormatZahlenformat .uno:TableNumberFormatDialog +FormatZelleVerbinden .uno:MergeCells +FormatZelleTeilen .uno:SplitCell +FormatZelleOben .uno:CellVertTop +FormatZelleMitte .uno:CellVertCenter +FormatZelleUnten .uno:CellVertBottom +FormatZelleSchuetzen .uno:Protect +FormatZelleSchutzAufheben .uno:UnsetCellsReadOnly +FormatZeileHoehe .uno:SetRowHeight +FormatZeileOptimaleHoehe .uno:SetOptimalRowHeight +FormatZeileZeilenGleichmaessigVerteilen .uno:DistributeRows +FormatZeileSelektieren .uno:EntireRow +FormatZeileEinfuegen .uno:InsertRowDialog +FormatZeileLoeschen .uno:DeleteRows +FormatSpalteBreiteWriter .uno:SetColumnWidth +FormatSpalteOptimaleBreiteWriter .uno:SetOptimalColumnWidth +FormatSpalteSpaltenGleichmaessigVerteilen .uno:DistributeColumns +FormatSpalteSelektieren .uno:EntireColumn +FormatSpalteEinfuegen .uno:InsertColumnDialog +FormatSpalteLoeschen .uno:DeleteColumns +FormatGrafik .uno:GraphicDialog +FormatRahmen .uno:FrameDialog +FormatObjekt .uno:FrameDialog +FormatAnordnungGanzNachVorn .uno:BringToFront +FormatAnordnungWeiterNachVorn .uno:ObjectForwardOne +FormatAnordnungWeiterNachHinten .uno:ObjectBackOne +FormatAnordnungGanzNachHinten .uno:SendToBack +FormatAnordnungInDenVordergrund .uno:SetObjectToForeground +FormatAnordnungInDenHintergrund .uno:SetObjectToBackground +FormatAusrichtungLinks .uno:AlignLeft +FormatAusrichtungZentriert .uno:AlignHorizontalCenter +FormatAusrichtungRechts .uno:AlignRight +FormatAusrichtungOben .uno:AlignTop +FormatAusrichtungMitte .uno:AlignVerticalCenter +FormatAusrichtungUnten .uno:AlignBottom +FormatVerankerungAnDerSeite .uno:SetAnchorToPage +FormatVerankerungAmAbsatz .uno:SetAnchorToPara +FormatVerankerungAmZeichen .uno:SetAnchorToChar +FormatUmlaufKeinUmlauf .uno:WrapOff +FormatUmlaufSeitenumlauf .uno:WrapOn +FormatUmlaufIdealerSeitenumlauf .uno:WrapIdeal +FormatUmlaufDurchlauf .uno:WrapThrough +FormatUmlaufImHintergrund .uno:WrapThroughTransparent +FormatUmlaufKontur .uno:WrapContour +FormatUmlaufKonturBearbeiten .uno:ContourDialog +FormatUmlaufErsterAbsatz .uno:WrapAnchorOnly +FormatUmlaufBearbeiten .uno:TextWrap +FormatPositionUndGroesse .uno:TransformDialog +FormatSpiegelnVertikal .uno:FlipVertical +FormatSpiegelnHorizontal .uno:FlipHorizontal +FormatObjektAusrichtungLinks .uno:ObjectAlignLeft +FormatObjektAusrichtungZentriert .uno:AlignCenter +FormatObjektAusrichtungRechts .uno:ObjectAlignRight +FormatObjektAusrichtungOben .uno:AlignUp +FormatObjektAusrichtungMitte .uno:AlignMiddle +FormatObjektAusrichtungUnten .uno:AlignDown +FormatPunkteBearbeiten .uno:ToggleObjectBezierMode +FormatGruppeGruppieren .uno:FormatGroup +FormatGruppeAufheben .uno:FormatUngroup +FormatGruppeBetreten .uno:EnterGroup +FormatGruppeVerlassen .uno:LeaveGroup +FormatStilFett .uno:Bold +FormatStilKursiv .uno:Italic +FormatStilUnterstreichen .uno:Underline +FormatStilDurchstreichen .uno:Strikeout +FormatStilSchatten .uno:Shadowed +FormatStilKontur .uno:OutlineFont +FormatStilHochstellen .uno:SuperScript +FormatStilTiefstellen .uno:SubScript +FormatZeilenabstandEinzeilig .uno:SpacePara1 +FormatZeilenabstand15Zeilig .uno:SpacePara15 +FormatZeilenabstandZweizeilig .uno:SpacePara2 +FormatAusrichtungLinksText .uno:LeftPara +FormatAusrichtungRechtsText .uno:RightPara +FormatAusrichtungZentriertText .uno:CenterPara +FormatAusrichtungBlocksatzText .uno:JustifyPara ' alt -FormatGruppierung SID_GROUP -FormatGruppierungAufheben SID_UNGROUP +FormatGruppierung .uno:FormatGroup +FormatGruppierungAufheben .uno:FormatUngroup ' Formatmenue : Calc -FormatStandardCalc SID_CELL_FORMAT_RESET -FormatTextZeichnung SID_DRAWTEXT_ATTR_DLG -FormatSeiteCalc SID_FORMATPAGE -FormatZelle FID_CELL_FORMAT -FormatZeileAusblenden FID_ROW_HIDE -FormatZeileEinblenden FID_ROW_SHOW -FormatZeileHoeheCalc FID_ROW_HEIGHT -FormatZeileOptimaleHoeheCalc FID_ROW_OPT_HEIGHT -FormatSpalteAusblenden FID_COL_HIDE -FormatSpalteBreiteCalc FID_COL_WIDTH -FormatSpalteEinblenden FID_COL_SHOW -FormatSpalteOptimaleBreiteCalc FID_COL_OPT_WIDTH -FormatTabelleAusblenden FID_TABLE_HIDE -FormatTabelleEinblenden FID_TABLE_SHOW -FormatTabelleUmbenennen FID_TAB_MENU_RENAME FID_TAB_RENAME -FormatZellenZusammenfassenAufheben FID_MERGE_OFF -FormatZellenZusammenfassenFestlegen FID_MERGE_ON -FormatDruckbereicheAufheben SID_DELETE_PRINTAREA -FormatDruckbereicheBearbeiten SID_OPENDLG_EDIT_PRINTAREA -FormatDruckbereicheFestlegen SID_DEFINE_PRINTAREA -FormatBedingteFormatierung SID_OPENDLG_CONDFRMT -FormatVerankerungSeite SID_ANCHOR_PAGE -FormatVerankerungZelle SID_ANCHOR_CELL -FormatSpiegelnVertikalCalc SID_MIRROR_VERTICAL -FormatSpiegelnHorizontalCalc SID_MIRROR_HORIZONTAL -FormatAnordnungGanzNachVornCalc SID_FRAME_TO_TOP -FormatAnordnungWeiterNachVornCalc SID_FRAME_UP -FormatAnordnungWeiterNachHintenCalc SID_FRAME_DOWN -FormatAnordnungGanzNachHintenCalc SID_FRAME_TO_BOTTOM -FormatAnordnungInDenHintergrundCalc SID_OBJECT_HELL -FormatAnordnungInDenVordergrundCalc SID_OBJECT_HEAVEN -FormatAusrichtungLinksCalc SID_OBJECT_ALIGN_LEFT -FormatAusrichtungZentriertCalc SID_OBJECT_ALIGN_CENTER -FormatAusrichtungRechtsCalc SID_OBJECT_ALIGN_RIGHT -FormatAusrichtungObenCalc SID_OBJECT_ALIGN_UP -FormatAusrichtungMitteCalc SID_OBJECT_ALIGN_MIDDLE -FormatAusrichtungUntenCalc SID_OBJECT_ALIGN_DOWN -FormatGruppeGruppierenCalc SID_GROUP -FormatGruppeAufhebenCalc SID_UNGROUP -FormatGruppeBetretenCalc SID_ENTER_GROUP -FormatGruppeVerlassenCalc SID_LEAVE_GROUP +FormatStandardCalc .uno:ResetAttributes +FormatTextZeichnung .uno:TextAttributes +FormatSeiteCalc .uno:PageFormatDialog +FormatZelle .uno:FormatCellDialog +FormatZeileAusblenden .uno:HideRow +FormatZeileEinblenden .uno:ShowRow +FormatZeileHoeheCalc .uno:RowHeight +FormatZeileOptimaleHoeheCalc .uno:SetOptimalRowHeight +FormatSpalteAusblenden .uno:HideColumn +FormatSpalteBreiteCalc .uno:ColumnWidth +FormatSpalteEinblenden .uno:ShowColumn +FormatSpalteOptimaleBreiteCalc .uno:SetOptimalColumnWidth +FormatTabelleAusblenden .uno:Hide +FormatTabelleEinblenden .uno:Show +FormatTabelleUmbenennen .uno:RenameTable .uno:Name +FormatZellenZusammenfassenAufheben .uno:SplitCell +FormatZellenZusammenfassenFestlegen .uno:MergeCells +FormatDruckbereicheAufheben .uno:DeletePrintArea +FormatDruckbereicheBearbeiten .uno:EditPrintArea +FormatDruckbereicheFestlegen .uno:DefinePrintArea +FormatBedingteFormatierung .uno:ConditionalFormatDialog +FormatVerankerungSeite .uno:SetAnchorToPage +FormatVerankerungZelle .uno:SetAnchorToCell +FormatSpiegelnVertikalCalc .uno:ObjectMirrorVertical +FormatSpiegelnHorizontalCalc .uno:ObjectMirrorHorizontal +FormatAnordnungGanzNachVornCalc .uno:BringToFront +FormatAnordnungWeiterNachVornCalc .uno:ObjectForwardOne +FormatAnordnungWeiterNachHintenCalc .uno:ObjectBackOne +FormatAnordnungGanzNachHintenCalc .uno:SendToBack +FormatAnordnungInDenHintergrundCalc .uno:SetObjectToBackground +FormatAnordnungInDenVordergrundCalc .uno:SetObjectToForeground +FormatAusrichtungLinksCalc .uno:ObjectAlignLeft +FormatAusrichtungZentriertCalc .uno:AlignCenter +FormatAusrichtungRechtsCalc .uno:ObjectAlignRight +FormatAusrichtungObenCalc .uno:AlignUp +FormatAusrichtungMitteCalc .uno:AlignMiddle +FormatAusrichtungUntenCalc .uno:AlignDown +FormatGruppeGruppierenCalc .uno:FormatGroup +FormatGruppeAufhebenCalc .uno:FormatUngroup +FormatGruppeBetretenCalc .uno:EnterGroup +FormatGruppeVerlassenCalc .uno:LeaveGroup ' **** Draw / Impress -FormatSeiteDraw SID_PAGESETUP -FormatBemassung SID_MEASURE_DLG -Format3D_Effekte SID_3D_WIN -FormatVerbinder SID_CONNECTION_DLG -FormatAufzaehlungszeichen SID_OUTLINE_BULLET -FormatSeitenlayout SID_MODIFYPAGE -FormatEbene SID_MODIFYLAYER -FormatDesign SID_PRESENTATION_LAYOUT +FormatSeiteDraw .uno:PageSetup +FormatBemassung .uno:MeasureAttributes +Format3D_Effekte .uno:Window3D +FormatVerbinder .uno:ConnectorAttributes +FormatAufzaehlungszeichen .uno:OutlineBullet +FormatSeitenlayout .uno:ModifyPage +FormatEbene .uno:ModifyLayer +FormatDesign .uno:PresentationLayout ' **** Math -FormatSchriftarten SID_FONT -FormatSchriftgroessen SID_FONTSIZE -FormatAbstaende SID_DISTANCE -FormatAusrichtung SID_ALIGN +FormatSchriftarten .uno:ChangeFont +FormatSchriftgroessen .uno:ChangeFontSize +FormatAbstaende .uno:ChangeDistance +FormatAusrichtung .uno:ChangeAlignment ' *********************************** ' *********** Extrasmenue *********** ' **** ' **** Alle -ExtrasRechtschreibungAutomatisch SID_AUTOSPELL_CHECK -ExtrasAutoKorrektur SID_AUTO_CORRECT_DLG -ExtrasMakro SID_BASICCHOOSER -ExtrasAnpassen SID_CONFIG -ExtrasOptionen SID_OPTIONS_TREEDIALOG +ExtrasRechtschreibungAutomatisch .uno:SpellOnline +ExtrasAutoKorrektur .uno:AutoCorrectDlg +ExtrasMakro .uno:MacroDialog +ExtrasAnpassen .uno:ConfigureDialog +ExtrasOptionen .uno:OptionsTreeDialog ' **** Writer -ExtrasKapitelnumerierung FN_NUMBERING_OUTLINE_DLG -ExtrasZeilennumerierung FN_LINE_NUMBERING_DLG -ExtrasSeitennummer FN_CHANGE_PAGENUM -ExtrasFussnoten FN_FORMAT_FOOTNOTE_DLG -ExtrasTextInTabelle FN_CONVERT_TEXT_TABLE -ExtrasSortieren FN_SORTING_DLG -ExtrasBerechnen FN_CALCULATE -ExtrasAktualisierenAllesAktualisieren FN_UPDATE_ALL -ExtrasAktualisierenFelder FN_UPDATE_FIELDS -ExtrasAktualisierenVerknuepfungen FN_UPDATE_ALL_LINKS -ExtrasAktualisierenAktuellesVerzeichnis FN_UPDATE_CUR_TOX -ExtrasAktualisierenAlleVerzeichnisse FN_UPDATE_TOX -ExtrasAktualisierenSeitenformatierung FN_REPAGINATE +ExtrasKapitelnumerierung .uno:ChapterNumberingDialog +ExtrasZeilennumerierung .uno:LineNumberingDialog +ExtrasSeitennummer .uno:PageOffset +ExtrasFussnoten .uno:FootnoteDialog +ExtrasTextInTabelle .uno:ConvertTableText +ExtrasSortieren .uno:SortDialog +ExtrasBerechnen .uno:CalculateSel +ExtrasAktualisierenAllesAktualisieren .uno:UpdateAll +ExtrasAktualisierenFelder .uno:UpdateFields +ExtrasAktualisierenVerknuepfungen .uno:UpdateAllLinks +ExtrasAktualisierenAktuellesVerzeichnis .uno:UpdateCurIndex +ExtrasAktualisierenAlleVerzeichnisse .uno:UpdateAllIndexes +ExtrasAktualisierenSeitenformatierung .uno:Repaginate ' **** WriterWeb -ExtrasSeitenformatierung FN_REPAGINATE +ExtrasSeitenformatierung .uno:Repaginate ' **** Calc -ExtrasDetektivAlleSpurenEntfernen SID_DETECTIVE_DEL_ALL -ExtrasDetektivFuellModus SID_DETECTIVE_FILLMODE -ExtrasDetektivSpurZumFehler SID_DETECTIVE_ADD_ERR -ExtrasDetektivSpurZumNachfolger SID_DETECTIVE_ADD_SUCC -ExtrasDetektivSpurZumNachfolgerEntfernen SID_DETECTIVE_DEL_SUCC -ExtrasDetektivSpurZumVorgaenger SID_DETECTIVE_ADD_PRED -ExtrasDetektivSpurZumVorgaengerEntfernen SID_DETECTIVE_DEL_PRED -ExtrasDetektivUngueltigeDatenEinkreisen SID_DETECTIVE_INVALID SID_FILL_SELECT -ExtrasDetektivAutomatischAktuakisieren SID_DETECTIVE_AUTO -ExtrasZielwertsuche SID_OPENDLG_SOLVE -ExtrasSzenarien SID_SCENARIOS -ExtrasDokumentSchuetzenDokument FID_PROTECT_DOC -ExtrasDokumentSchuetzenTabelle FID_PROTECT_TABLE -ExtrasNeuBerechnen FID_RECALC -ExtrasAutomatischBerechnen FID_AUTO_CALC -ExtrasAutoEingabe FID_AUTOCOMPLETE +ExtrasDetektivAlleSpurenEntfernen .uno:ClearArrows +ExtrasDetektivFuellModus .uno:AuditingFillMode +ExtrasDetektivSpurZumFehler .uno:ShowErrors +ExtrasDetektivSpurZumNachfolger .uno:ShowDependents +ExtrasDetektivSpurZumNachfolgerEntfernen .uno:ClearArrowDependents +ExtrasDetektivSpurZumVorgaenger .uno:ShowPrecedents +ExtrasDetektivSpurZumVorgaengerEntfernen .uno:ClearArrowPrecedents +ExtrasDetektivUngueltigeDatenEinkreisen .uno:ShowInvalid .uno:FillModeSelect +ExtrasDetektivAutomatischAktuakisieren .uno:AutoRefreshArrows +ExtrasZielwertsuche .uno:GoalSeekDialog +ExtrasSzenarien .uno:ScenarioManager +ExtrasDokumentSchuetzenDokument .uno:ToolProtectionDocument +ExtrasDokumentSchuetzenTabelle .uno:Protect +ExtrasNeuBerechnen .uno:Calculate +ExtrasAutomatischBerechnen .uno:AutomaticCalculation +ExtrasAutoEingabe .uno:AutoComplete ' **** Draw / Impress -ExtrasThesaurusDraw SID_THESAURUS -ExtrasPipette SID_BMPMASK +ExtrasThesaurusDraw .uno:Thesaurus +ExtrasPipette .uno:BmpMask ExtrasDiawechsel .uno:SlideChangeWindow -ExtrasAnimation SID_ANIMATION_OBJECTS +ExtrasAnimation .uno:AnimationObjects ExtrasEffekt .uno:AnimationEffects -ExtrasInteraktion SID_ANIMATION_EFFECTS -ExtrasPraesentationseinstellung SID_PRESENTATION_DLG -ExtrasIndividuellePraesentation SID_CUSTOMSHOW_DLG +ExtrasInteraktion .uno:AnimationEffects +ExtrasPraesentationseinstellung .uno:PresentationDialog +ExtrasIndividuellePraesentation .uno:CustomShowDialog ' **** Math -' ExtrasSymbole SID_SYMBOLS -ExtrasSymboleKatalog SID_SYMBOLS_CATALOGUE +' ExtrasSymbole .uno:Symbols +ExtrasSymboleKatalog .uno:SymbolCatalogue ' ExtrasSymboleLaden SID_SYMBOLS_LOAD -ExtrasFormelImportieren SID_INSERT_FORMULA +ExtrasFormelImportieren .uno:InsertFormula ' *********************************** ' *********** Praesentationmenue ************ ' **** -PraesentationBildschirmpraesentation SID_PRESENTATION -PraesentationPraesentationmitZeitnahme SID_REHEARSE_TIMINGS -PraesentationPraesentationseinstellungen SID_PRESENTATION_DLG -PraesentationIndividuellePraesentation SID_CUSTOMSHOW_DLG +PraesentationBildschirmpraesentation .uno:Presentation +PraesentationPraesentationmitZeitnahme .uno:RehearseTimings +PraesentationPraesentationseinstellungen .uno:PresentationDialog +PraesentationIndividuellePraesentation .uno:CustomShowDialog PraesentationDiawechsel .uno:SlideChangeWindow -PraesentationDiaAnzeigen SID_HIDE_SLIDE -PraesentationAnimation SID_ANIMATION_OBJECTS +PraesentationDiaAnzeigen .uno:HideSlide +PraesentationAnimation .uno:AnimationObjects PraesentationEffekt .uno:AnimationEffects -PraesentationInteraktion SID_ANIMATION_EFFECTS +PraesentationInteraktion .uno:AnimationEffects ' *********************************** ' *********** Datenmenue ************ ' **** ' **** Calc -DatenBereichAuswaehlen SID_SELECT_DB -DatenBereichFestlegen SID_DEFINE_DBNAME -DatenSortieren SID_SORT -DatenFilterAutoFilter SID_AUTO_FILTER -DatenFilterAutoFilterAusblenden SID_AUTOFILTER_HIDE -DatenFilterFilterEntfernen SID_UNFILTER -DatenFilterSpezialfilter SID_SPECIAL_FILTER -DatenFilterStandardfilter SID_FILTER -DatenTeilergebnisse SID_SUBTOTALS -DatenGueltigkeit FID_VALIDATION -DatenDatenpilotAufrufen SID_OPENDLG_PIVOTTABLE -DatenMehrfachoperationen SID_OPENDLG_TABOP -DatenKonsolidieren SID_OPENDLG_CONSOLIDATE -DatenGliederungAutoGliederung SID_AUTO_OUTLINE -DatenGliederungDetailAusblenden SID_OUTLINE_HIDE -DatenGliederungDetailEinblenden SID_OUTLINE_SHOW -DatenGliederungEntfernen SID_OUTLINE_DELETEALL -DatenGliederungGruppierung SID_OUTLINE_MAKE -DatenGliederungGruppierungAufheben SID_OUTLINE_REMOVE -DatenDatenpilotAktualisieren SID_PIVOT_RECALC -DatenDatenpilotLoeschen SID_PIVOT_KILL -DatenBereichAktualisieren SID_REFRESH_DBAREA +DatenBereichAuswaehlen .uno:SelectDB +DatenBereichFestlegen .uno:DefineDBName +DatenSortieren .uno:DataSort +DatenFilterAutoFilter .uno:DataFilterAutoFilter +DatenFilterAutoFilterAusblenden .uno:DataFilterHideAutoFilter +DatenFilterFilterEntfernen .uno:DataFilterRemoveFilter +DatenFilterSpezialfilter .uno:DataFilterSpecialFilter +DatenFilterStandardfilter .uno:DataFilterStandardFilter +DatenTeilergebnisse .uno:DataSubTotals +DatenGueltigkeit .uno:Validation +DatenDatenpilotAufrufen .uno:DataDataPilotRun +DatenMehrfachoperationen .uno:TableOperationDialog +DatenKonsolidieren .uno:DataConsolidate +DatenGliederungAutoGliederung .uno:AutoOutline +DatenGliederungDetailAusblenden .uno:HideDetail +DatenGliederungDetailEinblenden .uno:ShowDetail +DatenGliederungEntfernen .uno:ClearOutline +DatenGliederungGruppierung .uno:Group +DatenGliederungGruppierungAufheben .uno:Ungroup +DatenDatenpilotAktualisieren .uno:RecalcPivotTable +DatenDatenpilotLoeschen .uno:DeletePivotTable +DatenBereichAktualisieren .uno:DataAreaRefresh ' *********************************** ' ********** Fenstermenue *********** ' **** ' **** Alle -FensterNeuesFenster SID_NEWWINDOW +FensterNeuesFenster .uno:NewWindow 'FensterUeberlappend SID_CASCADEWINS 'FensterNebeneinander SID_TILEWINS 'FensterHorizontal SID_HORIZONTALWINS 'FensterVertikal SID_VERTICALWINS -FensterAlleSchliessen SID_CLOSEWINS -FensterTeilen SID_WINDOW_SPLIT -FensterFixieren SID_WINDOW_FIX +FensterAlleSchliessen .uno:CloseWins +FensterTeilen .uno:SplitWindow +FensterFixieren .uno:FreezePanes ' *********************************** ' *********** Hilfemenue ************ ' **** ' **** Alle -HilfeInhalt SID_HELPINDEX -HilfeHelferlein SID_HELP_PI -HilfeTip SID_HELPTIPS -HilfeAktiveHilfe SID_HELPBALLOONS -HilfeOnlineregistrierung SID_ONLINE_REGISTRATION -HilfeInfoUeber SID_ABOUT +HilfeInhalt .uno:HelpIndex +HilfeHelferlein .uno:HelperDialog +HilfeTip .uno:HelpTip +HilfeAktiveHilfe .uno:ActiveHelp +HilfeOnlineregistrierung .uno:OnlineRegistrationDlg +HilfeInfoUeber .uno:About ' *********************************** ' ********** Aendernmenue *********** ' **** ' **** Draw / Impress -AendernPositionGroesse SID_ATTR_TRANSFORM -AendernSpiegelnVertikalDraw SID_VERTICAL -AendernSpiegelnHorizontalDraw SID_HORIZONTAL -AendernUmwandelnInKurve SID_CHANGEBEZIER -AendernUmwandelnInPolygon SID_CHANGEPOLYGON -AendernUmwandelnIn3D SID_CONVERT_TO_3D -AendernUmwandelnIn3DRotationskoerper SID_CONVERT_TO_3D_LATHE_FAST -AendernUmwandelnInMetafile SID_CONVERT_TO_METAFILE -AendernUmwandelnInBitmap SID_CONVERT_TO_BITMAP -AendernAnordnungGanznachVorn SID_FRAME_TO_TOP -AendernAnordnungWeiterNachVorn SID_MOREFRONT -AendernAnordnungWeiterNachHinten SID_MOREBACK -AendernAnordnungGanznachHinten SID_FRAME_TO_BOTTOM -AendernAnordnungVorDasObjekt SID_BEFORE_OBJ -AendernAnordnungHinterDasObjekt SID_BEHIND_OBJ -AendernAnordnungVertauschen SID_REVERSE_ORDER -AendernVerteilen SID_DISTRIBUTE_DLG -AendernAusrichtungLinks SID_OBJECT_ALIGN_LEFT -AendernAusrichtungZentriert SID_OBJECT_ALIGN_CENTER -AendernAusrichtungRechts SID_OBJECT_ALIGN_RIGHT -AendernAusrichtungOben SID_OBJECT_ALIGN_UP -AendernAusrichtungMitte SID_OBJECT_ALIGN_MIDDLE -AendernAusrichtungUnten SID_OBJECT_ALIGN_DOWN -AendernObjektBenennen SID_NAME_GROUP -AendernFontWork SID_FONTWORK -AendernPipette SID_BMPMASK -AendernGruppierung SID_GROUP -AendernGruppierungAufheben SID_UNGROUP -AendernGruppierungBetreten SID_ENTER_GROUP -AendernGruppierungVerlassen SID_LEAVE_GROUP -AendernKombination SID_COMBINE -AendernKombinationAufheben SID_DISMANTLE -AendernVerbinden SID_CONNECT -AendernAufbrechen SID_BREAK -AendernShapeMerge SID_POLY_MERGE -AendernShapeSubstract SID_POLY_SUBSTRACT -AendernShapeIntersect SID_POLY_INTERSECT +AendernPositionGroesse .uno:TransformDialog +AendernSpiegelnVertikalDraw .uno:MirrorVert +AendernSpiegelnHorizontalDraw .uno:MirrorHorz +AendernUmwandelnInKurve .uno:ChangeBezier +AendernUmwandelnInPolygon .uno:ChangePolygon +AendernUmwandelnIn3D .uno:ConvertInto3D +AendernUmwandelnIn3DRotationskoerper .uno:ConvertInto3DLatheFast +AendernUmwandelnInMetafile .uno:ConvertIntoMetaFile +AendernUmwandelnInBitmap .uno:ConvertIntoBitmap +AendernAnordnungGanznachVorn .uno:BringToFront +AendernAnordnungWeiterNachVorn .uno:Forward +AendernAnordnungWeiterNachHinten .uno:Backward +AendernAnordnungGanznachHinten .uno:SendToBack +AendernAnordnungVorDasObjekt .uno:BeforeObject +AendernAnordnungHinterDasObjekt .uno:BehindObject +AendernAnordnungVertauschen .uno:ReverseOrder +AendernVerteilen .uno:DistributeSelection +AendernAusrichtungLinks .uno:ObjectAlignLeft +AendernAusrichtungZentriert .uno:AlignCenter +AendernAusrichtungRechts .uno:ObjectAlignRight +AendernAusrichtungOben .uno:AlignUp +AendernAusrichtungMitte .uno:AlignMiddle +AendernAusrichtungUnten .uno:AlignDown +AendernObjektBenennen .uno:NameGroup +AendernFontWork .uno:FontWork +AendernPipette .uno:BmpMask +AendernGruppierung .uno:FormatGroup +AendernGruppierungAufheben .uno:FormatUngroup +AendernGruppierungBetreten .uno:EnterGroup +AendernGruppierungVerlassen .uno:LeaveGroup +AendernKombination .uno:Combine +AendernKombinationAufheben .uno:Dismantle +AendernVerbinden .uno:Connect +AendernAufbrechen .uno:Break +AendernShapeMerge .uno:Merge +AendernShapeSubstract .uno:Substract +AendernShapeIntersect .uno:Intersect diff --git a/testautomation/global/sid/bars.sid b/testautomation/global/sid/bars.sid index 328c308ffac7..5c879edac84b 100644 --- a/testautomation/global/sid/bars.sid +++ b/testautomation/global/sid/bars.sid @@ -12,20 +12,20 @@ ' ***** Standardbar ' ** ' ** f�r alle -FL_URL SID_OPENURL -FL_NeuLaden SID_RELOAD -FL_Bearbeiten SID_EDITDOC -FL_Speichern SID_SAVEDOC -FL_Verknuepfen SID_CREATELINK -FL_Drucken SID_PRINTDOCDIRECT -FL_Ausschneiden SID_CUT -FL_Kopieren SID_COPY -FL_Einsetzen SID_PASTE -FL_Undo SID_UNDO -FL_Redo SID_REDO -FL_Browser SID_BROWSER -FL_Navigator SID_NAVIGATOR -FL_Gestalter SID_STYLE_DESIGNER +FL_URL .uno:OpenUrl +FL_NeuLaden .uno:Reload +FL_Bearbeiten .uno:EditDoc +FL_Speichern .uno:Save +FL_Verknuepfen .uno:AddBookmark +FL_Drucken .uno:PrintDefault +FL_Ausschneiden .uno:Cut +FL_Kopieren .uno:Copy +FL_Einsetzen .uno:Paste +FL_Undo .uno:Undo +FL_Redo .uno:Redo +FL_Browser .uno:Beamer +FL_Navigator .uno:Navigator +FL_Gestalter .uno:DesignerDialog ' ******************************************************* ' @@ -34,10 +34,10 @@ FL_Gestalter SID_STYLE_DESIGNER ' ** f�r alle 'HL_URLName ofa:ComboBox:RID_SVXDLG_HYPERLINK:CB_NAME 'HL_URLListe ofa:ComboBox:RID_SVXDLG_HYPERLINK:CB_URL -HL_Frame HID_OFA_HYPERLINK_TARGET -HL_Link SID_HYPERLINK_SETLINK -HL_Bookmark SID_CREATELINK -HL_Suchen HID_OFA_HYPERLINK_SEARCH +HL_Frame SVX_HID_OFA_HYPERLINK_TARGET +HL_Link .uno:SetHyperlink +HL_Bookmark .uno:AddBookmark +HL_Suchen SVX_HID_OFA_HYPERLINK_SEARCH ' ******************************************************* ' @@ -45,161 +45,161 @@ HL_Suchen HID_OFA_HYPERLINK_SEARCH ' ** ' ** Datenbank-Beamer -OL_DB_Beamer_StandardFilter SID_FM_FILTERCRIT -OL_DB_Beamer_DatenInText SID_SBA_BRW_INSERT +OL_DB_Beamer_StandardFilter .uno:FilterCrit +OL_DB_Beamer_DatenInText .uno:SbaBrwInsert ' ** Form Toolbar -FM_FormFilter_Start SID_FM_FILTER_START -FM_FF_Navigator SID_FM_FILTER_NAVIGATOR -FM_FF_Execute SID_FM_FILTER_EXECUTE -FM_FF_Exit SID_FM_FILTER_EXIT -FM_Remove_Filter SID_FM_REMOVE_FILTER_SORT - -FM_No_Record SID_FM_RECORD_ABSOLUTE -FM_First_Record SID_FM_RECORD_FIRST -FM_Previous_Record SID_FM_RECORD_PREV -FM_Next_Record SID_FM_RECORD_NEXT -FM_Last_Record SID_FM_RECORD_LAST -FM_Save_Record SID_FM_RECORD_SAVE -'--10630: BUTTON: Allows you to undo a data entry. SID_FM_RECORD_UNDO -FM_New_Record SID_FM_RECORD_NEW -FM_Delete_Record SID_FM_RECORD_DELETE -'OB_DB_Beamer:Refresh SID_FM_REFRESH -FM_Search SID_FM_SEARCH -FM_Sort_Asc SID_FM_SORTUP -FM_Sort_Des SID_FM_SORTDOWN -FM_AutoFilter SID_FM_AUTOFILTER -'--10729: BUTTON: Prompts the database server to filter the visible data by specified criteria. SID_FM_FILTER_START -FM_Sort_Order SID_FM_ORDERCRIT -FM_View_As_Grid SID_FM_VIEW_AS_GRID -FM_Apply_Filter SID_FM_FORM_FILTERED +FM_FormFilter_Start .uno:FormFilter +FM_FF_Navigator .uno:FormFilterNavigator +FM_FF_Execute .uno:FormFilterExecute +FM_FF_Exit .uno:FormFilterExit +FM_Remove_Filter .uno:RemoveFilterSort + +FM_No_Record .uno:AbsoluteRecord +FM_First_Record .uno:FirstRecord +FM_Previous_Record .uno:PrevRecord +FM_Next_Record .uno:NextRecord +FM_Last_Record .uno:LastRecord +FM_Save_Record .uno:RecSave +'--10630: BUTTON: Allows you to undo a data entry. .uno:RecUndo +FM_New_Record .uno:NewRecord +FM_Delete_Record .uno:DeleteRecord +'OB_DB_Beamer:Refresh .uno:Refresh +FM_Search .uno:RecSearch +FM_Sort_Asc .uno:Sortup +FM_Sort_Des .uno:SortDown +FM_AutoFilter .uno:AutoFilter +'--10729: BUTTON: Prompts the database server to filter the visible data by specified criteria. .uno:FormFilter +FM_Sort_Order .uno:OrderCrit +FM_View_As_Grid .uno:ViewFormAsGrid +FM_Apply_Filter .uno:FormFiltered ' ** Writer ' - normal -OL_Writer_Schriftart SID_ATTR_CHAR_FONT -OL_Writer_Schriftgroesse SID_ATTR_CHAR_FONTHEIGHT -OL_Writer_Fett SID_ATTR_CHAR_WEIGHT -OL_Writer_Kursiv SID_ATTR_CHAR_POSTURE -OL_Writer_Unterstrichen SID_ATTR_CHAR_UNDERLINE -OL_Writer_Linksbuendig SID_ATTR_PARA_ADJUST_LEFT -OL_Writer_Zentriert SID_ATTR_PARA_ADJUST_CENTER -OL_Writer_Rechtsbuendig SID_ATTR_PARA_ADJUST_RIGHT -OL_Writer_Blocksatz SID_ATTR_PARA_ADJUST_BLOCK -OL_Writer_Numerierung FN_NUM_NUMBERING_ON -OL_Writer_Aufzaehlung FN_NUM_BULLET_ON -OL_Writer_EinzugVermindern SID_DEC_INDENT -OL_Writer_EinzugErhoehen SID_INC_INDENT -OL_Writer_Textfarbe SID_ATTR_CHAR_COLOR2 -OL_Writer_Zeichenhintergrund SID_ATTR_CHAR_COLOR_BACKGROUND -OL_Writer_Absatzhintergrund SID_BACKGROUND_COLOR +OL_Writer_Schriftart .uno:CharFontName +OL_Writer_Schriftgroesse .uno:FontHeight +OL_Writer_Fett .uno:Bold +OL_Writer_Kursiv .uno:Italic +OL_Writer_Unterstrichen .uno:Underline +OL_Writer_Linksbuendig .uno:LeftPara +OL_Writer_Zentriert .uno:CenterPara +OL_Writer_Rechtsbuendig .uno:RightPara +OL_Writer_Blocksatz .uno:JustifyPara +OL_Writer_Numerierung .uno:DefaultNumbering +OL_Writer_Aufzaehlung .uno:DefaultBullet +OL_Writer_EinzugVermindern .uno:DecrementIndent +OL_Writer_EinzugErhoehen .uno:IncrementIndent +OL_Writer_Textfarbe .uno:FontColor +OL_Writer_Zeichenhintergrund .uno:BackColor +OL_Writer_Absatzhintergrund .uno:BackgroundColor ' ** Writer ' - Tabelle -OL_Tabelle_SW_FormelEingeben FN_EDIT_FORMULA -OL_Tabelle_SW_TabellenmodeFix FN_TABLE_MODE_FIX -OL_Tabelle_SW_TabellenmodeProportional FN_TABLE_MODE_FIX_PROP -OL_Tabelle_SW_TabellenmodeVariabel FN_TABLE_MODE_VARIABLE -OL_Tabelle_SW_ZelleVerbinden FN_TABLE_MERGE_CELLS -OL_Tabelle_SW_ZelleTeilen FN_TABLE_SPLIT_CELLS -OL_Tabelle_SW_Optimieren FN_OPTIMIZE_TABLE -OL_Tabelle_SW_ZeileEinfuegen FN_TABLE_INSERT_ROW_DLG -OL_Tabelle_SW_SpalteEinfuegen FN_TABLE_INSERT_COL -OL_Tabelle_SW_ZeileLoeschen FN_TABLE_DELETE_ROW -OL_Tabelle_SW_SpalteLoeschen FN_TABLE_DELETE_COL -OL_Tabelle_SW_Umrandung SID_ATTR_BORDER -OL_Tabelle_SW_LinienStil SID_FRAME_LINESTYLE -OL_Tabelle_SW_Hintergrundfarbe SID_BACKGROUND_COLOR -OL_Tabelle_SW_ZeileAuswaehlen FN_TABLE_SELECT_ROW -OL_Tabelle_SW_SpalteAuswaehlen FN_TABLE_SELECT_COL -OL_Tabelle_SW_TabelleAuswaehlen FN_TABLE_SELECT_ALL +OL_Tabelle_SW_FormelEingeben .uno:InsertFormula +OL_Tabelle_SW_TabellenmodeFix .uno:TableModeFix +OL_Tabelle_SW_TabellenmodeProportional .uno:TableModeFixProp +OL_Tabelle_SW_TabellenmodeVariabel .uno:TableModeVariable +OL_Tabelle_SW_ZelleVerbinden .uno:MergeCells +OL_Tabelle_SW_ZelleTeilen .uno:SplitCell +OL_Tabelle_SW_Optimieren .uno:OptimizeTable +OL_Tabelle_SW_ZeileEinfuegen .uno:InsertRowDialog +OL_Tabelle_SW_SpalteEinfuegen .uno:InsertColumns +OL_Tabelle_SW_ZeileLoeschen .uno:DeleteRows +OL_Tabelle_SW_SpalteLoeschen .uno:DeleteColumns +OL_Tabelle_SW_Umrandung .uno:SetBorderStyle +OL_Tabelle_SW_LinienStil .uno:LineStyle +OL_Tabelle_SW_Hintergrundfarbe .uno:BackgroundColor +OL_Tabelle_SW_ZeileAuswaehlen .uno:EntireRow +OL_Tabelle_SW_SpalteAuswaehlen .uno:EntireColumn +OL_Tabelle_SW_TabelleAuswaehlen .uno:SelectTable ' ** Writer ' - Rahmen / Grafik / OLE-Objekte -OL_Objekt_SW_KeinUmlauf FN_FRAME_NOWRAP -OL_Objekt_SW_Umlauf FN_FRAME_WRAP -OL_Objekt_SW_Durchlauf FN_FRAME_WRAPTHRU -OL_Objekt_SW_Links FN_FRAME_ALIGN_HORZ_LEFT -OL_Objekt_SW_Zentriert FN_FRAME_ALIGN_HORZ_CENTER -OL_Objekt_SW_Rechts FN_FRAME_ALIGN_HORZ_RIGHT -OL_Objekt_SW_Oben FN_FRAME_ALIGN_VERT_TOP -OL_Objekt_SW_Mitte FN_FRAME_ALIGN_VERT_CENTER -OL_Objekt_SW_Unten FN_FRAME_ALIGN_VERT_BOTTOM -OL_Objekt_SW_Umrandung SID_ATTR_BORDER -OL_Objekt_SW_Linienstil SID_FRAME_LINESTYLE -OL_Objekt_SW_LinienFarbe SID_FRAME_LINECOLOR -OL_Objekt_SW_Hintergrundmuster SID_BACKGROUND_PATTERN -OL_Objekt_SW_Hintergrundfarbe SID_BACKGROUND_COLOR -OL_Objekt_SW_GanzNachVorn SID_FRAME_TO_TOP -OL_Objekt_SW_GanzNachHinten SID_FRAME_TO_BOTTOM -OL_Objekt_SW_Verankerungwechseln FN_TOOL_ANKER -OL_Objekt_SW_HorizontalSpiegeln FN_FLIP_HORZ_GRAFIC -OL_Objekt_SW_VertikalSpiegeln FN_FLIP_VERT_GRAFIC -OL_Objekt_SW_PositionUndGroesse SID_ATTR_TRANSFORM -OL_Objekt_SW_InDenVordergrund SID_OBJECT_HEAVEN -OL_Objekt_SW_InDenHintergrund SID_OBJECT_HELL -OL_Objekt_SW_EigenschaftenObjekt FN_FORMAT_FRAME_DLG -OL_Objekt_SW_EigenschaftenControls SID_SHOW_BROWSER +OL_Objekt_SW_KeinUmlauf .uno:WrapOff +OL_Objekt_SW_Umlauf .uno:WrapOn +OL_Objekt_SW_Durchlauf .uno:WrapThrough +OL_Objekt_SW_Links .uno:AlignLeft +OL_Objekt_SW_Zentriert .uno:AlignHorizontalCenter +OL_Objekt_SW_Rechts .uno:AlignRight +OL_Objekt_SW_Oben .uno:AlignTop +OL_Objekt_SW_Mitte .uno:AlignVerticalCenter +OL_Objekt_SW_Unten .uno:AlignBottom +OL_Objekt_SW_Umrandung .uno:SetBorderStyle +OL_Objekt_SW_Linienstil .uno:LineStyle +OL_Objekt_SW_LinienFarbe .uno:FrameLineColor +OL_Objekt_SW_Hintergrundmuster .uno:BackgroundPatternController +OL_Objekt_SW_Hintergrundfarbe .uno:BackgroundColor +OL_Objekt_SW_GanzNachVorn .uno:BringToFront +OL_Objekt_SW_GanzNachHinten .uno:SendToBack +OL_Objekt_SW_Verankerungwechseln .uno:ToggleAnchorType +OL_Objekt_SW_HorizontalSpiegeln .uno:FlipHorizontal +OL_Objekt_SW_VertikalSpiegeln .uno:FlipVertical +OL_Objekt_SW_PositionUndGroesse .uno:TransformDialog +OL_Objekt_SW_InDenVordergrund .uno:SetObjectToForeground +OL_Objekt_SW_InDenHintergrund .uno:SetObjectToBackground +OL_Objekt_SW_EigenschaftenObjekt .uno:FrameDialog +OL_Objekt_SW_EigenschaftenControls .uno:ShowBrowser ' ** Writer ' - Numerierung / Aufzaehlung -OL_Numerierung_NumerierungAusschalten FN_NUM_BULLET_OFF -OL_Numerierung_Hochstufen FN_NUM_BULLET_UP -OL_Numerierung_Hinunterstufen FN_NUM_BULLET_DOWN -OL_Numerierung_HochstufenMitUnterpunkten FN_NUM_BULLET_OUTLINE_UP -OL_Numerierung_HinunterstufenMitUnterpunkten FN_NUM_BULLET_OUTLINE_DOWN -OL_Numerierung_AbsatzOhnenNumerierung FN_NUM_BULLET_NONUM -OL_Numerierung_Hochschieben FN_NUM_BULLET_MOVEUP -OL_Numerierung_Hinunterschieben FN_NUM_BULLET_MOVEDOWN -OL_Numerierung_HochschiebenMitUnterpunkten FN_NUM_BULLET_OUTLINE_MOVEUP -OL_Numerierung_HinunterschiebenMitUnterpunkten FN_NUM_BULLET_OUTLINE_MOVEDOWN -OL_Numerierung_NumerierungNeuStarten FN_NUMBER_NEWSTART -OL_Numerierung_NumerierungAufzaehlung FN_NUMBER_BULLETS +OL_Numerierung_NumerierungAusschalten .uno:RemoveBullets +OL_Numerierung_Hochstufen .uno:IncrementLevel +OL_Numerierung_Hinunterstufen .uno:DecrementLevel +OL_Numerierung_HochstufenMitUnterpunkten .uno:IncrementSubLevels +OL_Numerierung_HinunterstufenMitUnterpunkten .uno:DecrementSubLevels +OL_Numerierung_AbsatzOhnenNumerierung .uno:InsertNeutralParagraph +OL_Numerierung_Hochschieben .uno:MoveUp +OL_Numerierung_Hinunterschieben .uno:MoveDown +OL_Numerierung_HochschiebenMitUnterpunkten .uno:MoveUpSubItems +OL_Numerierung_HinunterschiebenMitUnterpunkten .uno:MoveDownSubItems +OL_Numerierung_NumerierungNeuStarten .uno:NumberingStart +OL_Numerierung_NumerierungAufzaehlung .uno:BulletsAndNumberingDialog ' ** Calc ' - normal -OL_CALC_Schriftart SID_ATTR_CHAR_FONT -OL_CALC_Schriftgroesse SID_ATTR_CHAR_FONTHEIGHT -OL_CALC_Fett SID_ATTR_CHAR_WEIGHT -OL_CALC_Kursiv SID_ATTR_CHAR_POSTURE -OL_CALC_Unterstrichen SID_ATTR_CHAR_UNDERLINE -OL_CALC_Schriftfarbe SID_ATTR_CHAR_COLOR -OL_CALC_Linksbuendig SID_ATTR_PARA_ADJUST_LEFT -OL_CALC_Zentriert SID_ATTR_PARA_ADJUST_CENTER -OL_CALC_Rechtsbuendig SID_ATTR_PARA_ADJUST_RIGHT -OL_CALC_Waehrungsformat SID_NUMBER_CURRENCY -OL_CALC_Prozentformat SID_NUMBER_PERCENT -OL_CALC_StandardWaehrungformat SID_NUMBER_STANDARD -OL_CALC_DezimalstellenHinzufuegen SID_NUMBER_INCDEC -OL_CALC_DezimalstellenLoeschen SID_NUMBER_DECDEC -OL_CALC_EinzugVermindern SID_DEC_INDENT -OL_CALC_EinzugErhoehen SID_INC_INDENT -OL_CALC_Umrandung SID_ATTR_BORDER -OL_CALC_Hintergrundfarbe SID_BACKGROUND_COLOR -OL_CALC_VertikalOben SID_ALIGNTOP -OL_CALC_VertikalMitte SID_ALIGNCENTERVER -OL_CALC_VertikalUnten SID_ALIGNBOTTOM +OL_CALC_Schriftart .uno:CharFontName +OL_CALC_Schriftgroesse .uno:FontHeight +OL_CALC_Fett .uno:Bold +OL_CALC_Kursiv .uno:Italic +OL_CALC_Unterstrichen .uno:Underline +OL_CALC_Schriftfarbe .uno:Color +OL_CALC_Linksbuendig .uno:LeftPara +OL_CALC_Zentriert .uno:CenterPara +OL_CALC_Rechtsbuendig .uno:RightPara +OL_CALC_Waehrungsformat .uno:NumberFormatCurrency +OL_CALC_Prozentformat .uno:NumberFormatPercent +OL_CALC_StandardWaehrungformat .uno:NumberFormatStandard +OL_CALC_DezimalstellenHinzufuegen .uno:NumberFormatIncDecimals +OL_CALC_DezimalstellenLoeschen .uno:NumberFormatDecDecimals +OL_CALC_EinzugVermindern .uno:DecrementIndent +OL_CALC_EinzugErhoehen .uno:IncrementIndent +OL_CALC_Umrandung .uno:SetBorderStyle +OL_CALC_Hintergrundfarbe .uno:BackgroundColor +OL_CALC_VertikalOben .uno:AlignTop +OL_CALC_VertikalMitte .uno:AlignVCenter +OL_CALC_VertikalUnten .uno:AlignBottom ' ** Draw / Impress ' - normal OL_DRAW_Linie .uno:FormatLine -OL_DRAW_Linienendenstil SID_ATTR_LINEEND_STYLE -OL_DRAW_Linienstil SID_ATTR_LINE_STYLE -OL_DRAW_Linienbreite SID_ATTR_LINE_WIDTH -OL_DRAW_Linienfarbe SID_ATTR_LINE_COLOR +OL_DRAW_Linienendenstil .uno:LineEndStyle +OL_DRAW_Linienstil .uno:XLineStyle +OL_DRAW_Linienbreite .uno:LineWidth +OL_DRAW_Linienfarbe .uno:XLineColor OL_DRAW_Flaeche .uno:FormatArea -OL_DRAW_Flaechenstil SID_ATTR_FILL_STYLE -OL_DRAW_Flaechenfarbe SID_ATTR_FILL_STYLE +OL_DRAW_Flaechenstil .uno:FillStyle +OL_DRAW_Flaechenfarbe .uno:FillStyle OL_DRAW_Schatten .uno:FillShadow -OL_DRAW_Drehen SID_OBJECT_ROTATE -OL_DRAW_PunkteBearbeiten SID_BEZIER_EDIT -OL_DRAW_Ausrichtung SID_OBJECT_ALIGN -OL_DRAW_GanzNachVorn SID_FRAME_TO_TOP -OL_DRAW_GanzNachHinten SID_FRAME_TO_BOTTOM -OL_DRAW_InDenVordergrund SID_OBJECT_HEAVEN -OL_DRAW_InDenHintergrund SID_OBJECT_HELL -OL_DRAW_VorDasObjekt SID_BEFORE_OBJ -OL_DRAW_HinterDasObjekt SID_BEHIND_OBJ -OL_DRAW_VerankerungWechseln FN_TOOL_ANKER +OL_DRAW_Drehen .uno:ToggleObjectRotateMode +OL_DRAW_PunkteBearbeiten .uno:ToggleObjectBezierMode +OL_DRAW_Ausrichtung .uno:ObjectAlign +OL_DRAW_GanzNachVorn .uno:BringToFront +OL_DRAW_GanzNachHinten .uno:SendToBack +OL_DRAW_InDenVordergrund .uno:SetObjectToForeground +OL_DRAW_InDenHintergrund .uno:SetObjectToBackground +OL_DRAW_VorDasObjekt .uno:BeforeObject +OL_DRAW_HinterDasObjekt .uno:BehindObject +OL_DRAW_VerankerungWechseln .uno:ToggleAnchorType ' ** Draw / Impress ' - Diamode @@ -207,126 +207,126 @@ OL_DIA_Ueberblendeffekt .uno:DiaEffect OL_DIA_Geschwindigkeit .uno:DiaSpeed OL_DIA_Diawechsel .uno:DiaAuto OL_DIA_Zeit .uno:DiaTime -OL_DIA_PraesentationMitZeitnahme SID_REHEARSE_TIMINGS -OL_DIA_DiaAnzeigen SID_HIDE_SLIDE -OL_DIA_DiasProReihe SID_PAGES_PER_ROW +OL_DIA_PraesentationMitZeitnahme .uno:RehearseTimings +OL_DIA_DiaAnzeigen .uno:HideSlide +OL_DIA_DiasProReihe .uno:PagesPerRow ' ** Draw / Impress ' - Bezierleiste -OL_BEZIER_Verschieben SID_BEZIER_MOVE -OL_BEZIER_Einfuegen SID_BEZIER_INSERT -OL_BEZIER_Loeschen SID_BEZIER_DELETE -OL_BEZIER_Auftrennen SID_BEZIER_CUTLINE -OL_BEZIER_InKurve SID_BEZIER_CONVERT -OL_BEZIER_Ecke SID_BEZIER_EDGE -OL_BEZIER_Glatt SID_BEZIER_SMOOTH -OL_BEZIER_Symmetrisch SID_BEZIER_SYMMTR -OL_BEZIER_Schliessen SID_BEZIER_CLOSE -OL_BEZIER_PunkteReduzieren SID_BEZIER_ELIMINATE_POINTS +OL_BEZIER_Verschieben .uno:BezierMove +OL_BEZIER_Einfuegen .uno:BezierInsert +OL_BEZIER_Loeschen .uno:BezierDelete +OL_BEZIER_Auftrennen .uno:BezierCutLine +OL_BEZIER_InKurve .uno:BezierConvert +OL_BEZIER_Ecke .uno:BezierEdge +OL_BEZIER_Glatt .uno:BezierSmooth +OL_BEZIER_Symmetrisch .uno:BezierSymmetric +OL_BEZIER_Schliessen .uno:BezierClose +OL_BEZIER_PunkteReduzieren .uno:BezierEliminatePoints ' ** Draw / Impress ' - Klebepunte -OL_KLEBE_PunkteEinfuegen SID_GLUE_INSERT_POINT -OL_KLEBE_Links SID_GLUE_ESCDIR_LEFT -OL_KLEBE_Oben SID_GLUE_ESCDIR_TOP -OL_KLEBE_Rechts SID_GLUE_ESCDIR_RIGHT -OL_KLEBE_Unten SID_GLUE_ESCDIR_BOTTOM -OL_KLEBE_PositionAnObjektAnpassen SID_GLUE_PERCENT -OL_KLEBE_HorizontalLinks SID_GLUE_HORZALIGN_LEFT -OL_KLEBE_HorizontalZentriert SID_GLUE_HORZALIGN_CENTER -OL_KLEBE_HorizontalRechts SID_GLUE_HORZALIGN_RIGHT -OL_KLEBE_VertikalOben SID_GLUE_VERTALIGN_TOP -OL_KLEBE_VertikalZentriert SID_GLUE_VERTALIGN_CENTER -OL_KLEBE_VertikalUnten SID_GLUE_VERTALIGN_BOTTOM +OL_KLEBE_PunkteEinfuegen .uno:GlueInsertPoint +OL_KLEBE_Links .uno:GlueEscapeDirectionLeft +OL_KLEBE_Oben .uno:GlueEscapeDirectionTop +OL_KLEBE_Rechts .uno:GlueEscapeDirectionRight +OL_KLEBE_Unten .uno:GlueEscapeDirectionBottom +OL_KLEBE_PositionAnObjektAnpassen .uno:GluePercent +OL_KLEBE_HorizontalLinks .uno:GlueHorzAlignLeft +OL_KLEBE_HorizontalZentriert .uno:GlueHorzAlignCenter +OL_KLEBE_HorizontalRechts .uno:GlueHorzAlignRight +OL_KLEBE_VertikalOben .uno:GlueVertAlignTop +OL_KLEBE_VertikalZentriert .uno:GlueVertAlignCenter +OL_KLEBE_VertikalUnten .uno:GlueVertAlignBottom ' ** Frameset ' - normal -OL_FRAME_HTMLQuelltext SID_SOURCEVIEW +OL_FRAME_HTMLQuelltext .uno:SourceView ' ** Basicdokument ' - normal -OL_BASIC_Bibliothek SID_BASICIDE_LIBSELECTOR -OL_BASIC_Uebersetzen SID_BASICCOMPILE -OL_BASIC_Ausfuehren SID_BASICRUN -OL_BASIC_Anhalten SID_BASICSTOP -OL_BASIC_Prozedurschritt SID_BASICSTEPOVER -OL_BASIC_Einzelschritt SID_BASICSTEPINTO -OL_BASIC_Haltepunkt SID_BASICIDE_TOGGLEBRKPNT -OL_BASIC_BeobachterAnzeigen SID_BASICIDE_ADDWATCH -OL_BASIC_Objektkatalog SID_BASICIDE_OBJCAT -OL_BASIC_Makros SID_BASICIDE_CHOOSEMACRO -OL_BASIC_Module SID_BASICIDE_MODULEDLG -OL_BASIC_KlammerSuchen SID_BASICIDE_MATCHGROUP -OL_BASIC_Kontrollfelder SID_CHOOSE_CONTROLS -OL_BASIC_QuelltextEinfuegen SID_BASICLOAD -OL_BASIC_QuelltextSpeichern SID_BASICSAVEAS +OL_BASIC_Bibliothek .uno:LibSelector +OL_BASIC_Uebersetzen .uno:CompileBasic +OL_BASIC_Ausfuehren .uno:RunBasic +OL_BASIC_Anhalten .uno:BasicStop +OL_BASIC_Prozedurschritt .uno:BasicStepOver +OL_BASIC_Einzelschritt .uno:BasicStepInto +OL_BASIC_Haltepunkt .uno:ToggleBreakPoint +OL_BASIC_BeobachterAnzeigen .uno:AddWatch +OL_BASIC_Objektkatalog .uno:ObjectCatalog +OL_BASIC_Makros .uno:ChooseMacro +OL_BASIC_Module .uno:ModuleDialog +OL_BASIC_KlammerSuchen .uno:MatchGroup +OL_BASIC_Kontrollfelder .uno:ChooseControls +OL_BASIC_QuelltextEinfuegen .uno:LoadBasic +OL_BASIC_QuelltextSpeichern .uno:SaveBasicAs ' ** Allgemeine Objektleisten ' ' ** Seitenansicht ' - normal -OL_SEITENANSICHT_VorherigeSeite FN_PAGEUP -OL_SEITENANSICHT_NaechsteSeite FN_PAGEDOWN -OL_SEITENANSICHT_ErsteSeite FN_START_OF_DOCUMENT -OL_SEITENANSICHT_LetzteSeite FN_END_OF_DOCUMENT -OL_SEITENANSICHT_ZweiSeiten FN_SHOW_TWO_PAGES -OL_SEITENANSICHT_VierSeiten FN_SHOW_MULTIPLE_PAGES -OL_SEITENANSICHT_Massstab SID_ATTR_ZOOM -OL_SEITENANSICHT_GanzerBildschirm SID_WIN_FULLSCREEN -OL_SEITENANSICHT_DruckenSeitenansicht FN_PRINT_PAGEPREVIEW -OL_SEITENANSICHT_Schliessen SID_CLOSEWIN -OL_SEITENANSICHT_SeitenAnsichtSchliessen SID_CLOSEWIN -OL_SEITENANSICHT_Seitenlayout SID_FORMATPAGE -OL_SEITENANSICHT_MassstabVergroessern SID_PREVIEW_ZOOMIN -OL_SEITENANSICHT_MassstabVerkleinern SID_PREVIEW_ZOOMOUT -OL_SEITENANSICHT_NaechsteSeiteCalc SID_PREVIEW_NEXT -OL_SEITENANSICHT_VorherigeSeiteCalc SID_PREVIEW_PREVIOUS -OL_SEITENANSICHT_ErsteSeiteCalc SID_PREVIEW_FIRST -OL_SEITENANSICHT_LetzteSeiteCalc SID_PREVIEW_LAST +OL_SEITENANSICHT_VorherigeSeite .uno:PageUp +OL_SEITENANSICHT_NaechsteSeite .uno:PageDown +OL_SEITENANSICHT_ErsteSeite .uno:GoToStartOfDoc +OL_SEITENANSICHT_LetzteSeite .uno:GoToEndOfDoc +OL_SEITENANSICHT_ZweiSeiten .uno:ShowTwoPages +OL_SEITENANSICHT_VierSeiten .uno:ShowMultiplePages +OL_SEITENANSICHT_Massstab .uno:Zoom +OL_SEITENANSICHT_GanzerBildschirm .uno:FullScreen +OL_SEITENANSICHT_DruckenSeitenansicht .uno:PrintPagePreView +OL_SEITENANSICHT_Schliessen .uno:CloseWin +OL_SEITENANSICHT_SeitenAnsichtSchliessen .uno:CloseWin +OL_SEITENANSICHT_Seitenlayout .uno:PageFormatDialog +OL_SEITENANSICHT_MassstabVergroessern .uno:ZoomIn +OL_SEITENANSICHT_MassstabVerkleinern .uno:ZoomOut +OL_SEITENANSICHT_NaechsteSeiteCalc .uno:NextPage +OL_SEITENANSICHT_VorherigeSeiteCalc .uno:PreviousPage +OL_SEITENANSICHT_ErsteSeiteCalc .uno:FirstPage +OL_SEITENANSICHT_LetzteSeiteCalc .uno:LastPage ' ** Zeichenobjekt ' - Text -OL_ZO_Text_Schriftart SID_ATTR_CHAR_FONT -OL_ZO_Text_Schriftgroesse SID_ATTR_CHAR_FONTHEIGHT -OL_ZO_Text_Fett SID_ATTR_CHAR_WEIGHT -OL_ZO_Text_Kursiv SID_ATTR_CHAR_POSTURE -OL_ZO_Text_Unterstrichen SID_ATTR_CHAR_UNDERLINE -OL_ZO_Text_Linksbuendig SID_ATTR_PARA_ADJUST_LEFT -OL_ZO_Text_Zentriert SID_ATTR_PARA_ADJUST_CENTER -OL_ZO_Text_Schriftfarbe SID_ATTR_CHAR_COLOR -OL_ZO_Text_Einzeilig SID_ATTR_PARA_LINESPACE_10 -OL_ZO_Text_Eineinhalbzeilig SID_ATTR_PARA_LINESPACE_15 -OL_ZO_Text_Zweizeilig SID_ATTR_PARA_LINESPACE_20 -OL_ZO_Text_Hochstellen FN_SET_SUPER_SCRIPT -OL_ZO_Text_Tiefstellen FN_SET_SUB_SCRIPT -OL_ZO_Text_Zeichenformat SID_CHAR_DLG -OL_ZO_Text_Absatzformat SID_PARA_DLG -OL_ZO_Text_Hintergrundmuster SID_BACKGROUND_PATTERN -OL_ZO_Text_Hintergrundfarbe SID_BACKGROUND_COLOR -OL_ZO_Text_Aufzaehlungszeichen SID_OUTLINE_BULLET +OL_ZO_Text_Schriftart .uno:CharFontName +OL_ZO_Text_Schriftgroesse .uno:FontHeight +OL_ZO_Text_Fett .uno:Bold +OL_ZO_Text_Kursiv .uno:Italic +OL_ZO_Text_Unterstrichen .uno:Underline +OL_ZO_Text_Linksbuendig .uno:LeftPara +OL_ZO_Text_Zentriert .uno:CenterPara +OL_ZO_Text_Schriftfarbe .uno:Color +OL_ZO_Text_Einzeilig .uno:SpacePara1 +OL_ZO_Text_Eineinhalbzeilig .uno:SpacePara15 +OL_ZO_Text_Zweizeilig .uno:SpacePara2 +OL_ZO_Text_Hochstellen .uno:SuperScript +OL_ZO_Text_Tiefstellen .uno:SubScript +OL_ZO_Text_Zeichenformat .uno:FontDialog +OL_ZO_Text_Absatzformat .uno:ParagraphDialog +OL_ZO_Text_Hintergrundmuster .uno:BackgroundPatternController +OL_ZO_Text_Hintergrundfarbe .uno:BackgroundColor +OL_ZO_Text_Aufzaehlungszeichen .uno:OutlineBullet ' ** Zeichenobjekt ' - Flaeche OL_ZO_FLAECHE_Linie .uno:FormatLine -OL_ZO_FLAECHE_Linienendenstil SID_ATTR_LINEEND_STYLE -OL_ZO_FLAECHE_Linienstil SID_ATTR_LINE_STYLE -OL_ZO_FLAECHE_Linienbreite SID_ATTR_LINE_WIDTH -OL_ZO_FLAECHE_Linienfarbe SID_ATTR_LINE_COLOR -OL_ZO_FLAECHE_Flaeche SID_ATTRIBUTES_AREA -OL_ZO_FLAECHE_Flaechenstil SID_ATTR_FILL_STYLE -OL_ZO_FLAECHE_Flaechenfarbe SID_ATTR_FILL_STYLE +OL_ZO_FLAECHE_Linienendenstil .uno:LineEndStyle +OL_ZO_FLAECHE_Linienstil .uno:XLineStyle +OL_ZO_FLAECHE_Linienbreite .uno:LineWidth +OL_ZO_FLAECHE_Linienfarbe .uno:XLineColor +OL_ZO_FLAECHE_Flaeche .uno:FormatArea +OL_ZO_FLAECHE_Flaechenstil .uno:FillStyle +OL_ZO_FLAECHE_Flaechenfarbe .uno:FillStyle OL_ZO_FLAECHE_Schatten .uno:FillShadow -OL_ZO_FLAECHE_Animation SID_ANIMATION_OBJECTS +OL_ZO_FLAECHE_Animation .uno:AnimationObjects OL_ZO_FLAECHE_Effekt .uno:EffectWindow -OL_ZO_FLAECHE_Interaktion SID_ANIMATION_EFFECTS -OL_ZO_FLAECHE_Drehen SID_OBJECT_ROTATE -OL_ZO_FLAECHE_PunkteBearbeiten SID_BEZIER_EDIT -OL_ZO_FLAECHE_Ausrichtung SID_OBJECT_ALIGN -OL_ZO_FLAECHE_GanzNachVorn SID_FRAME_TO_TOP -OL_ZO_FLAECHE_GanzNachHinten SID_FRAME_TO_BOTTOM -OL_ZO_FLAECHE_InDenVordergrund SID_OBJECT_HEAVEN -OL_ZO_FLAECHE_InDenHintergrund SID_OBJECT_HELL -OL_ZO_FLAECHE_VerankerungWechseln FN_TOOL_ANKER +OL_ZO_FLAECHE_Interaktion .uno:AnimationEffects +OL_ZO_FLAECHE_Drehen .uno:ToggleObjectRotateMode +OL_ZO_FLAECHE_PunkteBearbeiten .uno:ToggleObjectBezierMode +OL_ZO_FLAECHE_Ausrichtung .uno:ObjectAlign +OL_ZO_FLAECHE_GanzNachVorn .uno:BringToFront +OL_ZO_FLAECHE_GanzNachHinten .uno:SendToBack +OL_ZO_FLAECHE_InDenVordergrund .uno:SetObjectToForeground +OL_ZO_FLAECHE_InDenHintergrund .uno:SetObjectToBackground +OL_ZO_FLAECHE_VerankerungWechseln .uno:ToggleAnchorType ' ******************************************************* ' @@ -334,412 +334,412 @@ OL_ZO_FLAECHE_VerankerungWechseln FN_TOOL_ANKER ' ' ** Writer ' - normal -WL_WRITER_Einfuegen FN_INSERT_CTRL -WL_WRITER_Feldbefehle FN_INSERT_FIELD_CTRL - WL_WRITER_Datum FN_INSERT_FLD_DATE - WL_WRITER_Uhrzeit FN_INSERT_FLD_TIME - WL_WRITER_Seitennummer FN_INSERT_FLD_PGNUMBER - WL_WRITER_Seitenanzahl FN_INSERT_FLD_PGCOUNT - WL_WRITER_Thema FN_INSERT_FLD_TOPIC - WL_WRITER_Titel FN_INSERT_FLD_TITLE - WL_WRITER_Autor FN_INSERT_FLD_AUTHOR - WL_WRITER_Andere FN_INSERT_FIELD -WL_WRITER_ObjektEinfuegen FN_INSERT_OBJ_CTRL -WL_WRITER_Zeichnen SID_INSERT_DRAW -WL_WRITER_Kontrollfelder SID_CHOOSE_CONTROLS -WL_WRITER_Formular SID_FM_CONFIG -WL_WRITER_AutoFormat SID_AUTOFORMAT -WL_WRITER_Autotext FN_GLOSSARY_DLG -WL_WRITER_AutomatischePruefung SID_AUTOSPELL_CHECK -WL_WRITER_SuchenUndErsetzen SID_SEARCH_DLG -WL_WRITER_SteuerzeichenEinAus FN_VIEW_META_CHARS -WL_WRITER_GrafikenAusschalten FN_VIEW_GRAPHIC -WL_WRITER_Hyperlink SID_HYPERLINK_INSERT -WL_WRITER_OnlineLayout SID_BROWSER_MODE -WL_WRITER_SchattencursorEinschalten FN_SHADOWCURSOR +WL_WRITER_Einfuegen .uno:InsertCtrl +WL_WRITER_Feldbefehle .uno:InsertFieldCtrl + WL_WRITER_Datum .uno:InsertDateField + WL_WRITER_Uhrzeit .uno:InsertTimeField + WL_WRITER_Seitennummer .uno:InsertPageNumberField + WL_WRITER_Seitenanzahl .uno:InsertPageCountField + WL_WRITER_Thema .uno:InsertTopicField + WL_WRITER_Titel .uno:InsertTitleField + WL_WRITER_Autor .uno:InsertAuthorField + WL_WRITER_Andere .uno:InsertField +WL_WRITER_ObjektEinfuegen .uno:InsertObjCtrl +WL_WRITER_Zeichnen .uno:InsertDraw +WL_WRITER_Kontrollfelder .uno:ChooseControls +WL_WRITER_Formular .uno:Config +WL_WRITER_AutoFormat .uno:AutoFormat +WL_WRITER_Autotext .uno:EditGlossary +WL_WRITER_AutomatischePruefung .uno:SpellOnline +WL_WRITER_SuchenUndErsetzen .uno:SearchDialog +WL_WRITER_SteuerzeichenEinAus .uno:ControlCodes +WL_WRITER_GrafikenAusschalten .uno:Graphic +WL_WRITER_Hyperlink .uno:InsertHyperlink +WL_WRITER_OnlineLayout .uno:BrowseView +WL_WRITER_SchattencursorEinschalten .uno:ShadowCursor ' ** Calc ' - normal -WL_CALC_Einfuegen SID_TBXCTL_INSERT -WL_CALC_ZellenEinfuegen SID_TBXCTL_INSCELLS -WL_CALC_ObjektEinfuegen FN_INSERT_OBJ_CTRL -WL_CALC_Zeichnen SID_INSERT_DRAW -WL_CALC_Kontrollfelder SID_CHOOSE_CONTROLS -WL_CALC_Autoformat SID_AUTOFORMAT -WL_CALC_AutomatischeRechtschreibung SID_AUTOSPELL_CHECK -WL_CALC_SuchenUndErsetzen SID_SEARCH_DLG -WL_CALC_AutoFilter SID_AUTO_FILTER -WL_CALC_SortierenAuf SID_SORT_ASCENDING -WL_CALC_SortierenAb SID_SORT_DESCENDING -WL_CALC_Gruppierung SID_OUTLINE_MAKE -WL_CALC_GruppierungAufheben SID_OUTLINE_REMOVE +WL_CALC_Einfuegen .uno:InsertCtrl +WL_CALC_ZellenEinfuegen .uno:InsCellsCtrl +WL_CALC_ObjektEinfuegen .uno:InsertObjCtrl +WL_CALC_Zeichnen .uno:InsertDraw +WL_CALC_Kontrollfelder .uno:ChooseControls +WL_CALC_Autoformat .uno:AutoFormat +WL_CALC_AutomatischeRechtschreibung .uno:SpellOnline +WL_CALC_SuchenUndErsetzen .uno:SearchDialog +WL_CALC_AutoFilter .uno:DataFilterAutoFilter +WL_CALC_SortierenAuf .uno:SortAscending +WL_CALC_SortierenAb .uno:SortDescending +WL_CALC_Gruppierung .uno:Group +WL_CALC_GruppierungAufheben .uno:Ungroup ' ** Draw / Impress ' - normal -WL_DRAW_Auswahl SID_OBJECT_SELECT -WL_DRAW_Zoom SID_ZOOM_TOOLBOX -WL_DRAW_Grafikeffekte SID_OBJECT_CHOOSE_MODE -WL_DRAW_Anordnung SID_POSITION -WL_DRAW_TextBoxen SID_DRAWTBX_TEXT -WL_DRAW_Rechteck SID_DRAW_RECT -WL_DRAW_Ellipsen SID_DRAWTBX_ELLIPSES -WL_DRAW_Kurven SID_DRAWTBX_LINES -WL_DRAW_Linien SID_DRAWTBX_ARROWS -WL_DRAW_3DObjekte SID_DRAWTBX_3D_OBJECTS -WL_DRAW_Verbinder SID_DRAWTBX_CONNECTORS -WL_DRAW_Einfuegen SID_DRAWTBX_INSERT -WL_DRAW_Kontrollfelder SID_CHOOSE_CONTROLS -WL_DRAW_Praesentation SID_PRESENTATION +WL_DRAW_Auswahl .uno:SelectObject +WL_DRAW_Zoom .uno:ZoomToolBox +WL_DRAW_Grafikeffekte .uno:AdvancedMode +WL_DRAW_Anordnung .uno:ObjectPosition +WL_DRAW_TextBoxen .uno:TextToolbox +WL_DRAW_Rechteck .uno:Rect +WL_DRAW_Ellipsen .uno:EllipseToolbox +WL_DRAW_Kurven .uno:LineToolbox +WL_DRAW_Linien .uno:ArrowsToolbox +WL_DRAW_3DObjekte .uno:Objects3DToolbox +WL_DRAW_Verbinder .uno:ConnectorToolbox +WL_DRAW_Einfuegen .uno:InsertToolbox +WL_DRAW_Kontrollfelder .uno:ChooseControls +WL_DRAW_Praesentation .uno:Presentation WL_DRAW_Effekt .uno:EffectWindow -WL_DRAW_Interaktion SID_ANIMATION_OBJECTS -WL_DRAW_3DEffekt SID_3D_WIN +WL_DRAW_Interaktion .uno:AnimationObjects +WL_DRAW_3DEffekt .uno:Window3D ' ** Draw / Impress ' - Gliederungsansicht -WL_GL_DRAW_Zoom SID_ZOOM_TOOLBOX -WL_GL_DRAW_Hinunterstufen SID_OUTLINE_RIGHT -WL_GL_DRAW_Hochstufen SID_OUTLINE_LEFT -WL_GL_DRAW_Hochschieben SID_OUTLINE_UP -WL_GL_DRAW_Hinunterschieben SID_OUTLINE_DOWN -WL_GL_DRAW_NurErsteEbene SID_OUTLINE_COLLAPSE_ALL -WL_GL_DRAW_AlleEbenen SID_OUTLINE_EXPAND_ALL -WL_GL_DRAW_UnterpunkteAusblenden SID_OUTLINE_COLLAPSE -WL_GL_DRAW_UnterpunkteAnzeigen SID_OUTLINE_EXPAND -WL_GL_DRAW_FormatierungEinAus SID_OUTLINE_FORMAT -WL_GL_DRAW_SchwarzweisDarstellung SID_COLORVIEW -WL_GL_DRAW_Praesentation SID_PRESENTATION +WL_GL_DRAW_Zoom .uno:ZoomToolBox +WL_GL_DRAW_Hinunterstufen .uno:OutlineRight +WL_GL_DRAW_Hochstufen .uno:OutlineLeft +WL_GL_DRAW_Hochschieben .uno:OutlineUp +WL_GL_DRAW_Hinunterschieben .uno:OutlineDown +WL_GL_DRAW_NurErsteEbene .uno:OutlineCollapseAll +WL_GL_DRAW_AlleEbenen .uno:OutlineExpandAll +WL_GL_DRAW_UnterpunkteAusblenden .uno:OutlineCollapse +WL_GL_DRAW_UnterpunkteAnzeigen .uno:OutlineExpand +WL_GL_DRAW_FormatierungEinAus .uno:OutlineFormat +WL_GL_DRAW_SchwarzweisDarstellung .uno:ColorView +WL_GL_DRAW_Praesentation .uno:Presentation ' ** Draw / Impress ' - Diamodus -WL_DIA_Zoom SID_ZOOM_TOOLBOX -WL_DIA_Praesentation SID_PRESENTATION +WL_DIA_Zoom .uno:ZoomToolBox +WL_DIA_Praesentation .uno:Presentation ' ** HTML-Dokument ' - normal -WL_WEB_Einfuegen FN_INSERT_CTRL -WL_WEB_Feldbefehle FN_INSERT_FIELD_CTRL - WL_WEB_Datum FN_INSERT_FLD_DATE - WL_WEB_Uhrzeit FN_INSERT_FLD_TIME - WL_WEB_Seitennummer FN_INSERT_FLD_PGNUMBER - WL_WEB_Seitenanzahl FN_INSERT_FLD_PGCOUNT - WL_WEB_Thema FN_INSERT_FLD_TOPIC - WL_WEB_Titel FN_INSERT_FLD_TITLE +WL_WEB_Einfuegen .uno:InsertCtrl +WL_WEB_Feldbefehle .uno:InsertFieldCtrl + WL_WEB_Datum .uno:InsertDateField + WL_WEB_Uhrzeit .uno:InsertTimeField + WL_WEB_Seitennummer .uno:InsertPageNumberField + WL_WEB_Seitenanzahl .uno:InsertPageCountField + WL_WEB_Thema .uno:InsertTopicField + WL_WEB_Titel .uno:InsertTitleField 'WL_Web_Kopfzeile FN_INSERT_HEADER 'WL_Web_Fusszeile FN_INSERT_FOOTER -WL_WEB_Lauftext SID_DRAW_TEXT_MARQUEE -WL_WEB_Kontrollfelder SID_CHOOSE_CONTROLS -WL_WEB_SuchenUndErsetzen SID_SEARCH_DLG -WL_WEB_SteuerzeichenEinAus FN_VIEW_META_CHARS -WL_WEB_GrafikenAusschalten FN_VIEW_GRAPHIC -WL_WEB_Hyperlink SID_HYPERLINK_INSERT -WL_WEB_OnlineLayout SID_BROWSER_MODE -WL_WEB_SchattencursorEinschalten FN_SHADOWCURSOR -WL_WEB_DruckLayout FN_PRINT_LAYOUT -WL_WEB_HTMLQuelltextWeb SID_SOURCEVIEW +WL_WEB_Lauftext .uno:Text_Marquee +WL_WEB_Kontrollfelder .uno:ChooseControls +WL_WEB_SuchenUndErsetzen .uno:SearchDialog +WL_WEB_SteuerzeichenEinAus .uno:ControlCodes +WL_WEB_GrafikenAusschalten .uno:Graphic +WL_WEB_Hyperlink .uno:InsertHyperlink +WL_WEB_OnlineLayout .uno:BrowseView +WL_WEB_SchattencursorEinschalten .uno:ShadowCursor +WL_WEB_DruckLayout .uno:PrintLayout +WL_WEB_HTMLQuelltextWeb .uno:SourceView ' ** Math ' - Normal -WL_MATH_Vergroessern SID_ZOOMIN -WL_MATH_Verkleinern SID_ZOOMOUT -WL_MATH_ZoomHundertProzent SID_VIEW100 -WL_MATH_GanzeFormel SID_ADJUST -WL_MATH_FormelAktualisieren SID_DRAW -WL_MATH_FormelSymbole SID_SYMBOLS_CATALOGUE +WL_MATH_Vergroessern .uno:ZoomIn +WL_MATH_Verkleinern .uno:ZoomOut +WL_MATH_ZoomHundertProzent .uno:View100 +WL_MATH_GanzeFormel .uno:Adjust +WL_MATH_FormelAktualisieren .uno:Draw +WL_MATH_FormelSymbole .uno:SymbolCatalogue ' ******************************************************* ' ' ***** Rechenleisten ' ' ** Calc -RL_CALC_Bereich HID_INSWIN_POS -RL_CALC_Funktionsautopilot HID_INSWIN_CALC -RL_CALC_Summe HID_INSWIN_SUMME -RL_CALC_Funktion HID_INSWIN_FUNC -RL_CALC_Eingabefeld HID_INSWIN_INPUT -RL_CALC_Verwerfen HID_INSWIN_CANCEL -RL_CALC_Uebernehmen HID_INSWIN_OK +RL_CALC_Bereich SC_HID_INSWIN_POS +RL_CALC_Funktionsautopilot SC_HID_INSWIN_CALC +RL_CALC_Summe SC_HID_INSWIN_SUMME +RL_CALC_Funktion SC_HID_INSWIN_FUNC +RL_CALC_Eingabefeld SC_HID_INSWIN_INPUT +RL_CALC_Verwerfen SC_HID_INSWIN_CANCEL +RL_CALC_Uebernehmen SC_HID_INSWIN_OK ' ' ** Writer -RL_WRITER_Formel FN_FORMULA_CALC -RL_WRITER_VerwerfenWriter FN_FORMULA_CANCEL -RL_WRITER_UebernehmenWriter FN_FORMULA_APPLY -RL_WRITER_EingabefeldWriter HID_EDIT_FORMULA -RL_WRITER_SummeWriter HID_MN_CALC_SUM -RL_WRITER_Runden HID_MN_CALC_ROUND -RL_WRITER_Prozent HID_MN_CALC_PHD -RL_WRITER_Wurzel HID_MN_CALC_SQRT -RL_WRITER_Potenziere HID_MN_CALC_POW -RL_WRITER_OperatorenListentrenner HID_MN_CALC_LISTSEP -RL_WRITER_OperatorenGleich HID_MN_CALC_EQ -RL_WRITER_OperatorenNichtGleich HID_MN_CALC_NEQ -RL_WRITER_OperatorenKleinerGleich HID_MN_CALC_LEQ -RL_WRITER_OperatorenGroesserGleich HID_MN_CALC_GEQ -RL_WRITER_OperatorenKleiner HID_MN_CALC_LES -RL_WRITER_OperatorenGroesser HID_MN_CALC_GRE -RL_WRITER_OperatorenOder HID_MN_CALC_OR -RL_WRITER_OperatorenExklusivesOder HID_MN_CALC_XOR -RL_WRITER_OperatorenUnd HID_MN_CALC_AND -RL_WRITER_OperatorenNicht HID_MN_CALC_NOT -RL_WRITER_Mittelwert HID_MN_CALC_MEAN -RL_WRITER_Minimalwert HID_MN_CALC_MIN -RL_WRITER_Maximalwert HID_MN_CALC_MAX -RL_WRITER_Sinus HID_MN_CALC_SIN -RL_WRITER_Cosinus HID_MN_CALC_COS -RL_WRITER_Tangens HID_MN_CALC_TAN -RL_WRITER_Arcussinus HID_MN_CALC_ASIN -RL_WRITER_Arcuscosinus HID_MN_CALC_ACOS -RL_WRITER_Arcustangens HID_MN_CALC_ATAN +RL_WRITER_Formel SW_HID_TBX_FORMULA_CALC +RL_WRITER_VerwerfenWriter SW_HID_TBX_FORMULA_CANCEL +RL_WRITER_UebernehmenWriter SW_HID_TBX_FORMULA_APPLY +RL_WRITER_EingabefeldWriter SW_HID_EDIT_FORMULA +RL_WRITER_SummeWriter SW_HID_MN_CALC_SUM +RL_WRITER_Runden SW_HID_MN_CALC_ROUND +RL_WRITER_Prozent SW_HID_MN_CALC_PHD +RL_WRITER_Wurzel SW_HID_MN_CALC_SQRT +RL_WRITER_Potenziere SW_HID_MN_CALC_POW +RL_WRITER_OperatorenListentrenner SW_HID_MN_CALC_LISTSEP +RL_WRITER_OperatorenGleich SW_HID_MN_CALC_EQ +RL_WRITER_OperatorenNichtGleich SW_HID_MN_CALC_NEQ +RL_WRITER_OperatorenKleinerGleich SW_HID_MN_CALC_LEQ +RL_WRITER_OperatorenGroesserGleich SW_HID_MN_CALC_GEQ +RL_WRITER_OperatorenKleiner SW_HID_MN_CALC_LES +RL_WRITER_OperatorenGroesser SW_HID_MN_CALC_GRE +RL_WRITER_OperatorenOder SW_HID_MN_CALC_OR +RL_WRITER_OperatorenExklusivesOder SW_HID_MN_CALC_XOR +RL_WRITER_OperatorenUnd SW_HID_MN_CALC_AND +RL_WRITER_OperatorenNicht SW_HID_MN_CALC_NOT +RL_WRITER_Mittelwert SW_HID_MN_CALC_MEAN +RL_WRITER_Minimalwert SW_HID_MN_CALC_MIN +RL_WRITER_Maximalwert SW_HID_MN_CALC_MAX +RL_WRITER_Sinus SW_HID_MN_CALC_SIN +RL_WRITER_Cosinus SW_HID_MN_CALC_COS +RL_WRITER_Tangens SW_HID_MN_CALC_TAN +RL_WRITER_Arcussinus SW_HID_MN_CALC_ASIN +RL_WRITER_Arcuscosinus SW_HID_MN_CALC_ACOS +RL_WRITER_Arcustangens SW_HID_MN_CALC_ATAN ' ******************************************************* ' ' ***** Toolboxen ' ** ' ** Einfuegen Writer -WL_TB_SW_EINFUEGEN_Rahmen FN_INSERT_FRAME_INTERACT -WL_TB_SW_EINFUEGEN_Grafik SID_INSERT_GRAPHIC -WL_TB_SW_EINFUEGEN_Tabelle FN_INSERT_TABLE -WL_TB_SW_EINFUEGEN_TextEinfuegen SID_INSERTDOC -WL_TB_SW_EINFUEGEN_Fussnote FN_INSERT_FOOTNOTE +WL_TB_SW_EINFUEGEN_Rahmen .uno:InsertFrameInteract +WL_TB_SW_EINFUEGEN_Grafik .uno:InsertGraphic +WL_TB_SW_EINFUEGEN_Tabelle .uno:InsertTable +WL_TB_SW_EINFUEGEN_TextEinfuegen .uno:InsertDoc +WL_TB_SW_EINFUEGEN_Fussnote .uno:InsertFootnote WL_TB_SW_EINFUEGEN_Sonderzeichen FN_INSERT_SYMBOL -WL_TB_SW_EINFUEGEN_SpaltenAnzahl FN_INSERT_FRAME_INTERACT_NOCOL -WL_TB_SW_EINFUEGEN_MehrspaltigenRahmen FN_INSERT_FRAME -WL_TB_SW_EINFUEGEN_Verzeichnis FN_INSERT_IDX_ENTRY_DLG -WL_TB_SW_EINFUEGEN_TextMarke FN_INSERT_BOOKMARK +WL_TB_SW_EINFUEGEN_SpaltenAnzahl .uno:InsertFrameInteractNoColumns +WL_TB_SW_EINFUEGEN_MehrspaltigenRahmen .uno:InsertFrame +WL_TB_SW_EINFUEGEN_Verzeichnis .uno:InsertIndexesEntry +WL_TB_SW_EINFUEGEN_TextMarke .uno:InsertBookmark ' ** ' ** Einfuegen-Objekt Writer -WL_TB_SW_Objekt_Diagramm SID_INSERT_DIAGRAM -WL_TB_SW_Objekt_FormelEinfuegen FN_INSERT_SMA -WL_TB_SW_Objekt_Rahmenfenster SID_INSERT_FLOATINGFRAME -WL_TB_SW_Objekt_Objekt FN_INSERT_OBJECT_DLG +WL_TB_SW_Objekt_Diagramm .uno:InsertObjectChart +WL_TB_SW_Objekt_FormelEinfuegen .uno:InsertObjectStarMath +WL_TB_SW_Objekt_Rahmenfenster .uno:InsertObjectFloatingFrame +WL_TB_SW_Objekt_Objekt .uno:InsertObjectDialog ' ** ' ** Zeichenfunktionen -WL_TB_ZF_Auswahl SID_OBJECT_SELECT -WL_TB_ZF_Linie SID_DRAW_LINE -WL_TB_ZF_Rechteck SID_DRAW_RECT -WL_TB_ZF_Ellipse SID_DRAW_ELLIPSE -WL_TB_ZF_Polygon SID_DRAW_POLYGON_NOFILL -WL_TB_ZF_Bezier SID_DRAW_BEZIER_NOFILL -WL_TB_ZF_Freihand SID_DRAW_FREELINE_NOFILL -WL_TB_ZF_Kreisbogen SID_DRAW_ARC -WL_TB_ZF_Kreissektor SID_DRAW_PIE -WL_TB_ZF_Kreissegment SID_DRAW_CIRCLECUT -WL_TB_ZF_Textobjekt SID_DRAW_TEXT -WL_TB_ZF_Lauftext SID_DRAW_TEXT_MARQUEE -WL_TB_ZF_Legende SID_DRAW_CAPTION +WL_TB_ZF_Auswahl .uno:SelectObject +WL_TB_ZF_Linie .uno:Line +WL_TB_ZF_Rechteck .uno:Rect +WL_TB_ZF_Ellipse .uno:Ellipse +WL_TB_ZF_Polygon .uno:Polygon_Unfilled +WL_TB_ZF_Bezier .uno:Bezier_Unfilled +WL_TB_ZF_Freihand .uno:Freeline_Unfilled +WL_TB_ZF_Kreisbogen .uno:Arc +WL_TB_ZF_Kreissektor .uno:Pie +WL_TB_ZF_Kreissegment .uno:CircleCut +WL_TB_ZF_Textobjekt .uno:DrawText +WL_TB_ZF_Lauftext .uno:Text_Marquee +WL_TB_ZF_Legende .uno:DrawCaption ' ** ' ** Kontrollfelder -WL_TB_CONTROLS_CommandButton SID_INSERT_PUSHBUTTON -WL_TB_CONTROLS_SpinButton SID_INSERT_SPINBUTTON -WL_TB_CONTROLS_CheckBox SID_INSERT_CHECKBOX -WL_TB_CONTROLS_OptionButton SID_INSERT_RADIOBUTTON -WL_TB_CONTROLS_Label SID_INSERT_FIXEDTEXT -WL_TB_CONTROLS_TextFeld SID_INSERT_EDIT -WL_TB_CONTROLS_ListBox SID_INSERT_LISTBOX -WL_TB_CONTROLS_ComboBox SID_INSERT_COMBOBOX -WL_TB_CONTROLS_HScrollBar SID_INSERT_HSCROLLBAR -WL_TB_CONTROLS_VScrollBar SID_INSERT_VSCROLLBAR -WL_TB_CONTROLS_FrameControl SID_INSERT_GROUPBOX -WL_TB_CONTROLS_Preview SID_INSERT_PREVIEW -WL_TB_CONTROLS_URLButton SID_INSERT_URLBUTTON -WL_TB_CONTROLS_Selektieren SID_OBJECT_SELECT -WL_TB_CONTROLS_KontrollfeldEigenschaften SID_SHOW_BROWSER -WL_TB_CONTROLS_Testmodus SID_DIALOG_TESTMODE +WL_TB_CONTROLS_CommandButton .uno:InsertPushbutton +WL_TB_CONTROLS_SpinButton .uno:Spinbutton +WL_TB_CONTROLS_CheckBox .uno:Checkbox +WL_TB_CONTROLS_OptionButton .uno:Radiobutton +WL_TB_CONTROLS_Label .uno:InsertFixedText +WL_TB_CONTROLS_TextFeld .uno:InsertEdit +WL_TB_CONTROLS_ListBox .uno:InsertListbox +WL_TB_CONTROLS_ComboBox .uno:Combobox +WL_TB_CONTROLS_HScrollBar .uno:HScrollbar +WL_TB_CONTROLS_VScrollBar .uno:VScrollbar +WL_TB_CONTROLS_FrameControl .uno:Groupbox +WL_TB_CONTROLS_Preview .uno:Preview +WL_TB_CONTROLS_URLButton .uno:URLButton +WL_TB_CONTROLS_Selektieren .uno:SelectObject +WL_TB_CONTROLS_KontrollfeldEigenschaften .uno:ShowBrowser +WL_TB_CONTROLS_Testmodus .uno:TestMode ' ** ' ** Zoomen im Draw -WL_SD_Groesser SID_ZOOM_OUT -WL_SD_Kleiner SID_ZOOM_IN -WL_SD_VerschiebenZoom SID_ZOOM_PANNING -WL_SD_VorherigeDarstellung SID_ZOOM_PREV -WL_SD_NaechsteDarstellung SID_ZOOM_NEXT -WL_SD_EinsZuEins SID_SIZE_REAL -WL_SD_GanzeSeite SID_SIZE_PAGE -WL_SD_Seitenbreite SID_SIZE_PAGE_WIDTH -WL_SD_Optimal SID_SIZE_ALL -WL_SD_Objektzoom SID_SIZE_OPTIMAL +WL_SD_Groesser .uno:ZoomPlus +WL_SD_Kleiner .uno:ZoomMinus +WL_SD_VerschiebenZoom .uno:ZoomPanning +WL_SD_VorherigeDarstellung .uno:ZoomPrevious +WL_SD_NaechsteDarstellung .uno:ZoomNext +WL_SD_EinsZuEins .uno:Zoom100Percent +WL_SD_GanzeSeite .uno:ZoomPage +WL_SD_Seitenbreite .uno:ZoomPageWidth +WL_SD_Optimal .uno:ZoomOptimal +WL_SD_Objektzoom .uno:ZoomObjects ' ** ' ** Anordnung im Draw -WL_TB_ANORDNUNG_WeiterNachVorn SID_MOREFRONT -WL_TB_ANORDNUNG_WeiterNachHinten SID_MOREBACK -WL_TB_ANORDNUNG_VorDasObjekt SID_BEFORE_OBJ -WL_TB_ANORDNUNG_HinterDasObjekt SID_BEHIND_OBJ -WL_TB_ANORDNUNG_Vertauschen SID_REVERSE_ORDER +WL_TB_ANORDNUNG_WeiterNachVorn .uno:Forward +WL_TB_ANORDNUNG_WeiterNachHinten .uno:Backward +WL_TB_ANORDNUNG_VorDasObjekt .uno:BeforeObject +WL_TB_ANORDNUNG_HinterDasObjekt .uno:BehindObject +WL_TB_ANORDNUNG_Vertauschen .uno:ReverseOrder ' ** ' ** Ausrichtung im Draw -WL_TB_AUSRICHTUNG_Links SID_OBJECT_ALIGN_LEFT -WL_TB_AUSRICHTUNG_Rechts SID_OBJECT_ALIGN_RIGHT -WL_TB_AUSRICHTUNG_Oben SID_OBJECT_ALIGN_UP -WL_TB_AUSRICHTUNG_Mitte SID_OBJECT_ALIGN_MIDDLE -WL_TB_AUSRICHTUNG_Unten SID_OBJECT_ALIGN_DOWN -WL_TB_AUSRICHTUNG_Zentriert SID_OBJECT_ALIGN_CENTER +WL_TB_AUSRICHTUNG_Links .uno:ObjectAlignLeft +WL_TB_AUSRICHTUNG_Rechts .uno:ObjectAlignRight +WL_TB_AUSRICHTUNG_Oben .uno:AlignUp +WL_TB_AUSRICHTUNG_Mitte .uno:AlignMiddle +WL_TB_AUSRICHTUNG_Unten .uno:AlignDown +WL_TB_AUSRICHTUNG_Zentriert .uno:AlignCenter ' ** ' ** Effekte im Draw -WL_TB_SD_EFFEKTE_Spiegeln SID_OBJECT_MIRROR -WL_TB_SD_EFFEKTE_Verzerren SID_OBJECT_SHEAR -WL_TB_SD_EFFEKTE_Rotationskoerper SID_CONVERT_TO_3D_LATHE -WL_TB_SD_EFFEKTE_KlebepunkteBearbeiten SID_GLUE_EDITMODE -WL_TB_SD_EFFEKTE_SetzenAufKreisPerspektivisch SID_OBJECT_CROOK_ROTATE -WL_TB_SD_EFFEKTE_SetzenAufKreisSchraeggestellt SID_OBJECT_CROOK_SLANT +WL_TB_SD_EFFEKTE_Spiegeln .uno:Mirror +WL_TB_SD_EFFEKTE_Verzerren .uno:Shear +WL_TB_SD_EFFEKTE_Rotationskoerper .uno:ConvertInto3DLathe +WL_TB_SD_EFFEKTE_KlebepunkteBearbeiten .uno:GlueEditMode +WL_TB_SD_EFFEKTE_SetzenAufKreisPerspektivisch .uno:CrookRotate +WL_TB_SD_EFFEKTE_SetzenAufKreisSchraeggestellt .uno:CrookSlant ' ** ' ** Ellipsen im Draw -WL_SD_Ellipsen SID_DRAW_ELLIPSE -WL_SD_EllipseVoll SID_DRAW_ELLIPSE -WL_SD_EllipseLeer SID_DRAW_ELLIPSE_NOFILL -WL_SD_KreisVoll SID_DRAW_CIRCLE -WL_SD_KreisLeer SID_DRAW_CIRCLE_NOFILL -WL_SD_EllipsensegmentVoll SID_DRAW_PIE -WL_SD_EllipsensegmentLeer SID_DRAW_PIE_NOFILL -WL_SD_KreissegmentVoll SID_DRAW_CIRCLEPIE -WL_SD_KreissegmentLeer SID_DRAW_CIRCLEPIE_NOFILL -WL_SD_EllipsenabschnittVoll SID_DRAW_ELLIPSECUT -WL_SD_EllipsenabschnittLeer SID_DRAW_ELLIPSECUT_NOFILL -WL_SD_KreisabschnittVoll SID_DRAW_CIRCLECUT -WL_SD_KreisabschnittLeer SID_DRAW_CIRCLECUT_NOFILL -WL_SD_Kreisbogen SID_DRAW_CIRCLEARC +WL_SD_Ellipsen .uno:Ellipse +WL_SD_EllipseVoll .uno:Ellipse +WL_SD_EllipseLeer .uno:Ellipse_Unfilled +WL_SD_KreisVoll .uno:Circle +WL_SD_KreisLeer .uno:Circle_Unfilled +WL_SD_EllipsensegmentVoll .uno:Pie +WL_SD_EllipsensegmentLeer .uno:Pie_Unfilled +WL_SD_KreissegmentVoll .uno:CirclePie +WL_SD_KreissegmentLeer .uno:CirclePie_Unfilled +WL_SD_EllipsenabschnittVoll .uno:EllipseCut +WL_SD_EllipsenabschnittLeer .uno:EllipseCut_Unfilled +WL_SD_KreisabschnittVoll .uno:CircleCut +WL_SD_KreisabschnittLeer .uno:CircleCut_Unfilled +WL_SD_Kreisbogen .uno:CircleArc ' ** ' ** Kurven im Draw -WL_SD_KurveVoll SID_DRAW_BEZIER_FILL -WL_SD_KurveLeer SID_DRAW_BEZIER_NOFILL -WL_SD_PolygonVoll SID_DRAW_POLYGON -WL_SD_Polygon SID_DRAW_POLYGON_NOFILL -WL_SD_PolygonWinkelVoll SID_DRAW_XPOLYGON -WL_SD_PolygonWinkel SID_DRAW_XPOLYGON_NOFILL -WL_SD_FreihandlinieVoll SID_DRAW_FREELINE -WL_SD_FreihandlinieLeer SID_DRAW_FREELINE_NOFILL +WL_SD_KurveVoll .uno:BezierFill +WL_SD_KurveLeer .uno:Bezier_Unfilled +WL_SD_PolygonVoll .uno:Polygon +WL_SD_Polygon .uno:Polygon_Unfilled +WL_SD_PolygonWinkelVoll .uno:Polygon_Diagonal +WL_SD_PolygonWinkel .uno:Polygon_Diagonal_Unfilled +WL_SD_FreihandlinieVoll .uno:Freeline +WL_SD_FreihandlinieLeer .uno:Freeline_Unfilled ' ** ' ** Linien und Pfeile im Draw -WL_SD_LinieZeichnen SID_DRAW_LINE -WL_SD_LinieMitPfeilende SID_LINE_ARROW_END -WL_SD_LinieMitPfeilKreisende SID_LINE_ARROW_CIRCLE -WL_SD_LinieMitPfeilQuadratende SID_LINE_ARROW_SQUARE -WL_SD_LinieWinkel SID_DRAW_XLINE -WL_SD_LinieMitPfeilanfang SID_LINE_ARROW_START -WL_SD_LinieMitKreisPfeilende SID_LINE_CIRCLE_ARROW -WL_SD_LinieMitQuadratKreisende SID_LINE_SQUARE_ARROW -WL_SD_Masslinie SID_DRAW_MEASURELINE -WL_SD_LinieMitPfeilenden SID_LINE_ARROWS +WL_SD_LinieZeichnen .uno:Line +WL_SD_LinieMitPfeilende .uno:LineArrowEnd +WL_SD_LinieMitPfeilKreisende .uno:LineArrowCircle +WL_SD_LinieMitPfeilQuadratende .uno:LineArrowSquare +WL_SD_LinieWinkel .uno:Line_Diagonal +WL_SD_LinieMitPfeilanfang .uno:LineArrowStart +WL_SD_LinieMitKreisPfeilende .uno:LineCircleArrow +WL_SD_LinieMitQuadratKreisende .uno:LineSquareArrow +WL_SD_Masslinie .uno:MeasureLine +WL_SD_LinieMitPfeilenden .uno:LineArrows ' ** ' ** Rechtecke im Draw -WL_SD_RechteckVoll SID_DRAW_RECT -WL_SD_RechteckLeer SID_DRAW_RECT_NOFILL -WL_SD_RechteckRundVoll SID_DRAW_RECT_ROUND -WL_SD_RechteckRundLeer SID_DRAW_RECT_ROUND_NOFILL -WL_SD_QuadratVoll SID_DRAW_SQUARE -WL_SD_QuadratLeer SID_DRAW_SQUARE_NOFILL -WL_SD_QuadratRundVoll SID_DRAW_SQUARE_ROUND -WL_SD_QuadratRundLeer SID_DRAW_SQUARE_ROUND_NOFILL +WL_SD_RechteckVoll .uno:Rect +WL_SD_RechteckLeer .uno:Rect_Unfilled +WL_SD_RechteckRundVoll .uno:Rect_Rounded +WL_SD_RechteckRundLeer .uno:Rect_Rounded_Unfilled +WL_SD_QuadratVoll .uno:Square +WL_SD_QuadratLeer .uno:Square_Unfilled +WL_SD_QuadratRundVoll .uno:Square_Rounded +WL_SD_QuadratRundLeer .uno:Square_Rounded_Unfilled ' ** ' ** Text im Draw -WL_SD_TextBox SID_DRAWTBX_TEXT -WL_SD_TextEinfuegenDraw SID_ATTR_CHAR -WL_SD_TextRahmen SID_TEXT_FITTOSIZE -WL_SD_TextLegende SID_DRAW_CAPTION +WL_SD_TextBox .uno:TextToolbox +WL_SD_TextEinfuegenDraw .uno:Text +WL_SD_TextRahmen .uno:TextFitToSizeTool +WL_SD_TextLegende .uno:DrawCaption ' ** ' ** Verbinder im Draw -WL_SD_VVerbinder SID_TOOL_CONNECTOR -WL_SD_VPfeilAnfang SID_CONNECTOR_ARROW_START -WL_SD_VPfeilEnde SID_CONNECTOR_ARROW_END -WL_SD_Vpfeile SID_CONNECTOR_ARROWS -WL_SD_VkreisAnfang SID_CONNECTOR_CIRCLE_START -WL_SD_VkreisEnde SID_CONNECTOR_CIRCLE_END -WL_SD_Vkreise SID_CONNECTOR_CIRCLES -WL_SD_LinienVerbinder SID_CONNECTOR_LINES -WL_SD_LPfeilAnfang SID_CONNECTOR_LINES_ARROW_START -WL_SD_LPfeilEnde SID_CONNECTOR_LINES_ARROW_END -WL_SD_Lpfeile SID_CONNECTOR_LINES_ARROWS -WL_SD_LkreisAnfang SID_CONNECTOR_LINES_CIRCLE_START -WL_SD_LkreisEnde SID_CONNECTOR_LINES_CIRCLE_END -WL_SD_Lkreise SID_CONNECTOR_LINES_CIRCLES -WL_SD_Direktverbinder SID_CONNECTOR_LINE -WL_SD_DPfeilAnfang SID_CONNECTOR_LINE_ARROW_START -WL_SD_DPfeilEnde SID_CONNECTOR_LINE_ARROW_END -WL_SD_Dpfeile SID_CONNECTOR_LINE_ARROWS -WL_SD_DkreisAnfang SID_CONNECTOR_LINE_CIRCLE_START -WL_SD_DkreisEnde SID_CONNECTOR_LINE_CIRCLE_END -WL_SD_DKreise SID_CONNECTOR_LINE_CIRCLES -WL_SD_KurvenVerbinder SID_CONNECTOR_CURVE -WL_SD_KPfeilAnfang SID_CONNECTOR_CURVE_ARROW_START -WL_SD_KPfeilEnde SID_CONNECTOR_CURVE_ARROW_END -WL_SD_Kpfeile SID_CONNECTOR_CURVE_ARROWS -WL_SD_KkreisAnfang SID_CONNECTOR_CURVE_CIRCLE_START -WL_SD_KkreisEnde SID_CONNECTOR_CURVE_CIRCLE_END -WL_SD_KKreise SID_CONNECTOR_CURVE_CIRCLES +WL_SD_VVerbinder .uno:Connector +WL_SD_VPfeilAnfang .uno:ConnectorArrowStart +WL_SD_VPfeilEnde .uno:ConnectorArrowEnd +WL_SD_Vpfeile .uno:ConnectorArrows +WL_SD_VkreisAnfang .uno:ConnectorCircleStart +WL_SD_VkreisEnde .uno:ConnectorCircleEnd +WL_SD_Vkreise .uno:ConnectorCircles +WL_SD_LinienVerbinder .uno:ConnectorLines +WL_SD_LPfeilAnfang .uno:ConnectorLinesArrowStart +WL_SD_LPfeilEnde .uno:ConnectorLinesArrowEnd +WL_SD_Lpfeile .uno:ConnectorLinesArrows +WL_SD_LkreisAnfang .uno:ConnectorLinesCircleStart +WL_SD_LkreisEnde .uno:ConnectorLinesCircleEnd +WL_SD_Lkreise .uno:ConnectorLinesCircles +WL_SD_Direktverbinder .uno:ConnectorLine +WL_SD_DPfeilAnfang .uno:ConnectorLineArrowStart +WL_SD_DPfeilEnde .uno:ConnectorLineArrowEnd +WL_SD_Dpfeile .uno:ConnectorLineArrows +WL_SD_DkreisAnfang .uno:ConnectorLineCircleStart +WL_SD_DkreisEnde .uno:ConnectorLineCircleEnd +WL_SD_DKreise .uno:ConnectorLineCircles +WL_SD_KurvenVerbinder .uno:ConnectorCurve +WL_SD_KPfeilAnfang .uno:ConnectorCurveArrowStart +WL_SD_KPfeilEnde .uno:ConnectorCurveArrowEnd +WL_SD_Kpfeile .uno:ConnectorCurveArrows +WL_SD_KkreisAnfang .uno:ConnectorCurveCircleStart +WL_SD_KkreisEnde .uno:ConnectorCurveCircleEnd +WL_SD_KKreise .uno:ConnectorCurveCircles ' ** ' ** 3D-Objekte im Draw -WL_SD_Wuerfel SID_3D_CUBE -WL_SD_Kugel SID_3D_SPHERE -WL_SD_Zylinder SID_3D_CYLINDER -WL_SD_Kegel SID_3D_CONE -WL_SD_Pyramide SID_3D_PYRAMID -WL_SD_Torus SID_3D_TORUS -WL_SD_Schale SID_3D_SHELL -WL_SD_Halbkugel SID_3D_HALF_SPHERE +WL_SD_Wuerfel .uno:Cube +WL_SD_Kugel .uno:Sphere +WL_SD_Zylinder .uno:Cylinder +WL_SD_Kegel .uno:Cone +WL_SD_Pyramide .uno:Cyramid +WL_SD_Torus .uno:Torus +WL_SD_Schale .uno:Shell3D +WL_SD_Halbkugel .uno:HalfSphere ' ** ' ** Einfuegen im Draw -WL_TB_SD_EINFUEGEN_Diagramm SID_INSERT_DIAGRAM -WL_TB_SD_EINFUEGEN_Formel SID_INSERT_MATH -WL_TB_SD_EINFUEGEN_Objekt SID_INSERT_OBJECT -WL_TB_SD_EINFUEGEN_Plugin SID_INSERT_PLUGIN -WL_TB_SD_EINFUEGEN_Tabelle SID_ATTR_TABLE -WL_TB_SD_EINFUEGEN_Datei SID_INSERTFILE -WL_TB_SD_EINFUEGEN_Seite SID_INSERTPAGE -WL_TB_SD_EINFUEGEN_StarImage SID_INSERT_IMAGE +WL_TB_SD_EINFUEGEN_Diagramm .uno:InsertObjectChart +WL_TB_SD_EINFUEGEN_Formel .uno:InsertMath +WL_TB_SD_EINFUEGEN_Objekt .uno:InsertObject +WL_TB_SD_EINFUEGEN_Plugin .uno:InsertPlugin +WL_TB_SD_EINFUEGEN_Tabelle .uno:InsertSpreadsheet +WL_TB_SD_EINFUEGEN_Datei .uno:ImportFromFile +WL_TB_SD_EINFUEGEN_Seite .uno:InsertPage +WL_TB_SD_EINFUEGEN_StarImage .uno:InsertImage ' ** ' ** Einfuegen im Calc -WL_TB_SC_Einfuegen_Grafik SID_INSERT_GRAPHIC -WL_TB_SC_Einfuegen_Sonderzeichen SID_CHARMAP +WL_TB_SC_Einfuegen_Grafik .uno:InsertGraphic +WL_TB_SC_Einfuegen_Sonderzeichen .uno:InsertSymbol ' ** ' ** Einfuegen Objekte im Calc -WL_TB_SC_OBJEKT_Diagramm SID_DRAW_CHART -WL_TB_SC_OBJEKT_Image SID_INSERT_SIMAGE -WL_TB_SC_OBJEKT_Formel SID_INSERT_SMATH -WL_TB_SC_OBJEKT_Frame SID_INSERT_FLOATINGFRAME -WL_TB_SC_OBJEKT_Objekt SID_INSERT_OBJECT -WL_TB_SC_OBJEKT_Plugin SID_INSERT_PLUGIN +WL_TB_SC_OBJEKT_Diagramm .uno:DrawChart +WL_TB_SC_OBJEKT_Image .uno:InsertObjectStarImage +WL_TB_SC_OBJEKT_Formel .uno:InsertObjectStarMath +WL_TB_SC_OBJEKT_Frame .uno:InsertObjectFloatingFrame +WL_TB_SC_OBJEKT_Objekt .uno:InsertObject +WL_TB_SC_OBJEKT_Plugin .uno:InsertPlugin ' ** ' ** Einfuegen Zellen im Calc -WL_TB_SC_Zellen_ZellenNachUnten FID_INS_CELLSDOWN -WL_TB_SC_Zellen_ZellenNachRechts FID_INS_CELLSRIGHT -WL_TB_SC_Zellen_GanzeZeile FID_INS_ROW -WL_TB_SC_Zellen_GanzeSpalte FID_INS_COLUMN +WL_TB_SC_Zellen_ZellenNachUnten .uno:InsertCellsDown +WL_TB_SC_Zellen_ZellenNachRechts .uno:InsertCellsRight +WL_TB_SC_Zellen_GanzeZeile .uno:InsertRows +WL_TB_SC_Zellen_GanzeSpalte .uno:InsertColumns ' ** ' ** Optionsleiste im Draw / Impress -Opl_SD_PunkteBearbeiten SID_BEZIER_EDIT -Opl_SD_KlebepunkteBearbeiten SID_GLUE_EDITMODE +Opl_SD_PunkteBearbeiten .uno:ToggleObjectBezierMode +Opl_SD_KlebepunkteBearbeiten .uno:GlueEditMode Opl_SD_EffekteZulassen .uno:AnimationObjects -Opl_SD_DrehmodusNachKlick SID_CLICK_CHANGE_ROTATION -Opl_SD_RasterSichtbar SID_GRID_VISIBLE -Opl_SD_FanglinieSichtbar SID_HELPLINES_VISIBLE -Opl_SD_HilfslinienBeimVerschieben SID_HELPLINES_MOVE -Opl_SD_RasterBenutzen SID_GRID_USE -Opl_SD_FanglinieBenutzen SID_HELPLINES_USE -Opl_SD_FangenAnSeitenraendern SID_SNAP_BORDER -Opl_SD_FangenAnObjektRahmen SID_SNAP_FRAME -Opl_SD_FangenAnObjektpunkten SID_SNAP_POINTS -Opl_SD_Schnellbearbeitung SID_QUICKEDIT -Opl_SD_NurTextbreichSelektieren SID_PICK_THROUGH -Opl_SD_TextBearbeitenBeiDoppelklick SID_DOUBLECLICK_TEXTEDIT -Opl_SD_EinfacheHandles SID_HANDLES_DRAFT -Opl_SD_GrosseHandles SID_BIG_HANDLES -Opl_SD_ObjektMitAttributen SID_SOLID_CREATE -Opl_SD_AlleGruppierungenVerlassen SID_CONNECTOR_LINES_CIRCLES +Opl_SD_DrehmodusNachKlick .uno:ClickChangeRotation +Opl_SD_RasterSichtbar .uno:GridVisible +Opl_SD_FanglinieSichtbar .uno:HelplinesVisible +Opl_SD_HilfslinienBeimVerschieben .uno:HelplinesMove +Opl_SD_RasterBenutzen .uno:GridUse +Opl_SD_FanglinieBenutzen .uno:HelplinesUse +Opl_SD_FangenAnSeitenraendern .uno:SnapBorder +Opl_SD_FangenAnObjektRahmen .uno:SnapFrame +Opl_SD_FangenAnObjektpunkten .uno:SnapPoints +Opl_SD_Schnellbearbeitung .uno:QuickEdit +Opl_SD_NurTextbreichSelektieren .uno:PickThrough +Opl_SD_TextBearbeitenBeiDoppelklick .uno:DoubleClickTextEdit +Opl_SD_EinfacheHandles .uno:HandlesDraft +Opl_SD_GrosseHandles .uno:BigHandles +Opl_SD_ObjektMitAttributen .uno:SolidCreate +Opl_SD_AlleGruppierungenVerlassen .uno:ConnectorLinesCircles diff --git a/testautomation/global/sid/context.sid b/testautomation/global/sid/context.sid index f5d47e635a7f..de43147c5eb0 100644 --- a/testautomation/global/sid/context.sid +++ b/testautomation/global/sid/context.sid @@ -5,36 +5,36 @@ ' Minimieren SID_WIN_MINIMIZED ' ** Kontextmenue Calc -ZeilenLoeschen SID_DEL_ROWS -SpaltenLoeschen SID_DEL_COLS -' AnhaengenTabelle FID_TAB_APPEND ' ist zur 541 rausgenommen worden -NotizAnzeigen FID_NOTE_VISIBLE +ZeilenLoeschen .uno:DeleteRows +SpaltenLoeschen .uno:DeleteColumns +' AnhaengenTabelle .uno:Add ' ist zur 541 rausgenommen worden +NotizAnzeigen .uno:NoteVisible ' Kontextmenue: Tabelle Calc -AlleTabellenAuswaehlen FID_TAB_SELECTALL -SetTabColor FID_TAB_MENU_SET_TAB_BG_COLOR +AlleTabellenAuswaehlen .uno:TableSelectAll +SetTabColor .uno:SetTabBgColor ' ** Kontextmenue im Gestalter/Stylist -Stylist_Neu HID_STYLIST_NEW -Stylist_Aendern HID_STYLIST_EDIT -Stylist_Loeschen HID_STYLIST_DELETE +Stylist_Neu SFX2_HID_STYLIST_NEW +Stylist_Aendern SFX2_HID_STYLIST_EDIT +Stylist_Loeschen SFX2_HID_STYLIST_DELETE 'Open ' ** Kontextmenue Objekte -Obj_Originalgroesse SID_ORIGINALSIZE +Obj_Originalgroesse .uno:OriginalSize ' ** Kontextmenue SeitenUmbruchvorschau Calc -Skalierungaufheben FID_RESET_PRINTZOOM +Skalierungaufheben .uno:ResetPrintZoom ' ** Kontextmenue automatische Rechtschreibung pruefen -ARP_Ersetzung HID_LINGU_REPLACE -ARP_Rechtschreibung HID_LINGU_SPELLING_DLG -ARP_Aufnehmen HID_LINGU_ADD_WORD -ARP_AlleIgnorieren HID_LINGU_IGNORE_WORD -ARP_Autokorrektur HID_LINGU_AUTOCORR +ARP_Ersetzung SW_HID_LINGU_REPLACE +ARP_Rechtschreibung SW_HID_LINGU_SPELLING_DLG +ARP_Aufnehmen SW_HID_LINGU_ADD_WORD +ARP_AlleIgnorieren SW_HID_LINGU_IGNORE_WORD +ARP_Autokorrektur SW_HID_LINGU_AUTOCORR ' ** Kontextmenue IMPRESS/DRAW -VorlageBearbeiten SID_STYLE_EDIT -ContextOriginalSize SID_ORIGINAL_SIZE +VorlageBearbeiten .uno:EditStyle +ContextOriginalSize .uno:OriginalSize diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid index 866251e652ac..83e37b16a848 100644 --- a/testautomation/global/sid/e_all.sid +++ b/testautomation/global/sid/e_all.sid @@ -11,135 +11,135 @@ ' ********* File Menu ********* ' **** ' **** All applications -FileNewFromTemplate SID_NEWDOC -FileOpen SID_OPENDOC +FileNewFromTemplate .uno:NewDoc +FileOpen .uno:Open FileAutopilotLetter service:com.sun.star.wizards.letter.CallWizard?start FileAutopilotFax service:com.sun.star.wizards.fax.CallWizard?start FileAutopilotAgenda service:com.sun.star.wizards.agenda.CallWizard?start -FileAutopilotPresentation SID_SD_AUTOPILOT -FileAutopilotAddressDataSource SID_ADDRESS_DATA_SOURCE +FileAutopilotPresentation .uno:AutoPilotPresentations +FileAutopilotAddressDataSource .uno:AutoPilotAddressDataSource FirstTimeWizard service:com.sun.star.comp.desktop.FirstStart?start FileWizardsWebPage service:com.sun.star.wizards.web.CallWizard?start -FileCloseAndReturn SID_CLOSEDOC -FileSaveCopy SID_SAVEASDOC +FileCloseAndReturn .uno:CloseDoc +FileSaveCopy .uno:SaveAs FileClose .uno:CloseDoc -FileSave SID_SAVEDOC -FileSaveAs SID_SAVEASDOC -FileSaveAll SID_SAVEDOCS -FileExport SID_EXPORTDOC -FileExportAsPDF SID_EXPORTDOCASPDF -FileSendDocumentAsEmail SID_MAIL_SENDDOC -FileSendDocumentAsPDF SID_MAIL_SENDDOCASPDF -FileVersions SID_VERSION -FileReload SID_RELOAD SID_LASTVERSIONDOC -FileProperties SID_DOCINFO -FileTemplatesOrganize SID_ORGANIZER -FileTemplatesSave SID_DOCTEMPLATE -FileTemplatesEdit SID_OPENTEMPLATE -FileTemplatesAddressbookSource SID_TEMPLATE_ADDRESSBOKSOURCE -FilePageView SID_PRINTPREVIEW -FilePrint SID_PRINTDOC -FilePrintersettings SID_SETUPPRINTER -FileExit SID_QUITAPP +FileSave .uno:Save +FileSaveAs .uno:SaveAs +FileSaveAll .uno:SaveAll +FileExport .uno:ExportTo +FileExportAsPDF .uno:ExportToPDF +FileSendDocumentAsEmail .uno:SendMail +FileSendDocumentAsPDF .uno:SendMailDocAsPDF +FileVersions .uno:VersionDialog +FileReload .uno:Reload SID_LASTVERSIONDOC +FileProperties .uno:SetDocumentProperties +FileTemplatesOrganize .uno:Organizer +FileTemplatesSave .uno:SaveAsTemplate +FileTemplatesEdit .uno:OpenTemplate +FileTemplatesAddressbookSource .uno:AddressBookSource +FilePageView .uno:PrintPreview +FilePrint .uno:Print +FilePrintersettings .uno:PrinterSetup +FileExit .uno:Quit ' **** Writer -FileSendOutlineToPresentation FN_OUTLINE_TO_IMPRESS -FileSendOutlineToClipboard FN_OUTLINE_TO_CLIPBOARD -FileSendCreateAutoabstract FN_ABSTRACT_NEWDOC -FileSendAutoabstractToPresentation FN_ABSTRACT_STARIMPRESS -FileSendCreateMasterdocument FN_NEW_GLOBAL_DOC -FileSendCreateHTMLDocument FN_NEW_HTML_DOC +FileSendOutlineToPresentation .uno:SendOutlineToStarImpress +FileSendOutlineToClipboard .uno:SendOutlineToClipboard +FileSendCreateAutoabstract .uno:CreateAbstract +FileSendAutoabstractToPresentation .uno:SendAbstractToStarImpress +FileSendCreateMasterdocument .uno:NewGlobalDoc +FileSendCreateHTMLDocument .uno:NewHtmlDoc ' **** Impress / Draw -FilePack SID_PACKNGO +FilePack .uno:PackAndGo ' *********************************** ' ********* Edit Menu ********* ' **** ' **** All applications -EditUndo SID_UNDO -EditRedo SID_REDO -EditRepeat SID_REPEAT -EditCut SID_CUT +EditUndo .uno:Undo +EditRedo .uno:Redo +EditRepeat .uno:RepeatAction +EditCut .uno:Cut EditCopy .uno:Copy EditDoc .uno:EditDoc -EditPaste SID_PASTE -EditDelete SID_DELETE -EditSelectAll SID_SELECTALL -EditSearchAndReplace SID_SEARCH_DLG -EditPlugIn SID_PLUGINS_ACTIVE -EditImageMap SID_IMAP +EditPaste .uno:Paste +EditDelete .uno:Delete +EditSelectAll .uno:SelectAll +EditSearchAndReplace .uno:SearchDialog +EditPlugIn .uno:PlugInsActive +EditImageMap .uno:ImageMapDialog EditObjectEdit .uno:ObjectMenue?VerbID:short=0 EditObjectProperties .uno:ObjectMenue?VerbID:short=-7 EditObjectOpen .uno:ObjectMenue?VerbID:short=2 EditObjectSaveCopyAs .uno:ObjectMenue?VerbID:short=-8 ' **** Writer -EditAutotext FN_GLOSSARY_DLG +EditAutotext .uno:EditGlossary EditPasteSpecialWriter .uno:PasteSpecial -EditChangesRecord FN_REDLINE_ON -EditChangesShow FN_REDLINE_SHOW -EditChangesAcceptOrReject FN_REDLINE_ACCEPT -EditChangesComment FN_REDLINE_COMMENT -EditChangesMergeDocument SID_DOCUMENT_MERGE -EditCompareDocument SID_DOCUMENT_COMPARE -EditChangesProtectTrace FN_REDLINE_PROTECT -EditLinksWriter FN_EDIT_LINK_DLG -EditExchangeDatabase FN_CHANGE_DBFIELD -EditFields FN_EDIT_FIELD -EditFootnote FN_EDIT_FOOTNOTE -EditIndexEntry FN_EDIT_IDX_ENTRY_DLG -EditBibliographyEntry FN_EDIT_AUTH_ENTRY_DLG -EditHyperlink FN_EDIT_HYPERLINK +EditChangesRecord .uno:TrackChanges +EditChangesShow .uno:ShowTrackedChanges +EditChangesAcceptOrReject .uno:AcceptTrackedChanges +EditChangesComment .uno:CommentChangeTracking +EditChangesMergeDocument .uno:MergeDocuments +EditCompareDocument .uno:CompareDocuments +EditChangesProtectTrace .uno:ProtectTraceChangeMode +EditLinksWriter .uno:LinkDialog +EditExchangeDatabase .uno:ChangeDatabaseField +EditFields .uno:FieldDialog +EditFootnote .uno:EditFootnote +EditIndexEntry .uno:IndexEntryDialog +EditBibliographyEntry .uno:AuthoritiesEntryDialog +EditHyperlink .uno:EditHyperlink EditSelectionModeStandard .uno:SelectionModeDefault EditSelectionModeBlock .uno:SelectionModeBlock ' **** Calc EditPasteSpecialCalc .uno:PasteSpecial -EditChangesRecordCalc FID_CHG_RECORD -EditChangesProtectTraceCalc SID_CHG_PROTECT -EditChangesCommentsCalc FID_CHG_COMMENT -EditChangesShowCalc FID_CHG_SHOW -EditChangesAcceptOrDiscardCalc FID_CHG_ACCEPT -EditChangesDocumentMergeDocumentCalc SID_DOCUMENT_MERGE -EditCompareDocumentCalc SID_DOCUMENT_COMPARE -EditLinksCalc SID_LINKS -EditHeadersAndFooters SID_HFEDIT -EditFillLeft FID_FILL_TO_LEFT -EditFillUp FID_FILL_TO_TOP -EditFillRight FID_FILL_TO_RIGHT -EditFillSeries FID_FILL_SERIES -EditFillSheet FID_FILL_TAB -EditFillDown FID_FILL_TO_BOTTOM -EditDeleteContents SID_DELETE -EditDeleteCells FID_DELETE_CELL -EditDeleteSheet FID_DELETE_TABLE -EditCopyMoveSheet FID_TAB_MOVE -EditSheetSelect SID_SELECT_TABLES -EditRemoveManualBreakColumnBreak FID_DEL_COLBRK -EditRemoveManualBreakRowBreak FID_DEL_ROWBRK +EditChangesRecordCalc .uno:TraceChangeMode +EditChangesProtectTraceCalc .uno:ProtectTraceChangeMode +EditChangesCommentsCalc .uno:CommentChange +EditChangesShowCalc .uno:ShowChanges +EditChangesAcceptOrDiscardCalc .uno:AcceptChanges +EditChangesDocumentMergeDocumentCalc .uno:MergeDocuments +EditCompareDocumentCalc .uno:CompareDocuments +EditLinksCalc .uno:EditLinks +EditHeadersAndFooters .uno:EditHeaderAndFooter +EditFillLeft .uno:FillLeft +EditFillUp .uno:FillUp +EditFillRight .uno:FillRight +EditFillSeries .uno:FillSeries +EditFillSheet .uno:FillTable +EditFillDown .uno:FillDown +EditDeleteContents .uno:Delete +EditDeleteCells .uno:DeleteCell +EditDeleteSheet .uno:Remove +EditCopyMoveSheet .uno:Move +EditSheetSelect .uno:SelectTables +EditRemoveManualBreakColumnBreak .uno:DeleteColumnbreak +EditRemoveManualBreakRowBreak .uno:DeleteRowbreak EditObjectSaveCopyAsCalc .uno:ObjectMenue?VerbID:short=-8 ' **** Draw / Impress EditPasteSpecial .uno:PasteSpecial -EditLinksDraw SID_MANAGE_LINKS -EditDuplicate SID_COPYOBJECTS -EditCrossFading SID_POLYGON_MORPHING -EditRenameSlide SID_RENAMEPAGE -EditDeleteSlide SID_DELETE_PAGE -InsertLayer SID_INSERTLAYER -EditDeleteLayer SID_DELETE_LAYER -EditLayerRename SID_RENAMELAYER -EditfieldsDraw SID_MODIFY_FIELD -EditHyperlinkDraw SID_EDIT_HYPERLINK -EditGluePoints SID_GLUE_EDITMODE +EditLinksDraw .uno:ManageLinks +EditDuplicate .uno:CopyObjects +EditCrossFading .uno:Morphing +EditRenameSlide .uno:RenamePage +EditDeleteSlide .uno:DeletePage +InsertLayer .uno:InsertLayer +EditDeleteLayer .uno:DeleteLayer +EditLayerRename .uno:RenameLayer +EditfieldsDraw .uno:ModifyField +EditHyperlinkDraw .uno:EditHyperlink +EditGluePoints .uno:GlueEditMode ' **** Chart / Math -EditSelectAllMath SID_SELECT -EditNextMarker SID_NEXTMARK -EditPreviousMarker SID_PREVMARK -EditNextError SID_NEXTERR -EditPreviousError SID_PREVERR +EditSelectAllMath .uno:Select +EditNextMarker .uno:NextMark +EditPreviousMarker .uno:PrevMark +EditNextError .uno:NextError +EditPreviousError .uno:PrevError EditChartData .uno:DiagramData EditDataRanges .uno:DataRanges @@ -147,15 +147,15 @@ EditDataRanges .uno:DataRanges ' ********* View Menu ********* ' **** ' **** All applications -ViewZoom SID_ATTR_ZOOM -ViewBeamer SID_BROWSER +ViewZoom .uno:Zoom +ViewBeamer .uno:Beamer ViewDataSources .uno:ViewDataSourceBrowser ViewToolbarsHyperlinkbar .uno:InsertHyperlink ViewToolbarsConfigure .uno:ConfigureDialog -ViewToolbarsStatusbar SID_TOGGLESTATUSBAR -ViewFullScreen SID_WIN_FULLSCREEN -ViewCurrentDatabase SID_VIEW_DATA_SOURCE_BROWSER -ViewNavigator SID_NAVIGATOR +ViewToolbarsStatusbar .uno:StatusBarVisible +ViewFullScreen .uno:FullScreen +ViewCurrentDatabase .uno:ViewDataSourceBrowser +ViewNavigator .uno:Navigator ViewToolbarsThreeDSettings .uno:AvailableToolbars?Toolbar:string=extrusionobjectbar ViewToolbarsAlign .uno:AvailableToolbars?Toolbar:string=alignmentbar ViewToolbarsBasicShapes .uno:AvailableToolbars?Toolbar:string=basicshapes @@ -204,88 +204,88 @@ ViewToolbarsPreviewbar .uno:AvailableToolbars?Toolbar:string=previewbar ViewToolbarsDrawObjectbar .uno:AvailableToolbars?Toolbar:string=drawobjectbar ' **** Writer -ViewRuler FN_RULER -ViewCurrentDatabaseWriter SID_VIEW_DATA_SOURCE_BROWSER -ViewTextBoundaries FN_VIEW_BOUNDS -ViewFieldShadings FN_VIEW_MARKS -ViewFields FN_VIEW_FIELDNAME -ViewNonprintingCharacters FN_VIEW_META_CHARS -ViewOnlineLayout SID_BROWSER_MODE -ViewHiddenParagraphs FN_VIEW_HIDDEN_PARA -ViewInputMethodStatus SID_SHOW_IME_STATUS_WINDOW +ViewRuler .uno:Ruler +ViewCurrentDatabaseWriter .uno:ViewDataSourceBrowser +ViewTextBoundaries .uno:ViewBounds +ViewFieldShadings .uno:Marks +ViewFields .uno:Fieldnames +ViewNonprintingCharacters .uno:ControlCodes +ViewOnlineLayout .uno:BrowseView +ViewHiddenParagraphs .uno:ShowHiddenParagraphs +ViewInputMethodStatus .uno:ShowImeStatusWindow ' **** Calc ViewToolbarsFormulaBar .uno:InputLineVisible -ViewColumnAndRowHeaders FID_TOGGLEHEADERS -ViewValueHightlighting FID_TOGGLESYNTAX +ViewColumnAndRowHeaders .uno:ViewRowColumnHeaders +ViewValueHightlighting .uno:ViewValueHighlighting ViewNormalView .uno:NormalViewMode ViewPageBreakPreview .uno:PagebreakMode -ViewCurrentDatabaseCalc SID_VIEW_DATA_SOURCE_BROWSER +ViewCurrentDatabaseCalc .uno:ViewDataSourceBrowser ViewSelectionCalc .uno:Toolbox ' **** Draw / Impress -ViewBackground SID_MASTERPAGE -ViewDrawing SID_SLIDE_MASTERPAGE -ViewGridVisible SID_GRID_VISIBLE -ViewGridUse SID_GRID_USE -ViewGridFront SID_GRID_FRONT +ViewBackground .uno:MasterPage +ViewDrawing .uno:SlideMasterPage +ViewGridVisible .uno:GridVisible +ViewGridUse .uno:GridUse +ViewGridFront .uno:GridFront ViewHandout .uno:HandoutMode -ViewHeaderAndFooter SID_HEADER_AND_FOOTER -ViewLayer SID_LAYERMODE -ViewLayerButton HID_SD_BTN_LAYER 59781 +ViewHeaderAndFooter .uno:HeaderAndFooter +ViewLayer .uno:LayerMode +ViewLayerButton SD_HID_SD_BTN_LAYER 59781 ViewMasterPage .uno:MasterPage ViewMasterButton .uno:MasterPageMenu ViewNormal .uno:NormalMultiPaneGUI ViewNotes .uno:NotesMode ViewOutline .uno:OutlineMode ViewPagePane .uno:LeftPaneDraw -ViewPreview SID_PREVIEW_WIN +ViewPreview .uno:PreviewWindow ViewPreviewWindow .uno:PreviewWindow -ViewQualityColour SID_OUTPUT_QUALITY_COLOR -ViewQualityGreyscale SID_OUTPUT_QUALITY_GRAYSCALE -ViewQualityBlackWhite SID_OUTPUT_QUALITY_BLACKWHITE +ViewQualityColour .uno:OutputQualityColor +ViewQualityGreyscale .uno:OutputQualityGrayscale +ViewQualityBlackWhite .uno:OutputQualityBlackWhite ViewRightPane .uno:RightPane -ViewRulers SID_RULER +ViewRulers .uno:ShowRuler ViewSlideShow .uno:Presentation ViewSlideSorter .uno:DiaMode -ViewSlide SID_PAGEMODE -ViewSlideButton HID_SD_BTN_PAGE 59779 -ViewSnapLinesVisible SID_HELPLINES_VISIBLE -ViewSnapLinesUse SID_HELPLINES_USE -ViewSnapLinesFront SID_HELPLINES_FRONT +ViewSlide .uno:PageMode +ViewSlideButton SD_HID_SD_BTN_PAGE 59779 +ViewSnapLinesVisible .uno:HelplinesVisible +ViewSnapLinesUse .uno:HelplinesUse +ViewSnapLinesFront .uno:HelplinesFront ViewStatusBarVisible .uno:StatusBarVisible ViewShowImeStatusWindow .uno:ShowImeStatusWindow ViewShowRuler .uno:ShowRuler ViewTaskPane .uno:TaskPane ViewTaskSlide .uno:LeftPaneImpress -ViewTitle SID_TITLE_MASTERPAGE +ViewTitle .uno:TitleMasterPage ViewToolbarsOptionbar .uno:AvailableToolbars?Toolbar:string=optionsbar ViewToolbarsColorBar .uno:ColorControl -ViewWorkspaceDrawingView SID_DRAWINGMODE -ViewWorkspaceOutlineView SID_OUTLINEMODE -ViewWorkspaceSlidesView SID_DIAMODE -ViewWorkspaceNotesView SID_NOTESMODE -ViewWorkspaceHandoutView SID_HANDOUTMODE +ViewWorkspaceDrawingView .uno:DrawingMode +ViewWorkspaceOutlineView .uno:OutlineMode +ViewWorkspaceSlidesView .uno:DiaMode +ViewWorkspaceNotesView .uno:NotesMode +ViewWorkspaceHandoutView .uno:HandoutMode ' **** Math -ViewAutoUpdateDisplay SID_AUTO_REDRAW -ViewSelection SID_TOOLBOX -ViewZoomIn SID_ZOOMIN -ViewZoomAll SID_ZOOMOUT -ViewShowAll SID_ADJUST -ViewUpdate SID_DRAW +ViewAutoUpdateDisplay .uno:RedrawAutomatic +ViewSelection .uno:ToolBox +ViewZoomIn .uno:ZoomIn +ViewZoomAll .uno:ZoomOut +ViewShowAll .uno:Adjust +ViewUpdate .uno:Draw ' **** WriterWeb -ViewPrintLayout FN_PRINT_LAYOUT -ViewHTMLSource SID_SOURCEVIEW +ViewPrintLayout .uno:PrintLayout +ViewHTMLSource .uno:SourceView ' *********************************** ' ********* Insert Menu ********** ' **** ' **** All applications -InsertGraphics SID_INSERT_GRAPHIC +InsertGraphics .uno:InsertGraphic InsertChart .uno:InsertObjectChart -InsertGraphicsFromFile SID_INSERT_GRAPHIC +InsertGraphicsFromFile .uno:InsertGraphic InsertMovieAndSound .uno:InsertAVMedia InsertFloatingFrame .uno:InsertObjectFloatingFrame InsertObjectOLEObject .uno:InsertObject @@ -304,58 +304,58 @@ InsertLRM .uno:InsertLRM InsertRLM .uno:InsertLRM ' **** Writer -InsertManualBreak FN_INSERT_BREAK_DLG +InsertManualBreak .uno:InsertBreak InsertSpecialCharacterWriter .uno:InsertSymbol -InsertObjectFormulaWriter FN_INSERT_SMA -InsertTableWriter FN_INSERT_TABLE -InsertFileWriter SID_INSERTDOC -InsertFieldsDate FN_INSERT_FLD_DATE -InsertFieldsTime FN_INSERT_FLD_TIME -InsertFieldsPageNumbers FN_INSERT_FLD_PGNUMBER -InsertFieldsPageCount FN_INSERT_FLD_PGCOUNT -InsertFieldsSubject FN_INSERT_FLD_TOPIC -InsertFieldsTitle FN_INSERT_FLD_TITLE -InsertFieldsAuthor FN_INSERT_FLD_AUTHOR -InsertFieldsOther FN_INSERT_FIELD -InsertHeader FN_INSERT_PAGEHEADER -InsertFooter FN_INSERT_PAGEFOOTER -InsertSection FN_INSERT_REGION -InsertHyperlink SID_HYPERLINK_DIALOG -InsertFootnote FN_INSERT_FOOTNOTE_DLG -InsertCaption FN_INSERT_CAPTION -InsertBookmark FN_INSERT_BOOKMARK -InsertReferenceField FN_INSERT_REF_FIELD -InsertNoteWriter FN_POSTIT -InsertScript FN_JAVAEDIT -InsertIndexes FN_INSERT_MULTI_TOX -InsertIndexesEntry FN_INSERT_IDX_ENTRY_DLG -InsertIndexesBibliographyEntry FN_INSERT_AUTH_ENTRY_DLG -InsertEnvelope FN_ENVELOP -InsertHorizontalLine FN_INSERT_HRULER -InsertFrame FN_INSERT_FRAME -InsertGraphicsScanSelectSource SID_TWAIN_SELECT -InsertGraphicsScanRequest SID_TWAIN_TRANSFER +InsertObjectFormulaWriter .uno:InsertObjectStarMath +InsertTableWriter .uno:InsertTable +InsertFileWriter .uno:InsertDoc +InsertFieldsDate .uno:InsertDateField +InsertFieldsTime .uno:InsertTimeField +InsertFieldsPageNumbers .uno:InsertPageNumberField +InsertFieldsPageCount .uno:InsertPageCountField +InsertFieldsSubject .uno:InsertTopicField +InsertFieldsTitle .uno:InsertTitleField +InsertFieldsAuthor .uno:InsertAuthorField +InsertFieldsOther .uno:InsertField +InsertHeader .uno:InsertPageHeader +InsertFooter .uno:InsertPageFooter +InsertSection .uno:InsertSection +InsertHyperlink .uno:HyperlinkDialog +InsertFootnote .uno:InsertFootnoteDialog +InsertCaption .uno:InsertCaptionDialog +InsertBookmark .uno:InsertBookmark +InsertReferenceField .uno:InsertReferenceField +InsertNoteWriter .uno:InsertAnnotation +InsertScript .uno:InsertScript +InsertIndexes .uno:InsertMultiIndex +InsertIndexesEntry .uno:InsertIndexesEntry +InsertIndexesBibliographyEntry .uno:InsertAuthoritiesEntry +InsertEnvelope .uno:InsertEnvelope +InsertHorizontalLine .uno:InsertGraphicRuler +InsertFrame .uno:InsertFrame +InsertGraphicsScanSelectSource .uno:TwainSelect +InsertGraphicsScanRequest .uno:TwainTransfer ' **** Calc -InsertSpecialCharacterCalc SID_CHARMAP -InsertGraphicsFromImageEditorCalc SID_INSERT_SIMAGE +InsertSpecialCharacterCalc .uno:InsertSymbol +InsertGraphicsFromImageEditorCalc .uno:InsertObjectStarImage InsertChartCalc .uno:InsertObjectChart -InsertObjectFormulaCalc SID_INSERT_SMATH -InsertSheetCalc FID_INS_TABLE -InsertManuelBreakColumnBreak FID_INS_COLBRK -InsertManuelBreakRowBreak FID_INS_ROWBRK -InsertCells FID_INS_CELL -InsertRowsCalc FID_INS_ROW -InsertColumnsCalc FID_INS_COLUMN -InsertFunction SID_OPENDLG_FUNCTION -InsertFunctionList FID_FUNCTION_BOX -InsertNamesInsert FID_INSERT_NAME -InsertNamesDefine FID_DEFINE_NAME -InsertNameCreate FID_USE_NAME -InsertNamesLabels SID_DEFINE_COLROWNAMERANGES -InsertNoteCalc SID_INSERT_POSTIT -InsertLinkToExternalData SID_EXTERNAL_SOURCE -InsertSheetFromFile FID_INS_TABLE_EXT +InsertObjectFormulaCalc .uno:InsertObjectStarMath +InsertSheetCalc .uno:Insert +InsertManuelBreakColumnBreak .uno:InsertColumnBreak +InsertManuelBreakRowBreak .uno:InsertRowBreak +InsertCells .uno:InsertCell +InsertRowsCalc .uno:InsertRows +InsertColumnsCalc .uno:InsertColumns +InsertFunction .uno:FunctionDialog +InsertFunctionList .uno:FunctionBox +InsertNamesInsert .uno:InsertName +InsertNamesDefine .uno:DefineName +InsertNameCreate .uno:CreateNames +InsertNamesLabels .uno:DefineLabelRange +InsertNoteCalc .uno:InsertAnnotation +InsertLinkToExternalData .uno:InsertExternalDataSource +InsertSheetFromFile .uno:InsertSheetFromFile ' **** Draw InsertPage .uno:InsertPage @@ -364,32 +364,32 @@ InsertBullet .uno:InsertSymbol InsertCapturePoint .uno:CapturePoint InsertDuplicatePage .uno:DuplicatePage InsertSpecialCharacterDraw .uno:InsertSymbol -InsertGraficsDraw SID_INSERT_IMAGE +InsertGraficsDraw .uno:InsertImage InsertGraphicMenu .uno:GraphicMenu -InsertObjectFormulaDraw SID_INSERT_MATH +InsertObjectFormulaDraw .uno:InsertMath InsertObjectMenu .uno:ObjectMenu InsertImportFromFile .uno:ImportFromFile InsertSpreadsheet .uno:InsertSpreadsheet -InsertSpreadsheetDraw SID_ATTR_TABLE -InsertFileDraw SID_INSERTFILE -InsertSlide SID_INSERTPAGE -InsertDuplicateSlide SID_DUPLICATE_PAGE -InsertExpandSlide SID_EXPAND_PAGE -InsertSummerySlide SID_SUMMARY_PAGE -InsertFieldsDateFix SID_INSERT_FLD_DATE_FIX -InsertFieldsDateVariable SID_INSERT_FLD_DATE_VAR +InsertSpreadsheetDraw .uno:InsertSpreadsheet +InsertFileDraw .uno:ImportFromFile +InsertSlide .uno:InsertPage +InsertDuplicateSlide .uno:DuplicatePage +InsertExpandSlide .uno:ExpandPage +InsertSummerySlide .uno:SummaryPage +InsertFieldsDateFix .uno:InsertDateFieldFix +InsertFieldsDateVariable .uno:InsertDateFieldVar InsertFieldMenu .uno:FieldMenu -InsertFieldsTimeFix SID_INSERT_FLD_TIME_FIX -InsertFieldsTimeVariable SID_INSERT_FLD_TIME_VAR -InsertFieldsAuthorDraw SID_INSERT_FLD_AUTHOR -InsertFieldsPageNumberDraw SID_INSERT_FLD_PAGE +InsertFieldsTimeFix .uno:InsertTimeFieldFix +InsertFieldsTimeVariable .uno:InsertTimeFieldVar +InsertFieldsAuthorDraw .uno:InsertAuthorField +InsertFieldsPageNumberDraw .uno:InsertPageField InsertFieldsPageCountDraw .uno:InsertPagesField -InsertFieldsFileName SID_INSERT_FLD_FILE +InsertFieldsFileName .uno:InsertFileField InsertHyperlinkDialog .uno:HyperlinkDialog -InsertScanSelectSource SID_TWAIN_SELECT -InsertScanRequest SID_TWAIN_TRANSFER -InsertSymbol SID_CHOOSE_POLYGON -InsertSnapPointLine SID_CAPTUREPOINT +InsertScanSelectSource .uno:TwainSelect +InsertScanRequest .uno:TwainTransfer +InsertSymbol .uno:ChoosePolygon +InsertSnapPointLine .uno:CapturePoint ' **** Chart InsertTitle .uno:InsertMenuTitles @@ -405,15 +405,15 @@ InsertYErrorBars .uno:InsertMenuYErrorBars ' *********** Format Menu *********** ' **** ' **** All applications -FormatCharacter SID_CHAR_DLG -FormatLine SID_ATTRIBUTES_LINE -FormatArea SID_ATTRIBUTES_AREA -FormatParagraph SID_PARA_DLG -FormatStylesCatalog SID_STYLE_CATALOG -FormatStylesLoad SID_TEMPLATE_LOAD -FormatStylist SID_STYLE_DESIGNER -FormatControl SID_FM_CTL_PROPERTIES -FormatForm SID_FM_PROPERTIES +FormatCharacter .uno:FontDialog +FormatLine .uno:FormatLine +FormatArea .uno:FormatArea +FormatParagraph .uno:ParagraphDialog +FormatStylesCatalog .uno:StyleCatalog +FormatStylesLoad .uno:LoadStyles +FormatStylist .uno:DesignerDialog +FormatControl .uno:ControlProperties +FormatForm .uno:FormProperties FormatChangeCaseToSentence .uno:ChangeCaseToSentenceCase FormatChangeCaseCapitalizeEveryWord .uno:ChangeCaseToTitleCase FormatChangeCaseToggleCase .uno:ChangeCaseToToggleCase @@ -426,143 +426,143 @@ FormatChangeCaseKatagana .uno:ChangeCaseToKatakana ' **** Writer FormatDefaultWriter .uno:ResetAttributes -FormatPageWriter FN_FORMAT_PAGE_DLG -FormatSections FN_EDIT_REGION -FormatNumberingBullets FN_NUMBER_BULLETS +FormatPageWriter .uno:PageDialog +FormatSections .uno:EditRegion +FormatNumberingBullets .uno:BulletsAndNumberingDialog FormatAutoformatWhileTyping .uno:OnlineAutoFormat FormatAutoformatApply .uno:AutoFormatApply FormatAutoFormatApplyAndEditChanges .uno:AutoFormatRedlineApply -FormatTable FN_FORMAT_TABLE_DLG -FormatSplitTable FN_TABLE_SPLIT_TABLE -FormatMergeTables FN_TABLE_MERGE_TABLE -FormatTextWriter FN_DRAWTEXT_ATTR_DLG -FormatNumberFormat FN_NUM_FORMAT_TABLE_DLG -FormatRowHeight FN_TABLE_SET_ROW_HEIGHT -FormatRowOptimalHeight FN_TABLE_OPTIMAL_HEIGHT -FormatRowSpaceEqually FN_TABLE_BALANCE_ROWS -FormatRowSelect FN_TABLE_SELECT_ROW -FormatRowInsert FN_TABLE_INSERT_ROW_DLG -FormatRowDelete FN_TABLE_DELETE_ROW -FormatRuby SID_RUBY_DIALOG -FormatColumns FN_FORMAT_COLUMN -FormatColumnWidthWriter FN_TABLE_SET_COL_WIDTH -FormatColumnOptimalWidthWriter FN_TABLE_ADJUST_CELLS -FormatColumnSpaceEqually FN_TABLE_BALANCE_CELLS -FormatColumnInsert FN_TABLE_INSERT_COL_DLG -FormatGraphics FN_FORMAT_GRAFIC_DLG -FormatFrame FN_FORMAT_FRAME_DLG -FormatObject FN_FORMAT_FRAME_DLG -FormatArrangeBringToFront SID_FRAME_TO_TOP -FormatArrangeBringForward FN_FRAME_UP -FormatArrangeSetBackward FN_FRAME_DOWN -FormatArrangeSendToBack SID_FRAME_TO_BOTTOM -FormatArrangeToForeground SID_OBJECT_HEAVEN -FormatArrangeToBackground SID_OBJECT_HELL -FormatAlignmentLeft FN_FRAME_ALIGN_HORZ_LEFT -FormatAlignmentCentered FN_FRAME_ALIGN_HORZ_CENTER -FormatAlignmentRight FN_FRAME_ALIGN_HORZ_RIGHT -FormatAlignmentTop FN_FRAME_ALIGN_VERT_TOP -FormatAlignmentCenter FN_FRAME_ALIGN_VERT_CENTER -FormatAlignmentBottom FN_FRAME_ALIGN_VERT_BOTTOM -FormatAnchorToPage FN_TOOL_ANKER_PAGE -FormatAnchorToParagraph FN_TOOL_ANKER_PARAGRAPH -FormatAnchorAsCharacter FN_TOOL_ANKER_CHAR -FormatAnchorToCharacter FN_TOOL_ANKER_AT_CHAR -FormatAnchorToFrame FN_TOOL_ANKER_FRAME -FormatWrapNoWrap FN_FRAME_NOWRAP -FormatWrapPageWrap FN_FRAME_WRAP -FormatWrapOptimalPageWrap FN_FRAME_WRAP_IDEAL -FormatWrapThrough FN_FRAME_WRAPTHRU -FormatWrapInBackground FN_FRAME_WRAPTHRU_TRANSP -FormatWrapContour FN_FRAME_WRAP_CONTOUR -FormatWrapEditContour SID_CONTOUR_DLG -FormatWrapFirstParagraph FN_WRAP_ANCHOR_ONLY -FormatWrapEdit FN_DRAW_WRAP_DLG +FormatTable .uno:TableDialog +FormatSplitTable .uno:SplitTable +FormatMergeTables .uno:MergeTable +FormatTextWriter .uno:TextAttributes +FormatNumberFormat .uno:TableNumberFormatDialog +FormatRowHeight .uno:SetRowHeight +FormatRowOptimalHeight .uno:SetOptimalRowHeight +FormatRowSpaceEqually .uno:DistributeRows +FormatRowSelect .uno:EntireRow +FormatRowInsert .uno:InsertRowDialog +FormatRowDelete .uno:DeleteRows +FormatRuby .uno:RubyDialog +FormatColumns .uno:FormatColumns +FormatColumnWidthWriter .uno:SetColumnWidth +FormatColumnOptimalWidthWriter .uno:SetOptimalColumnWidth +FormatColumnSpaceEqually .uno:DistributeColumns +FormatColumnInsert .uno:InsertColumnDialog +FormatGraphics .uno:GraphicDialog +FormatFrame .uno:FrameDialog +FormatObject .uno:FrameDialog +FormatArrangeBringToFront .uno:BringToFront +FormatArrangeBringForward .uno:ObjectForwardOne +FormatArrangeSetBackward .uno:ObjectBackOne +FormatArrangeSendToBack .uno:SendToBack +FormatArrangeToForeground .uno:SetObjectToForeground +FormatArrangeToBackground .uno:SetObjectToBackground +FormatAlignmentLeft .uno:AlignLeft +FormatAlignmentCentered .uno:AlignHorizontalCenter +FormatAlignmentRight .uno:AlignRight +FormatAlignmentTop .uno:AlignTop +FormatAlignmentCenter .uno:AlignVerticalCenter +FormatAlignmentBottom .uno:AlignBottom +FormatAnchorToPage .uno:SetAnchorToPage +FormatAnchorToParagraph .uno:SetAnchorToPara +FormatAnchorAsCharacter .uno:SetAnchorToChar +FormatAnchorToCharacter .uno:SetAnchorAtChar +FormatAnchorToFrame .uno:SetAnchorToFrame +FormatWrapNoWrap .uno:WrapOff +FormatWrapPageWrap .uno:WrapOn +FormatWrapOptimalPageWrap .uno:WrapIdeal +FormatWrapThrough .uno:WrapThrough +FormatWrapInBackground .uno:WrapThroughTransparent +FormatWrapContour .uno:WrapContour +FormatWrapEditContour .uno:ContourDialog +FormatWrapFirstParagraph .uno:WrapAnchorOnly +FormatWrapEdit .uno:TextWrap FormatNameObject .uno:NameGroup -FormatPositionAndSize SID_ATTR_TRANSFORM -FormatFlipVertically FN_FLIP_VERT_GRAFIC -FormatFlipHorizontally FN_FLIP_HORZ_GRAFIC -FormatObjectAlignmentLeft SID_OBJECT_ALIGN_LEFT -FormatObjectAlignmentCentered SID_OBJECT_ALIGN_CENTER -FormatObjectAlignmentRight SID_OBJECT_ALIGN_RIGHT -FormatObjectAlignmentTop SID_OBJECT_ALIGN_UP -FormatObjectAlignmentCenter SID_OBJECT_ALIGN_MIDDLE -FormatObjectAlignmentBottom SID_OBJECT_ALIGN_DOWN -FormatEditPoints SID_BEZIER_EDIT -FormatFontWork SID_FONTWORK -FormatGroupGroup SID_GROUP -FormatGroupUngroup SID_UNGROUP -FormatGroupEditGroup SID_ENTER_GROUP -FormatGroupExitGroup SID_LEAVE_GROUP -FormatStyleBold SID_ATTR_CHAR_WEIGHT -FormatStyleItalic SID_ATTR_CHAR_POSTURE -FormatStyleUnderline SID_ATTR_CHAR_UNDERLINE -FormatStyleStrikeThrough SID_ATTR_CHAR_STRIKEOUT -FormatStyleShadow SID_ATTR_CHAR_SHADOWED -FormatStyleOutline SID_ATTR_CHAR_CONTOUR -FormatStyleSuperscript FN_SET_SUPER_SCRIPT -FormatStyleSubscript FN_SET_SUB_SCRIPT -FormatLineSpacingSingleLine SID_ATTR_PARA_LINESPACE_10 -FormatLineSpacing15Lines SID_ATTR_PARA_LINESPACE_15 -FormatLineSpacingDouble SID_ATTR_PARA_LINESPACE_20 -FormatAlignmentLeftText SID_ATTR_PARA_ADJUST_LEFT -FormatAlignmentRightText SID_ATTR_PARA_ADJUST_RIGHT -FormatAlignmentCenteredText SID_ATTR_PARA_ADJUST_CENTER -FormatAlignmentJustifiedText SID_ATTR_PARA_ADJUST_BLOCK -FormatReplaceWithTextBox SID_FM_CONVERTTO_EDIT -FormatReplaceWithLabelField SID_FM_CONVERTTO_FIXEDTEXT -FormatReplaceWithListbox SID_FM_CONVERTTO_LISTBOX -FormatReplaceWithCheckbox SID_FM_CONVERTTO_CHECKBOX -FormatReplaceWithRadiobutton SID_FM_CONVERTTO_RADIOBUTTON -FormatReplaceWithGroupbox SID_FM_CONVERTTO_GROUPBOX -FormatReplaceWithCombobox SID_FM_CONVERTTO_COMBOBOX -FormatReplaceWithImageButton SID_FM_CONVERTTO_IMAGEBUTTON -FormatReplaceWithFileSelection SID_FM_CONVERTTO_FILECONTROL -FormatReplaceWithDateField SID_FM_CONVERTTO_DATE -FormatReplaceWithTimeField SID_FM_CONVERTTO_TIME -FormatReplaceWithNumericalField SID_FM_CONVERTTO_NUMERIC -FormatReplaceWithCurrencyField SID_FM_CONVERTTO_CURRENCY -FormatReplaceWithPatternField SID_FM_CONVERTTO_PATTERN -FormatReplaceWithImageControl SID_FM_CONVERTTO_IMAGECONTROL -FormatReplaceWithFormattedField SID_FM_CONVERTTO_FORMATTED -FormatReplaceWithScrollbar SID_FM_CONVERTTO_SCROLLBAR -FormatReplaceWithSpinbutton SID_FM_CONVERTTO_SPINBUTTON +FormatPositionAndSize .uno:TransformDialog +FormatFlipVertically .uno:FlipVertical +FormatFlipHorizontally .uno:FlipHorizontal +FormatObjectAlignmentLeft .uno:ObjectAlignLeft +FormatObjectAlignmentCentered .uno:AlignCenter +FormatObjectAlignmentRight .uno:ObjectAlignRight +FormatObjectAlignmentTop .uno:AlignUp +FormatObjectAlignmentCenter .uno:AlignMiddle +FormatObjectAlignmentBottom .uno:AlignDown +FormatEditPoints .uno:ToggleObjectBezierMode +FormatFontWork .uno:FontWork +FormatGroupGroup .uno:FormatGroup +FormatGroupUngroup .uno:FormatUngroup +FormatGroupEditGroup .uno:EnterGroup +FormatGroupExitGroup .uno:LeaveGroup +FormatStyleBold .uno:Bold +FormatStyleItalic .uno:Italic +FormatStyleUnderline .uno:Underline +FormatStyleStrikeThrough .uno:Strikeout +FormatStyleShadow .uno:Shadowed +FormatStyleOutline .uno:OutlineFont +FormatStyleSuperscript .uno:SuperScript +FormatStyleSubscript .uno:SubScript +FormatLineSpacingSingleLine .uno:SpacePara1 +FormatLineSpacing15Lines .uno:SpacePara15 +FormatLineSpacingDouble .uno:SpacePara2 +FormatAlignmentLeftText .uno:LeftPara +FormatAlignmentRightText .uno:RightPara +FormatAlignmentCenteredText .uno:CenterPara +FormatAlignmentJustifiedText .uno:JustifyPara +FormatReplaceWithTextBox .uno:ConvertToEdit +FormatReplaceWithLabelField .uno:ConvertToFixed +FormatReplaceWithListbox .uno:ConvertToList +FormatReplaceWithCheckbox .uno:ConvertToCheckBox +FormatReplaceWithRadiobutton .uno:ConvertToRadio +FormatReplaceWithGroupbox .uno:ConvertToGroup +FormatReplaceWithCombobox .uno:ConvertToCombo +FormatReplaceWithImageButton .uno:ConvertToImageBtn +FormatReplaceWithFileSelection .uno:ConvertToFileControl +FormatReplaceWithDateField .uno:ConvertToDate +FormatReplaceWithTimeField .uno:ConvertToTime +FormatReplaceWithNumericalField .uno:ConvertToNumeric +FormatReplaceWithCurrencyField .uno:ConvertToCurrency +FormatReplaceWithPatternField .uno:ConvertToPattern +FormatReplaceWithImageControl .uno:ConvertToImageControl +FormatReplaceWithFormattedField .uno:ConvertToFormatted +FormatReplaceWithScrollbar .uno:ConvertToScrollBar +FormatReplaceWithSpinbutton .uno:ConvertToSpinButton ' Formatmenue : Calc -FormatDefaultCalc SID_CELL_FORMAT_RESET -FormatTextCalc SID_DRAWTEXT_ATTR_DLG -FormatPageCalc SID_FORMATPAGE -FormatCells FID_CELL_FORMAT -FormatRowHide FID_ROW_HIDE -FormatRowShow FID_ROW_SHOW -FormatRowHeightCalc FID_ROW_HEIGHT -FormatRowOptimalHeightCalc FID_ROW_OPT_HEIGHT -FormatColumnHide FID_COL_HIDE -FormatColumnWidthCalc FID_COL_WIDTH -FormatColumnShow FID_COL_SHOW -FormatColumnOptimalWidthCalc FID_COL_OPT_WIDTH -FormatSheetHide FID_TABLE_HIDE -FormatSheetShow FID_TABLE_SHOW -FormatSheetRename FID_TAB_MENU_RENAME FID_TAB_RENAME +FormatDefaultCalc .uno:ResetAttributes +FormatTextCalc .uno:TextAttributes +FormatPageCalc .uno:PageFormatDialog +FormatCells .uno:FormatCellDialog +FormatRowHide .uno:HideRow +FormatRowShow .uno:ShowRow +FormatRowHeightCalc .uno:RowHeight +FormatRowOptimalHeightCalc .uno:SetOptimalRowHeight +FormatColumnHide .uno:HideColumn +FormatColumnWidthCalc .uno:ColumnWidth +FormatColumnShow .uno:ShowColumn +FormatColumnOptimalWidthCalc .uno:SetOptimalColumnWidth +FormatSheetHide .uno:Hide +FormatSheetShow .uno:Show +FormatSheetRename .uno:RenameTable .uno:Name FormatSheetRightToLeft .uno:SheetRightToLeft FormatSheetTabColor .uno:SetTabBgColor FormatMergeCells .uno:ToggleMergeCells -FormatPrintRangesRemove SID_DELETE_PRINTAREA -FormatPrintRangesEdit SID_OPENDLG_EDIT_PRINTAREA -FormatPrintRangesDefine SID_DEFINE_PRINTAREA -FormatPrintRangesAdd SID_ADD_PRINTAREA +FormatPrintRangesRemove .uno:DeletePrintArea +FormatPrintRangesEdit .uno:EditPrintArea +FormatPrintRangesDefine .uno:DefinePrintArea +FormatPrintRangesAdd .uno:AddPrintArea FormatAutoformat .uno:AutoFormat -FormatConditionalFormatting SID_OPENDLG_CONDFRMT -FormatAnchorToPageCalc SID_ANCHOR_PAGE -FormatAnchorToCell SID_ANCHOR_CELL -FormatFlipVerticallyCalc SID_MIRROR_VERTICAL -FormatFlipHorizontalCalc SID_MIRROR_HORIZONTAL -FormatArrangeBringToFrontCalc SID_FRAME_TO_TOP -FormatArrangeBringForwardCalc SID_FRAME_UP -FormatArrangeSendBackwardCalc SID_FRAME_DOWN -FormatArrangeSendToBackCalc SID_FRAME_TO_BOTTOM -FormatArrangeToBackgroundCalc SID_OBJECT_HELL -FormatArrangeToForegroundCalc SID_OBJECT_HEAVEN +FormatConditionalFormatting .uno:ConditionalFormatDialog +FormatAnchorToPageCalc .uno:SetAnchorToPage +FormatAnchorToCell .uno:SetAnchorToCell +FormatFlipVerticallyCalc .uno:ObjectMirrorVertical +FormatFlipHorizontalCalc .uno:ObjectMirrorHorizontal +FormatArrangeBringToFrontCalc .uno:BringToFront +FormatArrangeBringForwardCalc .uno:ObjectForwardOne +FormatArrangeSendBackwardCalc .uno:ObjectBackOne +FormatArrangeSendToBackCalc .uno:SendToBack +FormatArrangeToBackgroundCalc .uno:SetObjectToBackground +FormatArrangeToForegroundCalc .uno:SetObjectToForeground FormatAlignmentHorizontalDefaultCalc .uno:CommonAlignHorizontalDefault FormatAlignmentLeftCalc .uno:CommonAlignLeft FormatAlignmentHorizontalCenterCalc .uno:CommonAlignHorizontalCenter @@ -571,45 +571,45 @@ FormatAlignmentJustifiedCalc .uno:CommonAlignJustified FormatAlignmentTopCalc .uno:CommonAlignTop FormatAlignmentverticalCenterCalc .uno:CommonAlignVerticalCenter FormatAlignmentBottomCalc .uno:CommonAlignBottom -FormatAlignmentObjectLeftCalc SID_OBJECT_ALIGN_LEFT -FormatAlignmentObjectCenteredCalc SID_OBJECT_ALIGN_CENTER -FormatAlignmentObjectRightCalc SID_OBJECT_ALIGN_RIGHT -FormatAlignmentObjectTopCalc SID_OBJECT_ALIGN_UP -FormatAlignmentObjectCenterCalc SID_OBJECT_ALIGN_MIDDLE -FormatAlignmentObjectBottomCalc SID_OBJECT_ALIGN_DOWN -FormatGroupGroupCalc SID_GROUP -FormatGroupUngroupCalc SID_UNGROUP -FormatGroupEditGroupCalc SID_ENTER_GROUP -FormatGroupExitGroupCalc SID_LEAVE_GROUP +FormatAlignmentObjectLeftCalc .uno:ObjectAlignLeft +FormatAlignmentObjectCenteredCalc .uno:AlignCenter +FormatAlignmentObjectRightCalc .uno:ObjectAlignRight +FormatAlignmentObjectTopCalc .uno:AlignUp +FormatAlignmentObjectCenterCalc .uno:AlignMiddle +FormatAlignmentObjectBottomCalc .uno:AlignDown +FormatGroupGroupCalc .uno:FormatGroup +FormatGroupUngroupCalc .uno:FormatUngroup +FormatGroupEditGroupCalc .uno:EnterGroup +FormatGroupExitGroupCalc .uno:LeaveGroup FormatPointsCalc .uno:ToggleObjectBezierMode ' **** Draw / Impress -Format3D_Effects SID_3D_WIN +Format3D_Effects .uno:Window3D FormatBullet .uno:OutlineBullet -FormatEditGroupDraw SID_ENTER_GROUP -FormatExitGroupDraw SID_LEAVE_GROUP +FormatEditGroupDraw .uno:EnterGroup +FormatExitGroupDraw .uno:LeaveGroup FormatDefaultFormatting .uno:SetDefault -FormatDimensioning SID_MEASURE_DLG -FormatConnector SID_CONNECTION_DLG +FormatDimensioning .uno:MeasureAttributes +FormatConnector .uno:ConnectorAttributes FormatModifyPage .uno:ModifyPage -FormatNumberingBulletsDraw SID_OUTLINE_BULLET -FormatPage SID_MODIFYPAGE -FormatLayer SID_MODIFYLAYER -FormatModifyLayout SID_PRESENTATION_LAYOUT -FormatGroupDraw SID_GROUP -FormatUngroupDraw SID_UNGROUP -FormatSlideDraw SID_PAGESETUP -FormatStandardDraw SID_SET_DEFAULT +FormatNumberingBulletsDraw .uno:OutlineBullet +FormatPage .uno:ModifyPage +FormatLayer .uno:ModifyLayer +FormatModifyLayout .uno:PresentationLayout +FormatGroupDraw .uno:FormatGroup +FormatUngroupDraw .uno:FormatUngroup +FormatSlideDraw .uno:PageSetup +FormatStandardDraw .uno:SetDefault FormatSlideDesign .uno:PresentationLayout FormatStylesFormatting .uno:DesignerDialog FormatTransform .uno:TransformDialog FormatTransliterate .uno:TransliterateMenu FormatText .uno:TextAttributes -FormatTextDraw SID_TEXTATTR_DLG +FormatTextDraw .uno:TextAttributes FormatCropPicture .uno:GrafAttrCrop ' **** Chart -'FormatStandardChart SID_SET_DEFAULT +'FormatStandardChart .uno:SetDefault FormatObjectProperties .uno:DiagramObjects FormatPositionAndSizeChart .uno:TransformDialog FormatArrangement .uno:ArrangeRow @@ -648,32 +648,32 @@ FormatDataRanges .uno:DataRanges Format3DView .uno:View3D FormatSelection .uno:FormatSelection ' **** Math -FormatFonts SID_FONT -FormatFontSize SID_FONTSIZE -FormatSpacing SID_DISTANCE -FormatAlignment SID_ALIGN -FormatTextMode SID_TEXTMODE +FormatFonts .uno:ChangeFont +FormatFontSize .uno:ChangeFontSize +FormatSpacing .uno:ChangeDistance +FormatAlignment .uno:ChangeAlignment +FormatTextMode .uno:Textmode ' *********** Table Menu / Writer ****************************** TableInsertTable .uno:InsertTable TableInsertRowDialog .uno:InsertRowDialog TableInsertColumnDialog .uno:InsertColumnDialog -TableCellSplit FN_TABLE_SPLIT_CELLS -TableCellTop FN_TABLE_VERT_NONE -TableCellCenter FN_TABLE_VERT_CENTER -TableCellBottom FN_TABLE_VERT_BOTTOM -TableCellProtect FN_TABLE_SET_READ_ONLY_CELLS -TableCellUnprotect FN_TABLE_UNSET_READ_ONLY_CELLS +TableCellSplit .uno:SplitCell +TableCellTop .uno:CellVertTop +TableCellCenter .uno:CellVertCenter +TableCellBottom .uno:CellVertBottom +TableCellProtect .uno:Protect +TableCellUnprotect .uno:UnsetCellsReadOnly TableDeleteTable .uno:DeleteTable TableDeleteRows .uno:DeleteRows -TableDeleteColumn FN_TABLE_DELETE_COL +TableDeleteColumn .uno:DeleteColumns TableDeleteColumns .uno:DeleteColumns -TableSelectColumn FN_TABLE_SELECT_COL +TableSelectColumn .uno:EntireColumn TableSelectTable .uno:SelectTable TableSelectEntireRow .uno:EntireRow TableSelectEntireColumn .uno:EntireColumn TableSelectEntireCell .uno:EntireCell -TableMergeCell FN_TABLE_MERGE_CELLS +TableMergeCell .uno:MergeCells TableMergeTable .uno:MergeTable TableMergeCells .uno:MergeCells TableSplitCell .uno:SplitCell @@ -700,13 +700,13 @@ TableProperties .uno:TableDialog ' **** ' **** All applications ToolsSpellcheck .uno:SpellDialog -ToolsSpellcheckAutoSpellcheck SID_AUTOSPELL_CHECK +ToolsSpellcheckAutoSpellcheck .uno:SpellOnline ToolsLanguageHangulHanjaConversion .uno:HangulHanjaConversion ToolsLanguageChineseTranslation .uno:ChineseConversion ToolsLanguageThesaurus .uno:ThesaurusDialog -ToolsLanguageHyphenate FN_HYPHENATE_OPT_DLG -ToolsAutocorrect SID_AUTO_CORRECT_DLG -ToolsXMLFilterSettings SID_OPEN_XML_FILTERSETTINGS +ToolsLanguageHyphenate .uno:Hyphenate +ToolsAutocorrect .uno:AutoCorrectDlg +ToolsXMLFilterSettings .uno:OpenXMLFilterSettings ToolsMacro .uno:MacroDialog ToolsMacroMacro .uno:MacroDialog ToolsMacrosRunMacro .uno:RunMacro @@ -715,186 +715,186 @@ ToolsMacrosOrganizeMacrosJavaScript .uno:ScriptOrganizer?ScriptOrganizer.Languag ToolsMacrosOrganizeMacrosPython .uno:ScriptOrganizer?ScriptOrganizer.Language:string=Python ToolsMacrosOrganizeDialogs .uno:MacroOrganizer?TabId:short=1 ToolsMacrosSignature .uno:MacroSignature -ToolsMacroRecordMacro SID_RECORDMACRO -ToolsCustomize SID_CONFIG -ToolsOptions SID_OPTIONS_TREEDIALOG +ToolsMacroRecordMacro .uno:MacroRecorder +ToolsCustomize .uno:ConfigureDialog +ToolsOptions .uno:OptionsTreeDialog ToolsPackagemanager service:com.sun.star.deployment.ui.PackageManagerDialog ToolsMailMergeWizard .uno:MailMergeWizard ' **** Writer ToolsSpellcheckWriter .uno:SpellingAndGrammarDialog -ToolsOutlineNumbering FN_NUMBERING_OUTLINE_DLG -ToolsLineNumbering FN_LINE_NUMBERING_DLG -ToolsPageNumber FN_CHANGE_PAGENUM -ToolsFootnote FN_FORMAT_FOOTNOTE_DLG -ToolsTextInTable FN_CONVERT_TEXT_TABLE -ToolsSort FN_SORTING_DLG -ToolsCalculate FN_CALCULATE -ToolsUpdateUpdateAll FN_UPDATE_ALL -ToolsUpdateFields FN_UPDATE_FIELDS -ToolsUpdateLinks FN_UPDATE_ALL_LINKS -ToolsUpdateCurrentIndex FN_UPDATE_CUR_TOX -ToolsUpdateAllIndexes FN_UPDATE_TOX -ToolsBibliographyDatabase SID_COMP_BIBLIOGRAPHY -ToolsWordCount FN_WORDCOUNT_DIALOG +ToolsOutlineNumbering .uno:ChapterNumberingDialog +ToolsLineNumbering .uno:LineNumberingDialog +ToolsPageNumber .uno:PageOffset +ToolsFootnote .uno:FootnoteDialog +ToolsTextInTable .uno:ConvertTableText +ToolsSort .uno:SortDialog +ToolsCalculate .uno:CalculateSel +ToolsUpdateUpdateAll .uno:UpdateAll +ToolsUpdateFields .uno:UpdateFields +ToolsUpdateLinks .uno:UpdateAllLinks +ToolsUpdateCurrentIndex .uno:UpdateCurIndex +ToolsUpdateAllIndexes .uno:UpdateAllIndexes +ToolsBibliographyDatabase .uno:BibliographyComponent +ToolsWordCount .uno:WordCountDialog TableTableProperties .uno:TableDialog -ToolsLanguageHyphenation FN_HYPHENATE_OPT_DLG +ToolsLanguageHyphenation .uno:Hyphenate ' **** WriterWeb -ToolsPageFormatting FN_REPAGINATE +ToolsPageFormatting .uno:Repaginate ' **** Calc -ToolsSpellcheckAutoCheckCalc SID_AUTOSPELL_CHECK +ToolsSpellcheckAutoCheckCalc .uno:SpellOnline ToolsLanguageHyphenateCalc .uno:Hyphenate -ToolsDetectiveRemoveAllTraces SID_DETECTIVE_DEL_ALL -ToolsDetectiveFillMode SID_DETECTIVE_FILLMODE -ToolsDetectiveTraceError SID_DETECTIVE_ADD_ERR -ToolsDetectiveTraceDependents SID_DETECTIVE_ADD_SUCC -ToolsDetectiveRemoveDependents SID_DETECTIVE_DEL_SUCC -ToolsDetectiveTracePrecedents SID_DETECTIVE_ADD_PRED -ToolsDetectiveRemovePrecedents SID_DETECTIVE_DEL_PRED -ToolsDetectiveMarkInvalidData SID_DETECTIVE_INVALID SID_FILL_SELECT +ToolsDetectiveRemoveAllTraces .uno:ClearArrows +ToolsDetectiveFillMode .uno:AuditingFillMode +ToolsDetectiveTraceError .uno:ShowErrors +ToolsDetectiveTraceDependents .uno:ShowDependents +ToolsDetectiveRemoveDependents .uno:ClearArrowDependents +ToolsDetectiveTracePrecedents .uno:ShowPrecedents +ToolsDetectiveRemovePrecedents .uno:ClearArrowPrecedents +ToolsDetectiveMarkInvalidData .uno:ShowInvalid .uno:FillModeSelect ToolsDetectiveRefreshTraces .uno:RefreshArrows -ToolsDetectiveAutoUpdate SID_DETECTIVE_AUTO +ToolsDetectiveAutoUpdate .uno:AutoRefreshArrows ToolsSolver .uno:SolverDialog -ToolsGoalSeek SID_OPENDLG_SOLVE -ToolsScenarios SID_SCENARIOS -ToolsProtectDocumentDocument FID_PROTECT_DOC -ToolsProtectDocumentSheet FID_PROTECT_TABLE -ToolsCellContentsRecalculate FID_RECALC -ToolsCellContentsAutoCalculate FID_AUTO_CALC -ToolsCellContentsAutoInput FID_AUTOCOMPLETE +ToolsGoalSeek .uno:GoalSeekDialog +ToolsScenarios .uno:ScenarioManager +ToolsProtectDocumentDocument .uno:ToolProtectionDocument +ToolsProtectDocumentSheet .uno:Protect +ToolsCellContentsRecalculate .uno:Calculate +ToolsCellContentsAutoCalculate .uno:AutomaticCalculation +ToolsCellContentsAutoInput .uno:AutoComplete ' **** Draw / Impress ToolsGallery .uno:Gallery -ToolsEyedropper SID_BMPMASK +ToolsEyedropper .uno:BmpMask ToolsMediaPlayer .uno:AVMediaPlayer ToolsChineseTranslation .uno:ChineseConversion -ToolsLanguageHyphenationDraw SID_HYPHENATION +ToolsLanguageHyphenationDraw .uno:Hyphenation ' **** Math -ToolsSymbolsCatalog SID_SYMBOLS_CATALOGUE -ToolsImportFormula SID_INSERT_FORMULA +ToolsSymbolsCatalog .uno:SymbolCatalogue +ToolsImportFormula .uno:InsertFormula ' ****************************************** ' *********** Slide Show Menu ************ ' **** -SlideShowSlideshow SID_PRESENTATION -SlideShowPresentationSettings SID_PRESENTATION_DLG -SlideShowRehearseTimings SID_REHEARSE_TIMINGS +SlideShowSlideshow .uno:Presentation +SlideShowPresentationSettings .uno:PresentationDialog +SlideShowRehearseTimings .uno:RehearseTimings SlideShowInteraction .uno:AnimationEffects SlideShowAnimation .uno:CustomAnimation SlideShowSlideTransition .uno:SlideChangeWindow -SlideShowHideSlide SID_HIDE_SLIDE -SlideShowShowSlide SID_SHOW_SLIDE -SlideShowCustomSlideshow SID_CUSTOMSHOW_DLG +SlideShowHideSlide .uno:HideSlide +SlideShowShowSlide .uno:ShowSlide +SlideShowCustomSlideshow .uno:CustomShowDialog SlideShowCustomAnimation .uno:CustomAnimation ' *********************************** ' *********** Datamenu ************ ' **** ' **** Calc -DataSelectRange SID_SELECT_DB -DataDefineRange SID_DEFINE_DBNAME -DataSort SID_SORT -DataFilterAutoFilter SID_AUTO_FILTER -DataFilterHideAutoFilter SID_AUTOFILTER_HIDE -DataFilterRemoveFilter SID_UNFILTER -DataFilterAdvancedFilter SID_SPECIAL_FILTER -DataFilterStandardFilter SID_FILTER -DataSubtotals SID_SUBTOTALS -DataValidity FID_VALIDATION +DataSelectRange .uno:SelectDB +DataDefineRange .uno:DefineDBName +DataSort .uno:DataSort +DataFilterAutoFilter .uno:DataFilterAutoFilter +DataFilterHideAutoFilter .uno:DataFilterHideAutoFilter +DataFilterRemoveFilter .uno:DataFilterRemoveFilter +DataFilterAdvancedFilter .uno:DataFilterSpecialFilter +DataFilterStandardFilter .uno:DataFilterStandardFilter +DataSubtotals .uno:DataSubTotals +DataValidity .uno:Validation DataTextToColumns .uno:TextToColumns -DataDataPilotStart SID_OPENDLG_PIVOTTABLE -DataMultipleOperations SID_OPENDLG_TABOP -DataConsolidate SID_OPENDLG_CONSOLIDATE -DataOutlineAutoOutline SID_AUTO_OUTLINE -DataOutlineHideDetails SID_OUTLINE_HIDE -DataOutlineShowDetails SID_OUTLINE_SHOW -DataOutlineRemove SID_OUTLINE_DELETEALL -DataOutlineGroup SID_OUTLINE_MAKE -DataOutlineUngroup SID_OUTLINE_REMOVE -DataDataPilotRefresh SID_PIVOT_RECALC -DataDataPilotDelete SID_PIVOT_KILL -DataRefreshRange SID_REFRESH_DBAREA +DataDataPilotStart .uno:DataDataPilotRun +DataMultipleOperations .uno:TableOperationDialog +DataConsolidate .uno:DataConsolidate +DataOutlineAutoOutline .uno:AutoOutline +DataOutlineHideDetails .uno:HideDetail +DataOutlineShowDetails .uno:ShowDetail +DataOutlineRemove .uno:ClearOutline +DataOutlineGroup .uno:Group +DataOutlineUngroup .uno:Ungroup +DataDataPilotRefresh .uno:RecalcPivotTable +DataDataPilotDelete .uno:DeletePivotTable +DataRefreshRange .uno:DataAreaRefresh ' *********************************** ' ********** Modify Menu *********** ' **** ' **** Draw -ModifyRotate SID_OBJECT_ROTATE -ContextPositionAndSize SID_ATTR_TRANSFORM -ContextFlipVerticalDraw SID_VERTICAL -ContextFlipHorizontalDraw SID_HORIZONTAL -ContextConvertIntoCurve SID_CHANGEBEZIER -ContextConvertIntoPolygon SID_CHANGEPOLYGON -ContextConvertIntoContour SID_CONVERT_TO_CONTOUR -ContextConvertInto3D SID_CONVERT_TO_3D -ContextConvertInto3DRotationObject SID_CONVERT_TO_3D_LATHE_FAST -ContextConvertIntoMetafile SID_CONVERT_TO_METAFILE -ContextConvertIntoBitmap SID_CONVERT_TO_BITMAP -ContextArrangeBringToFront SID_FRAME_TO_TOP -ContextArrangeBringForward SID_MOREFRONT -ContextArrangeBringBackward SID_MOREBACK -ContextArrangeSendToBack SID_FRAME_TO_BOTTOM -ContextArrangeInFrontOfObject SID_BEFORE_OBJ -ContextArrangeBehindObject SID_BEHIND_OBJ -ContextArrangeReverse SID_REVERSE_ORDER -ContextDistribution SID_DISTRIBUTE_DLG -ContextAlignmentLeft SID_OBJECT_ALIGN_LEFT -ContextAlignmentCentered SID_OBJECT_ALIGN_CENTER -ContextAlignmentRight SID_OBJECT_ALIGN_RIGHT -ContextAlignmentTop SID_OBJECT_ALIGN_UP -ContextAlignmentCenter SID_OBJECT_ALIGN_MIDDLE -ContextAlignmentBottom SID_OBJECT_ALIGN_DOWN +ModifyRotate .uno:ToggleObjectRotateMode +ContextPositionAndSize .uno:TransformDialog +ContextFlipVerticalDraw .uno:MirrorVert +ContextFlipHorizontalDraw .uno:MirrorHorz +ContextConvertIntoCurve .uno:ChangeBezier +ContextConvertIntoPolygon .uno:ChangePolygon +ContextConvertIntoContour .uno:convert_to_contour +ContextConvertInto3D .uno:ConvertInto3D +ContextConvertInto3DRotationObject .uno:ConvertInto3DLatheFast +ContextConvertIntoMetafile .uno:ConvertIntoMetaFile +ContextConvertIntoBitmap .uno:ConvertIntoBitmap +ContextArrangeBringToFront .uno:BringToFront +ContextArrangeBringForward .uno:Forward +ContextArrangeBringBackward .uno:Backward +ContextArrangeSendToBack .uno:SendToBack +ContextArrangeInFrontOfObject .uno:BeforeObject +ContextArrangeBehindObject .uno:BehindObject +ContextArrangeReverse .uno:ReverseOrder +ContextDistribution .uno:DistributeSelection +ContextAlignmentLeft .uno:ObjectAlignLeft +ContextAlignmentCentered .uno:AlignCenter +ContextAlignmentRight .uno:ObjectAlignRight +ContextAlignmentTop .uno:AlignUp +ContextAlignmentCenter .uno:AlignMiddle +ContextAlignmentBottom .uno:AlignDown ContextDescriptionObject .uno:ObjectTitleDescription -ContextNameObject SID_NAME_GROUP -ContextFontwork SID_FONTWORK -ContextEyedropper SID_BMPMASK -ContextGroup SID_GROUP -ContextUngroup SID_UNGROUP -ContextEnterGroup SID_ENTER_GROUP -ContextExitGroup SID_LEAVE_GROUP -ContextCombine SID_COMBINE -ContextSplit SID_DISMANTLE -ContextConnect SID_CONNECT -ContextBreak SID_BREAK -ModifyShapesMerge SID_POLY_MERGE -ModifyShapesSubstract SID_POLY_SUBSTRACT -ModifyShapesIntersect SID_POLY_INTERSECT -ContextOpenHyperlink SID_OPEN_HYPERLINK +ContextNameObject .uno:NameGroup +ContextFontwork .uno:FontWork +ContextEyedropper .uno:BmpMask +ContextGroup .uno:FormatGroup +ContextUngroup .uno:FormatUngroup +ContextEnterGroup .uno:EnterGroup +ContextExitGroup .uno:LeaveGroup +ContextCombine .uno:Combine +ContextSplit .uno:Dismantle +ContextConnect .uno:Connect +ContextBreak .uno:Break +ModifyShapesMerge .uno:Merge +ModifyShapesSubstract .uno:Substract +ModifyShapesIntersect .uno:Intersect +ContextOpenHyperlink .uno:OpenHyperlinkOnCursor ' *********************************** ' ********** Windows *********** ' **** ' **** All applications -WindowNewWindow SID_NEWWINDOW +WindowNewWindow .uno:NewWindow WindowCloseWindow .uno:CloseWin ' **** Calc -WindowSplit SID_WINDOW_SPLIT -WindowFreeze SID_WINDOW_FIX +WindowSplit .uno:SplitWindow +WindowFreeze .uno:FreezePanes ' *********************************** ' *********** Help Menu ************ ' **** ' **** All applications -HelpContents SID_HELPINDEX +HelpContents .uno:HelpIndex HelpWhatsThis .uno:ExtendedHelp -HelpHelpAgent SID_HELP_PI -HelpTips SID_HELPTIPS -HelpExtendedTips SID_HELPBALLOONS -HelpEntendedHelp SID_HELPBALLOONS +HelpHelpAgent .uno:HelperDialog +HelpTips .uno:HelpTip +HelpExtendedTips .uno:ActiveHelp +HelpEntendedHelp .uno:ActiveHelp HelpCheckForUpdates sym:vnd.sun.star.job:alias=UpdateCheck -HelpAboutStarOffice SID_ABOUT +HelpAboutStarOffice .uno:About HelpPurchaseStarOffice service:com.sun.star.tab.tabreg?purchase ' **************************************** ' *** Special Slots for Spreadsheet component *** ' **** ' **** Spreadsheet component -SpreadsheetEuroConverter SID_EURO_CONVERTER -ContextNameObjectCalc SID_RENAME_OBJECT +SpreadsheetEuroConverter .uno:EuroConverter +ContextNameObjectCalc .uno:RenameObject ' **************************************** ' *** UNO Slots for Database component *** @@ -957,7 +957,7 @@ MigrateMacros .uno:DBMigrateScripts ' ******************************** ' *** UNO Slots for Basic IDE *** ' **** -ContextProperties SID_SHOW_PROPERTYBROWSER +ContextProperties .uno:ShowPropBrowser ' Crash the office, allows to provide an automated test for the crash reporter Crash .uno:Crash diff --git a/testautomation/global/sid/others.sid b/testautomation/global/sid/others.sid index 77bc4dc15283..54fe659484e3 100644 --- a/testautomation/global/sid/others.sid +++ b/testautomation/global/sid/others.sid @@ -4,37 +4,37 @@ ' *************************************************** ' ** to create a new document -NeuDirekt SID_NEWDOCDIRECT -NewDirect SID_NEWDOCDIRECT +NeuDirekt .uno:AddDirect +NewDirect .uno:AddDirect ' ** slots for file import -FileName SID_FILE_NAME +FileName .uno:FileName FilterName SID_FILTER_NAME ' ** slots for file printing -PrinterName SID_PRINTER_NAME +PrinterName .uno:Printer ' ** to jump to a new table in calc -GeheZuTabelle SID_CURRENTTAB -GeheZuZelle SID_CURRENTCELL -GeheZuDokument SID_CURRENTDOC -GeheZuObjekt SID_CURRENTOBJECT -GoToTable SID_CURRENTTAB -GoToCell SID_CURRENTCELL -GoToDocument SID_CURRENTDOC -GoToObject SID_CURRENTOBJECT +GeheZuTabelle .uno:JumpToTable +GeheZuZelle .uno:GoToCell +GeheZuDokument .uno:GotoDocument +GeheZuObjekt .uno:GoToObject +GoToTable .uno:JumpToTable +GoToCell .uno:GoToCell +GoToDocument .uno:GotoDocument +GoToObject .uno:GoToObject ' ** activate OLE-Object -CalcOLEAktivieren SID_OLE_ACTIVATE -CalcOLEDeaktivieren SID_OLE_DEACTIVATE -CalcActivateOLE SID_OLE_ACTIVATE -CalcDeactivateOLE SID_OLE_DEACTIVATE +CalcOLEAktivieren .uno:ActivateOLE +CalcOLEDeaktivieren .uno:Deactivate +CalcActivateOLE .uno:ActivateOLE +CalcDeactivateOLE .uno:Deactivate ' ** show office version -GetVersion SID_VERSION_VISIBLE +GetVersion .uno:VersionVisible ' ** Load / Save -IsDocImageLoading SID_IMG_LOADING -IsDocLoading SID_DOC_LOADING -IsDocSaving SID_DOC_SAVED +IsDocImageLoading .uno:IsLoadingImages +IsDocLoading .uno:IsLoading +IsDocSaving .uno:Saved diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win old mode 100755 new mode 100644 index f2c40134d964..cfcd7548ff1c --- a/testautomation/global/win/bars.win +++ b/testautomation/global/win/bars.win @@ -57,16 +57,16 @@ Zentriert .uno:AlignCenter '------------------------------------------------------------------------- *Arrowsbar .HelpId:arrowsbar '------------------------------------------------------------------------- -LinieMitKreisPfeilende SID_LINE_CIRCLE_ARROW -LinieMitPfeilKreisende SID_LINE_ARROW_CIRCLE -LinieMitPfeilQuadratende SID_LINE_ARROW_SQUARE -LinieMitPfeilanfang SID_LINE_ARROW_START -LinieMitPfeilende SID_LINE_ARROW_END -LinieMitPfeilenden SID_LINE_ARROWS -LinieMitQuadratKreisende SID_LINE_SQUARE_ARROW -LinieWinkel SID_DRAW_XLINE -LinieZeichnen SID_DRAW_LINE -Masslinie SID_DRAW_MEASURELINE +LinieMitKreisPfeilende .uno:LineCircleArrow +LinieMitPfeilKreisende .uno:LineArrowCircle +LinieMitPfeilQuadratende .uno:LineArrowSquare +LinieMitPfeilanfang .uno:LineArrowStart +LinieMitPfeilende .uno:LineArrowEnd +LinieMitPfeilenden .uno:LineArrows +LinieMitQuadratKreisende .uno:LineSquareArrow +LinieWinkel .uno:Line_Diagonal +LinieZeichnen .uno:Line +Masslinie .uno:MeasureLine '------------------------------------------------------------------------- *Arrowshapes .HelpId:arrowshapes '------------------------------------------------------------------------- @@ -149,7 +149,7 @@ Line3 .uno:CalloutShapes.line-callout-3 *ChooseModebar .HelpId:choosemodebar '------------------------------------------------------------------------- Drehen .uno:ToggleObjectRotateMode -GluePoints SID_GLUE_EDITMODE +GluePoints .uno:GlueEditMode Rotationskoerper .uno:ConvertInto3DLathe SetzenAufKreisPerspektivisch .uno:CrookRotate SetzenAufKreisSchraeggestellt .uno:CrookSlant @@ -209,21 +209,21 @@ Vpfeile .uno:ConnectorArrows '------------------------------------------------------------------------- *DBQueryBrowsebar .HelpID:browserobjectbar '------------------------------------------------------------------------- -ApplyFilter SID_FM_FORM_FILTERED -Autofilter SID_FM_AUTOFILTER -CloseDoc SID_CLOSEWIN -DataToText SID_SBA_BRW_INSERT -DefaultFilter SID_FM_FILTERCRIT -Edit SID_EDITDOC -Explorer SID_DSBROWSER_EXPLORER -Refresh SID_FM_REFRESH -RemoveFilter SID_FM_REMOVE_FILTER_SORT -SaveNewDataEntry HID_BROWSER_SAVE_RECORD -Search SID_FM_SEARCH -SortAscending SID_FM_SORTUP -SortDescending SID_FM_SORTDOWN -SortOrder SID_FM_ORDERCRIT -Undo HID_BROWSER_UNDO_RECORD +ApplyFilter .uno:FormFiltered +Autofilter .uno:AutoFilter +CloseDoc .uno:CloseWin +DataToText .uno:SbaBrwInsert +DefaultFilter .uno:FilterCrit +Edit .uno:EditDoc +Explorer .uno:DSBrowserExplorer +Refresh .uno:Refresh +RemoveFilter .uno:RemoveFilterSort +SaveNewDataEntry DBACCESS_HID_BROWSER_SAVE_RECORD +Search .uno:RecSearch +SortAscending .uno:Sortup +SortDescending .uno:SortDown +SortOrder .uno:OrderCrit +Undo DBACCESS_HID_BROWSER_UNDO_RECORD '------------------------------------------------------------------------- *Designobjectbar .HelpId:designobjectbar '------------------------------------------------------------------------- @@ -248,7 +248,7 @@ Linie .uno:Line Polygon .uno:Polygon_Unfilled Rechteck .uno:Rect Textobjekt .uno:DrawText -Toolbox SID_DRAW_SELECT +Toolbox .uno:DrawSelect VerticalCallout .uno:VerticalCaption VerticalText .uno:VerticalText LineArrowEnd .uno:LineArrowEnd @@ -291,8 +291,8 @@ Absatzformat .uno:ParagraphDialog '------------------------------------------------------------------------- *DrawingObjectbar .HelpId:drawingobjectbar '------------------------------------------------------------------------- -AreaFilling HID_FILL_ATTR_LISTBOX -AreaStyle HID_FILL_TYPE_LISTBOX +AreaFilling SVX_HID_FILL_ATTR_LISTBOX +AreaStyle SVX_HID_FILL_TYPE_LISTBOX Ausrichtung .uno:ObjectAlign Drehen .uno:ToggleObjectRotateMode Flaeche .uno:FormatArea @@ -308,7 +308,7 @@ Linienbreite .uno:LineWidth Linienendenstil .uno:LineEndStyle Linienfarbe .uno:XLineColor Linienstil .uno:XLineStyle -PunkteBearbeiten SID_BEZIER_EDIT +PunkteBearbeiten .uno:ToggleObjectBezierMode Schatten .uno:FillShadow DesignerDialog .uno:DesignerDialog VerankerungWechseln .uno:ToggleAnchorType @@ -327,21 +327,21 @@ Group .uno:FormatGroup '------------------------------------------------------------------------- *Ellipsesbar .HelpId:ellipsesbar '------------------------------------------------------------------------- -EllipseLeer SID_DRAW_ELLIPSE_NOFILL -EllipseVoll SID_DRAW_ELLIPSE -Ellipsen SID_DRAWTBX_ELLIPSES -EllipsenabschnittLeer SID_DRAW_ELLIPSECUT_NOFILL -EllipsenabschnittVoll SID_DRAW_ELLIPSECUT -Ellipsenbogen SID_DRAW_ARC -EllipsensegmentLeer SID_DRAW_PIE_NOFILL -EllipsensegmentVoll SID_DRAW_PIE -KreisLeer SID_DRAW_CIRCLE_NOFILL -KreisVoll SID_DRAW_CIRCLE -KreisabschnittLeer SID_DRAW_CIRCLECUT_NOFILL -KreisabschnittVoll SID_DRAW_CIRCLECUT -Kreisbogen SID_DRAW_CIRCLEARC -KreissegmentLeer SID_DRAW_CIRCLEPIE_NOFILL -KreissegmentVoll SID_DRAW_CIRCLEPIE +EllipseLeer .uno:Ellipse_Unfilled +EllipseVoll .uno:Ellipse +Ellipsen .uno:EllipseToolbox +EllipsenabschnittLeer .uno:EllipseCut_Unfilled +EllipsenabschnittVoll .uno:EllipseCut +Ellipsenbogen .uno:Arc +EllipsensegmentLeer .uno:Pie_Unfilled +EllipsensegmentVoll .uno:Pie +KreisLeer .uno:Circle_Unfilled +KreisVoll .uno:Circle +KreisabschnittLeer .uno:CircleCut_Unfilled +KreisabschnittVoll .uno:CircleCut +Kreisbogen .uno:CircleArc +KreissegmentLeer .uno:CirclePie_Unfilled +KreissegmentVoll .uno:CirclePie '------------------------------------------------------------------------- *ExtrusionObjectBar .HelpId:extrusionobjectbar '------------------------------------------------------------------------- @@ -590,22 +590,22 @@ ObjectAlign .uno:ObjectAlign *FrameObjectbar .HelpId:frameobjectbar '------------------------------------------------------------------------- Durchlauf .uno:WrapThrough -EigenschaftenControls SID_SHOW_BROWSER +EigenschaftenControls .uno:ShowBrowser EigenschaftenObjekt .uno:FrameDialog GanzNachHinten .uno:SendToBack GanzNachVorn .uno:BringToFront Hintergrundfarbe .uno:BackgroundColor -Hintergrundmuster SID_BACKGROUND_PATTERN -HorizontalSpiegeln FN_FLIP_HORZ_GRAFIC -InDenHintergrund SID_OBJECT_HELL -InDenVordergrund SID_OBJECT_HEAVEN +Hintergrundmuster .uno:BackgroundPatternController +HorizontalSpiegeln .uno:FlipHorizontal +InDenHintergrund .uno:SetObjectToBackground +InDenVordergrund .uno:SetObjectToForeground LinienFarbe .uno:FrameLineColor Linienstil .uno:LineStyle Links .uno:AlignLeft Mitte .uno:AlignVerticalCenter NoWrap .uno:WrapOff Oben .uno:AlignTop -PositionUndGroesse SID_ATTR_TRANSFORM +PositionUndGroesse .uno:TransformDialog Rechts .uno:AlignRight UmlaufDynamisch .uno:WrapIdeal UmlaufLinks .uno:WrapLeft @@ -615,7 +615,7 @@ Unten .uno:AlignBottom Verankerungwechseln .uno:ToggleAnchorType Verketten .uno:ChainFrames VerkettungLoesen .uno:UnhainFrames -VertikalSpiegeln FN_FLIP_VERT_GRAFIC +VertikalSpiegeln .uno:FlipVertical Vorlage .uno:StyleApply Wrap .uno:WrapOn Zentriert .uno:AlignHorizontalCenter @@ -656,56 +656,56 @@ FrameDialog .uno:FrameDialog BringToFront .uno:BringToFront SendToBack .uno:SendToBack ToggleAnchorType .uno:ToggleAnchorType -AreaFilling HID_FILL_ATTR_LISTBOX -AreaStyle HID_FILL_TYPE_LISTBOX -Ausrichtung SID_OBJECT_ALIGN +AreaFilling SVX_HID_FILL_ATTR_LISTBOX +AreaStyle SVX_HID_FILL_TYPE_LISTBOX +Ausrichtung .uno:ObjectAlign Blauanteil .uno:GrafBlue ColorSettings .uno:ColorSettings Crop .uno:Crop -Drehen SID_OBJECT_ROTATE -Durchlauf FN_FRAME_WRAPTHRU -EigenschaftenControls SID_SHOW_BROWSER -EigenschaftenObjekt FN_FORMAT_FRAME_DLG +Drehen .uno:ToggleObjectRotateMode +Durchlauf .uno:WrapThrough +EigenschaftenControls .uno:ShowBrowser +EigenschaftenObjekt .uno:FrameDialog Filter .uno:GraphicFilterToolbox Flaeche .uno:FormatArea -Flaechenfarbe SID_ATTR_FILL_STYLE -Flaechenstil SID_ATTR_FILL_STYLE +Flaechenfarbe .uno:FillStyle +Flaechenstil .uno:FillStyle Gamma .uno:GrafGamma -GanzNachHinten SID_FRAME_TO_BOTTOM -GanzNachVorn SID_FRAME_TO_TOP -GrafikEigenschaften FN_FORMAT_GRAFIC_DLG +GanzNachHinten .uno:SendToBack +GanzNachVorn .uno:BringToFront +GrafikEigenschaften .uno:GraphicDialog Grafikmodus .uno:GrafMode Gruenanteil .uno:GrafGreen Helligkeit .uno:GrafLuminance -Hintergrundfarbe SID_BACKGROUND_COLOR -Hintergrundmuster SID_BACKGROUND_PATTERN +Hintergrundfarbe .uno:BackgroundColor +Hintergrundmuster .uno:BackgroundPatternController HorizontalSpiegeln .uno:FlipHorizontal -ImageMapEditor SID_IMAP -InDenHintergrund SID_OBJECT_HELL -InDenVordergrund SID_OBJECT_HEAVEN -KeinUmlauf FN_FRAME_NOWRAP +ImageMapEditor .uno:ImageMapDialog +InDenHintergrund .uno:SetObjectToBackground +InDenVordergrund .uno:SetObjectToForeground +KeinUmlauf .uno:WrapOff Kontrast .uno:GrafContrast Linie .uno:FormatLine -Linienbreite SID_ATTR_LINE_WIDTH -Linienendenstil SID_ATTR_LINEEND_STYLE -Linienfarbe SID_ATTR_LINE_COLOR -Linienstil SID_ATTR_LINE_STYLE -Links FN_FRAME_ALIGN_HORZ_LEFT -Mitte FN_FRAME_ALIGN_VERT_CENTER -Oben FN_FRAME_ALIGN_VERT_TOP -PositionUndGroesse SID_ATTR_TRANSFORM -PunkteBearbeiten SID_BEZIER_EDIT -Rechts FN_FRAME_ALIGN_HORZ_RIGHT +Linienbreite .uno:LineWidth +Linienendenstil .uno:LineEndStyle +Linienfarbe .uno:XLineColor +Linienstil .uno:XLineStyle +Links .uno:AlignLeft +Mitte .uno:AlignVerticalCenter +Oben .uno:AlignTop +PositionUndGroesse .uno:TransformDialog +PunkteBearbeiten .uno:ToggleObjectBezierMode +Rechts .uno:AlignRight Rotanteil .uno:GrafRed Schatten .uno:FillShadow Transparenz .uno:GrafTransparence -Umlauf FN_FRAME_WRAP -UmlaufLinks FN_FRAME_WRAP_LEFT -UmlaufRechts FN_FRAME_WRAP_RIGHT -Umrandung SID_ATTR_BORDER -Unten FN_FRAME_ALIGN_VERT_BOTTOM +Umlauf .uno:WrapOn +UmlaufLinks .uno:WrapLeft +UmlaufRechts .uno:WrapRight +Umrandung .uno:SetBorderStyle +Unten .uno:AlignBottom VertikalSpiegeln .uno:FlipVertical -Zentriert FN_FRAME_ALIGN_HORZ_CENTER +Zentriert .uno:AlignHorizontalCenter InsertGraphic .uno:InsertGraphic '------------------------------------------------------------------------- *GraphicFilterBar .HelpId:graffilterbar @@ -722,14 +722,14 @@ CharcoalSketch .uno:GraphicFilterSobel Relief .uno:GraphicFilterRelief Mosaic .uno:GraphicFilterMosaic '------------------------------------------------------------------------- -*Hyperlinkleiste HID_OFA_HYPERLINK_DLG +*Hyperlinkleiste SVX_HID_OFA_HYPERLINK_DLG '------------------------------------------------------------------------- -Frame HID_OFA_HYPERLINK_TARGET -Link SID_HYPERLINK_SETLINK -Suchen HID_OFA_HYPERLINK_SEARCH -UrlAdresse HID_OFA_HYPERLINK_URL -UrlName HID_OFA_HYPERLINK_NAME -Verknuepfung SID_CREATELINK +Frame SVX_HID_OFA_HYPERLINK_TARGET +Link .uno:SetHyperlink +Suchen SVX_HID_OFA_HYPERLINK_SEARCH +UrlAdresse SVX_HID_OFA_HYPERLINK_URL +UrlName SVX_HID_OFA_HYPERLINK_NAME +Verknuepfung .uno:AddBookmark '------------------------------------------------------------------------- *Insertbar .HelpId:insertbar '------------------------------------------------------------------------- @@ -743,13 +743,13 @@ Frame .uno:InsertObjectFloatingFrame Fussnote .uno:InsertFootnote Grafik .uno:InsertGraphic InsertSpreadsheet .uno:InsertSpreadsheet -MehrspaltigeRahmen FN_INSERT_FRAME +MehrspaltigeRahmen .uno:InsertFrame OLEObjekt .uno:InsertObject Plugin .uno:InsertPlugin Rahmen .uno:InsertFrameInteract Seite .uno:InsertPage Sonderzeichen .uno:InsertSymbol -Spalten FN_INSERT_FRAME_INTERACT_NOCOL +Spalten .uno:InsertFrameInteractNoColumns Tabelle .uno:InsertTable Textmarke .uno:InsertBookmark Verzeichnis .uno:InsertIndexesEntry @@ -799,10 +799,10 @@ Controls .uno:ChooseControls FindParanthese .uno:MatchGroup InsertSourceText .uno:LoadBasic Library .uno:LibSelector -Macros SID_BASICIDE_CHOOSEMACRO +Macros .uno:ChooseMacro ManageBreakpoints .uno:ManageBreakPoints -Modules SID_BASICIDE_MODULEDLG -ObjectCatalog SID_BASICIDE_OBJCAT +Modules .uno:ModuleDialog +ObjectCatalog .uno:ObjectCatalog ProcedureStep .uno:BasicStepOver SaveSourceText .uno:SaveBasicAs SingleStep .uno:BasicStepInto @@ -831,24 +831,24 @@ Vorlage .uno:StyleApply NumberingOnOff .uno:DefaultNumbering BulletsOnOff .uno:DefaultBullet '------------------------------------------------------------------------- -*OB_DB_Tabledesign HID_TLB_TABLEDESIGN +*OB_DB_Tabledesign DBACCESS_HID_TLB_TABLEDESIGN '------------------------------------------------------------------------- -Copy SID_COPY -Cut SID_CUT -Edit SID_EDITDOC -NoConnection HID_TABLE_DESIGN_NO_CONNECTION -Paste SID_PASTE -Redo SID_REDO -Save SID_SAVEDOC -SaveAs SID_SAVEASDOC -Undo SID_UNDO +Copy .uno:Copy +Cut .uno:Cut +Edit .uno:EditDoc +NoConnection DBACCESS_HID_TABLE_DESIGN_NO_CONNECTION +Paste .uno:Paste +Redo .uno:Redo +Save .uno:Save +SaveAs .uno:SaveAs +Undo .uno:Undo '------------------------------------------------------------------------- -*OL_SW_Rechenleiste HID_CALC_TOOLBOX +*OL_SW_Rechenleiste SW_HID_CALC_TOOLBOX '------------------------------------------------------------------------- -Eingabefeld HID_EDIT_FORMULA -Formel FN_FORMULA_CALC -Uebernehmen FN_FORMULA_APPLY -Verwerfen FN_FORMULA_CANCEL +Eingabefeld SW_HID_EDIT_FORMULA +Formel SW_HID_TBX_FORMULA_CALC +Uebernehmen SW_HID_TBX_FORMULA_APPLY +Verwerfen SW_HID_TBX_FORMULA_CANCEL '------------------------------------------------------------------------- *OLEObjectBar .HelpId:oleobjectbar '------------------------------------------------------------------------- @@ -886,7 +886,7 @@ ZeilenGleichmaessig .uno:DistributeRows *Optionsbar .HelpId:optionsbar '------------------------------------------------------------------------- AlleGruppenVerlassen .uno:LeaveAllGroups -AlleGruppierungenVerlassen SID_CONNECTOR_LINES_CIRCLES +AlleGruppierungenVerlassen .uno:ConnectorLinesCircles DrehmodusNachKlick .uno:ClickChangeRotation EinfacheHandles .uno:HandlesDraft FangenAnObjektRahmen .uno:SnapFrame @@ -901,8 +901,8 @@ KeineFuellungen .uno:FillDraft GluePoints .uno:GlueEditMode NurHaarlinien .uno:LineDraft NurTextbreichSelektieren .uno:PickThrough -ObjektMitAttributen SID_SOLID_CREATE -PunkteBearbeiten SID_BEZIER_EDIT +ObjektMitAttributen .uno:SolidCreate +PunkteBearbeiten .uno:ToggleObjectBezierMode RasterBenutzen .uno:GridUse RasterSichtbar .uno:GridVisible Schnellbearbeitung .uno:QuickEdit @@ -924,33 +924,33 @@ ZoomPlus .uno:ZoomPlus '------------------------------------------------------------------------- *Positionbar .HelpId:positionbar '------------------------------------------------------------------------- -GanzNachHinten SID_FRAME_TO_BOTTOM -GanzNachVorn SID_FRAME_TO_TOP -HinterDasObjekt SID_BEHIND_OBJ -Vertauschen SID_REVERSE_ORDER -VorDasObjekt SID_BEFORE_OBJ -WeiterNachHinten SID_MOREBACK -WeiterNachVorn SID_MOREFRONT +GanzNachHinten .uno:SendToBack +GanzNachVorn .uno:BringToFront +HinterDasObjekt .uno:BehindObject +Vertauschen .uno:ReverseOrder +VorDasObjekt .uno:BeforeObject +WeiterNachHinten .uno:Backward +WeiterNachVorn .uno:Forward '------------------------------------------------------------------------- *Previewbar .HelpId:previewbar '------------------------------------------------------------------------- -DruckenSeitenansicht FN_PRINT_PAGEPREVIEW +DruckenSeitenansicht .uno:PrintPagePreView ErsteSeite .uno:FirstPage GanzerBildschirm .uno:FullScreen KopfUndFusszeilen .uno:EditHeaderAndFooter LetzteSeite .uno:LastPage Margins .uno:Margins -Massstab SID_ATTR_ZOOM +Massstab .uno:Zoom MassstabVergroessern .uno:ZoomIn MassstabVerkleinern .uno:ZoomOut NaechsteSeite .uno:NextPage ScalingFactor .uno:ScalingFactor -Schliessen SID_CLOSEWIN +Schliessen .uno:CloseWin Seitenansicht .uno:ClosePreview Seitenlayout .uno:PageFormatDialog -VierSeiten FN_SHOW_MULTIPLE_PAGES +VierSeiten .uno:ShowMultiplePages VorherigeSeite .uno:PreviousPage -ZweiSeiten FN_SHOW_TWO_PAGES +ZweiSeiten .uno:ShowTwoPages '------------------------------------------------------------------------- *PreviewObjectbar .HelpId:previewobjectbar '------------------------------------------------------------------------- @@ -961,41 +961,41 @@ Groesser .uno:ZoomPlus Kleiner .uno:ZoomMinus LetzteSeite .uno:GoToEndOfDoc Massstab .uno:PreviewZoom -MassstabVergroessern SID_PREVIEW_ZOOMIN -MassstabVerkleinern SID_PREVIEW_ZOOMOUT +MassstabVergroessern .uno:ZoomIn +MassstabVerkleinern .uno:ZoomOut NaechsteSeite .uno:PageDown SeitenansichtSchliessen .uno:ClosePreview -Seitenlayout SID_FORMATPAGE +Seitenlayout .uno:PageFormatDialog Skalierung .uno:PreviewPrintOptions VierSeiten .uno:ShowMultiplePages VorherigeSeite .uno:PageUp ZweiSeiten .uno:ShowTwoPages '------------------------------------------------------------------------- -*RechenleisteCalc HID_SC_INPUTWIN +*RechenleisteCalc SC_HID_SC_INPUTWIN '------------------------------------------------------------------------- -AktiverZellBereich HID_INSWIN_POS -Bereich HID_INSWIN_POS -EingabeZeileCalc HID_INSWIN_INPUT -Funktion HID_INSWIN_FUNC -Funktionsautopilot HID_INSWIN_CALC -Summe HID_INSWIN_SUMME -Uebernehmen HID_INSWIN_OK -Verwerfen HID_INSWIN_CANCEL +AktiverZellBereich SC_HID_INSWIN_POS +Bereich SC_HID_INSWIN_POS +EingabeZeileCalc SC_HID_INSWIN_INPUT +Funktion SC_HID_INSWIN_FUNC +Funktionsautopilot SC_HID_INSWIN_CALC +Summe SC_HID_INSWIN_SUMME +Uebernehmen SC_HID_INSWIN_OK +Verwerfen SC_HID_INSWIN_CANCEL '------------------------------------------------------------------------- *Rectanglesbar .HelpId:rectanglesbar '------------------------------------------------------------------------- -QuadratLeer SID_DRAW_SQUARE_NOFILL -QuadratRundLeer SID_DRAW_SQUARE_ROUND_NOFILL -QuadratRundVoll SID_DRAW_SQUARE_ROUND -QuadratVoll SID_DRAW_SQUARE -RechteckLeer SID_DRAW_RECT_NOFILL -RechteckRundLeer SID_DRAW_RECT_ROUND_NOFILL -RechteckRundVoll SID_DRAW_RECT_ROUND -RechteckVoll SID_DRAW_RECT +QuadratLeer .uno:Square_Unfilled +QuadratRundLeer .uno:Square_Rounded_Unfilled +QuadratRundVoll .uno:Square_Rounded +QuadratVoll .uno:Square +RechteckLeer .uno:Rect_Unfilled +RechteckRundLeer .uno:Rect_Rounded_Unfilled +RechteckRundVoll .uno:Rect_Rounded +RechteckVoll .uno:Rect '------------------------------------------------------------------------- -*SD_Farbleiste HID_CTRL_COLOR +*SD_Farbleiste SVX_HID_CTRL_COLOR '------------------------------------------------------------------------- -Farben HID_COLOR_CTL_COLORS +Farben SVX_HID_COLOR_CTL_COLORS '------------------------------------------------------------------------- *SlideViewObjectbar .HelpId:slideviewobjectbar '------------------------------------------------------------------------- @@ -1035,22 +1035,22 @@ NativeSql .uno:SbaNativeSql '------------------------------------------------------------------------- Ausschneiden .uno:Cut Bearbeiten .uno:EditDoc -DokSchliessen SID_CLOSEDOC +DokSchliessen .uno:CloseDoc Drucken .uno:PrintDefault Einfuegen .uno:Paste ExportAsPDF .uno:ExportDirectToPDF FaxDrucken .uno:SendFax GalleryButton .uno:Gallery -Gesamtbild SID_WIN_FULLSCREEN -GestalterButton SID_STYLE_DESIGNER +Gesamtbild .uno:FullScreen +GestalterButton .uno:DesignerDialog HyperlinkDialog .uno:HyperlinkDialog -HyperlinkLeisteButton SID_HYPERLINK_INSERT +HyperlinkLeisteButton .uno:InsertHyperlink Kopieren .uno:Copy NavigatorButton .uno:Navigator Neu .uno:AddDirect NeuDialog .uno:NewDoc Oeffnen .uno:Open -RecordMacroButton SID_RECORDMACRO +RecordMacroButton .uno:MacroRecorder Redo .uno:Redo SortAscending .uno:SortAscending SortDescending .uno:SortDescending @@ -1116,18 +1116,18 @@ Sortieren .uno:OrderCrit Hintergrundfarbe .uno:BackgroundColor LinienStil .uno:LineStyle Optimieren .uno:OptimizeTable -Schriftart SID_ATTR_CHAR_FONT -Schriftgroesse SID_ATTR_CHAR_FONTHEIGHT +Schriftart .uno:CharFontName +Schriftgroesse .uno:FontHeight SpalteAuswaehlen .uno:EntireColumn SpalteEinfuegen .uno:InsertColumns SpalteLoeschen .uno:DeleteColumns TabelleAuswaehlen .uno:SelectTable -TabellenmodeFix FN_TABLE_MODE_FIX -TabellenmodeProportional FN_TABLE_MODE_FIX_PROP -TabellenmodeVariabel FN_TABLE_MODE_VARIABLE +TabellenmodeFix .uno:TableModeFix +TabellenmodeProportional .uno:TableModeFixProp +TabellenmodeVariabel .uno:TableModeVariable Umrandung .uno:SetBorderStyle -Vorlage SID_STYLE_APPLY -Vorlage2 HID_STYLE_LISTBOX +Vorlage .uno:StyleApplyState +Vorlage2 SVX_HID_STYLE_LISTBOX ZeileAuswaehlen .uno:EntireRow ZeileEinfuegen .uno:InsertRows ZeileLoeschen .uno:DeleteRows @@ -1143,12 +1143,12 @@ TableProperties .uno:TableDialog '------------------------------------------------------------------------- *Textbar .HelpId:textbar '------------------------------------------------------------------------- -FitVerticalTextToFrame SID_TEXT_FITTOSIZE_VERTICAL -Legende SID_DRAW_CAPTION -Rahmen SID_TEXT_FITTOSIZE -TextEinfuegen SID_ATTR_CHAR -VerticalCallout SID_DRAW_CAPTION_VERTICAL -VerticalText SID_DRAW_TEXT_VERTICAL +FitVerticalTextToFrame .uno:VerticalTextFitToSizeTool +Legende .uno:DrawCaption +Rahmen .uno:TextFitToSizeTool +TextEinfuegen .uno:Text +VerticalCallout .uno:VerticalCaption +VerticalText .uno:VerticalText '------------------------------------------------------------------------- *TextObjectbar .HelpId:textobjectbar '------------------------------------------------------------------------- @@ -1198,7 +1198,7 @@ BulletsOnOff2 .uno:Bullet '------------------------------------------------------------------------- *Toolbar .HelpId:toolbar '------------------------------------------------------------------------- -AlleEbenen SID_OUTLINE_EXPAND_ALL +AlleEbenen .uno:OutlineExpandAll Anordnung .uno:ObjectPosition ApplyFilter .uno:FormFiltered ArrowsToolbox .uno:ArrowsToolbox @@ -1215,7 +1215,7 @@ ChangeBezier .uno:ChangeBezier ChangePolygon .uno:ChangePolygon ClearQuery .uno:DBClearQuery ConvertInto3D .uno:ConvertInto3D -ConvertInto3Dnew SID_EXTRUSION_TOOGLE +ConvertInto3Dnew .uno:ExtrusionToggle ConvertInto3DLatheFast .uno:ConvertInto3DLatheFast Copy .uno:Copy CustomAnimation .uno:CustomAnimation @@ -1237,7 +1237,7 @@ Feldbefehle .uno:InsertFieldCtrl Filter .uno:DataFilterStandardFilter FlowChartShapes .uno:FlowChartShapes FontworkGalleryFloater .uno:FontworkGalleryFloater -FormatierungEinAus SID_OUTLINE_FORMAT +FormatierungEinAus .uno:OutlineFormat FormControls .uno:Config FormelAktualisieren .uno:Draw FormelSymbole .uno:SymbolCatalogue @@ -1247,11 +1247,11 @@ Grafikeffekte .uno:AdvancedMode GrafikenAusEin .uno:Graphic Gruppierung .uno:Group GruppierungAufheben .uno:Ungroup -HTMLQuelltext HID_SOURCEVIEW -Hinunterschieben SID_OUTLINE_DOWN -Hinunterstufen SID_OUTLINE_RIGHT -Hochschieben SID_OUTLINE_UP -Hochstufen SID_OUTLINE_LEFT +HTMLQuelltext SW_HID_SOURCEVIEW +Hinunterschieben .uno:OutlineDown +Hinunterstufen .uno:OutlineRight +Hochschieben .uno:OutlineUp +Hochstufen .uno:OutlineLeft Hyperlink .uno:InsertHyperlink Insert .uno:InsertToolbox InsertGraphic .uno:InsertGraphic @@ -1263,7 +1263,7 @@ LineArrowEnd .uno:LineArrowEnd Mirror .uno:Mirror NamenDefinieren .uno:DefineName NewDoc .uno:NewDoc -NurErsteEbene SID_OUTLINE_COLLAPSE_ALL +NurErsteEbene .uno:OutlineCollapseAll ObjectAlign .uno:ObjectAlign ObjektEinfuegen .uno:InsertObjCtrl ObjekteEinfuegen .uno:InsObjCtrl @@ -1280,7 +1280,7 @@ Redo .uno:Redo Refresh .uno:Refresh RemoveFilter .uno:RemoveFilterSort Rotate .uno:ToggleObjectRotateMode -SchwarzweisDarstellung SID_COLORVIEW +SchwarzweisDarstellung .uno:ColorView ShowFormFunctions .uno:Config Save .uno:Save SaveAs .uno:SaveAs @@ -1300,8 +1300,8 @@ Thesaurus .uno:Thesaurus ToolsGallery .uno:Gallery Transform .uno:TransformDialog Undo .uno:Undo -UnterpunkteAnzeigen SID_OUTLINE_EXPAND -UnterpunkteAusblenden SID_OUTLINE_COLLAPSE +UnterpunkteAnzeigen .uno:OutlineExpand +UnterpunkteAusblenden .uno:OutlineCollapse Verbinder .uno:ConnectorToolbox Vergroessern .uno:ZoomIn Verkleinern .uno:ZoomOut diff --git a/testautomation/global/win/dial_a_c.win b/testautomation/global/win/dial_a_c.win old mode 100755 new mode 100644 index f3c5879154ff..c0f6dc811944 --- a/testautomation/global/win/dial_a_c.win +++ b/testautomation/global/win/dial_a_c.win @@ -1,288 +1,288 @@ -*Aehnlichkeitssuche HID_SEARCHSIMILARITY -ZeichenHinzufuegen cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER -ZeichenTauschen cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER -Kombinieren cui:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX -ZeichenEntfernen cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER +*Aehnlichkeitssuche CUI_HID_SEARCHSIMILARITY +ZeichenHinzufuegen cui.NumericField.10023.21 +ZeichenTauschen cui.NumericField.10023.17 +Kombinieren cui.CheckBox.10023.15 +ZeichenEntfernen cui.NumericField.10023.19 -*Aenderungenanzeigen FID_CHG_ACCEPT -TabControl HID_REDLINING_TABCONTROL -TabFilter HID_REDLINING_FILTER_PAGE SVX:TABPAGE:SID_REDLIN_FILTER_PAGE -Datum HID_REDLINING_FILTER_CB_DATE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE -DatumListe HID_REDLINING_FILTER_LB_DATE SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE -Datum1 HID_REDLINING_FILTER_DF_DATE SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE -Zeit1 HID_REDLINING_FILTER_TF_DATE SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE -Aktuell1 HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK -Datum2 HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 -Zeit2 HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 -Aktuell2 HID_REDLINING_FILTER_IB_CLOCK2 SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 -Autor HID_REDLINING_FILTER_CB_AUTOR SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_AUTOR -AutoListe HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AUTOR -Bereich HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE -BereichText HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE -Button HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF -Aktion HID_REDLINING_FILTER_CB_RANGE -Aktionsliste HID_REDLINING_FILTER_LB_ACTION -TabListe HID_REDLINING_VIEW_PAGE SVX:TABPAGE:SID_REDLIN_VIEW_PAGE -Liste HID_REDLINING_VIEW_DG_VIEW -ListenInhalt HID_REDLINING_VIEW_DG_VIEW_TABLE -Listenkopf HID_REDLINING_VIEW_DG_VIEW_HEADER -Akzeptieren HID_REDLINING_VIEW_PB_ACCEPT SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_ACCEPT -AlleAkzeptieren HID_REDLINING_VIEW_PB_ACCEPTALL SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_ACCEPTALL -Ablehnen HID_REDLINING_VIEW_PB_REJECT SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_REJECT -AlleAblehnen HID_REDLINING_VIEW_PB_REJECTALL SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_REJECTALL -Rueckgaengig HID_REDLINING_VIEW_PB_UNDO +*Aenderungenanzeigen .uno:AcceptChanges +TabControl SVX_HID_REDLINING_TABCONTROL +TabFilter SVX_HID_REDLINING_FILTER_PAGE SVX:TABPAGE:SID_REDLIN_FILTER_PAGE +Datum SVX_HID_REDLINING_FILTER_CB_DATE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE +DatumListe SVX_HID_REDLINING_FILTER_LB_DATE SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE +Datum1 SVX_HID_REDLINING_FILTER_DF_DATE SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE +Zeit1 SVX_HID_REDLINING_FILTER_TF_DATE SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE +Aktuell1 SVX_HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK +Datum2 SVX_HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 +Zeit2 SVX_HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 +Aktuell2 SVX_HID_REDLINING_FILTER_IB_CLOCK2 SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 +Autor SVX_HID_REDLINING_FILTER_CB_AUTOR SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_AUTOR +AutoListe SVX_HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AUTOR +Bereich SVX_HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE +BereichText SVX_HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE +Button SVX_HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF +Aktion SVX_HID_REDLINING_FILTER_CB_RANGE +Aktionsliste SVX_HID_REDLINING_FILTER_LB_ACTION +TabListe SVX_HID_REDLINING_VIEW_PAGE SVX:TABPAGE:SID_REDLIN_VIEW_PAGE +Liste SVX_HID_REDLINING_VIEW_DG_VIEW +ListenInhalt SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE +Listenkopf SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER +Akzeptieren SVX_HID_REDLINING_VIEW_PB_ACCEPT SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_ACCEPT +AlleAkzeptieren SVX_HID_REDLINING_VIEW_PB_ACCEPTALL SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_ACCEPTALL +Ablehnen SVX_HID_REDLINING_VIEW_PB_REJECT SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_REJECT +AlleAblehnen SVX_HID_REDLINING_VIEW_PB_REJECTALL SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_REJECTALL +Rueckgaengig SVX_HID_REDLINING_VIEW_PB_UNDO -*AktualisierenGallery HID_GALLERY_ACTUALIZE +*AktualisierenGallery SVX_HID_GALLERY_ACTUALIZE -*Animation SID_ANIMATION_OBJECTS -BildAufnehmen sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ONE_OBJECT -AlleAufnehmen sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ALL_OBJECTS -BildLoeschen sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_BITMAP -AlleLoeschen sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_ALL -AnimationsgruppeGruppenobjekt sd:RadioButton:FLT_WIN_ANIMATION:RBT_GROUP -AnimationsgruppeBitmapobjekt sd:RadioButton:FLT_WIN_ANIMATION:RBT_BITMAP +*Animation .uno:AnimationObjects +BildAufnehmen sd.ImageButton.619.6 +AlleAufnehmen sd.ImageButton.619.7 +BildLoeschen sd.ImageButton.619.8 +AlleLoeschen sd.ImageButton.619.9 +AnimationsgruppeGruppenobjekt sd.RadioButton.619.1 +AnimationsgruppeBitmapobjekt sd.RadioButton.619.2 'Transparenzfarbe sd:ListBox:FLT_WIN_ANIMATION:LB_COLOR ' TBO 18.07.2002 removed from dialog -Anpassung sd:ListBox:FLT_WIN_ANIMATION:LB_ADJUSTMENT -AnzahlBilder sd:NumericField:FLT_WIN_ANIMATION:NUM_FLD_BITMAP -AnzahlDurchlaeufe sd:ListBox:FLT_WIN_ANIMATION:LB_LOOP_COUNT -AnzeigedauerProBild sd:TimeField:FLT_WIN_ANIMATION:TIME_FIELD -Erstellen sd:PushButton:FLT_WIN_ANIMATION:BTN_CREATE_GROUP -ErstesBild sd:ImageButton:FLT_WIN_ANIMATION:BTN_FIRST -Rueckwaerts sd:ImageButton:FLT_WIN_ANIMATION:BTN_REVERSE -Stopp sd:ImageButton:FLT_WIN_ANIMATION:BTN_STOP -Abspielen sd:ImageButton:FLT_WIN_ANIMATION:BTN_PLAY -LetztesBild sd:ImageButton:FLT_WIN_ANIMATION:BTN_LAST +Anpassung sd.ListBox.619.2 +AnzahlBilder sd.NumericField.619.1 +AnzahlDurchlaeufe sd.ListBox.619.3 +AnzeigedauerProBild sd.TimeField.619.1 +Erstellen sd.PushButton.619.10 +ErstesBild sd.ImageButton.619.1 +Rueckwaerts sd.ImageButton.619.2 +Stopp sd.ImageButton.619.3 +Abspielen sd.ImageButton.619.4 +LetztesBild sd.ImageButton.619.5 -*AsciiFilterOptionen HID_ASCII_FILTER -Zeichensatz sw:ListBox:DLG_ASCII_FILTER:LB_CHARSET -Schriftart sw:ListBox:DLG_ASCII_FILTER:LB_FONT -Sprache sw:ListBox:DLG_ASCII_FILTER:LB_LANGUAGE -CrLf sw:RadioButton:DLG_ASCII_FILTER:RB_CRLF -Cr sw:RadioButton:DLG_ASCII_FILTER:RB_CR -Lf sw:RadioButton:DLG_ASCII_FILTER:RB_LF +*AsciiFilterOptionen SW_HID_ASCII_FILTER +Zeichensatz sw.ListBox.20209.3 +Schriftart sw.ListBox.20209.5 +Sprache sw.ListBox.20209.7 +CrLf sw.RadioButton.20209.9 +Cr sw.RadioButton.20209.10 +Lf sw.RadioButton.20209.11 -*Attribute HID_SEARCHATTR -Auswahl HID_SEARCHATTR_CTL_ATTR +*Attribute CUI_HID_SEARCHATTR +Auswahl CUI_HID_SEARCHATTR_CTL_ATTR -*Ausrichtung SID_ALIGN -Links starmath:RadioButton:RID_ALIGNDIALOG:1 -Zentriert starmath:RadioButton:RID_ALIGNDIALOG:2 -Rechts starmath:RadioButton:RID_ALIGNDIALOG:3 +*Ausrichtung .uno:ChangeAlignment +Links starmath.RadioButton.20006.1 +Zentriert starmath.RadioButton.20006.2 +Rechts starmath.RadioButton.20006.3 'Oben starmath:RadioButton:RID_ALIGNDIALOG:4 'Mitte starmath:RadioButton:RID_ALIGNDIALOG:5 'Unten starmath:RadioButton:RID_ALIGNDIALOG:6 -Standard starmath:PushButton:RID_ALIGNDIALOG:1 +Standard starmath.PushButton.20006.1 -*AutoAbstractErzeugen HID_INSERT_ABSTRACT -Ebenen sw:NumericField:DLG_INSERT_ABSTRACT:NF_LEVEL -Kapitel sw:NumericField:DLG_INSERT_ABSTRACT:NF_PARA +*AutoAbstractErzeugen SW_HID_INSERT_ABSTRACT +Ebenen sw.NumericField.20208.5 +Kapitel sw.NumericField.20208.3 -*Autokorrektur SID_AUTO_CORRECT_DLG +*Autokorrektur .uno:AutoCorrectDlg -*AutoText FN_GLOSSARY_DLG -RestDesNamens sw:CheckBox:DLG_GLOSSARY:CB_INSERT_TIP -NameText sw:Edit:DLG_GLOSSARY:ED_NAME -Liste HID_MD_GLOS_CATEGORY -Kuerzel sw:Edit:DLG_GLOSSARY:ED_SHORTNAME -ImDateisystem sw:CheckBox:DLG_GLOSSARY:CB_FILE_REL -ImInternet sw:CheckBox:DLG_GLOSSARY:CB_NET_REL -Menue sw:MenuButton:DLG_GLOSSARY:PB_EDIT -Bereiche sw:PushButton:DLG_GLOSSARY:PB_BIB +*AutoText .uno:EditGlossary +RestDesNamens sw.CheckBox.21661.5 +NameText sw.Edit.21661.4 +Liste SW_HID_MD_GLOS_CATEGORY +Kuerzel sw.Edit.21661.2 +ImDateisystem sw.CheckBox.21661.68 +ImInternet sw.CheckBox.21661.69 +Menue sw.MenuButton.21661.52 +Bereiche sw.PushButton.21661.54 Pfade SW:PUSHBUTTON:DLG_GLOSSARY:PB_PATH -Vorschau_anzeigen sw:CheckBox:DLG_GLOSSARY:CB_SHOW_EXAMPLE +Vorschau_anzeigen sw.CheckBox.21661.73 -*AutoFormatCalc SID_AUTOFORMAT -FormatListe sc:ListBox:RID_SCDLG_AUTOFORMAT:LB_FORMAT -Einfuegen sc:PushButton:RID_SCDLG_AUTOFORMAT:BTN_ADD -Loeschen sc:PushButton:RID_SCDLG_AUTOFORMAT:BTN_REMOVE -Zahlenformat sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_NUMFORMAT -Umrandung sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_BORDER -Schriftart sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_FONT -Muster sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_PATTERN -Ausrichtung sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_ALIGNMENT -BreiteHoeheAnpassen sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_ADJUST -Zusaetze sc:MoreButton:RID_SCDLG_AUTOFORMAT:BTN_MORE -Umbenennen HID_SC_RENAME_AUTOFMT +*AutoFormatCalc .uno:AutoFormat +FormatListe sc.ListBox.25624.1 +Einfuegen sc.PushButton.25624.105 +Loeschen sc.PushButton.25624.106 +Zahlenformat sc.CheckBox.25624.20 +Umrandung sc.CheckBox.25624.21 +Schriftart sc.CheckBox.25624.23 +Muster sc.CheckBox.25624.24 +Ausrichtung sc.CheckBox.25624.25 +BreiteHoeheAnpassen sc.CheckBox.25624.26 +Zusaetze sc.MoreButton.25624.104 +Umbenennen SC_HID_SC_RENAME_AUTOFMT -*AutoFormatHinzufuegenWriter HID_SWDLG_STRINPUT -TabellenName sw:Edit:DLG_SWDLG_STRINPUT:ED_INPUT +*AutoFormatHinzufuegenWriter SW_HID_SWDLG_STRINPUT +TabellenName sw.Edit.21460.1 -*AutoFormatHinzufuegenCalc HID_SC_ADD_AUTOFMT -TabellenName HID_SC_AUTOFMT_NAME +*AutoFormatHinzufuegenCalc SC_HID_SC_ADD_AUTOFMT +TabellenName SC_HID_SC_AUTOFMT_NAME -*AutoFormatTabelle HID_AUTOFMT_TABLE -Formatbox sw:ListBox:DLG_AUTOFMT_TABLE:LB_FORMAT -Einfuegen sw:PushButton:DLG_AUTOFMT_TABLE:BTN_ADD -Loeschen sw:PushButton:DLG_AUTOFMT_TABLE:BTN_REMOVE -Zusaetze sw:MoreButton:DLG_AUTOFMT_TABLE:BTN_MORE -Ausrichtung sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_ALIGNMENT -Umrandung sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_BORDER -Schriftart sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_FONT -Muster sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_PATTERN +*AutoFormatTabelle SW_HID_AUTOFMT_TABLE +Formatbox sw.ListBox.21459.1 +Einfuegen sw.PushButton.21459.105 +Loeschen sw.PushButton.21459.106 +Zusaetze sw.MoreButton.21459.104 +Ausrichtung sw.CheckBox.21459.25 +Umrandung sw.CheckBox.21459.21 +Schriftart sw.CheckBox.21459.23 +Muster sw.CheckBox.21459.24 Zahlenformat SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT Umbenennen SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_RENAME -*BedingteFormatierung HID_SCDLG_CONDFORMAT sc:ModelessDialog:RID_SCDLG_CONDFORMAT -Bedingung1 sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND1 -PopupList1 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_1 -Vergleich1 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_2 -TextField1 sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND1_1 +*BedingteFormatierung SC_HID_SCDLG_CONDFORMAT sc:ModelessDialog:RID_SCDLG_CONDFORMAT +Bedingung1 sc.CheckBox.25700.1 +PopupList1 sc.ListBox.25700.2 +Vergleich1 sc.ListBox.25700.3 +TextField1 sc.Edit.25700.4 TextField12 SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND1_2 -Zellvorlage1 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_TEMPLATE -Minimieren1 sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND1_1 +Zellvorlage1 sc.ListBox.25700.10 +Minimieren1 sc.ImageButton.25700.5 Minimieren12 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND1_2 -NewStyle1 sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND1_NEW -Bedingung2 sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND2 -PopupList2 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_1 -Vergleich2 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_2 -TextField2 sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND2_1 +NewStyle1 sc.PushButton.25700.34 +Bedingung2 sc.CheckBox.25700.11 +PopupList2 sc.ListBox.25700.12 +Vergleich2 sc.ListBox.25700.13 +TextField2 sc.Edit.25700.14 TextField22 SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND2_2 -Zellvorlage2 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_TEMPLATE -Minimieren2 sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND2_1 +Zellvorlage2 sc.ListBox.25700.20 +Minimieren2 sc.ImageButton.25700.15 Minimieren22 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND2_2 -NewStyle2 sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND2_NEW -Bedingung3 sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND3 -PopupList3 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_1 -Vergleich3 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_2 -TextField3 sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND3_1 +NewStyle2 sc.PushButton.25700.35 +Bedingung3 sc.CheckBox.25700.21 +PopupList3 sc.ListBox.25700.22 +Vergleich3 sc.ListBox.25700.23 +TextField3 sc.Edit.25700.24 TextField32 SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND3_2 -Zellvorlage3 sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_TEMPLATE -Minimieren3 sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND3_1 +Zellvorlage3 sc.ListBox.25700.30 +Minimieren3 sc.ImageButton.25700.25 Minimieren32 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_2 -NewStyle3 sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND3_NEW +NewStyle3 sc.PushButton.25700.36 -*Bemassung HID_PAGE_MEASURE -Liniendistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST -HLUeberhang cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG -HLDistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST -LinkeHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN -RechteHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN -AnzeigeUnterhalb cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE -AnzeigeParallel cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL -MetrikAnzeigen cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT -MetrikList cui:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT -Textposition HID_MEASURE_CTL_POSITION -AutomatischVertikal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV -AutomatischHorizontal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH -Preview HID_MEASURE_CTL_PREVIEW -DecimalPlaces cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES +*Bemassung CUI_HID_PAGE_MEASURE +Liniendistanz cui.MetricField.10161.1 +HLUeberhang cui.MetricField.10161.2 +HLDistanz cui.MetricField.10161.3 +LinkeHL cui.MetricField.10161.4 +RechteHL cui.MetricField.10161.5 +AnzeigeUnterhalb cui.TriStateBox.10161.1 +AnzeigeParallel cui.TriStateBox.10161.5 +MetrikAnzeigen cui.TriStateBox.10161.2 +MetrikList cui.ListBox.10161.1 +Textposition CUI_HID_MEASURE_CTL_POSITION +AutomatischVertikal cui.TriStateBox.10161.3 +AutomatischHorizontal cui.TriStateBox.10161.4 +Preview CUI_HID_MEASURE_CTL_PREVIEW +DecimalPlaces cui.MetricField.10161.6 -*BenutzerwoerterbuchAnlegen HID_OPTIONS_DICT_NEW -WoerterbuchName cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME -Sprache cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG -Ausnahme cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT +*BenutzerwoerterbuchAnlegen CUI_HID_OPTIONS_DICT_NEW +WoerterbuchName cui.Edit.12003.11 +Sprache cui.ListBox.12003.13 +Ausnahme cui.CheckBox.12003.14 -*BenutzerwoerterbuchBearbeiten HID_OPTIONS_DICT_EDIT -Buch cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS -Sprache cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG -Inhalt cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD -Wort cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD -Aufnehmen cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE -Neu cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE -Entfernen cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE -Loeschen cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE -ReplaceBy cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE -WordList HID_OPTIONS_DICT_EDIT_ENTRIES_LIST +*BenutzerwoerterbuchBearbeiten CUI_HID_OPTIONS_DICT_EDIT +Buch cui.ListBox.12004.32 +Sprache cui.ListBox.12004.13 +Inhalt cui.Edit.12004.36 +Wort cui.Edit.12004.36 +Aufnehmen cui.PushButton.12004.39 +Neu cui.PushButton.12004.39 +Entfernen cui.PushButton.12004.40 +Loeschen cui.PushButton.12004.40 +ReplaceBy cui.Edit.12004.38 +WordList CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST -*BenutzerverzeichnisDefinieren HID_DLG_NEW_USER_IDX -NameBenutzerverzeichnis sw:Edit:DLG_NEW_USER_IDX:ED_NAME +*BenutzerverzeichnisDefinieren SW_HID_DLG_NEW_USER_IDX +NameBenutzerverzeichnis sw.Edit.21967.39 -*BereicheBearbeiten FN_EDIT_REGION -Bereich HID_REGION_TREE +*BereicheBearbeiten .uno:EditRegion +Bereich SW_HID_REGION_TREE BereichsName SW:EDIT:MD_EDIT_REGION:ED_RANAME -Geschuetzt sw:TriStateBox:MD_EDIT_REGION:CB_PROTECT -Ausblenden sw:TriStateBox:MD_EDIT_REGION:CB_HIDE -Bedingung sw:Edit:MD_EDIT_REGION:ED_CONDITION -Verknuepfung sw:TriStateBox:MD_EDIT_REGION:CB_FILE -DDE sw:CheckBox:MD_EDIT_REGION:CB_DDE -Dateiname sw:Edit:MD_EDIT_REGION:ED_FILE -OptionenBereich sw:ComboBox:MD_EDIT_REGION:LB_SUBREG +Geschuetzt sw.TriStateBox.20269.10 +Ausblenden sw.TriStateBox.20269.8 +Bedingung sw.Edit.20269.13 +Verknuepfung sw.TriStateBox.20269.5 +DDE sw.CheckBox.20269.1 +Dateiname sw.Edit.20269.16 +OptionenBereich sw.ComboBox.20269.38 Aufheben SW:PUSHBUTTON:MD_EDIT_REGION:CB_DISMISS ' Spalten sw:PushButton:MD_INS_REGION:PB_COLUMNS -Durchsuchen sw:PushButton:MD_EDIT_REGION:PB_FILE -Passwort sw:CheckBox:MD_EDIT_REGION:CB_PASSWD -Optionen sw:PushButton:MD_EDIT_REGION:PB_OPTIONS -EnterPasswort sw:PushButton:MD_EDIT_REGION:PB_PASSWD +Durchsuchen sw.PushButton.20269.40 +Passwort sw.CheckBox.20269.9 +Optionen sw.PushButton.20269.43 +EnterPasswort sw.PushButton.20269.51 -*BereicheBearbeitenAutoText HID_BIB_BASE +*BereicheBearbeitenAutoText SW_HID_BIB_BASE Bereich SW:EDIT:DLG_BIB_BASE:ED_NAME Pfad SW:LISTBOX:DLG_BIB_BASE:LB_PATH -Liste HID_GLOS_GROUP_TREE +Liste SW_HID_GLOS_GROUP_TREE Neu SW:PUSHBUTTON:DLG_BIB_BASE:PB_NEW Loeschen SW:PUSHBUTTON:DLG_BIB_BASE:PB_DELETE Umbenennen SW:PUSHBUTTON:DLG_BIB_BASE:PB_RENAME -*BereicheSchuetzen HID_DLG_PASSWD_SECTION -PasswortName sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD -PasswortBestaetigen sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM +*BereicheSchuetzen SW_HID_DLG_PASSWD_SECTION +PasswortName sfx2.Edit.2316.14 +PasswortBestaetigen sfx2.Edit.2316.16 -*Beschriftung HID_DLG_CAPTION FN_INSERT_CAPTION +*Beschriftung SW_HID_DLG_CAPTION .uno:InsertCaptionDialog Kategorie SW:COMBOBOX:DLG_CAPTION:BOX_CATEGORY Numerierung SW:LISTBOX:DLG_CAPTION:BOX_FORMAT BeschriftungsText SW:EDIT:DLG_CAPTION:EDT_TEXT Position SW:LISTBOX:DLG_CAPTION:BOX_POS -WeitereOptionen sw:PushButton:DLG_CAPTION:BTN_OPTION -Separator sw:Edit:DLG_CAPTION:EDT_SEP +WeitereOptionen sw.PushButton.21011.14 +Separator sw.Edit.21011.25 -*BeschriftungsbereichFestlegen HID_COLROWNAMERANGES sc:ModelessDialog:RID_SCDLG_COLROWNAMERANGES -Bereich sc:ListBox:RID_SCDLG_COLROWNAMERANGES:LB_RANGE -Zellbereich sc:Edit:RID_SCDLG_COLROWNAMERANGES:ED_AREA -ButtonZellbereich sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_AREA -Spaltenkoepfe sc:RadioButton:RID_SCDLG_COLROWNAMERANGES:BTN_COLHEAD -Zeilenkoepfe sc:RadioButton:RID_SCDLG_COLROWNAMERANGES:BTN_ROWHEAD -Hinzufuegen sc:PushButton:RID_SCDLG_COLROWNAMERANGES:BTN_ADD -Loeschen sc:PushButton:RID_SCDLG_COLROWNAMERANGES:BTN_REMOVE +*BeschriftungsbereichFestlegen SC_HID_COLROWNAMERANGES sc:ModelessDialog:RID_SCDLG_COLROWNAMERANGES +Bereich sc.ListBox.25716.11 +Zellbereich sc.Edit.25716.13 +ButtonZellbereich sc.ImageButton.25716.14 +Spaltenkoepfe sc.RadioButton.25716.15 +Zeilenkoepfe sc.RadioButton.25716.16 +Hinzufuegen sc.PushButton.25716.3 +Loeschen sc.PushButton.25716.4 Datenbereich SC:EDIT:RID_SCDLG_COLROWNAMERANGES:ED_DATA ButtonDatenbereich SC:IMAGEBUTTON:RID_SCDLG_COLROWNAMERANGES:RB_DATA -*Bildschirmpraesentation SID_PRESENTATION -AlleDias sd:RadioButton:DLG_START_PRESENTATION:RBT_ALL +*Bildschirmpraesentation .uno:Presentation +AlleDias sd.RadioButton.20003.1 AbDia SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_AT_DIA -AbDiaName sd:ListBox:DLG_START_PRESENTATION:LB_DIAS -RangeCustomSlideShow sd:RadioButton:DLG_START_PRESENTATION:RBT_CUSTOMSHOW -'IndividuellePraesentation sd:RadioButton:DLG_START_PRESENTATION:RBT_CUSTOMSHOW -IndividuellePraesentationName sd:ListBox:DLG_START_PRESENTATION:LB_CUSTOMSHOW -Standard sd:RadioButton:DLG_START_PRESENTATION:RBT_STANDARD -Fenster sd:RadioButton:DLG_START_PRESENTATION:RBT_WINDOW -Auto sd:RadioButton:DLG_START_PRESENTATION:RBT_AUTO -Zeit sd:TimeField:DLG_START_PRESENTATION:TMF_PAUSE -LogoAnzeigen sd:CheckBox:DLG_START_PRESENTATION:CBX_AUTOLOGO +AbDiaName sd.ListBox.20003.1 +RangeCustomSlideShow sd.RadioButton.20003.3 +'IndividuellePraesentation sd.RadioButton.20003.3 +IndividuellePraesentationName sd.ListBox.20003.2 +Standard sd.RadioButton.20003.4 +Fenster sd.RadioButton.20003.5 +Auto sd.RadioButton.20003.6 +Zeit sd.TimeField.20003.1 +LogoAnzeigen sd.CheckBox.20003.1 DiawechselManuel SD:CHECKBOX:DLG_START_PRESENTATION:CBX_MANUEL -MauszeigerSichtbar sd:CheckBox:DLG_START_PRESENTATION:CBX_MOUSEPOINTER +MauszeigerSichtbar sd.CheckBox.20003.3 MauszeigerAlsStift SD:CHECKBOX:DLG_START_PRESENTATION:CBX_PEN -NavigatorSichtbar sd:CheckBox:DLG_START_PRESENTATION:CBX_NAVIGATOR -AnimationenZulassen sd:CheckBox:DLG_START_PRESENTATION:CBX_ANIMATION_ALLOWED +NavigatorSichtbar sd.CheckBox.20003.5 +AnimationenZulassen sd.CheckBox.20003.6 DiawechselAufHintergrund SD:CHECKBOX:DLG_START_PRESENTATION:CBX_CHANGE_PAGE -PraesentationImmerImVordergrund sd:CheckBox:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP +PraesentationImmerImVordergrund sd.CheckBox.20003.8 -*BMPOptionen svtools:ModalDialog:DLG_EXPORT_PIX -Farbaufloesung svtools:ListBox:DLG_EXPORT_PIX:LB_COLORS -RLEKodierung svtools:CheckBox:DLG_EXPORT_PIX:CBX_RLE -Original svtools:RadioButton:DLG_EXPORT_PIX:RB_ORIGINAL_PIX -Aufloesung svtools:RadioButton:DLG_EXPORT_PIX:RB_RES_PIX -DPI svtools:ComboBox:DLG_EXPORT_PIX:CBB_RES_PIX -Groesse svtools:RadioButton:DLG_EXPORT_PIX:RB_SIZE_PIX -Breite svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEX_PIX -Hoehe svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEY_PIX +*BMPOptionen svtools.ModalDialog.16371 +Farbaufloesung svtools.ListBox.16371.1 +RLEKodierung svtools.CheckBox.16371.3 +Original svtools.RadioButton.16371.1 +Aufloesung svtools.RadioButton.16371.2 +DPI svtools.ComboBox.16371.1 +Groesse svtools.RadioButton.16371.3 +Breite svtools.MetricField.16371.1 +Hoehe svtools.MetricField.16371.2 -*Browser SID_BROWSER +*Browser .uno:Beamer -*ChineseTranslation svx:CB_USE_VARIANTS:DLG_CHINESETRANSLATION -TChineseToSChinese HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED -SChineseToTChinese HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL -'UseSARCharacter HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS -TranslateCommonTerms svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS -EditTerms svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS +*ChineseTranslation svx.CB_USE_VARIANTS.300 +TChineseToSChinese SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED +SChineseToTChinese SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL +'UseSARCharacter SVX_HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS +TranslateCommonTerms svx.CheckBox.300.2 +EditTerms svx.PushButton.300.1 -*ChineseDictionary svx:ModalDialog:DLG_CHINESEDICTIONARY -TChineseToSChinese HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED -SChineseToTChinese HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL -ReverseMapping HID_SVX_CHINESE_DICTIONARY_CB_REVERSE -Term svx:Edit:DLG_CHINESEDICTIONARY:ED_TERM -Mapping svx:Edit:DLG_CHINESEDICTIONARY:ED_MAPPING -Property svx:ListBox:DLG_CHINESEDICTIONARY:LB_PROPERTY -SToTMappingContent HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL -TToSMappingContent HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED -Add svx:PushButton:DLG_CHINESEDICTIONARY:PB_ADD -Modify svx:PushButton:DLG_CHINESEDICTIONARY:PB_MODIFY -Delete svx:PushButton:DLG_CHINESEDICTIONARY:PB_DELETE +*ChineseDictionary svx.ModalDialog.301 +TChineseToSChinese SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED +SChineseToTChinese SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL +ReverseMapping SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE +Term svx.Edit.301.1 +Mapping svx.Edit.301.2 +Property svx.ListBox.301.1 +SToTMappingContent SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL +TToSMappingContent SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED +Add svx.PushButton.301.1 +Modify svx.PushButton.301.2 +Delete svx.PushButton.301.3 diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win old mode 100755 new mode 100644 index ab6183ad7724..de5eff0c07ff --- a/testautomation/global/win/dial_d_h.win +++ b/testautomation/global/win/dial_d_h.win @@ -1,33 +1,33 @@ -*DataFieldsFunctionDlg HID_SC_DPDATAFIELD -FunctionList sc:MultiListBox:RID_SCDLG_DPDATAFIELD:LB_FUNC -More sc:MoreButton:RID_SCDLG_DPDATAFIELD:BTN_MORE -ValueType sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_TYPE -BaseField sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_BASEFIELD -BaseItem sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_BASEITEM - -*DataFieldsOptionsDlg HID_SC_DPSUBT_OPT -Sortby sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SORT_BY -Ascending sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_ASC -Descending sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_DESC -Manual sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_MAN -Layout sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_LAYOUT -EmptyLine sc:CheckBox:RID_SCDLG_DPSUBTOTAL_OPT:CB_LAYOUT_EMPTY -Show sc:CheckBox:RID_SCDLG_DPSUBTOTAL_OPT:CB_SHOW -ShowItems sc:NumericField:RID_SCDLG_DPSUBTOTAL_OPT:NF_SHOW -ShowFrom sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SHOW_FROM -UsingField sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SHOW_USING -HideItems HID_SC_DPSUBT_HIDE -Hierarchy sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_HIERARCHY - -*DateienAuswaehlen HID_FILEDLG_MAILMRGE2 -Hinzufuegen cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH -Loeschen cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH -Pfade cui:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH - -*Datenpilot SID_OPENDLG_PIVOTTABLE -Zusaetze sc:MoreButton:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE -DataPilotRange sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_INAREA -DataPilotRangeShrink sc:ImageButton:RID_SCDLG_PIVOT_LAYOUT:RB_INAREA +*DataFieldsFunctionDlg SC_HID_SC_DPDATAFIELD +FunctionList sc.MultiListBox.25737.1 +More sc.MoreButton.25737.4 +ValueType sc.ListBox.25737.2 +BaseField sc.ListBox.25737.3 +BaseItem sc.ListBox.25737.4 + +*DataFieldsOptionsDlg SC_HID_SC_DPSUBT_OPT +Sortby sc.ListBox.25738.5 +Ascending sc.RadioButton.25738.4 +Descending sc.RadioButton.25738.5 +Manual sc.RadioButton.25738.6 +Layout sc.ListBox.25738.6 +EmptyLine sc.CheckBox.25738.2 +Show sc.CheckBox.25738.3 +ShowItems sc.NumericField.25738.1 +ShowFrom sc.ListBox.25738.7 +UsingField sc.ListBox.25738.8 +HideItems SC_HID_SC_DPSUBT_HIDE +Hierarchy sc.ListBox.25738.9 + +*DateienAuswaehlen SW_HID_FILEDLG_MAILMRGE2 +Hinzufuegen cui.PushButton.10201.14 +Loeschen cui.PushButton.10201.15 +Pfade cui.ListBox.10201.11 + +*Datenpilot .uno:DataDataPilotRun +Zusaetze sc.MoreButton.25638.4 +DataPilotRange sc.Edit.25638.42 +DataPilotRangeShrink sc.ImageButton.25638.41 AusgabeAb SC:LISTBOX:RID_SCDLG_PIVOT_LAYOUT:LB_OUTAREA Bereich SC:EDIT:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA Minimieren SC:IMAGEBUTTON:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA @@ -35,70 +35,70 @@ LeerzeilenIgnorieren SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_IGNEMPTYROWS KategorieErkennung SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_DETECTCAT GesamtSpalten SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALCOL GesamtZeilen SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALROW -Entfernen sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_REMOVE -Optionen sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_OPTIONS -AddFilter sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_FILTER -EnableDrillToDetails sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_DRILLDOWN -DataPilotPage HID_SC_DPLAY_PAGE -DataPilotColumn HID_SC_DPLAY_COLUMN -DataPilotRow HID_SC_DPLAY_ROW -DataPilotData HID_SC_DPLAY_DATA -DataPilotSelection HID_SC_DPLAY_SELECT - -*DatenbankAustauschen sw:ModalDialog:DLG_CHANGE_DB -VerfuegbareDatenbanken HID_DB_SELECTION_TLB - -*Datenbankauswahl sw:ModalDialog:DLG_DBSELECTION - -*DatenbankbereichFestlegen SID_DEFINE_DBNAME -BereichsName sc:ComboBox:RID_SCDLG_DBNAMES:ED_NAME -EnthaeltSpaltenkoepfe sc:CheckBox:RID_SCDLG_DBNAMES:BTN_HEADER -Hinzufuegen sc:PushButton:RID_SCDLG_DBNAMES:BTN_ADD -Loeschen sc:PushButton:RID_SCDLG_DBNAMES:BTN_REMOVE -Aendern sc:PushButton:RID_SCDLG_DBNAMES:BTN_ADD -Bereich sc:Edit:RID_SCDLG_DBNAMES:ED_DBAREA -BereichMin sc:ImageButton:RID_SCDLG_DBNAMES:RB_DBAREA -Zusaetze sc:MoreButton:RID_SCDLG_DBNAMES:BTN_MORE -Spaltenkoepfe sc:CheckBox:RID_SCDLG_DBNAMES:BTN_HEADER -Zellen sc:CheckBox:RID_SCDLG_DBNAMES:BTN_SIZE -Formatierung sc:CheckBox:RID_SCDLG_DBNAMES:BTN_FORMAT -ImportierteDaten sc:CheckBox:RID_SCDLG_DBNAMES:BTN_STRIPDATA - -*DatenbankbereichWaehlen SID_SELECT_DB -Bereiche HID_SC_SELENTRY_LIST - -*Datenfeld HID_SC_PIVOTSUBT -Keine sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_NONE -Automatisch sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_AUTO -Benutzerdefiniert sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_USER -Funktionen sc:MultiListBox:RID_SCDLG_PIVOTSUBT:LB_FUNC -OhneDatenAnzeigen sc:CheckBox:RID_SCDLG_PIVOTSUBT:CB_SHOWALL -Options sc:PushButton:RID_SCDLG_PIVOTSUBT:BTN_OPTIONS - -*DatenquelleAuswaehlen HID_DATAPILOT_DATABASE -Datenbank sc:ListBox:RID_SCDLG_DAPIDATA:LB_DATABASE -Datenquelle sc:ComboBox:RID_SCDLG_DAPIDATA:CB_OBJECT -Art sc:ListBox:RID_SCDLG_DAPIDATA:LB_OBJTYPE - -*DatenquelleLiteraturdatenbank HID_DLG_DBCHANGE -Auswahl HID_SELECTION_TLB - - -*Dokumenteigenschaften SID_DOCINFO - -*DokumentSchuetzen FID_PROTECT_DOC -Passwort HID_PASSWD_DOC -Bestaetigung sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM -IstVerdeckt sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER - -*DokumentVorlagen SID_DOCTEMPLATE -NeueDokumentVorlage sfx2:Edit:DLG_DOC_TEMPLATE:ED_NAME -Bereiche sfx2:ListBox:DLG_DOC_TEMPLATE:LB_SECTION -Vorlagen sfx2:ListBox:DLG_DOC_TEMPLATE:LB_STYLESHEETS -Bearbeiten sfx2:PushButton:DLG_DOC_TEMPLATE:BT_EDIT -Verwalten sfx2:PushButton:DLG_DOC_TEMPLATE:BT_ORGANIZE - -*Drei_D_Effekte SID_3D_WIN +Entfernen sc.PushButton.25638.5 +Optionen sc.PushButton.25638.6 +AddFilter sc.CheckBox.25638.29 +EnableDrillToDetails sc.CheckBox.25638.30 +DataPilotPage SC_HID_SC_DPLAY_PAGE +DataPilotColumn SC_HID_SC_DPLAY_COLUMN +DataPilotRow SC_HID_SC_DPLAY_ROW +DataPilotData SC_HID_SC_DPLAY_DATA +DataPilotSelection SC_HID_SC_DPLAY_SELECT + +*DatenbankAustauschen sw.ModalDialog.21109 +VerfuegbareDatenbanken SW_HID_DB_SELECTION_TLB + +*Datenbankauswahl sw.ModalDialog.22050 + +*DatenbankbereichFestlegen .uno:DefineDBName +BereichsName sc.ComboBox.25627.11 +EnthaeltSpaltenkoepfe sc.CheckBox.25627.21 +Hinzufuegen sc.PushButton.25627.3 +Loeschen sc.PushButton.25627.4 +Aendern sc.PushButton.25627.3 +Bereich sc.Edit.25627.13 +BereichMin sc.ImageButton.25627.14 +Zusaetze sc.MoreButton.25627.33 +Spaltenkoepfe sc.CheckBox.25627.21 +Zellen sc.CheckBox.25627.22 +Formatierung sc.CheckBox.25627.23 +ImportierteDaten sc.CheckBox.25627.24 + +*DatenbankbereichWaehlen .uno:SelectDB +Bereiche SC_HID_SC_SELENTRY_LIST + +*Datenfeld SC_HID_SC_PIVOTSUBT +Keine sc.RadioButton.25642.1 +Automatisch sc.RadioButton.25642.2 +Benutzerdefiniert sc.RadioButton.25642.3 +Funktionen sc.MultiListBox.25642.1 +OhneDatenAnzeigen sc.CheckBox.25642.1 +Options sc.PushButton.25642.5 + +*DatenquelleAuswaehlen SC_HID_DATAPILOT_DATABASE +Datenbank sc.ListBox.25735.19 +Datenquelle sc.ComboBox.25735.21 +Art sc.ListBox.25735.23 + +*DatenquelleLiteraturdatenbank EXTENSIONS_HID_DLG_DBCHANGE +Auswahl EXTENSIONS_HID_SELECTION_TLB + + +*Dokumenteigenschaften .uno:SetDocumentProperties + +*DokumentSchuetzen .uno:ToolProtectionDocument +Passwort SC_HID_PASSWD_DOC +Bestaetigung sfx2.Edit.2316.16 +IstVerdeckt sfx2.Edit.2316.12 + +*DokumentVorlagen .uno:SaveAsTemplate +NeueDokumentVorlage sfx2.Edit.2054.7 +Bereiche sfx2.ListBox.2054.2 +Vorlagen sfx2.ListBox.2054.4 +Bearbeiten sfx2.PushButton.2054.12 +Verwalten sfx2.PushButton.2054.20 + +*Drei_D_Effekte .uno:Window3D Geometrie SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_GEO Darstellung SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_REPRESENTATION Beleuchtung SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT @@ -150,182 +150,182 @@ UmwandelnInRotationskoerper SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LATHE_OBJ Umgebungslicht SVX:LISTBOX:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT Horizontale_Segmente SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_HORIZONTAL Vertikale_Segmente SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_VERTICAL -Kantenrundung svx:MetricField:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL -Tiefenskalierung svx:MetricField:RID_SVXFLOAT_3D:MTR_BACKSCALE -Endwinkel svx:MetricField:RID_SVXFLOAT_3D:MTR_END_ANGLE -Tiefe svx:MetricField:RID_SVXFLOAT_3D:MTR_DEPTH -Modus svx:ListBox:RID_SVXFLOAT_3D:LB_SHADEMODE -Papierneigung svx:MetricField:RID_SVXFLOAT_3D:MTR_SLANT -Entfernung svx:MetricField:RID_SVXFLOAT_3D:MTR_DISTANCE -Brennweite svx:MetricField:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH - -*DruckbereicheBearbeiten HID_SCPAGE_AREAS -Druckbereich sc:Edit:RID_SCDLG_AREAS:ED_PRINTAREA -Wiederholungszeile sc:Edit:RID_SCDLG_AREAS:ED_REPEATROW -Wiederholungsspalte sc:Edit:RID_SCDLG_AREAS:ED_REPEATCOL -DruckbereichListe sc:ListBox:RID_SCDLG_AREAS:LB_PRINTAREA -WiederholungszeileListe sc:ListBox:RID_SCDLG_AREAS:LB_REPEATROW -WiederholungsspalteListe sc:ListBox:RID_SCDLG_AREAS:LB_REPEATCOL -DruckbereichButton sc:ImageButton:RID_SCDLG_AREAS:RB_PRINTAREA -WiederholungszeileButton sc:ImageButton:RID_SCDLG_AREAS:RB_REPEATROW -WiederholungsspalteButton sc:ImageButton:RID_SCDLG_AREAS:RB_REPEATCOL - -*Druckbestaetigung HID_PRINTMONITOR - -*Druckoptionen HID_DLG_PRV_PRT_OPTIONS -Zeilen sw:NumericField:DLG_PAGEPREVIEW_PRINTOPTIONS:NF_ROWS -Spalten sw:NumericField:DLG_PAGEPREVIEW_PRINTOPTIONS:NF_COLS -Links sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_LMARGIN -Rechts sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_RMARGIN -Oben sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_TMARGIN -Unten sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_BMARGIN -Horizontal sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_HMARGIN -Vertikal sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_VMARGIN -Querformat sw:RadioButton:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_LANDSCAPE -Hochformat sw:RadioButton:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_PORTRAIT -Standard sw:PushButton:DLG_PAGEPREVIEW_PRINTOPTIONS:PB_STANDARD - -*DruckerZusaetzeDraw HID_SD_PRINT_OPTIONS -Zeichnung sd:CheckBox:TP_PRINT_OPTIONS:CBX_DRAW -Notizen sd:CheckBox:TP_PRINT_OPTIONS:CBX_NOTES -Handzettel sd:CheckBox:TP_PRINT_OPTIONS:CBX_HANDOUTS -Gliederung sd:CheckBox:TP_PRINT_OPTIONS:CBX_OUTLINE -Seitenname sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAGENAME -Datum sd:CheckBox:TP_PRINT_OPTIONS:CBX_DATE -Zeit sd:CheckBox:TP_PRINT_OPTIONS:CBX_TIME -AusgeblendeteSeiten sd:CheckBox:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES -Standard sd:RadioButton:TP_PRINT_OPTIONS:RBT_DEFAULT -SeitengroesseAnpassen sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGESIZE -SeitenKacheln sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGETILE -Prospekt sd:RadioButton:TP_PRINT_OPTIONS:RBT_BOOKLET -Vorderseite sd:CheckBox:TP_PRINT_OPTIONS:CBX_FRONT -Rueckseite sd:CheckBox:TP_PRINT_OPTIONS:CBX_BACK -AusDruckereinstellung sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN - -*DruckerZusaetzeWriter HID_OPTPRINT_PAGE -Grafiken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF -Kontrollfelder sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD -Hintergrund sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND -HiddenText sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT -TextPlaceholder sw:CheckBox:TP_OPTPRINT_PAGE:CB_TEXT_PLACEHOLDER -RightToLeft sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL -SchwarzDrucken sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT -LinkeSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP -RechteSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP -Prospekt sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT -Keine sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO -NurNotizen sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY -Dokumentende sw:RadioButton:TP_OPTPRINT_PAGE:RB_END -Seitenende sw:RadioButton:TP_OPTPRINT_PAGE:RB_PAGEEND -Fax sw:ListBox:TP_OPTPRINT_PAGE:LB_FAX -AusDruckereinstellung sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP - -*Duplizieren SID_COPYOBJECTS -AnzahlAnKopien sd:NumericField:DLG_COPY:NUM_FLD_COPIES -XAchse sd:MetricField:DLG_COPY:MTR_FLD_MOVE_X -YAchse sd:MetricField:DLG_COPY:MTR_FLD_MOVE_Y -Drehwinkel sd:MetricField:DLG_COPY:MTR_FLD_ANGLE -Hoehe sd:MetricField:DLG_COPY:MTR_FLD_HEIGHT -Breite sd:MetricField:DLG_COPY:MTR_FLD_WIDTH -Anfang sd:ListBox:DLG_COPY:LB_START_COLOR -Ende sd:ListBox:DLG_COPY:LB_END_COLOR - -*DVVerwalten SID_ORGANIZER -Befehle sfx2:MenuButton:DLG_ORGANIZE:BTN_EDIT -WelcheDatei sfx2:PushButton:DLG_ORGANIZE:BTN_FILES -ListeLinks HID_CTL_ORGANIZER_LEFT -ListeRechts HID_CTL_ORGANIZER_RIGHT -PopuplisteLinks sfx2:ListBox:DLG_ORGANIZE:LB_LEFT_TYP -PopuplisteRechts sfx2:ListBox:DLG_ORGANIZE:LB_RIGHT_TYP -AddressBook sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE - -*EinfuegenSpalten FN_TABLE_INSERT_COL_DLG -Anzahl cui:NumericField:DLG_INS_ROW_COL:ED_COUNT -Davor cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE -Dahinter cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER - -*EinfuegenZeilen FN_TABLE_INSERT_ROW_DLG -Anzahl cui:NumericField:DLG_INS_ROW_COL:ED_COUNT -Davor cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE -Dahinter cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER - -*EbeneEinfuegenDlg SID_INSERTLAYER -EbenenName sd:Edit:DLG_INSERT_LAYER:EDT_NAME -LayerTitle sd:Edit:DLG_INSERT_LAYER:EDT_TITLE -LayerDescription sd:MultiLineEdit:DLG_INSERT_LAYER:EDT_DESCRIPTION -Sichtbar sd:CheckBox:DLG_INSERT_LAYER:CBX_VISIBLE -Druckbar sd:CheckBox:DLG_INSERT_LAYER:CBX_PRINTABLE -Gesperrt sd:CheckBox:DLG_INSERT_LAYER:CBX_LOCKED - -*EbeneAendernDlg SID_MODIFYLAYER -EbenenName sd:Edit:DLG_INSERT_LAYER:EDT_NAME -LayerTitle sd:Edit:DLG_INSERT_LAYER:EDT_TITLE -LayerDescription sd:MultiLineEdit:DLG_INSERT_LAYER:EDT_DESCRIPTION -Sichtbar sd:CheckBox:DLG_INSERT_LAYER:CBX_VISIBLE -Druckbar sd:CheckBox:DLG_INSERT_LAYER:CBX_PRINTABLE -Gesperrt sd:CheckBox:DLG_INSERT_LAYER:CBX_LOCKED - -*Eingabefeld HID_FLD_INPUT +Kantenrundung svx.MetricField.10209.30 +Tiefenskalierung svx.MetricField.10209.32 +Endwinkel svx.MetricField.10209.34 +Tiefe svx.MetricField.10209.36 +Modus svx.ListBox.10209.46 +Papierneigung svx.MetricField.10209.49 +Entfernung svx.MetricField.10209.52 +Brennweite svx.MetricField.10209.54 + +*DruckbereicheBearbeiten SC_HID_SCPAGE_AREAS +Druckbereich sc.Edit.25685.11 +Wiederholungszeile sc.Edit.25685.21 +Wiederholungsspalte sc.Edit.25685.31 +DruckbereichListe sc.ListBox.25685.13 +WiederholungszeileListe sc.ListBox.25685.23 +WiederholungsspalteListe sc.ListBox.25685.33 +DruckbereichButton sc.ImageButton.25685.12 +WiederholungszeileButton sc.ImageButton.25685.22 +WiederholungsspalteButton sc.ImageButton.25685.32 + +*Druckbestaetigung SFX2_HID_PRINTMONITOR + +*Druckoptionen SW_HID_DLG_PRV_PRT_OPTIONS +Zeilen sw.NumericField.20602.3 +Spalten sw.NumericField.20602.5 +Links sw.MetricField.20602.13 +Rechts sw.MetricField.20602.15 +Oben sw.MetricField.20602.17 +Unten sw.MetricField.20602.19 +Horizontal sw.MetricField.20602.21 +Vertikal sw.MetricField.20602.23 +Querformat sw.RadioButton.20602.24 +Hochformat sw.RadioButton.20602.25 +Standard sw.PushButton.20602.24 + +*DruckerZusaetzeDraw SD_HID_SD_PRINT_OPTIONS +Zeichnung sd.CheckBox.549.6 +Notizen sd.CheckBox.549.7 +Handzettel sd.CheckBox.549.8 +Gliederung sd.CheckBox.549.9 +Seitenname sd.CheckBox.549.2 +Datum sd.CheckBox.549.3 +Zeit sd.CheckBox.549.4 +AusgeblendeteSeiten sd.CheckBox.549.1 +Standard sd.RadioButton.549.1 +SeitengroesseAnpassen sd.RadioButton.549.2 +SeitenKacheln sd.RadioButton.549.3 +Prospekt sd.RadioButton.549.4 +Vorderseite sd.CheckBox.549.12 +Rueckseite sd.CheckBox.549.13 +AusDruckereinstellung sd.CheckBox.549.10 + +*DruckerZusaetzeWriter SW_HID_OPTPRINT_PAGE +Grafiken sw.CheckBox.20826.61 +Kontrollfelder sw.CheckBox.20826.69 +Hintergrund sw.CheckBox.20826.79 +HiddenText sw.CheckBox.20826.93 +TextPlaceholder sw.CheckBox.20826.94 +RightToLeft sw.CheckBox.20826.140 +SchwarzDrucken sw.CheckBox.20826.87 +LinkeSeiten sw.CheckBox.20826.64 +RechteSeiten sw.CheckBox.20826.65 +Prospekt sw.CheckBox.20826.67 +Keine sw.RadioButton.20826.80 +NurNotizen sw.RadioButton.20826.81 +Dokumentende sw.RadioButton.20826.82 +Seitenende sw.RadioButton.20826.83 +Fax sw.ListBox.20826.86 +AusDruckereinstellung sw.CheckBox.20826.70 + +*Duplizieren .uno:CopyObjects +AnzahlAnKopien sd.NumericField.727.1 +XAchse sd.MetricField.727.2 +YAchse sd.MetricField.727.3 +Drehwinkel sd.MetricField.727.1 +Hoehe sd.MetricField.727.5 +Breite sd.MetricField.727.4 +Anfang sd.ListBox.727.1 +Ende sd.ListBox.727.2 + +*DVVerwalten .uno:Organizer +Befehle sfx2.MenuButton.2055.105 +WelcheDatei sfx2.PushButton.2055.3 +ListeLinks SFX2_HID_CTL_ORGANIZER_LEFT +ListeRechts SFX2_HID_CTL_ORGANIZER_RIGHT +PopuplisteLinks sfx2.ListBox.2055.2 +PopuplisteRechts sfx2.ListBox.2055.11 +AddressBook sfx2.PushButton.2055.4 + +*EinfuegenSpalten .uno:InsertColumnDialog +Anzahl cui.NumericField.10156.2 +Davor cui.RadioButton.10156.10 +Dahinter cui.RadioButton.10156.11 + +*EinfuegenZeilen .uno:InsertRowDialog +Anzahl cui.NumericField.10156.2 +Davor cui.RadioButton.10156.10 +Dahinter cui.RadioButton.10156.11 + +*EbeneEinfuegenDlg .uno:InsertLayer +EbenenName sd.Edit.259.2 +LayerTitle sd.Edit.259.4 +LayerDescription sd.MultiLineEdit.259.6 +Sichtbar sd.CheckBox.259.7 +Druckbar sd.CheckBox.259.8 +Gesperrt sd.CheckBox.259.9 + +*EbeneAendernDlg .uno:ModifyLayer +EbenenName sd.Edit.259.2 +LayerTitle sd.Edit.259.4 +LayerDescription sd.MultiLineEdit.259.6 +Sichtbar sd.CheckBox.259.7 +Druckbar sd.CheckBox.259.8 +Gesperrt sd.CheckBox.259.9 + +*Eingabefeld SW_HID_FLD_INPUT Titel SW:EDIT:DLG_FLD_INPUT:ED_LABEL -EingabeText sw:MultiLineEdit:DLG_FLD_INPUT:ED_EDIT +EingabeText sw.MultiLineEdit.21105.3 Weiter SW:PUSHBUTTON:DLG_FLD_INPUT:PB_NEXT -*EMFOptionen svtools:ModalDialog:DLG_EXPORT_VEC -Original svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC -Groesse svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC -Breite svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC -Hoehe svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC - -*EPSOptionen filter:ModalDialog:DLG_EXPORT_EPS -VorschauTif filter:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_TIFF -InterchangeEPSI filter:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_EPSI -Level1 filter:RadioButton:DLG_EXPORT_EPS:RB_LEVEL1 -Level2 filter:RadioButton:DLG_EXPORT_EPS:RB_LEVEL2 -Farbe filter:RadioButton:DLG_EXPORT_EPS:RB_COLOR -Graustufen filter:RadioButton:DLG_EXPORT_EPS:RB_GRAYSCALE -LZWKodierung filter:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_LZW -Keine filter:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_NONE - -*EtikettenSynchronisieren HID_SYNC_BTN +*EMFOptionen svtools.ModalDialog.16372 +Original svtools.RadioButton.16372.1 +Groesse svtools.RadioButton.16372.2 +Breite svtools.MetricField.16372.1 +Hoehe svtools.MetricField.16372.2 + +*EPSOptionen filter.ModalDialog.17408 +VorschauTif filter.CheckBox.17408.1 +InterchangeEPSI filter.CheckBox.17408.2 +Level1 filter.RadioButton.17408.1 +Level2 filter.RadioButton.17408.2 +Farbe filter.RadioButton.17408.3 +Graustufen filter.RadioButton.17408.4 +LZWKodierung filter.RadioButton.17408.5 +Keine filter.RadioButton.17408.6 + +*EtikettenSynchronisieren SW_HID_SYNC_BTN Synchronisieren SW:PUSHBUTTON:DLG_SYNC_BTN:BTN_SYNC -*ExportCalc HID_SC_INPORTOPT -Zeichensatzliste sc:ListBox:RID_SCDLG_IMPORTOPT:LB_FONT -Feldtrenner sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_FIELDSEP -Texttrenner sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_TEXTSEP -Zeichensatz sc:ListBox:RID_SCDLG_IMPORTOPT:DDLB_FONT -FixedWidth sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_FIXEDWIDTH -SaveAsShown sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_SAVESHOWN - -*ExterneDaten sc:ModalDialog:RID_SCDLG_LINKAREA -URLFeld HID_SCDLG_LINKAREAURL -DateiAuswahl sc:PushButton:RID_SCDLG_LINKAREA:BTN_BROWSE -TabellenListBox sc:MultiListBox:RID_SCDLG_LINKAREA:LB_RANGES -Aktualisieren sc:CheckBox:RID_SCDLG_LINKAREA:BTN_RELOAD -Zeit sc:NumericField:RID_SCDLG_LINKAREA:NF_DELAY - -*ExterneDatenquelle HID_DATAPILOT_SERVICE -Service sc:ListBox:RID_SCDLG_DAPISERVICE:LB_SERVICE -Quelle sc:Edit:RID_SCDLG_DAPISERVICE:ED_SOURCE -Quellname sc:Edit:RID_SCDLG_DAPISERVICE:ED_NAME -Benutzer sc:Edit:RID_SCDLG_DAPISERVICE:ED_USER -Kennwort sc:Edit:RID_SCDLG_DAPISERVICE:ED_PASSWD - -*ExtrasOptionenDlg HID_OFADLG_OPTIONS_TREE -Optionsliste HID_OFADLG_TREELISTBOX -Zurueck cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK - -*FeldAuswahl HID_FIELD_SEL_WIN -Liste HID_FIELD_SEL +*ExportCalc SC_HID_SC_INPORTOPT +Zeichensatzliste sc.ListBox.25663.10 +Feldtrenner sc.ComboBox.25663.5 +Texttrenner sc.ComboBox.25663.7 +Zeichensatz sc.ListBox.25663.9 +FixedWidth sc.CheckBox.25663.12 +SaveAsShown sc.CheckBox.25663.13 + +*ExterneDaten sc.ModalDialog.25736 +URLFeld SC_HID_SCDLG_LINKAREAURL +DateiAuswahl sc.PushButton.25736.6 +TabellenListBox sc.MultiListBox.25736.9 +Aktualisieren sc.CheckBox.25736.10 +Zeit sc.NumericField.25736.11 + +*ExterneDatenquelle SC_HID_DATAPILOT_SERVICE +Service sc.ListBox.25734.9 +Quelle sc.Edit.25734.11 +Quellname sc.Edit.25734.13 +Benutzer sc.Edit.25734.15 +Kennwort sc.Edit.25734.17 + +*ExtrasOptionenDlg CUI_HID_OFADLG_OPTIONS_TREE +Optionsliste CUI_HID_OFADLG_TREELISTBOX +Zurueck cui.PushButton.17015.4 + +*FeldAuswahl SVX_HID_FIELD_SEL_WIN +Liste SVX_HID_FIELD_SEL *FeldbefehlBearbeitenDraw SD:MODALDIALOG:DLG_FIELD_MODIFY FeldtypFix SD:RADIOBUTTON:DLG_FIELD_MODIFY:RBT_FIX FeldtypVariabel SD:RADIOBUTTON:DLG_FIELD_MODIFY:RBT_VAR -*FeldbefehlBearbeitenDatenbank HID_EDIT_FLD_DB -Bearbeiten HID_FLDEDT_ADDRESS +*FeldbefehlBearbeitenDatenbank SW_HID_EDIT_FLD_DB +Bearbeiten SW_HID_FLDEDT_ADDRESS Feldtyp SW:LISTBOX:TP_FLD_DB:LB_DBTYPE -Datenbankauswahl HID_DB_SELECTION_TLB +Datenbankauswahl SW_HID_DB_SELECTION_TLB Bedingung SW:EDIT:TP_FLD_DB:ED_DBCONDITION Satznummer SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER AusDatenbank SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT @@ -333,8 +333,8 @@ Selbstdefiniert SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT Formatliste SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT Zahlenformat SW:LISTBOX:TP_FLD_DB:LB_DBNUMFORMAT -*FeldbefehlBearbeitenDokument HID_EDIT_FLD_DOK -Bearbeiten HID_FLDEDT_ADDRESS +*FeldbefehlBearbeitenDokument SW_HID_EDIT_FLD_DOK +Bearbeiten SW_HID_FLDEDT_ADDRESS Feldtyp SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE Auswahl SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION Editfeld SW:EDIT:TP_FLD_DOK:ED_DOKVALUE @@ -342,18 +342,18 @@ DokLevel SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL Formatliste SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT Zahlenformat SW:LISTBOX:TP_FLD_DOK:LB_DOKNUMFORMAT InhaltFix SW:CHECKBOX:TP_FLD_DOK:CB_DOKFIXEDCONTENT -VorigerFeldbefehl HID_DLG_FLDEDT_PREV -NaechsterFeldbefehl HID_DLG_FLDEDT_NEXT +VorigerFeldbefehl SW_HID_DLG_FLDEDT_PREV +NaechsterFeldbefehl SW_HID_DLG_FLDEDT_NEXT -*FeldbefehlBearbeitenDokumentinfo HID_EDIT_FLD_DOKINF -Bearbeiten HID_FLDEDT_ADDRESS -Feldtyp HID_FIELD_DINF_TYPE +*FeldbefehlBearbeitenDokumentinfo SW_HID_EDIT_FLD_DOKINF +Bearbeiten SW_HID_FLDEDT_ADDRESS +Feldtyp SW_HID_FIELD_DINF_TYPE Auswahl SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFSELECTION Zahlenformat SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFFORMAT InhaltFix SW:CHECKBOX:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT -*FeldbefehlBearbeitenFunktionen HID_EDIT_FLD_FUNC -Bearbeiten HID_FLDEDT_ADDRESS +*FeldbefehlBearbeitenFunktionen SW_HID_EDIT_FLD_FUNC +Bearbeiten SW_HID_FLDEDT_ADDRESS Feldtyp SW:LISTBOX:TP_FLD_FUNC:LB_FUNCTYPE Auswahl SW:LISTBOX:TP_FLD_FUNC:LB_FUNCSELECTION Formatliste SW:LISTBOX:TP_FLD_FUNC:LB_FUNCFORMAT @@ -367,26 +367,26 @@ Hinweis SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE Makroname SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME Platzhalter SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME Texteinfuegen SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE -AddListEntry sw:PushButton:TP_FLD_FUNC:PB_LISTADD -NewListEntry sw:Edit:TP_FLD_FUNC:ED_LISTITEM -EntrysList sw:ListBox:TP_FLD_FUNC:LB_LISTITEMS -RemoveEntry sw:PushButton:TP_FLD_FUNC:PB_LISTREMOVE -MoveUpEntry sw:PushButton:TP_FLD_FUNC:PB_LISTUP -MoveDownEntry sw:PushButton:TP_FLD_FUNC:PB_LISTDOWN -EntryName sw:Edit:TP_FLD_FUNC:ED_LISTNAME -VorigerFeldbefehl HID_DLG_FLDEDT_PREV -NaechsterFeldbefehl HID_DLG_FLDEDT_NEXT - -*FeldbefehlBearbeitenReferenz HID_EDIT_FLD_REF -Bearbeiten HID_FLDEDT_ADDRESS +AddListEntry sw.PushButton.20868.82 +NewListEntry sw.Edit.20868.81 +EntrysList sw.ListBox.20868.84 +RemoveEntry sw.PushButton.20868.85 +MoveUpEntry sw.PushButton.20868.86 +MoveDownEntry sw.PushButton.20868.87 +EntryName sw.Edit.20868.89 +VorigerFeldbefehl SW_HID_DLG_FLDEDT_PREV +NaechsterFeldbefehl SW_HID_DLG_FLDEDT_NEXT + +*FeldbefehlBearbeitenReferenz SW_HID_EDIT_FLD_REF +Bearbeiten SW_HID_FLDEDT_ADDRESS Feldtyp SW:LISTBOX:TP_FLD_REF:LB_REFTYPE Auswahl SW:LISTBOX:TP_FLD_REF:LB_REFSELECTION Formatliste SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT Namefeld SW:EDIT:TP_FLD_REF:ED_REFNAME Wert SW:EDIT:TP_FLD_REF:ED_REFVALUE -*FeldbefehlBearbeitenVariable HID_EDIT_FLD_VAR -Bearbeiten HID_FLDEDT_ADDRESS +*FeldbefehlBearbeitenVariable SW_HID_EDIT_FLD_VAR +Bearbeiten SW_HID_FLDEDT_ADDRESS Feldtyp SW:LISTBOX:TP_FLD_VAR:LB_VARTYPE Auswahl SW:LISTBOX:TP_FLD_VAR:LB_VARSELECTION Formatliste SW:LISTBOX:TP_FLD_VAR:LB_VARFORMAT @@ -397,91 +397,91 @@ Hinweis SW:EDIT:TP_FLD_VAR:ED_VARVALUE Korrektur SW:EDIT:TP_FLD_VAR:ED_VARVALUE Formel SW:EDIT:TP_FLD_VAR:ED_VARVALUE Unsichtbar SW:CHECKBOX:TP_FLD_VAR:CB_VARINVISIBLE -Uebernehmen HID_FLDVAR_APPLY -Loeschen HID_FLDVAR_DELETE - -*Filterauswahl HID_DLG_FILTER_SELECT -Filter uui:ListBox:DLG_FILTER_SELECT:LB_FILTERS - -*FilterDlg svtools:ModalDialog:DLG_EXPORT_PIX -Original svtools:RadioButton:DLG_EXPORT_PIX:RB_ORIGINAL_PIX -Aufloesung svtools:RadioButton:DLG_EXPORT_PIX:RB_RES_PIX -Groesse svtools:RadioButton:DLG_EXPORT_PIX:RB_SIZE_PIX -AufloesungDPI svtools:ComboBox:DLG_EXPORT_PIX:CBB_RES_PIX -Breite svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEX_PIX -Hoehe svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEY_PIX - -*Fontwork SID_FONTWORK -KreisAuswahl HID_FONTWORK_CTL_FORMS -Aus HID_FONTWORK_TBI_STYLE_OFF -Drehen HID_FONTWORK_TBI_STYLE_ROTATE -Aufrecht HID_FONTWORK_TBI_STYLE_UPRIGHT -HorizontalKippen HID_FONTWORK_TBI_STYLE_SLANTX -VertikalKippen HID_FONTWORK_TBI_STYLE_SLANTY -Laufrichtgung HID_FONTWORK_TBI_ADJUST_MIRROR -Linksbuendig HID_FONTWORK_TBI_ADJUST_LEFT -Zentriert HID_FONTWORK_TBI_ADJUST_CENTER -Rechtsbuendig HID_FONTWORK_TBI_ADJUST_RIGHT -AutoTextgroesse HID_FONTWORK_TBI_ADJUST_AUTOSIZE -Abstand svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE -Einzug svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART -Kontur HID_FONTWORK_TBI_SHOWFORM -Buchstabenumrandung HID_FONTWORK_TBI_OUTLINE -SchattenaAus HID_FONTWORK_TBI_SHADOW_OFF -Senkrecht HID_FONTWORK_TBI_SHADOW_NORMAL -Kippen HID_FONTWORK_TBI_SHADOW_SLANT -AbstandX svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X -AbstandY svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y -Schattenfarbe svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR - -*FormSpeichernUnter HID_NUM_NAMES -FormName sw:Edit:DLG_NUM_NAMES:ED_FORM -FormListe sw:ListBox:DLG_NUM_NAMES:LB_FORM - -*FormularNavigator SID_FM_SHOW_FMEXPLORER -Liste HID_FORM_NAVIGATOR - -*FussnoteBearbeiten FN_EDIT_FOOTNOTE -Automatisch sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO -Zeichen sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_CHAR -ZeichenText sw:Edit:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR +Uebernehmen SW_HID_FLDVAR_APPLY +Loeschen SW_HID_FLDVAR_DELETE + +*Filterauswahl UUI_HID_DLG_FILTER_SELECT +Filter uui.ListBox.14510.31 + +*FilterDlg svtools.ModalDialog.16371 +Original svtools.RadioButton.16371.1 +Aufloesung svtools.RadioButton.16371.2 +Groesse svtools.RadioButton.16371.3 +AufloesungDPI svtools.ComboBox.16371.1 +Breite svtools.MetricField.16371.1 +Hoehe svtools.MetricField.16371.2 + +*Fontwork .uno:FontWork +KreisAuswahl SVX_HID_FONTWORK_CTL_FORMS +Aus SVX_HID_FONTWORK_TBI_STYLE_OFF +Drehen SVX_HID_FONTWORK_TBI_STYLE_ROTATE +Aufrecht SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT +HorizontalKippen SVX_HID_FONTWORK_TBI_STYLE_SLANTX +VertikalKippen SVX_HID_FONTWORK_TBI_STYLE_SLANTY +Laufrichtgung SVX_HID_FONTWORK_TBI_ADJUST_MIRROR +Linksbuendig SVX_HID_FONTWORK_TBI_ADJUST_LEFT +Zentriert SVX_HID_FONTWORK_TBI_ADJUST_CENTER +Rechtsbuendig SVX_HID_FONTWORK_TBI_ADJUST_RIGHT +AutoTextgroesse SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE +Abstand svx.MetricField.10093.1 +Einzug svx.MetricField.10093.2 +Kontur SVX_HID_FONTWORK_TBI_SHOWFORM +Buchstabenumrandung SVX_HID_FONTWORK_TBI_OUTLINE +SchattenaAus SVX_HID_FONTWORK_TBI_SHADOW_OFF +Senkrecht SVX_HID_FONTWORK_TBI_SHADOW_NORMAL +Kippen SVX_HID_FONTWORK_TBI_SHADOW_SLANT +AbstandX svx.MetricField.10093.3 +AbstandY svx.MetricField.10093.4 +Schattenfarbe svx.ListBox.10093.1 + +*FormSpeichernUnter SW_HID_NUM_NAMES +FormName sw.Edit.21668.107 +FormListe sw.ListBox.21668.106 + +*FormularNavigator .uno:ShowFmExplorer +Liste SVX_HID_FORM_NAVIGATOR + +*FussnoteBearbeiten .uno:EditFootnote +Automatisch sw.RadioButton.21662.1 +Zeichen sw.RadioButton.21662.2 +ZeichenText sw.Edit.21662.3 Durchsuchen SW:PUSHBUTTON:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR Fussnote SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_FTN Endnote SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE -VorherigeFussnote sw:ImageButton:DLG_INS_FOOTNOTE:BT_PREV -NachfolgendeFussnote sw:ImageButton:DLG_INS_FOOTNOTE:BT_NEXT +VorherigeFussnote sw.ImageButton.21662.103 +NachfolgendeFussnote sw.ImageButton.21662.104 -*FussnoteEinfuegen FN_INSERT_FOOTNOTE_DLG -Automatisch sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO -Zeichen sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_CHAR -ZeichenText sw:Edit:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR +*FussnoteEinfuegen .uno:InsertFootnoteDialog +Automatisch sw.RadioButton.21662.1 +Zeichen sw.RadioButton.21662.2 +ZeichenText sw.Edit.21662.3 Durchsuchen SW:PUSHBUTTON:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR Fussnote SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_FTN Endnote SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE -*Gallerybeamer SID_BROWSER -Anzeige HID_GALLERY_WINDOW - -*Gestalter SID_STYLE_DESIGNER -TBGestalterRight HID_TEMPLDLG_TOOLBOX_RIGHT -TBGestalter HID_TEMPLDLG_TOOLBOX_LEFT -Absatzvorlagen SID_STYLE_FAMILY2 -Zeichenvorlagen SID_STYLE_FAMILY1 -Rahmenvorlagen SID_STYLE_FAMILY3 -Seitenvorlagen SID_STYLE_FAMILY4 -Grafikvorlagen SID_STYLE_FAMILY2 -Praesentationsvorlagen SID_STYLE_FAMILY5 -Numerierungsvorlagen SID_STYLE_FAMILY5 -Zellvorlagen SID_STYLE_FAMILY2 -Giesskanne HID_TEMPLDLG_WATERCAN -AusSelektion HID_TEMPLDLG_NEWBYEXAMPLE -Aktualisieren HID_TEMPLDLG_UPDATEBYEXAMPLE -Vorlagenliste HID_TEMPLATE_FMT -Gruppenliste HID_TEMPLATE_FILTER - -*GifOptionen filter:ModalDialog:DLG_EXPORT_GIF -Interlace filter:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED -TransparentSpeichern filter:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT +*Gallerybeamer .uno:Beamer +Anzeige SVX_HID_GALLERY_WINDOW + +*Gestalter .uno:DesignerDialog +TBGestalterRight SFX2_HID_TEMPLDLG_TOOLBOX_RIGHT +TBGestalter SFX2_HID_TEMPLDLG_TOOLBOX_LEFT +Absatzvorlagen .uno:ParaStyle +Zeichenvorlagen .uno:CharStyle +Rahmenvorlagen .uno:FrameStyle +Seitenvorlagen .uno:PageStyle +Grafikvorlagen .uno:ParaStyle +Praesentationsvorlagen .uno:ListStyle +Numerierungsvorlagen .uno:ListStyle +Zellvorlagen .uno:ParaStyle +Giesskanne SFX2_HID_TEMPLDLG_WATERCAN +AusSelektion SFX2_HID_TEMPLDLG_NEWBYEXAMPLE +Aktualisieren SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE +Vorlagenliste SFX2_HID_TEMPLATE_FMT +Gruppenliste SFX2_HID_TEMPLATE_FILTER + +*GifOptionen filter.ModalDialog.17401 +Interlace filter.CheckBox.17401.1 +TransparentSpeichern filter.CheckBox.17401.2 *GridControlDialogStarter ACTIVE ShowGridcontrol sym:showGridcontrol @@ -489,99 +489,99 @@ ShowGridcontrol sym:showGridcontrol *GridControlDialog sym:gridcontroldialog gridcontrolcontrol sym:gridcontrolself -*GroupingDlg HID_SC_DPDATEGROUP -AutoStart sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOSTART -ManualStart sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANSTART -StartContent sc:Edit:RID_SCDLG_DPNUMGROUP:ED_START -AutoEnd sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOEND -ManualEnd sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANEND -EndContent sc:Edit:RID_SCDLG_DPNUMGROUP:ED_END -NumberOfDays sc:RadioButton:RID_SCDLG_DPDATEGROUP:RB_NUMDAYS -DaysNumber sc:NumericField:RID_SCDLG_DPDATEGROUP:ED_NUMDAYS -Intervals sc:RadioButton:RID_SCDLG_DPDATEGROUP:RB_UNITS -IntervalsList HID_SC_DPDATEGROUP_LB -GroupBy sc:Edit:RID_SCDLG_DPNUMGROUP:ED_BY - -*GroupingNumDlg HID_SC_DPNUMGROUP -AutoStart sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOSTART -ManualStart sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANSTART -StartContent sc:Edit:RID_SCDLG_DPNUMGROUP:ED_START -AutoEnd sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOEND -ManualEnd sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANEND -EndContent sc:Edit:RID_SCDLG_DPNUMGROUP:ED_END -GroupBy sc:Edit:RID_SCDLG_DPNUMGROUP:ED_BY - -*GruppierungAufheben SID_OUTLINE_REMOVE -Zeilen HID_SC_GROUP_ROWS -Spalten HID_SC_GROUP_COLS - -*GruppierungAktivieren SID_OUTLINE_MAKE -Zeilen HID_SC_GROUP_ROWS -Spalten HID_SC_GROUP_COLS - -*HorizontaleLinieEinfuegen HID_RULER_DIALOG -Auswahl HID_VS_RULER - -*HTMLExport1 HID_SD_HTMLEXPORT_PAGE1 -NeuesDesign sd:RadioButton:DLG_PUBLISHING:PAGE1_NEW_DESIGN -ExistierendesDesign sd:RadioButton:DLG_PUBLISHING:PAGE1_OLD_DESIGN -DesignLoeschen sd:PushButton:DLG_PUBLISHING:PAGE1_DEL_DESIGN -DesignListe sd:ListBox:DLG_PUBLISHING:PAGE1_DESIGNS -Weiter sd:PushButton:DLG_PUBLISHING:BUT_NEXT -Zurueck sd:PushButton:DLG_PUBLISHING:BUT_LAST - -*HTMLExport2 HID_SD_HTMLEXPORT_PAGE2 -Standard sd:RadioButton:DLG_PUBLISHING:PAGE2_STANDARD -Frames sd:RadioButton:DLG_PUBLISHING:PAGE2_FRAMES -Automatisch sd:RadioButton:DLG_PUBLISHING:PAGE2_KIOSK -WebCast sd:RadioButton:DLG_PUBLISHING:PAGE2_WEBCAST -ASP sd:RadioButton:DLG_PUBLISHING:PAGE2_ASP -PERL sd:RadioButton:DLG_PUBLISHING:PAGE2_PERL -BeamerURL sd:Edit:DLG_PUBLISHING:PAGE2_INDEX -PraesentationURL sd:Edit:DLG_PUBLISHING:PAGE2_URL -ScriptURL sd:Edit:DLG_PUBLISHING:PAGE2_CGI -TitelseiteErzeugen sd:CheckBox:DLG_PUBLISHING:PAGE2_CONTENT -NotizenAnzeigen sd:CheckBox:DLG_PUBLISHING:PAGE2_NOTES -Weiter sd:PushButton:DLG_PUBLISHING:BUT_NEXT -Zurueck sd:PushButton:DLG_PUBLISHING:BUT_LAST - -*HTMLExport3 HID_SD_HTMLEXPORT_PAGE3 -PNG sd:RadioButton:DLG_PUBLISHING:PAGE3_PNG -GIF sd:RadioButton:DLG_PUBLISHING:PAGE3_GIF -JPG sd:RadioButton:DLG_PUBLISHING:PAGE3_JPG -Kompressionswert sd:ComboBox:DLG_PUBLISHING:PAGE3_QUALITY -NiedrigeAufloesung sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_1 -MittlereAufloesung sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_2 -HoheAufloesung sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_3 -KlaengeExportieren sd:CheckBox:DLG_PUBLISHING:PAGE3_SLD_SOUND -Weiter sd:PushButton:DLG_PUBLISHING:BUT_NEXT -Zurueck sd:PushButton:DLG_PUBLISHING:BUT_LAST - -*HTMLExport4 HID_SD_HTMLEXPORT_PAGE4 -Autor sd:Edit:DLG_PUBLISHING:PAGE4_AUTHOR -EMail sd:Edit:DLG_PUBLISHING:PAGE4_EMAIL_EDIT -Homepage sd:Edit:DLG_PUBLISHING:PAGE4_WWW_EDIT -LinkAufKopie sd:CheckBox:DLG_PUBLISHING:PAGE4_DOWNLOAD -AdditionalInformation sd:MultiLineEdit:DLG_PUBLISHING:PAGE4_MISC -Weiter sd:PushButton:DLG_PUBLISHING:BUT_NEXT -Zurueck sd:PushButton:DLG_PUBLISHING:BUT_LAST - -*HTMLExport5 HID_SD_HTMLEXPORT_PAGE5 -NurText sd:CheckBox:DLG_PUBLISHING:PAGE5_TEXTONLY -Weiter sd:PushButton:DLG_PUBLISHING:BUT_NEXT -Zurueck sd:PushButton:DLG_PUBLISHING:BUT_LAST - -*HTMLExport6 HID_SD_HTMLEXPORT_PAGE6 -FarbenAusDok sd:RadioButton:DLG_PUBLISHING:PAGE6_DOCCOLORS -BrowserFarben sd:RadioButton:DLG_PUBLISHING:PAGE6_DEFAULT -EigeneFarben sd:RadioButton:DLG_PUBLISHING:PAGE6_USER -Hintergrund sd:PushButton:DLG_PUBLISHING:PAGE6_BACK -Text sd:PushButton:DLG_PUBLISHING:PAGE6_TEXT -Hyperlink sd:PushButton:DLG_PUBLISHING:PAGE6_LINK -GesichteterLink sd:PushButton:DLG_PUBLISHING:PAGE6_VLINK -AktiverLink sd:PushButton:DLG_PUBLISHING:PAGE6_ALINK -Weiter sd:PushButton:DLG_PUBLISHING:BUT_NEXT -Zurueck sd:PushButton:DLG_PUBLISHING:BUT_LAST - -*HTMLDesign HID_SD_HTMLEXPORT_DLG_DNAME -Designname sd:Edit:DLG_DESIGNNAME:EDT_NAME +*GroupingDlg SC_HID_SC_DPDATEGROUP +AutoStart sc.RadioButton.25739.1 +ManualStart sc.RadioButton.25739.2 +StartContent sc.Edit.25739.1 +AutoEnd sc.RadioButton.25739.3 +ManualEnd sc.RadioButton.25739.4 +EndContent sc.Edit.25739.2 +NumberOfDays sc.RadioButton.25740.5 +DaysNumber sc.NumericField.25740.4 +Intervals sc.RadioButton.25740.6 +IntervalsList SC_HID_SC_DPDATEGROUP_LB +GroupBy sc.Edit.25739.3 + +*GroupingNumDlg SC_HID_SC_DPNUMGROUP +AutoStart sc.RadioButton.25739.1 +ManualStart sc.RadioButton.25739.2 +StartContent sc.Edit.25739.1 +AutoEnd sc.RadioButton.25739.3 +ManualEnd sc.RadioButton.25739.4 +EndContent sc.Edit.25739.2 +GroupBy sc.Edit.25739.3 + +*GruppierungAufheben .uno:Ungroup +Zeilen SC_HID_SC_GROUP_ROWS +Spalten SC_HID_SC_GROUP_COLS + +*GruppierungAktivieren .uno:Group +Zeilen SC_HID_SC_GROUP_ROWS +Spalten SC_HID_SC_GROUP_COLS + +*HorizontaleLinieEinfuegen SW_HID_RULER_DIALOG +Auswahl SW_HID_VS_RULER + +*HTMLExport1 SD_HID_SD_HTMLEXPORT_PAGE1 +NeuesDesign sd.RadioButton.739.3 +ExistierendesDesign sd.RadioButton.739.4 +DesignLoeschen sd.PushButton.739.6 +DesignListe sd.ListBox.739.5 +Weiter sd.PushButton.739.201 +Zurueck sd.PushButton.739.200 + +*HTMLExport2 SD_HID_SD_HTMLEXPORT_PAGE2 +Standard sd.RadioButton.739.22 +Frames sd.RadioButton.739.23 +Automatisch sd.RadioButton.739.24 +WebCast sd.RadioButton.739.25 +ASP sd.RadioButton.739.41 +PERL sd.RadioButton.739.42 +BeamerURL sd.Edit.739.44 +PraesentationURL sd.Edit.739.46 +ScriptURL sd.Edit.739.48 +TitelseiteErzeugen sd.CheckBox.739.31 +NotizenAnzeigen sd.CheckBox.739.32 +Weiter sd.PushButton.739.201 +Zurueck sd.PushButton.739.200 + +*HTMLExport3 SD_HID_SD_HTMLEXPORT_PAGE3 +PNG sd.RadioButton.739.51 +GIF sd.RadioButton.739.52 +JPG sd.RadioButton.739.53 +Kompressionswert sd.ComboBox.739.55 +NiedrigeAufloesung sd.RadioButton.739.57 +MittlereAufloesung sd.RadioButton.739.58 +HoheAufloesung sd.RadioButton.739.59 +KlaengeExportieren sd.CheckBox.739.61 +Weiter sd.PushButton.739.201 +Zurueck sd.PushButton.739.200 + +*HTMLExport4 SD_HID_SD_HTMLEXPORT_PAGE4 +Autor sd.Edit.739.68 +EMail sd.Edit.739.70 +Homepage sd.Edit.739.72 +LinkAufKopie sd.CheckBox.739.75 +AdditionalInformation sd.MultiLineEdit.739.74 +Weiter sd.PushButton.739.201 +Zurueck sd.PushButton.739.200 + +*HTMLExport5 SD_HID_SD_HTMLEXPORT_PAGE5 +NurText sd.CheckBox.739.82 +Weiter sd.PushButton.739.201 +Zurueck sd.PushButton.739.200 + +*HTMLExport6 SD_HID_SD_HTMLEXPORT_PAGE6 +FarbenAusDok sd.RadioButton.739.109 +BrowserFarben sd.RadioButton.739.102 +EigeneFarben sd.RadioButton.739.103 +Hintergrund sd.PushButton.739.104 +Text sd.PushButton.739.105 +Hyperlink sd.PushButton.739.106 +GesichteterLink sd.PushButton.739.107 +AktiverLink sd.PushButton.739.108 +Weiter sd.PushButton.739.201 +Zurueck sd.PushButton.739.200 + +*HTMLDesign SD_HID_SD_HTMLEXPORT_DLG_DNAME +Designname sd.Edit.740.3 diff --git a/testautomation/global/win/dial_i_o.win b/testautomation/global/win/dial_i_o.win old mode 100755 new mode 100644 index aa965b42f51d..221e7e2d0b47 --- a/testautomation/global/win/dial_i_o.win +++ b/testautomation/global/win/dial_i_o.win @@ -1,121 +1,121 @@ -*ImageMapEditor svx:ModelessDialog:RID_SVXDLG_IMAP -TB_ImagemapEditor HID_IMAPDLG_TOOLBOX -Zuweisen HID_IMAPDLG_APPLY -Oeffnen HID_IMAPDLG_OPEN -Speichern HID_IMAPDLG_SAVEAS -Auswahl HID_IMAPDLG_SELECT -Rechteck HID_IMAPDLG_RECT -Ellipse HID_IMAPDLG_CIRCLE -Polygon HID_IMAPDLG_POLY -Freihandpolygon HID_IMAPDLG_FREEPOLY -Punktebearbeiten HID_IMAPDLG_POLYEDIT -Punkteverschieben HID_IMAPDLG_POLYMOVE -Punkteeinfuegen HID_IMAPDLG_POLYINSERT -Punkteloeschen HID_IMAPDLG_POLYDELETE -Rueckgaengig HID_IMAPDLG_UNDO -Wiederholen HID_IMAPDLG_REDO -Aktiv HID_IMAPDLG_ACTIVE -Makro HID_IMAPDLG_MACRO -Eigenschaften HID_IMAPDLG_PROPERTY -BearbeitenImageMap SID_IMAP -Beschreibung svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT -Dokument HID_IMAPDLG_GRAPHWND -Adresse SID_OPENURL -BearbeitenText svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT - -*ImageMapHyperlink cui:ModalDialog:RID_SVXDLG_IMAPURL -URL cui:Edit:RID_SVXDLG_IMAPURL:EDT_URL -Alternativetext cui:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION -Frame cui:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS -Name cui:Edit:RID_SVXDLG_IMAPURL:EDT_NAME -Description cui:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION - -*IndividuellePraesentation SID_CUSTOMSHOW_DLG +*ImageMapEditor svx.ModelessDialog.10450 +TB_ImagemapEditor SVX_HID_IMAPDLG_TOOLBOX +Zuweisen SVX_HID_IMAPDLG_APPLY +Oeffnen SVX_HID_IMAPDLG_OPEN +Speichern SVX_HID_IMAPDLG_SAVEAS +Auswahl SVX_HID_IMAPDLG_SELECT +Rechteck SVX_HID_IMAPDLG_RECT +Ellipse SVX_HID_IMAPDLG_CIRCLE +Polygon SVX_HID_IMAPDLG_POLY +Freihandpolygon SVX_HID_IMAPDLG_FREEPOLY +Punktebearbeiten SVX_HID_IMAPDLG_POLYEDIT +Punkteverschieben SVX_HID_IMAPDLG_POLYMOVE +Punkteeinfuegen SVX_HID_IMAPDLG_POLYINSERT +Punkteloeschen SVX_HID_IMAPDLG_POLYDELETE +Rueckgaengig SVX_HID_IMAPDLG_UNDO +Wiederholen SVX_HID_IMAPDLG_REDO +Aktiv SVX_HID_IMAPDLG_ACTIVE +Makro SVX_HID_IMAPDLG_MACRO +Eigenschaften SVX_HID_IMAPDLG_PROPERTY +BearbeitenImageMap .uno:ImageMapDialog +Beschreibung svx.Edit.10450.1 +Dokument SVX_HID_IMAPDLG_GRAPHWND +Adresse .uno:OpenUrl +BearbeitenText svx.Edit.10450.1 + +*ImageMapHyperlink cui.ModalDialog.10102 +URL cui.Edit.10102.2 +Alternativetext cui.Edit.10102.1 +Frame cui.ComboBox.10102.1 +Name cui.Edit.10102.3 +Description cui.MultiLineEdit.10102.4 + +*IndividuellePraesentation .uno:CustomShowDialog Neu SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_NEW Bearbeiten SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_EDIT Loeschen SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_REMOVE Kopieren SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_COPY Starten SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_STARTSHOW IndividuellePraesentationBenutzen SD:CHECKBOX:DLG_CUSTOMSHOW:CBX_USE_CUSTOMSHOW -CustomSlideShowList sd:ListBox:DLG_CUSTOMSHOW:LB_CUSTOMSHOWS +CustomSlideShowList sd.ListBox.843.1 -*IndividuellePraesentationDefinieren HID_DLG_DEFINE_CUSTOMSHOW +*IndividuellePraesentationDefinieren SD_HID_DLG_DEFINE_CUSTOMSHOW PraesentationName SD:EDIT:DLG_DEFINE_CUSTOMSHOW:EDT_NAME SeitenPraesentation SD:MULTILISTBOX:DLG_DEFINE_CUSTOMSHOW:LB_PAGES -SelectedSlides HID_DLG_DEFINE_CUSTOMSHOW_CTL +SelectedSlides SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL Hinzufuegen SD:PUSHBUTTON:DLG_DEFINE_CUSTOMSHOW:BTN_ADD Entfernen SD:PUSHBUTTON:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE -*InfofelderBearbeiten HID_DOCINFO_EDT -Name0 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO1 -Name1 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO2 -Name2 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3 -Name3 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4 +*InfofelderBearbeiten SFX2_HID_DOCINFO_EDT +Name0 sfx2.Edit.266.5 +Name1 sfx2.Edit.266.7 +Name2 sfx2.Edit.266.9 +Name3 sfx2.Edit.266.11 -*InfonamenBearbeiten HID_DOCINFO_EDT -Namen1 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO1 -Namen2 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO2 -Namen3 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3 -Namen4 sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4 +*InfonamenBearbeiten SFX2_HID_DOCINFO_EDT +Namen1 sfx2.Edit.266.5 +Namen2 sfx2.Edit.266.7 +Namen3 sfx2.Edit.266.9 +Namen4 sfx2.Edit.266.11 -*InhaltEinfuegen HID_PASTE_DLG +*InhaltEinfuegen CUI_HID_PASTE_DLG AlsSymbol cui:CHECKBOX:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON AndersSymbol cui:PUSHBUTTON:MD_PASTE_OBJECT:PB_CHANGE_ICON VerknuepfungMit cui:RADIOBUTTON:MD_PASTE_OBJECT:RB_PASTE_LINK -Auswahl cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST -EinfuegenAls cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE - -*InhalteEinfuegenCalc FID_INS_CELL_CONTENTS -AllesEinfuegen sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSALL -Zeichenketten sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSSTRINGS -Zahlen sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSNUMBERS -DatumZeit sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSDATETIME -Formeln sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSFORMULAS -Notizen sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSNOTES -Formate sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSATTRS -Objects sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSOBJECTS -LeerzellenUeberspringen sc:CheckBox:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY -Transponieren sc:CheckBox:RID_SCDLG_INSCONT:BTN_TRANSPOSE -Verknuepfen sc:CheckBox:RID_SCDLG_INSCONT:BTN_LINK -Keine sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_NOOP -Addieren sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_ADD -Subtrahieren sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_SUB -Multiplizieren sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_MUL -Dividieren sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_DIV +Auswahl cui.ListBox.32001.7 +EinfuegenAls cui.RadioButton.32001.20 + +*InhalteEinfuegenCalc .uno:InsertContents +AllesEinfuegen sc.CheckBox.25618.20 +Zeichenketten sc.CheckBox.25618.21 +Zahlen sc.CheckBox.25618.22 +DatumZeit sc.CheckBox.25618.23 +Formeln sc.CheckBox.25618.24 +Notizen sc.CheckBox.25618.26 +Formate sc.CheckBox.25618.25 +Objects sc.CheckBox.25618.41 +LeerzellenUeberspringen sc.CheckBox.25618.33 +Transponieren sc.CheckBox.25618.34 +Verknuepfen sc.CheckBox.25618.35 +Keine sc.RadioButton.25618.27 +Addieren sc.RadioButton.25618.28 +Subtrahieren sc.RadioButton.25618.29 +Multiplizieren sc.RadioButton.25618.30 +Dividieren sc.RadioButton.25618.31 NichtVerschieben SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE NachUnten SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN NachRechts SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT -*InhalteLoeschen SID_DELETE -Alles sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELALL -Zeichenketten sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELSTRINGS -Zahlen sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELNUMBERS -DatumZeit sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELDATETIME -Formeln sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELFORMULAS -Notizen sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELNOTES -Formate sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELATTRS -Objekte sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELOBJECTS - -*InPolygonUmwandeln SID_VECTORIZE -Farbanzahl sd:NumericField:DLG_VECTORIZE:NM_LAYERS -Punktreduktion sd:MetricField:DLG_VECTORIZE:MT_REDUCE -LoecherFuellen sd:CheckBox:DLG_VECTORIZE:CB_FILLHOLES -Kachelgroesse sd:MetricField:DLG_VECTORIZE:MT_FILLHOLES -Vorschau sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW +*InhalteLoeschen .uno:Delete +Alles sc.CheckBox.25617.10 +Zeichenketten sc.CheckBox.25617.11 +Zahlen sc.CheckBox.25617.12 +DatumZeit sc.CheckBox.25617.13 +Formeln sc.CheckBox.25617.14 +Notizen sc.CheckBox.25617.16 +Formate sc.CheckBox.25617.15 +Objekte sc.CheckBox.25617.17 + +*InPolygonUmwandeln SD_HID_VECTORIZE_DLG +Farbanzahl sd.NumericField.654.1 +Punktreduktion sd.MetricField.654.3 +LoecherFuellen sd.CheckBox.654.1 +Kachelgroesse sd.MetricField.654.4 +Vorschau sd.PushButton.654.1 +Interaktion TabInteraktion -*JPEGOptionen svtools:ModalDialog:DLG_EXPORT_JPG -Qualitaet svtools:NumericField:DLG_EXPORT_JPG:NUM_FLD_QUALITY -Graustufen svtools:RadioButton:DLG_EXPORT_JPG:RB_GRAY -Echtfarben svtools:RadioButton:DLG_EXPORT_JPG:RB_RGB +*JPEGOptionen svtools.ModalDialog.16481 +Qualitaet svtools.NumericField.16481.1 +Graustufen svtools.RadioButton.16481.1 +Echtfarben svtools.RadioButton.16481.2 -*Kommentar HID_REDLINING_DLG -KommentarText HID_REDLINING_EDIT -Zurueck HID_REDLINING_PREV -Vor HID_REDLINING_NEXT +*Kommentar CUI_HID_REDLINING_DLG +KommentarText CUI_HID_REDLINING_EDIT +Zurueck CUI_HID_REDLINING_PREV +Vor CUI_HID_REDLINING_NEXT -*Konsolidieren SID_OPENDLG_CONSOLIDATE +*Konsolidieren .uno:DataConsolidate Berechnungsvorschrift SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_FUNC Konsolidierungsbereiche SC:MULTILISTBOX:RID_SCDLG_CONSOLIDATE:LB_CONSAREAS Quelldatenbereich SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_DATA_AREA @@ -131,133 +131,133 @@ Loeschen SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_REMOVE Hinzufuegen SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_ADD Zusaetze SC:MOREBUTTON:RID_SCDLG_CONSOLIDATE:BTN_MORE -*KonturEditor svx:FloatingWindow:RID_SVXDLG_CONTOUR -Zuweisen HID_CONTDLG_APPLY -Arbeitsbereich HID_CONTDLG_WORKPLACE -Auswahl HID_CONTDLG_SELECT -Rechteck HID_CONTDLG_RECT -Ellipse HID_CONTDLG_CIRCLE -Polygon HID_CONTDLG_POLY -PunkteBearbeiten HID_CONTDLG_POLYEDIT -PunkteVerschieben HID_CONTDLG_POLYMOVE -PunkteEinfuegen HID_CONTDLG_POLYINSERT -PunkteLoeschen HID_CONTDLG_POLYDELETE -Autokontur HID_CONTDLG_AUTOCONTOUR -Widerrufen HID_CONTDLG_UNDO -Wiederholen HID_CONTDLG_REDO -Pipette HID_CONTDLG_PIPETTE -Toleranz svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE - -*KopfFusszeilenSeitenvorlageStandard SID_HFEDIT - -*Linienenden HID_POPUP_LINEEND -Auswahl HID_POPUP_LINEEND_CTRL - -*Linienstil HID_DLG_MESSBOX -Aendern cui:PushButton:RID_SVXDLG_MESSBOX:BTN_1 -Hinzufuegen cui:PushButton:RID_SVXDLG_MESSBOX:BTN_2 - -*LinksFuellen FID_FILL_TO_LEFT - -*LiteratureintragEinfuegen FN_INSERT_AUTH_ENTRY_DLG -EintragErzeugen HID_INSERT_AUTH_MRK_CREATE_ENTRY -EintragEinfuegen HID_INSERT_AUTH_MRK_OK -EintragSchliessen HID_INSERT_AUTH_MRK_CLOSE -EintragBearbeiten HID_INSERT_AUTH_MRK_EDIT_ENTRY -AusLiteraturdatenbank HID_AUTH_MARK_DLG_FROM_COMP_RB -AusDokumentinhalt HID_AUTH_MARK_DLG_FROM_DOC_RB -Kurzbezeichnung HID_AUTH_MARK_DLG_ID_LISTBOX - -*LiteratureintragDefinieren HID_DLG_CREATE_AUTH_ENTRY -Kurzbezeichnung HID_AUTH_FIELD_IDENTIFIER -Typ HID_AUTH_FIELD_AUTHORITY_TYPE -Autor HID_AUTH_FIELD_AUTHOR -Titel HID_AUTH_FIELD_TITLE -Erscheinungsjahr HID_AUTH_FIELD_YEAR -Verlag HID_AUTH_FIELD_PUBLISHER -Verlagsadresse HID_AUTH_FIELD_ADDRESS -ISBN HID_AUTH_FIELD_ISBN -Kapitel HID_AUTH_FIELD_CHAPTER -Seiten HID_AUTH_FIELD_PAGES -Herausgeber HID_AUTH_FIELD_EDITOR -Ausgabe HID_AUTH_FIELD_EDITION -Buchtitel HID_AUTH_FIELD_BOOKTITLE -NummerDesBandes HID_AUTH_FIELD_VOLUME -Ausgabeart HID_AUTH_FIELD_HOWPUBLISHED -Organisation HID_AUTH_FIELD_ORGANIZATIONS -Institution HID_AUTH_FIELD_INSTITUTION -Hochschule HID_AUTH_FIELD_SCHOOL -ArtDesBerichts HID_AUTH_FIELD_REPORT_TYPE -Monat HID_AUTH_FIELD_MONTH -Zeitschrift HID_AUTH_FIELD_JOURNAL -Nummer HID_AUTH_FIELD_NUMBER -NameDerSerie HID_AUTH_FIELD_SERIES -Anmerkung HID_AUTH_FIELD_ANNOTE -Notiz HID_AUTH_FIELD_NOTE -URL HID_AUTH_FIELD_URL -Benutzerfeld1 HID_AUTH_FIELD_CUSTOM1 -Benutzerfeld2 HID_AUTH_FIELD_CUSTOM2 -Benutzerfeld3 HID_AUTH_FIELD_CUSTOM3 -Benutzerfeld4 HID_AUTH_FIELD_CUSTOM4 -Benutzerfeld5 HID_AUTH_FIELD_CUSTOM5 - -*Loeschbestaetigung svtools:ModalDialog:DLG_SVT_QUERYDELETE -Ja svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES -Alle svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL -Nein svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO - -*Makro basctl:ModalDialog:RID_MACROCHOOSER -Makroname basctl:Edit:RID_MACROCHOOSER:RID_ED_MACRONAME -Makroliste HID_BASICIDE_MACROS -MakroAus HID_BASICIDE_LIBS -Beschreibung basctl:MultiLineEdit:RID_MACROCHOOSER:RID_ML_DESCRIPTION -Ausfuehren basctl:PushButton:RID_MACROCHOOSER:RID_PB_RUN -Speichern basctl:PushButton:RID_MACROCHOOSER:RID_PB_RUN -Zuordnen basctl:PushButton:RID_MACROCHOOSER:RID_PB_ASSIGN -Bearbeiten basctl:PushButton:RID_MACROCHOOSER:RID_PB_EDIT -Loeschen basctl:PushButton:RID_MACROCHOOSER:RID_PB_DEL -Neu basctl:PushButton:RID_MACROCHOOSER:RID_PB_DEL -Verwalten basctl:PushButton:RID_MACROCHOOSER:RID_PB_ORG -NewLibrary basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWLIB -NewModule basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWMOD - -*MakroOptionen basctl:ModalDialog:RID_MACROOPTIONS -Beschreibung basctl:MultiLineEdit:RID_MACROOPTIONS:RID_ME_DESCR -HilfeIdentifikation basctl:NumericField:RID_MACROOPTIONS:RID_NF_HELPID -HilfeDateiname basctl:Edit:RID_MACROOPTIONS:RID_ED_HELPNAME - -*MakroZuweisen cui:TabPage:RID_SVXPAGE_EVENTASSIGN -Ereignis HID_MACRO_LB_EVENT -Bereich HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP -Makroname HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS -Zuweisen cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN -Aufheben cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE -Scripttyp cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE - -*Massstab SID_ATTR_ZOOM -Optimal cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL -GanzeSeite cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE -Seitenbreite cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH -Vergroesserung100 cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100 -VergroesserungStufenlos cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER -Stufenlos cui:MetricField:RID_SVXDLG_ZOOM:ED_USER -Automatic cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC -Singlepage cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE -Columns cui:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS -Columnsfield cui:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS -Bookmode cui:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK - -*MassstabSeitenansicht HID_PPREV_ZOOM -Spalten sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_COL -Zeilen sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_ROW - -*Mehrfachoperationen SID_OPENDLG_TABOP -Formeln sc:Edit:RID_SCDLG_TABOP:ED_FORMULARANGE -Zeile sc:Edit:RID_SCDLG_TABOP:ED_ROWCELL -Spalte sc:Edit:RID_SCDLG_TABOP:ED_COLCELL -Vorgaben1 sc:ImageButton:RID_SCDLG_TABOP:RB_FORMULARANGE -Vorgaben2 sc:ImageButton:RID_SCDLG_TABOP:RB_ROWCELL -Vorgaben3 sc:ImageButton:RID_SCDLG_TABOP:RB_COLCELL +*KonturEditor svx.FloatingWindow.10461 +Zuweisen SVX_HID_CONTDLG_APPLY +Arbeitsbereich SVX_HID_CONTDLG_WORKPLACE +Auswahl SVX_HID_CONTDLG_SELECT +Rechteck SVX_HID_CONTDLG_RECT +Ellipse SVX_HID_CONTDLG_CIRCLE +Polygon SVX_HID_CONTDLG_POLY +PunkteBearbeiten SVX_HID_CONTDLG_POLYEDIT +PunkteVerschieben SVX_HID_CONTDLG_POLYMOVE +PunkteEinfuegen SVX_HID_CONTDLG_POLYINSERT +PunkteLoeschen SVX_HID_CONTDLG_POLYDELETE +Autokontur SVX_HID_CONTDLG_AUTOCONTOUR +Widerrufen SVX_HID_CONTDLG_UNDO +Wiederholen SVX_HID_CONTDLG_REDO +Pipette SVX_HID_CONTDLG_PIPETTE +Toleranz svx.MetricField.10461.1 + +*KopfFusszeilenSeitenvorlageStandard .uno:EditHeaderAndFooter + +*Linienenden SVX_HID_POPUP_LINEEND +Auswahl SVX_HID_POPUP_LINEEND_CTRL + +*Linienstil CUI_HID_DLG_MESSBOX +Aendern cui.PushButton.10063.1 +Hinzufuegen cui.PushButton.10063.2 + +*LinksFuellen .uno:FillLeft + +*LiteratureintragEinfuegen .uno:InsertAuthoritiesEntry +EintragErzeugen SW_HID_INSERT_AUTH_MRK_CREATE_ENTRY +EintragEinfuegen SW_HID_INSERT_AUTH_MRK_OK +EintragSchliessen SW_HID_INSERT_AUTH_MRK_CLOSE +EintragBearbeiten SW_HID_INSERT_AUTH_MRK_EDIT_ENTRY +AusLiteraturdatenbank SW_HID_AUTH_MARK_DLG_FROM_COMP_RB +AusDokumentinhalt SW_HID_AUTH_MARK_DLG_FROM_DOC_RB +Kurzbezeichnung SW_HID_AUTH_MARK_DLG_ID_LISTBOX + +*LiteratureintragDefinieren SW_HID_DLG_CREATE_AUTH_ENTRY +Kurzbezeichnung SW_HID_AUTH_FIELD_IDENTIFIER +Typ SW_HID_AUTH_FIELD_AUTHORITY_TYPE +Autor SW_HID_AUTH_FIELD_AUTHOR +Titel SW_HID_AUTH_FIELD_TITLE +Erscheinungsjahr SW_HID_AUTH_FIELD_YEAR +Verlag SW_HID_AUTH_FIELD_PUBLISHER +Verlagsadresse SW_HID_AUTH_FIELD_ADDRESS +ISBN SW_HID_AUTH_FIELD_ISBN +Kapitel SW_HID_AUTH_FIELD_CHAPTER +Seiten SW_HID_AUTH_FIELD_PAGES +Herausgeber SW_HID_AUTH_FIELD_EDITOR +Ausgabe SW_HID_AUTH_FIELD_EDITION +Buchtitel SW_HID_AUTH_FIELD_BOOKTITLE +NummerDesBandes SW_HID_AUTH_FIELD_VOLUME +Ausgabeart SW_HID_AUTH_FIELD_HOWPUBLISHED +Organisation SW_HID_AUTH_FIELD_ORGANIZATIONS +Institution SW_HID_AUTH_FIELD_INSTITUTION +Hochschule SW_HID_AUTH_FIELD_SCHOOL +ArtDesBerichts SW_HID_AUTH_FIELD_REPORT_TYPE +Monat SW_HID_AUTH_FIELD_MONTH +Zeitschrift SW_HID_AUTH_FIELD_JOURNAL +Nummer SW_HID_AUTH_FIELD_NUMBER +NameDerSerie SW_HID_AUTH_FIELD_SERIES +Anmerkung SW_HID_AUTH_FIELD_ANNOTE +Notiz SW_HID_AUTH_FIELD_NOTE +URL SW_HID_AUTH_FIELD_URL +Benutzerfeld1 SW_HID_AUTH_FIELD_CUSTOM1 +Benutzerfeld2 SW_HID_AUTH_FIELD_CUSTOM2 +Benutzerfeld3 SW_HID_AUTH_FIELD_CUSTOM3 +Benutzerfeld4 SW_HID_AUTH_FIELD_CUSTOM4 +Benutzerfeld5 SW_HID_AUTH_FIELD_CUSTOM5 + +*Loeschbestaetigung svtools.ModalDialog.16376 +Ja svtools.PushButton.16376.4 +Alle svtools.PushButton.16376.6 +Nein svtools.PushButton.16376.5 + +*Makro basctl.ModalDialog.14900 +Makroname basctl.Edit.14900.5 +Makroliste BASCTL_HID_BASICIDE_MACROS +MakroAus BASCTL_HID_BASICIDE_LIBS +Beschreibung basctl.MultiLineEdit.14900.16 +Ausfuehren basctl.PushButton.14900.8 +Speichern basctl.PushButton.14900.8 +Zuordnen basctl.PushButton.14900.13 +Bearbeiten basctl.PushButton.14900.10 +Loeschen basctl.PushButton.14900.12 +Neu basctl.PushButton.14900.12 +Verwalten basctl.PushButton.14900.11 +NewLibrary basctl.PushButton.14900.19 +NewModule basctl.PushButton.14900.20 + +*MakroOptionen basctl.ModalDialog.14905 +Beschreibung basctl.MultiLineEdit.14905.7 +HilfeIdentifikation basctl.NumericField.14905.10 +HilfeDateiname basctl.Edit.14905.12 + +*MakroZuweisen cui.TabPage.10303 +Ereignis CUI_HID_MACRO_LB_EVENT +Bereich CUI_HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP +Makroname CUI_HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS +Zuweisen cui.PushButton.10303.3 +Aufheben cui.PushButton.10303.4 +Scripttyp cui.ListBox.10303.8 + +*Massstab .uno:Zoom +Optimal cui.RadioButton.10000.15 +GanzeSeite cui.RadioButton.10000.16 +Seitenbreite cui.RadioButton.10000.17 +Vergroesserung100 cui.RadioButton.10000.18 +VergroesserungStufenlos cui.RadioButton.10000.19 +Stufenlos cui.MetricField.10000.20 +Automatic cui.RadioButton.10000.22 +Singlepage cui.RadioButton.10000.23 +Columns cui.RadioButton.10000.24 +Columnsfield cui.MetricField.10000.25 +Bookmode cui.CheckBox.10000.26 + +*MassstabSeitenansicht SW_HID_PPREV_ZOOM +Spalten sw.NumericField.20601.4 +Zeilen sw.NumericField.20601.5 + +*Mehrfachoperationen .uno:TableOperationDialog +Formeln sc.Edit.25662.1 +Zeile sc.Edit.25662.2 +Spalte sc.Edit.25662.3 +Vorgaben1 sc.ImageButton.25662.1 +Vorgaben2 sc.ImageButton.25662.2 +Vorgaben3 sc.ImageButton.25662.3 *MetOptionen FILTER:MODALDIALOG:DLG_EXPORT_EMET Original FILTER:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL @@ -265,186 +265,186 @@ Groesse FILTER:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE Breite FILTER:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX Hoehe FILTER:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY -*ModuleBearbeiten HID_EDIT_MODULES -Sprache cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE -Module HID_CLB_EDIT_MODULES_MODULES -PrioPLus cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP -PrioMinus cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN -Zurueck cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK -Benutzerwoerterbuch HID_CLB_EDIT_MODULES_DICS +*ModuleBearbeiten CUI_HID_EDIT_MODULES +Sprache cui.ListBox.10831.319 +Module CUI_HID_CLB_EDIT_MODULES_MODULES +PrioPLus cui.PushButton.10831.309 +PrioMinus cui.PushButton.10831.310 +Zurueck cui.PushButton.10831.311 +Benutzerwoerterbuch CUI_HID_CLB_EDIT_MODULES_DICS -*DescriptionObject HID_DLG_OBJECT_TITLE_DESC -DescriptionTitle cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE -DescriptionText cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC +*DescriptionObject CUI_HID_DLG_OBJECT_TITLE_DESC +DescriptionTitle cui.Edit.10067.3 +DescriptionText cui.MultiLineEdit.10067.4 -*NameDlg HID_DLG_NAME -Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING +*NameDlg CUI_HID_DLG_NAME +Eingabefeld cui.Edit.10062.1 +LinieName NameDlg -*NameDlgObject HID_DLG_OBJECT_NAME -NameField cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME +*NameDlgObject CUI_HID_DLG_OBJECT_NAME +NameField cui.Edit.10064.2 +NameDlgGroup NameDlg -NameField HID_FORMAT_NAME_OBJECT_NAME +NameField SW_HID_FORMAT_NAME_OBJECT_NAME +NameDlgPage NameDlg -NameField HID_SD_NAMEDIALOG_PAGE +NameField SD_HID_SD_NAMEDIALOG_PAGE +NameDlgLineEnd NameDlg -NameField HID_SD_NAMEDIALOG_LINEEND +NameField SD_HID_SD_NAMEDIALOG_LINEEND +NameDlgGroupCalc NameDlg -NameField HID_SC_DRAW_RENAME - -*NamenEinfuegen FID_INSERT_NAME -NamenAuswahl sc:ListBox:RID_SCDLG_NAMES_PASTE:LB_ENTRYLIST -Liste sc:PushButton:RID_SCDLG_NAMES_PASTE:BTN_ADD - -*NamenErzeugen FID_USE_NAME -Kopfzeile sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_TOP -LinkerSpalte sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_LEFT -Fusszeile sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_BOTTOM -RechterSpalte sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_RIGHT - -*NamenFestlegen FID_DEFINE_NAME -BereichsName sc:ComboBox:RID_SCDLG_NAMES:ED_NAME -ZugeordnetZu sc:Edit:RID_SCDLG_NAMES:ED_ASSIGN -Filter sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA -Druckbereich sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA -Wiederholungsspalte sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER -Wiederholungszeile sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER -Hinzufuegen sc:PushButton:RID_SCDLG_NAMES:BTN_ADD -Aendern sc:PushButton:RID_SCDLG_NAMES:BTN_ADD -Loeschen sc:PushButton:RID_SCDLG_NAMES:BTN_REMOVE -Zusaetze sc:MoreButton:RID_SCDLG_NAMES:BTN_MORE -ZugeordnetZuButton sc:ImageButton:RID_SCDLG_NAMES:RB_ASSIGN - -*NavigationsFenster HID_INSERT_CTRL -Auswahl HID_NAVI_VS - -*Navigator SID_NAVIGATOR - -*NavigatorCalc HID_SC_NAVIGATOR -NavigatorToolboxCalc HID_SC_NAVIPI_TOOLBOX -Spalte HID_SC_NAVIPI_COL -Zeile HID_SC_NAVIPI_ROW -Liste HID_SC_NAVIPI_ENTRIES -Dokumente HID_SC_NAVIPI_DOC -Datenbereich HID_SC_NAVIPI_DATA -Anfang HID_SC_NAVIPI_UP -Ende HID_SC_NAVIPI_DOWN -Inhalte HID_SC_NAVIPI_ZOOM -Umschalten HID_SC_NAVIPI_ROOT -Szenarien HID_SC_NAVIPI_SCEN -Dragmodus HID_SC_NAVIPI_DROP -SzenarioEdit HID_SC_SCENWIN_TOP -SzenarioListe HID_SC_SCENWIN_BOTTOM - -*NavigatorDraw HID_SD_NAVIGATOR -NavigatorToolboxDraw HID_SD_NAVIGATOR_TBX -Stift HID_SD_NAVIGATOR_TBI_PEN -Erste HID_SD_NAVIGATOR_TBI_FIRST -Vorherige HID_SD_NAVIGATOR_TBI_PREV -Naechste HID_SD_NAVIGATOR_TBI_NEXT -Letzte HID_SD_NAVIGATOR_TBI_LAST -Dragmodus HID_SD_NAVIGATOR_TBI_DRAGTYPE -Liste HID_SD_NAVIGATOR_TLB -Dokumentliste HID_SD_NAVIGATOR_LB - -*NavigatorWriter HID_NAVIGATION_PI -Auswahlliste HID_NAVIGATOR_TREELIST -Dokumentliste HID_NAVIGATOR_LISTBOX -Toolbox HID_NAVIGATOR_TOOLBOX -Umschalten HID_NAVI_TBX17 -Navigation HID_NAVI_TBX24 -Seitennummer HID_NAVI_TBX16 -VorherigeSeite HID_NAVI_TBX2 -NaechsteSeite HID_NAVI_TBX3 -Dragmodus HID_NAVI_TBX4 -KapitelHoch HID_NAVI_TBX5 -KapitelRunter HID_NAVI_TBX6 -Auswahlbox HID_NAVI_TBX7 -Inhaltsansicht HID_NAVI_TBX8 -Merker HID_NAVI_TBX9 -Kopfzeile HID_NAVI_TBX10 -Fusszeile HID_NAVI_TBX11 -AnkerText HID_NAVI_TBX12 -Ebenen HID_NAVI_TBX13 -Hoch HID_NAVI_TBX14 -Senken HID_NAVI_TBX15 - -*NavigatorGlobaldoc HID_NAVIGATION_PI -Auswahlliste HID_NAVIGATOR_TREELIST -Liste HID_NAVIGATOR_GLOB_TREELIST -Umschalten HID_NAVI_TBX17 -Bearbeiten HID_NAVI_TBX18 -Aktualisieren HID_NAVI_TBX19 -Einfuegen HID_NAVI_TBX20 -InhalteMitspeichern HID_NAVI_TBX21 -GlobaldokumentToolbox HID_NAVIGATOR_GLOBAL_TOOLBOX -NachUntenVerschieben HID_NAVI_TBX22 -NachObenVerschieben HID_NAVI_TBX23 -Inhaltsansicht HID_NAVI_TBX8 - -*Neu SID_NEWDOC -Bereiche sfx2:ListBox:DLG_NEW_FILE:LB_REGION -Vorlagen sfx2:ListBox:DLG_NEW_FILE:LB_TEMPLATE -Zusaetze sfx2:MoreButton:DLG_NEW_FILE:BT_MORE -Vorschau sfx2:CheckBox:DLG_NEW_FILE:BTN_PREVIEW -Titel sfx2:Edit:DLG_NEW_FILE:ED_TITLE -Thema sfx2:Edit:DLG_NEW_FILE:ED_THEMA -Schluesselworte sfx2:Edit:DLG_NEW_FILE:ED_KEYWORDS -Beschreibung sfx2:MultiLineEdit:DLG_NEW_FILE:ED_DESC -Text sfx2:CheckBox:DLG_NEW_FILE:CB_TEXT_STYLE -Frame sfx2:CheckBox:DLG_NEW_FILE:CB_FRAME_STYLE -Pages sfx2:CheckBox:DLG_NEW_FILE:CB_PAGE_STYLE -Numbering sfx2:CheckBox:DLG_NEW_FILE:CB_NUM_STYLE -Overwrite sfx2:CheckBox:DLG_NEW_FILE:CB_MERGE_STYLE -Fromfile sfx2:PushButton:DLG_NEW_FILE:PB_LOAD_FILE - -*NeueBibliothek basctl:ModalDialog:RID_DLG_NEWLIB -Bibliotheksname basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME - -*NeuerDialog basctl:ModalDialog:RID_DLG_NEWLIB -Dialogname basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME - -*NeuesFangobjekt SID_CAPTUREPOINT +NameField SC_HID_SC_DRAW_RENAME + +*NamenEinfuegen .uno:InsertName +NamenAuswahl sc.ListBox.25676.11 +Liste sc.PushButton.25676.105 + +*NamenErzeugen .uno:CreateNames +Kopfzeile sc.CheckBox.25677.4 +LinkerSpalte sc.CheckBox.25677.2 +Fusszeile sc.CheckBox.25677.5 +RechterSpalte sc.CheckBox.25677.3 + +*NamenFestlegen .uno:DefineName +BereichsName sc.ComboBox.25626.12 +ZugeordnetZu sc.Edit.25626.15 +Filter sc.CheckBox.25626.31 +Druckbereich sc.CheckBox.25626.32 +Wiederholungsspalte sc.CheckBox.25626.33 +Wiederholungszeile sc.CheckBox.25626.34 +Hinzufuegen sc.PushButton.25626.3 +Aendern sc.PushButton.25626.3 +Loeschen sc.PushButton.25626.4 +Zusaetze sc.MoreButton.25626.6 +ZugeordnetZuButton sc.ImageButton.25626.16 + +*NavigationsFenster SW_HID_INSERT_CTRL +Auswahl SW_HID_NAVI_VS + +*Navigator .uno:Navigator + +*NavigatorCalc SC_HID_SC_NAVIGATOR +NavigatorToolboxCalc SC_HID_SC_NAVIPI_TOOLBOX +Spalte SC_HID_SC_NAVIPI_COL +Zeile SC_HID_SC_NAVIPI_ROW +Liste SC_HID_SC_NAVIPI_ENTRIES +Dokumente SC_HID_SC_NAVIPI_DOC +Datenbereich SC_HID_SC_NAVIPI_DATA +Anfang SC_HID_SC_NAVIPI_UP +Ende SC_HID_SC_NAVIPI_DOWN +Inhalte SC_HID_SC_NAVIPI_ZOOM +Umschalten SC_HID_SC_NAVIPI_ROOT +Szenarien SC_HID_SC_NAVIPI_SCEN +Dragmodus SC_HID_SC_NAVIPI_DROP +SzenarioEdit SC_HID_SC_SCENWIN_TOP +SzenarioListe SC_HID_SC_SCENWIN_BOTTOM + +*NavigatorDraw SD_HID_SD_NAVIGATOR +NavigatorToolboxDraw SD_HID_SD_NAVIGATOR_TBX +Stift SD_HID_SD_NAVIGATOR_TBI_PEN +Erste SD_HID_SD_NAVIGATOR_TBI_FIRST +Vorherige SD_HID_SD_NAVIGATOR_TBI_PREV +Naechste SD_HID_SD_NAVIGATOR_TBI_NEXT +Letzte SD_HID_SD_NAVIGATOR_TBI_LAST +Dragmodus SD_HID_SD_NAVIGATOR_TBI_DRAGTYPE +Liste SD_HID_SD_NAVIGATOR_TLB +Dokumentliste SD_HID_SD_NAVIGATOR_LB + +*NavigatorWriter SW_HID_NAVIGATION_PI +Auswahlliste SW_HID_NAVIGATOR_TREELIST +Dokumentliste SW_HID_NAVIGATOR_LISTBOX +Toolbox SW_HID_NAVIGATOR_TOOLBOX +Umschalten SW_HID_NAVI_TBX17 +Navigation SW_HID_NAVI_TBX24 +Seitennummer SW_HID_NAVI_TBX16 +VorherigeSeite SW_HID_NAVI_TBX2 +NaechsteSeite SW_HID_NAVI_TBX3 +Dragmodus SW_HID_NAVI_TBX4 +KapitelHoch SW_HID_NAVI_TBX5 +KapitelRunter SW_HID_NAVI_TBX6 +Auswahlbox SW_HID_NAVI_TBX7 +Inhaltsansicht SW_HID_NAVI_TBX8 +Merker SW_HID_NAVI_TBX9 +Kopfzeile SW_HID_NAVI_TBX10 +Fusszeile SW_HID_NAVI_TBX11 +AnkerText SW_HID_NAVI_TBX12 +Ebenen SW_HID_NAVI_TBX13 +Hoch SW_HID_NAVI_TBX14 +Senken SW_HID_NAVI_TBX15 + +*NavigatorGlobaldoc SW_HID_NAVIGATION_PI +Auswahlliste SW_HID_NAVIGATOR_TREELIST +Liste SW_HID_NAVIGATOR_GLOB_TREELIST +Umschalten SW_HID_NAVI_TBX17 +Bearbeiten SW_HID_NAVI_TBX18 +Aktualisieren SW_HID_NAVI_TBX19 +Einfuegen SW_HID_NAVI_TBX20 +InhalteMitspeichern SW_HID_NAVI_TBX21 +GlobaldokumentToolbox SW_HID_NAVIGATOR_GLOBAL_TOOLBOX +NachUntenVerschieben SW_HID_NAVI_TBX22 +NachObenVerschieben SW_HID_NAVI_TBX23 +Inhaltsansicht SW_HID_NAVI_TBX8 + +*Neu .uno:NewDoc +Bereiche sfx2.ListBox.2053.21 +Vorlagen sfx2.ListBox.2053.52 +Zusaetze sfx2.MoreButton.2053.32 +Vorschau sfx2.CheckBox.2053.51 +Titel sfx2.Edit.2053.56 +Thema sfx2.Edit.2053.55 +Schluesselworte sfx2.Edit.2053.61 +Beschreibung sfx2.MultiLineEdit.2053.71 +Text sfx2.CheckBox.2053.33 +Frame sfx2.CheckBox.2053.34 +Pages sfx2.CheckBox.2053.35 +Numbering sfx2.CheckBox.2053.36 +Overwrite sfx2.CheckBox.2053.37 +Fromfile sfx2.PushButton.2053.38 + +*NeueBibliothek basctl.ModalDialog.14892 +Bibliotheksname basctl.Edit.14892.41 + +*NeuerDialog basctl.ModalDialog.14892 +Dialogname basctl.Edit.14892.41 + +*NeuesFangobjekt .uno:CapturePoint Horizontal SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_HORIZONTAL Vertikal SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_VERTICAL Punkt SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_POINT -X sd:MetricField:DLG_SNAPLINE:MTR_FLD_X -Y sd:MetricField:DLG_SNAPLINE:MTR_FLD_Y +X sd.MetricField.312.7 +Y sd.MetricField.312.9 -*NeuesModul basctl:ModalDialog:RID_DLG_NEWLIB -Modulname basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME +*NeuesModul basctl.ModalDialog.14892 +Modulname basctl.Edit.14892.41 -*NotizBearbeiten SID_POSTIT -Texteingabe cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT sw:MultiLineEdit:DLG_POSTIT:ED_EDIT -Autor cui:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR sw:PushButton:DLG_POSTIT:BTN_AUTHOR +*NotizBearbeiten CUI_HID_POSTIT_DIALOG +Texteingabe cui.MultiLineEdit.10008.13 sw:MultiLineEdit:DLG_POSTIT:ED_EDIT +Autor cui.PushButton.10008.17 sw:PushButton:DLG_POSTIT:BTN_AUTHOR Vor cui:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_NEXT Zurueck cui:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_PREV -*NummernkreisOptionen HID_DLG_SEQUENCE_OPTION -Ebene sw:ListBox:DLG_SEQUENCE_OPTION:LB_LEVEL -Trenner sw:Edit:DLG_SEQUENCE_OPTION:ED_SEPARATOR +*NummernkreisOptionen SW_HID_DLG_SEQUENCE_OPTION +Ebene sw.ListBox.21012.17 +Trenner sw.Edit.21012.19 +NotizEinfuegen NotizBearbeiten +NotizEinfuegenCalc NotizBearbeiten -Text cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT +Text cui.MultiLineEdit.10008.13 -*ObenFuellen FID_FILL_TO_TOP +*ObenFuellen .uno:FillUp -*Objekte basctl:FloatingWindow:RID_BASICIDE_OBJCAT -Toolbox HID_BASICIDE_OBJECTS -Zeigen HID_BASICIDE_OBJCAT_SHOW -ObjektListe HID_BASICIDE_OBJECTCAT +*Objekte basctl.FloatingWindow.14920 +Toolbox BASCTL_HID_BASICIDE_OBJECTS +Zeigen BASCTL_HID_BASICIDE_OBJCAT_SHOW +ObjektListe BASCTL_HID_BASICIDE_OBJECTCAT -*ObjekteUmbenennen HID_RENAME_XNAMED -Objektname sw:Edit:DLG_RENAME_XNAMED:ED_NEW_NAME +*ObjekteUmbenennen SW_HID_RENAME_XNAMED +Objektname sw.Edit.20888.2 -*OLEObjektEinfuegen SID_INSERT_OBJECT +*OLEObjektEinfuegen .uno:InsertObject NeuErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT AusDateiErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE Objekttyp cui:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win old mode 100755 new mode 100644 index 84d1978a30d9..179cbd1e2284 --- a/testautomation/global/win/dial_p_s.win +++ b/testautomation/global/win/dial_p_s.win @@ -1,170 +1,170 @@ -*Passwort HID_PASSWD -UserName sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER -PasswortName sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD -PasswortBestaetigen sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM - -*PasswordFileOpen HID_DLG_PASSWORD_UUI -PasswortName uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD - -*PasswordFileSave HID_DLG_PASSWORD_TO_OPEN_MODIFY -Password HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN -PasswordConfirm HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN -PasswordMoreOptions HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE -PasswordFileReadonly HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY -PasswordToModify HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY -PasswordToModifyConfirm HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY - -*PasswortEingeben SID_CHG_PROTECT -SchutzAufheben HID_CHG_PROTECT -PasswortEingabe sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER -PasswortBestaetigen sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM - -*PBMOptionen filter:ModalDialog:DLG_EXPORT_EPBM -Binaer filter:RadioButton:DLG_EXPORT_EPBM:RB_RAW -Ascii filter:RadioButton:DLG_EXPORT_EPBM:RB_ASCII - -*PfadeAuswaehlen HID_MULTIPATH -Pfade HID_OPTIONS_MULTIPATH_LIST +*Passwort SFX2_HID_PASSWD +UserName sfx2.Edit.2316.12 +PasswortName sfx2.Edit.2316.14 +PasswortBestaetigen sfx2.Edit.2316.16 + +*PasswordFileOpen UUI_HID_DLG_PASSWORD_UUI +PasswortName uui.Edit.14522.2 + +*PasswordFileSave CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY +Password CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN +PasswordConfirm CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN +PasswordMoreOptions CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE +PasswordFileReadonly CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY +PasswordToModify CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY +PasswordToModifyConfirm CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY + +*PasswortEingeben .uno:ProtectTraceChangeMode +SchutzAufheben SC_HID_CHG_PROTECT +PasswortEingabe sfx2.Edit.2316.12 +PasswortBestaetigen sfx2.Edit.2316.16 + +*PBMOptionen filter.ModalDialog.17409 +Binaer filter.RadioButton.17409.1 +Ascii filter.RadioButton.17409.2 + +*PfadeAuswaehlen CUI_HID_MULTIPATH +Pfade CUI_HID_OPTIONS_MULTIPATH_LIST Hinzufuegen cui:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH Loeschen cui:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH -*PGMOptionen filter:ModalDialog:DLG_EXPORT_EPGM -Binaer filter:RadioButton:DLG_EXPORT_EPGM:RB_RAW -Ascii filter:RadioButton:DLG_EXPORT_EPGM:RB_ASCII - -*PICTOPtionen filter:ModalDialog:DLG_EXPORT_EPCT -Original filter:RadioButton:DLG_EXPORT_EPCT:RB_ORIGINAL -Groesse filter:RadioButton:DLG_EXPORT_EPCT:RB_SIZE -Breite filter:MetricField:DLG_EXPORT_EPCT:MTF_SIZEX -Hoehe filter:MetricField:DLG_EXPORT_EPCT:MTF_SIZEY - -*Pipette SID_BMPMASK svx:DockingWindow:RID_SVXDLG_BMPMASK -PipetteKnopf HID_BMPMASK_TBI_PIPETTE -Farbfeld HID_BMPMASK_CTL_PIPETTE -Ersetzen svx:PushButton:RID_SVXDLG_BMPMASK:BTN_EXEC -Quellfarbe1 svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_1 -Quellfarbe2 svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_2 -Quellfarbe3 svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_3 -Quellfarbe4 svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_4 -Toleranz1 svx:MetricField:RID_SVXDLG_BMPMASK:SP_1 -Toleranz2 svx:MetricField:RID_SVXDLG_BMPMASK:SP_2 -Toleranz3 svx:MetricField:RID_SVXDLG_BMPMASK:SP_3 -Toleranz4 svx:MetricField:RID_SVXDLG_BMPMASK:SP_4 -ErsetzenDurch1 svx:ListBox:RID_SVXDLG_BMPMASK:LB_1 -ErsetzenDurch2 svx:ListBox:RID_SVXDLG_BMPMASK:LB_2 -ErsetzenDurch3 svx:ListBox:RID_SVXDLG_BMPMASK:LB_3 -ErsetzenDurch4 svx:ListBox:RID_SVXDLG_BMPMASK:LB_4 -ErsetzenDurch5 svx:ListBox:RID_SVXDLG_BMPMASK:LB_TRANS -Tranzparenz svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_TRANS - -*PivotFilter HID_SC_PIVOTFILTER -Operator1 sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP1 -Operator2 sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP2 -FieldName1 sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD1 -FieldName2 sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD2 -FieldName3 sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD3 -Condition1 sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND1 -Condition2 sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND2 -Condition3 sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND3 -Value1 sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL1 -Value2 sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL2 -Value3 sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL3 -More sc:MoreButton:RID_SCDLG_PIVOTFILTER:BTN_MORE -CaseSensitive sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_CASE -RegularExpression sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_REGEXP -NoDuplication sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_UNIQUE - -*PlugInEinfuegen SID_INSERT_PLUGIN +*PGMOptionen filter.ModalDialog.17410 +Binaer filter.RadioButton.17410.1 +Ascii filter.RadioButton.17410.2 + +*PICTOPtionen filter.ModalDialog.17400 +Original filter.RadioButton.17400.1 +Groesse filter.RadioButton.17400.2 +Breite filter.MetricField.17400.1 +Hoehe filter.MetricField.17400.2 + +*Pipette .uno:BmpMask svx:DockingWindow:RID_SVXDLG_BMPMASK +PipetteKnopf SVX_HID_BMPMASK_TBI_PIPETTE +Farbfeld SVX_HID_BMPMASK_CTL_PIPETTE +Ersetzen svx.PushButton.10420.1 +Quellfarbe1 svx.CheckBox.10420.1 +Quellfarbe2 svx.CheckBox.10420.4 +Quellfarbe3 svx.CheckBox.10420.3 +Quellfarbe4 svx.CheckBox.10420.2 +Toleranz1 svx.MetricField.10420.2 +Toleranz2 svx.MetricField.10420.4 +Toleranz3 svx.MetricField.10420.1 +Toleranz4 svx.MetricField.10420.3 +ErsetzenDurch1 svx.ListBox.10420.1 +ErsetzenDurch2 svx.ListBox.10420.2 +ErsetzenDurch3 svx.ListBox.10420.3 +ErsetzenDurch4 svx.ListBox.10420.4 +ErsetzenDurch5 svx.ListBox.10420.5 +Tranzparenz svx.CheckBox.10420.5 + +*PivotFilter SC_HID_SC_PIVOTFILTER +Operator1 sc.ListBox.25637.27 +Operator2 sc.ListBox.25637.28 +FieldName1 sc.ListBox.25637.24 +FieldName2 sc.ListBox.25637.25 +FieldName3 sc.ListBox.25637.26 +Condition1 sc.ListBox.25637.29 +Condition2 sc.ListBox.25637.30 +Condition3 sc.ListBox.25637.31 +Value1 sc.ComboBox.25637.32 +Value2 sc.ComboBox.25637.33 +Value3 sc.ComboBox.25637.34 +More sc.MoreButton.25637.1 +CaseSensitive sc.CheckBox.25637.2 +RegularExpression sc.CheckBox.25637.3 +NoDuplication sc.CheckBox.25637.1 + +*PlugInEinfuegen .uno:InsertPlugin DateiUrl cui:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL Durchsuchen cui:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL Optionen cui:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS -*PNGOptionen svtools:ModalDialog:DLG_EXPORT_EPNG -Kompression svtools:NumericField:DLG_EXPORT_EPNG:NUM_COMPRESSION -Interlaced svtools:CheckBox:DLG_EXPORT_EPNG:CBX_INTERLACED - -*PPMOptionen filter:ModalDialog:DLG_EXPORT_EPPM -Binaer filter:RadioButton:DLG_EXPORT_EPPM:RB_RAW -Ascii filter:RadioButton:DLG_EXPORT_EPPM:RB_ASCII - -*QuelleAuswaehlen HID_DATAPILOT_TYPE -AktuelleSelektion sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_SELECTION -AngemeldeteDatenquelle sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_DATABASE -ExterneQuelle sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_EXTERNAL - -*Rechtschreibung HID_SPELLCHECK -Original HID_SPELLDLG_SETWORD -Ersetzen HID_SPLDLG_BUTTON_CHANGE -AlleErsetzen HID_SPLDLG_BUTTON_CHANGEALL -Ignorieren HID_SPLDLG_BUTTON_IGNORE -AlleIgnorieren HID_SPLDLG_BUTTON_IGNOREALL -Sprache cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE -RechtschreibungSchliessen HID_SPLDLG_BUTTON_CLOSE - -*Redlining HID_REDLINE_ACCEPT -TabControl HID_REDLINING_TABCONTROL -TabListe HID_REDLINING_VIEW_PAGE -Liste HID_REDLINING_VIEW_DG_VIEW -ListItem HID_REDLINING_VIEW_DG_VIEW_TABLE -Akzeptieren HID_REDLINING_VIEW_PB_ACCEPT -AlleAkzeptieren HID_REDLINING_VIEW_PB_ACCEPTALL -Ablehnen HID_REDLINING_VIEW_PB_REJECT -AlleAblehnen HID_REDLINING_VIEW_PB_REJECTALL -Undo HID_REDLINING_VIEW_PB_UNDO - -TabFilter HID_REDLINING_FILTER_PAGE cui:TABPAGE:SID_REDLIN_FILTER_PAGE -Datum HID_REDLINING_FILTER_CB_DATE cui:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE -DatumListe HID_REDLINING_FILTER_LB_DATE cui:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE -Datum1 HID_REDLINING_FILTER_DF_DATE cui:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE -Zeit1 HID_REDLINING_FILTER_TF_DATE cui:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE -Aktuell1 HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK -Datum2 HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 -Zeit2 HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 -Aktuell2 HID_REDLINING_FILTER_IB_CLOCK2 SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 -Autor HID_REDLINING_FILTER_CB_AUTOR SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_AUTOR -AutoListe HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AUTOR -Bereich HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE -BereichText HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE -Button HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF -Aktion HID_REDLINING_FILTER_CB_ACTION SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_ACTION -Aktionsliste HID_REDLINING_FILTER_LB_ACTION SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_ACTION -Comment HID_REDLINING_FILTER_CB_COMMENT SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_COMMENT -CommentText HID_REDLINING_FILTER_ED_COMMENT SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:ED_COMMENT - -*ReiheFuellen FID_FILL_SERIES -Oben sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_TOP -Unten sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_BOTTOM -Rechts sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_RIGHT -Links sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_LEFT -Arithmetisch sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_ARITHMETIC -Geometrisch sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_GEOMETRIC -Datum sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DATE -AutoAusfuellen sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_AUTOFILL -Tag sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DAY -WochenTag sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DAY_OF_WEEK -Monat sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_MONTH -Jahr sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_YEAR -StartWert sc:Edit:RID_SCDLG_FILLSERIES:ED_START_VALUES -EndWert sc:Edit:RID_SCDLG_FILLSERIES:ED_END_VALUES -Inkrement sc:Edit:RID_SCDLG_FILLSERIES:ED_INCREMENT +*PNGOptionen svtools.ModalDialog.16486 +Kompression svtools.NumericField.16486.1 +Interlaced svtools.CheckBox.16486.1 + +*PPMOptionen filter.ModalDialog.17411 +Binaer filter.RadioButton.17411.1 +Ascii filter.RadioButton.17411.2 + +*QuelleAuswaehlen SC_HID_DATAPILOT_TYPE +AktuelleSelektion sc.RadioButton.25733.4 +AngemeldeteDatenquelle sc.RadioButton.25733.5 +ExterneQuelle sc.RadioButton.25733.6 + +*Rechtschreibung CUI_HID_SPELLCHECK +Original CUI_HID_SPELLDLG_SETWORD +Ersetzen CUI_HID_SPLDLG_BUTTON_CHANGE +AlleErsetzen CUI_HID_SPLDLG_BUTTON_CHANGEALL +Ignorieren CUI_HID_SPLDLG_BUTTON_IGNORE +AlleIgnorieren CUI_HID_SPLDLG_BUTTON_IGNOREALL +Sprache cui.ListBox.10032.36 +RechtschreibungSchliessen CUI_HID_SPLDLG_BUTTON_CLOSE + +*Redlining SW_HID_REDLINE_ACCEPT +TabControl SVX_HID_REDLINING_TABCONTROL +TabListe SVX_HID_REDLINING_VIEW_PAGE +Liste SVX_HID_REDLINING_VIEW_DG_VIEW +ListItem SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE +Akzeptieren SVX_HID_REDLINING_VIEW_PB_ACCEPT +AlleAkzeptieren SVX_HID_REDLINING_VIEW_PB_ACCEPTALL +Ablehnen SVX_HID_REDLINING_VIEW_PB_REJECT +AlleAblehnen SVX_HID_REDLINING_VIEW_PB_REJECTALL +Undo SVX_HID_REDLINING_VIEW_PB_UNDO + +TabFilter SVX_HID_REDLINING_FILTER_PAGE cui:TABPAGE:SID_REDLIN_FILTER_PAGE +Datum SVX_HID_REDLINING_FILTER_CB_DATE cui:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE +DatumListe SVX_HID_REDLINING_FILTER_LB_DATE cui:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE +Datum1 SVX_HID_REDLINING_FILTER_DF_DATE cui:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE +Zeit1 SVX_HID_REDLINING_FILTER_TF_DATE cui:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE +Aktuell1 SVX_HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK +Datum2 SVX_HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 +Zeit2 SVX_HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 +Aktuell2 SVX_HID_REDLINING_FILTER_IB_CLOCK2 SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 +Autor SVX_HID_REDLINING_FILTER_CB_AUTOR SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_AUTOR +AutoListe SVX_HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AUTOR +Bereich SVX_HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE +BereichText SVX_HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE +Button SVX_HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF +Aktion SVX_HID_REDLINING_FILTER_CB_ACTION SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_ACTION +Aktionsliste SVX_HID_REDLINING_FILTER_LB_ACTION SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_ACTION +Comment SVX_HID_REDLINING_FILTER_CB_COMMENT SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_COMMENT +CommentText SVX_HID_REDLINING_FILTER_ED_COMMENT SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:ED_COMMENT + +*ReiheFuellen .uno:FillSeries +Oben sc.RadioButton.25623.4 +Unten sc.RadioButton.25623.5 +Rechts sc.RadioButton.25623.3 +Links sc.RadioButton.25623.2 +Arithmetisch sc.RadioButton.25623.12 +Geometrisch sc.RadioButton.25623.13 +Datum sc.RadioButton.25623.14 +AutoAusfuellen sc.RadioButton.25623.15 +Tag sc.RadioButton.25623.22 +WochenTag sc.RadioButton.25623.23 +Monat sc.RadioButton.25623.24 +Jahr sc.RadioButton.25623.25 +StartWert sc.Edit.25623.52 +EndWert sc.Edit.25623.49 +Inkrement sc.Edit.25623.39 *Schriften STARMATH:MODALDIALOG:RID_FONTDIALOG Schriftart STARMATH:COMBOBOX:RID_FONTDIALOG:1 Fett STARMATH:CHECKBOX:RID_FONTDIALOG:1 Kursiv STARMATH:CHECKBOX:RID_FONTDIALOG:2 -*Schriftarten SID_FONT -Variablen starmath:ListBox:RID_FONTTYPEDIALOG:1 -Funktionen starmath:ListBox:RID_FONTTYPEDIALOG:2 -Zahlen starmath:ListBox:RID_FONTTYPEDIALOG:3 -Text starmath:ListBox:RID_FONTTYPEDIALOG:4 -Serif starmath:ListBox:RID_FONTTYPEDIALOG:5 -Sans starmath:ListBox:RID_FONTTYPEDIALOG:6 -Fixed starmath:ListBox:RID_FONTTYPEDIALOG:7 -Aendern starmath:MenuButton:RID_FONTTYPEDIALOG:1 -Standard starmath:PushButton:RID_FONTTYPEDIALOG:2 - -*Schriftgroessen SID_FONTSIZE +*Schriftarten .uno:ChangeFont +Variablen starmath.ListBox.20004.1 +Funktionen starmath.ListBox.20004.2 +Zahlen starmath.ListBox.20004.3 +Text starmath.ListBox.20004.4 +Serif starmath.ListBox.20004.5 +Sans starmath.ListBox.20004.6 +Fixed starmath.ListBox.20004.7 +Aendern starmath.MenuButton.20004.1 +Standard starmath.PushButton.20004.2 + +*Schriftgroessen .uno:ChangeFontSize BasisGroesse STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:1 TextGroesse STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:4 Indizes STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:5 @@ -176,194 +176,194 @@ Standard STARMATH:PUSHBUTTON:RID_FONTSIZEDIALOG:1 *ScriptEinfuegen SW:MODALDIALOG:DLG_JAVAEDIT Scripttyp SW:EDIT:DLG_JAVAEDIT:ED_TYPE HierDerText SW:MULTILINEEDIT:DLG_JAVAEDIT:ED_EDIT -ScriptURL sw:RadioButton:DLG_JAVAEDIT:RB_URL -ScriptURLText sw:Edit:DLG_JAVAEDIT:ED_URL -ScriptURLWaehlen sw:PushButton:DLG_JAVAEDIT:PB_URL -ScriptText sw:RadioButton:DLG_JAVAEDIT:RB_EDIT -NaechstesScript sw:ImageButton:DLG_JAVAEDIT:BTN_NEXT -VorherigesScript sw:ImageButton:DLG_JAVAEDIT:BTN_PREV - -*SeiteEinfuegen SID_INSERTPAGE -AutoLayout HID_SD_CTL_NEWFOIL -Hintergrund HID_SD_CHGFOIL_BACKGROUND -ObjekteAufDemHintergund HID_SD_CHGFOIL_OBJECTS - -*SeitenLayout SID_MODIFYPAGE -AutoLayout HID_SD_CHGFOIL_LAYOUT -Hintergrund HID_SD_CHGFOIL_BACKGROUND -SeitenName HID_SD_CHGFOIL_NAME -ObjekteAufDemHintergrund HID_SD_CHGFOIL_OBJECTS - -*SeitenObjekteEinfuegen DLG_INSERT_PAGES_OBJS -Verknuepfung sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_LINK -DeleteUnusedBackgrounds sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_CHECK_MASTERS -InsertObjectsList HID_SD_PAGEOBJSTLB - -*Seitenvorlage SID_PRESENTATION_LAYOUT -Laden sd:PushButton:DLG_PRESLT:BTN_LOAD -HintergrundseiteAustauschen sd:CheckBox:DLG_PRESLT:CBX_MASTER_PAGE -DeleteUnusedBackgrounds sd:CheckBox:DLG_PRESLT:CBX_CHECK_MASTERS - -*SeitenvorlageLaden HID_FILEDLG_LOADTEMPLATE -Bereiche sfx2:ListBox:DLG_NEW_FILE:LB_REGION -Beschreibung sfx2:MultiLineEdit:DLG_NEW_FILE:ED_DESC -Schluesselworte sfx2:Edit:DLG_NEW_FILE:ED_KEYWORDS -Thema sfx2:Edit:DLG_NEW_FILE:ED_THEMA -Titel sfx2:Edit:DLG_NEW_FILE:ED_TITLE -Vorlagen sfx2:ListBox:DLG_NEW_FILE:LB_TEMPLATE -Vorschau sfx2:CheckBox:DLG_NEW_FILE:BTN_PREVIEW -Zusaetze sfx2:MoreButton:DLG_NEW_FILE:BT_MORE - -*Serienbrief FN_QRY_MERGE -DatensaetzeAlle sw:RadioButton:DLG_MAILMERGE:RB_ALL -DatensaetzeMarkiert sw:RadioButton:DLG_MAILMERGE:RB_MARKED -DatensaetzeVonBis sw:RadioButton:DLG_MAILMERGE:RB_FROM -Von sw:NumericField:DLG_MAILMERGE:NF_FROM -Bis sw:NumericField:DLG_MAILMERGE:NF_TO -Drucker sw:RadioButton:DLG_MAILMERGE:RB_PRINTER -Mailing sw:RadioButton:DLG_MAILMERGE:RB_MAILING -AlsDatei sw:RadioButton:DLG_MAILMERGE:RB_FILE -DateiButton sw:PushButton:DLG_MAILMERGE:PB_PATH -Pfadeingabe sw:Edit:DLG_MAILMERGE:ED_PATH -EinzelneDruckjobserzeugen sw:CheckBox:DLG_MAILMERGE:CB_SINGLE_JOBS -Adressfeld sw:ListBox:DLG_MAILMERGE:LB_ADDRESSFLD -Anhaenge sw:Edit:DLG_MAILMERGE:ED_ATTACH -AnhaengeAuswahl sw:PushButton:DLG_MAILMERGE:PB_ATTACH -Betreff sw:Edit:DLG_MAILMERGE:ED_SUBJECT -FormatHTML sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_HTML -FormatRTF sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_RTF -FormatStarWriter sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_SW -Datenbankfeldliste sw:ListBox:DLG_MAILMERGE:LB_COLUMN - -*Sonderzeichen SID_CHARMAP -Schrift cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT -SchriftListe HID_CHARMAP_CTL_SHOWSET -Loeschen cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE -Zeichenanzeige HID_CHARMAP_CTL_SHOWCHAR -Textanzeige HID_CHARMAP_CTL_SHOWTEXT -Subset cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET - -*SonstigesJavaabschaltung cui:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE -NichtMehrAnzeigen cui:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE - -*Sortieren FN_SORTING_DLG -Schluessel1 sw:CheckBox:DLG_SORTING:CB_KEY1 -Spalte1 sw:NumericField:DLG_SORTING:ED_KEY1 -Schluesseltyp1 sw:ListBox:DLG_SORTING:DLB_KEY1 -Aufsteigend1 sw:RadioButton:DLG_SORTING:RB_UP -Absteigend1 sw:RadioButton:DLG_SORTING:RB_DN -Schluessel2 sw:CheckBox:DLG_SORTING:CB_KEY2 -Spalte2 sw:NumericField:DLG_SORTING:ED_KEY2 -Schluesseltyp2 sw:ListBox:DLG_SORTING:DLB_KEY2 -Aufsteigend2 sw:RadioButton:DLG_SORTING:RB_UP2 -Absteigend2 sw:RadioButton:DLG_SORTING:RB_DN2 -Schluessel3 sw:CheckBox:DLG_SORTING:CB_KEY3 -Spalte3 sw:NumericField:DLG_SORTING:ED_KEY3 -Aufsteigend3 sw:RadioButton:DLG_SORTING:RB_UP3 -Absteigend3 sw:RadioButton:DLG_SORTING:RB_DN3 -Schluesseltyp3 sw:ListBox:DLG_SORTING:DLB_KEY3 -Spalten sw:RadioButton:DLG_SORTING:RB_COL -Zeilen sw:RadioButton:DLG_SORTING:RB_ROW -Tabulator sw:RadioButton:DLG_SORTING:RB_TAB -Zeichen sw:RadioButton:DLG_SORTING:RB_TABCH -Zeichentext sw:Edit:DLG_SORTING:ED_TABCH -Sonderzeichen sw:PushButton:DLG_SORTING:PB_DELIM -Sprache sw:ListBox:DLG_SORTING:LB_LANG -ExakterVergleich sw:CheckBox:DLG_SORTING:CB_CASE - -*SpalteAusblenden FID_COL_HIDE - -*SpalteEinblenden FID_COL_SHOW - -*SpaltenbreiteCalc FID_COL_WIDTH -Breite sc:MetricField:RID_SCDLG_COL_MAN:ED_VALUE HID_SC_MTRIN_VAL -Standardwert sc:CheckBox:RID_SCDLG_COL_MAN:BTN_DEFVAL HID_SC_MTRIN_DEF - -*SpaltenBreite FN_TABLE_SET_COL_WIDTH -Spalte sw:NumericField:DLG_COL_WIDTH:ED_COL -Breite sw:MetricField:DLG_COL_WIDTH:ED_WIDTH - -*Spaltenzuordnung HID_DLG_MAPPING -Kuerzel extensions:ListBox:RID_DLG_MAPPING:LB_IDENTIFIER -Literaturart extensions:ListBox:RID_DLG_MAPPING:LB_AUTHORITYTYPE -Autor extensions:ListBox:RID_DLG_MAPPING:LB_AUTHOR -Titel extensions:ListBox:RID_DLG_MAPPING:LB_TITLE -Jahr extensions:ListBox:RID_DLG_MAPPING:LB_YEAR -ISBN extensions:ListBox:RID_DLG_MAPPING:LB_ISBN -Buchtitel extensions:ListBox:RID_DLG_MAPPING:LB_BOOKTITLE -Kapitel extensions:ListBox:RID_DLG_MAPPING:LB_CHAPTER -Ausgabe extensions:ListBox:RID_DLG_MAPPING:LB_EDITION -Herausgeber extensions:ListBox:RID_DLG_MAPPING:LB_EDITOR -Ausgabeart extensions:ListBox:RID_DLG_MAPPING:LB_HOWPUBLISHED -Institution extensions:ListBox:RID_DLG_MAPPING:LB_INSTITUTION -Zeitschrift extensions:ListBox:RID_DLG_MAPPING:LB_JOURNAL -Monat extensions:ListBox:RID_DLG_MAPPING:LB_MONTH -Notiz extensions:ListBox:RID_DLG_MAPPING:LB_NOTE -Anmerkung extensions:ListBox:RID_DLG_MAPPING:LB_ANNOTE -Nummer extensions:ListBox:RID_DLG_MAPPING:LB_NUMBER -Organisation extensions:ListBox:RID_DLG_MAPPING:LB_ORGANIZATIONS -Seiten extensions:ListBox:RID_DLG_MAPPING:LB_PAGES -Verlag extensions:ListBox:RID_DLG_MAPPING:LB_PUBLISHER -Adresse extensions:ListBox:RID_DLG_MAPPING:LB_ADDRESS -Hochschule extensions:ListBox:RID_DLG_MAPPING:LB_SCHOOL -Serie extensions:ListBox:RID_DLG_MAPPING:LB_SERIES -ArtDesReport extensions:ListBox:RID_DLG_MAPPING:LB_REPORTTYPE -Band extensions:ListBox:RID_DLG_MAPPING:LB_VOLUME -URL extensions:ListBox:RID_DLG_MAPPING:LB_URL -Benutzerfeld1 extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM1 -Benutzerfeld2 extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM2 -Benutzerfeld3 extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM3 -Benutzerfeld4 extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM4 -Benutzerfeld5 extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM5 - -*SpalteOptimaleBreite FID_COL_OPT_WIDTH -Extra sc:MetricField:RID_SCDLG_COL_OPT:ED_VALUE HID_SC_MTRIN_VAL -Standardwert sc:CheckBox:RID_SCDLG_COL_OPT:BTN_DEFVAL HID_SC_MTRIN_DEF - -*Spezialfilter SID_SPECIAL_FILTER -BefindenBereich sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_CRITERIA_AREA -Befinden sc:Edit:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA -GrossKleinschreibung sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_CASE -RegulaererAusdruck sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_REGEXP -BereichEnthaeltSpaltenkoepfe sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_HEADER -KeineDuplikate sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_UNIQUE -Persistent sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_DEST_PERS -FilterergebnisAusgeben sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_COPY_RESULT -AusgebenBereich sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_COPY_AREA -Ausgeben sc:Edit:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA -Zusaetze sc:MoreButton:RID_SCDLG_SPEC_FILTER:BTN_MORE -FilterkriterienMin sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA -FilterergebnisMin sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA - -*StandardFilter SID_FILTER -FeldName1 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD1 -Feldname2 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD2 -Feldname3 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD3 -Feldname4 sc:ListBox:RID_SCDLG_FILTER:LB_FIELD4 -Bedingung1 sc:ListBox:RID_SCDLG_FILTER:LB_COND1 -Bedingung2 sc:ListBox:RID_SCDLG_FILTER:LB_COND2 -Bedingung3 sc:ListBox:RID_SCDLG_FILTER:LB_COND3 -Bedingung4 sc:ListBox:RID_SCDLG_FILTER:LB_COND4 -Wert1 sc:ComboBox:RID_SCDLG_FILTER:ED_VAL1 -Wert2 sc:ComboBox:RID_SCDLG_FILTER:ED_VAL2 -Wert3 sc:ComboBox:RID_SCDLG_FILTER:ED_VAL3 -Wert4 sc:ComboBox:RID_SCDLG_FILTER:ED_VAL4 -Verknuepfung1 sc:ListBox:RID_SCDLG_FILTER:LB_OP1 -Verknuepfung2 sc:ListBox:RID_SCDLG_FILTER:LB_OP2 -Verknuepfung3 sc:ListBox:RID_SCDLG_FILTER:LB_OP3 -Verknuepfung4 sc:ListBox:RID_SCDLG_FILTER:LB_OP4 -Zusaetze sc:MoreButton:RID_SCDLG_FILTER:BTN_MORE -GrossKleinschreibung sc:CheckBox:RID_SCDLG_FILTER:BTN_CASE -BereicheEnthaeltSpaltenkoepfe sc:CheckBox:RID_SCDLG_FILTER:BTN_HEADER -RegulaererAusdruck sc:CheckBox:RID_SCDLG_FILTER:BTN_REGEXP -KeineDuplikate sc:CheckBox:RID_SCDLG_FILTER:BTN_UNIQUE -FilterergebnisNach sc:CheckBox:RID_SCDLG_FILTER:BTN_COPY_RESULT -AusgebenBereich sc:ListBox:RID_SCDLG_FILTER:LB_COPY_AREA -Ausgeben sc:Edit:RID_SCDLG_FILTER:ED_COPY_AREA -DialogMin sc:ImageButton:RID_SCDLG_FILTER:RB_COPY_AREA -Persistent sc:CheckBox:RID_SCDLG_FILTER:BTN_DEST_PERS - -*Statusbar HID_STATUSBAR +ScriptURL sw.RadioButton.21110.19 +ScriptURLText sw.Edit.21110.20 +ScriptURLWaehlen sw.PushButton.21110.21 +ScriptText sw.RadioButton.21110.12 +NaechstesScript sw.ImageButton.21110.16 +VorherigesScript sw.ImageButton.21110.15 + +*SeiteEinfuegen .uno:InsertPage +AutoLayout SD_HID_SD_CTL_NEWFOIL +Hintergrund SD_HID_SD_CHGFOIL_BACKGROUND +ObjekteAufDemHintergund SD_HID_SD_CHGFOIL_OBJECTS + +*SeitenLayout .uno:ModifyPage +AutoLayout SD_HID_SD_CHGFOIL_LAYOUT +Hintergrund SD_HID_SD_CHGFOIL_BACKGROUND +SeitenName SD_HID_SD_CHGFOIL_NAME +ObjekteAufDemHintergrund SD_HID_SD_CHGFOIL_OBJECTS + +*SeitenObjekteEinfuegen SD_HID_DLG_INSERT_PAGES_OBJS +Verknuepfung sd.CheckBox.938.1 +DeleteUnusedBackgrounds sd.CheckBox.938.2 +InsertObjectsList SD_HID_SD_PAGEOBJSTLB + +*Seitenvorlage .uno:PresentationLayout +Laden sd.PushButton.868.2 +HintergrundseiteAustauschen sd.CheckBox.868.1 +DeleteUnusedBackgrounds sd.CheckBox.868.2 + +*SeitenvorlageLaden SW_HID_FILEDLG_LOADTEMPLATE +Bereiche sfx2.ListBox.2053.21 +Beschreibung sfx2.MultiLineEdit.2053.71 +Schluesselworte sfx2.Edit.2053.61 +Thema sfx2.Edit.2053.55 +Titel sfx2.Edit.2053.56 +Vorlagen sfx2.ListBox.2053.52 +Vorschau sfx2.CheckBox.2053.51 +Zusaetze sfx2.MoreButton.2053.32 + +*Serienbrief .uno:MergeDialog +DatensaetzeAlle sw.RadioButton.22758.2 +DatensaetzeMarkiert sw.RadioButton.22758.3 +DatensaetzeVonBis sw.RadioButton.22758.4 +Von sw.NumericField.22758.5 +Bis sw.NumericField.22758.7 +Drucker sw.RadioButton.22758.11 +Mailing sw.RadioButton.22758.12 +AlsDatei sw.RadioButton.22758.23 +DateiButton sw.PushButton.22758.26 +Pfadeingabe sw.Edit.22758.25 +EinzelneDruckjobserzeugen sw.CheckBox.22758.18 +Adressfeld sw.ListBox.22758.14 +Anhaenge sw.Edit.22758.33 +AnhaengeAuswahl sw.PushButton.22758.34 +Betreff sw.Edit.22758.16 +FormatHTML sw.CheckBox.22758.21 +FormatRTF sw.CheckBox.22758.22 +FormatStarWriter sw.CheckBox.22758.20 +Datenbankfeldliste sw.ListBox.22758.30 + +*Sonderzeichen .uno:InsertSymbol +Schrift cui.ListBox.10010.12 +SchriftListe CUI_HID_CHARMAP_CTL_SHOWSET +Loeschen cui.PushButton.10010.20 +Zeichenanzeige CUI_HID_CHARMAP_CTL_SHOWCHAR +Textanzeige CUI_HID_CHARMAP_CTL_SHOWTEXT +Subset cui.ListBox.10010.31 + +*SonstigesJavaabschaltung cui.ModalDialog.10225 +NichtMehrAnzeigen cui.CheckBox.10225.222 + +*Sortieren .uno:SortDialog +Schluessel1 sw.CheckBox.21669.5 +Spalte1 sw.NumericField.21669.6 +Schluesseltyp1 sw.ListBox.21669.7 +Aufsteigend1 sw.RadioButton.21669.18 +Absteigend1 sw.RadioButton.21669.19 +Schluessel2 sw.CheckBox.21669.8 +Spalte2 sw.NumericField.21669.9 +Schluesseltyp2 sw.ListBox.21669.10 +Aufsteigend2 sw.RadioButton.21669.29 +Absteigend2 sw.RadioButton.21669.30 +Schluessel3 sw.CheckBox.21669.11 +Spalte3 sw.NumericField.21669.12 +Aufsteigend3 sw.RadioButton.21669.31 +Absteigend3 sw.RadioButton.21669.32 +Schluesseltyp3 sw.ListBox.21669.13 +Spalten sw.RadioButton.21669.15 +Zeilen sw.RadioButton.21669.16 +Tabulator sw.RadioButton.21669.21 +Zeichen sw.RadioButton.21669.22 +Zeichentext sw.Edit.21669.23 +Sonderzeichen sw.PushButton.21669.34 +Sprache sw.ListBox.21669.36 +ExakterVergleich sw.CheckBox.21669.38 + +*SpalteAusblenden .uno:HideColumn + +*SpalteEinblenden .uno:ShowColumn + +*SpaltenbreiteCalc .uno:ColumnWidth +Breite sc.MetricField.25708.1 HID_SC_MTRIN_VAL +Standardwert sc.CheckBox.25708.1 HID_SC_MTRIN_DEF + +*SpaltenBreite .uno:SetColumnWidth +Spalte sw.NumericField.21456.2 +Breite sw.MetricField.21456.4 + +*Spaltenzuordnung EXTENSIONS_HID_DLG_MAPPING +Kuerzel extensions.ListBox.15701.6 +Literaturart extensions.ListBox.15701.9 +Autor extensions.ListBox.15701.15 +Titel extensions.ListBox.15701.17 +Jahr extensions.ListBox.15701.21 +ISBN extensions.ListBox.15701.23 +Buchtitel extensions.ListBox.15701.25 +Kapitel extensions.ListBox.15701.27 +Ausgabe extensions.ListBox.15701.29 +Herausgeber extensions.ListBox.15701.31 +Ausgabeart extensions.ListBox.15701.33 +Institution extensions.ListBox.15701.35 +Zeitschrift extensions.ListBox.15701.37 +Monat extensions.ListBox.15701.19 +Notiz extensions.ListBox.15701.39 +Anmerkung extensions.ListBox.15701.13 +Nummer extensions.ListBox.15701.41 +Organisation extensions.ListBox.15701.43 +Seiten extensions.ListBox.15701.45 +Verlag extensions.ListBox.15701.47 +Adresse extensions.ListBox.15701.11 +Hochschule extensions.ListBox.15701.49 +Serie extensions.ListBox.15701.51 +ArtDesReport extensions.ListBox.15701.53 +Band extensions.ListBox.15701.55 +URL extensions.ListBox.15701.57 +Benutzerfeld1 extensions.ListBox.15701.59 +Benutzerfeld2 extensions.ListBox.15701.61 +Benutzerfeld3 extensions.ListBox.15701.63 +Benutzerfeld4 extensions.ListBox.15701.65 +Benutzerfeld5 extensions.ListBox.15701.67 + +*SpalteOptimaleBreite .uno:SetOptimalColumnWidth +Extra sc.MetricField.25709.1 HID_SC_MTRIN_VAL +Standardwert sc.CheckBox.25709.1 HID_SC_MTRIN_DEF + +*Spezialfilter .uno:DataFilterSpecialFilter +BefindenBereich sc.ListBox.25613.51 +Befinden sc.Edit.25613.52 +GrossKleinschreibung sc.CheckBox.25613.2 +RegulaererAusdruck sc.CheckBox.25613.3 +BereichEnthaeltSpaltenkoepfe sc.CheckBox.25613.4 +KeineDuplikate sc.CheckBox.25613.1 +Persistent sc.CheckBox.25613.12 +FilterergebnisAusgeben sc.CheckBox.25613.5 +AusgebenBereich sc.ListBox.25613.6 +Ausgeben sc.Edit.25613.7 +Zusaetze sc.MoreButton.25613.1 +FilterkriterienMin sc.ImageButton.25613.53 +FilterergebnisMin sc.ImageButton.25613.8 + +*StandardFilter .uno:DataFilterStandardFilter +FeldName1 sc.ListBox.25612.24 +Feldname2 sc.ListBox.25612.25 +Feldname3 sc.ListBox.25612.26 +Feldname4 sc.ListBox.25612.38 +Bedingung1 sc.ListBox.25612.29 +Bedingung2 sc.ListBox.25612.30 +Bedingung3 sc.ListBox.25612.31 +Bedingung4 sc.ListBox.25612.39 +Wert1 sc.ComboBox.25612.32 +Wert2 sc.ComboBox.25612.33 +Wert3 sc.ComboBox.25612.34 +Wert4 sc.ComboBox.25612.40 +Verknuepfung1 sc.ListBox.25612.27 +Verknuepfung2 sc.ListBox.25612.28 +Verknuepfung3 sc.ListBox.25612.37 +Verknuepfung4 sc.ListBox.25612.42 +Zusaetze sc.MoreButton.25612.1 +GrossKleinschreibung sc.CheckBox.25612.2 +BereicheEnthaeltSpaltenkoepfe sc.CheckBox.25612.4 +RegulaererAusdruck sc.CheckBox.25612.3 +KeineDuplikate sc.CheckBox.25612.1 +FilterergebnisNach sc.CheckBox.25612.5 +AusgebenBereich sc.ListBox.25612.6 +Ausgeben sc.Edit.25612.7 +DialogMin sc.ImageButton.25612.8 +Persistent sc.CheckBox.25612.12 + +*Statusbar FWK_HID_STATUSBAR '*Standardbrowser extensions:ModalDialog:MD_PROTCHK_DIALOG 'StarOfficeVerwenden extensions:RadioButton:MD_PROTCHK_DIALOG:RB_STAROFFICE @@ -374,23 +374,23 @@ Persistent sc:CheckBox:RID_SCDLG_FILTER:BTN_DEST_PERS +Stylist Gestalter -*SVMOptionen svtools:ModalDialog:DLG_EXPORT_VEC -Original svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC -Groesse svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC -Breite svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC -Hoehe svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC - -*SymboleMath starmath:ModalDialog:RID_SYMBOLDIALOG -Symbolset starmath:ListBox:RID_SYMBOLDIALOG:1 -Bearbeiten starmath:PushButton:RID_SYMBOLDIALOG:1 -Uebernehmen starmath:PushButton:RID_SYMBOLDIALOG:2 -Symbols HID_SMA_CONTROL_SYMBOLSET_VIEW - -*SzenarioAnlegen SC:MODALDIALOG:RID_SCDLG_NEWSCENARIO SID_SCENARIOS -SzenarioName sc:Edit:RID_SCDLG_NEWSCENARIO:ED_NAME -Kommentar sc:MultiLineEdit:RID_SCDLG_NEWSCENARIO:ED_COMMENT +*SVMOptionen svtools.ModalDialog.16372 +Original svtools.RadioButton.16372.1 +Groesse svtools.RadioButton.16372.2 +Breite svtools.MetricField.16372.1 +Hoehe svtools.MetricField.16372.2 + +*SymboleMath starmath.ModalDialog.20008 +Symbolset starmath.ListBox.20008.1 +Bearbeiten starmath.PushButton.20008.1 +Uebernehmen starmath.PushButton.20008.2 +Symbols STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW + +*SzenarioAnlegen SC:MODALDIALOG:RID_SCDLG_NEWSCENARIO .uno:ScenarioManager +SzenarioName sc.Edit.25643.11 +Kommentar sc.MultiLineEdit.25643.13 RahmenAnzeigen SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_SHOWFRAME Rahmenfarbe SC:LISTBOX:RID_SCDLG_NEWSCENARIO:LB_COLOR Zurueckkopieren SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_TWOWAY GanzeTabelle SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_COPYALL -PreventChanges sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_PROTECT +PreventChanges sc.CheckBox.25643.28 diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win old mode 100755 new mode 100644 index 1f317fd412da..9ad323b4c43e --- a/testautomation/global/win/dial_t_z.win +++ b/testautomation/global/win/dial_t_z.win @@ -1,148 +1,148 @@ -*TabelleAuftrennen FN_TABLE_SPLIT_TABLE +*TabelleAuftrennen .uno:SplitTable UeberschriftKopieren SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_CNTNT EigeneMitVorlage SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_PARA Eigene SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_NOPARA Keine SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BORDER -*TabelleAusblenden FID_TABLE_HIDE - -*TabellenFormat HID_FORMAT_TABLE - -*TabelleEinblenden FID_TABLE_SHOW -AusgeblendeteTabelle SC:MULTILISTBOX:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST HID_SC_SELENTRY_LIST - -*TabelleEinfuegenCalc sc:ModalDialog:RID_SCDLG_INSERT_TABLE -Vor sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEFORE -Nach sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEHIND -Anzahl sc:NumericField:RID_SCDLG_INSERT_TABLE:NF_COUNT -NeuErstellen sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_NEW -AusDateiErstellen sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_FROMFILE -TabellenName sc:Edit:RID_SCDLG_INSERT_TABLE:ED_TABNAME -Auswahl sc:MultiListBox:RID_SCDLG_INSERT_TABLE:LB_TABLES -Verknuepfen sc:CheckBox:RID_SCDLG_INSERT_TABLE:CB_LINK -Durchsuchen sc:PushButton:RID_SCDLG_INSERT_TABLE:BTN_BROWSE -Tabellen sc:PushButton:RID_SCDLG_INSERT_TABLE:BTN_BROWSE - -*TabelleEinfuegenWriter FN_INSERT_TABLE -TabellenName sw:Edit:DLG_INSERT_TABLE:ED_NAME -Spalten sw:NumericField:DLG_INSERT_TABLE:ED_COL -Zeilen sw:NumericField:DLG_INSERT_TABLE:ED_ROW -UeberschriftWiederholen sw:CheckBox:DLG_INSERT_TABLE:CB_REPEAT_HEADER -TabelleNichtTrennen sw:CheckBox:DLG_INSERT_TABLE:CB_DONT_SPLIT -Umrandung sw:CheckBox:DLG_INSERT_TABLE:CB_BORDER +*TabelleAusblenden .uno:Hide + +*TabellenFormat SW_HID_FORMAT_TABLE + +*TabelleEinblenden .uno:Show +AusgeblendeteTabelle SC:MULTILISTBOX:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST SC_HID_SC_SELENTRY_LIST + +*TabelleEinfuegenCalc sc.ModalDialog.25646 +Vor sc.RadioButton.25646.11 +Nach sc.RadioButton.25646.12 +Anzahl sc.NumericField.25646.23 +NeuErstellen sc.RadioButton.25646.21 +AusDateiErstellen sc.RadioButton.25646.26 +TabellenName sc.Edit.25646.25 +Auswahl sc.MultiListBox.25646.27 +Verknuepfen sc.CheckBox.25646.29 +Durchsuchen sc.PushButton.25646.28 +Tabellen sc.PushButton.25646.28 + +*TabelleEinfuegenWriter .uno:InsertTable +TabellenName sw.Edit.21450.11 +Spalten sw.NumericField.21450.4 +Zeilen sw.NumericField.21450.5 +UeberschriftWiederholen sw.CheckBox.21450.14 +TabelleNichtTrennen sw.CheckBox.21450.15 +Umrandung sw.CheckBox.21450.16 Autoformat SW:PUSHBUTTON:DLG_INSERT_TABLE:BT_AUTOFORMAT -Ueberschrift sw:CheckBox:DLG_INSERT_TABLE:CB_HEADER - -*TabellenFuellen FID_INS_CELL_CONTENTS -AuswahlAllesEinfuegen sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSALL -AuswahlZeichenketten sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSSTRINGS -AuswahlZahlen sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSNUMBERS -AuswahlDatumZeit sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSDATETIME -AuswahlFormeln sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSFORMULAS -AuswahlNotizen sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSNOTES -AuswahlFormate sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSATTRS -Objects sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSOBJECTS -RechenopperationenKeine sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_NOOP -RechenopperationenAddieren sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_ADD -RechenopperationenSubtrahieren sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_SUB -RechenopperationenMultiplizieren sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_MUL -RechenopperationenDividieren sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_DIV -LeerzeilenUeberspringen sc:CheckBox:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY -Verknuepfen sc:CheckBox:RID_SCDLG_INSCONT:BTN_LINK -Transponieren sc:CheckBox:RID_SCDLG_INSCONT:BTN_TRANSPOSE +Ueberschrift sw.CheckBox.21450.13 + +*TabellenFuellen .uno:InsertContents +AuswahlAllesEinfuegen sc.CheckBox.25618.20 +AuswahlZeichenketten sc.CheckBox.25618.21 +AuswahlZahlen sc.CheckBox.25618.22 +AuswahlDatumZeit sc.CheckBox.25618.23 +AuswahlFormeln sc.CheckBox.25618.24 +AuswahlNotizen sc.CheckBox.25618.26 +AuswahlFormate sc.CheckBox.25618.25 +Objects sc.CheckBox.25618.41 +RechenopperationenKeine sc.RadioButton.25618.27 +RechenopperationenAddieren sc.RadioButton.25618.28 +RechenopperationenSubtrahieren sc.RadioButton.25618.29 +RechenopperationenMultiplizieren sc.RadioButton.25618.30 +RechenopperationenDividieren sc.RadioButton.25618.31 +LeerzeilenUeberspringen sc.CheckBox.25618.33 +Verknuepfen sc.CheckBox.25618.35 +Transponieren sc.CheckBox.25618.34 NichtVerschieben SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE NachUnten SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN NachRechts SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT -*TabelleSchuetzen FID_PROTECT_TABLE -Passwort HID_PASSWD_TABLE -Bestaetigung sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM -IstVerdeckt sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER - -*TabelleUmbenennen FID_TAB_RENAME -TabellenName HID_SC_RENAME_NAME sc:Edit:RID_SCDLG_STRINPUT:ED_INPUT - -*TabellenVerbinden FN_TABLE_MERGE_TABLE -MitVorherigerTabelleVerbinden sw:RadioButton:DLG_MERGE_TABLE:RB_MERGE_PREV -MitNachfolgenderTabelleVerbinden sw:RadioButton:DLG_MERGE_TABLE:RB_MERGE_NEXT - -*TabelleVerschiebenKopieren FID_TAB_MOVE -InsDokument sc:ListBox:RID_SCDLG_MOVETAB:LB_DEST -EinfuegenVor sc:ListBox:RID_SCDLG_MOVETAB:LB_INSERT -Kopieren sc:CheckBox:RID_SCDLG_MOVETAB:BTN_COPY - -*TB_SC_Themenauswahl HID_DLGSTYLES_DIALOG -ThemenListe HID_DLGSTYLES_LISTBOX -Schliessen HID_DLGSTYLES_CANCEL -Uebernehmen HID_DLGSTYLES_OKAY - -*TB_Farbe HID_POPUP_COLOR -Automatic HID_POPUP_COLOR_CTRL - -*TB_ImagemapEditor HID_IMAPDLG_TOOLBOX -Zuweisen HID_IMAPDLG_APPLY -Oeffnen HID_IMAPDLG_OPEN -Speichern HID_IMAPDLG_SAVEAS -Auswahl HID_IMAPDLG_SELECT -Rechteck HID_IMAPDLG_RECT -Ellipse HID_IMAPDLG_CIRCLE -Polygon HID_IMAPDLG_POLY -Freihandpolygon HID_IMAPDLG_FREEPOLY -Punktebearbeiten HID_IMAPDLG_POLYEDIT -Punkteverschieben HID_IMAPDLG_POLYMOVE -Punkteeinfuegen HID_IMAPDLG_POLYINSERT -Punkteloeschen HID_IMAPDLG_POLYDELETE -Rueckgaengig HID_IMAPDLG_UNDO -Wiederholen HID_IMAPDLG_REDO -Aktiv HID_IMAPDLG_ACTIVE -Makro HID_IMAPDLG_MACRO -Eigenschaften HID_IMAPDLG_PROPERTY - -*TB_Umrandung HID_POPUP_FRAME - -*TB_Umrandungsstil HID_POPUP_LINE - -*TextbausteineUmbenennen HID_RENAME_GLOSSARY +*TabelleSchuetzen .uno:Protect +Passwort SC_HID_PASSWD_TABLE +Bestaetigung sfx2.Edit.2316.16 +IstVerdeckt sfx2.Edit.2316.12 + +*TabelleUmbenennen .uno:Name +TabellenName SC_HID_SC_RENAME_NAME sc.Edit.25620.10 + +*TabellenVerbinden .uno:MergeTable +MitVorherigerTabelleVerbinden sw.RadioButton.21465.5 +MitNachfolgenderTabelleVerbinden sw.RadioButton.21465.6 + +*TabelleVerschiebenKopieren .uno:Move +InsDokument sc.ListBox.25619.2 +EinfuegenVor sc.ListBox.25619.4 +Kopieren sc.CheckBox.25619.5 + +*TB_SC_Themenauswahl WIZARDS_HID_DLGSTYLES_DIALOG +ThemenListe WIZARDS_HID_DLGSTYLES_LISTBOX +Schliessen WIZARDS_HID_DLGSTYLES_CANCEL +Uebernehmen WIZARDS_HID_DLGSTYLES_OKAY + +*TB_Farbe SVX_HID_POPUP_COLOR +Automatic SVX_HID_POPUP_COLOR_CTRL + +*TB_ImagemapEditor SVX_HID_IMAPDLG_TOOLBOX +Zuweisen SVX_HID_IMAPDLG_APPLY +Oeffnen SVX_HID_IMAPDLG_OPEN +Speichern SVX_HID_IMAPDLG_SAVEAS +Auswahl SVX_HID_IMAPDLG_SELECT +Rechteck SVX_HID_IMAPDLG_RECT +Ellipse SVX_HID_IMAPDLG_CIRCLE +Polygon SVX_HID_IMAPDLG_POLY +Freihandpolygon SVX_HID_IMAPDLG_FREEPOLY +Punktebearbeiten SVX_HID_IMAPDLG_POLYEDIT +Punkteverschieben SVX_HID_IMAPDLG_POLYMOVE +Punkteeinfuegen SVX_HID_IMAPDLG_POLYINSERT +Punkteloeschen SVX_HID_IMAPDLG_POLYDELETE +Rueckgaengig SVX_HID_IMAPDLG_UNDO +Wiederholen SVX_HID_IMAPDLG_REDO +Aktiv SVX_HID_IMAPDLG_ACTIVE +Makro SVX_HID_IMAPDLG_MACRO +Eigenschaften SVX_HID_IMAPDLG_PROPERTY + +*TB_Umrandung SVX_HID_POPUP_FRAME + +*TB_Umrandungsstil SVX_HID_POPUP_LINE + +*TextbausteineUmbenennen SW_HID_RENAME_GLOSSARY Name SW:EDIT:DLG_RENAME_GLOS:ED_ON Neu SW:EDIT:DLG_RENAME_GLOS:ED_NN KuerzelAlt SW:EDIT:DLG_RENAME_GLOS:ED_OS KuerzelNeu SW:EDIT:DLG_RENAME_GLOS:ED_NS -*TextInTabelleUmwandeln FN_CONVERT_TEXT_TABLE sw:ModalDialog:DLG_CONV_TEXT_TABLE -Tabulator sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_TAB -Semikolon sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_SEMI -Absatz sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_PARA +*TextInTabelleUmwandeln .uno:ConvertTableText sw:ModalDialog:DLG_CONV_TEXT_TABLE +Tabulator sw.RadioButton.21452.1 +Semikolon sw.RadioButton.21452.3 +Absatz sw.RadioButton.21452.4 Andere SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:RB_OTHER AndereText SW:EDIT:DLG_CONV_TEXT_TABLE:ED_OTHER GleicheBreite SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN Autoformat SW:PUSHBUTTON:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT -Ueberschrift sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_HEADER -Wiederholen sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_REPEAT_HEADER -NichtTrennen sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_DONT_SPLIT -Umrandung sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_BORDER +Ueberschrift sw.CheckBox.21452.13 +Wiederholen sw.CheckBox.21452.14 +NichtTrennen sw.CheckBox.21452.15 +Umrandung sw.CheckBox.21452.16 -*TextmarkeEinfuegen FN_INSERT_BOOKMARK -Textmarken sw:ComboBox:DLG_INSERT_BOOKMARK:CB_BOOKMARK -Loeschen sw:PushButton:DLG_INSERT_BOOKMARK:BT_DELETE +*TextmarkeEinfuegen .uno:InsertBookmark +Textmarken sw.ComboBox.21667.1 +Loeschen sw.PushButton.21667.22 -*Ueberblenden SID_POLYGON_MORPHING -Attributierung sd:CheckBox:DLG_MORPH:CBX_ATTRIBUTES -GleicheOrientierung sd:CheckBox:DLG_MORPH:CBX_ORIENTATION -Schritte sd:MetricField:DLG_MORPH:MTF_STEPS +*Ueberblenden .uno:Morphing +Attributierung sd.CheckBox.653.1 +GleicheOrientierung sd.CheckBox.653.2 +Schritte sd.MetricField.653.1 -*UeberStarCalc SID_ABOUT +*UeberStarCalc .uno:About -*UeberStarChart SID_ABOUT +*UeberStarChart .uno:About -*UeberStarDraw SID_ABOUT +*UeberStarDraw .uno:About -*UeberStarImage SID_ABOUT +*UeberStarImage .uno:About -*UeberStarMath SID_ABOUT +*UeberStarMath .uno:About -*UeberStarWriter SID_ABOUT +*UeberStarWriter .uno:About -*UmbruchEinfuegen FN_INSERT_BREAK_DLG +*UmbruchEinfuegen .uno:InsertBreak Zeilenumbruch SW:RADIOBUTTON:DLG_BREAK:RB_LINE Spaltenumbruch SW:RADIOBUTTON:DLG_BREAK:RB_COL Seitenumbruch SW:RADIOBUTTON:DLG_BREAK:RB_PAGE @@ -150,19 +150,19 @@ Vorlage SW:LISTBOX:DLG_BREAK:LB_COLL SeitennummerAendern SW:CHECKBOX:DLG_BREAK:CB_PAGENUM Seitennummer SW:NUMERICFIELD:DLG_BREAK:ED_PAGENUM -*UmwandelnInPolygon SID_VECTORIZE -Farbanzahl sd:NumericField:DLG_VECTORIZE:NM_LAYERS -Punktreduktion sd:MetricField:DLG_VECTORIZE:MT_REDUCE -LoecherFuellen sd:CheckBox:DLG_VECTORIZE:CB_FILLHOLES -Kachelgroesse sd:MetricField:DLG_VECTORIZE:MT_FILLHOLES -Vorschau sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW +*UmwandelnInPolygon SD_HID_VECTORIZE_DLG +Farbanzahl sd.NumericField.654.1 +Punktreduktion sd.MetricField.654.3 +LoecherFuellen sd.CheckBox.654.1 +Kachelgroesse sd.MetricField.654.4 +Vorschau sd.PushButton.654.1 -*UntenFuellen FID_FILL_TO_BOTTOM +*UntenFuellen .uno:FillDown -*UndoRedoBox HID_SVXTBX_UNDO_REDO_CTRL -UndoRedoList svx:ListBox:RID_SVXTBX_UNDO_REDO_CTRL:LB_SVXTBX_UNDO_REDO_CTRL +*UndoRedoBox SVX_HID_SVXTBX_UNDO_REDO_CTRL +UndoRedoList svx.ListBox.10845.11 -*Verbinder HID_PAGE_CONNECTION SVX:TABPAGE:RID_SVXPAGE_CONNECTION +*Verbinder CUI_HID_PAGE_CONNECTION SVX:TABPAGE:RID_SVXPAGE_CONNECTION Linie1 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1 Linie2 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2 Linie3 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3 @@ -171,18 +171,18 @@ AnfangHorizontal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1 AnfangVertikal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1 EndeHorizontal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2 EndeVertikal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2 -Vorschau HID_PAGE_CONNECTION_CTL_PREVIEW +Vorschau CUI_HID_PAGE_CONNECTION_CTL_PREVIEW -*VerknuepfungenBearbeiten cui:ModalDialog:MD_UPDATE_BASELINKS -Liste HID_LINKDLG_TABLB -VerknuepfungBearbeiten cui:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE -Automatisch cui:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC -Manuell cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL -Aktualisieren cui:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW -Aendern cui:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE -Loesen cui:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK +*VerknuepfungenBearbeiten cui.ModalDialog.32002 +Liste CUI_HID_LINKDLG_TABLB +VerknuepfungBearbeiten cui.PushButton.32002.36 +Automatisch cui.RadioButton.32002.42 +Manuell cui.RadioButton.32002.43 +Aktualisieren cui.PushButton.32002.35 +Aendern cui.PushButton.32002.37 +Loesen cui.PushButton.32002.38 -*VersendenMonitor HID_MERGE_PRINTMONITOR +*VersendenMonitor SW_HID_MERGE_PRINTMONITOR *Versionen SFX2:MODALDIALOG:DLG_VERSIONS Speichern SFX2:PUSHBUTTON:DLG_VERSIONS:PB_SAVE @@ -190,143 +190,143 @@ ImmerVersionSpeichern SFX2:CHECKBOX:DLG_VERSIONS:CB_SAVEONCLOSE Anzeigen SFX2:PUSHBUTTON:DLG_VERSIONS:PB_VIEW Loeschen SFX2:PUSHBUTTON:DLG_VERSIONS:PB_DELETE Oeffnen SFX2:PUSHBUTTON:DLG_VERSIONS:PB_OPEN -Vergleichen sfx2:PushButton:DLG_VERSIONS:PB_COMPARE +Vergleichen sfx2.PushButton.2377.17 *VersionskommentarEingeben SFX2:MODALDIALOG:DLG_COMMENTS Kommentar SFX2:MULTILINEEDIT:DLG_COMMENTS:ME_VERSIONS Schliessen SFX2:PUSHBUTTON:DLG_COMMENTS:PB_CLOSE -*VerteilenDlg HID_PAGE_DISTRIBUTE -KeineHorizontal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE -Links cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT -MitteHorizontal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER -AbstandHorizontal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE -Rechts cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT -KeineVertikal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE -Oben cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP -MitteVertikal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER -AbstandVertikal cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE -Unten cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM - -*VerzeichniseintragEinfuegen FN_INSERT_IDX_ENTRY_DLG -EintragOk HID_INSERT_IDX_MRK_OK -EinfuegenSchliessen HID_INSERT_IDX_MRK_CLOSE -Verzeichniseintrag HID_INSERT_IDX_MRK_ENTRY -Verzeichnis HID_INSERT_IDX_MRK_TYPE -Schluessel1 HID_INSERT_IDX_MRK_PRIM_KEY -Schluessel2 HID_INSERT_IDX_MRK_SEC_KEY -Stufe HID_INSERT_IDX_MRK_LEVEL -EintragLoeschen HID_INSERT_IDX_MRK_DELETE -EintragNeu HID_INSERT_IDX_MRK_NEW -Haupteintrag HID_INSERT_IDX_MRK_MAIN_ENTRY -AufAlleGleichenAnwenden HID_INSERT_IDX_MRK_APPLY_ALL -EntryPhoneticReading HID_INSERT_IDX_MRK_PHONETIC_READING - -*VerzeichniseintragBearbeiten FN_EDIT_IDX_ENTRY_DLG -EintragOk HID_INSERT_IDX_MRK_OK -BearbeitenSchliessen HID_INSERT_IDX_MRK_CLOSE -Verzeichnis HID_INSERT_IDX_MRK_TYPE -Verzeichniseintrag HID_INSERT_IDX_MRK_ENTRY -Schluessel1 HID_INSERT_IDX_MRK_PRIM_KEY -Schluessel2 HID_INSERT_IDX_MRK_SEC_KEY -Stufe HID_INSERT_IDX_MRK_LEVEL -EintragLoeschen HID_INSERT_IDX_MRK_DELETE -EintragNeu HID_INSERT_IDX_MRK_NEW -Naechster HID_INSERT_IDX_MRK_NEXT -Vorheriger HID_INSERT_IDX_MRK_PREV - -*VorlageErzeugen SID_STYLE_NEW_BY_EXAMPLE SID_TEMPLATE_NEW_BY_EXAMPLE -Vorlagenname sfx2:ComboBox:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL - -*Vorlagenkatalog SID_STYLE_CATALOG -Vorlagen sfx2:ListBox:RID_STYLECATALOG:BT_TOOL -Ansicht HID_TEMPLATE_FMT -Bereich sfx2:ListBox:RID_STYLECATALOG:BT_FLIST -Neu sfx2:PushButton:RID_STYLECATALOG:BT_NEW -Aendern sfx2:PushButton:RID_STYLECATALOG:BT_EDIT -Loeschen sfx2:PushButton:RID_STYLECATALOG:BT_DEL -Verwalten sfx2:PushButton:RID_STYLECATALOG:BT_ORG - -*Vorschau SID_PREVIEW_WIN - -*VorlageZuweisen HID_DLG_ADD_IDX_STYLES -ZuweisenLinks sw:ImageButton:DLG_ADD_IDX_STYLES:PB_LEFT -ZuweisenRechts sw:ImageButton:DLG_ADD_IDX_STYLES:PB_RIGHT - -*WBereicheBearbeiten HID_BIB_BASE +*VerteilenDlg CUI_HID_PAGE_DISTRIBUTE +KeineHorizontal cui.RadioButton.10236.2 +Links cui.RadioButton.10236.3 +MitteHorizontal cui.RadioButton.10236.4 +AbstandHorizontal cui.RadioButton.10236.5 +Rechts cui.RadioButton.10236.6 +KeineVertikal cui.RadioButton.10236.8 +Oben cui.RadioButton.10236.9 +MitteVertikal cui.RadioButton.10236.10 +AbstandVertikal cui.RadioButton.10236.11 +Unten cui.RadioButton.10236.12 + +*VerzeichniseintragEinfuegen .uno:InsertIndexesEntry +EintragOk SW_HID_INSERT_IDX_MRK_OK +EinfuegenSchliessen SW_HID_INSERT_IDX_MRK_CLOSE +Verzeichniseintrag SW_HID_INSERT_IDX_MRK_ENTRY +Verzeichnis SW_HID_INSERT_IDX_MRK_TYPE +Schluessel1 SW_HID_INSERT_IDX_MRK_PRIM_KEY +Schluessel2 SW_HID_INSERT_IDX_MRK_SEC_KEY +Stufe SW_HID_INSERT_IDX_MRK_LEVEL +EintragLoeschen SW_HID_INSERT_IDX_MRK_DELETE +EintragNeu SW_HID_INSERT_IDX_MRK_NEW +Haupteintrag SW_HID_INSERT_IDX_MRK_MAIN_ENTRY +AufAlleGleichenAnwenden SW_HID_INSERT_IDX_MRK_APPLY_ALL +EntryPhoneticReading SW_HID_INSERT_IDX_MRK_PHONETIC_READING + +*VerzeichniseintragBearbeiten .uno:IndexEntryDialog +EintragOk SW_HID_INSERT_IDX_MRK_OK +BearbeitenSchliessen SW_HID_INSERT_IDX_MRK_CLOSE +Verzeichnis SW_HID_INSERT_IDX_MRK_TYPE +Verzeichniseintrag SW_HID_INSERT_IDX_MRK_ENTRY +Schluessel1 SW_HID_INSERT_IDX_MRK_PRIM_KEY +Schluessel2 SW_HID_INSERT_IDX_MRK_SEC_KEY +Stufe SW_HID_INSERT_IDX_MRK_LEVEL +EintragLoeschen SW_HID_INSERT_IDX_MRK_DELETE +EintragNeu SW_HID_INSERT_IDX_MRK_NEW +Naechster SW_HID_INSERT_IDX_MRK_NEXT +Vorheriger SW_HID_INSERT_IDX_MRK_PREV + +*VorlageErzeugen .uno:StyleNewByExample SID_TEMPLATE_NEW_BY_EXAMPLE +Vorlagenname sfx2.ComboBox.2323.1 + +*Vorlagenkatalog .uno:StyleCatalog +Vorlagen sfx2.ListBox.1461.10 +Ansicht SFX2_HID_TEMPLATE_FMT +Bereich sfx2.ListBox.1461.8 +Neu sfx2.PushButton.1461.6 +Aendern sfx2.PushButton.1461.5 +Loeschen sfx2.PushButton.1461.4 +Verwalten sfx2.PushButton.1461.3 + +*Vorschau .uno:PreviewWindow + +*VorlageZuweisen SW_HID_DLG_ADD_IDX_STYLES +ZuweisenLinks sw.ImageButton.20894.110 +ZuweisenRechts sw.ImageButton.20894.111 + +*WBereicheBearbeiten SW_HID_BIB_BASE Bereichname SW:EDIT:DLG_BIB_BASE:ED_NAME Bereich SW:LISTBOX:DLG_BIB_BASE:LB_PATH -Liste HID_GLOS_GROUP_TREE -Neu sw:PushButton:DLG_BIB_BASE:PB_NEW -Loeschen sw:PushButton:DLG_BIB_BASE:PB_DELETE -Umbenennen sw:PushButton:DLG_BIB_BASE:PB_RENAME - -*WMFOptionen svtools:ModalDialog:DLG_EXPORT_VEC -Original svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC -Groesse svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC -Breite svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC -Hoehe svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC - -*Zahlenformat HID_NUMBERFORMAT -Kategorie cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY -KategorieFormat HID_NUMBERFORMAT_LB_FORMAT +Liste SW_HID_GLOS_GROUP_TREE +Neu sw.PushButton.21666.3 +Loeschen sw.PushButton.21666.4 +Umbenennen sw.PushButton.21666.11 + +*WMFOptionen svtools.ModalDialog.16372 +Original svtools.RadioButton.16372.1 +Groesse svtools.RadioButton.16372.2 +Breite svtools.MetricField.16372.1 +Hoehe svtools.MetricField.16372.2 + +*Zahlenformat CUI_HID_NUMBERFORMAT +Kategorie cui.ListBox.10041.9 +KategorieFormat CUI_HID_NUMBERFORMAT_LB_FORMAT 'FormatZahl -FormatCode cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT -Hinzufuegen HID_NUMBERFORMAT_TBI_ADD -Entfernen HID_NUMBERFORMAT_TBI_REMOVE -Sprache cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE -Nachkommastellen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS -FuehrendeNullen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES -NegativInRot cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED -Tausenderpunkt cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND - -*ZeileAusblenden FID_ROW_HIDE - -*Zeilenhoehe FID_ROW_HEIGHT -Hoehe sc:MetricField:RID_SCDLG_ROW_MAN:ED_VALUE HID_SC_MTRIN_VAL -Standwardwert sc:CheckBox:RID_SCDLG_ROW_MAN:BTN_DEFVAL HID_SC_MTRIN_DEF - -*ZeileOptimaleHoehe FID_ROW_OPT_HEIGHT -Extra sc:MetricField:RID_SCDLG_ROW_OPT:ED_VALUE HID_SC_MTRIN_VAL -Standardwert sc:CheckBox:RID_SCDLG_ROW_OPT:BTN_DEFVAL HID_SC_MTRIN_DEF - -*ZellvorlageCalc HID_MANAGE_STYLES - -*ZeileEinblenden FID_ROW_SHOW - -*ZellenEinfuegen FID_INS_CELL -ZellenNachUnten sc:RadioButton:RID_SCDLG_INSCELL:BTN_CELLSDOWN -ZellenNachRechts sc:RadioButton:RID_SCDLG_INSCELL:BTN_CELLSRIGHT -GanzeZeile sc:RadioButton:RID_SCDLG_INSCELL:BTN_INSROWS -GanzeSpalte sc:RadioButton:RID_SCDLG_INSCELL:BTN_INSCOLS - -*ZellenLoeschen FID_DELETE_CELL -Auswahl sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSUP -Zellennachoben sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSUP -Zellennachlinks sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSLEFT -GanzeZeilen sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELROWS -GanzeSpalten sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELCOLS - -*ZellenHoehe FN_TABLE_SET_ROW_HEIGHT -Hoehe sw:MetricField:DLG_ROW_HEIGHT:ED_HEIGHT -Dynamisch sw:CheckBox:DLG_ROW_HEIGHT:CB_AUTOHEIGHT - -*ZellenTeilen cui:ModalDialog:RID_SVX_SPLITCELLDLG -Anzahl cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT -Horizontal cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ -Vertikal cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT -GleichmaessigTeilen cui:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP - -*ZielImDokument HID_HYPERLINK_MARKWND +FormatCode cui.Edit.10041.14 +Hinzufuegen CUI_HID_NUMBERFORMAT_TBI_ADD +Entfernen CUI_HID_NUMBERFORMAT_TBI_REMOVE +Sprache cui.ListBox.10041.13 +Nachkommastellen cui.NumericField.10041.22 +FuehrendeNullen cui.NumericField.10041.24 +NegativInRot cui.CheckBox.10041.25 +Tausenderpunkt cui.CheckBox.10041.26 + +*ZeileAusblenden .uno:HideRow + +*Zeilenhoehe .uno:RowHeight +Hoehe sc.MetricField.25710.1 HID_SC_MTRIN_VAL +Standwardwert sc.CheckBox.25710.1 HID_SC_MTRIN_DEF + +*ZeileOptimaleHoehe .uno:SetOptimalRowHeight +Extra sc.MetricField.25711.1 HID_SC_MTRIN_VAL +Standardwert sc.CheckBox.25711.1 HID_SC_MTRIN_DEF + +*ZellvorlageCalc SFX2_HID_MANAGE_STYLES + +*ZeileEinblenden .uno:ShowRow + +*ZellenEinfuegen .uno:InsertCell +ZellenNachUnten sc.RadioButton.25616.11 +ZellenNachRechts sc.RadioButton.25616.12 +GanzeZeile sc.RadioButton.25616.16 +GanzeSpalte sc.RadioButton.25616.17 + +*ZellenLoeschen .uno:DeleteCell +Auswahl sc.RadioButton.25615.10 +Zellennachoben sc.RadioButton.25615.10 +Zellennachlinks sc.RadioButton.25615.13 +GanzeZeilen sc.RadioButton.25615.14 +GanzeSpalten sc.RadioButton.25615.15 + +*ZellenHoehe .uno:SetRowHeight +Hoehe sw.MetricField.21454.1 +Dynamisch sw.CheckBox.21454.2 + +*ZellenTeilen cui.ModalDialog.10043 +Anzahl cui.NumericField.10043.2 +Horizontal cui.ImageRadioButton.10043.10 +Vertikal cui.ImageRadioButton.10043.12 +GleichmaessigTeilen cui.CheckBox.10043.11 + +*ZielImDokument CUI_HID_HYPERLINK_MARKWND 'Uebernehmen Kein Eintrag in Hid.Lst 'Schliessen Kein Eintrag in Hid.Lst -*Zielwertsuche SID_OPENDLG_SOLVE -Formelzelle sc:Edit:RID_SCDLG_SOLVER:ED_FORMULACELL -Vorgaben1 sc:ImageButton:RID_SCDLG_SOLVER:RB_FORMULACELL -Zielwert sc:Edit:RID_SCDLG_SOLVER:ED_TARGETVAL -VariableZelle sc:Edit:RID_SCDLG_SOLVER:ED_VARCELL -Vorgaben2 sc:ImageButton:RID_SCDLG_SOLVER:RB_VARCELL +*Zielwertsuche .uno:GoalSeekDialog +Formelzelle sc.Edit.25630.1 +Vorgaben1 sc.ImageButton.25630.1 +Zielwert sc.Edit.25630.2 +VariableZelle sc.Edit.25630.3 +Vorgaben2 sc.ImageButton.25630.2 -*Zusammenfassen SID_AUTOFORMAT +*Zusammenfassen .uno:AutoFormat Mindestgroesse cui:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN diff --git a/testautomation/global/win/dokument.win b/testautomation/global/win/dokument.win old mode 100755 new mode 100644 index ff31dfdbcf3b..9628f5bcbaa7 --- a/testautomation/global/win/dokument.win +++ b/testautomation/global/win/dokument.win @@ -1,45 +1,45 @@ ' german Part -*DokumentWriter HID_EDIT_WIN -*DokumentWriterWeb HID_EDIT_WIN -*DokumentCalc HID_SC_WIN_GRIDWIN -*DokumentDraw SD_IF_SDGRAPHICVIEWSHELL HID_SD_WIN_DOCUMENT -*DokumentImpress SD_IF_SDDRAWVIEWSHELL HID_SD_WIN_DOCUMENT +*DokumentWriter SW_HID_EDIT_WIN +*DokumentWriterWeb SW_HID_EDIT_WIN +*DokumentCalc SC_HID_SC_WIN_GRIDWIN +*DokumentDraw SD_HID_SDGRAPHICVIEWSHELL SD_HID_SD_WIN_DOCUMENT +*DokumentImpress SD_HID_SDDRAWVIEWSHELL SD_HID_SD_WIN_DOCUMENT *DokumentImpressDiatisch SD_IF_SDSLIDEVIEWSHELL -*DokumentImpressGliederungsmodus SD_IF_SDOUTLINEVIEWSHELL -*DokumentImpressNotizen SID_NOTESMODE -*DokumentImpressHandzettel SID_HANDOUTMODE -*DokumentChart HID_SCH_WIN_DOCUMENT -*DokumentGlobalDoc HID_EDIT_WIN +*DokumentImpressGliederungsmodus SD_HID_SDOUTLINEVIEWSHELL +*DokumentImpressNotizen .uno:NotesMode +*DokumentImpressHandzettel .uno:HandoutMode +*DokumentChart CHART2_HID_SCH_WIN_DOCUMENT +*DokumentGlobalDoc SW_HID_EDIT_WIN -*DokumentMath HID_SMA_WIN_DOCUMENT -*DokumentImageMap HID_IMAPDLG_GRAPHWND -*DokumentPraesentation HID_SD_WIN_PRESENTATION +*DokumentMath STARMATH_HID_SMA_WIN_DOCUMENT +*DokumentImageMap SVX_HID_IMAPDLG_GRAPHWND +*DokumentPraesentation SD_HID_SD_WIN_PRESENTATION -*KommandosMath HID_SMA_COMMAND_WIN -Kommandos HID_SMA_COMMAND_WIN_EDIT +*KommandosMath STARMATH_HID_SMA_COMMAND_WIN +Kommandos STARMATH_HID_SMA_COMMAND_WIN_EDIT *DokSeitenansichtWriter HID_PagePreview *DokSeitenansichtCalc HID_SC_Win_Preview ' english Part -*DocumentWriter HID_EDIT_WIN -*DocumentWriterWeb HID_EDIT_WIN -*DocumentHTMLSourceView HID_SOURCE_EDITWIN -*DocumentCalc HID_SC_WIN_GRIDWIN -*DocumentDraw SD_IF_SDGRAPHICVIEWSHELL HID_SD_WIN_DOCUMENT -*DocumentImpress SD_IF_SDDRAWVIEWSHELL HID_SD_WIN_DOCUMENT +*DocumentWriter SW_HID_EDIT_WIN +*DocumentWriterWeb SW_HID_EDIT_WIN +*DocumentHTMLSourceView SW_HID_SOURCE_EDITWIN +*DocumentCalc SC_HID_SC_WIN_GRIDWIN +*DocumentDraw SD_HID_SDGRAPHICVIEWSHELL SD_HID_SD_WIN_DOCUMENT +*DocumentImpress SD_HID_SDDRAWVIEWSHELL SD_HID_SD_WIN_DOCUMENT *DocumentImpressSlideView SD_IF_SDSLIDEVIEWSHELL -*DocumentImpressOutlineView SD_IF_SDOUTLINEVIEWSHELL -*DocumentImpressNotesView SID_NOTESMODE -*DocumentImpressHandoutView SID_HANDOUTMODE -*DocumentChart HID_SCH_WIN_DOCUMENT -*DocumentMasterDoc HID_EDIT_WIN -*DocumentMath HID_SMA_WIN_DOCUMENT -*DocumentImageMap HID_IMAPDLG_GRAPHWND -*DocumentPresentation HID_SD_WIN_PRESENTATION -*DocumentBackground HID_BACKINGWINDOW +*DocumentImpressOutlineView SD_HID_SDOUTLINEVIEWSHELL +*DocumentImpressNotesView .uno:NotesMode +*DocumentImpressHandoutView .uno:HandoutMode +*DocumentChart CHART2_HID_SCH_WIN_DOCUMENT +*DocumentMasterDoc SW_HID_EDIT_WIN +*DocumentMath STARMATH_HID_SMA_WIN_DOCUMENT +*DocumentImageMap SVX_HID_IMAPDLG_GRAPHWND +*DocumentPresentation SD_HID_SD_WIN_PRESENTATION +*DocumentBackground FWK_HID_BACKINGWINDOW TextDocument .HelpId:StartCenter:WriterButton Spreadsheet .HelpId:StartCenter:CalcButton Presentation .HelpId:StartCenter:ImpressButton @@ -52,24 +52,24 @@ Extensions .HelpId:StartCenter:Extensions Register .HelpId:StartCenter:Register Info .HelpId:StartCenter:Info -*CommandsMath HID_SMA_COMMAND_WIN -Commands HID_SMA_COMMAND_WIN_EDIT +*CommandsMath STARMATH_HID_SMA_COMMAND_WIN +Commands STARMATH_HID_SMA_COMMAND_WIN_EDIT *DocPageViewWriter HID_PagePreview *DocPageViewCalc HID_SC_Win_Preview ' to access the buttons in the lower left corner -*DocumentDrawImpress SD_IF_SDGRAPHICVIEWSHELL -ViewSlideButton HID_SD_BTN_PAGE -ViewLayerButton HID_SD_BTN_LAYER -ViewMasterButton HID_SD_BTN_MASTERPAGE -TabBar HID_SD_TABBAR_PAGES -LayerTabBar HID_SD_TABBAR_LAYERS +*DocumentDrawImpress SD_HID_SDGRAPHICVIEWSHELL +ViewSlideButton SD_HID_SD_BTN_PAGE +ViewLayerButton SD_HID_SD_BTN_LAYER +ViewMasterButton SD_HID_SD_BTN_MASTERPAGE +TabBar SD_HID_SD_TABBAR_PAGES +LayerTabBar SD_HID_SD_TABBAR_LAYERS ' these are the buttons on the right side -ButtonDrawingView HID_SD_BTN_DRAW -ButtonOutlineView HID_SD_BTN_OUTLINE -ButtonSlideView HID_SD_BTN_SLIDE -ButtonNotesView HID_SD_BTN_NOTES -ButtonHandoutView HID_SD_BTN_HANDOUT -ButtonStartSlideShow HID_SD_BTN_PRESENTATION +ButtonDrawingView SD_HID_SD_BTN_DRAW +ButtonOutlineView SD_HID_SD_BTN_OUTLINE +ButtonSlideView SD_HID_SD_BTN_SLIDE +ButtonNotesView SD_HID_SD_BTN_NOTES +ButtonHandoutView SD_HID_SD_BTN_HANDOUT +ButtonStartSlideShow SD_HID_SD_BTN_PRESENTATION diff --git a/testautomation/global/win/e_mathop.win b/testautomation/global/win/e_mathop.win old mode 100755 new mode 100644 index 88bed2b93789..1b6b3ccb9c68 --- a/testautomation/global/win/e_mathop.win +++ b/testautomation/global/win/e_mathop.win @@ -1,202 +1,202 @@ -*SelectionMath HID_SMA_OPERATOR_WIN -TB_Group HID_SMA_SELECTION_TBX -UnaryBinary HID_SMA_UNBINOPS_CAT -Relations HID_SMA_RELATIONS_CAT -SetOperations HID_SMA_SETOPERATIONS_CAT -Functions HID_SMA_FUNCTIONS_CAT -Operators HID_SMA_OPERATORS_CAT -Attributes HID_SMA_ATTRIBUTES_CAT -Others HID_SMA_MISC_CAT -Brackets HID_SMA_BRACKETS_CAT -Format HID_SMA_FORMAT_CAT +*SelectionMath STARMATH_HID_SMA_OPERATOR_WIN +TB_Group STARMATH_HID_SMA_SELECTION_TBX +UnaryBinary STARMATH_HID_SMA_UNBINOPS_CAT +Relations STARMATH_HID_SMA_RELATIONS_CAT +SetOperations STARMATH_HID_SMA_SETOPERATIONS_CAT +Functions STARMATH_HID_SMA_FUNCTIONS_CAT +Operators STARMATH_HID_SMA_OPERATORS_CAT +Attributes STARMATH_HID_SMA_ATTRIBUTES_CAT +Others STARMATH_HID_SMA_MISC_CAT +Brackets STARMATH_HID_SMA_BRACKETS_CAT +Format STARMATH_HID_SMA_FORMAT_CAT -TB_UnaryBinary HID_SMA_UNBINOPS_TBX -Plus HID_SMA_PLUSX -Minus HID_SMA_MINUSX -PlusMinus HID_SMA_PLUSMINUSX -MinusPlus HID_SMA_MINUSPLUSX -BooleanNot HID_SMA_NEGX -Addition HID_SMA_XPLUSY -Multiplication HID_SMA_XCDOTY -MultiplicationX HID_SMA_XTIMESY -MultiplicationStar HID_SMA_XSYMTIMESY -BooleanAND HID_SMA_XANDY -Subtraction HID_SMA_XMINUSY -DivisionFraction HID_SMA_XOVERY -Division HID_SMA_XDIVY -DivisionSlash HID_SMA_XSYMDIVIDEY -BooleanOR HID_SMA_XORY -Catenate HID_SMA_XCIRCY +TB_UnaryBinary STARMATH_HID_SMA_UNBINOPS_TBX +Plus STARMATH_HID_SMA_PLUSX +Minus STARMATH_HID_SMA_MINUSX +PlusMinus STARMATH_HID_SMA_PLUSMINUSX +MinusPlus STARMATH_HID_SMA_MINUSPLUSX +BooleanNot STARMATH_HID_SMA_NEGX +Addition STARMATH_HID_SMA_XPLUSY +Multiplication STARMATH_HID_SMA_XCDOTY +MultiplicationX STARMATH_HID_SMA_XTIMESY +MultiplicationStar STARMATH_HID_SMA_XSYMTIMESY +BooleanAND STARMATH_HID_SMA_XANDY +Subtraction STARMATH_HID_SMA_XMINUSY +DivisionFraction STARMATH_HID_SMA_XOVERY +Division STARMATH_HID_SMA_XDIVY +DivisionSlash STARMATH_HID_SMA_XSYMDIVIDEY +BooleanOR STARMATH_HID_SMA_XORY +Catenate STARMATH_HID_SMA_XCIRCY -TB_Relations HID_SMA_RELATIONS_TBX -IsEqual HID_SMA_XEQY -IsNotEqual HID_SMA_XNEQY -IsApprocimatelyEqual HID_SMA_XAPPROXY -Divides HID_SMA_XDIVIDESY -DoesNotDivide HID_SMA_XNDIVIDESY -IsLessThan HID_SMA_XLTY -IsGreaterThan HID_SMA_XGTY -IsSimilarOrEqual HID_SMA_XSIMEQY -IsParallelTo HID_SMA_XPARALLELY -IsOrthogonalTo HID_SMA_XORTHOY -IsLessThanOrEqualTo HID_SMA_XLESLANTY -IsGreaterThanOrEqualTo HID_SMA_XGESLANTY -IsSimilarTo HID_SMA_XSIMY -IsCongruentTo HID_SMA_XEQUIVY -IsLessThanOrEqualTo2 HID_SMA_XLEY -IsGreaterThanOrEqualTo2 HID_SMA_XGEY -IsProportionalTo HID_SMA_XPROPY -Toward HID_SMA_XTOWARDY -DoubleArrowLeft HID_SMA_DLARROW -DoubleArrowLeftAndRight HID_SMA_DLRARROW -DoubleArrowRight HID_SMA_DRARROW +TB_Relations STARMATH_HID_SMA_RELATIONS_TBX +IsEqual STARMATH_HID_SMA_XEQY +IsNotEqual STARMATH_HID_SMA_XNEQY +IsApprocimatelyEqual STARMATH_HID_SMA_XAPPROXY +Divides STARMATH_HID_SMA_XDIVIDESY +DoesNotDivide STARMATH_HID_SMA_XNDIVIDESY +IsLessThan STARMATH_HID_SMA_XLTY +IsGreaterThan STARMATH_HID_SMA_XGTY +IsSimilarOrEqual STARMATH_HID_SMA_XSIMEQY +IsParallelTo STARMATH_HID_SMA_XPARALLELY +IsOrthogonalTo STARMATH_HID_SMA_XORTHOY +IsLessThanOrEqualTo STARMATH_HID_SMA_XLESLANTY +IsGreaterThanOrEqualTo STARMATH_HID_SMA_XGESLANTY +IsSimilarTo STARMATH_HID_SMA_XSIMY +IsCongruentTo STARMATH_HID_SMA_XEQUIVY +IsLessThanOrEqualTo2 STARMATH_HID_SMA_XLEY +IsGreaterThanOrEqualTo2 STARMATH_HID_SMA_XGEY +IsProportionalTo STARMATH_HID_SMA_XPROPY +Toward STARMATH_HID_SMA_XTOWARDY +DoubleArrowLeft STARMATH_HID_SMA_DLARROW +DoubleArrowLeftAndRight STARMATH_HID_SMA_DLRARROW +DoubleArrowRight STARMATH_HID_SMA_DRARROW -TB_SetOperators HID_SMA_SETOPERATIONS_TBX -IsIn HID_SMA_XINY -IsNotIn HID_SMA_XNOTINY -Owns HID_SMA_XOWNSY -EmptySet HID_SMA_EMPTYSET -Intersection HID_SMA_XINTERSECTIONY -Union HID_SMA_XUNIONY -Difference HID_SMA_XSETMINUSY -QuotientSet HID_SMA_XSLASHY -Aleph HID_SMA_ALEPH -Subset HID_SMA_XSUBSETY -SubsetOrEqualTo HID_SMA_XSUBSETEQY -Superset HID_SMA_XSUPSETY -SupersetOrEqualTo HID_SMA_XSUPSETEQY -NotSubset HID_SMA_XNSUBSETY -NotSubsetOrEqual HID_SMA_XNSUBSETEQY -NotSuperset HID_SMA_XNSUPSETY -NotSupersetOrEqual HID_SMA_XNSUPSETEQY -NaturalNumbersSet HID_SMA_SETN -IntegersSet HID_SMA_SETZ -RelationalNumbersSet HID_SMA_SETQ -RealNumbersSet HID_SMA_SETR -ComplexNumbersSet HID_SMA_SETC +TB_SetOperators STARMATH_HID_SMA_SETOPERATIONS_TBX +IsIn STARMATH_HID_SMA_XINY +IsNotIn STARMATH_HID_SMA_XNOTINY +Owns STARMATH_HID_SMA_XOWNSY +EmptySet STARMATH_HID_SMA_EMPTYSET +Intersection STARMATH_HID_SMA_XINTERSECTIONY +Union STARMATH_HID_SMA_XUNIONY +Difference STARMATH_HID_SMA_XSETMINUSY +QuotientSet STARMATH_HID_SMA_XSLASHY +Aleph STARMATH_HID_SMA_ALEPH +Subset STARMATH_HID_SMA_XSUBSETY +SubsetOrEqualTo STARMATH_HID_SMA_XSUBSETEQY +Superset STARMATH_HID_SMA_XSUPSETY +SupersetOrEqualTo STARMATH_HID_SMA_XSUPSETEQY +NotSubset STARMATH_HID_SMA_XNSUBSETY +NotSubsetOrEqual STARMATH_HID_SMA_XNSUBSETEQY +NotSuperset STARMATH_HID_SMA_XNSUPSETY +NotSupersetOrEqual STARMATH_HID_SMA_XNSUPSETEQY +NaturalNumbersSet STARMATH_HID_SMA_SETN +IntegersSet STARMATH_HID_SMA_SETZ +RelationalNumbersSet STARMATH_HID_SMA_SETQ +RealNumbersSet STARMATH_HID_SMA_SETR +ComplexNumbersSet STARMATH_HID_SMA_SETC -TB_Functions HID_SMA_FUNCTIONS_TBX -ExponentialFunction HID_SMA_EX -NaturalLogarithm HID_SMA_LNX -ExponentialFunction2 HID_SMA_EXPX -Logarithm HID_SMA_LOGX -Power HID_SMA_RSUPX -Sine HID_SMA_SINX -Cosine HID_SMA_COSX -Tangent HID_SMA_TANX -Cotangent HID_SMA_COTX -SquareRoot HID_SMA_SQRTX -Arcsine HID_SMA_ARCSINX -Arccosine HID_SMA_ARCCOSX -Arctangent HID_SMA_ARCTANX -Arccotangent HID_SMA_ARCCOTX -NthRoot HID_SMA_NROOTXY -HyperbolicSine HID_SMA_SINHX -HyperbolicCosine HID_SMA_COSHX -HyperbolicTangent HID_SMA_TANHX -HyperbolicCotangent HID_SMA_COTHX -AbsoluteValue HID_SMA_ABSX -AreaHyperbolicSine HID_SMA_ARSINHX -AreaHyperbolicCosine HID_SMA_ARCOSHX -AreaHyperbolicTangent HID_SMA_ARTANHX -AreaHyperbolicCotangent HID_SMA_ARCOTHX -Factorial HID_SMA_FACTX +TB_Functions STARMATH_HID_SMA_FUNCTIONS_TBX +ExponentialFunction STARMATH_HID_SMA_EX +NaturalLogarithm STARMATH_HID_SMA_LNX +ExponentialFunction2 STARMATH_HID_SMA_EXPX +Logarithm STARMATH_HID_SMA_LOGX +Power STARMATH_HID_SMA_RSUPX +Sine STARMATH_HID_SMA_SINX +Cosine STARMATH_HID_SMA_COSX +Tangent STARMATH_HID_SMA_TANX +Cotangent STARMATH_HID_SMA_COTX +SquareRoot STARMATH_HID_SMA_SQRTX +Arcsine STARMATH_HID_SMA_ARCSINX +Arccosine STARMATH_HID_SMA_ARCCOSX +Arctangent STARMATH_HID_SMA_ARCTANX +Arccotangent STARMATH_HID_SMA_ARCCOTX +NthRoot STARMATH_HID_SMA_NROOTXY +HyperbolicSine STARMATH_HID_SMA_SINHX +HyperbolicCosine STARMATH_HID_SMA_COSHX +HyperbolicTangent STARMATH_HID_SMA_TANHX +HyperbolicCotangent STARMATH_HID_SMA_COTHX +AbsoluteValue STARMATH_HID_SMA_ABSX +AreaHyperbolicSine STARMATH_HID_SMA_ARSINHX +AreaHyperbolicCosine STARMATH_HID_SMA_ARCOSHX +AreaHyperbolicTangent STARMATH_HID_SMA_ARTANHX +AreaHyperbolicCotangent STARMATH_HID_SMA_ARCOTHX +Factorial STARMATH_HID_SMA_FACTX -TB_Operators HID_SMA_OPERATORS_TBX -Limes HID_SMA_LIMX -Sum HID_SMA_SUMX -Product HID_SMA_PRODX -Coproduct HID_SMA_COPRODX -UpperAndLowerLimit HID_SMA_FROMXTOY -Integral HID_SMA_INTX -DoubleIntegral HID_SMA_IINTX -TripleIntegral HID_SMA_IIINTX -LowerLimit HID_SMA_FROMX -CurveIntegral HID_SMA_LINTX -DoubleCurveIntegral HID_SMA_LLINTX -TripleCurveIntegral HID_SMA_LLLINTX -UpperLimit HID_SMA_TOX +TB_Operators STARMATH_HID_SMA_OPERATORS_TBX +Limes STARMATH_HID_SMA_LIMX +Sum STARMATH_HID_SMA_SUMX +Product STARMATH_HID_SMA_PRODX +Coproduct STARMATH_HID_SMA_COPRODX +UpperAndLowerLimit STARMATH_HID_SMA_FROMXTOY +Integral STARMATH_HID_SMA_INTX +DoubleIntegral STARMATH_HID_SMA_IINTX +TripleIntegral STARMATH_HID_SMA_IIINTX +LowerLimit STARMATH_HID_SMA_FROMX +CurveIntegral STARMATH_HID_SMA_LINTX +DoubleCurveIntegral STARMATH_HID_SMA_LLINTX +TripleCurveIntegral STARMATH_HID_SMA_LLLINTX +UpperLimit STARMATH_HID_SMA_TOX -TB_Attributes HID_SMA_ATTRIBUTES_TBX -AccentToTheRight HID_SMA_ACUTEX -AccentToTheLeft HID_SMA_GRAVEX -ReverseCircumflex HID_SMA_CHECKX -Breve HID_SMA_BREVEX -Circle HID_SMA_CIRCLEX -VectorArrow HID_SMA_VECX -Tilde HID_SMA_TILDEX -Circumflex HID_SMA_HATX -LineAbove HID_SMA_BARX -Dot HID_SMA_DOTX -LargeVectorArrow HID_SMA_WIDEVECX -LargeTilde HID_SMA_WIDETILDEX -LargeCircumflex HID_SMA_WIDEHATX -DoubleDot HID_SMA_DDOTX -LineOver HID_SMA_OVERLINEX -LineBelow HID_SMA_UNDERLINEX -LineThrough HID_SMA_OVERSTRIKEX -TripleDot HID_SMA_DDDOTX -Transparent HID_SMA_PHANTOMX -BoldFont HID_SMA_BOLDX -ItalicFont HID_SMA_ITALX -Resize HID_SMA_SIZEXY -ChangeFont HID_SMA_FONTXY +TB_Attributes STARMATH_HID_SMA_ATTRIBUTES_TBX +AccentToTheRight STARMATH_HID_SMA_ACUTEX +AccentToTheLeft STARMATH_HID_SMA_GRAVEX +ReverseCircumflex STARMATH_HID_SMA_CHECKX +Breve STARMATH_HID_SMA_BREVEX +Circle STARMATH_HID_SMA_CIRCLEX +VectorArrow STARMATH_HID_SMA_VECX +Tilde STARMATH_HID_SMA_TILDEX +Circumflex STARMATH_HID_SMA_HATX +LineAbove STARMATH_HID_SMA_BARX +Dot STARMATH_HID_SMA_DOTX +LargeVectorArrow STARMATH_HID_SMA_WIDEVECX +LargeTilde STARMATH_HID_SMA_WIDETILDEX +LargeCircumflex STARMATH_HID_SMA_WIDEHATX +DoubleDot STARMATH_HID_SMA_DDOTX +LineOver STARMATH_HID_SMA_OVERLINEX +LineBelow STARMATH_HID_SMA_UNDERLINEX +LineThrough STARMATH_HID_SMA_OVERSTRIKEX +TripleDot STARMATH_HID_SMA_DDDOTX +Transparent STARMATH_HID_SMA_PHANTOMX +BoldFont STARMATH_HID_SMA_BOLDX +ItalicFont STARMATH_HID_SMA_ITALX +Resize STARMATH_HID_SMA_SIZEXY +ChangeFont STARMATH_HID_SMA_FONTXY -TB_Others HID_SMA_FORMAT_TBX -Infinity HID_SMA_INFINITY -Partial HID_SMA_PARTIAL -Nabla HID_SMA_NABLA -ThereExists HID_SMA_EXISTS -ForAll HID_SMA_FORALL -HBar HID_SMA_HBAR -LambdaBar HID_SMA_LAMBDABAR -RealPart HID_SMA_RE -ImaginaryPart HID_SMA_IM -WeierstrassP HID_SMA_WP -LeftArrow HID_SMA_LEFTARROW -RightArrow HID_SMA_RIGHTARROW -UpArrow HID_SMA_UPARROW -DownArrow HID_SMA_DOWNARROW -DotsBottom HID_SMA_DOTSLOW -CenterDots HID_SMA_DOTSAXIS -DotsVertically HID_SMA_DOTSVERT -DotsToTop HID_SMA_DOTSUP -AlignDotsDown HID_SMA_DOTSDOWN +TB_Others STARMATH_HID_SMA_FORMAT_TBX +Infinity STARMATH_HID_SMA_INFINITY +Partial STARMATH_HID_SMA_PARTIAL +Nabla STARMATH_HID_SMA_NABLA +ThereExists STARMATH_HID_SMA_EXISTS +ForAll STARMATH_HID_SMA_FORALL +HBar STARMATH_HID_SMA_HBAR +LambdaBar STARMATH_HID_SMA_LAMBDABAR +RealPart STARMATH_HID_SMA_RE +ImaginaryPart STARMATH_HID_SMA_IM +WeierstrassP STARMATH_HID_SMA_WP +LeftArrow STARMATH_HID_SMA_LEFTARROW +RightArrow STARMATH_HID_SMA_RIGHTARROW +UpArrow STARMATH_HID_SMA_UPARROW +DownArrow STARMATH_HID_SMA_DOWNARROW +DotsBottom STARMATH_HID_SMA_DOTSLOW +CenterDots STARMATH_HID_SMA_DOTSAXIS +DotsVertically STARMATH_HID_SMA_DOTSVERT +DotsToTop STARMATH_HID_SMA_DOTSUP +AlignDotsDown STARMATH_HID_SMA_DOTSDOWN -TB_Brackets HID_SMA_BRACKETS_TBX -RoundBrackets HID_SMA_LRPARENTX -SquareBrackets HID_SMA_LRBRACKETX -DoubleSquareBrackets HID_SMA_LRDBRACKETX -SingleLines HID_SMA_LRLINEX -DoubleLines HID_SMA_LRDLINEX -Braces HID_SMA_LRBRACEX -PointedBrackets HID_SMA_LRANGLEX -OperatorBrackets HID_SMA_LMRANGLEXY -GroupBrackets HID_SMA_LRGROUPX -RoundBracketsScaleable HID_SMA_SLRPARENTX -SquareBracketsScaleable HID_SMA_SLRBRACKETX -SquareBracketsScaleable2 HID_SMA_SLRDBRACKETX -SingleLinesScaleable HID_SMA_SLRLINEX -DoubleLinesScaleable HID_SMA_SLRDLINEX -BracesScaleable HID_SMA_SLRBRACEX -PointedBracketsScaleable HID_SMA_SLRANGLEX -OperatorBrackets2 HID_SMA_SLMRANGLEXY -BracesTopScalable HID_SMA_XOVERBRACEY -BracesBottomScalable HID_SMA_XUNDERBRACEY +TB_Brackets STARMATH_HID_SMA_BRACKETS_TBX +RoundBrackets STARMATH_HID_SMA_LRPARENTX +SquareBrackets STARMATH_HID_SMA_LRBRACKETX +DoubleSquareBrackets STARMATH_HID_SMA_LRDBRACKETX +SingleLines STARMATH_HID_SMA_LRLINEX +DoubleLines STARMATH_HID_SMA_LRDLINEX +Braces STARMATH_HID_SMA_LRBRACEX +PointedBrackets STARMATH_HID_SMA_LRANGLEX +OperatorBrackets STARMATH_HID_SMA_LMRANGLEXY +GroupBrackets STARMATH_HID_SMA_LRGROUPX +RoundBracketsScaleable STARMATH_HID_SMA_SLRPARENTX +SquareBracketsScaleable STARMATH_HID_SMA_SLRBRACKETX +SquareBracketsScaleable2 STARMATH_HID_SMA_SLRDBRACKETX +SingleLinesScaleable STARMATH_HID_SMA_SLRLINEX +DoubleLinesScaleable STARMATH_HID_SMA_SLRDLINEX +BracesScaleable STARMATH_HID_SMA_SLRBRACEX +PointedBracketsScaleable STARMATH_HID_SMA_SLRANGLEX +OperatorBrackets2 STARMATH_HID_SMA_SLMRANGLEXY +BracesTopScalable STARMATH_HID_SMA_XOVERBRACEY +BracesBottomScalable STARMATH_HID_SMA_XUNDERBRACEY -TB_Format HID_SMA_FORMAT_TBX -SuperscriptLeft HID_SMA_LSUPX -SuperscriptTop HID_SMA_CSUPX -SuperscriptRight HID_SMA_RSUPX -VerticalStack2Elements HID_SMA_BINOMXY -NewLine HID_SMA_NEWLINE -SubscriptLeft HID_SMA_LSUBX -SubscriptBottom HID_SMA_CSUBX -SubscriptRight HID_SMA_RSUBX -VerticalStack HID_SMA_STACK -SmallGap HID_SMA_SBLANK -AlignLeft HID_SMA_ALIGNLX -AlignCenter HID_SMA_ALIGNCX -AlignRight HID_SMA_ALIGNRX -MatrixStack HID_SMA_MATRIX -Gap HID_SMA_BLANK +TB_Format STARMATH_HID_SMA_FORMAT_TBX +SuperscriptLeft STARMATH_HID_SMA_LSUPX +SuperscriptTop STARMATH_HID_SMA_CSUPX +SuperscriptRight STARMATH_HID_SMA_RSUPX +VerticalStack2Elements STARMATH_HID_SMA_BINOMXY +NewLine STARMATH_HID_SMA_NEWLINE +SubscriptLeft STARMATH_HID_SMA_LSUBX +SubscriptBottom STARMATH_HID_SMA_CSUBX +SubscriptRight STARMATH_HID_SMA_RSUBX +VerticalStack STARMATH_HID_SMA_STACK +SmallGap STARMATH_HID_SMA_SBLANK +AlignLeft STARMATH_HID_SMA_ALIGNLX +AlignCenter STARMATH_HID_SMA_ALIGNCX +AlignRight STARMATH_HID_SMA_ALIGNRX +MatrixStack STARMATH_HID_SMA_MATRIX +Gap STARMATH_HID_SMA_BLANK diff --git a/testautomation/global/win/edia_a_c.win b/testautomation/global/win/edia_a_c.win old mode 100755 new mode 100644 index a062d5db9cf0..3a0617478895 --- a/testautomation/global/win/edia_a_c.win +++ b/testautomation/global/win/edia_a_c.win @@ -1,173 +1,173 @@ -*AcceptOrRejectChangesArea sc:ModelessDialog:RID_SCDLG_SIMPLEREF -AreaEditField sc:Edit:RID_SCDLG_SIMPLEREF:ED_ASSIGN -ShrinkButton sc:ImageButton:RID_SCDLG_SIMPLEREF:RB_ASSIGN - -*ActivationOrder extensions:ModalDialog:RID_DLG_TABORDER -ControlList HID_PROP_TABORDER_CONTROLS -MoveUp extensions:PushButton:RID_DLG_TABORDER:PB_MOVE_UP -MoveDown extensions:PushButton:RID_DLG_TABORDER:PB_MOVE_DOWN -AutoOrder extensions:PushButton:RID_DLG_TABORDER:PB_AUTO_ORDER - -*AddBookmark sfx2:ModalDialog:DLG_HELP_ADDBOOKMARK -Bookmarkname sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE - -*AddConditionDLG HID_XFORMS_ADDCONDITION_DLG -Condition svx:MultiLineEdit:RID_SVXDLG_ADD_CONDITION:ED_CONDITION -EditNamespaces svx:PushButton:RID_SVXDLG_ADD_CONDITION:PB_EDIT_NAMESPACES - -*AddingPackages HID_PACKAGE_MANAGER_PROGRESS -Cancel HID_PACKAGE_MANAGER_PROGRESS_CANCEL - -*AddUserInterface HID_BASICIDE_ADDNEW_LANGUAGE -AvailableLanguagesListbox basctl:ListBox:RID_DLG_SETDEF_LANGUAGE:LB_DEF_LANGUAGE -AddNewControl HID_BASICIDE_ADDNEW_CONTROL - -*AddTables DLG_JOIN_TABADD -TableName HID_JOINSH_ADDTAB_TABLELIST -AddTable dbaccess:PushButton:DLG_JOIN_TABADD:PB_ADDTABLE -Tables dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_TABLES -Queries dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_QUERIES -QueryName HID_JOINSH_ADDTAB_QUERYLIST -CloseDlg HID_JOINSH_ADDTAB_CLOSE - -*AddressBookSource svtools:ModalDialog:DLG_ADDRESSBOOKSOURCE -DataSource svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_DATASOURCE -Administrate svtools:PushButton:DLG_ADDRESSBOOKSOURCE:PB_ADMINISTATE_DATASOURCES -Table svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_TABLE - -*AddressSourceAutopilot HID_ABSPILOT -TabAdditionalSettings extensions:TabPage:RID_PAGE_ADMININVOKATION -TabAddressDataSourceAutoPilot extensions:TabPage:RID_PAGE_SELECTABTYPE -TabDataSourceName extensions:TabPage:RID_PAGE_FINAL -TabSelectTable extensions:TabPage:RID_PAGE_TABLESELECTION -CancelButton HID_ABSPILOT_CANCEL -BackButton HID_ABSPILOT_PREVIOUS -NextButton HID_ABSPILOT_NEXT -CreateButton HID_ABSPILOT_FINISH - -*Advanced HID_DSADMIN_ADVANCED -SQL92Check HID_DSADMIN_SQL92CHECK -BooleanComparison HID_DSADMIN_BOOLEANCOMPARISON -AppendAlias HID_DSADMIN_APPENDTABLEALIAS -ParameterSubstiti HID_DSADMIN_PARAMETERNAMESUBST -Ignoreprivileges HID_DSADMIN_IGNOREDRIVER_PRIV -HostName HID_DSADMIN_HOSTNAME -PortNumber HID_DSADMIN_PORTNUMBER -TabControl HID_DSADMIN_TABCONTROL +*AcceptOrRejectChangesArea sc.ModelessDialog.25729 +AreaEditField sc.Edit.25729.11 +ShrinkButton sc.ImageButton.25729.12 + +*ActivationOrder extensions.ModalDialog.1001 +ControlList EXTENSIONS_HID_PROP_TABORDER_CONTROLS +MoveUp extensions.PushButton.1001.1 +MoveDown extensions.PushButton.1001.2 +AutoOrder extensions.PushButton.1001.3 + +*AddBookmark sfx2.ModalDialog.620 +Bookmarkname sfx2.Edit.620.11 + +*AddConditionDLG SVX_HID_XFORMS_ADDCONDITION_DLG +Condition svx.MultiLineEdit.18013.11 +EditNamespaces svx.PushButton.18013.14 + +*AddingPackages DESKTOP_HID_PACKAGE_MANAGER_PROGRESS +Cancel DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL + +*AddUserInterface BASCTL_HID_BASICIDE_ADDNEW_LANGUAGE +AvailableLanguagesListbox basctl.ListBox.16872.2 +AddNewControl BASCTL_HID_BASICIDE_ADDNEW_CONTROL + +*AddTables DBACCESS_HID_DLG_JOIN_TABADD +TableName DBACCESS_HID_JOINSH_ADDTAB_TABLELIST +AddTable dbaccess.PushButton.19214.1 +Tables dbaccess.RadioButton.19214.1 +Queries dbaccess.RadioButton.19214.2 +QueryName DBACCESS_HID_JOINSH_ADDTAB_QUERYLIST +CloseDlg DBACCESS_HID_JOINSH_ADDTAB_CLOSE + +*AddressBookSource svtools.ModalDialog.16484 +DataSource svtools.ComboBox.16484.3 +Administrate svtools.PushButton.16484.4 +Table svtools.ComboBox.16484.6 + +*AddressSourceAutopilot EXTENSIONS_HID_ABSPILOT +TabAdditionalSettings extensions.TabPage.19701 +TabAddressDataSourceAutoPilot extensions.TabPage.19700 +TabDataSourceName extensions.TabPage.19704 +TabSelectTable extensions.TabPage.19721 +CancelButton EXTENSIONS_HID_ABSPILOT_CANCEL +BackButton EXTENSIONS_HID_ABSPILOT_PREVIOUS +NextButton EXTENSIONS_HID_ABSPILOT_NEXT +CreateButton EXTENSIONS_HID_ABSPILOT_FINISH + +*Advanced DBACCESS_HID_DSADMIN_ADVANCED +SQL92Check DBACCESS_HID_DSADMIN_SQL92CHECK +BooleanComparison DBACCESS_HID_DSADMIN_BOOLEANCOMPARISON +AppendAlias DBACCESS_HID_DSADMIN_APPENDTABLEALIAS +ParameterSubstiti DBACCESS_HID_DSADMIN_PARAMETERNAMESUBST +Ignoreprivileges DBACCESS_HID_DSADMIN_IGNOREDRIVER_PRIV +HostName DBACCESS_HID_DSADMIN_HOSTNAME +PortNumber DBACCESS_HID_DSADMIN_PORTNUMBER +TabControl DBACCESS_HID_DSADMIN_TABCONTROL 'TabPage2 dbaccess:TabPage:PAGE_DS_ADABAS_SETTINGS -TabGeneratedValues dbaccess:TabPage:PAGE_GENERATED_VALUES -RetrieveGeneratedValues HID_DSADMIN_AUTORETRIEVEENABLED -AutoIncrementStatement HID_DSADMIN_AUTOINCREMENTVALUE -QueryGeneratedValues HID_DSADMIN_RETRIEVE_AUTO -AdvancedSettingsSpecial dbaccess:TabPage:PAGE_ADVANCED_SETTINGS_SPECIAL -DisplayVersionColumns HID_DSADMIN_SUPPRESS_VERSIONCL -EnableOuterJoin HID_DSADMIN_ENABLEOUTERJOIN -CheckRequiredFields HID_DSADMIN_CHECK_REQUIRED_FIELDS - - -*Aging SID_GRFFILTER_SEPIA -AgingDegree cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA - -*AlienWarning HID_WARNING_ALIENFORMAT -DoNotShowAgain sfx2:CheckBox:RID_DLG_ALIEN_WARNING:CB_WARNING_OFF - -*AppendLibraries basctl:ModalDialog:RID_DLG_LIBS -Libraries HID_BASICIDE_LIBSDLG_TREE -InsertAsReference basctl:CheckBox:RID_DLG_LIBS:RID_CB_REF -ReplaceExistingLibraries basctl:CheckBox:RID_DLG_LIBS:RID_CB_REPL - -*ApplyGallery HID_GALLERY_APPLY - -*AssingComponent cui:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT -ComponentMethodName cui:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD - -*AssignMacro cui:TabPage:RID_SVXPAGE_MACROASSIGN -EventListBox HID_SVX_MACRO_LB_EVENT -AssignButton cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN -Component cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT -RemoveButton cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE - -*AutopilotAgenda HID_AGWIZ -ItemScrollbar HID_AGWIZ_5_SCROLL_BAR -TopicText1 HID_AGWIZ_5_TXT_TOPIC_1 -ResposibleText1 HID_AGWIZ_5_TXT_RESPONSIBLE_1 -MinutesText1 HID_AGWIZ_5_TXT_MINUTES_1 -TopicText2 HID_AGWIZ_5_TXT_TOPIC_2 -ResposibleText2 HID_AGWIZ_5_TXT_RESPONSIBLE_2 -MinutesText2 HID_AGWIZ_5_TXT_MINUTES_2 -TopicText3 HID_AGWIZ_5_TXT_TOPIC_3 -ResposibleText3 HID_AGWIZ_5_TXT_RESPONSIBLE_3 -MinutesText3 HID_AGWIZ_5_TXT_MINUTES_3 -TopicText4 HID_AGWIZ_5_TXT_TOPIC_4 -ResposibleText4 HID_AGWIZ_5_TXT_RESPONSIBLE_4 -MinutesText4 HID_AGWIZ_5_TXT_MINUTES_4 -TopicText5 HID_AGWIZ_5_TXT_TOPIC_5 -ResponsibleText5 HID_AGWIZ_5_TXT_RESPONSIBLE_5 -MinutesText5 HID_AGWIZ_5_TXT_MINUTES_5 -PagedesignList HID_AGWIZ_1_LIST_PAGEDESIGN -CBMinutes HID_AGWIZ_1_CHK_MINUTES -DateText HID_AGWIZ_2_TXT_DATE -TimeText HID_AGWIZ_2_TXT_TIME -TitleText HID_AGWIZ_2_TXT_TITLE -LocationText HID_AGWIZ_2_TXT_LOCATION -CBMeetingType HID_AGWIZ_3_CHK_MEETING_TYPE -CBRead HID_AGWIZ_3_CHK_READ -CBBring HID_AGWIZ_3_CHK_BRING -CBNotes HID_AGWIZ_3_CHK_NOTES -CBCalledBy HID_AGWIZ_4_CHK_CALLED_BY -CBFacilitator HID_AGWIZ_4_CHK_FACILITATOR -CBNotetaker HID_AGWIZ_4_CHK_NOTETAKER -CBTimeKeeper HID_AGWIZ_4_CHK_TIMEKEEPER -CBAttendees HID_AGWIZ_4_CHK_ATTENDEES -CBObservers HID_AGWIZ_4_CHK_OBSERVERS -CBRessourcePersons HID_AGWIZ_4_CHK_RESOURCEPERSONS -InsertButton HID_AGWIZ_5_BTN_INSERT -RemoveButton HID_AGWIZ_5_BTN_REMOVE -UpButton HID_AGWIZ_5_BTN_UP -DownButton HID_AGWIZ_5_BTN_DOWN -TemplateName HID_AGWIZ_6_TXT_TEMPLATENAME -TemplatePath HID_AGWIZ_6_TXT_TEMPLATEPATH -SaveAsButton HID_AGWIZ_6_BTN_TEMPLATEPATH -CreateAgenda HID_AGWIZ_6_OPT_CREATEAGENDA -MakeChanges HID_AGWIZ_6_OPT_MAKECHANGES -BackButton HID_AGWIZ_NEXT -NextButton HID_AGWIZ_PREV -CreateButton HID_AGWIZ_CREATE -CancelButton HID_AGWIZ_CANCEL - -*AutopilotFax HID_FAXWIZARD -Business HID_FAXWIZ_OPTBUSINESSFAX -Personal HID_FAXWIZ_OPTPRIVATEFAX -BusinessStyle HID_FAXWIZ_LSTBUSINESSSTYLE -PersonalStyle HID_LSTPRIVATESTYLE -Logo HID_CHKUSELOGO -Date HID_CHKUSEDATE -CommForm HID_CHKUSECOMMUNICATIONTYPE -ListCommForm HID_LSTCOMMUNICATIONTYPE -Subject HID_CHKUSESUBJECT -Salutation HID_CHKUSESALUTATION -ListSalutation HID_LSTSALUTATION -ComplimentaryClose HID_CHKUSEGREETING -ListGreetings HID_LSTGREETING -Footer HID_CHKUSEFOOTER -UseReturnAddress HID_OPTSENDERPLACEHOLDER -NewSenderAddress HID_OPTSENDERDEFINE -SenderName HID_TXTSENDERNAME -SenderStreet HID_TXTSENDERSTREET -SenderPostcode HID_TXTSENDERPOSTCODE -SenderState HID_TXTSENDERSTATE -SenderCity HID_TXTSENDERCITY -SenderFax HID_TXTSENDERFAX -RecipientUsePlaceholder HID_OPTRECEIVERPLACEHOLDER -RecipientUseDatabase HID_OPTRECEIVERDATABASE -FooterText HID_TXTFOOTER -FooterOnNextPages HID_CHKFOOTERNEXTPAGES -FooterPageNumbers HID_CHKFOOTERPAGENUMBERS -TemplateName HID_TXTTEMPLATENAME -TextPath HID_FAXWIZ_TXTPATH -CreateFax HID_OPTCREATEFAX -MakeChanges HID_OPTMAKECHANGES -UseAddressDatabase HID_FILETEMPLATEPATH +TabGeneratedValues dbaccess.TabPage.19222 +RetrieveGeneratedValues DBACCESS_HID_DSADMIN_AUTORETRIEVEENABLED +AutoIncrementStatement DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE +QueryGeneratedValues DBACCESS_HID_DSADMIN_RETRIEVE_AUTO +AdvancedSettingsSpecial dbaccess.TabPage.19223 +DisplayVersionColumns DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL +EnableOuterJoin DBACCESS_HID_DSADMIN_ENABLEOUTERJOIN +CheckRequiredFields DBACCESS_HID_DSADMIN_CHECK_REQUIRED_FIELDS + + +*Aging .uno:GraphicFilterSepia +AgingDegree cui.MetricField.10334.2 + +*AlienWarning SFX2_HID_WARNING_ALIENFORMAT +DoNotShowAgain sfx2.CheckBox.2308.16 + +*AppendLibraries basctl.ModalDialog.14890 +Libraries BASCTL_HID_BASICIDE_LIBSDLG_TREE +InsertAsReference basctl.CheckBox.14890.35 +ReplaceExistingLibraries basctl.CheckBox.14890.36 + +*ApplyGallery CUI_HID_GALLERY_APPLY + +*AssingComponent cui.ModalDialog.10297 +ComponentMethodName cui.Edit.10297.45 + +*AssignMacro cui.TabPage.10296 +EventListBox CUI_HID_SVX_MACRO_LB_EVENT +AssignButton cui.PushButton.10296.2 +Component cui.PushButton.10296.7 +RemoveButton cui.PushButton.10296.3 + +*AutopilotAgenda WIZARDS_HID_AGWIZ +ItemScrollbar WIZARDS_HID_AGWIZ_5_SCROLL_BAR +TopicText1 WIZARDS_HID_AGWIZ_5_TXT_TOPIC_1 +ResposibleText1 WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_1 +MinutesText1 WIZARDS_HID_AGWIZ_5_TXT_MINUTES_1 +TopicText2 WIZARDS_HID_AGWIZ_5_TXT_TOPIC_2 +ResposibleText2 WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_2 +MinutesText2 WIZARDS_HID_AGWIZ_5_TXT_MINUTES_2 +TopicText3 WIZARDS_HID_AGWIZ_5_TXT_TOPIC_3 +ResposibleText3 WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_3 +MinutesText3 WIZARDS_HID_AGWIZ_5_TXT_MINUTES_3 +TopicText4 WIZARDS_HID_AGWIZ_5_TXT_TOPIC_4 +ResposibleText4 WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_4 +MinutesText4 WIZARDS_HID_AGWIZ_5_TXT_MINUTES_4 +TopicText5 WIZARDS_HID_AGWIZ_5_TXT_TOPIC_5 +ResponsibleText5 WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_5 +MinutesText5 WIZARDS_HID_AGWIZ_5_TXT_MINUTES_5 +PagedesignList WIZARDS_HID_AGWIZ_1_LIST_PAGEDESIGN +CBMinutes WIZARDS_HID_AGWIZ_1_CHK_MINUTES +DateText WIZARDS_HID_AGWIZ_2_TXT_DATE +TimeText WIZARDS_HID_AGWIZ_2_TXT_TIME +TitleText WIZARDS_HID_AGWIZ_2_TXT_TITLE +LocationText WIZARDS_HID_AGWIZ_2_TXT_LOCATION +CBMeetingType WIZARDS_HID_AGWIZ_3_CHK_MEETING_TYPE +CBRead WIZARDS_HID_AGWIZ_3_CHK_READ +CBBring WIZARDS_HID_AGWIZ_3_CHK_BRING +CBNotes WIZARDS_HID_AGWIZ_3_CHK_NOTES +CBCalledBy WIZARDS_HID_AGWIZ_4_CHK_CALLED_BY +CBFacilitator WIZARDS_HID_AGWIZ_4_CHK_FACILITATOR +CBNotetaker WIZARDS_HID_AGWIZ_4_CHK_NOTETAKER +CBTimeKeeper WIZARDS_HID_AGWIZ_4_CHK_TIMEKEEPER +CBAttendees WIZARDS_HID_AGWIZ_4_CHK_ATTENDEES +CBObservers WIZARDS_HID_AGWIZ_4_CHK_OBSERVERS +CBRessourcePersons WIZARDS_HID_AGWIZ_4_CHK_RESOURCEPERSONS +InsertButton WIZARDS_HID_AGWIZ_5_BTN_INSERT +RemoveButton WIZARDS_HID_AGWIZ_5_BTN_REMOVE +UpButton WIZARDS_HID_AGWIZ_5_BTN_UP +DownButton WIZARDS_HID_AGWIZ_5_BTN_DOWN +TemplateName WIZARDS_HID_AGWIZ_6_TXT_TEMPLATENAME +TemplatePath WIZARDS_HID_AGWIZ_6_TXT_TEMPLATEPATH +SaveAsButton WIZARDS_HID_AGWIZ_6_BTN_TEMPLATEPATH +CreateAgenda WIZARDS_HID_AGWIZ_6_OPT_CREATEAGENDA +MakeChanges WIZARDS_HID_AGWIZ_6_OPT_MAKECHANGES +BackButton WIZARDS_HID_AGWIZ_NEXT +NextButton WIZARDS_HID_AGWIZ_PREV +CreateButton WIZARDS_HID_AGWIZ_CREATE +CancelButton WIZARDS_HID_AGWIZ_CANCEL + +*AutopilotFax WIZARDS_HID_FAXWIZARD +Business WIZARDS_HID_FAXWIZ_OPTBUSINESSFAX +Personal WIZARDS_HID_FAXWIZ_OPTPRIVATEFAX +BusinessStyle WIZARDS_HID_FAXWIZ_LSTBUSINESSSTYLE +PersonalStyle WIZARDS_HID_LSTPRIVATESTYLE +Logo WIZARDS_HID_CHKUSELOGO +Date WIZARDS_HID_CHKUSEDATE +CommForm WIZARDS_HID_CHKUSECOMMUNICATIONTYPE +ListCommForm WIZARDS_HID_LSTCOMMUNICATIONTYPE +Subject WIZARDS_HID_CHKUSESUBJECT +Salutation WIZARDS_HID_CHKUSESALUTATION +ListSalutation WIZARDS_HID_LSTSALUTATION +ComplimentaryClose WIZARDS_HID_CHKUSEGREETING +ListGreetings WIZARDS_HID_LSTGREETING +Footer WIZARDS_HID_CHKUSEFOOTER +UseReturnAddress WIZARDS_HID_OPTSENDERPLACEHOLDER +NewSenderAddress WIZARDS_HID_OPTSENDERDEFINE +SenderName WIZARDS_HID_TXTSENDERNAME +SenderStreet WIZARDS_HID_TXTSENDERSTREET +SenderPostcode WIZARDS_HID_TXTSENDERPOSTCODE +SenderState WIZARDS_HID_TXTSENDERSTATE +SenderCity WIZARDS_HID_TXTSENDERCITY +SenderFax WIZARDS_HID_TXTSENDERFAX +RecipientUsePlaceholder WIZARDS_HID_OPTRECEIVERPLACEHOLDER +RecipientUseDatabase WIZARDS_HID_OPTRECEIVERDATABASE +FooterText WIZARDS_HID_TXTFOOTER +FooterOnNextPages WIZARDS_HID_CHKFOOTERNEXTPAGES +FooterPageNumbers WIZARDS_HID_CHKFOOTERPAGENUMBERS +TemplateName WIZARDS_HID_TXTTEMPLATENAME +TextPath WIZARDS_HID_FAXWIZ_TXTPATH +CreateFax WIZARDS_HID_OPTCREATEFAX +MakeChanges WIZARDS_HID_OPTMAKECHANGES +UseAddressDatabase WIZARDS_HID_FILETEMPLATEPATH BusinessFax RID_TOOLBOX_INSERT PageDesignBusiness RID_TOOLBOX_INSCELLS PersonalFax RID_TOOLBOX_INSOBJ @@ -175,215 +175,215 @@ MailView HID_INTERFACE_SFXMAILVIEW ReturnAddressUseUserData HID_INTERFACE_SFXFRAMESETVIEW NewReturnAddress HID_INTERFACE_SFXFRAMESETSOURCEVIEW Street HID_INTERFACE_SFXHELP_VIEWSH -SaveAsButton HID_FAXWIZ_CMDPATH -BackButton HID_FAXWIZARD_BACK -NextButton HID_FAXWIZARD_NEXT -FinishButton HID_FAXWIZARD_CREATE -CancelButton HID_FAXWIZARD_CANCEL - -*AutopilotGroupElement extensions:ModalDialog:RID_DLG_GROUPBOXWIZARD -BackButton HID_GROUPWIZARD_PREVIOUS -NextButton HID_GROUPWIZARD_NEXT -CancelButton HID_GROUPWIZARD_CANCEL -CreateButton HID_GROUPWIZARD_FINISH -TabGroupBoxData extensions:TabPage:RID_PAGE_GROUPRADIOSELECTION -TabDefaultFieldSelection extensions:TabPage:RID_PAGE_DEFAULTFIELDSELECTION -TabDatabaseValues extensions:TabPage:RID_PAGE_OPTIONVALUES -TabCreateOptionGroup extensions:TabPage:RID_PAGE_OPTIONS_FINAL - -*AutopilotLetter HID_LTRWIZARD -Business HID_LTRWIZ_OPTBUSINESSLETTER -BusinessStyle HID_LTRWIZ_LSTBUSINESSSTYLE -LetterHead HID_LTRWIZ_CHKBUSINESSPAPER -Formal HID_LTRWIZ_OPTPRIVOFFICIALLETTER -FormalStyle HID_LTRWIZ_LSTPRIVOFFICIALSTYLE -Personal HID_LTRWIZ_OPTPRIVATELETTER -PersonalStyle HID_LTRWIZ_LSTPRIVATESTYLE -Logo HID_LTRWIZ_CHKPAPERCOMPANYLOGO -LogoHeight HID_LTRWIZ_NUMLOGOHEIGHT -LogoXpos HID_LTRWIZ_NUMLOGOX -LogoWidth HID_LTRWIZ_NUMLOGOWIDTH -LogoYpos HID_LTRWIZ_NUMLOGOY -ReturnAddress HID_LTRWIZ_CHKPAPERCOMPANYADDRESS -AddressHeight HID_LTRWIZ_NUMADDRESSHEIGHT -AddressXpos HID_LTRWIZ_NUMADDRESSX -AddressWidth HID_LTRWIZ_NUMADDRESSWIDTH -AddressYpos HID_LTRWIZ_NUMADDRESSY -ReturnAddressCompany HID_LTRWIZ_CHKCOMPANYRECEIVER -IncludeFooter HID_LTRWIZ_CHKPAPERFOOTER -FooterHeight HID_LTRWIZ_NUMFOOTERHEIGHT -LetterPageNorm HID_LTRWIZ_LSTLETTERNORM -LetterUseLogo HID_LTRWIZ_CHKUSELOGO -ReturnAddressUse HID_LTRWIZ_CHKUSEADDRESSRECEIVER -LetterSigns HID_LTRWIZ_CHKUSESIGNS -SubjectLine HID_LTRWIZ_CHKUSESUBJECT -Salutation HID_LTRWIZ_CHKUSESALUTATION -ListSalutation HID_LTRWIZ_LSTSALUTATION -UseFoldMarks HID_LTRWIZ_CHKUSEBENDMARKS -ComplimantaryClose HID_LTRWIZ_CHKUSEGREETING -ListGreetings HID_LTRWIZ_LSTGREETING -UseFooter HID_LTRWIZ_CHKUSEFOOTER -UseReturnAddress HID_LTRWIZ_OPTSENDERPLACEHOLDER -NewSenderAddress HID_LTRWIZ_OPTSENDERDEFINE -SenderName HID_LTRWIZ_TXTSENDERNAME -SenderStreet HID_LTRWIZ_TXTSENDERSTREET -SenderPostcode HID_LTRWIZ_TXTSENDERPOSTCODE -SenderState HID_LTRWIZ_TXTSENDERSTATE_TEXT -SenderCity HID_LTRWIZ_TXTSENDERCITY -UsePlaceholder HID_LTRWIZ_OPTRECEIVERPLACEHOLDER -UseAddressDatabase HID_LTRWIZ_OPTRECEIVERDATABASE -TextFooter HID_LTRWIZ_TXTFOOTER -IncludeFromPage2 HID_LTRWIZ_CHKFOOTERNEXTPAGES -IncludePageNumbers HID_LTRWIZ_CHKFOOTERPAGENUMBERS -TemplateName HID_LTRWIZ_TXTTEMPLATENAME -TemplatePath HID_LTRWIZ_TXTPATH -SaveAsButton HID_LTRWIZ_CMDPATH -CreateLetter HID_LTRWIZ_OPTCREATELETTER -ModifyLetter HID_LTRWIZ_OPTMAKECHANGES -BackButton HID_LTRWIZARD_BACK -NextButton HID_LTRWIZARD_NEXT -FinishButton HID_LTRWIZARD_CREATE -CancelButton HID_LTRWIZARD_CANCEL - - - - -*AutoPilotListComboBox extensions:ModalDialog:RID_DLG_LISTCOMBOWIZARD -TabListBoxData extensions:TabPage:RID_PAGE_TABLESELECTION -TabTableSelection extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_TABLE -TabFieldLink extensions:TabPage:RID_PAGE_LCW_FIELDLINK -TabDatabaseField extensions:TabPage:RID_PAGE_OPTION_DBFIELD -BackButton HID_LISTWIZARD_PREVIOUS -NextButton HID_LISTWIZARD_NEXT -CancelButton HID_LISTWIZARD_CANCEL -CreateButton HID_LISTWIZARD_FINISH - -*AutopilotTableElement extensions:ModalDialog:RID_DLG_GRIDWIZARD -TabTableFieldSelection extensions:TabPage:RID_PAGE_GW_FIELDSELECTION -BackButton HID_GRIDWIZARD_PREVIOUS -NextButton HID_GRIDWIZARD_NEXT -CancelButton HID_GRIDWIZARD_CANCEL -CreateButton HID_GRIDWIZARD_FINISH - -*BackgroundImages HID_BG -Image1 HID_BG_BTN_IMG1 -Image2 HID_BG_BTN_IMG2 -Image3 HID_BG_BTN_IMG3 -Image4 HID_BG_BTN_IMG14 -Image5 HID_BG_BTN_IMG5 -Image6 HID_BG_BTN_IMG6 -Image7 HID_BG_BTN_IMG7 -Image8 HID_BG_BTN_IMG8 -Image9 HID_BG_BTN_IMG9 -Image10 HID_BG_BTN_IMG10 -Image11 HID_BG_BTN_IMG11 -Image12 HID_BG_BTN_IMG12 -Back HID_BG_BTN_BACK -Forward HID_BG_BTN_FW -None HID_BG_BTN_NONE -Other HID_BG_BTN_OTHER -CancelB HID_BG_BTN_CANCEL - -*BasicIDE HID_BASICIDE_MODULWINDOW -EditWindow HID_BASICIDE_EDITORWINDOW -BreakPointsWindow HID_BASICIDE_BREAKPOINTWINDOW -DialogWindow HID_BASICIDE_DIALOGWINDOW -Tabbar HID_BASICIDE_TABBAR -Watch HID_BASICIDE_WATCHWINDOW -WatchEdit HID_BASICIDE_WATCHWINDOW_EDIT -WatchList HID_BASICIDE_WATCHWINDOW_LIST -Remove HID_BASICIDE_REMOVEWATCH -Calls HID_BASICIDE_STACKWINDOW -CallsList HID_BASICIDE_STACKWINDOW_LIST -GotoAll HID_BASICIDE_GOTOALL - -*Bibliography HID_BIB_CONTROL_PARENT -ShortName HID_BIB_IDENTIFIER_POS -Type HID_BIB_AUTHORITYTYPE_POS -Year HID_BIB_YEAR_POS -Author HID_BIB_AUTHOR_POS -Title HID_BIB_TITLE_POS -Publisher HID_BIB_PUBLISHER_POS -Address HID_BIB_ADDRESS_POS -ISBN HID_BIB_ISBN_POS -Chapter HID_BIB_CHAPTER_POS -Pages HID_BIB_PAGES_POS -Editor HID_BIB_EDITOR_POS -Edition HID_BIB_EDITION_POS -Booktitle HID_BIB_BOOKTITLE_POS -Volume HID_BIB_VOLUME_POS -HowPublished HID_BIB_HOWPUBLISHED_POS -Organization HID_BIB_ORGANIZATIONS_POS -Institution HID_BIB_INSTITUTION_POS -School HID_BIB_SCHOOL_POS -Report HID_BIB_REPORTTYPE_POS -Month HID_BIB_MONTH_POS -Journal HID_BIB_JOURNAL_POS -Number HID_BIB_NUMBER_POS -Series HID_BIB_SERIES_POS -Annote HID_BIB_ANNOTE_POS -Note HID_BIB_NOTE_POS -URL HID_BIB_URL_POS -Custom1 HID_BIB_CUSTOM1_POS -Custom2 HID_BIB_CUSTOM2_POS -Custom3 HID_BIB_CUSTOM3_POS -Custom4 HID_BIB_CUSTOM4_POS -Custom5 HID_BIB_CUSTOM5_POS - -*Breakpoints basctl:ModalDialog:RID_BASICIDE_BREAKPOINTDLG -BreakpointsList basctl:ComboBox:RID_BASICIDE_BREAKPOINTDLG:RID_CB_BRKPOINTS -NewButton basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_NEW -Remove basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_DEL -ActiveBox basctl:CheckBox:RID_BASICIDE_BREAKPOINTDLG:RID_CHKB_ACTIVE -Pass basctl:NumericField:RID_BASICIDE_BREAKPOINTDLG:RID_FLD_PASS - -*CellWarning HID_SC_REPLCELLSWARN - -*ChangeIcon HID_SVX_CONFIG_ICON_SELECTOR -Import cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT - -*ChangePassword HID_DLG_PASSWORD -OldPassword dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD -Password dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD -ConfirmPassword dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD_REPEAT - -*ChartType SID_DIAGRAM_TYPE -ChooseType HID_SCH_CTL_TYPE -Variant HID_SCH_CTL_VARIANT -XAxisWithCategories chart2:CheckBox:TP_CHARTTYPE:CB_X_AXIS_CATEGORIES -Look3D chart2:CheckBox:TP_CHARTTYPE:CB_3D_LOOK -Scheme3D chart2:ListBox:TP_CHARTTYPE:LB_3D_SCHEME -BarColumnShape HID_SCH_LB_BAR_GEOMETRY -StackSeries chart2:CheckBox:TP_CHARTTYPE:CB_STACKED -Ontop chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y -Percent chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y_PERCENT -Deep chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Z -SmoothLines chart2:CheckBox:TP_CHARTTYPE:CB_SPLINES -SmoothLineProperties chart2:PushButton:TP_CHARTTYPE:PB_SPLINE_DIALOG -NumberOfLines HID_SCH_NUM_OF_LINES - -*ChartWizard HID_SCH_CHART_AUTO_FORMAT -RoadMap HID_SCH_WIZARD_ROADMAP -GoNext HID_WIZARD_NEXT -GoBack HID_WIZARD_PREVIOUS - -*CheckForUpdates HID_CHECK_FOR_UPD_DLG -CloseBtn HID_CHECK_FOR_UPD_CLOSE -Cancel HID_CHECK_FOR_UPD_CANCEL -Pause HID_CHECK_FOR_UPD_PAUSE -Resume HID_CHECK_FOR_UPD_RESUME -Download HID_CHECK_FOR_UPD_DOWNLOAD -Download2 HID_CHECK_FOR_UPD_DOWNLOAD2 -Install HID_CHECK_FOR_UPD_INSTALL -Status HID_CHECK_FOR_UPD_STATUS -Description HID_CHECK_FOR_UPD_DESCRIPTION - -'*ChooseDatabase HID_DLGFORM_DIALOG +SaveAsButton WIZARDS_HID_FAXWIZ_CMDPATH +BackButton WIZARDS_HID_FAXWIZARD_BACK +NextButton WIZARDS_HID_FAXWIZARD_NEXT +FinishButton WIZARDS_HID_FAXWIZARD_CREATE +CancelButton WIZARDS_HID_FAXWIZARD_CANCEL + +*AutopilotGroupElement extensions.ModalDialog.19721 +BackButton EXTENSIONS_HID_GROUPWIZARD_PREVIOUS +NextButton EXTENSIONS_HID_GROUPWIZARD_NEXT +CancelButton EXTENSIONS_HID_GROUPWIZARD_CANCEL +CreateButton EXTENSIONS_HID_GROUPWIZARD_FINISH +TabGroupBoxData extensions.TabPage.19722 +TabDefaultFieldSelection extensions.TabPage.19723 +TabDatabaseValues extensions.TabPage.19724 +TabCreateOptionGroup extensions.TabPage.19726 + +*AutopilotLetter WIZARDS_HID_LTRWIZARD +Business WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER +BusinessStyle WIZARDS_HID_LTRWIZ_LSTBUSINESSSTYLE +LetterHead WIZARDS_HID_LTRWIZ_CHKBUSINESSPAPER +Formal WIZARDS_HID_LTRWIZ_OPTPRIVOFFICIALLETTER +FormalStyle WIZARDS_HID_LTRWIZ_LSTPRIVOFFICIALSTYLE +Personal WIZARDS_HID_LTRWIZ_OPTPRIVATELETTER +PersonalStyle WIZARDS_HID_LTRWIZ_LSTPRIVATESTYLE +Logo WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYLOGO +LogoHeight WIZARDS_HID_LTRWIZ_NUMLOGOHEIGHT +LogoXpos WIZARDS_HID_LTRWIZ_NUMLOGOX +LogoWidth WIZARDS_HID_LTRWIZ_NUMLOGOWIDTH +LogoYpos WIZARDS_HID_LTRWIZ_NUMLOGOY +ReturnAddress WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYADDRESS +AddressHeight WIZARDS_HID_LTRWIZ_NUMADDRESSHEIGHT +AddressXpos WIZARDS_HID_LTRWIZ_NUMADDRESSX +AddressWidth WIZARDS_HID_LTRWIZ_NUMADDRESSWIDTH +AddressYpos WIZARDS_HID_LTRWIZ_NUMADDRESSY +ReturnAddressCompany WIZARDS_HID_LTRWIZ_CHKCOMPANYRECEIVER +IncludeFooter WIZARDS_HID_LTRWIZ_CHKPAPERFOOTER +FooterHeight WIZARDS_HID_LTRWIZ_NUMFOOTERHEIGHT +LetterPageNorm WIZARDS_HID_LTRWIZ_LSTLETTERNORM +LetterUseLogo WIZARDS_HID_LTRWIZ_CHKUSELOGO +ReturnAddressUse WIZARDS_HID_LTRWIZ_CHKUSEADDRESSRECEIVER +LetterSigns WIZARDS_HID_LTRWIZ_CHKUSESIGNS +SubjectLine WIZARDS_HID_LTRWIZ_CHKUSESUBJECT +Salutation WIZARDS_HID_LTRWIZ_CHKUSESALUTATION +ListSalutation WIZARDS_HID_LTRWIZ_LSTSALUTATION +UseFoldMarks WIZARDS_HID_LTRWIZ_CHKUSEBENDMARKS +ComplimantaryClose WIZARDS_HID_LTRWIZ_CHKUSEGREETING +ListGreetings WIZARDS_HID_LTRWIZ_LSTGREETING +UseFooter WIZARDS_HID_LTRWIZ_CHKUSEFOOTER +UseReturnAddress WIZARDS_HID_LTRWIZ_OPTSENDERPLACEHOLDER +NewSenderAddress WIZARDS_HID_LTRWIZ_OPTSENDERDEFINE +SenderName WIZARDS_HID_LTRWIZ_TXTSENDERNAME +SenderStreet WIZARDS_HID_LTRWIZ_TXTSENDERSTREET +SenderPostcode WIZARDS_HID_LTRWIZ_TXTSENDERPOSTCODE +SenderState WIZARDS_HID_LTRWIZ_TXTSENDERSTATE_TEXT +SenderCity WIZARDS_HID_LTRWIZ_TXTSENDERCITY +UsePlaceholder WIZARDS_HID_LTRWIZ_OPTRECEIVERPLACEHOLDER +UseAddressDatabase WIZARDS_HID_LTRWIZ_OPTRECEIVERDATABASE +TextFooter WIZARDS_HID_LTRWIZ_TXTFOOTER +IncludeFromPage2 WIZARDS_HID_LTRWIZ_CHKFOOTERNEXTPAGES +IncludePageNumbers WIZARDS_HID_LTRWIZ_CHKFOOTERPAGENUMBERS +TemplateName WIZARDS_HID_LTRWIZ_TXTTEMPLATENAME +TemplatePath WIZARDS_HID_LTRWIZ_TXTPATH +SaveAsButton WIZARDS_HID_LTRWIZ_CMDPATH +CreateLetter WIZARDS_HID_LTRWIZ_OPTCREATELETTER +ModifyLetter WIZARDS_HID_LTRWIZ_OPTMAKECHANGES +BackButton WIZARDS_HID_LTRWIZARD_BACK +NextButton WIZARDS_HID_LTRWIZARD_NEXT +FinishButton WIZARDS_HID_LTRWIZARD_CREATE +CancelButton WIZARDS_HID_LTRWIZARD_CANCEL + + + + +*AutoPilotListComboBox extensions.ModalDialog.19722 +TabListBoxData extensions.TabPage.19721 +TabTableSelection extensions.TabPage.19727 +TabFieldLink extensions.TabPage.19729 +TabDatabaseField extensions.TabPage.19725 +BackButton EXTENSIONS_HID_LISTWIZARD_PREVIOUS +NextButton EXTENSIONS_HID_LISTWIZARD_NEXT +CancelButton EXTENSIONS_HID_LISTWIZARD_CANCEL +CreateButton EXTENSIONS_HID_LISTWIZARD_FINISH + +*AutopilotTableElement extensions.ModalDialog.19723 +TabTableFieldSelection extensions.TabPage.19730 +BackButton EXTENSIONS_HID_GRIDWIZARD_PREVIOUS +NextButton EXTENSIONS_HID_GRIDWIZARD_NEXT +CancelButton EXTENSIONS_HID_GRIDWIZARD_CANCEL +CreateButton EXTENSIONS_HID_GRIDWIZARD_FINISH + +*BackgroundImages WIZARDS_HID_BG +Image1 WIZARDS_HID_BG_BTN_IMG1 +Image2 WIZARDS_HID_BG_BTN_IMG2 +Image3 WIZARDS_HID_BG_BTN_IMG3 +Image4 WIZARDS_HID_BG_BTN_IMG14 +Image5 WIZARDS_HID_BG_BTN_IMG5 +Image6 WIZARDS_HID_BG_BTN_IMG6 +Image7 WIZARDS_HID_BG_BTN_IMG7 +Image8 WIZARDS_HID_BG_BTN_IMG8 +Image9 WIZARDS_HID_BG_BTN_IMG9 +Image10 WIZARDS_HID_BG_BTN_IMG10 +Image11 WIZARDS_HID_BG_BTN_IMG11 +Image12 WIZARDS_HID_BG_BTN_IMG12 +Back WIZARDS_HID_BG_BTN_BACK +Forward WIZARDS_HID_BG_BTN_FW +None WIZARDS_HID_BG_BTN_NONE +Other WIZARDS_HID_BG_BTN_OTHER +CancelB WIZARDS_HID_BG_BTN_CANCEL + +*BasicIDE BASCTL_HID_BASICIDE_MODULWINDOW +EditWindow BASCTL_HID_BASICIDE_EDITORWINDOW +BreakPointsWindow BASCTL_HID_BASICIDE_BREAKPOINTWINDOW +DialogWindow BASCTL_HID_BASICIDE_DIALOGWINDOW +Tabbar BASCTL_HID_BASICIDE_TABBAR +Watch BASCTL_HID_BASICIDE_WATCHWINDOW +WatchEdit BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT +WatchList BASCTL_HID_BASICIDE_WATCHWINDOW_LIST +Remove BASCTL_HID_BASICIDE_REMOVEWATCH +Calls BASCTL_HID_BASICIDE_STACKWINDOW +CallsList BASCTL_HID_BASICIDE_STACKWINDOW_LIST +GotoAll BASCTL_HID_BASICIDE_GOTOALL + +*Bibliography EXTENSIONS_HID_BIB_CONTROL_PARENT +ShortName EXTENSIONS_HID_BIB_IDENTIFIER_POS +Type EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS +Year EXTENSIONS_HID_BIB_YEAR_POS +Author EXTENSIONS_HID_BIB_AUTHOR_POS +Title EXTENSIONS_HID_BIB_TITLE_POS +Publisher EXTENSIONS_HID_BIB_PUBLISHER_POS +Address EXTENSIONS_HID_BIB_ADDRESS_POS +ISBN EXTENSIONS_HID_BIB_ISBN_POS +Chapter EXTENSIONS_HID_BIB_CHAPTER_POS +Pages EXTENSIONS_HID_BIB_PAGES_POS +Editor EXTENSIONS_HID_BIB_EDITOR_POS +Edition EXTENSIONS_HID_BIB_EDITION_POS +Booktitle EXTENSIONS_HID_BIB_BOOKTITLE_POS +Volume EXTENSIONS_HID_BIB_VOLUME_POS +HowPublished EXTENSIONS_HID_BIB_HOWPUBLISHED_POS +Organization EXTENSIONS_HID_BIB_ORGANIZATIONS_POS +Institution EXTENSIONS_HID_BIB_INSTITUTION_POS +School EXTENSIONS_HID_BIB_SCHOOL_POS +Report EXTENSIONS_HID_BIB_REPORTTYPE_POS +Month EXTENSIONS_HID_BIB_MONTH_POS +Journal EXTENSIONS_HID_BIB_JOURNAL_POS +Number EXTENSIONS_HID_BIB_NUMBER_POS +Series EXTENSIONS_HID_BIB_SERIES_POS +Annote EXTENSIONS_HID_BIB_ANNOTE_POS +Note EXTENSIONS_HID_BIB_NOTE_POS +URL EXTENSIONS_HID_BIB_URL_POS +Custom1 EXTENSIONS_HID_BIB_CUSTOM1_POS +Custom2 EXTENSIONS_HID_BIB_CUSTOM2_POS +Custom3 EXTENSIONS_HID_BIB_CUSTOM3_POS +Custom4 EXTENSIONS_HID_BIB_CUSTOM4_POS +Custom5 EXTENSIONS_HID_BIB_CUSTOM5_POS + +*Breakpoints basctl.ModalDialog.14930 +BreakpointsList basctl.ComboBox.14930.2 +NewButton basctl.PushButton.14930.5 +Remove basctl.PushButton.14930.6 +ActiveBox basctl.CheckBox.14930.7 +Pass basctl.NumericField.14930.10 + +*CellWarning SC_HID_SC_REPLCELLSWARN + +*ChangeIcon CUI_HID_SVX_CONFIG_ICON_SELECTOR +Import cui.PushButton.390.397 + +*ChangePassword DBACCESS_HID_DLG_PASSWORD +OldPassword dbaccess.Edit.19223.19 +Password dbaccess.Edit.19223.21 +ConfirmPassword dbaccess.Edit.19223.23 + +*ChartType CHART2_HID_DIAGRAM_TYPE +ChooseType CHART2_HID_SCH_CTL_TYPE +Variant CHART2_HID_SCH_CTL_VARIANT +XAxisWithCategories chart2.CheckBox.910.1 +Look3D chart2.CheckBox.910.2 +Scheme3D chart2.ListBox.910.1 +BarColumnShape CHART2_HID_SCH_LB_BAR_GEOMETRY +StackSeries chart2.CheckBox.910.3 +Ontop chart2.RadioButton.910.2 +Percent chart2.RadioButton.910.3 +Deep chart2.RadioButton.910.4 +SmoothLines chart2.CheckBox.910.4 +SmoothLineProperties chart2.PushButton.910.1 +NumberOfLines CHART2_HID_SCH_NUM_OF_LINES + +*ChartWizard CHART2_HID_SCH_CHART_AUTO_FORMAT +RoadMap CHART2_HID_SCH_WIZARD_ROADMAP +GoNext SVT_HID_WIZARD_NEXT +GoBack SVT_HID_WIZARD_PREVIOUS + +*CheckForUpdates EXTENSIONS_HID_CHECK_FOR_UPD_DLG +CloseBtn EXTENSIONS_HID_CHECK_FOR_UPD_CLOSE +Cancel EXTENSIONS_HID_CHECK_FOR_UPD_CANCEL +Pause EXTENSIONS_HID_CHECK_FOR_UPD_PAUSE +Resume EXTENSIONS_HID_CHECK_FOR_UPD_RESUME +Download EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD +Download2 EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD2 +Install EXTENSIONS_HID_CHECK_FOR_UPD_INSTALL +Status EXTENSIONS_HID_CHECK_FOR_UPD_STATUS +Description EXTENSIONS_HID_CHECK_FOR_UPD_DESCRIPTION + +'*ChooseDatabase WIZARDS_HID_DLGFORM_DIALOG 'DataSource HID_DLGFORM_CMBAVAILDATABASE 'TablesOrQueries HID_DLGFORM_LBTABLES -'CancelBtn HID_DLGFORM_CMDCANCEL -'BackBtn HID_DLGFORM_CMDPREV -'NextBtn HID_DLGFORM_CMDNEXT +'CancelBtn WIZARDS_HID_DLGFORM_CMDCANCEL +'BackBtn WIZARDS_HID_DLGFORM_CMDPREV +'NextBtn WIZARDS_HID_DLGFORM_CMDNEXT 'MoveSelected HID_DLGFORM_CMDMOVESELECTED 'MoveAll HID_DLGFORM_CMDMOVEALL 'RemoveSelected HID_DLGFORM_CMDREMOVESELECTED @@ -392,87 +392,87 @@ Description HID_CHECK_FOR_UPD_DESCRIPTION 'BinaryFieldsAsImages HID_DLGFORM_OPTBINARIESASGRAPHICS 'ExistingFields HID_DLGFORM_FIELDSAVAILABLE 'FieldsInForm HID_DLGFORM_FIELDSSELECTED -'ColumnarLabelsLeft HID_DLGFORM_CMDLEFTLABELED -'ColumnarLabelsOnTop HID_DLGFORM_CMDTOPLABELED -'AsDataSheet HID_DLGFORM_CMDTABLESTYLE +'ColumnarLabelsLeft WIZARDS_HID_DLGFORM_CMDLEFTLABELED +'ColumnarLabelsOnTop WIZARDS_HID_DLGFORM_CMDTOPLABELED +'AsDataSheet WIZARDS_HID_DLGFORM_CMDTABLESTYLE 'InBlocksLabelsLeft HID_DLGFORM_CMDLEFTJUSTIFIED -'InBlocksLabelsAbove HID_DLGFORM_CMDTOPJUSTIFIED -'PageStyles HID_DLGFORM_LSTSTYLES -'NoBorder HID_DLGFORM_CMDNOBORDER -'ThreeDLook HID_DLGFORM_CMD3DBORDER -'FlatLook HID_DLGFORM_CMDSIMPLEBORDER +'InBlocksLabelsAbove WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED +'PageStyles WIZARDS_HID_DLGFORM_LSTSTYLES +'NoBorder WIZARDS_HID_DLGFORM_CMDNOBORDER +'ThreeDLook WIZARDS_HID_DLGFORM_CMD3DBORDER +'FlatLook WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER 'TiledLook HID_DLGFORM_OPTBACKGRAPHICTILED 'ScaledLook HID_DLGFORM_OPTBACKGRAPHICAREA -'AlignLeft HID_DLGFORM_CMDALIGNLEFT -'AlignRight HID_DLGFORM_CMDALIGNRIGHT - -*ContainerView UID_APP_CONTAINER_VIEW -'PreviewButton HID_APP_VIEW_PREVIEW_CB -'PreviewWindow HID_APP_VIEW_PREVIEW_1 -QueriesTree HID_APP_QUERY_TREE -TableTree HID_APP_TABLE_TREE -TablePreview HID_APP_VIEW_PREVIEW_2 -FormTree HID_APP_FORM_TREE - -*ControlPropertiesDialog UID_FORMPROPBROWSER_FRAME - -*ControlPropertiesTabControl HID_FM_PROPDLG_TABCTR -TabGeneralControl HID_FM_PROPDLG_TAB_GENERAL -TabDataControl HID_FM_PROPDLG_TAB_DATA -TabEventsControl HID_FM_PROPDLG_TAB_EVT - -*CreateNewAdabasDatabase HID_DLG_ADABAS_NEWDB -DatabaseName HID_DLG_ADABAS_DBNAME -Administrator HID_DLG_ADABAS_SYSUSR -AdminPasswordBtn HID_DLG_ADABAS_SYSPWD -ControlUser HID_DLG_ADABAS_CONUSR -ControlPasswordBtn HID_DLG_ADABAS_CONPWD -DomainUser HID_DLG_ADABAS_USR -DomainPasswordBtn HID_DLG_ADABAS_DOMAINPWD -Restore HID_DLG_ADABAS_RESTORE -RestoreBtn HID_DLG_ADABAS_PBRESTORE -SysDevSpace HID_DLG_ADABAS_SYSDEVSPACE -SysDevSpaceBtn HID_DLG_ADABAS_PBSYSDEVSPACE -Transactionlog HID_DLG_ADABAS_TRANSACTIONLOG -TransactionlogBtn HID_DLG_ADABAS_PBTRANSACTIONLOG -DataDevSpace HID_DLG_ADABAS_DATADEVSPACE -DataDevSpaceBtn HID_DLG_ADABAS_PBDATADEVSPACE -TransactionFilesize HID_DLG_ADABAS_TRANSACTIONLOG_SIZE -DatabaseSize HID_DLG_ADABAS_DATADEVSPACE_SIZE -DataBuffersize HID_DLG_ADABAS_CACHE_SIZE - -*ConnectionType HID_DSADMIN_TYPE_DIALOG -BackBtn HID_DBWIZ_PREVIOUS -CreateBtn HID_DBWIZ_FINISH -NextBtn HID_DBWIZ_NEXT - -*CopyDatabaseTable dbaccess:ModalDialog:WIZ_RTFCOPYTABLE -Back dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_PREV -NextBt dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_NEXT - -*ConfirmDelete svtools:ModalDialog:DLG_SVT_QUERYDELETE -Delete svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES -DeleteAll svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL -DoNotDelete svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO - -*CopyToDialog HID_MM_COPYTO -CC sw:Edit:DLG_MM_COPYTO:ED_CC -BCC sw:Edit:DLG_MM_COPYTO:ED_BCC - -*CustomizeAddressList HID_MM_CUSTOMIZE_ADDRESS_LIST -AddressListElements sw:ListBox:DLG_MM_CUSTOMIZE_ADDRESS_LIST:LB_FIELDS -Add sw:PushButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_ADD -Delete sw:PushButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_DELETE -Rename sw:PushButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_RENAME -MoveUp sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_UP -MoveDown sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_DOWN - -*CustomizeMenuName HID_SVX_CONFIG_NAME_SUBMENU -Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING - -*CustomizeMenuReName HID_SVX_CONFIG_RENAME_MENU_ITEM -Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING - -*CustomizeToolbarsReName HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM -Eingabefeld cui:Edit:RID_SVXDLG_NAME:EDT_STRING +'AlignLeft WIZARDS_HID_DLGFORM_CMDALIGNLEFT +'AlignRight WIZARDS_HID_DLGFORM_CMDALIGNRIGHT + +*ContainerView DBACCESS_UID_APP_CONTAINER_VIEW +'PreviewButton DBACCESS_HID_APP_VIEW_PREVIEW_CB +'PreviewWindow DBACCESS_HID_APP_VIEW_PREVIEW_1 +QueriesTree DBACCESS_HID_APP_QUERY_TREE +TableTree DBACCESS_HID_APP_TABLE_TREE +TablePreview DBACCESS_HID_APP_VIEW_PREVIEW_2 +FormTree DBACCESS_HID_APP_FORM_TREE + +*ControlPropertiesDialog SVX_UID_FORMPROPBROWSER_FRAME + +*ControlPropertiesTabControl EXTENSIONS_HID_FM_PROPDLG_TABCTR +TabGeneralControl EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL +TabDataControl EXTENSIONS_HID_FM_PROPDLG_TAB_DATA +TabEventsControl EXTENSIONS_HID_FM_PROPDLG_TAB_EVT + +*CreateNewAdabasDatabase DBACCESS_HID_DLG_ADABAS_NEWDB +DatabaseName DBACCESS_HID_DLG_ADABAS_DBNAME +Administrator DBACCESS_HID_DLG_ADABAS_SYSUSR +AdminPasswordBtn DBACCESS_HID_DLG_ADABAS_SYSPWD +ControlUser DBACCESS_HID_DLG_ADABAS_CONUSR +ControlPasswordBtn DBACCESS_HID_DLG_ADABAS_CONPWD +DomainUser DBACCESS_HID_DLG_ADABAS_USR +DomainPasswordBtn DBACCESS_HID_DLG_ADABAS_DOMAINPWD +Restore DBACCESS_HID_DLG_ADABAS_RESTORE +RestoreBtn DBACCESS_HID_DLG_ADABAS_PBRESTORE +SysDevSpace DBACCESS_HID_DLG_ADABAS_SYSDEVSPACE +SysDevSpaceBtn DBACCESS_HID_DLG_ADABAS_PBSYSDEVSPACE +Transactionlog DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG +TransactionlogBtn DBACCESS_HID_DLG_ADABAS_PBTRANSACTIONLOG +DataDevSpace DBACCESS_HID_DLG_ADABAS_DATADEVSPACE +DataDevSpaceBtn DBACCESS_HID_DLG_ADABAS_PBDATADEVSPACE +TransactionFilesize DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG_SIZE +DatabaseSize DBACCESS_HID_DLG_ADABAS_DATADEVSPACE_SIZE +DataBuffersize DBACCESS_HID_DLG_ADABAS_CACHE_SIZE + +*ConnectionType DBACCESS_HID_DSADMIN_TYPE_DIALOG +BackBtn DBACCESS_HID_DBWIZ_PREVIOUS +CreateBtn DBACCESS_HID_DBWIZ_FINISH +NextBtn DBACCESS_HID_DBWIZ_NEXT + +*CopyDatabaseTable dbaccess.ModalDialog.19216 +Back dbaccess.PushButton.19216.10 +NextBt dbaccess.PushButton.19216.9 + +*ConfirmDelete svtools.ModalDialog.16376 +Delete svtools.PushButton.16376.4 +DeleteAll svtools.PushButton.16376.6 +DoNotDelete svtools.PushButton.16376.5 + +*CopyToDialog SW_HID_MM_COPYTO +CC sw.Edit.22073.43 +BCC sw.Edit.22073.45 + +*CustomizeAddressList SW_HID_MM_CUSTOMIZE_ADDRESS_LIST +AddressListElements sw.ListBox.22067.2 +Add sw.PushButton.22067.3 +Delete sw.PushButton.22067.4 +Rename sw.PushButton.22067.5 +MoveUp sw.ImageButton.22067.6 +MoveDown sw.ImageButton.22067.7 + +*CustomizeMenuName CUI_HID_SVX_CONFIG_NAME_SUBMENU +Eingabefeld cui.Edit.10062.1 + +*CustomizeMenuReName CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM +Eingabefeld cui.Edit.10062.1 + +*CustomizeToolbarsReName CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM +Eingabefeld cui.Edit.10062.1 diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win old mode 100755 new mode 100644 index 19ba11ec6695..b31b32eef6c6 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -1,508 +1,508 @@ -*Database UID_APP_VIEW +*Database DBACCESS_UID_APP_VIEW 'UID_APP_VIEW_BORDER_WIN -DatabaseSplitter UID_APP_VIEW_VERT_SPLIT -DatabaseDetailView UID_APP_DETAIL_VIEW -CreationList HID_APP_CREATION_LIST -DatabaseSwapView UID_APP_SWAP_VIEW -DatabaseSwapIconView HID_APP_SWAP_ICONCONTROL -DatabaseQueriesView HID_APP_QUERY_TREE -DatabaseReportsView HID_APP_REPORT_TREE -DatabaseTablesView HID_APP_TABLE_TREE - -*DatabaseBeamer UID_CTL_CONTENT - -*DatabaseProperties HID_DSADMIN_DIALOG -TabControl HID_DSADMIN_TABCONTROL -TabConnection dbaccess:TabPage:PAGE_CONNECTION +DatabaseSplitter DBACCESS_UID_APP_VIEW_VERT_SPLIT +DatabaseDetailView DBACCESS_UID_APP_DETAIL_VIEW +CreationList DBACCESS_HID_APP_CREATION_LIST +DatabaseSwapView DBACCESS_UID_APP_SWAP_VIEW +DatabaseSwapIconView DBACCESS_HID_APP_SWAP_ICONCONTROL +DatabaseQueriesView DBACCESS_HID_APP_QUERY_TREE +DatabaseReportsView DBACCESS_HID_APP_REPORT_TREE +DatabaseTablesView DBACCESS_HID_APP_TABLE_TREE + +*DatabaseBeamer DBACCESS_UID_CTL_CONTENT + +*DatabaseProperties DBACCESS_HID_DSADMIN_DIALOG +TabControl DBACCESS_HID_DSADMIN_TABCONTROL +TabConnection dbaccess.TabPage.19206 'URL dbaccess:Edit:PAGE_CONNECTION:ET_CONNECTURL -Browse HID_DSADMIN_BROWSECONN -Username dbaccess:Edit:PAGE_CONNECTION:ET_USERNAME -PasswordRequired dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED -DriverClass HID_DSADMIN_DRIVERCLASS -TestDriverClass dbaccess:PushButton:PAGE_CONNECTION:PB_TESTDRIVERCLASS -TestConnection dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION -Reset HID_TABDLG_RESET_BTN -TabdBase HID_DSADMIN_PAGE_DBASE -TabTextBase HID_DSADMIN_PAGE_TEXT - -*DatabaseWizard HID_DLG_DATABASE_WIZARD -AdabasDBName HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME -BackBtn HID_DBWIZ_PREVIOUS -CancelBtn HID_DBWIZ_CANCEL -ConnectToDatabase HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE -FinishBtn HID_DBWIZ_FINISH -CreateNewDatabase HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE -DatabaseType HID_DSADMIN_DSTYPE -dBasePath HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION -DocumentList dbaccess:ListBox:PAGE_GENERAL:LB_DOCUMENTLIST -LDAPHostName HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER -BaseDN HID_PAGE_DBWIZARD_LDAP_ET_BASEDN -NextBtn HID_DBWIZ_NEXT -OpenBtn dbaccess:PushButton:PAGE_GENERAL:PB_OPENDOCUMENT -OpenExistingDoc dbaccess:RadioButton:PAGE_GENERAL:RB_OPENEXISTINGDOC -PasswordRequired HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED -SpreadsheetPath HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH -TextPath HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE -UserName HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME -AdabasBrowse HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME -MySQLODBC HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC -MySQLJDBC HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC -MySQLDatabaseName HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME -MySQLODBCDSName HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE -MySQLHostName HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER -MySQLPort HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT -AdoURL HID_PAGE_DBWIZARD_ADO_ET_ADOURL -StartTableWizard HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD - -*CreateDatabaseLink cui:ModalDialog:DLG_DOCUMENTLINK -DatabaseFile SID_OPENURL -Browse cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE -RegisteredName cui:Edit:DLG_DOCUMENTLINK:ET_NAME - -*Diagramdata SID_DIAGRAM_DATA -Toolbox2 HID_SCH_TBX_DATA -InsertRow HID_SCH_TBI_DATA_INSERT_ROW -InsertColumn HID_SCH_TBI_DATA_INSERT_COL -InsertTextColumn HID_SCH_TBI_DATA_INSERT_TEXT_COL -DeleteRow HID_SCH_TBI_DATA_DELETE_ROW -DeleteColumn HID_SCH_TBI_DATA_DELETE_COL -SwapColumns HID_SCH_TBI_DATA_SWAP_COL -SwapRows HID_SCH_TBI_DATA_SWAP_ROW -Tables HID_SCH_CTL_DATA -DataSeriesLabel HID_SCH_DATA_SERIES_LABEL - -*DigitalSignature HID_XMLSEC_DLG_DIGSIG -ViewCertificate xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT -CertificateList HID_XMLSEC_CTRL_SIGNATURESDLG -Add xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_ADDCERT -Remove xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_REMOVECERT - -*DuplicateNameWarning HID_WARN_NAME_DUPLICATE - -*EditInputList HID_FLD_DROPDOWN -AllListEntrys sw:ListBox:DLG_FLD_DROPDOWN:LB_LISTITEMS -NextListEntry sw:PushButton:DLG_FLD_DROPDOWN:PB_NEXT -EditListEntry sw:PushButton:DLG_FLD_DROPDOWN:PB_EDIT - -*EditSymbols starmath:ModalDialog:RID_SYMDEFINEDIALOG -OldSymbol starmath:ComboBox:RID_SYMDEFINEDIALOG:1 -OldSymbolSet starmath:ComboBox:RID_SYMDEFINEDIALOG:2 -Symbol starmath:ComboBox:RID_SYMDEFINEDIALOG:4 -SymbolSet starmath:ComboBox:RID_SYMDEFINEDIALOG:5 -Font starmath:ListBox:RID_SYMDEFINEDIALOG:1 -Subset starmath:ListBox:RID_SYMDEFINEDIALOG:LB_FONTS_SUBSET -Typeface starmath:ComboBox:RID_SYMDEFINEDIALOG:3 -Add starmath:PushButton:RID_SYMDEFINEDIALOG:1 -Modify starmath:PushButton:RID_SYMDEFINEDIALOG:2 -Delete starmath:PushButton:RID_SYMDEFINEDIALOG:3 -Symbols HID_SMA_CONTROL_FONTCHAR_VIEW - -*ExecuteSQLCommand dbaccess:ModalDialog:DLG_DIRECTSQL -CommandToExecute dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL -ExecuteBtn dbaccess:PushButton:DLG_DIRECTSQL:PB_EXECUTE -PreviousCommands dbaccess:ListBox:DLG_DIRECTSQL:LB_HISTORY -Status dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_STATUS -CloseBtn dbaccess:PushButton:DLG_DIRECTSQL:PB_CLOSE - -*ExportBasicLibraryDlg basctl:ModalDialog:RID_DLG_EXPORT -ExportAsPackage basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASPACKAGE -ExportAsLibrary basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASBASIC - -*ExtensionSoftwareLicenseAgreement desktop:ModalDialog:RID_DLG_LICENSE -LicenseText desktop:MultiLineEdit:RID_DLG_LICENSE:ML_LICENSE -ScrollDown desktop:PushButton:RID_DLG_LICENSE:PB_LICENSE_DOWN -Accept UID_BTN_LICENSE_ACCEPT - -*ExtensionUpdate HID_DEPLOYMENT_GUI_UPDATE -ShowAllUpdates desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL -UpdateDescriptions desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS -DownloadAndInstall desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK -AvailableUpdatesList HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES -UpdatePublisherText HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER -ReleaseNotesText HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES - - -*FilterDialog HID_DLG_FILTERCRIT -Fieldname1 dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD1 -Condition1 dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP1 -Value1 dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE1 -Operator2 dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND2 -Fieldname2 dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD2 -Condition2 dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP2 -Value2 dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE2 -Operator3 dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND3 -Fieldname3 dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD3 -Condition3 dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP3 -Value3 dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE3 - -*FilterNavigator HID_FILTER_NAVIGATOR - -*FilterWarning HID_SVXDLG_FILTER_WARNING - -*FindEntry HID_MM_FIND_ENTRY -FindString sw:Edit:DLG_MM_FIND_ENTRY:ED_FIND -FindOnlyIn sw:CheckBox:DLG_MM_FIND_ENTRY:CB_FINDONLY -FindOnlyInWhat sw:ListBox:DLG_MM_FIND_ENTRY:LB_FINDONLY -FindNow sw:PushButton:DLG_MM_FIND_ENTRY:PB_FIND - -*FontworkGallery svx:ModalDialog:RID_SVX_MDLG_FONTWORK_GALLERY -SelectAFontworkStyle HID_CTL_FONTWORK_FAVORITES - -*FontworkCharacterSpacingCustom svx:ModalDialog:RID_SVX_MDLG_FONTWORK_CHARSPACING -Value svx:MetricField:RID_SVX_MDLG_FONTWORK_CHARSPACING:MF_VALUE +Browse DBACCESS_HID_DSADMIN_BROWSECONN +Username dbaccess.Edit.19206.1 +PasswordRequired dbaccess.CheckBox.19206.1 +DriverClass DBACCESS_HID_DSADMIN_DRIVERCLASS +TestDriverClass dbaccess.PushButton.19206.1 +TestConnection dbaccess.PushButton.19206.2 +Reset SFX2_HID_TABDLG_RESET_BTN +TabdBase DBACCESS_HID_DSADMIN_PAGE_DBASE +TabTextBase DBACCESS_HID_DSADMIN_PAGE_TEXT + +*DatabaseWizard DBACCESS_HID_DLG_DATABASE_WIZARD +AdabasDBName DBACCESS_HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME +BackBtn DBACCESS_HID_DBWIZ_PREVIOUS +CancelBtn DBACCESS_HID_DBWIZ_CANCEL +ConnectToDatabase DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE +FinishBtn DBACCESS_HID_DBWIZ_FINISH +CreateNewDatabase DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE +DatabaseType DBACCESS_HID_DSADMIN_DSTYPE +dBasePath DBACCESS_HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION +DocumentList dbaccess.ListBox.19200.3 +LDAPHostName DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER +BaseDN DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN +NextBtn DBACCESS_HID_DBWIZ_NEXT +OpenBtn dbaccess.PushButton.19200.6 +OpenExistingDoc dbaccess.RadioButton.19200.3 +PasswordRequired DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED +SpreadsheetPath DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH +TextPath DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE +UserName DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME +AdabasBrowse DBACCESS_HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME +MySQLODBC DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC +MySQLJDBC DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC +MySQLDatabaseName DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME +MySQLODBCDSName DBACCESS_HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE +MySQLHostName DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER +MySQLPort DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT +AdoURL DBACCESS_HID_PAGE_DBWIZARD_ADO_ET_ADOURL +StartTableWizard DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD + +*CreateDatabaseLink cui.ModalDialog.17024 +DatabaseFile .uno:OpenUrl +Browse cui.PushButton.17024.1 +RegisteredName cui.Edit.17024.1 + +*Diagramdata CHART2_HID_DIAGRAM_DATA +Toolbox2 CHART2_HID_SCH_TBX_DATA +InsertRow CHART2_HID_SCH_TBI_DATA_INSERT_ROW +InsertColumn CHART2_HID_SCH_TBI_DATA_INSERT_COL +InsertTextColumn CHART2_HID_SCH_TBI_DATA_INSERT_TEXT_COL +DeleteRow CHART2_HID_SCH_TBI_DATA_DELETE_ROW +DeleteColumn CHART2_HID_SCH_TBI_DATA_DELETE_COL +SwapColumns CHART2_HID_SCH_TBI_DATA_SWAP_COL +SwapRows CHART2_HID_SCH_TBI_DATA_SWAP_ROW +Tables CHART2_HID_SCH_CTL_DATA +DataSeriesLabel CHART2_HID_SCH_DATA_SERIES_LABEL + +*DigitalSignature XMLSECURITY_HID_XMLSEC_DLG_DIGSIG +ViewCertificate xmlsecurity.PushButton.1000.55 +CertificateList XMLSECURITY_HID_XMLSEC_CTRL_SIGNATURESDLG +Add xmlsecurity.PushButton.1000.2 +Remove xmlsecurity.PushButton.1000.3 + +*DuplicateNameWarning CUI_HID_WARN_NAME_DUPLICATE + +*EditInputList SW_HID_FLD_DROPDOWN +AllListEntrys sw.ListBox.21112.2 +NextListEntry sw.PushButton.21112.5 +EditListEntry sw.PushButton.21112.7 + +*EditSymbols starmath.ModalDialog.20009 +OldSymbol starmath.ComboBox.20009.1 +OldSymbolSet starmath.ComboBox.20009.2 +Symbol starmath.ComboBox.20009.4 +SymbolSet starmath.ComboBox.20009.5 +Font starmath.ListBox.20009.1 +Subset starmath.ListBox.20009.111 +Typeface starmath.ComboBox.20009.3 +Add starmath.PushButton.20009.1 +Modify starmath.PushButton.20009.2 +Delete starmath.PushButton.20009.3 +Symbols STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW + +*ExecuteSQLCommand dbaccess.ModalDialog.19222 +CommandToExecute dbaccess.MultiLineEdit.19222.3 +ExecuteBtn dbaccess.PushButton.19222.4 +PreviousCommands dbaccess.ListBox.19222.6 +Status dbaccess.MultiLineEdit.19222.8 +CloseBtn dbaccess.PushButton.19222.11 + +*ExportBasicLibraryDlg basctl.ModalDialog.14893 +ExportAsPackage basctl.RadioButton.14893.42 +ExportAsLibrary basctl.RadioButton.14893.43 + +*ExtensionSoftwareLicenseAgreement desktop.ModalDialog.6500 +LicenseText desktop.MultiLineEdit.6500.51 +ScrollDown desktop.PushButton.6500.50 +Accept DESKTOP_UID_BTN_LICENSE_ACCEPT + +*ExtensionUpdate DESKTOP_HID_DEPLOYMENT_GUI_UPDATE +ShowAllUpdates desktop.CheckBox.2010.5 +UpdateDescriptions desktop.MultiLineEdit.2010.7 +DownloadAndInstall desktop.PushButton.2010.10 +AvailableUpdatesList DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES +UpdatePublisherText DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER +ReleaseNotesText DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES + + +*FilterDialog DBACCESS_HID_DLG_FILTERCRIT +Fieldname1 dbaccess.ListBox.19206.1 +Condition1 dbaccess.ListBox.19206.2 +Value1 dbaccess.Edit.19206.1 +Operator2 dbaccess.ListBox.19206.7 +Fieldname2 dbaccess.ListBox.19206.3 +Condition2 dbaccess.ListBox.19206.4 +Value2 dbaccess.Edit.19206.2 +Operator3 dbaccess.ListBox.19206.8 +Fieldname3 dbaccess.ListBox.19206.5 +Condition3 dbaccess.ListBox.19206.6 +Value3 dbaccess.Edit.19206.3 + +*FilterNavigator SVX_HID_FILTER_NAVIGATOR + +*FilterWarning CUI_HID_SVXDLG_FILTER_WARNING + +*FindEntry SW_HID_MM_FIND_ENTRY +FindString sw.Edit.22065.2 +FindOnlyIn sw.CheckBox.22065.3 +FindOnlyInWhat sw.ListBox.22065.4 +FindNow sw.PushButton.22065.5 + +*FontworkGallery svx.ModalDialog.10002 +SelectAFontworkStyle SVX_HID_CTL_FONTWORK_FAVORITES + +*FontworkCharacterSpacingCustom svx.ModalDialog.10019 +Value svx.MetricField.10019.7 *FontWorkAlignment FontWork1TBO *FontWorkCharacterSpacing FontWork2TBO -*FormatColumn HID_FORMAT_COLUMN -ApplyTo sw:ListBox:DLG_COLUMN:LB_APPLY_TO -Columns sw:NumericField:TP_COLUMN:ED_NUMBER -ColumnValueset HID_COLUMN_VALUESET -BalanceColumns sw:CheckBox:TP_COLUMN:CB_BALANCECOLS -Width1 sw:MetricField:TP_COLUMN:ED_1 -Width2 sw:MetricField:TP_COLUMN:ED_2 -Width3 sw:MetricField:TP_COLUMN:ED_3 -ColumnRight sw:ImageButton:TP_COLUMN:BTN_DOWN -ColumnLeft sw:ImageButton:TP_COLUMN:BTN_UP -Space12 sw:MetricField:TP_COLUMN:ED_DIST1 -Space23 sw:MetricField:TP_COLUMN:ED_DIST2 -AutoWidth sw:CheckBox:TP_COLUMN:CB_AUTO_WIDTH -Line sw:ListBox:TP_COLUMN:LB_STYLE -Height sw:MetricField:TP_COLUMN:ED_HEIGHT -Position sw:ListBox:TP_COLUMN:LB_POSITION -TextDirection sw:ListBox:TP_COLUMN:LB_TEXTDIRECTION - -*NamespaceDLG HID_XFORMS_NAMESPACEITEM_DLG -Namespaces HID_XFORMS_NAMESPACEITEM_LIST -Add svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_ADD_NAMESPACE -Edit svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_EDIT_NAMESPACE -Delete svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_DELETE_NAMESPACE - -*DatabaseTableSaveAs HID_DLG_SAVE_AS -Catalog dbaccess:ComboBox:DLG_SAVE_AS:ET_CATALOG -Schema dbaccess:ComboBox:DLG_SAVE_AS:ET_SCHEMA -TableName dbaccess:Edit:DLG_SAVE_AS:ET_TITLE - -*DatabaseSelection HID_TLB_TREELISTBOX - -*TableView HID_CTL_TABBROWSER -DataWindow UID_DATABROWSE_DATAWINDOW -CurrentRecord HID_GRID_TRAVEL_ABSOLUTE -AllRecords HID_GRID_NUMBEROFRECORDS -FirstRecord HID_GRID_TRAVEL_FIRST -PreviousRecord HID_GRID_TRAVEL_PREV -NextRecord HID_GRID_TRAVEL_NEXT -LastRecord HID_GRID_TRAVEL_LAST -NewRecord HID_GRID_TRAVEL_NEW -TableHeader HID_DATABROWSE_HEADER - -'*DataSourceAdministration HID_DSADMIN_DIALOG -'TabControl HID_DSADMIN_TABCONTROL +*FormatColumn SW_HID_FORMAT_COLUMN +ApplyTo sw.ListBox.21004.54 +Columns sw.NumericField.20813.2 +ColumnValueset SW_HID_COLUMN_VALUESET +BalanceColumns sw.CheckBox.20813.58 +Width1 sw.MetricField.20813.25 +Width2 sw.MetricField.20813.26 +Width3 sw.MetricField.20813.27 +ColumnRight sw.ImageButton.20813.31 +ColumnLeft sw.ImageButton.20813.30 +Space12 sw.MetricField.20813.46 +Space23 sw.MetricField.20813.47 +AutoWidth sw.CheckBox.20813.4 +Line sw.ListBox.20813.34 +Height sw.MetricField.20813.36 +Position sw.ListBox.20813.38 +TextDirection sw.ListBox.20813.61 + +*NamespaceDLG SVX_HID_XFORMS_NAMESPACEITEM_DLG +Namespaces SVX_HID_XFORMS_NAMESPACEITEM_LIST +Add svx.PushButton.18014.12 +Edit svx.PushButton.18014.13 +Delete svx.PushButton.18014.14 + +*DatabaseTableSaveAs DBACCESS_HID_DLG_SAVE_AS +Catalog dbaccess.ComboBox.19211.1 +Schema dbaccess.ComboBox.19211.2 +TableName dbaccess.Edit.19211.3 + +*DatabaseSelection DBACCESS_HID_TLB_TREELISTBOX + +*TableView DBACCESS_HID_CTL_TABBROWSER +DataWindow DBACCESS_UID_DATABROWSE_DATAWINDOW +CurrentRecord SVX_HID_GRID_TRAVEL_ABSOLUTE +AllRecords SVX_HID_GRID_NUMBEROFRECORDS +FirstRecord SVX_HID_GRID_TRAVEL_FIRST +PreviousRecord SVX_HID_GRID_TRAVEL_PREV +NextRecord SVX_HID_GRID_TRAVEL_NEXT +LastRecord SVX_HID_GRID_TRAVEL_LAST +NewRecord SVX_HID_GRID_TRAVEL_NEW +TableHeader DBACCESS_HID_DATABROWSE_HEADER + +'*DataSourceAdministration DBACCESS_HID_DSADMIN_DIALOG +'TabControl DBACCESS_HID_DSADMIN_TABCONTROL 'NewDataSource HID_DSADMIN_DATASOURCE_NEWDS 'DatabaseSourceList HID_DSADMIN_DATASOURCE_DSLIST -'TabGeneral HID_DSADMIN_PAGE_GENERAL -'TabADO HID_DSADMIN_PAGE_ADO -'TabdBase HID_DSADMIN_PAGE_DBASE -'TabODBC HID_DSADMIN_PAGE_ODBC +'TabGeneral DBACCESS_HID_DSADMIN_PAGE_GENERAL +'TabADO DBACCESS_HID_DSADMIN_PAGE_ADO +'TabdBase DBACCESS_HID_DSADMIN_PAGE_DBASE +'TabODBC DBACCESS_HID_DSADMIN_PAGE_ODBC 'TabAdabasStatistics dbaccess:TabPage:TAB_PAG_ADABAS_SETTINGS -'TabAdabasUserSettings HID_TAB_PAGE_USERADMIN -'TabJDBC HID_DSADMIN_PAGE_JDBC -'TabLDAP HID_DSADMIN_PAGE_LDAP -'TabTextBase HID_DSADMIN_PAGE_TEXT -'TabTables HID_DSADMIN_TABLE_SUBSCRIPTION -'TabQueries HID_DSADMIN_QUERYADMINISTRATION -'TabBaseBookmarks HID_DSADMIN_DOCUMENTLINKS -'Apply HID_TABDLG_APPLY_BTN -'Reset HID_TABDLG_RESET_BTN - -*DatabaseIndexes dbaccess:ModalDialog:DLG_INDEXDESIGN -NewIndex HID_DLGIDX_NEWINDEX -DropIndex HID_DLGIDX_DROPINDEX -RenameIndex HID_DLGIDX_RENAMEINDEX -SaveIndex HID_DLGIDX_SAVEINDEX -ResetIndex HID_DLGIDX_RESETINDEX -IndexList HID_DLGIDX_INDEXLIST -Unique dbaccess:CheckBox:DLG_INDEXDESIGN:CB_UNIQUE -'IndexDetails UID_DLGINDEX_INDEXDETAILS_BACK -IndexDetails UID_DLGINDEX_INDEXDETAILS_MAIN +'TabAdabasUserSettings DBACCESS_HID_TAB_PAGE_USERADMIN +'TabJDBC DBACCESS_HID_DSADMIN_PAGE_JDBC +'TabLDAP DBACCESS_HID_DSADMIN_PAGE_LDAP +'TabTextBase DBACCESS_HID_DSADMIN_PAGE_TEXT +'TabTables DBACCESS_HID_DSADMIN_TABLE_SUBSCRIPTION +'TabQueries DBACCESS_HID_DSADMIN_QUERYADMINISTRATION +'TabBaseBookmarks DBACCESS_HID_DSADMIN_DOCUMENTLINKS +'Apply SFX2_HID_TABDLG_APPLY_BTN +'Reset SFX2_HID_TABDLG_RESET_BTN + +*DatabaseIndexes dbaccess.ModalDialog.19219 +NewIndex DBACCESS_HID_DLGIDX_NEWINDEX +DropIndex DBACCESS_HID_DLGIDX_DROPINDEX +RenameIndex DBACCESS_HID_DLGIDX_RENAMEINDEX +SaveIndex DBACCESS_HID_DLGIDX_SAVEINDEX +ResetIndex DBACCESS_HID_DLGIDX_RESETINDEX +IndexList DBACCESS_HID_DLGIDX_INDEXLIST +Unique dbaccess.CheckBox.19219.1 +'IndexDetails DBACCESS_UID_DLGINDEX_INDEXDETAILS_BACK +IndexDetails DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN '--0: CONTROL: No entries in Hid.Lst '--0: CHECKBOX: No entries in Hid.Lst -'--38973: LISTBOX: Select one or more fields. HID_DLGINDEX_INDEXDETAILS_FIELD -IndexFields HID_DLGINDEX_INDEXDETAILS_FIELD +'--38973: LISTBOX: Select one or more fields. DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD +IndexFields DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD '--0: CONTROL: No entries in Hid.Lst '--0: PUSHBUTTON: No entries in Hid.Lst -'--38974: LISTBOX: Select the sort order. HID_DLGINDEX_INDEXDETAILS_SORTORDER +'--38974: LISTBOX: Select the sort order. DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER '--0: CONTROL: No entries in Hid.Lst '--0: PUSHBUTTON: No entries in Hid.Lst -DatabaseIndexesClose dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE - -*RecordSearch HID_FM_DLG_SEARCH -SearchForText cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT -SearchForNull cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL -SearchForNotNull cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL -SearchText HID_SEARCH_TEXT -Formular cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM -AllFields HID_SEARCH_ALLFIELDS -FieldSelection HID_SEARCH_FIELDSELECTION -Position HID_SEARCH_POSITION -FieldFormat HID_SEARCH_FORMATTER -MatchCase HID_SEARCH_CASE -Backwards HID_SEARCH_BACKWARD -FromTop HID_SEARCH_STARTOVER -Wildcard HID_SEARCH_WILDCARD -Regular HID_SEARCH_REGULAR -SimilaritySearch HID_SEARCH_APPROX -More HID_SEARCH_APPROXSETTINGS -Search HID_SEARCH_BTN_SEARCH -CloseBtn HID_SEARCH_BTN_CLOSE -RecordCount UID_SEARCH_RECORDSTATUS +DatabaseIndexesClose dbaccess.PushButton.19219.1 + +*RecordSearch CUI_HID_FM_DLG_SEARCH +SearchForText cui.RadioButton.18007.3 +SearchForNull cui.RadioButton.18007.4 +SearchForNotNull cui.RadioButton.18007.5 +SearchText CUI_HID_SEARCH_TEXT +Formular cui.ListBox.18007.1 +AllFields CUI_HID_SEARCH_ALLFIELDS +FieldSelection CUI_HID_SEARCH_FIELDSELECTION +Position CUI_HID_SEARCH_POSITION +FieldFormat CUI_HID_SEARCH_FORMATTER +MatchCase CUI_HID_SEARCH_CASE +Backwards CUI_HID_SEARCH_BACKWARD +FromTop CUI_HID_SEARCH_STARTOVER +Wildcard CUI_HID_SEARCH_WILDCARD +Regular CUI_HID_SEARCH_REGULAR +SimilaritySearch CUI_HID_SEARCH_APPROX +More CUI_HID_SEARCH_APPROXSETTINGS +Search CUI_HID_SEARCH_BTN_SEARCH +CloseBtn CUI_HID_SEARCH_BTN_CLOSE +RecordCount CUI_UID_SEARCH_RECORDSTATUS *DataSourceSelection dbaccess:Modaldialog:DLG_DATASOURCE_SELECTION -SourceList dbaccess:ListBox:DLG_DATASOURCE_SELECTION:LB_DATASOURCE -Organize dbaccess:PushButton:DLG_DATASOURCE_SELECTION:PB_MANAGE -Create dbaccess:PushButton:DLG_DATASOURCE_SELECTION:PB_CREATE +SourceList dbaccess.ListBox.19204.1 +Organize dbaccess.PushButton.19204.5 +Create dbaccess.PushButton.19204.9 -*DataSourcesNotAvailable HID_DATA_SOURCES_UNAVAILABLE +*DataSourcesNotAvailable SW_HID_DATA_SOURCES_UNAVAILABLE -*DocumentConverter HID_DLGIMPORT_DIALOG +*DocumentConverter WIZARDS_HID_DLGIMPORT_DIALOG 'first page -StarOffice HID_DLGIMPORT_0_OPTSODOCUMENTS -TextDoc HID_DLGIMPORT_0_CHKWRITER -Spreadsheet HID_DLGIMPORT_0_CHKCALC -Drawing HID_DLGIMPORT_0_CHKIMPRESS -Master HID_DLGIMPORT_0_CHKMATHGLOBAL -MicrosoftOffice HID_DLGIMPORT_0_OPTMSDOCUMENTS -Word HID_DLGIMPORT_2_CHKWORD -Excel HID_DLGIMPORT_2_CHKEXCEL -PowerPoint HID_DLGIMPORT_2_CHKPOWERPOINT -CreateLogFile HID_DLGIMPORT_0_CHKLOGFILE +StarOffice WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS +TextDoc WIZARDS_HID_DLGIMPORT_0_CHKWRITER +Spreadsheet WIZARDS_HID_DLGIMPORT_0_CHKCALC +Drawing WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS +Master WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL +MicrosoftOffice WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS +Word WIZARDS_HID_DLGIMPORT_2_CHKWORD +Excel WIZARDS_HID_DLGIMPORT_2_CHKEXCEL +PowerPoint WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT +CreateLogFile WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE 'second page -Template HID_DLGIMPORT_2_CBTEMPLATE -IncludingSubdirectoriesTemplate HID_DLGIMPORT_2_CBTEMPLATERECURSE -ImportFormTemplates HID_DLGIMPORT_2_LBTEMPLATEPATH -ImportFormTemplatesSearch HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT -SaveToTemplates HID_DLGIMPORT_2_EDTEMPLATEPATH -SaveToTemplatesSearch HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 - -Document HID_DLGIMPORT_2_CBDOCUMENT -IncludingSubdirectoriesDocument HID_DLGIMPORT_2_CBDOCUMENTRECURSE -ImportFormDocument HID_DLGIMPORT_2_LBDOCUMENTPATH -ImportFormDocumentSearch HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT -SaveToDocument HID_DLGIMPORT_2_EDDOCUMENTPATH -SaveToDocumentSearch HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 +Template WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE +IncludingSubdirectoriesTemplate WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE +ImportFormTemplates WIZARDS_HID_DLGIMPORT_2_LBTEMPLATEPATH +ImportFormTemplatesSearch WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT +SaveToTemplates WIZARDS_HID_DLGIMPORT_2_EDTEMPLATEPATH +SaveToTemplatesSearch WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 + +Document WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT +IncludingSubdirectoriesDocument WIZARDS_HID_DLGIMPORT_2_CBDOCUMENTRECURSE +ImportFormDocument WIZARDS_HID_DLGIMPORT_2_LBDOCUMENTPATH +ImportFormDocumentSearch WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT +SaveToDocument WIZARDS_HID_DLGIMPORT_2_EDDOCUMENTPATH +SaveToDocumentSearch WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 'third page -Summary HID_DLGIMPORT_3_TBSUMMARY +Summary WIZARDS_HID_DLGIMPORT_3_TBSUMMARY 'all pages -BackButton HID_DLGIMPORT_0_CMDPREV -CancelButton HID_DLGIMPORT_0_CMDCANCEL -HelpButton HID_DLGIMPORT_0_CMDHELP -ContinueButton HID_DLGIMPORT_0_CMDNEXT - -*ExternalData sc:ModalDialog:RID_SCDLG_LINKAREA -URLField HID_SCDLG_LINKAREAURL -FileChoose sc:PushButton:RID_SCDLG_LINKAREA:BTN_BROWSE -TableListBox sc:MultiListBox:RID_SCDLG_LINKAREA:LB_RANGES -Update sc:CheckBox:RID_SCDLG_LINKAREA:BTN_RELOAD -UpdateTime sc:NumericField:RID_SCDLG_LINKAREA:NF_DELAY - -*FindAndReplace SID_SEARCH_DLG -SearchFor svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH -SearchForStyle svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH -ReplaceWith svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE -ReplaceWithStyle svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE -SearchNow svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH -SearchAll svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL -ReplaceBtn svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE -ReplaceAll svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL -MatchCase svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE -WholeWordsOnly svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS -More svx:MoreButton:RID_SVXDLG_SEARCH:BTN_MORE -CurrentSelectionOnly svx:CheckBox:RID_SVXDLG_SEARCH:CB_SELECTIONS -Backwards svx:CheckBox:RID_SVXDLG_SEARCH:CB_BACKWARDS -RegularExpressions svx:CheckBox:RID_SVXDLG_SEARCH:CB_REGEXP -SimilaritySearch svx:CheckBox:RID_SVXDLG_SEARCH:CB_SIMILARITY -SimilaritySearchFor svx:PushButton:RID_SVXDLG_SEARCH:PB_SIMILARITY -SearchForStyles svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS -MatchFullHalfWidth svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_MATCH_FULL_HALF_WIDTH -SoundsLike svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_SOUNDS_LIKE -SoundsLikeOptions svx:PushButton:RID_SVXDLG_SEARCH:PB_JAP_OPTIONS -Attributes svx:PushButton:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE -Formats svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT -NoFormat svx:PushButton:RID_SVXDLG_SEARCH:BTN_NOFORMAT -SearchIn svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN -Rows svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS -Columns svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS -SearchInAllSheets svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS -Notes svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES - -*FormFolderNameDialog HID_DLG_SAVE_AS -FolderName dbaccess:Edit:DLG_SAVE_AS:ET_TITLE -FolderReName HID_DLG_RENAME - -*FormPropertiesDialog UID_FORMPROPBROWSER_FRAME -FormPropertiesTabControl HID_FM_PROPDLG_TABCTR -TabGeneralForm HID_FM_PROPDLG_TAB_GENERAL -TabDataForm HID_FM_PROPDLG_TAB_DATA -TabEventsForm HID_FM_PROPDLG_TAB_EVT - -*FormSaveDialog HID_EXPLORERDLG_COLLECTION -NewFolder dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER -OneLevelUp dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP -FormName dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME -SaveBtn dbaccess:PushButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_SAVE - -*FormWizard HID_DLGFORM_DIALOG -TablesOrQueriesMaster HID_DLGFORM_MASTER_LBTABLES -CancelBtn HID_DLGFORM_CMDCANCEL -BackBtn HID_DLGFORM_CMDPREV -NextBtn HID_DLGFORM_CMDNEXT -MasterMoveSelected HID_DLGFORM_MASTER_CMDMOVESELECTED -MasterMoveAll HID_DLGFORM_MASTER_CMDMOVEALL -MasterRemoveSelected HID_DLGFORM_MASTER_CMDREMOVESELECTED -MasterRemoveAll HID_DLGFORM_MASTER_CMDREMOVEALL -AvailableMasterFields HID_DLGFORM_MASTER_FIELDSAVAILABLE -FieldsInForm HID_DLGFORM_MASTER_FIELDSSELECTED -ColumnarLabelsLeft HID_DLGFORM_CMDLEFTLABELED -ColumnarLabelsOnTop HID_DLGFORM_CMDTOPLABELED -AsDataSheet HID_DLGFORM_CMDTABLESTYLE -InBlocksLabelsAbove HID_DLGFORM_CMDTOPJUSTIFIED -PageStyles HID_DLGFORM_LSTSTYLES -NoBorder HID_DLGFORM_CMDNOBORDER -ThreeDLook HID_DLGFORM_CMD3DBORDER -FlatLook HID_DLGFORM_CMDSIMPLEBORDER -AlignLeft HID_DLGFORM_CMDALIGNLEFT -AlignRight HID_DLGFORM_CMDALIGNRIGHT -FinishBtn HID_DLGFORM_CMDFINISH - -*FunctionsCalc HID_FUNCTION_BOX -FunctionInsert sc:ImageButton:FID_FUNCTION_BOX:IMB_INSERT -Category sc:ListBox:FID_FUNCTION_BOX:CB_CAT -FunctionList sc:ListBox:FID_FUNCTION_BOX:LB_FUNC - -*FunctionWizard HID_FORMULADLG_FORMULA -FunctionWizardTabControl formula:TabControl:RID_FORMULADLG_FORMULA:TC_FUNCTION -TabFunctionWizardFormula HID_FORMULA_FAP_FORMULA -CategoryLB HID_FORMULA_LB_CATEGORY -FunctionLB HID_FORMULA_LB_FUNCTION -TabFunktion HID_FORMULATAB_FUNCTION -Functionsbutton1 HID_FORMULA_FAP_BTN_FX1 -Editfield1 HID_FORMULA_FAP_EDIT1 -Shrink1 HID_FORMULA_FAP_BTN_REF1 -Maximize formula:ImageButton:RID_FORMULADLG_FORMULA:RB_REF -Functionsbutton2 HID_FORMULA_FAP_BTN_FX2 -Editfield2 HID_FORMULA_FAP_EDIT2 -Shrink2 HID_FORMULA_FAP_BTN_REF2 -Functionsbutton3 HID_FORMULA_FAP_BTN_FX3 -Editfield3 HID_FORMULA_FAP_EDIT3 -Shrink3 HID_FORMULA_FAP_BTN_REF3 -Functionsbutton4 HID_FORMULA_FAP_BTN_FX4 -Editfield4 HID_FORMULA_FAP_EDIT4 -Shrink4 HID_FORMULA_FAP_BTN_REF4 -TabFunctionWizardStructure HID_FORMULATAB_STRUCT -Structure HID_FORMULA_FAP_STRUCT -Formel HID_FORMULA_FAP_FORMULA -Matrix formula:CheckBox:RID_FORMULADLG_FORMULA:BTN_MATRIX -Backward formula:PushButton:RID_FORMULADLG_FORMULA:BTN_BACKWARD -Forward formula:PushButton:RID_FORMULADLG_FORMULA:BTN_FORWARD -NextBt formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_FORWARD - -*FTPConnection HID_FTP -ServerName HID_FTP_SERVER -UserName HID_FTP_USERNAME -Password HID_FTP_PASS -Connect HID_FTP_TEST -ChooseARemoteDirectory HID_FTP_TXT_PATH -ChooseARemoteDirectoryB HID_FTP_BTN_PATH -CancelB HID_FTP_CANCEL - -*LoginDialog HID_DLG_LOGIN -LoginName HID_LOGIN_DLG_USER_NAME -LoginPassword HID_LOGIN_DLG_PASSWORD -LoginSavePassword HID_LOGIN_DLG_REMEMBER_PASSWORD -Path HID_LOGIN_DLG_PATH -Browse HID_LOGIN_DLG_BROWSE -Account HID_LOGIN_DLG_ACCOUNT -UseSystemCredentials HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS - -*Gallery SID_GALLERY -NewTheme HID_GALLERY_NEWTHEME +BackButton WIZARDS_HID_DLGIMPORT_0_CMDPREV +CancelButton WIZARDS_HID_DLGIMPORT_0_CMDCANCEL +HelpButton WIZARDS_HID_DLGIMPORT_0_CMDHELP +ContinueButton WIZARDS_HID_DLGIMPORT_0_CMDNEXT + +*ExternalData sc.ModalDialog.25736 +URLField SC_HID_SCDLG_LINKAREAURL +FileChoose sc.PushButton.25736.6 +TableListBox sc.MultiListBox.25736.9 +Update sc.CheckBox.25736.10 +UpdateTime sc.NumericField.25736.11 + +*FindAndReplace .uno:SearchDialog +SearchFor svx.ComboBox.10020.11 +SearchForStyle svx.ListBox.10020.12 +ReplaceWith svx.ComboBox.10020.16 +ReplaceWithStyle svx.ListBox.10020.17 +SearchNow svx.PushButton.10020.20 +SearchAll svx.PushButton.10020.21 +ReplaceBtn svx.PushButton.10020.23 +ReplaceAll svx.PushButton.10020.24 +MatchCase svx.CheckBox.10020.25 +WholeWordsOnly svx.CheckBox.10020.26 +More svx.MoreButton.10020.31 +CurrentSelectionOnly svx.CheckBox.10020.41 +Backwards svx.CheckBox.10020.42 +RegularExpressions svx.CheckBox.10020.43 +SimilaritySearch svx.CheckBox.10020.44 +SimilaritySearchFor svx.PushButton.10020.45 +SearchForStyles svx.CheckBox.10020.46 +MatchFullHalfWidth svx.CheckBox.10020.47 +SoundsLike svx.CheckBox.10020.48 +SoundsLikeOptions svx.PushButton.10020.49 +Attributes svx.PushButton.10020.50 +Formats svx.PushButton.10020.51 +NoFormat svx.PushButton.10020.52 +SearchIn svx.ListBox.10020.55 +Rows svx.RadioButton.10020.57 +Columns svx.RadioButton.10020.58 +SearchInAllSheets svx.CheckBox.10020.59 +Notes svx.CheckBox.10020.60 + +*FormFolderNameDialog DBACCESS_HID_DLG_SAVE_AS +FolderName dbaccess.Edit.19211.3 +FolderReName DBACCESS_HID_DLG_RENAME + +*FormPropertiesDialog SVX_UID_FORMPROPBROWSER_FRAME +FormPropertiesTabControl EXTENSIONS_HID_FM_PROPDLG_TABCTR +TabGeneralForm EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL +TabDataForm EXTENSIONS_HID_FM_PROPDLG_TAB_DATA +TabEventsForm EXTENSIONS_HID_FM_PROPDLG_TAB_EVT + +*FormSaveDialog DBACCESS_HID_EXPLORERDLG_COLLECTION +NewFolder dbaccess.ImageButton.19227.1 +OneLevelUp dbaccess.ImageButton.19227.2 +FormName dbaccess.Edit.19227.1 +SaveBtn dbaccess.PushButton.19227.3 + +*FormWizard WIZARDS_HID_DLGFORM_DIALOG +TablesOrQueriesMaster WIZARDS_HID_DLGFORM_MASTER_LBTABLES +CancelBtn WIZARDS_HID_DLGFORM_CMDCANCEL +BackBtn WIZARDS_HID_DLGFORM_CMDPREV +NextBtn WIZARDS_HID_DLGFORM_CMDNEXT +MasterMoveSelected WIZARDS_HID_DLGFORM_MASTER_CMDMOVESELECTED +MasterMoveAll WIZARDS_HID_DLGFORM_MASTER_CMDMOVEALL +MasterRemoveSelected WIZARDS_HID_DLGFORM_MASTER_CMDREMOVESELECTED +MasterRemoveAll WIZARDS_HID_DLGFORM_MASTER_CMDREMOVEALL +AvailableMasterFields WIZARDS_HID_DLGFORM_MASTER_FIELDSAVAILABLE +FieldsInForm WIZARDS_HID_DLGFORM_MASTER_FIELDSSELECTED +ColumnarLabelsLeft WIZARDS_HID_DLGFORM_CMDLEFTLABELED +ColumnarLabelsOnTop WIZARDS_HID_DLGFORM_CMDTOPLABELED +AsDataSheet WIZARDS_HID_DLGFORM_CMDTABLESTYLE +InBlocksLabelsAbove WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED +PageStyles WIZARDS_HID_DLGFORM_LSTSTYLES +NoBorder WIZARDS_HID_DLGFORM_CMDNOBORDER +ThreeDLook WIZARDS_HID_DLGFORM_CMD3DBORDER +FlatLook WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER +AlignLeft WIZARDS_HID_DLGFORM_CMDALIGNLEFT +AlignRight WIZARDS_HID_DLGFORM_CMDALIGNRIGHT +FinishBtn WIZARDS_HID_DLGFORM_CMDFINISH + +*FunctionsCalc SC_HID_FUNCTION_BOX +FunctionInsert sc.ImageButton.26248.1 +Category sc.ListBox.26248.1 +FunctionList sc.ListBox.26248.2 + +*FunctionWizard FORMULA_HID_FORMULADLG_FORMULA +FunctionWizardTabControl formula.TabControl.31003.18 +TabFunctionWizardFormula FORMULA_HID_FORMULA_FAP_FORMULA +CategoryLB FORMULA_HID_FORMULA_LB_CATEGORY +FunctionLB FORMULA_HID_FORMULA_LB_FUNCTION +TabFunktion FORMULA_HID_FORMULATAB_FUNCTION +Functionsbutton1 FORMULA_HID_FORMULA_FAP_BTN_FX1 +Editfield1 FORMULA_HID_FORMULA_FAP_EDIT1 +Shrink1 FORMULA_HID_FORMULA_FAP_BTN_REF1 +Maximize formula.ImageButton.31003.20 +Functionsbutton2 FORMULA_HID_FORMULA_FAP_BTN_FX2 +Editfield2 FORMULA_HID_FORMULA_FAP_EDIT2 +Shrink2 FORMULA_HID_FORMULA_FAP_BTN_REF2 +Functionsbutton3 FORMULA_HID_FORMULA_FAP_BTN_FX3 +Editfield3 FORMULA_HID_FORMULA_FAP_EDIT3 +Shrink3 FORMULA_HID_FORMULA_FAP_BTN_REF3 +Functionsbutton4 FORMULA_HID_FORMULA_FAP_BTN_FX4 +Editfield4 FORMULA_HID_FORMULA_FAP_EDIT4 +Shrink4 FORMULA_HID_FORMULA_FAP_BTN_REF4 +TabFunctionWizardStructure FORMULA_HID_FORMULATAB_STRUCT +Structure FORMULA_HID_FORMULA_FAP_STRUCT +Formel FORMULA_HID_FORMULA_FAP_FORMULA +Matrix formula.CheckBox.31003.11 +Backward formula.PushButton.31003.8 +Forward formula.PushButton.31003.9 +NextBt formula.PushButton.31005.9 + +*FTPConnection WIZARDS_HID_FTP +ServerName WIZARDS_HID_FTP_SERVER +UserName WIZARDS_HID_FTP_USERNAME +Password WIZARDS_HID_FTP_PASS +Connect WIZARDS_HID_FTP_TEST +ChooseARemoteDirectory WIZARDS_HID_FTP_TXT_PATH +ChooseARemoteDirectoryB WIZARDS_HID_FTP_BTN_PATH +CancelB WIZARDS_HID_FTP_CANCEL + +*LoginDialog UUI_HID_DLG_LOGIN +LoginName UUI_HID_LOGIN_DLG_USER_NAME +LoginPassword UUI_HID_LOGIN_DLG_PASSWORD +LoginSavePassword UUI_HID_LOGIN_DLG_REMEMBER_PASSWORD +Path UUI_HID_LOGIN_DLG_PATH +Browse UUI_HID_LOGIN_DLG_BROWSE +Account UUI_HID_LOGIN_DLG_ACCOUNT +UseSystemCredentials UUI_HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS + +*Gallery .uno:Gallery +NewTheme SVX_HID_GALLERY_NEWTHEME 'NewThemeName NEW_TITLE_FOR_GALLERY_THEME_EDITFIELD -Gallerys HID_GALLERY_THEMELIST -ListView HID_GALLERY_LISTVIEW -IconView HID_GALLERY_ICONVIEW -View HID_GALLERY_WINDOW - -*GalleryNewTitle HID_GALLERY_TITLE -Title HID_GALLERY_TITLE_EDIT - -*HelpAgent HID_HELPAGENT_WINDOW - -*HangulHanjaConversion HID_DIALOG_HANGULHANJA -Original HID_SPELLDLG_SETWORD -Word HID_HANGULDLG_EDIT_NEWWORD -Find cui:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND -Suggestions HID_HANGULDLG_SUGGESTIONS_LIST -HangulAndHanja cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION -HanjaHangul cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED -HangulHanja cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED -HanjaAsRubyAbove cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE -HanjaAsRubyBelow cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW -HangulAsRubyAbove cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE -HangulAsRubyBelow cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW -HangulOnly cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY -HanjaOnly cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY -ReplaceByCharacter cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER -Ignore HID_HANGULDLG_BUTTON_IGNORE -AlwaysIgnore HID_HANGULDLG_BUTTON_IGNOREALL -ReplaceBtn HID_HANGULDLG_BUTTON_CHANGE -AlwaysReplace HID_HANGULDLG_BUTTON_CHANGEALL -Options HID_HANGULDLG_BUTTON_OPTIONS -Grid HID_HANGULDLG_SUGGESTIONS_GRID - -*HangulHanjaOptions HID_HANGULHANJA_OPT_DLG -NewDictionary cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW -EditDictionary cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT -DeleteDictionary cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE -UserDefineDictionary HID_HANGULHANJA_OPT_DICTS_LB -IgnorePostPositionalWord cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST -ShowEntries cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST -ReplaceUniqueEntries cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE - -*HangulHanjaNewDictionary HID_HANGULHANJA_NEWDICT_DLG -DictionaryName cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME - -*HangulHanjaEditDictionary HID_HANGULHANJA_EDIT_DLG -Book cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK -Original cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL -Suggestion1 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1 -Suggestion2 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2 -Suggestion3 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3 -Suggestion4 cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4 -NewEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW -DeleteEntry cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE - -*Hyphenation HID_HYPHENATE svx:ModalDialog:RID_SVXDLG_HYPHENATE -Wort cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD -Vor cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT -Zurueck cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT -Weiter cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE -Entfernen cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE -HyphenateAll cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL - -*HyphenationOptions HID_LNGDLG_NUM_PREBREAK -ZeichenVorUmbruch cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK - -*HTMLImportOptions sc:ModalDialog:RID_SCDLG_TEXT_IMPORT_OPTIONS -Automatic sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_AUTOMATIC -Custom sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_CUSTOM -CustomLanguage sc:ListBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:LB_CUSTOM_LANG -DetectSpecialNumbers sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE - -*HyperlinkDialog HID_HYPERLINK_DIALOG -CloseButton HID_ICCDIALOG_CANCEL_BTN -ApplyButton HID_ICCDIALOG_OK_BTN -BackButton HID_ICCDIALOG_RESET_BTN +Gallerys SVX_HID_GALLERY_THEMELIST +ListView SVX_HID_GALLERY_LISTVIEW +IconView SVX_HID_GALLERY_ICONVIEW +View SVX_HID_GALLERY_WINDOW + +*GalleryNewTitle SVX_HID_GALLERY_TITLE +Title CUI_HID_GALLERY_TITLE_EDIT + +*HelpAgent SVT_HID_HELPAGENT_WINDOW + +*HangulHanjaConversion CUI_HID_DIALOG_HANGULHANJA +Original CUI_HID_SPELLDLG_SETWORD +Word CUI_HID_HANGULDLG_EDIT_NEWWORD +Find cui.PushButton.10001.1 +Suggestions CUI_HID_HANGULDLG_SUGGESTIONS_LIST +HangulAndHanja cui.RadioButton.10001.1 +HanjaHangul cui.RadioButton.10001.2 +HangulHanja cui.RadioButton.10001.3 +HanjaAsRubyAbove cui.RadioButton.10001.4 +HanjaAsRubyBelow cui.RadioButton.10001.5 +HangulAsRubyAbove cui.RadioButton.10001.6 +HangulAsRubyBelow cui.RadioButton.10001.7 +HangulOnly cui.CheckBox.10001.2 +HanjaOnly cui.CheckBox.10001.3 +ReplaceByCharacter cui.CheckBox.10001.1 +Ignore CUI_HID_HANGULDLG_BUTTON_IGNORE +AlwaysIgnore CUI_HID_HANGULDLG_BUTTON_IGNOREALL +ReplaceBtn CUI_HID_HANGULDLG_BUTTON_CHANGE +AlwaysReplace CUI_HID_HANGULDLG_BUTTON_CHANGEALL +Options CUI_HID_HANGULDLG_BUTTON_OPTIONS +Grid CUI_HID_HANGULDLG_SUGGESTIONS_GRID + +*HangulHanjaOptions CUI_HID_HANGULHANJA_OPT_DLG +NewDictionary cui.PushButton.10004.1 +EditDictionary cui.PushButton.10004.2 +DeleteDictionary cui.PushButton.10004.3 +UserDefineDictionary CUI_HID_HANGULHANJA_OPT_DICTS_LB +IgnorePostPositionalWord cui.CheckBox.10004.1 +ShowEntries cui.CheckBox.10004.3 +ReplaceUniqueEntries cui.CheckBox.10004.4 + +*HangulHanjaNewDictionary CUI_HID_HANGULHANJA_NEWDICT_DLG +DictionaryName cui.Edit.10006.1 + +*HangulHanjaEditDictionary CUI_HID_HANGULHANJA_EDIT_DLG +Book cui.ListBox.10005.1 +Original cui.ComboBox.10005.2 +Suggestion1 cui.Edit.10005.1 +Suggestion2 cui.Edit.10005.2 +Suggestion3 cui.Edit.10005.3 +Suggestion4 cui.Edit.10005.4 +NewEntry cui.PushButton.10005.1 +DeleteEntry cui.PushButton.10005.2 + +*Hyphenation CUI_HID_HYPHENATE svx:ModalDialog:RID_SVXDLG_HYPHENATE +Wort cui.Edit.10030.10 +Vor cui.ImageButton.10030.11 +Zurueck cui.ImageButton.10030.12 +Weiter cui.PushButton.10030.20 +Entfernen cui.PushButton.10030.21 +HyphenateAll cui.PushButton.10030.25 + +*HyphenationOptions CUI_HID_LNGDLG_NUM_PREBREAK +ZeichenVorUmbruch cui.NumericField.10830.308 + +*HTMLImportOptions sc.ModalDialog.25756 +Automatic sc.RadioButton.25756.5 +Custom sc.RadioButton.25756.6 +CustomLanguage sc.ListBox.25756.7 +DetectSpecialNumbers sc.CheckBox.25756.9 + +*HyperlinkDialog CUI_HID_HYPERLINK_DIALOG +CloseButton CUI_HID_ICCDIALOG_CANCEL_BTN +ApplyButton CUI_HID_ICCDIALOG_OK_BTN +BackButton CUI_HID_ICCDIALOG_RESET_BTN diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win old mode 100755 new mode 100644 index c2353a085c3b..33d053e6e914 --- a/testautomation/global/win/edia_i_o.win +++ b/testautomation/global/win/edia_i_o.win @@ -1,294 +1,294 @@ -*IconSets HID_IS -Image1 HID_IS_BTN_IMG1 -Image2 HID_IS_BTN_IMG2 -Image3 HID_IS_BTN_IMG3 -Image4 HID_IS_BTN_IMG4 -Image5 HID_IS_BTN_IMG5 -Image6 HID_IS_BTN_IMG6 -Image7 HID_IS_BTN_IMG7 -Image8 HID_IS_BTN_IMG8 -Image9 HID_IS_BTN_IMG9 -Image10 HID_IS_BTN_IMG10 -Image11 HID_IS_BTN_IMG11 -Image12 HID_IS_BTN_IMG12 -Image13 HID_IS_BTN_IMG13 -Image14 HID_IS_BTN_IMG14 -Image15 HID_IS_BTN_IMG15 -Image16 HID_IS_BTN_IMG16 -Image17 HID_IS_BTN_IMG17 -Image18 HID_IS_BTN_IMG18 -Image19 HID_IS_BTN_IMG19 -Image20 HID_IS_BTN_IMG20 -Image21 HID_IS_BTN_IMG21 -Image22 HID_IS_BTN_IMG22 -Image23 HID_IS_BTN_IMG23 -Image24 HID_IS_BTN_IMG24 -Image25 HID_IS_BTN_IMG25 -Image26 HID_IS_BTN_IMG26 -Image27 HID_IS_BTN_IMG27 -Image28 HID_IS_BTN_IMG28 -Image29 HID_IS_BTN_IMG29 -Image30 HID_IS_BTN_IMG30 -Image31 HID_IS_BTN_IMG31 -Image32 HID_IS_BTN_IMG32 -None HID_IS_BTN_NONE -CancelB HID_IS_BTN_CANCEL - -*Indexes dbaccess:ModalDialog:DLG_DBASE_INDEXES -Table dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES -TableIndexes dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES -FreeIndexes dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES -Add dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADD -Remove dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVE -AddAll dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADDALL -RemoveAll dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVEALL - -*InsertAxesDialog SID_INSERT_AXIS -MajorXaxis HID_SCH_CB_XAXIS -MajorYaxis HID_SCH_CB_YAXIS -MajorZaxis HID_SCH_CB_ZAXIS -SecondaryXaxis HID_SCH_CB_SECONDARY_XAXIS -SecondaryYaxis HID_SCH_CB_SECONDARY_YAXIS -SecondaryZaxis HID_SCH_CB_SECONDARY_ZAXIS - -*InsertDataColumns HID_AP_INSERT_DB_SEL -TableBtn sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE -FieldsBtn sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_FIELD -TextBtn sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT -DatabaseColumnsTable sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN -DatabaseColumns sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TXT_DB_COLUMN -FromDatabase sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB -FromUser sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_USR -FromUserList sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR -ToEditButton sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_TOEDIT -FieldsInList sw:MultiLineEdit:DLG_AP_INSERT_DB_SEL:ED_DB_TEXT -ParagraphStyle sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DB_PARA_COLL -AllToButton sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_TO -OneToButton sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_TO -OneFromButton sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_FROM -AllFromButton sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_FROM -TableColumns sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL -InsertTableHeading sw:CheckBox:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON -ApplyColumnName sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS -CreateRowOnly sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY -Properties sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT -AutoFormat sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT - -*InsertLabelsDialog SID_INSERT_DESCRIPTION -ShowValue HID_SCH_DATALABEL_VALUE -AsNumber HID_SCH_DATALABEL_NUMBER -AsPercentage HID_SCH_DATALABEL_PERCENT -ShowLabelText HID_SCH_DATALABEL_TEXT -ShowLegendIconWithLabel HID_SCH_DATALABEL_SYMBOL - -*InsertGridsDialog SID_INSERT_GRIDS -MainGridXaxis HID_SCH_CB_XGRID -MainGridYaxis HID_SCH_CB_YGRID -MainGridZaxis HID_SCH_CB_ZGRID -MinorGridXaxis HID_SCH_CB_SECONDARY_XGRID -MinorGridYaxis HID_SCH_CB_SECONDARY_YGRID -MinorGridZaxis HID_SCH_CB_SECONDARY_ZGRID +*IconSets WIZARDS_HID_IS +Image1 WIZARDS_HID_IS_BTN_IMG1 +Image2 WIZARDS_HID_IS_BTN_IMG2 +Image3 WIZARDS_HID_IS_BTN_IMG3 +Image4 WIZARDS_HID_IS_BTN_IMG4 +Image5 WIZARDS_HID_IS_BTN_IMG5 +Image6 WIZARDS_HID_IS_BTN_IMG6 +Image7 WIZARDS_HID_IS_BTN_IMG7 +Image8 WIZARDS_HID_IS_BTN_IMG8 +Image9 WIZARDS_HID_IS_BTN_IMG9 +Image10 WIZARDS_HID_IS_BTN_IMG10 +Image11 WIZARDS_HID_IS_BTN_IMG11 +Image12 WIZARDS_HID_IS_BTN_IMG12 +Image13 WIZARDS_HID_IS_BTN_IMG13 +Image14 WIZARDS_HID_IS_BTN_IMG14 +Image15 WIZARDS_HID_IS_BTN_IMG15 +Image16 WIZARDS_HID_IS_BTN_IMG16 +Image17 WIZARDS_HID_IS_BTN_IMG17 +Image18 WIZARDS_HID_IS_BTN_IMG18 +Image19 WIZARDS_HID_IS_BTN_IMG19 +Image20 WIZARDS_HID_IS_BTN_IMG20 +Image21 WIZARDS_HID_IS_BTN_IMG21 +Image22 WIZARDS_HID_IS_BTN_IMG22 +Image23 WIZARDS_HID_IS_BTN_IMG23 +Image24 WIZARDS_HID_IS_BTN_IMG24 +Image25 WIZARDS_HID_IS_BTN_IMG25 +Image26 WIZARDS_HID_IS_BTN_IMG26 +Image27 WIZARDS_HID_IS_BTN_IMG27 +Image28 WIZARDS_HID_IS_BTN_IMG28 +Image29 WIZARDS_HID_IS_BTN_IMG29 +Image30 WIZARDS_HID_IS_BTN_IMG30 +Image31 WIZARDS_HID_IS_BTN_IMG31 +Image32 WIZARDS_HID_IS_BTN_IMG32 +None WIZARDS_HID_IS_BTN_NONE +CancelB WIZARDS_HID_IS_BTN_CANCEL + +*Indexes dbaccess.ModalDialog.19201 +Table dbaccess.ComboBox.19201.1 +TableIndexes dbaccess.ListBox.19201.1 +FreeIndexes dbaccess.ListBox.19201.2 +Add dbaccess.ImageButton.19201.1 +Remove dbaccess.ImageButton.19201.2 +AddAll dbaccess.ImageButton.19201.3 +RemoveAll dbaccess.ImageButton.19201.4 + +*InsertAxesDialog CHART2_HID_INSERT_AXIS +MajorXaxis CHART2_HID_SCH_CB_XAXIS +MajorYaxis CHART2_HID_SCH_CB_YAXIS +MajorZaxis CHART2_HID_SCH_CB_ZAXIS +SecondaryXaxis CHART2_HID_SCH_CB_SECONDARY_XAXIS +SecondaryYaxis CHART2_HID_SCH_CB_SECONDARY_YAXIS +SecondaryZaxis CHART2_HID_SCH_CB_SECONDARY_ZAXIS + +*InsertDataColumns SW_HID_AP_INSERT_DB_SEL +TableBtn sw.RadioButton.22052.2 +FieldsBtn sw.RadioButton.22052.3 +TextBtn sw.RadioButton.22052.4 +DatabaseColumnsTable sw.ListBox.22052.20 +DatabaseColumns sw.ListBox.22052.15 +FromDatabase sw.RadioButton.22052.12 +FromUser sw.RadioButton.22052.13 +FromUserList sw.ListBox.22052.14 +ToEditButton sw.ImageButton.22052.16 +FieldsInList sw.MultiLineEdit.22052.17 +ParagraphStyle sw.ListBox.22052.19 +AllToButton sw.ImageButton.22052.21 +OneToButton sw.ImageButton.22052.22 +OneFromButton sw.ImageButton.22052.23 +AllFromButton sw.ImageButton.22052.24 +TableColumns sw.ListBox.22052.26 +InsertTableHeading sw.CheckBox.22052.28 +ApplyColumnName sw.RadioButton.22052.29 +CreateRowOnly sw.RadioButton.22052.30 +Properties sw.PushButton.22052.31 +AutoFormat sw.PushButton.22052.32 + +*InsertLabelsDialog CHART2_HID_INSERT_DESCRIPTION +ShowValue CHART2_HID_SCH_DATALABEL_VALUE +AsNumber CHART2_HID_SCH_DATALABEL_NUMBER +AsPercentage CHART2_HID_SCH_DATALABEL_PERCENT +ShowLabelText CHART2_HID_SCH_DATALABEL_TEXT +ShowLegendIconWithLabel CHART2_HID_SCH_DATALABEL_SYMBOL + +*InsertGridsDialog CHART2_HID_INSERT_GRIDS +MainGridXaxis CHART2_HID_SCH_CB_XGRID +MainGridYaxis CHART2_HID_SCH_CB_YGRID +MainGridZaxis CHART2_HID_SCH_CB_ZGRID +MinorGridXaxis CHART2_HID_SCH_CB_SECONDARY_XGRID +MinorGridYaxis CHART2_HID_SCH_CB_SECONDARY_YGRID +MinorGridZaxis CHART2_HID_SCH_CB_SECONDARY_ZGRID -*InsertLegendDialog SID_INSERT_CHART_LEGEND -Display HID_SCH_LEGEND_SHOW -PositionLeft HID_SCH_LEGEND_POS_LEFT -PositionTop HID_SCH_LEGEND_POS_TOP -PositionRight HID_SCH_LEGEND_POS_RIGHT -PositionBottom HID_SCH_LEGEND_POS_BOTTOM - -*InsertPaste sd:ModalDialog:DLG_INSERT_PASTE -Before sd:RadioButton:DLG_INSERT_PASTE:RB_BEFORE -After sd:RadioButton:DLG_INSERT_PASTE:RB_AFTER +*InsertLegendDialog CHART2_HID_INSERT_CHART_LEGEND +Display CHART2_HID_SCH_LEGEND_SHOW +PositionLeft CHART2_HID_SCH_LEGEND_POS_LEFT +PositionTop CHART2_HID_SCH_LEGEND_POS_TOP +PositionRight CHART2_HID_SCH_LEGEND_POS_RIGHT +PositionBottom CHART2_HID_SCH_LEGEND_POS_BOTTOM + +*InsertPaste sd.ModalDialog.678 +Before sd.RadioButton.678.1 +After sd.RadioButton.678.2 -*InsertTrendlinesDialog SID_INSERT_STATISTICS -None HID_SCH_TRENDLINE_RB_NONE -Linear HID_SCH_TRENDLINE_RB_LINEAR -Logarithmic HID_SCH_TRENDLINE_RB_LOGARITHMIC -Exponential HID_SCH_TRENDLINE_RB_EXPONENTIAL -Power HID_SCH_TRENDLINE_RB_POWER -ShowEquation HID_SCH_TRENDLINE_SHOW_EQUATION -ShowCorrelationCoefficient HID_SCH_TRENDLINE_SHOW_R_SQUARED - -*InsertTitleDialog SID_INSERT_TITLE -MainTitle HID_SCH_TITLE_MAIN -SubTitle HID_SCH_TITLE_SUB -TitleXaxis HID_SCH_TITLE_X -TitleYaxis HID_SCH_TITLE_Y -TitleZaxis HID_SCH_TITLE_Z -SecondTitleXaxis HID_SCH_TITLE_SECONDARY_X -SecondTitleYaxis HID_SCH_TITLE_SECONDARY_Y - - -*InsertYErrorBarsDLG chart2:ModalDialog:DLG_DATA_YERRORBAR -MeanValue HID_SCH_STATISTIK_MEANVALUE -NoFunction HID_SCH_STATISTIK_NO_ERROR -Variance HID_SCH_STATISTIK_VARIANT -StandardDeviation HID_SCH_STATISTIK_SIGMA -Percentage HID_SCH_STATISTIK_PERCENT -ErrorMargin HID_SCH_STATISTIK_BIGERROR -ConstantValue HID_SCH_STATISTIK_CONSTERROR -PercentageValue HID_SCH_STATISTIK_PERCENT_VALUE -ErrorMarginValue HID_SCH_STATISTIK_BIGERROR_VALUE -ConstantValuePlus HID_SCH_STATISTIK_PLUS_VALUE -ConstantValueMinus HID_SCH_STATISTIK_MINUS_VALUE -ErrorIndicator HID_SCH_CT_INDICATE +*InsertTrendlinesDialog CHART2_HID_INSERT_STATISTICS +None CHART2_HID_SCH_TRENDLINE_RB_NONE +Linear CHART2_HID_SCH_TRENDLINE_RB_LINEAR +Logarithmic CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC +Exponential CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL +Power CHART2_HID_SCH_TRENDLINE_RB_POWER +ShowEquation CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION +ShowCorrelationCoefficient CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED + +*InsertTitleDialog CHART2_HID_INSERT_TITLE +MainTitle CHART2_HID_SCH_TITLE_MAIN +SubTitle CHART2_HID_SCH_TITLE_SUB +TitleXaxis CHART2_HID_SCH_TITLE_X +TitleYaxis CHART2_HID_SCH_TITLE_Y +TitleZaxis CHART2_HID_SCH_TITLE_Z +SecondTitleXaxis CHART2_HID_SCH_TITLE_SECONDARY_X +SecondTitleYaxis CHART2_HID_SCH_TITLE_SECONDARY_Y + + +*InsertYErrorBarsDLG chart2.ModalDialog.842 +MeanValue CHART2_HID_SCH_STATISTIK_MEANVALUE +NoFunction CHART2_HID_SCH_STATISTIK_NO_ERROR +Variance CHART2_HID_SCH_STATISTIK_VARIANT +StandardDeviation CHART2_HID_SCH_STATISTIK_SIGMA +Percentage CHART2_HID_SCH_STATISTIK_PERCENT +ErrorMargin CHART2_HID_SCH_STATISTIK_BIGERROR +ConstantValue CHART2_HID_SCH_STATISTIK_CONSTERROR +PercentageValue CHART2_HID_SCH_STATISTIK_PERCENT_VALUE +ErrorMarginValue CHART2_HID_SCH_STATISTIK_BIGERROR_VALUE +ConstantValuePlus CHART2_HID_SCH_STATISTIK_PLUS_VALUE +ConstantValueMinus CHART2_HID_SCH_STATISTIK_MINUS_VALUE +ErrorIndicator CHART2_HID_SCH_CT_INDICATE -*JavaClassPath HID_OPTIONS_JAVA_CLASSPATH -ClassPath cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH -AddArchive cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE -AddFolder cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH -Remove cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH - -*JavaStartParameter HID_OPTIONS_JAVA_PARAMETER -StartParameter cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER -Assign cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN -AssignedStartParameters cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED -Remove cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE - -*JoinProperties HID_DLG_QRY_JOIN -Type HID_DLG_QRY_JOINTYPE -QueryHelpText HID_DLG_QRY_HELPTEXT -FielsInvolved HID_RELDLG_KEYFIELDS -LeftFieldCell HID_RELATIONDIALOG_LEFTFIELDCELL -RightFieldCell HID_RELATIONDIALOG_RIGHTFIELDCELL - -*LabelFieldSelection extensions:ModalDialog:RID_DLG_SELECTLABELCONTROL - -*LicenseAgreementDialog HID_LICENSEDIALOG -LicenseText framework:MultiLineEdit:DLG_LICENSE:ML_LICENSE -ScrollBtn framework:PushButton:DLG_LICENSE:PB_PAGEDOWN -DeclineBtn framework:PushButton:DLG_LICENSE:PB_DECLINE -AcceptBtn framework:PushButton:DLG_LICENSE:PB_ACCEPT - -*FormLinkDialog extensions:ModalDialog:RID_DLG_FORMLINKS -LinkDetail1 UID_FIELDLINK_DETAIL1 -LinkMaster1 UID_FIELDLINK_MASTER1 -LinkDetail2 UID_FIELDLINK_DETAIL2 -LinkMaster2 UID_FIELDLINK_MASTER2 -LinkDetail3 UID_FIELDLINK_DETAIL3 -LinkMaster3 UID_FIELDLINK_MASTER3 -LinkDetail4 UID_FIELDLINK_DETAIL4 -LinkMaster4 UID_FIELDLINK_MASTER4 -SuggestBtn extensions:PushButton:RID_DLG_FORMLINKS:PB_SUGGEST - -*MacroMigration dbaccess:ModalDialog:DLG_MACRO_MIGRATION -DatabaseFile SID_OPENURL -Browse dbaccess:PushButton:TP_SAVE_DBDOC_AS:PB_BROWSE_SAVE_AS_LOCATION -BackButton HID_WIZARD_PREVIOUS -NextButton HID_WIZARD_NEXT -BackupLocation HID_MACRO_MIGRATION_BACKUP_LOCATION - -*MailMerge HID_MAIL_MERGE_CREATE_FROM -ThisDocument sw:RadioButton:DLG_MERGE_CREATE:RB_THISDOC -UseTemplate sw:RadioButton:DLG_MERGE_CREATE:RB_TEMPLATE +*JavaClassPath CUI_HID_OPTIONS_JAVA_CLASSPATH +ClassPath cui.ListBox.10255.11 +AddArchive cui.PushButton.10255.20 +AddFolder cui.PushButton.10255.21 +Remove cui.PushButton.10255.22 + +*JavaStartParameter CUI_HID_OPTIONS_JAVA_PARAMETER +StartParameter cui.Edit.10254.11 +Assign cui.PushButton.10254.12 +AssignedStartParameters cui.ListBox.10254.21 +Remove cui.PushButton.10254.23 + +*JoinProperties DBACCESS_HID_DLG_QRY_JOIN +Type DBACCESS_HID_DLG_QRY_JOINTYPE +QueryHelpText DBACCESS_HID_DLG_QRY_HELPTEXT +FielsInvolved DBACCESS_HID_RELDLG_KEYFIELDS +LeftFieldCell DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL +RightFieldCell DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL + +*LabelFieldSelection extensions.ModalDialog.1000 + +*LicenseAgreementDialog FWK_HID_LICENSEDIALOG +LicenseText framework.MultiLineEdit.256.11 +ScrollBtn framework.PushButton.256.18 +DeclineBtn framework.PushButton.256.22 +AcceptBtn framework.PushButton.256.23 + +*FormLinkDialog extensions.ModalDialog.1002 +LinkDetail1 EXTENSIONS_UID_FIELDLINK_DETAIL1 +LinkMaster1 EXTENSIONS_UID_FIELDLINK_MASTER1 +LinkDetail2 EXTENSIONS_UID_FIELDLINK_DETAIL2 +LinkMaster2 EXTENSIONS_UID_FIELDLINK_MASTER2 +LinkDetail3 EXTENSIONS_UID_FIELDLINK_DETAIL3 +LinkMaster3 EXTENSIONS_UID_FIELDLINK_MASTER3 +LinkDetail4 EXTENSIONS_UID_FIELDLINK_DETAIL4 +LinkMaster4 EXTENSIONS_UID_FIELDLINK_MASTER4 +SuggestBtn extensions.PushButton.1002.4 + +*MacroMigration dbaccess.ModalDialog.19200 +DatabaseFile .uno:OpenUrl +Browse dbaccess.PushButton.19201.1 +BackButton SVT_HID_WIZARD_PREVIOUS +NextButton SVT_HID_WIZARD_NEXT +BackupLocation DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION + +*MailMerge SW_HID_MAIL_MERGE_CREATE_FROM +ThisDocument sw.RadioButton.22812.2 +UseTemplate sw.RadioButton.22812.3 *MailMergeFloat active -ReturnToMailMergeWizard HID_RETURN_TO_MAILMERGE - -*MailMergeInsertFields HID_MAIL_MERGE_INSERT_FIELDS -UseExisting sw:RadioButton:DLG_MERGE_FIELD_CONNECTIONS:RB_USEEXISTING -CreateNewConnection sw:RadioButton:DLG_MERGE_FIELD_CONNECTIONS:RB_CREATENEW - -*ManageNamespaceDLG HID_XFORMS_MANAGENAMESPACE_DLG -Prefix svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_PREFIX -URL svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_URL - -*MailMergeWizard sw:ModalDialog:DLG_MAILMERGEWIZARD -BackButton HID_MM_PREV_PAGE -NextButton HID_MM_NEXT_PAGE - -*ManageUILanguages HID_BASICIDE_MANAGE_LANGUAGE -PresentLanguages basctl:ListBox:RID_DLG_MANAGE_LANGUAGE:LB_LANGUAGE -Add basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_ADD_LANG -Delete basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_DEL_LANG -Default basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_MAKE_DEFAULT - -*MasterPasswordDefine HID_DLG_MASTERPASSWORD_CRT -Password1 uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_CRT -Password2 uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_REPEAT - -*MasterPasswordEnter HID_DLG_MASTERPASSWORD_UUI -Password uui:Edit:DLG_UUI_MASTERPASSWORD:ED_MASTERPASSWORD - -*MatchFields HID_MM_ASSIGNFIELDS -Title HID_MM_HEADER_0 -FirstName HID_MM_HEADER_1 -LastName HID_MM_HEADER_2 -Company HID_MM_HEADER_3 -Address1 HID_MM_HEADER_4 -Address2 HID_MM_HEADER_5 -City HID_MM_HEADER_6 -State HID_MM_HEADER_7 -ZIP HID_MM_HEADER_8 -Country HID_MM_HEADER_9 -PhonePrivate HID_MM_HEADER_10 -PhoneBusiness HID_MM_HEADER_11 -Email HID_MM_HEADER_12 -Gender HID_MM_HEADER_13 - -*Mplayer HID_AVMEDIA_PLAYERWINDOW -Mopen HID_AVMEDIA_TOOLBOXITEM_OPEN -mInsert HID_AVMEDIA_TOOLBOXITEM_INSERT -mPlay HID_AVMEDIA_TOOLBOXITEM_PLAY -mPause HID_AVMEDIA_TOOLBOXITEM_PAUSE -mStop HID_AVMEDIA_TOOLBOXITEM_STOP -mLoop HID_AVMEDIA_TOOLBOXITEM_LOOP -mTimeslider HID_AVMEDIA_TIMESLIDER -mMute HID_AVMEDIA_TOOLBOXITEM_MUTE -mVolume HID_AVMEDIA_VOLUMESLIDER -mZoomlistbox HID_AVMEDIA_ZOOMLISTBOX -mTimeedit HID_AVMEDIA_TIMEEDIT - -*MenuOrganiser HID_SVX_CONFIG_MENU_ORGANIZER -MenuName cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME -ButtonUp cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP -ButtonDown cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN - -*ModifyLink sfx2:ModalDialog:MD_DDE_LINKEDIT -ModifyDDEApplication sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_APP -ModifyDDEFile sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_TOPIC -ModifyDDECategory sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_ITEM - -*Mosaic SID_GRFFILTER_MOSAIC -Width cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH -Height cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT -EnhanceEdges cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES - -*NewAddressList HID_MM_CREATEADDRESSLIST -New sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_NEW -Delete sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_DELETE -Find sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_FIND -Customize sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_CUSTOMIZE -ShowFirst sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_START -ShowPrevious sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_PREV -ShowNumber sw:NumericField:DLG_MM_CREATEADDRESSLIST:NF_SETNO -ShowNext sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_NEXT -ShowLast sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_END - -*NewAddressBlock HID_MM_CUSTOMIZEADDRESSBLOCK -SelectField HID_MM_CUSTOMFIELDS -Add sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_INSERTFIELD -Remove sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_REMOVEFIELD -Arrange sw:MultiLineEdit:DLG_MM_CUSTOMIZEADDRESSBLOCK:ED_DRAG -MoveUp sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_UP -MoveLeft sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_LEFT -MoveRight sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_RIGHT -MoveDown sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_DOWN -Select sw:ComboBox:DLG_MM_CUSTOMIZEADDRESSBLOCK:CB_FIELD - -*NewToolbar cui:ModalDialog:MD_NEW_TOOLBAR -ToolbarName cui:Edit:MD_NEW_TOOLBAR:EDT_STRING -SaveIn cui:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN - -*NewsletterLayout HID_DLGNEWSLTR_DIALOG -Newsletter HID_DLGNEWSLTR_OPTSTANDARDLAYOUT -CommemorativePublication HID_DLGNEWSLTR_OPTPARTYLAYOUT -Brochure HID_DLGNEWSLTR_OPTBROCHURELAYOUT -Single HID_DLGNEWSLTR_OPTSINGLESIDED -Duplex HID_DLGNEWSLTR_OPTDOUBLESIDED -OKButton HID_DLGNEWSLTR_CMDGOON - -*OLEObjektInsert SID_INSERT_OBJECT +ReturnToMailMergeWizard SW_HID_RETURN_TO_MAILMERGE + +*MailMergeInsertFields SW_HID_MAIL_MERGE_INSERT_FIELDS +UseExisting sw.RadioButton.22813.8 +CreateNewConnection sw.RadioButton.22813.9 + +*ManageNamespaceDLG SVX_HID_XFORMS_MANAGENAMESPACE_DLG +Prefix svx.Edit.18015.11 +URL svx.Edit.18015.13 + +*MailMergeWizard sw.ModalDialog.22053 +BackButton SW_HID_MM_PREV_PAGE +NextButton SW_HID_MM_NEXT_PAGE + +*ManageUILanguages BASCTL_HID_BASICIDE_MANAGE_LANGUAGE +PresentLanguages basctl.ListBox.16870.2 +Add basctl.PushButton.16870.3 +Delete basctl.PushButton.16870.4 +Default basctl.PushButton.16870.5 + +*MasterPasswordDefine UUI_HID_DLG_MASTERPASSWORD_CRT +Password1 uui.Edit.14521.21 +Password2 uui.Edit.14521.23 + +*MasterPasswordEnter UUI_HID_DLG_MASTERPASSWORD_UUI +Password uui.Edit.14512.21 + +*MatchFields SW_HID_MM_ASSIGNFIELDS +Title SW_HID_MM_HEADER_0 +FirstName SW_HID_MM_HEADER_1 +LastName SW_HID_MM_HEADER_2 +Company SW_HID_MM_HEADER_3 +Address1 SW_HID_MM_HEADER_4 +Address2 SW_HID_MM_HEADER_5 +City SW_HID_MM_HEADER_6 +State SW_HID_MM_HEADER_7 +ZIP SW_HID_MM_HEADER_8 +Country SW_HID_MM_HEADER_9 +PhonePrivate SW_HID_MM_HEADER_10 +PhoneBusiness SW_HID_MM_HEADER_11 +Email SW_HID_MM_HEADER_12 +Gender SW_HID_MM_HEADER_13 + +*Mplayer AVMEDIA_HID_AVMEDIA_PLAYERWINDOW +Mopen AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN +mInsert AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT +mPlay AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY +mPause AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE +mStop AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP +mLoop AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP +mTimeslider AVMEDIA_HID_AVMEDIA_TIMESLIDER +mMute AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE +mVolume AVMEDIA_HID_AVMEDIA_VOLUMESLIDER +mZoomlistbox AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX +mTimeedit AVMEDIA_HID_AVMEDIA_TIMEEDIT + +*MenuOrganiser CUI_HID_SVX_CONFIG_MENU_ORGANIZER +MenuName cui.Edit.379.388 +ButtonUp cui.ImageButton.379.382 +ButtonDown cui.ImageButton.379.383 + +*ModifyLink sfx2.ModalDialog.517 +ModifyDDEApplication sfx2.Edit.517.50 +ModifyDDEFile sfx2.Edit.517.51 +ModifyDDECategory sfx2.Edit.517.52 + +*Mosaic .uno:GraphicFilterMosaic +Width cui.MetricField.10332.2 +Height cui.MetricField.10332.4 +EnhanceEdges cui.CheckBox.10332.5 + +*NewAddressList SW_HID_MM_CREATEADDRESSLIST +New sw.PushButton.22064.3 +Delete sw.PushButton.22064.4 +Find sw.PushButton.22064.5 +Customize sw.PushButton.22064.6 +ShowFirst sw.PushButton.22064.8 +ShowPrevious sw.PushButton.22064.9 +ShowNumber sw.NumericField.22064.10 +ShowNext sw.PushButton.22064.11 +ShowLast sw.PushButton.22064.12 + +*NewAddressBlock SW_HID_MM_CUSTOMIZEADDRESSBLOCK +SelectField SW_HID_MM_CUSTOMFIELDS +Add sw.ImageButton.22068.42 +Remove sw.ImageButton.22068.43 +Arrange sw.MultiLineEdit.22068.49 +MoveUp sw.ImageButton.22068.50 +MoveLeft sw.ImageButton.22068.51 +MoveRight sw.ImageButton.22068.52 +MoveDown sw.ImageButton.22068.53 +Select sw.ComboBox.22068.55 + +*NewToolbar cui.ModalDialog.401 +ToolbarName cui.Edit.401.402 +SaveIn cui.ListBox.401.324 + +*NewsletterLayout WIZARDS_HID_DLGNEWSLTR_DIALOG +Newsletter WIZARDS_HID_DLGNEWSLTR_OPTSTANDARDLAYOUT +CommemorativePublication WIZARDS_HID_DLGNEWSLTR_OPTPARTYLAYOUT +Brochure WIZARDS_HID_DLGNEWSLTR_OPTBROCHURELAYOUT +Single WIZARDS_HID_DLGNEWSLTR_OPTSINGLESIDED +Duplex WIZARDS_HID_DLGNEWSLTR_OPTDOUBLESIDED +OKButton WIZARDS_HID_DLGNEWSLTR_CMDGOON + +*OLEObjektInsert .uno:InsertObject NeuErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT AusDateiErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE Objekttyp cui:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE @@ -296,8 +296,8 @@ OleDatei cui:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH Verknuepfen cui:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK Durchsuchen cui:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH -*InsertTableImpress cui:ModalDialog:RID_SVX_NEWTABLE_DLG -NumberOfColumns cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS -NumberOfRows cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS +*InsertTableImpress cui.ModalDialog.10044 +NumberOfColumns cui.NumericField.10044.2 +NumberOfRows cui.NumericField.10044.4 -*TableDesign sd:ModalDialog:DLG_TABLEDESIGNPANE +*TableDesign sd.ModalDialog.20974 diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win index a97b3b3ed8be..597e1c2114c7 100644 --- a/testautomation/global/win/edia_p_s.win +++ b/testautomation/global/win/edia_p_s.win @@ -1,75 +1,75 @@ -*PackageManager HID_PACKAGE_MANAGER -Add desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_ADD -Updates desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_CHECK_UPDATES -BrowsePackages HID_EXTENSION_MANAGER_LISTBOX -Options HID_EXTENSION_MANAGER_LISTBOX_OPTIONS -Enable HID_EXTENSION_MANAGER_LISTBOX_ENABLE -Disable HID_EXTENSION_MANAGER_LISTBOX_DISABLE -Remove HID_EXTENSION_MANAGER_LISTBOX_REMOVE - -*Pagelayout_UndoDeleteWarning HID_SD_UNDODELETEWARNING_DLG -DontShowAgain HID_SD_UNDODELETEWARNING_CBX - -*ParameterInput dbaccess:ModalDialog:DLG_PARAMETERS -Parameters dbaccess:ListBox:DLG_PARAMETERS:LB_ALLPARAMS -Value dbaccess:Edit:DLG_PARAMETERS:ET_PARAM -NextParameter dbaccess:PushButton:DLG_PARAMETERS:BT_TRAVELNEXT - -*PasswordDLG HID_PASSWD -UserName sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER -Password sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD -PasswordConfirm sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM - -*PasswdDLG HID_PASSWORD -OldPassword svx:Edit:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD -NewPassword svx:Edit:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD -Confirm svx:Edit:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD +*PackageManager DESKTOP_HID_PACKAGE_MANAGER +Add desktop.PushButton.2000.12 +Updates desktop.PushButton.2000.13 +BrowsePackages DESKTOP_HID_EXTENSION_MANAGER_LISTBOX +Options DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS +Enable DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE +Disable DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE +Remove DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE + +*Pagelayout_UndoDeleteWarning SD_HID_SD_UNDODELETEWARNING_DLG +DontShowAgain SD_HID_SD_UNDODELETEWARNING_CBX + +*ParameterInput dbaccess.ModalDialog.19205 +Parameters dbaccess.ListBox.19205.1 +Value dbaccess.Edit.19205.4 +NextParameter dbaccess.PushButton.19205.6 + +*PasswordDLG SFX2_HID_PASSWD +UserName sfx2.Edit.2316.12 +Password sfx2.Edit.2316.14 +PasswordConfirm sfx2.Edit.2316.16 + +*PasswdDLG SVX_HID_PASSWORD +OldPassword svx.Edit.10141.11 +NewPassword svx.Edit.10141.21 +Confirm svx.Edit.10141.23 *PDFOptions HID_FILTER_PDF_OPTIONS -RangeAll filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL -RangePages filter:RadioButton:RID_PDF_TAB_GENER:RB_RANGE -RangeSelection filter:RadioButton:RID_PDF_TAB_GENER:RB_SELECTION -RangePagesEdit filter:Edit:RID_PDF_TAB_GENER:ED_PAGES -LosslessCompression filter:RadioButton:RID_PDF_TAB_GENER:RB_LOSSLESSCOMPRESSION -JpegCompression filter:RadioButton:RID_PDF_TAB_GENER:RB_JPEGCOMPRESSION -ImagesQuality filter:MetricField:RID_PDF_TAB_GENER:NF_QUALITY -ReduceImageResolution filter:CheckBox:RID_PDF_TAB_GENER:CB_REDUCEIMAGERESOLUTION -ReduceImageResolutionDPI filter:ComboBox:RID_PDF_TAB_GENER:CO_REDUCEIMAGERESOLUTION -TaggedPDF filter:CheckBox:RID_PDF_TAB_GENER:CB_TAGGEDPDF -ExportNotes filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTES -TransitionEffects filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTBOOKMARKS -FormsFormat filter:ListBox:RID_PDF_TAB_GENER:LB_FORMSFORMAT -ExportBlankPages filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES +RangeAll filter.RadioButton.20201.2 +RangePages filter.RadioButton.20201.3 +RangeSelection filter.RadioButton.20201.4 +RangePagesEdit filter.Edit.20201.5 +LosslessCompression filter.RadioButton.20201.10 +JpegCompression filter.RadioButton.20201.11 +ImagesQuality filter.MetricField.20201.13 +ReduceImageResolution filter.CheckBox.20201.14 +ReduceImageResolutionDPI filter.ComboBox.20201.15 +TaggedPDF filter.CheckBox.20201.17 +ExportNotes filter.CheckBox.20201.18 +TransitionEffects filter.CheckBox.20201.19 +FormsFormat filter.ListBox.20201.22 +ExportBlankPages filter.CheckBox.20201.24 *PDFOptionsInitialView HID_FILTER_PDF_INITIAL_VIEW -PageOnly filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_PAGEONLY -BookmarksAndPage filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_OUTLINE -ThumbnailsAndPage filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_THUMBS -MagnificationDefault filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_DEFAULT -FitInWindow filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIND -FitWidth filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIDTH -FitVisible filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_VISIBLE -PageLayoutDefault filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_DEFAULT -SinglePage filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_SINGPG -Continuous filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONT -ContinuousFacing filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONTFAC +PageOnly filter.RadioButton.20203.81 +BookmarksAndPage filter.RadioButton.20203.82 +ThumbnailsAndPage filter.RadioButton.20203.83 +MagnificationDefault filter.RadioButton.20203.85 +FitInWindow filter.RadioButton.20203.86 +FitWidth filter.RadioButton.20203.87 +FitVisible filter.RadioButton.20203.88 +PageLayoutDefault filter.RadioButton.20203.94 +SinglePage filter.RadioButton.20203.95 +Continuous filter.RadioButton.20203.96 +ContinuousFacing filter.RadioButton.20203.97 *PDFOptionsUserInterface HID_FILTER_PDF_USER_INTERFACE -ResizeWindow filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_RESINIT -CenterWindow filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_CNTRWIN -OpenInFullscreen filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_OPNFULL -DisplayDocumentTitle filter:CheckBox:RID_PDF_TAB_VPREFER:CB_DISPDOCTITLE -HideMenubar filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVMENUBAR -HideToolbar filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVTOOLBAR -HideWindowControls filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVWINCTRL - -*Posterize SID_GRFFILTER_POSTER -PosterColors cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER - -*PortfolioCurrency HID_DLGDEPOT_DIALOG_HISTORY -Currency HID_DLGDEPOT_LSTMARKETS -OKButton HID_DLGDEPOT_0_CMDGOON_HISTORY -CancelButton HID_DLGDEPOT_0_CMDCANCEL_HISTORY +ResizeWindow filter.CheckBox.20202.101 +CenterWindow filter.CheckBox.20202.102 +OpenInFullscreen filter.CheckBox.20202.103 +DisplayDocumentTitle filter.CheckBox.20202.104 +HideMenubar filter.CheckBox.20202.106 +HideToolbar filter.CheckBox.20202.107 +HideWindowControls filter.CheckBox.20202.108 + +*Posterize .uno:GraphicFilterPoster +PosterColors cui.NumericField.10335.2 + +*PortfolioCurrency WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY +Currency WIZARDS_HID_DLGDEPOT_LSTMARKETS +OKButton WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY +CancelButton WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY *Printing .HelpId:vcl:PrintDialog:Dialog PreviewWindow .HelpId:vcl:PrintDialog:Preview @@ -157,471 +157,471 @@ PrintAsSingleJobs .HelpId:vcl:PrintDialog:OptPage:SingleJobs PrintReverse .HelpId:vcl:PrintDialog:OptPage:Reverse PaperTrayFromPrefs .HelpId:vcl:PrintDialog:PrintPaperFromSetup:CheckBox -*PurchaseStarOffice HID_LICENSING_DIALOG -TabPurchase HID_TP_PURCHASE -getSerialNumber tab:PushButton:TP_PURCHASE:PB_PURCHASE_GET -TabUnlockStarOffice HID_TP_UNLOCK -SerialNumberA tab:Edit:TP_UNLOCK:ED_UNLOCK_A -SerialNumberB tab:Edit:TP_UNLOCK:ED_UNLOCK_B -SerialNumberC tab:Edit:TP_UNLOCK:ED_UNLOCK_C -TabSummary HID_TP_SUMMARY - -*QueryEditWindow HID_CTL_QRYSQLEDIT - -*QueryDesignTable HID_CTL_QRYDGNTAB - -*QueryDesignCriterion HID_CTL_QRYDGNCRIT -Visible HID_QRYDGN_ROW_VISIBLE -Table HID_QRYDGN_ROW_TABLE -Field HID_QRYDGN_ROW_FIELD -Sort HID_QRYDGN_ROW_ORDER -Functions HID_QRYDGN_ROW_FUNCTION -AliasName HID_QRYDGN_ROW_ALIAS -Criterion HID_QRYDGN_ROW_CRIT - -*QueryWizard HID_QUERYWIZARD -Summary HID_QUERYWIZARD_TXTSUMMARY -Tables HID_QUERYWIZARD_LSTTABLES -AvailableFields HID_QUERYWIZARD_LSTFIELDS -Add HID_QUERYWIZARD_CMDMOVESELECTED -AddAll HID_QUERYWIZARD_CMDMOVEALL -Remove HID_QUERYWIZARD_CMDREMOVESELECTED -RemoveAll HID_QUERYWIZARD_CMDREMOVEALL -FieldsInQuery HID_QUERYWIZARD_LSTSELFIELDS -Up HID_QUERYWIZARD_CMDMOVEUP -Down HID_QUERYWIZARD_CMDMOVEDOWN -Sort1 HID_QUERYWIZARD_SORT1 -Ascending1 HID_QUERYWIZARD_OPTASCEND1 -Descending1 HID_QUERYWIZARD_OPTDESCEND1 -Sort2 HID_QUERYWIZARD_SORT2 -Ascending2 HID_QUERYWIZARD_OPTASCEND2 -Descending2 HID_QUERYWIZARD_OPTDESCEND2 -Sort3 HID_QUERYWIZARD_SORT3 -Ascending3 HID_QUERYWIZARD_OPTASCEND3 -Descending3 HID_QUERYWIZARD_OPTDESCEND3 -Sort4 HID_QUERYWIZARD_SORT4 -Ascending4 HID_QUERYWIZARD_OPTASCEND4 -Descending4 HID_QUERYWIZARD_OPTDESCEND4 -FieldName1 HID_QUERYWIZARD_LSTFIELDNAME_1 -Condition1 HID_QUERYWIZARD_LSTOPERATOR_1 -Value1 HID_QUERYWIZARD_TXTVALUE_1 -FieldName2 HID_QUERYWIZARD_LSTFIELDNAME_2 -Condition2 HID_QUERYWIZARD_LSTOPERATOR_2 -Value2 HID_QUERYWIZARD_TXTVALUE_2 -FieldName3 HID_QUERYWIZARD_LSTFIELDNAME_3 -Condition3 HID_QUERYWIZARD_LSTOPERATOR_3 -Value3 HID_QUERYWIZARD_TXTVALUE_3 -Alias1 HID_QUERYWIZARD_TXTTITLE_1 -QueryTitle HID_QUERYWIZARD_TXTQUERYTITLE -DisplayQuery HID_QUERYWIZARD_OPTDISPLAYQUERY -ModifyQuery HID_QUERYWIZARD_OPTMODIFYQUERY -BackBtn HID_QUERYWIZARD_BACK -NextBtn HID_QUERYWIZARD_NEXT -FinishBtn HID_QUERYWIZARD_CREATE -CancelBtn HID_QUERYWIZARD_CANCEL - -MatchAll HID_QUERYWIZARD_OPTMATCHALL -MatchAny HID_QUERYWIZARD_OPTMATCHANY -AggregatFunction1 HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 -AggregatField1 HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 -AggregatFunction2 HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 -AggregatField2 HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 -AggregatFunction3 HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 -AggregatField3 HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 -AggregatFunction4 HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 -AggregatField4 HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 -AggregatFunction5 HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 -AggregatField5 HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 -DetailQuery HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY -SummaryQuery HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY -PlusBtn HID_QUERYWIZARD_BTNAGGREGATEPLUS -MinusBtn HID_QUERYWIZARD_BTNAGGREGATEMINUS - -*RelationDesign HID_CTL_RELATIONTAB - -*RelationProperties dbaccess:ModalDialog:DLG_REL_PROPERTIES -UpdateNoAction HID_DLG_REL_NO_CASC_UPD -UpdateCascade HID_DLG_REL_CASC_UPD -UpdateSetNull HID_DLG_REL_CASC_UPD_NULL -UpdateSetDefault HID_DLG_REL_CASC_UPD_DEFAULT -DeleteNoAction HID_DLG_REL_NO_CASC_DEL -DeleteCascade HID_DLG_REL_CASC_DEL -DeleteSetNull HID_DLG_REL_CASC_DEL_NULL -DeleteSetDefault HID_DLG_REL_CASC_DEL_DEFAULT - -LeftTable HID_DLG_QRY_LEFT_TABLE -RightTable HID_DLG_QRY_RIGHT_TABLE -FielsInvolved HID_RELDLG_KEYFIELDS -RightFieldCell HID_RELATIONDIALOG_RIGHTFIELDCELL - -*Relief SID_GRFFILTER_EMBOSS -LightSource HID_GRFFILTER_EMBOSS_LIGHT - -*RenameAutoFormat HID_SC_REN_AFMT_DLG -RenameAutoFormatName HID_SC_REN_AFMT_NAME - -*RenameElement HID_MM_ADD_RENAME_ENTRY -FieldTitle sw:Edit:DLG_MM_ADD_RENAME_ENTRY:ED_FIELDNAME - -*RenameMenu HID_SVX_CONFIG_RENAME_MENU -NewName cui:Edit:RID_SVXDLG_NAME:EDT_STRING - -*RenameToolbar HID_SVX_CONFIG_RENAME_TOOLBAR -NewName cui:Edit:RID_SVXDLG_NAME:EDT_STRING - -*Registration HID_REGISTRATION_DIALOG -Now svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW -Later svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_LATER -Never svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NEVER -AlreadyRegistered svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_DONE - -*ReportWizard HID_DLGREPORT_DIALOG -CancelBtn HID_DLGREPORT_0_CMDCANCEL -BackBtn HID_DLGREPORT_0_CMDPREV -NextBtn HID_DLGREPORT_0_CMDNEXT -FinishBtn HID_DLGREPORT_0_CMDFINISH -Add HID_DLGREPORT_1_CMDMOVESELECTED -AddAll HID_DLGREPORT_1_CMDMOVEALL -RemoveSelected HID_DLGREPORT_1_CMDREMOVESELECTED -RemoveAll HID_DLGREPORT_1_CMDREMOVEALL -Tables HID_DLGREPORT_1_LBTABLES -AvailableFields HID_DLGREPORT_1_FIELDSAVAILABLE -SelectedFields HID_DLGREPORT_1_FIELDSSELECTED -AvailGrouping HID_DLGREPORT_2_GROUPING -SelectedGrouping HID_DLGREPORT_2_PREGROUPINGDEST -AddSelected2 HID_DLGREPORT_2_CMDGROUP -RemoveSelected2 HID_DLGREPORT_2_CMDUNGROUP -SortBy1 HID_DLGREPORT_3_SORT1 -Ascending1 HID_DLGREPORT_3_OPTASCEND1 -Descending1 HID_DLGREPORT_3_OPTDESCEND1 -SortBy2 HID_DLGREPORT_3_SORT3 -Ascending2 HID_DLGREPORT_3_OPTASCEND2 -Descending2 HID_DLGREPORT_3_OPTDESCEND2 -SortBy3 HID_DLGREPORT_3_SORT4 -Ascending3 HID_DLGREPORT_3_OPTASCEND3 -Descending3 HID_DLGREPORT_3_OPTDESCEND3 -SortBy4 HID_DLGREPORT_3_SORT4 -Ascending4 HID_DLGREPORT_3_OPTASCEND4 -Descending4 HID_DLGREPORT_3_OPTDESCEND4 -ReportTitle HID_DLGREPORT_4_TITLE -DataLqayout HID_DLGREPORT_4_DATALAYOUT -PageLayout HID_DLGREPORT_4_PAGELAYOUT -Landscape HID_DLGREPORT_4_LANDSCAPE -Portrait HID_DLGREPORT_4_PORTRAIT -DynamicReportTemplate HID_DLGREPORT_5_OPTDYNTEMPLATE -StaticReport HID_DLGREPORT_5_OPTSTATDOCUMENT -TemplatePath HID_DLGREPORT_5_TXTTEMPLATEPATH -TemplatePathBtn HID_DLGREPORT_5_CMDTEMPLATEPATH -ModifyReportTemplate HID_DLGREPORT_5_OPTEDITTEMPLATE -UseReportTemplateImmediately HID_DLGREPORT_5_OPTUSETEMPLATE -StaticPath HID_DLGREPORT_5_TXTDOCUMENTPATH -StaticPathBtn HID_DLGREPORT_5_CMDDOCUMENTPATH -CreateLinkToDatabase HID_DLGREPORT_5_CHKLINKTODB - -*ResolveConflicts HID_SCDLG_CONFLICTS -KeepMine sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE -KeepOther sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER -KeepAllMine sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE -KeepAllOthers sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS - -*RubyDialog HID_RUBY_DIALOG -BasisText1 svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_1 -RubyText1 svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_1 -BasisText2 svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_2 -RubyText2 svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_2 -BasisText3 svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_3 -RubyText3 svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_3 -BasisText4 svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_4 -RubyText4 svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_4 -AutoDetection svx:CheckBox:RID_SVXDLG_RUBY:CB_AUTO_DETECT -Adjust svx:ListBox:RID_SVXDLG_RUBY:LB_ADJUST -CharacterStyle svx:ListBox:RID_SVXDLG_RUBY:LB_CHAR_STYLE -CallStylist svx:PushButton:RID_SVXDLG_RUBY:PB_STYLIST -DialogClose svx:PushButton:RID_SVXDLG_RUBY:PB_CLOSE -RubyPosition svx:ListBox:RID_SVXDLG_RUBY:LB_POSITION - -*SaveLabelFormat HID_SAVE_LABEL_DLG -Label sw:ComboBox:DLG_SAVE_LABEL:CB_MAKE -Type sw:Edit:DLG_SAVE_LABEL:ED_TYPE - -*ScriptOrganizer HID_SCRIPTORG_DIALOG -ScriptTreeList HID_SCRIPTSBOX -PBRun cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN -PBCreate cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE -PBEdit cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT -PBRename cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME -PBDelete cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL - -*ScriptNameDlg cui:ModalDialog:RID_DLG_NEWLIB -EFObjectName cui:Edit:RID_DLG_NEWLIB:ED_LIBNAME - -*ScriptSelector HID_SELECTOR_DIALOG -LibraryTreeList HID_SELECTOR_CATEGORIES -ScriptList HID_SELECTOR_COMMANDS - -*SelectAddressList HID_MM_ADDRESSLISTDIALOG -Addresses HID_MM_ADDRESSLIST_HB -AddressList HID_MM_ADDRESSLIST_TLB -Add sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_LOADLIST -Create sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_CREATELIST -Filter sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_FILTER -Edit sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_EDIT -ChangeTable sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_TABLE - -*SelectAddressBlock HID_MM_SELECTADDRESSBLOCK -NewBtn sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_NEW -Customize sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_CUSTOMIZE -Delete sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_DELETE -NeverInclude sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_NEVER -AlwaysInclude sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_ALWAYS -ConditionalInclude sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_DEPENDENT -Filter sw:Edit:DLG_MM_SELECTADDRESSBLOCK:ED_COUNTRY - -*SelectCertificate HID_XMLSEC_DLG_CERTCHOOSER -ChooseCertificate HID_XMLSEC_CTRL_CHOOSESIGNATURES -ViewCertificate xmlsecurity:PushButton:RID_XMLSECDLG_CERTCHOOSER:BTN_VIEWCERT - -*SelectSheets SID_SELECT_TABLES -SheetSelectionBox HID_SELECTTABLES - -*ServerAuthentication HID_MM_SERVERAUTHENTICATION -SMTPauthentication sw:CheckBox:DLG_MM_SERVERAUTHENTICATION:CB_AUTHENTICATION -SMTPoutgoing sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SEP_AUTHENTICATION -IncomingMailServer sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMPTAFTERPOP -OutgoingUserName sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_USERNAME -OutgoingPassword sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_OUTPASSWORD -Server sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_SERVER -Port sw:NumericField:DLG_MM_SERVERAUTHENTICATION:NF_PORT -POP3 sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_POP3 -IMAP sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_IMAP -User sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INUSERNAME -Password sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INPASSWORD - -*SetDefaultLanguage HID_BASICIDE_SETDEFAULT_LANGUAGE -DefaultLanguageListbox basctl:ListBox:RID_DLG_SETDEF_LANGUAGE:LB_DEF_LANGUAGE - -*ShareDocument SID_SHARE_DOC -ShareCalc sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE +*PurchaseStarOffice TAB_HID_LICENSING_DIALOG +TabPurchase TAB_HID_TP_PURCHASE +getSerialNumber tab.PushButton.503.4 +TabUnlockStarOffice TAB_HID_TP_UNLOCK +SerialNumberA tab.Edit.504.3 +SerialNumberB tab.Edit.504.4 +SerialNumberC tab.Edit.504.5 +TabSummary TAB_HID_TP_SUMMARY + +*QueryEditWindow DBACCESS_HID_CTL_QRYSQLEDIT + +*QueryDesignTable DBACCESS_HID_CTL_QRYDGNTAB + +*QueryDesignCriterion DBACCESS_HID_CTL_QRYDGNCRIT +Visible DBACCESS_HID_QRYDGN_ROW_VISIBLE +Table DBACCESS_HID_QRYDGN_ROW_TABLE +Field DBACCESS_HID_QRYDGN_ROW_FIELD +Sort DBACCESS_HID_QRYDGN_ROW_ORDER +Functions DBACCESS_HID_QRYDGN_ROW_FUNCTION +AliasName DBACCESS_HID_QRYDGN_ROW_ALIAS +Criterion DBACCESS_HID_QRYDGN_ROW_CRIT + +*QueryWizard WIZARDS_HID_QUERYWIZARD +Summary WIZARDS_HID_QUERYWIZARD_TXTSUMMARY +Tables WIZARDS_HID_QUERYWIZARD_LSTTABLES +AvailableFields WIZARDS_HID_QUERYWIZARD_LSTFIELDS +Add WIZARDS_HID_QUERYWIZARD_CMDMOVESELECTED +AddAll WIZARDS_HID_QUERYWIZARD_CMDMOVEALL +Remove WIZARDS_HID_QUERYWIZARD_CMDREMOVESELECTED +RemoveAll WIZARDS_HID_QUERYWIZARD_CMDREMOVEALL +FieldsInQuery WIZARDS_HID_QUERYWIZARD_LSTSELFIELDS +Up WIZARDS_HID_QUERYWIZARD_CMDMOVEUP +Down WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN +Sort1 WIZARDS_HID_QUERYWIZARD_SORT1 +Ascending1 WIZARDS_HID_QUERYWIZARD_OPTASCEND1 +Descending1 WIZARDS_HID_QUERYWIZARD_OPTDESCEND1 +Sort2 WIZARDS_HID_QUERYWIZARD_SORT2 +Ascending2 WIZARDS_HID_QUERYWIZARD_OPTASCEND2 +Descending2 WIZARDS_HID_QUERYWIZARD_OPTDESCEND2 +Sort3 WIZARDS_HID_QUERYWIZARD_SORT3 +Ascending3 WIZARDS_HID_QUERYWIZARD_OPTASCEND3 +Descending3 WIZARDS_HID_QUERYWIZARD_OPTDESCEND3 +Sort4 WIZARDS_HID_QUERYWIZARD_SORT4 +Ascending4 WIZARDS_HID_QUERYWIZARD_OPTASCEND4 +Descending4 WIZARDS_HID_QUERYWIZARD_OPTDESCEND4 +FieldName1 WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_1 +Condition1 WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_1 +Value1 WIZARDS_HID_QUERYWIZARD_TXTVALUE_1 +FieldName2 WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_2 +Condition2 WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_2 +Value2 WIZARDS_HID_QUERYWIZARD_TXTVALUE_2 +FieldName3 WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_3 +Condition3 WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_3 +Value3 WIZARDS_HID_QUERYWIZARD_TXTVALUE_3 +Alias1 WIZARDS_HID_QUERYWIZARD_TXTTITLE_1 +QueryTitle WIZARDS_HID_QUERYWIZARD_TXTQUERYTITLE +DisplayQuery WIZARDS_HID_QUERYWIZARD_OPTDISPLAYQUERY +ModifyQuery WIZARDS_HID_QUERYWIZARD_OPTMODIFYQUERY +BackBtn WIZARDS_HID_QUERYWIZARD_BACK +NextBtn WIZARDS_HID_QUERYWIZARD_NEXT +FinishBtn WIZARDS_HID_QUERYWIZARD_CREATE +CancelBtn WIZARDS_HID_QUERYWIZARD_CANCEL + +MatchAll WIZARDS_HID_QUERYWIZARD_OPTMATCHALL +MatchAny WIZARDS_HID_QUERYWIZARD_OPTMATCHANY +AggregatFunction1 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 +AggregatField1 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 +AggregatFunction2 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 +AggregatField2 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 +AggregatFunction3 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 +AggregatField3 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 +AggregatFunction4 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 +AggregatField4 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 +AggregatFunction5 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 +AggregatField5 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 +DetailQuery WIZARDS_HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY +SummaryQuery WIZARDS_HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY +PlusBtn WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEPLUS +MinusBtn WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS + +*RelationDesign DBACCESS_HID_CTL_RELATIONTAB + +*RelationProperties dbaccess.ModalDialog.19217 +UpdateNoAction DBACCESS_HID_DLG_REL_NO_CASC_UPD +UpdateCascade DBACCESS_HID_DLG_REL_CASC_UPD +UpdateSetNull DBACCESS_HID_DLG_REL_CASC_UPD_NULL +UpdateSetDefault DBACCESS_HID_DLG_REL_CASC_UPD_DEFAULT +DeleteNoAction DBACCESS_HID_DLG_REL_NO_CASC_DEL +DeleteCascade DBACCESS_HID_DLG_REL_CASC_DEL +DeleteSetNull DBACCESS_HID_DLG_REL_CASC_DEL_NULL +DeleteSetDefault DBACCESS_HID_DLG_REL_CASC_DEL_DEFAULT + +LeftTable DBACCESS_HID_DLG_QRY_LEFT_TABLE +RightTable DBACCESS_HID_DLG_QRY_RIGHT_TABLE +FielsInvolved DBACCESS_HID_RELDLG_KEYFIELDS +RightFieldCell DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL + +*Relief .uno:GraphicFilterRelief +LightSource CUI_HID_GRFFILTER_EMBOSS_LIGHT + +*RenameAutoFormat SC_HID_SC_REN_AFMT_DLG +RenameAutoFormatName SC_HID_SC_REN_AFMT_NAME + +*RenameElement SW_HID_MM_ADD_RENAME_ENTRY +FieldTitle sw.Edit.22066.2 + +*RenameMenu CUI_HID_SVX_CONFIG_RENAME_MENU +NewName cui.Edit.10062.1 + +*RenameToolbar CUI_HID_SVX_CONFIG_RENAME_TOOLBAR +NewName cui.Edit.10062.1 + +*Registration SVT_HID_REGISTRATION_DIALOG +Now svtools.RadioButton.16485.3 +Later svtools.RadioButton.16485.4 +Never svtools.RadioButton.16485.5 +AlreadyRegistered svtools.RadioButton.16485.6 + +*ReportWizard WIZARDS_HID_DLGREPORT_DIALOG +CancelBtn WIZARDS_HID_DLGREPORT_0_CMDCANCEL +BackBtn WIZARDS_HID_DLGREPORT_0_CMDPREV +NextBtn WIZARDS_HID_DLGREPORT_0_CMDNEXT +FinishBtn WIZARDS_HID_DLGREPORT_0_CMDFINISH +Add WIZARDS_HID_DLGREPORT_1_CMDMOVESELECTED +AddAll WIZARDS_HID_DLGREPORT_1_CMDMOVEALL +RemoveSelected WIZARDS_HID_DLGREPORT_1_CMDREMOVESELECTED +RemoveAll WIZARDS_HID_DLGREPORT_1_CMDREMOVEALL +Tables WIZARDS_HID_DLGREPORT_1_LBTABLES +AvailableFields WIZARDS_HID_DLGREPORT_1_FIELDSAVAILABLE +SelectedFields WIZARDS_HID_DLGREPORT_1_FIELDSSELECTED +AvailGrouping WIZARDS_HID_DLGREPORT_2_GROUPING +SelectedGrouping WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST +AddSelected2 WIZARDS_HID_DLGREPORT_2_CMDGROUP +RemoveSelected2 WIZARDS_HID_DLGREPORT_2_CMDUNGROUP +SortBy1 WIZARDS_HID_DLGREPORT_3_SORT1 +Ascending1 WIZARDS_HID_DLGREPORT_3_OPTASCEND1 +Descending1 WIZARDS_HID_DLGREPORT_3_OPTDESCEND1 +SortBy2 WIZARDS_HID_DLGREPORT_3_SORT3 +Ascending2 WIZARDS_HID_DLGREPORT_3_OPTASCEND2 +Descending2 WIZARDS_HID_DLGREPORT_3_OPTDESCEND2 +SortBy3 WIZARDS_HID_DLGREPORT_3_SORT4 +Ascending3 WIZARDS_HID_DLGREPORT_3_OPTASCEND3 +Descending3 WIZARDS_HID_DLGREPORT_3_OPTDESCEND3 +SortBy4 WIZARDS_HID_DLGREPORT_3_SORT4 +Ascending4 WIZARDS_HID_DLGREPORT_3_OPTASCEND4 +Descending4 WIZARDS_HID_DLGREPORT_3_OPTDESCEND4 +ReportTitle WIZARDS_HID_DLGREPORT_4_TITLE +DataLqayout WIZARDS_HID_DLGREPORT_4_DATALAYOUT +PageLayout WIZARDS_HID_DLGREPORT_4_PAGELAYOUT +Landscape WIZARDS_HID_DLGREPORT_4_LANDSCAPE +Portrait WIZARDS_HID_DLGREPORT_4_PORTRAIT +DynamicReportTemplate WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE +StaticReport WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT +TemplatePath WIZARDS_HID_DLGREPORT_5_TXTTEMPLATEPATH +TemplatePathBtn WIZARDS_HID_DLGREPORT_5_CMDTEMPLATEPATH +ModifyReportTemplate WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE +UseReportTemplateImmediately WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE +StaticPath WIZARDS_HID_DLGREPORT_5_TXTDOCUMENTPATH +StaticPathBtn WIZARDS_HID_DLGREPORT_5_CMDDOCUMENTPATH +CreateLinkToDatabase WIZARDS_HID_DLGREPORT_5_CHKLINKTODB + +*ResolveConflicts SC_HID_SCDLG_CONFLICTS +KeepMine sc.PushButton.25749.3 +KeepOther sc.PushButton.25749.4 +KeepAllMine sc.PushButton.25749.6 +KeepAllOthers sc.PushButton.25749.7 + +*RubyDialog SVX_HID_RUBY_DIALOG +BasisText1 svx.Edit.10247.10 +RubyText1 svx.Edit.10247.14 +BasisText2 svx.Edit.10247.11 +RubyText2 svx.Edit.10247.15 +BasisText3 svx.Edit.10247.12 +RubyText3 svx.Edit.10247.16 +BasisText4 svx.Edit.10247.13 +RubyText4 svx.Edit.10247.17 +AutoDetection svx.CheckBox.10247.1 +Adjust svx.ListBox.10247.23 +CharacterStyle svx.ListBox.10247.3 +CallStylist svx.PushButton.10247.4 +DialogClose svx.PushButton.10247.8 +RubyPosition svx.ListBox.10247.25 + +*SaveLabelFormat SW_HID_SAVE_LABEL_DLG +Label sw.ComboBox.22760.3 +Type sw.Edit.22760.5 + +*ScriptOrganizer CUI_HID_SCRIPTORG_DIALOG +ScriptTreeList CUI_HID_SCRIPTSBOX +PBRun cui.PushButton.10258.3 +PBCreate cui.PushButton.10258.5 +PBEdit cui.PushButton.10258.6 +PBRename cui.PushButton.10258.7 +PBDelete cui.PushButton.10258.8 + +*ScriptNameDlg cui.ModalDialog.10290 +EFObjectName cui.Edit.10290.14 + +*ScriptSelector CUI_HID_SELECTOR_DIALOG +LibraryTreeList CUI_HID_SELECTOR_CATEGORIES +ScriptList CUI_HID_SELECTOR_COMMANDS + +*SelectAddressList SW_HID_MM_ADDRESSLISTDIALOG +Addresses SW_HID_MM_ADDRESSLIST_HB +AddressList SW_HID_MM_ADDRESSLIST_TLB +Add sw.PushButton.22061.7 +Create sw.PushButton.22061.8 +Filter sw.PushButton.22061.6 +Edit sw.PushButton.22061.4 +ChangeTable sw.PushButton.22061.17 + +*SelectAddressBlock SW_HID_MM_SELECTADDRESSBLOCK +NewBtn sw.PushButton.22069.21 +Customize sw.PushButton.22069.23 +Delete sw.PushButton.22069.22 +NeverInclude sw.RadioButton.22069.25 +AlwaysInclude sw.RadioButton.22069.26 +ConditionalInclude sw.RadioButton.22069.27 +Filter sw.Edit.22069.28 + +*SelectCertificate XMLSECURITY_HID_XMLSEC_DLG_CERTCHOOSER +ChooseCertificate XMLSECURITY_HID_XMLSEC_CTRL_CHOOSESIGNATURES +ViewCertificate xmlsecurity.PushButton.1001.55 + +*SelectSheets .uno:SelectTables +SheetSelectionBox SC_HID_SELECTTABLES + +*ServerAuthentication SW_HID_MM_SERVERAUTHENTICATION +SMTPauthentication sw.CheckBox.21570.50 +SMTPoutgoing sw.RadioButton.21570.51 +IncomingMailServer sw.RadioButton.21570.52 +OutgoingUserName sw.Edit.21570.55 +OutgoingPassword sw.Edit.21570.57 +Server sw.Edit.21570.11 +Port sw.NumericField.21570.13 +POP3 sw.RadioButton.21570.67 +IMAP sw.RadioButton.21570.68 +User sw.Edit.21570.60 +Password sw.Edit.21570.64 + +*SetDefaultLanguage BASCTL_HID_BASICIDE_SETDEFAULT_LANGUAGE +DefaultLanguageListbox basctl.ListBox.16872.2 + +*ShareDocument .uno:ShareDocument +ShareCalc sc.CheckBox.25750.1 +ShowChanges Aenderungenanzeigen -TabFilterPage HID_REDLINING_FILTER_PAGE -ShowDate HID_REDLINING_FILTER_CB_DATE -DateList HID_REDLINING_FILTER_LB_DATE -Date1 HID_REDLINING_FILTER_DF_DATE -Time1 HID_REDLINING_FILTER_TF_DATE -Now1 HID_REDLINING_FILTER_IB_CLOCK -Date2 HID_REDLINING_FILTER_DF_DATE2 -Time2 HID_REDLINING_FILTER_TF_DATE2 -Now2 HID_REDLINING_FILTER_IB_CLOCK2 -ShowAuthor HID_REDLINING_FILTER_CB_AUTOR -AuthorList HID_REDLINING_FILTER_LB_AUTOR -ShowRange HID_REDLINING_FILTER_CB_RANGE -RangeText HID_REDLINING_FILTER_ED_RANGE -ShrinkRange HID_REDLINING_FILTER_BTN_REF -AktionList HID_REDLINING_FILTER_LB_ACTION -ShowChangesCalc sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT -ShowAcceptedChanges sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT -ShowRejectedChanges sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT -ShowComment HID_REDLINING_FILTER_CB_COMMENT -EditComment HID_REDLINING_FILTER_ED_COMMENT -RangeCalc sc:Edit:RID_SCDLG_HIGHLIGHT_CHANGES:ED_ASSIGN -Shrink sc:ImageButton:RID_SCDLG_HIGHLIGHT_CHANGES:RB_ASSIGN - -*SmoothLineProperties HID_SCH_DLG_SPLINE_PROPERTIES -CubicSpline chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_CUBIC -BSpline chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_B -Resolution chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_RESOLUTION -DataPointsOrder chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_ORDER - -*Solarization SID_GRFFILTER_SOLARIZE -Value cui:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD -Invert cui:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT - -*Solver SID_OPENDLG_OPTSOLVER -TargetCell sc:Edit:RID_SCDLG_OPTSOLVER:ED_OBJECTIVECELL -Shrink sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_OBJECTIVECELL -OptimizeMaximum sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MAX -OptimizeMinimum sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MIN -OptimizeValueOf sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_VALUE -OptimizeValueEdit sc:Edit:RID_SCDLG_OPTSOLVER:ED_TARGET -OptimizeValueEditShrink sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_TARGET -ChangingCells sc:Edit:RID_SCDLG_OPTSOLVER:ED_VARIABLECELLS -ChangingCellsShrink sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_VARIABLECELLS -CellReference1 sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT1 -CellReferenceShrink1 sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT1 -Operator1 sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP1 -Value1 sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT1 -ValueShrink1 sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT1 -Remove1 sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE1 -CellReference2 sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT2 -CellReferenceShrink2 sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT2 -Operator2 sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP2 -Value2 sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT2 -ValueShrink2 sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT2 -Remove2 sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE2 -CellReference3 sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT3 -CellReferenceShrink3 sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT3 -Operator3 sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP3 -Value3 sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT3 -ValueShrink3 sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT3 -Remove3 sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE3 -CellReference4 sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT4 -CellReferenceShrink4 sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT4 -Operator4 sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP4 -Value4 sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT4 -ValueShrink4 sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT4 -Remove4 sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE4 -Options sc:PushButton:RID_SCDLG_OPTSOLVER:BTN_OPTIONS -Solve sc:PushButton:RID_SCDLG_OPTSOLVER:BTN_SOLVE - -*SolverOptions HID_SC_SOLVEROPTIONS -SolverEngine sc:ListBox:RID_SCDLG_SOLVEROPTIONS:LB_ENGINE -SolverSettings HID_SC_SOLVEROPTIONS_LB -SolverSettingsEdit sc:PushButton:RID_SCDLG_SOLVEROPTIONS:BTN_EDIT - -*SolverEditSetting HID_SC_SOLVER_INTEGER -SolverNumeric sc:NumericField:RID_SCDLG_SOLVER_INTEGER:NF_VALUE - -*SolvingResult HID_SC_SOLVER_SUCCESS - -*NoSolution HID_SC_SOLVER_NOSOLUTION - -*SortOrder HID_DLG_ORDERCRIT -Fieldname1 dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD1 -Order1 dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE1 -Fieldname2 dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD2 -Order2 dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE2 -Fieldname3 dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD3 -Order3 dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE3 - -*SortRange sc:ModalDialog:RID_SCDLG_SORT_WARNING -ExtendSelection sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_EXTSORT -CurrentSelection sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_CURSORT - -*Spellcheck HID_SPELLCHECK -NotInDictionary cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD -Suggestions cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION -DictionaryLanguage cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE -IgnoreOnce HID_SPLDLG_BUTTON_IGNORE -IgnoreAll HID_SPLDLG_BUTTON_IGNOREALL -AddToDictionary cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT -Change HID_SPLDLG_BUTTON_CHANGE -ChangeAll HID_SPLDLG_BUTTON_CHANGEALL -AutoCorrect cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR -SpellcheckOptions cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS -SpellcheckUndo cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO -SpellcheckClose HID_SPLDLG_BUTTON_CLOSE - -*SQLException dbaccess:ModalDialog:DLG_SQLEXCEPTIONCHAIN -Errors HID_SQLERROR_EXCHAIN_ERRORS -Errortext HID_SQLERROR_EXCHAIN_TEXT - -*HelpContent HID_HELP_ONHELP -HelpContentUP HID_SCRL_PAGEUP -HelpContentDOWN HID_SCRL_PAGEDOWN -HelpContentNAVIGATION HID_SCRL_NAVI - -*StarOfficeHelp HID_HELP_WINDOW -HelpAbout HID_HELP_LISTBOX -TABCONTROL HID_HELP_TABCONTROL - -ContentPage HID_HELP_TABPAGE_CONTENTS -SearchContent HID_HELP_TREELISTBOX_CONTENTS - -IndexPage HID_HELP_TABPAGE_INDEX -SearchIndex sfx2:ComboBox:TP_HELP_INDEX:CB_INDEX -DisplayIndex sfx2:PushButton:TP_HELP_INDEX:PB_OPEN_INDEX - -FindPage HID_HELP_TABPAGE_SEARCH -SearchFind sfx2:ComboBox:TP_HELP_SEARCH:ED_SEARCH -FindButton sfx2:PushButton:TP_HELP_SEARCH:PB_SEARCH -Result sfx2:ListBox:TP_HELP_SEARCH:LB_RESULT -FindInHeadingsOnly sfx2:CheckBox:TP_HELP_SEARCH:CB_SCOPE -FindFullWords sfx2:CheckBox:TP_HELP_SEARCH:CB_FULLWORDS -DisplayFind sfx2:PushButton:TP_HELP_SEARCH:PB_OPEN_SEARCH - -BookmarksPage HID_HELP_TABPAGE_BOOKMARKS -Bookmarks sfx2:ListBox:TP_HELP_BOOKMARKS:LB_BOOKMARKS -DisplayBookmarks sfx2:PushButton:TP_HELP_BOOKMARKS:PB_BOOKMARKS - -HelpWindow HID_EDIT_WIN - -Index HID_HELP_TOOLBOXITEM_INDEX -GoToStart HID_HELP_TOOLBOXITEM_START -Backward HID_HELP_TOOLBOXITEM_BACKWARD -Forward HID_HELP_TOOLBOXITEM_FORWARD -PrintButton HID_HELP_TOOLBOXITEM_PRINT -SetBookmarks HID_HELP_TOOLBOXITEM_BOOKMARKS - -*SaveScheme HID_OPTIONS_COLORCONFIG_SAVE_SCHEME - -SchemeName HID_OPTIONS_COLORCONFIG_NAME_SCHEME - -*SecurityWarning HID_XMLSECDLG_MACROWARN -ViewSignature uui:PushButton:RID_XMLSECDLG_MACROWARN:PB_VIEWSIGNS -TrustAlways uui:CheckBox:RID_XMLSECDLG_MACROWARN:CB_ALWAYSTRUST - -*Slides sd:DockingWindow:FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW -SlidesControl HID_SD_WIN_DOCUMENT - -*Pagepane sd:DockingWindow:FLT_LEFT_PANE_DRAW_DOCKING_WINDOW -Pagecontrol HID_SD_WIN_DOCUMENT - -*Spacing SID_DISTANCE -Category starmath:MenuButton:RID_DISTANCEDIALOG:1 -Default starmath:PushButton:RID_DISTANCEDIALOG:1 -SpacingSpacing HID_SMA_DEFAULT_DIST -LineSpacing HID_SMA_LINE_DIST -RootSpacing HID_SMA_ROOT_DIST -Superscript HID_SMA_SUP_DIST -Subscript HID_SMA_SUB_DIST -Numerator HID_SMA_NUMERATOR_DIST -Denominator HID_SMA_DENOMINATOR_DIST -ExcessLength HID_SMA_FRACLINE_EXCWIDTH -Weight HID_SMA_FRACLINE_LINEWIDTH -UpperLimit HID_SMA_UPPERLIMIT_DIST -LowerLimit HID_SMA_LOWERLIMIT_DIST -ExcessSize HID_SMA_BRACKET_EXCHEIGHT -BracketSpacing HID_SMA_BRACKET_DIST -ExcessSizeAll HID_SMA_BRACKET_EXCHEIGHT2 -ScaleAllBrackets starmath:CheckBox:RID_DISTANCEDIALOG:1 -MatrixLineSpacing HID_SMA_MATRIXROW_DIST -ColumnSpacing HID_SMA_MATRIXCOL_DIST -PrimaryHeight HID_SMA_ATTRIBUT_DIST -MinimunSpacing HID_SMA_INTERATTRIBUT_DIST -OperatorsExcessSize HID_SMA_OPERATOR_EXCHEIGHT -OperatorsSpacing HID_SMA_OPERATOR_DIST -BordersLeft HID_SMA_LEFTBORDER_DIST -BordersRight HID_SMA_RIGHTBORDER_DIST -BordersTop HID_SMA_UPPERBORDER_DIST -BordersBottom HID_SMA_LOWERBORDER_DIST - -*StarOfficeCalendar1 HID_DLGHOLIDAYCAL_DIALOG -Area HID_DLGHOLIDAYCAL_1_CMBSTATE -YearOverview HID_DLGHOLIDAYCAL_1_OPYEAR -MonthOverview HID_DLGHOLIDAYCAL_1_OPMONTH -Year HID_DLGHOLIDAYCAL_1_EDYEAR -Month HID_DLGHOLIDAYCAL_1_EDMONTH -Preview HID_DLGHOLIDAYCAL_1_PREVIEW -Cancel HID_DLGHOLIDAYCAL_0_CMDCANCEL -PersonalData HID_DLGHOLIDAYCAL_0_CMDOWNDATA -Create HID_DLGHOLIDAYCAL_0_CMDOK - -*StarOfficeCalendar2 HID_DLGHOLIDAYCAL_DIALOG -Event HID_DLGHOLIDAYCAL_2_EDEVENT -OneTime HID_DLGHOLIDAYCAL_2_CHKEVENT -Day HID_DLGHOLIDAYCAL_2_EDEVENTDAY -Month HID_DLGHOLIDAYCAL_2_EDEVENTMONTH -Year HID_DLGHOLIDAYCAL_2_EDEVENTYEAR -Insert HID_DLGHOLIDAYCAL_2_CMDINSERT -Delete HID_DLGHOLIDAYCAL_2_CMDDELETE -List HID_DLGHOLIDAYCAL_2_LBOWNDATA -Cancel HID_DLGHOLIDAYCAL_0_CMDCANCEL -Back HID_DLGHOLIDAYCAL_0_CMDOWNDATA -Create HID_DLGHOLIDAYCAL_0_CMDOK - -*StoredPasswordsDialog HID_DLG_WEBCONNECTION_INFO -Remove cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE -RemoveAll cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL -changePassword cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE +TabFilterPage SVX_HID_REDLINING_FILTER_PAGE +ShowDate SVX_HID_REDLINING_FILTER_CB_DATE +DateList SVX_HID_REDLINING_FILTER_LB_DATE +Date1 SVX_HID_REDLINING_FILTER_DF_DATE +Time1 SVX_HID_REDLINING_FILTER_TF_DATE +Now1 SVX_HID_REDLINING_FILTER_IB_CLOCK +Date2 SVX_HID_REDLINING_FILTER_DF_DATE2 +Time2 SVX_HID_REDLINING_FILTER_TF_DATE2 +Now2 SVX_HID_REDLINING_FILTER_IB_CLOCK2 +ShowAuthor SVX_HID_REDLINING_FILTER_CB_AUTOR +AuthorList SVX_HID_REDLINING_FILTER_LB_AUTOR +ShowRange SVX_HID_REDLINING_FILTER_CB_RANGE +RangeText SVX_HID_REDLINING_FILTER_ED_RANGE +ShrinkRange SVX_HID_REDLINING_FILTER_BTN_REF +AktionList SVX_HID_REDLINING_FILTER_LB_ACTION +ShowChangesCalc sc.CheckBox.25727.13 +ShowAcceptedChanges sc.CheckBox.25727.6 +ShowRejectedChanges sc.CheckBox.25727.7 +ShowComment SVX_HID_REDLINING_FILTER_CB_COMMENT +EditComment SVX_HID_REDLINING_FILTER_ED_COMMENT +RangeCalc sc.Edit.25727.15 +Shrink sc.ImageButton.25727.16 + +*SmoothLineProperties CHART2_HID_SCH_DLG_SPLINE_PROPERTIES +CubicSpline chart2.RadioButton.904.5 +BSpline chart2.RadioButton.904.6 +Resolution chart2.MetricField.904.2 +DataPointsOrder chart2.MetricField.904.1 + +*Solarization .uno:GraphicFilterSolarize +Value cui.MetricField.10333.2 +Invert cui.CheckBox.10333.3 + +*Solver .uno:SolverDialog +TargetCell sc.Edit.25742.1 +Shrink sc.ImageButton.25742.1 +OptimizeMaximum sc.RadioButton.25742.1 +OptimizeMinimum sc.RadioButton.25742.2 +OptimizeValueOf sc.RadioButton.25742.3 +OptimizeValueEdit sc.Edit.25742.2 +OptimizeValueEditShrink sc.ImageButton.25742.2 +ChangingCells sc.Edit.25742.3 +ChangingCellsShrink sc.ImageButton.25742.3 +CellReference1 sc.Edit.25742.4 +CellReferenceShrink1 sc.ImageButton.25742.4 +Operator1 sc.ListBox.25742.1 +Value1 sc.Edit.25742.8 +ValueShrink1 sc.ImageButton.25742.8 +Remove1 sc.ImageButton.25742.12 +CellReference2 sc.Edit.25742.5 +CellReferenceShrink2 sc.ImageButton.25742.5 +Operator2 sc.ListBox.25742.2 +Value2 sc.Edit.25742.9 +ValueShrink2 sc.ImageButton.25742.9 +Remove2 sc.ImageButton.25742.13 +CellReference3 sc.Edit.25742.6 +CellReferenceShrink3 sc.ImageButton.25742.6 +Operator3 sc.ListBox.25742.3 +Value3 sc.Edit.25742.10 +ValueShrink3 sc.ImageButton.25742.10 +Remove3 sc.ImageButton.25742.14 +CellReference4 sc.Edit.25742.7 +CellReferenceShrink4 sc.ImageButton.25742.7 +Operator4 sc.ListBox.25742.4 +Value4 sc.Edit.25742.11 +ValueShrink4 sc.ImageButton.25742.11 +Remove4 sc.ImageButton.25742.15 +Options sc.PushButton.25742.1 +Solve sc.PushButton.25742.4 + +*SolverOptions SC_HID_SC_SOLVEROPTIONS +SolverEngine sc.ListBox.25743.1 +SolverSettings SC_HID_SC_SOLVEROPTIONS_LB +SolverSettingsEdit sc.PushButton.25743.1 + +*SolverEditSetting SC_HID_SC_SOLVER_INTEGER +SolverNumeric sc.NumericField.25744.1 + +*SolvingResult SC_HID_SC_SOLVER_SUCCESS + +*NoSolution SC_HID_SC_SOLVER_NOSOLUTION + +*SortOrder DBACCESS_HID_DLG_ORDERCRIT +Fieldname1 dbaccess.ListBox.19207.1 +Order1 dbaccess.ListBox.19207.4 +Fieldname2 dbaccess.ListBox.19207.2 +Order2 dbaccess.ListBox.19207.5 +Fieldname3 dbaccess.ListBox.19207.3 +Order3 dbaccess.ListBox.19207.6 + +*SortRange sc.ModalDialog.25751 +ExtendSelection sc.PushButton.25751.3 +CurrentSelection sc.PushButton.25751.4 + +*Spellcheck CUI_HID_SPELLCHECK +NotInDictionary cui.MultiLineEdit.10032.34 +Suggestions cui.ListBox.10032.32 +DictionaryLanguage cui.ListBox.10032.36 +IgnoreOnce CUI_HID_SPLDLG_BUTTON_IGNORE +IgnoreAll CUI_HID_SPLDLG_BUTTON_IGNOREALL +AddToDictionary cui.MenuButton.10032.39 +Change CUI_HID_SPLDLG_BUTTON_CHANGE +ChangeAll CUI_HID_SPLDLG_BUTTON_CHANGEALL +AutoCorrect cui.PushButton.10032.42 +SpellcheckOptions cui.PushButton.10032.44 +SpellcheckUndo cui.PushButton.10032.46 +SpellcheckClose CUI_HID_SPLDLG_BUTTON_CLOSE + +*SQLException dbaccess.ModalDialog.19203 +Errors DBACCESS_HID_SQLERROR_EXCHAIN_ERRORS +Errortext DBACCESS_HID_SQLERROR_EXCHAIN_TEXT + +*HelpContent SFX2_HID_HELP_ONHELP +HelpContentUP SW_HID_SCRL_PAGEUP +HelpContentDOWN SW_HID_SCRL_PAGEDOWN +HelpContentNAVIGATION SW_HID_SCRL_NAVI + +*StarOfficeHelp SFX2_HID_HELP_WINDOW +HelpAbout SFX2_HID_HELP_LISTBOX +TABCONTROL SFX2_HID_HELP_TABCONTROL + +ContentPage SFX2_HID_HELP_TABPAGE_CONTENTS +SearchContent SFX2_HID_HELP_TREELISTBOX_CONTENTS + +IndexPage SFX2_HID_HELP_TABPAGE_INDEX +SearchIndex sfx2.ComboBox.617.11 +DisplayIndex sfx2.PushButton.617.12 + +FindPage SFX2_HID_HELP_TABPAGE_SEARCH +SearchFind sfx2.ComboBox.618.11 +FindButton sfx2.PushButton.618.12 +Result sfx2.ListBox.618.16 +FindInHeadingsOnly sfx2.CheckBox.618.15 +FindFullWords sfx2.CheckBox.618.14 +DisplayFind sfx2.PushButton.618.17 + +BookmarksPage SFX2_HID_HELP_TABPAGE_BOOKMARKS +Bookmarks sfx2.ListBox.619.11 +DisplayBookmarks sfx2.PushButton.619.12 + +HelpWindow SW_HID_EDIT_WIN + +Index SFX2_HID_HELP_TOOLBOXITEM_INDEX +GoToStart SFX2_HID_HELP_TOOLBOXITEM_START +Backward SFX2_HID_HELP_TOOLBOXITEM_BACKWARD +Forward SFX2_HID_HELP_TOOLBOXITEM_FORWARD +PrintButton SFX2_HID_HELP_TOOLBOXITEM_PRINT +SetBookmarks SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS + +*SaveScheme CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME + +SchemeName CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME + +*SecurityWarning UUI_HID_XMLSECDLG_MACROWARN +ViewSignature uui.PushButton.14530.4 +TrustAlways uui.CheckBox.14530.6 + +*Slides sd.DockingWindow.792 +SlidesControl SD_HID_SD_WIN_DOCUMENT + +*Pagepane sd.DockingWindow.793 +Pagecontrol SD_HID_SD_WIN_DOCUMENT + +*Spacing .uno:ChangeDistance +Category starmath.MenuButton.20005.1 +Default starmath.PushButton.20005.1 +SpacingSpacing STARMATH_HID_SMA_DEFAULT_DIST +LineSpacing STARMATH_HID_SMA_LINE_DIST +RootSpacing STARMATH_HID_SMA_ROOT_DIST +Superscript STARMATH_HID_SMA_SUP_DIST +Subscript STARMATH_HID_SMA_SUB_DIST +Numerator STARMATH_HID_SMA_NUMERATOR_DIST +Denominator STARMATH_HID_SMA_DENOMINATOR_DIST +ExcessLength STARMATH_HID_SMA_FRACLINE_EXCWIDTH +Weight STARMATH_HID_SMA_FRACLINE_LINEWIDTH +UpperLimit STARMATH_HID_SMA_UPPERLIMIT_DIST +LowerLimit STARMATH_HID_SMA_LOWERLIMIT_DIST +ExcessSize STARMATH_HID_SMA_BRACKET_EXCHEIGHT +BracketSpacing STARMATH_HID_SMA_BRACKET_DIST +ExcessSizeAll STARMATH_HID_SMA_BRACKET_EXCHEIGHT2 +ScaleAllBrackets starmath.CheckBox.20005.1 +MatrixLineSpacing STARMATH_HID_SMA_MATRIXROW_DIST +ColumnSpacing STARMATH_HID_SMA_MATRIXCOL_DIST +PrimaryHeight STARMATH_HID_SMA_ATTRIBUT_DIST +MinimunSpacing STARMATH_HID_SMA_INTERATTRIBUT_DIST +OperatorsExcessSize STARMATH_HID_SMA_OPERATOR_EXCHEIGHT +OperatorsSpacing STARMATH_HID_SMA_OPERATOR_DIST +BordersLeft STARMATH_HID_SMA_LEFTBORDER_DIST +BordersRight STARMATH_HID_SMA_RIGHTBORDER_DIST +BordersTop STARMATH_HID_SMA_UPPERBORDER_DIST +BordersBottom STARMATH_HID_SMA_LOWERBORDER_DIST + +*StarOfficeCalendar1 WIZARDS_HID_DLGHOLIDAYCAL_DIALOG +Area WIZARDS_HID_DLGHOLIDAYCAL_1_CMBSTATE +YearOverview WIZARDS_HID_DLGHOLIDAYCAL_1_OPYEAR +MonthOverview WIZARDS_HID_DLGHOLIDAYCAL_1_OPMONTH +Year WIZARDS_HID_DLGHOLIDAYCAL_1_EDYEAR +Month WIZARDS_HID_DLGHOLIDAYCAL_1_EDMONTH +Preview WIZARDS_HID_DLGHOLIDAYCAL_1_PREVIEW +Cancel WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL +PersonalData WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA +Create WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK + +*StarOfficeCalendar2 WIZARDS_HID_DLGHOLIDAYCAL_DIALOG +Event WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENT +OneTime WIZARDS_HID_DLGHOLIDAYCAL_2_CHKEVENT +Day WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTDAY +Month WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTMONTH +Year WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTYEAR +Insert WIZARDS_HID_DLGHOLIDAYCAL_2_CMDINSERT +Delete WIZARDS_HID_DLGHOLIDAYCAL_2_CMDDELETE +List WIZARDS_HID_DLGHOLIDAYCAL_2_LBOWNDATA +Cancel WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL +Back WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA +Create WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK + +*StoredPasswordsDialog CUI_HID_DLG_WEBCONNECTION_INFO +Remove cui.PushButton.10301.12 +RemoveAll cui.PushButton.10301.13 +changePassword cui.PushButton.10301.14 diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win old mode 100755 new mode 100644 index 4e3e0cd2a1be..f63625b29cf6 --- a/testautomation/global/win/edia_t_z.win +++ b/testautomation/global/win/edia_t_z.win @@ -1,145 +1,145 @@ -*TabColor FID_TAB_SET_TAB_BG_COLOR +*TabColor .uno:TabBgColor -*TableDesignTable HID_TABDESIGN_BACKGROUND -TableWindow HID_CTL_TABLEEDIT -Fieldname HID_TABDESIGN_NAMECELL -FieldType HID_TABDESIGN_TYPECELL -Description HID_TABDESIGN_HELPTEXT +*TableDesignTable DBACCESS_HID_TABDESIGN_BACKGROUND +TableWindow DBACCESS_HID_CTL_TABLEEDIT +Fieldname DBACCESS_HID_TABDESIGN_NAMECELL +FieldType DBACCESS_HID_TABDESIGN_TYPECELL +Description DBACCESS_HID_TABDESIGN_HELPTEXT -*TablesFilter HID_DSADMIN_TABLE_SUBSCRIPTION -Tables HID_DSADMIN_TABLE_SELECTOR +*TablesFilter DBACCESS_HID_DSADMIN_TABLE_SUBSCRIPTION +Tables DBACCESS_HID_DSADMIN_TABLE_SELECTOR -*TableToolbox HID_DSADMIN_TABLE_TOOLBOX -CreateDesign HID_BROWSER_TABLE_CREATE_DESIGN -EditTable HID_BROWSER_TABLE_EDIT -DeleteTable HID_BROWSER_TABLE_DELETE +*TableToolbox DBACCESS_HID_DSADMIN_TABLE_TOOLBOX +CreateDesign DBACCESS_HID_BROWSER_TABLE_CREATE_DESIGN +EditTable DBACCESS_HID_BROWSER_TABLE_EDIT +DeleteTable DBACCESS_HID_BROWSER_TABLE_DELETE -*TableWizard HID_DLGTABLE_DIALOG -Business HID_DLGTABLE_OPTBUSINESS -Personal HID_DLGTABLE_OPTPRIVATE -Tables HID_DLGTABLE_LBTABLES -Fields HID_DLGTABLE_FIELDSAVAILABLE -SelectedFields HID_DLGTABLE_FIELDSSELECTED -Add HID_DLGTABLE_CMDMOVESELECTED -AddAll HID_DLGTABLE_CMDMOVEALL -Remove HID_DLGTABLE_CMDREMOVESELECTED -RemoveAll HID_DLGTABLE_CMDREMOVEALL -Up HID_DLGTABLE_CMDMOVEUP -Down HID_DLGTABLE_CMDMOVEDOWN -FieldNames HID_DLGTABLE_LB_SELFIELDNAMES -FieldsUp HID_DLGTABLE_CMDMOVEFIELDUP -FieldsDown HID_DLGTABLE_CMDMOVEFIELDDOWN -FieldsRemove HID_DLGTABLE_CMDMINUS -FieldsAdd HID_DLGTABLE_CMDPLUS -FieldName HID_DLGTABLE_COLNAME -TableName HID_DLGTABLE_TXT_NAME -InsertData HID_DLGTABLE_OPT_WORKWITHTABLE -ModifyDesing HID_DLGTABLE_OPT_MODIFYTABLE -CreateForm HID_DLGTABLE_OPT_STARTFORMWIZARD -BackBtn HID_DLGTABLE_CMDPREV -NextBtn HID_DLGTABLE_CMDNEXT -FinishBtn HID_DLGTABLE_CMDFINISH -CancelBtn HID_DLGTABLE_CMDCANCEL +*TableWizard WIZARDS_HID_DLGTABLE_DIALOG +Business WIZARDS_HID_DLGTABLE_OPTBUSINESS +Personal WIZARDS_HID_DLGTABLE_OPTPRIVATE +Tables WIZARDS_HID_DLGTABLE_LBTABLES +Fields WIZARDS_HID_DLGTABLE_FIELDSAVAILABLE +SelectedFields WIZARDS_HID_DLGTABLE_FIELDSSELECTED +Add WIZARDS_HID_DLGTABLE_CMDMOVESELECTED +AddAll WIZARDS_HID_DLGTABLE_CMDMOVEALL +Remove WIZARDS_HID_DLGTABLE_CMDREMOVESELECTED +RemoveAll WIZARDS_HID_DLGTABLE_CMDREMOVEALL +Up WIZARDS_HID_DLGTABLE_CMDMOVEUP +Down WIZARDS_HID_DLGTABLE_CMDMOVEDOWN +FieldNames WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES +FieldsUp WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP +FieldsDown WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN +FieldsRemove WIZARDS_HID_DLGTABLE_CMDMINUS +FieldsAdd WIZARDS_HID_DLGTABLE_CMDPLUS +FieldName WIZARDS_HID_DLGTABLE_COLNAME +TableName WIZARDS_HID_DLGTABLE_TXT_NAME +InsertData WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE +ModifyDesing WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE +CreateForm WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD +BackBtn WIZARDS_HID_DLGTABLE_CMDPREV +NextBtn WIZARDS_HID_DLGTABLE_CMDNEXT +FinishBtn WIZARDS_HID_DLGTABLE_CMDFINISH +CancelBtn WIZARDS_HID_DLGTABLE_CMDCANCEL ' not nice solved, but can't do better right now; complains -> TBO -*Tasks sd:DockingWindow:FLT_TOOL_PANEL_DOCKING_WINDOW -View HID_TASKPANE_VIEW_MENU -'? HID_SD_WIN_DOCUMENT +*Tasks sd.DockingWindow.794 +View SFX2_HID_TASKPANE_VIEW_MENU +'? SD_HID_SD_WIN_DOCUMENT ' Master Pages -UsedInThisPresentationPreview HID_SD_TASK_PANE_PREVIEW_CURRENT -RecentlyUsedPreview HID_SD_TASK_PANE_PREVIEW_RECENT -AvailableForUsePreview HID_SD_TASK_PANE_PREVIEW_ALL +UsedInThisPresentationPreview SD_HID_SD_TASK_PANE_PREVIEW_CURRENT +RecentlyUsedPreview SD_HID_SD_TASK_PANE_PREVIEW_RECENT +AvailableForUsePreview SD_HID_SD_TASK_PANE_PREVIEW_ALL ' Layouts -LayoutsPreview HID_SD_TASK_PANE_PREVIEW_LAYOUTS +LayoutsPreview SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS ' Custom Animation -EffectAdd HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT -EffectChange HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT -EffectRemove HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT -EffectStart HID_SD_CUSTOMANIMATIONPANE_LB_START -EffectProperty HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY -EffectDirection HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX -EffectOptions HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE -EffectSpeed HID_SD_CUSTOMANIMATIONPANE_CB_SPEED -EffectList HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST -EffectUp HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP -EffectDown HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN -EffectPlay HID_SD_CUSTOMANIMATIONPANE_PB_PLAY -EffectSlideShow HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW -EffectAutomaticPreview HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW +EffectAdd SD_HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT +EffectChange SD_HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT +EffectRemove SD_HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT +EffectStart SD_HID_SD_CUSTOMANIMATIONPANE_LB_START +EffectProperty SD_HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY +EffectDirection SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX +EffectOptions SD_HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE +EffectSpeed SD_HID_SD_CUSTOMANIMATIONPANE_CB_SPEED +EffectList SD_HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST +EffectUp SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP +EffectDown SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN +EffectPlay SD_HID_SD_CUSTOMANIMATIONPANE_PB_PLAY +EffectSlideShow SD_HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW +EffectAutomaticPreview SD_HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW ' Slide Transition -TransitionApplyToSelectedSlide HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS -TransitionSpeed HID_SD_SLIDETRANSITIONPANE_LB_SPEED -TransitionSound HID_SD_SLIDETRANSITIONPANE_LB_SOUND -TransitionLoopUntilNextSound HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND -TransitionOnMouseClick HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE -TransitionAutomaticallyAfter HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO -TransitionAutomaticallyAfterTime HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER -TransitionApplyToAllSlides HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL -TransitionPlay HID_SD_SLIDETRANSITIONPANE_PB_PLAY -TransitionSlideShow HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW -TransitionAutomaticPreview HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW +TransitionApplyToSelectedSlide SD_HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS +TransitionSpeed SD_HID_SD_SLIDETRANSITIONPANE_LB_SPEED +TransitionSound SD_HID_SD_SLIDETRANSITIONPANE_LB_SOUND +TransitionLoopUntilNextSound SD_HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND +TransitionOnMouseClick SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE +TransitionAutomaticallyAfter SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO +TransitionAutomaticallyAfterTime SD_HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER +TransitionApplyToAllSlides SD_HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL +TransitionPlay SD_HID_SD_SLIDETRANSITIONPANE_PB_PLAY +TransitionSlideShow SD_HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW +TransitionAutomaticPreview SD_HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW -*MasterPages HID_SD_SLIDE_DESIGNS -*UsedInThisPresentation HID_SD_CURRENT_MASTERS -*RecentlyUsed HID_SD_RECENT_MASTERS -*AvailableForUse HID_SD_ALL_MASTERS -*Layouts HID_SD_SLIDE_LAYOUTS -*CustomAnimation HID_SD_CUSTOM_ANIMATIONS -*SlideTransition HID_SD_SLIDE_TRANSITIONS +*MasterPages SD_HID_SD_SLIDE_DESIGNS +*UsedInThisPresentation SD_HID_SD_CURRENT_MASTERS +*RecentlyUsed SD_HID_SD_RECENT_MASTERS +*AvailableForUse SD_HID_SD_ALL_MASTERS +*Layouts SD_HID_SD_SLIDE_LAYOUTS +*CustomAnimation SD_HID_SD_CUSTOM_ANIMATIONS +*SlideTransition SD_HID_SD_SLIDE_TRANSITIONS -*TemplateAndDocuments HID_TEMPLATEDLG_DIALOG -Organize svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_MANAGE -Edit svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_EDIT -Backward HID_TEMPLATEDLG_TB_BACK -UpOneLevel HID_TEMPLATEDLG_TB_PREV -Print HID_TEMPLATEDLG_TB_PRINT -Docinfo HID_TEMPLATEDLG_TB_DOCINFO -Preview HID_TEMPLATEDLG_TB_PREVIEW -Category HID_TEMPLATEDLG_ICONCTRL -Filelist HID_TEMPLATEDLG_FILEVIEW +*TemplateAndDocuments SVT_HID_TEMPLATEDLG_DIALOG +Organize svtools.PushButton.16420.11 +Edit svtools.PushButton.16420.12 +Backward SVT_HID_TEMPLATEDLG_TB_BACK +UpOneLevel SVT_HID_TEMPLATEDLG_TB_PREV +Print SVT_HID_TEMPLATEDLG_TB_PRINT +Docinfo SVT_HID_TEMPLATEDLG_TB_DOCINFO +Preview SVT_HID_TEMPLATEDLG_TB_PREVIEW +Category SVT_HID_TEMPLATEDLG_ICONCTRL +Filelist SVT_HID_TEMPLATEDLG_FILEVIEW -*TemplatesBasicMessage HID_DLGCORRESPONDENCE_DIALOG -OptAgenda1 HID_DLGCORRESPONDENCE_OPTIONAGENDA1 -OptAgenda2 HID_DLGCORRESPONDENCE_OPTIONAGENDA2 -OneRecepient HID_DLGCORRESPONDENCE_OPTIONLETTER1 -AdressDatabase HID_DLGCORRESPONDENCE_OPTIONLETTER2 -CmdAgdGoOn HID_DLGCORRESPONDENCE_AGENDAOKAY -OKButton HID_DLGCORRESPONDENCE_LETTEROKAY -CancelButton HID_DLGCORRESPONDENCE_CANCEL +*TemplatesBasicMessage WIZARDS_HID_DLGCORRESPONDENCE_DIALOG +OptAgenda1 WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA1 +OptAgenda2 WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA2 +OneRecepient WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER1 +AdressDatabase WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER2 +CmdAgdGoOn WIZARDS_HID_DLGCORRESPONDENCE_AGENDAOKAY +OKButton WIZARDS_HID_DLGCORRESPONDENCE_LETTEROKAY +CancelButton WIZARDS_HID_DLGCORRESPONDENCE_CANCEL +ToolsOptionsDlg ExtrasOptionenDlg +UseOfThisTemplate TemplatesBasicMessage -*TestAccountSettings HID_MM_TESTACCOUNTSETTINGS -IDontKnow HID_MM_TESTACCOUNTSETTINGS_HB -TaskStatusListBox HID_MM_TESTACCOUNTSETTINGS_TLB -Errors sw:MultiLineEdit:DLG_MM_TESTACCOUNTSETTINGS:ED_ERROR -Stop sw:PushButton:DLG_MM_TESTACCOUNTSETTINGS:PB_STOP +*TestAccountSettings SW_HID_MM_TESTACCOUNTSETTINGS +IDontKnow SW_HID_MM_TESTACCOUNTSETTINGS_HB +TaskStatusListBox SW_HID_MM_TESTACCOUNTSETTINGS_TLB +Errors sw.MultiLineEdit.21569.34 +Stop sw.PushButton.21569.36 -*TestXMLFilter HID_XML_FILTER_TEST_DIALOG -XSLTForExport HID_XML_FILTER_TEST_EXPORT_XSLT_FILE -ExportBrowseBtn HID_XML_FILTER_TEST_EXPORT_BROWSE -CurrentDocument HID_XML_FILTER_TEST_EXPORT_CURRENT -FixedCurrentFile HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE -XSLTForImport HID_XML_FILTER_TEST_IMPORT_XSLT_FILE -TemplateForImport HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE -DisplaySource HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE -ImportBrowseBtn HID_XML_FILTER_TEST_IMPORT_BROWSE -RecentFile HID_XML_FILTER_TEST_IMPORT_RECENT -FixedRecentFile HID_XML_FILTER_TEST_IMPORT_RECENT_FILE -CloseBtn HID_XML_FILTER_TEST_CLOSE +*TestXMLFilter FILTER_HID_XML_FILTER_TEST_DIALOG +XSLTForExport FILTER_HID_XML_FILTER_TEST_EXPORT_XSLT_FILE +ExportBrowseBtn FILTER_HID_XML_FILTER_TEST_EXPORT_BROWSE +CurrentDocument FILTER_HID_XML_FILTER_TEST_EXPORT_CURRENT +FixedCurrentFile FILTER_HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE +XSLTForImport FILTER_HID_XML_FILTER_TEST_IMPORT_XSLT_FILE +TemplateForImport FILTER_HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE +DisplaySource FILTER_HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE +ImportBrowseBtn FILTER_HID_XML_FILTER_TEST_IMPORT_BROWSE +RecentFile FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT +FixedRecentFile FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT_FILE +CloseBtn FILTER_HID_XML_FILTER_TEST_CLOSE -*Thesaurus SID_THESAURUS -CurrentWord cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD -RecallCurrentWord cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT -Alternatives HID_CT_THES_ALTERNATIVES -ReplaceWith cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL -Language cui:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE +*Thesaurus .uno:Thesaurus +CurrentWord cui.ComboBox.10031.16 +RecallCurrentWord cui.ImageButton.10031.9 +Alternatives CUI_HID_CT_THES_ALTERNATIVES +ReplaceWith cui.Edit.10031.22 +Language cui.MenuButton.10031.12 *TextImport SC:MODALDIALOG:RID_SCDLG_ASCII CharacterSet SC:LISTBOX:RID_SCDLG_ASCII:LB_CHARSET -Language sc:ListBox:RID_SCDLG_ASCII:LB_CUSTOMLANG +Language sc.ListBox.25695.8 FromRow SC:NUMERICFIELD:RID_SCDLG_ASCII:NF_AT_ROW FixedWidth SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_FIXED Separated SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_SEPARATED @@ -151,158 +151,158 @@ Other SC:CHECKBOX:RID_SCDLG_ASCII:CKB_OTHER OtherText SC:EDIT:RID_SCDLG_ASCII:ED_OTHER MergeDelimiter SC:CHECKBOX:RID_SCDLG_ASCII:CB_ASONCE TextDelimiter SC:COMBOBOX:RID_SCDLG_ASCII:CB_TEXTSEP -QuotedAsText sc:CheckBox:RID_SCDLG_ASCII:CB_QUOTED_AS_TEXT -DetectSpecialNumbers sc:CheckBox:RID_SCDLG_ASCII:CB_DETECT_SPECIAL_NUMBER +QuotedAsText sc.CheckBox.25695.24 +DetectSpecialNumbers sc.CheckBox.25695.25 Type SC:LISTBOX:RID_SCDLG_ASCII:LB_TYPE1 -Preview HID_SC_ASCII_TABCTR +Preview SC_HID_SC_ASCII_TABCTR -*UnsatisfiedDependencies desktop:ModalDialog:RID_DLG_DEPENDENCIES -UnsatisfiedDependencyList desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST +*UnsatisfiedDependencies desktop.ModalDialog.2001 +UnsatisfiedDependencyList desktop.ListBox.2001.2 -*WarningPrintTransparency sfx2:ModalDialog:RID_WARN_PRINTTRANSPARENCY -NoButton sfx2:PushButton:RID_WARN_PRINTTRANSPARENCY:BTN_PRINTTRANS_NO -DoNotShowAgain sfx2:CheckBox:RID_WARN_PRINTTRANSPARENCY:CBX_NOPRINTTRANSWARN +*WarningPrintTransparency sfx2.ModalDialog.2399 +NoButton sfx2.PushButton.2399.63 +DoNotShowAgain sfx2.CheckBox.2399.65 -*WebWizard HID0_WEBWIZARD -IntroductionChooseSettings HID1_LST_SESSIONS -IntroductionDelete HID1_BTN_DEL_SES -Back HID0_NEXT -NextButton HID0_PREV -Finish HID0_CREATE -CancelB HID0_CANCEL -DocumentsWebSiteContent HID2_LST_DOCS -DocumentsAdd HID2_BTN_ADD_DOC -DocumentsRemove HID2_BTN_REM_DOC -DocumentsUp HID2_BTN_DOC_UP -DocumentsDown HID2_BTN_DOC_DOWN -DocumentsExportFileFormat HID2_LST_DOC_EXPORT -DocumentsInformationTitle HID2_TXT_DOC_TITLE -DocumentsInformationsummary HID2_TXT_DOC_DESC -DocumentsInformationAuthor HID2_TXT_DOC_AUTHOR -MainLayoutLayout1 HID3_IL_LAYOUTS_IMG1 -MainLayoutLayout2 HID3_IL_LAYOUTS_IMG2 -MainLayoutLayout3 HID3_IL_LAYOUTS_IMG3 -MainLayoutLayout4 HID3_IL_LAYOUTS_IMG4 -MainLayoutLayout5 HID3_IL_LAYOUTS_IMG5 -MainLayoutLayout6 HID3_IL_LAYOUTS_IMG6 -MainLayoutLayout7 HID3_IL_LAYOUTS_IMG7 -MainLayoutLayout8 HID3_IL_LAYOUTS_IMG8 -MainLayoutLayout9 HID3_IL_LAYOUTS_IMG9 -MainLayoutLayout10 HID3_IL_LAYOUTS_IMG10 -MainLayoutLayout11 HID3_IL_LAYOUTS_IMG11 -MainLayoutLayout12 HID3_IL_LAYOUTS_IMG12 -MainLayoutLayout13 HID3_IL_LAYOUTS_IMG13 -MainLayoutLayout14 HID3_IL_LAYOUTS_IMG14 -MainLayoutLayout15 HID3_IL_LAYOUTS_IMG15 -LayoutDetailsFileName HID4_CHK_DISPLAY_FILENAME -LayoutDetailsDescription HID4_CHK_DISPLAY_DESCRIPTION -LayoutDetailsAuthor HID4_CHK_DISPLAY_AUTHOR -LayoutDetailsCreationDate HID4_CHK_DISPLAY_CR_DATE -LayoutDetailsLastChangeDate HID4_CHK_DISPLAY_UP_DATE -LayoutDetailsFileFormat HID4_CHK_DISPLAY_FORMAT -LayoutDetailsFileFormatIcon HID4_CHK_DISPLAY_F_ICON -LayoutDetailsNumberOfPages HID4_CHK_DISPLAY_PAGES -LayoutDetailsSizeInKB HID4_CHK_DISPLAY_SIZE -LayoutDetails640x480 HID4_GRP_OPTIMAIZE_640 -LayoutDetails800x600 HID4_GRP_OPTIMAIZE_800 -LayoutDetails1024x768 HID4_GRP_OPTIMAIZE_1024 -StyleStyle HID5_LST_STYLES -StyleBackgroundImage HID5_BTN_BACKGND -StyleIconSet HID5_BTN_ICONS -WebSiteInformationTitle HID6_TXT_SITE_TITLE -WebSiteInformationDescription HID6_TXT_SITE_DESC -WebSiteInformationEmail HID6_TXT_SITE_EMAIL -WebSiteInformationCopyrightNotice HID6_TXT_SITE_COPYRIGHT -WebSiteInformationCreated HID6_DATE_SITE_CREATED -WebSiteInformationModified HID6_DATE_SITE_UPDATED -PreviewPreciew HID7_BTN_PREVIEW -PreviewToALocalFolderCB HID7_CHK_PUBLISH_LOCAL -PreviewToALocalFolderTF HID7_TXT_LOCAL -PublishToALocalFolderB HID7_BTN_LOCAL -PublishToAZIPArchiveCB HID7_CHK_PUBLISH_ZIP -PublishToAZIPArchiveTF HID7_TXT_ZIP -PublishToAZIPArchiveB HID7_BTN_ZIP -PublishToAWebServer HID7_CHK_PUBLISH_FTP -PublishFTPConfigure HID7_BTN_FTP -PublishSaveSettings HID7_CHK_SAVE -PublishSaveAs HID7_TXT_SAVE +*WebWizard WIZARDS_HID0_WEBWIZARD +IntroductionChooseSettings WIZARDS_HID1_LST_SESSIONS +IntroductionDelete WIZARDS_HID1_BTN_DEL_SES +Back WIZARDS_HID0_NEXT +NextButton WIZARDS_HID0_PREV +Finish WIZARDS_HID0_CREATE +CancelB WIZARDS_HID0_CANCEL +DocumentsWebSiteContent WIZARDS_HID2_LST_DOCS +DocumentsAdd WIZARDS_HID2_BTN_ADD_DOC +DocumentsRemove WIZARDS_HID2_BTN_REM_DOC +DocumentsUp WIZARDS_HID2_BTN_DOC_UP +DocumentsDown WIZARDS_HID2_BTN_DOC_DOWN +DocumentsExportFileFormat WIZARDS_HID2_LST_DOC_EXPORT +DocumentsInformationTitle WIZARDS_HID2_TXT_DOC_TITLE +DocumentsInformationsummary WIZARDS_HID2_TXT_DOC_DESC +DocumentsInformationAuthor WIZARDS_HID2_TXT_DOC_AUTHOR +MainLayoutLayout1 WIZARDS_HID3_IL_LAYOUTS_IMG1 +MainLayoutLayout2 WIZARDS_HID3_IL_LAYOUTS_IMG2 +MainLayoutLayout3 WIZARDS_HID3_IL_LAYOUTS_IMG3 +MainLayoutLayout4 WIZARDS_HID3_IL_LAYOUTS_IMG4 +MainLayoutLayout5 WIZARDS_HID3_IL_LAYOUTS_IMG5 +MainLayoutLayout6 WIZARDS_HID3_IL_LAYOUTS_IMG6 +MainLayoutLayout7 WIZARDS_HID3_IL_LAYOUTS_IMG7 +MainLayoutLayout8 WIZARDS_HID3_IL_LAYOUTS_IMG8 +MainLayoutLayout9 WIZARDS_HID3_IL_LAYOUTS_IMG9 +MainLayoutLayout10 WIZARDS_HID3_IL_LAYOUTS_IMG10 +MainLayoutLayout11 WIZARDS_HID3_IL_LAYOUTS_IMG11 +MainLayoutLayout12 WIZARDS_HID3_IL_LAYOUTS_IMG12 +MainLayoutLayout13 WIZARDS_HID3_IL_LAYOUTS_IMG13 +MainLayoutLayout14 WIZARDS_HID3_IL_LAYOUTS_IMG14 +MainLayoutLayout15 WIZARDS_HID3_IL_LAYOUTS_IMG15 +LayoutDetailsFileName WIZARDS_HID4_CHK_DISPLAY_FILENAME +LayoutDetailsDescription WIZARDS_HID4_CHK_DISPLAY_DESCRIPTION +LayoutDetailsAuthor WIZARDS_HID4_CHK_DISPLAY_AUTHOR +LayoutDetailsCreationDate WIZARDS_HID4_CHK_DISPLAY_CR_DATE +LayoutDetailsLastChangeDate WIZARDS_HID4_CHK_DISPLAY_UP_DATE +LayoutDetailsFileFormat WIZARDS_HID4_CHK_DISPLAY_FORMAT +LayoutDetailsFileFormatIcon WIZARDS_HID4_CHK_DISPLAY_F_ICON +LayoutDetailsNumberOfPages WIZARDS_HID4_CHK_DISPLAY_PAGES +LayoutDetailsSizeInKB WIZARDS_HID4_CHK_DISPLAY_SIZE +LayoutDetails640x480 WIZARDS_HID4_GRP_OPTIMAIZE_640 +LayoutDetails800x600 WIZARDS_HID4_GRP_OPTIMAIZE_800 +LayoutDetails1024x768 WIZARDS_HID4_GRP_OPTIMAIZE_1024 +StyleStyle WIZARDS_HID5_LST_STYLES +StyleBackgroundImage WIZARDS_HID5_BTN_BACKGND +StyleIconSet WIZARDS_HID5_BTN_ICONS +WebSiteInformationTitle WIZARDS_HID6_TXT_SITE_TITLE +WebSiteInformationDescription WIZARDS_HID6_TXT_SITE_DESC +WebSiteInformationEmail WIZARDS_HID6_TXT_SITE_EMAIL +WebSiteInformationCopyrightNotice WIZARDS_HID6_TXT_SITE_COPYRIGHT +WebSiteInformationCreated WIZARDS_HID6_DATE_SITE_CREATED +WebSiteInformationModified WIZARDS_HID6_DATE_SITE_UPDATED +PreviewPreciew WIZARDS_HID7_BTN_PREVIEW +PreviewToALocalFolderCB WIZARDS_HID7_CHK_PUBLISH_LOCAL +PreviewToALocalFolderTF WIZARDS_HID7_TXT_LOCAL +PublishToALocalFolderB WIZARDS_HID7_BTN_LOCAL +PublishToAZIPArchiveCB WIZARDS_HID7_CHK_PUBLISH_ZIP +PublishToAZIPArchiveTF WIZARDS_HID7_TXT_ZIP +PublishToAZIPArchiveB WIZARDS_HID7_BTN_ZIP +PublishToAWebServer WIZARDS_HID7_CHK_PUBLISH_FTP +PublishFTPConfigure WIZARDS_HID7_BTN_FTP +PublishSaveSettings WIZARDS_HID7_CHK_SAVE +PublishSaveAs WIZARDS_HID7_TXT_SAVE -*WebWizardStatus HID0_STATUS_DIALOG +*WebWizardStatus WIZARDS_HID0_STATUS_DIALOG -*WelcomeDialog HID_FIRSTSTART_DIALOG -HelpBtn UID_FIRSTSTART_HELP -BackBtn HID_FIRSTSTART_PREV -NextBtn HID_FIRSTSTART_NEXT -OKBtn HID_FIRSTSTART_FINISH -CancelBtn HID_FIRSTSTART_CANCEL +*WelcomeDialog DESKTOP_HID_FIRSTSTART_DIALOG +HelpBtn DESKTOP_UID_FIRSTSTART_HELP +BackBtn DESKTOP_HID_FIRSTSTART_PREV +NextBtn DESKTOP_HID_FIRSTSTART_NEXT +OKBtn DESKTOP_HID_FIRSTSTART_FINISH +CancelBtn DESKTOP_HID_FIRSTSTART_CANCEL -*XFormAddInstance HID_XFORMS_ADDINSTANCE_DLG -InstanceName svx:Edit:RID_SVXDLG_ADD_INSTANCE:ED_INST_NAME -InstanceURL SID_OPENURL -BrowseBtn svx:PushButton:RID_SVXDLG_ADD_INSTANCE:PB_FILEPICKER -LinkInstance svx:CheckBox:RID_SVXDLG_ADD_INSTANCE:CB_INST_LINKINST +*XFormAddInstance SVX_HID_XFORMS_ADDINSTANCE_DLG +InstanceName svx.Edit.18018.12 +InstanceURL .uno:OpenUrl +BrowseBtn svx.PushButton.18018.15 +LinkInstance svx.CheckBox.18018.16 -*XFormAddItemDLG HID_XFORMS_ADDDATAITEM_DLG -ElementName svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME -DefaultValue svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT -DataType svx:ListBox:RID_SVXDLG_ADD_DATAITEM:LB_DATATYPE -Required svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_REQUIRED -RequiredBtn svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_REQUIRED -Relevant svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_RELEVANT -RelevantBtn svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_RELEVANT -Constraint svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CONSTRAINT -ConstraintBtn svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CONSTRAINT -Calculate svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CALCULATE -CalculateBtn svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CALCULATE -ReadOnly svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_READONLY -ReadOnlyBtn svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_READONLY +*XFormAddItemDLG SVX_HID_XFORMS_ADDDATAITEM_DLG +ElementName svx.Edit.18012.12 +DefaultValue svx.Edit.18012.14 +DataType svx.ListBox.18012.18 +Required svx.CheckBox.18012.19 +RequiredBtn svx.PushButton.18012.20 +Relevant svx.CheckBox.18012.21 +RelevantBtn svx.PushButton.18012.22 +Constraint svx.CheckBox.18012.23 +ConstraintBtn svx.PushButton.18012.24 +Calculate svx.CheckBox.18012.27 +CalculateBtn svx.PushButton.18012.28 +ReadOnly svx.CheckBox.18012.25 +ReadOnlyBtn svx.PushButton.18012.26 -*XFormAddModel HID_XFORMS_ADDMODEL_DLG -ModelName svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME +*XFormAddModel SVX_HID_XFORMS_ADDMODEL_DLG +ModelName svx.Edit.18017.12 -*XFormAddSubmission HID_XFORMS_ADDSUBMISSION_DLG -SubmitName svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_NAME -SubmitAction svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_ACTION -SubmitMethod svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_METHOD -SubmitBindingExpression svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_REF -SubmitBindingExpressionBtn svx:PushButton:RID_SVXDLG_ADD_SUBMISSION:PB_SUBMIT_REF -SubmitBinding svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_BIND -SubmitReplace svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_REPLACE +*XFormAddSubmission SVX_HID_XFORMS_ADDSUBMISSION_DLG +SubmitName svx.Edit.18016.12 +SubmitAction svx.Edit.18016.14 +SubmitMethod svx.ListBox.18016.16 +SubmitBindingExpression svx.Edit.18016.18 +SubmitBindingExpressionBtn svx.PushButton.18016.19 +SubmitBinding svx.ListBox.18016.21 +SubmitReplace svx.ListBox.18016.23 -*XFormsDataNavigator SID_FM_SHOW_DATANAVIGATOR -XFormsDataNavigatorTabControl HID_XFORMS_TAB_CONTROL +*XFormsDataNavigator .uno:ShowDataNavigator +XFormsDataNavigatorTabControl SVX_HID_XFORMS_TAB_CONTROL 'Instance svx:TabPage:RID_SVX_TP_XFORMS_INSTANCE -Models HID_XFORMS_MODELS_LIST -ModelsBtn HID_XFORMS_MODELS_MENUBTN -TabPages svx:TabPage:RID_SVX_XFORMS_TABPAGES -ItemList HID_XFORMS_ITEMS_LIST -InstanceBtn HID_XFORMS_INSTANCES_MENUBTN +Models SVX_HID_XFORMS_MODELS_LIST +ModelsBtn SVX_HID_XFORMS_MODELS_MENUBTN +TabPages svx.TabPage.18020 +ItemList SVX_HID_XFORMS_ITEMS_LIST +InstanceBtn SVX_HID_XFORMS_INSTANCES_MENUBTN -*XFormToolbar HID_XFORMS_TOOLBOX -AddElement HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT -AddAttribute HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE -EditElement HID_XFORMS_TOOLBOX_ITEM_EDIT -RemoveElement HID_XFORMS_TOOLBOX_ITEM_REMOVE -AddSubmission HID_XFORMS_TOOLBOX_ITEM_ADD -AddBinding HID_XFORMS_TOOLBOX_ITEM_ADD +*XFormToolbar SVX_HID_XFORMS_TOOLBOX +AddElement SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT +AddAttribute SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE +EditElement SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT +RemoveElement SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE +AddSubmission SVX_HID_XFORMS_TOOLBOX_ITEM_ADD +AddBinding SVX_HID_XFORMS_TOOLBOX_ITEM_ADD -*XMLFilter HID_XML_FILTER_TABDIALOG -TabControl HID_XML_FILTER_TABPAGE_CTRL -TabXMLGeneral HID_XML_FILTER_TABPAGE_BASIC -TabXMLTransformation HID_XML_FILTER_TABPAGE_XSLT +*XMLFilter FILTER_HID_XML_FILTER_TABDIALOG +TabControl FILTER_HID_XML_FILTER_TABPAGE_CTRL +TabXMLGeneral FILTER_HID_XML_FILTER_TABPAGE_BASIC +TabXMLTransformation FILTER_HID_XML_FILTER_TABPAGE_XSLT -*XMLFilterOutput HID_XML_SOURCE_FILE_DIALOG -ValidateOutput HID_XML_FILTER_TEST_VALIDATE_OUPUT -Validate HID_XML_SOURCE_FILE_VALIDATE -FilterOutput HID_XML_FILTER_OUTPUT_WINDOW +*XMLFilterOutput FILTER_HID_XML_SOURCE_FILE_DIALOG +ValidateOutput FILTER_HID_XML_FILTER_TEST_VALIDATE_OUPUT +Validate FILTER_HID_XML_SOURCE_FILE_VALIDATE +FilterOutput FILTER_HID_XML_FILTER_OUTPUT_WINDOW -*XMLFilterSettings HID_XML_FILTER_SETTINGS_DIALOG -FilterList HID_XML_FILTER_LIST -NewBtn HID_XML_FILTER_NEW -EditBtn HID_XML_FILTER_EDIT -TestXSLTs HID_XML_FILTER_TEST -DeleteBtn HID_XML_FILTER_DELETE -SaveToPackage HID_XML_FILTER_SAVE -OpenPackage HID_XML_FILTER_OPEN -CloseBtn HID_XML_FILTER_CLOSE +*XMLFilterSettings FILTER_HID_XML_FILTER_SETTINGS_DIALOG +FilterList FILTER_HID_XML_FILTER_LIST +NewBtn FILTER_HID_XML_FILTER_NEW +EditBtn FILTER_HID_XML_FILTER_EDIT +TestXSLTs FILTER_HID_XML_FILTER_TEST +DeleteBtn FILTER_HID_XML_FILTER_DELETE +SaveToPackage FILTER_HID_XML_FILTER_SAVE +OpenPackage FILTER_HID_XML_FILTER_OPEN +CloseBtn FILTER_HID_XML_FILTER_CLOSE diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win old mode 100755 new mode 100644 index f2214f266741..c33dd7af9ec3 --- a/testautomation/global/win/etab_a_d.win +++ b/testautomation/global/win/etab_a_d.win @@ -1,474 +1,474 @@ -*TabAccessibility HID_OPTIONS_ACCESSIBILITYCONFIG -ForPagePreviews cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS -HelpTips cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP -After cui:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP -AllowAnimatedGraphics cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS -AllowAnimatedText cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS -AlwaysUseAutomaticFontColor cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR -SupportAssistiveTechnologyTools cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL -UseTextSelectionCursor cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION -AutomaticDetectHC cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC - -*TabAdabas HID_DSADMIN_PAGE_ADABAS -Hostname dbaccess:Edit:PAGE_ADABAS:ET_HOSTNAME -CacheSize dbaccess:NumericField:PAGE_ADABAS:NF_CACHE_SIZE -DataIncrement dbaccess:NumericField:PAGE_ADABAS:NF_DATA_INCREMENT -CotrolUser dbaccess:Edit:PAGE_ADABAS:ET_CTRLUSERNAME -ControlPassword dbaccess:Edit:PAGE_ADABAS:ET_CTRLPASSWORD -ShutdownService dbaccess:CheckBox:PAGE_ADABAS:CB_SHUTDB -Charset HID_DSADMIN_CHARSET -Extended dbaccess:PushButton:PAGE_ADABAS:PB_STAT - -*TabAdabasUserSettings HID_TAB_PAGE_USERADMIN -User HID_TAB_PAGE_LBUSER -AddUser HID_TAB_PAGE_PBUSER -ChangePassword HID_TAB_PAGE_PBCHGPWD -DeleteUser HID_TAB_PAGE_PBUSERDELETE -AccessRights HID_TAB_PAGE_TBLGRANTS - -*TabAdditionalSettings extensions:TabPage:RID_PAGE_ADMININVOKATION -Settings extensions:PushButton:RID_PAGE_ADMININVOKATION:PB_INVOKE_ADMIN_DIALOG - -*TabAddressDataSourceAutoPilot extensions:TabPage:RID_PAGE_SELECTABTYPE -Mozilla extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK -LDAP extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP -Outlook extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK -WinSystem extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS -Other extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER - -*TabADO HID_DSADMIN_PAGE_ADO -URL HID_DSADMIN_CONNURL_ADOPAGE -UserName HID_DSADMIN_USER_ADO -PasswordRequired HID_DSADMIN_PWDREC_ADO - -*TabAppearance HID_OPTIONS_COLORCONFIG -Scheme cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME -Save cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME -Delete cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME -ColorList HID_OPTIONS_COLORCONFIG_COLORLIST_WIN -LBGeneralDocBg HID_COLORPAGE_DOCCOLOR_LB -CBGeneralTextBd HID_COLORPAGE_DOCBOUNDARIES_CB -LBGeneralTextBd HID_COLORPAGE_DOCBOUNDARIES_LB -LBGeneralAppBg HID_COLORPAGE_APPBACKGROUND_LB -CBGeneralObjBd HID_COLORPAGE_OBJECTBOUNDARIES_CB -LBGeneralObjBd HID_COLORPAGE_OBJECTBOUNDARIES_LB -CBGeneralTableBd HID_COLORPAGE_TABLEBOUNDARIES_CB -LBGeneralTableBd HID_COLORPAGE_TABLEBOUNDARIES_LB -LBGeneralFont HID_COLORPAGE_FONTCOLOR_LB -CBGeneralUnvisitedLinks HID_COLORPAGE_LINKS_CB -LBGeneralUnvisitedLinks HID_COLORPAGE_LINKS_LB -CBGeneralVisitedLinks HID_COLORPAGE_LINKSVISITED_CB -LBGeneralVisitedLinks HID_COLORPAGE_LINKSVISITED_LB -LBGeneralAutoSpellcheck HID_COLORPAGE_SPELL_LB -LBWriterGrid HID_COLORPAGE_WRITERTEXTGRID_LB -CBWriterFieldShadings HID_COLORPAGE_WRITERFIELDSHADINGS_CB -LBWriterFieldShadings HID_COLORPAGE_WRITERFIELDSHADINGS_LB -CBWriterIndexShadings HID_COLORPAGE_WRITERIDXSHADINGS_CB -LBWriterIndexShadings HID_COLORPAGE_WRITERIDXSHADINGS_LB -LBWriterNoteIndicator HID_COLORPAGE_WRITERNOTESINDICATOR_LB -LBWriterScriptIndicator HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB -CBWriterSectionBd HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB -LBWriterSectionBd HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB -LBWriterPageBreaks HID_COLORPAGE_WRITERPAGEBREAKS_LB -LBWriterDirectCursor HID_COLORPAGE_WRITERDIRECTCURSOR_LB -LBHtmlSGML HID_COLORPAGE_HTMLSGML_LB -LBHtmlComment HID_COLORPAGE_HTMLCOMMENT_LB -LBHtmlKeyword HID_COLORPAGE_HTMLKEYWORD_LB -LBHtmlText HID_COLORPAGE_HTMLUNKNOWN_LB -LBCalcGridlines HID_COLORPAGE_CALCGRID_LB -LBCalcPageBreaks HID_COLORPAGE_CALCPAGEBREAK_LB -LBCalcManualBreaks HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB -LBCalcAutoBreaks HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB -LBCalcDetective HID_COLORPAGE_CALCDETECTIVE_LB -LBCalcDetectiveError HID_COLORPAGE_CALCDETECTIVEERROR_LB -LBCalcReferences HID_COLORPAGE_CALCREFERENCE_LB -LBCalcNotesBg HID_COLORPAGE_CALCNOTESBACKGROUND_LB -LBDrawingGrid HID_COLORPAGE_DRAWGRID_LB -LBBasicIdentifier HID_COLORPAGE_BASICIDENTIFIER_LB -LBBasicComment HID_COLORPAGE_BASICCOMMENT_LB -LBBasicNumber HID_COLORPAGE_BASICNUMBER_LB -LBBasicString HID_COLORPAGE_BASICSTRING_LB -LBBasicOperator HID_COLORPAGE_BASICOPERATOR_LB -LBBasicReservedExpression HID_COLORPAGE_BASICKEYWORD_LB -LBBasicError HID_COLORPAGE_BASICERROR_LB - -*TabArea HID_AREA_AREA -BackgroundColour cui:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD -BackgroundColourList cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR -FillOptions cui:ListBox:RID_SVXPAGE_AREA:LB_AREA_TYPE -ColourList cui:ListBox:RID_SVXPAGE_AREA:LB_COLOR -GradientList cui:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT -HatchingList cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHING -BitmapList cui:ListBox:RID_SVXPAGE_AREA:LB_BITMAP -Automatic cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT -Increments cui:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT -Tile cui:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE -Stretch cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH -Relative cui:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE -Original cui:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL -Width cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE -Height cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE -XOffset cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET -YOffset cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET -Row cui:RadioButton:RID_SVXPAGE_AREA:RBT_ROW -Column cui:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN -Offset cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET - -*TabAsianLayout HID_SVXPAGE_CHAR_TWOLINES -TwoLinesEachLine cui:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES -BeginningCharacter cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET -EndCharacter cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET - -*TabAsianLayoutOptions HID_OPTIONS_ASIAN_LAYOUT -WesternCharactersOnly cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING -WesternTextAndPunctuation cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT -NoCompression cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP -CompressPunctuationOnly cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP -CompressPunctuationAndJapaneseKana cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP -Language cui:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE -Standard cui:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD -NoStartOfLine cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START -NoEndOfLine cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END - -*TabAsianTypography HID_SVXPAGE_PARA_ASIAN -ApplyList cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN -AllowHangingPunctuation cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC -ApplySpacingBetween cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE - -*TabAutoCaption HID_OPTCAPTION_PAGE -ObjectList HID_OPTCAPTION_CLB -Category sw:ComboBox:TP_OPTCAPTION_PAGE:BOX_CATEGORY -Numbering sw:ListBox:TP_OPTCAPTION_PAGE:BOX_FORMAT -CaptionSeparator sw:Edit:TP_OPTCAPTION_PAGE:EDT_TEXT -Position sw:ListBox:TP_OPTCAPTION_PAGE:BOX_POS -Level sw:ListBox:TP_OPTCAPTION_PAGE:LB_LEVEL -ChapterSeparator sw:Edit:TP_OPTCAPTION_PAGE:ED_SEPARATOR -CharacterStyle sw:ListBox:TP_OPTCAPTION_PAGE:LB_CHARSTYLE -ApplyBorderAndShadow sw:CheckBox:TP_OPTCAPTION_PAGE:CB_APPLYBORDER - -*TabBaseBookmarks HID_DSADMIN_DOCUMENTLINKS -Bookmarklist HID_DSADMIN_DOCUMENTS - -*TabBullet HID_SVXPAGE_PICK_BULLET -Auswahl HID_VALUESET_BULLET -Optionen HID_NUM_FORMAT_BTN -Zurueck HID_TABDLG_RESET_BTN -Remove HID_NUM_RESET - -*TabChartAxisLabel HID_SCH_TP_AXIS_LABEL - ShowLabels chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR - Tile chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_SIDEBYSIDE - StaggerOdd chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_UPDOWN - StaggerEven chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_DOWNUP - Automatic chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_AUTOORDER - Overlap chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTOVERLAP - Break chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTBREAK - AngleKnob HID_SCH_ALIGNMENT_CTR_DIAL - AngleText HID_SCH_ALIGNMENT_DEGREES - VerticallyStacked HID_SCH_ALIGNMENT_STACKED - TextDirection chart2:ListBox:TP_AXIS_LABEL:LB_AXIS_TEXTDIR +*TabAccessibility CUI_HID_OPTIONS_ACCESSIBILITYCONFIG +ForPagePreviews cui.CheckBox.10250.2 +HelpTips cui.CheckBox.10250.4 +After cui.NumericField.10250.5 +AllowAnimatedGraphics cui.CheckBox.10250.7 +AllowAnimatedText cui.CheckBox.10250.8 +AlwaysUseAutomaticFontColor cui.CheckBox.10250.9 +SupportAssistiveTechnologyTools cui.CheckBox.10250.11 +UseTextSelectionCursor cui.CheckBox.10250.12 +AutomaticDetectHC cui.CheckBox.10250.13 + +*TabAdabas DBACCESS_HID_DSADMIN_PAGE_ADABAS +Hostname dbaccess.Edit.19205.5 +CacheSize dbaccess.NumericField.19205.2 +DataIncrement dbaccess.NumericField.19205.1 +CotrolUser dbaccess.Edit.19205.2 +ControlPassword dbaccess.Edit.19205.1 +ShutdownService dbaccess.CheckBox.19205.1 +Charset DBACCESS_HID_DSADMIN_CHARSET +Extended dbaccess.PushButton.19205.1 + +*TabAdabasUserSettings DBACCESS_HID_TAB_PAGE_USERADMIN +User DBACCESS_HID_TAB_PAGE_LBUSER +AddUser DBACCESS_HID_TAB_PAGE_PBUSER +ChangePassword DBACCESS_HID_TAB_PAGE_PBCHGPWD +DeleteUser DBACCESS_HID_TAB_PAGE_PBUSERDELETE +AccessRights DBACCESS_HID_TAB_PAGE_TBLGRANTS + +*TabAdditionalSettings extensions.TabPage.19701 +Settings extensions.PushButton.19701.1 + +*TabAddressDataSourceAutoPilot extensions.TabPage.19700 +Mozilla extensions.RadioButton.19700.1 +LDAP extensions.RadioButton.19700.6 +Outlook extensions.RadioButton.19700.7 +WinSystem extensions.RadioButton.19700.8 +Other extensions.RadioButton.19700.9 + +*TabADO DBACCESS_HID_DSADMIN_PAGE_ADO +URL DBACCESS_HID_DSADMIN_CONNURL_ADOPAGE +UserName DBACCESS_HID_DSADMIN_USER_ADO +PasswordRequired DBACCESS_HID_DSADMIN_PWDREC_ADO + +*TabAppearance CUI_HID_OPTIONS_COLORCONFIG +Scheme cui.ListBox.10249.3 +Save cui.PushButton.10249.4 +Delete cui.PushButton.10249.5 +ColorList CUI_HID_OPTIONS_COLORCONFIG_COLORLIST_WIN +LBGeneralDocBg CUI_HID_COLORPAGE_DOCCOLOR_LB +CBGeneralTextBd CUI_HID_COLORPAGE_DOCBOUNDARIES_CB +LBGeneralTextBd CUI_HID_COLORPAGE_DOCBOUNDARIES_LB +LBGeneralAppBg CUI_HID_COLORPAGE_APPBACKGROUND_LB +CBGeneralObjBd CUI_HID_COLORPAGE_OBJECTBOUNDARIES_CB +LBGeneralObjBd CUI_HID_COLORPAGE_OBJECTBOUNDARIES_LB +CBGeneralTableBd CUI_HID_COLORPAGE_TABLEBOUNDARIES_CB +LBGeneralTableBd CUI_HID_COLORPAGE_TABLEBOUNDARIES_LB +LBGeneralFont CUI_HID_COLORPAGE_FONTCOLOR_LB +CBGeneralUnvisitedLinks CUI_HID_COLORPAGE_LINKS_CB +LBGeneralUnvisitedLinks CUI_HID_COLORPAGE_LINKS_LB +CBGeneralVisitedLinks CUI_HID_COLORPAGE_LINKSVISITED_CB +LBGeneralVisitedLinks CUI_HID_COLORPAGE_LINKSVISITED_LB +LBGeneralAutoSpellcheck CUI_HID_COLORPAGE_SPELL_LB +LBWriterGrid CUI_HID_COLORPAGE_WRITERTEXTGRID_LB +CBWriterFieldShadings CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_CB +LBWriterFieldShadings CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_LB +CBWriterIndexShadings CUI_HID_COLORPAGE_WRITERIDXSHADINGS_CB +LBWriterIndexShadings CUI_HID_COLORPAGE_WRITERIDXSHADINGS_LB +LBWriterNoteIndicator CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_LB +LBWriterScriptIndicator CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB +CBWriterSectionBd CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB +LBWriterSectionBd CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB +LBWriterPageBreaks CUI_HID_COLORPAGE_WRITERPAGEBREAKS_LB +LBWriterDirectCursor CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_LB +LBHtmlSGML CUI_HID_COLORPAGE_HTMLSGML_LB +LBHtmlComment CUI_HID_COLORPAGE_HTMLCOMMENT_LB +LBHtmlKeyword CUI_HID_COLORPAGE_HTMLKEYWORD_LB +LBHtmlText CUI_HID_COLORPAGE_HTMLUNKNOWN_LB +LBCalcGridlines CUI_HID_COLORPAGE_CALCGRID_LB +LBCalcPageBreaks CUI_HID_COLORPAGE_CALCPAGEBREAK_LB +LBCalcManualBreaks CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB +LBCalcAutoBreaks CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB +LBCalcDetective CUI_HID_COLORPAGE_CALCDETECTIVE_LB +LBCalcDetectiveError CUI_HID_COLORPAGE_CALCDETECTIVEERROR_LB +LBCalcReferences CUI_HID_COLORPAGE_CALCREFERENCE_LB +LBCalcNotesBg CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_LB +LBDrawingGrid CUI_HID_COLORPAGE_DRAWGRID_LB +LBBasicIdentifier CUI_HID_COLORPAGE_BASICIDENTIFIER_LB +LBBasicComment CUI_HID_COLORPAGE_BASICCOMMENT_LB +LBBasicNumber CUI_HID_COLORPAGE_BASICNUMBER_LB +LBBasicString CUI_HID_COLORPAGE_BASICSTRING_LB +LBBasicOperator CUI_HID_COLORPAGE_BASICOPERATOR_LB +LBBasicReservedExpression CUI_HID_COLORPAGE_BASICKEYWORD_LB +LBBasicError CUI_HID_COLORPAGE_BASICERROR_LB + +*TabArea CUI_HID_AREA_AREA +BackgroundColour cui.CheckBox.10056.21 +BackgroundColourList cui.ListBox.10056.22 +FillOptions cui.ListBox.10056.19 +ColourList cui.ListBox.10056.1 +GradientList cui.ListBox.10056.2 +HatchingList cui.ListBox.10056.3 +BitmapList cui.ListBox.10056.4 +Automatic cui.TriStateBox.10056.3 +Increments cui.NumericField.10056.1 +Tile cui.TriStateBox.10056.4 +Stretch cui.TriStateBox.10056.5 +Relative cui.TriStateBox.10056.1 +Original cui.TriStateBox.10056.6 +Width cui.MetricField.10056.4 +Height cui.MetricField.10056.5 +XOffset cui.MetricField.10056.1 +YOffset cui.MetricField.10056.2 +Row cui.RadioButton.10056.6 +Column cui.RadioButton.10056.7 +Offset cui.MetricField.10056.3 + +*TabAsianLayout CUI_HID_SVXPAGE_CHAR_TWOLINES +TwoLinesEachLine cui.CheckBox.10242.401 +BeginningCharacter cui.ListBox.10242.412 +EndCharacter cui.ListBox.10242.414 + +*TabAsianLayoutOptions CUI_HID_OPTIONS_ASIAN_LAYOUT +WesternCharactersOnly cui.RadioButton.10246.2 +WesternTextAndPunctuation cui.RadioButton.10246.3 +NoCompression cui.RadioButton.10246.5 +CompressPunctuationOnly cui.RadioButton.10246.6 +CompressPunctuationAndJapaneseKana cui.RadioButton.10246.7 +Language cui.ListBox.10246.12 +Standard cui.CheckBox.10246.9 +NoStartOfLine cui.Edit.10246.14 +NoEndOfLine cui.Edit.10246.16 + +*TabAsianTypography CUI_HID_SVXPAGE_PARA_ASIAN +ApplyList cui.TriStateBox.10245.4 +AllowHangingPunctuation cui.TriStateBox.10245.2 +ApplySpacingBetween cui.TriStateBox.10245.7 + +*TabAutoCaption SW_HID_OPTCAPTION_PAGE +ObjectList SW_HID_OPTCAPTION_CLB +Category sw.ComboBox.20878.14 +Numbering sw.ListBox.20878.16 +CaptionSeparator sw.Edit.20878.18 +Position sw.ListBox.20878.20 +Level sw.ListBox.20878.23 +ChapterSeparator sw.Edit.20878.25 +CharacterStyle sw.ListBox.20878.28 +ApplyBorderAndShadow sw.CheckBox.20878.29 + +*TabBaseBookmarks DBACCESS_HID_DSADMIN_DOCUMENTLINKS +Bookmarklist DBACCESS_HID_DSADMIN_DOCUMENTS + +*TabBullet CUI_HID_SVXPAGE_PICK_BULLET +Auswahl CUI_HID_VALUESET_BULLET +Optionen SW_HID_NUM_FORMAT_BTN +Zurueck SFX2_HID_TABDLG_RESET_BTN +Remove SW_HID_NUM_RESET + +*TabChartAxisLabel CHART2_HID_SCH_TP_AXIS_LABEL + ShowLabels chart2.CheckBox.920.1 + Tile chart2.RadioButton.920.14 + StaggerOdd chart2.RadioButton.920.15 + StaggerEven chart2.RadioButton.920.16 + Automatic chart2.RadioButton.920.17 + Overlap chart2.CheckBox.920.11 + Break chart2.CheckBox.920.12 + AngleKnob CHART2_HID_SCH_ALIGNMENT_CTR_DIAL + AngleText CHART2_HID_SCH_ALIGNMENT_DEGREES + VerticallyStacked CHART2_HID_SCH_ALIGNMENT_STACKED + TextDirection chart2.ListBox.920.20 -*TabChartAxisNumbers HID_NUMBERFORMAT - Category cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY - FormatCurrency cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY - FormatString HID_NUMBERFORMAT_LB_FORMAT - Language cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE - Sourceformat cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT - DecimalPlaces cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS - LeadingZeroes cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES - NegativNumbersRed cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED - ThousandsSeparator cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND - FormatCode cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT - AddButton HID_NUMBERFORMAT_TBI_ADD - EditCommentButton HID_NUMBERFORMAT_TBI_INFO - RemoveButton HID_NUMBERFORMAT_TBI_REMOVE - Comment cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT +*TabChartAxisNumbers CUI_HID_NUMBERFORMAT + Category cui.ListBox.10041.9 + FormatCurrency cui.ListBox.10041.33 + FormatString CUI_HID_NUMBERFORMAT_LB_FORMAT + Language cui.ListBox.10041.13 + Sourceformat cui.CheckBox.10041.34 + DecimalPlaces cui.NumericField.10041.22 + LeadingZeroes cui.NumericField.10041.24 + NegativNumbersRed cui.CheckBox.10041.25 + ThousandsSeparator cui.CheckBox.10041.26 + FormatCode cui.Edit.10041.14 + AddButton CUI_HID_NUMBERFORMAT_TBI_ADD + EditCommentButton CUI_HID_NUMBERFORMAT_TBI_INFO + RemoveButton CUI_HID_NUMBERFORMAT_TBI_REMOVE + Comment cui.Edit.10041.28 -*TabChartAxisScale chart2:TabPage:TP_SCALE -MinimumValue chart2:SpinField:TP_SCALE:EDT_MIN -MinimumAutomatic chart2:CheckBox:TP_SCALE:CBX_AUTO_MIN -MaximumValue chart2:SpinField:TP_SCALE:EDT_MAX -MaximumAutomatic chart2:CheckBox:TP_SCALE:CBX_AUTO_MAX -MajorIntervalValue chart2:SpinField:TP_SCALE:EDT_STEP_MAIN -MajorIntervalAutomatic chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_MAIN -MinorIntervalCount chart2:MetricField:TP_SCALE:MT_STEPHELP -MinorIntervalCountAutomatic chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_HELP -ReferenceValue chart2:SpinField:TP_SCALE:EDT_ORIGIN -RreferenceValueAutomatic chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN -LogarithmicScale chart2:CheckBox:TP_SCALE:CBX_LOGARITHM -ReverseDirection chart2:CheckBox:TP_SCALE:CBX_REVERSE - -*TabChartAxisPositioning chart2:TabPage:TP_AXIS_POSITIONS -CrossOtherAxisAt chart2:ListBox:TP_AXIS_POSITIONS:LB_CROSSES_OTHER_AXIS_AT -AxisAtValue chart2:SpinField:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT -AxisAtCategory chart2:ComboBox:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT_CATEGORY -Hidden_Checkbox1 chart2:CheckBox:TP_AXIS_POSITIONS:CB_AXIS_BETWEEN_CATEGORIES -PlaceLabels chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_LABELS -Hidden_Spinfield1 chart2:SpinField:TP_AXIS_POSITIONS:EDT_AXIS_LABEL_DISTANCE -MajorIntervalMarksInner chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_INNER -MajorIntervalMarksOuter chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_OUTER -MinorIntervalMarksInner chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_INNER -MinorIntervalMarksOuter chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_OUTER -PlaceMarks chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_TICKS -Hidden_Checkbox2 chart2:CheckBox:TP_AXIS_POSITIONS:CB_MAJOR_GRID -Hidden_MoreBtn chart2:PushButton:TP_AXIS_POSITIONS:PB_MAJOR_GRID -Hidden_Checkbox3 chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_GRID -Hidden_More2 chart2:PushButton:TP_AXIS_POSITIONS:PB_MINOR_GRID - -*TabChartTypeDataRange chart2:TabPage:TP_RANGECHOOSER - DataRange chart2:Edit:TP_RANGECHOOSER:ED_RANGE - SelectDataRange chart2:ImageButton:TP_RANGECHOOSER:IB_RANGE - Rows chart2:RadioButton:TP_RANGECHOOSER:RB_DATAROWS - Columns chart2:RadioButton:TP_RANGECHOOSER:RB_DATACOLS - FirstRowAsLabel chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_ROW_ASLABELS - FirstColumnAsLabel chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_COLUMN_ASLABELS +*TabChartAxisScale chart2.TabPage.903 +MinimumValue chart2.SpinField.903.3 +MinimumAutomatic chart2.CheckBox.903.1 +MaximumValue chart2.SpinField.903.2 +MaximumAutomatic chart2.CheckBox.903.2 +MajorIntervalValue chart2.SpinField.903.1 +MajorIntervalAutomatic chart2.CheckBox.903.3 +MinorIntervalCount chart2.MetricField.903.10 +MinorIntervalCountAutomatic chart2.CheckBox.903.4 +ReferenceValue chart2.SpinField.903.4 +RreferenceValueAutomatic chart2.CheckBox.903.5 +LogarithmicScale chart2.CheckBox.903.6 +ReverseDirection chart2.CheckBox.903.7 + +*TabChartAxisPositioning chart2.TabPage.904 +CrossOtherAxisAt chart2.ListBox.904.1 +AxisAtValue chart2.SpinField.904.3 +AxisAtCategory chart2.ComboBox.904.4 +Hidden_Checkbox1 chart2.CheckBox.904.1 +PlaceLabels chart2.ListBox.904.2 +Hidden_Spinfield1 chart2.SpinField.904.5 +MajorIntervalMarksInner chart2.CheckBox.904.2 +MajorIntervalMarksOuter chart2.CheckBox.904.3 +MinorIntervalMarksInner chart2.CheckBox.904.4 +MinorIntervalMarksOuter chart2.CheckBox.904.5 +PlaceMarks chart2.ListBox.904.6 +Hidden_Checkbox2 chart2.CheckBox.904.6 +Hidden_MoreBtn chart2.PushButton.904.1 +Hidden_Checkbox3 chart2.CheckBox.904.7 +Hidden_More2 chart2.PushButton.904.2 + +*TabChartTypeDataRange chart2.TabPage.911 + DataRange chart2.Edit.911.1 + SelectDataRange chart2.ImageButton.911.1 + Rows chart2.RadioButton.911.1 + Columns chart2.RadioButton.911.2 + FirstRowAsLabel chart2.CheckBox.911.1 + FirstColumnAsLabel chart2.CheckBox.911.2 +TabDataRangesDataRange TabChartTypeDataRange +TabFormatDataRangesDataRange TabChartTypeDataRange -*TabChartTypeDataSeries chart2:TabPage:TP_DATA_SOURCE - DataRanges HID_SCH_DATA_RANGES_LIST - RangeFor chart2:Edit:TP_DATA_SOURCE:EDT_RANGE - SelectRange chart2:ImageButton:TP_DATA_SOURCE:IMB_RANGE_MAIN - Categories chart2:Edit:TP_DATA_SOURCE:EDT_CATEGORIES - SelectCategories chart2:ImageButton:TP_DATA_SOURCE:IMB_RANGE_CAT - AddButton chart2:PushButton:TP_DATA_SOURCE:BTN_ADD - RemoveButton chart2:PushButton:TP_DATA_SOURCE:BTN_REMOVE - MoveUp chart2:PushButton:TP_DATA_SOURCE:BTN_UP - MoveDown chart2:PushButton:TP_DATA_SOURCE:BTN_DOWN - DataSeries HID_SCH_SERIES_LIST +*TabChartTypeDataSeries chart2.TabPage.914 + DataRanges CHART2_HID_SCH_DATA_RANGES_LIST + RangeFor chart2.Edit.914.80 + SelectRange chart2.ImageButton.914.90 + Categories chart2.Edit.914.120 + SelectCategories chart2.ImageButton.914.130 + AddButton chart2.PushButton.914.30 + RemoveButton chart2.PushButton.914.40 + MoveUp chart2.PushButton.914.140 + MoveDown chart2.PushButton.914.150 + DataSeries CHART2_HID_SCH_SERIES_LIST +TabDataRangesDataSeries TabChartTypeDataSeries +TabFormatDataRangesDataSeries TabChartTypeDataSeries -*TabChartPieOptions chart2:TabPage:TP_POLAROPTIONS -Clockwise chart2:CheckBox:TP_POLAROPTIONS:CB_CLOCKWISE -StartingAngle HID_SCH_STARTING_ANGLE_DIAL -Degrees chart2:NumericField:TP_POLAROPTIONS:NF_STARTING_ANGLE - -*TabChartTypeChartElements chart2:TabPage:TP_WIZARD_TITLEANDOBJECTS -Title HID_SCH_TITLE_MAIN -Subtitle HID_SCH_TITLE_SUB -TitleXaxis HID_SCH_TITLE_X -TitleYaxis HID_SCH_TITLE_Y -TitleZaxis HID_SCH_TITLE_Z -SecondTitleXaxis HID_SCH_TITLE_SECONDARY_X -SecondTitleYaxis HID_SCH_TITLE_SECONDARY_Y -Display HID_SCH_LEGEND_SHOW -PositionLeft HID_SCH_LEGEND_POS_LEFT -PositionTop HID_SCH_LEGEND_POS_TOP -PositionRight HID_SCH_LEGEND_POS_RIGHT -PositionBottom HID_SCH_LEGEND_POS_BOTTOM -GridLinesXaxis HID_SCH_CB_XGRID -GridLinesYaxis HID_SCH_CB_YGRID -GridLinesZaxis HID_SCH_CB_ZGRID +*TabChartPieOptions chart2.TabPage.909 +Clockwise chart2.CheckBox.909.1 +StartingAngle CHART2_HID_SCH_STARTING_ANGLE_DIAL +Degrees chart2.NumericField.909.1 + +*TabChartTypeChartElements chart2.TabPage.912 +Title CHART2_HID_SCH_TITLE_MAIN +Subtitle CHART2_HID_SCH_TITLE_SUB +TitleXaxis CHART2_HID_SCH_TITLE_X +TitleYaxis CHART2_HID_SCH_TITLE_Y +TitleZaxis CHART2_HID_SCH_TITLE_Z +SecondTitleXaxis CHART2_HID_SCH_TITLE_SECONDARY_X +SecondTitleYaxis CHART2_HID_SCH_TITLE_SECONDARY_Y +Display CHART2_HID_SCH_LEGEND_SHOW +PositionLeft CHART2_HID_SCH_LEGEND_POS_LEFT +PositionTop CHART2_HID_SCH_LEGEND_POS_TOP +PositionRight CHART2_HID_SCH_LEGEND_POS_RIGHT +PositionBottom CHART2_HID_SCH_LEGEND_POS_BOTTOM +GridLinesXaxis CHART2_HID_SCH_CB_XGRID +GridLinesYaxis CHART2_HID_SCH_CB_YGRID +GridLinesZaxis CHART2_HID_SCH_CB_ZGRID -*TabChartTypeChartLocation chart2:TabPage:TP_LOCATION -InsertInSheet chart2:ListBox:TP_LOCATION:LB_TABLE - -*TabCreateOptionGroup extensions:TabPage:RID_PAGE_OPTIONS_FINAL -GroupCaption extensions:Edit:RID_PAGE_OPTIONS_FINAL:ET_NAMEIT - -*TabConnections cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS -DriverList HID_OFA_CONNPOOL_DRIVERLIST -ConnectionPoolingEnabled cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS -EnablePoolingForThisDriver cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING -Timeout cui:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT - -*TabConnection dbaccess:TabPage:PAGE_CONNECTION -dBasePath HID_DSADMIN_DBASE_PATH -SelectPath HID_DSADMIN_BROWSECONN -Username dbaccess:Edit:PAGE_CONNECTION:ET_USERNAME -PasswordRequired dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED -JDBCDriverClass HID_DSADMIN_DRIVERCLASS -TestDriver dbaccess:PushButton:PAGE_CONNECTION:PB_TESTDRIVERCLASS -MySQLODBCDatasource HID_DSADMIN_MYSQL_ODBC_DATASOURCE -TestConnection dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION -MySQLJDBCDatasource HID_DSADMIN_MYSQL_DATABASE -AdabasDatasource HID_DSADMIN_ADABAS_DATABASE -OracleJDBCDatasource HID_DSADMIN_ORACLE_DATABASE -ConnectUrl HID_DSADMIN_URL_GENERAL -OdbcDatasourceName HID_DSADMIN_ODBC_DATASOURCE -SpreadsheetPath HID_DSADMIN_CALC_PATH -HostName HID_DSADMIN_LDAP_HOSTNAME -BaseDN HID_PAGE_DBWIZARD_LDAP_ET_BASEDN -TextPath HID_DSADMIN_FLAT_PATH - -*TabCopyDatabaseTable HID_TAB_WIZ_COPYTABLE -TableName HID_TAB_WIZ_TABLENAME_EDIT -DefinitionAndData dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEFDATA -Definition dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEF -AsTableView dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_VIEW -AttachData dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_APPENDDATA -CreatePrimaryKey dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_PRIMARY_COLUMN -PrimaryKeyName dbaccess:Edit:TAB_WIZ_COPYTABLE:ET_KEYNAME - -*TabColumnSelect HID_TAB_WIZ_COLUMN_SELECT -LeftColumNames dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_ORG_COLUMN_NAMES -Add dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_RH -AddAll dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_RH -Remove dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_LH -RemoveAll dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_LH -RightColumNames dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_NEW_COLUMN_NAMES - -*TabCompatibility HID_OPTCOMPATIBILITY_PAGE -Options HID_COMPATIBILITY_OPTIONS_BOX -Formatting sw:ListBox:TP_OPTCOMPATIBILITY_PAGE:LB_FORMATTING -Reset sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_RESET -Default sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_DEFAULT - -*TabComplexTextLayout HID_OPTIONS_CTL -UseSequenceChecking cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING -Logical cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL -Visual cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL -Numerals cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS -Restricted cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED -TypeAndReplace cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE - -*TabCustomizeEvents HID_SVX_CONFIG_EVENT -SaveIn cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN -EventListbox HID_SVX_MACRO_LB_EVENT -AssignMacro cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN -RemoveMacro cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE -ResetBtn HID_TABDLG_RESET_BTN - -*TabCustomizeMenu HID_SVX_CONFIG_MENU -Menu cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS -BtnNew cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW -MenuBtn cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE -AddCommands cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS -Command cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY -BtnUp cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP -BtnDown cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN -SaveIn cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN -ResetBtn HID_TABDLG_RESET_BTN -Entries HID_SVX_CONFIG_MENU_CONTENTS - -*TabCustomizeToolbars HID_SVX_CONFIG_TOOLBAR -Menu cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS -BtnNew HID_SVX_NEW_TOOLBAR -MenuBtn HID_SVX_MODIFY_TOOLBAR -AddCommands HID_SVX_NEW_TOOLBAR_ITEM -Command HID_SVX_MODIFY_TOOLBAR_ITEM -BtnUp cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP -BtnDown cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN -SaveIn HID_SVX_SAVE_IN -ToolbarContents HID_SVX_CONFIG_TOOLBAR_CONTENTS -ResetBtn HID_TABDLG_RESET_BTN +*TabChartTypeChartLocation chart2.TabPage.913 +InsertInSheet chart2.ListBox.913.1 + +*TabCreateOptionGroup extensions.TabPage.19726 +GroupCaption extensions.Edit.19726.3 + +*TabConnections cui.TabPage.17022 +DriverList CUI_HID_OFA_CONNPOOL_DRIVERLIST +ConnectionPoolingEnabled cui.CheckBox.17022.2 +EnablePoolingForThisDriver cui.CheckBox.17022.7 +Timeout cui.NumericField.17022.9 + +*TabConnection dbaccess.TabPage.19206 +dBasePath DBACCESS_HID_DSADMIN_DBASE_PATH +SelectPath DBACCESS_HID_DSADMIN_BROWSECONN +Username dbaccess.Edit.19206.1 +PasswordRequired dbaccess.CheckBox.19206.1 +JDBCDriverClass DBACCESS_HID_DSADMIN_DRIVERCLASS +TestDriver dbaccess.PushButton.19206.1 +MySQLODBCDatasource DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE +TestConnection dbaccess.PushButton.19206.2 +MySQLJDBCDatasource DBACCESS_HID_DSADMIN_MYSQL_DATABASE +AdabasDatasource DBACCESS_HID_DSADMIN_ADABAS_DATABASE +OracleJDBCDatasource DBACCESS_HID_DSADMIN_ORACLE_DATABASE +ConnectUrl DBACCESS_HID_DSADMIN_URL_GENERAL +OdbcDatasourceName DBACCESS_HID_DSADMIN_ODBC_DATASOURCE +SpreadsheetPath DBACCESS_HID_DSADMIN_CALC_PATH +HostName DBACCESS_HID_DSADMIN_LDAP_HOSTNAME +BaseDN DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN +TextPath DBACCESS_HID_DSADMIN_FLAT_PATH + +*TabCopyDatabaseTable DBACCESS_HID_TAB_WIZ_COPYTABLE +TableName DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT +DefinitionAndData dbaccess.RadioButton.19212.1 +Definition dbaccess.RadioButton.19212.2 +AsTableView dbaccess.RadioButton.19212.3 +AttachData dbaccess.RadioButton.19212.4 +CreatePrimaryKey dbaccess.CheckBox.19212.5 +PrimaryKeyName dbaccess.Edit.19212.3 + +*TabColumnSelect DBACCESS_HID_TAB_WIZ_COLUMN_SELECT +LeftColumNames dbaccess.MultiListBox.19209.1 +Add dbaccess.ImageButton.19209.1 +AddAll dbaccess.ImageButton.19209.3 +Remove dbaccess.ImageButton.19209.2 +RemoveAll dbaccess.ImageButton.19209.4 +RightColumNames dbaccess.MultiListBox.19209.2 + +*TabCompatibility SW_HID_OPTCOMPATIBILITY_PAGE +Options SW_HID_COMPATIBILITY_OPTIONS_BOX +Formatting sw.ListBox.20903.12 +Reset sw.PushButton.20903.15 +Default sw.PushButton.20903.16 + +*TabComplexTextLayout CUI_HID_OPTIONS_CTL +UseSequenceChecking cui.CheckBox.10252.11 +Logical cui.RadioButton.10252.22 +Visual cui.RadioButton.10252.23 +Numerals cui.ListBox.10252.32 +Restricted cui.CheckBox.10252.12 +TypeAndReplace cui.CheckBox.10252.13 + +*TabCustomizeEvents CUI_HID_SVX_CONFIG_EVENT +SaveIn cui.ListBox.10295.11 +EventListbox CUI_HID_SVX_MACRO_LB_EVENT +AssignMacro cui.PushButton.10295.2 +RemoveMacro cui.PushButton.10295.3 +ResetBtn SFX2_HID_TABDLG_RESET_BTN + +*TabCustomizeMenu CUI_HID_SVX_CONFIG_MENU +Menu cui.ListBox.10292.311 +BtnNew cui.PushButton.10292.312 +MenuBtn cui.MenuButton.10292.314 +AddCommands cui.PushButton.10292.326 +Command cui.MenuButton.10292.318 +BtnUp cui.ImageButton.10292.319 +BtnDown cui.ImageButton.10292.320 +SaveIn cui.ListBox.10292.324 +ResetBtn SFX2_HID_TABDLG_RESET_BTN +Entries CUI_HID_SVX_CONFIG_MENU_CONTENTS + +*TabCustomizeToolbars CUI_HID_SVX_CONFIG_TOOLBAR +Menu cui.ListBox.10292.311 +BtnNew CUI_HID_SVX_NEW_TOOLBAR +MenuBtn CUI_HID_SVX_MODIFY_TOOLBAR +AddCommands CUI_HID_SVX_NEW_TOOLBAR_ITEM +Command CUI_HID_SVX_MODIFY_TOOLBAR_ITEM +BtnUp cui.ImageButton.10292.319 +BtnDown cui.ImageButton.10292.320 +SaveIn CUI_HID_SVX_SAVE_IN +ToolbarContents CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS +ResetBtn SFX2_HID_TABDLG_RESET_BTN -*TabDatabaseField extensions:TabPage:RID_PAGE_OPTION_DBFIELD -YesSaveIt extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES -NoValueForm extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_NO -Fieldbox extensions:ListBox:RID_PAGE_OPTION_DBFIELD:LB_STOREINFIELD - -*TabDatabaseValues extensions:TabPage:RID_PAGE_OPTIONVALUES -YesSaveIt extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES -NoValueForm extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_NO -Fieldbox extensions:ListBox:RID_PAGE_OPTION_DBFIELD:LB_STOREINFIELD -WhichValue extensions:Edit:RID_PAGE_OPTIONVALUES:ET_OPTIONVALUE -OptionFields extensions:ListBox:RID_PAGE_OPTIONVALUES:LB_RADIOBUTTONS - -*TabDataControl HID_FM_PROPDLG_TAB_DATA -DataField HID_PROP_CONTROLSOURCE -EmptyStringIsNull HID_PROP_EMPTY_IS_NULL -FilterProposal HID_PROP_FILTERPROPOSAL -TypeOfListContent HID_PROP_LISTSOURCETYPE -ListContent HID_PROP_LISTSOURCE -BoundField HID_PROP_BOUNDCOLUMN -CellBound HID_PROP_BOUND_CELL -CellContentType HID_PROP_CELL_EXCHANGE_TYPE -CellRange HID_PROP_LIST_CELL_RANGE -ReferenceValue HID_PROP_REFVALUE -ReferenceValueOff HID_PROP_UNCHECKEDREFVALUE +*TabDatabaseField extensions.TabPage.19725 +YesSaveIt extensions.RadioButton.19725.3 +NoValueForm extensions.RadioButton.19725.4 +Fieldbox extensions.ListBox.19725.4 + +*TabDatabaseValues extensions.TabPage.19724 +YesSaveIt extensions.RadioButton.19725.3 +NoValueForm extensions.RadioButton.19725.4 +Fieldbox extensions.ListBox.19725.4 +WhichValue extensions.Edit.19724.2 +OptionFields extensions.ListBox.19724.3 + +*TabDataControl EXTENSIONS_HID_FM_PROPDLG_TAB_DATA +DataField EXTENSIONS_HID_PROP_CONTROLSOURCE +EmptyStringIsNull EXTENSIONS_HID_PROP_EMPTY_IS_NULL +FilterProposal EXTENSIONS_HID_PROP_FILTERPROPOSAL +TypeOfListContent EXTENSIONS_HID_PROP_LISTSOURCETYPE +ListContent EXTENSIONS_HID_PROP_LISTSOURCE +BoundField EXTENSIONS_HID_PROP_BOUNDCOLUMN +CellBound EXTENSIONS_HID_PROP_BOUND_CELL +CellContentType EXTENSIONS_HID_PROP_CELL_EXCHANGE_TYPE +CellRange EXTENSIONS_HID_PROP_LIST_CELL_RANGE +ReferenceValue EXTENSIONS_HID_PROP_REFVALUE +ReferenceValueOff EXTENSIONS_HID_PROP_UNCHECKEDREFVALUE 'Controls in XForm Mode -XFormDataModel HID_PROP_XML_DATA_MODEL -XFormBindExpression HID_PROP_BIND_EXPRESSION -XFormBindExpressionName HID_PROP_BINDING_NAME -XFormBindExpressionBtn UID_PROP_DLG_BIND_EXPRESSION -XFormRequired HID_PROP_XSD_REQUIRED -XFormRequiredBtn UID_PROP_DLG_XSD_REQUIRED -XFormReleveant HID_PROP_XSD_RELEVANT -XFormReleveantBtn UID_PROP_DLG_XSD_RELEVANT -XFormReadOnly HID_PROP_XSD_READONLY -XFormReadOnlyBtn UID_PROP_DLG_XSD_READONLY -XFormConstraint HID_PROP_XSD_CONSTRAINT -XFormConstraintBtn UID_PROP_DLG_XSD_CONSTRAINT -XFormCalculation HID_PROP_XSD_CALCULATION -XFormCalculationBtn UID_PROP_DLG_XSD_CALCULATION -XFormDataType HID_PROP_XSD_DATA_TYPE -XFormAddDataTypeBtn UID_PROP_ADD_DATA_TYPE -XFormRemoveDataTypeBtn UID_PROP_REMOVE_DATA_TYPE - -*TabDataForm HID_FM_PROPDLG_TAB_DATA -DataSource HID_PROP_DATASOURCE -ContentType HID_PROP_CURSORSOURCETYPE -Content HID_PROP_CURSORSOURCE -AnalyzeSQLCommand HID_PROP_ESCAPE_PROCESSING -Filter HID_PROP_FILTER -FilterDLGButton UID_PROP_DLG_FILTER -Sort HID_PROP_SORT_CRITERIA -AllowAdditions HID_PROP_ALLOW_ADDITIONS -AllowModifications HID_PROP_ALLOW_EDITS -DeleteData HID_PROP_ALLOW_DELETIONS -AddDataOnly HID_PROP_DATAENTRY -NavigationBar HID_PROP_NAVIGATION -Cycle HID_PROP_CYCLE -LinkMasterFields HID_PROP_MASTERFIELDS -LinkSlaveFields HID_PROP_SLAVEFIELDS -FormLinkDLGButton UID_PROP_DLG_FORMLINKFIELDS -OpenQueryDesign UID_PROP_DLG_SQLCOMMAND -SortDLGButton UID_PROP_DLG_ORDER - -*TabDataPointLayout chart2:TabPage:TP_LAYOUT - BarColumnShape HID_SCH_LB_BAR_GEOMETRY - -*TabDataSeriesLabels HID_SCH_DATA_DESCR -ShowValue HID_SCH_DATALABEL_VALUE -AsNumber HID_SCH_DATALABEL_NUMBER -AsPercentage HID_SCH_DATALABEL_PERCENT -ShowLabelText HID_SCH_DATALABEL_TEXT -ShowLegendIconWithLabel HID_SCH_DATALABEL_SYMBOL -NumberFormat HID_SCH_PB_NUMBERFORMAT -PercentageFormat HID_SCH_PB_PERCENT_NUMBERFORMAT -Separator HID_SCH_DATALABEL_SEPARATOR -Placement HID_SCH_DATALABEL_PLACEMENT -TextDirection HID_SCH_TEXTDIRECTION -RotateAngle HID_SCH_DATALABEL_ROTATION_KNOB -RotateDegrees HID_SCH_DATALABEL_ROTATION_EDIT +XFormDataModel EXTENSIONS_HID_PROP_XML_DATA_MODEL +XFormBindExpression EXTENSIONS_HID_PROP_BIND_EXPRESSION +XFormBindExpressionName EXTENSIONS_HID_PROP_BINDING_NAME +XFormBindExpressionBtn EXTENSIONS_UID_PROP_DLG_BIND_EXPRESSION +XFormRequired EXTENSIONS_HID_PROP_XSD_REQUIRED +XFormRequiredBtn EXTENSIONS_UID_PROP_DLG_XSD_REQUIRED +XFormReleveant EXTENSIONS_HID_PROP_XSD_RELEVANT +XFormReleveantBtn EXTENSIONS_UID_PROP_DLG_XSD_RELEVANT +XFormReadOnly EXTENSIONS_HID_PROP_XSD_READONLY +XFormReadOnlyBtn EXTENSIONS_UID_PROP_DLG_XSD_READONLY +XFormConstraint EXTENSIONS_HID_PROP_XSD_CONSTRAINT +XFormConstraintBtn EXTENSIONS_UID_PROP_DLG_XSD_CONSTRAINT +XFormCalculation EXTENSIONS_HID_PROP_XSD_CALCULATION +XFormCalculationBtn EXTENSIONS_UID_PROP_DLG_XSD_CALCULATION +XFormDataType EXTENSIONS_HID_PROP_XSD_DATA_TYPE +XFormAddDataTypeBtn EXTENSIONS_UID_PROP_ADD_DATA_TYPE +XFormRemoveDataTypeBtn EXTENSIONS_UID_PROP_REMOVE_DATA_TYPE + +*TabDataForm EXTENSIONS_HID_FM_PROPDLG_TAB_DATA +DataSource EXTENSIONS_HID_PROP_DATASOURCE +ContentType EXTENSIONS_HID_PROP_CURSORSOURCETYPE +Content EXTENSIONS_HID_PROP_CURSORSOURCE +AnalyzeSQLCommand EXTENSIONS_HID_PROP_ESCAPE_PROCESSING +Filter EXTENSIONS_HID_PROP_FILTER +FilterDLGButton EXTENSIONS_UID_PROP_DLG_FILTER +Sort EXTENSIONS_HID_PROP_SORT_CRITERIA +AllowAdditions EXTENSIONS_HID_PROP_ALLOW_ADDITIONS +AllowModifications EXTENSIONS_HID_PROP_ALLOW_EDITS +DeleteData EXTENSIONS_HID_PROP_ALLOW_DELETIONS +AddDataOnly EXTENSIONS_HID_PROP_DATAENTRY +NavigationBar EXTENSIONS_HID_PROP_NAVIGATION +Cycle EXTENSIONS_HID_PROP_CYCLE +LinkMasterFields EXTENSIONS_HID_PROP_MASTERFIELDS +LinkSlaveFields EXTENSIONS_HID_PROP_SLAVEFIELDS +FormLinkDLGButton EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS +OpenQueryDesign EXTENSIONS_UID_PROP_DLG_SQLCOMMAND +SortDLGButton EXTENSIONS_UID_PROP_DLG_ORDER + +*TabDataPointLayout chart2.TabPage.907 + BarColumnShape CHART2_HID_SCH_LB_BAR_GEOMETRY + +*TabDataSeriesLabels CHART2_HID_SCH_DATA_DESCR +ShowValue CHART2_HID_SCH_DATALABEL_VALUE +AsNumber CHART2_HID_SCH_DATALABEL_NUMBER +AsPercentage CHART2_HID_SCH_DATALABEL_PERCENT +ShowLabelText CHART2_HID_SCH_DATALABEL_TEXT +ShowLegendIconWithLabel CHART2_HID_SCH_DATALABEL_SYMBOL +NumberFormat CHART2_HID_SCH_PB_NUMBERFORMAT +PercentageFormat CHART2_HID_SCH_PB_PERCENT_NUMBERFORMAT +Separator CHART2_HID_SCH_DATALABEL_SEPARATOR +Placement CHART2_HID_SCH_DATALABEL_PLACEMENT +TextDirection CHART2_HID_SCH_TEXTDIRECTION +RotateAngle CHART2_HID_SCH_DATALABEL_ROTATION_KNOB +RotateDegrees CHART2_HID_SCH_DATALABEL_ROTATION_EDIT +TabDataPointLabels TabDataSeriesLabels -*TabDataSeriesOptions chart2:TabPage:TP_OPTIONS -PrimaryYaxis chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_1 -SecondaryYaxis chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_2 -Gap chart2:MetricField:TP_OPTIONS:MT_GAP -Overlap chart2:MetricField:TP_OPTIONS:MT_OVERLAP -ConnectionLines chart2:CheckBox:TP_OPTIONS:CB_CONNECTOR -ShowBarsSideBySide chart2:CheckBox:TP_OPTIONS:CB_BARS_SIDE_BY_SIDE -LeaveGap chart2:RadioButton:TP_OPTIONS:RB_DONT_PAINT -AssumeZero chart2:RadioButton:TP_OPTIONS:RB_ASSUME_ZERO -ContinueLine chart2:RadioButton:TP_OPTIONS:RB_CONTINUE_LINE -IncludeHiddenCells chart2:CheckBox:TP_OPTIONS:CB_INCLUDE_HIDDEN_CELLS - -*TabDataSourceName extensions:TabPage:RID_PAGE_FINAL -SourceName extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME - -*TabdBase HID_DSADMIN_PAGE_DBASE -CharSet HID_DSADMIN_CHARSET -DisplayInactiveRecords HID_DSADMIN_SHOWDELETED -Indexes HID_DSADMIN_DBASE_INDICIES - -*TabDefaultFieldSelection extensions:TabPage:RID_PAGE_DEFAULTFIELDSELECTION -YesFollowing extensions:RadioButton:RID_PAGE_DEFAULTFIELDSELECTION:RB_DEFSELECTION_YES -NoSelected extensions:RadioButton:RID_PAGE_DEFAULTFIELDSELECTION:RB_DEFSELECTION_NO -Selection extensions:ListBox:RID_PAGE_DEFAULTFIELDSELECTION:LB_DEFSELECTIONFIELD - -*TabDialogs basctl:TabPage:RID_TP_DLGS -ModuleList HID_BASICIDE_MODULES_TREE -Edit basctl:PushButton:RID_TP_DLGS:RID_PB_EDIT -NewModule basctl:PushButton:RID_TP_DLGS:RID_PB_NEWMOD -NewDialog basctl:PushButton:RID_TP_DLGS:RID_PB_NEWDLG -Delete basctl:PushButton:RID_TP_DLGS:RID_PB_DELETE +*TabDataSeriesOptions chart2.TabPage.908 +PrimaryYaxis chart2.RadioButton.908.2 +SecondaryYaxis chart2.RadioButton.908.3 +Gap chart2.MetricField.908.4 +Overlap chart2.MetricField.908.5 +ConnectionLines chart2.CheckBox.908.9 +ShowBarsSideBySide chart2.CheckBox.908.10 +LeaveGap chart2.RadioButton.908.13 +AssumeZero chart2.RadioButton.908.14 +ContinueLine chart2.RadioButton.908.15 +IncludeHiddenCells chart2.CheckBox.908.16 + +*TabDataSourceName extensions.TabPage.19704 +SourceName extensions.Edit.19704.1 + +*TabdBase DBACCESS_HID_DSADMIN_PAGE_DBASE +CharSet DBACCESS_HID_DSADMIN_CHARSET +DisplayInactiveRecords DBACCESS_HID_DSADMIN_SHOWDELETED +Indexes DBACCESS_HID_DSADMIN_DBASE_INDICIES + +*TabDefaultFieldSelection extensions.TabPage.19723 +YesFollowing extensions.RadioButton.19723.1 +NoSelected extensions.RadioButton.19723.2 +Selection extensions.ListBox.19723.3 + +*TabDialogs basctl.TabPage.14889 +ModuleList BASCTL_HID_BASICIDE_MODULES_TREE +Edit basctl.PushButton.14889.4 +NewModule basctl.PushButton.14889.6 +NewDialog basctl.PushButton.14889.7 +Delete basctl.PushButton.14889.8 diff --git a/testautomation/global/win/etab_e_g.win b/testautomation/global/win/etab_e_g.win old mode 100755 new mode 100644 index 09fd5e9067b8..42d33ef010e3 --- a/testautomation/global/win/etab_e_g.win +++ b/testautomation/global/win/etab_e_g.win @@ -1,374 +1,374 @@ -*TabEffect sd:TabPage:RID_TP_CUSTOMANIMATION_EFFECT -Sound sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_SOUND -Play sd:PushButton:RID_TP_CUSTOMANIMATION_EFFECT:PB_SOUND_PREVIEW -AfterAnimation sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_AFTER_EFFECT -Dimcolor sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:CLB_DIMCOLOR -TextAnimation sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_TEXT_ANIM -DelayBetweenCharacters sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_TEXT_DELAY +*TabEffect sd.TabPage.20871 +Sound sd.ListBox.20871.11 +Play sd.PushButton.20871.12 +AfterAnimation sd.ListBox.20871.14 +Dimcolor sd.ListBox.20871.16 +TextAnimation sd.ListBox.20871.18 +DelayBetweenCharacters sd.MetricField.20871.19 -*TabEmail HID_OPTIONS_MAIL -EmailProgram cui:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL -EmailOpen cui:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL +*TabEmail CUI_HID_OPTIONS_MAIL +EmailProgram cui.Edit.10155.4 +EmailOpen cui.PushButton.10155.5 -*TabEntrance HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE -Effects sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS -Speed sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED -AutomaticPreview sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW +*TabEntrance SD_HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE +Effects sd.ListBox.20874.1 +Speed sd.ComboBox.20874.3 +AutomaticPreview sd.CheckBox.20874.4 -*TabEmphasis HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS -Effects sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS -Speed sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED -AutomaticPreview sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW +*TabEmphasis SD_HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS +Effects sd.ListBox.20874.1 +Speed sd.ComboBox.20874.3 +AutomaticPreview sd.CheckBox.20874.4 -*TabExit HID_SD_CUSTOMANIMATIONDIALOG_EXIT -Effects sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS -Speed sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED -AutomaticPreview sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW +*TabExit SD_HID_SD_CUSTOMANIMATIONDIALOG_EXIT +Effects sd.ListBox.20874.1 +Speed sd.ComboBox.20874.3 +AutomaticPreview sd.CheckBox.20874.4 -*TabMotionPaths HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH -Effects sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS -Speed sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED -AutomaticPreview sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW +*TabMotionPaths SD_HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH +Effects sd.ListBox.20874.1 +Speed sd.ComboBox.20874.3 +AutomaticPreview sd.CheckBox.20874.4 -*TabEnvelope HID_ENV_ENV -Addressee sw:MultiLineEdit:TP_ENV_ENV:EDT_ADDR -Sender sw:CheckBox:TP_ENV_ENV:BOX_SEND -SenderText sw:MultiLineEdit:TP_ENV_ENV:EDT_SEND -Database sw:ListBox:TP_ENV_ENV:LB_DATABASE -Table sw:ListBox:TP_ENV_ENV:LB_TABLE -Datenbasefield sw:ListBox:TP_ENV_ENV:LB_DBFIELD -Apply sw:ImageButton:TP_ENV_ENV:BTN_INSERT -Print HID_ENVELOP_PRINT -Insert HID_ENVELOP_INSERT -Back HID_TABDLG_RESET_BTN +*TabEnvelope SW_HID_ENV_ENV +Addressee sw.MultiLineEdit.22752.2 +Sender sw.CheckBox.22752.10 +SenderText sw.MultiLineEdit.22752.11 +Database sw.ListBox.22752.4 +Table sw.ListBox.22752.6 +Datenbasefield sw.ListBox.22752.9 +Apply sw.ImageButton.22752.7 +Print SW_HID_ENVELOP_PRINT +Insert SW_HID_ENVELOP_INSERT +Back SFX2_HID_TABDLG_RESET_BTN -*TabEventsControl HID_FM_PROPDLG_TAB_EVT -evtActionPerformed HID_EVT_ACTIONPERFORMED -evtFocusGained HID_EVT_FOCUSGAINED -evtFocusLost HID_EVT_FOCUSLOST -evtKeyTyped HID_EVT_KEYTYPED -evtKeyUp HID_EVT_KEYUP -evtMouseEntered HID_EVT_MOUSEENTERED -evtMouseDragged HID_EVT_MOUSEDRAGGED -evtMouseMoved HID_EVT_MOUSEMOVED -evtMousePressed HID_EVT_MOUSEPRESSED -evtMouseRelesased HID_EVT_MOUSERELEASED -evtMouseExited HID_EVT_MOUSEEXITED -ScriptSelectorButton UID_EVT_MACRODLG -PBActionPerformed UID_BRWEVT_ACTIONPERFORMED -PBFocusGained UID_BRWEVT_FOCUSGAINED -PBFocusLost UID_BRWEVT_FOCUSLOST -PBKeyTyped UID_BRWEVT_KEYTYPED -PBKeyUp UID_BRWEVT_KEYUP -PBMouseEntered UID_BRWEVT_MOUSEENTERED -PMBMouseDragged UID_BRWEVT_MOUSEDRAGGED -PBMouseMoved UID_BRWEVT_MOUSEMOVED -PBMousePressed UID_BRWEVT_MOUSEPRESSED -PBMouseRelesed UID_BRWEVT_MOUSERELEASED -PBMouseExited UID_BRWEVT_MOUSEEXITED +*TabEventsControl EXTENSIONS_HID_FM_PROPDLG_TAB_EVT +evtActionPerformed EXTENSIONS_HID_EVT_ACTIONPERFORMED +evtFocusGained EXTENSIONS_HID_EVT_FOCUSGAINED +evtFocusLost EXTENSIONS_HID_EVT_FOCUSLOST +evtKeyTyped EXTENSIONS_HID_EVT_KEYTYPED +evtKeyUp EXTENSIONS_HID_EVT_KEYUP +evtMouseEntered EXTENSIONS_HID_EVT_MOUSEENTERED +evtMouseDragged EXTENSIONS_HID_EVT_MOUSEDRAGGED +evtMouseMoved EXTENSIONS_HID_EVT_MOUSEMOVED +evtMousePressed EXTENSIONS_HID_EVT_MOUSEPRESSED +evtMouseRelesased EXTENSIONS_HID_EVT_MOUSERELEASED +evtMouseExited EXTENSIONS_HID_EVT_MOUSEEXITED +ScriptSelectorButton EXTENSIONS_UID_EVT_MACRODLG +PBActionPerformed EXTENSIONS_UID_BRWEVT_ACTIONPERFORMED +PBFocusGained EXTENSIONS_UID_BRWEVT_FOCUSGAINED +PBFocusLost EXTENSIONS_UID_BRWEVT_FOCUSLOST +PBKeyTyped EXTENSIONS_UID_BRWEVT_KEYTYPED +PBKeyUp EXTENSIONS_UID_BRWEVT_KEYUP +PBMouseEntered EXTENSIONS_UID_BRWEVT_MOUSEENTERED +PMBMouseDragged EXTENSIONS_UID_BRWEVT_MOUSEDRAGGED +PBMouseMoved EXTENSIONS_UID_BRWEVT_MOUSEMOVED +PBMousePressed EXTENSIONS_UID_BRWEVT_MOUSEPRESSED +PBMouseRelesed EXTENSIONS_UID_BRWEVT_MOUSERELEASED +PBMouseExited EXTENSIONS_UID_BRWEVT_MOUSEEXITED -*TabEventsForm HID_FM_PROPDLG_TAB_EVT +*TabEventsForm EXTENSIONS_HID_FM_PROPDLG_TAB_EVT -*TabFieldLink extensions:TabPage:RID_PAGE_LCW_FIELDLINK -ValueTable extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_VALUELISTFIELD -ListTable extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_TABLEFIELD +*TabFieldLink extensions.TabPage.19729 +ValueTable extensions.ComboBox.19729.1 +ListTable extensions.ComboBox.19729.2 -*TabFieldProperties HID_TAB_DESIGN_FIELDCONTROL -IntLength HID_TAB_ENT_LEN -DecimalPlaces HID_TAB_ENT_SCALE -EntryRequired HID_TAB_ENT_REQUIRED -TxtLength HID_TAB_ENT_TEXT_LEN -DefaultValue HID_TAB_ENT_DEFAULT -FormatExample HID_TAB_ENT_FORMAT_SAMPLE -BrowseBtm HID_TAB_ENT_FORMAT +*TabFieldProperties DBACCESS_HID_TAB_DESIGN_FIELDCONTROL +IntLength DBACCESS_HID_TAB_ENT_LEN +DecimalPlaces DBACCESS_HID_TAB_ENT_SCALE +EntryRequired DBACCESS_HID_TAB_ENT_REQUIRED +TxtLength DBACCESS_HID_TAB_ENT_TEXT_LEN +DefaultValue DBACCESS_HID_TAB_ENT_DEFAULT +FormatExample DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE +BrowseBtm DBACCESS_HID_TAB_ENT_FORMAT -*TabFieldSelection extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_FIELD -ExistingFields extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_FIELD:LB_SELECTFIELD -DisplayField extensions:Edit:RID_PAGE_LCW_CONTENTSELECTION_FIELD:ET_DISPLAYEDFIELD +*TabFieldSelection extensions.TabPage.19728 +ExistingFields extensions.ListBox.19728.6 +DisplayField extensions.Edit.19728.4 -*TabFirstStartOnlineUpdate HID_FIRSTSTART_UPDATE_CHECK -CheckForUpdates desktop:CheckBox:TP_UPDATE_CHECK:CB_UPDATE_CHECK +*TabFirstStartOnlineUpdate DESKTOP_HID_FIRSTSTART_UPDATE_CHECK +CheckForUpdates desktop.CheckBox.3008.3 -*TabFirstStartLicense HID_FIRSTSTART_LICENSE -LicenseText desktop:MultiLineEdit:TP_LICENSE:ML_LICENSE -ScrollDown desktop:PushButton:TP_LICENSE:PB_LICENSE_DOWN +*TabFirstStartLicense DESKTOP_HID_FIRSTSTART_LICENSE +LicenseText desktop.MultiLineEdit.3007.6 +ScrollDown desktop.PushButton.3007.7 -*TabFirstStartRegistration HID_FIRSTSTART_REGISTRATION -RegisterNow desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NOW -RegisterLater desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_LATER -DoNotWantRegister desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NEVER +*TabFirstStartRegistration DESKTOP_HID_FIRSTSTART_REGISTRATION +RegisterNow desktop.RadioButton.3004.5 +RegisterLater desktop.RadioButton.3004.6 +DoNotWantRegister desktop.RadioButton.3004.7 -*TabFirstStartUser HID_FIRSTSTART_USER -FirstName desktop:Edit:TP_USER:ED_USER_FIRST -LastName desktop:Edit:TP_USER:ED_USER_LAST -Initials desktop:Edit:TP_USER:ED_USER_INITIALS -FathersName desktop:Edit:TP_USER:ED_USER_FATHER +*TabFirstStartUser DESKTOP_HID_FIRSTSTART_USER +FirstName desktop.Edit.3006.16 +LastName desktop.Edit.3006.17 +Initials desktop.Edit.3006.19 +FathersName desktop.Edit.3006.18 -*TabFirstStartWelcome HID_FIRSTSTART_WELCOME +*TabFirstStartWelcome DESKTOP_HID_FIRSTSTART_WELCOME -*TabFont HID_SVXPAGE_CHAR_NAME -Font cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK -Style cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK -Size cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK -Language cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK -FontWest cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME -StyleWest cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE -SizeWest cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE -LanguageWest cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG -FontEast cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME -StyleEast cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE -SizeEast cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE -LanguageEast cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG -FontCTL cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME -StyleCTL cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE -SizeCTL cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE -LanguageCTL cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG -Color cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2 +*TabFont CUI_HID_SVXPAGE_CHAR_NAME +Font cui.ComboBox.10239.424 +Style cui.ComboBox.10239.426 +Size cui.MetricBox.10239.428 +Language cui.ListBox.10239.430 +FontWest cui.ComboBox.10239.102 +StyleWest cui.ComboBox.10239.104 +SizeWest cui.MetricBox.10239.106 +LanguageWest cui.ListBox.10239.108 +FontEast cui.ComboBox.10239.112 +StyleEast cui.ComboBox.10239.114 +SizeEast cui.MetricBox.10239.116 +LanguageEast cui.ListBox.10239.118 +FontCTL cui.ComboBox.10239.122 +StyleCTL cui.ComboBox.10239.124 +SizeCTL cui.MetricBox.10239.126 +LanguageCTL cui.ListBox.10239.128 +Color cui.ListBox.10239.142 -*TabFontEffects HID_SVXPAGE_CHAR_EFFECTS -Underline cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE -Color cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR -Effects cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2 -StrikeThrough cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT -IndividualWords cui:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS -Emphasis cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS -Position cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION -Outline cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE -Overline cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE -OverlineColor cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR -Shadow cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW -Blinking cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING -Relief cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF -FontColor cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR -Hidden cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN +*TabFontEffects CUI_HID_SVXPAGE_CHAR_EFFECTS +Underline cui.ListBox.10240.228 +Color cui.ListBox.10240.230 +Effects cui.ListBox.10240.205 +StrikeThrough cui.ListBox.10240.226 +IndividualWords cui.CheckBox.10240.231 +Emphasis cui.ListBox.10240.242 +Position cui.ListBox.10240.244 +Outline cui.TriStateBox.10240.208 +Overline cui.ListBox.10240.222 +OverlineColor cui.ListBox.10240.224 +Shadow cui.TriStateBox.10240.209 +Blinking cui.TriStateBox.10240.210 +Relief cui.ListBox.10240.207 +FontColor cui.ListBox.10240.202 +Hidden cui.TriStateBox.10240.211 -*TabFontPosition HID_SVXPAGE_CHAR_POSITION -SuperScript cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS -Normal cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS -Subscript cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS -RaiseLower cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW -RelativeFontSize cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE -Automatic cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW -n0Degree cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG -n90Degree cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG -n270Degree cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG -FitToLine cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE -ScaleWith cui:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH -Spacing cui:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2 -SpacingBy cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2 -PairKerning cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING -Super cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS +*TabFontPosition CUI_HID_SVXPAGE_CHAR_POSITION +SuperScript cui.RadioButton.10241.301 +Normal cui.RadioButton.10241.302 +Subscript cui.RadioButton.10241.303 +RaiseLower cui.MetricField.10241.305 +RelativeFontSize cui.MetricField.10241.308 +Automatic cui.CheckBox.10241.306 +n0Degree cui.RadioButton.10241.311 +n90Degree cui.RadioButton.10241.312 +n270Degree cui.RadioButton.10241.313 +FitToLine cui.CheckBox.10241.314 +ScaleWith cui.MetricField.10241.316 +Spacing cui.ListBox.10241.321 +SpacingBy cui.MetricField.10241.323 +PairKerning cui.CheckBox.10241.324 +Super cui.RadioButton.10241.301 -*TabFormat3dViewGeometry SID_3D_VIEW - AxisRotationXaxis chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_X_ROTATION - AxisRotationYaxis chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Y_ROTATION - AxisRotationZaxis chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Z_ROTATION - Perspective chart2:CheckBox:TP_3D_SCENEGEOMETRY:CBX_PERSPECTIVE +*TabFormat3dViewGeometry CHART2_HID_3D_VIEW + AxisRotationXaxis chart2.MetricField.915.1 + AxisRotationYaxis chart2.MetricField.915.2 + AxisRotationZaxis chart2.MetricField.915.3 + Perspective chart2.CheckBox.915.1 -*TabFormat3dViewAppearance chart2:TabPage:TP_3D_SCENEAPPEARANCE - Scheme chart2:ListBox:TP_3D_SCENEAPPEARANCE:LB_SCHEME +*TabFormat3dViewAppearance chart2.TabPage.916 + Scheme chart2.ListBox.916.2 RoundedEdges chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_ROUNDEDEDGE - Shading chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_SHADING - ObjectBorders chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_OBJECTLINES + Shading chart2.CheckBox.916.2 + ObjectBorders chart2.CheckBox.916.1 -*TabFormat3dViewIllumination chart2:TabPage:TP_3D_SCENEILLUMINATION - LightSource1 chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_1 - LightSource2 chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_2 - LightSource3 chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_3 - LightSource4 chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_4 - LightSource5 chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_5 - LightSource6 chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_6 - LightSource7 chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_7 - LightSource8 chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_8 - Color chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_LIGHTSOURCE - ColorSelect chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHTSOURCE_COLOR - AmbientLight chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_AMBIENTLIGHT - AmbientLightSelect chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_AMBIENT_COLOR +*TabFormat3dViewIllumination chart2.TabPage.917 + LightSource1 chart2.ImageButton.917.3 + LightSource2 chart2.ImageButton.917.4 + LightSource3 chart2.ImageButton.917.5 + LightSource4 chart2.ImageButton.917.6 + LightSource5 chart2.ImageButton.917.7 + LightSource6 chart2.ImageButton.917.8 + LightSource7 chart2.ImageButton.917.9 + LightSource8 chart2.ImageButton.917.10 + Color chart2.ListBox.917.2 + ColorSelect chart2.ImageButton.917.2 + AmbientLight chart2.ListBox.917.1 + AmbientLightSelect chart2.ImageButton.917.1 -*TabFormatChartTitleAlignment HID_SCH_ALIGNMENT - AngleKnob HID_SCH_ALIGNMENT_CTR_DIAL - AngleText HID_SCH_ALIGNMENT_DEGREES - VerticallyStacked HID_SCH_ALIGNMENT_STACKED - TextDirection HID_SCH_TEXTDIRECTION_TITLE - TextDirection2 HID_SCH_TEXTDIRECTION_EQUATION +*TabFormatChartTitleAlignment CHART2_HID_SCH_ALIGNMENT + AngleKnob CHART2_HID_SCH_ALIGNMENT_CTR_DIAL + AngleText CHART2_HID_SCH_ALIGNMENT_DEGREES + VerticallyStacked CHART2_HID_SCH_ALIGNMENT_STACKED + TextDirection CHART2_HID_SCH_TEXTDIRECTION_TITLE + TextDirection2 CHART2_HID_SCH_TEXTDIRECTION_EQUATION -*TabFormatChartLine HID_LINE_LINE - Style cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE - Color cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR - Width cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH - Transparency cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT - StyleLeft cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE - WidthLeft cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH - CenterLeft cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START - StyleRight cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE - WidthRight cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH - CenterRight cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END - SynchroniteEnds cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE - CornerStyle cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE - IconSelect cui:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP - IconWidth cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH - IconHeigth cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT - KeepRatio cui:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO +*TabFormatChartLine CUI_HID_LINE_LINE + Style cui.ListBox.10051.2 + Color cui.ListBox.10051.1 + Width cui.MetricField.10051.1 + Transparency cui.MetricField.10051.5 + StyleLeft cui.ListBox.10051.3 + WidthLeft cui.MetricField.10051.3 + CenterLeft cui.TriStateBox.10051.4 + StyleRight cui.ListBox.10051.4 + WidthRight cui.MetricField.10051.2 + CenterRight cui.TriStateBox.10051.5 + SynchroniteEnds cui.CheckBox.10051.1 + CornerStyle cui.ListBox.10051.5 + IconSelect cui.MenuButton.10051.26 + IconWidth cui.MetricField.10051.22 + IconHeigth cui.MetricField.10051.23 + KeepRatio cui.CheckBox.10051.24 +TabFormatChartBorders TabFormatChartLine -*TabFormatEnvelope HID_ENV_FMT -AddresseeFromLeft sw:MetricField:TP_ENV_FMT:FLD_ADDR_LEFT -AddresseeFromRight sw:MetricField:TP_ENV_FMT:FLD_ADDR_TOP -AddresseeEdit sw:MenuButton:TP_ENV_FMT:BTN_ADDR_EDIT -SenderFromLeft sw:MetricField:TP_ENV_FMT:FLD_SEND_LEFT -SenderFromRight sw:MetricField:TP_ENV_FMT:FLD_SEND_TOP -SenderEdit sw:MenuButton:TP_ENV_FMT:BTN_SEND_EDIT -SizeFormat sw:ListBox:TP_ENV_FMT:BOX_SIZE_FORMAT -SizeWidth sw:MetricField:TP_ENV_FMT:FLD_SIZE_WIDTH -SizeHeight sw:MetricField:TP_ENV_FMT:FLD_SIZE_HEIGHT +*TabFormatEnvelope SW_HID_ENV_FMT +AddresseeFromLeft sw.MetricField.22753.14 +AddresseeFromRight sw.MetricField.22753.16 +AddresseeEdit sw.MenuButton.22753.18 +SenderFromLeft sw.MetricField.22753.24 +SenderFromRight sw.MetricField.22753.26 +SenderEdit sw.MenuButton.22753.28 +SizeFormat sw.ListBox.22753.33 +SizeWidth sw.MetricField.22753.35 +SizeHeight sw.MetricField.22753.37 -*TabGeneral HID_DSADMIN_PAGE_GENERAL -DatabaseType HID_DSADMIN_DSTYPE -StatusMessage HID_DSADMIN_SPECIAL_MESSAGE +*TabGeneral DBACCESS_HID_DSADMIN_PAGE_GENERAL +DatabaseType DBACCESS_HID_DSADMIN_DSTYPE +StatusMessage DBACCESS_HID_DSADMIN_SPECIAL_MESSAGE -*TabGeneralForm HID_FM_PROPDLG_TAB_GENERAL -Encoding HID_PROP_SUBMIT_ENCODING -Frame HID_PROP_TARGET_FRAME -SubmitMethod HID_PROP_SUBMIT_METHOD -URL HID_PROP_TARGET_URL +*TabGeneralForm EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL +Encoding EXTENSIONS_HID_PROP_SUBMIT_ENCODING +Frame EXTENSIONS_HID_PROP_TARGET_FRAME +SubmitMethod EXTENSIONS_HID_PROP_SUBMIT_METHOD +URL EXTENSIONS_HID_PROP_TARGET_URL -*TabGeneralControl HID_FM_PROPDLG_TAB_GENERAL -Accuracy HID_PROP_DECIMAL_ACCURACY -Align HID_PROP_ALIGN -AutoComplete HID_PROP_AUTOCOMPLETE -Background HID_PROP_BACKGROUNDCOLOR -BackgroundButton UID_PROP_DLG_BACKGROUNDCOLOR -BlockIncrement HID_PROP_BLOCKINCREMENT -Border HID_PROP_BORDER -BorderColor HID_PROP_BORDERCOLOR -ButtonType HID_PROP_BUTTONTYPE -CharacterSet HID_PROP_FONT -CharacterSetButton UID_PROP_DLG_FONT_TYPE -CurrencySymbol HID_PROP_CURRENCYSYMBOL -CurrSymPosition HID_PROP_CURRSYM_POSITION -DateField HID_PROP_DATE -DateFormat HID_PROP_DATEFORMAT -DateMax HID_PROP_DATEMAX -DateMin HID_PROP_DATEMIN -DefaultButton HID_PROP_DEFAULT_BUTTON -DefaultSelection HID_PROP_SELECTEDITEMS -DefaultSelection2 HID_PROP_DEFAULT_SELECT_SEQ -DefaultSelectionButton UID_PROP_DLG_SELECTION -DefaultState HID_PROP_DEFAULT_STATE -DefaultSpinValue HID_PROP_DEFAULT_SPINVALUE -DefaultValue HID_PROP_DEFAULTVALUE -Delay HID_PROP_REPEAT_DELAY -DropDown HID_PROP_DROPDOWN -EditMask HID_PROP_EDITMASK -EffectiveMax HID_PROP_EFFECTIVEMAX -EffectiveMin HID_PROP_EFFECTIVEMIN -Enabled HID_PROP_ENABLED -FillColor HID_PROP_FILLCOLOR -FillColorButton UID_PROP_DLG_FILLCOLOR -FilteringSorting HID_PROP_SHOW_FILTERSORT -FormatKey HID_PROP_FORMATKEY -FormatkeyButton UID_PROP_DLG_NUMBER_FORMAT -Frame HID_PROP_TARGET_FRAME -Graphics HID_PROP_IMAGE_URL -GraphicsAlignment HID_PROP_IMAGEPOSITION -GraphicsButton UID_PROP_DLG_IMAGE_URL -Height HID_PROP_HEIGHT -Help HID_PROP_HELPTEXT -HelpText HID_PROP_HELPTEXT -HelpURL HID_PROP_HELPURL -HiddenValue HID_PROP_HIDDEN_VALUE -HideSelection HID_PROP_HIDEINACTIVESELECTION -HorizontalScroll HID_PROP_HSCROLL -IconSize HID_PROP_ICONSIZE -Information HID_PROP_TAG -Label HID_PROP_LABEL -LabelField HID_PROP_CONTROLLABEL -LabelFieldButton UID_PROP_DLG_CONTROLLABEL -LineCount HID_PROP_LINECOUNT -LineIncrement HID_PROP_LINEINCREMENT -ListEntries HID_PROP_STRINGITEMLIST -LiteralMask HID_PROP_LITERALMASK -MaxTextLen HID_PROP_MAXTEXTLEN -MultiLine HID_PROP_MULTILINE -Multiselection HID_PROP_MULTISELECTION -NameText HID_PROP_NAME -Navigation HID_PROP_SHOW_NAVIGATION -NavigationBar HID_PROP_NAVIGATIONBAR -Order HID_PROP_TABINDEX -Orientation HID_PROP_ORIENTATION -Password HID_PROP_ECHO_CHAR -PosX HID_PROP_POSITIONX -PosY HID_PROP_POSITIONY -Printable HID_PROP_PRINTABLE -ProgressValue HID_PROP_PROGRESSVALUE -ProgressValueMax HID_PROP_PROGRESSVALUE_MAX -ProgressValueMin HID_PROP_PROGRESSVALUE_MIN -PushButtonType HID_PROP_PUSHBUTTONTYPE -PageStep HID_PROP_STEP -Positioning HID_PROP_SHOW_POSITION -Readonly HID_PROP_READONLY -RecordActions HID_PROP_SHOW_RECORDACTIONS -RecordMarker HID_PROP_RECORDMARKER -Repeat HID_PROP_REPEAT -RowHeight HID_PROP_ROWHEIGHT -Scale HID_PROP_SCALEIMAGE -Scrollbars HID_PROP_SHOW_SCROLLBARS -ScrollValue HID_PROP_SCROLLVALUE -ScrollValueMin HID_PROP_SCROLLVALUE_MIN -ScrollValueMax HID_PROP_SCROLLVALUE_MAX -ScrollValueDefault HID_PROP_DEFAULT_SCROLLVALUE -Spin HID_PROP_SPIN -SpinIncrement HID_PROP_SPININCREMENT -SpinValueMin HID_PROP_SPINVALUE_MIN -SpinValueMax HID_PROP_SPINVALUE_MAX -Status HID_PROP_STATE -Submission HID_PROP_SUBMISSION_ID -TakeFocus HID_PROP_FOCUSONCLICK -ToggleProp HID_PROP_TOGGLE +*TabGeneralControl EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL +Accuracy EXTENSIONS_HID_PROP_DECIMAL_ACCURACY +Align EXTENSIONS_HID_PROP_ALIGN +AutoComplete EXTENSIONS_HID_PROP_AUTOCOMPLETE +Background EXTENSIONS_HID_PROP_BACKGROUNDCOLOR +BackgroundButton EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR +BlockIncrement EXTENSIONS_HID_PROP_BLOCKINCREMENT +Border EXTENSIONS_HID_PROP_BORDER +BorderColor EXTENSIONS_HID_PROP_BORDERCOLOR +ButtonType EXTENSIONS_HID_PROP_BUTTONTYPE +CharacterSet EXTENSIONS_HID_PROP_FONT +CharacterSetButton EXTENSIONS_UID_PROP_DLG_FONT_TYPE +CurrencySymbol EXTENSIONS_HID_PROP_CURRENCYSYMBOL +CurrSymPosition EXTENSIONS_HID_PROP_CURRSYM_POSITION +DateField EXTENSIONS_HID_PROP_DATE +DateFormat EXTENSIONS_HID_PROP_DATEFORMAT +DateMax EXTENSIONS_HID_PROP_DATEMAX +DateMin EXTENSIONS_HID_PROP_DATEMIN +DefaultButton EXTENSIONS_HID_PROP_DEFAULT_BUTTON +DefaultSelection EXTENSIONS_HID_PROP_SELECTEDITEMS +DefaultSelection2 EXTENSIONS_HID_PROP_DEFAULT_SELECT_SEQ +DefaultSelectionButton EXTENSIONS_UID_PROP_DLG_SELECTION +DefaultState EXTENSIONS_HID_PROP_DEFAULT_STATE +DefaultSpinValue EXTENSIONS_HID_PROP_DEFAULT_SPINVALUE +DefaultValue EXTENSIONS_HID_PROP_DEFAULTVALUE +Delay EXTENSIONS_HID_PROP_REPEAT_DELAY +DropDown EXTENSIONS_HID_PROP_DROPDOWN +EditMask EXTENSIONS_HID_PROP_EDITMASK +EffectiveMax EXTENSIONS_HID_PROP_EFFECTIVEMAX +EffectiveMin EXTENSIONS_HID_PROP_EFFECTIVEMIN +Enabled EXTENSIONS_HID_PROP_ENABLED +FillColor EXTENSIONS_HID_PROP_FILLCOLOR +FillColorButton EXTENSIONS_UID_PROP_DLG_FILLCOLOR +FilteringSorting EXTENSIONS_HID_PROP_SHOW_FILTERSORT +FormatKey EXTENSIONS_HID_PROP_FORMATKEY +FormatkeyButton EXTENSIONS_UID_PROP_DLG_NUMBER_FORMAT +Frame EXTENSIONS_HID_PROP_TARGET_FRAME +Graphics EXTENSIONS_HID_PROP_IMAGE_URL +GraphicsAlignment EXTENSIONS_HID_PROP_IMAGEPOSITION +GraphicsButton EXTENSIONS_UID_PROP_DLG_IMAGE_URL +Height EXTENSIONS_HID_PROP_HEIGHT +Help EXTENSIONS_HID_PROP_HELPTEXT +HelpText EXTENSIONS_HID_PROP_HELPTEXT +HelpURL EXTENSIONS_HID_PROP_HELPURL +HiddenValue EXTENSIONS_HID_PROP_HIDDEN_VALUE +HideSelection EXTENSIONS_HID_PROP_HIDEINACTIVESELECTION +HorizontalScroll EXTENSIONS_HID_PROP_HSCROLL +IconSize EXTENSIONS_HID_PROP_ICONSIZE +Information EXTENSIONS_HID_PROP_TAG +Label EXTENSIONS_HID_PROP_LABEL +LabelField EXTENSIONS_HID_PROP_CONTROLLABEL +LabelFieldButton EXTENSIONS_UID_PROP_DLG_CONTROLLABEL +LineCount EXTENSIONS_HID_PROP_LINECOUNT +LineIncrement EXTENSIONS_HID_PROP_LINEINCREMENT +ListEntries EXTENSIONS_HID_PROP_STRINGITEMLIST +LiteralMask EXTENSIONS_HID_PROP_LITERALMASK +MaxTextLen EXTENSIONS_HID_PROP_MAXTEXTLEN +MultiLine EXTENSIONS_HID_PROP_MULTILINE +Multiselection EXTENSIONS_HID_PROP_MULTISELECTION +NameText EXTENSIONS_HID_PROP_NAME +Navigation EXTENSIONS_HID_PROP_SHOW_NAVIGATION +NavigationBar EXTENSIONS_HID_PROP_NAVIGATIONBAR +Order EXTENSIONS_HID_PROP_TABINDEX +Orientation EXTENSIONS_HID_PROP_ORIENTATION +Password EXTENSIONS_HID_PROP_ECHO_CHAR +PosX EXTENSIONS_HID_PROP_POSITIONX +PosY EXTENSIONS_HID_PROP_POSITIONY +Printable EXTENSIONS_HID_PROP_PRINTABLE +ProgressValue EXTENSIONS_HID_PROP_PROGRESSVALUE +ProgressValueMax EXTENSIONS_HID_PROP_PROGRESSVALUE_MAX +ProgressValueMin EXTENSIONS_HID_PROP_PROGRESSVALUE_MIN +PushButtonType EXTENSIONS_HID_PROP_PUSHBUTTONTYPE +PageStep EXTENSIONS_HID_PROP_STEP +Positioning EXTENSIONS_HID_PROP_SHOW_POSITION +Readonly EXTENSIONS_HID_PROP_READONLY +RecordActions EXTENSIONS_HID_PROP_SHOW_RECORDACTIONS +RecordMarker EXTENSIONS_HID_PROP_RECORDMARKER +Repeat EXTENSIONS_HID_PROP_REPEAT +RowHeight EXTENSIONS_HID_PROP_ROWHEIGHT +Scale EXTENSIONS_HID_PROP_SCALEIMAGE +Scrollbars EXTENSIONS_HID_PROP_SHOW_SCROLLBARS +ScrollValue EXTENSIONS_HID_PROP_SCROLLVALUE +ScrollValueMin EXTENSIONS_HID_PROP_SCROLLVALUE_MIN +ScrollValueMax EXTENSIONS_HID_PROP_SCROLLVALUE_MAX +ScrollValueDefault EXTENSIONS_HID_PROP_DEFAULT_SCROLLVALUE +Spin EXTENSIONS_HID_PROP_SPIN +SpinIncrement EXTENSIONS_HID_PROP_SPININCREMENT +SpinValueMin EXTENSIONS_HID_PROP_SPINVALUE_MIN +SpinValueMax EXTENSIONS_HID_PROP_SPINVALUE_MAX +Status EXTENSIONS_HID_PROP_STATE +Submission EXTENSIONS_HID_PROP_SUBMISSION_ID +TakeFocus EXTENSIONS_HID_PROP_FOCUSONCLICK +ToggleProp EXTENSIONS_HID_PROP_TOGGLE -StrictFormat HID_PROP_STRICTFORMAT -SymbolColor HID_PROP_SYMBOLCOLOR -SymbolColorButton UID_PROP_DLG_SYMBOLCOLOR -TabOrderButton UID_PROP_DLG_TABINDEX -TabStop HID_PROP_TABSTOP -TextText HID_PROP_TEXT -TextType HID_PROP_TEXTTYPE -ThousandSeperator HID_PROP_SHOWTHOUSANDSEP -TimeField HID_PROP_TIME -TimeFormat HID_PROP_TIMEFORMAT -TimeMax HID_PROP_TIMEMAX -TimeMin HID_PROP_TIMEMIN -TriState HID_PROP_TRISTATE -URL HID_PROP_TARGET_URL -URLButton UID_PROP_DLG_ATTR_TARGET_URL -Value HID_PROP_VALUE -ValueMax HID_PROP_VALUEMAX -ValueMin HID_PROP_VALUEMIN -ValueStep HID_PROP_VALUESTEP -VerticalScroll HID_PROP_VSCROLL -VisibleSize HID_PROP_VISIBLESIZE -Width HID_PROP_WIDTH -WordBreak HID_PROP_WORDBREAK +StrictFormat EXTENSIONS_HID_PROP_STRICTFORMAT +SymbolColor EXTENSIONS_HID_PROP_SYMBOLCOLOR +SymbolColorButton EXTENSIONS_UID_PROP_DLG_SYMBOLCOLOR +TabOrderButton EXTENSIONS_UID_PROP_DLG_TABINDEX +TabStop EXTENSIONS_HID_PROP_TABSTOP +TextText EXTENSIONS_HID_PROP_TEXT +TextType EXTENSIONS_HID_PROP_TEXTTYPE +ThousandSeperator EXTENSIONS_HID_PROP_SHOWTHOUSANDSEP +TimeField EXTENSIONS_HID_PROP_TIME +TimeFormat EXTENSIONS_HID_PROP_TIMEFORMAT +TimeMax EXTENSIONS_HID_PROP_TIMEMAX +TimeMin EXTENSIONS_HID_PROP_TIMEMIN +TriState EXTENSIONS_HID_PROP_TRISTATE +URL EXTENSIONS_HID_PROP_TARGET_URL +URLButton EXTENSIONS_UID_PROP_DLG_ATTR_TARGET_URL +Value EXTENSIONS_HID_PROP_VALUE +ValueMax EXTENSIONS_HID_PROP_VALUEMAX +ValueMin EXTENSIONS_HID_PROP_VALUEMIN +ValueStep EXTENSIONS_HID_PROP_VALUESTEP +VerticalScroll EXTENSIONS_HID_PROP_VSCROLL +VisibleSize EXTENSIONS_HID_PROP_VISIBLESIZE +Width EXTENSIONS_HID_PROP_WIDTH +WordBreak EXTENSIONS_HID_PROP_WORDBREAK -*TabGrid HID_TEXTGRID_PAGE -NoGrid sw:RadioButton:TP_TEXTGRID_PAGE:RB_NOGRID -LinesGrid sw:RadioButton:TP_TEXTGRID_PAGE:RB_LINESGRID -CharsGrid sw:RadioButton:TP_TEXTGRID_PAGE:RB_CHARSGRID -LinesPerPage sw:NumericField:TP_TEXTGRID_PAGE:NF_LINESPERPAGE -TextSize sw:MetricField:TP_TEXTGRID_PAGE:MF_TEXTSIZE -CharsPerLine sw:NumericField:TP_TEXTGRID_PAGE:NF_CHARSPERLINE -RubySize sw:MetricField:TP_TEXTGRID_PAGE:MF_RUBYSIZE -RubyBelow sw:CheckBox:TP_TEXTGRID_PAGE:CB_RUBYBELOW -Display sw:CheckBox:TP_TEXTGRID_PAGE:CB_DISPLAY -PrintGrid sw:CheckBox:TP_TEXTGRID_PAGE:CB_PRINT -Color sw:ListBox:TP_TEXTGRID_PAGE:LB_COLOR +*TabGrid SW_HID_TEXTGRID_PAGE +NoGrid sw.RadioButton.20901.2 +LinesGrid sw.RadioButton.20901.3 +CharsGrid sw.RadioButton.20901.4 +LinesPerPage sw.NumericField.20901.8 +TextSize sw.MetricField.20901.11 +CharsPerLine sw.NumericField.20901.13 +RubySize sw.MetricField.20901.16 +RubyBelow sw.CheckBox.20901.17 +Display sw.CheckBox.20901.19 +PrintGrid sw.CheckBox.20901.20 +Color sw.ListBox.20901.22 -*TabGroupBoxData extensions:TabPage:RID_PAGE_GROUPRADIOSELECTION -Address SID_OPENURL -Names extensions:Edit:RID_PAGE_GROUPRADIOSELECTION:ET_RADIOLABELS -AddTo extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETORIGHT -RemoveFrom extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETOLEFT -OptionFields extensions:ListBox:RID_PAGE_GROUPRADIOSELECTION:LB_RADIOBUTTONS +*TabGroupBoxData extensions.TabPage.19722 +Address .uno:OpenUrl +Names extensions.Edit.19722.1 +AddTo extensions.PushButton.19722.1 +RemoveFrom extensions.PushButton.19722.2 +OptionFields extensions.ListBox.19722.3 diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win old mode 100755 new mode 100644 index de5481e2e3c2..54fa7db1a4c1 --- a/testautomation/global/win/etab_h_o.win +++ b/testautomation/global/win/etab_h_o.win @@ -1,239 +1,239 @@ -*TabHelpTextFrame HID_TAB_DESIGN_HELP_TEXT_FRAME -HelpText HID_TABLE_DESIGN_HELP_WINDOW - -*TabInternet HID_DOCINFORELOAD -DoNotRefreshAutomatically sfx2:RadioButton:TP_DOCINFORELOAD:RB_NOAUTOUPDATE -RefreshThisDocument sfx2:RadioButton:TP_DOCINFORELOAD:RB_RELOADUPDATE -RedirectFromThisDocument sfx2:RadioButton:TP_DOCINFORELOAD:RB_FORWARDUPDATE -TimeReload sfx2:NumericField:TP_DOCINFORELOAD:ED_RELOAD -TimeForward sfx2:NumericField:TP_DOCINFORELOAD:ED_FORWARD -URL sfx2:Edit:TP_DOCINFORELOAD:ED_URL -BrowseURL sfx2:PushButton:TP_DOCINFORELOAD:PB_BROWSEURL -Frame sfx2:ComboBox:TP_DOCINFORELOAD:CB_FRAME - -*TabOOoImprovement cui:TabPage:RID_SVXPAGE_IMPROVEMENT -ParticipateYes cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES -ParticipateNo cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO -ShowData cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA - -*TabJava HID_OPTIONS_JAVA -UseJava cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE -JavaList HID_OPTIONS_JAVA_LIST -Add cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD -Parameters cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER -ClassPath cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH - -*TabJapaneseFind HID_SVXPAGE_JSEARCH_OPTIONS -MatchCase cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE -MatchFullHalf cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH -MatchHiraganaKatakana cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA -MatchContractions cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS -MatchMinusDashChoOn cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON -MatchRepeatcharacterMarks cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS -MatchVariantFormKanji cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI -MatchOldKanaForms cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS -MatchDiZiDuZu cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU -MatchBaVaHaFa cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA -MatchTsiThiChiDhiZi cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI -MatchHyuFyuByuVyu cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU -MatchDeSheZeJe cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE -MatchIaIya cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA -MatchKiKu cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU -PunctuationCharacters cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION -WhitespaceCharacters cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES -ProlongedSoundmarks cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK -MiddleDots cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT - -*TabJDBC HID_DSADMIN_PAGE_JDBC -JDBCDriverClass HID_DSADMIN_DRIVERCLASS -AutoRetrieveEnabled HID_DSADMIN_AUTORETRIEVEENABLED -AutoIncrementStatement HID_DSADMIN_AUTOINCREMENTVALUE -RetrieveQuery HID_DSADMIN_RETRIEVE_AUTO -SQL92Check HID_DSADMIN_SQL92CHECK - -*TabLDAP HID_DSADMIN_PAGE_LDAP -BaseDN HID_DSADMIN_LDAP_BASEDN -PortNumber HID_DSADMIN_LDAP_PORTNUMBER -Records HID_DSADMIN_LDAP_ROWCOUNT - -*TabLegendPosition HID_SCH_LEGEND_POS - PostionLeft HID_SCH_LEGEND_POS_LEFT - PostionTop HID_SCH_LEGEND_POS_TOP - PostionRight HID_SCH_LEGEND_POS_RIGHT - PostionBottom HID_SCH_LEGEND_POS_BOTTOM - TextDirection chart2:ListBox:TP_LEGEND_POS:LB_LEGEND_TEXTDIR - -*TabListBoxData extensions:TabPage:RID_PAGE_TABLESELECTION -DataSource extensions:ListBox:RID_PAGE_TABLESELECTION:LB_DATASOURCE -Table extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLE - -*TabLocalizedOptions HID_OFAPAGE_AUTOCORR_QUOTE -LocalizedOptionsList HID_OFAPAGE_QUOTE_CLB -LocalizedOptions HID_OFAPAGE_QUOTE_SW_CLB -SingleQuotesReplace cui:Checkbox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO -SingleQuotesStart cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE -SingleQuotesEnd cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE -SingleQuotesDefault cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD -DoubleQuotesReplace cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO -DoubleQuotesStart cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE -DoubleQuotesEnd cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE -DoubleQuotesDefault cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD - -*TabMailMergeEMail HID_TP_MAILCONFIG -YourName sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME -EmailAddress sw:Edit:TP_MAILCONFIG:ED_ADDRESS -SendReplies sw:CheckBox:TP_MAILCONFIG:CB_REPLYTO -ReplyAddress sw:Edit:TP_MAILCONFIG:ED_REPLYTO -ServerName sw:Edit:TP_MAILCONFIG:ED_SERVER -Port sw:NumericField:TP_MAILCONFIG:NF_PORT -UseSecure sw:CheckBox:TP_MAILCONFIG:CB_SECURE -ServerAuthentication sw:PushButton:TP_MAILCONFIG:PB_AUTHENTICATION -TestSettings sw:PushButton:TP_MAILCONFIG:PB_TEST - -*TabMailMergeSourceDocument HID_MM_DOCSELECTPAGE -UseTheCurrentDocument sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_CURRENTDOC -CreateANewDocument sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_NEWDOC -StartFromExistingDocument sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADDOC -StartFromATemplate sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADTEMPLATE -StartFromRecentlySaved sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_RECENTDOC -BrowseDocument sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_LOADDOC -BrowseTemplate sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_BROWSETEMPLATE -RecentDocument sw:ListBox:DLG_MM_DOCSELECT_PAGE:LB_RECENTDOC - -*TabMailMergeDocumentType HID_MM_OUTPUTTYPEPAGE -Letter sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_LETTER -MailMessage sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_MAIL - -*TabMailMergeAddressBlock HID_MM_ADDRESSBLOCKPAGE -SelectAddressListButton sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ADDRESSLIST -Addressblock sw:CheckBox:DLG_MM_ADDRESSBLOCK_PAGE:CB_ADDRESS -More sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_SETTINGS -MatchFields sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ASSIGN -PreviewAddressBlock sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_PREVSET -PreviewNextAddressBlock sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_NEXTSET -MatchFieldsButton sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ASSIGN -SuppressLines sw:CheckBox:DLG_MM_ADDRESSBLOCK_PAGE:CB_HIDE_EMPTY_PARA - -*TabMailMergeGreetingsPage HID_MM_GREETINGSPAGE -GreetingPersonalized HID_MM_GREETINGS_CB_PERSONALIZED -GreetingListBoxFemale HID_MM_GREETINGS_LB_FEMALE -GreetingButtonFemale HID_MM_GREETINGS_PB_FEMALE -GreetingListBoxMale HID_MM_GREETINGS_LB_MALE -GreetingButtonMale HID_MM_GREETINGS_PB_MALE -GreetingListBoxFemaleColumn HID_MM_GREETINGS_LB_FEMALECOLUMN -GreetingComboBoxFemale HID_MM_GREETINGS_CB_FEMALEFIELD -GreetingComboBoxNeutral HID_MM_GREETINGS_CB_NEUTRAL -MatchFields sw:PushButton:DLG_MM_GREETINGS_PAGE:PB_ASSIGN -PreviewPreviousSalutation sw:ImageButton:DLG_MM_GREETINGS_PAGE:IB_PREVSET -PreviewNextSalutation sw:ImageButton:DLG_MM_GREETINGS_PAGE:IB_NEXTSET - -*TabMailMergeLayoutPage HID_MM_LAYOUT_PAGE -LayoutAlignButton sw:CheckBox:DLG_MM_LAYOUT_PAGE:CB_ALIGN -LayoutLeftBorder sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_LEFT -LayoutTopBorder sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_TOP -LayoutTopButton sw:PushButton:DLG_MM_LAYOUT_PAGE:MF_UP -LayoutDownButton sw:PushButton:DLG_MM_LAYOUT_PAGE:PB_DOWN -LayoutScrollPageUp HID_SCRL_PAGEUP -LayoutScrollPageDown HID_SCRL_PAGEDOWN -LayoutHelpContentNavigation HID_SCRL_NAVI -LayoutZoomListBox sw:ListBox:DLG_MM_LAYOUT_PAGE:LB_ZOOM - -*TabMailMergeOutputPage HID_MM_OUTPUTPAGE -RBSaveStartDoc sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVESTARTDOC -RBSaveMergedDoc sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEMERGEDDOC -RBPrintMerged sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_PRINT -RBSendAsMail sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SENDMAIL -PBSaveStartDoc sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SAVESTARTDOC -RBSaveAsOneDocument sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEASONE -RBSaveIndividual sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEINDIVIDUAL -RBPrintAll sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_PRINTALL -RBSendAll sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SENDALL -RBStartFrom sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_FROM -NFFirstDataSet sw:NumericField:DLG_MM_OUTPUT_PAGE:NF_FROM -NFLastDataSet sw:NumericField:DLG_MM_OUTPUT_PAGE:NF_TO -PBSaveNow sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SAVENOW -LBChoosePrinter sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_PRINT -PBPrinterSettings sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_PRINTERSETTINGS -PBPrintNow sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_PRINTNOW -LBMailTo sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_MAILTO -PBCopyTo sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_COPYTO -PBEditSubject sw:Edit:DLG_MM_OUTPUT_PAGE:ED_SUBJECT -PBSendAs sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_SENDAS -EFEditAttachmentName sw:Edit:DLG_MM_OUTPUT_PAGE:ED_ATTACHMENT -PBProperties sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SENDAS -PBSendDocuments sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SENDDOCUMENTS - -*TabMailMergePersonalize HID_MM_MERGEPAGE -EditIndividualButton sw:PushButton:DLG_MM_MERGE_PAGE:PB_EDIT -SearchDocumentButton sw:Edit:DLG_MM_MERGE_PAGE:ED_FIND -FindButton sw:PushButton:DLG_MM_MERGE_PAGE:PB_FIND -FindWholeWordsButton sw:CheckBox:DLG_MM_MERGE_PAGE:CB_WHOLEWORDS -ToTopCheckBox sw:CheckBox:DLG_MM_MERGE_PAGE:CB_BACKWARDS -MatchCaseCheckBox sw:CheckBox:DLG_MM_MERGE_PAGE:CB_MATCHCASE - -*TabMailMergePrepare HID_MM_PREPAREMERGEPAGE -FirstRecordButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_FIRST -PreviousRecordButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_PREV -SelectRecord sw:NumericField:DLG_MM_PREPAREMERGE_PAGE:ED_RECORD -NextRecordButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_NEXT -LastRecordButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_LAST -ExcludeCheckBox sw:CheckBox:DLG_MM_PREPAREMERGE_PAGE:CB_EXCLUDE -EditButton sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT +*TabHelpTextFrame DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME +HelpText DBACCESS_HID_TABLE_DESIGN_HELP_WINDOW + +*TabInternet SFX2_HID_DOCINFORELOAD +DoNotRefreshAutomatically sfx2.RadioButton.273.63 +RefreshThisDocument sfx2.RadioButton.273.64 +RedirectFromThisDocument sfx2.RadioButton.273.65 +TimeReload sfx2.NumericField.273.67 +TimeForward sfx2.NumericField.273.70 +URL sfx2.Edit.273.44 +BrowseURL sfx2.PushButton.273.74 +Frame sfx2.ComboBox.273.73 + +*TabOOoImprovement cui.TabPage.10302 +ParticipateYes cui.RadioButton.10302.12 +ParticipateNo cui.RadioButton.10302.13 +ShowData cui.PushButton.10302.19 + +*TabJava CUI_HID_OPTIONS_JAVA +UseJava cui.CheckBox.10253.11 +JavaList CUI_HID_OPTIONS_JAVA_LIST +Add cui.PushButton.10253.20 +Parameters cui.PushButton.10253.21 +ClassPath cui.PushButton.10253.22 + +*TabJapaneseFind CUI_HID_SVXPAGE_JSEARCH_OPTIONS +MatchCase cui.CheckBox.10840.101 +MatchFullHalf cui.CheckBox.10840.102 +MatchHiraganaKatakana cui.CheckBox.10840.103 +MatchContractions cui.CheckBox.10840.104 +MatchMinusDashChoOn cui.CheckBox.10840.105 +MatchRepeatcharacterMarks cui.CheckBox.10840.106 +MatchVariantFormKanji cui.CheckBox.10840.107 +MatchOldKanaForms cui.CheckBox.10840.108 +MatchDiZiDuZu cui.CheckBox.10840.109 +MatchBaVaHaFa cui.CheckBox.10840.110 +MatchTsiThiChiDhiZi cui.CheckBox.10840.111 +MatchHyuFyuByuVyu cui.CheckBox.10840.112 +MatchDeSheZeJe cui.CheckBox.10840.113 +MatchIaIya cui.CheckBox.10840.114 +MatchKiKu cui.CheckBox.10840.115 +PunctuationCharacters cui.CheckBox.10840.201 +WhitespaceCharacters cui.CheckBox.10840.202 +ProlongedSoundmarks cui.CheckBox.10840.203 +MiddleDots cui.CheckBox.10840.204 + +*TabJDBC DBACCESS_HID_DSADMIN_PAGE_JDBC +JDBCDriverClass DBACCESS_HID_DSADMIN_DRIVERCLASS +AutoRetrieveEnabled DBACCESS_HID_DSADMIN_AUTORETRIEVEENABLED +AutoIncrementStatement DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE +RetrieveQuery DBACCESS_HID_DSADMIN_RETRIEVE_AUTO +SQL92Check DBACCESS_HID_DSADMIN_SQL92CHECK + +*TabLDAP DBACCESS_HID_DSADMIN_PAGE_LDAP +BaseDN DBACCESS_HID_DSADMIN_LDAP_BASEDN +PortNumber DBACCESS_HID_DSADMIN_LDAP_PORTNUMBER +Records DBACCESS_HID_DSADMIN_LDAP_ROWCOUNT + +*TabLegendPosition CHART2_HID_SCH_LEGEND_POS + PostionLeft CHART2_HID_SCH_LEGEND_POS_LEFT + PostionTop CHART2_HID_SCH_LEGEND_POS_TOP + PostionRight CHART2_HID_SCH_LEGEND_POS_RIGHT + PostionBottom CHART2_HID_SCH_LEGEND_POS_BOTTOM + TextDirection chart2.ListBox.900.4 + +*TabListBoxData extensions.TabPage.19721 +DataSource extensions.ListBox.19721.1 +Table extensions.ListBox.19721.2 + +*TabLocalizedOptions CUI_HID_OFAPAGE_AUTOCORR_QUOTE +LocalizedOptionsList CUI_HID_OFAPAGE_QUOTE_CLB +LocalizedOptions CUI_HID_OFAPAGE_QUOTE_SW_CLB +SingleQuotesReplace cui.Checkbox.17009.57 +SingleQuotesStart cui.PushButton.17009.46 +SingleQuotesEnd cui.PushButton.17009.48 +SingleQuotesDefault cui.PushButton.17009.49 +DoubleQuotesReplace cui.CheckBox.17009.11 +DoubleQuotesStart cui.PushButton.17009.13 +DoubleQuotesEnd cui.PushButton.17009.15 +DoubleQuotesDefault cui.PushButton.17009.50 + +*TabMailMergeEMail SW_HID_TP_MAILCONFIG +YourName sw.Edit.20904.3 +EmailAddress sw.Edit.20904.5 +SendReplies sw.CheckBox.20904.6 +ReplyAddress sw.Edit.20904.8 +ServerName sw.Edit.20904.11 +Port sw.NumericField.20904.13 +UseSecure sw.CheckBox.20904.14 +ServerAuthentication sw.PushButton.20904.16 +TestSettings sw.PushButton.20904.21 + +*TabMailMergeSourceDocument SW_HID_MM_DOCSELECTPAGE +UseTheCurrentDocument sw.RadioButton.22054.2 +CreateANewDocument sw.RadioButton.22054.3 +StartFromExistingDocument sw.RadioButton.22054.4 +StartFromATemplate sw.RadioButton.22054.6 +StartFromRecentlySaved sw.RadioButton.22054.8 +BrowseDocument sw.PushButton.22054.5 +BrowseTemplate sw.PushButton.22054.7 +RecentDocument sw.ListBox.22054.9 + +*TabMailMergeDocumentType SW_HID_MM_OUTPUTTYPEPAGE +Letter sw.RadioButton.22055.2 +MailMessage sw.RadioButton.22055.3 + +*TabMailMergeAddressBlock SW_HID_MM_ADDRESSBLOCKPAGE +SelectAddressListButton sw.PushButton.22056.2 +Addressblock sw.CheckBox.22056.6 +More sw.PushButton.22056.5 +MatchFields sw.PushButton.22056.9 +PreviewAddressBlock sw.ImageButton.22056.11 +PreviewNextAddressBlock sw.ImageButton.22056.12 +MatchFieldsButton sw.PushButton.22056.9 +SuppressLines sw.CheckBox.22056.75 + +*TabMailMergeGreetingsPage SW_HID_MM_GREETINGSPAGE +GreetingPersonalized SW_HID_MM_GREETINGS_CB_PERSONALIZED +GreetingListBoxFemale SW_HID_MM_GREETINGS_LB_FEMALE +GreetingButtonFemale SW_HID_MM_GREETINGS_PB_FEMALE +GreetingListBoxMale SW_HID_MM_GREETINGS_LB_MALE +GreetingButtonMale SW_HID_MM_GREETINGS_PB_MALE +GreetingListBoxFemaleColumn SW_HID_MM_GREETINGS_LB_FEMALECOLUMN +GreetingComboBoxFemale SW_HID_MM_GREETINGS_CB_FEMALEFIELD +GreetingComboBoxNeutral SW_HID_MM_GREETINGS_CB_NEUTRAL +MatchFields sw.PushButton.22057.18 +PreviewPreviousSalutation sw.ImageButton.22057.20 +PreviewNextSalutation sw.ImageButton.22057.21 + +*TabMailMergeLayoutPage SW_HID_MM_LAYOUT_PAGE +LayoutAlignButton sw.CheckBox.22072.12 +LayoutLeftBorder sw.MetricField.22072.4 +LayoutTopBorder sw.MetricField.22072.6 +LayoutTopButton sw.PushButton.22072.9 +LayoutDownButton sw.PushButton.22072.11 +LayoutScrollPageUp SW_HID_SCRL_PAGEUP +LayoutScrollPageDown SW_HID_SCRL_PAGEDOWN +LayoutHelpContentNavigation SW_HID_SCRL_NAVI +LayoutZoomListBox sw.ListBox.22072.15 + +*TabMailMergeOutputPage SW_HID_MM_OUTPUTPAGE +RBSaveStartDoc sw.RadioButton.22060.3 +RBSaveMergedDoc sw.RadioButton.22060.4 +RBPrintMerged sw.RadioButton.22060.5 +RBSendAsMail sw.RadioButton.22060.6 +PBSaveStartDoc sw.PushButton.22060.8 +RBSaveAsOneDocument sw.RadioButton.22060.12 +RBSaveIndividual sw.RadioButton.22060.13 +RBPrintAll sw.RadioButton.22060.24 +RBSendAll sw.RadioButton.22060.39 +RBStartFrom sw.RadioButton.22060.15 +NFFirstDataSet sw.NumericField.22060.16 +NFLastDataSet sw.NumericField.22060.18 +PBSaveNow sw.PushButton.22060.19 +LBChoosePrinter sw.ListBox.22060.22 +PBPrinterSettings sw.PushButton.22060.23 +PBPrintNow sw.PushButton.22060.26 +LBMailTo sw.ListBox.22060.32 +PBCopyTo sw.PushButton.22060.33 +PBEditSubject sw.Edit.22060.35 +PBSendAs sw.ListBox.22060.37 +EFEditAttachmentName sw.Edit.22060.52 +PBProperties sw.PushButton.22060.38 +PBSendDocuments sw.PushButton.22060.40 + +*TabMailMergePersonalize SW_HID_MM_MERGEPAGE +EditIndividualButton sw.PushButton.22059.3 +SearchDocumentButton sw.Edit.22059.6 +FindButton sw.PushButton.22059.7 +FindWholeWordsButton sw.CheckBox.22059.8 +ToTopCheckBox sw.CheckBox.22059.9 +MatchCaseCheckBox sw.CheckBox.22059.10 + +*TabMailMergePrepare SW_HID_MM_PREPAREMERGEPAGE +FirstRecordButton sw.PushButton.22058.3 +PreviousRecordButton sw.PushButton.22058.4 +SelectRecord sw.NumericField.22058.5 +NextRecordButton sw.PushButton.22058.6 +LastRecordButton sw.PushButton.22058.7 +ExcludeCheckBox sw.CheckBox.22058.8 +EditButton sw.PushButton.22058.10 *TabMediaWiki sym:vnd.com.sun.star.wiki:settings -*TabMemory HID_OFA_TP_MEMORY -UndoSteps cui:NumericField:OFA_TP_MEMORY:ED_UNDO -StarOffice cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE -MemoryPerObject cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE -RemoveFromMemoryAfter cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME -NumberOfObjects cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE -LoadQuickstarter cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH - -*TabMozillaPlugin cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN -Enable cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE - -*TabMySQLJDBC dbaccess:TabPage:PAGE_MYSQL_JDBC -HostName HID_DSADMIN_HOSTNAME -PortNumber HID_DSADMIN_PORTNUMBER -DriverClass dbaccess:Edit:PAGE_MYSQL_JDBC:ET_JDBCDRIVERCLASS -Charset HID_DSADMIN_CHARSET -TestClass dbaccess:PushButton:PAGE_MYSQL_JDBC:PB_TESTDRIVERCLASS - -*TabMySQLODBC dbaccess:TabPage:PAGE_MYSQL_ODBC -Charset HID_DSADMIN_CHARSET - -*TabNameMatching dbaccess:TabPage:TAB_WIZ_NAME_MATCHING -RightColumnNames HID_TAB_NAMEMATCHING_COLS_AVAIL -LeftColumnNames HID_TAB_NAMEMATCHING_COLS_ASSIGN -LeftColumnUp dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP -LeftColumnDown dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN -RightColumnUp dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP_RIGHT -RightColumnDown dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN_RIGHT -ColumnAll dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_ALL -ColumnNone dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_NONE - -*TabODBC HID_DSADMIN_PAGE_ODBC -Options HID_DSADMIN_ODBC_OPTIONS -CharSet HID_DSADMIN_CHARSET -SQL92Check HID_DSADMIN_SQL92CHECK -UseCatalogs HID_DSADMIN_USECATALOG +*TabMemory CUI_HID_OFA_TP_MEMORY +UndoSteps cui.NumericField.17150.12 +StarOffice cui.NumericField.17150.18 +MemoryPerObject cui.NumericField.17150.20 +RemoveFromMemoryAfter cui.TimeField.17150.22 +NumberOfObjects cui.NumericField.17150.25 +LoadQuickstarter cui.CheckBox.17150.27 + +*TabMozillaPlugin cui.TabPage.12161 +Enable cui.CheckBox.12161.2 + +*TabMySQLJDBC dbaccess.TabPage.19220 +HostName DBACCESS_HID_DSADMIN_HOSTNAME +PortNumber DBACCESS_HID_DSADMIN_PORTNUMBER +DriverClass dbaccess.Edit.19220.4 +Charset DBACCESS_HID_DSADMIN_CHARSET +TestClass dbaccess.PushButton.19220.5 + +*TabMySQLODBC dbaccess.TabPage.19217 +Charset DBACCESS_HID_DSADMIN_CHARSET + +*TabNameMatching dbaccess.TabPage.19211 +RightColumnNames DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL +LeftColumnNames DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN +LeftColumnUp dbaccess.ImageButton.19211.12 +LeftColumnDown dbaccess.ImageButton.19211.13 +RightColumnUp dbaccess.ImageButton.19211.14 +RightColumnDown dbaccess.ImageButton.19211.15 +ColumnAll dbaccess.PushButton.19211.16 +ColumnNone dbaccess.PushButton.19211.17 + +*TabODBC DBACCESS_HID_DSADMIN_PAGE_ODBC +Options DBACCESS_HID_DSADMIN_ODBC_OPTIONS +CharSet DBACCESS_HID_DSADMIN_CHARSET +SQL92Check DBACCESS_HID_DSADMIN_SQL92CHECK +UseCatalogs DBACCESS_HID_DSADMIN_USECATALOG +TabOfficeView TabAnsichtAllgemein -*TabOnlineUpdate HID_SVX_OPTIONS_ONLINEUPDATE -CheckAutomatically cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK -EveryDay cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY -EveryWeek cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK -EveryMonth cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH -CheckNow cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW -DownloadAutomatically cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD -Change cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH - -*TabOracleJDBC dbaccess:TabPage:PAGE_ORACLE_JDBC -HostName HID_DSADMIN_HOSTNAME -PortNumber HID_DSADMIN_PORTNUMBER -DriverClass dbaccess:Edit:PAGE_ORACLE_JDBC:ET_JDBCDRIVERCLASS -Charset HID_DSADMIN_CHARSET -TestClass dbaccess:PushButton:PAGE_ORACLE_JDBC:PB_TESTDRIVERCLASS +*TabOnlineUpdate CUI_HID_SVX_OPTIONS_ONLINEUPDATE +CheckAutomatically cui.CheckBox.10298.11 +EveryDay cui.RadioButton.10298.12 +EveryWeek cui.RadioButton.10298.13 +EveryMonth cui.RadioButton.10298.14 +CheckNow cui.PushButton.10298.15 +DownloadAutomatically cui.CheckBox.10298.16 +Change cui.PushButton.10298.19 + +*TabOracleJDBC dbaccess.TabPage.19227 +HostName DBACCESS_HID_DSADMIN_HOSTNAME +PortNumber DBACCESS_HID_DSADMIN_PORTNUMBER +DriverClass dbaccess.Edit.19227.4 +Charset DBACCESS_HID_DSADMIN_CHARSET +TestClass dbaccess.PushButton.19227.5 diff --git a/testautomation/global/win/etab_p_s.win b/testautomation/global/win/etab_p_s.win old mode 100755 new mode 100644 index 806645915f07..e8ef50214231 --- a/testautomation/global/win/etab_p_s.win +++ b/testautomation/global/win/etab_p_s.win @@ -1,121 +1,121 @@ -*TabPersonalDataMigration HID_FIRSTSTART_MIGRATION -TransferPersonalData desktop:CheckBox:TP_MIGRATION:CB_MIGRATION +*TabPersonalDataMigration DESKTOP_HID_FIRSTSTART_MIGRATION +TransferPersonalData desktop.CheckBox.3005.3 -*TabPositionAndSize HID_TRANS_POSITION_SIZE -PositionX cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X -PositionY cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y -Width cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH -Height cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT -KeepRatio cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE -ProtectPosition cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT -ProtectSize cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT -FitWidthText cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH -FitHeightText cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT -AnchorPosition cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT -Anchor cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR -PositionPosition HID_TPPOSITION_CTRL -SizePosition HID_TPSIZE_CTRL +*TabPositionAndSize CUI_HID_TRANS_POSITION_SIZE +PositionX cui.MetricField.10087.7 +PositionY cui.MetricField.10087.8 +Width cui.MetricField.10087.17 +Height cui.MetricField.10087.18 +KeepRatio cui.CheckBox.10087.22 +ProtectPosition cui.TriStateBox.10087.45 +ProtectSize cui.TriStateBox.10087.46 +FitWidthText cui.TriStateBox.10087.13 +FitHeightText cui.TriStateBox.10087.12 +AnchorPosition cui.ListBox.10087.40 +Anchor cui.ListBox.10087.35 +PositionPosition CUI_HID_TPPOSITION_CTRL +SizePosition CUI_HID_TPSIZE_CTRL -*TabPositionAndSizeWriter HID_SVXPAGE_SWPOSSIZE -Width cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH -Height cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT -KeepRatio cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO -Topage cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE -Toparagraph cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA -Tocharacter cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR -Ascharacter cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR -ToFrame cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOFRAME -ProtectPosition cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_POSITION -ProtectSize cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_SIZE -Horizontal cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI -Horizontalby cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY -Horizontalto cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO -Mirror cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR -Vertical cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT -Verticalby cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY -Verticalto cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO -Followtextflow cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW +*TabPositionAndSizeWriter CUI_HID_SVXPAGE_SWPOSSIZE +Width cui.MetricField.10288.3 +Height cui.MetricField.10288.5 +KeepRatio cui.CheckBox.10288.6 +Topage cui.RadioButton.10288.9 +Toparagraph cui.RadioButton.10288.10 +Tocharacter cui.RadioButton.10288.11 +Ascharacter cui.RadioButton.10288.12 +ToFrame cui.RadioButton.10288.13 +ProtectPosition cui.TriStateBox.10288.15 +ProtectSize cui.TriStateBox.10288.16 +Horizontal cui.ListBox.10288.19 +Horizontalby cui.MetricField.10288.21 +Horizontalto cui.ListBox.10288.23 +Mirror cui.CheckBox.10288.24 +Vertical cui.ListBox.10288.26 +Verticalby cui.MetricField.10288.28 +Verticalto cui.ListBox.10288.30 +Followtextflow cui.CheckBox.10288.31 -*TabPrintStarOffice HID_TP_COMMONPRINTOPTIONS -Printer sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT -PrintToFile sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTFILEOUTPUT -ReduceTransparency sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCETRANSPARENCY -Automatically sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_AUTO -NoTransparency sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_NONE -ReduceGradients sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEGRADIENTS -GradientStripes sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_STRIPES -Stripes sfx2:NumericField:TP_COMMONPRINTOPTIONS:NF_REDUCEGRADIENTS_STEPCOUNT -IntermediateColor sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_COLOR -ReduceBitmaps sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS -GoodPrintQuality sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_OPTIMAL -NormalPrintQuality sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_NORMAL -Resolution sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_RESOLUTION -IncludeTransparentObjects sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS_TRANSPARENCY -DPI sfx2:ListBox:TP_COMMONPRINTOPTIONS:LB_REDUCEBITMAPS_RESOLUTION -ConvertColorsToGrayscale sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_CONVERTTOGREYSCALES -PaperSize sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERSIZE -PaperOrientation sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERORIENTATION -Transparency sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_TRANSPARENCY +*TabPrintStarOffice SFX2_HID_TP_COMMONPRINTOPTIONS +Printer sfx2.RadioButton.2398.3 +PrintToFile sfx2.RadioButton.2398.4 +ReduceTransparency sfx2.CheckBox.2398.10 +Automatically sfx2.RadioButton.2398.11 +NoTransparency sfx2.RadioButton.2398.12 +ReduceGradients sfx2.CheckBox.2398.20 +GradientStripes sfx2.RadioButton.2398.21 +Stripes sfx2.NumericField.2398.23 +IntermediateColor sfx2.RadioButton.2398.22 +ReduceBitmaps sfx2.CheckBox.2398.30 +GoodPrintQuality sfx2.RadioButton.2398.31 +NormalPrintQuality sfx2.RadioButton.2398.32 +Resolution sfx2.RadioButton.2398.33 +IncludeTransparentObjects sfx2.CheckBox.2398.34 +DPI sfx2.ListBox.2398.35 +ConvertColorsToGrayscale sfx2.CheckBox.2398.40 +PaperSize sfx2.CheckBox.2398.51 +PaperOrientation sfx2.CheckBox.2398.52 +Transparency sfx2.CheckBox.2398.53 -*TabPrintCalcOptions HID_SCPAGE_PRINT -SuppressOutput sc:CheckBox:RID_SCPAGE_PRINT:BTN_SKIPEMPTYPAGES -PrintOnly sc:CheckBox:RID_SCPAGE_PRINT:BTN_SELECTEDSHEETS +*TabPrintCalcOptions SC_HID_SCPAGE_PRINT +SuppressOutput sc.CheckBox.25674.2 +PrintOnly sc.CheckBox.25674.4 -*TabProxyServer HID_OPTIONS_PROXY -ProxyServer cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE -HttpProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY -HttpPort cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT -HttpsProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY -HttpsPort cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PORT -FtpProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY -FtpPort cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT -NoProxy cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR +*TabProxyServer CUI_HID_OPTIONS_PROXY +ProxyServer cui.ListBox.10157.2 +HttpProxy cui.Edit.10157.3 +HttpPort cui.Edit.10157.4 +HttpsProxy cui.Edit.10157.14 +HttpsPort cui.Edit.10157.15 +FtpProxy cui.Edit.10157.5 +FtpPort cui.Edit.10157.6 +NoProxy cui.Edit.10157.11 -*TabRegisteredDatabase cui:TabPage:RID_SFXPAGE_DBREGISTER -RegisteredDatabases HID_DBPATH_CTL_PATH -NewBtn cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW -EditBtn cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT -DeleteBtn cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE +*TabRegisteredDatabase cui.TabPage.17023 +RegisteredDatabases CUI_HID_DBPATH_CTL_PATH +NewBtn cui.PushButton.17023.13 +EditBtn cui.PushButton.17023.14 +DeleteBtn cui.PushButton.17023.18 -*TabSectionIndent HID_SECTION_INDENTS_PAGE -IndentBefore sw:MetricField:TP_SECTION_INDENTS:MF_BEFORE -IndentAfter sw:MetricField:TP_SECTION_INDENTS:MF_AFTER +*TabSectionIndent SW_HID_SECTION_INDENTS_PAGE +IndentBefore sw.MetricField.20902.3 +IndentAfter sw.MetricField.20902.5 -*TabSecurity cui:TabPage:RID_SVXPAGE_INET_SECURITY -MacroSecurity cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC -PersistentlySavePasswords cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS -Options cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS -MasterPassword cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD -ShowPasswords cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS +*TabSecurity cui.TabPage.10200 +MacroSecurity cui.PushButton.10200.21 +PersistentlySavePasswords cui.CheckBox.10200.14 +Options cui.PushButton.10200.12 +MasterPassword cui.PushButton.10200.18 +ShowPasswords cui.PushButton.10200.15 -*TabSecurityProperties HID_DOCINFOSECURITY -EnterPasswordToOpen HID_SECURITYTAB_PASSWORD_TO_OPEN -ReEnterPasswordToOpen HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN -EnterPasswordToModify HID_SECURITYTAB_PASSWORD_TO_MODIFY -ReEnterPasswordToModify HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY -RecommendToOpenDocumentReadOnly HID_SECURITYTAB_OPEN_FILE_READONLY -RecordChanges HID_SECURITYTAB_RECORD_CHANGES -Protect HID_SECURITYTAB_PROTECTION +*TabSecurityProperties SFX2_HID_DOCINFOSECURITY +EnterPasswordToOpen SFX2_HID_SECURITYTAB_PASSWORD_TO_OPEN +ReEnterPasswordToOpen SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN +EnterPasswordToModify SFX2_HID_SECURITYTAB_PASSWORD_TO_MODIFY +ReEnterPasswordToModify SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY +RecommendToOpenDocumentReadOnly SFX2_HID_SECURITYTAB_OPEN_FILE_READONLY +RecordChanges SFX2_HID_SECURITYTAB_RECORD_CHANGES +Protect SFX2_HID_SECURITYTAB_PROTECTION -*TabSecurityOptionsAndWarnings HID_DLG_SECURITY_OPTIONS -SavingOrSendingDocuments cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS -SigningDocuments cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS -PrintingDocuments cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS -CreatingPDFfiles cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF -RemovePersonalInformationOnSaving cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO -RecommendPasswordProtectionOnSaving cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD -CtrlClickRequiredToFollowHyperlinks cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK +*TabSecurityOptionsAndWarnings CUI_HID_DLG_SECURITY_OPTIONS +SavingOrSendingDocuments cui.CheckBox.10300.13 +SigningDocuments cui.CheckBox.10300.15 +PrintingDocuments cui.CheckBox.10300.17 +CreatingPDFfiles cui.CheckBox.10300.19 +RemovePersonalInformationOnSaving cui.CheckBox.10300.22 +RecommendPasswordProtectionOnSaving cui.CheckBox.10300.24 +CtrlClickRequiredToFollowHyperlinks cui.CheckBox.10300.26 -*TabSecurityLevel HID_XMLSEC_TP_SECLEVEL -VeryHigh xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH -High xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_HIGH -Medium xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_MEDIUM -Low xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_LOW +*TabSecurityLevel XMLSECURITY_HID_XMLSEC_TP_SECLEVEL +VeryHigh xmlsecurity.RadioButton.1007.2 +High xmlsecurity.RadioButton.1007.3 +Medium xmlsecurity.RadioButton.1007.4 +Low xmlsecurity.RadioButton.1007.5 -*TabSendAsEmail SID_MAIL_CHILDWIN +*TabSendAsEmail .uno:MailWindow -*TabQueries HID_DSADMIN_QUERYADMINISTRATION -Queries HID_DSADMIN_QUERIES -NewQuery HID_DSADMIN_QUERIES_NEW -Edit HID_DSADMIN_QUERIES_EDIT -DeleteQuery HID_DSADMIN_QUERIES_DELETE +*TabQueries DBACCESS_HID_DSADMIN_QUERYADMINISTRATION +Queries DBACCESS_HID_DSADMIN_QUERIES +NewQuery DBACCESS_HID_DSADMIN_QUERIES_NEW +Edit DBACCESS_HID_DSADMIN_QUERIES_EDIT +DeleteQuery DBACCESS_HID_DSADMIN_QUERIES_DELETE diff --git a/testautomation/global/win/etab_t_z.win b/testautomation/global/win/etab_t_z.win old mode 100755 new mode 100644 index b7db16fd1ef4..4d4d54139b5f --- a/testautomation/global/win/etab_t_z.win +++ b/testautomation/global/win/etab_t_z.win @@ -1,149 +1,149 @@ -*TabTableFieldSelection extensions:TabPage:RID_PAGE_GW_FIELDSELECTION -ExistingFields extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_EXISTING_FIELDS -SelectedFields extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_SELECTED_FIELDS -AddTo extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDRIGHT -AddAllTo extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSRIGHT -RemoveFrom extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDLEFT -RemoveAllFrom extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSLEFT - -*TabTableSelection extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_TABLE -TableSelection extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_TABLE:LB_SELECTTABLE - -*TabTextAnimation sd:TabPage:RID_TP_CUSTOMANIMATION_TEXT -GroupText sd:ListBox:RID_TP_CUSTOMANIMATION_TEXT:LB_GROUP_TEXT -AutomaticallyAfter sd:Checkbox:RID_TP_CUSTOMANIMATION_TEXT:CBX_GROUP_AUTO -AutomaticallyAfterValue sd:MetricField:RID_TP_CUSTOMANIMATION_TEXT:MF_GROUP_AUTO -AnimateAttachedShape sd:Checkbox:RID_TP_CUSTOMANIMATION_TEXT:CBX_ANIMATE_FORM -InReverseOrder sd:Checkbox:RID_TP_CUSTOMANIMATION_TEXT:CBX_REVERSE - -*TabTextBase HID_DSADMIN_PAGE_TEXT -CVSFiles HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES -Custom HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES -CustomTxt HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION -TextContainsHeaders HID_DSADMIN_TEXT_HEADER -FieldSeparator HID_DSADMIN_FIELD_SEPARATOR -TextSeparator HID_DSADMIN_TEXT_SEPARATOR -DecimalSeparator HID_DSADMIN_DECIMAL_SEPARATOR -ThousandsSeparator HID_DSADMIN_THOUSANDS_SEPARATOR -Extension HID_DSADMIN_EXTENSION -CharSet HID_DSADMIN_CHARSET -PlainTextFiles HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES - -*TabTiming sd:TabPage:RID_TP_CUSTOMANIMATION_DURATION -TimingStart sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_START -Delay sd:MetricField:RID_TP_CUSTOMANIMATION_DURATION:MF_START_DELAY -Speed sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_DURATION -Repeat sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_REPEAT -Rewind sd:CheckBox:RID_TP_CUSTOMANIMATION_DURATION:CBX_REWIND -TriggerAnimate sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_CLICKSEQUENCE -TriggerStart sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_INTERACTIVE -Shape sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_TRIGGER - -*TabTransparency HID_AREA_TRANSPARENCE -NoTransparency cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF -Transparency cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR -Gradient cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT -TransparencyPercent cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT -Type cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES -CenterX cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X -CenterY cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y -Angle cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE -Border cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER -StartValue cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE -EndValue cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE - -*TabTrendLineType chart2:TabPage:TP_TRENDLINE -None HID_SCH_TRENDLINE_RB_NONE -Linear HID_SCH_TRENDLINE_RB_LINEAR -Logarithmic HID_SCH_TRENDLINE_RB_LOGARITHMIC -Exponential HID_SCH_TRENDLINE_RB_EXPONENTIAL -Power HID_SCH_TRENDLINE_RB_POWER -ShowEquation HID_SCH_TRENDLINE_SHOW_EQUATION -ShowCorrelationCoefficient HID_SCH_TRENDLINE_SHOW_R_SQUARED - - -*TabTrustedSources HID_XMLSEC_TP_TRUSTSOURCES -SourcesAdd xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_ADD_TRUSTCERT -SourcesView xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_VIEW_TRUSTCERT -SourcesRemove xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_REMOVE_TRUSTCERT -LocationsListBox xmlsecurity:ListBox:RID_XMLSECTP_TRUSTSOURCES:LB_TRUSTFILELOC -LocationsAdd xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_ADD_TRUSTFILELOC -LocationsRemove xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_REMOVE_TRUSTFILELOC - -*TabType HID_FRM_STD -Width sw:MetricField:TP_FRM_STD:ED_WIDTH -Height sw:MetricField:TP_FRM_STD:ED_HEIGHT -RelativeWidth sw:CheckBox:TP_FRM_STD:CB_REL_WIDTH -Automatic sw:CheckBox:TP_FRM_STD:CB_AUTOWIDTH -RelativeHeight sw:CheckBox:TP_FRM_STD:CB_REL_HEIGHT -KeepRatio sw:CheckBox:TP_FRM_STD:CB_FIXEDRATIO -AutoHoehe sw:CheckBox:TP_FRM_STD:CB_AUTOHEIGHT -AnchorAtPage sw:RadioButton:TP_FRM_STD:RB_ANCHOR_PAGE -AnchorAtParagraph sw:RadioButton:TP_FRM_STD:RB_ANCHOR_PARA -AnchorAtCharacter sw:RadioButton:TP_FRM_STD:RB_ANCHOR_AT_CHAR -AnchorAsCharacter sw:RadioButton:TP_FRM_STD:RB_ANCHOR_AS_CHAR -AnchorAtFrame sw:RadioButton:TP_FRM_STD:RB_ANCHOR_FRAME -Horizontal sw:ListBox:TP_FRM_STD:DLB_HORIZONTAL -HorizontalBy sw:MetricField:TP_FRM_STD:ED_AT_HORZ_POS +*TabTableFieldSelection extensions.TabPage.19730 +ExistingFields extensions.ListBox.19730.7 +SelectedFields extensions.ListBox.19730.8 +AddTo extensions.PushButton.19730.3 +AddAllTo extensions.PushButton.19730.4 +RemoveFrom extensions.PushButton.19730.5 +RemoveAllFrom extensions.PushButton.19730.6 + +*TabTableSelection extensions.TabPage.19727 +TableSelection extensions.ListBox.19727.5 + +*TabTextAnimation sd.TabPage.20873 +GroupText sd.ListBox.20873.2 +AutomaticallyAfter sd.Checkbox.20873.3 +AutomaticallyAfterValue sd.MetricField.20873.4 +AnimateAttachedShape sd.Checkbox.20873.5 +InReverseOrder sd.Checkbox.20873.6 + +*TabTextBase DBACCESS_HID_DSADMIN_PAGE_TEXT +CVSFiles DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES +Custom DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES +CustomTxt DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION +TextContainsHeaders DBACCESS_HID_DSADMIN_TEXT_HEADER +FieldSeparator DBACCESS_HID_DSADMIN_FIELD_SEPARATOR +TextSeparator DBACCESS_HID_DSADMIN_TEXT_SEPARATOR +DecimalSeparator DBACCESS_HID_DSADMIN_DECIMAL_SEPARATOR +ThousandsSeparator DBACCESS_HID_DSADMIN_THOUSANDS_SEPARATOR +Extension DBACCESS_HID_DSADMIN_EXTENSION +CharSet DBACCESS_HID_DSADMIN_CHARSET +PlainTextFiles DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES + +*TabTiming sd.TabPage.20872 +TimingStart sd.ListBox.20872.2 +Delay sd.MetricField.20872.4 +Speed sd.ComboBox.20872.6 +Repeat sd.ComboBox.20872.8 +Rewind sd.CheckBox.20872.9 +TriggerAnimate sd.RadioButton.20872.11 +TriggerStart sd.RadioButton.20872.12 +Shape sd.ListBox.20872.13 + +*TabTransparency CUI_HID_AREA_TRANSPARENCE +NoTransparency cui.RadioButton.10054.8 +Transparency cui.RadioButton.10054.9 +Gradient cui.RadioButton.10054.10 +TransparencyPercent cui.MetricField.10054.10 +Type cui.ListBox.10054.3 +CenterX cui.MetricField.10054.4 +CenterY cui.MetricField.10054.5 +Angle cui.MetricField.10054.6 +Border cui.MetricField.10054.7 +StartValue cui.MetricField.10054.8 +EndValue cui.MetricField.10054.9 + +*TabTrendLineType chart2.TabPage.918 +None CHART2_HID_SCH_TRENDLINE_RB_NONE +Linear CHART2_HID_SCH_TRENDLINE_RB_LINEAR +Logarithmic CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC +Exponential CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL +Power CHART2_HID_SCH_TRENDLINE_RB_POWER +ShowEquation CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION +ShowCorrelationCoefficient CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED + + +*TabTrustedSources XMLSECURITY_HID_XMLSEC_TP_TRUSTSOURCES +SourcesAdd xmlsecurity.PushButton.1008.3 +SourcesView xmlsecurity.PushButton.1008.4 +SourcesRemove xmlsecurity.PushButton.1008.5 +LocationsListBox xmlsecurity.ListBox.1008.8 +LocationsAdd xmlsecurity.PushButton.1008.9 +LocationsRemove xmlsecurity.PushButton.1008.10 + +*TabType SW_HID_FRM_STD +Width sw.MetricField.20831.28 +Height sw.MetricField.20831.30 +RelativeWidth sw.CheckBox.20831.100 +Automatic sw.CheckBox.20831.46 +RelativeHeight sw.CheckBox.20831.101 +KeepRatio sw.CheckBox.20831.102 +AutoHoehe sw.CheckBox.20831.31 +AnchorAtPage sw.RadioButton.20831.1 +AnchorAtParagraph sw.RadioButton.20831.2 +AnchorAtCharacter sw.RadioButton.20831.3 +AnchorAsCharacter sw.RadioButton.20831.4 +AnchorAtFrame sw.RadioButton.20831.5 +Horizontal sw.ListBox.20831.34 +HorizontalBy sw.MetricField.20831.36 HorizontalTo SW:LISTBOX:TP_FRM_STD:LB_HORI_RELATION MirrorOnEvenPages SW:CHECKBOX:TP_FRM_STD:CB_MIRROR -Vertical sw:ListBox:TP_FRM_STD:DLB_VERTICAL -VerticalBy sw:MetricField:TP_FRM_STD:ED_AT_VERT_POS +Vertical sw.ListBox.20831.39 +VerticalBy sw.MetricField.20831.41 VerticalTo SW:LISTBOX:TP_FRM_STD:LB_VERT_RELATION -OriginalSize sw:PushButton:TP_FRM_STD:BT_REALSIZE -FollowTextflow sw:CheckBox:TP_FRM_STD:CB_FOLLOWTEXTFLOW +OriginalSize sw.PushButton.20831.44 +FollowTextflow sw.CheckBox.20831.129 -*TabTypeSelect HID_TAB_WIZ_TYPE_SELECT -ColumnNames dbaccess:MultiListBox:TAB_WIZ_TYPE_SELECT:LB_NEW_COLUMN_NAMES -ColumnName HID_TAB_ENT_COLUMNNAME -ColumnType HID_TAB_ENT_TYPE -ColumnLength HID_TAB_ENT_TEXT_LEN -ColumnAutoValue dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO -ColumnAuto dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO +*TabTypeSelect DBACCESS_HID_TAB_WIZ_TYPE_SELECT +ColumnNames dbaccess.MultiListBox.19210.2 +ColumnName DBACCESS_HID_TAB_ENT_COLUMNNAME +ColumnType DBACCESS_HID_TAB_ENT_TYPE +ColumnLength DBACCESS_HID_TAB_ENT_TEXT_LEN +ColumnAutoValue dbaccess.NumericField.19210.1 +ColumnAuto dbaccess.PushButton.19210.5 *TabWeblog sym:vnd.com.sun.star.blogger:settings -*TabXMLGeneral HID_XML_FILTER_TABPAGE_BASIC -FilterName HID_XML_FILTER_NAME -Application HID_XML_FILTER_APPLICATION -UIName HID_XML_FILTER_INTERFACE_NAME -FileExtension HID_XML_FILTER_EXTENSION -Comments HID_XML_FILTER_DESCRIPTION - -*TabXMLTransformation HID_XML_FILTER_TABPAGE_XSLT -DocType HID_XML_FILTER_DOCTYPE -DTD HID_XML_FILTER_DTD -DTDBrowse HID_XML_FILTER_DTD_BROWSE -XSLTForExport HID_XML_FILTER_EXPORT_XSLT -XSLTForExportBrowse HID_XML_FILTER_EXPORT_XSLT_BROWSE -XSLTForImport HID_XML_FILTER_IMPORT_XSLT -XSLTForImportBrowse HID_XML_FILTER_IMPORT_XSLT_BROWSE -TemplateForImprt HID_XML_FILTER_IMPORT_TEMPLATE -BrowseTemplateForImport HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE - -*TabXMLSecDetails HID_XMLSEC_TP_DETAILS -XMLSecDetailsListBox HID_XMLSEC_CTRL_ELEMENTS -XMLSecDetailsEditField xmlsecurity:MultiLineEdit:RID_XMLSECTP_DETAILS:ML_ELEMENT - -*TabXMLSecGeneral HID_XMLSEC_TP_GENERAL - -*TabXMLSecCertPath HID_XMLSEC_TP_CERTPATH -XMLSecViewSigTree HID_XMLSEC_CTRL_VIEWSIGNATURES -XMLViewCertButton xmlsecurity:PushButton:RID_XMLSECTP_CERTPATH:BTN_VIEWCERT -XMLSecCertStatus xmlsecurity:MultiLineEdit:RID_XMLSECTP_CERTPATH:ML_CERTSTATUS - -*TabYErrorBars chart2:TabPage:TP_YERRORBAR -MeanValue HID_SCH_STATISTIK_MEANVALUE -NoFunction HID_SCH_STATISTIK_NO_ERROR -Variance HID_SCH_STATISTIK_VARIANT -StandardDeviation HID_SCH_STATISTIK_SIGMA -Percentage HID_SCH_STATISTIK_PERCENT -ErrorMargin HID_SCH_STATISTIK_BIGERROR -ConstantValue HID_SCH_STATISTIK_CONSTERROR -PercentageValue HID_SCH_STATISTIK_PERCENT_VALUE -ErrorMarginValue HID_SCH_STATISTIK_BIGERROR_VALUE -ConstantValuePlus HID_SCH_STATISTIK_PLUS_VALUE -ConstantValueMinus HID_SCH_STATISTIK_MINUS_VALUE -ErrorIndicator HID_SCH_CT_INDICATE - -*WordCount HID_DLG_WORDCOUNT +*TabXMLGeneral FILTER_HID_XML_FILTER_TABPAGE_BASIC +FilterName FILTER_HID_XML_FILTER_NAME +Application FILTER_HID_XML_FILTER_APPLICATION +UIName FILTER_HID_XML_FILTER_INTERFACE_NAME +FileExtension FILTER_HID_XML_FILTER_EXTENSION +Comments FILTER_HID_XML_FILTER_DESCRIPTION + +*TabXMLTransformation FILTER_HID_XML_FILTER_TABPAGE_XSLT +DocType FILTER_HID_XML_FILTER_DOCTYPE +DTD FILTER_HID_XML_FILTER_DTD +DTDBrowse FILTER_HID_XML_FILTER_DTD_BROWSE +XSLTForExport FILTER_HID_XML_FILTER_EXPORT_XSLT +XSLTForExportBrowse FILTER_HID_XML_FILTER_EXPORT_XSLT_BROWSE +XSLTForImport FILTER_HID_XML_FILTER_IMPORT_XSLT +XSLTForImportBrowse FILTER_HID_XML_FILTER_IMPORT_XSLT_BROWSE +TemplateForImprt FILTER_HID_XML_FILTER_IMPORT_TEMPLATE +BrowseTemplateForImport FILTER_HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE + +*TabXMLSecDetails XMLSECURITY_HID_XMLSEC_TP_DETAILS +XMLSecDetailsListBox XMLSECURITY_HID_XMLSEC_CTRL_ELEMENTS +XMLSecDetailsEditField xmlsecurity.MultiLineEdit.1004.2 + +*TabXMLSecGeneral XMLSECURITY_HID_XMLSEC_TP_GENERAL + +*TabXMLSecCertPath XMLSECURITY_HID_XMLSEC_TP_CERTPATH +XMLSecViewSigTree XMLSECURITY_HID_XMLSEC_CTRL_VIEWSIGNATURES +XMLViewCertButton xmlsecurity.PushButton.1005.55 +XMLSecCertStatus xmlsecurity.MultiLineEdit.1005.3 + +*TabYErrorBars chart2.TabPage.919 +MeanValue CHART2_HID_SCH_STATISTIK_MEANVALUE +NoFunction CHART2_HID_SCH_STATISTIK_NO_ERROR +Variance CHART2_HID_SCH_STATISTIK_VARIANT +StandardDeviation CHART2_HID_SCH_STATISTIK_SIGMA +Percentage CHART2_HID_SCH_STATISTIK_PERCENT +ErrorMargin CHART2_HID_SCH_STATISTIK_BIGERROR +ConstantValue CHART2_HID_SCH_STATISTIK_CONSTERROR +PercentageValue CHART2_HID_SCH_STATISTIK_PERCENT_VALUE +ErrorMarginValue CHART2_HID_SCH_STATISTIK_BIGERROR_VALUE +ConstantValuePlus CHART2_HID_SCH_STATISTIK_PLUS_VALUE +ConstantValueMinus CHART2_HID_SCH_STATISTIK_MINUS_VALUE +ErrorIndicator CHART2_HID_SCH_CT_INDICATE + +*WordCount SW_HID_DLG_WORDCOUNT diff --git a/testautomation/global/win/etoolbox.win b/testautomation/global/win/etoolbox.win old mode 100755 new mode 100644 index 7f4a8e86414a..ff990cb2beca --- a/testautomation/global/win/etoolbox.win +++ b/testautomation/global/win/etoolbox.win @@ -9,53 +9,53 @@ ' Bibliography Database -*TB_Bibliography HID_BIB_DB_TBX -Table HID_BIB_TBX_TABLE -SearchKey HID_BIB_TBX_SEARCH -AutoFilter HID_BIB_TBX_AUTOFILTER -StandardFilter SID_FM_FILTERCRIT -RemoveFilter SID_FM_REMOVE_FILTER_SORT -ColumnArrangement HID_BIB_MAPPINGDLG -DataSource HID_BIB_CHANGESOURCE +*TB_Bibliography EXTENSIONS_HID_BIB_DB_TBX +Table EXTENSIONS_HID_BIB_TBX_TABLE +SearchKey EXTENSIONS_HID_BIB_TBX_SEARCH +AutoFilter EXTENSIONS_HID_BIB_TBX_AUTOFILTER +StandardFilter .uno:FilterCrit +RemoveFilter .uno:RemoveFilterSort +ColumnArrangement EXTENSIONS_HID_BIB_MAPPINGDLG +DataSource EXTENSIONS_HID_BIB_CHANGESOURCE -*TB_Help HID_HELP_TOOLBOX -Index HID_HELP_TOOLBOXITEM_INDEX -GoToStart HID_HELP_TOOLBOXITEM_START -Backward HID_HELP_TOOLBOXITEM_BACKWARD -Forward HID_HELP_TOOLBOXITEM_FORWARD -PrintButton HID_HELP_TOOLBOXITEM_PRINT -SetBookmarks HID_HELP_TOOLBOXITEM_BOOKMARKS -DisplayHelpAtStartUp HID_HELP_ONSTARTUP_BOX +*TB_Help SFX2_HID_HELP_TOOLBOX +Index SFX2_HID_HELP_TOOLBOXITEM_INDEX +GoToStart SFX2_HID_HELP_TOOLBOXITEM_START +Backward SFX2_HID_HELP_TOOLBOXITEM_BACKWARD +Forward SFX2_HID_HELP_TOOLBOXITEM_FORWARD +PrintButton SFX2_HID_HELP_TOOLBOXITEM_PRINT +SetBookmarks SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS +DisplayHelpAtStartUp SFX2_HID_HELP_ONSTARTUP_BOX *TB_MacroControls HID_BASICIDE_CONTROLS -CommandButton SID_INSERT_PUSHBUTTON -CheckBox SID_INSERT_CHECKBOX -Label SID_INSERT_FIXEDTEXT -ListBox SID_INSERT_LISTBOX -HScrollBar SID_INSERT_HSCROLLBAR -VScrollBar SID_INSERT_VSCROLLBAR -HLine SID_INSERT_HFIXEDLINE -VLine SID_INSERT_VFIXEDLINE -FrameControl SID_INSERT_GROUPBOX -DateField SID_INSERT_DATEFIELD -TimeField SID_INSERT_TIMEFIELD -NumericField SID_INSERT_NUMERICFIELD -FormattedField SID_INSERT_FORMATTEDFIELD -FileControl SID_INSERT_FILECONTROL -Properties SID_SHOW_PROPERTYBROWSER -ImageControl SID_INSERT_IMAGECONTROL -OptionButton SID_INSERT_RADIOBUTTON -TextField SID_INSERT_EDIT -ComboBox SID_INSERT_COMBOBOX -Progressbar SID_INSERT_PROGRESSBAR -CurrencyField SID_INSERT_CURRENCYFIELD -PatternField SID_INSERT_PATTERNFIELD -SelectMode SID_INSERT_SELECT -Testmode SID_DIALOG_TESTMODE +CommandButton .uno:InsertPushbutton +CheckBox .uno:Checkbox +Label .uno:InsertFixedText +ListBox .uno:InsertListbox +HScrollBar .uno:HScrollbar +VScrollBar .uno:VScrollbar +HLine .uno:HFixedLine +VLine .uno:VFixedLine +FrameControl .uno:Groupbox +DateField .uno:AddDateField +TimeField .uno:InsertTimeField +NumericField .uno:InsertNumericField +FormattedField .uno:InsertFormattedField +FileControl .uno:InsertFileControl +Properties .uno:ShowPropBrowser +ImageControl .uno:InsertImageControl +OptionButton .uno:Radiobutton +TextField .uno:InsertEdit +ComboBox .uno:Combobox +Progressbar .uno:ProgressBar +CurrencyField .uno:InsertCurrencyField +PatternField .uno:InsertPatternField +SelectMode .uno:SelectMode +Testmode .uno:TestMode -*TB_MacroRecording SID_RECORDING_FLOATWINDOW -StopRecording SID_STOP_RECORDING +*TB_MacroRecording .uno:MacroRecordingFloat +StopRecording .uno:StopRecording -*TB_Relation HID_TLB_RELATIONDESIGN -AddTables SID_FM_ADDTABLE +*TB_Relation DBACCESS_HID_TLB_RELATIONDESIGN +AddTables .uno:AddTable diff --git a/testautomation/global/win/mathop.win b/testautomation/global/win/mathop.win old mode 100755 new mode 100644 index bf1e46434973..fd208db24f50 --- a/testautomation/global/win/mathop.win +++ b/testautomation/global/win/mathop.win @@ -1,204 +1,204 @@ -*AuswahlMath HID_SMA_OPERATOR_WIN -TB_Gruppen HID_SMA_SELECTION_TBX -UnaereBinaere HID_SMA_UNBINOPS_CAT -Relationen HID_SMA_RELATIONS_CAT -MengenOperatoren HID_SMA_SETOPERATIONS_CAT -Funktionen HID_SMA_FUNCTIONS_CAT -Operatoren HID_SMA_OPERATORS_CAT -Attribute HID_SMA_ATTRIBUTES_CAT HID_SMA_ATTRIBUTS_CAT -Klammerungen HID_SMA_BRACKETS_CAT HID_SMA_PARENTHESES_CAT -Formatierungen HID_SMA_FORMAT_CAT -Sonstiges HID_SMA_MISC_CAT +*AuswahlMath STARMATH_HID_SMA_OPERATOR_WIN +TB_Gruppen STARMATH_HID_SMA_SELECTION_TBX +UnaereBinaere STARMATH_HID_SMA_UNBINOPS_CAT +Relationen STARMATH_HID_SMA_RELATIONS_CAT +MengenOperatoren STARMATH_HID_SMA_SETOPERATIONS_CAT +Funktionen STARMATH_HID_SMA_FUNCTIONS_CAT +Operatoren STARMATH_HID_SMA_OPERATORS_CAT +Attribute STARMATH_HID_SMA_ATTRIBUTES_CAT HID_SMA_ATTRIBUTS_CAT +Klammerungen STARMATH_HID_SMA_BRACKETS_CAT HID_SMA_PARENTHESES_CAT +Formatierungen STARMATH_HID_SMA_FORMAT_CAT +Sonstiges STARMATH_HID_SMA_MISC_CAT -TB_UnaereBinaere HID_SMA_UNBINOPS_TBX -Plus HID_SMA_PLUSX -Minus HID_SMA_MINUSX -PlusMinus HID_SMA_PLUSMINUSX -MinusPlus HID_SMA_MINUSPLUSX -Additions HID_SMA_XPLUSY -Multiplikation HID_SMA_XCDOTY -MultiplikationKreuz HID_SMA_XTIMESY -MultiplikationStern HID_SMA_XSYMTIMESY -Subtraktions HID_SMA_XMINUSY -Division HID_SMA_XOVERY -DivisionDoppelpunkt HID_SMA_XDIVY -DivisionSchraegstrich HID_SMA_XSYMDIVIDEY -LogischesNICHT HID_SMA_NEGX -LogischesUND HID_SMA_XANDY -LogischesODER HID_SMA_XORY -Verkettung HID_SMA_XCIRCY +TB_UnaereBinaere STARMATH_HID_SMA_UNBINOPS_TBX +Plus STARMATH_HID_SMA_PLUSX +Minus STARMATH_HID_SMA_MINUSX +PlusMinus STARMATH_HID_SMA_PLUSMINUSX +MinusPlus STARMATH_HID_SMA_MINUSPLUSX +Additions STARMATH_HID_SMA_XPLUSY +Multiplikation STARMATH_HID_SMA_XCDOTY +MultiplikationKreuz STARMATH_HID_SMA_XTIMESY +MultiplikationStern STARMATH_HID_SMA_XSYMTIMESY +Subtraktions STARMATH_HID_SMA_XMINUSY +Division STARMATH_HID_SMA_XOVERY +DivisionDoppelpunkt STARMATH_HID_SMA_XDIVY +DivisionSchraegstrich STARMATH_HID_SMA_XSYMDIVIDEY +LogischesNICHT STARMATH_HID_SMA_NEGX +LogischesUND STARMATH_HID_SMA_XANDY +LogischesODER STARMATH_HID_SMA_XORY +Verkettung STARMATH_HID_SMA_XCIRCY -TB_Relationen HID_SMA_RELATIONS_TBX -IstGleich HID_SMA_XEQY -IstUngleich HID_SMA_XNEQY -IstKongruentZu HID_SMA_XEQUIVY -IstOrthogonalZu HID_SMA_XORTHOY -IstKleinerAls HID_SMA_XLTY -IstGroesserAls HID_SMA_XGTY -IstUngefaehrGleich HID_SMA_XAPPROXY -Teilt HID_SMA_XDIVIDESY -TeiltNicht HID_SMA_XNDIVIDESY -IstParallelZu HID_SMA_XPARALLELY -IstKleinerGleich HID_SMA_XLESLANTY -IstGroesserGleich HID_SMA_XGESLANTY -IstAehnlichOderGlech HID_SMA_XSIMEQY -IstProportionalZu HID_SMA_XPROPY -IstKleinerGleich2 HID_SMA_XLEY -IstGroesserGleich2 HID_SMA_XGEY -IstAehnlichZu HID_SMA_XSIMY -StrebtGegen HID_SMA_XTOWARDY -DoppelterPfeilNachLinks HID_SMA_DLARROW -DoppelterPfeilNachLinksUndRechts HID_SMA_DLRARROW -DoppelterPfeilNachRechts HID_SMA_DRARROW +TB_Relationen STARMATH_HID_SMA_RELATIONS_TBX +IstGleich STARMATH_HID_SMA_XEQY +IstUngleich STARMATH_HID_SMA_XNEQY +IstKongruentZu STARMATH_HID_SMA_XEQUIVY +IstOrthogonalZu STARMATH_HID_SMA_XORTHOY +IstKleinerAls STARMATH_HID_SMA_XLTY +IstGroesserAls STARMATH_HID_SMA_XGTY +IstUngefaehrGleich STARMATH_HID_SMA_XAPPROXY +Teilt STARMATH_HID_SMA_XDIVIDESY +TeiltNicht STARMATH_HID_SMA_XNDIVIDESY +IstParallelZu STARMATH_HID_SMA_XPARALLELY +IstKleinerGleich STARMATH_HID_SMA_XLESLANTY +IstGroesserGleich STARMATH_HID_SMA_XGESLANTY +IstAehnlichOderGlech STARMATH_HID_SMA_XSIMEQY +IstProportionalZu STARMATH_HID_SMA_XPROPY +IstKleinerGleich2 STARMATH_HID_SMA_XLEY +IstGroesserGleich2 STARMATH_HID_SMA_XGEY +IstAehnlichZu STARMATH_HID_SMA_XSIMY +StrebtGegen STARMATH_HID_SMA_XTOWARDY +DoppelterPfeilNachLinks STARMATH_HID_SMA_DLARROW +DoppelterPfeilNachLinksUndRechts STARMATH_HID_SMA_DLRARROW +DoppelterPfeilNachRechts STARMATH_HID_SMA_DRARROW -TB_Mengenoperatoren HID_SMA_SETOPERATIONS_TBX -IstEnthaltenIn HID_SMA_XINY -IstNichtEnthaltenIn HID_SMA_XNOTINY -Enthaelt HID_SMA_XOWNSY -LeereMenge HID_SMA_EMPTYSET -Durchschnitt HID_SMA_XINTERSECTIONY -Vereinigung HID_SMA_XUNIONY -Differenz HID_SMA_XSETMINUSY -Quotientenmenge HID_SMA_XSLASHY -Aleph HID_SMA_ALEPH -Teilmenge HID_SMA_XSUBSETY -TeilmengeOderGleich HID_SMA_XSUBSETEQY -Obermenge HID_SMA_XSUPSETY -ObermengeOderGleich HID_SMA_XSUPSETEQY -NichtTeilmenge HID_SMA_XNSUBSETY -NichtTeilmengeOderGleich HID_SMA_XNSUBSETEQY -NichtObermenge HID_SMA_XNSUPSETY -NichtObermengeOderGleich HID_SMA_XNSUPSETEQY -MengeDerNatuerlichenZahlen HID_SMA_SETN -MengeDerGanzenZahlen HID_SMA_SETZ -MengeDerRationalenZahlen HID_SMA_SETQ -MengeDerReellenZahlen HID_SMA_SETR -MengeDerKomplexenZahlen HID_SMA_SETC +TB_Mengenoperatoren STARMATH_HID_SMA_SETOPERATIONS_TBX +IstEnthaltenIn STARMATH_HID_SMA_XINY +IstNichtEnthaltenIn STARMATH_HID_SMA_XNOTINY +Enthaelt STARMATH_HID_SMA_XOWNSY +LeereMenge STARMATH_HID_SMA_EMPTYSET +Durchschnitt STARMATH_HID_SMA_XINTERSECTIONY +Vereinigung STARMATH_HID_SMA_XUNIONY +Differenz STARMATH_HID_SMA_XSETMINUSY +Quotientenmenge STARMATH_HID_SMA_XSLASHY +Aleph STARMATH_HID_SMA_ALEPH +Teilmenge STARMATH_HID_SMA_XSUBSETY +TeilmengeOderGleich STARMATH_HID_SMA_XSUBSETEQY +Obermenge STARMATH_HID_SMA_XSUPSETY +ObermengeOderGleich STARMATH_HID_SMA_XSUPSETEQY +NichtTeilmenge STARMATH_HID_SMA_XNSUBSETY +NichtTeilmengeOderGleich STARMATH_HID_SMA_XNSUBSETEQY +NichtObermenge STARMATH_HID_SMA_XNSUPSETY +NichtObermengeOderGleich STARMATH_HID_SMA_XNSUPSETEQY +MengeDerNatuerlichenZahlen STARMATH_HID_SMA_SETN +MengeDerGanzenZahlen STARMATH_HID_SMA_SETZ +MengeDerRationalenZahlen STARMATH_HID_SMA_SETQ +MengeDerReellenZahlen STARMATH_HID_SMA_SETR +MengeDerKomplexenZahlen STARMATH_HID_SMA_SETC -TB_Funktionen HID_SMA_FUNCTIONS_TBX -Absolutwert HID_SMA_ABSX -Fakultaet HID_SMA_FACTX -Quadratwurzel HID_SMA_SQRTX -NteWurzel HID_SMA_NROOTXY -NatuerlicheExponentialfunktion HID_SMA_EX -NatuerlicherLogarithmus HID_SMA_LNX -Exponentialfunktion HID_SMA_EXPX -Logarithmus HID_SMA_LOGX -Sinus HID_SMA_SINX -Cosinus HID_SMA_COSX -Tangens HID_SMA_TANX -Cotangens HID_SMA_COTX -Hyperbelsinus HID_SMA_SINHX -Hyperbelcosinus HID_SMA_COSHX -Hyperbeltangens HID_SMA_TANHX -Hyperbelcotangens HID_SMA_COTHX -Arcussinus HID_SMA_ARCSINX -Arcuscosinus HID_SMA_ARCCOSX -Arcustangens HID_SMA_ARCTANX -Arcuscotangens HID_SMA_ARCCOTX -Areahyperbelsinus HID_SMA_ARSINHX -Areahyperbelcosinus HID_SMA_ARCOSHX -Areahyperbeltangens HID_SMA_ARTANHX -Areahyperbelcotangens HID_SMA_ARCOTHX +TB_Funktionen STARMATH_HID_SMA_FUNCTIONS_TBX +Absolutwert STARMATH_HID_SMA_ABSX +Fakultaet STARMATH_HID_SMA_FACTX +Quadratwurzel STARMATH_HID_SMA_SQRTX +NteWurzel STARMATH_HID_SMA_NROOTXY +NatuerlicheExponentialfunktion STARMATH_HID_SMA_EX +NatuerlicherLogarithmus STARMATH_HID_SMA_LNX +Exponentialfunktion STARMATH_HID_SMA_EXPX +Logarithmus STARMATH_HID_SMA_LOGX +Sinus STARMATH_HID_SMA_SINX +Cosinus STARMATH_HID_SMA_COSX +Tangens STARMATH_HID_SMA_TANX +Cotangens STARMATH_HID_SMA_COTX +Hyperbelsinus STARMATH_HID_SMA_SINHX +Hyperbelcosinus STARMATH_HID_SMA_COSHX +Hyperbeltangens STARMATH_HID_SMA_TANHX +Hyperbelcotangens STARMATH_HID_SMA_COTHX +Arcussinus STARMATH_HID_SMA_ARCSINX +Arcuscosinus STARMATH_HID_SMA_ARCCOSX +Arcustangens STARMATH_HID_SMA_ARCTANX +Arcuscotangens STARMATH_HID_SMA_ARCCOTX +Areahyperbelsinus STARMATH_HID_SMA_ARSINHX +Areahyperbelcosinus STARMATH_HID_SMA_ARCOSHX +Areahyperbeltangens STARMATH_HID_SMA_ARTANHX +Areahyperbelcotangens STARMATH_HID_SMA_ARCOTHX -TB_Operatoren HID_SMA_OPERATORS_TBX -Limes HID_SMA_LIMX -Summe HID_SMA_SUMX -Produkt HID_SMA_PRODX -Coprodukt HID_SMA_COPRODX -Integral HID_SMA_INTX -DoppeltesIntegral HID_SMA_IINTX -DreifachesIntegral HID_SMA_IIINTX +TB_Operatoren STARMATH_HID_SMA_OPERATORS_TBX +Limes STARMATH_HID_SMA_LIMX +Summe STARMATH_HID_SMA_SUMX +Produkt STARMATH_HID_SMA_PRODX +Coprodukt STARMATH_HID_SMA_COPRODX +Integral STARMATH_HID_SMA_INTX +DoppeltesIntegral STARMATH_HID_SMA_IINTX +DreifachesIntegral STARMATH_HID_SMA_IIINTX 'EsExistiertEin HID_SMA_EXISTSX -Kurvenintegral HID_SMA_LINTX -DoppeltesKurvenintegral HID_SMA_LLINTX -DreifachesKurvenintegral HID_SMA_LLLINTX +Kurvenintegral STARMATH_HID_SMA_LINTX +DoppeltesKurvenintegral STARMATH_HID_SMA_LLINTX +DreifachesKurvenintegral STARMATH_HID_SMA_LLLINTX 'FuerAlle HID_SMA_FORALLX -UntereUndObereGrenze HID_SMA_FROMXTOY -UntereGrenze HID_SMA_FROMX -ObereGrenze HID_SMA_TOX +UntereUndObereGrenze STARMATH_HID_SMA_FROMXTOY +UntereGrenze STARMATH_HID_SMA_FROMX +ObereGrenze STARMATH_HID_SMA_TOX -TB_Attribute HID_SMA_ATTRIBUTES_TBX -AccentNachRechts HID_SMA_ACUTEX -AccentNachLinks HID_SMA_GRAVEX -UmgekehrtesDach HID_SMA_CHECKX -Breve HID_SMA_BREVEX -Ueberstrich HID_SMA_BARX -Vektorpfeil HID_SMA_VECX -Dach HID_SMA_HATX -Tilde HID_SMA_TILDEX -Kreis HID_SMA_CIRCLEX -Punkt HID_SMA_DOTX -BreiterVektorpfeil HID_SMA_WIDEVECX -BreiteTilde HID_SMA_WIDETILDEX -BreitesDach HID_SMA_WIDEHATX -DoppelterPunkt HID_SMA_DDOTX -DreifacherPunkt HID_SMA_DDDOTX -LinieUeber HID_SMA_OVERLINEX -LinieUnter HID_SMA_UNDERLINEX -LinieDurch HID_SMA_OVERSTRIKEX -Transparent HID_SMA_PHANTOMX -Fettschrift HID_SMA_BOLDX -KursiveSchrift HID_SMA_ITALX -GroesseAendern HID_SMA_SIZEXY -FontAendern HID_SMA_FONTXY +TB_Attribute STARMATH_HID_SMA_ATTRIBUTES_TBX +AccentNachRechts STARMATH_HID_SMA_ACUTEX +AccentNachLinks STARMATH_HID_SMA_GRAVEX +UmgekehrtesDach STARMATH_HID_SMA_CHECKX +Breve STARMATH_HID_SMA_BREVEX +Ueberstrich STARMATH_HID_SMA_BARX +Vektorpfeil STARMATH_HID_SMA_VECX +Dach STARMATH_HID_SMA_HATX +Tilde STARMATH_HID_SMA_TILDEX +Kreis STARMATH_HID_SMA_CIRCLEX +Punkt STARMATH_HID_SMA_DOTX +BreiterVektorpfeil STARMATH_HID_SMA_WIDEVECX +BreiteTilde STARMATH_HID_SMA_WIDETILDEX +BreitesDach STARMATH_HID_SMA_WIDEHATX +DoppelterPunkt STARMATH_HID_SMA_DDOTX +DreifacherPunkt STARMATH_HID_SMA_DDDOTX +LinieUeber STARMATH_HID_SMA_OVERLINEX +LinieUnter STARMATH_HID_SMA_UNDERLINEX +LinieDurch STARMATH_HID_SMA_OVERSTRIKEX +Transparent STARMATH_HID_SMA_PHANTOMX +Fettschrift STARMATH_HID_SMA_BOLDX +KursiveSchrift STARMATH_HID_SMA_ITALX +GroesseAendern STARMATH_HID_SMA_SIZEXY +FontAendern STARMATH_HID_SMA_FONTXY -Unendlich HID_SMA_INFINITY -Partial HID_SMA_PARTIAL -Nabla HID_SMA_NABLA -EsExistiert HID_SMA_EXISTS -FuerAlle HID_SMA_FORALL -HQuer HID_SMA_HBAR -LambdaQuer HID_SMA_LAMBDABAR -Realteil HID_SMA_RE -Imaginaerteil HID_SMA_IM -WeierstrassP HID_SMA_WP -PfeilNachLinks HID_SMA_LEFTARROW -PfeilNachRechts HID_SMA_RIGHTARROW -PfeilNachOben HID_SMA_UPARROW -PfeilNachUnten HID_SMA_DOWNARROW -PunkteUnten HID_SMA_DOTSLOW -PunkteMittig HID_SMA_DOTSAXIS -PunkteVertikal HID_SMA_DOTSVERT -PunkteNachOben HID_SMA_DOTSUP -PunkteNachUnten HID_SMA_DOTSDOWN +Unendlich STARMATH_HID_SMA_INFINITY +Partial STARMATH_HID_SMA_PARTIAL +Nabla STARMATH_HID_SMA_NABLA +EsExistiert STARMATH_HID_SMA_EXISTS +FuerAlle STARMATH_HID_SMA_FORALL +HQuer STARMATH_HID_SMA_HBAR +LambdaQuer STARMATH_HID_SMA_LAMBDABAR +Realteil STARMATH_HID_SMA_RE +Imaginaerteil STARMATH_HID_SMA_IM +WeierstrassP STARMATH_HID_SMA_WP +PfeilNachLinks STARMATH_HID_SMA_LEFTARROW +PfeilNachRechts STARMATH_HID_SMA_RIGHTARROW +PfeilNachOben STARMATH_HID_SMA_UPARROW +PfeilNachUnten STARMATH_HID_SMA_DOWNARROW +PunkteUnten STARMATH_HID_SMA_DOTSLOW +PunkteMittig STARMATH_HID_SMA_DOTSAXIS +PunkteVertikal STARMATH_HID_SMA_DOTSVERT +PunkteNachOben STARMATH_HID_SMA_DOTSUP +PunkteNachUnten STARMATH_HID_SMA_DOTSDOWN -TB_Klammerungen HID_SMA_BRACKETS_TBX -RundeKlammern HID_SMA_LRPARENTX -EckigeKlammern HID_SMA_LRBRACKETX -DoppelteEckigeKlammern HID_SMA_LRDBRACKETX -SpitzeKlammern HID_SMA_LRANGLEX -OperatorKlammern HID_SMA_LMRANGLEXY -GeschweifteKlammern HID_SMA_LRBRACEX -EinfacheLinien HID_SMA_LRLINEX -DoppelteLinien HID_SMA_LRDLINEX -GruppierungsKlammern HID_SMA_LRGROUPX -RundeKlammernSkalierbar HID_SMA_SLRPARENTX -EckigeKlammernSkalierbar HID_SMA_SLRBRACKETX -EckigeKlammernSkalierbar2 HID_SMA_SLRDBRACKETX -SpitzeKlammernSkalierbar HID_SMA_SLRANGLEX -GeschweifteKlammernSkalierbar HID_SMA_SLRBRACEX -EinfacheLinienSkalierbar HID_SMA_SLRLINEX -DoppelteLinienSkalierbar HID_SMA_SLRDLINEX -OperatorKlammernSkalierbar HID_SMA_SLMRANGLEXY -GeschweifteKlammerObenSkalierbar HID_SMA_XOVERBRACEY -GeschweifteKlammerUntenSkalierbar HID_SMA_XUNDERBRACEY +TB_Klammerungen STARMATH_HID_SMA_BRACKETS_TBX +RundeKlammern STARMATH_HID_SMA_LRPARENTX +EckigeKlammern STARMATH_HID_SMA_LRBRACKETX +DoppelteEckigeKlammern STARMATH_HID_SMA_LRDBRACKETX +SpitzeKlammern STARMATH_HID_SMA_LRANGLEX +OperatorKlammern STARMATH_HID_SMA_LMRANGLEXY +GeschweifteKlammern STARMATH_HID_SMA_LRBRACEX +EinfacheLinien STARMATH_HID_SMA_LRLINEX +DoppelteLinien STARMATH_HID_SMA_LRDLINEX +GruppierungsKlammern STARMATH_HID_SMA_LRGROUPX +RundeKlammernSkalierbar STARMATH_HID_SMA_SLRPARENTX +EckigeKlammernSkalierbar STARMATH_HID_SMA_SLRBRACKETX +EckigeKlammernSkalierbar2 STARMATH_HID_SMA_SLRDBRACKETX +SpitzeKlammernSkalierbar STARMATH_HID_SMA_SLRANGLEX +GeschweifteKlammernSkalierbar STARMATH_HID_SMA_SLRBRACEX +EinfacheLinienSkalierbar STARMATH_HID_SMA_SLRLINEX +DoppelteLinienSkalierbar STARMATH_HID_SMA_SLRDLINEX +OperatorKlammernSkalierbar STARMATH_HID_SMA_SLMRANGLEXY +GeschweifteKlammerObenSkalierbar STARMATH_HID_SMA_XOVERBRACEY +GeschweifteKlammerUntenSkalierbar STARMATH_HID_SMA_XUNDERBRACEY -TB_Formatierungen HID_SMA_FORMAT_TBX -NeueZeileBeginnen HID_SMA_NEWLINE -KleinerZwischenraum HID_SMA_SBLANK -Zwischenraum HID_SMA_BLANK -SubscriptRechts HID_SMA_RSUBX -VertikaleAnordnung2Elemente HID_SMA_BINOMXY -VertikaleAnordnung HID_SMA_STACK -MatrixAnordnung HID_SMA_MATRIX -SuperscriptRechts HID_SMA_RSUPX -LinksbuendigAusrichten HID_SMA_ALIGNLX -ZentriertHorizontalAusrichten HID_SMA_ALIGNCX -RechtsbuendigAusrichten HID_SMA_ALIGNRX -SubscriptLinks HID_SMA_LSUBX -SuperscriptLinks HID_SMA_LSUPX -SuperscriptOben HID_SMA_CSUPX -SubscriptUnten HID_SMA_CSUBX +TB_Formatierungen STARMATH_HID_SMA_FORMAT_TBX +NeueZeileBeginnen STARMATH_HID_SMA_NEWLINE +KleinerZwischenraum STARMATH_HID_SMA_SBLANK +Zwischenraum STARMATH_HID_SMA_BLANK +SubscriptRechts STARMATH_HID_SMA_RSUBX +VertikaleAnordnung2Elemente STARMATH_HID_SMA_BINOMXY +VertikaleAnordnung STARMATH_HID_SMA_STACK +MatrixAnordnung STARMATH_HID_SMA_MATRIX +SuperscriptRechts STARMATH_HID_SMA_RSUPX +LinksbuendigAusrichten STARMATH_HID_SMA_ALIGNLX +ZentriertHorizontalAusrichten STARMATH_HID_SMA_ALIGNCX +RechtsbuendigAusrichten STARMATH_HID_SMA_ALIGNRX +SubscriptLinks STARMATH_HID_SMA_LSUBX +SuperscriptLinks STARMATH_HID_SMA_LSUPX +SuperscriptOben STARMATH_HID_SMA_CSUPX +SubscriptUnten STARMATH_HID_SMA_CSUBX +OperatorenMath AuswahlMath diff --git a/testautomation/global/win/piloten.win b/testautomation/global/win/piloten.win old mode 100755 new mode 100644 index 08d512727471..59a592be2dd6 --- a/testautomation/global/win/piloten.win +++ b/testautomation/global/win/piloten.win @@ -2,73 +2,73 @@ ' **** Autopilot Pr„sentation **** ' ************************************************************************************************ -*AutoPilotPraesentation1 HID_SD_AUTOPILOT_PAGE1 -Backbutton sd:PushButton:DLG_ASS:BUT_LAST -Nextbutton sd:PushButton:DLG_ASS:BUT_NEXT -EmptyPresentation sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY -FromTemplate sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE -TemplateRegion HID_SD_AUTOPILOT_REGION -TemplateList HID_SD_AUTOPILOT_TEMPLATES -Existingpresentation sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN -ExistingOpen sd:PushButton:DLG_ASS:PB_PAGE1_OPEN -Existinglist HID_SD_AUTOPILOT_OPEN -Preview sd:CheckBox:DLG_ASS:CB_PREVIEW -Startwithwizard sd:CheckBox:DLG_ASS:CB_STARTWITH +*AutoPilotPraesentation1 SD_HID_SD_AUTOPILOT_PAGE1 +Backbutton sd.PushButton.900.3 +Nextbutton sd.PushButton.900.4 +EmptyPresentation sd.RadioButton.900.11 +FromTemplate sd.RadioButton.900.12 +TemplateRegion SD_HID_SD_AUTOPILOT_REGION +TemplateList SD_HID_SD_AUTOPILOT_TEMPLATES +Existingpresentation sd.RadioButton.900.15 +ExistingOpen sd.PushButton.900.17 +Existinglist SD_HID_SD_AUTOPILOT_OPEN +Preview sd.CheckBox.900.7 +Startwithwizard sd.CheckBox.900.8 -*AutoPilotPraesentation2 HID_SD_AUTOPILOT_PAGE2 -Backbutton sd:PushButton:DLG_ASS:BUT_LAST -Nextbutton sd:PushButton:DLG_ASS:BUT_NEXT -Background HID_SD_AUTOPILOT_PAGETEMPLATES -Backgroundchoice sd:ListBox:DLG_ASS:LB_PAGE2_LAYOUT -Original sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM5 -Screen sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM1 -Overhead sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM3 -Slide sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM2 -Paper sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM4 -Preview sd:CheckBox:DLG_ASS:CB_PREVIEW +*AutoPilotPraesentation2 SD_HID_SD_AUTOPILOT_PAGE2 +Backbutton sd.PushButton.900.3 +Nextbutton sd.PushButton.900.4 +Background SD_HID_SD_AUTOPILOT_PAGETEMPLATES +Backgroundchoice sd.ListBox.900.33 +Original sd.RadioButton.900.39 +Screen sd.RadioButton.900.35 +Overhead sd.RadioButton.900.37 +Slide sd.RadioButton.900.36 +Paper sd.RadioButton.900.38 +Preview sd.CheckBox.900.7 -*AutoPilotPraesentation3 HID_SD_AUTOPILOT_PAGE3 -Backbutton sd:PushButton:DLG_ASS:BUT_LAST -Nextbutton sd:PushButton:DLG_ASS:BUT_NEXT -Effect sd:ListBox:DLG_ASS:LB_PAGE3_EFFECT -Speed sd:ListBox:DLG_ASS:LB_PAGE3_SPEED -Default sd:RadioButton:DLG_ASS:RB_PAGE3_LIVE -Automatic sd:RadioButton:DLG_ASS:RB_PAGE3_KIOSK -Timebutton sd:TimeField:DLG_ASS:TMF_PAGE3_TIME -Break sd:TimeField:DLG_ASS:TMF_PAGE3_BREAK -Logo sd:CheckBox:DLG_ASS:CB_PAGE3_LOGO -Preview sd:CheckBox:DLG_ASS:CB_PREVIEW +*AutoPilotPraesentation3 SD_HID_SD_AUTOPILOT_PAGE3 +Backbutton sd.PushButton.900.3 +Nextbutton sd.PushButton.900.4 +Effect sd.ListBox.900.43 +Speed sd.ListBox.900.45 +Default sd.RadioButton.900.47 +Automatic sd.RadioButton.900.48 +Timebutton sd.TimeField.900.50 +Break sd.TimeField.900.52 +Logo sd.CheckBox.900.53 +Preview sd.CheckBox.900.7 -*AutoPilotPraesentation4 HID_SD_AUTOPILOT_PAGE4 -Backbutton sd:PushButton:DLG_ASS:BUT_LAST -Nextbutton sd:PushButton:DLG_ASS:BUT_NEXT -AddName sd:Edit:DLG_ASS:EDT_PAGE4_ASKNAME -AddTopic sd:Edit:DLG_ASS:EDT_PAGE4_ASKTOPIC -Askinformation sd:MultiLineEdit:DLG_ASS:EDT_PAGE4_ASKINFORMATION +*AutoPilotPraesentation4 SD_HID_SD_AUTOPILOT_PAGE4 +Backbutton sd.PushButton.900.3 +Nextbutton sd.PushButton.900.4 +AddName sd.Edit.900.23 +AddTopic sd.Edit.900.25 +Askinformation sd.MultiLineEdit.900.27 -*AutoPilotPraesentation5 HID_SD_AUTOPILOT_PAGE5 -Backbutton sd:PushButton:DLG_ASS:BUT_LAST -Nextbutton sd:PushButton:DLG_ASS:BUT_NEXT -Summary sd:CheckBox:DLG_ASS:CB_PAGE5_SUMMARY -Preview sd:CheckBox:DLG_ASS:CB_PREVIEW +*AutoPilotPraesentation5 SD_HID_SD_AUTOPILOT_PAGE5 +Backbutton sd.PushButton.900.3 +Nextbutton sd.PushButton.900.4 +Summary sd.CheckBox.900.63 +Preview sd.CheckBox.900.7 -*AutoPilotEuroKonverter HID_DLGCONVERT_DIALOG -Abbrechen HID_DLGCONVERT_CBCANCEL -Hilfe HID_DLGCONVERT_CBHELP -Zurueck HID_DLGCONVERT_CBBACK -Konvertieren HID_DLGCONVERT_CBGOON -AktuellesDokument HID_DLGCONVERT_OBFILE -Verzeichnis HID_DLGCONVERT_OBDIR -Waehrungen HID_DLGCONVERT_COMBOBOX1 -Quelle HID_DLGCONVERT_TBSOURCE -QuelleSuchen HID_DLGCONVERT_CBSOURCEOPEN -Unterverzeichnisse HID_DLGCONVERT_CHECKRECURSIVE -FelderUndTabellen HID_DLGCONVERT_CHKTEXTDOCUMENTS -TabellenschutzAufheben HID_DLGCONVERT_CHKPROTECT -Ziel HID_DLGCONVERT_TBTARGET -ZielSuchen HID_DLGCONVERT_CBTARGETOPEN -KomplettesDokument HID_DLGCONVERT_CHECKBOX1 -Zellvorlagen HID_DLGCONVERT_OPTIONBUTTON1 -WaehrungszellenTabellenblatt HID_DLGCONVERT_OPTIONBUTTON2 -WaehrungszellenDokument HID_DLGCONVERT_OPTIONBUTTON3 -AusgewaehlterBereich HID_DLGCONVERT_OPTIONBUTTON4 +*AutoPilotEuroKonverter WIZARDS_HID_DLGCONVERT_DIALOG +Abbrechen WIZARDS_HID_DLGCONVERT_CBCANCEL +Hilfe WIZARDS_HID_DLGCONVERT_CBHELP +Zurueck WIZARDS_HID_DLGCONVERT_CBBACK +Konvertieren WIZARDS_HID_DLGCONVERT_CBGOON +AktuellesDokument WIZARDS_HID_DLGCONVERT_OBFILE +Verzeichnis WIZARDS_HID_DLGCONVERT_OBDIR +Waehrungen WIZARDS_HID_DLGCONVERT_COMBOBOX1 +Quelle WIZARDS_HID_DLGCONVERT_TBSOURCE +QuelleSuchen WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN +Unterverzeichnisse WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE +FelderUndTabellen WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS +TabellenschutzAufheben WIZARDS_HID_DLGCONVERT_CHKPROTECT +Ziel WIZARDS_HID_DLGCONVERT_TBTARGET +ZielSuchen WIZARDS_HID_DLGCONVERT_CBTARGETOPEN +KomplettesDokument WIZARDS_HID_DLGCONVERT_CHECKBOX1 +Zellvorlagen WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1 +WaehrungszellenTabellenblatt WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2 +WaehrungszellenDokument WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3 +AusgewaehlterBereich WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4 diff --git a/testautomation/global/win/reportdesigner.win b/testautomation/global/win/reportdesigner.win old mode 100755 new mode 100644 index f5e0baccf1ba..05088ad1fad2 --- a/testautomation/global/win/reportdesigner.win +++ b/testautomation/global/win/reportdesigner.win @@ -1,7 +1,7 @@ -*ReportDesign UID_RPT_RPT_APP_VIEW +*ReportDesign REPORTDESIGN_UID_RPT_RPT_APP_VIEW '--64509: TABPAGE: UID_APP_DESIGNVIEW -ReportWindow UID_RPT_REPORTWINDOW -SectionWindow UID_RPT_SECTIONSWINDOW +ReportWindow REPORTDESIGN_UID_RPT_REPORTWINDOW +SectionWindow REPORTDESIGN_UID_RPT_SECTIONSWINDOW ' HID_STARTMARKER ' HID_START_TITLE ' HID_START_IMAGE @@ -12,75 +12,75 @@ SectionWindow UID_RPT_SECTIONSWINDOW ' HID_START_TITLE ' HID_START_IMAGE ' UID_VIEWSWINDOW -' HID_REPORTSECTION +' REPORTDESIGN_HID_REPORTSECTION ' HID_ENDMARKER -' HID_REPORTSECTION +' REPORTDESIGN_HID_REPORTSECTION ' HID_ENDMARKER -' HID_REPORTSECTION +' REPORTDESIGN_HID_REPORTSECTION ' HID_ENDMARKER -*ReportPageNumber HID_RPT_PAGENUMBERS_DLG -PageN reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N -PageNofM reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N_OF_M -TopOfPage reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_TOPPAGE -BottomOfpage reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_BOTTOMPAGE -PageNumberAlignment reportdesign:ListBox:RID_PAGENUMBERS:LST_ALIGNMENT -ShowNumberOnFirstPage reportdesign:CheckBox:RID_PAGENUMBERS:CB_SHOWNUMBERONFIRSTPAGE +*ReportPageNumber REPORTDESIGN_HID_RPT_PAGENUMBERS_DLG +PageN reportdesign.RadioButton.30769.2 +PageNofM reportdesign.RadioButton.30769.3 +TopOfPage reportdesign.RadioButton.30769.5 +BottomOfpage reportdesign.RadioButton.30769.6 +PageNumberAlignment reportdesign.ListBox.30769.8 +ShowNumberOnFirstPage reportdesign.CheckBox.30769.9 -*ReportDateTime HID_RPT_DATETIME_DLG -IncludeDate reportdesign:CheckBox:RID_DATETIME_DLG:CB_DATE -DateFormat reportdesign:ListBox:RID_DATETIME_DLG:LB_DATE_TYPE -IncludeTime reportdesign:CheckBox:RID_DATETIME_DLG:CB_TIME -TimeFormat reportdesign:ListBox:RID_DATETIME_DLG:LB_TIME_TYPE +*ReportDateTime REPORTDESIGN_HID_RPT_DATETIME_DLG +IncludeDate reportdesign.CheckBox.30770.1 +DateFormat reportdesign.ListBox.30770.3 +IncludeTime reportdesign.CheckBox.30770.5 +TimeFormat reportdesign.ListBox.30770.7 -*ReportSortingGrouping HID_RPT_GROUPSSORTING_DLG -Groups HID_RPT_GROUPSBRW -FieldExpression HID_RPT_FIELDEXPRESSION -MoveUp HID_RPT_GROUPSORT_MOVE_UP -MoveDown HID_RPT_GROUPSORT_MOVE_DOWN -Sorting reportdesign:ListBox:RID_GROUPS_SORTING:LST_ORDER -GroupHeader reportdesign:ListBox:RID_GROUPS_SORTING:LST_HEADERLST -GroupFooter reportdesign:ListBox:RID_GROUPS_SORTING:LST_FOOTERLST -GroupOn reportdesign:ListBox:RID_GROUPS_SORTING:LST_GROUPONLST -GroupIntervall reportdesign:NumericField:RID_GROUPS_SORTING:ED_GROUPINTERVALLST -KeepTogether reportdesign:ListBox:RID_GROUPS_SORTING:LST_KEEPTOGETHERLST +*ReportSortingGrouping REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG +Groups REPORTDESIGN_HID_RPT_GROUPSBRW +FieldExpression REPORTDESIGN_HID_RPT_FIELDEXPRESSION +MoveUp REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_UP +MoveDown REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_DOWN +Sorting reportdesign.ListBox.30768.17 +GroupHeader reportdesign.ListBox.30768.2 +GroupFooter reportdesign.ListBox.30768.4 +GroupOn reportdesign.ListBox.30768.6 +GroupIntervall reportdesign.NumericField.30768.8 +KeepTogether reportdesign.ListBox.30768.10 -*ReportNavigator HID_RPT_NAVIGATOR_DLG -NavigatorTree HID_REPORT_NAVIGATOR_TREE +*ReportNavigator REPORTDESIGN_HID_RPT_NAVIGATOR_DLG +NavigatorTree REPORTDESIGN_HID_REPORT_NAVIGATOR_TREE -*ReportGeneralProperties HID_RPT_PROPDLG_TAB_GENERAL -NameText HID_PROP_NAME -GroupKeepTogether HID_RPT_PROP_GROUPKEEPTOGETHER -PageHeader HID_RPT_PROP_PAGEHEADEROPTION -PageFooter HID_RPT_PROP_PAGEFOOTEROPTION -PrintRepeatedValues HID_RPT_PROP_PRINTREPEATEDVALUES -Height HID_RPT_PROP_RPT_HEIGHT -Width HID_RPT_PROP_RPT_WIDTH -PositionX HID_RPT_PROP_RPT_POSITIONX -PositionY HID_RPT_PROP_RPT_POSITIONY -ConditionalPrintExpression HID_RPT_PROP_CONDITIONALPRINTEXPRESSION -BackgroundColor HID_RPT_PROP_BACKCOLOR -BackgroundTransparent HID_RPT_PROP_BACKTRANSPARENT -Font HID_RPT_PROP_RPT_FONT -FontTypeDlg UID_PROP_DLG_FONT_TYPE -PrintWhenGroupChange HID_RPT_PROP_PRINTWHENGROUPCHANGE -ControlBackgroundTransparent HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT +*ReportGeneralProperties REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL +NameText EXTENSIONS_HID_PROP_NAME +GroupKeepTogether REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER +PageHeader REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION +PageFooter REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION +PrintRepeatedValues REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES +Height REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT +Width REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH +PositionX REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX +PositionY REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY +ConditionalPrintExpression REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION +BackgroundColor REPORTDESIGN_HID_RPT_PROP_BACKCOLOR +BackgroundTransparent REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT +Font REPORTDESIGN_HID_RPT_PROP_RPT_FONT +FontTypeDlg EXTENSIONS_UID_PROP_DLG_FONT_TYPE +PrintWhenGroupChange REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE +ControlBackgroundTransparent REPORTDESIGN_HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT -*ReportDataProperties HID_RPT_PROPDLG_TAB_DATA -ContentType HID_PROP_CURSORSOURCETYPE -Content HID_PROP_CURSORSOURCE -OpenQueryDesign UID_PROP_DLG_SQLCOMMAND -AnalyzeSQLCommand HID_PROP_ESCAPE_PROCESSING -Filter HID_PROP_FILTER -FilterDLGButton UID_PROP_DLG_FILTER -DataField HID_RPT_PROP_DATAFIELD -OpenFormularWizard UID_RPT_PROP_FORMULA +*ReportDataProperties REPORTDESIGN_HID_RPT_PROPDLG_TAB_DATA +ContentType EXTENSIONS_HID_PROP_CURSORSOURCETYPE +Content EXTENSIONS_HID_PROP_CURSORSOURCE +OpenQueryDesign EXTENSIONS_UID_PROP_DLG_SQLCOMMAND +AnalyzeSQLCommand EXTENSIONS_HID_PROP_ESCAPE_PROCESSING +Filter EXTENSIONS_HID_PROP_FILTER +FilterDLGButton EXTENSIONS_UID_PROP_DLG_FILTER +DataField REPORTDESIGN_HID_RPT_PROP_DATAFIELD +OpenFormularWizard REPORTDESIGN_UID_RPT_PROP_FORMULA -*ReportPropertiesTabControl HID_FM_PROPDLG_TABCTR -ReportGeneralProperties HID_RPT_PROPDLG_TAB_GENERAL -ReportDataProperties HID_RPT_PROPDLG_TAB_DATA +*ReportPropertiesTabControl EXTENSIONS_HID_FM_PROPDLG_TABCTR +ReportGeneralProperties REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL +ReportDataProperties REPORTDESIGN_HID_RPT_PROPDLG_TAB_DATA -*ReportAddField HID_RPT_FIELD_SEL_WIN -ReportAddFieldList HID_RPT_FIELD_SEL +*ReportAddField REPORTDESIGN_HID_RPT_FIELD_SEL_WIN +ReportAddFieldList REPORTDESIGN_HID_RPT_FIELD_SEL -*ConditionalFormating HID_RPT_CONDFORMAT_DLG +*ConditionalFormating REPORTDESIGN_HID_RPT_CONDFORMAT_DLG diff --git a/testautomation/global/win/spadmin.win b/testautomation/global/win/spadmin.win old mode 100755 new mode 100644 index 1e8de27e9b15..65e5b44447e9 --- a/testautomation/global/win/spadmin.win +++ b/testautomation/global/win/spadmin.win @@ -1,107 +1,107 @@ -*SPRenamePrinterDLG padmin:ModalDialog:RID_STRINGQUERYDLG -EFPrinterName padmin:Edit:RID_STRINGQUERYDLG:RID_STRQRY_EDT_NEWNAME -CBUnidentifiedObject padmin:ComboBox:RID_STRINGQUERYDLG:RID_STRQRY_BOX_NEWNAME - -*SPFontNameDLG padmin:ModalDialog:RID_FONTNAMEDIALOG -PBRename padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_RENAME -PBRemove padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_REMOVE -PBAdd padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_IMPORT -LBFontList padmin:ListBox:RID_FONTNAMEDIALOG:RID_FNTNM_LB_FONTS - -*SPFontImportDLG padmin:ModalDialog:RID_FONTIMPORT_DIALOG -PBSelectAll padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_SELECTALL -LBFontList padmin:ListBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_NEWFONTS -EFFontPath padmin:Edit:RID_FONTIMPORT_DIALOG:RID_FIMP_EDT_FROM -PBFontPath padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_FROM -CBCreateSoftlinks padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_LINKONLY - -*FilePicker HID_EXPLORERDLG_FILE -EFFileName HID_FILEDLG_AUTOCOMPLETEBOX -LBFileList fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE -PBSelect fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN -PBUpOneLevel fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP -PBNewDir fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER -MBDefaultDir fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD -TLBStandard HID_FILEDLG_STANDARD - -*SPPrinterWizard padmin:ModalDialog:RID_ADD_PRINTER_DIALOG -TabPWDeviceSelector padmin:TabPage:RID_ADDP_PAGE_CHOOSEDEV -TabPWDriverSelector padmin:TabPage:RID_ADDP_PAGE_CHOOSEDRIVER -TabPWQueueCommand padmin:TabPage:RID_ADDP_PAGE_COMMAND -TabPWPrinterName padmin:TabPage:RID_ADDP_PAGE_NAME -PBBack padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_PREV -PBNext padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_NEXT - -*TabPWDeviceSelector padmin:TabPage:RID_ADDP_PAGE_CHOOSEDEV -RBAdd padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PRINTER -RBFax padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_FAX -RBPdf padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PDF -RBImport padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_OLD - -*TabPWDriverSelector padmin:TabPage:RID_ADDP_PAGE_CHOOSEDRIVER -LBChooseDriver padmin:ListBox:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BOX_DRIVER -PBImport padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_ADD -PBDelete padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_REMOVE - -*TabPWFaxDriverSelector padmin:TabPage:RID_ADDP_PAGE_FAXDRIVER -RBDefault padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_DEFAULT -RBSelect padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_SELECT - -*TabPWQueueCommand padmin:TabPage:RID_ADDP_PAGE_COMMAND -CBCommand padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_COMMAND -PBHelp padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_HELP -EFPdfDir padmin:Edit:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_EDT_PDFDIR -PBPdfDir padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_PDFDIR - -*TabPWPrinterName padmin:TabPage:RID_ADDP_PAGE_NAME -EFPrinterName padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_NAME -EFFaxName padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_FAXNAME -CBUseAsDefault padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_DEFAULT -CBRemoveFaxNumber padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_FAXSWALLOW - -*SPAdmin padmin:ModalDialog:RID_PADIALOG -LBPrinters padmin:ListBox:RID_PADIALOG:RID_PA_LB_DEV -PBProperties padmin:PushButton:RID_PADIALOG:RID_PA_BTN_CONF -PBRename padmin:PushButton:RID_PADIALOG:RID_PA_BTN_RENAME -PBDefault padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD -PBRemove padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL -PBTestpage padmin:PushButton:RID_PADIALOG:RID_PA_TESTPAGE -PBNewPrinter padmin:PushButton:RID_PADIALOG:RID_PA_BTN_ADD - -*TabSPACommand padmin:TabPage:RID_RTS_COMMANDPAGE -EFlpr padmin:ComboBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_COMMANDS -LBConfigureAs padmin:ListBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_LB_CONFIGURE -PBPdfDir padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_PDFDIR -EFPdfDir padmin:Edit:RID_RTS_COMMANDPAGE:RID_RTS_CMD_EDT_PDFDIR -CBRemoveFaxNumber padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BOX_SWALLOWFAXNO -PBHelp padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_HELP -PBRemove padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_REMOVE - -*TabSPAPaper padmin:TabPage:RID_RTS_PAPERPAGE -LBPaperSize padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_PAPER_BOX -LBOrientation padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_ORIENTATION_BOX -LBDuplex padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_DUPLEX_BOX -LBPaperTray padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_SLOT_BOX - -*TabSPADevice padmin:TabPage:RID_RTS_DEVICEPAGE -LBOption padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDKEY_BOX -LBCurrentValue padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDVALUE_BOX -LBColor padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_SPACE_BOX - -*TabSPAFontReplacement padmin:TabPage:RID_RTS_FONTSUBSTPAGE -MLReplacedFonts padmin:MultiListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_SUBST_BOX -CBReplaceFont padmin:ComboBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_FROM_BOX -LBByPrinterFont padmin:ListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_TO_BOX -PBAdd padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ADD_BTN -PBRemove padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_REMOVE_BTN -CBEnableReplacement padmin:CheckBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ENABLE_BTN - -*TabSPAOther padmin:TabPage:RID_RTS_OTHERPAGE -MFLeftMargin padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_LEFTMARGIN_BOX -MFTopMargin padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_TOPMARGIN_BOX -MFRightMargin padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_RIGHTMARGIN_BOX -MFBottomMargin padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_BOTTOMMARGIN_BOX -EFComment padmin:Edit:RID_RTS_OTHERPAGE:RID_RTS_OTHER_COMMENT_EDT -PBDefault padmin:PushButton:RID_RTS_OTHERPAGE:RID_RTS_OTHER_DEFAULT_BTN +*SPRenamePrinterDLG padmin.ModalDialog.1003 +EFPrinterName padmin.Edit.1003.2 +CBUnidentifiedObject padmin.ComboBox.1003.5 + +*SPFontNameDLG padmin.ModalDialog.1030 +PBRename padmin.PushButton.1030.6 +PBRemove padmin.PushButton.1030.3 +PBAdd padmin.PushButton.1030.5 +LBFontList padmin.ListBox.1030.4 + +*SPFontImportDLG padmin.ModalDialog.1065 +PBSelectAll padmin.PushButton.1065.6 +LBFontList padmin.ListBox.1065.7 +EFFontPath padmin.Edit.1065.3 +PBFontPath padmin.PushButton.1065.4 +CBCreateSoftlinks padmin.CheckBox.1065.18 + +*FilePicker SVT_HID_EXPLORERDLG_FILE +EFFileName SFX2_HID_FILEDLG_AUTOCOMPLETEBOX +LBFileList fpicker.ListBox.16374.35 +PBSelect fpicker.PushButton.16374.16 +PBUpOneLevel fpicker.MenuButton.16374.14 +PBNewDir fpicker.ImageButton.16374.11 +MBDefaultDir fpicker.MenuButton.16374.15 +TLBStandard SFX2_HID_FILEDLG_STANDARD + +*SPPrinterWizard padmin.ModalDialog.2000 +TabPWDeviceSelector padmin.TabPage.2001 +TabPWDriverSelector padmin.TabPage.2002 +TabPWQueueCommand padmin.TabPage.2004 +TabPWPrinterName padmin.TabPage.2003 +PBBack padmin.PushButton.2000.4 +PBNext padmin.PushButton.2000.3 + +*TabPWDeviceSelector padmin.TabPage.2001 +RBAdd padmin.RadioButton.2001.2 +RBFax padmin.RadioButton.2001.3 +RBPdf padmin.RadioButton.2001.4 +RBImport padmin.RadioButton.2001.5 + +*TabPWDriverSelector padmin.TabPage.2002 +LBChooseDriver padmin.ListBox.2002.2 +PBImport padmin.PushButton.2002.3 +PBDelete padmin.PushButton.2002.4 + +*TabPWFaxDriverSelector padmin.TabPage.2006 +RBDefault padmin.RadioButton.2006.2 +RBSelect padmin.RadioButton.2006.3 + +*TabPWQueueCommand padmin.TabPage.2004 +CBCommand padmin.ComboBox.2004.2 +PBHelp padmin.PushButton.2004.3 +EFPdfDir padmin.Edit.2004.7 +PBPdfDir padmin.PushButton.2004.8 + +*TabPWPrinterName padmin.TabPage.2003 +EFPrinterName padmin.Edit.2003.4 +EFFaxName padmin.Edit.2003.5 +CBUseAsDefault padmin.CheckBox.2003.7 +CBRemoveFaxNumber padmin.CheckBox.2003.8 + +*SPAdmin padmin.ModalDialog.1000 +LBPrinters padmin.ListBox.1000.4 +PBProperties padmin.PushButton.1000.6 +PBRename padmin.PushButton.1000.7 +PBDefault padmin.PushButton.1000.2 +PBRemove padmin.PushButton.1000.3 +PBTestpage padmin.PushButton.1000.8 +PBNewPrinter padmin.PushButton.1000.19 + +*TabSPACommand padmin.TabPage.4006 +EFlpr padmin.ComboBox.4006.5 +LBConfigureAs padmin.ListBox.4006.8 +PBPdfDir padmin.PushButton.4006.17 +EFPdfDir padmin.Edit.4006.16 +CBRemoveFaxNumber padmin.CheckBox.4006.19 +PBHelp padmin.PushButton.4006.4 +PBRemove padmin.PushButton.4006.15 + +*TabSPAPaper padmin.TabPage.4004 +LBPaperSize padmin.ListBox.4004.2 +LBOrientation padmin.ListBox.4004.4 +LBDuplex padmin.ListBox.4004.6 +LBPaperTray padmin.ListBox.4004.8 + +*TabSPADevice padmin.TabPage.4003 +LBOption padmin.ListBox.4003.4 +LBCurrentValue padmin.ListBox.4003.6 +LBColor padmin.ListBox.4003.10 + +*TabSPAFontReplacement padmin.TabPage.4005 +MLReplacedFonts padmin.MultiListBox.4005.2 +CBReplaceFont padmin.ComboBox.4005.4 +LBByPrinterFont padmin.ListBox.4005.6 +PBAdd padmin.PushButton.4005.7 +PBRemove padmin.PushButton.4005.8 +CBEnableReplacement padmin.CheckBox.4005.9 + +*TabSPAOther padmin.TabPage.4002 +MFLeftMargin padmin.MetricField.4002.2 +MFTopMargin padmin.MetricField.4002.4 +MFRightMargin padmin.MetricField.4002.6 +MFBottomMargin padmin.MetricField.4002.8 +EFComment padmin.Edit.4002.10 +PBDefault padmin.PushButton.4002.11 diff --git a/testautomation/global/win/sys_dial.win b/testautomation/global/win/sys_dial.win old mode 100755 new mode 100644 index 4cacc4dda5cc..f9086ea869b1 --- a/testautomation/global/win/sys_dial.win +++ b/testautomation/global/win/sys_dial.win @@ -1,115 +1,115 @@ ' **** general Printersettings-Dialog ( File/Printer settings ) ' **** -*DruckerEinrichten svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG -Drucker svtools:ListBox:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES -Eigenschaften svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES +*DruckerEinrichten svtools.ModalDialog.16511 +Drucker svtools.ListBox.16511.2 +Eigenschaften svtools.PushButton.16511.3 '************************************************************************ '************ all file-dialogs '************ -*GeneralFileDialog HID_EXPLORERDLG_FILE -UebergeordneterOrdner fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP -NeuerOrdner fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER -Standard fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD -DateiAuswahl HID_FILEDLG_STANDARD -Dateiname HID_FILEDLG_AUTOCOMPLETEBOX -Dateityp fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE -Oeffnen fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN -Auswaehlen fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN +*GeneralFileDialog SVT_HID_EXPLORERDLG_FILE +UebergeordneterOrdner fpicker.MenuButton.16374.14 +NeuerOrdner fpicker.ImageButton.16374.11 +Standard fpicker.MenuButton.16374.15 +DateiAuswahl SFX2_HID_FILEDLG_STANDARD +Dateiname SFX2_HID_FILEDLG_AUTOCOMPLETEBOX +Dateityp fpicker.ListBox.16374.35 +Oeffnen fpicker.PushButton.16374.16 +Auswaehlen fpicker.PushButton.16374.16 +GrafikEinfuegenDlg GeneralFileDialog -Pfad HID_FILEDLG_AUTOCOMPLETEBOX HID_FILEDLG_PATH_FILENAME -Stil HID_FILEOPEN_IMAGE_TEMPLATE -Verknuepfen HID_FILEDLG_LINK_CB HID_IMPGRF_CB_LINK -Vorschau HID_FILEDLG_PREVIEW_CB HID_IMPGRF_CB_PREVIEW -Link HID_FILEDLG_LINK_CB -Preview HID_FILEDLG_PREVIEW_CB +Pfad SFX2_HID_FILEDLG_AUTOCOMPLETEBOX SFX2_HID_FILEDLG_PATH_FILENAME +Stil SVT_HID_FILEOPEN_IMAGE_TEMPLATE +Verknuepfen SFX2_HID_FILEDLG_LINK_CB HID_IMPGRF_CB_LINK +Vorschau SFX2_HID_FILEDLG_PREVIEW_CB HID_IMPGRF_CB_PREVIEW +Link SFX2_HID_FILEDLG_LINK_CB +Preview SFX2_HID_FILEDLG_PREVIEW_CB +OeffnenDlg GeneralFileDialog -Pfad HID_FILEDLG_AUTOCOMPLETEBOX HID_FILEDLG_PATH_FILENAME -Version HID_FILEOPEN_VERSION -NurLesen HID_FILEOPEN_READONLY -Einfuegen HID_FILEDLG_INSERT_BTN -Play HID_FILESAVE_DOPLAY +Pfad SFX2_HID_FILEDLG_AUTOCOMPLETEBOX SFX2_HID_FILEDLG_PATH_FILENAME +Version SVT_HID_FILEOPEN_VERSION +NurLesen SVT_HID_FILEOPEN_READONLY +Einfuegen SFX2_HID_FILEDLG_INSERT_BTN +Play SVT_HID_FILESAVE_DOPLAY +KonkordanzdateiOeffnen GeneralFileDialog +VorlagenLaden GeneralFileDialog -Text HID_LTEMPL_TEXT -Rahmen HID_LTEMPL_FRAME -Seite HID_LTEMPL_PAGE -Numerierung HID_LTEMPL_NUMBERING -Ueberschreiben HID_LTEMPL_OVERRIDE +Text SW_HID_LTEMPL_TEXT +Rahmen SW_HID_LTEMPL_FRAME +Seite SW_HID_LTEMPL_PAGE +Numerierung SW_HID_LTEMPL_NUMBERING +Ueberschreiben SW_HID_LTEMPL_OVERRIDE ' Vorlagen HID_LTEMPL_TEMPLATES -*SpeichernDlg HID_FILESAVE_DIALOG -Dateiname HID_FILESAVE_FILEURL -Vorlage HID_FILESAVE_TEMPLATE -Dateityp HID_FILESAVE_FILETYPE -Speichern HID_FILESAVE_DOSAVE -NeuerOrdner HID_FILESAVE_CREATEDIRECTORY -Standard HID_FILESAVE_DEFAULTDIRECTORY -DateiAuswahl HID_FILESAVE_FILEVIEW -Passwort HID_FILESAVE_SAVEWITHPASSWORD -AutomatischeDateinamenserweiterung HID_FILESAVE_AUTOEXTENSION -UebergeordneterOrdner HID_FILESAVE_LEVELUP +*SpeichernDlg SVT_HID_FILESAVE_DIALOG +Dateiname SVT_HID_FILESAVE_FILEURL +Vorlage SVT_HID_FILESAVE_TEMPLATE +Dateityp SVT_HID_FILESAVE_FILETYPE +Speichern SVT_HID_FILESAVE_DOSAVE +NeuerOrdner SVT_HID_FILESAVE_CREATEDIRECTORY +Standard SVT_HID_FILESAVE_DEFAULTDIRECTORY +DateiAuswahl SVT_HID_FILESAVE_FILEVIEW +Passwort SVT_HID_FILESAVE_SAVEWITHPASSWORD +AutomatischeDateinamenserweiterung SVT_HID_FILESAVE_AUTOEXTENSION +UebergeordneterOrdner SVT_HID_FILESAVE_LEVELUP +ExportierenDlg SpeichernDlg -Selektion HID_FILESAVE_SELECTION +Selektion SVT_HID_FILESAVE_SELECTION ' **** Hyperlink-File-Dialog ' **** -*HyperlinkAuswahlDlg HID_FILEDLG_CHARDLG -UebergeordneterOrdner fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP -NeuerOrdner fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER -Standard fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD -DateiAuswahl HID_FILEDLG_STANDARD -Dateiname HID_FILEDLG_AUTOCOMPLETEBOX -Dateityp fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE -Oeffnen fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN -NurLesen fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_READONLY +*HyperlinkAuswahlDlg SW_HID_FILEDLG_CHARDLG +UebergeordneterOrdner fpicker.MenuButton.16374.14 +NeuerOrdner fpicker.ImageButton.16374.11 +Standard fpicker.MenuButton.16374.15 +DateiAuswahl SFX2_HID_FILEDLG_STANDARD +Dateiname SFX2_HID_FILEDLG_AUTOCOMPLETEBOX +Dateityp fpicker.ListBox.16374.35 +Oeffnen fpicker.PushButton.16374.16 +NurLesen fpicker.CheckBox.16374.40 ' **** general Color-Dialog ( under tools / options / staroffice / color / edit ) ' **** -*FarbeDlg svtools:ModalDialog:DLG_COLOR +*FarbeDlg svtools.ModalDialog.996 'Grundfarben 'BenutzerdefinierteFarben -Cyan svtools:MetricField:DLG_COLOR:NUM_CYAN -Magenta svtools:MetricField:DLG_COLOR:NUM_MAGENTA -Yellow svtools:MetricField:DLG_COLOR:NUM_YELLOW -Key svtools:MetricField:DLG_COLOR:NUM_KEY -Rot svtools:NumericField:DLG_COLOR:NUM_RED -Gruen svtools:NumericField:DLG_COLOR:NUM_GREEN -Blau svtools:NumericField:DLG_COLOR:NUM_BLUE -Farbton svtools:NumericField:DLG_COLOR:NUM_HUE -Saettigung svtools:NumericField:DLG_COLOR:NUM_SATURATION -Hell svtools:NumericField:DLG_COLOR:NUM_LUMINANCE -Links svtools:PushButton:DLG_COLOR:BTN_1 -Rechts svtools:PushButton:DLG_COLOR:BTN_2 - -*SendMasterDocument HID_FILESAVE_DIALOG -Dateiname HID_SEND_MASTER_CTRL_EDIT_FILEURL -Vorlage HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE -Filter HID_SEND_MASTER_CTRL_LISTBOX_FILTER -AutomatischeDateinamenserweiterung HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION -Speichern HID_SEND_MASTER_CTRL_PUSHBUTTON_OK -Cancel HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL -DateiAuswahl HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW -UebergeordneterOrdner HID_FILESAVE_LEVELUP -NeuerOrdner HID_FILESAVE_CREATEDIRECTORY -Standard HID_FILESAVE_DEFAULTDIRECTORY - -*SendHTMLDocument HID_FILESAVE_DIALOG -Dateiname HID_SEND_HTML_CTRL_EDIT_FILEURL -Vorlage HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE -Filter HID_SEND_HTML_CTRL_LISTBOX_FILTER -AutomatischeDateinamenserweiterung HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION -Speichern HID_SEND_HTML_CTRL_PUSHBUTTON_OK -Cancel HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL -DateiAuswahl HID_SEND_HTML_CTRL_CONTROL_FILEVIEW -UebergeordneterOrdner HID_FILESAVE_LEVELUP -NeuerOrdner HID_FILESAVE_CREATEDIRECTORY -Standard HID_FILESAVE_DEFAULTDIRECTORY +Cyan svtools.MetricField.996.7 +Magenta svtools.MetricField.996.8 +Yellow svtools.MetricField.996.9 +Key svtools.MetricField.996.10 +Rot svtools.NumericField.996.1 +Gruen svtools.NumericField.996.2 +Blau svtools.NumericField.996.3 +Farbton svtools.NumericField.996.4 +Saettigung svtools.NumericField.996.5 +Hell svtools.NumericField.996.6 +Links svtools.PushButton.996.1 +Rechts svtools.PushButton.996.2 + +*SendMasterDocument SVT_HID_FILESAVE_DIALOG +Dateiname SW_HID_SEND_MASTER_CTRL_EDIT_FILEURL +Vorlage SW_HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE +Filter SW_HID_SEND_MASTER_CTRL_LISTBOX_FILTER +AutomatischeDateinamenserweiterung SW_HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION +Speichern SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_OK +Cancel SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL +DateiAuswahl SW_HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW +UebergeordneterOrdner SVT_HID_FILESAVE_LEVELUP +NeuerOrdner SVT_HID_FILESAVE_CREATEDIRECTORY +Standard SVT_HID_FILESAVE_DEFAULTDIRECTORY + +*SendHTMLDocument SVT_HID_FILESAVE_DIALOG +Dateiname SW_HID_SEND_HTML_CTRL_EDIT_FILEURL +Vorlage SW_HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE +Filter SW_HID_SEND_HTML_CTRL_LISTBOX_FILTER +AutomatischeDateinamenserweiterung SW_HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION +Speichern SW_HID_SEND_HTML_CTRL_PUSHBUTTON_OK +Cancel SW_HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL +DateiAuswahl SW_HID_SEND_HTML_CTRL_CONTROL_FILEVIEW +UebergeordneterOrdner SVT_HID_FILESAVE_LEVELUP +NeuerOrdner SVT_HID_FILESAVE_CREATEDIRECTORY +Standard SVT_HID_FILESAVE_DEFAULTDIRECTORY ' **** Messageboxes amd Lastversion-message set to the active operator @@ -119,12 +119,12 @@ Standard HID_FILESAVE_DEFAULTDIRECTORY ' **** new folder-dialog ' **** -*NeuerOrdner fpicker:ModalDialog:DLG_SVT_QUERYFOLDERNAME -OrdnerName fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_NAME +*NeuerOrdner fpicker.ModalDialog.16375 +OrdnerName fpicker.Edit.16375.11 ' **** Translationwidow fuer das Ubersetzungstooling ' **** -*TranslationWindow svtools:WorkWindow:TT_INLINE_TRANSLATION svtools:FloatingWindow:TT_INLINE_TRANSLATION +*TranslationWindow svtools.WorkWindow.12348 svtools:FloatingWindow:TT_INLINE_TRANSLATION ' **** specal longnames for bas test ' **** author marc.schwanz@sun.com diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win old mode 100755 new mode 100644 index a3135d80e1dd..499ead027bf1 --- a/testautomation/global/win/tab_a_d.win +++ b/testautomation/global/win/tab_a_d.win @@ -1,6 +1,6 @@ *Active -*TabAenderungenWriter HID_REDLINE_OPT +*TabAenderungenWriter SW_HID_REDLINE_OPT EinfuegenAttribute SW:LISTBOX:TP_REDLINE_OPT:LB_INS_ATTR EinfuegenFarbe SW:LISTBOX:TP_REDLINE_OPT:LB_INS_COL LoeschenAttribute SW:LISTBOX:TP_REDLINE_OPT:LB_DEL_ATTR @@ -10,103 +10,103 @@ AendernFarbe SW:LISTBOX:TP_REDLINE_OPT:LB_CHG_COL ZeilenMarkierung SW:LISTBOX:TP_REDLINE_OPT:LB_MARKPOS ZeilenFarbe SW:LISTBOX:TP_REDLINE_OPT:LB_LC_COL -*TabAenderungenCalc HID_SCPAGE_OPREDLINE SC:TABPAGE:RID_SCPAGE_OPREDLINE +*TabAenderungenCalc SC_HID_SCPAGE_OPREDLINE SC:TABPAGE:RID_SCPAGE_OPREDLINE Aenderungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_CONTENT Loeschungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_REMOVE Einfuegungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_INSERT Verschiebungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_MOVE -*TabAllgemein HID_OPTIONS_GENERAL -Firma cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY -VorName cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME -ZuName cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME -NameDesVaters cui:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME -Strasse cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET -Apartmentnummer cui:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR -Land cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY -PLZ cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ -Ort cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY -Kuerzel cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME -TelPriv cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT -TelGe cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY -Fax cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX -EMail cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL -Titel cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE -Position cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION -City cui:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY -Zip cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE -Street cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET +*TabAllgemein CUI_HID_OPTIONS_GENERAL +Firma cui.Edit.12001.11 +VorName cui.Edit.12001.15 +ZuName cui.Edit.12001.16 +NameDesVaters cui.Edit.12001.14 +Strasse cui.Edit.12001.20 +Apartmentnummer cui.Edit.12001.21 +Land cui.Edit.12001.29 +PLZ cui.Edit.12001.23 +Ort cui.Edit.12001.24 +Kuerzel cui.Edit.12001.17 +TelPriv cui.Edit.12001.34 +TelGe cui.Edit.12001.35 +Fax cui.Edit.12001.37 +EMail cui.Edit.12001.38 +Titel cui.Edit.12001.31 +Position cui.Edit.12001.32 +City cui.Edit.12001.25 +Zip cui.Edit.12001.27 +Street cui.Edit.12001.20 State cui:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE -Zurueck HID_TABDLG_RESET_BTN +Zurueck SFX2_HID_TABDLG_RESET_BTN +TabAllgemeines TabAllgemein -*TabAllgemeinGallery HID_GALLERY_PROPERTIES_GENERAL -NeuesThema HID_GALLERY_EDIT_MSNAME - -*TabAnsichtAllgemein HID_OFA_TP_VIEW -FontScale cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE -IconStyle cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE -IconScale cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE -FontAntiAliasing cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING -AAPixel cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT -VorschauInSchriftlisten cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW -SchriftenHistorie cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY -UseHardwareAcceleration cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL -UseAntiAliasing cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE -IconsInMenueAnzeigen cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS -MausAktion cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE -MousePositioning cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS -UseSystemFont cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT -Transparency cui:CheckBox:OFA_TP_VIEW:CB_SELECTION -SelectionOpacity cui:MetricField:OFA_TP_VIEW:MF_SELECTION - -*TabAusnahmen HID_OFAPAGE_AUTOCORR_EXCEPT -Abkuerzungen cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV -AbkuerzungenListe cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV -AbkuerzungenNeu cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV -AbkuerzungenLoeschen cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV -AbkuerzungenAutomatisch cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV -Woerter cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS -WoerterListe cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS -WoerterNeu cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS -WoerterLoeschen cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS -WoerterAutomatisch cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS -Zurueck HID_TABDLG_RESET_BTN -WelcheSprache HID_AUTOCORR_LANGUAGE - -*TabAusrichtung HID_ALIGNMENT -ListeHAusrichtung cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN -ListeVAusrichtung cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN +*TabAllgemeinGallery CUI_HID_GALLERY_PROPERTIES_GENERAL +NeuesThema CUI_HID_GALLERY_EDIT_MSNAME + +*TabAnsichtAllgemein CUI_HID_OFA_TP_VIEW +FontScale cui.MetricField.17102.22 +IconStyle cui.ListBox.17102.56 +IconScale cui.ListBox.17102.54 +FontAntiAliasing cui.CheckBox.17102.63 +AAPixel cui.NumericField.17102.64 +VorschauInSchriftlisten cui.CheckBox.17102.60 +SchriftenHistorie cui.CheckBox.17102.62 +UseHardwareAcceleration cui.CheckBox.17102.68 +UseAntiAliasing cui.CheckBox.17102.69 +IconsInMenueAnzeigen cui.ListBox.17102.41 +MausAktion cui.ListBox.17102.34 +MousePositioning cui.ListBox.17102.31 +UseSystemFont cui.CheckBox.17102.57 +Transparency cui.CheckBox.17102.71 +SelectionOpacity cui.MetricField.17102.72 + +*TabAusnahmen CUI_HID_OFAPAGE_AUTOCORR_EXCEPT +Abkuerzungen cui.Edit.17004.17 +AbkuerzungenListe cui.ListBox.17004.18 +AbkuerzungenNeu cui.PushButton.17004.19 +AbkuerzungenLoeschen cui.PushButton.17004.20 +AbkuerzungenAutomatisch cui.CheckBox.17004.43 +Woerter cui.Edit.17004.22 +WoerterListe cui.ListBox.17004.23 +WoerterNeu cui.PushButton.17004.24 +WoerterLoeschen cui.PushButton.17004.25 +WoerterAutomatisch cui.CheckBox.17004.44 +Zurueck SFX2_HID_TABDLG_RESET_BTN +WelcheSprache CUI_HID_AUTOCORR_LANGUAGE + +*TabAusrichtung CUI_HID_ALIGNMENT +ListeHAusrichtung cui.ListBox.10090.12 +ListeVAusrichtung cui.ListBox.10090.16 Einzug cui:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT -Zeilenumbruch cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP -Silbentrennung cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH +Zeilenumbruch cui.TriStateBox.10090.41 +Silbentrennung cui.TriStateBox.10090.42 Grad cui:NUMERICFIELD:RID_SVXPAGE_ALIGNMENT:NF_DEGREES -Bezugskante HID_ALIGNMENT_CTR_BORDER_LOCK -VertikaleAusrichtung cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL -Gestapelt cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED -ShrinkToFit cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK -SetAlignmentOptions cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_FRAMEDIR -AlignmentDial HID_ALIGNMENT_CTR_DIAL - -*TabAusrichtungAbsatz HID_FORMAT_PARAGRAPH_ALIGN +Bezugskante CUI_HID_ALIGNMENT_CTR_BORDER_LOCK +VertikaleAusrichtung cui.TriStateBox.10090.27 +Gestapelt cui.TriStateBox.10090.21 +ShrinkToFit cui.TriStateBox.10090.45 +SetAlignmentOptions cui.ListBox.10090.44 +AlignmentDial CUI_HID_ALIGNMENT_CTR_DIAL + +*TabAusrichtungAbsatz CUI_HID_FORMAT_PARAGRAPH_ALIGN Links cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN Rechts cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN Zentriert cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN Blocksatz cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN LetzteZeile cui:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE EinzelnesWortAustreiben cui:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND -VertikaleTextausrichtung cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN -TextrasterFangen cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP -TextDirection cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION - -*TabBedingung HID_COND_COLL -AlsBedingteVorlage sw:CheckBox:TP_CONDCOLL:CB_CONDITION -Kontextliste HID_COND_COLL_TABLIST -Absatzvorlagen sw:ListBox:TP_CONDCOLL:LB_STYLE -Vorlagen sw:ListBox:TP_CONDCOLL:LB_FILTER -Entfernen sw:PushButton:TP_CONDCOLL:PB_REMOVE -Zuweisen sw:PushButton:TP_CONDCOLL:PB_ASSIGN +VertikaleTextausrichtung cui.ListBox.10187.36 +TextrasterFangen cui.CheckBox.10187.38 +TextDirection cui.ListBox.10187.92 + +*TabBedingung SW_HID_COND_COLL +AlsBedingteVorlage sw.CheckBox.20848.1 +Kontextliste SW_HID_COND_COLL_TABLIST +Absatzvorlagen sw.ListBox.20848.7 +Vorlagen sw.ListBox.20848.8 +Entfernen sw.PushButton.20848.9 +Zuweisen sw.PushButton.20848.10 '*TabBeleuchtung HID_PAGE_LIGHT3D svx:TabPage:RID_SVXPAGE_LIGHT3D 'QuellFarbfilter svx:ListBox:RID_SVXPAGE_LIGHT3D:LB_LIGHT_COLOR @@ -114,108 +114,108 @@ Zuweisen sw:PushButton:TP_CONDCOLL:PB_ASSIGN 'Richtung 'UmgebungsFarbfilter svx:ListBox:RID_SVXPAGE_LIGHT3D:LB_COLOR 'UmgebungsIntensitaet svx:MetricField:RID_SVXPAGE_LIGHT3D:MTR_FLD_INTENSITY -'Zurueck HID_TABDLG_RESET_BTN - -*TabBemassung HID_PAGE_MEASURE -Liniendistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST -HLUebergang cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG -HLDistanz cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST -LinkeHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN -RechteHL cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN -AnzeigeUnterhalb cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE -AnzeigeParallel cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL -MetrikAnzeigen cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT -Textposition HID_MEASURE_CTL_POSITION -AutomatischVertikal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV -AutomatischHorizontal cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH - -*TabBenutzer HID_DOCINFOUSER -Info0 sfx2:Edit:TP_DOCINFOUSER:ED_INFO1 -Info1 sfx2:Edit:TP_DOCINFOUSER:ED_INFO2 -Info2 sfx2:Edit:TP_DOCINFOUSER:ED_INFO3 -Info3 sfx2:Edit:TP_DOCINFOUSER:ED_INFO4 -Infofelder sfx2:PushButton:TP_DOCINFOUSER:BTN_EDITLABEL +'Zurueck SFX2_HID_TABDLG_RESET_BTN + +*TabBemassung CUI_HID_PAGE_MEASURE +Liniendistanz cui.MetricField.10161.1 +HLUebergang cui.MetricField.10161.2 +HLDistanz cui.MetricField.10161.3 +LinkeHL cui.MetricField.10161.4 +RechteHL cui.MetricField.10161.5 +AnzeigeUnterhalb cui.TriStateBox.10161.1 +AnzeigeParallel cui.TriStateBox.10161.5 +MetrikAnzeigen cui.TriStateBox.10161.2 +Textposition CUI_HID_MEASURE_CTL_POSITION +AutomatischVertikal cui.TriStateBox.10161.3 +AutomatischHorizontal cui.TriStateBox.10161.4 + +*TabBenutzer SFX2_HID_DOCINFOUSER +Info0 sfx2.Edit.265.16 +Info1 sfx2.Edit.265.18 +Info2 sfx2.Edit.265.20 +Info3 sfx2.Edit.265.22 +Infofelder sfx2.PushButton.265.34 +TabBenutzerdaten TabAllgemein -*TabBerechnen HID_SCPAGE_CALC -Iterationen sc:CheckBox:RID_SCPAGE_CALC:BTN_ITERATE -Schritte sc:NumericField:RID_SCPAGE_CALC:ED_STEPS -Nachkommastellen sc:NumericField:RID_SCPAGE_CALC:ED_PREC -MinimalerAenderungswert sc:Edit:RID_SCPAGE_CALC:ED_EPS -Standard sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESTD -StarCalc10 sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESC10 -Jahr1904 sc:RadioButton:RID_SCPAGE_CALC:BTN_DATE1904 -GrossKleinschreibung sc:CheckBox:RID_SCPAGE_CALC:BTN_CASE -GenauigkeitWieAngezeigt sc:CheckBox:RID_SCPAGE_CALC:BTN_CALC -Suchkriterien sc:CheckBox:RID_SCPAGE_CALC:BTN_MATCH -RegulaererAusdruck sc:CheckBox:RID_SCPAGE_CALC:BTN_REGEX -SpaltenZeilenbeschriftung sc:CheckBox:RID_SCPAGE_CALC:BTN_LOOKUP -LimitDecimals sc:CheckBox:RID_SCPAGE_CALC:BTN_GENERAL_PREC - -*TabBereiche HID_INSERT_SECTION_PAGE -Bereichsliste sw:ComboBox:TP_INSERT_SECTION:ED_RNAME -Geschuetzt sw:CheckBox:TP_INSERT_SECTION:CB_PROTECT -Ausblenden sw:CheckBox:TP_INSERT_SECTION:CB_HIDE -BedingungText sw:Edit:TP_INSERT_SECTION:ED_CONDITION -Verknuepfung sw:CheckBox:TP_INSERT_SECTION:CB_FILE -DDE sw:CheckBox:TP_INSERT_SECTION:CB_DDE -DateiVerknuepfung sw:Edit:TP_INSERT_SECTION:ED_FILE -Bereich sw:ComboBox:TP_INSERT_SECTION:LB_SUBREG -Auswaehlen sw:PushButton:TP_INSERT_SECTION:PB_FILE -Passwort sw:CheckBox:TP_INSERT_SECTION:CB_PASSWD -EnterPasswort sw:PushButton:TP_INSERT_SECTION:PB_PASSWD - -*TabBeschreibung HID_DOCINFODESC -Titel sfx2:Edit:TP_DOCINFODESC:ED_TITLE -Thema sfx2:Edit:TP_DOCINFODESC:ED_THEMA -Schluesselwoerter sfx2:Edit:TP_DOCINFODESC:ED_KEYWORDS -Beschreibung sfx2:MultiLineEdit:TP_DOCINFODESC:ED_COMMENT - -*TabBibliotheken basctl:TabPage:RID_TP_LIBS -Bibliothek basctl:ListBox:RID_TP_LIBS:RID_LB_BASICS -Bibliotheksliste HID_BASICIDE_LIBS_TREE -Bearbeiten basctl:PushButton:RID_TP_LIBS:RID_PB_EDIT -Passwort basctl:PushButton:RID_TP_LIBS:RID_PB_PASSWORD -Neu basctl:PushButton:RID_TP_LIBS:RID_PB_NEWLIB -Hinzufuegen basctl:PushButton:RID_TP_LIBS:RID_PB_APPEND -Export basctl:PushButton:RID_TP_LIBS:RID_PB_EXPORT -Loeschen basctl:PushButton:RID_TP_LIBS:RID_PB_DELETE - -*TabBitmap HID_AREA_BITMAP +*TabBerechnen SC_HID_SCPAGE_CALC +Iterationen sc.CheckBox.25660.1 +Schritte sc.NumericField.25660.4 +Nachkommastellen sc.NumericField.25660.7 +MinimalerAenderungswert sc.Edit.25660.5 +Standard sc.RadioButton.25660.9 +StarCalc10 sc.RadioButton.25660.10 +Jahr1904 sc.RadioButton.25660.11 +GrossKleinschreibung sc.CheckBox.25660.15 +GenauigkeitWieAngezeigt sc.CheckBox.25660.17 +Suchkriterien sc.CheckBox.25660.18 +RegulaererAusdruck sc.CheckBox.25660.20 +SpaltenZeilenbeschriftung sc.CheckBox.25660.19 +LimitDecimals sc.CheckBox.25660.21 + +*TabBereiche SW_HID_INSERT_SECTION_PAGE +Bereichsliste sw.ComboBox.20885.20 +Geschuetzt sw.CheckBox.20885.10 +Ausblenden sw.CheckBox.20885.8 +BedingungText sw.Edit.20885.13 +Verknuepfung sw.CheckBox.20885.5 +DDE sw.CheckBox.20885.1 +DateiVerknuepfung sw.Edit.20885.16 +Bereich sw.ComboBox.20885.38 +Auswaehlen sw.PushButton.20885.40 +Passwort sw.CheckBox.20885.9 +EnterPasswort sw.PushButton.20885.51 + +*TabBeschreibung SFX2_HID_DOCINFODESC +Titel sfx2.Edit.263.10 +Thema sfx2.Edit.263.12 +Schluesselwoerter sfx2.Edit.263.14 +Beschreibung sfx2.MultiLineEdit.263.24 + +*TabBibliotheken basctl.TabPage.14888 +Bibliothek basctl.ListBox.14888.12 +Bibliotheksliste BASCTL_HID_BASICIDE_LIBS_TREE +Bearbeiten basctl.PushButton.14888.4 +Passwort basctl.PushButton.14888.11 +Neu basctl.PushButton.14888.9 +Hinzufuegen basctl.PushButton.14888.10 +Export basctl.PushButton.14888.14 +Loeschen basctl.PushButton.14888.8 + +*TabBitmap CUI_HID_AREA_BITMAP 'PixelEditor -Vordergrund cui:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR -Hintergrund cui:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR -Tabelle cui:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS -Hinzufuegen cui:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD -Aendern cui:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY -Import cui:PushButton:RID_SVXPAGE_BITMAP:BTN_IMPORT -Loeschen cui:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE -Oeffnen cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD -Speichern cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE -Zurueck HID_TABDLG_RESET_BTN - -*TabDateien HID_GALLERY_BROWSER -Dateityp cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE -Suche cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH -Dateiliste cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND -Hinzufuegen cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE -HinzufuegenAlle cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL -Vorschau cui:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW - -*TabDatenbank HID_FLD_DB +Vordergrund cui.ListBox.10058.1 +Hintergrund cui.ListBox.10058.3 +Tabelle cui.ListBox.10058.4 +Hinzufuegen cui.PushButton.10058.1 +Aendern cui.PushButton.10058.3 +Import cui.PushButton.10058.2 +Loeschen cui.PushButton.10058.4 +Oeffnen cui.ImageButton.10058.5 +Speichern cui.ImageButton.10058.6 +Zurueck SFX2_HID_TABDLG_RESET_BTN + +*TabDateien CUI_HID_GALLERY_BROWSER +Dateityp cui.ComboBox.10364.1 +Suche cui.PushButton.10364.4 +Dateiliste cui.MultiListBox.10364.1 +Hinzufuegen cui.PushButton.10364.5 +HinzufuegenAlle cui.PushButton.10364.1 +Vorschau cui.CheckBox.10364.3 + +*TabDatenbank SW_HID_FLD_DB Feldtyp SW:LISTBOX:TP_FLD_DB:LB_DBTYPE -Datenbankauswahl HID_DB_SELECTION_TLB +Datenbankauswahl SW_HID_DB_SELECTION_TLB Bedingung SW:EDIT:TP_FLD_DB:ED_DBCONDITION Satznummer SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER AusDatenbank SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT Selbstdefiniert SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT Formatliste SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT Zahlenformat SW:LISTBOX:TP_FLD_DB:LB_DBNUMFORMAT -Einfuegen HID_FIELD_INSERT -Schliessen HID_FIELD_CLOSE +Einfuegen SW_HID_FIELD_INSERT +Schliessen SW_HID_FIELD_CLOSE -*TabDirektCursor HID_OPTSHDWCRSR +*TabDirektCursor SW_HID_OPTSHDWCRSR DirektCursor SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF Absatzausrichtung SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN LinkerAbsatzrand SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT @@ -229,80 +229,80 @@ Leerzeichen SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SPACE GeschLeerzeichen SW:CHECKBOX:TP_OPTSHDWCRSR:CB_HSPACE WeicheTrenner SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SHYPH Umbrueche SW:CHECKBOX:TP_OPTSHDWCRSR:CB_BREAK -VersteckteAbsatze sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN_PARA -FeldVersteckterText sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN -VersteckterText sw:CheckBox:TP_OPTSHDWCRSR:CB_CHAR_HIDDEN - -*TabDokument HID_DOCINFODOC -Dokumentname sfx2:Edit:TP_DOCINFODOC:ED_FILE_NAME -Schreibgeschuetzt sfx2:CheckBox:TP_DOCINFODOC:CB_FILE_READONLY -DigitalSignature sfx2:PushButton:TP_DOCINFODOC:BTN_SIGNATURE -Loeschen sfx2:PushButton:TP_DOCINFODOC:BTN_DELETE -BenutzerdatenVerwenden sfx2:CheckBox:TP_DOCINFODOC:CB_USE_USERDATA - -FileTypeInfo sfx2:Edit:TP_DOCINFODOC:FT_FILE_SHOW_TYP -FileLocationInfo sfx2:Edit:TP_DOCINFODOC:FT_FILE_VAL -FileSizeInfo sfx2:Edit:TP_DOCINFODOC:FT_FILE_SHOW_SIZE -FileCreatedInfo sfx2:Edit:TP_DOCINFODOC:FT_CREATE_VAL -FileChangedInfo sfx2:Edit:TP_DOCINFODOC:FT_CHANGE_VAL -FileSignedInfo sfx2:Edit:TP_DOCINFODOC:FT_SIGNED_VAL -FileLastPrintedInfo sfx2:Edit:TP_DOCINFODOC:FT_PRINT_VAL -FileEditTimeInfo sfx2:Edit:TP_DOCINFODOC:FT_TIMELOG_VAL -FileRevisionInfo sfx2:Edit:TP_DOCINFODOC:FT_DOCNO_VAL -FileTemplateinfo sfx2:Edit:TP_DOCINFODOC:FT_TEMPL_VAL - -*TabDokumentFeldbefehle HID_FLD_DOK +VersteckteAbsatze sw.CheckBox.20870.36 +FeldVersteckterText sw.CheckBox.20870.10 +VersteckterText sw.CheckBox.20870.61 + +*TabDokument SFX2_HID_DOCINFODOC +Dokumentname sfx2.Edit.264.51 +Schreibgeschuetzt sfx2.CheckBox.264.48 +DigitalSignature sfx2.PushButton.264.79 +Loeschen sfx2.PushButton.264.62 +BenutzerdatenVerwenden sfx2.CheckBox.264.49 + +FileTypeInfo sfx2.Edit.264.54 +FileLocationInfo sfx2.Edit.264.2 +FileSizeInfo sfx2.Edit.264.56 +FileCreatedInfo sfx2.Edit.264.8 +FileChangedInfo sfx2.Edit.264.4 +FileSignedInfo sfx2.Edit.264.77 +FileLastPrintedInfo sfx2.Edit.264.59 +FileEditTimeInfo sfx2.Edit.264.36 +FileRevisionInfo sfx2.Edit.264.38 +FileTemplateinfo sfx2.Edit.264.33 + +*TabDokumentFeldbefehle SW_HID_FLD_DOK Feldtyp SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE Auswahl SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION Formatliste SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT Zahlenformat SW:LISTBOX:TP_FLD_DOK:LB_DOKNUMFORMAT Editfeld SW:EDIT:TP_FLD_DOK:ED_DOKVALUE InhaltFix SW:CHECKBOX:TP_FLD_DOK:CB_DOKFIXEDCONTENT -Einfuegen HID_FIELD_INSERT -Schliessen HID_FIELD_CLOSE +Einfuegen SW_HID_FIELD_INSERT +Schliessen SW_HID_FIELD_CLOSE -*TabDokumentinfo HID_DOCINFODESC -Beschreibung sfx2:MultiLineEdit:TP_DOCINFODESC:ED_COMMENT -Schluesselworte sfx2:Edit:TP_DOCINFODESC:ED_KEYWORDS -Thema sfx2:Edit:TP_DOCINFODESC:ED_THEMA -Titel sfx2:Edit:TP_DOCINFODESC:ED_TITLE +*TabDokumentinfo SFX2_HID_DOCINFODESC +Beschreibung sfx2.MultiLineEdit.263.24 +Schluesselworte sfx2.Edit.263.14 +Thema sfx2.Edit.263.12 +Titel sfx2.Edit.263.10 -*TabDokumentInfoFeldbefehle HID_FLD_DOKINF -Feldtyp HID_FIELD_DINF_TYPE +*TabDokumentInfoFeldbefehle SW_HID_FLD_DOKINF +Feldtyp SW_HID_FIELD_DINF_TYPE Auswahl SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFSELECTION Zahlenformat SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFFORMAT InhaltFix SW:CHECKBOX:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT -Einfuegen HID_FIELD_INSERT -Schliessen HID_FIELD_CLOSE - -*TabDrehung HID_TRANS_ANGLE -PositionX cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X -PositionY cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y -Winkel cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE -Drehpunkt HID_TPROTATION_CTRL1 -Drehwinkel HID_TPROTATION_CTRL2 - -*TabDruckenDraw HID_SD_PRINT_OPTIONS sc:hidspecial:HID_SC_WIN_PREVIEW -Zeichnung sd:CheckBox:TP_PRINT_OPTIONS:CBX_DRAW -Notizen sd:CheckBox:TP_PRINT_OPTIONS:CBX_NOTES -Handzettel sd:CheckBox:TP_PRINT_OPTIONS:CBX_HANDOUTS -Gliederung sd:CheckBox:TP_PRINT_OPTIONS:CBX_OUTLINE -Seitenname sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAGENAME -Datum sd:CheckBox:TP_PRINT_OPTIONS:CBX_DATE -Zeit sd:CheckBox:TP_PRINT_OPTIONS:CBX_TIME -AusgeblendeteSeitenDrucken sd:CheckBox:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES -Standard sd:RadioButton:TP_PRINT_OPTIONS:RBT_DEFAULT -AnSeitengroesseAnpassen sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGESIZE -SeitenKacheln sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGETILE -Prospekt sd:RadioButton:TP_PRINT_OPTIONS:RBT_BOOKLET -Vorderseite sd:CheckBox:TP_PRINT_OPTIONS:CBX_FRONT -Rueckseite sd:CheckBox:TP_PRINT_OPTIONS:CBX_BACK -AusDruckereinstellung sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN +Einfuegen SW_HID_FIELD_INSERT +Schliessen SW_HID_FIELD_CLOSE + +*TabDrehung CUI_HID_TRANS_ANGLE +PositionX cui.MetricField.10048.7 +PositionY cui.MetricField.10048.8 +Winkel cui.MetricField.10048.19 +Drehpunkt CUI_HID_TPROTATION_CTRL1 +Drehwinkel CUI_HID_TPROTATION_CTRL2 + +*TabDruckenDraw SD_HID_SD_PRINT_OPTIONS sc:hidspecial:HID_SC_WIN_PREVIEW +Zeichnung sd.CheckBox.549.6 +Notizen sd.CheckBox.549.7 +Handzettel sd.CheckBox.549.8 +Gliederung sd.CheckBox.549.9 +Seitenname sd.CheckBox.549.2 +Datum sd.CheckBox.549.3 +Zeit sd.CheckBox.549.4 +AusgeblendeteSeitenDrucken sd.CheckBox.549.1 +Standard sd.RadioButton.549.1 +AnSeitengroesseAnpassen sd.RadioButton.549.2 +SeitenKacheln sd.RadioButton.549.3 +Prospekt sd.RadioButton.549.4 +Vorderseite sd.CheckBox.549.12 +Rueckseite sd.CheckBox.549.13 +AusDruckereinstellung sd.CheckBox.549.10 StandardAusgabe SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_COLOR Graustufen SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_GRAYSCALE SchwarzWeiss SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_BLACKWHITE -*TabDruckenHTML HID_OPTPRINT_PAGE +*TabDruckenHTML SW_HID_OPTPRINT_PAGE Grafiken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF Kontrollfelder SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD Hintergrund SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND @@ -313,62 +313,62 @@ NurNotizen SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY Dokumentende SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END Seitenende SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND AusDruckereinstellung SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP -LeereSeitenDrucken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES +LeereSeitenDrucken sw.CheckBox.20826.92 Fax SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX -*TabDruckenWriter HID_OPTPRINT_PAGE -Grafiken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF -Kontrollfelder sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD -Hintergrund sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND -HiddenText sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT -TextPlaceholder sw:CheckBox:TP_OPTPRINT_PAGE:CB_TEXT_PLACEHOLDER -RightToLeft sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL +*TabDruckenWriter SW_HID_OPTPRINT_PAGE +Grafiken sw.CheckBox.20826.61 +Kontrollfelder sw.CheckBox.20826.69 +Hintergrund sw.CheckBox.20826.79 +HiddenText sw.CheckBox.20826.93 +TextPlaceholder sw.CheckBox.20826.94 +RightToLeft sw.CheckBox.20826.140 SchwarzDrucken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT -LinkeSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP -RechteSeiten sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP -Prospekt sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT -Keine sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO -NurNotizen sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY -Dokumentende sw:RadioButton:TP_OPTPRINT_PAGE:RB_END -Seitenende sw:RadioButton:TP_OPTPRINT_PAGE:RB_PAGEEND -AusDruckereinstellung sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP -LeereSeitenDrucken sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES -Fax sw:ListBox:TP_OPTPRINT_PAGE:LB_FAX -Zurueck HID_TABDLG_RESET_BTN - -*TabDruckenMath starmath:TabPage:RID_PRINTOPTIONPAGE -DruckeTitelzeile starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_TITLEROW -DruckeFormeltext starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_EQUATION_TEXT -DruckeRahmen starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_FRAME -Originalgroesse starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_ORIGINAL_SIZE -DerSeiteAnpassen starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_FIT_TO_PAGE -Skalierung starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_ZOOM -Prozent starmath:MetricField:RID_PRINTOPTIONPAGE:MF_ZOOM -Ignorieren starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_IGNORE_SPACING - -*TabDruckerEtiketten HID_LAB_PRT -GanzeSeite sw:RadioButton:TP_LAB_PRT:BTN_PAGE -EinzelnesEtikett sw:RadioButton:TP_LAB_PRT:BTN_SINGLE -Spalte sw:NumericField:TP_LAB_PRT:FLD_COL -Zeile sw:NumericField:TP_LAB_PRT:FLD_ROW -Einrichten sw:PushButton:TP_LAB_PRT:BTN_PRTSETUP +LinkeSeiten sw.CheckBox.20826.64 +RechteSeiten sw.CheckBox.20826.65 +Prospekt sw.CheckBox.20826.67 +Keine sw.RadioButton.20826.80 +NurNotizen sw.RadioButton.20826.81 +Dokumentende sw.RadioButton.20826.82 +Seitenende sw.RadioButton.20826.83 +AusDruckereinstellung sw.CheckBox.20826.70 +LeereSeitenDrucken sw.CheckBox.20826.92 +Fax sw.ListBox.20826.86 +Zurueck SFX2_HID_TABDLG_RESET_BTN + +*TabDruckenMath starmath.TabPage.20007 +DruckeTitelzeile starmath.CheckBox.20007.11 +DruckeFormeltext starmath.CheckBox.20007.12 +DruckeRahmen starmath.CheckBox.20007.13 +Originalgroesse starmath.RadioButton.20007.21 +DerSeiteAnpassen starmath.RadioButton.20007.22 +Skalierung starmath.RadioButton.20007.23 +Prozent starmath.MetricField.20007.24 +Ignorieren starmath.CheckBox.20007.31 + +*TabDruckerEtiketten SW_HID_LAB_PRT +GanzeSeite sw.RadioButton.22757.1 +EinzelnesEtikett sw.RadioButton.22757.2 +Spalte sw.NumericField.22757.5 +Zeile sw.NumericField.22757.7 +Einrichten sw.PushButton.22757.8 InhaltSynchronisieren SW:CHECKBOX:TP_LAB_PRT:CB_SYNCHRON -NeuesDok HID_LABEL_INSERT -Zurueck HID_TABDLG_RESET_BTN - -*TabDruckerBriefumschlag HID_ENV_PRT -Art1 ITM_HOR_LEFT -Art2 ITM_HOR_CNTR -Art3 ITM_HOR_RGHT -Art4 ITM_VER_LEFT -Art5 ITM_VER_CNTR -Art6 ITM_VER_RGHT -VonObenBedrucken sw:RadioButton:TP_ENV_PRT:BTN_TOP -VonUntenBedrucken sw:RadioButton:TP_ENV_PRT:BTN_BOTTOM -NachRechts sw:MetricField:TP_ENV_PRT:FLD_RIGHT -NachUnten sw:MetricField:TP_ENV_PRT:FLD_DOWN -Einrichten sw:PushButton:TP_ENV_PRT:BTN_PRTSETUP -Drucken HID_ENVELOP_PRINT -Zurueck HID_TABDLG_RESET_BTN +NeuesDok SW_HID_LABEL_INSERT +Zurueck SFX2_HID_TABDLG_RESET_BTN + +*TabDruckerBriefumschlag SW_HID_ENV_PRT +Art1 SW_HID_ITM_HOR_LEFT +Art2 SW_HID_ITM_HOR_CNTR +Art3 SW_HID_ITM_HOR_RGHT +Art4 SW_HID_ITM_VER_LEFT +Art5 SW_HID_ITM_VER_CNTR +Art6 SW_HID_ITM_VER_RGHT +VonObenBedrucken sw.RadioButton.22754.7 +VonUntenBedrucken sw.RadioButton.22754.8 +NachRechts sw.MetricField.22754.10 +NachUnten sw.MetricField.22754.12 +Einrichten sw.PushButton.22754.15 +Drucken SW_HID_ENVELOP_PRINT +Zurueck SFX2_HID_TABDLG_RESET_BTN diff --git a/testautomation/global/win/tab_e_g.win b/testautomation/global/win/tab_e_g.win old mode 100755 new mode 100644 index d34d387acffc..e588dff1e415 --- a/testautomation/global/win/tab_e_g.win +++ b/testautomation/global/win/tab_e_g.win @@ -1,112 +1,112 @@ -*TabEigenschaften SID_INSERT_FLOATINGFRAME -FrameName cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME -Inhalt cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL -Oeffnen cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN -An cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON -Aus cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF -Automatisch cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO -UmrandungAn cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON -UmrandungAus cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF -Breite cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH -Hoehe cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT -BreiteStandard cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT -HoeheStandard cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT +*TabEigenschaften .uno:InsertObjectFloatingFrame +FrameName cui.Edit.32011.4 +Inhalt cui.Edit.32011.6 +Oeffnen cui.PushButton.32011.7 +An cui.RadioButton.32011.13 +Aus cui.RadioButton.32011.14 +Automatisch cui.RadioButton.32011.15 +UmrandungAn cui.RadioButton.32011.18 +UmrandungAus cui.RadioButton.32011.20 +Breite cui.NumericField.32011.10 +Hoehe cui.NumericField.32011.8 +BreiteStandard cui.CheckBox.32011.22 +HoeheStandard cui.CheckBox.32011.22 *TabEingabehilfe SC:TABPAGE:TP_VALIDATION_INPUTHELP EingabehilfenbeiSelektion SC:TRISTATEBOX:TP_VALIDATION_INPUTHELP:TSB_HELP Titel SC:EDIT:TP_VALIDATION_INPUTHELP:EDT_TITLE EingabeHilfe SC:MULTILINEEDIT:TP_VALIDATION_INPUTHELP:EDT_INPUTHELP -*TabEinzuegeUndAbstaende HID_FORMAT_PARAGRAPH_STD -Automatisch cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO -Vonlinks cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT -ErsteZeile cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT -VonRechts cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT -Oben cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST -Unten cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST -Zeilenabstand cui:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST -Um cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT +*TabEinzuegeUndAbstaende CUI_HID_FORMAT_PARAGRAPH_STD +Automatisch cui.CheckBox.10006.48 +Vonlinks cui.MetricField.10006.11 +ErsteZeile cui.MetricField.10006.13 +VonRechts cui.MetricField.10006.15 +Oben cui.MetricField.10006.21 +Unten cui.MetricField.10006.23 +Zeilenabstand cui.ListBox.10006.40 +Um cui.MetricField.10006.42 Von cui:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC -Registerhaltigkeit cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER +Registerhaltigkeit cui.CheckBox.10006.84 -*TabEndnoten HID_ENDNOTE_OPTIONS -Numerierung sw:ListBox:TP_ENDNOTEOPTION:LB_NUMVIEW -BeginnBei sw:NumericField:TP_ENDNOTEOPTION:FLD_OFFSET -Davor sw:Edit:TP_ENDNOTEOPTION:ED_PREFIX -Dahinter sw:Edit:TP_ENDNOTEOPTION:ED_SUFFIX -Absatz sw:ListBox:TP_ENDNOTEOPTION:LB_PARA_TEMPL -Seite sw:ListBox:TP_ENDNOTEOPTION:LB_PAGE_TEMPL -ZeichenvorlageEndnotenbereich sw:ListBox:TP_ENDNOTEOPTION:LB_TEXT_CHARFMT -ZeichenvorlageTextbereich sw:ListBox:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT +*TabEndnoten SW_HID_ENDNOTE_OPTIONS +Numerierung sw.ListBox.21013.10 +BeginnBei sw.NumericField.21013.12 +Davor sw.Edit.21013.46 +Dahinter sw.Edit.21013.48 +Absatz sw.ListBox.21013.30 +Seite sw.ListBox.21013.31 +ZeichenvorlageEndnotenbereich sw.ListBox.21013.50 +ZeichenvorlageTextbereich sw.ListBox.21013.53 -*TabErsetzung HID_OFAPAGE_AUTOCORR_REPLACE -NurText cui:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY -Kuerzel cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT -ErsetzenDurch cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE -Liste HID_OFACTL_AUTOCORR_REPLACE -Neu cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE -Loeschen cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE -Zurueck HID_TABDLG_RESET_BTN -WelcheSprache HID_AUTOCORR_LANGUAGE +*TabErsetzung CUI_HID_OFAPAGE_AUTOCORR_REPLACE +NurText cui.CheckBox.17003.34 +Kuerzel cui.Edit.17003.31 +ErsetzenDurch cui.Edit.17003.32 +Liste CUI_HID_OFACTL_AUTOCORR_REPLACE +Neu cui.PushButton.17003.35 +Loeschen cui.PushButton.17003.36 +Zurueck SFX2_HID_TABDLG_RESET_BTN +WelcheSprache CUI_HID_AUTOCORR_LANGUAGE -*TabEtiketten HID_LAB_LAB -Adresse sw:CheckBox:TP_LAB_LAB:BOX_ADDR -Aufschrift sw:MultiLineEdit:TP_LAB_LAB:EDT_WRITING -Anschrift sw:ListBox:TP_LAB_LAB:LB_DATABASE -Tabelle sw:ListBox:TP_LAB_LAB:LB_TABLE -Datenbankfeld sw:ListBox:TP_LAB_LAB:LB_DBFIELD -Uebernehmen sw:ImageButton:TP_LAB_LAB:BTN_INSERT -Endlos sw:RadioButton:TP_LAB_LAB:BTN_CONT -Bogen sw:RadioButton:TP_LAB_LAB:BTN_SHEET -Marke sw:ListBox:TP_LAB_LAB:BOX_MAKE -Typ sw:ListBox:TP_LAB_LAB:BOX_TYPE -NeuesDok HID_LABEL_INSERT -Zurueck HID_TABDLG_RESET_BTN +*TabEtiketten SW_HID_LAB_LAB +Adresse sw.CheckBox.22755.2 +Aufschrift sw.MultiLineEdit.22755.3 +Anschrift sw.ListBox.22755.5 +Tabelle sw.ListBox.22755.7 +Datenbankfeld sw.ListBox.22755.18 +Uebernehmen sw.ImageButton.22755.19 +Endlos sw.RadioButton.22755.9 +Bogen sw.RadioButton.22755.10 +Marke sw.ListBox.22755.12 +Typ sw.ListBox.22755.14 +NeuesDok SW_HID_LABEL_INSERT +Zurueck SFX2_HID_TABDLG_RESET_BTN -*TabEtikettenMedium HID_BUSINESS_FMT_PAGE -Endlos HID_BUSINESS_FMT_PAGE_CONT -Bogen HID_BUSINESS_FMT_PAGE_SHEET -Marke HID_BUSINESS_FMT_PAGE_BRAND -Typ HID_BUSINESS_FMT_PAGE_TYPE -NeuesDok HID_LABEL_INSERT -Zurueck HID_TABDLG_RESET_BTN +*TabEtikettenMedium SW_HID_BUSINESS_FMT_PAGE +Endlos SW_HID_BUSINESS_FMT_PAGE_CONT +Bogen SW_HID_BUSINESS_FMT_PAGE_SHEET +Marke SW_HID_BUSINESS_FMT_PAGE_BRAND +Typ SW_HID_BUSINESS_FMT_PAGE_TYPE +NeuesDok SW_HID_LABEL_INSERT +Zurueck SFX2_HID_TABDLG_RESET_BTN -*TabFangenEinrasten HID_SD_OPTIONS_SNAP sc:hidspecial:HID_SC_WIN_PREVIEW +*TabFangenEinrasten SD_HID_SD_OPTIONS_SNAP sc:hidspecial:HID_SC_WIN_PREVIEW -*TabFarben HID_OPTIONS_COLOR -FarbName cui:Edit:RID_SVXPAGE_COLOR:EDT_NAME -Farbe cui:ListBox:RID_SVXPAGE_COLOR:LB_COLOR -Farbmodell cui:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL -R HID_TPCOLOR_RGB_1 -G HID_TPCOLOR_RGB_2 -B HID_TPCOLOR_RGB_3 -C HID_TPCOLOR_CMYK_1 -M HID_TPCOLOR_CMYK_2 -Y HID_TPCOLOR_CMYK_3 -K cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4 -Aendern cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY -Hinzufuegen cui:PushButton:RID_SVXPAGE_COLOR:BTN_ADD -Loeschen cui:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE -Oeffnen cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD -Speichern cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE -Bearbeiten cui:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON +*TabFarben CUI_HID_OPTIONS_COLOR +FarbName cui.Edit.10060.1 +Farbe cui.ListBox.10060.1 +Farbmodell cui.ListBox.10060.2 +R CUI_HID_TPCOLOR_RGB_1 +G CUI_HID_TPCOLOR_RGB_2 +B CUI_HID_TPCOLOR_RGB_3 +C CUI_HID_TPCOLOR_CMYK_1 +M CUI_HID_TPCOLOR_CMYK_2 +Y CUI_HID_TPCOLOR_CMYK_3 +K cui.MetricField.10060.4 +Aendern cui.PushButton.10060.3 +Hinzufuegen cui.PushButton.10060.1 +Loeschen cui.PushButton.10060.4 +Oeffnen cui.ImageButton.10060.5 +Speichern cui.ImageButton.10060.6 +Bearbeiten cui.PushButton.10060.2 -*TabFarbverlaeufe HID_AREA_GRADIENT -Typ cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES -ZentrumX cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X -ZentrumY cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y -Winkel cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE -Rand cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER -Von cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM -Bis cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO -VonWert cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM -BisWert cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO -Tabelle cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS -Hinzufuegen cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD -Aendern cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY -Loeschen cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE -Oeffnen cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD -Speichern cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE +*TabFarbverlaeufe CUI_HID_AREA_GRADIENT +Typ cui.ListBox.10059.4 +ZentrumX cui.MetricField.10059.2 +ZentrumY cui.MetricField.10059.3 +Winkel cui.MetricField.10059.1 +Rand cui.MetricField.10059.6 +Von cui.ListBox.10059.1 +Bis cui.ListBox.10059.2 +VonWert cui.MetricField.10059.4 +BisWert cui.MetricField.10059.5 +Tabelle cui.ListBox.10059.3 +Hinzufuegen cui.PushButton.10059.1 +Aendern cui.PushButton.10059.3 +Loeschen cui.PushButton.10059.4 +Oeffnen cui.ImageButton.10059.5 +Speichern cui.ImageButton.10059.6 *TabFehlermeldung SC:TABPAGE:TP_VALIDATION_ERROR FehlermeldungbeiEingabe SC:TRISTATEBOX:TP_VALIDATION_ERROR:TSB_SHOW @@ -115,36 +115,36 @@ Titel SC:EDIT:TP_VALIDATION_ERROR:EDT_TITLE Fehlermeldung SC:MULTILINEEDIT:TP_VALIDATION_ERROR:EDT_ERROR Durchsuchen SC:PUSHBUTTON:TP_VALIDATION_ERROR:BTN_SEARCH -*TabFussEndnoten HID_SECTION_FTNENDNOTES_PAGE -FussnotenAmTextendeSammeln sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND -FussnotenNummerNeuStarten sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM -FussnotenEigenesFormat sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT -FussnotenNummerierung sw:ListBox:TP_SECTION_FTNENDNOTES:LB_FTN_NUMVIEW -FussnotenBeginn sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET -FussnotenDavor sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_PREFIX -FussnotenDahinter sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_SUFFIX -EndnotenAmBereichsendeSammeln sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_AT_TXTEND -EndnotenNummerNeuStarten sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM -EndnotenEigenesFormat sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM_FMT -EndnotenNumerierung sw:ListBox:TP_SECTION_FTNENDNOTES:LB_END_NUMVIEW -EndnotenBeginn sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_END_OFFSET -EndnotenDavor sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_PREFIX -EndnotenDahinter sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_SUFFIX +*TabFussEndnoten SW_HID_SECTION_FTNENDNOTES_PAGE +FussnotenAmTextendeSammeln sw.CheckBox.20897.6 +FussnotenNummerNeuStarten sw.CheckBox.20897.7 +FussnotenEigenesFormat sw.CheckBox.20897.11 +FussnotenNummerierung sw.ListBox.20897.37 +FussnotenBeginn sw.NumericField.20897.24 +FussnotenDavor sw.Edit.20897.17 +FussnotenDahinter sw.Edit.20897.18 +EndnotenAmBereichsendeSammeln sw.CheckBox.20897.3 +EndnotenNummerNeuStarten sw.CheckBox.20897.4 +EndnotenEigenesFormat sw.CheckBox.20897.12 +EndnotenNumerierung sw.ListBox.20897.36 +EndnotenBeginn sw.NumericField.20897.23 +EndnotenDavor sw.Edit.20897.14 +EndnotenDahinter sw.Edit.20897.15 -*TabFormatEtiketten HID_LAB_FMT -HAbstand sw:MetricField:TP_LAB_FMT:FLD_HDIST -VAbstand sw:MetricField:TP_LAB_FMT:FLD_VDIST -Breite sw:MetricField:TP_LAB_FMT:FLD_WIDTH -Hoehe sw:MetricField:TP_LAB_FMT:FLD_HEIGHT -RandLinks sw:MetricField:TP_LAB_FMT:FLD_LEFT -RandRechts sw:MetricField:TP_LAB_FMT:FLD_UPPER -Spalten sw:NumericField:TP_LAB_FMT:FLD_COLUMNS -Zeilen sw:NumericField:TP_LAB_FMT:FLD_ROWS -NeuesDok HID_LABEL_INSERT -Zurueck HID_TABDLG_RESET_BTN -FormatSpeichern sw:PushButton:TP_LAB_FMT:PB_SAVE +*TabFormatEtiketten SW_HID_LAB_FMT +HAbstand sw.MetricField.22756.3 +VAbstand sw.MetricField.22756.5 +Breite sw.MetricField.22756.7 +Hoehe sw.MetricField.22756.9 +RandLinks sw.MetricField.22756.11 +RandRechts sw.MetricField.22756.13 +Spalten sw.NumericField.22756.15 +Zeilen sw.NumericField.22756.17 +NeuesDok SW_HID_LABEL_INSERT +Zurueck SFX2_HID_TABDLG_RESET_BTN +FormatSpeichern sw.PushButton.22756.19 -*TabFunktionen HID_FLD_FUNC +*TabFunktionen SW_HID_FLD_FUNC Feldtyp SW:LISTBOX:TP_FLD_FUNC:LB_FUNCTYPE Formatliste SW:LISTBOX:TP_FLD_FUNC:LB_FUNCFORMAT Auswahl SW:LISTBOX:TP_FLD_FUNC:LB_FUNCSELECTION @@ -158,29 +158,29 @@ Makroname SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME Platzhalter SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME Texteinfuegen SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE Wert SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE -Einfuegen HID_FIELD_INSERT -Schliessen HID_FIELD_CLOSE -AddListEntry sw:PushButton:TP_FLD_FUNC:PB_LISTADD -NewListEntry sw:Edit:TP_FLD_FUNC:ED_LISTITEM -EntrysList sw:ListBox:TP_FLD_FUNC:LB_LISTITEMS -RemoveEntry sw:PushButton:TP_FLD_FUNC:PB_LISTREMOVE -MoveUpEntry sw:PushButton:TP_FLD_FUNC:PB_LISTUP -MoveDownEntry sw:PushButton:TP_FLD_FUNC:PB_LISTDOWN -EntryName sw:Edit:TP_FLD_FUNC:ED_LISTNAME +Einfuegen SW_HID_FIELD_INSERT +Schliessen SW_HID_FIELD_CLOSE +AddListEntry sw.PushButton.20868.82 +NewListEntry sw.Edit.20868.81 +EntrysList sw.ListBox.20868.84 +RemoveEntry sw.PushButton.20868.85 +MoveUpEntry sw.PushButton.20868.86 +MoveDownEntry sw.PushButton.20868.87 +EntryName sw.Edit.20868.89 -*TabFussnote HID_FOOTNOTE_PAGE -HoeheWieSeite sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE -HoeheFussnoteOption sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT -HoeheFussnote sw:MetricField:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT -AbstandTextkoerper sw:MetricField:TP_FOOTNOTE_PAGE:ED_DIST -Position sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINEPOS -Art sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINETYPE -Breite sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEWIDTH -Abstand sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEDIST +*TabFussnote SW_HID_FOOTNOTE_PAGE +HoeheWieSeite sw.RadioButton.20818.1 +HoeheFussnoteOption sw.RadioButton.20818.2 +HoeheFussnote sw.MetricField.20818.3 +AbstandTextkoerper sw.MetricField.20818.5 +Position sw.ListBox.20818.23 +Art sw.ListBox.20818.21 +Breite sw.MetricField.20818.25 +Abstand sw.MetricField.20818.27 -*TabFussnoten HID_FOOTNOTE_OPTIONS +*TabFussnoten SW_HID_FOOTNOTE_OPTIONS Numerierung SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMVIEW Pro SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMCOUNT BeginnBei SW:NUMERICFIELD:TP_FOOTNOTEOPTION:FLD_OFFSET @@ -192,111 +192,111 @@ Seitenende SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_PAGE Dokumentende SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_CHAPTER Davor SW:EDIT:TP_FOOTNOTEOPTION:ED_PREFIX Dahinter SW:EDIT:TP_FOOTNOTEOPTION:ED_SUFFIX -ZeichenvorlageTextbereich sw:ListBox:TP_FOOTNOTEOPTION:LB_ANCHR_CHARFMT -ZeichenvorlageFussnotenbereich sw:ListBox:TP_FOOTNOTEOPTION:LB_TEXT_CHARFMT +ZeichenvorlageTextbereich sw.ListBox.21012.53 +ZeichenvorlageFussnotenbereich sw.ListBox.21012.50 -*TabFusszeile HID_FORMAT_FOOTER -FusszeileMitAbstand svx:CheckBox:RID_SVXPAGE_FOOTER:CB_TURNON svx:CheckBox:RID_SVXPAGE_FOOTER:CB_FOOTER -Abstand svx:MetricField:RID_SVXPAGE_FOOTER:ED_DIST -Hoehe svx:MetricField:RID_SVXPAGE_FOOTER:ED_HEIGHT +*TabFusszeile SVX_HID_FORMAT_FOOTER +FusszeileMitAbstand svx.CheckBox.10026.10 svx:CheckBox:RID_SVXPAGE_FOOTER:CB_FOOTER +Abstand svx.MetricField.10026.12 +Hoehe svx.MetricField.10026.14 Hoehedynamisch SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN -RechterRandFusszeile svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN -LinkerRandFusszeile svx:MetricField:RID_SVXPAGE_FOOTER:ED_LMARGIN -InhaltLinksRechtsGleich svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED -Zusaetze svx:PushButton:RID_SVXPAGE_FOOTER:BTN_EXTRAS svx:PushButton:RID_SVXPAGE_FOOTER:PB_BACKGROUND -Bearbeiten HID_SC_FOOTER_EDIT +RechterRandFusszeile svx.MetricField.10026.19 +LinkerRandFusszeile svx.MetricField.10026.17 +InhaltLinksRechtsGleich svx.CheckBox.10026.20 +Zusaetze svx.PushButton.10026.40 svx:PushButton:RID_SVXPAGE_FOOTER:PB_BACKGROUND +Bearbeiten SC_HID_SC_FOOTER_EDIT -*TabFusszeileCalc HID_SCPAGE_HFED_FR -LinkerBereich HID_SC_HF_FRL -MittlererBereich HID_SC_HF_FRC -RechterBereich HID_SC_HF_FRR -PredefinedFooter HID_SC_HF_FR_DEFINED -TextAttribute HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT -Datei HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE -Tabelle HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE -Seitennummer HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE -Seitenanzahl HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES -Datum HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE -Zeit HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME -Hoehedynamisch svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN +*TabFusszeileCalc SC_HID_SCPAGE_HFED_FR +LinkerBereich SC_HID_SC_HF_FRL +MittlererBereich SC_HID_SC_HF_FRC +RechterBereich SC_HID_SC_HF_FRR +PredefinedFooter SC_HID_SC_HF_FR_DEFINED +TextAttribute SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT +Datei SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE +Tabelle SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE +Seitennummer SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE +Seitenanzahl SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES +Datum SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE +Zeit SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME +Hoehedynamisch svx.CheckBox.10026.15 -*TabFusszeileCalcLinks HID_SCPAGE_HFED_FL -LinkerBereich HID_SC_HF_FLL -MittlererBereich HID_SC_HF_FLC -RechterBereich HID_SC_HF_FLR -PredefinedFooterLeft HID_SC_HF_FL_DEFINED -TextAttribute HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT -Datei HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE -Tabelle HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE -Seitennummer HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE -Seitenanzahl HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES -Datum HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE -Zeit HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME +*TabFusszeileCalcLinks SC_HID_SCPAGE_HFED_FL +LinkerBereich SC_HID_SC_HF_FLL +MittlererBereich SC_HID_SC_HF_FLC +RechterBereich SC_HID_SC_HF_FLR +PredefinedFooterLeft SC_HID_SC_HF_FL_DEFINED +TextAttribute SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT +Datei SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE +Tabelle SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE +Seitennummer SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE +Seitenanzahl SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES +Datum SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE +Zeit SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME -*TabGeschaeft HID_TP_BUSINESS_DATA -Firma sw:Edit:TP_BUSINESS_DATA:ED_COMP -Firma2 sw:Edit:TP_BUSINESS_DATA:ED_COMP_EXT -Slogan sw:Edit:TP_BUSINESS_DATA:ED_SLOGAN -Strasse sw:Edit:TP_BUSINESS_DATA:ED_STREET -PLZ sw:Edit:TP_BUSINESS_DATA:ED_ZIP -Ort sw:Edit:TP_BUSINESS_DATA:ED_CITY -Land sw:Edit:TP_BUSINESS_DATA:ED_COUNTRY -Bundesland sw:Edit:TP_BUSINESS_DATA:ED_STATE -Position sw:Edit:TP_BUSINESS_DATA:ED_POSITION -Telefon sw:Edit:TP_BUSINESS_DATA:ED_PHONE -Handy sw:Edit:TP_BUSINESS_DATA:ED_MOBILE -Fax sw:Edit:TP_BUSINESS_DATA:ED_FAX -Homepage sw:Edit:TP_BUSINESS_DATA:ED_WWW -Email sw:Edit:TP_BUSINESS_DATA:ED_MAIL +*TabGeschaeft SW_HID_TP_BUSINESS_DATA +Firma sw.Edit.20896.55 +Firma2 sw.Edit.20896.57 +Slogan sw.Edit.20896.59 +Strasse sw.Edit.20896.36 +PLZ sw.Edit.20896.38 +Ort sw.Edit.20896.39 +Land sw.Edit.20896.41 +Bundesland sw.Edit.20896.53 +Position sw.Edit.20896.61 +Telefon sw.Edit.20896.46 +Handy sw.Edit.20896.47 +Fax sw.Edit.20896.49 +Homepage sw.Edit.20896.51 +Email sw.Edit.20896.52 -*TabGrafik HID_GRF_EXT -Vertikal sw:CheckBox:TP_GRF_EXT:CB_VERT -Horizontal sw:CheckBox:TP_GRF_EXT:CB_HOR -AufAllenSeiten sw:RadioButton:TP_GRF_EXT:RB_MIRROR_ALL_PAGES -JedeLinkeSeite sw:RadioButton:TP_GRF_EXT:RB_MIRROR_LEFT_PAGES -JedeRechteSeite sw:RadioButton:TP_GRF_EXT:RB_MIRROR_RIGHT_PAGES -Dateiname sw:Edit:TP_GRF_EXT:ED_CONNECT -Durchsuchen sw:PushButton:TP_GRF_EXT:PB_BROWSE +*TabGrafik SW_HID_GRF_EXT +Vertikal sw.CheckBox.20835.47 +Horizontal sw.CheckBox.20835.46 +AufAllenSeiten sw.RadioButton.20835.64 +JedeLinkeSeite sw.RadioButton.20835.65 +JedeRechteSeite sw.RadioButton.20835.66 +Dateiname sw.Edit.20835.54 +Durchsuchen sw.PushButton.20835.53 -*TabGrafiken HID_SVXPAGE_PICK_BMP -Auswahl HID_VALUESET_NUMBMP -Optionen HID_NUM_FORMAT_BTN -Zurueck HID_TABDLG_RESET_BTN -LinkGraphics cui:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED +*TabGrafiken CUI_HID_SVXPAGE_PICK_BMP +Auswahl CUI_HID_VALUESET_NUMBMP +Optionen SW_HID_NUM_FORMAT_BTN +Zurueck SFX2_HID_TABDLG_RESET_BTN +LinkGraphics cui.CheckBox.10218.224 -*TabGrundfarben HID_OPTIONS_CHART_DEFCOLORS -Farbliste cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST -Standard cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT +*TabGrundfarben CUI_HID_OPTIONS_CHART_DEFCOLORS +Farbliste cui.ListBox.10299.2 +Standard cui.PushButton.10299.5 -*TabGrundschriften HID_STD_FONT -StandardSchrift sw:ComboBox:TP_STD_FONT:LB_STANDARD -Ueberschrift sw:ComboBox:TP_STD_FONT:LB_TITLE -Liste sw:ComboBox:TP_STD_FONT:LB_LIST -Beschriftung sw:ComboBox:TP_STD_FONT:LB_LABEL -Verzeichnis sw:ComboBox:TP_STD_FONT:LB_IDX -AktuellesDokument sw:CheckBox:TP_STD_FONT:CB_DOCONLY -Standard sw:PushButton:TP_STD_FONT:PB_STANDARD -StandardSchriftGroesse sw:MetricBox:TP_STD_FONT:LB_STANDARD_SIZE -UeberschriftGroesse sw:MetricBox:TP_STD_FONT:LB_TITLE_SIZE -ListeGroesse sw:MetricBox:TP_STD_FONT:LB_LIST_SIZE -BeschriftungGroesse sw:MetricBox:TP_STD_FONT:LB_LABEL_SIZE -VerzeichnisGroesse sw:MetricBox:TP_STD_FONT:LB_INDEX_SIZE +*TabGrundschriften SW_HID_STD_FONT +StandardSchrift sw.ComboBox.20847.91 +Ueberschrift sw.ComboBox.20847.93 +Liste sw.ComboBox.20847.95 +Beschriftung sw.ComboBox.20847.97 +Verzeichnis sw.ComboBox.20847.99 +AktuellesDokument sw.CheckBox.20847.102 +Standard sw.PushButton.20847.101 +StandardSchriftGroesse sw.MetricBox.20847.108 +UeberschriftGroesse sw.MetricBox.20847.109 +ListeGroesse sw.MetricBox.20847.110 +BeschriftungGroesse sw.MetricBox.20847.111 +VerzeichnisGroesse sw.MetricBox.20847.112 +TabGrundschriftenAsian TabGrundschriften +TabGrundschriftenCTL TabGrundschriften -*TabGruppe1 HID_SCPAGE_SUBT_GROUP1 -GruppierenNach HID_SC_SUBT_GROUP -Teilergebnisse HID_SC_SUBT_COLS -Berechnungsvorschrift HID_SC_SUBT_FUNC +*TabGruppe1 SC_HID_SCPAGE_SUBT_GROUP1 +GruppierenNach SC_HID_SC_SUBT_GROUP +Teilergebnisse SC_HID_SC_SUBT_COLS +Berechnungsvorschrift SC_HID_SC_SUBT_FUNC -*TabGruppe2 HID_SCPAGE_SUBT_GROUP2 -GruppierenNach HID_SC_SUBT_GROUP -Teilergebnisse HID_SC_SUBT_COLS -Berechnungsvorschrift HID_SC_SUBT_FUNC +*TabGruppe2 SC_HID_SCPAGE_SUBT_GROUP2 +GruppierenNach SC_HID_SC_SUBT_GROUP +Teilergebnisse SC_HID_SC_SUBT_COLS +Berechnungsvorschrift SC_HID_SC_SUBT_FUNC -*TabGruppe3 HID_SCPAGE_SUBT_GROUP3 -GruppierenNach HID_SC_SUBT_GROUP -Teilergebnisse HID_SC_SUBT_COLS -Berechnungsvorschrift HID_SC_SUBT_FUNC +*TabGruppe3 SC_HID_SCPAGE_SUBT_GROUP3 +GruppierenNach SC_HID_SC_SUBT_GROUP +Teilergebnisse SC_HID_SC_SUBT_COLS +Berechnungsvorschrift SC_HID_SC_SUBT_FUNC diff --git a/testautomation/global/win/tab_h_o.win b/testautomation/global/win/tab_h_o.win old mode 100755 new mode 100644 index c31ece1bffe2..561e6f2f53c3 --- a/testautomation/global/win/tab_h_o.win +++ b/testautomation/global/win/tab_h_o.win @@ -1,122 +1,122 @@ -*TabHintergrund HID_BACKGROUND -Als cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR -Fuer cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX +*TabHintergrund CUI_HID_BACKGROUND +Als cui.ListBox.10001.1 +Fuer cui.ListBox.10001.32 FuerAbsatz cui:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX -Hintergrundfarbe HID_BACKGROUND_CTL_BGDCOLORSET -Verknuepfen cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK -Vorschau cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW -Durchsuchen cui:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE -Position cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION -Flaeche cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA -Kachel cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE -ArtPosition HID_BACKGROUND_CTL_POSITION -'ArtPosition cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION +Hintergrundfarbe CUI_HID_BACKGROUND_CTL_BGDCOLORSET +Verknuepfen cui.CheckBox.10001.22 +Vorschau cui.CheckBox.10001.23 +Durchsuchen cui.PushButton.10001.20 +Position cui.RadioButton.10001.27 +Flaeche cui.RadioButton.10001.25 +Kachel cui.RadioButton.10001.26 +ArtPosition CUI_HID_BACKGROUND_CTL_POSITION +'ArtPosition cui.RadioButton.10001.27 'Muster HID_BACKGROUND_CTL_PATTERNSET 'Musterfarbe HID_BACKGROUND_CTL_PATCOLORSET -*TabHTML cui:TabPage:RID_OFAPAGE_HTMLOPT -Groesse1 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1 -Groesse2 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2 -Groesse3 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3 -Groesse4 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4 -Groesse5 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5 -Groesse6 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6 -Groesse7 cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7 -UnbekannteHTML cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS -FontEinstellungen cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES +*TabHTML cui.TabPage.17000 +Groesse1 cui.NumericField.17000.3 +Groesse2 cui.NumericField.17000.5 +Groesse3 cui.NumericField.17000.7 +Groesse4 cui.NumericField.17000.9 +Groesse5 cui.NumericField.17000.11 +Groesse6 cui.NumericField.17000.13 +Groesse7 cui.NumericField.17000.15 +UnbekannteHTML cui.CheckBox.17000.21 +FontEinstellungen cui.CheckBox.17000.22 Export cui:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT -StarBasic cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC -Grafikenkopieren cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF +StarBasic cui.CheckBox.17000.31 +Grafikenkopieren cui.CheckBox.17000.37 Drucklayout cui:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION -WarnungAnzeigen cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING -Zeichensatz cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET -UseEnglishLocaleForNumbers cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US - -*TabHyperlinkRahmen HID_FRM_URL -URL sw:Edit:TP_FRM_URL:ED_URL -Durchsuchen sw:PushButton:TP_FRM_URL:PB_SEARCH -NameText sw:Edit:TP_FRM_URL:ED_NAME -Frame sw:ComboBox:TP_FRM_URL:CB_FRAME -Server sw:CheckBox:TP_FRM_URL:CB_SERVER -Client sw:CheckBox:TP_FRM_URL:CB_CLIENT - -*TabHyperlinkZeichen HID_CHAR_URL -URLName sw:Edit:TP_CHAR_URL:ED_URL -Durchsuchen sw:PushButton:TP_CHAR_URL:PB_URL -Ereignisse sw:PushButton:TP_CHAR_URL:PB_EVENT -Hinweis sw:Edit:TP_CHAR_URL:ED_TEXT -Targetframe sw:ComboBox:TP_CHAR_URL:LB_TARGET -BesuchterLink sw:ListBox:TP_CHAR_URL:LB_VISITED -UnbesuchterLink sw:ListBox:TP_CHAR_URL:LB_NOT_VISITED -NameText sw:Edit:TP_CHAR_URL:ED_NAME -Zurueck HID_TABDLG_RESET_BTN - -*Hyperlink HID_HYPERLINK_INTERNET -Auswahl HID_ICCDIALOG_CHOICECTRL -Zurueck HID_ICCDIALOG_RESET_BTN -Uebernehmen HID_ICCDIALOG_OK_BTN +WarnungAnzeigen cui.CheckBox.17000.32 +Zeichensatz cui.ListBox.17000.41 +UseEnglishLocaleForNumbers cui.CheckBox.17000.23 + +*TabHyperlinkRahmen SW_HID_FRM_URL +URL sw.Edit.20842.59 +Durchsuchen sw.PushButton.20842.103 +NameText sw.Edit.20842.111 +Frame sw.ComboBox.20842.96 +Server sw.CheckBox.20842.98 +Client sw.CheckBox.20842.99 + +*TabHyperlinkZeichen SW_HID_CHAR_URL +URLName sw.Edit.20843.52 +Durchsuchen sw.PushButton.20843.60 +Ereignisse sw.PushButton.20843.59 +Hinweis sw.Edit.20843.64 +Targetframe sw.ComboBox.20843.61 +BesuchterLink sw.ListBox.20843.56 +UnbesuchterLink sw.ListBox.20843.58 +NameText sw.Edit.20843.66 +Zurueck SFX2_HID_TABDLG_RESET_BTN + +*Hyperlink CUI_HID_HYPERLINK_INTERNET +Auswahl CUI_HID_ICCDIALOG_CHOICECTRL +Zurueck CUI_HID_ICCDIALOG_RESET_BTN +Uebernehmen CUI_HID_ICCDIALOG_OK_BTN +TabHyperlinkInternet Hyperlink -Internet cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET -FTP cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP -Telnet cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET -ZielUrl HID_HYPERDLG_INET_PATH -Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME -Form cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM -Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION -NameText cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT -Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT -Loginname cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN -Passwort cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD -AnonymerBenutzer cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS -WWWBrowser cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE -Target cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET - -*TabHyperlinkMailUndNews HID_HYPERLINK_MAIL -EMail cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL -News cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS -Receiver HID_HYPERDLG_MAIL_PATH -Betreff cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT -Adressbuch cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK -Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME -Form cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM -Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION -NameText cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT -Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT -Auswahl HID_ICCDIALOG_CHOICECTRL -Zurueck HID_ICCDIALOG_RESET_BTN -Uebernehmen HID_ICCDIALOG_OK_BTN - -*TabHyperlinkDokument HID_HYPERLINK_DOCUMENT -Path HID_HYPERDLG_DOC_PATH -DateiOeffnen cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN -Ziel cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC -Target cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE -Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME -Form cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM -Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION -NameText cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT -Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT -Auswahl HID_ICCDIALOG_CHOICECTRL -Zurueck HID_ICCDIALOG_RESET_BTN -Uebernehmen HID_ICCDIALOG_OK_BTN - -*TabHyperlinkNeuesDokument HID_HYPERLINK_NEWDOCUMENT -SofortBearbeiten cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW -SpaeterBearbeiten cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER -Datei cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC -Dateityp cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES -Pfad cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE -Frame cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME -Form cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM -Hinweis cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION -NameText cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT -Ereignisse cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT -Auswahl HID_ICCDIALOG_CHOICECTRL -Zurueck HID_ICCDIALOG_RESET_BTN -Uebernehmen HID_ICCDIALOG_OK_BTN - -*TabInhaltCalc HID_SCPAGE_CONTENT +Internet cui.RadioButton.10228.2 +FTP cui.RadioButton.10228.3 +Telnet cui.RadioButton.10228.4 +ZielUrl CUI_HID_HYPERDLG_INET_PATH +Frame cui.ComboBox.10228.32 +Form cui.ListBox.10228.34 +Hinweis cui.Edit.10228.36 +NameText cui.Edit.10228.38 +Ereignisse cui.ImageButton.10228.39 +Loginname cui.Edit.10228.8 +Passwort cui.Edit.10228.10 +AnonymerBenutzer cui.CheckBox.10228.11 +WWWBrowser cui.ImageButton.10228.12 +Target cui.ImageButton.10228.13 + +*TabHyperlinkMailUndNews CUI_HID_HYPERLINK_MAIL +EMail cui.RadioButton.10229.2 +News cui.RadioButton.10229.3 +Receiver CUI_HID_HYPERDLG_MAIL_PATH +Betreff cui.Edit.10229.7 +Adressbuch cui.ImageButton.10229.8 +Frame cui.ComboBox.10229.32 +Form cui.ListBox.10229.34 +Hinweis cui.Edit.10229.36 +NameText cui.Edit.10229.38 +Ereignisse cui.ImageButton.10229.39 +Auswahl CUI_HID_ICCDIALOG_CHOICECTRL +Zurueck CUI_HID_ICCDIALOG_RESET_BTN +Uebernehmen CUI_HID_ICCDIALOG_OK_BTN + +*TabHyperlinkDokument CUI_HID_HYPERLINK_DOCUMENT +Path CUI_HID_HYPERDLG_DOC_PATH +DateiOeffnen cui.ImageButton.10230.4 +Ziel cui.Edit.10230.7 +Target cui.ImageButton.10230.12 +Frame cui.ComboBox.10230.32 +Form cui.ListBox.10230.34 +Hinweis cui.Edit.10230.36 +NameText cui.Edit.10230.38 +Ereignisse cui.ImageButton.10230.39 +Auswahl CUI_HID_ICCDIALOG_CHOICECTRL +Zurueck CUI_HID_ICCDIALOG_RESET_BTN +Uebernehmen CUI_HID_ICCDIALOG_OK_BTN + +*TabHyperlinkNeuesDokument CUI_HID_HYPERLINK_NEWDOCUMENT +SofortBearbeiten cui.RadioButton.10231.2 +SpaeterBearbeiten cui.RadioButton.10231.3 +Datei cui.Edit.10231.5 +Dateityp cui.ListBox.10231.7 +Pfad cui.ImageButton.10231.8 +Frame cui.ComboBox.10231.32 +Form cui.ListBox.10231.34 +Hinweis cui.Edit.10231.36 +NameText cui.Edit.10231.38 +Ereignisse cui.ImageButton.10231.39 +Auswahl CUI_HID_ICCDIALOG_CHOICECTRL +Zurueck CUI_HID_ICCDIALOG_RESET_BTN +Uebernehmen CUI_HID_ICCDIALOG_OK_BTN + +*TabInhaltCalc SC_HID_SCPAGE_CONTENT Formeln SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_FORMULA Nullwerte SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_NIL Notizanzeiger SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_ANNOT @@ -139,81 +139,81 @@ Tabellenregister SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_TBLREG Gliederungssymbole SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_OUTLINE Referenzenfarbig SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_RFIND -*TabInhalteDraw HID_SD_OPTIONS_CONTENTS HID_SD_OPTIONS_SNAP -LinealeSichtbar sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_RULER -HilfslinienBeimBewegen sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES -KontrolpunkteImBezierEditor sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HANDLES_BEZIER -KonturFuerIndividuelleObjekte sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_MOVE_OUTLINE +*TabInhalteDraw SD_HID_SD_OPTIONS_CONTENTS SD_HID_SD_OPTIONS_SNAP +LinealeSichtbar sd.CheckBox.597.14 +HilfslinienBeimBewegen sd.CheckBox.597.1 +KontrolpunkteImBezierEditor sd.CheckBox.597.2 +KonturFuerIndividuelleObjekte sd.CheckBox.597.15 -*TabInhalteHTML HID_CONTENT_OPT +*TabInhalteHTML SW_HID_CONTENT_OPT GrafikenUndObjekte SW:CHECKBOX:TP_CONTENT_OPT:CB_GRF Tabellen SW:CHECKBOX:TP_CONTENT_OPT:CB_TBL Zeichnungen SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST Feldnamen SW:CHECKBOX:TP_CONTENT_OPT:CB_FIELD Notizen SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT -Hilfslinien sw:CheckBox:TP_CONTENT_OPT:CB_CROSS +Hilfslinien sw.CheckBox.20845.14 FarbigeHandles SW:CHECKBOX:TP_CONTENT_OPT:CB_HANDLE GrosseHandles SW:CHECKBOX:TP_CONTENT_OPT:CB_BIGHANDLE -HorizontaleBildlaufleiste sw:CheckBox:TP_CONTENT_OPT:CB_HSCROLL +HorizontaleBildlaufleiste sw.CheckBox.20845.15 VertikaleBildlaufleiste SW:CHECKBOX:TP_CONTENT_OPT:CB_VSCROLL -HorizontalesLineal sw:CheckBox:TP_CONTENT_OPT:CB_HRULER -VertikalesLineal sw:CheckBox:TP_CONTENT_OPT:CB_VRULER -RechtsAusgerichtet sw:CheckBox:TP_CONTENT_OPT:CB_VRULER_RIGHT +HorizontalesLineal sw.CheckBox.20845.17 +VertikalesLineal sw.CheckBox.20845.18 +RechtsAusgerichtet sw.CheckBox.20845.24 WeichesScrollen SW:CHECKBOX:TP_CONTENT_OPT:CB_SMOOTH_SCROLL -Lineal sw:CheckBox:TP_CONTENT_OPT:CB_ANY_RULER -HorizontalesLinealMasseinheit sw:ListBox:TP_CONTENT_OPT:LB_HMETRIC -VertikalesLinealMasseinheit sw:ListBox:TP_CONTENT_OPT:LB_VMETRIC -Masseinheit sw:ListBox:TP_CONTENT_OPT:LB_METRIC +Lineal sw.CheckBox.20845.12 +HorizontalesLinealMasseinheit sw.ListBox.20845.88 +VertikalesLinealMasseinheit sw.ListBox.20845.89 +Masseinheit sw.ListBox.20845.27 -*TabInhalteWriter HID_CONTENT_OPT +*TabInhalteWriter SW_HID_CONTENT_OPT GrafikenUndObjekte SW:CHECKBOX:TP_CONTENT_OPT:CB_GRF Tabellen SW:CHECKBOX:TP_CONTENT_OPT:CB_TBL Zeichnungen SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST Feldname SW:CHECKBOX:TP_CONTENT_OPT:CB_FIELD Notizen SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT -Hilfslinien sw:CheckBox:TP_CONTENT_OPT:CB_CROSS +Hilfslinien sw.CheckBox.20845.14 FarbigeHandles SW:CHECKBOX:TP_CONTENT_OPT:CB_HANDLE GrosseHandles SW:CHECKBOX:TP_CONTENT_OPT:CB_BIGHANDLE -HorizontaleBildlaufleiste sw:CheckBox:TP_CONTENT_OPT:CB_HSCROLL +HorizontaleBildlaufleiste sw.CheckBox.20845.15 VertikaleBildlaufleiste SW:CHECKBOX:TP_CONTENT_OPT:CB_VSCROLL -HorizontalesLineal sw:CheckBox:TP_CONTENT_OPT:CB_HRULER -VertikalesLineal sw:CheckBox:TP_CONTENT_OPT:CB_VRULER -RechtsAusgerichtet sw:CheckBox:TP_CONTENT_OPT:CB_VRULER_RIGHT +HorizontalesLineal sw.CheckBox.20845.17 +VertikalesLineal sw.CheckBox.20845.18 +RechtsAusgerichtet sw.CheckBox.20845.24 WeichesScrollen SW:CHECKBOX:TP_CONTENT_OPT:CB_SMOOTH_SCROLL -Lineal sw:CheckBox:TP_CONTENT_OPT:CB_ANY_RULER -HorizontalesLinealMasseinheit sw:ListBox:TP_CONTENT_OPT:LB_HMETRIC -VertikalesLinealMasseinheit sw:ListBox:TP_CONTENT_OPT:LB_VMETRIC - -*TabInitialen HID_DROPCAPS -Anzeigen sw:CheckBox:TP_DROPCAPS:CB_SWITCH -Anzahl sw:NumericField:TP_DROPCAPS:FLD_DROPCAPS -AbstandZumText sw:MetricField:TP_DROPCAPS:FLD_DISTANCE -Zeilen sw:NumericField:TP_DROPCAPS:FLD_LINES -Initialentext sw:Edit:TP_DROPCAPS:EDT_TEXT -Zeichenvorlage sw:ListBox:TP_DROPCAPS:BOX_TEMPLATE -GanzesWort sw:CheckBox:TP_DROPCAPS:CB_WORD - -*TabInteraktion SID_ANIMATION_EFFECTS -AktionBeiMausklick sd:ListBox:TP_ANIMATION:LB_ACTION -ListeSprungZuDokument HID_CTL_ACTION_DLG_2 -ListeSprungZuSeiteObjekt HID_CTL_ACTION_DLG_1 -ListeObjektAktion sd:ListBox:TP_ANIMATION:LB_OLE_ACTION -Durchsuchen sd:PushButton:TP_ANIMATION:BTN_SEARCH -Suchen sd:PushButton:TP_ANIMATION:BTN_SEEK -Effekt sd:ListBox:TP_ANIMATION:LB_OLE_ACTION +Lineal sw.CheckBox.20845.12 +HorizontalesLinealMasseinheit sw.ListBox.20845.88 +VertikalesLinealMasseinheit sw.ListBox.20845.89 + +*TabInitialen SW_HID_DROPCAPS +Anzeigen sw.CheckBox.20810.13 +Anzahl sw.NumericField.20810.2 +AbstandZumText sw.MetricField.20810.6 +Zeilen sw.NumericField.20810.4 +Initialentext sw.Edit.20810.9 +Zeichenvorlage sw.ListBox.20810.11 +GanzesWort sw.CheckBox.20810.16 + +*TabInteraktion .uno:AnimationEffects +AktionBeiMausklick sd.ListBox.787.3 +ListeSprungZuDokument SD_HID_CTL_ACTION_DLG_2 +ListeSprungZuSeiteObjekt SD_HID_CTL_ACTION_DLG_1 +ListeObjektAktion sd.ListBox.787.4 +Durchsuchen sd.PushButton.787.1 +Suchen sd.PushButton.787.2 +Effekt sd.ListBox.787.4 'Effekt sd:ListBox:TP_ANIMATION:LB_EFFECT 'Langsam sd:RadioButton:TP_ANIMATION:RBT_SLOW 'Schnell sd:RadioButton:TP_ANIMATION:RBT_MEDIUM 'Mittel sd:RadioButton:TP_ANIMATION:RBT_FAST 'KlangbeiObjektausblenden sd:TriStateBox:TP_ANIMATION:TSB_SOUND -Seite sd:Edit:TP_ANIMATION:EDT_BOOKMARK -Dokument sd:Edit:TP_ANIMATION:EDT_DOCUMENT -Objekt sd:Edit:TP_ANIMATION:EDT_PROGRAM -Makro sd:Edit:TP_ANIMATION:EDT_MACRO -KlangWahl sd:Edit:TP_ANIMATION:EDT_SOUND +Seite sd.Edit.787.2 +Dokument sd.Edit.787.3 +Objekt sd.Edit.787.4 +Makro sd.Edit.787.5 +KlangWahl sd.Edit.787.1 'KlangVollstaendigAbspielen sd:TriStateBox:TP_ANIMATION:TSB_PLAY_FULL -*TabKapitelnumerierung HID_TP_OUTLINE_NUM +*TabKapitelnumerierung SW_HID_TP_OUTLINE_NUM Ebene SW:LISTBOX:TP_OUTLINE_NUM:LB_LEVEL Absatzvorlage SW:LISTBOX:TP_OUTLINE_NUM:LB_COLL Zeichenvorlage SW:LISTBOX:TP_OUTLINE_NUM:LB_CHARFMT @@ -222,70 +222,70 @@ Vollstaendig SW:NUMERICFIELD:TP_OUTLINE_NUM:NF_ALL_LEVEL Davor SW:EDIT:TP_OUTLINE_NUM:ED_PREFIX Dahinter SW:EDIT:TP_OUTLINE_NUM:ED_SUFFIX BeginBei SW:NUMERICFIELD:TP_OUTLINE_NUM:ED_START -Form HID_OUTLINE_FORM - -*TabKopfzeile HID_FORMAT_HEADER -KopfzeileMitAbstand svx:CheckBox:RID_SVXPAGE_HEADER:CB_TURNON svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEADER -Abstand svx:MetricField:RID_SVXPAGE_HEADER:ED_DIST -Hoehe svx:MetricField:RID_SVXPAGE_HEADER:ED_HEIGHT -Hoehedynamisch svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN -RechterRandKopfzeile svx:MetricField:RID_SVXPAGE_HEADER:ED_RMARGIN -LinkerRandKopfzeile svx:MetricField:RID_SVXPAGE_HEADER:ED_LMARGIN -InhaltLinksRechtsGleich svx:CheckBox:RID_SVXPAGE_HEADER:CB_SHARED -Zusaetze svx:PushButton:RID_SVXPAGE_HEADER:BTN_EXTRAS -Bearbeiten HID_SC_HEADER_EDIT - -*TabKopfzeileCalc HID_SCPAGE_HFED_HR -LinkerBereich HID_SC_HF_HRL -MittlererBereich HID_SC_HF_HRC -RechterBereich HID_SC_HF_HRR -PredefinedHeader HID_SC_HF_HR_DEFINED -TextAttribute HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT -Datei HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE -Tabelle HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE -Seitennummer HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE -Seitenanzahl HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES -Datum HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE -Zeit HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME - -*TabKopfzeileCalcLinks HID_SCPAGE_HFED_HL -LinkerBereich HID_SC_HF_HLL -MittlererBereich HID_SC_HF_HLC -RechterBereich HID_SC_HF_HLR -PredefinedHeaderLeft HID_SC_HF_HL_DEFINED -TextAttribute HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT -Datei HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE -Tabelle HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE -Seitennummer HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE -Seitenanzahl HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES -Datum HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE -Zeit HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME - -*TabLaden HID_OPTLOAD_PAGE -Immer sw:RadioButton:TP_OPTLOAD_PAGE:RB_ALWAYS -AufNachfrage sw:RadioButton:TP_OPTLOAD_PAGE:RB_REQUEST -Nie sw:RadioButton:TP_OPTLOAD_PAGE:RB_NEVER -Feldbefehle sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS -Diagramme sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS -Masseinheit sw:ListBox:TP_OPTLOAD_PAGE:LB_METRIC -Tabulatorenabstand sw:MetricField:TP_OPTLOAD_PAGE:MF_TAB - -*TabLauftext cui:TabPage:RID_SVXPAGE_TEXTANIMATION . -Effekt cui:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT -NachOben cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP -NachLinks cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT -NachUnten cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN -NachRechts cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT -TextSichtbarBeimStarten cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE -TextSichtbarBeimBeenden cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE -Endlos cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS -Anzahl cui:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT -Automatisch cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO -Verzoegerung cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY -Pixel cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL -Schrittweite cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT - -*TabLayoutCalc HID_SCPAGE_LAYOUT +Form SW_HID_OUTLINE_FORM + +*TabKopfzeile SVX_HID_FORMAT_HEADER +KopfzeileMitAbstand svx.CheckBox.10027.10 svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEADER +Abstand svx.MetricField.10027.12 +Hoehe svx.MetricField.10027.14 +Hoehedynamisch svx.CheckBox.10027.15 +RechterRandKopfzeile svx.MetricField.10027.19 +LinkerRandKopfzeile svx.MetricField.10027.17 +InhaltLinksRechtsGleich svx.CheckBox.10027.20 +Zusaetze svx.PushButton.10027.40 +Bearbeiten SC_HID_SC_HEADER_EDIT + +*TabKopfzeileCalc SC_HID_SCPAGE_HFED_HR +LinkerBereich SC_HID_SC_HF_HRL +MittlererBereich SC_HID_SC_HF_HRC +RechterBereich SC_HID_SC_HF_HRR +PredefinedHeader SC_HID_SC_HF_HR_DEFINED +TextAttribute SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT +Datei SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE +Tabelle SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE +Seitennummer SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE +Seitenanzahl SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES +Datum SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE +Zeit SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME + +*TabKopfzeileCalcLinks SC_HID_SCPAGE_HFED_HL +LinkerBereich SC_HID_SC_HF_HLL +MittlererBereich SC_HID_SC_HF_HLC +RechterBereich SC_HID_SC_HF_HLR +PredefinedHeaderLeft SC_HID_SC_HF_HL_DEFINED +TextAttribute SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT +Datei SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE +Tabelle SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE +Seitennummer SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE +Seitenanzahl SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES +Datum SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE +Zeit SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME + +*TabLaden SW_HID_OPTLOAD_PAGE +Immer sw.RadioButton.20880.12 +AufNachfrage sw.RadioButton.20880.13 +Nie sw.RadioButton.20880.14 +Feldbefehle sw.CheckBox.20880.16 +Diagramme sw.CheckBox.20880.17 +Masseinheit sw.ListBox.20880.19 +Tabulatorenabstand sw.MetricField.20880.22 + +*TabLauftext cui.TabPage.10184 . +Effekt cui.ListBox.10184.1 +NachOben cui.ImageButton.10184.1 +NachLinks cui.ImageButton.10184.2 +NachUnten cui.ImageButton.10184.4 +NachRechts cui.ImageButton.10184.3 +TextSichtbarBeimStarten cui.TriStateBox.10184.1 +TextSichtbarBeimBeenden cui.TriStateBox.10184.2 +Endlos cui.TriStateBox.10184.3 +Anzahl cui.NumericField.10184.1 +Automatisch cui.TriStateBox.10184.5 +Verzoegerung cui.MetricField.10184.2 +Pixel cui.TriStateBox.10184.4 +Schrittweite cui.MetricField.10184.1 + +*TabLayoutCalc SC_HID_SCPAGE_LAYOUT Masseinheit SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_UNIT Tabulator SC:METRICFIELD:RID_SCPAGE_LAYOUT:MF_TAB Eingabebestaetigung SC:CHECKBOX:RID_SCPAGE_LAYOUT:CB_ALIGN @@ -293,121 +293,121 @@ Eingabetaste SC:CHECKBOX:RID_SCPAGE_LAYOUT:CB_EDITMODE FormatierungAusdehnen SC:CHECKBOX:RID_SCPAGE_LAYOUT:CB_FORMAT SelektionNach SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_ALIGN ' Referenzenfarbig sc:CheckBox:RID_SCPAGE_LAYOUT:CB_RFIND -Referenzenausdehnen sc:CheckBox:RID_SCPAGE_LAYOUT:CB_EXPREF -SelektionHervorheben sc:CheckBox:RID_SCPAGE_LAYOUT:CB_MARKHDR -ImmerAktualisieren sc:RadioButton:RID_SCPAGE_LAYOUT:RB_ALWAYS -AufNachfrageAktualisieren sc:RadioButton:RID_SCPAGE_LAYOUT:RB_REQUEST -NieAktualisieren sc:RadioButton:RID_SCPAGE_LAYOUT:RB_NEVER -Druckermasse sc:CheckBox:RID_SCPAGE_LAYOUT:CB_TEXTFMT -Ueberschreibwarnung sc:CheckBox:RID_SCPAGE_LAYOUT:CB_REPLWARN - -*TabLegende HID_CAPTION -Art HID_CAPTION_CTL_TYPE +Referenzenausdehnen sc.CheckBox.25718.76 +SelektionHervorheben sc.CheckBox.25718.77 +ImmerAktualisieren sc.RadioButton.25718.2 +AufNachfrageAktualisieren sc.RadioButton.25718.3 +NieAktualisieren sc.RadioButton.25718.4 +Druckermasse sc.CheckBox.25718.78 +Ueberschreibwarnung sc.CheckBox.25718.79 + +*TabLegende CUI_HID_CAPTION +Art CUI_HID_CAPTION_CTL_TYPE Abstand cui:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND Ansatz cui:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ Laenge cui:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE Position cui:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL Optimal cui:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE -*TabLinguistik HID_OPTIONS_LINGU -Sprachmodule HID_CLB_LINGU_MODULES -SprachmoduleBearbeiten cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT -Optionen HID_CLB_LINGU_OPTIONS -OptionenBearbeiten cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT -Benutzerwoerterbuch HID_CLB_EDIT_MODULES_DICS -Neu cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC -Bearbeiten cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC -Loeschen cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC - -*TabLinie HID_LINE_LINE -Breite cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH -BreiteLinks cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH -BreiteRechts cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH -EndenSynchronisieren cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE -Farbe cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR -Stil cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE -StilLinks cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE -StilRechts cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE -Transparenz cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT -ZentriertLinks cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START -ZentriertRechts cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END -CornerStyle cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE - -*TabLinienenden HID_LINE_ENDDEF -Aendern cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY -Hinzufuegen cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD -Liste cui:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS -Loeschen cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE -Oeffnen cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD -Speichern cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE -Textfeld cui:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME - -*TabLinienstile HID_LINE_DEF -Abstand cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE -Aendern cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY -AnLinienbreite cui:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE -AnzahlLinks cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1 -AnzahlRechts cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2 -Hinzufuegen cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD -LaengeLinks cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1 -LaengeRechts cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2 -Linienstil cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES -Loeschen cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE -Oeffnen cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD -Speichern cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE -TypLinks cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1 -TypRechts cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2 - -*TabLiteraturAllgemein HID_BIB_CONTROL_PAGE - -*TabMakro cui:TabPage:RID_SVXPAGE_EVENTASSIGN -Ereignis HID_MACRO_LB_EVENT -Bereich HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP -Makroname HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS -Zuweisen cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN -Aufheben cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE -Scripttyp cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE - -*TabMicrosoftOffice97 cui:TabPage:RID_OFAPAGE_MSFILTEROPT -WinwordBasicLaden cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE -WinwordBasicSpeichern cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG -ExcelBasicLaden cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE -ExecutableCode cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL -ExcelBasicSpeichern cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG -PowerpointBasicLaden cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE -PowerpointBasicSpeichern cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG - -*TabMicrosoftOffice2 cui:TabPage:RID_OFAPAGE_MSFILTEROPT2 -Auswahl HID_OFAPAGE_MSFLTR2_CLB - -*TabModule basctl:TabPage:RID_TP_MODULS -Modulliste HID_BASICIDE_MODULES_TREE -Bearbeiten basctl:PushButton:RID_TP_MODULS:RID_PB_EDIT -NeuesModul basctl:PushButton:RID_TP_MODULS:RID_PB_NEWMOD -NeuerDialog basctl:PushButton:RID_TP_MODULS:RID_PB_NEWDLG -Loeschen basctl:PushButton:RID_TP_MODULS:RID_PB_DELETE - -*TabNumerierungsart HID_SVXPAGE_PICK_SINGLE_NUM -Auswahl HID_VALUESET_SINGLENUM -Optionen HID_NUM_FORMAT_BTN -Zurueck HID_TABDLG_RESET_BTN - -*TabNumerierung HID_SVXPAGE_PICK_NUM -Auswahl HID_VALUESET_NUM -Optionen HID_NUM_FORMAT_BTN -Zurueck HID_TABDLG_RESET_BTN +*TabLinguistik CUI_HID_OPTIONS_LINGU +Sprachmodule CUI_HID_CLB_LINGU_MODULES +SprachmoduleBearbeiten cui.PushButton.12007.113 +Optionen CUI_HID_CLB_LINGU_OPTIONS +OptionenBearbeiten cui.PushButton.12007.123 +Benutzerwoerterbuch CUI_HID_CLB_EDIT_MODULES_DICS +Neu cui.PushButton.12007.314 +Bearbeiten cui.PushButton.12007.315 +Loeschen cui.PushButton.12007.316 + +*TabLinie CUI_HID_LINE_LINE +Breite cui.MetricField.10051.1 +BreiteLinks cui.MetricField.10051.3 +BreiteRechts cui.MetricField.10051.2 +EndenSynchronisieren cui.CheckBox.10051.1 +Farbe cui.ListBox.10051.1 +Stil cui.ListBox.10051.2 +StilLinks cui.ListBox.10051.3 +StilRechts cui.ListBox.10051.4 +Transparenz cui.MetricField.10051.5 +ZentriertLinks cui.TriStateBox.10051.4 +ZentriertRechts cui.TriStateBox.10051.5 +CornerStyle cui.ListBox.10051.5 + +*TabLinienenden CUI_HID_LINE_ENDDEF +Aendern cui.PushButton.10053.2 +Hinzufuegen cui.PushButton.10053.1 +Liste cui.ListBox.10053.1 +Loeschen cui.PushButton.10053.3 +Oeffnen cui.ImageButton.10053.5 +Speichern cui.ImageButton.10053.6 +Textfeld cui.Edit.10053.1 + +*TabLinienstile CUI_HID_LINE_DEF +Abstand cui.MetricField.10052.1 +Aendern cui.PushButton.10052.2 +AnLinienbreite cui.CheckBox.10052.1 +AnzahlLinks cui.NumericField.10052.1 +AnzahlRechts cui.NumericField.10052.2 +Hinzufuegen cui.PushButton.10052.1 +LaengeLinks cui.MetricField.10052.3 +LaengeRechts cui.MetricField.10052.4 +Linienstil cui.ListBox.10052.2 +Loeschen cui.PushButton.10052.3 +Oeffnen cui.ImageButton.10052.5 +Speichern cui.ImageButton.10052.6 +TypLinks cui.ListBox.10052.3 +TypRechts cui.ListBox.10052.1 + +*TabLiteraturAllgemein EXTENSIONS_HID_BIB_CONTROL_PAGE + +*TabMakro cui.TabPage.10303 +Ereignis CUI_HID_MACRO_LB_EVENT +Bereich CUI_HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP +Makroname CUI_HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS +Zuweisen cui.PushButton.10303.3 +Aufheben cui.PushButton.10303.4 +Scripttyp cui.ListBox.10303.8 + +*TabMicrosoftOffice97 cui.TabPage.17020 +WinwordBasicLaden cui.CheckBox.17020.1 +WinwordBasicSpeichern cui.CheckBox.17020.2 +ExcelBasicLaden cui.CheckBox.17020.3 +ExecutableCode cui.CheckBox.17020.4 +ExcelBasicSpeichern cui.CheckBox.17020.5 +PowerpointBasicLaden cui.CheckBox.17020.6 +PowerpointBasicSpeichern cui.CheckBox.17020.7 + +*TabMicrosoftOffice2 cui.TabPage.17021 +Auswahl CUI_HID_OFAPAGE_MSFLTR2_CLB + +*TabModule basctl.TabPage.14887 +Modulliste BASCTL_HID_BASICIDE_MODULES_TREE +Bearbeiten basctl.PushButton.14887.4 +NeuesModul basctl.PushButton.14887.6 +NeuerDialog basctl.PushButton.14887.7 +Loeschen basctl.PushButton.14887.8 + +*TabNumerierungsart CUI_HID_SVXPAGE_PICK_SINGLE_NUM +Auswahl CUI_HID_VALUESET_SINGLENUM +Optionen SW_HID_NUM_FORMAT_BTN +Zurueck SFX2_HID_TABDLG_RESET_BTN + +*TabNumerierung CUI_HID_SVXPAGE_PICK_NUM +Auswahl CUI_HID_VALUESET_NUM +Optionen SW_HID_NUM_FORMAT_BTN +Zurueck SFX2_HID_TABDLG_RESET_BTN +TabGliederung TabNumerierung *TabNumerierungAbsatz Hid_NUMPARA Vorlage SW:LISTBOX:TP_NUMPARA:LB_NUMBER_STYLE NumerierungNeuBeginnen SW:TRISTATEBOX:TP_NUMPARA:CB_NEW_START SW:CHECKBOX:TP_NUMPARA:CB_NEW_START -StartWith sw:TriStateBox:TP_NUMPARA:CB_NUMBER_NEW_START +StartWith sw.TriStateBox.20873.4 NumerierungBeginnenBei SW:NUMERICFIELD:TP_NUMPARA:NF_NEW_START ZeilenumerierungZeilenMitzaehlen SW:TRISTATEBOX:TP_NUMPARA:CB_COUNT_PARA SW:CHECKBOX:TP_NUMPARA:CB_COUNT_PARA ZeilenumerierungNeuBeginnen SW:TRISTATEBOX:TP_NUMPARA:CB_RESTART_PARACOUNT SW:CHECKBOX:TP_NUMPARA:CB_RESTART_PARACOUNT ZeilenumerierungBeginnenBei SW:NUMERICFIELD:TP_NUMPARA:NF_RESTART_PARA -OutlineLevel sw:ListBox:TP_NUMPARA:LB_OUTLINE_LEVEL +OutlineLevel sw.ListBox.20873.13 +TabNumerierungKapitelnumerierung TabKapitelnumerierung @@ -422,24 +422,24 @@ OutlineLevel sw:ListBox:TP_NUMPARA:LB_OUTLINE_LEVEL ' Brennweite svx:MetricField:RID_SVXPAGE_3DATTR:MTR_FLD_FOCAL_LENGTH ' BrennweiteTyp HID_3DATTR_CTL_FOCALLENGTH -*TabOptionen HID_OFAPAGE_AUTOCORR_OPTIONS -Einstellungen HID_OFAPAGE_AUTOCORR_CLB +*TabOptionen CUI_HID_OFAPAGE_AUTOCORR_OPTIONS +Einstellungen CUI_HID_OFAPAGE_AUTOCORR_CLB -*TabOptionenAutokorrektur HID_OFAPAGE_AUTOFMT_OPTIONS -Einstellungen HID_OFAPAGE_AUTOFORMAT_CLB +*TabOptionenAutokorrektur CUI_HID_OFAPAGE_AUTOFMT_OPTIONS +Einstellungen CUI_HID_OFAPAGE_AUTOFORMAT_CLB Bearbeiten cui:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT -*TabOptionenTeilergebnisse HID_SCPAGE_SUBT_OPTIONS -NeueSeiteBeiGruppenwechsel sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK -GrossKleinschreibung sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_CASE -BereichVorherNachSortieren sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_SORT -FormateEinschliessen sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_FORMATS -BenutzerdefinierteSortierreihenfolge sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_USERDEF +*TabOptionenTeilergebnisse SC_HID_SCPAGE_SUBT_OPTIONS +NeueSeiteBeiGruppenwechsel sc.CheckBox.25633.21 +GrossKleinschreibung sc.CheckBox.25633.22 +BereichVorherNachSortieren sc.CheckBox.25633.23 +FormateEinschliessen sc.CheckBox.25633.33 +BenutzerdefinierteSortierreihenfolge sc.CheckBox.25633.34 SortierreihenfolgeAnzeige SC:LISTBOX:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF -Aufsteigend sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING +Aufsteigend sc.RadioButton.25633.31 Absteigend SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING -*TabOptionenNumerierung HID_SVXPAGE_NUM_OPTIONS +*TabOptionenNumerierung CUI_HID_SVXPAGE_NUM_OPTIONS Ebene cui:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL Numerierung cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT Davor cui:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX @@ -455,35 +455,35 @@ Hoehe cui:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT Abgleich cui:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO Ausrichtung cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT -*TabHeaderFooterSlide HID_SD_TABPAGE_HEADERFOOTER_SLIDE -DateTime sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME -DateTimeFixed sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_FIXED -DateTimeFixedText sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_DATETIME_FIXED -DateTimeVariable sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_AUTOMATIC -DateTimeFormat sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_FORMAT -DateTimeLanguage sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_LANGUAGE -Header sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_HEADER -HeaderFixedText sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_HEADER_FIXED -Footer sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_FOOTER -FooterFixedText sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_FOOTER_FIXED -Slidenumber sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_SLIDENUMBER -Donotshowonfirstslide sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_NOTONTITLE -Applytoall sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLYTOALL -Apply sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLY - -*TabHeaderFooterNotesHandout HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT -Header sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_HEADER -HeaderFixedText sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_HEADER_FIXED -DateTime sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME -DateTimeFixed sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_FIXED -DateTimeFixedText sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_DATETIME_FIXED -DateTimeVariable sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_AUTOMATIC -DateTimeFormat sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_FORMAT -DateTimeLanguage sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_LANGUAGE -Footer sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_FOOTER -FooterFixedText sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_FOOTER_FIXED -Slidenumber sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_SLIDENUMBER -Donotshowonfirstslide sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_NOTONTITLE -Applytoall sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLYTOALL -Apply sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLY +*TabHeaderFooterSlide SD_HID_SD_TABPAGE_HEADERFOOTER_SLIDE +DateTime sd.CheckBox.1000.2 +DateTimeFixed sd.RadioButton.1000.3 +DateTimeFixedText sd.Edit.1000.4 +DateTimeVariable sd.RadioButton.1000.5 +DateTimeFormat sd.ListBox.1000.6 +DateTimeLanguage sd.ListBox.1000.8 +Header sd.CheckBox.1000.22 +HeaderFixedText sd.Edit.1000.24 +Footer sd.CheckBox.1000.10 +FooterFixedText sd.Edit.1000.12 +Slidenumber sd.CheckBox.1000.14 +Donotshowonfirstslide sd.CheckBox.1000.16 +Applytoall sd.PushButton.1000.17 +Apply sd.PushButton.1000.18 + +*TabHeaderFooterNotesHandout SD_HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT +Header sd.CheckBox.1000.22 +HeaderFixedText sd.Edit.1000.24 +DateTime sd.CheckBox.1000.2 +DateTimeFixed sd.RadioButton.1000.3 +DateTimeFixedText sd.Edit.1000.4 +DateTimeVariable sd.RadioButton.1000.5 +DateTimeFormat sd.ListBox.1000.6 +DateTimeLanguage sd.ListBox.1000.8 +Footer sd.CheckBox.1000.10 +FooterFixedText sd.Edit.1000.12 +Slidenumber sd.CheckBox.1000.14 +Donotshowonfirstslide sd.CheckBox.1000.16 +Applytoall sd.PushButton.1000.17 +Apply sd.PushButton.1000.18 diff --git a/testautomation/global/win/tab_p_s.win b/testautomation/global/win/tab_p_s.win old mode 100755 new mode 100644 index 5a51e737b471..aa7755b33632 --- a/testautomation/global/win/tab_p_s.win +++ b/testautomation/global/win/tab_p_s.win @@ -1,21 +1,21 @@ -*TabPfade HID_OPTIONS_PATH -Standard cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD +*TabPfade CUI_HID_OPTIONS_PATH +Standard cui.PushButton.12006.14 Bearbeiten cui:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH -Typ HID_OPTPATH_CTL_PATH +Typ CUI_HID_OPTPATH_CTL_PATH -*TabPositionNumerierung HID_SVXPAGE_NUM_POSITION +*TabPositionNumerierung CUI_HID_SVXPAGE_NUM_POSITION Level cui:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL -Alignment cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2 -NumberFollowedBy cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY -NumberFollowedByAt cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB -AlignedAt cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT -IndentAt cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT +Alignment cui.ListBox.10220.255 +NumberFollowedBy cui.ListBox.10220.251 +NumberFollowedByAt cui.MetricField.10220.253 +AlignedAt cui.MetricField.10220.257 +IndentAt cui.MetricField.10220.259 Ausrichtung cui:LISTBOX:RID_SVXPAGE_NUM_POSITION:LB_ALIGN AbstandTextNumerierung cui:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST Relativ cui:CHECKBOX:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE Standard cui:PUSHBUTTON:RID_SVXPAGE_NUM_POSITION:PB_STANDARD -*TabPositionKapitelnumerierung HID_NUM_POSITION +*TabPositionKapitelnumerierung SW_HID_NUM_POSITION Level sw:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL NumberAlignment sw:LISTBOX:TP_NUM_POSITION:LB_ALIGN AlignedAt sw:METRICFIELD:TP_NUM_POSITION:MF_BORDERDIST @@ -23,123 +23,123 @@ AbstandTextNumerierung sw:METRICFIELD:TP_NUM_POSITION:MF_NUMDIST IndentAt sw:METRICFIELD:TP_NUM_POSITION:MF_INDENT Relativ sw:CHECKBOX:TP_NUM_POSITION:CB_RELATIVE Standard sw:PUSHBUTTON:TP_NUM_POSITION:PB_STANDARD -LabelFollowedBy sw:ListBox:TP_NUM_POSITION:LB_LABEL_FOLLOWED_BY -AbstandTextNumerierung2 sw:MetricField:TP_NUM_POSITION:MF_LISTTAB -NumberingAlignment sw:ListBox:TP_NUM_POSITION:LB_ALIGN_2 -AlignedAt2 sw:MetricField:TP_NUM_POSITION:MF_ALIGNED_AT -IndentAt2 sw:MetricField:TP_NUM_POSITION:MF_INDENT_AT +LabelFollowedBy sw.ListBox.20872.18 +AbstandTextNumerierung2 sw.MetricField.20872.20 +NumberingAlignment sw.ListBox.20872.22 +AlignedAt2 sw.MetricField.20872.24 +IndentAt2 sw.MetricField.20872.26 -*TabPrivat HID_TP_PRIVATE_DATA -Vorname sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME -Nachname sw:Edit:TP_PRIVATE_DATA:ED_NAME -Kuerzel sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT -Strasse sw:Edit:TP_PRIVATE_DATA:ED_STREET -PLZ sw:Edit:TP_PRIVATE_DATA:ED_ZIP -Ort sw:Edit:TP_PRIVATE_DATA:ED_CITY -Land sw:Edit:TP_PRIVATE_DATA:ED_COUNTRY -Bundesland sw:Edit:TP_PRIVATE_DATA:ED_STATE -Titel sw:Edit:TP_PRIVATE_DATA:ED_TITLE -Beruf sw:Edit:TP_PRIVATE_DATA:ED_PROFESSION -Telefon sw:Edit:TP_PRIVATE_DATA:ED_PHONE -Handy sw:Edit:TP_PRIVATE_DATA:ED_MOBILE -Fax sw:Edit:TP_PRIVATE_DATA:ED_FAX -Homepage sw:Edit:TP_PRIVATE_DATA:ED_WWW -Email sw:Edit:TP_PRIVATE_DATA:ED_MAIL +*TabPrivat SW_HID_TP_PRIVATE_DATA +Vorname sw.Edit.20895.32 +Nachname sw.Edit.20895.33 +Kuerzel sw.Edit.20895.34 +Strasse sw.Edit.20895.36 +PLZ sw.Edit.20895.38 +Ort sw.Edit.20895.39 +Land sw.Edit.20895.41 +Bundesland sw.Edit.20895.53 +Titel sw.Edit.20895.44 +Beruf sw.Edit.20895.43 +Telefon sw.Edit.20895.46 +Handy sw.Edit.20895.47 +Fax sw.Edit.20895.49 +Homepage sw.Edit.20895.51 +Email sw.Edit.20895.52 -*TabRaster HID_OPTIONS_GRID -FangrasterBenutzen svx:CheckBox:RID_SVXPAGE_GRID:CBX_USE_GRIDSNAP -RasterSichtbar svx:CheckBox:RID_SVXPAGE_GRID:CBX_GRID_VISIBLE -FangenFangbereich svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_SNAP_AREA -AchsenSynchronisieren svx:CheckBox:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE -RasterAufloesungXAchse svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_X -RasterAufloesungYAchse svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y -RasterUnterteilungXAchse svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_X -RasterUnterteilungYAchse svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_Y -AnFanglinien svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES -AnSeitenraendern svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER -AmObjektrahmen svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME -AnObjektpunkten svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS -BeimErzeugenUndBewegen svx:CheckBox:RID_SVXPAGE_GRID:CBX_ORTHO -LaengereKantenlaenge svx:CheckBox:RID_SVXPAGE_GRID:CBX_BIGORTHO -BeimDrehen svx:CheckBox:RID_SVXPAGE_GRID:CBX_ROTATE -Punktreduktion svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_BEZ_ANGLE -Winkel svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_ANGLE +*TabRaster SVX_HID_OPTIONS_GRID +FangrasterBenutzen svx.CheckBox.10152.4 +RasterSichtbar svx.CheckBox.10152.8 +FangenFangbereich svx.MetricField.10152.30 +AchsenSynchronisieren svx.CheckBox.10152.5 +RasterAufloesungXAchse svx.MetricField.10152.12 +RasterAufloesungYAchse svx.MetricField.10152.9 +RasterUnterteilungXAchse svx.NumericField.10152.13 +RasterUnterteilungYAchse svx.NumericField.10152.14 +AnFanglinien svx.CheckBox.10152.25 +AnSeitenraendern svx.CheckBox.10152.26 +AmObjektrahmen svx.CheckBox.10152.27 +AnObjektpunkten svx.CheckBox.10152.28 +BeimErzeugenUndBewegen svx.CheckBox.10152.32 +LaengereKantenlaenge svx.CheckBox.10152.33 +BeimDrehen svx.CheckBox.10152.34 +Punktreduktion svx.MetricField.10152.37 +Winkel svx.MetricField.10152.35 -*TabReferenzen HID_FLD_REF +*TabReferenzen SW_HID_FLD_REF Feldtyp SW:LISTBOX:TP_FLD_REF:LB_REFTYPE Auswahl SW:LISTBOX:TP_FLD_REF:LB_REFSELECTION Formatliste SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT Namefeld SW:EDIT:TP_FLD_REF:ED_REFNAME Wert SW:EDIT:TP_FLD_REF:ED_REFVALUE -Einfuegen HID_FIELD_INSERT -Schliessen HID_FIELD_CLOSE +Einfuegen SW_HID_FIELD_INSERT +Schliessen SW_HID_FIELD_CLOSE -*TabSchatten HID_AREA_SHADOW -Anzeigen cui:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW -Position HID_TPSHADOW_CTRL -Entfernung cui:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE -Farbe cui:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR -Transparenz cui:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT +*TabSchatten CUI_HID_AREA_SHADOW +Anzeigen cui.TriStateBox.10061.2 +Position CUI_HID_TPSHADOW_CTRL +Entfernung cui.MetricField.10061.1 +Farbe cui.ListBox.10061.10 +Transparenz cui.MetricField.10061.11 -*TabSchraegstellen HID_TRANS_SLANT -Radius cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS -Winkel cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE +*TabSchraegstellen CUI_HID_TRANS_SLANT +Radius cui.MetricField.10049.29 +Winkel cui.MetricField.10049.19 -*TabSchraffuren HID_AREA_HATCH -Abstand cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE -Winkel cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE -Definition HID_TPHATCH_CTRL -Linientyp cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE -Linienfarbe cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR -Tabelle cui:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS -Hinzufuegen cui:PushButton:RID_SVXPAGE_HATCH:BTN_ADD -Aendern cui:PushButton:RID_SVXPAGE_HATCH:BTN_MODIFY -Loeschen cui:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE -Oeffnen cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD -Speichern cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE +*TabSchraffuren CUI_HID_AREA_HATCH +Abstand cui.MetricField.10057.1 +Winkel cui.MetricField.10057.3 +Definition CUI_HID_TPHATCH_CTRL +Linientyp cui.ListBox.10057.1 +Linienfarbe cui.ListBox.10057.3 +Tabelle cui.ListBox.10057.4 +Hinzufuegen cui.PushButton.10057.1 +Aendern cui.PushButton.10057.3 +Loeschen cui.PushButton.10057.4 +Oeffnen cui.ImageButton.10057.5 +Speichern cui.ImageButton.10057.6 -*TabSchriftErsetzung HID_OFA_FONT_SUBSTITUTION -Anwenden cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE -Schriftart cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1 -Liste HID_OFA_FONT_SUBST_CLB -ErsetzenDurch cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2 -Uebernehmen HID_OFA_SUBST_APPLY -Loeschen HID_OFA_SUBST_DELETE -Fonts cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME -NonProportional cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP -Size cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT +*TabSchriftErsetzung CUI_HID_OFA_FONT_SUBSTITUTION +Anwenden cui.CheckBox.10018.21 +Schriftart cui.ComboBox.10018.3 +Liste CUI_HID_OFA_FONT_SUBST_CLB +ErsetzenDurch cui.ComboBox.10018.5 +Uebernehmen CUI_HID_OFA_SUBST_APPLY +Loeschen CUI_HID_OFA_SUBST_DELETE +Fonts cui.ListBox.10018.24 +NonProportional cui.CheckBox.10018.25 +Size cui.ListBox.10018.27 -*TabSeite HID_FORMAT_PAGE -Links cui:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN -Rechts cui:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN -Oben cui:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN -Unten cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN -Seitenlayout cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT -Numerierung cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT -Papierformat cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE -Breite cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH -Hoehe cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT -Schacht cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY -Horizontal cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ -Vertikal cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT -Hoch cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT -Quer cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE +*TabSeite CUI_HID_FORMAT_PAGE +Links cui.MetricField.10025.11 +Rechts cui.MetricField.10025.13 +Oben cui.MetricField.10025.15 +Unten cui.MetricField.10025.17 +Seitenlayout cui.ListBox.10025.20 +Numerierung cui.ListBox.10025.30 +Papierformat cui.ListBox.10025.50 +Breite cui.MetricField.10025.54 +Hoehe cui.MetricField.10025.56 +Schacht cui.ListBox.10025.58 +Horizontal cui.CheckBox.10025.70 +Vertikal cui.CheckBox.10025.71 +Hoch cui.RadioButton.10025.51 +Quer cui.RadioButton.10025.52 Einschalten cui:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER AbsatzVorlage cui:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER -Textfluss cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW -FitObject cui:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT +Textfluss cui.ListBox.10025.36 +FitObject cui.CheckBox.10025.72 -*TabSonstigesAllgemein HID_OFA_TP_MISC -Zweistellig cui:NumericField:OFA_TP_MISC:NF_YEARVALUE -Aktivieren cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT -Zuruecksetzen cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET -Tips cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP -ExtendedTips cui:CheckBox:OFA_TP_MISC:CB_EXTHELP -StarOfficeDialogeBenutzen cui:CheckBox:OFA_TP_MISC:CB_FILEDLG -DruckenStatus cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS -StyleSheet cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT +*TabSonstigesAllgemein CUI_HID_OFA_TP_MISC +Zweistellig cui.NumericField.17100.42 +Aktivieren cui.CheckBox.17100.13 +Zuruecksetzen cui.PushButton.17100.14 +Tips cui.CheckBox.17100.11 +ExtendedTips cui.CheckBox.17100.12 +StarOfficeDialogeBenutzen cui.CheckBox.17100.55 +DruckenStatus cui.CheckBox.17100.61 +StyleSheet cui.ListBox.17100.16 -*TabSonstigesDraw HID_SD_OPTIONS_MISC +*TabSonstigesDraw SD_HID_SD_OPTIONS_MISC Schnellbearbeitung SD:CHECKBOX:TP_OPTIONS_MISC:CBX_QUICKEDIT TextbereichSelektierbar SD:CHECKBOX:TP_OPTIONS_MISC:CBX_PICKTHROUGH SeitenlayoutdialogZeigen SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE @@ -149,139 +149,139 @@ ObjekteImmerVerschiebbar SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS SetzenAufKreis SD:CHECKBOX:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION MitAktuellerSeite SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE Praesentationsdialoge SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE -MitAutopilotStarten sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE -Masseinheit sd:ListBox:TP_OPTIONS_MISC:LB_METRIC -Tabulatorabstand sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_TABSTOP -AlleAbsatzabstaendeAddieren sd:CheckBox:TP_OPTIONS_MISC:CB_MERGE_PARA_DIST -Zeichnungsmasstab sd:ComboBox:TP_OPTIONS_MISC:CB_SCALE -Originalbreite sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_ORIGINAL_WIDTH -Originalhoehe sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_ORIGINAL_HEIGHT -UsePrinterMetrics sd:CheckBox:TP_OPTIONS_MISC:CB_USE_PRINTER_METRICS +MitAutopilotStarten sd.CheckBox.599.6 +Masseinheit sd.ListBox.599.1 +Tabulatorabstand sd.MetricField.599.4 +AlleAbsatzabstaendeAddieren sd.CheckBox.599.28 +Zeichnungsmasstab sd.ComboBox.599.29 +Originalbreite sd.MetricField.599.31 +Originalhoehe sd.MetricField.599.33 +UsePrinterMetrics sd.CheckBox.599.40 +TabSonstigesWriter TabLaden -*TabSortierkriterien HID_SCPAGE_SORT_FIELDS -SortierenNach sc:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT1 -AnschliessendNach1 sc:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT2 -AnschliessendNach2 sc:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT3 -Aufsteigend1 sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP1 -Absteigend1 sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1 -Aufsteigend2 sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP2 -Absteigend2 sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2 -Aufsteigend3 sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP3 -Absteigend3 sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3 +*TabSortierkriterien SC_HID_SCPAGE_SORT_FIELDS +SortierenNach sc.ListBox.25610.4 +AnschliessendNach1 sc.ListBox.25610.5 +AnschliessendNach2 sc.ListBox.25610.6 +Aufsteigend1 sc.RadioButton.25610.7 +Absteigend1 sc.RadioButton.25610.10 +Aufsteigend2 sc.RadioButton.25610.8 +Absteigend2 sc.RadioButton.25610.11 +Aufsteigend3 sc.RadioButton.25610.9 +Absteigend3 sc.RadioButton.25610.12 -*TabSortierlisten HID_SCPAGE_USERLISTS -Listen sc:ListBox:RID_SCPAGE_USERLISTS:LB_LISTS -Eintraege sc:MultiLineEdit:RID_SCPAGE_USERLISTS:ED_ENTRIES -ListeKopierenAus sc:Edit:RID_SCPAGE_USERLISTS:ED_COPYFROM -Neu sc:PushButton:RID_SCPAGE_USERLISTS:BTN_NEW -Loeschen sc:PushButton:RID_SCPAGE_USERLISTS:BTN_REMOVE -Kopieren sc:PushButton:RID_SCPAGE_USERLISTS:BTN_COPY -Aendern sc:PushButton:RID_SCPAGE_USERLISTS:BTN_ADD -Abbruch sc:PushButton:RID_SCPAGE_USERLISTS:BTN_NEW +*TabSortierlisten SC_HID_SCPAGE_USERLISTS +Listen sc.ListBox.25635.1 +Eintraege sc.MultiLineEdit.25635.2 +ListeKopierenAus sc.Edit.25635.3 +Neu sc.PushButton.25635.1 +Loeschen sc.PushButton.25635.3 +Kopieren sc.PushButton.25635.4 +Aendern sc.PushButton.25635.2 +Abbruch sc.PushButton.25635.1 -*TabSortierenOptionen HID_SCPAGE_SORT_OPTIONS -GrossKleinschreibungBeachten sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_CASESENSITIVE -BereichEnthaeltSpaltenkoepfe sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_LABEL -FormateEinschliessen sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_FORMATS -SortierergebnisseAusgebenNach sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_COPYRESULT -AusgabebereichName sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_OUTAREA -AusgabebereichZellen sc:Edit:RID_SCPAGE_SORT_OPTIONS:ED_OUTAREA -BenutzerdefinierteSortierreihenfolge sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER +*TabSortierenOptionen SC_HID_SCPAGE_SORT_OPTIONS +GrossKleinschreibungBeachten sc.CheckBox.25611.8 +BereichEnthaeltSpaltenkoepfe sc.CheckBox.25611.9 +FormateEinschliessen sc.CheckBox.25611.10 +SortierergebnisseAusgebenNach sc.CheckBox.25611.11 +AusgabebereichName sc.ListBox.25611.3 +AusgabebereichZellen sc.Edit.25611.4 +BenutzerdefinierteSortierreihenfolge sc.CheckBox.25611.7 SortierreihenfolgeListe SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER -VonObenNachUnten sc:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_TOP_DOWN -VonLinksNachRechts sc:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_LEFT_RIGHT -Sprache sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_LANGUAGE -Optionen sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_ALGORITHM +VonObenNachUnten sc.RadioButton.25611.12 +VonLinksNachRechts sc.RadioButton.25611.13 +Sprache sc.ListBox.25611.17 +Optionen sc.ListBox.25611.19 -*TabSpalten HID_COLUMN -Anzahl sw:NumericField:TP_COLUMN:ED_NUMBER -ColumnValueset HID_COLUMN_VALUESET -BalanceColumns sw:CheckBox:TP_COLUMN:CB_BALANCECOLS -Spaltenbreite1 sw:MetricField:TP_COLUMN:ED_1 -Spaltenbreite2 sw:MetricField:TP_COLUMN:ED_2 -Spaltenbreite3 sw:MetricField:TP_COLUMN:ED_3 -Spaltenbreite4 sw:MetricField:TP_COLUMN:ED_1 -Spaltenbreite5 sw:MetricField:TP_COLUMN:ED_2 -Spaltenbreite6 sw:MetricField:TP_COLUMN:ED_3 -Spaltenbreite7 sw:MetricField:TP_COLUMN:ED_1 -Spaltenbreite8 sw:MetricField:TP_COLUMN:ED_2 -Spaltenbreite9 sw:MetricField:TP_COLUMN:ED_3 -Vor sw:ImageButton:TP_COLUMN:BTN_DOWN -Zurueck sw:ImageButton:TP_COLUMN:BTN_UP -Abstand12 sw:MetricField:TP_COLUMN:ED_DIST1 -Abstand23 sw:MetricField:TP_COLUMN:ED_DIST2 -Abstand34 sw:MetricField:TP_COLUMN:ED_DIST1 -Abstand45 sw:MetricField:TP_COLUMN:ED_DIST2 -Abstand56 sw:MetricField:TP_COLUMN:ED_DIST1 -Abstand67 sw:MetricField:TP_COLUMN:ED_DIST2 -Abstand78 sw:MetricField:TP_COLUMN:ED_DIST1 -Abstand89 sw:MetricField:TP_COLUMN:ED_DIST2 -AutomBreite sw:CheckBox:TP_COLUMN:CB_AUTO_WIDTH -Art sw:ListBox:TP_COLUMN:LB_STYLE -Hoehe sw:MetricField:TP_COLUMN:ED_HEIGHT -Position sw:ListBox:TP_COLUMN:LB_POSITION -TextDirection sw:ListBox:TP_COLUMN:LB_TEXTDIRECTION -Zuruecksetzen HID_TABDLG_RESET_BTN +*TabSpalten SW_HID_COLUMN +Anzahl sw.NumericField.20813.2 +ColumnValueset SW_HID_COLUMN_VALUESET +BalanceColumns sw.CheckBox.20813.58 +Spaltenbreite1 sw.MetricField.20813.25 +Spaltenbreite2 sw.MetricField.20813.26 +Spaltenbreite3 sw.MetricField.20813.27 +Spaltenbreite4 sw.MetricField.20813.25 +Spaltenbreite5 sw.MetricField.20813.26 +Spaltenbreite6 sw.MetricField.20813.27 +Spaltenbreite7 sw.MetricField.20813.25 +Spaltenbreite8 sw.MetricField.20813.26 +Spaltenbreite9 sw.MetricField.20813.27 +Vor sw.ImageButton.20813.31 +Zurueck sw.ImageButton.20813.30 +Abstand12 sw.MetricField.20813.46 +Abstand23 sw.MetricField.20813.47 +Abstand34 sw.MetricField.20813.46 +Abstand45 sw.MetricField.20813.47 +Abstand56 sw.MetricField.20813.46 +Abstand67 sw.MetricField.20813.47 +Abstand78 sw.MetricField.20813.46 +Abstand89 sw.MetricField.20813.47 +AutomBreite sw.CheckBox.20813.4 +Art sw.ListBox.20813.34 +Hoehe sw.MetricField.20813.36 +Position sw.ListBox.20813.38 +TextDirection sw.ListBox.20813.61 +Zuruecksetzen SFX2_HID_TABDLG_RESET_BTN -*TabSpaltenTabelle HID_TABLE_COLUMN -BreiteAnpassen sw:CheckBox:TP_TABLE_COLUMN:CB_MOD_TBL -ProportionalAendern sw:CheckBox:TP_TABLE_COLUMN:CB_PROP -VerfuegbarerPlatz sw:MetricField:TP_TABLE_COLUMN:ED_SPACE -Spalte1 sw:MetricField:TP_TABLE_COLUMN:COL_MF_1 -Spalte2 sw:MetricField:TP_TABLE_COLUMN:COL_MF_2 -Spalte3 sw:MetricField:TP_TABLE_COLUMN:COL_MF_3 -Spalte4 sw:MetricField:TP_TABLE_COLUMN:COL_MF_4 -Spalte5 sw:MetricField:TP_TABLE_COLUMN:COL_MF_5 -Spalte6 sw:MetricField:TP_TABLE_COLUMN:COL_MF_6 -Zurueck sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_DOWN -Weiter sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP -Zuruecksetzen HID_TABDLG_RESET_BTN +*TabSpaltenTabelle SW_HID_TABLE_COLUMN +BreiteAnpassen sw.CheckBox.21461.122 +ProportionalAendern sw.CheckBox.21461.123 +VerfuegbarerPlatz sw.MetricField.21461.126 +Spalte1 sw.MetricField.21461.108 +Spalte2 sw.MetricField.21461.110 +Spalte3 sw.MetricField.21461.112 +Spalte4 sw.MetricField.21461.114 +Spalte5 sw.MetricField.21461.116 +Spalte6 sw.MetricField.21461.118 +Zurueck sw.ImageButton.21461.121 +Weiter sw.ImageButton.21461.120 +Zuruecksetzen SFX2_HID_TABDLG_RESET_BTN -*TabSpeichern HID_OPTIONS_SAVE -BenutzerspezifischeEinstellungen cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS +*TabSpeichern CUI_HID_OPTIONS_SAVE +BenutzerspezifischeEinstellungen cui.CheckBox.12000.11 DokumenteigenschaftenBearbeiten cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_DOCINFO -Sicherungskopie cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP -AutomatischSpeichern cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE +Sicherungskopie cui.CheckBox.12000.15 +AutomatischSpeichern cui.CheckBox.12000.16 Minuten cui:NUMERICFIELD:RID_SFXPAGE_SAVE:ED_AUTOSAVE -NoPrettyPrinting cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING +NoPrettyPrinting cui.CheckBox.12000.20 URLimDateisystem cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS URLimInternet cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET -Dokumenttyp cui:ListBox:RID_SFXPAGE_SAVE:LB_APP -Filter cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER -WarnWhenSavingAlienFormat cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT -LoadPrinterSettingsWithDocument cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER +Dokumenttyp cui.ListBox.12000.45 +Filter cui.ListBox.12000.47 +WarnWhenSavingAlienFormat cui.CheckBox.12000.22 +LoadPrinterSettingsWithDocument cui.CheckBox.12000.12 -*TabSprachen HID_OFA_TP_LANGUAGES -UILanguage cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE -Gebietsschema cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING -DecimalSeparator cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR -StandardWaehrung cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY -Westlich cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG -Asiatisch cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG -AktuellesDokument cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC -Aktivieren cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT -LanguageComplexScript cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG -ComplexScriptEnabled cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT +*TabSprachen CUI_HID_OFA_TP_LANGUAGES +UILanguage cui.ListBox.17105.31 +Gebietsschema cui.ListBox.17105.17 +DecimalSeparator cui.CheckBox.17105.28 +StandardWaehrung cui.ListBox.17105.19 +Westlich cui.ListBox.17105.6 +Asiatisch cui.ListBox.17105.8 +AktuellesDokument cui.CheckBox.17105.11 +Aktivieren cui.CheckBox.17105.13 +LanguageComplexScript cui.ListBox.17105.10 +ComplexScriptEnabled cui.CheckBox.17105.15 -*TabStatistik HID_DOC_STAT -Aktualisieren sw:PushButton:TP_DOC_STAT:PB_PDATE +*TabStatistik SW_HID_DOC_STAT +Aktualisieren sw.PushButton.20815.19 -*TabStatistikCalc sc:TabPage:RID_SCPAGE_STAT +*TabStatistikCalc sc.TabPage.25683 -*TabSuche HID_OPTIONS_SEARCH -SuchenIn cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH -DienstName cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME -Und cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND -Oder cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR -Exakt cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT -Praefix cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL -Suffix cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX -Trenner cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR -Schreibstil cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE -Hinzufuegen cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD -Aendern cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE -Loeschen cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE -Neu cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW +*TabSuche CUI_HID_OPTIONS_SEARCH +SuchenIn cui.ListBox.10160.40 +DienstName cui.Edit.10160.41 +Und cui.RadioButton.10160.43 +Oder cui.RadioButton.10160.44 +Exakt cui.RadioButton.10160.45 +Praefix cui.Edit.10160.46 +Suffix cui.Edit.10160.47 +Trenner cui.Edit.10160.48 +Schreibstil cui.ListBox.10160.49 +Hinzufuegen cui.PushButton.10160.55 +Aendern cui.PushButton.10160.53 +Loeschen cui.PushButton.10160.54 +Neu cui.PushButton.10160.56 diff --git a/testautomation/global/win/tab_t_z.win b/testautomation/global/win/tab_t_z.win old mode 100755 new mode 100644 index be8f4870de47..cc52a1628c7a --- a/testautomation/global/win/tab_t_z.win +++ b/testautomation/global/win/tab_t_z.win @@ -1,41 +1,41 @@ -*TabTabelle HID_FORMAT_TABLE -TabellenName sw:Edit:TP_FORMAT_TABLE:ED_NAME -Breite sw:MetricField:TP_FORMAT_TABLE:ED_WIDTH -Relativ sw:CheckBox:TP_FORMAT_TABLE:CB_REL_WIDTH -Automatisch sw:RadioButton:TP_FORMAT_TABLE:RB_FULL -Links sw:RadioButton:TP_FORMAT_TABLE:RB_LEFT -Rechts sw:RadioButton:TP_FORMAT_TABLE:RB_RIGHT -Zentriert sw:RadioButton:TP_FORMAT_TABLE:RB_CENTER -Vonlinks sw:RadioButton:TP_FORMAT_TABLE:RB_FROM_LEFT -Manuell sw:RadioButton:TP_FORMAT_TABLE:RB_FREE -NachLinks sw:MetricField:TP_FORMAT_TABLE:ED_LEFT_DIST -NachRechts sw:MetricField:TP_FORMAT_TABLE:ED_RIGHT_DIST -NachOben sw:MetricField:TP_FORMAT_TABLE:ED_TOP_DIST -NachUnten sw:MetricField:TP_FORMAT_TABLE:ED_BOTTOM_DIST -TextDirection sw:ListBox:TP_FORMAT_TABLE:LB_TEXTDIRECTION +*TabTabelle SW_HID_FORMAT_TABLE +TabellenName sw.Edit.20834.103 +Breite sw.MetricField.20834.1 +Relativ sw.CheckBox.20834.4 +Automatisch sw.RadioButton.20834.14 +Links sw.RadioButton.20834.10 +Rechts sw.RadioButton.20834.11 +Zentriert sw.RadioButton.20834.12 +Vonlinks sw.RadioButton.20834.144 +Manuell sw.RadioButton.20834.13 +NachLinks sw.MetricField.20834.51 +NachRechts sw.MetricField.20834.52 +NachOben sw.MetricField.20834.21 +NachUnten sw.MetricField.20834.23 +TextDirection sw.ListBox.20834.44 -*TabTabelleCalc HID_SCPAGE_TABLE -ZeilenSpaltenKoepfe sc:CheckBox:RID_SCPAGE_TABLE:BTN_HEADER -Tabellengitter sc:CheckBox:RID_SCPAGE_TABLE:BTN_GRID -Notizen sc:CheckBox:RID_SCPAGE_TABLE:BTN_NOTES -GrafikenObjekte sc:CheckBox:RID_SCPAGE_TABLE:BTN_OBJECTS -Diagramme sc:CheckBox:RID_SCPAGE_TABLE:BTN_CHARTS -Zeichenobjekte sc:CheckBox:RID_SCPAGE_TABLE:BTN_DRAWINGS -Formeln sc:CheckBox:RID_SCPAGE_TABLE:BTN_FORMULAS -Nullwerte sc:CheckBox:RID_SCPAGE_TABLE:BTN_NULLVALS -SeitenreihenfolgeObenUnten sc:RadioButton:RID_SCPAGE_TABLE:BTN_TOPDOWN -SeitenreihenfolgeLinksRechts sc:RadioButton:RID_SCPAGE_TABLE:BTN_LEFTRIGHT -ErsteSeitenzahl sc:CheckBox:RID_SCPAGE_TABLE:BTN_PAGENO -NummerErsteSeite sc:NumericField:RID_SCPAGE_TABLE:ED_PAGENO +*TabTabelleCalc SC_HID_SCPAGE_TABLE +ZeilenSpaltenKoepfe sc.CheckBox.25647.11 +Tabellengitter sc.CheckBox.25647.10 +Notizen sc.CheckBox.25647.12 +GrafikenObjekte sc.CheckBox.25647.14 +Diagramme sc.CheckBox.25647.13 +Zeichenobjekte sc.CheckBox.25647.15 +Formeln sc.CheckBox.25647.16 +Nullwerte sc.CheckBox.25647.17 +SeitenreihenfolgeObenUnten sc.RadioButton.25647.20 +SeitenreihenfolgeLinksRechts sc.RadioButton.25647.21 +ErsteSeitenzahl sc.CheckBox.25647.25 +NummerErsteSeite sc.NumericField.25647.26 'SkalierungAllesAuf sc:RadioButton:RID_SCPAGE_TABLE:BTN_SCALEALL -SkalierungProzent sc:MetricField:RID_SCPAGE_TABLE:ED_SCALEALL +SkalierungProzent sc.MetricField.25647.32 'MaxSeitenzahl sc:RadioButton:RID_SCPAGE_TABLE:BTN_SCALEPAGENUM -AnzahlMaxSeiten sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGENUM -ScalingMode sc:ListBox:RID_SCPAGE_TABLE:LB_SCALEMODE -ScalePageWidth sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEWIDTH -ScalePageHeight sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEHEIGHT +AnzahlMaxSeiten sc.NumericField.25647.34 +ScalingMode sc.ListBox.25647.31 +ScalePageWidth sc.NumericField.25647.35 +ScalePageHeight sc.NumericField.25647.36 -*TabTabelleOptionen HID_OPTTABLE_PAGE +*TabTabelleOptionen SW_HID_OPTTABLE_PAGE VerschiebenZeile SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWMOVE VerschiebenSpalte SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLMOVE EinfuegenZeile SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWINSERT @@ -44,103 +44,103 @@ VerhaltenFix SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIX FixProportional SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIXPROP Variabel SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_VAR -Ueberschrift sw:CheckBox:TP_OPTTABLE_PAGE:CB_HEADER -Wiederholen sw:CheckBox:TP_OPTTABLE_PAGE:CB_REPEAT_HEADER -NichtTrennen sw:CheckBox:TP_OPTTABLE_PAGE:CB_DONT_SPLIT -Umrandung sw:CheckBox:TP_OPTTABLE_PAGE:CB_BORDER -AutomatischeZahlenerkennung sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFORMATTING -Zahlenformaterkennung sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFMT_FORMATTING -AutomatischeAusrichtung sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMALIGNMENT +Ueberschrift sw.CheckBox.20856.101 +Wiederholen sw.CheckBox.20856.102 +NichtTrennen sw.CheckBox.20856.103 +Umrandung sw.CheckBox.20856.104 +AutomatischeZahlenerkennung sw.CheckBox.20856.105 +Zahlenformaterkennung sw.CheckBox.20856.109 +AutomatischeAusrichtung sw.CheckBox.20856.106 -*TabTabulatoren HID_TABULATOR -AlleLoeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL -Fuellzeichen1 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO -Fuellzeichen2 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS -Fuellzeichen3 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE -Fuellzeichen4 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE -Fuellzeichen5 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER -FuellzeichenZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER -Loeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL -Neu cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW -Position cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS -TypLinks cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT -TypRechts cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT -TypZentriert cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER -TypDezimal cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL -TypZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR +*TabTabulatoren CUI_HID_TABULATOR +AlleLoeschen cui.PushButton.10002.52 +Fuellzeichen1 cui.RadioButton.10002.40 +Fuellzeichen2 cui.RadioButton.10002.41 +Fuellzeichen3 cui.RadioButton.10002.42 +Fuellzeichen4 cui.RadioButton.10002.43 +Fuellzeichen5 cui.RadioButton.10002.44 +FuellzeichenZeichen cui.Edit.10002.45 +Loeschen cui.PushButton.10002.51 +Neu cui.PushButton.10002.50 +Position cui.MetricBox.10002.10 +TypLinks cui.RadioButton.10002.20 +TypRechts cui.RadioButton.10002.22 +TypZentriert cui.RadioButton.10002.24 +TypDezimal cui.RadioButton.10002.26 +TypZeichen cui.Edit.10002.28 -*TabTabulator HID_TABULATOR -AlleLoeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL -Fuellzeichen1 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO -Fuellzeichen2 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS -Fuellzeichen3 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE -Fuellzeichen4 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE -Fuellzeichen5 cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER -FuellzeichenZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER -Loeschen cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL -Neu cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW -Position cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS -TypLinks cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT -TypRechts cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT -TypZentriert cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER -TypDezimal cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL -TypZeichen cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR +*TabTabulator CUI_HID_TABULATOR +AlleLoeschen cui.PushButton.10002.52 +Fuellzeichen1 cui.RadioButton.10002.40 +Fuellzeichen2 cui.RadioButton.10002.41 +Fuellzeichen3 cui.RadioButton.10002.42 +Fuellzeichen4 cui.RadioButton.10002.43 +Fuellzeichen5 cui.RadioButton.10002.44 +FuellzeichenZeichen cui.Edit.10002.45 +Loeschen cui.PushButton.10002.51 +Neu cui.PushButton.10002.50 +Position cui.MetricBox.10002.10 +TypLinks cui.RadioButton.10002.20 +TypRechts cui.RadioButton.10002.22 +TypZentriert cui.RadioButton.10002.24 +TypDezimal cui.RadioButton.10002.26 +TypZeichen cui.Edit.10002.28 -*TabTastatur HID_CONFIG_ACCEL -Tastatur HID_ACCELCONFIG_LISTBOX -Bereich HID_CONFIGGROUP_ACC_LISTBOX -Funktion HID_CONFIGFUNCTION_ACC_LISTBOX -Aendern cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE -Loeschen cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE -Zuruecksetzen cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET -Laden cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD -Speichern cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE -StarOffice cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE -Application cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE +*TabTastatur CUI_HID_CONFIG_ACCEL +Tastatur CUI_HID_ACCELCONFIG_LISTBOX +Bereich CUI_HID_CONFIGGROUP_ACC_LISTBOX +Funktion CUI_HID_CONFIGFUNCTION_ACC_LISTBOX +Aendern cui.PushButton.10293.3 +Loeschen cui.PushButton.10293.4 +Zuruecksetzen cui.PushButton.10293.20 +Laden cui.PushButton.10293.40 +Speichern cui.PushButton.10293.41 +StarOffice cui.RadioButton.10293.44 +Application cui.RadioButton.10293.45 -*TabTeilergebnisseOptionen HID_SCPAGE_SUBT_OPTIONS -NeueSeiteBeiGruppenwechsel sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK -GrossKleinschreibungBeachten sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_CASE -BereichVorherNachGruppenSortieren sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_SORT -FormateEinschliessen sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_FORMATS -BenutzerdefinierteSortierreihenfolge sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_USERDEF -SortierreihenfolgeAnzeige sc:ListBox:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF -Aufsteigend sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING -Absteigend sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING +*TabTeilergebnisseOptionen SC_HID_SCPAGE_SUBT_OPTIONS +NeueSeiteBeiGruppenwechsel sc.CheckBox.25633.21 +GrossKleinschreibungBeachten sc.CheckBox.25633.22 +BereichVorherNachGruppenSortieren sc.CheckBox.25633.23 +FormateEinschliessen sc.CheckBox.25633.33 +BenutzerdefinierteSortierreihenfolge sc.CheckBox.25633.34 +SortierreihenfolgeAnzeige sc.ListBox.25633.35 +Aufsteigend sc.RadioButton.25633.31 +Absteigend sc.RadioButton.25633.32 -*TabText HID_PAGE_TEXTATTR -BreiteAnTextAnpassen cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH -HoeheAnTextAnpassen cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT -AmRahmenAnpassen cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE -Konturfluss cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR -WordWrap cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT -ResizeShape cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE -Links cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT -Rechts cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT -Oben cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP -Unten cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM -AnchorPosition HID_TEXTATTR_CTL_POSITION -GanzeBreite cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH +*TabText CUI_HID_PAGE_TEXTATTR +BreiteAnTextAnpassen cui.TriStateBox.10153.2 +HoeheAnTextAnpassen cui.TriStateBox.10153.1 +AmRahmenAnpassen cui.TriStateBox.10153.3 +Konturfluss cui.TriStateBox.10153.5 +WordWrap cui.TriStateBox.10153.6 +ResizeShape cui.TriStateBox.10153.7 +Links cui.MetricField.10153.1 +Rechts cui.MetricField.10153.2 +Oben cui.MetricField.10153.3 +Unten cui.MetricField.10153.4 +AnchorPosition CUI_HID_TEXTATTR_CTL_POSITION +GanzeBreite cui.TriStateBox.10153.4 -*TabTextfluss HID_FORMAT_PARAGRAPH_EXT -Automatisch cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN -AbZeichenende cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE -AbZeichenAnfang cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER -Trennstellen cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH -Umbruch cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK -UmbruchTyp cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE -UmbruchPosition cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION -MitSeitenvorlage cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL -Vorlage cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL -AbsatzNichtTrennen cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER -AbsaetzeZusammenhalten cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER -Schusterjungenregelung cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS -SchusterZeilen cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS -Hurenkinderregelung cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS -HurenkinderZeilen cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS +*TabTextfluss CUI_HID_FORMAT_PARAGRAPH_EXT +Automatisch cui.TriStateBox.10007.50 +AbZeichenende cui.NumericField.10007.52 +AbZeichenAnfang cui.NumericField.10007.55 +Trennstellen cui.NumericField.10007.83 +Umbruch cui.TriStateBox.10007.60 +UmbruchTyp cui.ListBox.10007.62 +UmbruchPosition cui.ListBox.10007.64 +MitSeitenvorlage cui.TriStateBox.10007.65 +Vorlage cui.ListBox.10007.66 +AbsatzNichtTrennen cui.TriStateBox.10007.67 +AbsaetzeZusammenhalten cui.TriStateBox.10007.80 +Schusterjungenregelung cui.TriStateBox.10007.68 +SchusterZeilen cui.NumericField.10007.69 +Hurenkinderregelung cui.TriStateBox.10007.71 +HurenkinderZeilen cui.NumericField.10007.72 Seitenzahl cui:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM -*TabTextflussTabelle HID_TABLE_TEXTFLOW +*TabTextflussTabelle SW_HID_TABLE_TEXTFLOW Umbruch SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGEBREAK MitSeitenvorlage SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGECOLL UeberschriftWiederholen SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_HEADLINE @@ -152,57 +152,57 @@ Davor SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE Danach SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER Seitenvorlage SW:LISTBOX:TP_TABLE_TEXTFLOW:LB_PAGECOLL Seitennummer SW:NUMERICFIELD:TP_TABLE_TEXTFLOW:NF_PAGENUM -ZeileTrennen sw:TriStateBox:TP_TABLE_TEXTFLOW:CB_SPLIT_ROW -TextDirection sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTDIRECTION -VerticalAlignment sw:ListBox:TP_TABLE_TEXTFLOW:LB_VERTORIENT +ZeileTrennen sw.TriStateBox.20852.146 +TextDirection sw.ListBox.20852.44 +VerticalAlignment sw.ListBox.20852.151 -*TabTransparenz HID_AREA_TRANSPARENCE -KeineTransparenz cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF -LineareTransparenz cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR -Transparenzverlauf cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT -MFLinTransparenz cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT -TransparenzverlaufTyp cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES -MFZentrumX cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X -MFZentrumY cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y -MFWinkel cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE -MFRand cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER -MFStartwert cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE -MFEndwert cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE +*TabTransparenz CUI_HID_AREA_TRANSPARENCE +KeineTransparenz cui.RadioButton.10054.8 +LineareTransparenz cui.RadioButton.10054.9 +Transparenzverlauf cui.RadioButton.10054.10 +MFLinTransparenz cui.MetricField.10054.10 +TransparenzverlaufTyp cui.ListBox.10054.3 +MFZentrumX cui.MetricField.10054.4 +MFZentrumY cui.MetricField.10054.5 +MFWinkel cui.MetricField.10054.6 +MFRand cui.MetricField.10054.7 +MFStartwert cui.MetricField.10054.8 +MFEndwert cui.MetricField.10054.9 -*TabUmlauf HID_FRM_EXT -Kein sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP -Links sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_LEFT -Rechts sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_RIGHT -Parallel sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_PARALLEL -Durchlauf sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_THROUGH -Dynamisch sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_IDEAL -AbstaendeLinks sw:MetricField:TP_FRM_WRAP:ED_LEFT_MARGIN +*TabUmlauf SW_HID_FRM_EXT +Kein sw.ImageRadioButton.20849.2 +Links sw.ImageRadioButton.20849.3 +Rechts sw.ImageRadioButton.20849.4 +Parallel sw.ImageRadioButton.20849.5 +Durchlauf sw.ImageRadioButton.20849.6 +Dynamisch sw.ImageRadioButton.20849.7 +AbstaendeLinks sw.MetricField.20849.14 AbstaendeRechts SW:METRICFIELD:TP_FRM_WRAP:ED_RIGHT_MARGIN sw:MetricField:TP_FRM_EXT:ED_RIGHT_MARGIN AbstaendeOben SW:METRICFIELD:TP_FRM_WRAP:ED_TOP_MARGIN sw:MetricField:TP_FRM_EXT:ED_TOP_MARGIN AbstaendeUnten SW:METRICFIELD:TP_FRM_WRAP:ED_BOTTOM_MARGIN sw:MetricField:TP_FRM_EXT:ED_BOTTOM_MARGIN -ErsterAbsatz sw:CheckBox:TP_FRM_WRAP:CB_ANCHOR_ONLY -ImHintergrund sw:CheckBox:TP_FRM_WRAP:CB_TRANSPARENT -Kontur sw:CheckBox:TP_FRM_WRAP:CB_OUTLINE -NurAussen sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE +ErsterAbsatz sw.CheckBox.20849.8 +ImHintergrund sw.CheckBox.20849.22 +Kontur sw.CheckBox.20849.23 +NurAussen sw.CheckBox.20849.25 -*TabUmrandung HID_BORDER -Vorgaben HID_BORDER_CTL_PRESETS -Stil cui:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE -StilFarbe cui:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR -Position HID_BORDER_CTL_SHADOWS -Groesse cui:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE -SchattenFarbe cui:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR -Zurueck HID_TABDLG_RESET_BTN -Standard HID_TABDLG_STANDARD_BTN -Links cui:MetricField:RID_SVXPAGE_BORDER:MF_LEFT -Rechts cui:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT -Oben cui:MetricField:RID_SVXPAGE_BORDER:MF_TOP -Unten cui:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM -Synchronisieren cui:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC +*TabUmrandung CUI_HID_BORDER +Vorgaben CUI_HID_BORDER_CTL_PRESETS +Stil cui.ListBox.10005.21 +StilFarbe cui.ListBox.10005.22 +Position CUI_HID_BORDER_CTL_SHADOWS +Groesse cui.MetricField.10005.34 +SchattenFarbe cui.ListBox.10005.36 +Zurueck SFX2_HID_TABDLG_RESET_BTN +Standard SFX2_HID_TABDLG_STANDARD_BTN +Links cui.MetricField.10005.52 +Rechts cui.MetricField.10005.54 +Oben cui.MetricField.10005.56 +Unten cui.MetricField.10005.58 +Synchronisieren cui.CheckBox.10005.59 +TabUmrandungChart TabLinie -*TabVariablen HID_FLD_VAR +*TabVariablen SW_HID_FLD_VAR Feldtyp SW:LISTBOX:TP_FLD_VAR:LB_VARTYPE Auswahl SW:LISTBOX:TP_FLD_VAR:LB_VARSELECTION Formatliste SW:LISTBOX:TP_FLD_VAR:LB_VARFORMAT @@ -213,147 +213,147 @@ Hinweis SW:EDIT:TP_FLD_VAR:ED_VARVALUE Korrektur SW:EDIT:TP_FLD_VAR:ED_VARVALUE Formel SW:EDIT:TP_FLD_VAR:ED_VARVALUE Unsichtbar SW:CHECKBOX:TP_FLD_VAR:CB_VARINVISIBLE -Uebernehmen HID_FLDVAR_APPLY -Loeschen HID_FLDVAR_DELETE -Einfuegen HID_FIELD_INSERT -Schliessen HID_FIELD_CLOSE +Uebernehmen SW_HID_FLDVAR_APPLY +Loeschen SW_HID_FLDVAR_DELETE +Einfuegen SW_HID_FIELD_INSERT +Schliessen SW_HID_FIELD_CLOSE -*TabVerbinder HID_PAGE_CONNECTION -Linie1 cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1 -Linie2 cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2 -Linie3 cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3 -AnfangHorizontal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1 -AnfangVertikal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1 -EndeHorizontal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2 -EndeVertikal cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2 -Typ cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE +*TabVerbinder CUI_HID_PAGE_CONNECTION +Linie1 cui.MetricField.10191.1 +Linie2 cui.MetricField.10191.2 +Linie3 cui.MetricField.10191.3 +AnfangHorizontal cui.MetricField.10191.4 +AnfangVertikal cui.MetricField.10191.6 +EndeHorizontal cui.MetricField.10191.5 +EndeVertikal cui.MetricField.10191.7 +Typ cui.ListBox.10191.1 -*TabVerwalten HID_MANAGE_STYLES -VorlagenName sfx2:Edit:TP_MANAGE_STYLES:ED_NAME -Aktualisieren sfx2:CheckBox:TP_MANAGE_STYLES:CB_AUTO -Folgevorlage sfx2:ListBox:TP_MANAGE_STYLES:LB_NEXT -VerknuepftMit sfx2:ListBox:TP_MANAGE_STYLES:LB_BASE -Bereich sfx2:ListBox:TP_MANAGE_STYLES:LB_REGION -Enthaelt sfx2:MultiLineEdit:TP_MANAGE_STYLES:ED_DESC -Zurueck HID_TABDLG_RESET_BTN -Standard HID_TABDLG_STANDARD_BTN +*TabVerwalten SFX2_HID_MANAGE_STYLES +VorlagenName sfx2.Edit.267.2 +Aktualisieren sfx2.CheckBox.267.12 +Folgevorlage sfx2.ListBox.267.4 +VerknuepftMit sfx2.ListBox.267.6 +Bereich sfx2.ListBox.267.8 +Enthaelt sfx2.MultiLineEdit.267.11 +Zurueck SFX2_HID_TABDLG_RESET_BTN +Standard SFX2_HID_TABDLG_STANDARD_BTN -*TabVerzeichnisseVerzeichnis HID_TP_TOX_SELECT -VerzeichnisTyp sw:ListBox:TP_TOX_SELECT:LB_TYPE -VerzeichnisTitel sw:Edit:TP_TOX_SELECT:ED_TITLE -VerzeichnisGeschuetzt sw:CheckBox:TP_TOX_SELECT:CB_READONLY -ErstellenFuer sw:ListBox:TP_TOX_SELECT:LB_AREA -AuswertenBis sw:NumericField:TP_TOX_SELECT:NF_LEVEL -ErzeugenAusGliederung sw:CheckBox:TP_TOX_SELECT:CB_FROMHEADINGS -ErzeugenAusVorlagen sw:CheckBox:TP_TOX_SELECT:CB_ADDSTYLES -VorlagenAuswahl sw:PushButton:TP_TOX_SELECT:PB_ADDSTYLES -ErzeugenAusMarkierungen sw:CheckBox:TP_TOX_SELECT:CB_TOXMARKS -ZusammenfassenGleicherEintraege sw:CheckBox:TP_TOX_SELECT:CB_COLLECTSAME -ZusammenfassenMitEff sw:CheckBox:TP_TOX_SELECT:CB_USEFF -ZusammenfassenMitStrich sw:CheckBox:TP_TOX_SELECT:CB_USE_DASH -GrossKlein sw:CheckBox:TP_TOX_SELECT:CB_CASESENSITIVE -AutomatischGross sw:CheckBox:TP_TOX_SELECT:CB_INITIALCAPS -EigenerEintrag sw:CheckBox:TP_TOX_SELECT:CB_KEYASENTRY -Konkordanzdatei sw:CheckBox:TP_TOX_SELECT:CB_FROMFILE -KonkordanzAuswahl sw:MenuButton:TP_TOX_SELECT:MB_AUTOMARK -Beschriftungen sw:RadioButton:TP_TOX_SELECT:RB_FROMCAPTIONS -Objektnamen sw:RadioButton:TP_TOX_SELECT:RB_FROMOBJECTNAMES -Kategorie sw:ListBox:TP_TOX_SELECT:LB_CAPTIONSEQUENCE -Anzeige sw:ListBox:TP_TOX_SELECT:LB_DISPLAYTYPE -Vorlagen sw:CheckBox:TP_TOX_SELECT:CB_ADDSTYLES -WelcheVorlage sw:PushButton:TP_TOX_SELECT:PB_ADDSTYLES -Tabellen sw:CheckBox:TP_TOX_SELECT:CB_FROMTABLES -Textrahmen sw:CheckBox:TP_TOX_SELECT:CB_FROMFRAMES -Grafiken sw:CheckBox:TP_TOX_SELECT:CB_FROMGRAPHICS -OLEObjekte sw:CheckBox:TP_TOX_SELECT:CB_FROMOLE -Ursprungskapitel sw:CheckBox:TP_TOX_SELECT:CB_LEVELFROMCHAPTER -ErzeugenAusObjekt HID_OLE_CHECKLB -EintraegeNumerieren sw:CheckBox:TP_TOX_SELECT:CB_SEQUENCE -Klammern sw:ListBox:TP_TOX_SELECT:LB_BRACKET -SortLanguage sw:ListBox:TP_TOX_SELECT:LB_LANGUAGE -SortKeyType sw:ListBox:TP_TOX_SELECT:LB_SORTALG +*TabVerzeichnisseVerzeichnis SW_HID_TP_TOX_SELECT +VerzeichnisTyp sw.ListBox.20890.2 +VerzeichnisTitel sw.Edit.20890.15 +VerzeichnisGeschuetzt sw.CheckBox.20890.3 +ErstellenFuer sw.ListBox.20890.7 +AuswertenBis sw.NumericField.20890.9 +ErzeugenAusGliederung sw.CheckBox.20890.11 +ErzeugenAusVorlagen sw.CheckBox.20890.13 +VorlagenAuswahl sw.PushButton.20890.14 +ErzeugenAusMarkierungen sw.CheckBox.20890.21 +ZusammenfassenGleicherEintraege sw.CheckBox.20890.23 +ZusammenfassenMitEff sw.CheckBox.20890.24 +ZusammenfassenMitStrich sw.CheckBox.20890.33 +GrossKlein sw.CheckBox.20890.25 +AutomatischGross sw.CheckBox.20890.26 +EigenerEintrag sw.CheckBox.20890.27 +Konkordanzdatei sw.CheckBox.20890.28 +KonkordanzAuswahl sw.MenuButton.20890.29 +Beschriftungen sw.RadioButton.20890.19 +Objektnamen sw.RadioButton.20890.20 +Kategorie sw.ListBox.20890.106 +Anzeige sw.ListBox.20890.108 +Vorlagen sw.CheckBox.20890.13 +WelcheVorlage sw.PushButton.20890.14 +Tabellen sw.CheckBox.20890.114 +Textrahmen sw.CheckBox.20890.115 +Grafiken sw.CheckBox.20890.116 +OLEObjekte sw.CheckBox.20890.17 +Ursprungskapitel sw.CheckBox.20890.18 +ErzeugenAusObjekt SW_HID_OLE_CHECKLB +EintraegeNumerieren sw.CheckBox.20890.122 +Klammern sw.ListBox.20890.124 +SortLanguage sw.ListBox.20890.146 +SortKeyType sw.ListBox.20890.148 -*TabVerzeichnisseEintraege HID_TP_TOX_ENTRY -AuswahlEbene HID_INSERT_INDEX_ENTRY_LEVEL_LB -Kapitelnummer sw:PushButton:TP_TOX_ENTRY:PB_ENTRYNO -Kapitelinfo sw:PushButton:TP_TOX_ENTRY:PB_CHAPTERINFO -Eintragstext sw:PushButton:TP_TOX_ENTRY:PB_ENTRY -Tabulator sw:PushButton:TP_TOX_ENTRY:PB_TAB -Tabulatorposition sw:MetricField:TP_TOX_ENTRY:MF_TABPOS -Seitennummer sw:PushButton:TP_TOX_ENTRY:PB_PAGENO -Hyperlink sw:PushButton:TP_TOX_ENTRY:PB_HYPERLINK -ZeichenvorlageBearbeiten sw:PushButton:TP_TOX_ENTRY:PB_EDITSTYLE -Zeichenvorlage sw:ListBox:TP_TOX_ENTRY:LB_CHAPTERENTRY -ZeichenvorlageAuswahl sw:ListBox:TP_TOX_ENTRY:LB_CHARSTYLE -ZeichenvorlageHaupteintraege sw:ListBox:TP_TOX_ENTRY:LB_MAIN_ENTRY_STYLE -Fuellzeichen sw:ComboBox:TP_TOX_ENTRY:CB_FILLCHAR -AlphabetischesTrennzeichen sw:CheckBox:TP_TOX_ENTRY:CB_ALPHADELIM -SchluesselKommasepariert sw:CheckBox:TP_TOX_ENTRY:CB_COMMASEPARATED -AmRechtenRand sw:CheckBox:TP_TOX_ENTRY:CB_AUTORIGHT -PositionTabulatorRelativ sw:CheckBox:TP_TOX_ENTRY:CB_RELTOSTYLE -Aufbau HID_TOKEN_WINDOW -AufbauText HID_TOX_ENTRY_EDIT -AufbauAuswahl HID_TOX_ENTRY_BUTTON -AufbauEinfuegen sw:PushButton:TP_TOX_ENTRY:PB_AUTHINSERT -AufbauEntfernen sw:PushButton:TP_TOX_ENTRY:PB_AUTHREMOVE +*TabVerzeichnisseEintraege SW_HID_TP_TOX_ENTRY +AuswahlEbene SW_HID_INSERT_INDEX_ENTRY_LEVEL_LB +Kapitelnummer sw.PushButton.20891.36 +Kapitelinfo sw.PushButton.20891.38 +Eintragstext sw.PushButton.20891.37 +Tabulator sw.PushButton.20891.40 +Tabulatorposition sw.MetricField.20891.52 +Seitennummer sw.PushButton.20891.39 +Hyperlink sw.PushButton.20891.41 +ZeichenvorlageBearbeiten sw.PushButton.20891.44 +Zeichenvorlage sw.ListBox.20891.48 +ZeichenvorlageAuswahl sw.ListBox.20891.43 +ZeichenvorlageHaupteintraege sw.ListBox.20891.57 +Fuellzeichen sw.ComboBox.20891.46 +AlphabetischesTrennzeichen sw.CheckBox.20891.58 +SchluesselKommasepariert sw.CheckBox.20891.59 +AmRechtenRand sw.CheckBox.20891.53 +PositionTabulatorRelativ sw.CheckBox.20891.54 +Aufbau SW_HID_TOKEN_WINDOW +AufbauText SW_HID_TOX_ENTRY_EDIT +AufbauAuswahl SW_HID_TOX_ENTRY_BUTTON +AufbauEinfuegen sw.PushButton.20891.120 +AufbauEntfernen sw.PushButton.20891.121 -*TabVerzeichnisseVorlagen HID_TOX_STYLES_PAGE -ZuordnungStufen sw:ListBox:TP_TOX_STYLES:LB_LEVEL -ZuordnungAbsatzvorlagen sw:ListBox:TP_TOX_STYLES:LB_PARALAY -Standard sw:PushButton:TP_TOX_STYLES:BT_STD -Zuordnen sw:ImageButton:TP_TOX_STYLES:BT_ASSIGN -Bearbeiten sw:PushButton:TP_TOX_STYLES:BT_EDIT_STYLE +*TabVerzeichnisseVorlagen SW_HID_TOX_STYLES_PAGE +ZuordnungStufen sw.ListBox.20892.29 +ZuordnungAbsatzvorlagen sw.ListBox.20892.31 +Standard sw.PushButton.20892.26 +Zuordnen sw.ImageButton.20892.32 +Bearbeiten sw.PushButton.20892.40 -*TabVisitenkarten HID_TP_VISITING_CARDS -Inhalt HID_BUSINESS_CARD_CONTENT -WelcherAutotext sw:ListBox:TP_VISITING_CARDS:LB_AUTO_TEXT_GROUP +*TabVisitenkarten SW_HID_TP_VISITING_CARDS +Inhalt SW_HID_BUSINESS_CARD_CONTENT +WelcherAutotext sw.ListBox.20893.5 *TabWerte SC:TABPAGE:TP_VALIDATION_VALUES Zulassen SC:LISTBOX:TP_VALIDATION_VALUES:LB_ALLOW -LeerzellenZulassen sc:CheckBox:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS +LeerzellenZulassen sc.CheckBox.696.3 Daten SC:LISTBOX:TP_VALIDATION_VALUES:LB_VALUE Wert SC:EDIT:TP_VALIDATION_VALUES:EDT_MIN Minimum SC:EDIT:TP_VALIDATION_VALUES:EDT_MIN -Maximum sc:Edit:TP_VALIDATION_VALUES:EDT_MAX -ShowSelectionList sc:CheckBox:TP_VALIDATION_VALUES:CB_SHOWLIST -ListSortEntries sc:CheckBox:TP_VALIDATION_VALUES:CB_SORTLIST -CriteriaListEntries sc:MultiLineEdit:TP_VALIDATION_VALUES:EDT_LIST -SourceShrink sc:ImageButton:TP_VALIDATION_VALUES:RB_VALIDITY_REF -ValidityReset HID_TABDLG_RESET_BTN +Maximum sc.Edit.696.9 +ShowSelectionList sc.CheckBox.696.27 +ListSortEntries sc.CheckBox.696.28 +CriteriaListEntries sc.MultiLineEdit.696.29 +SourceShrink sc.ImageButton.696.88 +ValidityReset SFX2_HID_TABDLG_RESET_BTN -*TabWortergaenzung HID_OFAPAGE_AUTOCOMPLETE_OPTIONS -WoerterErgaenzen cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV -VorschlaegeSammeln cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT -AlsTipphilfe cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP -MinWortlaenge cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN -MaxEintraege cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES -AnnehmenMit cui:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY -GesammelteWorte cui:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES -EintragLoeschen cui:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES -AppendSpace cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE -KeepList cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST +*TabWortergaenzung CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS +WoerterErgaenzen cui.CheckBox.17019.121 +VorschlaegeSammeln cui.CheckBox.17019.122 +AlsTipphilfe cui.CheckBox.17019.125 +MinWortlaenge cui.NumericField.17019.128 +MaxEintraege cui.NumericField.17019.129 +AnnehmenMit cui.ListBox.17019.131 +GesammelteWorte cui.MultiListBox.17019.132 +EintragLoeschen cui.PushButton.17019.133 +AppendSpace cui.CheckBox.17019.123 +KeepList cui.CheckBox.17019.124 -*TabZahlen HID_NUMBERFORMAT -Kategorie cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY -ZahlenFormat HID_NUMBERFORMAT_LB_FORMAT -Sprache cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE -FormatPreview HID_NUMBERFORMAT_WND_NUMBER_PREVIEW -FormatCode cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT -FuehrendeNullen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES -Nachkommastellen cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS -NegativInRot cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED -Tausenderpunkt cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND -PBHinzufuegen HID_NUMBERFORMAT_TBI_ADD -PBEntfernen HID_NUMBERFORMAT_TBI_REMOVE -PBInfo HID_NUMBERFORMAT_TBI_INFO +*TabZahlen CUI_HID_NUMBERFORMAT +Kategorie cui.ListBox.10041.9 +ZahlenFormat CUI_HID_NUMBERFORMAT_LB_FORMAT +Sprache cui.ListBox.10041.13 +FormatPreview CUI_HID_NUMBERFORMAT_WND_NUMBER_PREVIEW +FormatCode cui.Edit.10041.14 +FuehrendeNullen cui.NumericField.10041.24 +Nachkommastellen cui.NumericField.10041.22 +NegativInRot cui.CheckBox.10041.25 +Tausenderpunkt cui.CheckBox.10041.26 +PBHinzufuegen CUI_HID_NUMBERFORMAT_TBI_ADD +PBEntfernen CUI_HID_NUMBERFORMAT_TBI_REMOVE +PBInfo CUI_HID_NUMBERFORMAT_TBI_INFO Kommentar cui:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT -Zurueck HID_TABDLG_RESET_BTN -FormatSprache cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY -Standard HID_TABDLG_STANDARD_BTN -Standardformat cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT +Zurueck SFX2_HID_TABDLG_RESET_BTN +FormatSprache cui.ListBox.10041.33 +Standard SFX2_HID_TABDLG_STANDARD_BTN +Standardformat cui.CheckBox.10041.34 -*TabZeilennumerierung HID_LINENUMBERING +*TabZeilennumerierung SW_HID_LINENUMBERING Einschalten SW:CHECKBOX:TP_LINENUMBERING:CB_NUMBERING_ON Vorlage SW:LISTBOX:TP_LINENUMBERING:LB_CHAR_STYLE Format SW:LISTBOX:TP_LINENUMBERING:LB_FORMAT @@ -365,37 +365,37 @@ Alle SW:NUMERICFIELD:TP_LINENUMBERING:NF_DIV_INTERVAL Leerzeilen SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_EMPTYLINES ZeilenInTextrahmen SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_FRAMELINES -*TabZellschutz HID_SCPAGE_PROTECTION -Gesperrt sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_PROTECTED -AllesAusblenden sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_ALL -FormelAusblenden sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_FORMULAR -FuerAusdruckAusblenden sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_PRINT -Zurueck HID_TABDLG_RESET_BTN -Standard HID_TABDLG_STANDARD_BTN +*TabZellschutz SC_HID_SCPAGE_PROTECTION +Gesperrt sc.TriStateBox.25607.1 +AllesAusblenden sc.TriStateBox.25607.3 +FormelAusblenden sc.TriStateBox.25607.2 +FuerAusdruckAusblenden sc.TriStateBox.25607.6 +Zurueck SFX2_HID_TABDLG_RESET_BTN +Standard SFX2_HID_TABDLG_STANDARD_BTN -*TabZuschneiden HID_SVXPAGE_GRFCROP -Links cui:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT -Rechts cui:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT -Oben cui:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP -Unten cui:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM -GroesseBeibehalten cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST -MassstabBeibehalten cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST -GroesseBreite cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH -GroesseHoehe cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT -MassstabBreite cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM -MassstabHoehe cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM -Originalgroesse cui:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE +*TabZuschneiden CUI_HID_SVXPAGE_GRFCROP +Links cui.MetricField.10238.17 +Rechts cui.MetricField.10238.18 +Oben cui.MetricField.10238.19 +Unten cui.MetricField.10238.14 +GroesseBeibehalten cui.RadioButton.10238.23 +MassstabBeibehalten cui.RadioButton.10238.24 +GroesseBreite cui.MetricField.10238.20 +GroesseHoehe cui.MetricField.10238.15 +MassstabBreite cui.MetricField.10238.21 +MassstabHoehe cui.MetricField.10238.16 +Originalgroesse cui.PushButton.10238.22 -*TabZusaetze HID_FRM_ADD -ObjektName sw:Edit:TP_FRM_ADD:ED_NAME -Alternativtext sw:Edit:TP_FRM_ADD:ED_ALT_NAME -InhaltSchuetzen sw:CheckBox:TP_FRM_ADD:CB_PROTECT_CONTENT -PositionSchuetzen sw:CheckBox:TP_FRM_ADD:CB_PROTECT_FRAME -GroesseSchuetzen sw:CheckBox:TP_FRM_ADD:CB_PROTECT_SIZE -Drucken sw:CheckBox:TP_FRM_ADD:CB_PRINT_FRAME +*TabZusaetze SW_HID_FRM_ADD +ObjektName sw.Edit.20851.111 +Alternativtext sw.Edit.20851.113 +InhaltSchuetzen sw.CheckBox.20851.119 +PositionSchuetzen sw.CheckBox.20851.120 +GroesseSchuetzen sw.CheckBox.20851.121 +Drucken sw.CheckBox.20851.124 Editierbar SW:CHECKBOX:TP_FRM_ADD:CB_EDIT_IN_READONLY -PreviousLink sw:ListBox:TP_FRM_ADD:LB_PREV -NextLink sw:ListBox:TP_FRM_ADD:LB_NEXT -TextDirection sw:ListBox:TP_FRM_ADD:LB_TEXTFLOW +PreviousLink sw.ListBox.20851.115 +NextLink sw.ListBox.20851.117 +TextDirection sw.ListBox.20851.128 +TabZusaetzeEtiketten TabDruckerEtiketten diff --git a/testautomation/global/win/w_autop.win b/testautomation/global/win/w_autop.win old mode 100755 new mode 100644 index e24f9e1d37c6..dad715fbf731 --- a/testautomation/global/win/w_autop.win +++ b/testautomation/global/win/w_autop.win @@ -1,29 +1,29 @@ -*AutopilotBrief1 HID_LETTER_PAGE1 -*AutopilotBrief2 HID_LETTER_PAGE2 -*AutopilotBrief3 HID_LETTER_PAGE3 -*AutopilotBrief4 HID_LETTER_PAGE4 -*AutopilotBrief5 HID_LETTER_PAGE5 -*AutopilotBrief6 HID_LETTER_PAGE6 -*AutopilotBrief7 HID_LETTER_PAGE7 -*AutopilotBrief8 HID_LETTER_PAGE8 -*AutopilotBrief9 HID_LETTER_PAGE9 -*AutopilotFax1 HID_FAX_PAGE1 -*AutopilotFax2 HID_FAX_PAGE2 -*AutopilotFax3 HID_FAX_PAGE3 -*AutopilotFax4 HID_FAX_PAGE4 -*AutopilotFax5 HID_FAX_PAGE5 -*AutopilotFax6 HID_FAX_PAGE6 -*AutopilotFax7 HID_FAX_PAGE7 -*AutopilotFax8 HID_FAX_PAGE8 -*AutopilotMemo1 HID_MEMO_PAGE1 -*AutopilotMemo2 HID_MEMO_PAGE2 -*AutopilotMemo3 HID_MEMO_PAGE3 -*AutopilotMemo4 HID_MEMO_PAGE4 -*AutopilotMemo5 HID_MEMO_PAGE5 -*AutopilotAgenda1 HID_AGENDA_PAGE1 -*AutopilotAgenda2 HID_AGENDA_PAGE2 -*AutopilotAgenda3 HID_AGENDA_PAGE3 -*AutopilotAgenda4 HID_AGENDA_PAGE4 -*AutopilotAgenda5 HID_AGENDA_PAGE5 -*AutopilotAgenda6 HID_AGENDA_PAGE6 +*AutopilotBrief1 SW_HID_LETTER_PAGE1 +*AutopilotBrief2 SW_HID_LETTER_PAGE2 +*AutopilotBrief3 SW_HID_LETTER_PAGE3 +*AutopilotBrief4 SW_HID_LETTER_PAGE4 +*AutopilotBrief5 SW_HID_LETTER_PAGE5 +*AutopilotBrief6 SW_HID_LETTER_PAGE6 +*AutopilotBrief7 SW_HID_LETTER_PAGE7 +*AutopilotBrief8 SW_HID_LETTER_PAGE8 +*AutopilotBrief9 SW_HID_LETTER_PAGE9 +*AutopilotFax1 SW_HID_FAX_PAGE1 +*AutopilotFax2 SW_HID_FAX_PAGE2 +*AutopilotFax3 SW_HID_FAX_PAGE3 +*AutopilotFax4 SW_HID_FAX_PAGE4 +*AutopilotFax5 SW_HID_FAX_PAGE5 +*AutopilotFax6 SW_HID_FAX_PAGE6 +*AutopilotFax7 SW_HID_FAX_PAGE7 +*AutopilotFax8 SW_HID_FAX_PAGE8 +*AutopilotMemo1 SW_HID_MEMO_PAGE1 +*AutopilotMemo2 SW_HID_MEMO_PAGE2 +*AutopilotMemo3 SW_HID_MEMO_PAGE3 +*AutopilotMemo4 SW_HID_MEMO_PAGE4 +*AutopilotMemo5 SW_HID_MEMO_PAGE5 +*AutopilotAgenda1 SW_HID_AGENDA_PAGE1 +*AutopilotAgenda2 SW_HID_AGENDA_PAGE2 +*AutopilotAgenda3 SW_HID_AGENDA_PAGE3 +*AutopilotAgenda4 SW_HID_AGENDA_PAGE4 +*AutopilotAgenda5 SW_HID_AGENDA_PAGE5 +*AutopilotAgenda6 SW_HID_AGENDA_PAGE6 -- cgit From 72056dce2fde9a092c6fd28663fe61c8ccf4f085 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 23 Sep 2010 17:00:54 +0200 Subject: CWS changehid: use sym: prefix to silent search in hid.lst --- testautomation/global/sid/all.sid | 990 +++++++++++------------ testautomation/global/sid/bars.sid | 1115 +++++++++++++------------- testautomation/global/sid/context.sid | 36 +- testautomation/global/sid/e_all.sid | 1024 +++++++++++------------ testautomation/global/sid/others.sid | 41 +- testautomation/global/win/bars.win | 360 ++++----- testautomation/global/win/dial_a_c.win | 458 +++++------ testautomation/global/win/dial_d_h.win | 910 ++++++++++----------- testautomation/global/win/dial_i_o.win | 740 ++++++++--------- testautomation/global/win/dial_p_s.win | 716 ++++++++--------- testautomation/global/win/dial_t_z.win | 528 ++++++------ testautomation/global/win/dokument.win | 90 +-- testautomation/global/win/e_mathop.win | 386 ++++----- testautomation/global/win/edia_a_c.win | 919 +++++++++++---------- testautomation/global/win/edia_d_h.win | 960 +++++++++++----------- testautomation/global/win/edia_i_o.win | 580 +++++++------- testautomation/global/win/edia_p_s.win | 1074 ++++++++++++------------- testautomation/global/win/edia_t_z.win | 514 ++++++------ testautomation/global/win/etab_a_d.win | 910 ++++++++++----------- testautomation/global/win/etab_e_g.win | 676 ++++++++-------- testautomation/global/win/etab_h_o.win | 464 +++++------ testautomation/global/win/etab_p_s.win | 216 ++--- testautomation/global/win/etab_t_z.win | 284 +++---- testautomation/global/win/etoolbox.win | 90 +-- testautomation/global/win/mathop.win | 382 ++++----- testautomation/global/win/piloten.win | 130 +-- testautomation/global/win/reportdesigner.win | 126 +-- testautomation/global/win/spadmin.win | 210 ++--- testautomation/global/win/sys_dial.win | 178 ++-- testautomation/global/win/tab_a_d.win | 566 ++++++------- testautomation/global/win/tab_e_g.win | 468 +++++------ testautomation/global/win/tab_h_o.win | 730 ++++++++--------- testautomation/global/win/tab_p_s.win | 456 +++++------ testautomation/global/win/tab_t_z.win | 636 +++++++-------- testautomation/global/win/w_autop.win | 56 +- 35 files changed, 9004 insertions(+), 9015 deletions(-) diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid index 87ecbf120ae1..a5162431e8fa 100644 --- a/testautomation/global/sid/all.sid +++ b/testautomation/global/sid/all.sid @@ -10,17 +10,17 @@ ' *** Nicht mehr aktuelle Slots, *** ' ** die aber noch verwendet werden ** ' ** -DateiNeu .uno:NewDoc -DateiLetzteVersion .uno:Reload SID_LASTVERSIONDOC -DateiVersenden .uno:SendMail -DateiScannenQuelleAuswaehlen .uno:TwainSelect -DateiScannenAnfordern .uno:TwainSelect -BearbeitenAllesMarkieren .uno:Select -EinfuegenObjekt .uno:InsertObject -EinfuegenObjektObjekte .uno:InsertObject -EinfuegenObjektWriter .uno:InsertObjectDialog -EinfuegenRahmenfenster .uno:InsertObjectFloatingFrame -ExtrasNumerierungAufzaehlung .uno:BulletsAndNumberingDialog +DateiNeu sym:.uno:NewDoc +DateiLetzteVersion sym:.uno:Reload SID_LASTVERSIONDOC +DateiVersenden sym:.uno:SendMail +DateiScannenQuelleAuswaehlen sym:.uno:TwainSelect +DateiScannenAnfordern sym:.uno:TwainSelect +BearbeitenAllesMarkieren sym:.uno:Select +EinfuegenObjekt sym:.uno:InsertObject +EinfuegenObjektObjekte sym:.uno:InsertObject +EinfuegenObjektWriter sym:.uno:InsertObjectDialog +EinfuegenRahmenfenster sym:.uno:InsertObjectFloatingFrame +ExtrasNumerierungAufzaehlung sym:.uno:BulletsAndNumberingDialog ' *************************************************** @@ -28,620 +28,620 @@ ExtrasNumerierungAufzaehlung .uno:BulletsAndNumberingDialog ' ********* DateiMen� ********* ' **** ' **** Alle -DateiNeuAusVorlage .uno:NewDoc -DateiOeffnen .uno:Open +DateiNeuAusVorlage sym:.uno:NewDoc +DateiOeffnen sym:.uno:Open DateiAutopilotBrief service:com.sun.star.wizards.letter.CallWizard?start DateiAutopilotFax service:com.sun.star.wizards.fax.CallWizard?start DateiAutopilotAgenda service:com.sun.star.wizards.agenda.CallWizard?start -DateiAutopilotPraesentation .uno:AutoPilotPresentations -DateiSchliessenUndZurueck .uno:CloseDoc -DateiKopieAktualisieren .uno:Save -DateiKopieSpeichern .uno:SaveAs -DateiSchliessen .uno:CloseDoc -DateiSpeichern .uno:Save -DateiSpeichernUnter .uno:SaveAs -DateiAllesSpeichern .uno:SaveAll -DateiExportieren .uno:ExportTo -DateiSendenDokumentAlseMail .uno:SendMail -DateiVersionen .uno:VersionDialog -DateiNeuLaden .uno:Reload SID_LASTVERSIONDOC -DateiEigenschaften .uno:SetDocumentProperties -DateiDokumentvorlageSpeichern .uno:SaveAsTemplate -DateiDokumentvorlageVerwalten .uno:Organizer -DateiDokumentvorlageBearbeiten .uno:OpenTemplate -DateiSeitenansicht .uno:PrintPreview -DateiDrucken .uno:Print -DateiDruckereinstellung .uno:PrinterSetup -DateiBeenden .uno:Quit +DateiAutopilotPraesentation sym:.uno:AutoPilotPresentations +DateiSchliessenUndZurueck sym:.uno:CloseDoc +DateiKopieAktualisieren sym:.uno:Save +DateiKopieSpeichern sym:.uno:SaveAs +DateiSchliessen sym:.uno:CloseDoc +DateiSpeichern sym:.uno:Save +DateiSpeichernUnter sym:.uno:SaveAs +DateiAllesSpeichern sym:.uno:SaveAll +DateiExportieren sym:.uno:ExportTo +DateiSendenDokumentAlseMail sym:.uno:SendMail +DateiVersionen sym:.uno:VersionDialog +DateiNeuLaden sym:.uno:Reload SID_LASTVERSIONDOC +DateiEigenschaften sym:.uno:SetDocumentProperties +DateiDokumentvorlageSpeichern sym:.uno:SaveAsTemplate +DateiDokumentvorlageVerwalten sym:.uno:Organizer +DateiDokumentvorlageBearbeiten sym:.uno:OpenTemplate +DateiSeitenansicht sym:.uno:PrintPreview +DateiDrucken sym:.uno:Print +DateiDruckereinstellung sym:.uno:PrinterSetup +DateiBeenden sym:.uno:Quit ' **** Writer -DateiSendenGliederungAnPraesentation .uno:SendOutlineToStarImpress -DateiSendenGliederungZumClipboard .uno:SendOutlineToClipboard -DateiSendenAutoabstractErzeugen .uno:CreateAbstract -DateiSendenAutoabstractAnPraesentation .uno:SendAbstractToStarImpress -DateiSendenGlobaldokumentErzeugen .uno:NewGlobalDoc -DateiSendenHTMLDokumentErzeugen .uno:NewHtmlDoc -DateiSerienbrief .uno:MergeDialog +DateiSendenGliederungAnPraesentation sym:.uno:SendOutlineToStarImpress +DateiSendenGliederungZumClipboard sym:.uno:SendOutlineToClipboard +DateiSendenAutoabstractErzeugen sym:.uno:CreateAbstract +DateiSendenAutoabstractAnPraesentation sym:.uno:SendAbstractToStarImpress +DateiSendenGlobaldokumentErzeugen sym:.uno:NewGlobalDoc +DateiSendenHTMLDokumentErzeugen sym:.uno:NewHtmlDoc +DateiSerienbrief sym:.uno:MergeDialog ' **** Impress / Draw -DateiSeiteEinrichten .uno:PageSetup -Dateieinpacken .uno:PackAndGo +DateiSeiteEinrichten sym:.uno:PageSetup +Dateieinpacken sym:.uno:PackAndGo ' **** Image / Chart / Math -DateiDokumentAlsEMail .uno:SendMail +DateiDokumentAlsEMail sym:.uno:SendMail ' *********************************** ' ********* Bearbeitenmenue ********* ' **** ' **** Alle -BearbeitenRueckgaengig .uno:Undo -BearbeitenWiederholen .uno:Redo -BearbeitenLetzterBefehl .uno:RepeatAction -BearbeitenAusschneiden .uno:Cut -BearbeitenKopieren .uno:Copy -BearbeitenEinfuegen .uno:Paste -BearbeitenLoeschen .uno:Delete -BearbeitenAllesAuswaehlen .uno:SelectAll -BearbeitenSuchenErsetzen .uno:SearchDialog -BearbeitenNavigator .uno:Navigator -BearbeitenAutoText .uno:EditGlossary -BearbeitenPlugIn .uno:PlugInsActive -BearbeitenImageMap .uno:ImageMapDialog -BearbeitenLiteraturdatenbank .uno:BibliographyComponent +BearbeitenRueckgaengig sym:.uno:Undo +BearbeitenWiederholen sym:.uno:Redo +BearbeitenLetzterBefehl sym:.uno:RepeatAction +BearbeitenAusschneiden sym:.uno:Cut +BearbeitenKopieren sym:.uno:Copy +BearbeitenEinfuegen sym:.uno:Paste +BearbeitenLoeschen sym:.uno:Delete +BearbeitenAllesAuswaehlen sym:.uno:SelectAll +BearbeitenSuchenErsetzen sym:.uno:SearchDialog +BearbeitenNavigator sym:.uno:Navigator +BearbeitenAutoText sym:.uno:EditGlossary +BearbeitenPlugIn sym:.uno:PlugInsActive +BearbeitenImageMap sym:.uno:ImageMapDialog +BearbeitenLiteraturdatenbank sym:.uno:BibliographyComponent ' **** Writer BearbeitenInhalteEinfuegenWriter .uno:PasteSpecial -BearbeitenAenderungenAufzeichnen .uno:TrackChanges -BearbeitenAenderungenAnzeigen .uno:ShowTrackedChanges -BearbeitenAenderungenAkzeptierenOderVerwerfen .uno:AcceptTrackedChanges -BearbeitenAenderungenKommentar .uno:CommentChangeTracking -BearbeitenAenderungenDokumentZusammenfuehren .uno:MergeDocuments -BearbeitenDokumentVergleichen .uno:CompareDocuments -BearbeitenVerknuepfungenWriter .uno:LinkDialog -BearbeitenDatenbankAustauschen .uno:ChangeDatabaseField -BearbeitenFeldbefehl .uno:FieldDialog -BearbeitenFussnote .uno:EditFootnote -BearbeitenVerzeichniseintrag .uno:IndexEntryDialog -BearbeitenHyperlink .uno:EditHyperlink +BearbeitenAenderungenAufzeichnen sym:.uno:TrackChanges +BearbeitenAenderungenAnzeigen sym:.uno:ShowTrackedChanges +BearbeitenAenderungenAkzeptierenOderVerwerfen sym:.uno:AcceptTrackedChanges +BearbeitenAenderungenKommentar sym:.uno:CommentChangeTracking +BearbeitenAenderungenDokumentZusammenfuehren sym:.uno:MergeDocuments +BearbeitenDokumentVergleichen sym:.uno:CompareDocuments +BearbeitenVerknuepfungenWriter sym:.uno:LinkDialog +BearbeitenDatenbankAustauschen sym:.uno:ChangeDatabaseField +BearbeitenFeldbefehl sym:.uno:FieldDialog +BearbeitenFussnote sym:.uno:EditFootnote +BearbeitenVerzeichniseintrag sym:.uno:IndexEntryDialog +BearbeitenHyperlink sym:.uno:EditHyperlink ' **** Calc BearbeitenInhalteEinfuegenCalc .uno:PasteSpecial -BearbeitenAenderungenAufzeichnenCalc .uno:TraceChangeMode -BearbeitenAenderungenSchuetzen .uno:ProtectTraceChangeMode -BearbeitenAenderungenKommentarCalc .uno:CommentChange -BearbeitenAenderungenAnzeigenCalc .uno:ShowChanges -BearbeitenAenderungenAkzeptierenOderVerwerfenCalc .uno:AcceptChanges -BearbeitenAenderungenDokumentZusammenfuehrenCalc .uno:MergeDocuments -BearbeitenDokumentVergleichenCalc .uno:CompareDocuments -BearbeitenVerknuepfungenCalc .uno:EditLinks -BearbeitenKopfUndFusszeilen .uno:EditHeaderAndFooter -BearbeitenAusfuellenLinks .uno:FillLeft -BearbeitenAusfuellenOben .uno:FillUp -BearbeitenAusfuellenRechts .uno:FillRight -BearbeitenAusfuellenReihe .uno:FillSeries -BearbeitenAusfuellenTabelle .uno:FillTable -BearbeitenAusfuellenUnten .uno:FillDown -BearbeitenInhalteLoeschen .uno:Delete -BearbeitenZellenLoeschen .uno:DeleteCell -BearbeitenTabelleLoeschen .uno:Remove -BearbeitenTabelleVerschiebenKopieren .uno:Move -BearbeitenManuellenUmbruchLoeschenSpaltenumbruch .uno:DeleteColumnbreak -BearbeitenManuellenUmbruchLoeschenZeilenumbruch .uno:DeleteRowbreak +BearbeitenAenderungenAufzeichnenCalc sym:.uno:TraceChangeMode +BearbeitenAenderungenSchuetzen sym:.uno:ProtectTraceChangeMode +BearbeitenAenderungenKommentarCalc sym:.uno:CommentChange +BearbeitenAenderungenAnzeigenCalc sym:.uno:ShowChanges +BearbeitenAenderungenAkzeptierenOderVerwerfenCalc sym:.uno:AcceptChanges +BearbeitenAenderungenDokumentZusammenfuehrenCalc sym:.uno:MergeDocuments +BearbeitenDokumentVergleichenCalc sym:.uno:CompareDocuments +BearbeitenVerknuepfungenCalc sym:.uno:EditLinks +BearbeitenKopfUndFusszeilen sym:.uno:EditHeaderAndFooter +BearbeitenAusfuellenLinks sym:.uno:FillLeft +BearbeitenAusfuellenOben sym:.uno:FillUp +BearbeitenAusfuellenRechts sym:.uno:FillRight +BearbeitenAusfuellenReihe sym:.uno:FillSeries +BearbeitenAusfuellenTabelle sym:.uno:FillTable +BearbeitenAusfuellenUnten sym:.uno:FillDown +BearbeitenInhalteLoeschen sym:.uno:Delete +BearbeitenZellenLoeschen sym:.uno:DeleteCell +BearbeitenTabelleLoeschen sym:.uno:Remove +BearbeitenTabelleVerschiebenKopieren sym:.uno:Move +BearbeitenManuellenUmbruchLoeschenSpaltenumbruch sym:.uno:DeleteColumnbreak +BearbeitenManuellenUmbruchLoeschenZeilenumbruch sym:.uno:DeleteRowbreak ' **** Draw / Impress BearbeitenInhalteEinfuegenDraw .uno:PasteSpecial -BearbeitenVerknuepfungenDraw .uno:ManageLinks -BearbeitenDuplizieren .uno:CopyObjects -BearbeitenUeberblenden .uno:Morphing -BearbeitenSeiteLoeschen .uno:DeletePage -BearbeitenEbeneLoeschen .uno:DeleteLayer -BearbeitenFeldbefehlDraw .uno:ModifyField +BearbeitenVerknuepfungenDraw sym:.uno:ManageLinks +BearbeitenDuplizieren sym:.uno:CopyObjects +BearbeitenUeberblenden sym:.uno:Morphing +BearbeitenSeiteLoeschen sym:.uno:DeletePage +BearbeitenEbeneLoeschen sym:.uno:DeleteLayer +BearbeitenFeldbefehlDraw sym:.uno:ModifyField ' **** Image / Chart / Math -BearbeitenAllesAuswaehlenMath .uno:Select -BearbeitenNaechsterMarker .uno:NextMark -BearbeitenVorherigerMarker .uno:PrevMark -BearbeitenNaechsterFehler .uno:NextError -BearbeitenVorherigerFehler .uno:PrevError -BearbeitenDiagrammdaten CHART2_HID_DIAGRAM_DATA +BearbeitenAllesAuswaehlenMath sym:.uno:Select +BearbeitenNaechsterMarker sym:.uno:NextMark +BearbeitenVorherigerMarker sym:.uno:PrevMark +BearbeitenNaechsterFehler sym:.uno:NextError +BearbeitenVorherigerFehler sym:.uno:PrevError +BearbeitenDiagrammdaten sym:CHART2_HID_DIAGRAM_DATA ' *********************************** ' ********* Ansichtmenue ********* ' **** ' **** Alle -AnsichtMassstab .uno:Zoom -AnsichtBrowser .uno:Beamer -AnsichtHyperlinkleiste .uno:InsertHyperlink -AnsichtStatusleiste .uno:StatusBarVisible .uno:StatusBarVisible -AnsichtGanzerBildschirm .uno:FullScreen SID_FULLSCREEN +AnsichtMassstab sym:.uno:Zoom +AnsichtBrowser sym:.uno:Beamer +AnsichtHyperlinkleiste sym:.uno:InsertHyperlink +AnsichtStatusleiste sym:.uno:StatusBarVisible sym:.uno:StatusBarVisible +AnsichtGanzerBildschirm sym:.uno:FullScreen SID_FULLSCREEN ' **** Writer -AnsichtLineal .uno:Ruler -AnsichtAktuelleDatenbank .uno:DataImport -AnsichtTextbegrenzungen .uno:ViewBounds -AnsichtMarkierungen .uno:Marks -AnsichtFeldbefehle .uno:Fieldnames -AnsichtSteuerzeichen .uno:ControlCodes -AnsichtOnlineLayout .uno:BrowseView -AnsichtVersteckteAbsaetze .uno:ShowHiddenParagraphs -AnsichtHTMLBearbeitung .uno:HtmlMode -AnsichtHTMLQuelltextWriter SW_HID_SOURCEVIEW +AnsichtLineal sym:.uno:Ruler +AnsichtAktuelleDatenbank sym:.uno:DataImport +AnsichtTextbegrenzungen sym:.uno:ViewBounds +AnsichtMarkierungen sym:.uno:Marks +AnsichtFeldbefehle sym:.uno:Fieldnames +AnsichtSteuerzeichen sym:.uno:ControlCodes +AnsichtOnlineLayout sym:.uno:BrowseView +AnsichtVersteckteAbsaetze sym:.uno:ShowHiddenParagraphs +AnsichtHTMLBearbeitung sym:.uno:HtmlMode +AnsichtHTMLQuelltextWriter sym:SW_HID_SOURCEVIEW ' **** Calc -AnsichtRechenleiste .uno:InputLineVisible -AnsichtSpaltenZeilenkoepfe .uno:ViewRowColumnHeaders -AnsichtWerteHervorheben .uno:ViewValueHighlighting -AnsichtSeitenumbruchVorschau .uno:PagebreakMode +AnsichtRechenleiste sym:.uno:InputLineVisible +AnsichtSpaltenZeilenkoepfe sym:.uno:ViewRowColumnHeaders +AnsichtWerteHervorheben sym:.uno:ViewValueHighlighting +AnsichtSeitenumbruchVorschau sym:.uno:PagebreakMode ' **** Draw / Impress -AnsichtFarbleiste .uno:ColorControl -AnsichtLineale .uno:ShowRuler -AnsichtZeichnung .uno:DrawingMode -AnsichtGliederung .uno:OutlineMode -AnsichtDiasortierung .uno:DiaMode -AnsichtNotizen .uno:NotesMode -AnsichtHandzettel .uno:HandoutMode -AnsichtBildschirmpraesentation .uno:Presentation -AnsichtVorschau .uno:PreviewWindow -AnsichtSeite .uno:PageMode -AnsichtHintergrund .uno:MasterPage -AnsichtHintergrundZeichnung .uno:SlideMasterPage -AnsichtHintergrundTitel .uno:TitleMasterPage -AnsichtHintergrundNotizen .uno:NotesMasterPage -AnsichtHintergrundHandzettel .uno:HandoutMasterPage -AnsichtEbene .uno:LayerMode +AnsichtFarbleiste sym:.uno:ColorControl +AnsichtLineale sym:.uno:ShowRuler +AnsichtZeichnung sym:.uno:DrawingMode +AnsichtGliederung sym:.uno:OutlineMode +AnsichtDiasortierung sym:.uno:DiaMode +AnsichtNotizen sym:.uno:NotesMode +AnsichtHandzettel sym:.uno:HandoutMode +AnsichtBildschirmpraesentation sym:.uno:Presentation +AnsichtVorschau sym:.uno:PreviewWindow +AnsichtSeite sym:.uno:PageMode +AnsichtHintergrund sym:.uno:MasterPage +AnsichtHintergrundZeichnung sym:.uno:SlideMasterPage +AnsichtHintergrundTitel sym:.uno:TitleMasterPage +AnsichtHintergrundNotizen sym:.uno:NotesMasterPage +AnsichtHintergrundHandzettel sym:.uno:HandoutMasterPage +AnsichtEbene sym:.uno:LayerMode ' **** Image -AnsichtFuenfzig .uno:View50 -AnsichtEinhundert .uno:View100 -AnsichtZweihundert .uno:View200 -AnsichtVergroessern .uno:ZoomIn -AnsichtVerkleinern .uno:ZoomOut -AnsichtAllesAnzeigen .uno:Adjust -AnsichtAktualisieren .uno:Draw -AnsichtOperatoren .uno:ToolBox +AnsichtFuenfzig sym:.uno:View50 +AnsichtEinhundert sym:.uno:View100 +AnsichtZweihundert sym:.uno:View200 +AnsichtVergroessern sym:.uno:ZoomIn +AnsichtVerkleinern sym:.uno:ZoomOut +AnsichtAllesAnzeigen sym:.uno:Adjust +AnsichtAktualisieren sym:.uno:Draw +AnsichtOperatoren sym:.uno:ToolBox ' **** Math -AnsichtAutomatischesNeuzeichnen .uno:RedrawAutomatic +AnsichtAutomatischesNeuzeichnen sym:.uno:RedrawAutomatic ' **** Frameset -AnsichtHTMLQuelltextFrame .uno:SourceView +AnsichtHTMLQuelltextFrame sym:.uno:SourceView ' **** WriterWeb -AnsichtDruckLayout .uno:PrintLayout -AnsichtHTMLQuelltext .uno:SourceView +AnsichtDruckLayout sym:.uno:PrintLayout +AnsichtHTMLQuelltext sym:.uno:SourceView ' *********************************** ' ********* Einfuegenmenue ********** ' **** ' **** Alle -EinfuegenGrafikAusDatei .uno:InsertGraphic -EinfuegenGrafikDiagramm .uno:InsertObjectChart -EinfuegenObjektOLEObjekt .uno:InsertObject -EinfuegenObjektPlugIn .uno:InsertPlugin -EinfuegenObjektKlang .uno:InsertSound -EinfuegenObjektVideo .uno:InsertVideo -EinfuegenFrame .uno:InsertObjectFloatingFrame +EinfuegenGrafikAusDatei sym:.uno:InsertGraphic +EinfuegenGrafikDiagramm sym:.uno:InsertObjectChart +EinfuegenObjektOLEObjekt sym:.uno:InsertObject +EinfuegenObjektPlugIn sym:.uno:InsertPlugin +EinfuegenObjektKlang sym:.uno:InsertSound +EinfuegenObjektVideo sym:.uno:InsertVideo +EinfuegenFrame sym:.uno:InsertObjectFloatingFrame ' **** Writer EinfuegenSonderzeichenWriter .uno:InsertSymbol -EinfuegenFormelWriter .uno:InsertObjectStarMath -EinfuegenTabelleWriter .uno:InsertTable -EinfuegenDateiWriter .uno:InsertDoc -EinfuegenManuellerUmbruch .uno:InsertBreak -EinfuegenFeldbefehlDatum .uno:InsertDateField -EinfuegenFeldbefehlUhrzeit .uno:InsertTimeField -EinfuegenFeldbefehlSeitennummer .uno:InsertPageNumberField -EinfuegenFeldbefehlSeitenanzahl .uno:InsertPageCountField -EinfuegenFeldbefehlThema .uno:InsertTopicField -EinfuegenFeldbefehlTitel .uno:InsertTitleField -EinfuegenFeldbefehlAutor .uno:InsertAuthorField -EinfuegenFeldbefehlAndere .uno:InsertField -EinfuegenBereich .uno:InsertSection -EinfuegenHyperlink .uno:HyperlinkDialog -EinfuegenFussnote .uno:InsertFootnoteDialog -EinfuegenBeschriftung .uno:InsertCaptionDialog -EinfuegenTextmarke .uno:InsertBookmark -EinfuegenQuerverweis .uno:InsertReferenceField -EinfuegenNotizWriter .uno:InsertAnnotation -EinfuegenScript .uno:InsertScript -EinfuegenVerzeichnis .uno:InsertMultiIndex -EinfuegenVerzeichnisseEintrag .uno:InsertIndexesEntry -EinfuegenVerzeichnisLiteraturverzeichnis .uno:InsertAuthoritiesEntry -EinfuegenBriefumschlag .uno:InsertEnvelope -EinfuegenEtiketten .uno:InsertLabels -EinfuegenVisitenkarten .uno:InsertBusinessCard -EinfuegenHorizontaleLinie .uno:InsertGraphicRuler -EinfuegenRahmen .uno:InsertFrame -EinfuegenGrafikScannenQuelleAuswaehlen .uno:TwainSelect -EinfuegenGrafikScannenAnfordern .uno:TwainTransfer +EinfuegenFormelWriter sym:.uno:InsertObjectStarMath +EinfuegenTabelleWriter sym:.uno:InsertTable +EinfuegenDateiWriter sym:.uno:InsertDoc +EinfuegenManuellerUmbruch sym:.uno:InsertBreak +EinfuegenFeldbefehlDatum sym:.uno:InsertDateField +EinfuegenFeldbefehlUhrzeit sym:.uno:InsertTimeField +EinfuegenFeldbefehlSeitennummer sym:.uno:InsertPageNumberField +EinfuegenFeldbefehlSeitenanzahl sym:.uno:InsertPageCountField +EinfuegenFeldbefehlThema sym:.uno:InsertTopicField +EinfuegenFeldbefehlTitel sym:.uno:InsertTitleField +EinfuegenFeldbefehlAutor sym:.uno:InsertAuthorField +EinfuegenFeldbefehlAndere sym:.uno:InsertField +EinfuegenBereich sym:.uno:InsertSection +EinfuegenHyperlink sym:.uno:HyperlinkDialog +EinfuegenFussnote sym:.uno:InsertFootnoteDialog +EinfuegenBeschriftung sym:.uno:InsertCaptionDialog +EinfuegenTextmarke sym:.uno:InsertBookmark +EinfuegenQuerverweis sym:.uno:InsertReferenceField +EinfuegenNotizWriter sym:.uno:InsertAnnotation +EinfuegenScript sym:.uno:InsertScript +EinfuegenVerzeichnis sym:.uno:InsertMultiIndex +EinfuegenVerzeichnisseEintrag sym:.uno:InsertIndexesEntry +EinfuegenVerzeichnisLiteraturverzeichnis sym:.uno:InsertAuthoritiesEntry +EinfuegenBriefumschlag sym:.uno:InsertEnvelope +EinfuegenEtiketten sym:.uno:InsertLabels +EinfuegenVisitenkarten sym:.uno:InsertBusinessCard +EinfuegenHorizontaleLinie sym:.uno:InsertGraphicRuler +EinfuegenRahmen sym:.uno:InsertFrame +EinfuegenGrafikScannenQuelleAuswaehlen sym:.uno:TwainSelect +EinfuegenGrafikScannenAnfordern sym:.uno:TwainTransfer ' **** Calc -EinfuegenSonderzeichenCalc .uno:InsertSymbol -EinfuegenGrafikAusBildbearbeitungCalc .uno:InsertObjectStarImage -EinfuegenFormelCalc .uno:InsertObjectStarMath -EinfuegenTabelleCalc .uno:Insert -EinfuegenManuellerUmbruchSpaltenumbruch .uno:InsertColumnBreak -EinfuegenManuellerUmbruchZeilenumbruch .uno:InsertRowBreak -EinfuegenZellen .uno:InsertCell -EinfuegenZeilenCalc .uno:InsertRows -EinfuegenSpaltenCalc .uno:InsertColumns -EinfuegenFunktion .uno:FunctionDialog -EinfuegenNamenEinfuegen .uno:InsertName -EinfuegenNamenFestlegen .uno:DefineName -EinfuegenNamenUebernehmen .uno:CreateNames -EinfuegenNamenBeschriftungen .uno:DefineLabelRange -EinfuegenNotizCalc .uno:InsertAnnotation -EinfuegenExterneDatenQuelle .uno:InsertExternalDataSource +EinfuegenSonderzeichenCalc sym:.uno:InsertSymbol +EinfuegenGrafikAusBildbearbeitungCalc sym:.uno:InsertObjectStarImage +EinfuegenFormelCalc sym:.uno:InsertObjectStarMath +EinfuegenTabelleCalc sym:.uno:Insert +EinfuegenManuellerUmbruchSpaltenumbruch sym:.uno:InsertColumnBreak +EinfuegenManuellerUmbruchZeilenumbruch sym:.uno:InsertRowBreak +EinfuegenZellen sym:.uno:InsertCell +EinfuegenZeilenCalc sym:.uno:InsertRows +EinfuegenSpaltenCalc sym:.uno:InsertColumns +EinfuegenFunktion sym:.uno:FunctionDialog +EinfuegenNamenEinfuegen sym:.uno:InsertName +EinfuegenNamenFestlegen sym:.uno:DefineName +EinfuegenNamenUebernehmen sym:.uno:CreateNames +EinfuegenNamenBeschriftungen sym:.uno:DefineLabelRange +EinfuegenNotizCalc sym:.uno:InsertAnnotation +EinfuegenExterneDatenQuelle sym:.uno:InsertExternalDataSource ' **** Einfuegenmenue : Draw EinfuegenSonderzeichenDraw .uno:InsertSymbol -EinfuegenGrafikAusBildbearbeitungDraw .uno:InsertImage -EinfuegenFormelDraw .uno:InsertMath -EinfuegenTabelleDraw .uno:InsertSpreadsheet -EinfuegenDateiDraw .uno:ImportFromFile -EinfuegenSeite .uno:InsertPage -EinfuegenSeiteDuplizieren .uno:DuplicatePage -EinfuegenSeitenAusGliederung .uno:ExpandPage -EinfuegenUebersichtsseite .uno:SummaryPage -EinfuegenEbene .uno:InsertLayer -EinfuegenFangliniePunkt .uno:CapturePoint -EinfuegenFeldbefehlDatumFix .uno:InsertDateFieldFix -EinfuegenFeldbefehlDatumVariabel .uno:InsertDateFieldVar -EinfuegenFeldbefehlUhrzeitFix .uno:InsertTimeFieldFix -EinfuegenFeldbefehlUhrzeitVariabel .uno:InsertTimeFieldVar -EinfuegenFeldbefehlAutorDraw .uno:InsertAuthorField -EinfuegenFeldbefehlSeitennummerDraw .uno:InsertPageField -EinfuegenFeldbefehlDateiname .uno:InsertFileField -EinfuegenQuelleAuswaehlen .uno:TwainSelect -EinfuegenAnfordern .uno:TwainTransfer -EinfuegenSymbol .uno:ChoosePolygon +EinfuegenGrafikAusBildbearbeitungDraw sym:.uno:InsertImage +EinfuegenFormelDraw sym:.uno:InsertMath +EinfuegenTabelleDraw sym:.uno:InsertSpreadsheet +EinfuegenDateiDraw sym:.uno:ImportFromFile +EinfuegenSeite sym:.uno:InsertPage +EinfuegenSeiteDuplizieren sym:.uno:DuplicatePage +EinfuegenSeitenAusGliederung sym:.uno:ExpandPage +EinfuegenUebersichtsseite sym:.uno:SummaryPage +EinfuegenEbene sym:.uno:InsertLayer +EinfuegenFangliniePunkt sym:.uno:CapturePoint +EinfuegenFeldbefehlDatumFix sym:.uno:InsertDateFieldFix +EinfuegenFeldbefehlDatumVariabel sym:.uno:InsertDateFieldVar +EinfuegenFeldbefehlUhrzeitFix sym:.uno:InsertTimeFieldFix +EinfuegenFeldbefehlUhrzeitVariabel sym:.uno:InsertTimeFieldVar +EinfuegenFeldbefehlAutorDraw sym:.uno:InsertAuthorField +EinfuegenFeldbefehlSeitennummerDraw sym:.uno:InsertPageField +EinfuegenFeldbefehlDateiname sym:.uno:InsertFileField +EinfuegenQuelleAuswaehlen sym:.uno:TwainSelect +EinfuegenAnfordern sym:.uno:TwainTransfer +EinfuegenSymbol sym:.uno:ChoosePolygon ' *********************************** ' *********** Formatmenue *********** ' **** ' **** Alle -FormatZeichen .uno:FontDialog +FormatZeichen sym:.uno:FontDialog FormatLinie .uno:FormatLine FormatFlaeche .uno:FormatArea -FormatAbsatz .uno:ParagraphDialog -FormatVorlagenkatalog .uno:StyleCatalog -FormatVorlagenLaden .uno:LoadStyles -FormatGestalter .uno:DesignerDialog -'FormatStylist .uno:DesignerDialog -FormatKontrollfeld .uno:ControlProperties -FormatFormularEigenschaften .uno:FormProperties -FormatGrossBuchstaben .uno:ChangeCaseToUpper -FormatKleinBuchstaben .uno:ChangeCaseToLower +FormatAbsatz sym:.uno:ParagraphDialog +FormatVorlagenkatalog sym:.uno:StyleCatalog +FormatVorlagenLaden sym:.uno:LoadStyles +FormatGestalter sym:.uno:DesignerDialog +'FormatStylist sym:.uno:DesignerDialog +FormatKontrollfeld sym:.uno:ControlProperties +FormatFormularEigenschaften sym:.uno:FormProperties +FormatGrossBuchstaben sym:.uno:ChangeCaseToUpper +FormatKleinBuchstaben sym:.uno:ChangeCaseToLower ' **** Writer -FormatStandardWriter .uno:ResetAttributes -FormatSeiteWriter .uno:PageDialog -FormatBereiche .uno:EditRegion -FormatNumerierungAufzaehlung .uno:BulletsAndNumberingDialog -FormatAutoformatWaehrendDerEingabe .uno:OnlineAutoFormat -FormatAutoFormatAutomatisch .uno:OnlineAutoFormat -FormatAutoformatDokumentFormatieren .uno:AutoFormatApply -FormatAutoFormatAutoFormat .uno:AutoFormat -FormatAutoFormatEinstellungen .uno:AutoFormat -FormatTabelle .uno:TableDialog -FormatTabelleAuftrennen .uno:SplitTable -FormatTabellenVerbinden .uno:MergeTable -FormatZahlenformat .uno:TableNumberFormatDialog -FormatZelleVerbinden .uno:MergeCells -FormatZelleTeilen .uno:SplitCell -FormatZelleOben .uno:CellVertTop -FormatZelleMitte .uno:CellVertCenter -FormatZelleUnten .uno:CellVertBottom -FormatZelleSchuetzen .uno:Protect -FormatZelleSchutzAufheben .uno:UnsetCellsReadOnly -FormatZeileHoehe .uno:SetRowHeight -FormatZeileOptimaleHoehe .uno:SetOptimalRowHeight -FormatZeileZeilenGleichmaessigVerteilen .uno:DistributeRows -FormatZeileSelektieren .uno:EntireRow -FormatZeileEinfuegen .uno:InsertRowDialog -FormatZeileLoeschen .uno:DeleteRows -FormatSpalteBreiteWriter .uno:SetColumnWidth -FormatSpalteOptimaleBreiteWriter .uno:SetOptimalColumnWidth -FormatSpalteSpaltenGleichmaessigVerteilen .uno:DistributeColumns -FormatSpalteSelektieren .uno:EntireColumn -FormatSpalteEinfuegen .uno:InsertColumnDialog -FormatSpalteLoeschen .uno:DeleteColumns -FormatGrafik .uno:GraphicDialog -FormatRahmen .uno:FrameDialog -FormatObjekt .uno:FrameDialog -FormatAnordnungGanzNachVorn .uno:BringToFront -FormatAnordnungWeiterNachVorn .uno:ObjectForwardOne -FormatAnordnungWeiterNachHinten .uno:ObjectBackOne -FormatAnordnungGanzNachHinten .uno:SendToBack -FormatAnordnungInDenVordergrund .uno:SetObjectToForeground -FormatAnordnungInDenHintergrund .uno:SetObjectToBackground -FormatAusrichtungLinks .uno:AlignLeft -FormatAusrichtungZentriert .uno:AlignHorizontalCenter -FormatAusrichtungRechts .uno:AlignRight -FormatAusrichtungOben .uno:AlignTop -FormatAusrichtungMitte .uno:AlignVerticalCenter -FormatAusrichtungUnten .uno:AlignBottom -FormatVerankerungAnDerSeite .uno:SetAnchorToPage -FormatVerankerungAmAbsatz .uno:SetAnchorToPara -FormatVerankerungAmZeichen .uno:SetAnchorToChar -FormatUmlaufKeinUmlauf .uno:WrapOff -FormatUmlaufSeitenumlauf .uno:WrapOn -FormatUmlaufIdealerSeitenumlauf .uno:WrapIdeal -FormatUmlaufDurchlauf .uno:WrapThrough -FormatUmlaufImHintergrund .uno:WrapThroughTransparent -FormatUmlaufKontur .uno:WrapContour -FormatUmlaufKonturBearbeiten .uno:ContourDialog -FormatUmlaufErsterAbsatz .uno:WrapAnchorOnly -FormatUmlaufBearbeiten .uno:TextWrap -FormatPositionUndGroesse .uno:TransformDialog -FormatSpiegelnVertikal .uno:FlipVertical -FormatSpiegelnHorizontal .uno:FlipHorizontal -FormatObjektAusrichtungLinks .uno:ObjectAlignLeft -FormatObjektAusrichtungZentriert .uno:AlignCenter -FormatObjektAusrichtungRechts .uno:ObjectAlignRight -FormatObjektAusrichtungOben .uno:AlignUp -FormatObjektAusrichtungMitte .uno:AlignMiddle -FormatObjektAusrichtungUnten .uno:AlignDown -FormatPunkteBearbeiten .uno:ToggleObjectBezierMode -FormatGruppeGruppieren .uno:FormatGroup -FormatGruppeAufheben .uno:FormatUngroup -FormatGruppeBetreten .uno:EnterGroup -FormatGruppeVerlassen .uno:LeaveGroup -FormatStilFett .uno:Bold -FormatStilKursiv .uno:Italic -FormatStilUnterstreichen .uno:Underline -FormatStilDurchstreichen .uno:Strikeout -FormatStilSchatten .uno:Shadowed -FormatStilKontur .uno:OutlineFont -FormatStilHochstellen .uno:SuperScript -FormatStilTiefstellen .uno:SubScript -FormatZeilenabstandEinzeilig .uno:SpacePara1 -FormatZeilenabstand15Zeilig .uno:SpacePara15 -FormatZeilenabstandZweizeilig .uno:SpacePara2 -FormatAusrichtungLinksText .uno:LeftPara -FormatAusrichtungRechtsText .uno:RightPara -FormatAusrichtungZentriertText .uno:CenterPara -FormatAusrichtungBlocksatzText .uno:JustifyPara +FormatStandardWriter sym:.uno:ResetAttributes +FormatSeiteWriter sym:.uno:PageDialog +FormatBereiche sym:.uno:EditRegion +FormatNumerierungAufzaehlung sym:.uno:BulletsAndNumberingDialog +FormatAutoformatWaehrendDerEingabe sym:.uno:OnlineAutoFormat +FormatAutoFormatAutomatisch sym:.uno:OnlineAutoFormat +FormatAutoformatDokumentFormatieren sym:.uno:AutoFormatApply +FormatAutoFormatAutoFormat sym:.uno:AutoFormat +FormatAutoFormatEinstellungen sym:.uno:AutoFormat +FormatTabelle sym:.uno:TableDialog +FormatTabelleAuftrennen sym:.uno:SplitTable +FormatTabellenVerbinden sym:.uno:MergeTable +FormatZahlenformat sym:.uno:TableNumberFormatDialog +FormatZelleVerbinden sym:.uno:MergeCells +FormatZelleTeilen sym:.uno:SplitCell +FormatZelleOben sym:.uno:CellVertTop +FormatZelleMitte sym:.uno:CellVertCenter +FormatZelleUnten sym:.uno:CellVertBottom +FormatZelleSchuetzen sym:.uno:Protect +FormatZelleSchutzAufheben sym:.uno:UnsetCellsReadOnly +FormatZeileHoehe sym:.uno:SetRowHeight +FormatZeileOptimaleHoehe sym:.uno:SetOptimalRowHeight +FormatZeileZeilenGleichmaessigVerteilen sym:.uno:DistributeRows +FormatZeileSelektieren sym:.uno:EntireRow +FormatZeileEinfuegen sym:.uno:InsertRowDialog +FormatZeileLoeschen sym:.uno:DeleteRows +FormatSpalteBreiteWriter sym:.uno:SetColumnWidth +FormatSpalteOptimaleBreiteWriter sym:.uno:SetOptimalColumnWidth +FormatSpalteSpaltenGleichmaessigVerteilen sym:.uno:DistributeColumns +FormatSpalteSelektieren sym:.uno:EntireColumn +FormatSpalteEinfuegen sym:.uno:InsertColumnDialog +FormatSpalteLoeschen sym:.uno:DeleteColumns +FormatGrafik sym:.uno:GraphicDialog +FormatRahmen sym:.uno:FrameDialog +FormatObjekt sym:.uno:FrameDialog +FormatAnordnungGanzNachVorn sym:.uno:BringToFront +FormatAnordnungWeiterNachVorn sym:.uno:ObjectForwardOne +FormatAnordnungWeiterNachHinten sym:.uno:ObjectBackOne +FormatAnordnungGanzNachHinten sym:.uno:SendToBack +FormatAnordnungInDenVordergrund sym:.uno:SetObjectToForeground +FormatAnordnungInDenHintergrund sym:.uno:SetObjectToBackground +FormatAusrichtungLinks sym:.uno:AlignLeft +FormatAusrichtungZentriert sym:.uno:AlignHorizontalCenter +FormatAusrichtungRechts sym:.uno:AlignRight +FormatAusrichtungOben sym:.uno:AlignTop +FormatAusrichtungMitte sym:.uno:AlignVerticalCenter +FormatAusrichtungUnten sym:.uno:AlignBottom +FormatVerankerungAnDerSeite sym:.uno:SetAnchorToPage +FormatVerankerungAmAbsatz sym:.uno:SetAnchorToPara +FormatVerankerungAmZeichen sym:.uno:SetAnchorToChar +FormatUmlaufKeinUmlauf sym:.uno:WrapOff +FormatUmlaufSeitenumlauf sym:.uno:WrapOn +FormatUmlaufIdealerSeitenumlauf sym:.uno:WrapIdeal +FormatUmlaufDurchlauf sym:.uno:WrapThrough +FormatUmlaufImHintergrund sym:.uno:WrapThroughTransparent +FormatUmlaufKontur sym:.uno:WrapContour +FormatUmlaufKonturBearbeiten sym:.uno:ContourDialog +FormatUmlaufErsterAbsatz sym:.uno:WrapAnchorOnly +FormatUmlaufBearbeiten sym:.uno:TextWrap +FormatPositionUndGroesse sym:.uno:TransformDialog +FormatSpiegelnVertikal sym:.uno:FlipVertical +FormatSpiegelnHorizontal sym:.uno:FlipHorizontal +FormatObjektAusrichtungLinks sym:.uno:ObjectAlignLeft +FormatObjektAusrichtungZentriert sym:.uno:AlignCenter +FormatObjektAusrichtungRechts sym:.uno:ObjectAlignRight +FormatObjektAusrichtungOben sym:.uno:AlignUp +FormatObjektAusrichtungMitte sym:.uno:AlignMiddle +FormatObjektAusrichtungUnten sym:.uno:AlignDown +FormatPunkteBearbeiten sym:.uno:ToggleObjectBezierMode +FormatGruppeGruppieren sym:.uno:FormatGroup +FormatGruppeAufheben sym:.uno:FormatUngroup +FormatGruppeBetreten sym:.uno:EnterGroup +FormatGruppeVerlassen sym:.uno:LeaveGroup +FormatStilFett sym:.uno:Bold +FormatStilKursiv sym:.uno:Italic +FormatStilUnterstreichen sym:.uno:Underline +FormatStilDurchstreichen sym:.uno:Strikeout +FormatStilSchatten sym:.uno:Shadowed +FormatStilKontur sym:.uno:OutlineFont +FormatStilHochstellen sym:.uno:SuperScript +FormatStilTiefstellen sym:.uno:SubScript +FormatZeilenabstandEinzeilig sym:.uno:SpacePara1 +FormatZeilenabstand15Zeilig sym:.uno:SpacePara15 +FormatZeilenabstandZweizeilig sym:.uno:SpacePara2 +FormatAusrichtungLinksText sym:.uno:LeftPara +FormatAusrichtungRechtsText sym:.uno:RightPara +FormatAusrichtungZentriertText sym:.uno:CenterPara +FormatAusrichtungBlocksatzText sym:.uno:JustifyPara ' alt -FormatGruppierung .uno:FormatGroup -FormatGruppierungAufheben .uno:FormatUngroup +FormatGruppierung sym:.uno:FormatGroup +FormatGruppierungAufheben sym:.uno:FormatUngroup ' Formatmenue : Calc -FormatStandardCalc .uno:ResetAttributes -FormatTextZeichnung .uno:TextAttributes -FormatSeiteCalc .uno:PageFormatDialog -FormatZelle .uno:FormatCellDialog -FormatZeileAusblenden .uno:HideRow -FormatZeileEinblenden .uno:ShowRow -FormatZeileHoeheCalc .uno:RowHeight -FormatZeileOptimaleHoeheCalc .uno:SetOptimalRowHeight -FormatSpalteAusblenden .uno:HideColumn -FormatSpalteBreiteCalc .uno:ColumnWidth -FormatSpalteEinblenden .uno:ShowColumn -FormatSpalteOptimaleBreiteCalc .uno:SetOptimalColumnWidth -FormatTabelleAusblenden .uno:Hide -FormatTabelleEinblenden .uno:Show -FormatTabelleUmbenennen .uno:RenameTable .uno:Name -FormatZellenZusammenfassenAufheben .uno:SplitCell -FormatZellenZusammenfassenFestlegen .uno:MergeCells -FormatDruckbereicheAufheben .uno:DeletePrintArea -FormatDruckbereicheBearbeiten .uno:EditPrintArea -FormatDruckbereicheFestlegen .uno:DefinePrintArea -FormatBedingteFormatierung .uno:ConditionalFormatDialog -FormatVerankerungSeite .uno:SetAnchorToPage -FormatVerankerungZelle .uno:SetAnchorToCell -FormatSpiegelnVertikalCalc .uno:ObjectMirrorVertical -FormatSpiegelnHorizontalCalc .uno:ObjectMirrorHorizontal -FormatAnordnungGanzNachVornCalc .uno:BringToFront -FormatAnordnungWeiterNachVornCalc .uno:ObjectForwardOne -FormatAnordnungWeiterNachHintenCalc .uno:ObjectBackOne -FormatAnordnungGanzNachHintenCalc .uno:SendToBack -FormatAnordnungInDenHintergrundCalc .uno:SetObjectToBackground -FormatAnordnungInDenVordergrundCalc .uno:SetObjectToForeground -FormatAusrichtungLinksCalc .uno:ObjectAlignLeft -FormatAusrichtungZentriertCalc .uno:AlignCenter -FormatAusrichtungRechtsCalc .uno:ObjectAlignRight -FormatAusrichtungObenCalc .uno:AlignUp -FormatAusrichtungMitteCalc .uno:AlignMiddle -FormatAusrichtungUntenCalc .uno:AlignDown -FormatGruppeGruppierenCalc .uno:FormatGroup -FormatGruppeAufhebenCalc .uno:FormatUngroup -FormatGruppeBetretenCalc .uno:EnterGroup -FormatGruppeVerlassenCalc .uno:LeaveGroup +FormatStandardCalc sym:.uno:ResetAttributes +FormatTextZeichnung sym:.uno:TextAttributes +FormatSeiteCalc sym:.uno:PageFormatDialog +FormatZelle sym:.uno:FormatCellDialog +FormatZeileAusblenden sym:.uno:HideRow +FormatZeileEinblenden sym:.uno:ShowRow +FormatZeileHoeheCalc sym:.uno:RowHeight +FormatZeileOptimaleHoeheCalc sym:.uno:SetOptimalRowHeight +FormatSpalteAusblenden sym:.uno:HideColumn +FormatSpalteBreiteCalc sym:.uno:ColumnWidth +FormatSpalteEinblenden sym:.uno:ShowColumn +FormatSpalteOptimaleBreiteCalc sym:.uno:SetOptimalColumnWidth +FormatTabelleAusblenden sym:.uno:Hide +FormatTabelleEinblenden sym:.uno:Show +FormatTabelleUmbenennen sym:.uno:RenameTable sym:.uno:Name +FormatZellenZusammenfassenAufheben sym:.uno:SplitCell +FormatZellenZusammenfassenFestlegen sym:.uno:MergeCells +FormatDruckbereicheAufheben sym:.uno:DeletePrintArea +FormatDruckbereicheBearbeiten sym:.uno:EditPrintArea +FormatDruckbereicheFestlegen sym:.uno:DefinePrintArea +FormatBedingteFormatierung sym:.uno:ConditionalFormatDialog +FormatVerankerungSeite sym:.uno:SetAnchorToPage +FormatVerankerungZelle sym:.uno:SetAnchorToCell +FormatSpiegelnVertikalCalc sym:.uno:ObjectMirrorVertical +FormatSpiegelnHorizontalCalc sym:.uno:ObjectMirrorHorizontal +FormatAnordnungGanzNachVornCalc sym:.uno:BringToFront +FormatAnordnungWeiterNachVornCalc sym:.uno:ObjectForwardOne +FormatAnordnungWeiterNachHintenCalc sym:.uno:ObjectBackOne +FormatAnordnungGanzNachHintenCalc sym:.uno:SendToBack +FormatAnordnungInDenHintergrundCalc sym:.uno:SetObjectToBackground +FormatAnordnungInDenVordergrundCalc sym:.uno:SetObjectToForeground +FormatAusrichtungLinksCalc sym:.uno:ObjectAlignLeft +FormatAusrichtungZentriertCalc sym:.uno:AlignCenter +FormatAusrichtungRechtsCalc sym:.uno:ObjectAlignRight +FormatAusrichtungObenCalc sym:.uno:AlignUp +FormatAusrichtungMitteCalc sym:.uno:AlignMiddle +FormatAusrichtungUntenCalc sym:.uno:AlignDown +FormatGruppeGruppierenCalc sym:.uno:FormatGroup +FormatGruppeAufhebenCalc sym:.uno:FormatUngroup +FormatGruppeBetretenCalc sym:.uno:EnterGroup +FormatGruppeVerlassenCalc sym:.uno:LeaveGroup ' **** Draw / Impress -FormatSeiteDraw .uno:PageSetup -FormatBemassung .uno:MeasureAttributes -Format3D_Effekte .uno:Window3D -FormatVerbinder .uno:ConnectorAttributes -FormatAufzaehlungszeichen .uno:OutlineBullet -FormatSeitenlayout .uno:ModifyPage -FormatEbene .uno:ModifyLayer -FormatDesign .uno:PresentationLayout +FormatSeiteDraw sym:.uno:PageSetup +FormatBemassung sym:.uno:MeasureAttributes +Format3D_Effekte sym:.uno:Window3D +FormatVerbinder sym:.uno:ConnectorAttributes +FormatAufzaehlungszeichen sym:.uno:OutlineBullet +FormatSeitenlayout sym:.uno:ModifyPage +FormatEbene sym:.uno:ModifyLayer +FormatDesign sym:.uno:PresentationLayout ' **** Math -FormatSchriftarten .uno:ChangeFont -FormatSchriftgroessen .uno:ChangeFontSize -FormatAbstaende .uno:ChangeDistance -FormatAusrichtung .uno:ChangeAlignment +FormatSchriftarten sym:.uno:ChangeFont +FormatSchriftgroessen sym:.uno:ChangeFontSize +FormatAbstaende sym:.uno:ChangeDistance +FormatAusrichtung sym:.uno:ChangeAlignment ' *********************************** ' *********** Extrasmenue *********** ' **** ' **** Alle -ExtrasRechtschreibungAutomatisch .uno:SpellOnline -ExtrasAutoKorrektur .uno:AutoCorrectDlg -ExtrasMakro .uno:MacroDialog -ExtrasAnpassen .uno:ConfigureDialog -ExtrasOptionen .uno:OptionsTreeDialog +ExtrasRechtschreibungAutomatisch sym:.uno:SpellOnline +ExtrasAutoKorrektur sym:.uno:AutoCorrectDlg +ExtrasMakro sym:.uno:MacroDialog +ExtrasAnpassen sym:.uno:ConfigureDialog +ExtrasOptionen sym:.uno:OptionsTreeDialog ' **** Writer -ExtrasKapitelnumerierung .uno:ChapterNumberingDialog -ExtrasZeilennumerierung .uno:LineNumberingDialog -ExtrasSeitennummer .uno:PageOffset -ExtrasFussnoten .uno:FootnoteDialog -ExtrasTextInTabelle .uno:ConvertTableText -ExtrasSortieren .uno:SortDialog -ExtrasBerechnen .uno:CalculateSel -ExtrasAktualisierenAllesAktualisieren .uno:UpdateAll -ExtrasAktualisierenFelder .uno:UpdateFields -ExtrasAktualisierenVerknuepfungen .uno:UpdateAllLinks -ExtrasAktualisierenAktuellesVerzeichnis .uno:UpdateCurIndex -ExtrasAktualisierenAlleVerzeichnisse .uno:UpdateAllIndexes -ExtrasAktualisierenSeitenformatierung .uno:Repaginate +ExtrasKapitelnumerierung sym:.uno:ChapterNumberingDialog +ExtrasZeilennumerierung sym:.uno:LineNumberingDialog +ExtrasSeitennummer sym:.uno:PageOffset +ExtrasFussnoten sym:.uno:FootnoteDialog +ExtrasTextInTabelle sym:.uno:ConvertTableText +ExtrasSortieren sym:.uno:SortDialog +ExtrasBerechnen sym:.uno:CalculateSel +ExtrasAktualisierenAllesAktualisieren sym:.uno:UpdateAll +ExtrasAktualisierenFelder sym:.uno:UpdateFields +ExtrasAktualisierenVerknuepfungen sym:.uno:UpdateAllLinks +ExtrasAktualisierenAktuellesVerzeichnis sym:.uno:UpdateCurIndex +ExtrasAktualisierenAlleVerzeichnisse sym:.uno:UpdateAllIndexes +ExtrasAktualisierenSeitenformatierung sym:.uno:Repaginate ' **** WriterWeb -ExtrasSeitenformatierung .uno:Repaginate +ExtrasSeitenformatierung sym:.uno:Repaginate ' **** Calc -ExtrasDetektivAlleSpurenEntfernen .uno:ClearArrows -ExtrasDetektivFuellModus .uno:AuditingFillMode -ExtrasDetektivSpurZumFehler .uno:ShowErrors -ExtrasDetektivSpurZumNachfolger .uno:ShowDependents -ExtrasDetektivSpurZumNachfolgerEntfernen .uno:ClearArrowDependents -ExtrasDetektivSpurZumVorgaenger .uno:ShowPrecedents -ExtrasDetektivSpurZumVorgaengerEntfernen .uno:ClearArrowPrecedents -ExtrasDetektivUngueltigeDatenEinkreisen .uno:ShowInvalid .uno:FillModeSelect -ExtrasDetektivAutomatischAktuakisieren .uno:AutoRefreshArrows -ExtrasZielwertsuche .uno:GoalSeekDialog -ExtrasSzenarien .uno:ScenarioManager -ExtrasDokumentSchuetzenDokument .uno:ToolProtectionDocument -ExtrasDokumentSchuetzenTabelle .uno:Protect -ExtrasNeuBerechnen .uno:Calculate -ExtrasAutomatischBerechnen .uno:AutomaticCalculation -ExtrasAutoEingabe .uno:AutoComplete +ExtrasDetektivAlleSpurenEntfernen sym:.uno:ClearArrows +ExtrasDetektivFuellModus sym:.uno:AuditingFillMode +ExtrasDetektivSpurZumFehler sym:.uno:ShowErrors +ExtrasDetektivSpurZumNachfolger sym:.uno:ShowDependents +ExtrasDetektivSpurZumNachfolgerEntfernen sym:.uno:ClearArrowDependents +ExtrasDetektivSpurZumVorgaenger sym:.uno:ShowPrecedents +ExtrasDetektivSpurZumVorgaengerEntfernen sym:.uno:ClearArrowPrecedents +ExtrasDetektivUngueltigeDatenEinkreisen sym:.uno:ShowInvalid sym:.uno:FillModeSelect +ExtrasDetektivAutomatischAktuakisieren sym:.uno:AutoRefreshArrows +ExtrasZielwertsuche sym:.uno:GoalSeekDialog +ExtrasSzenarien sym:.uno:ScenarioManager +ExtrasDokumentSchuetzenDokument sym:.uno:ToolProtectionDocument +ExtrasDokumentSchuetzenTabelle sym:.uno:Protect +ExtrasNeuBerechnen sym:.uno:Calculate +ExtrasAutomatischBerechnen sym:.uno:AutomaticCalculation +ExtrasAutoEingabe sym:.uno:AutoComplete ' **** Draw / Impress -ExtrasThesaurusDraw .uno:Thesaurus -ExtrasPipette .uno:BmpMask +ExtrasThesaurusDraw sym:.uno:Thesaurus +ExtrasPipette sym:.uno:BmpMask ExtrasDiawechsel .uno:SlideChangeWindow -ExtrasAnimation .uno:AnimationObjects +ExtrasAnimation sym:.uno:AnimationObjects ExtrasEffekt .uno:AnimationEffects -ExtrasInteraktion .uno:AnimationEffects -ExtrasPraesentationseinstellung .uno:PresentationDialog -ExtrasIndividuellePraesentation .uno:CustomShowDialog +ExtrasInteraktion sym:.uno:AnimationEffects +ExtrasPraesentationseinstellung sym:.uno:PresentationDialog +ExtrasIndividuellePraesentation sym:.uno:CustomShowDialog ' **** Math -' ExtrasSymbole .uno:Symbols -ExtrasSymboleKatalog .uno:SymbolCatalogue +' ExtrasSymbole sym:.uno:Symbols +ExtrasSymboleKatalog sym:.uno:SymbolCatalogue ' ExtrasSymboleLaden SID_SYMBOLS_LOAD -ExtrasFormelImportieren .uno:InsertFormula +ExtrasFormelImportieren sym:.uno:InsertFormula ' *********************************** ' *********** Praesentationmenue ************ ' **** -PraesentationBildschirmpraesentation .uno:Presentation -PraesentationPraesentationmitZeitnahme .uno:RehearseTimings -PraesentationPraesentationseinstellungen .uno:PresentationDialog -PraesentationIndividuellePraesentation .uno:CustomShowDialog +PraesentationBildschirmpraesentation sym:.uno:Presentation +PraesentationPraesentationmitZeitnahme sym:.uno:RehearseTimings +PraesentationPraesentationseinstellungen sym:.uno:PresentationDialog +PraesentationIndividuellePraesentation sym:.uno:CustomShowDialog PraesentationDiawechsel .uno:SlideChangeWindow -PraesentationDiaAnzeigen .uno:HideSlide -PraesentationAnimation .uno:AnimationObjects +PraesentationDiaAnzeigen sym:.uno:HideSlide +PraesentationAnimation sym:.uno:AnimationObjects PraesentationEffekt .uno:AnimationEffects -PraesentationInteraktion .uno:AnimationEffects +PraesentationInteraktion sym:.uno:AnimationEffects ' *********************************** ' *********** Datenmenue ************ ' **** ' **** Calc -DatenBereichAuswaehlen .uno:SelectDB -DatenBereichFestlegen .uno:DefineDBName -DatenSortieren .uno:DataSort -DatenFilterAutoFilter .uno:DataFilterAutoFilter -DatenFilterAutoFilterAusblenden .uno:DataFilterHideAutoFilter -DatenFilterFilterEntfernen .uno:DataFilterRemoveFilter -DatenFilterSpezialfilter .uno:DataFilterSpecialFilter -DatenFilterStandardfilter .uno:DataFilterStandardFilter -DatenTeilergebnisse .uno:DataSubTotals -DatenGueltigkeit .uno:Validation -DatenDatenpilotAufrufen .uno:DataDataPilotRun -DatenMehrfachoperationen .uno:TableOperationDialog -DatenKonsolidieren .uno:DataConsolidate -DatenGliederungAutoGliederung .uno:AutoOutline -DatenGliederungDetailAusblenden .uno:HideDetail -DatenGliederungDetailEinblenden .uno:ShowDetail -DatenGliederungEntfernen .uno:ClearOutline -DatenGliederungGruppierung .uno:Group -DatenGliederungGruppierungAufheben .uno:Ungroup -DatenDatenpilotAktualisieren .uno:RecalcPivotTable -DatenDatenpilotLoeschen .uno:DeletePivotTable -DatenBereichAktualisieren .uno:DataAreaRefresh +DatenBereichAuswaehlen sym:.uno:SelectDB +DatenBereichFestlegen sym:.uno:DefineDBName +DatenSortieren sym:.uno:DataSort +DatenFilterAutoFilter sym:.uno:DataFilterAutoFilter +DatenFilterAutoFilterAusblenden sym:.uno:DataFilterHideAutoFilter +DatenFilterFilterEntfernen sym:.uno:DataFilterRemoveFilter +DatenFilterSpezialfilter sym:.uno:DataFilterSpecialFilter +DatenFilterStandardfilter sym:.uno:DataFilterStandardFilter +DatenTeilergebnisse sym:.uno:DataSubTotals +DatenGueltigkeit sym:.uno:Validation +DatenDatenpilotAufrufen sym:.uno:DataDataPilotRun +DatenMehrfachoperationen sym:.uno:TableOperationDialog +DatenKonsolidieren sym:.uno:DataConsolidate +DatenGliederungAutoGliederung sym:.uno:AutoOutline +DatenGliederungDetailAusblenden sym:.uno:HideDetail +DatenGliederungDetailEinblenden sym:.uno:ShowDetail +DatenGliederungEntfernen sym:.uno:ClearOutline +DatenGliederungGruppierung sym:.uno:Group +DatenGliederungGruppierungAufheben sym:.uno:Ungroup +DatenDatenpilotAktualisieren sym:.uno:RecalcPivotTable +DatenDatenpilotLoeschen sym:.uno:DeletePivotTable +DatenBereichAktualisieren sym:.uno:DataAreaRefresh ' *********************************** ' ********** Fenstermenue *********** ' **** ' **** Alle -FensterNeuesFenster .uno:NewWindow +FensterNeuesFenster sym:.uno:NewWindow 'FensterUeberlappend SID_CASCADEWINS 'FensterNebeneinander SID_TILEWINS 'FensterHorizontal SID_HORIZONTALWINS 'FensterVertikal SID_VERTICALWINS -FensterAlleSchliessen .uno:CloseWins -FensterTeilen .uno:SplitWindow -FensterFixieren .uno:FreezePanes +FensterAlleSchliessen sym:.uno:CloseWins +FensterTeilen sym:.uno:SplitWindow +FensterFixieren sym:.uno:FreezePanes ' *********************************** ' *********** Hilfemenue ************ ' **** ' **** Alle -HilfeInhalt .uno:HelpIndex -HilfeHelferlein .uno:HelperDialog -HilfeTip .uno:HelpTip -HilfeAktiveHilfe .uno:ActiveHelp -HilfeOnlineregistrierung .uno:OnlineRegistrationDlg -HilfeInfoUeber .uno:About +HilfeInhalt sym:.uno:HelpIndex +HilfeHelferlein sym:.uno:HelperDialog +HilfeTip sym:.uno:HelpTip +HilfeAktiveHilfe sym:.uno:ActiveHelp +HilfeOnlineregistrierung sym:.uno:OnlineRegistrationDlg +HilfeInfoUeber sym:.uno:About ' *********************************** ' ********** Aendernmenue *********** ' **** ' **** Draw / Impress -AendernPositionGroesse .uno:TransformDialog -AendernSpiegelnVertikalDraw .uno:MirrorVert -AendernSpiegelnHorizontalDraw .uno:MirrorHorz -AendernUmwandelnInKurve .uno:ChangeBezier -AendernUmwandelnInPolygon .uno:ChangePolygon -AendernUmwandelnIn3D .uno:ConvertInto3D -AendernUmwandelnIn3DRotationskoerper .uno:ConvertInto3DLatheFast -AendernUmwandelnInMetafile .uno:ConvertIntoMetaFile -AendernUmwandelnInBitmap .uno:ConvertIntoBitmap -AendernAnordnungGanznachVorn .uno:BringToFront -AendernAnordnungWeiterNachVorn .uno:Forward -AendernAnordnungWeiterNachHinten .uno:Backward -AendernAnordnungGanznachHinten .uno:SendToBack -AendernAnordnungVorDasObjekt .uno:BeforeObject -AendernAnordnungHinterDasObjekt .uno:BehindObject -AendernAnordnungVertauschen .uno:ReverseOrder -AendernVerteilen .uno:DistributeSelection -AendernAusrichtungLinks .uno:ObjectAlignLeft -AendernAusrichtungZentriert .uno:AlignCenter -AendernAusrichtungRechts .uno:ObjectAlignRight -AendernAusrichtungOben .uno:AlignUp -AendernAusrichtungMitte .uno:AlignMiddle -AendernAusrichtungUnten .uno:AlignDown -AendernObjektBenennen .uno:NameGroup -AendernFontWork .uno:FontWork -AendernPipette .uno:BmpMask -AendernGruppierung .uno:FormatGroup -AendernGruppierungAufheben .uno:FormatUngroup -AendernGruppierungBetreten .uno:EnterGroup -AendernGruppierungVerlassen .uno:LeaveGroup -AendernKombination .uno:Combine -AendernKombinationAufheben .uno:Dismantle -AendernVerbinden .uno:Connect -AendernAufbrechen .uno:Break -AendernShapeMerge .uno:Merge -AendernShapeSubstract .uno:Substract -AendernShapeIntersect .uno:Intersect +AendernPositionGroesse sym:.uno:TransformDialog +AendernSpiegelnVertikalDraw sym:.uno:MirrorVert +AendernSpiegelnHorizontalDraw sym:.uno:MirrorHorz +AendernUmwandelnInKurve sym:.uno:ChangeBezier +AendernUmwandelnInPolygon sym:.uno:ChangePolygon +AendernUmwandelnIn3D sym:.uno:ConvertInto3D +AendernUmwandelnIn3DRotationskoerper sym:.uno:ConvertInto3DLatheFast +AendernUmwandelnInMetafile sym:.uno:ConvertIntoMetaFile +AendernUmwandelnInBitmap sym:.uno:ConvertIntoBitmap +AendernAnordnungGanznachVorn sym:.uno:BringToFront +AendernAnordnungWeiterNachVorn sym:.uno:Forward +AendernAnordnungWeiterNachHinten sym:.uno:Backward +AendernAnordnungGanznachHinten sym:.uno:SendToBack +AendernAnordnungVorDasObjekt sym:.uno:BeforeObject +AendernAnordnungHinterDasObjekt sym:.uno:BehindObject +AendernAnordnungVertauschen sym:.uno:ReverseOrder +AendernVerteilen sym:.uno:DistributeSelection +AendernAusrichtungLinks sym:.uno:ObjectAlignLeft +AendernAusrichtungZentriert sym:.uno:AlignCenter +AendernAusrichtungRechts sym:.uno:ObjectAlignRight +AendernAusrichtungOben sym:.uno:AlignUp +AendernAusrichtungMitte sym:.uno:AlignMiddle +AendernAusrichtungUnten sym:.uno:AlignDown +AendernObjektBenennen sym:.uno:NameGroup +AendernFontWork sym:.uno:FontWork +AendernPipette sym:.uno:BmpMask +AendernGruppierung sym:.uno:FormatGroup +AendernGruppierungAufheben sym:.uno:FormatUngroup +AendernGruppierungBetreten sym:.uno:EnterGroup +AendernGruppierungVerlassen sym:.uno:LeaveGroup +AendernKombination sym:.uno:Combine +AendernKombinationAufheben sym:.uno:Dismantle +AendernVerbinden sym:.uno:Connect +AendernAufbrechen sym:.uno:Break +AendernShapeMerge sym:.uno:Merge +AendernShapeSubstract sym:.uno:Substract +AendernShapeIntersect sym:.uno:Intersect diff --git a/testautomation/global/sid/bars.sid b/testautomation/global/sid/bars.sid index 5c879edac84b..55df846f5e1f 100644 --- a/testautomation/global/sid/bars.sid +++ b/testautomation/global/sid/bars.sid @@ -12,20 +12,20 @@ ' ***** Standardbar ' ** ' ** f�r alle -FL_URL .uno:OpenUrl -FL_NeuLaden .uno:Reload -FL_Bearbeiten .uno:EditDoc -FL_Speichern .uno:Save -FL_Verknuepfen .uno:AddBookmark -FL_Drucken .uno:PrintDefault -FL_Ausschneiden .uno:Cut -FL_Kopieren .uno:Copy -FL_Einsetzen .uno:Paste -FL_Undo .uno:Undo -FL_Redo .uno:Redo -FL_Browser .uno:Beamer -FL_Navigator .uno:Navigator -FL_Gestalter .uno:DesignerDialog +FL_URL sym:.uno:OpenUrl +FL_NeuLaden sym:.uno:Reload +FL_Bearbeiten sym:.uno:EditDoc +FL_Speichern sym:.uno:Save +FL_Verknuepfen sym:.uno:AddBookmark +FL_Drucken sym:.uno:PrintDefault +FL_Ausschneiden sym:.uno:Cut +FL_Kopieren sym:.uno:Copy +FL_Einsetzen sym:.uno:Paste +FL_Undo sym:.uno:Undo +FL_Redo sym:.uno:Redo +FL_Browser sym:.uno:Beamer +FL_Navigator sym:.uno:Navigator +FL_Gestalter sym:.uno:DesignerDialog ' ******************************************************* ' @@ -34,10 +34,10 @@ FL_Gestalter .uno:DesignerDialog ' ** f�r alle 'HL_URLName ofa:ComboBox:RID_SVXDLG_HYPERLINK:CB_NAME 'HL_URLListe ofa:ComboBox:RID_SVXDLG_HYPERLINK:CB_URL -HL_Frame SVX_HID_OFA_HYPERLINK_TARGET -HL_Link .uno:SetHyperlink -HL_Bookmark .uno:AddBookmark -HL_Suchen SVX_HID_OFA_HYPERLINK_SEARCH +HL_Frame sym:SVX_HID_OFA_HYPERLINK_TARGET +HL_Link sym:.uno:SetHyperlink +HL_Bookmark sym:.uno:AddBookmark +HL_Suchen sym:SVX_HID_OFA_HYPERLINK_SEARCH ' ******************************************************* ' @@ -45,161 +45,161 @@ HL_Suchen SVX_HID_OFA_HYPERLINK_SEARCH ' ** ' ** Datenbank-Beamer -OL_DB_Beamer_StandardFilter .uno:FilterCrit -OL_DB_Beamer_DatenInText .uno:SbaBrwInsert +OL_DB_Beamer_StandardFilter sym:.uno:FilterCrit +OL_DB_Beamer_DatenInText sym:.uno:SbaBrwInsert ' ** Form Toolbar -FM_FormFilter_Start .uno:FormFilter -FM_FF_Navigator .uno:FormFilterNavigator -FM_FF_Execute .uno:FormFilterExecute -FM_FF_Exit .uno:FormFilterExit -FM_Remove_Filter .uno:RemoveFilterSort - -FM_No_Record .uno:AbsoluteRecord -FM_First_Record .uno:FirstRecord -FM_Previous_Record .uno:PrevRecord -FM_Next_Record .uno:NextRecord -FM_Last_Record .uno:LastRecord -FM_Save_Record .uno:RecSave -'--10630: BUTTON: Allows you to undo a data entry. .uno:RecUndo -FM_New_Record .uno:NewRecord -FM_Delete_Record .uno:DeleteRecord -'OB_DB_Beamer:Refresh .uno:Refresh -FM_Search .uno:RecSearch -FM_Sort_Asc .uno:Sortup -FM_Sort_Des .uno:SortDown -FM_AutoFilter .uno:AutoFilter -'--10729: BUTTON: Prompts the database server to filter the visible data by specified criteria. .uno:FormFilter -FM_Sort_Order .uno:OrderCrit -FM_View_As_Grid .uno:ViewFormAsGrid -FM_Apply_Filter .uno:FormFiltered +FM_FormFilter_Start sym:.uno:FormFilter +FM_FF_Navigator sym:.uno:FormFilterNavigator +FM_FF_Execute sym:.uno:FormFilterExecute +FM_FF_Exit sym:.uno:FormFilterExit +FM_Remove_Filter sym:.uno:RemoveFilterSort + +FM_No_Record sym:.uno:AbsoluteRecord +FM_First_Record sym:.uno:FirstRecord +FM_Previous_Record sym:.uno:PrevRecord +FM_Next_Record sym:.uno:NextRecord +FM_Last_Record sym:.uno:LastRecord +FM_Save_Record sym:.uno:RecSave +'--10630: BUTTON: Allows you to undo a data entry. sym:.uno:RecUndo +FM_New_Record sym:.uno:NewRecord +FM_Delete_Record sym:.uno:DeleteRecord +'OB_DB_Beamer:Refresh sym:.uno:Refresh +FM_Search sym:.uno:RecSearch +FM_Sort_Asc sym:.uno:Sortup +FM_Sort_Des sym:.uno:SortDown +FM_AutoFilter sym:.uno:AutoFilter +'--10729: BUTTON: Prompts the database server to filter the visible data by specified criteria. sym:.uno:FormFilter +FM_Sort_Order sym:.uno:OrderCrit +FM_View_As_Grid sym:.uno:ViewFormAsGrid +FM_Apply_Filter sym:.uno:FormFiltered ' ** Writer ' - normal -OL_Writer_Schriftart .uno:CharFontName -OL_Writer_Schriftgroesse .uno:FontHeight -OL_Writer_Fett .uno:Bold -OL_Writer_Kursiv .uno:Italic -OL_Writer_Unterstrichen .uno:Underline -OL_Writer_Linksbuendig .uno:LeftPara -OL_Writer_Zentriert .uno:CenterPara -OL_Writer_Rechtsbuendig .uno:RightPara -OL_Writer_Blocksatz .uno:JustifyPara -OL_Writer_Numerierung .uno:DefaultNumbering -OL_Writer_Aufzaehlung .uno:DefaultBullet -OL_Writer_EinzugVermindern .uno:DecrementIndent -OL_Writer_EinzugErhoehen .uno:IncrementIndent -OL_Writer_Textfarbe .uno:FontColor -OL_Writer_Zeichenhintergrund .uno:BackColor -OL_Writer_Absatzhintergrund .uno:BackgroundColor +OL_Writer_Schriftart sym:.uno:CharFontName +OL_Writer_Schriftgroesse sym:.uno:FontHeight +OL_Writer_Fett sym:.uno:Bold +OL_Writer_Kursiv sym:.uno:Italic +OL_Writer_Unterstrichen sym:.uno:Underline +OL_Writer_Linksbuendig sym:.uno:LeftPara +OL_Writer_Zentriert sym:.uno:CenterPara +OL_Writer_Rechtsbuendig sym:.uno:RightPara +OL_Writer_Blocksatz sym:.uno:JustifyPara +OL_Writer_Numerierung sym:.uno:DefaultNumbering +OL_Writer_Aufzaehlung sym:.uno:DefaultBullet +OL_Writer_EinzugVermindern sym:.uno:DecrementIndent +OL_Writer_EinzugErhoehen sym:.uno:IncrementIndent +OL_Writer_Textfarbe sym:.uno:FontColor +OL_Writer_Zeichenhintergrund sym:.uno:BackColor +OL_Writer_Absatzhintergrund sym:.uno:BackgroundColor ' ** Writer ' - Tabelle -OL_Tabelle_SW_FormelEingeben .uno:InsertFormula -OL_Tabelle_SW_TabellenmodeFix .uno:TableModeFix -OL_Tabelle_SW_TabellenmodeProportional .uno:TableModeFixProp -OL_Tabelle_SW_TabellenmodeVariabel .uno:TableModeVariable -OL_Tabelle_SW_ZelleVerbinden .uno:MergeCells -OL_Tabelle_SW_ZelleTeilen .uno:SplitCell -OL_Tabelle_SW_Optimieren .uno:OptimizeTable -OL_Tabelle_SW_ZeileEinfuegen .uno:InsertRowDialog -OL_Tabelle_SW_SpalteEinfuegen .uno:InsertColumns -OL_Tabelle_SW_ZeileLoeschen .uno:DeleteRows -OL_Tabelle_SW_SpalteLoeschen .uno:DeleteColumns -OL_Tabelle_SW_Umrandung .uno:SetBorderStyle -OL_Tabelle_SW_LinienStil .uno:LineStyle -OL_Tabelle_SW_Hintergrundfarbe .uno:BackgroundColor -OL_Tabelle_SW_ZeileAuswaehlen .uno:EntireRow -OL_Tabelle_SW_SpalteAuswaehlen .uno:EntireColumn -OL_Tabelle_SW_TabelleAuswaehlen .uno:SelectTable +OL_Tabelle_SW_FormelEingeben sym:.uno:InsertFormula +OL_Tabelle_SW_TabellenmodeFix sym:.uno:TableModeFix +OL_Tabelle_SW_TabellenmodeProportional sym:.uno:TableModeFixProp +OL_Tabelle_SW_TabellenmodeVariabel sym:.uno:TableModeVariable +OL_Tabelle_SW_ZelleVerbinden sym:.uno:MergeCells +OL_Tabelle_SW_ZelleTeilen sym:.uno:SplitCell +OL_Tabelle_SW_Optimieren sym:.uno:OptimizeTable +OL_Tabelle_SW_ZeileEinfuegen sym:.uno:InsertRowDialog +OL_Tabelle_SW_SpalteEinfuegen sym:.uno:InsertColumns +OL_Tabelle_SW_ZeileLoeschen sym:.uno:DeleteRows +OL_Tabelle_SW_SpalteLoeschen sym:.uno:DeleteColumns +OL_Tabelle_SW_Umrandung sym:.uno:SetBorderStyle +OL_Tabelle_SW_LinienStil sym:.uno:LineStyle +OL_Tabelle_SW_Hintergrundfarbe sym:.uno:BackgroundColor +OL_Tabelle_SW_ZeileAuswaehlen sym:.uno:EntireRow +OL_Tabelle_SW_SpalteAuswaehlen sym:.uno:EntireColumn +OL_Tabelle_SW_TabelleAuswaehlen sym:.uno:SelectTable ' ** Writer ' - Rahmen / Grafik / OLE-Objekte -OL_Objekt_SW_KeinUmlauf .uno:WrapOff -OL_Objekt_SW_Umlauf .uno:WrapOn -OL_Objekt_SW_Durchlauf .uno:WrapThrough -OL_Objekt_SW_Links .uno:AlignLeft -OL_Objekt_SW_Zentriert .uno:AlignHorizontalCenter -OL_Objekt_SW_Rechts .uno:AlignRight -OL_Objekt_SW_Oben .uno:AlignTop -OL_Objekt_SW_Mitte .uno:AlignVerticalCenter -OL_Objekt_SW_Unten .uno:AlignBottom -OL_Objekt_SW_Umrandung .uno:SetBorderStyle -OL_Objekt_SW_Linienstil .uno:LineStyle -OL_Objekt_SW_LinienFarbe .uno:FrameLineColor -OL_Objekt_SW_Hintergrundmuster .uno:BackgroundPatternController -OL_Objekt_SW_Hintergrundfarbe .uno:BackgroundColor -OL_Objekt_SW_GanzNachVorn .uno:BringToFront -OL_Objekt_SW_GanzNachHinten .uno:SendToBack -OL_Objekt_SW_Verankerungwechseln .uno:ToggleAnchorType -OL_Objekt_SW_HorizontalSpiegeln .uno:FlipHorizontal -OL_Objekt_SW_VertikalSpiegeln .uno:FlipVertical -OL_Objekt_SW_PositionUndGroesse .uno:TransformDialog -OL_Objekt_SW_InDenVordergrund .uno:SetObjectToForeground -OL_Objekt_SW_InDenHintergrund .uno:SetObjectToBackground -OL_Objekt_SW_EigenschaftenObjekt .uno:FrameDialog -OL_Objekt_SW_EigenschaftenControls .uno:ShowBrowser +OL_Objekt_SW_KeinUmlauf sym:.uno:WrapOff +OL_Objekt_SW_Umlauf sym:.uno:WrapOn +OL_Objekt_SW_Durchlauf sym:.uno:WrapThrough +OL_Objekt_SW_Links sym:.uno:AlignLeft +OL_Objekt_SW_Zentriert sym:.uno:AlignHorizontalCenter +OL_Objekt_SW_Rechts sym:.uno:AlignRight +OL_Objekt_SW_Oben sym:.uno:AlignTop +OL_Objekt_SW_Mitte sym:.uno:AlignVerticalCenter +OL_Objekt_SW_Unten sym:.uno:AlignBottom +OL_Objekt_SW_Umrandung sym:.uno:SetBorderStyle +OL_Objekt_SW_Linienstil sym:.uno:LineStyle +OL_Objekt_SW_LinienFarbe sym:.uno:FrameLineColor +OL_Objekt_SW_Hintergrundmuster sym:.uno:BackgroundPatternController +OL_Objekt_SW_Hintergrundfarbe sym:.uno:BackgroundColor +OL_Objekt_SW_GanzNachVorn sym:.uno:BringToFront +OL_Objekt_SW_GanzNachHinten sym:.uno:SendToBack +OL_Objekt_SW_Verankerungwechseln sym:.uno:ToggleAnchorType +OL_Objekt_SW_HorizontalSpiegeln sym:.uno:FlipHorizontal +OL_Objekt_SW_VertikalSpiegeln sym:.uno:FlipVertical +OL_Objekt_SW_PositionUndGroesse sym:.uno:TransformDialog +OL_Objekt_SW_InDenVordergrund sym:.uno:SetObjectToForeground +OL_Objekt_SW_InDenHintergrund sym:.uno:SetObjectToBackground +OL_Objekt_SW_EigenschaftenObjekt sym:.uno:FrameDialog +OL_Objekt_SW_EigenschaftenControls sym:.uno:ShowBrowser ' ** Writer ' - Numerierung / Aufzaehlung -OL_Numerierung_NumerierungAusschalten .uno:RemoveBullets -OL_Numerierung_Hochstufen .uno:IncrementLevel -OL_Numerierung_Hinunterstufen .uno:DecrementLevel -OL_Numerierung_HochstufenMitUnterpunkten .uno:IncrementSubLevels -OL_Numerierung_HinunterstufenMitUnterpunkten .uno:DecrementSubLevels -OL_Numerierung_AbsatzOhnenNumerierung .uno:InsertNeutralParagraph -OL_Numerierung_Hochschieben .uno:MoveUp -OL_Numerierung_Hinunterschieben .uno:MoveDown -OL_Numerierung_HochschiebenMitUnterpunkten .uno:MoveUpSubItems -OL_Numerierung_HinunterschiebenMitUnterpunkten .uno:MoveDownSubItems -OL_Numerierung_NumerierungNeuStarten .uno:NumberingStart -OL_Numerierung_NumerierungAufzaehlung .uno:BulletsAndNumberingDialog +OL_Numerierung_NumerierungAusschalten sym:.uno:RemoveBullets +OL_Numerierung_Hochstufen sym:.uno:IncrementLevel +OL_Numerierung_Hinunterstufen sym:.uno:DecrementLevel +OL_Numerierung_HochstufenMitUnterpunkten sym:.uno:IncrementSubLevels +OL_Numerierung_HinunterstufenMitUnterpunkten sym:.uno:DecrementSubLevels +OL_Numerierung_AbsatzOhnenNumerierung sym:.uno:InsertNeutralParagraph +OL_Numerierung_Hochschieben sym:.uno:MoveUp +OL_Numerierung_Hinunterschieben sym:.uno:MoveDown +OL_Numerierung_HochschiebenMitUnterpunkten sym:.uno:MoveUpSubItems +OL_Numerierung_HinunterschiebenMitUnterpunkten sym:.uno:MoveDownSubItems +OL_Numerierung_NumerierungNeuStarten sym:.uno:NumberingStart +OL_Numerierung_NumerierungAufzaehlung sym:.uno:BulletsAndNumberingDialog ' ** Calc ' - normal -OL_CALC_Schriftart .uno:CharFontName -OL_CALC_Schriftgroesse .uno:FontHeight -OL_CALC_Fett .uno:Bold -OL_CALC_Kursiv .uno:Italic -OL_CALC_Unterstrichen .uno:Underline -OL_CALC_Schriftfarbe .uno:Color -OL_CALC_Linksbuendig .uno:LeftPara -OL_CALC_Zentriert .uno:CenterPara -OL_CALC_Rechtsbuendig .uno:RightPara -OL_CALC_Waehrungsformat .uno:NumberFormatCurrency -OL_CALC_Prozentformat .uno:NumberFormatPercent -OL_CALC_StandardWaehrungformat .uno:NumberFormatStandard -OL_CALC_DezimalstellenHinzufuegen .uno:NumberFormatIncDecimals -OL_CALC_DezimalstellenLoeschen .uno:NumberFormatDecDecimals -OL_CALC_EinzugVermindern .uno:DecrementIndent -OL_CALC_EinzugErhoehen .uno:IncrementIndent -OL_CALC_Umrandung .uno:SetBorderStyle -OL_CALC_Hintergrundfarbe .uno:BackgroundColor -OL_CALC_VertikalOben .uno:AlignTop -OL_CALC_VertikalMitte .uno:AlignVCenter -OL_CALC_VertikalUnten .uno:AlignBottom +OL_CALC_Schriftart sym:.uno:CharFontName +OL_CALC_Schriftgroesse sym:.uno:FontHeight +OL_CALC_Fett sym:.uno:Bold +OL_CALC_Kursiv sym:.uno:Italic +OL_CALC_Unterstrichen sym:.uno:Underline +OL_CALC_Schriftfarbe sym:.uno:Color +OL_CALC_Linksbuendig sym:.uno:LeftPara +OL_CALC_Zentriert sym:.uno:CenterPara +OL_CALC_Rechtsbuendig sym:.uno:RightPara +OL_CALC_Waehrungsformat sym:.uno:NumberFormatCurrency +OL_CALC_Prozentformat sym:.uno:NumberFormatPercent +OL_CALC_StandardWaehrungformat sym:.uno:NumberFormatStandard +OL_CALC_DezimalstellenHinzufuegen sym:.uno:NumberFormatIncDecimals +OL_CALC_DezimalstellenLoeschen sym:.uno:NumberFormatDecDecimals +OL_CALC_EinzugVermindern sym:.uno:DecrementIndent +OL_CALC_EinzugErhoehen sym:.uno:IncrementIndent +OL_CALC_Umrandung sym:.uno:SetBorderStyle +OL_CALC_Hintergrundfarbe sym:.uno:BackgroundColor +OL_CALC_VertikalOben sym:.uno:AlignTop +OL_CALC_VertikalMitte sym:.uno:AlignVCenter +OL_CALC_VertikalUnten sym:.uno:AlignBottom ' ** Draw / Impress ' - normal OL_DRAW_Linie .uno:FormatLine -OL_DRAW_Linienendenstil .uno:LineEndStyle -OL_DRAW_Linienstil .uno:XLineStyle -OL_DRAW_Linienbreite .uno:LineWidth -OL_DRAW_Linienfarbe .uno:XLineColor +OL_DRAW_Linienendenstil sym:.uno:LineEndStyle +OL_DRAW_Linienstil sym:.uno:XLineStyle +OL_DRAW_Linienbreite sym:.uno:LineWidth +OL_DRAW_Linienfarbe sym:.uno:XLineColor OL_DRAW_Flaeche .uno:FormatArea -OL_DRAW_Flaechenstil .uno:FillStyle -OL_DRAW_Flaechenfarbe .uno:FillStyle +OL_DRAW_Flaechenstil sym:.uno:FillStyle +OL_DRAW_Flaechenfarbe sym:.uno:FillStyle OL_DRAW_Schatten .uno:FillShadow -OL_DRAW_Drehen .uno:ToggleObjectRotateMode -OL_DRAW_PunkteBearbeiten .uno:ToggleObjectBezierMode -OL_DRAW_Ausrichtung .uno:ObjectAlign -OL_DRAW_GanzNachVorn .uno:BringToFront -OL_DRAW_GanzNachHinten .uno:SendToBack -OL_DRAW_InDenVordergrund .uno:SetObjectToForeground -OL_DRAW_InDenHintergrund .uno:SetObjectToBackground -OL_DRAW_VorDasObjekt .uno:BeforeObject -OL_DRAW_HinterDasObjekt .uno:BehindObject -OL_DRAW_VerankerungWechseln .uno:ToggleAnchorType +OL_DRAW_Drehen sym:.uno:ToggleObjectRotateMode +OL_DRAW_PunkteBearbeiten sym:.uno:ToggleObjectBezierMode +OL_DRAW_Ausrichtung sym:.uno:ObjectAlign +OL_DRAW_GanzNachVorn sym:.uno:BringToFront +OL_DRAW_GanzNachHinten sym:.uno:SendToBack +OL_DRAW_InDenVordergrund sym:.uno:SetObjectToForeground +OL_DRAW_InDenHintergrund sym:.uno:SetObjectToBackground +OL_DRAW_VorDasObjekt sym:.uno:BeforeObject +OL_DRAW_HinterDasObjekt sym:.uno:BehindObject +OL_DRAW_VerankerungWechseln sym:.uno:ToggleAnchorType ' ** Draw / Impress ' - Diamode @@ -207,126 +207,126 @@ OL_DIA_Ueberblendeffekt .uno:DiaEffect OL_DIA_Geschwindigkeit .uno:DiaSpeed OL_DIA_Diawechsel .uno:DiaAuto OL_DIA_Zeit .uno:DiaTime -OL_DIA_PraesentationMitZeitnahme .uno:RehearseTimings -OL_DIA_DiaAnzeigen .uno:HideSlide -OL_DIA_DiasProReihe .uno:PagesPerRow +OL_DIA_PraesentationMitZeitnahme sym:.uno:RehearseTimings +OL_DIA_DiaAnzeigen sym:.uno:HideSlide +OL_DIA_DiasProReihe sym:.uno:PagesPerRow ' ** Draw / Impress ' - Bezierleiste -OL_BEZIER_Verschieben .uno:BezierMove -OL_BEZIER_Einfuegen .uno:BezierInsert -OL_BEZIER_Loeschen .uno:BezierDelete -OL_BEZIER_Auftrennen .uno:BezierCutLine -OL_BEZIER_InKurve .uno:BezierConvert -OL_BEZIER_Ecke .uno:BezierEdge -OL_BEZIER_Glatt .uno:BezierSmooth -OL_BEZIER_Symmetrisch .uno:BezierSymmetric -OL_BEZIER_Schliessen .uno:BezierClose -OL_BEZIER_PunkteReduzieren .uno:BezierEliminatePoints +OL_BEZIER_Verschieben sym:.uno:BezierMove +OL_BEZIER_Einfuegen sym:.uno:BezierInsert +OL_BEZIER_Loeschen sym:.uno:BezierDelete +OL_BEZIER_Auftrennen sym:.uno:BezierCutLine +OL_BEZIER_InKurve sym:.uno:BezierConvert +OL_BEZIER_Ecke sym:.uno:BezierEdge +OL_BEZIER_Glatt sym:.uno:BezierSmooth +OL_BEZIER_Symmetrisch sym:.uno:BezierSymmetric +OL_BEZIER_Schliessen sym:.uno:BezierClose +OL_BEZIER_PunkteReduzieren sym:.uno:BezierEliminatePoints ' ** Draw / Impress ' - Klebepunte -OL_KLEBE_PunkteEinfuegen .uno:GlueInsertPoint -OL_KLEBE_Links .uno:GlueEscapeDirectionLeft -OL_KLEBE_Oben .uno:GlueEscapeDirectionTop -OL_KLEBE_Rechts .uno:GlueEscapeDirectionRight -OL_KLEBE_Unten .uno:GlueEscapeDirectionBottom -OL_KLEBE_PositionAnObjektAnpassen .uno:GluePercent -OL_KLEBE_HorizontalLinks .uno:GlueHorzAlignLeft -OL_KLEBE_HorizontalZentriert .uno:GlueHorzAlignCenter -OL_KLEBE_HorizontalRechts .uno:GlueHorzAlignRight -OL_KLEBE_VertikalOben .uno:GlueVertAlignTop -OL_KLEBE_VertikalZentriert .uno:GlueVertAlignCenter -OL_KLEBE_VertikalUnten .uno:GlueVertAlignBottom +OL_KLEBE_PunkteEinfuegen sym:.uno:GlueInsertPoint +OL_KLEBE_Links sym:.uno:GlueEscapeDirectionLeft +OL_KLEBE_Oben sym:.uno:GlueEscapeDirectionTop +OL_KLEBE_Rechts sym:.uno:GlueEscapeDirectionRight +OL_KLEBE_Unten sym:.uno:GlueEscapeDirectionBottom +OL_KLEBE_PositionAnObjektAnpassen sym:.uno:GluePercent +OL_KLEBE_HorizontalLinks sym:.uno:GlueHorzAlignLeft +OL_KLEBE_HorizontalZentriert sym:.uno:GlueHorzAlignCenter +OL_KLEBE_HorizontalRechts sym:.uno:GlueHorzAlignRight +OL_KLEBE_VertikalOben sym:.uno:GlueVertAlignTop +OL_KLEBE_VertikalZentriert sym:.uno:GlueVertAlignCenter +OL_KLEBE_VertikalUnten sym:.uno:GlueVertAlignBottom ' ** Frameset ' - normal -OL_FRAME_HTMLQuelltext .uno:SourceView +OL_FRAME_HTMLQuelltext sym:.uno:SourceView ' ** Basicdokument ' - normal -OL_BASIC_Bibliothek .uno:LibSelector -OL_BASIC_Uebersetzen .uno:CompileBasic -OL_BASIC_Ausfuehren .uno:RunBasic -OL_BASIC_Anhalten .uno:BasicStop -OL_BASIC_Prozedurschritt .uno:BasicStepOver -OL_BASIC_Einzelschritt .uno:BasicStepInto -OL_BASIC_Haltepunkt .uno:ToggleBreakPoint -OL_BASIC_BeobachterAnzeigen .uno:AddWatch -OL_BASIC_Objektkatalog .uno:ObjectCatalog -OL_BASIC_Makros .uno:ChooseMacro -OL_BASIC_Module .uno:ModuleDialog -OL_BASIC_KlammerSuchen .uno:MatchGroup -OL_BASIC_Kontrollfelder .uno:ChooseControls -OL_BASIC_QuelltextEinfuegen .uno:LoadBasic -OL_BASIC_QuelltextSpeichern .uno:SaveBasicAs +OL_BASIC_Bibliothek sym:.uno:LibSelector +OL_BASIC_Uebersetzen sym:.uno:CompileBasic +OL_BASIC_Ausfuehren sym:.uno:RunBasic +OL_BASIC_Anhalten sym:.uno:BasicStop +OL_BASIC_Prozedurschritt sym:.uno:BasicStepOver +OL_BASIC_Einzelschritt sym:.uno:BasicStepInto +OL_BASIC_Haltepunkt sym:.uno:ToggleBreakPoint +OL_BASIC_BeobachterAnzeigen sym:.uno:AddWatch +OL_BASIC_Objektkatalog sym:.uno:ObjectCatalog +OL_BASIC_Makros sym:.uno:ChooseMacro +OL_BASIC_Module sym:.uno:ModuleDialog +OL_BASIC_KlammerSuchen sym:.uno:MatchGroup +OL_BASIC_Kontrollfelder sym:.uno:ChooseControls +OL_BASIC_QuelltextEinfuegen sym:.uno:LoadBasic +OL_BASIC_QuelltextSpeichern sym:.uno:SaveBasicAs ' ** Allgemeine Objektleisten ' ' ** Seitenansicht ' - normal -OL_SEITENANSICHT_VorherigeSeite .uno:PageUp -OL_SEITENANSICHT_NaechsteSeite .uno:PageDown -OL_SEITENANSICHT_ErsteSeite .uno:GoToStartOfDoc -OL_SEITENANSICHT_LetzteSeite .uno:GoToEndOfDoc -OL_SEITENANSICHT_ZweiSeiten .uno:ShowTwoPages -OL_SEITENANSICHT_VierSeiten .uno:ShowMultiplePages -OL_SEITENANSICHT_Massstab .uno:Zoom -OL_SEITENANSICHT_GanzerBildschirm .uno:FullScreen -OL_SEITENANSICHT_DruckenSeitenansicht .uno:PrintPagePreView -OL_SEITENANSICHT_Schliessen .uno:CloseWin -OL_SEITENANSICHT_SeitenAnsichtSchliessen .uno:CloseWin -OL_SEITENANSICHT_Seitenlayout .uno:PageFormatDialog -OL_SEITENANSICHT_MassstabVergroessern .uno:ZoomIn -OL_SEITENANSICHT_MassstabVerkleinern .uno:ZoomOut -OL_SEITENANSICHT_NaechsteSeiteCalc .uno:NextPage -OL_SEITENANSICHT_VorherigeSeiteCalc .uno:PreviousPage -OL_SEITENANSICHT_ErsteSeiteCalc .uno:FirstPage -OL_SEITENANSICHT_LetzteSeiteCalc .uno:LastPage +OL_SEITENANSICHT_VorherigeSeite sym:.uno:PageUp +OL_SEITENANSICHT_NaechsteSeite sym:.uno:PageDown +OL_SEITENANSICHT_ErsteSeite sym:.uno:GoToStartOfDoc +OL_SEITENANSICHT_LetzteSeite sym:.uno:GoToEndOfDoc +OL_SEITENANSICHT_ZweiSeiten sym:.uno:ShowTwoPages +OL_SEITENANSICHT_VierSeiten sym:.uno:ShowMultiplePages +OL_SEITENANSICHT_Massstab sym:.uno:Zoom +OL_SEITENANSICHT_GanzerBildschirm sym:.uno:FullScreen +OL_SEITENANSICHT_DruckenSeitenansicht sym:.uno:PrintPagePreView +OL_SEITENANSICHT_Schliessen sym:.uno:CloseWin +OL_SEITENANSICHT_SeitenAnsichtSchliessen sym:.uno:CloseWin +OL_SEITENANSICHT_Seitenlayout sym:.uno:PageFormatDialog +OL_SEITENANSICHT_MassstabVergroessern sym:.uno:ZoomIn +OL_SEITENANSICHT_MassstabVerkleinern sym:.uno:ZoomOut +OL_SEITENANSICHT_NaechsteSeiteCalc sym:.uno:NextPage +OL_SEITENANSICHT_VorherigeSeiteCalc sym:.uno:PreviousPage +OL_SEITENANSICHT_ErsteSeiteCalc sym:.uno:FirstPage +OL_SEITENANSICHT_LetzteSeiteCalc sym:.uno:LastPage ' ** Zeichenobjekt ' - Text -OL_ZO_Text_Schriftart .uno:CharFontName -OL_ZO_Text_Schriftgroesse .uno:FontHeight -OL_ZO_Text_Fett .uno:Bold -OL_ZO_Text_Kursiv .uno:Italic -OL_ZO_Text_Unterstrichen .uno:Underline -OL_ZO_Text_Linksbuendig .uno:LeftPara -OL_ZO_Text_Zentriert .uno:CenterPara -OL_ZO_Text_Schriftfarbe .uno:Color -OL_ZO_Text_Einzeilig .uno:SpacePara1 -OL_ZO_Text_Eineinhalbzeilig .uno:SpacePara15 -OL_ZO_Text_Zweizeilig .uno:SpacePara2 -OL_ZO_Text_Hochstellen .uno:SuperScript -OL_ZO_Text_Tiefstellen .uno:SubScript -OL_ZO_Text_Zeichenformat .uno:FontDialog -OL_ZO_Text_Absatzformat .uno:ParagraphDialog -OL_ZO_Text_Hintergrundmuster .uno:BackgroundPatternController -OL_ZO_Text_Hintergrundfarbe .uno:BackgroundColor -OL_ZO_Text_Aufzaehlungszeichen .uno:OutlineBullet +OL_ZO_Text_Schriftart sym:.uno:CharFontName +OL_ZO_Text_Schriftgroesse sym:.uno:FontHeight +OL_ZO_Text_Fett sym:.uno:Bold +OL_ZO_Text_Kursiv sym:.uno:Italic +OL_ZO_Text_Unterstrichen sym:.uno:Underline +OL_ZO_Text_Linksbuendig sym:.uno:LeftPara +OL_ZO_Text_Zentriert sym:.uno:CenterPara +OL_ZO_Text_Schriftfarbe sym:.uno:Color +OL_ZO_Text_Einzeilig sym:.uno:SpacePara1 +OL_ZO_Text_Eineinhalbzeilig sym:.uno:SpacePara15 +OL_ZO_Text_Zweizeilig sym:.uno:SpacePara2 +OL_ZO_Text_Hochstellen sym:.uno:SuperScript +OL_ZO_Text_Tiefstellen sym:.uno:SubScript +OL_ZO_Text_Zeichenformat sym:.uno:FontDialog +OL_ZO_Text_Absatzformat sym:.uno:ParagraphDialog +OL_ZO_Text_Hintergrundmuster sym:.uno:BackgroundPatternController +OL_ZO_Text_Hintergrundfarbe sym:.uno:BackgroundColor +OL_ZO_Text_Aufzaehlungszeichen sym:.uno:OutlineBullet ' ** Zeichenobjekt ' - Flaeche OL_ZO_FLAECHE_Linie .uno:FormatLine -OL_ZO_FLAECHE_Linienendenstil .uno:LineEndStyle -OL_ZO_FLAECHE_Linienstil .uno:XLineStyle -OL_ZO_FLAECHE_Linienbreite .uno:LineWidth -OL_ZO_FLAECHE_Linienfarbe .uno:XLineColor -OL_ZO_FLAECHE_Flaeche .uno:FormatArea -OL_ZO_FLAECHE_Flaechenstil .uno:FillStyle -OL_ZO_FLAECHE_Flaechenfarbe .uno:FillStyle +OL_ZO_FLAECHE_Linienendenstil sym:.uno:LineEndStyle +OL_ZO_FLAECHE_Linienstil sym:.uno:XLineStyle +OL_ZO_FLAECHE_Linienbreite sym:.uno:LineWidth +OL_ZO_FLAECHE_Linienfarbe sym:.uno:XLineColor +OL_ZO_FLAECHE_Flaeche sym:.uno:FormatArea +OL_ZO_FLAECHE_Flaechenstil sym:.uno:FillStyle +OL_ZO_FLAECHE_Flaechenfarbe sym:.uno:FillStyle OL_ZO_FLAECHE_Schatten .uno:FillShadow -OL_ZO_FLAECHE_Animation .uno:AnimationObjects +OL_ZO_FLAECHE_Animation sym:.uno:AnimationObjects OL_ZO_FLAECHE_Effekt .uno:EffectWindow -OL_ZO_FLAECHE_Interaktion .uno:AnimationEffects -OL_ZO_FLAECHE_Drehen .uno:ToggleObjectRotateMode -OL_ZO_FLAECHE_PunkteBearbeiten .uno:ToggleObjectBezierMode -OL_ZO_FLAECHE_Ausrichtung .uno:ObjectAlign -OL_ZO_FLAECHE_GanzNachVorn .uno:BringToFront -OL_ZO_FLAECHE_GanzNachHinten .uno:SendToBack -OL_ZO_FLAECHE_InDenVordergrund .uno:SetObjectToForeground -OL_ZO_FLAECHE_InDenHintergrund .uno:SetObjectToBackground -OL_ZO_FLAECHE_VerankerungWechseln .uno:ToggleAnchorType +OL_ZO_FLAECHE_Interaktion sym:.uno:AnimationEffects +OL_ZO_FLAECHE_Drehen sym:.uno:ToggleObjectRotateMode +OL_ZO_FLAECHE_PunkteBearbeiten sym:.uno:ToggleObjectBezierMode +OL_ZO_FLAECHE_Ausrichtung sym:.uno:ObjectAlign +OL_ZO_FLAECHE_GanzNachVorn sym:.uno:BringToFront +OL_ZO_FLAECHE_GanzNachHinten sym:.uno:SendToBack +OL_ZO_FLAECHE_InDenVordergrund sym:.uno:SetObjectToForeground +OL_ZO_FLAECHE_InDenHintergrund sym:.uno:SetObjectToBackground +OL_ZO_FLAECHE_VerankerungWechseln sym:.uno:ToggleAnchorType ' ******************************************************* ' @@ -334,412 +334,411 @@ OL_ZO_FLAECHE_VerankerungWechseln .uno:ToggleAnchorType ' ' ** Writer ' - normal -WL_WRITER_Einfuegen .uno:InsertCtrl -WL_WRITER_Feldbefehle .uno:InsertFieldCtrl - WL_WRITER_Datum .uno:InsertDateField - WL_WRITER_Uhrzeit .uno:InsertTimeField - WL_WRITER_Seitennummer .uno:InsertPageNumberField - WL_WRITER_Seitenanzahl .uno:InsertPageCountField - WL_WRITER_Thema .uno:InsertTopicField - WL_WRITER_Titel .uno:InsertTitleField - WL_WRITER_Autor .uno:InsertAuthorField - WL_WRITER_Andere .uno:InsertField -WL_WRITER_ObjektEinfuegen .uno:InsertObjCtrl -WL_WRITER_Zeichnen .uno:InsertDraw -WL_WRITER_Kontrollfelder .uno:ChooseControls -WL_WRITER_Formular .uno:Config -WL_WRITER_AutoFormat .uno:AutoFormat -WL_WRITER_Autotext .uno:EditGlossary -WL_WRITER_AutomatischePruefung .uno:SpellOnline -WL_WRITER_SuchenUndErsetzen .uno:SearchDialog -WL_WRITER_SteuerzeichenEinAus .uno:ControlCodes -WL_WRITER_GrafikenAusschalten .uno:Graphic -WL_WRITER_Hyperlink .uno:InsertHyperlink -WL_WRITER_OnlineLayout .uno:BrowseView -WL_WRITER_SchattencursorEinschalten .uno:ShadowCursor +WL_WRITER_Einfuegen sym:.uno:InsertCtrl +WL_WRITER_Feldbefehle sym:.uno:InsertFieldCtrl + WL_WRITER_Datum sym:.uno:InsertDateField + WL_WRITER_Uhrzeit sym:.uno:InsertTimeField + WL_WRITER_Seitennummer sym:.uno:InsertPageNumberField + WL_WRITER_Seitenanzahl sym:.uno:InsertPageCountField + WL_WRITER_Thema sym:.uno:InsertTopicField + WL_WRITER_Titel sym:.uno:InsertTitleField + WL_WRITER_Autor sym:.uno:InsertAuthorField + WL_WRITER_Andere sym:.uno:InsertField +WL_WRITER_ObjektEinfuegen sym:.uno:InsertObjCtrl +WL_WRITER_Zeichnen sym:.uno:InsertDraw +WL_WRITER_Kontrollfelder sym:.uno:ChooseControls +WL_WRITER_Formular sym:.uno:Config +WL_WRITER_AutoFormat sym:.uno:AutoFormat +WL_WRITER_Autotext sym:.uno:EditGlossary +WL_WRITER_AutomatischePruefung sym:.uno:SpellOnline +WL_WRITER_SuchenUndErsetzen sym:.uno:SearchDialog +WL_WRITER_SteuerzeichenEinAus sym:.uno:ControlCodes +WL_WRITER_GrafikenAusschalten sym:.uno:Graphic +WL_WRITER_Hyperlink sym:.uno:InsertHyperlink +WL_WRITER_OnlineLayout sym:.uno:BrowseView +WL_WRITER_SchattencursorEinschalten sym:.uno:ShadowCursor ' ** Calc ' - normal -WL_CALC_Einfuegen .uno:InsertCtrl -WL_CALC_ZellenEinfuegen .uno:InsCellsCtrl -WL_CALC_ObjektEinfuegen .uno:InsertObjCtrl -WL_CALC_Zeichnen .uno:InsertDraw -WL_CALC_Kontrollfelder .uno:ChooseControls -WL_CALC_Autoformat .uno:AutoFormat -WL_CALC_AutomatischeRechtschreibung .uno:SpellOnline -WL_CALC_SuchenUndErsetzen .uno:SearchDialog -WL_CALC_AutoFilter .uno:DataFilterAutoFilter -WL_CALC_SortierenAuf .uno:SortAscending -WL_CALC_SortierenAb .uno:SortDescending -WL_CALC_Gruppierung .uno:Group -WL_CALC_GruppierungAufheben .uno:Ungroup +WL_CALC_Einfuegen sym:.uno:InsertCtrl +WL_CALC_ZellenEinfuegen sym:.uno:InsCellsCtrl +WL_CALC_ObjektEinfuegen sym:.uno:InsertObjCtrl +WL_CALC_Zeichnen sym:.uno:InsertDraw +WL_CALC_Kontrollfelder sym:.uno:ChooseControls +WL_CALC_Autoformat sym:.uno:AutoFormat +WL_CALC_AutomatischeRechtschreibung sym:.uno:SpellOnline +WL_CALC_SuchenUndErsetzen sym:.uno:SearchDialog +WL_CALC_AutoFilter sym:.uno:DataFilterAutoFilter +WL_CALC_SortierenAuf sym:.uno:SortAscending +WL_CALC_SortierenAb sym:.uno:SortDescending +WL_CALC_Gruppierung sym:.uno:Group +WL_CALC_GruppierungAufheben sym:.uno:Ungroup ' ** Draw / Impress ' - normal -WL_DRAW_Auswahl .uno:SelectObject -WL_DRAW_Zoom .uno:ZoomToolBox -WL_DRAW_Grafikeffekte .uno:AdvancedMode -WL_DRAW_Anordnung .uno:ObjectPosition -WL_DRAW_TextBoxen .uno:TextToolbox -WL_DRAW_Rechteck .uno:Rect -WL_DRAW_Ellipsen .uno:EllipseToolbox -WL_DRAW_Kurven .uno:LineToolbox -WL_DRAW_Linien .uno:ArrowsToolbox -WL_DRAW_3DObjekte .uno:Objects3DToolbox -WL_DRAW_Verbinder .uno:ConnectorToolbox -WL_DRAW_Einfuegen .uno:InsertToolbox -WL_DRAW_Kontrollfelder .uno:ChooseControls -WL_DRAW_Praesentation .uno:Presentation +WL_DRAW_Auswahl sym:.uno:SelectObject +WL_DRAW_Zoom sym:.uno:ZoomToolBox +WL_DRAW_Grafikeffekte sym:.uno:AdvancedMode +WL_DRAW_Anordnung sym:.uno:ObjectPosition +WL_DRAW_TextBoxen sym:.uno:TextToolbox +WL_DRAW_Rechteck sym:.uno:Rect +WL_DRAW_Ellipsen sym:.uno:EllipseToolbox +WL_DRAW_Kurven sym:.uno:LineToolbox +WL_DRAW_Linien sym:.uno:ArrowsToolbox +WL_DRAW_3DObjekte sym:.uno:Objects3DToolbox +WL_DRAW_Verbinder sym:.uno:ConnectorToolbox +WL_DRAW_Einfuegen sym:.uno:InsertToolbox +WL_DRAW_Kontrollfelder sym:.uno:ChooseControls +WL_DRAW_Praesentation sym:.uno:Presentation WL_DRAW_Effekt .uno:EffectWindow -WL_DRAW_Interaktion .uno:AnimationObjects -WL_DRAW_3DEffekt .uno:Window3D +WL_DRAW_Interaktion sym:.uno:AnimationObjects +WL_DRAW_3DEffekt sym:.uno:Window3D ' ** Draw / Impress ' - Gliederungsansicht -WL_GL_DRAW_Zoom .uno:ZoomToolBox -WL_GL_DRAW_Hinunterstufen .uno:OutlineRight -WL_GL_DRAW_Hochstufen .uno:OutlineLeft -WL_GL_DRAW_Hochschieben .uno:OutlineUp -WL_GL_DRAW_Hinunterschieben .uno:OutlineDown -WL_GL_DRAW_NurErsteEbene .uno:OutlineCollapseAll -WL_GL_DRAW_AlleEbenen .uno:OutlineExpandAll -WL_GL_DRAW_UnterpunkteAusblenden .uno:OutlineCollapse -WL_GL_DRAW_UnterpunkteAnzeigen .uno:OutlineExpand -WL_GL_DRAW_FormatierungEinAus .uno:OutlineFormat -WL_GL_DRAW_SchwarzweisDarstellung .uno:ColorView -WL_GL_DRAW_Praesentation .uno:Presentation +WL_GL_DRAW_Zoom sym:.uno:ZoomToolBox +WL_GL_DRAW_Hinunterstufen sym:.uno:OutlineRight +WL_GL_DRAW_Hochstufen sym:.uno:OutlineLeft +WL_GL_DRAW_Hochschieben sym:.uno:OutlineUp +WL_GL_DRAW_Hinunterschieben sym:.uno:OutlineDown +WL_GL_DRAW_NurErsteEbene sym:.uno:OutlineCollapseAll +WL_GL_DRAW_AlleEbenen sym:.uno:OutlineExpandAll +WL_GL_DRAW_UnterpunkteAusblenden sym:.uno:OutlineCollapse +WL_GL_DRAW_UnterpunkteAnzeigen sym:.uno:OutlineExpand +WL_GL_DRAW_FormatierungEinAus sym:.uno:OutlineFormat +WL_GL_DRAW_SchwarzweisDarstellung sym:.uno:ColorView +WL_GL_DRAW_Praesentation sym:.uno:Presentation ' ** Draw / Impress ' - Diamodus -WL_DIA_Zoom .uno:ZoomToolBox -WL_DIA_Praesentation .uno:Presentation +WL_DIA_Zoom sym:.uno:ZoomToolBox +WL_DIA_Praesentation sym:.uno:Presentation ' ** HTML-Dokument ' - normal -WL_WEB_Einfuegen .uno:InsertCtrl -WL_WEB_Feldbefehle .uno:InsertFieldCtrl - WL_WEB_Datum .uno:InsertDateField - WL_WEB_Uhrzeit .uno:InsertTimeField - WL_WEB_Seitennummer .uno:InsertPageNumberField - WL_WEB_Seitenanzahl .uno:InsertPageCountField - WL_WEB_Thema .uno:InsertTopicField - WL_WEB_Titel .uno:InsertTitleField +WL_WEB_Einfuegen sym:.uno:InsertCtrl +WL_WEB_Feldbefehle sym:.uno:InsertFieldCtrl + WL_WEB_Datum sym:.uno:InsertDateField + WL_WEB_Uhrzeit sym:.uno:InsertTimeField + WL_WEB_Seitennummer sym:.uno:InsertPageNumberField + WL_WEB_Seitenanzahl sym:.uno:InsertPageCountField + WL_WEB_Thema sym:.uno:InsertTopicField + WL_WEB_Titel sym:.uno:InsertTitleField 'WL_Web_Kopfzeile FN_INSERT_HEADER 'WL_Web_Fusszeile FN_INSERT_FOOTER -WL_WEB_Lauftext .uno:Text_Marquee -WL_WEB_Kontrollfelder .uno:ChooseControls -WL_WEB_SuchenUndErsetzen .uno:SearchDialog -WL_WEB_SteuerzeichenEinAus .uno:ControlCodes -WL_WEB_GrafikenAusschalten .uno:Graphic -WL_WEB_Hyperlink .uno:InsertHyperlink -WL_WEB_OnlineLayout .uno:BrowseView -WL_WEB_SchattencursorEinschalten .uno:ShadowCursor -WL_WEB_DruckLayout .uno:PrintLayout -WL_WEB_HTMLQuelltextWeb .uno:SourceView +WL_WEB_Lauftext sym:.uno:Text_Marquee +WL_WEB_Kontrollfelder sym:.uno:ChooseControls +WL_WEB_SuchenUndErsetzen sym:.uno:SearchDialog +WL_WEB_SteuerzeichenEinAus sym:.uno:ControlCodes +WL_WEB_GrafikenAusschalten sym:.uno:Graphic +WL_WEB_Hyperlink sym:.uno:InsertHyperlink +WL_WEB_OnlineLayout sym:.uno:BrowseView +WL_WEB_SchattencursorEinschalten sym:.uno:ShadowCursor +WL_WEB_DruckLayout sym:.uno:PrintLayout +WL_WEB_HTMLQuelltextWeb sym:.uno:SourceView ' ** Math ' - Normal -WL_MATH_Vergroessern .uno:ZoomIn -WL_MATH_Verkleinern .uno:ZoomOut -WL_MATH_ZoomHundertProzent .uno:View100 -WL_MATH_GanzeFormel .uno:Adjust -WL_MATH_FormelAktualisieren .uno:Draw -WL_MATH_FormelSymbole .uno:SymbolCatalogue +WL_MATH_Vergroessern sym:.uno:ZoomIn +WL_MATH_Verkleinern sym:.uno:ZoomOut +WL_MATH_ZoomHundertProzent sym:.uno:View100 +WL_MATH_GanzeFormel sym:.uno:Adjust +WL_MATH_FormelAktualisieren sym:.uno:Draw +WL_MATH_FormelSymbole sym:.uno:SymbolCatalogue ' ******************************************************* ' ' ***** Rechenleisten ' ' ** Calc -RL_CALC_Bereich SC_HID_INSWIN_POS -RL_CALC_Funktionsautopilot SC_HID_INSWIN_CALC -RL_CALC_Summe SC_HID_INSWIN_SUMME -RL_CALC_Funktion SC_HID_INSWIN_FUNC -RL_CALC_Eingabefeld SC_HID_INSWIN_INPUT -RL_CALC_Verwerfen SC_HID_INSWIN_CANCEL -RL_CALC_Uebernehmen SC_HID_INSWIN_OK +RL_CALC_Bereich sym:SC_HID_INSWIN_POS +RL_CALC_Funktionsautopilot sym:SC_HID_INSWIN_CALC +RL_CALC_Summe sym:SC_HID_INSWIN_SUMME +RL_CALC_Funktion sym:SC_HID_INSWIN_FUNC +RL_CALC_Eingabefeld sym:SC_HID_INSWIN_INPUT +RL_CALC_Verwerfen sym:SC_HID_INSWIN_CANCEL +RL_CALC_Uebernehmen sym:SC_HID_INSWIN_OK ' ' ** Writer -RL_WRITER_Formel SW_HID_TBX_FORMULA_CALC -RL_WRITER_VerwerfenWriter SW_HID_TBX_FORMULA_CANCEL -RL_WRITER_UebernehmenWriter SW_HID_TBX_FORMULA_APPLY -RL_WRITER_EingabefeldWriter SW_HID_EDIT_FORMULA -RL_WRITER_SummeWriter SW_HID_MN_CALC_SUM -RL_WRITER_Runden SW_HID_MN_CALC_ROUND -RL_WRITER_Prozent SW_HID_MN_CALC_PHD -RL_WRITER_Wurzel SW_HID_MN_CALC_SQRT -RL_WRITER_Potenziere SW_HID_MN_CALC_POW -RL_WRITER_OperatorenListentrenner SW_HID_MN_CALC_LISTSEP -RL_WRITER_OperatorenGleich SW_HID_MN_CALC_EQ -RL_WRITER_OperatorenNichtGleich SW_HID_MN_CALC_NEQ -RL_WRITER_OperatorenKleinerGleich SW_HID_MN_CALC_LEQ -RL_WRITER_OperatorenGroesserGleich SW_HID_MN_CALC_GEQ -RL_WRITER_OperatorenKleiner SW_HID_MN_CALC_LES -RL_WRITER_OperatorenGroesser SW_HID_MN_CALC_GRE -RL_WRITER_OperatorenOder SW_HID_MN_CALC_OR -RL_WRITER_OperatorenExklusivesOder SW_HID_MN_CALC_XOR -RL_WRITER_OperatorenUnd SW_HID_MN_CALC_AND -RL_WRITER_OperatorenNicht SW_HID_MN_CALC_NOT -RL_WRITER_Mittelwert SW_HID_MN_CALC_MEAN -RL_WRITER_Minimalwert SW_HID_MN_CALC_MIN -RL_WRITER_Maximalwert SW_HID_MN_CALC_MAX -RL_WRITER_Sinus SW_HID_MN_CALC_SIN -RL_WRITER_Cosinus SW_HID_MN_CALC_COS -RL_WRITER_Tangens SW_HID_MN_CALC_TAN -RL_WRITER_Arcussinus SW_HID_MN_CALC_ASIN -RL_WRITER_Arcuscosinus SW_HID_MN_CALC_ACOS -RL_WRITER_Arcustangens SW_HID_MN_CALC_ATAN +RL_WRITER_Formel sym:SW_HID_TBX_FORMULA_CALC +RL_WRITER_VerwerfenWriter sym:SW_HID_TBX_FORMULA_CANCEL +RL_WRITER_UebernehmenWriter sym:SW_HID_TBX_FORMULA_APPLY +RL_WRITER_EingabefeldWriter sym:SW_HID_EDIT_FORMULA +RL_WRITER_SummeWriter sym:SW_HID_MN_CALC_SUM +RL_WRITER_Runden sym:SW_HID_MN_CALC_ROUND +RL_WRITER_Prozent sym:SW_HID_MN_CALC_PHD +RL_WRITER_Wurzel sym:SW_HID_MN_CALC_SQRT +RL_WRITER_Potenziere sym:SW_HID_MN_CALC_POW +RL_WRITER_OperatorenListentrenner sym:SW_HID_MN_CALC_LISTSEP +RL_WRITER_OperatorenGleich sym:SW_HID_MN_CALC_EQ +RL_WRITER_OperatorenNichtGleich sym:SW_HID_MN_CALC_NEQ +RL_WRITER_OperatorenKleinerGleich sym:SW_HID_MN_CALC_LEQ +RL_WRITER_OperatorenGroesserGleich sym:SW_HID_MN_CALC_GEQ +RL_WRITER_OperatorenKleiner sym:SW_HID_MN_CALC_LES +RL_WRITER_OperatorenGroesser sym:SW_HID_MN_CALC_GRE +RL_WRITER_OperatorenOder sym:SW_HID_MN_CALC_OR +RL_WRITER_OperatorenExklusivesOder sym:SW_HID_MN_CALC_XOR +RL_WRITER_OperatorenUnd sym:SW_HID_MN_CALC_AND +RL_WRITER_OperatorenNicht sym:SW_HID_MN_CALC_NOT +RL_WRITER_Mittelwert sym:SW_HID_MN_CALC_MEAN +RL_WRITER_Minimalwert sym:SW_HID_MN_CALC_MIN +RL_WRITER_Maximalwert sym:SW_HID_MN_CALC_MAX +RL_WRITER_Sinus sym:SW_HID_MN_CALC_SIN +RL_WRITER_Cosinus sym:SW_HID_MN_CALC_COS +RL_WRITER_Tangens sym:SW_HID_MN_CALC_TAN +RL_WRITER_Arcussinus sym:SW_HID_MN_CALC_ASIN +RL_WRITER_Arcuscosinus sym:SW_HID_MN_CALC_ACOS +RL_WRITER_Arcustangens sym:SW_HID_MN_CALC_ATAN ' ******************************************************* ' ' ***** Toolboxen ' ** ' ** Einfuegen Writer -WL_TB_SW_EINFUEGEN_Rahmen .uno:InsertFrameInteract -WL_TB_SW_EINFUEGEN_Grafik .uno:InsertGraphic -WL_TB_SW_EINFUEGEN_Tabelle .uno:InsertTable -WL_TB_SW_EINFUEGEN_TextEinfuegen .uno:InsertDoc -WL_TB_SW_EINFUEGEN_Fussnote .uno:InsertFootnote -WL_TB_SW_EINFUEGEN_Sonderzeichen FN_INSERT_SYMBOL -WL_TB_SW_EINFUEGEN_SpaltenAnzahl .uno:InsertFrameInteractNoColumns -WL_TB_SW_EINFUEGEN_MehrspaltigenRahmen .uno:InsertFrame -WL_TB_SW_EINFUEGEN_Verzeichnis .uno:InsertIndexesEntry -WL_TB_SW_EINFUEGEN_TextMarke .uno:InsertBookmark +WL_TB_SW_EINFUEGEN_Rahmen sym:.uno:InsertFrameInteract +WL_TB_SW_EINFUEGEN_Grafik sym:.uno:InsertGraphic +WL_TB_SW_EINFUEGEN_Tabelle sym:.uno:InsertTable +WL_TB_SW_EINFUEGEN_TextEinfuegen sym:.uno:InsertDoc +WL_TB_SW_EINFUEGEN_Fussnote sym:.uno:InsertFootnote +WL_TB_SW_EINFUEGEN_SpaltenAnzahl sym:.uno:InsertFrameInteractNoColumns +WL_TB_SW_EINFUEGEN_MehrspaltigenRahmen sym:.uno:InsertFrame +WL_TB_SW_EINFUEGEN_Verzeichnis sym:.uno:InsertIndexesEntry +WL_TB_SW_EINFUEGEN_TextMarke sym:.uno:InsertBookmark ' ** ' ** Einfuegen-Objekt Writer -WL_TB_SW_Objekt_Diagramm .uno:InsertObjectChart -WL_TB_SW_Objekt_FormelEinfuegen .uno:InsertObjectStarMath -WL_TB_SW_Objekt_Rahmenfenster .uno:InsertObjectFloatingFrame -WL_TB_SW_Objekt_Objekt .uno:InsertObjectDialog +WL_TB_SW_Objekt_Diagramm sym:.uno:InsertObjectChart +WL_TB_SW_Objekt_FormelEinfuegen sym:.uno:InsertObjectStarMath +WL_TB_SW_Objekt_Rahmenfenster sym:.uno:InsertObjectFloatingFrame +WL_TB_SW_Objekt_Objekt sym:.uno:InsertObjectDialog ' ** ' ** Zeichenfunktionen -WL_TB_ZF_Auswahl .uno:SelectObject -WL_TB_ZF_Linie .uno:Line -WL_TB_ZF_Rechteck .uno:Rect -WL_TB_ZF_Ellipse .uno:Ellipse -WL_TB_ZF_Polygon .uno:Polygon_Unfilled -WL_TB_ZF_Bezier .uno:Bezier_Unfilled -WL_TB_ZF_Freihand .uno:Freeline_Unfilled -WL_TB_ZF_Kreisbogen .uno:Arc -WL_TB_ZF_Kreissektor .uno:Pie -WL_TB_ZF_Kreissegment .uno:CircleCut -WL_TB_ZF_Textobjekt .uno:DrawText -WL_TB_ZF_Lauftext .uno:Text_Marquee -WL_TB_ZF_Legende .uno:DrawCaption +WL_TB_ZF_Auswahl sym:.uno:SelectObject +WL_TB_ZF_Linie sym:.uno:Line +WL_TB_ZF_Rechteck sym:.uno:Rect +WL_TB_ZF_Ellipse sym:.uno:Ellipse +WL_TB_ZF_Polygon sym:.uno:Polygon_Unfilled +WL_TB_ZF_Bezier sym:.uno:Bezier_Unfilled +WL_TB_ZF_Freihand sym:.uno:Freeline_Unfilled +WL_TB_ZF_Kreisbogen sym:.uno:Arc +WL_TB_ZF_Kreissektor sym:.uno:Pie +WL_TB_ZF_Kreissegment sym:.uno:CircleCut +WL_TB_ZF_Textobjekt sym:.uno:DrawText +WL_TB_ZF_Lauftext sym:.uno:Text_Marquee +WL_TB_ZF_Legende sym:.uno:DrawCaption ' ** ' ** Kontrollfelder -WL_TB_CONTROLS_CommandButton .uno:InsertPushbutton -WL_TB_CONTROLS_SpinButton .uno:Spinbutton -WL_TB_CONTROLS_CheckBox .uno:Checkbox -WL_TB_CONTROLS_OptionButton .uno:Radiobutton -WL_TB_CONTROLS_Label .uno:InsertFixedText -WL_TB_CONTROLS_TextFeld .uno:InsertEdit -WL_TB_CONTROLS_ListBox .uno:InsertListbox -WL_TB_CONTROLS_ComboBox .uno:Combobox -WL_TB_CONTROLS_HScrollBar .uno:HScrollbar -WL_TB_CONTROLS_VScrollBar .uno:VScrollbar -WL_TB_CONTROLS_FrameControl .uno:Groupbox -WL_TB_CONTROLS_Preview .uno:Preview -WL_TB_CONTROLS_URLButton .uno:URLButton -WL_TB_CONTROLS_Selektieren .uno:SelectObject -WL_TB_CONTROLS_KontrollfeldEigenschaften .uno:ShowBrowser -WL_TB_CONTROLS_Testmodus .uno:TestMode +WL_TB_CONTROLS_CommandButton sym:.uno:InsertPushbutton +WL_TB_CONTROLS_SpinButton sym:.uno:Spinbutton +WL_TB_CONTROLS_CheckBox sym:.uno:Checkbox +WL_TB_CONTROLS_OptionButton sym:.uno:Radiobutton +WL_TB_CONTROLS_Label sym:.uno:InsertFixedText +WL_TB_CONTROLS_TextFeld sym:.uno:InsertEdit +WL_TB_CONTROLS_ListBox sym:.uno:InsertListbox +WL_TB_CONTROLS_ComboBox sym:.uno:Combobox +WL_TB_CONTROLS_HScrollBar sym:.uno:HScrollbar +WL_TB_CONTROLS_VScrollBar sym:.uno:VScrollbar +WL_TB_CONTROLS_FrameControl sym:.uno:Groupbox +WL_TB_CONTROLS_Preview sym:.uno:Preview +WL_TB_CONTROLS_URLButton sym:.uno:URLButton +WL_TB_CONTROLS_Selektieren sym:.uno:SelectObject +WL_TB_CONTROLS_KontrollfeldEigenschaften sym:.uno:ShowBrowser +WL_TB_CONTROLS_Testmodus sym:.uno:TestMode ' ** ' ** Zoomen im Draw -WL_SD_Groesser .uno:ZoomPlus -WL_SD_Kleiner .uno:ZoomMinus -WL_SD_VerschiebenZoom .uno:ZoomPanning -WL_SD_VorherigeDarstellung .uno:ZoomPrevious -WL_SD_NaechsteDarstellung .uno:ZoomNext -WL_SD_EinsZuEins .uno:Zoom100Percent -WL_SD_GanzeSeite .uno:ZoomPage -WL_SD_Seitenbreite .uno:ZoomPageWidth -WL_SD_Optimal .uno:ZoomOptimal -WL_SD_Objektzoom .uno:ZoomObjects +WL_SD_Groesser sym:.uno:ZoomPlus +WL_SD_Kleiner sym:.uno:ZoomMinus +WL_SD_VerschiebenZoom sym:.uno:ZoomPanning +WL_SD_VorherigeDarstellung sym:.uno:ZoomPrevious +WL_SD_NaechsteDarstellung sym:.uno:ZoomNext +WL_SD_EinsZuEins sym:.uno:Zoom100Percent +WL_SD_GanzeSeite sym:.uno:ZoomPage +WL_SD_Seitenbreite sym:.uno:ZoomPageWidth +WL_SD_Optimal sym:.uno:ZoomOptimal +WL_SD_Objektzoom sym:.uno:ZoomObjects ' ** ' ** Anordnung im Draw -WL_TB_ANORDNUNG_WeiterNachVorn .uno:Forward -WL_TB_ANORDNUNG_WeiterNachHinten .uno:Backward -WL_TB_ANORDNUNG_VorDasObjekt .uno:BeforeObject -WL_TB_ANORDNUNG_HinterDasObjekt .uno:BehindObject -WL_TB_ANORDNUNG_Vertauschen .uno:ReverseOrder +WL_TB_ANORDNUNG_WeiterNachVorn sym:.uno:Forward +WL_TB_ANORDNUNG_WeiterNachHinten sym:.uno:Backward +WL_TB_ANORDNUNG_VorDasObjekt sym:.uno:BeforeObject +WL_TB_ANORDNUNG_HinterDasObjekt sym:.uno:BehindObject +WL_TB_ANORDNUNG_Vertauschen sym:.uno:ReverseOrder ' ** ' ** Ausrichtung im Draw -WL_TB_AUSRICHTUNG_Links .uno:ObjectAlignLeft -WL_TB_AUSRICHTUNG_Rechts .uno:ObjectAlignRight -WL_TB_AUSRICHTUNG_Oben .uno:AlignUp -WL_TB_AUSRICHTUNG_Mitte .uno:AlignMiddle -WL_TB_AUSRICHTUNG_Unten .uno:AlignDown -WL_TB_AUSRICHTUNG_Zentriert .uno:AlignCenter +WL_TB_AUSRICHTUNG_Links sym:.uno:ObjectAlignLeft +WL_TB_AUSRICHTUNG_Rechts sym:.uno:ObjectAlignRight +WL_TB_AUSRICHTUNG_Oben sym:.uno:AlignUp +WL_TB_AUSRICHTUNG_Mitte sym:.uno:AlignMiddle +WL_TB_AUSRICHTUNG_Unten sym:.uno:AlignDown +WL_TB_AUSRICHTUNG_Zentriert sym:.uno:AlignCenter ' ** ' ** Effekte im Draw -WL_TB_SD_EFFEKTE_Spiegeln .uno:Mirror -WL_TB_SD_EFFEKTE_Verzerren .uno:Shear -WL_TB_SD_EFFEKTE_Rotationskoerper .uno:ConvertInto3DLathe -WL_TB_SD_EFFEKTE_KlebepunkteBearbeiten .uno:GlueEditMode -WL_TB_SD_EFFEKTE_SetzenAufKreisPerspektivisch .uno:CrookRotate -WL_TB_SD_EFFEKTE_SetzenAufKreisSchraeggestellt .uno:CrookSlant +WL_TB_SD_EFFEKTE_Spiegeln sym:.uno:Mirror +WL_TB_SD_EFFEKTE_Verzerren sym:.uno:Shear +WL_TB_SD_EFFEKTE_Rotationskoerper sym:.uno:ConvertInto3DLathe +WL_TB_SD_EFFEKTE_KlebepunkteBearbeiten sym:.uno:GlueEditMode +WL_TB_SD_EFFEKTE_SetzenAufKreisPerspektivisch sym:.uno:CrookRotate +WL_TB_SD_EFFEKTE_SetzenAufKreisSchraeggestellt sym:.uno:CrookSlant ' ** ' ** Ellipsen im Draw -WL_SD_Ellipsen .uno:Ellipse -WL_SD_EllipseVoll .uno:Ellipse -WL_SD_EllipseLeer .uno:Ellipse_Unfilled -WL_SD_KreisVoll .uno:Circle -WL_SD_KreisLeer .uno:Circle_Unfilled -WL_SD_EllipsensegmentVoll .uno:Pie -WL_SD_EllipsensegmentLeer .uno:Pie_Unfilled -WL_SD_KreissegmentVoll .uno:CirclePie -WL_SD_KreissegmentLeer .uno:CirclePie_Unfilled -WL_SD_EllipsenabschnittVoll .uno:EllipseCut -WL_SD_EllipsenabschnittLeer .uno:EllipseCut_Unfilled -WL_SD_KreisabschnittVoll .uno:CircleCut -WL_SD_KreisabschnittLeer .uno:CircleCut_Unfilled -WL_SD_Kreisbogen .uno:CircleArc +WL_SD_Ellipsen sym:.uno:Ellipse +WL_SD_EllipseVoll sym:.uno:Ellipse +WL_SD_EllipseLeer sym:.uno:Ellipse_Unfilled +WL_SD_KreisVoll sym:.uno:Circle +WL_SD_KreisLeer sym:.uno:Circle_Unfilled +WL_SD_EllipsensegmentVoll sym:.uno:Pie +WL_SD_EllipsensegmentLeer sym:.uno:Pie_Unfilled +WL_SD_KreissegmentVoll sym:.uno:CirclePie +WL_SD_KreissegmentLeer sym:.uno:CirclePie_Unfilled +WL_SD_EllipsenabschnittVoll sym:.uno:EllipseCut +WL_SD_EllipsenabschnittLeer sym:.uno:EllipseCut_Unfilled +WL_SD_KreisabschnittVoll sym:.uno:CircleCut +WL_SD_KreisabschnittLeer sym:.uno:CircleCut_Unfilled +WL_SD_Kreisbogen sym:.uno:CircleArc ' ** ' ** Kurven im Draw -WL_SD_KurveVoll .uno:BezierFill -WL_SD_KurveLeer .uno:Bezier_Unfilled -WL_SD_PolygonVoll .uno:Polygon -WL_SD_Polygon .uno:Polygon_Unfilled -WL_SD_PolygonWinkelVoll .uno:Polygon_Diagonal -WL_SD_PolygonWinkel .uno:Polygon_Diagonal_Unfilled -WL_SD_FreihandlinieVoll .uno:Freeline -WL_SD_FreihandlinieLeer .uno:Freeline_Unfilled +WL_SD_KurveVoll sym:.uno:BezierFill +WL_SD_KurveLeer sym:.uno:Bezier_Unfilled +WL_SD_PolygonVoll sym:.uno:Polygon +WL_SD_Polygon sym:.uno:Polygon_Unfilled +WL_SD_PolygonWinkelVoll sym:.uno:Polygon_Diagonal +WL_SD_PolygonWinkel sym:.uno:Polygon_Diagonal_Unfilled +WL_SD_FreihandlinieVoll sym:.uno:Freeline +WL_SD_FreihandlinieLeer sym:.uno:Freeline_Unfilled ' ** ' ** Linien und Pfeile im Draw -WL_SD_LinieZeichnen .uno:Line -WL_SD_LinieMitPfeilende .uno:LineArrowEnd -WL_SD_LinieMitPfeilKreisende .uno:LineArrowCircle -WL_SD_LinieMitPfeilQuadratende .uno:LineArrowSquare -WL_SD_LinieWinkel .uno:Line_Diagonal -WL_SD_LinieMitPfeilanfang .uno:LineArrowStart -WL_SD_LinieMitKreisPfeilende .uno:LineCircleArrow -WL_SD_LinieMitQuadratKreisende .uno:LineSquareArrow -WL_SD_Masslinie .uno:MeasureLine -WL_SD_LinieMitPfeilenden .uno:LineArrows +WL_SD_LinieZeichnen sym:.uno:Line +WL_SD_LinieMitPfeilende sym:.uno:LineArrowEnd +WL_SD_LinieMitPfeilKreisende sym:.uno:LineArrowCircle +WL_SD_LinieMitPfeilQuadratende sym:.uno:LineArrowSquare +WL_SD_LinieWinkel sym:.uno:Line_Diagonal +WL_SD_LinieMitPfeilanfang sym:.uno:LineArrowStart +WL_SD_LinieMitKreisPfeilende sym:.uno:LineCircleArrow +WL_SD_LinieMitQuadratKreisende sym:.uno:LineSquareArrow +WL_SD_Masslinie sym:.uno:MeasureLine +WL_SD_LinieMitPfeilenden sym:.uno:LineArrows ' ** ' ** Rechtecke im Draw -WL_SD_RechteckVoll .uno:Rect -WL_SD_RechteckLeer .uno:Rect_Unfilled -WL_SD_RechteckRundVoll .uno:Rect_Rounded -WL_SD_RechteckRundLeer .uno:Rect_Rounded_Unfilled -WL_SD_QuadratVoll .uno:Square -WL_SD_QuadratLeer .uno:Square_Unfilled -WL_SD_QuadratRundVoll .uno:Square_Rounded -WL_SD_QuadratRundLeer .uno:Square_Rounded_Unfilled +WL_SD_RechteckVoll sym:.uno:Rect +WL_SD_RechteckLeer sym:.uno:Rect_Unfilled +WL_SD_RechteckRundVoll sym:.uno:Rect_Rounded +WL_SD_RechteckRundLeer sym:.uno:Rect_Rounded_Unfilled +WL_SD_QuadratVoll sym:.uno:Square +WL_SD_QuadratLeer sym:.uno:Square_Unfilled +WL_SD_QuadratRundVoll sym:.uno:Square_Rounded +WL_SD_QuadratRundLeer sym:.uno:Square_Rounded_Unfilled ' ** ' ** Text im Draw -WL_SD_TextBox .uno:TextToolbox -WL_SD_TextEinfuegenDraw .uno:Text -WL_SD_TextRahmen .uno:TextFitToSizeTool -WL_SD_TextLegende .uno:DrawCaption +WL_SD_TextBox sym:.uno:TextToolbox +WL_SD_TextEinfuegenDraw sym:.uno:Text +WL_SD_TextRahmen sym:.uno:TextFitToSizeTool +WL_SD_TextLegende sym:.uno:DrawCaption ' ** ' ** Verbinder im Draw -WL_SD_VVerbinder .uno:Connector -WL_SD_VPfeilAnfang .uno:ConnectorArrowStart -WL_SD_VPfeilEnde .uno:ConnectorArrowEnd -WL_SD_Vpfeile .uno:ConnectorArrows -WL_SD_VkreisAnfang .uno:ConnectorCircleStart -WL_SD_VkreisEnde .uno:ConnectorCircleEnd -WL_SD_Vkreise .uno:ConnectorCircles -WL_SD_LinienVerbinder .uno:ConnectorLines -WL_SD_LPfeilAnfang .uno:ConnectorLinesArrowStart -WL_SD_LPfeilEnde .uno:ConnectorLinesArrowEnd -WL_SD_Lpfeile .uno:ConnectorLinesArrows -WL_SD_LkreisAnfang .uno:ConnectorLinesCircleStart -WL_SD_LkreisEnde .uno:ConnectorLinesCircleEnd -WL_SD_Lkreise .uno:ConnectorLinesCircles -WL_SD_Direktverbinder .uno:ConnectorLine -WL_SD_DPfeilAnfang .uno:ConnectorLineArrowStart -WL_SD_DPfeilEnde .uno:ConnectorLineArrowEnd -WL_SD_Dpfeile .uno:ConnectorLineArrows -WL_SD_DkreisAnfang .uno:ConnectorLineCircleStart -WL_SD_DkreisEnde .uno:ConnectorLineCircleEnd -WL_SD_DKreise .uno:ConnectorLineCircles -WL_SD_KurvenVerbinder .uno:ConnectorCurve -WL_SD_KPfeilAnfang .uno:ConnectorCurveArrowStart -WL_SD_KPfeilEnde .uno:ConnectorCurveArrowEnd -WL_SD_Kpfeile .uno:ConnectorCurveArrows -WL_SD_KkreisAnfang .uno:ConnectorCurveCircleStart -WL_SD_KkreisEnde .uno:ConnectorCurveCircleEnd -WL_SD_KKreise .uno:ConnectorCurveCircles +WL_SD_VVerbinder sym:.uno:Connector +WL_SD_VPfeilAnfang sym:.uno:ConnectorArrowStart +WL_SD_VPfeilEnde sym:.uno:ConnectorArrowEnd +WL_SD_Vpfeile sym:.uno:ConnectorArrows +WL_SD_VkreisAnfang sym:.uno:ConnectorCircleStart +WL_SD_VkreisEnde sym:.uno:ConnectorCircleEnd +WL_SD_Vkreise sym:.uno:ConnectorCircles +WL_SD_LinienVerbinder sym:.uno:ConnectorLines +WL_SD_LPfeilAnfang sym:.uno:ConnectorLinesArrowStart +WL_SD_LPfeilEnde sym:.uno:ConnectorLinesArrowEnd +WL_SD_Lpfeile sym:.uno:ConnectorLinesArrows +WL_SD_LkreisAnfang sym:.uno:ConnectorLinesCircleStart +WL_SD_LkreisEnde sym:.uno:ConnectorLinesCircleEnd +WL_SD_Lkreise sym:.uno:ConnectorLinesCircles +WL_SD_Direktverbinder sym:.uno:ConnectorLine +WL_SD_DPfeilAnfang sym:.uno:ConnectorLineArrowStart +WL_SD_DPfeilEnde sym:.uno:ConnectorLineArrowEnd +WL_SD_Dpfeile sym:.uno:ConnectorLineArrows +WL_SD_DkreisAnfang sym:.uno:ConnectorLineCircleStart +WL_SD_DkreisEnde sym:.uno:ConnectorLineCircleEnd +WL_SD_DKreise sym:.uno:ConnectorLineCircles +WL_SD_KurvenVerbinder sym:.uno:ConnectorCurve +WL_SD_KPfeilAnfang sym:.uno:ConnectorCurveArrowStart +WL_SD_KPfeilEnde sym:.uno:ConnectorCurveArrowEnd +WL_SD_Kpfeile sym:.uno:ConnectorCurveArrows +WL_SD_KkreisAnfang sym:.uno:ConnectorCurveCircleStart +WL_SD_KkreisEnde sym:.uno:ConnectorCurveCircleEnd +WL_SD_KKreise sym:.uno:ConnectorCurveCircles ' ** ' ** 3D-Objekte im Draw -WL_SD_Wuerfel .uno:Cube -WL_SD_Kugel .uno:Sphere -WL_SD_Zylinder .uno:Cylinder -WL_SD_Kegel .uno:Cone -WL_SD_Pyramide .uno:Cyramid -WL_SD_Torus .uno:Torus -WL_SD_Schale .uno:Shell3D -WL_SD_Halbkugel .uno:HalfSphere +WL_SD_Wuerfel sym:.uno:Cube +WL_SD_Kugel sym:.uno:Sphere +WL_SD_Zylinder sym:.uno:Cylinder +WL_SD_Kegel sym:.uno:Cone +WL_SD_Pyramide sym:.uno:Cyramid +WL_SD_Torus sym:.uno:Torus +WL_SD_Schale sym:.uno:Shell3D +WL_SD_Halbkugel sym:.uno:HalfSphere ' ** ' ** Einfuegen im Draw -WL_TB_SD_EINFUEGEN_Diagramm .uno:InsertObjectChart -WL_TB_SD_EINFUEGEN_Formel .uno:InsertMath -WL_TB_SD_EINFUEGEN_Objekt .uno:InsertObject -WL_TB_SD_EINFUEGEN_Plugin .uno:InsertPlugin -WL_TB_SD_EINFUEGEN_Tabelle .uno:InsertSpreadsheet -WL_TB_SD_EINFUEGEN_Datei .uno:ImportFromFile -WL_TB_SD_EINFUEGEN_Seite .uno:InsertPage -WL_TB_SD_EINFUEGEN_StarImage .uno:InsertImage +WL_TB_SD_EINFUEGEN_Diagramm sym:.uno:InsertObjectChart +WL_TB_SD_EINFUEGEN_Formel sym:.uno:InsertMath +WL_TB_SD_EINFUEGEN_Objekt sym:.uno:InsertObject +WL_TB_SD_EINFUEGEN_Plugin sym:.uno:InsertPlugin +WL_TB_SD_EINFUEGEN_Tabelle sym:.uno:InsertSpreadsheet +WL_TB_SD_EINFUEGEN_Datei sym:.uno:ImportFromFile +WL_TB_SD_EINFUEGEN_Seite sym:.uno:InsertPage +WL_TB_SD_EINFUEGEN_StarImage sym:.uno:InsertImage ' ** ' ** Einfuegen im Calc -WL_TB_SC_Einfuegen_Grafik .uno:InsertGraphic -WL_TB_SC_Einfuegen_Sonderzeichen .uno:InsertSymbol +WL_TB_SC_Einfuegen_Grafik sym:.uno:InsertGraphic +WL_TB_SC_Einfuegen_Sonderzeichen sym:.uno:InsertSymbol ' ** ' ** Einfuegen Objekte im Calc -WL_TB_SC_OBJEKT_Diagramm .uno:DrawChart -WL_TB_SC_OBJEKT_Image .uno:InsertObjectStarImage -WL_TB_SC_OBJEKT_Formel .uno:InsertObjectStarMath -WL_TB_SC_OBJEKT_Frame .uno:InsertObjectFloatingFrame -WL_TB_SC_OBJEKT_Objekt .uno:InsertObject -WL_TB_SC_OBJEKT_Plugin .uno:InsertPlugin +WL_TB_SC_OBJEKT_Diagramm sym:.uno:DrawChart +WL_TB_SC_OBJEKT_Image sym:.uno:InsertObjectStarImage +WL_TB_SC_OBJEKT_Formel sym:.uno:InsertObjectStarMath +WL_TB_SC_OBJEKT_Frame sym:.uno:InsertObjectFloatingFrame +WL_TB_SC_OBJEKT_Objekt sym:.uno:InsertObject +WL_TB_SC_OBJEKT_Plugin sym:.uno:InsertPlugin ' ** ' ** Einfuegen Zellen im Calc -WL_TB_SC_Zellen_ZellenNachUnten .uno:InsertCellsDown -WL_TB_SC_Zellen_ZellenNachRechts .uno:InsertCellsRight -WL_TB_SC_Zellen_GanzeZeile .uno:InsertRows -WL_TB_SC_Zellen_GanzeSpalte .uno:InsertColumns +WL_TB_SC_Zellen_ZellenNachUnten sym:.uno:InsertCellsDown +WL_TB_SC_Zellen_ZellenNachRechts sym:.uno:InsertCellsRight +WL_TB_SC_Zellen_GanzeZeile sym:.uno:InsertRows +WL_TB_SC_Zellen_GanzeSpalte sym:.uno:InsertColumns ' ** ' ** Optionsleiste im Draw / Impress -Opl_SD_PunkteBearbeiten .uno:ToggleObjectBezierMode -Opl_SD_KlebepunkteBearbeiten .uno:GlueEditMode +Opl_SD_PunkteBearbeiten sym:.uno:ToggleObjectBezierMode +Opl_SD_KlebepunkteBearbeiten sym:.uno:GlueEditMode Opl_SD_EffekteZulassen .uno:AnimationObjects -Opl_SD_DrehmodusNachKlick .uno:ClickChangeRotation -Opl_SD_RasterSichtbar .uno:GridVisible -Opl_SD_FanglinieSichtbar .uno:HelplinesVisible -Opl_SD_HilfslinienBeimVerschieben .uno:HelplinesMove -Opl_SD_RasterBenutzen .uno:GridUse -Opl_SD_FanglinieBenutzen .uno:HelplinesUse -Opl_SD_FangenAnSeitenraendern .uno:SnapBorder -Opl_SD_FangenAnObjektRahmen .uno:SnapFrame -Opl_SD_FangenAnObjektpunkten .uno:SnapPoints -Opl_SD_Schnellbearbeitung .uno:QuickEdit -Opl_SD_NurTextbreichSelektieren .uno:PickThrough -Opl_SD_TextBearbeitenBeiDoppelklick .uno:DoubleClickTextEdit -Opl_SD_EinfacheHandles .uno:HandlesDraft -Opl_SD_GrosseHandles .uno:BigHandles -Opl_SD_ObjektMitAttributen .uno:SolidCreate -Opl_SD_AlleGruppierungenVerlassen .uno:ConnectorLinesCircles +Opl_SD_DrehmodusNachKlick sym:.uno:ClickChangeRotation +Opl_SD_RasterSichtbar sym:.uno:GridVisible +Opl_SD_FanglinieSichtbar sym:.uno:HelplinesVisible +Opl_SD_HilfslinienBeimVerschieben sym:.uno:HelplinesMove +Opl_SD_RasterBenutzen sym:.uno:GridUse +Opl_SD_FanglinieBenutzen sym:.uno:HelplinesUse +Opl_SD_FangenAnSeitenraendern sym:.uno:SnapBorder +Opl_SD_FangenAnObjektRahmen sym:.uno:SnapFrame +Opl_SD_FangenAnObjektpunkten sym:.uno:SnapPoints +Opl_SD_Schnellbearbeitung sym:.uno:QuickEdit +Opl_SD_NurTextbreichSelektieren sym:.uno:PickThrough +Opl_SD_TextBearbeitenBeiDoppelklick sym:.uno:DoubleClickTextEdit +Opl_SD_EinfacheHandles sym:.uno:HandlesDraft +Opl_SD_GrosseHandles sym:.uno:BigHandles +Opl_SD_ObjektMitAttributen sym:.uno:SolidCreate +Opl_SD_AlleGruppierungenVerlassen sym:.uno:ConnectorLinesCircles diff --git a/testautomation/global/sid/context.sid b/testautomation/global/sid/context.sid index de43147c5eb0..43ef943d96eb 100644 --- a/testautomation/global/sid/context.sid +++ b/testautomation/global/sid/context.sid @@ -5,36 +5,36 @@ ' Minimieren SID_WIN_MINIMIZED ' ** Kontextmenue Calc -ZeilenLoeschen .uno:DeleteRows -SpaltenLoeschen .uno:DeleteColumns -' AnhaengenTabelle .uno:Add ' ist zur 541 rausgenommen worden -NotizAnzeigen .uno:NoteVisible +ZeilenLoeschen sym:.uno:DeleteRows +SpaltenLoeschen sym:.uno:DeleteColumns +' AnhaengenTabelle sym:.uno:Add ' ist zur 541 rausgenommen worden +NotizAnzeigen sym:.uno:NoteVisible ' Kontextmenue: Tabelle Calc -AlleTabellenAuswaehlen .uno:TableSelectAll -SetTabColor .uno:SetTabBgColor +AlleTabellenAuswaehlen sym:.uno:TableSelectAll +SetTabColor sym:.uno:SetTabBgColor ' ** Kontextmenue im Gestalter/Stylist -Stylist_Neu SFX2_HID_STYLIST_NEW -Stylist_Aendern SFX2_HID_STYLIST_EDIT -Stylist_Loeschen SFX2_HID_STYLIST_DELETE +Stylist_Neu sym:SFX2_HID_STYLIST_NEW +Stylist_Aendern sym:SFX2_HID_STYLIST_EDIT +Stylist_Loeschen sym:SFX2_HID_STYLIST_DELETE 'Open ' ** Kontextmenue Objekte -Obj_Originalgroesse .uno:OriginalSize +Obj_Originalgroesse sym:.uno:OriginalSize ' ** Kontextmenue SeitenUmbruchvorschau Calc -Skalierungaufheben .uno:ResetPrintZoom +Skalierungaufheben sym:.uno:ResetPrintZoom ' ** Kontextmenue automatische Rechtschreibung pruefen -ARP_Ersetzung SW_HID_LINGU_REPLACE -ARP_Rechtschreibung SW_HID_LINGU_SPELLING_DLG -ARP_Aufnehmen SW_HID_LINGU_ADD_WORD -ARP_AlleIgnorieren SW_HID_LINGU_IGNORE_WORD -ARP_Autokorrektur SW_HID_LINGU_AUTOCORR +ARP_Ersetzung sym:SW_HID_LINGU_REPLACE +ARP_Rechtschreibung sym:SW_HID_LINGU_SPELLING_DLG +ARP_Aufnehmen sym:SW_HID_LINGU_ADD_WORD +ARP_AlleIgnorieren sym:SW_HID_LINGU_IGNORE_WORD +ARP_Autokorrektur sym:SW_HID_LINGU_AUTOCORR ' ** Kontextmenue IMPRESS/DRAW -VorlageBearbeiten .uno:EditStyle -ContextOriginalSize .uno:OriginalSize +VorlageBearbeiten sym:.uno:EditStyle +ContextOriginalSize sym:.uno:OriginalSize diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid index 83e37b16a848..56a3f3d9e371 100644 --- a/testautomation/global/sid/e_all.sid +++ b/testautomation/global/sid/e_all.sid @@ -11,135 +11,135 @@ ' ********* File Menu ********* ' **** ' **** All applications -FileNewFromTemplate .uno:NewDoc -FileOpen .uno:Open +FileNewFromTemplate sym:.uno:NewDoc +FileOpen sym:.uno:Open FileAutopilotLetter service:com.sun.star.wizards.letter.CallWizard?start FileAutopilotFax service:com.sun.star.wizards.fax.CallWizard?start FileAutopilotAgenda service:com.sun.star.wizards.agenda.CallWizard?start -FileAutopilotPresentation .uno:AutoPilotPresentations -FileAutopilotAddressDataSource .uno:AutoPilotAddressDataSource +FileAutopilotPresentation sym:.uno:AutoPilotPresentations +FileAutopilotAddressDataSource sym:.uno:AutoPilotAddressDataSource FirstTimeWizard service:com.sun.star.comp.desktop.FirstStart?start FileWizardsWebPage service:com.sun.star.wizards.web.CallWizard?start -FileCloseAndReturn .uno:CloseDoc -FileSaveCopy .uno:SaveAs +FileCloseAndReturn sym:.uno:CloseDoc +FileSaveCopy sym:.uno:SaveAs FileClose .uno:CloseDoc -FileSave .uno:Save -FileSaveAs .uno:SaveAs -FileSaveAll .uno:SaveAll -FileExport .uno:ExportTo -FileExportAsPDF .uno:ExportToPDF -FileSendDocumentAsEmail .uno:SendMail -FileSendDocumentAsPDF .uno:SendMailDocAsPDF -FileVersions .uno:VersionDialog -FileReload .uno:Reload SID_LASTVERSIONDOC -FileProperties .uno:SetDocumentProperties -FileTemplatesOrganize .uno:Organizer -FileTemplatesSave .uno:SaveAsTemplate -FileTemplatesEdit .uno:OpenTemplate -FileTemplatesAddressbookSource .uno:AddressBookSource -FilePageView .uno:PrintPreview -FilePrint .uno:Print -FilePrintersettings .uno:PrinterSetup -FileExit .uno:Quit +FileSave sym:.uno:Save +FileSaveAs sym:.uno:SaveAs +FileSaveAll sym:.uno:SaveAll +FileExport sym:.uno:ExportTo +FileExportAsPDF sym:.uno:ExportToPDF +FileSendDocumentAsEmail sym:.uno:SendMail +FileSendDocumentAsPDF sym:.uno:SendMailDocAsPDF +FileVersions sym:.uno:VersionDialog +FileReload sym:.uno:Reload SID_LASTVERSIONDOC +FileProperties sym:.uno:SetDocumentProperties +FileTemplatesOrganize sym:.uno:Organizer +FileTemplatesSave sym:.uno:SaveAsTemplate +FileTemplatesEdit sym:.uno:OpenTemplate +FileTemplatesAddressbookSource sym:.uno:AddressBookSource +FilePageView sym:.uno:PrintPreview +FilePrint sym:.uno:Print +FilePrintersettings sym:.uno:PrinterSetup +FileExit sym:.uno:Quit ' **** Writer -FileSendOutlineToPresentation .uno:SendOutlineToStarImpress -FileSendOutlineToClipboard .uno:SendOutlineToClipboard -FileSendCreateAutoabstract .uno:CreateAbstract -FileSendAutoabstractToPresentation .uno:SendAbstractToStarImpress -FileSendCreateMasterdocument .uno:NewGlobalDoc -FileSendCreateHTMLDocument .uno:NewHtmlDoc +FileSendOutlineToPresentation sym:.uno:SendOutlineToStarImpress +FileSendOutlineToClipboard sym:.uno:SendOutlineToClipboard +FileSendCreateAutoabstract sym:.uno:CreateAbstract +FileSendAutoabstractToPresentation sym:.uno:SendAbstractToStarImpress +FileSendCreateMasterdocument sym:.uno:NewGlobalDoc +FileSendCreateHTMLDocument sym:.uno:NewHtmlDoc ' **** Impress / Draw -FilePack .uno:PackAndGo +FilePack sym:.uno:PackAndGo ' *********************************** ' ********* Edit Menu ********* ' **** ' **** All applications -EditUndo .uno:Undo -EditRedo .uno:Redo -EditRepeat .uno:RepeatAction -EditCut .uno:Cut +EditUndo sym:.uno:Undo +EditRedo sym:.uno:Redo +EditRepeat sym:.uno:RepeatAction +EditCut sym:.uno:Cut EditCopy .uno:Copy EditDoc .uno:EditDoc -EditPaste .uno:Paste -EditDelete .uno:Delete -EditSelectAll .uno:SelectAll -EditSearchAndReplace .uno:SearchDialog -EditPlugIn .uno:PlugInsActive -EditImageMap .uno:ImageMapDialog +EditPaste sym:.uno:Paste +EditDelete sym:.uno:Delete +EditSelectAll sym:.uno:SelectAll +EditSearchAndReplace sym:.uno:SearchDialog +EditPlugIn sym:.uno:PlugInsActive +EditImageMap sym:.uno:ImageMapDialog EditObjectEdit .uno:ObjectMenue?VerbID:short=0 EditObjectProperties .uno:ObjectMenue?VerbID:short=-7 EditObjectOpen .uno:ObjectMenue?VerbID:short=2 EditObjectSaveCopyAs .uno:ObjectMenue?VerbID:short=-8 ' **** Writer -EditAutotext .uno:EditGlossary +EditAutotext sym:.uno:EditGlossary EditPasteSpecialWriter .uno:PasteSpecial -EditChangesRecord .uno:TrackChanges -EditChangesShow .uno:ShowTrackedChanges -EditChangesAcceptOrReject .uno:AcceptTrackedChanges -EditChangesComment .uno:CommentChangeTracking -EditChangesMergeDocument .uno:MergeDocuments -EditCompareDocument .uno:CompareDocuments -EditChangesProtectTrace .uno:ProtectTraceChangeMode -EditLinksWriter .uno:LinkDialog -EditExchangeDatabase .uno:ChangeDatabaseField -EditFields .uno:FieldDialog -EditFootnote .uno:EditFootnote -EditIndexEntry .uno:IndexEntryDialog -EditBibliographyEntry .uno:AuthoritiesEntryDialog -EditHyperlink .uno:EditHyperlink +EditChangesRecord sym:.uno:TrackChanges +EditChangesShow sym:.uno:ShowTrackedChanges +EditChangesAcceptOrReject sym:.uno:AcceptTrackedChanges +EditChangesComment sym:.uno:CommentChangeTracking +EditChangesMergeDocument sym:.uno:MergeDocuments +EditCompareDocument sym:.uno:CompareDocuments +EditChangesProtectTrace sym:.uno:ProtectTraceChangeMode +EditLinksWriter sym:.uno:LinkDialog +EditExchangeDatabase sym:.uno:ChangeDatabaseField +EditFields sym:.uno:FieldDialog +EditFootnote sym:.uno:EditFootnote +EditIndexEntry sym:.uno:IndexEntryDialog +EditBibliographyEntry sym:.uno:AuthoritiesEntryDialog +EditHyperlink sym:.uno:EditHyperlink EditSelectionModeStandard .uno:SelectionModeDefault EditSelectionModeBlock .uno:SelectionModeBlock ' **** Calc EditPasteSpecialCalc .uno:PasteSpecial -EditChangesRecordCalc .uno:TraceChangeMode -EditChangesProtectTraceCalc .uno:ProtectTraceChangeMode -EditChangesCommentsCalc .uno:CommentChange -EditChangesShowCalc .uno:ShowChanges -EditChangesAcceptOrDiscardCalc .uno:AcceptChanges -EditChangesDocumentMergeDocumentCalc .uno:MergeDocuments -EditCompareDocumentCalc .uno:CompareDocuments -EditLinksCalc .uno:EditLinks -EditHeadersAndFooters .uno:EditHeaderAndFooter -EditFillLeft .uno:FillLeft -EditFillUp .uno:FillUp -EditFillRight .uno:FillRight -EditFillSeries .uno:FillSeries -EditFillSheet .uno:FillTable -EditFillDown .uno:FillDown -EditDeleteContents .uno:Delete -EditDeleteCells .uno:DeleteCell -EditDeleteSheet .uno:Remove -EditCopyMoveSheet .uno:Move -EditSheetSelect .uno:SelectTables -EditRemoveManualBreakColumnBreak .uno:DeleteColumnbreak -EditRemoveManualBreakRowBreak .uno:DeleteRowbreak +EditChangesRecordCalc sym:.uno:TraceChangeMode +EditChangesProtectTraceCalc sym:.uno:ProtectTraceChangeMode +EditChangesCommentsCalc sym:.uno:CommentChange +EditChangesShowCalc sym:.uno:ShowChanges +EditChangesAcceptOrDiscardCalc sym:.uno:AcceptChanges +EditChangesDocumentMergeDocumentCalc sym:.uno:MergeDocuments +EditCompareDocumentCalc sym:.uno:CompareDocuments +EditLinksCalc sym:.uno:EditLinks +EditHeadersAndFooters sym:.uno:EditHeaderAndFooter +EditFillLeft sym:.uno:FillLeft +EditFillUp sym:.uno:FillUp +EditFillRight sym:.uno:FillRight +EditFillSeries sym:.uno:FillSeries +EditFillSheet sym:.uno:FillTable +EditFillDown sym:.uno:FillDown +EditDeleteContents sym:.uno:Delete +EditDeleteCells sym:.uno:DeleteCell +EditDeleteSheet sym:.uno:Remove +EditCopyMoveSheet sym:.uno:Move +EditSheetSelect sym:.uno:SelectTables +EditRemoveManualBreakColumnBreak sym:.uno:DeleteColumnbreak +EditRemoveManualBreakRowBreak sym:.uno:DeleteRowbreak EditObjectSaveCopyAsCalc .uno:ObjectMenue?VerbID:short=-8 ' **** Draw / Impress EditPasteSpecial .uno:PasteSpecial -EditLinksDraw .uno:ManageLinks -EditDuplicate .uno:CopyObjects -EditCrossFading .uno:Morphing -EditRenameSlide .uno:RenamePage -EditDeleteSlide .uno:DeletePage -InsertLayer .uno:InsertLayer -EditDeleteLayer .uno:DeleteLayer -EditLayerRename .uno:RenameLayer -EditfieldsDraw .uno:ModifyField -EditHyperlinkDraw .uno:EditHyperlink -EditGluePoints .uno:GlueEditMode +EditLinksDraw sym:.uno:ManageLinks +EditDuplicate sym:.uno:CopyObjects +EditCrossFading sym:.uno:Morphing +EditRenameSlide sym:.uno:RenamePage +EditDeleteSlide sym:.uno:DeletePage +InsertLayer sym:.uno:InsertLayer +EditDeleteLayer sym:.uno:DeleteLayer +EditLayerRename sym:.uno:RenameLayer +EditfieldsDraw sym:.uno:ModifyField +EditHyperlinkDraw sym:.uno:EditHyperlink +EditGluePoints sym:.uno:GlueEditMode ' **** Chart / Math -EditSelectAllMath .uno:Select -EditNextMarker .uno:NextMark -EditPreviousMarker .uno:PrevMark -EditNextError .uno:NextError -EditPreviousError .uno:PrevError +EditSelectAllMath sym:.uno:Select +EditNextMarker sym:.uno:NextMark +EditPreviousMarker sym:.uno:PrevMark +EditNextError sym:.uno:NextError +EditPreviousError sym:.uno:PrevError EditChartData .uno:DiagramData EditDataRanges .uno:DataRanges @@ -147,15 +147,15 @@ EditDataRanges .uno:DataRanges ' ********* View Menu ********* ' **** ' **** All applications -ViewZoom .uno:Zoom -ViewBeamer .uno:Beamer +ViewZoom sym:.uno:Zoom +ViewBeamer sym:.uno:Beamer ViewDataSources .uno:ViewDataSourceBrowser ViewToolbarsHyperlinkbar .uno:InsertHyperlink ViewToolbarsConfigure .uno:ConfigureDialog -ViewToolbarsStatusbar .uno:StatusBarVisible -ViewFullScreen .uno:FullScreen -ViewCurrentDatabase .uno:ViewDataSourceBrowser -ViewNavigator .uno:Navigator +ViewToolbarsStatusbar sym:.uno:StatusBarVisible +ViewFullScreen sym:.uno:FullScreen +ViewCurrentDatabase sym:.uno:ViewDataSourceBrowser +ViewNavigator sym:.uno:Navigator ViewToolbarsThreeDSettings .uno:AvailableToolbars?Toolbar:string=extrusionobjectbar ViewToolbarsAlign .uno:AvailableToolbars?Toolbar:string=alignmentbar ViewToolbarsBasicShapes .uno:AvailableToolbars?Toolbar:string=basicshapes @@ -204,88 +204,88 @@ ViewToolbarsPreviewbar .uno:AvailableToolbars?Toolbar:string=previewbar ViewToolbarsDrawObjectbar .uno:AvailableToolbars?Toolbar:string=drawobjectbar ' **** Writer -ViewRuler .uno:Ruler -ViewCurrentDatabaseWriter .uno:ViewDataSourceBrowser -ViewTextBoundaries .uno:ViewBounds -ViewFieldShadings .uno:Marks -ViewFields .uno:Fieldnames -ViewNonprintingCharacters .uno:ControlCodes -ViewOnlineLayout .uno:BrowseView -ViewHiddenParagraphs .uno:ShowHiddenParagraphs -ViewInputMethodStatus .uno:ShowImeStatusWindow +ViewRuler sym:.uno:Ruler +ViewCurrentDatabaseWriter sym:.uno:ViewDataSourceBrowser +ViewTextBoundaries sym:.uno:ViewBounds +ViewFieldShadings sym:.uno:Marks +ViewFields sym:.uno:Fieldnames +ViewNonprintingCharacters sym:.uno:ControlCodes +ViewOnlineLayout sym:.uno:BrowseView +ViewHiddenParagraphs sym:.uno:ShowHiddenParagraphs +ViewInputMethodStatus sym:.uno:ShowImeStatusWindow ' **** Calc ViewToolbarsFormulaBar .uno:InputLineVisible -ViewColumnAndRowHeaders .uno:ViewRowColumnHeaders -ViewValueHightlighting .uno:ViewValueHighlighting +ViewColumnAndRowHeaders sym:.uno:ViewRowColumnHeaders +ViewValueHightlighting sym:.uno:ViewValueHighlighting ViewNormalView .uno:NormalViewMode ViewPageBreakPreview .uno:PagebreakMode -ViewCurrentDatabaseCalc .uno:ViewDataSourceBrowser +ViewCurrentDatabaseCalc sym:.uno:ViewDataSourceBrowser ViewSelectionCalc .uno:Toolbox ' **** Draw / Impress -ViewBackground .uno:MasterPage -ViewDrawing .uno:SlideMasterPage -ViewGridVisible .uno:GridVisible -ViewGridUse .uno:GridUse -ViewGridFront .uno:GridFront +ViewBackground sym:.uno:MasterPage +ViewDrawing sym:.uno:SlideMasterPage +ViewGridVisible sym:.uno:GridVisible +ViewGridUse sym:.uno:GridUse +ViewGridFront sym:.uno:GridFront ViewHandout .uno:HandoutMode -ViewHeaderAndFooter .uno:HeaderAndFooter -ViewLayer .uno:LayerMode -ViewLayerButton SD_HID_SD_BTN_LAYER 59781 +ViewHeaderAndFooter sym:.uno:HeaderAndFooter +ViewLayer sym:.uno:LayerMode +ViewLayerButton sym:SD_HID_SD_BTN_LAYER 59781 ViewMasterPage .uno:MasterPage ViewMasterButton .uno:MasterPageMenu ViewNormal .uno:NormalMultiPaneGUI ViewNotes .uno:NotesMode ViewOutline .uno:OutlineMode ViewPagePane .uno:LeftPaneDraw -ViewPreview .uno:PreviewWindow +ViewPreview sym:.uno:PreviewWindow ViewPreviewWindow .uno:PreviewWindow -ViewQualityColour .uno:OutputQualityColor -ViewQualityGreyscale .uno:OutputQualityGrayscale -ViewQualityBlackWhite .uno:OutputQualityBlackWhite +ViewQualityColour sym:.uno:OutputQualityColor +ViewQualityGreyscale sym:.uno:OutputQualityGrayscale +ViewQualityBlackWhite sym:.uno:OutputQualityBlackWhite ViewRightPane .uno:RightPane -ViewRulers .uno:ShowRuler +ViewRulers sym:.uno:ShowRuler ViewSlideShow .uno:Presentation ViewSlideSorter .uno:DiaMode -ViewSlide .uno:PageMode -ViewSlideButton SD_HID_SD_BTN_PAGE 59779 -ViewSnapLinesVisible .uno:HelplinesVisible -ViewSnapLinesUse .uno:HelplinesUse -ViewSnapLinesFront .uno:HelplinesFront +ViewSlide sym:.uno:PageMode +ViewSlideButton sym:SD_HID_SD_BTN_PAGE 59779 +ViewSnapLinesVisible sym:.uno:HelplinesVisible +ViewSnapLinesUse sym:.uno:HelplinesUse +ViewSnapLinesFront sym:.uno:HelplinesFront ViewStatusBarVisible .uno:StatusBarVisible ViewShowImeStatusWindow .uno:ShowImeStatusWindow ViewShowRuler .uno:ShowRuler ViewTaskPane .uno:TaskPane ViewTaskSlide .uno:LeftPaneImpress -ViewTitle .uno:TitleMasterPage +ViewTitle sym:.uno:TitleMasterPage ViewToolbarsOptionbar .uno:AvailableToolbars?Toolbar:string=optionsbar ViewToolbarsColorBar .uno:ColorControl -ViewWorkspaceDrawingView .uno:DrawingMode -ViewWorkspaceOutlineView .uno:OutlineMode -ViewWorkspaceSlidesView .uno:DiaMode -ViewWorkspaceNotesView .uno:NotesMode -ViewWorkspaceHandoutView .uno:HandoutMode +ViewWorkspaceDrawingView sym:.uno:DrawingMode +ViewWorkspaceOutlineView sym:.uno:OutlineMode +ViewWorkspaceSlidesView sym:.uno:DiaMode +ViewWorkspaceNotesView sym:.uno:NotesMode +ViewWorkspaceHandoutView sym:.uno:HandoutMode ' **** Math -ViewAutoUpdateDisplay .uno:RedrawAutomatic -ViewSelection .uno:ToolBox -ViewZoomIn .uno:ZoomIn -ViewZoomAll .uno:ZoomOut -ViewShowAll .uno:Adjust -ViewUpdate .uno:Draw +ViewAutoUpdateDisplay sym:.uno:RedrawAutomatic +ViewSelection sym:.uno:ToolBox +ViewZoomIn sym:.uno:ZoomIn +ViewZoomAll sym:.uno:ZoomOut +ViewShowAll sym:.uno:Adjust +ViewUpdate sym:.uno:Draw ' **** WriterWeb -ViewPrintLayout .uno:PrintLayout -ViewHTMLSource .uno:SourceView +ViewPrintLayout sym:.uno:PrintLayout +ViewHTMLSource sym:.uno:SourceView ' *********************************** ' ********* Insert Menu ********** ' **** ' **** All applications -InsertGraphics .uno:InsertGraphic +InsertGraphics sym:.uno:InsertGraphic InsertChart .uno:InsertObjectChart -InsertGraphicsFromFile .uno:InsertGraphic +InsertGraphicsFromFile sym:.uno:InsertGraphic InsertMovieAndSound .uno:InsertAVMedia InsertFloatingFrame .uno:InsertObjectFloatingFrame InsertObjectOLEObject .uno:InsertObject @@ -304,58 +304,58 @@ InsertLRM .uno:InsertLRM InsertRLM .uno:InsertLRM ' **** Writer -InsertManualBreak .uno:InsertBreak +InsertManualBreak sym:.uno:InsertBreak InsertSpecialCharacterWriter .uno:InsertSymbol -InsertObjectFormulaWriter .uno:InsertObjectStarMath -InsertTableWriter .uno:InsertTable -InsertFileWriter .uno:InsertDoc -InsertFieldsDate .uno:InsertDateField -InsertFieldsTime .uno:InsertTimeField -InsertFieldsPageNumbers .uno:InsertPageNumberField -InsertFieldsPageCount .uno:InsertPageCountField -InsertFieldsSubject .uno:InsertTopicField -InsertFieldsTitle .uno:InsertTitleField -InsertFieldsAuthor .uno:InsertAuthorField -InsertFieldsOther .uno:InsertField -InsertHeader .uno:InsertPageHeader -InsertFooter .uno:InsertPageFooter -InsertSection .uno:InsertSection -InsertHyperlink .uno:HyperlinkDialog -InsertFootnote .uno:InsertFootnoteDialog -InsertCaption .uno:InsertCaptionDialog -InsertBookmark .uno:InsertBookmark -InsertReferenceField .uno:InsertReferenceField -InsertNoteWriter .uno:InsertAnnotation -InsertScript .uno:InsertScript -InsertIndexes .uno:InsertMultiIndex -InsertIndexesEntry .uno:InsertIndexesEntry -InsertIndexesBibliographyEntry .uno:InsertAuthoritiesEntry -InsertEnvelope .uno:InsertEnvelope -InsertHorizontalLine .uno:InsertGraphicRuler -InsertFrame .uno:InsertFrame -InsertGraphicsScanSelectSource .uno:TwainSelect -InsertGraphicsScanRequest .uno:TwainTransfer +InsertObjectFormulaWriter sym:.uno:InsertObjectStarMath +InsertTableWriter sym:.uno:InsertTable +InsertFileWriter sym:.uno:InsertDoc +InsertFieldsDate sym:.uno:InsertDateField +InsertFieldsTime sym:.uno:InsertTimeField +InsertFieldsPageNumbers sym:.uno:InsertPageNumberField +InsertFieldsPageCount sym:.uno:InsertPageCountField +InsertFieldsSubject sym:.uno:InsertTopicField +InsertFieldsTitle sym:.uno:InsertTitleField +InsertFieldsAuthor sym:.uno:InsertAuthorField +InsertFieldsOther sym:.uno:InsertField +InsertHeader sym:.uno:InsertPageHeader +InsertFooter sym:.uno:InsertPageFooter +InsertSection sym:.uno:InsertSection +InsertHyperlink sym:.uno:HyperlinkDialog +InsertFootnote sym:.uno:InsertFootnoteDialog +InsertCaption sym:.uno:InsertCaptionDialog +InsertBookmark sym:.uno:InsertBookmark +InsertReferenceField sym:.uno:InsertReferenceField +InsertNoteWriter sym:.uno:InsertAnnotation +InsertScript sym:.uno:InsertScript +InsertIndexes sym:.uno:InsertMultiIndex +InsertIndexesEntry sym:.uno:InsertIndexesEntry +InsertIndexesBibliographyEntry sym:.uno:InsertAuthoritiesEntry +InsertEnvelope sym:.uno:InsertEnvelope +InsertHorizontalLine sym:.uno:InsertGraphicRuler +InsertFrame sym:.uno:InsertFrame +InsertGraphicsScanSelectSource sym:.uno:TwainSelect +InsertGraphicsScanRequest sym:.uno:TwainTransfer ' **** Calc -InsertSpecialCharacterCalc .uno:InsertSymbol -InsertGraphicsFromImageEditorCalc .uno:InsertObjectStarImage +InsertSpecialCharacterCalc sym:.uno:InsertSymbol +InsertGraphicsFromImageEditorCalc sym:.uno:InsertObjectStarImage InsertChartCalc .uno:InsertObjectChart -InsertObjectFormulaCalc .uno:InsertObjectStarMath -InsertSheetCalc .uno:Insert -InsertManuelBreakColumnBreak .uno:InsertColumnBreak -InsertManuelBreakRowBreak .uno:InsertRowBreak -InsertCells .uno:InsertCell -InsertRowsCalc .uno:InsertRows -InsertColumnsCalc .uno:InsertColumns -InsertFunction .uno:FunctionDialog -InsertFunctionList .uno:FunctionBox -InsertNamesInsert .uno:InsertName -InsertNamesDefine .uno:DefineName -InsertNameCreate .uno:CreateNames -InsertNamesLabels .uno:DefineLabelRange -InsertNoteCalc .uno:InsertAnnotation -InsertLinkToExternalData .uno:InsertExternalDataSource -InsertSheetFromFile .uno:InsertSheetFromFile +InsertObjectFormulaCalc sym:.uno:InsertObjectStarMath +InsertSheetCalc sym:.uno:Insert +InsertManuelBreakColumnBreak sym:.uno:InsertColumnBreak +InsertManuelBreakRowBreak sym:.uno:InsertRowBreak +InsertCells sym:.uno:InsertCell +InsertRowsCalc sym:.uno:InsertRows +InsertColumnsCalc sym:.uno:InsertColumns +InsertFunction sym:.uno:FunctionDialog +InsertFunctionList sym:.uno:FunctionBox +InsertNamesInsert sym:.uno:InsertName +InsertNamesDefine sym:.uno:DefineName +InsertNameCreate sym:.uno:CreateNames +InsertNamesLabels sym:.uno:DefineLabelRange +InsertNoteCalc sym:.uno:InsertAnnotation +InsertLinkToExternalData sym:.uno:InsertExternalDataSource +InsertSheetFromFile sym:.uno:InsertSheetFromFile ' **** Draw InsertPage .uno:InsertPage @@ -364,32 +364,32 @@ InsertBullet .uno:InsertSymbol InsertCapturePoint .uno:CapturePoint InsertDuplicatePage .uno:DuplicatePage InsertSpecialCharacterDraw .uno:InsertSymbol -InsertGraficsDraw .uno:InsertImage +InsertGraficsDraw sym:.uno:InsertImage InsertGraphicMenu .uno:GraphicMenu -InsertObjectFormulaDraw .uno:InsertMath +InsertObjectFormulaDraw sym:.uno:InsertMath InsertObjectMenu .uno:ObjectMenu InsertImportFromFile .uno:ImportFromFile InsertSpreadsheet .uno:InsertSpreadsheet -InsertSpreadsheetDraw .uno:InsertSpreadsheet -InsertFileDraw .uno:ImportFromFile -InsertSlide .uno:InsertPage -InsertDuplicateSlide .uno:DuplicatePage -InsertExpandSlide .uno:ExpandPage -InsertSummerySlide .uno:SummaryPage -InsertFieldsDateFix .uno:InsertDateFieldFix -InsertFieldsDateVariable .uno:InsertDateFieldVar +InsertSpreadsheetDraw sym:.uno:InsertSpreadsheet +InsertFileDraw sym:.uno:ImportFromFile +InsertSlide sym:.uno:InsertPage +InsertDuplicateSlide sym:.uno:DuplicatePage +InsertExpandSlide sym:.uno:ExpandPage +InsertSummerySlide sym:.uno:SummaryPage +InsertFieldsDateFix sym:.uno:InsertDateFieldFix +InsertFieldsDateVariable sym:.uno:InsertDateFieldVar InsertFieldMenu .uno:FieldMenu -InsertFieldsTimeFix .uno:InsertTimeFieldFix -InsertFieldsTimeVariable .uno:InsertTimeFieldVar -InsertFieldsAuthorDraw .uno:InsertAuthorField -InsertFieldsPageNumberDraw .uno:InsertPageField +InsertFieldsTimeFix sym:.uno:InsertTimeFieldFix +InsertFieldsTimeVariable sym:.uno:InsertTimeFieldVar +InsertFieldsAuthorDraw sym:.uno:InsertAuthorField +InsertFieldsPageNumberDraw sym:.uno:InsertPageField InsertFieldsPageCountDraw .uno:InsertPagesField -InsertFieldsFileName .uno:InsertFileField +InsertFieldsFileName sym:.uno:InsertFileField InsertHyperlinkDialog .uno:HyperlinkDialog -InsertScanSelectSource .uno:TwainSelect -InsertScanRequest .uno:TwainTransfer -InsertSymbol .uno:ChoosePolygon -InsertSnapPointLine .uno:CapturePoint +InsertScanSelectSource sym:.uno:TwainSelect +InsertScanRequest sym:.uno:TwainTransfer +InsertSymbol sym:.uno:ChoosePolygon +InsertSnapPointLine sym:.uno:CapturePoint ' **** Chart InsertTitle .uno:InsertMenuTitles @@ -405,15 +405,15 @@ InsertYErrorBars .uno:InsertMenuYErrorBars ' *********** Format Menu *********** ' **** ' **** All applications -FormatCharacter .uno:FontDialog -FormatLine .uno:FormatLine -FormatArea .uno:FormatArea -FormatParagraph .uno:ParagraphDialog -FormatStylesCatalog .uno:StyleCatalog -FormatStylesLoad .uno:LoadStyles -FormatStylist .uno:DesignerDialog -FormatControl .uno:ControlProperties -FormatForm .uno:FormProperties +FormatCharacter sym:.uno:FontDialog +FormatLine sym:.uno:FormatLine +FormatArea sym:.uno:FormatArea +FormatParagraph sym:.uno:ParagraphDialog +FormatStylesCatalog sym:.uno:StyleCatalog +FormatStylesLoad sym:.uno:LoadStyles +FormatStylist sym:.uno:DesignerDialog +FormatControl sym:.uno:ControlProperties +FormatForm sym:.uno:FormProperties FormatChangeCaseToSentence .uno:ChangeCaseToSentenceCase FormatChangeCaseCapitalizeEveryWord .uno:ChangeCaseToTitleCase FormatChangeCaseToggleCase .uno:ChangeCaseToToggleCase @@ -426,143 +426,143 @@ FormatChangeCaseKatagana .uno:ChangeCaseToKatakana ' **** Writer FormatDefaultWriter .uno:ResetAttributes -FormatPageWriter .uno:PageDialog -FormatSections .uno:EditRegion -FormatNumberingBullets .uno:BulletsAndNumberingDialog +FormatPageWriter sym:.uno:PageDialog +FormatSections sym:.uno:EditRegion +FormatNumberingBullets sym:.uno:BulletsAndNumberingDialog FormatAutoformatWhileTyping .uno:OnlineAutoFormat FormatAutoformatApply .uno:AutoFormatApply FormatAutoFormatApplyAndEditChanges .uno:AutoFormatRedlineApply -FormatTable .uno:TableDialog -FormatSplitTable .uno:SplitTable -FormatMergeTables .uno:MergeTable -FormatTextWriter .uno:TextAttributes -FormatNumberFormat .uno:TableNumberFormatDialog -FormatRowHeight .uno:SetRowHeight -FormatRowOptimalHeight .uno:SetOptimalRowHeight -FormatRowSpaceEqually .uno:DistributeRows -FormatRowSelect .uno:EntireRow -FormatRowInsert .uno:InsertRowDialog -FormatRowDelete .uno:DeleteRows -FormatRuby .uno:RubyDialog -FormatColumns .uno:FormatColumns -FormatColumnWidthWriter .uno:SetColumnWidth -FormatColumnOptimalWidthWriter .uno:SetOptimalColumnWidth -FormatColumnSpaceEqually .uno:DistributeColumns -FormatColumnInsert .uno:InsertColumnDialog -FormatGraphics .uno:GraphicDialog -FormatFrame .uno:FrameDialog -FormatObject .uno:FrameDialog -FormatArrangeBringToFront .uno:BringToFront -FormatArrangeBringForward .uno:ObjectForwardOne -FormatArrangeSetBackward .uno:ObjectBackOne -FormatArrangeSendToBack .uno:SendToBack -FormatArrangeToForeground .uno:SetObjectToForeground -FormatArrangeToBackground .uno:SetObjectToBackground -FormatAlignmentLeft .uno:AlignLeft -FormatAlignmentCentered .uno:AlignHorizontalCenter -FormatAlignmentRight .uno:AlignRight -FormatAlignmentTop .uno:AlignTop -FormatAlignmentCenter .uno:AlignVerticalCenter -FormatAlignmentBottom .uno:AlignBottom -FormatAnchorToPage .uno:SetAnchorToPage -FormatAnchorToParagraph .uno:SetAnchorToPara -FormatAnchorAsCharacter .uno:SetAnchorToChar -FormatAnchorToCharacter .uno:SetAnchorAtChar -FormatAnchorToFrame .uno:SetAnchorToFrame -FormatWrapNoWrap .uno:WrapOff -FormatWrapPageWrap .uno:WrapOn -FormatWrapOptimalPageWrap .uno:WrapIdeal -FormatWrapThrough .uno:WrapThrough -FormatWrapInBackground .uno:WrapThroughTransparent -FormatWrapContour .uno:WrapContour -FormatWrapEditContour .uno:ContourDialog -FormatWrapFirstParagraph .uno:WrapAnchorOnly -FormatWrapEdit .uno:TextWrap +FormatTable sym:.uno:TableDialog +FormatSplitTable sym:.uno:SplitTable +FormatMergeTables sym:.uno:MergeTable +FormatTextWriter sym:.uno:TextAttributes +FormatNumberFormat sym:.uno:TableNumberFormatDialog +FormatRowHeight sym:.uno:SetRowHeight +FormatRowOptimalHeight sym:.uno:SetOptimalRowHeight +FormatRowSpaceEqually sym:.uno:DistributeRows +FormatRowSelect sym:.uno:EntireRow +FormatRowInsert sym:.uno:InsertRowDialog +FormatRowDelete sym:.uno:DeleteRows +FormatRuby sym:.uno:RubyDialog +FormatColumns sym:.uno:FormatColumns +FormatColumnWidthWriter sym:.uno:SetColumnWidth +FormatColumnOptimalWidthWriter sym:.uno:SetOptimalColumnWidth +FormatColumnSpaceEqually sym:.uno:DistributeColumns +FormatColumnInsert sym:.uno:InsertColumnDialog +FormatGraphics sym:.uno:GraphicDialog +FormatFrame sym:.uno:FrameDialog +FormatObject sym:.uno:FrameDialog +FormatArrangeBringToFront sym:.uno:BringToFront +FormatArrangeBringForward sym:.uno:ObjectForwardOne +FormatArrangeSetBackward sym:.uno:ObjectBackOne +FormatArrangeSendToBack sym:.uno:SendToBack +FormatArrangeToForeground sym:.uno:SetObjectToForeground +FormatArrangeToBackground sym:.uno:SetObjectToBackground +FormatAlignmentLeft sym:.uno:AlignLeft +FormatAlignmentCentered sym:.uno:AlignHorizontalCenter +FormatAlignmentRight sym:.uno:AlignRight +FormatAlignmentTop sym:.uno:AlignTop +FormatAlignmentCenter sym:.uno:AlignVerticalCenter +FormatAlignmentBottom sym:.uno:AlignBottom +FormatAnchorToPage sym:.uno:SetAnchorToPage +FormatAnchorToParagraph sym:.uno:SetAnchorToPara +FormatAnchorAsCharacter sym:.uno:SetAnchorToChar +FormatAnchorToCharacter sym:.uno:SetAnchorAtChar +FormatAnchorToFrame sym:.uno:SetAnchorToFrame +FormatWrapNoWrap sym:.uno:WrapOff +FormatWrapPageWrap sym:.uno:WrapOn +FormatWrapOptimalPageWrap sym:.uno:WrapIdeal +FormatWrapThrough sym:.uno:WrapThrough +FormatWrapInBackground sym:.uno:WrapThroughTransparent +FormatWrapContour sym:.uno:WrapContour +FormatWrapEditContour sym:.uno:ContourDialog +FormatWrapFirstParagraph sym:.uno:WrapAnchorOnly +FormatWrapEdit sym:.uno:TextWrap FormatNameObject .uno:NameGroup -FormatPositionAndSize .uno:TransformDialog -FormatFlipVertically .uno:FlipVertical -FormatFlipHorizontally .uno:FlipHorizontal -FormatObjectAlignmentLeft .uno:ObjectAlignLeft -FormatObjectAlignmentCentered .uno:AlignCenter -FormatObjectAlignmentRight .uno:ObjectAlignRight -FormatObjectAlignmentTop .uno:AlignUp -FormatObjectAlignmentCenter .uno:AlignMiddle -FormatObjectAlignmentBottom .uno:AlignDown -FormatEditPoints .uno:ToggleObjectBezierMode -FormatFontWork .uno:FontWork -FormatGroupGroup .uno:FormatGroup -FormatGroupUngroup .uno:FormatUngroup -FormatGroupEditGroup .uno:EnterGroup -FormatGroupExitGroup .uno:LeaveGroup -FormatStyleBold .uno:Bold -FormatStyleItalic .uno:Italic -FormatStyleUnderline .uno:Underline -FormatStyleStrikeThrough .uno:Strikeout -FormatStyleShadow .uno:Shadowed -FormatStyleOutline .uno:OutlineFont -FormatStyleSuperscript .uno:SuperScript -FormatStyleSubscript .uno:SubScript -FormatLineSpacingSingleLine .uno:SpacePara1 -FormatLineSpacing15Lines .uno:SpacePara15 -FormatLineSpacingDouble .uno:SpacePara2 -FormatAlignmentLeftText .uno:LeftPara -FormatAlignmentRightText .uno:RightPara -FormatAlignmentCenteredText .uno:CenterPara -FormatAlignmentJustifiedText .uno:JustifyPara -FormatReplaceWithTextBox .uno:ConvertToEdit -FormatReplaceWithLabelField .uno:ConvertToFixed -FormatReplaceWithListbox .uno:ConvertToList -FormatReplaceWithCheckbox .uno:ConvertToCheckBox -FormatReplaceWithRadiobutton .uno:ConvertToRadio -FormatReplaceWithGroupbox .uno:ConvertToGroup -FormatReplaceWithCombobox .uno:ConvertToCombo -FormatReplaceWithImageButton .uno:ConvertToImageBtn -FormatReplaceWithFileSelection .uno:ConvertToFileControl -FormatReplaceWithDateField .uno:ConvertToDate -FormatReplaceWithTimeField .uno:ConvertToTime -FormatReplaceWithNumericalField .uno:ConvertToNumeric -FormatReplaceWithCurrencyField .uno:ConvertToCurrency -FormatReplaceWithPatternField .uno:ConvertToPattern -FormatReplaceWithImageControl .uno:ConvertToImageControl -FormatReplaceWithFormattedField .uno:ConvertToFormatted -FormatReplaceWithScrollbar .uno:ConvertToScrollBar -FormatReplaceWithSpinbutton .uno:ConvertToSpinButton +FormatPositionAndSize sym:.uno:TransformDialog +FormatFlipVertically sym:.uno:FlipVertical +FormatFlipHorizontally sym:.uno:FlipHorizontal +FormatObjectAlignmentLeft sym:.uno:ObjectAlignLeft +FormatObjectAlignmentCentered sym:.uno:AlignCenter +FormatObjectAlignmentRight sym:.uno:ObjectAlignRight +FormatObjectAlignmentTop sym:.uno:AlignUp +FormatObjectAlignmentCenter sym:.uno:AlignMiddle +FormatObjectAlignmentBottom sym:.uno:AlignDown +FormatEditPoints sym:.uno:ToggleObjectBezierMode +FormatFontWork sym:.uno:FontWork +FormatGroupGroup sym:.uno:FormatGroup +FormatGroupUngroup sym:.uno:FormatUngroup +FormatGroupEditGroup sym:.uno:EnterGroup +FormatGroupExitGroup sym:.uno:LeaveGroup +FormatStyleBold sym:.uno:Bold +FormatStyleItalic sym:.uno:Italic +FormatStyleUnderline sym:.uno:Underline +FormatStyleStrikeThrough sym:.uno:Strikeout +FormatStyleShadow sym:.uno:Shadowed +FormatStyleOutline sym:.uno:OutlineFont +FormatStyleSuperscript sym:.uno:SuperScript +FormatStyleSubscript sym:.uno:SubScript +FormatLineSpacingSingleLine sym:.uno:SpacePara1 +FormatLineSpacing15Lines sym:.uno:SpacePara15 +FormatLineSpacingDouble sym:.uno:SpacePara2 +FormatAlignmentLeftText sym:.uno:LeftPara +FormatAlignmentRightText sym:.uno:RightPara +FormatAlignmentCenteredText sym:.uno:CenterPara +FormatAlignmentJustifiedText sym:.uno:JustifyPara +FormatReplaceWithTextBox sym:.uno:ConvertToEdit +FormatReplaceWithLabelField sym:.uno:ConvertToFixed +FormatReplaceWithListbox sym:.uno:ConvertToList +FormatReplaceWithCheckbox sym:.uno:ConvertToCheckBox +FormatReplaceWithRadiobutton sym:.uno:ConvertToRadio +FormatReplaceWithGroupbox sym:.uno:ConvertToGroup +FormatReplaceWithCombobox sym:.uno:ConvertToCombo +FormatReplaceWithImageButton sym:.uno:ConvertToImageBtn +FormatReplaceWithFileSelection sym:.uno:ConvertToFileControl +FormatReplaceWithDateField sym:.uno:ConvertToDate +FormatReplaceWithTimeField sym:.uno:ConvertToTime +FormatReplaceWithNumericalField sym:.uno:ConvertToNumeric +FormatReplaceWithCurrencyField sym:.uno:ConvertToCurrency +FormatReplaceWithPatternField sym:.uno:ConvertToPattern +FormatReplaceWithImageControl sym:.uno:ConvertToImageControl +FormatReplaceWithFormattedField sym:.uno:ConvertToFormatted +FormatReplaceWithScrollbar sym:.uno:ConvertToScrollBar +FormatReplaceWithSpinbutton sym:.uno:ConvertToSpinButton ' Formatmenue : Calc -FormatDefaultCalc .uno:ResetAttributes -FormatTextCalc .uno:TextAttributes -FormatPageCalc .uno:PageFormatDialog -FormatCells .uno:FormatCellDialog -FormatRowHide .uno:HideRow -FormatRowShow .uno:ShowRow -FormatRowHeightCalc .uno:RowHeight -FormatRowOptimalHeightCalc .uno:SetOptimalRowHeight -FormatColumnHide .uno:HideColumn -FormatColumnWidthCalc .uno:ColumnWidth -FormatColumnShow .uno:ShowColumn -FormatColumnOptimalWidthCalc .uno:SetOptimalColumnWidth -FormatSheetHide .uno:Hide -FormatSheetShow .uno:Show -FormatSheetRename .uno:RenameTable .uno:Name +FormatDefaultCalc sym:.uno:ResetAttributes +FormatTextCalc sym:.uno:TextAttributes +FormatPageCalc sym:.uno:PageFormatDialog +FormatCells sym:.uno:FormatCellDialog +FormatRowHide sym:.uno:HideRow +FormatRowShow sym:.uno:ShowRow +FormatRowHeightCalc sym:.uno:RowHeight +FormatRowOptimalHeightCalc sym:.uno:SetOptimalRowHeight +FormatColumnHide sym:.uno:HideColumn +FormatColumnWidthCalc sym:.uno:ColumnWidth +FormatColumnShow sym:.uno:ShowColumn +FormatColumnOptimalWidthCalc sym:.uno:SetOptimalColumnWidth +FormatSheetHide sym:.uno:Hide +FormatSheetShow sym:.uno:Show +FormatSheetRename sym:.uno:RenameTable sym:.uno:Name FormatSheetRightToLeft .uno:SheetRightToLeft FormatSheetTabColor .uno:SetTabBgColor FormatMergeCells .uno:ToggleMergeCells -FormatPrintRangesRemove .uno:DeletePrintArea -FormatPrintRangesEdit .uno:EditPrintArea -FormatPrintRangesDefine .uno:DefinePrintArea -FormatPrintRangesAdd .uno:AddPrintArea +FormatPrintRangesRemove sym:.uno:DeletePrintArea +FormatPrintRangesEdit sym:.uno:EditPrintArea +FormatPrintRangesDefine sym:.uno:DefinePrintArea +FormatPrintRangesAdd sym:.uno:AddPrintArea FormatAutoformat .uno:AutoFormat -FormatConditionalFormatting .uno:ConditionalFormatDialog -FormatAnchorToPageCalc .uno:SetAnchorToPage -FormatAnchorToCell .uno:SetAnchorToCell -FormatFlipVerticallyCalc .uno:ObjectMirrorVertical -FormatFlipHorizontalCalc .uno:ObjectMirrorHorizontal -FormatArrangeBringToFrontCalc .uno:BringToFront -FormatArrangeBringForwardCalc .uno:ObjectForwardOne -FormatArrangeSendBackwardCalc .uno:ObjectBackOne -FormatArrangeSendToBackCalc .uno:SendToBack -FormatArrangeToBackgroundCalc .uno:SetObjectToBackground -FormatArrangeToForegroundCalc .uno:SetObjectToForeground +FormatConditionalFormatting sym:.uno:ConditionalFormatDialog +FormatAnchorToPageCalc sym:.uno:SetAnchorToPage +FormatAnchorToCell sym:.uno:SetAnchorToCell +FormatFlipVerticallyCalc sym:.uno:ObjectMirrorVertical +FormatFlipHorizontalCalc sym:.uno:ObjectMirrorHorizontal +FormatArrangeBringToFrontCalc sym:.uno:BringToFront +FormatArrangeBringForwardCalc sym:.uno:ObjectForwardOne +FormatArrangeSendBackwardCalc sym:.uno:ObjectBackOne +FormatArrangeSendToBackCalc sym:.uno:SendToBack +FormatArrangeToBackgroundCalc sym:.uno:SetObjectToBackground +FormatArrangeToForegroundCalc sym:.uno:SetObjectToForeground FormatAlignmentHorizontalDefaultCalc .uno:CommonAlignHorizontalDefault FormatAlignmentLeftCalc .uno:CommonAlignLeft FormatAlignmentHorizontalCenterCalc .uno:CommonAlignHorizontalCenter @@ -571,45 +571,45 @@ FormatAlignmentJustifiedCalc .uno:CommonAlignJustified FormatAlignmentTopCalc .uno:CommonAlignTop FormatAlignmentverticalCenterCalc .uno:CommonAlignVerticalCenter FormatAlignmentBottomCalc .uno:CommonAlignBottom -FormatAlignmentObjectLeftCalc .uno:ObjectAlignLeft -FormatAlignmentObjectCenteredCalc .uno:AlignCenter -FormatAlignmentObjectRightCalc .uno:ObjectAlignRight -FormatAlignmentObjectTopCalc .uno:AlignUp -FormatAlignmentObjectCenterCalc .uno:AlignMiddle -FormatAlignmentObjectBottomCalc .uno:AlignDown -FormatGroupGroupCalc .uno:FormatGroup -FormatGroupUngroupCalc .uno:FormatUngroup -FormatGroupEditGroupCalc .uno:EnterGroup -FormatGroupExitGroupCalc .uno:LeaveGroup +FormatAlignmentObjectLeftCalc sym:.uno:ObjectAlignLeft +FormatAlignmentObjectCenteredCalc sym:.uno:AlignCenter +FormatAlignmentObjectRightCalc sym:.uno:ObjectAlignRight +FormatAlignmentObjectTopCalc sym:.uno:AlignUp +FormatAlignmentObjectCenterCalc sym:.uno:AlignMiddle +FormatAlignmentObjectBottomCalc sym:.uno:AlignDown +FormatGroupGroupCalc sym:.uno:FormatGroup +FormatGroupUngroupCalc sym:.uno:FormatUngroup +FormatGroupEditGroupCalc sym:.uno:EnterGroup +FormatGroupExitGroupCalc sym:.uno:LeaveGroup FormatPointsCalc .uno:ToggleObjectBezierMode ' **** Draw / Impress -Format3D_Effects .uno:Window3D +Format3D_Effects sym:.uno:Window3D FormatBullet .uno:OutlineBullet -FormatEditGroupDraw .uno:EnterGroup -FormatExitGroupDraw .uno:LeaveGroup +FormatEditGroupDraw sym:.uno:EnterGroup +FormatExitGroupDraw sym:.uno:LeaveGroup FormatDefaultFormatting .uno:SetDefault -FormatDimensioning .uno:MeasureAttributes -FormatConnector .uno:ConnectorAttributes +FormatDimensioning sym:.uno:MeasureAttributes +FormatConnector sym:.uno:ConnectorAttributes FormatModifyPage .uno:ModifyPage -FormatNumberingBulletsDraw .uno:OutlineBullet -FormatPage .uno:ModifyPage -FormatLayer .uno:ModifyLayer -FormatModifyLayout .uno:PresentationLayout -FormatGroupDraw .uno:FormatGroup -FormatUngroupDraw .uno:FormatUngroup -FormatSlideDraw .uno:PageSetup -FormatStandardDraw .uno:SetDefault +FormatNumberingBulletsDraw sym:.uno:OutlineBullet +FormatPage sym:.uno:ModifyPage +FormatLayer sym:.uno:ModifyLayer +FormatModifyLayout sym:.uno:PresentationLayout +FormatGroupDraw sym:.uno:FormatGroup +FormatUngroupDraw sym:.uno:FormatUngroup +FormatSlideDraw sym:.uno:PageSetup +FormatStandardDraw sym:.uno:SetDefault FormatSlideDesign .uno:PresentationLayout FormatStylesFormatting .uno:DesignerDialog FormatTransform .uno:TransformDialog FormatTransliterate .uno:TransliterateMenu FormatText .uno:TextAttributes -FormatTextDraw .uno:TextAttributes +FormatTextDraw sym:.uno:TextAttributes FormatCropPicture .uno:GrafAttrCrop ' **** Chart -'FormatStandardChart .uno:SetDefault +'FormatStandardChart sym:.uno:SetDefault FormatObjectProperties .uno:DiagramObjects FormatPositionAndSizeChart .uno:TransformDialog FormatArrangement .uno:ArrangeRow @@ -648,32 +648,32 @@ FormatDataRanges .uno:DataRanges Format3DView .uno:View3D FormatSelection .uno:FormatSelection ' **** Math -FormatFonts .uno:ChangeFont -FormatFontSize .uno:ChangeFontSize -FormatSpacing .uno:ChangeDistance -FormatAlignment .uno:ChangeAlignment -FormatTextMode .uno:Textmode +FormatFonts sym:.uno:ChangeFont +FormatFontSize sym:.uno:ChangeFontSize +FormatSpacing sym:.uno:ChangeDistance +FormatAlignment sym:.uno:ChangeAlignment +FormatTextMode sym:.uno:Textmode ' *********** Table Menu / Writer ****************************** TableInsertTable .uno:InsertTable TableInsertRowDialog .uno:InsertRowDialog TableInsertColumnDialog .uno:InsertColumnDialog -TableCellSplit .uno:SplitCell -TableCellTop .uno:CellVertTop -TableCellCenter .uno:CellVertCenter -TableCellBottom .uno:CellVertBottom -TableCellProtect .uno:Protect -TableCellUnprotect .uno:UnsetCellsReadOnly +TableCellSplit sym:.uno:SplitCell +TableCellTop sym:.uno:CellVertTop +TableCellCenter sym:.uno:CellVertCenter +TableCellBottom sym:.uno:CellVertBottom +TableCellProtect sym:.uno:Protect +TableCellUnprotect sym:.uno:UnsetCellsReadOnly TableDeleteTable .uno:DeleteTable TableDeleteRows .uno:DeleteRows -TableDeleteColumn .uno:DeleteColumns +TableDeleteColumn sym:.uno:DeleteColumns TableDeleteColumns .uno:DeleteColumns -TableSelectColumn .uno:EntireColumn +TableSelectColumn sym:.uno:EntireColumn TableSelectTable .uno:SelectTable TableSelectEntireRow .uno:EntireRow TableSelectEntireColumn .uno:EntireColumn TableSelectEntireCell .uno:EntireCell -TableMergeCell .uno:MergeCells +TableMergeCell sym:.uno:MergeCells TableMergeTable .uno:MergeTable TableMergeCells .uno:MergeCells TableSplitCell .uno:SplitCell @@ -700,13 +700,13 @@ TableProperties .uno:TableDialog ' **** ' **** All applications ToolsSpellcheck .uno:SpellDialog -ToolsSpellcheckAutoSpellcheck .uno:SpellOnline +ToolsSpellcheckAutoSpellcheck sym:.uno:SpellOnline ToolsLanguageHangulHanjaConversion .uno:HangulHanjaConversion ToolsLanguageChineseTranslation .uno:ChineseConversion ToolsLanguageThesaurus .uno:ThesaurusDialog -ToolsLanguageHyphenate .uno:Hyphenate -ToolsAutocorrect .uno:AutoCorrectDlg -ToolsXMLFilterSettings .uno:OpenXMLFilterSettings +ToolsLanguageHyphenate sym:.uno:Hyphenate +ToolsAutocorrect sym:.uno:AutoCorrectDlg +ToolsXMLFilterSettings sym:.uno:OpenXMLFilterSettings ToolsMacro .uno:MacroDialog ToolsMacroMacro .uno:MacroDialog ToolsMacrosRunMacro .uno:RunMacro @@ -715,186 +715,186 @@ ToolsMacrosOrganizeMacrosJavaScript .uno:ScriptOrganizer?ScriptOrganizer.Languag ToolsMacrosOrganizeMacrosPython .uno:ScriptOrganizer?ScriptOrganizer.Language:string=Python ToolsMacrosOrganizeDialogs .uno:MacroOrganizer?TabId:short=1 ToolsMacrosSignature .uno:MacroSignature -ToolsMacroRecordMacro .uno:MacroRecorder -ToolsCustomize .uno:ConfigureDialog -ToolsOptions .uno:OptionsTreeDialog +ToolsMacroRecordMacro sym:.uno:MacroRecorder +ToolsCustomize sym:.uno:ConfigureDialog +ToolsOptions sym:.uno:OptionsTreeDialog ToolsPackagemanager service:com.sun.star.deployment.ui.PackageManagerDialog ToolsMailMergeWizard .uno:MailMergeWizard ' **** Writer ToolsSpellcheckWriter .uno:SpellingAndGrammarDialog -ToolsOutlineNumbering .uno:ChapterNumberingDialog -ToolsLineNumbering .uno:LineNumberingDialog -ToolsPageNumber .uno:PageOffset -ToolsFootnote .uno:FootnoteDialog -ToolsTextInTable .uno:ConvertTableText -ToolsSort .uno:SortDialog -ToolsCalculate .uno:CalculateSel -ToolsUpdateUpdateAll .uno:UpdateAll -ToolsUpdateFields .uno:UpdateFields -ToolsUpdateLinks .uno:UpdateAllLinks -ToolsUpdateCurrentIndex .uno:UpdateCurIndex -ToolsUpdateAllIndexes .uno:UpdateAllIndexes -ToolsBibliographyDatabase .uno:BibliographyComponent -ToolsWordCount .uno:WordCountDialog +ToolsOutlineNumbering sym:.uno:ChapterNumberingDialog +ToolsLineNumbering sym:.uno:LineNumberingDialog +ToolsPageNumber sym:.uno:PageOffset +ToolsFootnote sym:.uno:FootnoteDialog +ToolsTextInTable sym:.uno:ConvertTableText +ToolsSort sym:.uno:SortDialog +ToolsCalculate sym:.uno:CalculateSel +ToolsUpdateUpdateAll sym:.uno:UpdateAll +ToolsUpdateFields sym:.uno:UpdateFields +ToolsUpdateLinks sym:.uno:UpdateAllLinks +ToolsUpdateCurrentIndex sym:.uno:UpdateCurIndex +ToolsUpdateAllIndexes sym:.uno:UpdateAllIndexes +ToolsBibliographyDatabase sym:.uno:BibliographyComponent +ToolsWordCount sym:.uno:WordCountDialog TableTableProperties .uno:TableDialog -ToolsLanguageHyphenation .uno:Hyphenate +ToolsLanguageHyphenation sym:.uno:Hyphenate ' **** WriterWeb -ToolsPageFormatting .uno:Repaginate +ToolsPageFormatting sym:.uno:Repaginate ' **** Calc -ToolsSpellcheckAutoCheckCalc .uno:SpellOnline +ToolsSpellcheckAutoCheckCalc sym:.uno:SpellOnline ToolsLanguageHyphenateCalc .uno:Hyphenate -ToolsDetectiveRemoveAllTraces .uno:ClearArrows -ToolsDetectiveFillMode .uno:AuditingFillMode -ToolsDetectiveTraceError .uno:ShowErrors -ToolsDetectiveTraceDependents .uno:ShowDependents -ToolsDetectiveRemoveDependents .uno:ClearArrowDependents -ToolsDetectiveTracePrecedents .uno:ShowPrecedents -ToolsDetectiveRemovePrecedents .uno:ClearArrowPrecedents -ToolsDetectiveMarkInvalidData .uno:ShowInvalid .uno:FillModeSelect +ToolsDetectiveRemoveAllTraces sym:.uno:ClearArrows +ToolsDetectiveFillMode sym:.uno:AuditingFillMode +ToolsDetectiveTraceError sym:.uno:ShowErrors +ToolsDetectiveTraceDependents sym:.uno:ShowDependents +ToolsDetectiveRemoveDependents sym:.uno:ClearArrowDependents +ToolsDetectiveTracePrecedents sym:.uno:ShowPrecedents +ToolsDetectiveRemovePrecedents sym:.uno:ClearArrowPrecedents +ToolsDetectiveMarkInvalidData sym:.uno:ShowInvalid sym:.uno:FillModeSelect ToolsDetectiveRefreshTraces .uno:RefreshArrows -ToolsDetectiveAutoUpdate .uno:AutoRefreshArrows +ToolsDetectiveAutoUpdate sym:.uno:AutoRefreshArrows ToolsSolver .uno:SolverDialog -ToolsGoalSeek .uno:GoalSeekDialog -ToolsScenarios .uno:ScenarioManager -ToolsProtectDocumentDocument .uno:ToolProtectionDocument -ToolsProtectDocumentSheet .uno:Protect -ToolsCellContentsRecalculate .uno:Calculate -ToolsCellContentsAutoCalculate .uno:AutomaticCalculation -ToolsCellContentsAutoInput .uno:AutoComplete +ToolsGoalSeek sym:.uno:GoalSeekDialog +ToolsScenarios sym:.uno:ScenarioManager +ToolsProtectDocumentDocument sym:.uno:ToolProtectionDocument +ToolsProtectDocumentSheet sym:.uno:Protect +ToolsCellContentsRecalculate sym:.uno:Calculate +ToolsCellContentsAutoCalculate sym:.uno:AutomaticCalculation +ToolsCellContentsAutoInput sym:.uno:AutoComplete ' **** Draw / Impress ToolsGallery .uno:Gallery -ToolsEyedropper .uno:BmpMask +ToolsEyedropper sym:.uno:BmpMask ToolsMediaPlayer .uno:AVMediaPlayer ToolsChineseTranslation .uno:ChineseConversion -ToolsLanguageHyphenationDraw .uno:Hyphenation +ToolsLanguageHyphenationDraw sym:.uno:Hyphenation ' **** Math -ToolsSymbolsCatalog .uno:SymbolCatalogue -ToolsImportFormula .uno:InsertFormula +ToolsSymbolsCatalog sym:.uno:SymbolCatalogue +ToolsImportFormula sym:.uno:InsertFormula ' ****************************************** ' *********** Slide Show Menu ************ ' **** -SlideShowSlideshow .uno:Presentation -SlideShowPresentationSettings .uno:PresentationDialog -SlideShowRehearseTimings .uno:RehearseTimings +SlideShowSlideshow sym:.uno:Presentation +SlideShowPresentationSettings sym:.uno:PresentationDialog +SlideShowRehearseTimings sym:.uno:RehearseTimings SlideShowInteraction .uno:AnimationEffects SlideShowAnimation .uno:CustomAnimation SlideShowSlideTransition .uno:SlideChangeWindow -SlideShowHideSlide .uno:HideSlide -SlideShowShowSlide .uno:ShowSlide -SlideShowCustomSlideshow .uno:CustomShowDialog +SlideShowHideSlide sym:.uno:HideSlide +SlideShowShowSlide sym:.uno:ShowSlide +SlideShowCustomSlideshow sym:.uno:CustomShowDialog SlideShowCustomAnimation .uno:CustomAnimation ' *********************************** ' *********** Datamenu ************ ' **** ' **** Calc -DataSelectRange .uno:SelectDB -DataDefineRange .uno:DefineDBName -DataSort .uno:DataSort -DataFilterAutoFilter .uno:DataFilterAutoFilter -DataFilterHideAutoFilter .uno:DataFilterHideAutoFilter -DataFilterRemoveFilter .uno:DataFilterRemoveFilter -DataFilterAdvancedFilter .uno:DataFilterSpecialFilter -DataFilterStandardFilter .uno:DataFilterStandardFilter -DataSubtotals .uno:DataSubTotals -DataValidity .uno:Validation +DataSelectRange sym:.uno:SelectDB +DataDefineRange sym:.uno:DefineDBName +DataSort sym:.uno:DataSort +DataFilterAutoFilter sym:.uno:DataFilterAutoFilter +DataFilterHideAutoFilter sym:.uno:DataFilterHideAutoFilter +DataFilterRemoveFilter sym:.uno:DataFilterRemoveFilter +DataFilterAdvancedFilter sym:.uno:DataFilterSpecialFilter +DataFilterStandardFilter sym:.uno:DataFilterStandardFilter +DataSubtotals sym:.uno:DataSubTotals +DataValidity sym:.uno:Validation DataTextToColumns .uno:TextToColumns -DataDataPilotStart .uno:DataDataPilotRun -DataMultipleOperations .uno:TableOperationDialog -DataConsolidate .uno:DataConsolidate -DataOutlineAutoOutline .uno:AutoOutline -DataOutlineHideDetails .uno:HideDetail -DataOutlineShowDetails .uno:ShowDetail -DataOutlineRemove .uno:ClearOutline -DataOutlineGroup .uno:Group -DataOutlineUngroup .uno:Ungroup -DataDataPilotRefresh .uno:RecalcPivotTable -DataDataPilotDelete .uno:DeletePivotTable -DataRefreshRange .uno:DataAreaRefresh +DataDataPilotStart sym:.uno:DataDataPilotRun +DataMultipleOperations sym:.uno:TableOperationDialog +DataConsolidate sym:.uno:DataConsolidate +DataOutlineAutoOutline sym:.uno:AutoOutline +DataOutlineHideDetails sym:.uno:HideDetail +DataOutlineShowDetails sym:.uno:ShowDetail +DataOutlineRemove sym:.uno:ClearOutline +DataOutlineGroup sym:.uno:Group +DataOutlineUngroup sym:.uno:Ungroup +DataDataPilotRefresh sym:.uno:RecalcPivotTable +DataDataPilotDelete sym:.uno:DeletePivotTable +DataRefreshRange sym:.uno:DataAreaRefresh ' *********************************** ' ********** Modify Menu *********** ' **** ' **** Draw -ModifyRotate .uno:ToggleObjectRotateMode -ContextPositionAndSize .uno:TransformDialog -ContextFlipVerticalDraw .uno:MirrorVert -ContextFlipHorizontalDraw .uno:MirrorHorz -ContextConvertIntoCurve .uno:ChangeBezier -ContextConvertIntoPolygon .uno:ChangePolygon -ContextConvertIntoContour .uno:convert_to_contour -ContextConvertInto3D .uno:ConvertInto3D -ContextConvertInto3DRotationObject .uno:ConvertInto3DLatheFast -ContextConvertIntoMetafile .uno:ConvertIntoMetaFile -ContextConvertIntoBitmap .uno:ConvertIntoBitmap -ContextArrangeBringToFront .uno:BringToFront -ContextArrangeBringForward .uno:Forward -ContextArrangeBringBackward .uno:Backward -ContextArrangeSendToBack .uno:SendToBack -ContextArrangeInFrontOfObject .uno:BeforeObject -ContextArrangeBehindObject .uno:BehindObject -ContextArrangeReverse .uno:ReverseOrder -ContextDistribution .uno:DistributeSelection -ContextAlignmentLeft .uno:ObjectAlignLeft -ContextAlignmentCentered .uno:AlignCenter -ContextAlignmentRight .uno:ObjectAlignRight -ContextAlignmentTop .uno:AlignUp -ContextAlignmentCenter .uno:AlignMiddle -ContextAlignmentBottom .uno:AlignDown +ModifyRotate sym:.uno:ToggleObjectRotateMode +ContextPositionAndSize sym:.uno:TransformDialog +ContextFlipVerticalDraw sym:.uno:MirrorVert +ContextFlipHorizontalDraw sym:.uno:MirrorHorz +ContextConvertIntoCurve sym:.uno:ChangeBezier +ContextConvertIntoPolygon sym:.uno:ChangePolygon +ContextConvertIntoContour sym:.uno:convert_to_contour +ContextConvertInto3D sym:.uno:ConvertInto3D +ContextConvertInto3DRotationObject sym:.uno:ConvertInto3DLatheFast +ContextConvertIntoMetafile sym:.uno:ConvertIntoMetaFile +ContextConvertIntoBitmap sym:.uno:ConvertIntoBitmap +ContextArrangeBringToFront sym:.uno:BringToFront +ContextArrangeBringForward sym:.uno:Forward +ContextArrangeBringBackward sym:.uno:Backward +ContextArrangeSendToBack sym:.uno:SendToBack +ContextArrangeInFrontOfObject sym:.uno:BeforeObject +ContextArrangeBehindObject sym:.uno:BehindObject +ContextArrangeReverse sym:.uno:ReverseOrder +ContextDistribution sym:.uno:DistributeSelection +ContextAlignmentLeft sym:.uno:ObjectAlignLeft +ContextAlignmentCentered sym:.uno:AlignCenter +ContextAlignmentRight sym:.uno:ObjectAlignRight +ContextAlignmentTop sym:.uno:AlignUp +ContextAlignmentCenter sym:.uno:AlignMiddle +ContextAlignmentBottom sym:.uno:AlignDown ContextDescriptionObject .uno:ObjectTitleDescription -ContextNameObject .uno:NameGroup -ContextFontwork .uno:FontWork -ContextEyedropper .uno:BmpMask -ContextGroup .uno:FormatGroup -ContextUngroup .uno:FormatUngroup -ContextEnterGroup .uno:EnterGroup -ContextExitGroup .uno:LeaveGroup -ContextCombine .uno:Combine -ContextSplit .uno:Dismantle -ContextConnect .uno:Connect -ContextBreak .uno:Break -ModifyShapesMerge .uno:Merge -ModifyShapesSubstract .uno:Substract -ModifyShapesIntersect .uno:Intersect -ContextOpenHyperlink .uno:OpenHyperlinkOnCursor +ContextNameObject sym:.uno:NameGroup +ContextFontwork sym:.uno:FontWork +ContextEyedropper sym:.uno:BmpMask +ContextGroup sym:.uno:FormatGroup +ContextUngroup sym:.uno:FormatUngroup +ContextEnterGroup sym:.uno:EnterGroup +ContextExitGroup sym:.uno:LeaveGroup +ContextCombine sym:.uno:Combine +ContextSplit sym:.uno:Dismantle +ContextConnect sym:.uno:Connect +ContextBreak sym:.uno:Break +ModifyShapesMerge sym:.uno:Merge +ModifyShapesSubstract sym:.uno:Substract +ModifyShapesIntersect sym:.uno:Intersect +ContextOpenHyperlink sym:.uno:OpenHyperlinkOnCursor ' *********************************** ' ********** Windows *********** ' **** ' **** All applications -WindowNewWindow .uno:NewWindow +WindowNewWindow sym:.uno:NewWindow WindowCloseWindow .uno:CloseWin ' **** Calc -WindowSplit .uno:SplitWindow -WindowFreeze .uno:FreezePanes +WindowSplit sym:.uno:SplitWindow +WindowFreeze sym:.uno:FreezePanes ' *********************************** ' *********** Help Menu ************ ' **** ' **** All applications -HelpContents .uno:HelpIndex +HelpContents sym:.uno:HelpIndex HelpWhatsThis .uno:ExtendedHelp -HelpHelpAgent .uno:HelperDialog -HelpTips .uno:HelpTip -HelpExtendedTips .uno:ActiveHelp -HelpEntendedHelp .uno:ActiveHelp +HelpHelpAgent sym:.uno:HelperDialog +HelpTips sym:.uno:HelpTip +HelpExtendedTips sym:.uno:ActiveHelp +HelpEntendedHelp sym:.uno:ActiveHelp HelpCheckForUpdates sym:vnd.sun.star.job:alias=UpdateCheck -HelpAboutStarOffice .uno:About +HelpAboutStarOffice sym:.uno:About HelpPurchaseStarOffice service:com.sun.star.tab.tabreg?purchase ' **************************************** ' *** Special Slots for Spreadsheet component *** ' **** ' **** Spreadsheet component -SpreadsheetEuroConverter .uno:EuroConverter -ContextNameObjectCalc .uno:RenameObject +SpreadsheetEuroConverter sym:.uno:EuroConverter +ContextNameObjectCalc sym:.uno:RenameObject ' **************************************** ' *** UNO Slots for Database component *** @@ -957,7 +957,7 @@ MigrateMacros .uno:DBMigrateScripts ' ******************************** ' *** UNO Slots for Basic IDE *** ' **** -ContextProperties .uno:ShowPropBrowser +ContextProperties sym:.uno:ShowPropBrowser ' Crash the office, allows to provide an automated test for the crash reporter Crash .uno:Crash diff --git a/testautomation/global/sid/others.sid b/testautomation/global/sid/others.sid index 54fe659484e3..1a5e340dc38b 100644 --- a/testautomation/global/sid/others.sid +++ b/testautomation/global/sid/others.sid @@ -4,37 +4,36 @@ ' *************************************************** ' ** to create a new document -NeuDirekt .uno:AddDirect -NewDirect .uno:AddDirect +NeuDirekt sym:.uno:AddDirect +NewDirect sym:.uno:AddDirect ' ** slots for file import -FileName .uno:FileName -FilterName SID_FILTER_NAME +FileName sym:.uno:FileName ' ** slots for file printing -PrinterName .uno:Printer +PrinterName sym:.uno:Printer ' ** to jump to a new table in calc -GeheZuTabelle .uno:JumpToTable -GeheZuZelle .uno:GoToCell -GeheZuDokument .uno:GotoDocument -GeheZuObjekt .uno:GoToObject -GoToTable .uno:JumpToTable -GoToCell .uno:GoToCell -GoToDocument .uno:GotoDocument -GoToObject .uno:GoToObject +GeheZuTabelle sym:.uno:JumpToTable +GeheZuZelle sym:.uno:GoToCell +GeheZuDokument sym:.uno:GotoDocument +GeheZuObjekt sym:.uno:GoToObject +GoToTable sym:.uno:JumpToTable +GoToCell sym:.uno:GoToCell +GoToDocument sym:.uno:GotoDocument +GoToObject sym:.uno:GoToObject ' ** activate OLE-Object -CalcOLEAktivieren .uno:ActivateOLE -CalcOLEDeaktivieren .uno:Deactivate -CalcActivateOLE .uno:ActivateOLE -CalcDeactivateOLE .uno:Deactivate +CalcOLEAktivieren sym:.uno:ActivateOLE +CalcOLEDeaktivieren sym:.uno:Deactivate +CalcActivateOLE sym:.uno:ActivateOLE +CalcDeactivateOLE sym:.uno:Deactivate ' ** show office version -GetVersion .uno:VersionVisible +GetVersion sym:.uno:VersionVisible ' ** Load / Save -IsDocImageLoading .uno:IsLoadingImages -IsDocLoading .uno:IsLoading -IsDocSaving .uno:Saved +IsDocImageLoading sym:.uno:IsLoadingImages +IsDocLoading sym:.uno:IsLoading +IsDocSaving sym:.uno:Saved diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win index cfcd7548ff1c..339e91be70a1 100644 --- a/testautomation/global/win/bars.win +++ b/testautomation/global/win/bars.win @@ -57,16 +57,16 @@ Zentriert .uno:AlignCenter '------------------------------------------------------------------------- *Arrowsbar .HelpId:arrowsbar '------------------------------------------------------------------------- -LinieMitKreisPfeilende .uno:LineCircleArrow -LinieMitPfeilKreisende .uno:LineArrowCircle -LinieMitPfeilQuadratende .uno:LineArrowSquare -LinieMitPfeilanfang .uno:LineArrowStart -LinieMitPfeilende .uno:LineArrowEnd -LinieMitPfeilenden .uno:LineArrows -LinieMitQuadratKreisende .uno:LineSquareArrow -LinieWinkel .uno:Line_Diagonal -LinieZeichnen .uno:Line -Masslinie .uno:MeasureLine +LinieMitKreisPfeilende sym:.uno:LineCircleArrow +LinieMitPfeilKreisende sym:.uno:LineArrowCircle +LinieMitPfeilQuadratende sym:.uno:LineArrowSquare +LinieMitPfeilanfang sym:.uno:LineArrowStart +LinieMitPfeilende sym:.uno:LineArrowEnd +LinieMitPfeilenden sym:.uno:LineArrows +LinieMitQuadratKreisende sym:.uno:LineSquareArrow +LinieWinkel sym:.uno:Line_Diagonal +LinieZeichnen sym:.uno:Line +Masslinie sym:.uno:MeasureLine '------------------------------------------------------------------------- *Arrowshapes .HelpId:arrowshapes '------------------------------------------------------------------------- @@ -149,7 +149,7 @@ Line3 .uno:CalloutShapes.line-callout-3 *ChooseModebar .HelpId:choosemodebar '------------------------------------------------------------------------- Drehen .uno:ToggleObjectRotateMode -GluePoints .uno:GlueEditMode +GluePoints sym:.uno:GlueEditMode Rotationskoerper .uno:ConvertInto3DLathe SetzenAufKreisPerspektivisch .uno:CrookRotate SetzenAufKreisSchraeggestellt .uno:CrookSlant @@ -209,21 +209,21 @@ Vpfeile .uno:ConnectorArrows '------------------------------------------------------------------------- *DBQueryBrowsebar .HelpID:browserobjectbar '------------------------------------------------------------------------- -ApplyFilter .uno:FormFiltered -Autofilter .uno:AutoFilter -CloseDoc .uno:CloseWin -DataToText .uno:SbaBrwInsert -DefaultFilter .uno:FilterCrit -Edit .uno:EditDoc -Explorer .uno:DSBrowserExplorer -Refresh .uno:Refresh -RemoveFilter .uno:RemoveFilterSort -SaveNewDataEntry DBACCESS_HID_BROWSER_SAVE_RECORD -Search .uno:RecSearch -SortAscending .uno:Sortup -SortDescending .uno:SortDown -SortOrder .uno:OrderCrit -Undo DBACCESS_HID_BROWSER_UNDO_RECORD +ApplyFilter sym:.uno:FormFiltered +Autofilter sym:.uno:AutoFilter +CloseDoc sym:.uno:CloseWin +DataToText sym:.uno:SbaBrwInsert +DefaultFilter sym:.uno:FilterCrit +Edit sym:.uno:EditDoc +Explorer sym:.uno:DSBrowserExplorer +Refresh sym:.uno:Refresh +RemoveFilter sym:.uno:RemoveFilterSort +SaveNewDataEntry sym:DBACCESS_HID_BROWSER_SAVE_RECORD +Search sym:.uno:RecSearch +SortAscending sym:.uno:Sortup +SortDescending sym:.uno:SortDown +SortOrder sym:.uno:OrderCrit +Undo sym:DBACCESS_HID_BROWSER_UNDO_RECORD '------------------------------------------------------------------------- *Designobjectbar .HelpId:designobjectbar '------------------------------------------------------------------------- @@ -248,7 +248,7 @@ Linie .uno:Line Polygon .uno:Polygon_Unfilled Rechteck .uno:Rect Textobjekt .uno:DrawText -Toolbox .uno:DrawSelect +Toolbox sym:.uno:DrawSelect VerticalCallout .uno:VerticalCaption VerticalText .uno:VerticalText LineArrowEnd .uno:LineArrowEnd @@ -291,8 +291,8 @@ Absatzformat .uno:ParagraphDialog '------------------------------------------------------------------------- *DrawingObjectbar .HelpId:drawingobjectbar '------------------------------------------------------------------------- -AreaFilling SVX_HID_FILL_ATTR_LISTBOX -AreaStyle SVX_HID_FILL_TYPE_LISTBOX +AreaFilling sym:SVX_HID_FILL_ATTR_LISTBOX +AreaStyle sym:SVX_HID_FILL_TYPE_LISTBOX Ausrichtung .uno:ObjectAlign Drehen .uno:ToggleObjectRotateMode Flaeche .uno:FormatArea @@ -308,7 +308,7 @@ Linienbreite .uno:LineWidth Linienendenstil .uno:LineEndStyle Linienfarbe .uno:XLineColor Linienstil .uno:XLineStyle -PunkteBearbeiten .uno:ToggleObjectBezierMode +PunkteBearbeiten sym:.uno:ToggleObjectBezierMode Schatten .uno:FillShadow DesignerDialog .uno:DesignerDialog VerankerungWechseln .uno:ToggleAnchorType @@ -327,21 +327,21 @@ Group .uno:FormatGroup '------------------------------------------------------------------------- *Ellipsesbar .HelpId:ellipsesbar '------------------------------------------------------------------------- -EllipseLeer .uno:Ellipse_Unfilled -EllipseVoll .uno:Ellipse -Ellipsen .uno:EllipseToolbox -EllipsenabschnittLeer .uno:EllipseCut_Unfilled -EllipsenabschnittVoll .uno:EllipseCut -Ellipsenbogen .uno:Arc -EllipsensegmentLeer .uno:Pie_Unfilled -EllipsensegmentVoll .uno:Pie -KreisLeer .uno:Circle_Unfilled -KreisVoll .uno:Circle -KreisabschnittLeer .uno:CircleCut_Unfilled -KreisabschnittVoll .uno:CircleCut -Kreisbogen .uno:CircleArc -KreissegmentLeer .uno:CirclePie_Unfilled -KreissegmentVoll .uno:CirclePie +EllipseLeer sym:.uno:Ellipse_Unfilled +EllipseVoll sym:.uno:Ellipse +Ellipsen sym:.uno:EllipseToolbox +EllipsenabschnittLeer sym:.uno:EllipseCut_Unfilled +EllipsenabschnittVoll sym:.uno:EllipseCut +Ellipsenbogen sym:.uno:Arc +EllipsensegmentLeer sym:.uno:Pie_Unfilled +EllipsensegmentVoll sym:.uno:Pie +KreisLeer sym:.uno:Circle_Unfilled +KreisVoll sym:.uno:Circle +KreisabschnittLeer sym:.uno:CircleCut_Unfilled +KreisabschnittVoll sym:.uno:CircleCut +Kreisbogen sym:.uno:CircleArc +KreissegmentLeer sym:.uno:CirclePie_Unfilled +KreissegmentVoll sym:.uno:CirclePie '------------------------------------------------------------------------- *ExtrusionObjectBar .HelpId:extrusionobjectbar '------------------------------------------------------------------------- @@ -590,22 +590,22 @@ ObjectAlign .uno:ObjectAlign *FrameObjectbar .HelpId:frameobjectbar '------------------------------------------------------------------------- Durchlauf .uno:WrapThrough -EigenschaftenControls .uno:ShowBrowser +EigenschaftenControls sym:.uno:ShowBrowser EigenschaftenObjekt .uno:FrameDialog GanzNachHinten .uno:SendToBack GanzNachVorn .uno:BringToFront Hintergrundfarbe .uno:BackgroundColor -Hintergrundmuster .uno:BackgroundPatternController -HorizontalSpiegeln .uno:FlipHorizontal -InDenHintergrund .uno:SetObjectToBackground -InDenVordergrund .uno:SetObjectToForeground +Hintergrundmuster sym:.uno:BackgroundPatternController +HorizontalSpiegeln sym:.uno:FlipHorizontal +InDenHintergrund sym:.uno:SetObjectToBackground +InDenVordergrund sym:.uno:SetObjectToForeground LinienFarbe .uno:FrameLineColor Linienstil .uno:LineStyle Links .uno:AlignLeft Mitte .uno:AlignVerticalCenter NoWrap .uno:WrapOff Oben .uno:AlignTop -PositionUndGroesse .uno:TransformDialog +PositionUndGroesse sym:.uno:TransformDialog Rechts .uno:AlignRight UmlaufDynamisch .uno:WrapIdeal UmlaufLinks .uno:WrapLeft @@ -615,7 +615,7 @@ Unten .uno:AlignBottom Verankerungwechseln .uno:ToggleAnchorType Verketten .uno:ChainFrames VerkettungLoesen .uno:UnhainFrames -VertikalSpiegeln .uno:FlipVertical +VertikalSpiegeln sym:.uno:FlipVertical Vorlage .uno:StyleApply Wrap .uno:WrapOn Zentriert .uno:AlignHorizontalCenter @@ -656,56 +656,56 @@ FrameDialog .uno:FrameDialog BringToFront .uno:BringToFront SendToBack .uno:SendToBack ToggleAnchorType .uno:ToggleAnchorType -AreaFilling SVX_HID_FILL_ATTR_LISTBOX -AreaStyle SVX_HID_FILL_TYPE_LISTBOX -Ausrichtung .uno:ObjectAlign +AreaFilling sym:SVX_HID_FILL_ATTR_LISTBOX +AreaStyle sym:SVX_HID_FILL_TYPE_LISTBOX +Ausrichtung sym:.uno:ObjectAlign Blauanteil .uno:GrafBlue ColorSettings .uno:ColorSettings Crop .uno:Crop -Drehen .uno:ToggleObjectRotateMode -Durchlauf .uno:WrapThrough -EigenschaftenControls .uno:ShowBrowser -EigenschaftenObjekt .uno:FrameDialog +Drehen sym:.uno:ToggleObjectRotateMode +Durchlauf sym:.uno:WrapThrough +EigenschaftenControls sym:.uno:ShowBrowser +EigenschaftenObjekt sym:.uno:FrameDialog Filter .uno:GraphicFilterToolbox Flaeche .uno:FormatArea -Flaechenfarbe .uno:FillStyle -Flaechenstil .uno:FillStyle +Flaechenfarbe sym:.uno:FillStyle +Flaechenstil sym:.uno:FillStyle Gamma .uno:GrafGamma -GanzNachHinten .uno:SendToBack -GanzNachVorn .uno:BringToFront -GrafikEigenschaften .uno:GraphicDialog +GanzNachHinten sym:.uno:SendToBack +GanzNachVorn sym:.uno:BringToFront +GrafikEigenschaften sym:.uno:GraphicDialog Grafikmodus .uno:GrafMode Gruenanteil .uno:GrafGreen Helligkeit .uno:GrafLuminance -Hintergrundfarbe .uno:BackgroundColor -Hintergrundmuster .uno:BackgroundPatternController +Hintergrundfarbe sym:.uno:BackgroundColor +Hintergrundmuster sym:.uno:BackgroundPatternController HorizontalSpiegeln .uno:FlipHorizontal -ImageMapEditor .uno:ImageMapDialog -InDenHintergrund .uno:SetObjectToBackground -InDenVordergrund .uno:SetObjectToForeground -KeinUmlauf .uno:WrapOff +ImageMapEditor sym:.uno:ImageMapDialog +InDenHintergrund sym:.uno:SetObjectToBackground +InDenVordergrund sym:.uno:SetObjectToForeground +KeinUmlauf sym:.uno:WrapOff Kontrast .uno:GrafContrast Linie .uno:FormatLine -Linienbreite .uno:LineWidth -Linienendenstil .uno:LineEndStyle -Linienfarbe .uno:XLineColor -Linienstil .uno:XLineStyle -Links .uno:AlignLeft -Mitte .uno:AlignVerticalCenter -Oben .uno:AlignTop -PositionUndGroesse .uno:TransformDialog -PunkteBearbeiten .uno:ToggleObjectBezierMode -Rechts .uno:AlignRight +Linienbreite sym:.uno:LineWidth +Linienendenstil sym:.uno:LineEndStyle +Linienfarbe sym:.uno:XLineColor +Linienstil sym:.uno:XLineStyle +Links sym:.uno:AlignLeft +Mitte sym:.uno:AlignVerticalCenter +Oben sym:.uno:AlignTop +PositionUndGroesse sym:.uno:TransformDialog +PunkteBearbeiten sym:.uno:ToggleObjectBezierMode +Rechts sym:.uno:AlignRight Rotanteil .uno:GrafRed Schatten .uno:FillShadow Transparenz .uno:GrafTransparence -Umlauf .uno:WrapOn -UmlaufLinks .uno:WrapLeft -UmlaufRechts .uno:WrapRight -Umrandung .uno:SetBorderStyle -Unten .uno:AlignBottom +Umlauf sym:.uno:WrapOn +UmlaufLinks sym:.uno:WrapLeft +UmlaufRechts sym:.uno:WrapRight +Umrandung sym:.uno:SetBorderStyle +Unten sym:.uno:AlignBottom VertikalSpiegeln .uno:FlipVertical -Zentriert .uno:AlignHorizontalCenter +Zentriert sym:.uno:AlignHorizontalCenter InsertGraphic .uno:InsertGraphic '------------------------------------------------------------------------- *GraphicFilterBar .HelpId:graffilterbar @@ -722,14 +722,14 @@ CharcoalSketch .uno:GraphicFilterSobel Relief .uno:GraphicFilterRelief Mosaic .uno:GraphicFilterMosaic '------------------------------------------------------------------------- -*Hyperlinkleiste SVX_HID_OFA_HYPERLINK_DLG +*Hyperlinkleiste sym:SVX_HID_OFA_HYPERLINK_DLG '------------------------------------------------------------------------- -Frame SVX_HID_OFA_HYPERLINK_TARGET -Link .uno:SetHyperlink -Suchen SVX_HID_OFA_HYPERLINK_SEARCH -UrlAdresse SVX_HID_OFA_HYPERLINK_URL -UrlName SVX_HID_OFA_HYPERLINK_NAME -Verknuepfung .uno:AddBookmark +Frame sym:SVX_HID_OFA_HYPERLINK_TARGET +Link sym:.uno:SetHyperlink +Suchen sym:SVX_HID_OFA_HYPERLINK_SEARCH +UrlAdresse sym:SVX_HID_OFA_HYPERLINK_URL +UrlName sym:SVX_HID_OFA_HYPERLINK_NAME +Verknuepfung sym:.uno:AddBookmark '------------------------------------------------------------------------- *Insertbar .HelpId:insertbar '------------------------------------------------------------------------- @@ -743,13 +743,13 @@ Frame .uno:InsertObjectFloatingFrame Fussnote .uno:InsertFootnote Grafik .uno:InsertGraphic InsertSpreadsheet .uno:InsertSpreadsheet -MehrspaltigeRahmen .uno:InsertFrame +MehrspaltigeRahmen sym:.uno:InsertFrame OLEObjekt .uno:InsertObject Plugin .uno:InsertPlugin Rahmen .uno:InsertFrameInteract Seite .uno:InsertPage Sonderzeichen .uno:InsertSymbol -Spalten .uno:InsertFrameInteractNoColumns +Spalten sym:.uno:InsertFrameInteractNoColumns Tabelle .uno:InsertTable Textmarke .uno:InsertBookmark Verzeichnis .uno:InsertIndexesEntry @@ -799,10 +799,10 @@ Controls .uno:ChooseControls FindParanthese .uno:MatchGroup InsertSourceText .uno:LoadBasic Library .uno:LibSelector -Macros .uno:ChooseMacro +Macros sym:.uno:ChooseMacro ManageBreakpoints .uno:ManageBreakPoints -Modules .uno:ModuleDialog -ObjectCatalog .uno:ObjectCatalog +Modules sym:.uno:ModuleDialog +ObjectCatalog sym:.uno:ObjectCatalog ProcedureStep .uno:BasicStepOver SaveSourceText .uno:SaveBasicAs SingleStep .uno:BasicStepInto @@ -831,24 +831,24 @@ Vorlage .uno:StyleApply NumberingOnOff .uno:DefaultNumbering BulletsOnOff .uno:DefaultBullet '------------------------------------------------------------------------- -*OB_DB_Tabledesign DBACCESS_HID_TLB_TABLEDESIGN +*OB_DB_Tabledesign sym:DBACCESS_HID_TLB_TABLEDESIGN '------------------------------------------------------------------------- -Copy .uno:Copy -Cut .uno:Cut -Edit .uno:EditDoc -NoConnection DBACCESS_HID_TABLE_DESIGN_NO_CONNECTION -Paste .uno:Paste -Redo .uno:Redo -Save .uno:Save -SaveAs .uno:SaveAs -Undo .uno:Undo +Copy sym:.uno:Copy +Cut sym:.uno:Cut +Edit sym:.uno:EditDoc +NoConnection sym:DBACCESS_HID_TABLE_DESIGN_NO_CONNECTION +Paste sym:.uno:Paste +Redo sym:.uno:Redo +Save sym:.uno:Save +SaveAs sym:.uno:SaveAs +Undo sym:.uno:Undo '------------------------------------------------------------------------- -*OL_SW_Rechenleiste SW_HID_CALC_TOOLBOX +*OL_SW_Rechenleiste sym:SW_HID_CALC_TOOLBOX '------------------------------------------------------------------------- -Eingabefeld SW_HID_EDIT_FORMULA -Formel SW_HID_TBX_FORMULA_CALC -Uebernehmen SW_HID_TBX_FORMULA_APPLY -Verwerfen SW_HID_TBX_FORMULA_CANCEL +Eingabefeld sym:SW_HID_EDIT_FORMULA +Formel sym:SW_HID_TBX_FORMULA_CALC +Uebernehmen sym:SW_HID_TBX_FORMULA_APPLY +Verwerfen sym:SW_HID_TBX_FORMULA_CANCEL '------------------------------------------------------------------------- *OLEObjectBar .HelpId:oleobjectbar '------------------------------------------------------------------------- @@ -886,7 +886,7 @@ ZeilenGleichmaessig .uno:DistributeRows *Optionsbar .HelpId:optionsbar '------------------------------------------------------------------------- AlleGruppenVerlassen .uno:LeaveAllGroups -AlleGruppierungenVerlassen .uno:ConnectorLinesCircles +AlleGruppierungenVerlassen sym:.uno:ConnectorLinesCircles DrehmodusNachKlick .uno:ClickChangeRotation EinfacheHandles .uno:HandlesDraft FangenAnObjektRahmen .uno:SnapFrame @@ -901,8 +901,8 @@ KeineFuellungen .uno:FillDraft GluePoints .uno:GlueEditMode NurHaarlinien .uno:LineDraft NurTextbreichSelektieren .uno:PickThrough -ObjektMitAttributen .uno:SolidCreate -PunkteBearbeiten .uno:ToggleObjectBezierMode +ObjektMitAttributen sym:.uno:SolidCreate +PunkteBearbeiten sym:.uno:ToggleObjectBezierMode RasterBenutzen .uno:GridUse RasterSichtbar .uno:GridVisible Schnellbearbeitung .uno:QuickEdit @@ -924,33 +924,33 @@ ZoomPlus .uno:ZoomPlus '------------------------------------------------------------------------- *Positionbar .HelpId:positionbar '------------------------------------------------------------------------- -GanzNachHinten .uno:SendToBack -GanzNachVorn .uno:BringToFront -HinterDasObjekt .uno:BehindObject -Vertauschen .uno:ReverseOrder -VorDasObjekt .uno:BeforeObject -WeiterNachHinten .uno:Backward -WeiterNachVorn .uno:Forward +GanzNachHinten sym:.uno:SendToBack +GanzNachVorn sym:.uno:BringToFront +HinterDasObjekt sym:.uno:BehindObject +Vertauschen sym:.uno:ReverseOrder +VorDasObjekt sym:.uno:BeforeObject +WeiterNachHinten sym:.uno:Backward +WeiterNachVorn sym:.uno:Forward '------------------------------------------------------------------------- *Previewbar .HelpId:previewbar '------------------------------------------------------------------------- -DruckenSeitenansicht .uno:PrintPagePreView +DruckenSeitenansicht sym:.uno:PrintPagePreView ErsteSeite .uno:FirstPage GanzerBildschirm .uno:FullScreen KopfUndFusszeilen .uno:EditHeaderAndFooter LetzteSeite .uno:LastPage Margins .uno:Margins -Massstab .uno:Zoom +Massstab sym:.uno:Zoom MassstabVergroessern .uno:ZoomIn MassstabVerkleinern .uno:ZoomOut NaechsteSeite .uno:NextPage ScalingFactor .uno:ScalingFactor -Schliessen .uno:CloseWin +Schliessen sym:.uno:CloseWin Seitenansicht .uno:ClosePreview Seitenlayout .uno:PageFormatDialog -VierSeiten .uno:ShowMultiplePages +VierSeiten sym:.uno:ShowMultiplePages VorherigeSeite .uno:PreviousPage -ZweiSeiten .uno:ShowTwoPages +ZweiSeiten sym:.uno:ShowTwoPages '------------------------------------------------------------------------- *PreviewObjectbar .HelpId:previewobjectbar '------------------------------------------------------------------------- @@ -961,41 +961,41 @@ Groesser .uno:ZoomPlus Kleiner .uno:ZoomMinus LetzteSeite .uno:GoToEndOfDoc Massstab .uno:PreviewZoom -MassstabVergroessern .uno:ZoomIn -MassstabVerkleinern .uno:ZoomOut +MassstabVergroessern sym:.uno:ZoomIn +MassstabVerkleinern sym:.uno:ZoomOut NaechsteSeite .uno:PageDown SeitenansichtSchliessen .uno:ClosePreview -Seitenlayout .uno:PageFormatDialog +Seitenlayout sym:.uno:PageFormatDialog Skalierung .uno:PreviewPrintOptions VierSeiten .uno:ShowMultiplePages VorherigeSeite .uno:PageUp ZweiSeiten .uno:ShowTwoPages '------------------------------------------------------------------------- -*RechenleisteCalc SC_HID_SC_INPUTWIN +*RechenleisteCalc sym:SC_HID_SC_INPUTWIN '------------------------------------------------------------------------- -AktiverZellBereich SC_HID_INSWIN_POS -Bereich SC_HID_INSWIN_POS -EingabeZeileCalc SC_HID_INSWIN_INPUT -Funktion SC_HID_INSWIN_FUNC -Funktionsautopilot SC_HID_INSWIN_CALC -Summe SC_HID_INSWIN_SUMME -Uebernehmen SC_HID_INSWIN_OK -Verwerfen SC_HID_INSWIN_CANCEL +AktiverZellBereich sym:SC_HID_INSWIN_POS +Bereich sym:SC_HID_INSWIN_POS +EingabeZeileCalc sym:SC_HID_INSWIN_INPUT +Funktion sym:SC_HID_INSWIN_FUNC +Funktionsautopilot sym:SC_HID_INSWIN_CALC +Summe sym:SC_HID_INSWIN_SUMME +Uebernehmen sym:SC_HID_INSWIN_OK +Verwerfen sym:SC_HID_INSWIN_CANCEL '------------------------------------------------------------------------- *Rectanglesbar .HelpId:rectanglesbar '------------------------------------------------------------------------- -QuadratLeer .uno:Square_Unfilled -QuadratRundLeer .uno:Square_Rounded_Unfilled -QuadratRundVoll .uno:Square_Rounded -QuadratVoll .uno:Square -RechteckLeer .uno:Rect_Unfilled -RechteckRundLeer .uno:Rect_Rounded_Unfilled -RechteckRundVoll .uno:Rect_Rounded -RechteckVoll .uno:Rect +QuadratLeer sym:.uno:Square_Unfilled +QuadratRundLeer sym:.uno:Square_Rounded_Unfilled +QuadratRundVoll sym:.uno:Square_Rounded +QuadratVoll sym:.uno:Square +RechteckLeer sym:.uno:Rect_Unfilled +RechteckRundLeer sym:.uno:Rect_Rounded_Unfilled +RechteckRundVoll sym:.uno:Rect_Rounded +RechteckVoll sym:.uno:Rect '------------------------------------------------------------------------- -*SD_Farbleiste SVX_HID_CTRL_COLOR +*SD_Farbleiste sym:SVX_HID_CTRL_COLOR '------------------------------------------------------------------------- -Farben SVX_HID_COLOR_CTL_COLORS +Farben sym:SVX_HID_COLOR_CTL_COLORS '------------------------------------------------------------------------- *SlideViewObjectbar .HelpId:slideviewobjectbar '------------------------------------------------------------------------- @@ -1035,22 +1035,22 @@ NativeSql .uno:SbaNativeSql '------------------------------------------------------------------------- Ausschneiden .uno:Cut Bearbeiten .uno:EditDoc -DokSchliessen .uno:CloseDoc +DokSchliessen sym:.uno:CloseDoc Drucken .uno:PrintDefault Einfuegen .uno:Paste ExportAsPDF .uno:ExportDirectToPDF FaxDrucken .uno:SendFax GalleryButton .uno:Gallery -Gesamtbild .uno:FullScreen -GestalterButton .uno:DesignerDialog +Gesamtbild sym:.uno:FullScreen +GestalterButton sym:.uno:DesignerDialog HyperlinkDialog .uno:HyperlinkDialog -HyperlinkLeisteButton .uno:InsertHyperlink +HyperlinkLeisteButton sym:.uno:InsertHyperlink Kopieren .uno:Copy NavigatorButton .uno:Navigator Neu .uno:AddDirect NeuDialog .uno:NewDoc Oeffnen .uno:Open -RecordMacroButton .uno:MacroRecorder +RecordMacroButton sym:.uno:MacroRecorder Redo .uno:Redo SortAscending .uno:SortAscending SortDescending .uno:SortDescending @@ -1116,18 +1116,18 @@ Sortieren .uno:OrderCrit Hintergrundfarbe .uno:BackgroundColor LinienStil .uno:LineStyle Optimieren .uno:OptimizeTable -Schriftart .uno:CharFontName -Schriftgroesse .uno:FontHeight +Schriftart sym:.uno:CharFontName +Schriftgroesse sym:.uno:FontHeight SpalteAuswaehlen .uno:EntireColumn SpalteEinfuegen .uno:InsertColumns SpalteLoeschen .uno:DeleteColumns TabelleAuswaehlen .uno:SelectTable -TabellenmodeFix .uno:TableModeFix -TabellenmodeProportional .uno:TableModeFixProp -TabellenmodeVariabel .uno:TableModeVariable +TabellenmodeFix sym:.uno:TableModeFix +TabellenmodeProportional sym:.uno:TableModeFixProp +TabellenmodeVariabel sym:.uno:TableModeVariable Umrandung .uno:SetBorderStyle -Vorlage .uno:StyleApplyState -Vorlage2 SVX_HID_STYLE_LISTBOX +Vorlage sym:.uno:StyleApplyState +Vorlage2 sym:SVX_HID_STYLE_LISTBOX ZeileAuswaehlen .uno:EntireRow ZeileEinfuegen .uno:InsertRows ZeileLoeschen .uno:DeleteRows @@ -1143,12 +1143,12 @@ TableProperties .uno:TableDialog '------------------------------------------------------------------------- *Textbar .HelpId:textbar '------------------------------------------------------------------------- -FitVerticalTextToFrame .uno:VerticalTextFitToSizeTool -Legende .uno:DrawCaption -Rahmen .uno:TextFitToSizeTool -TextEinfuegen .uno:Text -VerticalCallout .uno:VerticalCaption -VerticalText .uno:VerticalText +FitVerticalTextToFrame sym:.uno:VerticalTextFitToSizeTool +Legende sym:.uno:DrawCaption +Rahmen sym:.uno:TextFitToSizeTool +TextEinfuegen sym:.uno:Text +VerticalCallout sym:.uno:VerticalCaption +VerticalText sym:.uno:VerticalText '------------------------------------------------------------------------- *TextObjectbar .HelpId:textobjectbar '------------------------------------------------------------------------- @@ -1198,7 +1198,7 @@ BulletsOnOff2 .uno:Bullet '------------------------------------------------------------------------- *Toolbar .HelpId:toolbar '------------------------------------------------------------------------- -AlleEbenen .uno:OutlineExpandAll +AlleEbenen sym:.uno:OutlineExpandAll Anordnung .uno:ObjectPosition ApplyFilter .uno:FormFiltered ArrowsToolbox .uno:ArrowsToolbox @@ -1215,7 +1215,7 @@ ChangeBezier .uno:ChangeBezier ChangePolygon .uno:ChangePolygon ClearQuery .uno:DBClearQuery ConvertInto3D .uno:ConvertInto3D -ConvertInto3Dnew .uno:ExtrusionToggle +ConvertInto3Dnew sym:.uno:ExtrusionToggle ConvertInto3DLatheFast .uno:ConvertInto3DLatheFast Copy .uno:Copy CustomAnimation .uno:CustomAnimation @@ -1237,7 +1237,7 @@ Feldbefehle .uno:InsertFieldCtrl Filter .uno:DataFilterStandardFilter FlowChartShapes .uno:FlowChartShapes FontworkGalleryFloater .uno:FontworkGalleryFloater -FormatierungEinAus .uno:OutlineFormat +FormatierungEinAus sym:.uno:OutlineFormat FormControls .uno:Config FormelAktualisieren .uno:Draw FormelSymbole .uno:SymbolCatalogue @@ -1247,11 +1247,11 @@ Grafikeffekte .uno:AdvancedMode GrafikenAusEin .uno:Graphic Gruppierung .uno:Group GruppierungAufheben .uno:Ungroup -HTMLQuelltext SW_HID_SOURCEVIEW -Hinunterschieben .uno:OutlineDown -Hinunterstufen .uno:OutlineRight -Hochschieben .uno:OutlineUp -Hochstufen .uno:OutlineLeft +HTMLQuelltext sym:SW_HID_SOURCEVIEW +Hinunterschieben sym:.uno:OutlineDown +Hinunterstufen sym:.uno:OutlineRight +Hochschieben sym:.uno:OutlineUp +Hochstufen sym:.uno:OutlineLeft Hyperlink .uno:InsertHyperlink Insert .uno:InsertToolbox InsertGraphic .uno:InsertGraphic @@ -1263,7 +1263,7 @@ LineArrowEnd .uno:LineArrowEnd Mirror .uno:Mirror NamenDefinieren .uno:DefineName NewDoc .uno:NewDoc -NurErsteEbene .uno:OutlineCollapseAll +NurErsteEbene sym:.uno:OutlineCollapseAll ObjectAlign .uno:ObjectAlign ObjektEinfuegen .uno:InsertObjCtrl ObjekteEinfuegen .uno:InsObjCtrl @@ -1280,7 +1280,7 @@ Redo .uno:Redo Refresh .uno:Refresh RemoveFilter .uno:RemoveFilterSort Rotate .uno:ToggleObjectRotateMode -SchwarzweisDarstellung .uno:ColorView +SchwarzweisDarstellung sym:.uno:ColorView ShowFormFunctions .uno:Config Save .uno:Save SaveAs .uno:SaveAs @@ -1300,8 +1300,8 @@ Thesaurus .uno:Thesaurus ToolsGallery .uno:Gallery Transform .uno:TransformDialog Undo .uno:Undo -UnterpunkteAnzeigen .uno:OutlineExpand -UnterpunkteAusblenden .uno:OutlineCollapse +UnterpunkteAnzeigen sym:.uno:OutlineExpand +UnterpunkteAusblenden sym:.uno:OutlineCollapse Verbinder .uno:ConnectorToolbox Vergroessern .uno:ZoomIn Verkleinern .uno:ZoomOut diff --git a/testautomation/global/win/dial_a_c.win b/testautomation/global/win/dial_a_c.win index c0f6dc811944..57a248ce0a98 100644 --- a/testautomation/global/win/dial_a_c.win +++ b/testautomation/global/win/dial_a_c.win @@ -1,288 +1,288 @@ -*Aehnlichkeitssuche CUI_HID_SEARCHSIMILARITY -ZeichenHinzufuegen cui.NumericField.10023.21 -ZeichenTauschen cui.NumericField.10023.17 -Kombinieren cui.CheckBox.10023.15 -ZeichenEntfernen cui.NumericField.10023.19 +*Aehnlichkeitssuche sym:CUI_HID_SEARCHSIMILARITY +ZeichenHinzufuegen sym:cui.NumericField.10023.21 +ZeichenTauschen sym:cui.NumericField.10023.17 +Kombinieren sym:cui.CheckBox.10023.15 +ZeichenEntfernen sym:cui.NumericField.10023.19 -*Aenderungenanzeigen .uno:AcceptChanges -TabControl SVX_HID_REDLINING_TABCONTROL -TabFilter SVX_HID_REDLINING_FILTER_PAGE SVX:TABPAGE:SID_REDLIN_FILTER_PAGE -Datum SVX_HID_REDLINING_FILTER_CB_DATE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE -DatumListe SVX_HID_REDLINING_FILTER_LB_DATE SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE -Datum1 SVX_HID_REDLINING_FILTER_DF_DATE SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE -Zeit1 SVX_HID_REDLINING_FILTER_TF_DATE SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE -Aktuell1 SVX_HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK -Datum2 SVX_HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 -Zeit2 SVX_HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 -Aktuell2 SVX_HID_REDLINING_FILTER_IB_CLOCK2 SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 -Autor SVX_HID_REDLINING_FILTER_CB_AUTOR SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_AUTOR -AutoListe SVX_HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AUTOR -Bereich SVX_HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE -BereichText SVX_HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE -Button SVX_HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF -Aktion SVX_HID_REDLINING_FILTER_CB_RANGE -Aktionsliste SVX_HID_REDLINING_FILTER_LB_ACTION -TabListe SVX_HID_REDLINING_VIEW_PAGE SVX:TABPAGE:SID_REDLIN_VIEW_PAGE -Liste SVX_HID_REDLINING_VIEW_DG_VIEW -ListenInhalt SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE -Listenkopf SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER -Akzeptieren SVX_HID_REDLINING_VIEW_PB_ACCEPT SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_ACCEPT -AlleAkzeptieren SVX_HID_REDLINING_VIEW_PB_ACCEPTALL SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_ACCEPTALL -Ablehnen SVX_HID_REDLINING_VIEW_PB_REJECT SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_REJECT -AlleAblehnen SVX_HID_REDLINING_VIEW_PB_REJECTALL SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_REJECTALL -Rueckgaengig SVX_HID_REDLINING_VIEW_PB_UNDO +*Aenderungenanzeigen sym:.uno:AcceptChanges +TabControl sym:SVX_HID_REDLINING_TABCONTROL +TabFilter sym:SVX_HID_REDLINING_FILTER_PAGE SVX:TABPAGE:SID_REDLIN_FILTER_PAGE +Datum sym:SVX_HID_REDLINING_FILTER_CB_DATE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE +DatumListe sym:SVX_HID_REDLINING_FILTER_LB_DATE SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE +Datum1 sym:SVX_HID_REDLINING_FILTER_DF_DATE SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE +Zeit1 sym:SVX_HID_REDLINING_FILTER_TF_DATE SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE +Aktuell1 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK +Datum2 sym:SVX_HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 +Zeit2 sym:SVX_HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 +Aktuell2 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK2 SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 +Autor sym:SVX_HID_REDLINING_FILTER_CB_AUTOR SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_AUTOR +AutoListe sym:SVX_HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AUTOR +Bereich sym:SVX_HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE +BereichText sym:SVX_HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE +Button sym:SVX_HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF +Aktion sym:SVX_HID_REDLINING_FILTER_CB_RANGE +Aktionsliste sym:SVX_HID_REDLINING_FILTER_LB_ACTION +TabListe sym:SVX_HID_REDLINING_VIEW_PAGE SVX:TABPAGE:SID_REDLIN_VIEW_PAGE +Liste sym:SVX_HID_REDLINING_VIEW_DG_VIEW +ListenInhalt sym:SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE +Listenkopf sym:SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER +Akzeptieren sym:SVX_HID_REDLINING_VIEW_PB_ACCEPT SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_ACCEPT +AlleAkzeptieren sym:SVX_HID_REDLINING_VIEW_PB_ACCEPTALL SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_ACCEPTALL +Ablehnen sym:SVX_HID_REDLINING_VIEW_PB_REJECT SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_REJECT +AlleAblehnen sym:SVX_HID_REDLINING_VIEW_PB_REJECTALL SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_REJECTALL +Rueckgaengig sym:SVX_HID_REDLINING_VIEW_PB_UNDO -*AktualisierenGallery SVX_HID_GALLERY_ACTUALIZE +*AktualisierenGallery sym:SVX_HID_GALLERY_ACTUALIZE -*Animation .uno:AnimationObjects -BildAufnehmen sd.ImageButton.619.6 -AlleAufnehmen sd.ImageButton.619.7 -BildLoeschen sd.ImageButton.619.8 -AlleLoeschen sd.ImageButton.619.9 -AnimationsgruppeGruppenobjekt sd.RadioButton.619.1 -AnimationsgruppeBitmapobjekt sd.RadioButton.619.2 +*Animation sym:.uno:AnimationObjects +BildAufnehmen sym:sd.ImageButton.619.6 +AlleAufnehmen sym:sd.ImageButton.619.7 +BildLoeschen sym:sd.ImageButton.619.8 +AlleLoeschen sym:sd.ImageButton.619.9 +AnimationsgruppeGruppenobjekt sym:sd.RadioButton.619.1 +AnimationsgruppeBitmapobjekt sym:sd.RadioButton.619.2 'Transparenzfarbe sd:ListBox:FLT_WIN_ANIMATION:LB_COLOR ' TBO 18.07.2002 removed from dialog -Anpassung sd.ListBox.619.2 -AnzahlBilder sd.NumericField.619.1 -AnzahlDurchlaeufe sd.ListBox.619.3 -AnzeigedauerProBild sd.TimeField.619.1 -Erstellen sd.PushButton.619.10 -ErstesBild sd.ImageButton.619.1 -Rueckwaerts sd.ImageButton.619.2 -Stopp sd.ImageButton.619.3 -Abspielen sd.ImageButton.619.4 -LetztesBild sd.ImageButton.619.5 +Anpassung sym:sd.ListBox.619.2 +AnzahlBilder sym:sd.NumericField.619.1 +AnzahlDurchlaeufe sym:sd.ListBox.619.3 +AnzeigedauerProBild sym:sd.TimeField.619.1 +Erstellen sym:sd.PushButton.619.10 +ErstesBild sym:sd.ImageButton.619.1 +Rueckwaerts sym:sd.ImageButton.619.2 +Stopp sym:sd.ImageButton.619.3 +Abspielen sym:sd.ImageButton.619.4 +LetztesBild sym:sd.ImageButton.619.5 -*AsciiFilterOptionen SW_HID_ASCII_FILTER -Zeichensatz sw.ListBox.20209.3 -Schriftart sw.ListBox.20209.5 -Sprache sw.ListBox.20209.7 -CrLf sw.RadioButton.20209.9 -Cr sw.RadioButton.20209.10 -Lf sw.RadioButton.20209.11 +*AsciiFilterOptionen sym:SW_HID_ASCII_FILTER +Zeichensatz sym:sw.ListBox.20209.3 +Schriftart sym:sw.ListBox.20209.5 +Sprache sym:sw.ListBox.20209.7 +CrLf sym:sw.RadioButton.20209.9 +Cr sym:sw.RadioButton.20209.10 +Lf sym:sw.RadioButton.20209.11 -*Attribute CUI_HID_SEARCHATTR -Auswahl CUI_HID_SEARCHATTR_CTL_ATTR +*Attribute sym:CUI_HID_SEARCHATTR +Auswahl sym:CUI_HID_SEARCHATTR_CTL_ATTR -*Ausrichtung .uno:ChangeAlignment -Links starmath.RadioButton.20006.1 -Zentriert starmath.RadioButton.20006.2 -Rechts starmath.RadioButton.20006.3 +*Ausrichtung sym:.uno:ChangeAlignment +Links sym:starmath.RadioButton.20006.1 +Zentriert sym:starmath.RadioButton.20006.2 +Rechts sym:starmath.RadioButton.20006.3 'Oben starmath:RadioButton:RID_ALIGNDIALOG:4 'Mitte starmath:RadioButton:RID_ALIGNDIALOG:5 'Unten starmath:RadioButton:RID_ALIGNDIALOG:6 -Standard starmath.PushButton.20006.1 +Standard sym:starmath.PushButton.20006.1 -*AutoAbstractErzeugen SW_HID_INSERT_ABSTRACT -Ebenen sw.NumericField.20208.5 -Kapitel sw.NumericField.20208.3 +*AutoAbstractErzeugen sym:SW_HID_INSERT_ABSTRACT +Ebenen sym:sw.NumericField.20208.5 +Kapitel sym:sw.NumericField.20208.3 -*Autokorrektur .uno:AutoCorrectDlg +*Autokorrektur sym:.uno:AutoCorrectDlg -*AutoText .uno:EditGlossary -RestDesNamens sw.CheckBox.21661.5 -NameText sw.Edit.21661.4 -Liste SW_HID_MD_GLOS_CATEGORY -Kuerzel sw.Edit.21661.2 -ImDateisystem sw.CheckBox.21661.68 -ImInternet sw.CheckBox.21661.69 -Menue sw.MenuButton.21661.52 -Bereiche sw.PushButton.21661.54 +*AutoText sym:.uno:EditGlossary +RestDesNamens sym:sw.CheckBox.21661.5 +NameText sym:sw.Edit.21661.4 +Liste sym:SW_HID_MD_GLOS_CATEGORY +Kuerzel sym:sw.Edit.21661.2 +ImDateisystem sym:sw.CheckBox.21661.68 +ImInternet sym:sw.CheckBox.21661.69 +Menue sym:sw.MenuButton.21661.52 +Bereiche sym:sw.PushButton.21661.54 Pfade SW:PUSHBUTTON:DLG_GLOSSARY:PB_PATH -Vorschau_anzeigen sw.CheckBox.21661.73 +Vorschau_anzeigen sym:sw.CheckBox.21661.73 -*AutoFormatCalc .uno:AutoFormat -FormatListe sc.ListBox.25624.1 -Einfuegen sc.PushButton.25624.105 -Loeschen sc.PushButton.25624.106 -Zahlenformat sc.CheckBox.25624.20 -Umrandung sc.CheckBox.25624.21 -Schriftart sc.CheckBox.25624.23 -Muster sc.CheckBox.25624.24 -Ausrichtung sc.CheckBox.25624.25 -BreiteHoeheAnpassen sc.CheckBox.25624.26 -Zusaetze sc.MoreButton.25624.104 -Umbenennen SC_HID_SC_RENAME_AUTOFMT +*AutoFormatCalc sym:.uno:AutoFormat +FormatListe sym:sc.ListBox.25624.1 +Einfuegen sym:sc.PushButton.25624.105 +Loeschen sym:sc.PushButton.25624.106 +Zahlenformat sym:sc.CheckBox.25624.20 +Umrandung sym:sc.CheckBox.25624.21 +Schriftart sym:sc.CheckBox.25624.23 +Muster sym:sc.CheckBox.25624.24 +Ausrichtung sym:sc.CheckBox.25624.25 +BreiteHoeheAnpassen sym:sc.CheckBox.25624.26 +Zusaetze sym:sc.MoreButton.25624.104 +Umbenennen sym:SC_HID_SC_RENAME_AUTOFMT -*AutoFormatHinzufuegenWriter SW_HID_SWDLG_STRINPUT -TabellenName sw.Edit.21460.1 +*AutoFormatHinzufuegenWriter sym:SW_HID_SWDLG_STRINPUT +TabellenName sym:sw.Edit.21460.1 -*AutoFormatHinzufuegenCalc SC_HID_SC_ADD_AUTOFMT -TabellenName SC_HID_SC_AUTOFMT_NAME +*AutoFormatHinzufuegenCalc sym:SC_HID_SC_ADD_AUTOFMT +TabellenName sym:SC_HID_SC_AUTOFMT_NAME -*AutoFormatTabelle SW_HID_AUTOFMT_TABLE -Formatbox sw.ListBox.21459.1 -Einfuegen sw.PushButton.21459.105 -Loeschen sw.PushButton.21459.106 -Zusaetze sw.MoreButton.21459.104 -Ausrichtung sw.CheckBox.21459.25 -Umrandung sw.CheckBox.21459.21 -Schriftart sw.CheckBox.21459.23 -Muster sw.CheckBox.21459.24 +*AutoFormatTabelle sym:SW_HID_AUTOFMT_TABLE +Formatbox sym:sw.ListBox.21459.1 +Einfuegen sym:sw.PushButton.21459.105 +Loeschen sym:sw.PushButton.21459.106 +Zusaetze sym:sw.MoreButton.21459.104 +Ausrichtung sym:sw.CheckBox.21459.25 +Umrandung sym:sw.CheckBox.21459.21 +Schriftart sym:sw.CheckBox.21459.23 +Muster sym:sw.CheckBox.21459.24 Zahlenformat SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT Umbenennen SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_RENAME -*BedingteFormatierung SC_HID_SCDLG_CONDFORMAT sc:ModelessDialog:RID_SCDLG_CONDFORMAT -Bedingung1 sc.CheckBox.25700.1 -PopupList1 sc.ListBox.25700.2 -Vergleich1 sc.ListBox.25700.3 -TextField1 sc.Edit.25700.4 +*BedingteFormatierung sym:SC_HID_SCDLG_CONDFORMAT sc:ModelessDialog:RID_SCDLG_CONDFORMAT +Bedingung1 sym:sc.CheckBox.25700.1 +PopupList1 sym:sc.ListBox.25700.2 +Vergleich1 sym:sc.ListBox.25700.3 +TextField1 sym:sc.Edit.25700.4 TextField12 SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND1_2 -Zellvorlage1 sc.ListBox.25700.10 -Minimieren1 sc.ImageButton.25700.5 +Zellvorlage1 sym:sc.ListBox.25700.10 +Minimieren1 sym:sc.ImageButton.25700.5 Minimieren12 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND1_2 -NewStyle1 sc.PushButton.25700.34 -Bedingung2 sc.CheckBox.25700.11 -PopupList2 sc.ListBox.25700.12 -Vergleich2 sc.ListBox.25700.13 -TextField2 sc.Edit.25700.14 +NewStyle1 sym:sc.PushButton.25700.34 +Bedingung2 sym:sc.CheckBox.25700.11 +PopupList2 sym:sc.ListBox.25700.12 +Vergleich2 sym:sc.ListBox.25700.13 +TextField2 sym:sc.Edit.25700.14 TextField22 SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND2_2 -Zellvorlage2 sc.ListBox.25700.20 -Minimieren2 sc.ImageButton.25700.15 +Zellvorlage2 sym:sc.ListBox.25700.20 +Minimieren2 sym:sc.ImageButton.25700.15 Minimieren22 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND2_2 -NewStyle2 sc.PushButton.25700.35 -Bedingung3 sc.CheckBox.25700.21 -PopupList3 sc.ListBox.25700.22 -Vergleich3 sc.ListBox.25700.23 -TextField3 sc.Edit.25700.24 +NewStyle2 sym:sc.PushButton.25700.35 +Bedingung3 sym:sc.CheckBox.25700.21 +PopupList3 sym:sc.ListBox.25700.22 +Vergleich3 sym:sc.ListBox.25700.23 +TextField3 sym:sc.Edit.25700.24 TextField32 SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND3_2 -Zellvorlage3 sc.ListBox.25700.30 -Minimieren3 sc.ImageButton.25700.25 +Zellvorlage3 sym:sc.ListBox.25700.30 +Minimieren3 sym:sc.ImageButton.25700.25 Minimieren32 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_2 -NewStyle3 sc.PushButton.25700.36 +NewStyle3 sym:sc.PushButton.25700.36 -*Bemassung CUI_HID_PAGE_MEASURE -Liniendistanz cui.MetricField.10161.1 -HLUeberhang cui.MetricField.10161.2 -HLDistanz cui.MetricField.10161.3 -LinkeHL cui.MetricField.10161.4 -RechteHL cui.MetricField.10161.5 -AnzeigeUnterhalb cui.TriStateBox.10161.1 -AnzeigeParallel cui.TriStateBox.10161.5 -MetrikAnzeigen cui.TriStateBox.10161.2 -MetrikList cui.ListBox.10161.1 -Textposition CUI_HID_MEASURE_CTL_POSITION -AutomatischVertikal cui.TriStateBox.10161.3 -AutomatischHorizontal cui.TriStateBox.10161.4 -Preview CUI_HID_MEASURE_CTL_PREVIEW -DecimalPlaces cui.MetricField.10161.6 +*Bemassung sym:CUI_HID_PAGE_MEASURE +Liniendistanz sym:cui.MetricField.10161.1 +HLUeberhang sym:cui.MetricField.10161.2 +HLDistanz sym:cui.MetricField.10161.3 +LinkeHL sym:cui.MetricField.10161.4 +RechteHL sym:cui.MetricField.10161.5 +AnzeigeUnterhalb sym:cui.TriStateBox.10161.1 +AnzeigeParallel sym:cui.TriStateBox.10161.5 +MetrikAnzeigen sym:cui.TriStateBox.10161.2 +MetrikList sym:cui.ListBox.10161.1 +Textposition sym:CUI_HID_MEASURE_CTL_POSITION +AutomatischVertikal sym:cui.TriStateBox.10161.3 +AutomatischHorizontal sym:cui.TriStateBox.10161.4 +Preview sym:CUI_HID_MEASURE_CTL_PREVIEW +DecimalPlaces sym:cui.MetricField.10161.6 -*BenutzerwoerterbuchAnlegen CUI_HID_OPTIONS_DICT_NEW -WoerterbuchName cui.Edit.12003.11 -Sprache cui.ListBox.12003.13 -Ausnahme cui.CheckBox.12003.14 +*BenutzerwoerterbuchAnlegen sym:CUI_HID_OPTIONS_DICT_NEW +WoerterbuchName sym:cui.Edit.12003.11 +Sprache sym:cui.ListBox.12003.13 +Ausnahme sym:cui.CheckBox.12003.14 -*BenutzerwoerterbuchBearbeiten CUI_HID_OPTIONS_DICT_EDIT -Buch cui.ListBox.12004.32 -Sprache cui.ListBox.12004.13 -Inhalt cui.Edit.12004.36 -Wort cui.Edit.12004.36 -Aufnehmen cui.PushButton.12004.39 -Neu cui.PushButton.12004.39 -Entfernen cui.PushButton.12004.40 -Loeschen cui.PushButton.12004.40 -ReplaceBy cui.Edit.12004.38 -WordList CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST +*BenutzerwoerterbuchBearbeiten sym:CUI_HID_OPTIONS_DICT_EDIT +Buch sym:cui.ListBox.12004.32 +Sprache sym:cui.ListBox.12004.13 +Inhalt sym:cui.Edit.12004.36 +Wort sym:cui.Edit.12004.36 +Aufnehmen sym:cui.PushButton.12004.39 +Neu sym:cui.PushButton.12004.39 +Entfernen sym:cui.PushButton.12004.40 +Loeschen sym:cui.PushButton.12004.40 +ReplaceBy sym:cui.Edit.12004.38 +WordList sym:CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST -*BenutzerverzeichnisDefinieren SW_HID_DLG_NEW_USER_IDX -NameBenutzerverzeichnis sw.Edit.21967.39 +*BenutzerverzeichnisDefinieren sym:SW_HID_DLG_NEW_USER_IDX +NameBenutzerverzeichnis sym:sw.Edit.21967.39 -*BereicheBearbeiten .uno:EditRegion -Bereich SW_HID_REGION_TREE +*BereicheBearbeiten sym:.uno:EditRegion +Bereich sym:SW_HID_REGION_TREE BereichsName SW:EDIT:MD_EDIT_REGION:ED_RANAME -Geschuetzt sw.TriStateBox.20269.10 -Ausblenden sw.TriStateBox.20269.8 -Bedingung sw.Edit.20269.13 -Verknuepfung sw.TriStateBox.20269.5 -DDE sw.CheckBox.20269.1 -Dateiname sw.Edit.20269.16 -OptionenBereich sw.ComboBox.20269.38 +Geschuetzt sym:sw.TriStateBox.20269.10 +Ausblenden sym:sw.TriStateBox.20269.8 +Bedingung sym:sw.Edit.20269.13 +Verknuepfung sym:sw.TriStateBox.20269.5 +DDE sym:sw.CheckBox.20269.1 +Dateiname sym:sw.Edit.20269.16 +OptionenBereich sym:sw.ComboBox.20269.38 Aufheben SW:PUSHBUTTON:MD_EDIT_REGION:CB_DISMISS ' Spalten sw:PushButton:MD_INS_REGION:PB_COLUMNS -Durchsuchen sw.PushButton.20269.40 -Passwort sw.CheckBox.20269.9 -Optionen sw.PushButton.20269.43 -EnterPasswort sw.PushButton.20269.51 +Durchsuchen sym:sw.PushButton.20269.40 +Passwort sym:sw.CheckBox.20269.9 +Optionen sym:sw.PushButton.20269.43 +EnterPasswort sym:sw.PushButton.20269.51 -*BereicheBearbeitenAutoText SW_HID_BIB_BASE +*BereicheBearbeitenAutoText sym:SW_HID_BIB_BASE Bereich SW:EDIT:DLG_BIB_BASE:ED_NAME Pfad SW:LISTBOX:DLG_BIB_BASE:LB_PATH -Liste SW_HID_GLOS_GROUP_TREE +Liste sym:SW_HID_GLOS_GROUP_TREE Neu SW:PUSHBUTTON:DLG_BIB_BASE:PB_NEW Loeschen SW:PUSHBUTTON:DLG_BIB_BASE:PB_DELETE Umbenennen SW:PUSHBUTTON:DLG_BIB_BASE:PB_RENAME -*BereicheSchuetzen SW_HID_DLG_PASSWD_SECTION -PasswortName sfx2.Edit.2316.14 -PasswortBestaetigen sfx2.Edit.2316.16 +*BereicheSchuetzen sym:SW_HID_DLG_PASSWD_SECTION +PasswortName sym:sfx2.Edit.2316.14 +PasswortBestaetigen sym:sfx2.Edit.2316.16 -*Beschriftung SW_HID_DLG_CAPTION .uno:InsertCaptionDialog +*Beschriftung sym:SW_HID_DLG_CAPTION sym:.uno:InsertCaptionDialog Kategorie SW:COMBOBOX:DLG_CAPTION:BOX_CATEGORY Numerierung SW:LISTBOX:DLG_CAPTION:BOX_FORMAT BeschriftungsText SW:EDIT:DLG_CAPTION:EDT_TEXT Position SW:LISTBOX:DLG_CAPTION:BOX_POS -WeitereOptionen sw.PushButton.21011.14 -Separator sw.Edit.21011.25 +WeitereOptionen sym:sw.PushButton.21011.14 +Separator sym:sw.Edit.21011.25 -*BeschriftungsbereichFestlegen SC_HID_COLROWNAMERANGES sc:ModelessDialog:RID_SCDLG_COLROWNAMERANGES -Bereich sc.ListBox.25716.11 -Zellbereich sc.Edit.25716.13 -ButtonZellbereich sc.ImageButton.25716.14 -Spaltenkoepfe sc.RadioButton.25716.15 -Zeilenkoepfe sc.RadioButton.25716.16 -Hinzufuegen sc.PushButton.25716.3 -Loeschen sc.PushButton.25716.4 +*BeschriftungsbereichFestlegen sym:SC_HID_COLROWNAMERANGES sc:ModelessDialog:RID_SCDLG_COLROWNAMERANGES +Bereich sym:sc.ListBox.25716.11 +Zellbereich sym:sc.Edit.25716.13 +ButtonZellbereich sym:sc.ImageButton.25716.14 +Spaltenkoepfe sym:sc.RadioButton.25716.15 +Zeilenkoepfe sym:sc.RadioButton.25716.16 +Hinzufuegen sym:sc.PushButton.25716.3 +Loeschen sym:sc.PushButton.25716.4 Datenbereich SC:EDIT:RID_SCDLG_COLROWNAMERANGES:ED_DATA ButtonDatenbereich SC:IMAGEBUTTON:RID_SCDLG_COLROWNAMERANGES:RB_DATA -*Bildschirmpraesentation .uno:Presentation -AlleDias sd.RadioButton.20003.1 +*Bildschirmpraesentation sym:.uno:Presentation +AlleDias sym:sd.RadioButton.20003.1 AbDia SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_AT_DIA -AbDiaName sd.ListBox.20003.1 -RangeCustomSlideShow sd.RadioButton.20003.3 -'IndividuellePraesentation sd.RadioButton.20003.3 -IndividuellePraesentationName sd.ListBox.20003.2 -Standard sd.RadioButton.20003.4 -Fenster sd.RadioButton.20003.5 -Auto sd.RadioButton.20003.6 -Zeit sd.TimeField.20003.1 -LogoAnzeigen sd.CheckBox.20003.1 +AbDiaName sym:sd.ListBox.20003.1 +RangeCustomSlideShow sym:sd.RadioButton.20003.3 +'IndividuellePraesentation sym:sd.RadioButton.20003.3 +IndividuellePraesentationName sym:sd.ListBox.20003.2 +Standard sym:sd.RadioButton.20003.4 +Fenster sym:sd.RadioButton.20003.5 +Auto sym:sd.RadioButton.20003.6 +Zeit sym:sd.TimeField.20003.1 +LogoAnzeigen sym:sd.CheckBox.20003.1 DiawechselManuel SD:CHECKBOX:DLG_START_PRESENTATION:CBX_MANUEL -MauszeigerSichtbar sd.CheckBox.20003.3 +MauszeigerSichtbar sym:sd.CheckBox.20003.3 MauszeigerAlsStift SD:CHECKBOX:DLG_START_PRESENTATION:CBX_PEN -NavigatorSichtbar sd.CheckBox.20003.5 -AnimationenZulassen sd.CheckBox.20003.6 +NavigatorSichtbar sym:sd.CheckBox.20003.5 +AnimationenZulassen sym:sd.CheckBox.20003.6 DiawechselAufHintergrund SD:CHECKBOX:DLG_START_PRESENTATION:CBX_CHANGE_PAGE -PraesentationImmerImVordergrund sd.CheckBox.20003.8 +PraesentationImmerImVordergrund sym:sd.CheckBox.20003.8 -*BMPOptionen svtools.ModalDialog.16371 -Farbaufloesung svtools.ListBox.16371.1 -RLEKodierung svtools.CheckBox.16371.3 -Original svtools.RadioButton.16371.1 -Aufloesung svtools.RadioButton.16371.2 -DPI svtools.ComboBox.16371.1 -Groesse svtools.RadioButton.16371.3 -Breite svtools.MetricField.16371.1 -Hoehe svtools.MetricField.16371.2 +*BMPOptionen sym:svtools.ModalDialog.16371 +Farbaufloesung sym:svtools.ListBox.16371.1 +RLEKodierung sym:svtools.CheckBox.16371.3 +Original sym:svtools.RadioButton.16371.1 +Aufloesung sym:svtools.RadioButton.16371.2 +DPI sym:svtools.ComboBox.16371.1 +Groesse sym:svtools.RadioButton.16371.3 +Breite sym:svtools.MetricField.16371.1 +Hoehe sym:svtools.MetricField.16371.2 -*Browser .uno:Beamer +*Browser sym:.uno:Beamer -*ChineseTranslation svx.CB_USE_VARIANTS.300 -TChineseToSChinese SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED -SChineseToTChinese SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL -'UseSARCharacter SVX_HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS -TranslateCommonTerms svx.CheckBox.300.2 -EditTerms svx.PushButton.300.1 +*ChineseTranslation sym:svx.CB_USE_VARIANTS.300 +TChineseToSChinese sym:SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED +SChineseToTChinese sym:SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL +'UseSARCharacter sym:SVX_HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS +TranslateCommonTerms sym:svx.CheckBox.300.2 +EditTerms sym:svx.PushButton.300.1 -*ChineseDictionary svx.ModalDialog.301 -TChineseToSChinese SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED -SChineseToTChinese SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL -ReverseMapping SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE -Term svx.Edit.301.1 -Mapping svx.Edit.301.2 -Property svx.ListBox.301.1 -SToTMappingContent SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL -TToSMappingContent SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED -Add svx.PushButton.301.1 -Modify svx.PushButton.301.2 -Delete svx.PushButton.301.3 +*ChineseDictionary sym:svx.ModalDialog.301 +TChineseToSChinese sym:SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED +SChineseToTChinese sym:SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL +ReverseMapping sym:SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE +Term sym:svx.Edit.301.1 +Mapping sym:svx.Edit.301.2 +Property sym:svx.ListBox.301.1 +SToTMappingContent sym:SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL +TToSMappingContent sym:SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED +Add sym:svx.PushButton.301.1 +Modify sym:svx.PushButton.301.2 +Delete sym:svx.PushButton.301.3 diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win index de5eff0c07ff..e645f5a649d7 100644 --- a/testautomation/global/win/dial_d_h.win +++ b/testautomation/global/win/dial_d_h.win @@ -1,33 +1,33 @@ -*DataFieldsFunctionDlg SC_HID_SC_DPDATAFIELD -FunctionList sc.MultiListBox.25737.1 -More sc.MoreButton.25737.4 -ValueType sc.ListBox.25737.2 -BaseField sc.ListBox.25737.3 -BaseItem sc.ListBox.25737.4 - -*DataFieldsOptionsDlg SC_HID_SC_DPSUBT_OPT -Sortby sc.ListBox.25738.5 -Ascending sc.RadioButton.25738.4 -Descending sc.RadioButton.25738.5 -Manual sc.RadioButton.25738.6 -Layout sc.ListBox.25738.6 -EmptyLine sc.CheckBox.25738.2 -Show sc.CheckBox.25738.3 -ShowItems sc.NumericField.25738.1 -ShowFrom sc.ListBox.25738.7 -UsingField sc.ListBox.25738.8 -HideItems SC_HID_SC_DPSUBT_HIDE -Hierarchy sc.ListBox.25738.9 - -*DateienAuswaehlen SW_HID_FILEDLG_MAILMRGE2 -Hinzufuegen cui.PushButton.10201.14 -Loeschen cui.PushButton.10201.15 -Pfade cui.ListBox.10201.11 - -*Datenpilot .uno:DataDataPilotRun -Zusaetze sc.MoreButton.25638.4 -DataPilotRange sc.Edit.25638.42 -DataPilotRangeShrink sc.ImageButton.25638.41 +*DataFieldsFunctionDlg sym:SC_HID_SC_DPDATAFIELD +FunctionList sym:sc.MultiListBox.25737.1 +More sym:sc.MoreButton.25737.4 +ValueType sym:sc.ListBox.25737.2 +BaseField sym:sc.ListBox.25737.3 +BaseItem sym:sc.ListBox.25737.4 + +*DataFieldsOptionsDlg sym:SC_HID_SC_DPSUBT_OPT +Sortby sym:sc.ListBox.25738.5 +Ascending sym:sc.RadioButton.25738.4 +Descending sym:sc.RadioButton.25738.5 +Manual sym:sc.RadioButton.25738.6 +Layout sym:sc.ListBox.25738.6 +EmptyLine sym:sc.CheckBox.25738.2 +Show sym:sc.CheckBox.25738.3 +ShowItems sym:sc.NumericField.25738.1 +ShowFrom sym:sc.ListBox.25738.7 +UsingField sym:sc.ListBox.25738.8 +HideItems sym:SC_HID_SC_DPSUBT_HIDE +Hierarchy sym:sc.ListBox.25738.9 + +*DateienAuswaehlen sym:SW_HID_FILEDLG_MAILMRGE2 +Hinzufuegen sym:cui.PushButton.10201.14 +Loeschen sym:cui.PushButton.10201.15 +Pfade sym:cui.ListBox.10201.11 + +*Datenpilot sym:.uno:DataDataPilotRun +Zusaetze sym:sc.MoreButton.25638.4 +DataPilotRange sym:sc.Edit.25638.42 +DataPilotRangeShrink sym:sc.ImageButton.25638.41 AusgabeAb SC:LISTBOX:RID_SCDLG_PIVOT_LAYOUT:LB_OUTAREA Bereich SC:EDIT:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA Minimieren SC:IMAGEBUTTON:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA @@ -35,70 +35,70 @@ LeerzeilenIgnorieren SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_IGNEMPTYROWS KategorieErkennung SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_DETECTCAT GesamtSpalten SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALCOL GesamtZeilen SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALROW -Entfernen sc.PushButton.25638.5 -Optionen sc.PushButton.25638.6 -AddFilter sc.CheckBox.25638.29 -EnableDrillToDetails sc.CheckBox.25638.30 -DataPilotPage SC_HID_SC_DPLAY_PAGE -DataPilotColumn SC_HID_SC_DPLAY_COLUMN -DataPilotRow SC_HID_SC_DPLAY_ROW -DataPilotData SC_HID_SC_DPLAY_DATA -DataPilotSelection SC_HID_SC_DPLAY_SELECT - -*DatenbankAustauschen sw.ModalDialog.21109 -VerfuegbareDatenbanken SW_HID_DB_SELECTION_TLB - -*Datenbankauswahl sw.ModalDialog.22050 - -*DatenbankbereichFestlegen .uno:DefineDBName -BereichsName sc.ComboBox.25627.11 -EnthaeltSpaltenkoepfe sc.CheckBox.25627.21 -Hinzufuegen sc.PushButton.25627.3 -Loeschen sc.PushButton.25627.4 -Aendern sc.PushButton.25627.3 -Bereich sc.Edit.25627.13 -BereichMin sc.ImageButton.25627.14 -Zusaetze sc.MoreButton.25627.33 -Spaltenkoepfe sc.CheckBox.25627.21 -Zellen sc.CheckBox.25627.22 -Formatierung sc.CheckBox.25627.23 -ImportierteDaten sc.CheckBox.25627.24 - -*DatenbankbereichWaehlen .uno:SelectDB -Bereiche SC_HID_SC_SELENTRY_LIST - -*Datenfeld SC_HID_SC_PIVOTSUBT -Keine sc.RadioButton.25642.1 -Automatisch sc.RadioButton.25642.2 -Benutzerdefiniert sc.RadioButton.25642.3 -Funktionen sc.MultiListBox.25642.1 -OhneDatenAnzeigen sc.CheckBox.25642.1 -Options sc.PushButton.25642.5 - -*DatenquelleAuswaehlen SC_HID_DATAPILOT_DATABASE -Datenbank sc.ListBox.25735.19 -Datenquelle sc.ComboBox.25735.21 -Art sc.ListBox.25735.23 - -*DatenquelleLiteraturdatenbank EXTENSIONS_HID_DLG_DBCHANGE -Auswahl EXTENSIONS_HID_SELECTION_TLB - - -*Dokumenteigenschaften .uno:SetDocumentProperties - -*DokumentSchuetzen .uno:ToolProtectionDocument -Passwort SC_HID_PASSWD_DOC -Bestaetigung sfx2.Edit.2316.16 -IstVerdeckt sfx2.Edit.2316.12 - -*DokumentVorlagen .uno:SaveAsTemplate -NeueDokumentVorlage sfx2.Edit.2054.7 -Bereiche sfx2.ListBox.2054.2 -Vorlagen sfx2.ListBox.2054.4 -Bearbeiten sfx2.PushButton.2054.12 -Verwalten sfx2.PushButton.2054.20 - -*Drei_D_Effekte .uno:Window3D +Entfernen sym:sc.PushButton.25638.5 +Optionen sym:sc.PushButton.25638.6 +AddFilter sym:sc.CheckBox.25638.29 +EnableDrillToDetails sym:sc.CheckBox.25638.30 +DataPilotPage sym:SC_HID_SC_DPLAY_PAGE +DataPilotColumn sym:SC_HID_SC_DPLAY_COLUMN +DataPilotRow sym:SC_HID_SC_DPLAY_ROW +DataPilotData sym:SC_HID_SC_DPLAY_DATA +DataPilotSelection sym:SC_HID_SC_DPLAY_SELECT + +*DatenbankAustauschen sym:sw.ModalDialog.21109 +VerfuegbareDatenbanken sym:SW_HID_DB_SELECTION_TLB + +*Datenbankauswahl sym:sw.ModalDialog.22050 + +*DatenbankbereichFestlegen sym:.uno:DefineDBName +BereichsName sym:sc.ComboBox.25627.11 +EnthaeltSpaltenkoepfe sym:sc.CheckBox.25627.21 +Hinzufuegen sym:sc.PushButton.25627.3 +Loeschen sym:sc.PushButton.25627.4 +Aendern sym:sc.PushButton.25627.3 +Bereich sym:sc.Edit.25627.13 +BereichMin sym:sc.ImageButton.25627.14 +Zusaetze sym:sc.MoreButton.25627.33 +Spaltenkoepfe sym:sc.CheckBox.25627.21 +Zellen sym:sc.CheckBox.25627.22 +Formatierung sym:sc.CheckBox.25627.23 +ImportierteDaten sym:sc.CheckBox.25627.24 + +*DatenbankbereichWaehlen sym:.uno:SelectDB +Bereiche sym:SC_HID_SC_SELENTRY_LIST + +*Datenfeld sym:SC_HID_SC_PIVOTSUBT +Keine sym:sc.RadioButton.25642.1 +Automatisch sym:sc.RadioButton.25642.2 +Benutzerdefiniert sym:sc.RadioButton.25642.3 +Funktionen sym:sc.MultiListBox.25642.1 +OhneDatenAnzeigen sym:sc.CheckBox.25642.1 +Options sym:sc.PushButton.25642.5 + +*DatenquelleAuswaehlen sym:SC_HID_DATAPILOT_DATABASE +Datenbank sym:sc.ListBox.25735.19 +Datenquelle sym:sc.ComboBox.25735.21 +Art sym:sc.ListBox.25735.23 + +*DatenquelleLiteraturdatenbank sym:EXTENSIONS_HID_DLG_DBCHANGE +Auswahl sym:EXTENSIONS_HID_SELECTION_TLB + + +*Dokumenteigenschaften sym:.uno:SetDocumentProperties + +*DokumentSchuetzen sym:.uno:ToolProtectionDocument +Passwort sym:SC_HID_PASSWD_DOC +Bestaetigung sym:sfx2.Edit.2316.16 +IstVerdeckt sym:sfx2.Edit.2316.12 + +*DokumentVorlagen sym:.uno:SaveAsTemplate +NeueDokumentVorlage sym:sfx2.Edit.2054.7 +Bereiche sym:sfx2.ListBox.2054.2 +Vorlagen sym:sfx2.ListBox.2054.4 +Bearbeiten sym:sfx2.PushButton.2054.12 +Verwalten sym:sfx2.PushButton.2054.20 + +*Drei_D_Effekte sym:.uno:Window3D Geometrie SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_GEO Darstellung SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_REPRESENTATION Beleuchtung SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT @@ -150,182 +150,182 @@ UmwandelnInRotationskoerper SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LATHE_OBJ Umgebungslicht SVX:LISTBOX:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT Horizontale_Segmente SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_HORIZONTAL Vertikale_Segmente SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_VERTICAL -Kantenrundung svx.MetricField.10209.30 -Tiefenskalierung svx.MetricField.10209.32 -Endwinkel svx.MetricField.10209.34 -Tiefe svx.MetricField.10209.36 -Modus svx.ListBox.10209.46 -Papierneigung svx.MetricField.10209.49 -Entfernung svx.MetricField.10209.52 -Brennweite svx.MetricField.10209.54 - -*DruckbereicheBearbeiten SC_HID_SCPAGE_AREAS -Druckbereich sc.Edit.25685.11 -Wiederholungszeile sc.Edit.25685.21 -Wiederholungsspalte sc.Edit.25685.31 -DruckbereichListe sc.ListBox.25685.13 -WiederholungszeileListe sc.ListBox.25685.23 -WiederholungsspalteListe sc.ListBox.25685.33 -DruckbereichButton sc.ImageButton.25685.12 -WiederholungszeileButton sc.ImageButton.25685.22 -WiederholungsspalteButton sc.ImageButton.25685.32 - -*Druckbestaetigung SFX2_HID_PRINTMONITOR - -*Druckoptionen SW_HID_DLG_PRV_PRT_OPTIONS -Zeilen sw.NumericField.20602.3 -Spalten sw.NumericField.20602.5 -Links sw.MetricField.20602.13 -Rechts sw.MetricField.20602.15 -Oben sw.MetricField.20602.17 -Unten sw.MetricField.20602.19 -Horizontal sw.MetricField.20602.21 -Vertikal sw.MetricField.20602.23 -Querformat sw.RadioButton.20602.24 -Hochformat sw.RadioButton.20602.25 -Standard sw.PushButton.20602.24 - -*DruckerZusaetzeDraw SD_HID_SD_PRINT_OPTIONS -Zeichnung sd.CheckBox.549.6 -Notizen sd.CheckBox.549.7 -Handzettel sd.CheckBox.549.8 -Gliederung sd.CheckBox.549.9 -Seitenname sd.CheckBox.549.2 -Datum sd.CheckBox.549.3 -Zeit sd.CheckBox.549.4 -AusgeblendeteSeiten sd.CheckBox.549.1 -Standard sd.RadioButton.549.1 -SeitengroesseAnpassen sd.RadioButton.549.2 -SeitenKacheln sd.RadioButton.549.3 -Prospekt sd.RadioButton.549.4 -Vorderseite sd.CheckBox.549.12 -Rueckseite sd.CheckBox.549.13 -AusDruckereinstellung sd.CheckBox.549.10 - -*DruckerZusaetzeWriter SW_HID_OPTPRINT_PAGE -Grafiken sw.CheckBox.20826.61 -Kontrollfelder sw.CheckBox.20826.69 -Hintergrund sw.CheckBox.20826.79 -HiddenText sw.CheckBox.20826.93 -TextPlaceholder sw.CheckBox.20826.94 -RightToLeft sw.CheckBox.20826.140 -SchwarzDrucken sw.CheckBox.20826.87 -LinkeSeiten sw.CheckBox.20826.64 -RechteSeiten sw.CheckBox.20826.65 -Prospekt sw.CheckBox.20826.67 -Keine sw.RadioButton.20826.80 -NurNotizen sw.RadioButton.20826.81 -Dokumentende sw.RadioButton.20826.82 -Seitenende sw.RadioButton.20826.83 -Fax sw.ListBox.20826.86 -AusDruckereinstellung sw.CheckBox.20826.70 - -*Duplizieren .uno:CopyObjects -AnzahlAnKopien sd.NumericField.727.1 -XAchse sd.MetricField.727.2 -YAchse sd.MetricField.727.3 -Drehwinkel sd.MetricField.727.1 -Hoehe sd.MetricField.727.5 -Breite sd.MetricField.727.4 -Anfang sd.ListBox.727.1 -Ende sd.ListBox.727.2 - -*DVVerwalten .uno:Organizer -Befehle sfx2.MenuButton.2055.105 -WelcheDatei sfx2.PushButton.2055.3 -ListeLinks SFX2_HID_CTL_ORGANIZER_LEFT -ListeRechts SFX2_HID_CTL_ORGANIZER_RIGHT -PopuplisteLinks sfx2.ListBox.2055.2 -PopuplisteRechts sfx2.ListBox.2055.11 -AddressBook sfx2.PushButton.2055.4 - -*EinfuegenSpalten .uno:InsertColumnDialog -Anzahl cui.NumericField.10156.2 -Davor cui.RadioButton.10156.10 -Dahinter cui.RadioButton.10156.11 - -*EinfuegenZeilen .uno:InsertRowDialog -Anzahl cui.NumericField.10156.2 -Davor cui.RadioButton.10156.10 -Dahinter cui.RadioButton.10156.11 - -*EbeneEinfuegenDlg .uno:InsertLayer -EbenenName sd.Edit.259.2 -LayerTitle sd.Edit.259.4 -LayerDescription sd.MultiLineEdit.259.6 -Sichtbar sd.CheckBox.259.7 -Druckbar sd.CheckBox.259.8 -Gesperrt sd.CheckBox.259.9 - -*EbeneAendernDlg .uno:ModifyLayer -EbenenName sd.Edit.259.2 -LayerTitle sd.Edit.259.4 -LayerDescription sd.MultiLineEdit.259.6 -Sichtbar sd.CheckBox.259.7 -Druckbar sd.CheckBox.259.8 -Gesperrt sd.CheckBox.259.9 - -*Eingabefeld SW_HID_FLD_INPUT +Kantenrundung sym:svx.MetricField.10209.30 +Tiefenskalierung sym:svx.MetricField.10209.32 +Endwinkel sym:svx.MetricField.10209.34 +Tiefe sym:svx.MetricField.10209.36 +Modus sym:svx.ListBox.10209.46 +Papierneigung sym:svx.MetricField.10209.49 +Entfernung sym:svx.MetricField.10209.52 +Brennweite sym:svx.MetricField.10209.54 + +*DruckbereicheBearbeiten sym:SC_HID_SCPAGE_AREAS +Druckbereich sym:sc.Edit.25685.11 +Wiederholungszeile sym:sc.Edit.25685.21 +Wiederholungsspalte sym:sc.Edit.25685.31 +DruckbereichListe sym:sc.ListBox.25685.13 +WiederholungszeileListe sym:sc.ListBox.25685.23 +WiederholungsspalteListe sym:sc.ListBox.25685.33 +DruckbereichButton sym:sc.ImageButton.25685.12 +WiederholungszeileButton sym:sc.ImageButton.25685.22 +WiederholungsspalteButton sym:sc.ImageButton.25685.32 + +*Druckbestaetigung sym:SFX2_HID_PRINTMONITOR + +*Druckoptionen sym:SW_HID_DLG_PRV_PRT_OPTIONS +Zeilen sym:sw.NumericField.20602.3 +Spalten sym:sw.NumericField.20602.5 +Links sym:sw.MetricField.20602.13 +Rechts sym:sw.MetricField.20602.15 +Oben sym:sw.MetricField.20602.17 +Unten sym:sw.MetricField.20602.19 +Horizontal sym:sw.MetricField.20602.21 +Vertikal sym:sw.MetricField.20602.23 +Querformat sym:sw.RadioButton.20602.24 +Hochformat sym:sw.RadioButton.20602.25 +Standard sym:sw.PushButton.20602.24 + +*DruckerZusaetzeDraw sym:SD_HID_SD_PRINT_OPTIONS +Zeichnung sym:sd.CheckBox.549.6 +Notizen sym:sd.CheckBox.549.7 +Handzettel sym:sd.CheckBox.549.8 +Gliederung sym:sd.CheckBox.549.9 +Seitenname sym:sd.CheckBox.549.2 +Datum sym:sd.CheckBox.549.3 +Zeit sym:sd.CheckBox.549.4 +AusgeblendeteSeiten sym:sd.CheckBox.549.1 +Standard sym:sd.RadioButton.549.1 +SeitengroesseAnpassen sym:sd.RadioButton.549.2 +SeitenKacheln sym:sd.RadioButton.549.3 +Prospekt sym:sd.RadioButton.549.4 +Vorderseite sym:sd.CheckBox.549.12 +Rueckseite sym:sd.CheckBox.549.13 +AusDruckereinstellung sym:sd.CheckBox.549.10 + +*DruckerZusaetzeWriter sym:SW_HID_OPTPRINT_PAGE +Grafiken sym:sw.CheckBox.20826.61 +Kontrollfelder sym:sw.CheckBox.20826.69 +Hintergrund sym:sw.CheckBox.20826.79 +HiddenText sym:sw.CheckBox.20826.93 +TextPlaceholder sym:sw.CheckBox.20826.94 +RightToLeft sym:sw.CheckBox.20826.140 +SchwarzDrucken sym:sw.CheckBox.20826.87 +LinkeSeiten sym:sw.CheckBox.20826.64 +RechteSeiten sym:sw.CheckBox.20826.65 +Prospekt sym:sw.CheckBox.20826.67 +Keine sym:sw.RadioButton.20826.80 +NurNotizen sym:sw.RadioButton.20826.81 +Dokumentende sym:sw.RadioButton.20826.82 +Seitenende sym:sw.RadioButton.20826.83 +Fax sym:sw.ListBox.20826.86 +AusDruckereinstellung sym:sw.CheckBox.20826.70 + +*Duplizieren sym:.uno:CopyObjects +AnzahlAnKopien sym:sd.NumericField.727.1 +XAchse sym:sd.MetricField.727.2 +YAchse sym:sd.MetricField.727.3 +Drehwinkel sym:sd.MetricField.727.1 +Hoehe sym:sd.MetricField.727.5 +Breite sym:sd.MetricField.727.4 +Anfang sym:sd.ListBox.727.1 +Ende sym:sd.ListBox.727.2 + +*DVVerwalten sym:.uno:Organizer +Befehle sym:sfx2.MenuButton.2055.105 +WelcheDatei sym:sfx2.PushButton.2055.3 +ListeLinks sym:SFX2_HID_CTL_ORGANIZER_LEFT +ListeRechts sym:SFX2_HID_CTL_ORGANIZER_RIGHT +PopuplisteLinks sym:sfx2.ListBox.2055.2 +PopuplisteRechts sym:sfx2.ListBox.2055.11 +AddressBook sym:sfx2.PushButton.2055.4 + +*EinfuegenSpalten sym:.uno:InsertColumnDialog +Anzahl sym:cui.NumericField.10156.2 +Davor sym:cui.RadioButton.10156.10 +Dahinter sym:cui.RadioButton.10156.11 + +*EinfuegenZeilen sym:.uno:InsertRowDialog +Anzahl sym:cui.NumericField.10156.2 +Davor sym:cui.RadioButton.10156.10 +Dahinter sym:cui.RadioButton.10156.11 + +*EbeneEinfuegenDlg sym:.uno:InsertLayer +EbenenName sym:sd.Edit.259.2 +LayerTitle sym:sd.Edit.259.4 +LayerDescription sym:sd.MultiLineEdit.259.6 +Sichtbar sym:sd.CheckBox.259.7 +Druckbar sym:sd.CheckBox.259.8 +Gesperrt sym:sd.CheckBox.259.9 + +*EbeneAendernDlg sym:.uno:ModifyLayer +EbenenName sym:sd.Edit.259.2 +LayerTitle sym:sd.Edit.259.4 +LayerDescription sym:sd.MultiLineEdit.259.6 +Sichtbar sym:sd.CheckBox.259.7 +Druckbar sym:sd.CheckBox.259.8 +Gesperrt sym:sd.CheckBox.259.9 + +*Eingabefeld sym:SW_HID_FLD_INPUT Titel SW:EDIT:DLG_FLD_INPUT:ED_LABEL -EingabeText sw.MultiLineEdit.21105.3 +EingabeText sym:sw.MultiLineEdit.21105.3 Weiter SW:PUSHBUTTON:DLG_FLD_INPUT:PB_NEXT -*EMFOptionen svtools.ModalDialog.16372 -Original svtools.RadioButton.16372.1 -Groesse svtools.RadioButton.16372.2 -Breite svtools.MetricField.16372.1 -Hoehe svtools.MetricField.16372.2 - -*EPSOptionen filter.ModalDialog.17408 -VorschauTif filter.CheckBox.17408.1 -InterchangeEPSI filter.CheckBox.17408.2 -Level1 filter.RadioButton.17408.1 -Level2 filter.RadioButton.17408.2 -Farbe filter.RadioButton.17408.3 -Graustufen filter.RadioButton.17408.4 -LZWKodierung filter.RadioButton.17408.5 -Keine filter.RadioButton.17408.6 - -*EtikettenSynchronisieren SW_HID_SYNC_BTN +*EMFOptionen sym:svtools.ModalDialog.16372 +Original sym:svtools.RadioButton.16372.1 +Groesse sym:svtools.RadioButton.16372.2 +Breite sym:svtools.MetricField.16372.1 +Hoehe sym:svtools.MetricField.16372.2 + +*EPSOptionen sym:filter.ModalDialog.17408 +VorschauTif sym:filter.CheckBox.17408.1 +InterchangeEPSI sym:filter.CheckBox.17408.2 +Level1 sym:filter.RadioButton.17408.1 +Level2 sym:filter.RadioButton.17408.2 +Farbe sym:filter.RadioButton.17408.3 +Graustufen sym:filter.RadioButton.17408.4 +LZWKodierung sym:filter.RadioButton.17408.5 +Keine sym:filter.RadioButton.17408.6 + +*EtikettenSynchronisieren sym:SW_HID_SYNC_BTN Synchronisieren SW:PUSHBUTTON:DLG_SYNC_BTN:BTN_SYNC -*ExportCalc SC_HID_SC_INPORTOPT -Zeichensatzliste sc.ListBox.25663.10 -Feldtrenner sc.ComboBox.25663.5 -Texttrenner sc.ComboBox.25663.7 -Zeichensatz sc.ListBox.25663.9 -FixedWidth sc.CheckBox.25663.12 -SaveAsShown sc.CheckBox.25663.13 - -*ExterneDaten sc.ModalDialog.25736 -URLFeld SC_HID_SCDLG_LINKAREAURL -DateiAuswahl sc.PushButton.25736.6 -TabellenListBox sc.MultiListBox.25736.9 -Aktualisieren sc.CheckBox.25736.10 -Zeit sc.NumericField.25736.11 - -*ExterneDatenquelle SC_HID_DATAPILOT_SERVICE -Service sc.ListBox.25734.9 -Quelle sc.Edit.25734.11 -Quellname sc.Edit.25734.13 -Benutzer sc.Edit.25734.15 -Kennwort sc.Edit.25734.17 - -*ExtrasOptionenDlg CUI_HID_OFADLG_OPTIONS_TREE -Optionsliste CUI_HID_OFADLG_TREELISTBOX -Zurueck cui.PushButton.17015.4 - -*FeldAuswahl SVX_HID_FIELD_SEL_WIN -Liste SVX_HID_FIELD_SEL +*ExportCalc sym:SC_HID_SC_INPORTOPT +Zeichensatzliste sym:sc.ListBox.25663.10 +Feldtrenner sym:sc.ComboBox.25663.5 +Texttrenner sym:sc.ComboBox.25663.7 +Zeichensatz sym:sc.ListBox.25663.9 +FixedWidth sym:sc.CheckBox.25663.12 +SaveAsShown sym:sc.CheckBox.25663.13 + +*ExterneDaten sym:sc.ModalDialog.25736 +URLFeld sym:SC_HID_SCDLG_LINKAREAURL +DateiAuswahl sym:sc.PushButton.25736.6 +TabellenListBox sym:sc.MultiListBox.25736.9 +Aktualisieren sym:sc.CheckBox.25736.10 +Zeit sym:sc.NumericField.25736.11 + +*ExterneDatenquelle sym:SC_HID_DATAPILOT_SERVICE +Service sym:sc.ListBox.25734.9 +Quelle sym:sc.Edit.25734.11 +Quellname sym:sc.Edit.25734.13 +Benutzer sym:sc.Edit.25734.15 +Kennwort sym:sc.Edit.25734.17 + +*ExtrasOptionenDlg sym:CUI_HID_OFADLG_OPTIONS_TREE +Optionsliste sym:CUI_HID_OFADLG_TREELISTBOX +Zurueck sym:cui.PushButton.17015.4 + +*FeldAuswahl sym:SVX_HID_FIELD_SEL_WIN +Liste sym:SVX_HID_FIELD_SEL *FeldbefehlBearbeitenDraw SD:MODALDIALOG:DLG_FIELD_MODIFY FeldtypFix SD:RADIOBUTTON:DLG_FIELD_MODIFY:RBT_FIX FeldtypVariabel SD:RADIOBUTTON:DLG_FIELD_MODIFY:RBT_VAR -*FeldbefehlBearbeitenDatenbank SW_HID_EDIT_FLD_DB -Bearbeiten SW_HID_FLDEDT_ADDRESS +*FeldbefehlBearbeitenDatenbank sym:SW_HID_EDIT_FLD_DB +Bearbeiten sym:SW_HID_FLDEDT_ADDRESS Feldtyp SW:LISTBOX:TP_FLD_DB:LB_DBTYPE -Datenbankauswahl SW_HID_DB_SELECTION_TLB +Datenbankauswahl sym:SW_HID_DB_SELECTION_TLB Bedingung SW:EDIT:TP_FLD_DB:ED_DBCONDITION Satznummer SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER AusDatenbank SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT @@ -333,8 +333,8 @@ Selbstdefiniert SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT Formatliste SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT Zahlenformat SW:LISTBOX:TP_FLD_DB:LB_DBNUMFORMAT -*FeldbefehlBearbeitenDokument SW_HID_EDIT_FLD_DOK -Bearbeiten SW_HID_FLDEDT_ADDRESS +*FeldbefehlBearbeitenDokument sym:SW_HID_EDIT_FLD_DOK +Bearbeiten sym:SW_HID_FLDEDT_ADDRESS Feldtyp SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE Auswahl SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION Editfeld SW:EDIT:TP_FLD_DOK:ED_DOKVALUE @@ -342,18 +342,18 @@ DokLevel SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL Formatliste SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT Zahlenformat SW:LISTBOX:TP_FLD_DOK:LB_DOKNUMFORMAT InhaltFix SW:CHECKBOX:TP_FLD_DOK:CB_DOKFIXEDCONTENT -VorigerFeldbefehl SW_HID_DLG_FLDEDT_PREV -NaechsterFeldbefehl SW_HID_DLG_FLDEDT_NEXT +VorigerFeldbefehl sym:SW_HID_DLG_FLDEDT_PREV +NaechsterFeldbefehl sym:SW_HID_DLG_FLDEDT_NEXT -*FeldbefehlBearbeitenDokumentinfo SW_HID_EDIT_FLD_DOKINF -Bearbeiten SW_HID_FLDEDT_ADDRESS -Feldtyp SW_HID_FIELD_DINF_TYPE +*FeldbefehlBearbeitenDokumentinfo sym:SW_HID_EDIT_FLD_DOKINF +Bearbeiten sym:SW_HID_FLDEDT_ADDRESS +Feldtyp sym:SW_HID_FIELD_DINF_TYPE Auswahl SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFSELECTION Zahlenformat SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFFORMAT InhaltFix SW:CHECKBOX:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT -*FeldbefehlBearbeitenFunktionen SW_HID_EDIT_FLD_FUNC -Bearbeiten SW_HID_FLDEDT_ADDRESS +*FeldbefehlBearbeitenFunktionen sym:SW_HID_EDIT_FLD_FUNC +Bearbeiten sym:SW_HID_FLDEDT_ADDRESS Feldtyp SW:LISTBOX:TP_FLD_FUNC:LB_FUNCTYPE Auswahl SW:LISTBOX:TP_FLD_FUNC:LB_FUNCSELECTION Formatliste SW:LISTBOX:TP_FLD_FUNC:LB_FUNCFORMAT @@ -367,26 +367,26 @@ Hinweis SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE Makroname SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME Platzhalter SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME Texteinfuegen SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE -AddListEntry sw.PushButton.20868.82 -NewListEntry sw.Edit.20868.81 -EntrysList sw.ListBox.20868.84 -RemoveEntry sw.PushButton.20868.85 -MoveUpEntry sw.PushButton.20868.86 -MoveDownEntry sw.PushButton.20868.87 -EntryName sw.Edit.20868.89 -VorigerFeldbefehl SW_HID_DLG_FLDEDT_PREV -NaechsterFeldbefehl SW_HID_DLG_FLDEDT_NEXT - -*FeldbefehlBearbeitenReferenz SW_HID_EDIT_FLD_REF -Bearbeiten SW_HID_FLDEDT_ADDRESS +AddListEntry sym:sw.PushButton.20868.82 +NewListEntry sym:sw.Edit.20868.81 +EntrysList sym:sw.ListBox.20868.84 +RemoveEntry sym:sw.PushButton.20868.85 +MoveUpEntry sym:sw.PushButton.20868.86 +MoveDownEntry sym:sw.PushButton.20868.87 +EntryName sym:sw.Edit.20868.89 +VorigerFeldbefehl sym:SW_HID_DLG_FLDEDT_PREV +NaechsterFeldbefehl sym:SW_HID_DLG_FLDEDT_NEXT + +*FeldbefehlBearbeitenReferenz sym:SW_HID_EDIT_FLD_REF +Bearbeiten sym:SW_HID_FLDEDT_ADDRESS Feldtyp SW:LISTBOX:TP_FLD_REF:LB_REFTYPE Auswahl SW:LISTBOX:TP_FLD_REF:LB_REFSELECTION Formatliste SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT Namefeld SW:EDIT:TP_FLD_REF:ED_REFNAME Wert SW:EDIT:TP_FLD_REF:ED_REFVALUE -*FeldbefehlBearbeitenVariable SW_HID_EDIT_FLD_VAR -Bearbeiten SW_HID_FLDEDT_ADDRESS +*FeldbefehlBearbeitenVariable sym:SW_HID_EDIT_FLD_VAR +Bearbeiten sym:SW_HID_FLDEDT_ADDRESS Feldtyp SW:LISTBOX:TP_FLD_VAR:LB_VARTYPE Auswahl SW:LISTBOX:TP_FLD_VAR:LB_VARSELECTION Formatliste SW:LISTBOX:TP_FLD_VAR:LB_VARFORMAT @@ -397,91 +397,91 @@ Hinweis SW:EDIT:TP_FLD_VAR:ED_VARVALUE Korrektur SW:EDIT:TP_FLD_VAR:ED_VARVALUE Formel SW:EDIT:TP_FLD_VAR:ED_VARVALUE Unsichtbar SW:CHECKBOX:TP_FLD_VAR:CB_VARINVISIBLE -Uebernehmen SW_HID_FLDVAR_APPLY -Loeschen SW_HID_FLDVAR_DELETE - -*Filterauswahl UUI_HID_DLG_FILTER_SELECT -Filter uui.ListBox.14510.31 - -*FilterDlg svtools.ModalDialog.16371 -Original svtools.RadioButton.16371.1 -Aufloesung svtools.RadioButton.16371.2 -Groesse svtools.RadioButton.16371.3 -AufloesungDPI svtools.ComboBox.16371.1 -Breite svtools.MetricField.16371.1 -Hoehe svtools.MetricField.16371.2 - -*Fontwork .uno:FontWork -KreisAuswahl SVX_HID_FONTWORK_CTL_FORMS -Aus SVX_HID_FONTWORK_TBI_STYLE_OFF -Drehen SVX_HID_FONTWORK_TBI_STYLE_ROTATE -Aufrecht SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT -HorizontalKippen SVX_HID_FONTWORK_TBI_STYLE_SLANTX -VertikalKippen SVX_HID_FONTWORK_TBI_STYLE_SLANTY -Laufrichtgung SVX_HID_FONTWORK_TBI_ADJUST_MIRROR -Linksbuendig SVX_HID_FONTWORK_TBI_ADJUST_LEFT -Zentriert SVX_HID_FONTWORK_TBI_ADJUST_CENTER -Rechtsbuendig SVX_HID_FONTWORK_TBI_ADJUST_RIGHT -AutoTextgroesse SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE -Abstand svx.MetricField.10093.1 -Einzug svx.MetricField.10093.2 -Kontur SVX_HID_FONTWORK_TBI_SHOWFORM -Buchstabenumrandung SVX_HID_FONTWORK_TBI_OUTLINE -SchattenaAus SVX_HID_FONTWORK_TBI_SHADOW_OFF -Senkrecht SVX_HID_FONTWORK_TBI_SHADOW_NORMAL -Kippen SVX_HID_FONTWORK_TBI_SHADOW_SLANT -AbstandX svx.MetricField.10093.3 -AbstandY svx.MetricField.10093.4 -Schattenfarbe svx.ListBox.10093.1 - -*FormSpeichernUnter SW_HID_NUM_NAMES -FormName sw.Edit.21668.107 -FormListe sw.ListBox.21668.106 - -*FormularNavigator .uno:ShowFmExplorer -Liste SVX_HID_FORM_NAVIGATOR - -*FussnoteBearbeiten .uno:EditFootnote -Automatisch sw.RadioButton.21662.1 -Zeichen sw.RadioButton.21662.2 -ZeichenText sw.Edit.21662.3 +Uebernehmen sym:SW_HID_FLDVAR_APPLY +Loeschen sym:SW_HID_FLDVAR_DELETE + +*Filterauswahl sym:UUI_HID_DLG_FILTER_SELECT +Filter sym:uui.ListBox.14510.31 + +*FilterDlg sym:svtools.ModalDialog.16371 +Original sym:svtools.RadioButton.16371.1 +Aufloesung sym:svtools.RadioButton.16371.2 +Groesse sym:svtools.RadioButton.16371.3 +AufloesungDPI sym:svtools.ComboBox.16371.1 +Breite sym:svtools.MetricField.16371.1 +Hoehe sym:svtools.MetricField.16371.2 + +*Fontwork sym:.uno:FontWork +KreisAuswahl sym:SVX_HID_FONTWORK_CTL_FORMS +Aus sym:SVX_HID_FONTWORK_TBI_STYLE_OFF +Drehen sym:SVX_HID_FONTWORK_TBI_STYLE_ROTATE +Aufrecht sym:SVX_HID_FONTWORK_TBI_STYLE_UPRIGHT +HorizontalKippen sym:SVX_HID_FONTWORK_TBI_STYLE_SLANTX +VertikalKippen sym:SVX_HID_FONTWORK_TBI_STYLE_SLANTY +Laufrichtgung sym:SVX_HID_FONTWORK_TBI_ADJUST_MIRROR +Linksbuendig sym:SVX_HID_FONTWORK_TBI_ADJUST_LEFT +Zentriert sym:SVX_HID_FONTWORK_TBI_ADJUST_CENTER +Rechtsbuendig sym:SVX_HID_FONTWORK_TBI_ADJUST_RIGHT +AutoTextgroesse sym:SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE +Abstand sym:svx.MetricField.10093.1 +Einzug sym:svx.MetricField.10093.2 +Kontur sym:SVX_HID_FONTWORK_TBI_SHOWFORM +Buchstabenumrandung sym:SVX_HID_FONTWORK_TBI_OUTLINE +SchattenaAus sym:SVX_HID_FONTWORK_TBI_SHADOW_OFF +Senkrecht sym:SVX_HID_FONTWORK_TBI_SHADOW_NORMAL +Kippen sym:SVX_HID_FONTWORK_TBI_SHADOW_SLANT +AbstandX sym:svx.MetricField.10093.3 +AbstandY sym:svx.MetricField.10093.4 +Schattenfarbe sym:svx.ListBox.10093.1 + +*FormSpeichernUnter sym:SW_HID_NUM_NAMES +FormName sym:sw.Edit.21668.107 +FormListe sym:sw.ListBox.21668.106 + +*FormularNavigator sym:.uno:ShowFmExplorer +Liste sym:SVX_HID_FORM_NAVIGATOR + +*FussnoteBearbeiten sym:.uno:EditFootnote +Automatisch sym:sw.RadioButton.21662.1 +Zeichen sym:sw.RadioButton.21662.2 +ZeichenText sym:sw.Edit.21662.3 Durchsuchen SW:PUSHBUTTON:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR Fussnote SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_FTN Endnote SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE -VorherigeFussnote sw.ImageButton.21662.103 -NachfolgendeFussnote sw.ImageButton.21662.104 +VorherigeFussnote sym:sw.ImageButton.21662.103 +NachfolgendeFussnote sym:sw.ImageButton.21662.104 -*FussnoteEinfuegen .uno:InsertFootnoteDialog -Automatisch sw.RadioButton.21662.1 -Zeichen sw.RadioButton.21662.2 -ZeichenText sw.Edit.21662.3 +*FussnoteEinfuegen sym:.uno:InsertFootnoteDialog +Automatisch sym:sw.RadioButton.21662.1 +Zeichen sym:sw.RadioButton.21662.2 +ZeichenText sym:sw.Edit.21662.3 Durchsuchen SW:PUSHBUTTON:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR Fussnote SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_FTN Endnote SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE -*Gallerybeamer .uno:Beamer -Anzeige SVX_HID_GALLERY_WINDOW - -*Gestalter .uno:DesignerDialog -TBGestalterRight SFX2_HID_TEMPLDLG_TOOLBOX_RIGHT -TBGestalter SFX2_HID_TEMPLDLG_TOOLBOX_LEFT -Absatzvorlagen .uno:ParaStyle -Zeichenvorlagen .uno:CharStyle -Rahmenvorlagen .uno:FrameStyle -Seitenvorlagen .uno:PageStyle -Grafikvorlagen .uno:ParaStyle -Praesentationsvorlagen .uno:ListStyle -Numerierungsvorlagen .uno:ListStyle -Zellvorlagen .uno:ParaStyle -Giesskanne SFX2_HID_TEMPLDLG_WATERCAN -AusSelektion SFX2_HID_TEMPLDLG_NEWBYEXAMPLE -Aktualisieren SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE -Vorlagenliste SFX2_HID_TEMPLATE_FMT -Gruppenliste SFX2_HID_TEMPLATE_FILTER - -*GifOptionen filter.ModalDialog.17401 -Interlace filter.CheckBox.17401.1 -TransparentSpeichern filter.CheckBox.17401.2 +*Gallerybeamer sym:.uno:Beamer +Anzeige sym:SVX_HID_GALLERY_WINDOW + +*Gestalter sym:.uno:DesignerDialog +TBGestalterRight sym:SFX2_HID_TEMPLDLG_TOOLBOX_RIGHT +TBGestalter sym:SFX2_HID_TEMPLDLG_TOOLBOX_LEFT +Absatzvorlagen sym:.uno:ParaStyle +Zeichenvorlagen sym:.uno:CharStyle +Rahmenvorlagen sym:.uno:FrameStyle +Seitenvorlagen sym:.uno:PageStyle +Grafikvorlagen sym:.uno:ParaStyle +Praesentationsvorlagen sym:.uno:ListStyle +Numerierungsvorlagen sym:.uno:ListStyle +Zellvorlagen sym:.uno:ParaStyle +Giesskanne sym:SFX2_HID_TEMPLDLG_WATERCAN +AusSelektion sym:SFX2_HID_TEMPLDLG_NEWBYEXAMPLE +Aktualisieren sym:SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE +Vorlagenliste sym:SFX2_HID_TEMPLATE_FMT +Gruppenliste sym:SFX2_HID_TEMPLATE_FILTER + +*GifOptionen sym:filter.ModalDialog.17401 +Interlace sym:filter.CheckBox.17401.1 +TransparentSpeichern sym:filter.CheckBox.17401.2 *GridControlDialogStarter ACTIVE ShowGridcontrol sym:showGridcontrol @@ -489,99 +489,99 @@ ShowGridcontrol sym:showGridcontrol *GridControlDialog sym:gridcontroldialog gridcontrolcontrol sym:gridcontrolself -*GroupingDlg SC_HID_SC_DPDATEGROUP -AutoStart sc.RadioButton.25739.1 -ManualStart sc.RadioButton.25739.2 -StartContent sc.Edit.25739.1 -AutoEnd sc.RadioButton.25739.3 -ManualEnd sc.RadioButton.25739.4 -EndContent sc.Edit.25739.2 -NumberOfDays sc.RadioButton.25740.5 -DaysNumber sc.NumericField.25740.4 -Intervals sc.RadioButton.25740.6 -IntervalsList SC_HID_SC_DPDATEGROUP_LB -GroupBy sc.Edit.25739.3 - -*GroupingNumDlg SC_HID_SC_DPNUMGROUP -AutoStart sc.RadioButton.25739.1 -ManualStart sc.RadioButton.25739.2 -StartContent sc.Edit.25739.1 -AutoEnd sc.RadioButton.25739.3 -ManualEnd sc.RadioButton.25739.4 -EndContent sc.Edit.25739.2 -GroupBy sc.Edit.25739.3 - -*GruppierungAufheben .uno:Ungroup -Zeilen SC_HID_SC_GROUP_ROWS -Spalten SC_HID_SC_GROUP_COLS - -*GruppierungAktivieren .uno:Group -Zeilen SC_HID_SC_GROUP_ROWS -Spalten SC_HID_SC_GROUP_COLS - -*HorizontaleLinieEinfuegen SW_HID_RULER_DIALOG -Auswahl SW_HID_VS_RULER - -*HTMLExport1 SD_HID_SD_HTMLEXPORT_PAGE1 -NeuesDesign sd.RadioButton.739.3 -ExistierendesDesign sd.RadioButton.739.4 -DesignLoeschen sd.PushButton.739.6 -DesignListe sd.ListBox.739.5 -Weiter sd.PushButton.739.201 -Zurueck sd.PushButton.739.200 - -*HTMLExport2 SD_HID_SD_HTMLEXPORT_PAGE2 -Standard sd.RadioButton.739.22 -Frames sd.RadioButton.739.23 -Automatisch sd.RadioButton.739.24 -WebCast sd.RadioButton.739.25 -ASP sd.RadioButton.739.41 -PERL sd.RadioButton.739.42 -BeamerURL sd.Edit.739.44 -PraesentationURL sd.Edit.739.46 -ScriptURL sd.Edit.739.48 -TitelseiteErzeugen sd.CheckBox.739.31 -NotizenAnzeigen sd.CheckBox.739.32 -Weiter sd.PushButton.739.201 -Zurueck sd.PushButton.739.200 - -*HTMLExport3 SD_HID_SD_HTMLEXPORT_PAGE3 -PNG sd.RadioButton.739.51 -GIF sd.RadioButton.739.52 -JPG sd.RadioButton.739.53 -Kompressionswert sd.ComboBox.739.55 -NiedrigeAufloesung sd.RadioButton.739.57 -MittlereAufloesung sd.RadioButton.739.58 -HoheAufloesung sd.RadioButton.739.59 -KlaengeExportieren sd.CheckBox.739.61 -Weiter sd.PushButton.739.201 -Zurueck sd.PushButton.739.200 - -*HTMLExport4 SD_HID_SD_HTMLEXPORT_PAGE4 -Autor sd.Edit.739.68 -EMail sd.Edit.739.70 -Homepage sd.Edit.739.72 -LinkAufKopie sd.CheckBox.739.75 -AdditionalInformation sd.MultiLineEdit.739.74 -Weiter sd.PushButton.739.201 -Zurueck sd.PushButton.739.200 - -*HTMLExport5 SD_HID_SD_HTMLEXPORT_PAGE5 -NurText sd.CheckBox.739.82 -Weiter sd.PushButton.739.201 -Zurueck sd.PushButton.739.200 - -*HTMLExport6 SD_HID_SD_HTMLEXPORT_PAGE6 -FarbenAusDok sd.RadioButton.739.109 -BrowserFarben sd.RadioButton.739.102 -EigeneFarben sd.RadioButton.739.103 -Hintergrund sd.PushButton.739.104 -Text sd.PushButton.739.105 -Hyperlink sd.PushButton.739.106 -GesichteterLink sd.PushButton.739.107 -AktiverLink sd.PushButton.739.108 -Weiter sd.PushButton.739.201 -Zurueck sd.PushButton.739.200 - -*HTMLDesign SD_HID_SD_HTMLEXPORT_DLG_DNAME -Designname sd.Edit.740.3 +*GroupingDlg sym:SC_HID_SC_DPDATEGROUP +AutoStart sym:sc.RadioButton.25739.1 +ManualStart sym:sc.RadioButton.25739.2 +StartContent sym:sc.Edit.25739.1 +AutoEnd sym:sc.RadioButton.25739.3 +ManualEnd sym:sc.RadioButton.25739.4 +EndContent sym:sc.Edit.25739.2 +NumberOfDays sym:sc.RadioButton.25740.5 +DaysNumber sym:sc.NumericField.25740.4 +Intervals sym:sc.RadioButton.25740.6 +IntervalsList sym:SC_HID_SC_DPDATEGROUP_LB +GroupBy sym:sc.Edit.25739.3 + +*GroupingNumDlg sym:SC_HID_SC_DPNUMGROUP +AutoStart sym:sc.RadioButton.25739.1 +ManualStart sym:sc.RadioButton.25739.2 +StartContent sym:sc.Edit.25739.1 +AutoEnd sym:sc.RadioButton.25739.3 +ManualEnd sym:sc.RadioButton.25739.4 +EndContent sym:sc.Edit.25739.2 +GroupBy sym:sc.Edit.25739.3 + +*GruppierungAufheben sym:.uno:Ungroup +Zeilen sym:SC_HID_SC_GROUP_ROWS +Spalten sym:SC_HID_SC_GROUP_COLS + +*GruppierungAktivieren sym:.uno:Group +Zeilen sym:SC_HID_SC_GROUP_ROWS +Spalten sym:SC_HID_SC_GROUP_COLS + +*HorizontaleLinieEinfuegen sym:SW_HID_RULER_DIALOG +Auswahl sym:SW_HID_VS_RULER + +*HTMLExport1 sym:SD_HID_SD_HTMLEXPORT_PAGE1 +NeuesDesign sym:sd.RadioButton.739.3 +ExistierendesDesign sym:sd.RadioButton.739.4 +DesignLoeschen sym:sd.PushButton.739.6 +DesignListe sym:sd.ListBox.739.5 +Weiter sym:sd.PushButton.739.201 +Zurueck sym:sd.PushButton.739.200 + +*HTMLExport2 sym:SD_HID_SD_HTMLEXPORT_PAGE2 +Standard sym:sd.RadioButton.739.22 +Frames sym:sd.RadioButton.739.23 +Automatisch sym:sd.RadioButton.739.24 +WebCast sym:sd.RadioButton.739.25 +ASP sym:sd.RadioButton.739.41 +PERL sym:sd.RadioButton.739.42 +BeamerURL sym:sd.Edit.739.44 +PraesentationURL sym:sd.Edit.739.46 +ScriptURL sym:sd.Edit.739.48 +TitelseiteErzeugen sym:sd.CheckBox.739.31 +NotizenAnzeigen sym:sd.CheckBox.739.32 +Weiter sym:sd.PushButton.739.201 +Zurueck sym:sd.PushButton.739.200 + +*HTMLExport3 sym:SD_HID_SD_HTMLEXPORT_PAGE3 +PNG sym:sd.RadioButton.739.51 +GIF sym:sd.RadioButton.739.52 +JPG sym:sd.RadioButton.739.53 +Kompressionswert sym:sd.ComboBox.739.55 +NiedrigeAufloesung sym:sd.RadioButton.739.57 +MittlereAufloesung sym:sd.RadioButton.739.58 +HoheAufloesung sym:sd.RadioButton.739.59 +KlaengeExportieren sym:sd.CheckBox.739.61 +Weiter sym:sd.PushButton.739.201 +Zurueck sym:sd.PushButton.739.200 + +*HTMLExport4 sym:SD_HID_SD_HTMLEXPORT_PAGE4 +Autor sym:sd.Edit.739.68 +EMail sym:sd.Edit.739.70 +Homepage sym:sd.Edit.739.72 +LinkAufKopie sym:sd.CheckBox.739.75 +AdditionalInformation sym:sd.MultiLineEdit.739.74 +Weiter sym:sd.PushButton.739.201 +Zurueck sym:sd.PushButton.739.200 + +*HTMLExport5 sym:SD_HID_SD_HTMLEXPORT_PAGE5 +NurText sym:sd.CheckBox.739.82 +Weiter sym:sd.PushButton.739.201 +Zurueck sym:sd.PushButton.739.200 + +*HTMLExport6 sym:SD_HID_SD_HTMLEXPORT_PAGE6 +FarbenAusDok sym:sd.RadioButton.739.109 +BrowserFarben sym:sd.RadioButton.739.102 +EigeneFarben sym:sd.RadioButton.739.103 +Hintergrund sym:sd.PushButton.739.104 +Text sym:sd.PushButton.739.105 +Hyperlink sym:sd.PushButton.739.106 +GesichteterLink sym:sd.PushButton.739.107 +AktiverLink sym:sd.PushButton.739.108 +Weiter sym:sd.PushButton.739.201 +Zurueck sym:sd.PushButton.739.200 + +*HTMLDesign sym:SD_HID_SD_HTMLEXPORT_DLG_DNAME +Designname sym:sd.Edit.740.3 diff --git a/testautomation/global/win/dial_i_o.win b/testautomation/global/win/dial_i_o.win index 221e7e2d0b47..822b6b4d4634 100644 --- a/testautomation/global/win/dial_i_o.win +++ b/testautomation/global/win/dial_i_o.win @@ -1,121 +1,121 @@ -*ImageMapEditor svx.ModelessDialog.10450 -TB_ImagemapEditor SVX_HID_IMAPDLG_TOOLBOX -Zuweisen SVX_HID_IMAPDLG_APPLY -Oeffnen SVX_HID_IMAPDLG_OPEN -Speichern SVX_HID_IMAPDLG_SAVEAS -Auswahl SVX_HID_IMAPDLG_SELECT -Rechteck SVX_HID_IMAPDLG_RECT -Ellipse SVX_HID_IMAPDLG_CIRCLE -Polygon SVX_HID_IMAPDLG_POLY -Freihandpolygon SVX_HID_IMAPDLG_FREEPOLY -Punktebearbeiten SVX_HID_IMAPDLG_POLYEDIT -Punkteverschieben SVX_HID_IMAPDLG_POLYMOVE -Punkteeinfuegen SVX_HID_IMAPDLG_POLYINSERT -Punkteloeschen SVX_HID_IMAPDLG_POLYDELETE -Rueckgaengig SVX_HID_IMAPDLG_UNDO -Wiederholen SVX_HID_IMAPDLG_REDO -Aktiv SVX_HID_IMAPDLG_ACTIVE -Makro SVX_HID_IMAPDLG_MACRO -Eigenschaften SVX_HID_IMAPDLG_PROPERTY -BearbeitenImageMap .uno:ImageMapDialog -Beschreibung svx.Edit.10450.1 -Dokument SVX_HID_IMAPDLG_GRAPHWND -Adresse .uno:OpenUrl -BearbeitenText svx.Edit.10450.1 - -*ImageMapHyperlink cui.ModalDialog.10102 -URL cui.Edit.10102.2 -Alternativetext cui.Edit.10102.1 -Frame cui.ComboBox.10102.1 -Name cui.Edit.10102.3 -Description cui.MultiLineEdit.10102.4 - -*IndividuellePraesentation .uno:CustomShowDialog +*ImageMapEditor sym:svx.ModelessDialog.10450 +TB_ImagemapEditor sym:SVX_HID_IMAPDLG_TOOLBOX +Zuweisen sym:SVX_HID_IMAPDLG_APPLY +Oeffnen sym:SVX_HID_IMAPDLG_OPEN +Speichern sym:SVX_HID_IMAPDLG_SAVEAS +Auswahl sym:SVX_HID_IMAPDLG_SELECT +Rechteck sym:SVX_HID_IMAPDLG_RECT +Ellipse sym:SVX_HID_IMAPDLG_CIRCLE +Polygon sym:SVX_HID_IMAPDLG_POLY +Freihandpolygon sym:SVX_HID_IMAPDLG_FREEPOLY +Punktebearbeiten sym:SVX_HID_IMAPDLG_POLYEDIT +Punkteverschieben sym:SVX_HID_IMAPDLG_POLYMOVE +Punkteeinfuegen sym:SVX_HID_IMAPDLG_POLYINSERT +Punkteloeschen sym:SVX_HID_IMAPDLG_POLYDELETE +Rueckgaengig sym:SVX_HID_IMAPDLG_UNDO +Wiederholen sym:SVX_HID_IMAPDLG_REDO +Aktiv sym:SVX_HID_IMAPDLG_ACTIVE +Makro sym:SVX_HID_IMAPDLG_MACRO +Eigenschaften sym:SVX_HID_IMAPDLG_PROPERTY +BearbeitenImageMap sym:.uno:ImageMapDialog +Beschreibung sym:svx.Edit.10450.1 +Dokument sym:SVX_HID_IMAPDLG_GRAPHWND +Adresse sym:.uno:OpenUrl +BearbeitenText sym:svx.Edit.10450.1 + +*ImageMapHyperlink sym:cui.ModalDialog.10102 +URL sym:cui.Edit.10102.2 +Alternativetext sym:cui.Edit.10102.1 +Frame sym:cui.ComboBox.10102.1 +Name sym:cui.Edit.10102.3 +Description sym:cui.MultiLineEdit.10102.4 + +*IndividuellePraesentation sym:.uno:CustomShowDialog Neu SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_NEW Bearbeiten SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_EDIT Loeschen SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_REMOVE Kopieren SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_COPY Starten SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_STARTSHOW IndividuellePraesentationBenutzen SD:CHECKBOX:DLG_CUSTOMSHOW:CBX_USE_CUSTOMSHOW -CustomSlideShowList sd.ListBox.843.1 +CustomSlideShowList sym:sd.ListBox.843.1 -*IndividuellePraesentationDefinieren SD_HID_DLG_DEFINE_CUSTOMSHOW +*IndividuellePraesentationDefinieren sym:SD_HID_DLG_DEFINE_CUSTOMSHOW PraesentationName SD:EDIT:DLG_DEFINE_CUSTOMSHOW:EDT_NAME SeitenPraesentation SD:MULTILISTBOX:DLG_DEFINE_CUSTOMSHOW:LB_PAGES -SelectedSlides SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL +SelectedSlides sym:SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL Hinzufuegen SD:PUSHBUTTON:DLG_DEFINE_CUSTOMSHOW:BTN_ADD Entfernen SD:PUSHBUTTON:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE -*InfofelderBearbeiten SFX2_HID_DOCINFO_EDT -Name0 sfx2.Edit.266.5 -Name1 sfx2.Edit.266.7 -Name2 sfx2.Edit.266.9 -Name3 sfx2.Edit.266.11 +*InfofelderBearbeiten sym:SFX2_HID_DOCINFO_EDT +Name0 sym:sfx2.Edit.266.5 +Name1 sym:sfx2.Edit.266.7 +Name2 sym:sfx2.Edit.266.9 +Name3 sym:sfx2.Edit.266.11 -*InfonamenBearbeiten SFX2_HID_DOCINFO_EDT -Namen1 sfx2.Edit.266.5 -Namen2 sfx2.Edit.266.7 -Namen3 sfx2.Edit.266.9 -Namen4 sfx2.Edit.266.11 +*InfonamenBearbeiten sym:SFX2_HID_DOCINFO_EDT +Namen1 sym:sfx2.Edit.266.5 +Namen2 sym:sfx2.Edit.266.7 +Namen3 sym:sfx2.Edit.266.9 +Namen4 sym:sfx2.Edit.266.11 -*InhaltEinfuegen CUI_HID_PASTE_DLG +*InhaltEinfuegen sym:CUI_HID_PASTE_DLG AlsSymbol cui:CHECKBOX:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON AndersSymbol cui:PUSHBUTTON:MD_PASTE_OBJECT:PB_CHANGE_ICON VerknuepfungMit cui:RADIOBUTTON:MD_PASTE_OBJECT:RB_PASTE_LINK -Auswahl cui.ListBox.32001.7 -EinfuegenAls cui.RadioButton.32001.20 - -*InhalteEinfuegenCalc .uno:InsertContents -AllesEinfuegen sc.CheckBox.25618.20 -Zeichenketten sc.CheckBox.25618.21 -Zahlen sc.CheckBox.25618.22 -DatumZeit sc.CheckBox.25618.23 -Formeln sc.CheckBox.25618.24 -Notizen sc.CheckBox.25618.26 -Formate sc.CheckBox.25618.25 -Objects sc.CheckBox.25618.41 -LeerzellenUeberspringen sc.CheckBox.25618.33 -Transponieren sc.CheckBox.25618.34 -Verknuepfen sc.CheckBox.25618.35 -Keine sc.RadioButton.25618.27 -Addieren sc.RadioButton.25618.28 -Subtrahieren sc.RadioButton.25618.29 -Multiplizieren sc.RadioButton.25618.30 -Dividieren sc.RadioButton.25618.31 +Auswahl sym:cui.ListBox.32001.7 +EinfuegenAls sym:cui.RadioButton.32001.20 + +*InhalteEinfuegenCalc sym:.uno:InsertContents +AllesEinfuegen sym:sc.CheckBox.25618.20 +Zeichenketten sym:sc.CheckBox.25618.21 +Zahlen sym:sc.CheckBox.25618.22 +DatumZeit sym:sc.CheckBox.25618.23 +Formeln sym:sc.CheckBox.25618.24 +Notizen sym:sc.CheckBox.25618.26 +Formate sym:sc.CheckBox.25618.25 +Objects sym:sc.CheckBox.25618.41 +LeerzellenUeberspringen sym:sc.CheckBox.25618.33 +Transponieren sym:sc.CheckBox.25618.34 +Verknuepfen sym:sc.CheckBox.25618.35 +Keine sym:sc.RadioButton.25618.27 +Addieren sym:sc.RadioButton.25618.28 +Subtrahieren sym:sc.RadioButton.25618.29 +Multiplizieren sym:sc.RadioButton.25618.30 +Dividieren sym:sc.RadioButton.25618.31 NichtVerschieben SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE NachUnten SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN NachRechts SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT -*InhalteLoeschen .uno:Delete -Alles sc.CheckBox.25617.10 -Zeichenketten sc.CheckBox.25617.11 -Zahlen sc.CheckBox.25617.12 -DatumZeit sc.CheckBox.25617.13 -Formeln sc.CheckBox.25617.14 -Notizen sc.CheckBox.25617.16 -Formate sc.CheckBox.25617.15 -Objekte sc.CheckBox.25617.17 - -*InPolygonUmwandeln SD_HID_VECTORIZE_DLG -Farbanzahl sd.NumericField.654.1 -Punktreduktion sd.MetricField.654.3 -LoecherFuellen sd.CheckBox.654.1 -Kachelgroesse sd.MetricField.654.4 -Vorschau sd.PushButton.654.1 +*InhalteLoeschen sym:.uno:Delete +Alles sym:sc.CheckBox.25617.10 +Zeichenketten sym:sc.CheckBox.25617.11 +Zahlen sym:sc.CheckBox.25617.12 +DatumZeit sym:sc.CheckBox.25617.13 +Formeln sym:sc.CheckBox.25617.14 +Notizen sym:sc.CheckBox.25617.16 +Formate sym:sc.CheckBox.25617.15 +Objekte sym:sc.CheckBox.25617.17 + +*InPolygonUmwandeln sym:SD_HID_VECTORIZE_DLG +Farbanzahl sym:sd.NumericField.654.1 +Punktreduktion sym:sd.MetricField.654.3 +LoecherFuellen sym:sd.CheckBox.654.1 +Kachelgroesse sym:sd.MetricField.654.4 +Vorschau sym:sd.PushButton.654.1 +Interaktion TabInteraktion -*JPEGOptionen svtools.ModalDialog.16481 -Qualitaet svtools.NumericField.16481.1 -Graustufen svtools.RadioButton.16481.1 -Echtfarben svtools.RadioButton.16481.2 +*JPEGOptionen sym:svtools.ModalDialog.16481 +Qualitaet sym:svtools.NumericField.16481.1 +Graustufen sym:svtools.RadioButton.16481.1 +Echtfarben sym:svtools.RadioButton.16481.2 -*Kommentar CUI_HID_REDLINING_DLG -KommentarText CUI_HID_REDLINING_EDIT -Zurueck CUI_HID_REDLINING_PREV -Vor CUI_HID_REDLINING_NEXT +*Kommentar sym:CUI_HID_REDLINING_DLG +KommentarText sym:CUI_HID_REDLINING_EDIT +Zurueck sym:CUI_HID_REDLINING_PREV +Vor sym:CUI_HID_REDLINING_NEXT -*Konsolidieren .uno:DataConsolidate +*Konsolidieren sym:.uno:DataConsolidate Berechnungsvorschrift SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_FUNC Konsolidierungsbereiche SC:MULTILISTBOX:RID_SCDLG_CONSOLIDATE:LB_CONSAREAS Quelldatenbereich SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_DATA_AREA @@ -131,133 +131,133 @@ Loeschen SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_REMOVE Hinzufuegen SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_ADD Zusaetze SC:MOREBUTTON:RID_SCDLG_CONSOLIDATE:BTN_MORE -*KonturEditor svx.FloatingWindow.10461 -Zuweisen SVX_HID_CONTDLG_APPLY -Arbeitsbereich SVX_HID_CONTDLG_WORKPLACE -Auswahl SVX_HID_CONTDLG_SELECT -Rechteck SVX_HID_CONTDLG_RECT -Ellipse SVX_HID_CONTDLG_CIRCLE -Polygon SVX_HID_CONTDLG_POLY -PunkteBearbeiten SVX_HID_CONTDLG_POLYEDIT -PunkteVerschieben SVX_HID_CONTDLG_POLYMOVE -PunkteEinfuegen SVX_HID_CONTDLG_POLYINSERT -PunkteLoeschen SVX_HID_CONTDLG_POLYDELETE -Autokontur SVX_HID_CONTDLG_AUTOCONTOUR -Widerrufen SVX_HID_CONTDLG_UNDO -Wiederholen SVX_HID_CONTDLG_REDO -Pipette SVX_HID_CONTDLG_PIPETTE -Toleranz svx.MetricField.10461.1 - -*KopfFusszeilenSeitenvorlageStandard .uno:EditHeaderAndFooter - -*Linienenden SVX_HID_POPUP_LINEEND -Auswahl SVX_HID_POPUP_LINEEND_CTRL - -*Linienstil CUI_HID_DLG_MESSBOX -Aendern cui.PushButton.10063.1 -Hinzufuegen cui.PushButton.10063.2 - -*LinksFuellen .uno:FillLeft - -*LiteratureintragEinfuegen .uno:InsertAuthoritiesEntry -EintragErzeugen SW_HID_INSERT_AUTH_MRK_CREATE_ENTRY -EintragEinfuegen SW_HID_INSERT_AUTH_MRK_OK -EintragSchliessen SW_HID_INSERT_AUTH_MRK_CLOSE -EintragBearbeiten SW_HID_INSERT_AUTH_MRK_EDIT_ENTRY -AusLiteraturdatenbank SW_HID_AUTH_MARK_DLG_FROM_COMP_RB -AusDokumentinhalt SW_HID_AUTH_MARK_DLG_FROM_DOC_RB -Kurzbezeichnung SW_HID_AUTH_MARK_DLG_ID_LISTBOX - -*LiteratureintragDefinieren SW_HID_DLG_CREATE_AUTH_ENTRY -Kurzbezeichnung SW_HID_AUTH_FIELD_IDENTIFIER -Typ SW_HID_AUTH_FIELD_AUTHORITY_TYPE -Autor SW_HID_AUTH_FIELD_AUTHOR -Titel SW_HID_AUTH_FIELD_TITLE -Erscheinungsjahr SW_HID_AUTH_FIELD_YEAR -Verlag SW_HID_AUTH_FIELD_PUBLISHER -Verlagsadresse SW_HID_AUTH_FIELD_ADDRESS -ISBN SW_HID_AUTH_FIELD_ISBN -Kapitel SW_HID_AUTH_FIELD_CHAPTER -Seiten SW_HID_AUTH_FIELD_PAGES -Herausgeber SW_HID_AUTH_FIELD_EDITOR -Ausgabe SW_HID_AUTH_FIELD_EDITION -Buchtitel SW_HID_AUTH_FIELD_BOOKTITLE -NummerDesBandes SW_HID_AUTH_FIELD_VOLUME -Ausgabeart SW_HID_AUTH_FIELD_HOWPUBLISHED -Organisation SW_HID_AUTH_FIELD_ORGANIZATIONS -Institution SW_HID_AUTH_FIELD_INSTITUTION -Hochschule SW_HID_AUTH_FIELD_SCHOOL -ArtDesBerichts SW_HID_AUTH_FIELD_REPORT_TYPE -Monat SW_HID_AUTH_FIELD_MONTH -Zeitschrift SW_HID_AUTH_FIELD_JOURNAL -Nummer SW_HID_AUTH_FIELD_NUMBER -NameDerSerie SW_HID_AUTH_FIELD_SERIES -Anmerkung SW_HID_AUTH_FIELD_ANNOTE -Notiz SW_HID_AUTH_FIELD_NOTE -URL SW_HID_AUTH_FIELD_URL -Benutzerfeld1 SW_HID_AUTH_FIELD_CUSTOM1 -Benutzerfeld2 SW_HID_AUTH_FIELD_CUSTOM2 -Benutzerfeld3 SW_HID_AUTH_FIELD_CUSTOM3 -Benutzerfeld4 SW_HID_AUTH_FIELD_CUSTOM4 -Benutzerfeld5 SW_HID_AUTH_FIELD_CUSTOM5 - -*Loeschbestaetigung svtools.ModalDialog.16376 -Ja svtools.PushButton.16376.4 -Alle svtools.PushButton.16376.6 -Nein svtools.PushButton.16376.5 - -*Makro basctl.ModalDialog.14900 -Makroname basctl.Edit.14900.5 -Makroliste BASCTL_HID_BASICIDE_MACROS -MakroAus BASCTL_HID_BASICIDE_LIBS -Beschreibung basctl.MultiLineEdit.14900.16 -Ausfuehren basctl.PushButton.14900.8 -Speichern basctl.PushButton.14900.8 -Zuordnen basctl.PushButton.14900.13 -Bearbeiten basctl.PushButton.14900.10 -Loeschen basctl.PushButton.14900.12 -Neu basctl.PushButton.14900.12 -Verwalten basctl.PushButton.14900.11 -NewLibrary basctl.PushButton.14900.19 -NewModule basctl.PushButton.14900.20 - -*MakroOptionen basctl.ModalDialog.14905 -Beschreibung basctl.MultiLineEdit.14905.7 -HilfeIdentifikation basctl.NumericField.14905.10 -HilfeDateiname basctl.Edit.14905.12 - -*MakroZuweisen cui.TabPage.10303 -Ereignis CUI_HID_MACRO_LB_EVENT -Bereich CUI_HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP -Makroname CUI_HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS -Zuweisen cui.PushButton.10303.3 -Aufheben cui.PushButton.10303.4 -Scripttyp cui.ListBox.10303.8 - -*Massstab .uno:Zoom -Optimal cui.RadioButton.10000.15 -GanzeSeite cui.RadioButton.10000.16 -Seitenbreite cui.RadioButton.10000.17 -Vergroesserung100 cui.RadioButton.10000.18 -VergroesserungStufenlos cui.RadioButton.10000.19 -Stufenlos cui.MetricField.10000.20 -Automatic cui.RadioButton.10000.22 -Singlepage cui.RadioButton.10000.23 -Columns cui.RadioButton.10000.24 -Columnsfield cui.MetricField.10000.25 -Bookmode cui.CheckBox.10000.26 - -*MassstabSeitenansicht SW_HID_PPREV_ZOOM -Spalten sw.NumericField.20601.4 -Zeilen sw.NumericField.20601.5 - -*Mehrfachoperationen .uno:TableOperationDialog -Formeln sc.Edit.25662.1 -Zeile sc.Edit.25662.2 -Spalte sc.Edit.25662.3 -Vorgaben1 sc.ImageButton.25662.1 -Vorgaben2 sc.ImageButton.25662.2 -Vorgaben3 sc.ImageButton.25662.3 +*KonturEditor sym:svx.FloatingWindow.10461 +Zuweisen sym:SVX_HID_CONTDLG_APPLY +Arbeitsbereich sym:SVX_HID_CONTDLG_WORKPLACE +Auswahl sym:SVX_HID_CONTDLG_SELECT +Rechteck sym:SVX_HID_CONTDLG_RECT +Ellipse sym:SVX_HID_CONTDLG_CIRCLE +Polygon sym:SVX_HID_CONTDLG_POLY +PunkteBearbeiten sym:SVX_HID_CONTDLG_POLYEDIT +PunkteVerschieben sym:SVX_HID_CONTDLG_POLYMOVE +PunkteEinfuegen sym:SVX_HID_CONTDLG_POLYINSERT +PunkteLoeschen sym:SVX_HID_CONTDLG_POLYDELETE +Autokontur sym:SVX_HID_CONTDLG_AUTOCONTOUR +Widerrufen sym:SVX_HID_CONTDLG_UNDO +Wiederholen sym:SVX_HID_CONTDLG_REDO +Pipette sym:SVX_HID_CONTDLG_PIPETTE +Toleranz sym:svx.MetricField.10461.1 + +*KopfFusszeilenSeitenvorlageStandard sym:.uno:EditHeaderAndFooter + +*Linienenden sym:SVX_HID_POPUP_LINEEND +Auswahl sym:SVX_HID_POPUP_LINEEND_CTRL + +*Linienstil sym:CUI_HID_DLG_MESSBOX +Aendern sym:cui.PushButton.10063.1 +Hinzufuegen sym:cui.PushButton.10063.2 + +*LinksFuellen sym:.uno:FillLeft + +*LiteratureintragEinfuegen sym:.uno:InsertAuthoritiesEntry +EintragErzeugen sym:SW_HID_INSERT_AUTH_MRK_CREATE_ENTRY +EintragEinfuegen sym:SW_HID_INSERT_AUTH_MRK_OK +EintragSchliessen sym:SW_HID_INSERT_AUTH_MRK_CLOSE +EintragBearbeiten sym:SW_HID_INSERT_AUTH_MRK_EDIT_ENTRY +AusLiteraturdatenbank sym:SW_HID_AUTH_MARK_DLG_FROM_COMP_RB +AusDokumentinhalt sym:SW_HID_AUTH_MARK_DLG_FROM_DOC_RB +Kurzbezeichnung sym:SW_HID_AUTH_MARK_DLG_ID_LISTBOX + +*LiteratureintragDefinieren sym:SW_HID_DLG_CREATE_AUTH_ENTRY +Kurzbezeichnung sym:SW_HID_AUTH_FIELD_IDENTIFIER +Typ sym:SW_HID_AUTH_FIELD_AUTHORITY_TYPE +Autor sym:SW_HID_AUTH_FIELD_AUTHOR +Titel sym:SW_HID_AUTH_FIELD_TITLE +Erscheinungsjahr sym:SW_HID_AUTH_FIELD_YEAR +Verlag sym:SW_HID_AUTH_FIELD_PUBLISHER +Verlagsadresse sym:SW_HID_AUTH_FIELD_ADDRESS +ISBN sym:SW_HID_AUTH_FIELD_ISBN +Kapitel sym:SW_HID_AUTH_FIELD_CHAPTER +Seiten sym:SW_HID_AUTH_FIELD_PAGES +Herausgeber sym:SW_HID_AUTH_FIELD_EDITOR +Ausgabe sym:SW_HID_AUTH_FIELD_EDITION +Buchtitel sym:SW_HID_AUTH_FIELD_BOOKTITLE +NummerDesBandes sym:SW_HID_AUTH_FIELD_VOLUME +Ausgabeart sym:SW_HID_AUTH_FIELD_HOWPUBLISHED +Organisation sym:SW_HID_AUTH_FIELD_ORGANIZATIONS +Institution sym:SW_HID_AUTH_FIELD_INSTITUTION +Hochschule sym:SW_HID_AUTH_FIELD_SCHOOL +ArtDesBerichts sym:SW_HID_AUTH_FIELD_REPORT_TYPE +Monat sym:SW_HID_AUTH_FIELD_MONTH +Zeitschrift sym:SW_HID_AUTH_FIELD_JOURNAL +Nummer sym:SW_HID_AUTH_FIELD_NUMBER +NameDerSerie sym:SW_HID_AUTH_FIELD_SERIES +Anmerkung sym:SW_HID_AUTH_FIELD_ANNOTE +Notiz sym:SW_HID_AUTH_FIELD_NOTE +URL sym:SW_HID_AUTH_FIELD_URL +Benutzerfeld1 sym:SW_HID_AUTH_FIELD_CUSTOM1 +Benutzerfeld2 sym:SW_HID_AUTH_FIELD_CUSTOM2 +Benutzerfeld3 sym:SW_HID_AUTH_FIELD_CUSTOM3 +Benutzerfeld4 sym:SW_HID_AUTH_FIELD_CUSTOM4 +Benutzerfeld5 sym:SW_HID_AUTH_FIELD_CUSTOM5 + +*Loeschbestaetigung sym:svtools.ModalDialog.16376 +Ja sym:svtools.PushButton.16376.4 +Alle sym:svtools.PushButton.16376.6 +Nein sym:svtools.PushButton.16376.5 + +*Makro sym:basctl.ModalDialog.14900 +Makroname sym:basctl.Edit.14900.5 +Makroliste sym:BASCTL_HID_BASICIDE_MACROS +MakroAus sym:BASCTL_HID_BASICIDE_LIBS +Beschreibung sym:basctl.MultiLineEdit.14900.16 +Ausfuehren sym:basctl.PushButton.14900.8 +Speichern sym:basctl.PushButton.14900.8 +Zuordnen sym:basctl.PushButton.14900.13 +Bearbeiten sym:basctl.PushButton.14900.10 +Loeschen sym:basctl.PushButton.14900.12 +Neu sym:basctl.PushButton.14900.12 +Verwalten sym:basctl.PushButton.14900.11 +NewLibrary sym:basctl.PushButton.14900.19 +NewModule sym:basctl.PushButton.14900.20 + +*MakroOptionen sym:basctl.ModalDialog.14905 +Beschreibung sym:basctl.MultiLineEdit.14905.7 +HilfeIdentifikation sym:basctl.NumericField.14905.10 +HilfeDateiname sym:basctl.Edit.14905.12 + +*MakroZuweisen sym:cui.TabPage.10303 +Ereignis sym:CUI_HID_MACRO_LB_EVENT +Bereich sym:CUI_HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP +Makroname sym:CUI_HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS +Zuweisen sym:cui.PushButton.10303.3 +Aufheben sym:cui.PushButton.10303.4 +Scripttyp sym:cui.ListBox.10303.8 + +*Massstab sym:.uno:Zoom +Optimal sym:cui.RadioButton.10000.15 +GanzeSeite sym:cui.RadioButton.10000.16 +Seitenbreite sym:cui.RadioButton.10000.17 +Vergroesserung100 sym:cui.RadioButton.10000.18 +VergroesserungStufenlos sym:cui.RadioButton.10000.19 +Stufenlos sym:cui.MetricField.10000.20 +Automatic sym:cui.RadioButton.10000.22 +Singlepage sym:cui.RadioButton.10000.23 +Columns sym:cui.RadioButton.10000.24 +Columnsfield sym:cui.MetricField.10000.25 +Bookmode sym:cui.CheckBox.10000.26 + +*MassstabSeitenansicht sym:SW_HID_PPREV_ZOOM +Spalten sym:sw.NumericField.20601.4 +Zeilen sym:sw.NumericField.20601.5 + +*Mehrfachoperationen sym:.uno:TableOperationDialog +Formeln sym:sc.Edit.25662.1 +Zeile sym:sc.Edit.25662.2 +Spalte sym:sc.Edit.25662.3 +Vorgaben1 sym:sc.ImageButton.25662.1 +Vorgaben2 sym:sc.ImageButton.25662.2 +Vorgaben3 sym:sc.ImageButton.25662.3 *MetOptionen FILTER:MODALDIALOG:DLG_EXPORT_EMET Original FILTER:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL @@ -265,186 +265,186 @@ Groesse FILTER:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE Breite FILTER:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX Hoehe FILTER:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY -*ModuleBearbeiten CUI_HID_EDIT_MODULES -Sprache cui.ListBox.10831.319 -Module CUI_HID_CLB_EDIT_MODULES_MODULES -PrioPLus cui.PushButton.10831.309 -PrioMinus cui.PushButton.10831.310 -Zurueck cui.PushButton.10831.311 -Benutzerwoerterbuch CUI_HID_CLB_EDIT_MODULES_DICS +*ModuleBearbeiten sym:CUI_HID_EDIT_MODULES +Sprache sym:cui.ListBox.10831.319 +Module sym:CUI_HID_CLB_EDIT_MODULES_MODULES +PrioPLus sym:cui.PushButton.10831.309 +PrioMinus sym:cui.PushButton.10831.310 +Zurueck sym:cui.PushButton.10831.311 +Benutzerwoerterbuch sym:CUI_HID_CLB_EDIT_MODULES_DICS -*DescriptionObject CUI_HID_DLG_OBJECT_TITLE_DESC -DescriptionTitle cui.Edit.10067.3 -DescriptionText cui.MultiLineEdit.10067.4 +*DescriptionObject sym:CUI_HID_DLG_OBJECT_TITLE_DESC +DescriptionTitle sym:cui.Edit.10067.3 +DescriptionText sym:cui.MultiLineEdit.10067.4 -*NameDlg CUI_HID_DLG_NAME -Eingabefeld cui.Edit.10062.1 +*NameDlg sym:CUI_HID_DLG_NAME +Eingabefeld sym:cui.Edit.10062.1 +LinieName NameDlg -*NameDlgObject CUI_HID_DLG_OBJECT_NAME -NameField cui.Edit.10064.2 +*NameDlgObject sym:CUI_HID_DLG_OBJECT_NAME +NameField sym:cui.Edit.10064.2 +NameDlgGroup NameDlg -NameField SW_HID_FORMAT_NAME_OBJECT_NAME +NameField sym:SW_HID_FORMAT_NAME_OBJECT_NAME +NameDlgPage NameDlg -NameField SD_HID_SD_NAMEDIALOG_PAGE +NameField sym:SD_HID_SD_NAMEDIALOG_PAGE +NameDlgLineEnd NameDlg -NameField SD_HID_SD_NAMEDIALOG_LINEEND +NameField sym:SD_HID_SD_NAMEDIALOG_LINEEND +NameDlgGroupCalc NameDlg -NameField SC_HID_SC_DRAW_RENAME - -*NamenEinfuegen .uno:InsertName -NamenAuswahl sc.ListBox.25676.11 -Liste sc.PushButton.25676.105 - -*NamenErzeugen .uno:CreateNames -Kopfzeile sc.CheckBox.25677.4 -LinkerSpalte sc.CheckBox.25677.2 -Fusszeile sc.CheckBox.25677.5 -RechterSpalte sc.CheckBox.25677.3 - -*NamenFestlegen .uno:DefineName -BereichsName sc.ComboBox.25626.12 -ZugeordnetZu sc.Edit.25626.15 -Filter sc.CheckBox.25626.31 -Druckbereich sc.CheckBox.25626.32 -Wiederholungsspalte sc.CheckBox.25626.33 -Wiederholungszeile sc.CheckBox.25626.34 -Hinzufuegen sc.PushButton.25626.3 -Aendern sc.PushButton.25626.3 -Loeschen sc.PushButton.25626.4 -Zusaetze sc.MoreButton.25626.6 -ZugeordnetZuButton sc.ImageButton.25626.16 - -*NavigationsFenster SW_HID_INSERT_CTRL -Auswahl SW_HID_NAVI_VS - -*Navigator .uno:Navigator - -*NavigatorCalc SC_HID_SC_NAVIGATOR -NavigatorToolboxCalc SC_HID_SC_NAVIPI_TOOLBOX -Spalte SC_HID_SC_NAVIPI_COL -Zeile SC_HID_SC_NAVIPI_ROW -Liste SC_HID_SC_NAVIPI_ENTRIES -Dokumente SC_HID_SC_NAVIPI_DOC -Datenbereich SC_HID_SC_NAVIPI_DATA -Anfang SC_HID_SC_NAVIPI_UP -Ende SC_HID_SC_NAVIPI_DOWN -Inhalte SC_HID_SC_NAVIPI_ZOOM -Umschalten SC_HID_SC_NAVIPI_ROOT -Szenarien SC_HID_SC_NAVIPI_SCEN -Dragmodus SC_HID_SC_NAVIPI_DROP -SzenarioEdit SC_HID_SC_SCENWIN_TOP -SzenarioListe SC_HID_SC_SCENWIN_BOTTOM - -*NavigatorDraw SD_HID_SD_NAVIGATOR -NavigatorToolboxDraw SD_HID_SD_NAVIGATOR_TBX -Stift SD_HID_SD_NAVIGATOR_TBI_PEN -Erste SD_HID_SD_NAVIGATOR_TBI_FIRST -Vorherige SD_HID_SD_NAVIGATOR_TBI_PREV -Naechste SD_HID_SD_NAVIGATOR_TBI_NEXT -Letzte SD_HID_SD_NAVIGATOR_TBI_LAST -Dragmodus SD_HID_SD_NAVIGATOR_TBI_DRAGTYPE -Liste SD_HID_SD_NAVIGATOR_TLB -Dokumentliste SD_HID_SD_NAVIGATOR_LB - -*NavigatorWriter SW_HID_NAVIGATION_PI -Auswahlliste SW_HID_NAVIGATOR_TREELIST -Dokumentliste SW_HID_NAVIGATOR_LISTBOX -Toolbox SW_HID_NAVIGATOR_TOOLBOX -Umschalten SW_HID_NAVI_TBX17 -Navigation SW_HID_NAVI_TBX24 -Seitennummer SW_HID_NAVI_TBX16 -VorherigeSeite SW_HID_NAVI_TBX2 -NaechsteSeite SW_HID_NAVI_TBX3 -Dragmodus SW_HID_NAVI_TBX4 -KapitelHoch SW_HID_NAVI_TBX5 -KapitelRunter SW_HID_NAVI_TBX6 -Auswahlbox SW_HID_NAVI_TBX7 -Inhaltsansicht SW_HID_NAVI_TBX8 -Merker SW_HID_NAVI_TBX9 -Kopfzeile SW_HID_NAVI_TBX10 -Fusszeile SW_HID_NAVI_TBX11 -AnkerText SW_HID_NAVI_TBX12 -Ebenen SW_HID_NAVI_TBX13 -Hoch SW_HID_NAVI_TBX14 -Senken SW_HID_NAVI_TBX15 - -*NavigatorGlobaldoc SW_HID_NAVIGATION_PI -Auswahlliste SW_HID_NAVIGATOR_TREELIST -Liste SW_HID_NAVIGATOR_GLOB_TREELIST -Umschalten SW_HID_NAVI_TBX17 -Bearbeiten SW_HID_NAVI_TBX18 -Aktualisieren SW_HID_NAVI_TBX19 -Einfuegen SW_HID_NAVI_TBX20 -InhalteMitspeichern SW_HID_NAVI_TBX21 -GlobaldokumentToolbox SW_HID_NAVIGATOR_GLOBAL_TOOLBOX -NachUntenVerschieben SW_HID_NAVI_TBX22 -NachObenVerschieben SW_HID_NAVI_TBX23 -Inhaltsansicht SW_HID_NAVI_TBX8 - -*Neu .uno:NewDoc -Bereiche sfx2.ListBox.2053.21 -Vorlagen sfx2.ListBox.2053.52 -Zusaetze sfx2.MoreButton.2053.32 -Vorschau sfx2.CheckBox.2053.51 -Titel sfx2.Edit.2053.56 -Thema sfx2.Edit.2053.55 -Schluesselworte sfx2.Edit.2053.61 -Beschreibung sfx2.MultiLineEdit.2053.71 -Text sfx2.CheckBox.2053.33 -Frame sfx2.CheckBox.2053.34 -Pages sfx2.CheckBox.2053.35 -Numbering sfx2.CheckBox.2053.36 -Overwrite sfx2.CheckBox.2053.37 -Fromfile sfx2.PushButton.2053.38 - -*NeueBibliothek basctl.ModalDialog.14892 -Bibliotheksname basctl.Edit.14892.41 - -*NeuerDialog basctl.ModalDialog.14892 -Dialogname basctl.Edit.14892.41 - -*NeuesFangobjekt .uno:CapturePoint +NameField sym:SC_HID_SC_DRAW_RENAME + +*NamenEinfuegen sym:.uno:InsertName +NamenAuswahl sym:sc.ListBox.25676.11 +Liste sym:sc.PushButton.25676.105 + +*NamenErzeugen sym:.uno:CreateNames +Kopfzeile sym:sc.CheckBox.25677.4 +LinkerSpalte sym:sc.CheckBox.25677.2 +Fusszeile sym:sc.CheckBox.25677.5 +RechterSpalte sym:sc.CheckBox.25677.3 + +*NamenFestlegen sym:.uno:DefineName +BereichsName sym:sc.ComboBox.25626.12 +ZugeordnetZu sym:sc.Edit.25626.15 +Filter sym:sc.CheckBox.25626.31 +Druckbereich sym:sc.CheckBox.25626.32 +Wiederholungsspalte sym:sc.CheckBox.25626.33 +Wiederholungszeile sym:sc.CheckBox.25626.34 +Hinzufuegen sym:sc.PushButton.25626.3 +Aendern sym:sc.PushButton.25626.3 +Loeschen sym:sc.PushButton.25626.4 +Zusaetze sym:sc.MoreButton.25626.6 +ZugeordnetZuButton sym:sc.ImageButton.25626.16 + +*NavigationsFenster sym:SW_HID_INSERT_CTRL +Auswahl sym:SW_HID_NAVI_VS + +*Navigator sym:.uno:Navigator + +*NavigatorCalc sym:SC_HID_SC_NAVIGATOR +NavigatorToolboxCalc sym:SC_HID_SC_NAVIPI_TOOLBOX +Spalte sym:SC_HID_SC_NAVIPI_COL +Zeile sym:SC_HID_SC_NAVIPI_ROW +Liste sym:SC_HID_SC_NAVIPI_ENTRIES +Dokumente sym:SC_HID_SC_NAVIPI_DOC +Datenbereich sym:SC_HID_SC_NAVIPI_DATA +Anfang sym:SC_HID_SC_NAVIPI_UP +Ende sym:SC_HID_SC_NAVIPI_DOWN +Inhalte sym:SC_HID_SC_NAVIPI_ZOOM +Umschalten sym:SC_HID_SC_NAVIPI_ROOT +Szenarien sym:SC_HID_SC_NAVIPI_SCEN +Dragmodus sym:SC_HID_SC_NAVIPI_DROP +SzenarioEdit sym:SC_HID_SC_SCENWIN_TOP +SzenarioListe sym:SC_HID_SC_SCENWIN_BOTTOM + +*NavigatorDraw sym:SD_HID_SD_NAVIGATOR +NavigatorToolboxDraw sym:SD_HID_SD_NAVIGATOR_TBX +Stift sym:SD_HID_SD_NAVIGATOR_TBI_PEN +Erste sym:SD_HID_SD_NAVIGATOR_TBI_FIRST +Vorherige sym:SD_HID_SD_NAVIGATOR_TBI_PREV +Naechste sym:SD_HID_SD_NAVIGATOR_TBI_NEXT +Letzte sym:SD_HID_SD_NAVIGATOR_TBI_LAST +Dragmodus sym:SD_HID_SD_NAVIGATOR_TBI_DRAGTYPE +Liste sym:SD_HID_SD_NAVIGATOR_TLB +Dokumentliste sym:SD_HID_SD_NAVIGATOR_LB + +*NavigatorWriter sym:SW_HID_NAVIGATION_PI +Auswahlliste sym:SW_HID_NAVIGATOR_TREELIST +Dokumentliste sym:SW_HID_NAVIGATOR_LISTBOX +Toolbox sym:SW_HID_NAVIGATOR_TOOLBOX +Umschalten sym:SW_HID_NAVI_TBX17 +Navigation sym:SW_HID_NAVI_TBX24 +Seitennummer sym:SW_HID_NAVI_TBX16 +VorherigeSeite sym:SW_HID_NAVI_TBX2 +NaechsteSeite sym:SW_HID_NAVI_TBX3 +Dragmodus sym:SW_HID_NAVI_TBX4 +KapitelHoch sym:SW_HID_NAVI_TBX5 +KapitelRunter sym:SW_HID_NAVI_TBX6 +Auswahlbox sym:SW_HID_NAVI_TBX7 +Inhaltsansicht sym:SW_HID_NAVI_TBX8 +Merker sym:SW_HID_NAVI_TBX9 +Kopfzeile sym:SW_HID_NAVI_TBX10 +Fusszeile sym:SW_HID_NAVI_TBX11 +AnkerText sym:SW_HID_NAVI_TBX12 +Ebenen sym:SW_HID_NAVI_TBX13 +Hoch sym:SW_HID_NAVI_TBX14 +Senken sym:SW_HID_NAVI_TBX15 + +*NavigatorGlobaldoc sym:SW_HID_NAVIGATION_PI +Auswahlliste sym:SW_HID_NAVIGATOR_TREELIST +Liste sym:SW_HID_NAVIGATOR_GLOB_TREELIST +Umschalten sym:SW_HID_NAVI_TBX17 +Bearbeiten sym:SW_HID_NAVI_TBX18 +Aktualisieren sym:SW_HID_NAVI_TBX19 +Einfuegen sym:SW_HID_NAVI_TBX20 +InhalteMitspeichern sym:SW_HID_NAVI_TBX21 +GlobaldokumentToolbox sym:SW_HID_NAVIGATOR_GLOBAL_TOOLBOX +NachUntenVerschieben sym:SW_HID_NAVI_TBX22 +NachObenVerschieben sym:SW_HID_NAVI_TBX23 +Inhaltsansicht sym:SW_HID_NAVI_TBX8 + +*Neu sym:.uno:NewDoc +Bereiche sym:sfx2.ListBox.2053.21 +Vorlagen sym:sfx2.ListBox.2053.52 +Zusaetze sym:sfx2.MoreButton.2053.32 +Vorschau sym:sfx2.CheckBox.2053.51 +Titel sym:sfx2.Edit.2053.56 +Thema sym:sfx2.Edit.2053.55 +Schluesselworte sym:sfx2.Edit.2053.61 +Beschreibung sym:sfx2.MultiLineEdit.2053.71 +Text sym:sfx2.CheckBox.2053.33 +Frame sym:sfx2.CheckBox.2053.34 +Pages sym:sfx2.CheckBox.2053.35 +Numbering sym:sfx2.CheckBox.2053.36 +Overwrite sym:sfx2.CheckBox.2053.37 +Fromfile sym:sfx2.PushButton.2053.38 + +*NeueBibliothek sym:basctl.ModalDialog.14892 +Bibliotheksname sym:basctl.Edit.14892.41 + +*NeuerDialog sym:basctl.ModalDialog.14892 +Dialogname sym:basctl.Edit.14892.41 + +*NeuesFangobjekt sym:.uno:CapturePoint Horizontal SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_HORIZONTAL Vertikal SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_VERTICAL Punkt SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_POINT -X sd.MetricField.312.7 -Y sd.MetricField.312.9 +X sym:sd.MetricField.312.7 +Y sym:sd.MetricField.312.9 -*NeuesModul basctl.ModalDialog.14892 -Modulname basctl.Edit.14892.41 +*NeuesModul sym:basctl.ModalDialog.14892 +Modulname sym:basctl.Edit.14892.41 -*NotizBearbeiten CUI_HID_POSTIT_DIALOG -Texteingabe cui.MultiLineEdit.10008.13 sw:MultiLineEdit:DLG_POSTIT:ED_EDIT -Autor cui.PushButton.10008.17 sw:PushButton:DLG_POSTIT:BTN_AUTHOR +*NotizBearbeiten sym:CUI_HID_POSTIT_DIALOG +Texteingabe sym:cui.MultiLineEdit.10008.13 sw:MultiLineEdit:DLG_POSTIT:ED_EDIT +Autor sym:cui.PushButton.10008.17 sw:PushButton:DLG_POSTIT:BTN_AUTHOR Vor cui:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_NEXT Zurueck cui:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_PREV -*NummernkreisOptionen SW_HID_DLG_SEQUENCE_OPTION -Ebene sw.ListBox.21012.17 -Trenner sw.Edit.21012.19 +*NummernkreisOptionen sym:SW_HID_DLG_SEQUENCE_OPTION +Ebene sym:sw.ListBox.21012.17 +Trenner sym:sw.Edit.21012.19 +NotizEinfuegen NotizBearbeiten +NotizEinfuegenCalc NotizBearbeiten -Text cui.MultiLineEdit.10008.13 +Text sym:cui.MultiLineEdit.10008.13 -*ObenFuellen .uno:FillUp +*ObenFuellen sym:.uno:FillUp -*Objekte basctl.FloatingWindow.14920 -Toolbox BASCTL_HID_BASICIDE_OBJECTS -Zeigen BASCTL_HID_BASICIDE_OBJCAT_SHOW -ObjektListe BASCTL_HID_BASICIDE_OBJECTCAT +*Objekte sym:basctl.FloatingWindow.14920 +Toolbox sym:BASCTL_HID_BASICIDE_OBJECTS +Zeigen sym:BASCTL_HID_BASICIDE_OBJCAT_SHOW +ObjektListe sym:BASCTL_HID_BASICIDE_OBJECTCAT -*ObjekteUmbenennen SW_HID_RENAME_XNAMED -Objektname sw.Edit.20888.2 +*ObjekteUmbenennen sym:SW_HID_RENAME_XNAMED +Objektname sym:sw.Edit.20888.2 -*OLEObjektEinfuegen .uno:InsertObject +*OLEObjektEinfuegen sym:.uno:InsertObject NeuErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT AusDateiErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE Objekttyp cui:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win index 179cbd1e2284..4e8048b05c2e 100644 --- a/testautomation/global/win/dial_p_s.win +++ b/testautomation/global/win/dial_p_s.win @@ -1,170 +1,170 @@ -*Passwort SFX2_HID_PASSWD -UserName sfx2.Edit.2316.12 -PasswortName sfx2.Edit.2316.14 -PasswortBestaetigen sfx2.Edit.2316.16 - -*PasswordFileOpen UUI_HID_DLG_PASSWORD_UUI -PasswortName uui.Edit.14522.2 - -*PasswordFileSave CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY -Password CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN -PasswordConfirm CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN -PasswordMoreOptions CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE -PasswordFileReadonly CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY -PasswordToModify CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY -PasswordToModifyConfirm CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY - -*PasswortEingeben .uno:ProtectTraceChangeMode -SchutzAufheben SC_HID_CHG_PROTECT -PasswortEingabe sfx2.Edit.2316.12 -PasswortBestaetigen sfx2.Edit.2316.16 - -*PBMOptionen filter.ModalDialog.17409 -Binaer filter.RadioButton.17409.1 -Ascii filter.RadioButton.17409.2 - -*PfadeAuswaehlen CUI_HID_MULTIPATH -Pfade CUI_HID_OPTIONS_MULTIPATH_LIST +*Passwort sym:SFX2_HID_PASSWD +UserName sym:sfx2.Edit.2316.12 +PasswortName sym:sfx2.Edit.2316.14 +PasswortBestaetigen sym:sfx2.Edit.2316.16 + +*PasswordFileOpen sym:UUI_HID_DLG_PASSWORD_UUI +PasswortName sym:uui.Edit.14522.2 + +*PasswordFileSave sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY +Password sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN +PasswordConfirm sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_OPEN +PasswordMoreOptions sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_MORE +PasswordFileReadonly sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY +PasswordToModify sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY +PasswordToModifyConfirm sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY + +*PasswortEingeben sym:.uno:ProtectTraceChangeMode +SchutzAufheben sym:SC_HID_CHG_PROTECT +PasswortEingabe sym:sfx2.Edit.2316.12 +PasswortBestaetigen sym:sfx2.Edit.2316.16 + +*PBMOptionen sym:filter.ModalDialog.17409 +Binaer sym:filter.RadioButton.17409.1 +Ascii sym:filter.RadioButton.17409.2 + +*PfadeAuswaehlen sym:CUI_HID_MULTIPATH +Pfade sym:CUI_HID_OPTIONS_MULTIPATH_LIST Hinzufuegen cui:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH Loeschen cui:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH -*PGMOptionen filter.ModalDialog.17410 -Binaer filter.RadioButton.17410.1 -Ascii filter.RadioButton.17410.2 - -*PICTOPtionen filter.ModalDialog.17400 -Original filter.RadioButton.17400.1 -Groesse filter.RadioButton.17400.2 -Breite filter.MetricField.17400.1 -Hoehe filter.MetricField.17400.2 - -*Pipette .uno:BmpMask svx:DockingWindow:RID_SVXDLG_BMPMASK -PipetteKnopf SVX_HID_BMPMASK_TBI_PIPETTE -Farbfeld SVX_HID_BMPMASK_CTL_PIPETTE -Ersetzen svx.PushButton.10420.1 -Quellfarbe1 svx.CheckBox.10420.1 -Quellfarbe2 svx.CheckBox.10420.4 -Quellfarbe3 svx.CheckBox.10420.3 -Quellfarbe4 svx.CheckBox.10420.2 -Toleranz1 svx.MetricField.10420.2 -Toleranz2 svx.MetricField.10420.4 -Toleranz3 svx.MetricField.10420.1 -Toleranz4 svx.MetricField.10420.3 -ErsetzenDurch1 svx.ListBox.10420.1 -ErsetzenDurch2 svx.ListBox.10420.2 -ErsetzenDurch3 svx.ListBox.10420.3 -ErsetzenDurch4 svx.ListBox.10420.4 -ErsetzenDurch5 svx.ListBox.10420.5 -Tranzparenz svx.CheckBox.10420.5 - -*PivotFilter SC_HID_SC_PIVOTFILTER -Operator1 sc.ListBox.25637.27 -Operator2 sc.ListBox.25637.28 -FieldName1 sc.ListBox.25637.24 -FieldName2 sc.ListBox.25637.25 -FieldName3 sc.ListBox.25637.26 -Condition1 sc.ListBox.25637.29 -Condition2 sc.ListBox.25637.30 -Condition3 sc.ListBox.25637.31 -Value1 sc.ComboBox.25637.32 -Value2 sc.ComboBox.25637.33 -Value3 sc.ComboBox.25637.34 -More sc.MoreButton.25637.1 -CaseSensitive sc.CheckBox.25637.2 -RegularExpression sc.CheckBox.25637.3 -NoDuplication sc.CheckBox.25637.1 - -*PlugInEinfuegen .uno:InsertPlugin +*PGMOptionen sym:filter.ModalDialog.17410 +Binaer sym:filter.RadioButton.17410.1 +Ascii sym:filter.RadioButton.17410.2 + +*PICTOPtionen sym:filter.ModalDialog.17400 +Original sym:filter.RadioButton.17400.1 +Groesse sym:filter.RadioButton.17400.2 +Breite sym:filter.MetricField.17400.1 +Hoehe sym:filter.MetricField.17400.2 + +*Pipette sym:.uno:BmpMask svx:DockingWindow:RID_SVXDLG_BMPMASK +PipetteKnopf sym:SVX_HID_BMPMASK_TBI_PIPETTE +Farbfeld sym:SVX_HID_BMPMASK_CTL_PIPETTE +Ersetzen sym:svx.PushButton.10420.1 +Quellfarbe1 sym:svx.CheckBox.10420.1 +Quellfarbe2 sym:svx.CheckBox.10420.4 +Quellfarbe3 sym:svx.CheckBox.10420.3 +Quellfarbe4 sym:svx.CheckBox.10420.2 +Toleranz1 sym:svx.MetricField.10420.2 +Toleranz2 sym:svx.MetricField.10420.4 +Toleranz3 sym:svx.MetricField.10420.1 +Toleranz4 sym:svx.MetricField.10420.3 +ErsetzenDurch1 sym:svx.ListBox.10420.1 +ErsetzenDurch2 sym:svx.ListBox.10420.2 +ErsetzenDurch3 sym:svx.ListBox.10420.3 +ErsetzenDurch4 sym:svx.ListBox.10420.4 +ErsetzenDurch5 sym:svx.ListBox.10420.5 +Tranzparenz sym:svx.CheckBox.10420.5 + +*PivotFilter sym:SC_HID_SC_PIVOTFILTER +Operator1 sym:sc.ListBox.25637.27 +Operator2 sym:sc.ListBox.25637.28 +FieldName1 sym:sc.ListBox.25637.24 +FieldName2 sym:sc.ListBox.25637.25 +FieldName3 sym:sc.ListBox.25637.26 +Condition1 sym:sc.ListBox.25637.29 +Condition2 sym:sc.ListBox.25637.30 +Condition3 sym:sc.ListBox.25637.31 +Value1 sym:sc.ComboBox.25637.32 +Value2 sym:sc.ComboBox.25637.33 +Value3 sym:sc.ComboBox.25637.34 +More sym:sc.MoreButton.25637.1 +CaseSensitive sym:sc.CheckBox.25637.2 +RegularExpression sym:sc.CheckBox.25637.3 +NoDuplication sym:sc.CheckBox.25637.1 + +*PlugInEinfuegen sym:.uno:InsertPlugin DateiUrl cui:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL Durchsuchen cui:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL Optionen cui:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS -*PNGOptionen svtools.ModalDialog.16486 -Kompression svtools.NumericField.16486.1 -Interlaced svtools.CheckBox.16486.1 - -*PPMOptionen filter.ModalDialog.17411 -Binaer filter.RadioButton.17411.1 -Ascii filter.RadioButton.17411.2 - -*QuelleAuswaehlen SC_HID_DATAPILOT_TYPE -AktuelleSelektion sc.RadioButton.25733.4 -AngemeldeteDatenquelle sc.RadioButton.25733.5 -ExterneQuelle sc.RadioButton.25733.6 - -*Rechtschreibung CUI_HID_SPELLCHECK -Original CUI_HID_SPELLDLG_SETWORD -Ersetzen CUI_HID_SPLDLG_BUTTON_CHANGE -AlleErsetzen CUI_HID_SPLDLG_BUTTON_CHANGEALL -Ignorieren CUI_HID_SPLDLG_BUTTON_IGNORE -AlleIgnorieren CUI_HID_SPLDLG_BUTTON_IGNOREALL -Sprache cui.ListBox.10032.36 -RechtschreibungSchliessen CUI_HID_SPLDLG_BUTTON_CLOSE - -*Redlining SW_HID_REDLINE_ACCEPT -TabControl SVX_HID_REDLINING_TABCONTROL -TabListe SVX_HID_REDLINING_VIEW_PAGE -Liste SVX_HID_REDLINING_VIEW_DG_VIEW -ListItem SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE -Akzeptieren SVX_HID_REDLINING_VIEW_PB_ACCEPT -AlleAkzeptieren SVX_HID_REDLINING_VIEW_PB_ACCEPTALL -Ablehnen SVX_HID_REDLINING_VIEW_PB_REJECT -AlleAblehnen SVX_HID_REDLINING_VIEW_PB_REJECTALL -Undo SVX_HID_REDLINING_VIEW_PB_UNDO - -TabFilter SVX_HID_REDLINING_FILTER_PAGE cui:TABPAGE:SID_REDLIN_FILTER_PAGE -Datum SVX_HID_REDLINING_FILTER_CB_DATE cui:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE -DatumListe SVX_HID_REDLINING_FILTER_LB_DATE cui:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE -Datum1 SVX_HID_REDLINING_FILTER_DF_DATE cui:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE -Zeit1 SVX_HID_REDLINING_FILTER_TF_DATE cui:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE -Aktuell1 SVX_HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK -Datum2 SVX_HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 -Zeit2 SVX_HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 -Aktuell2 SVX_HID_REDLINING_FILTER_IB_CLOCK2 SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 -Autor SVX_HID_REDLINING_FILTER_CB_AUTOR SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_AUTOR -AutoListe SVX_HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AUTOR -Bereich SVX_HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE -BereichText SVX_HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE -Button SVX_HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF -Aktion SVX_HID_REDLINING_FILTER_CB_ACTION SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_ACTION -Aktionsliste SVX_HID_REDLINING_FILTER_LB_ACTION SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_ACTION -Comment SVX_HID_REDLINING_FILTER_CB_COMMENT SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_COMMENT -CommentText SVX_HID_REDLINING_FILTER_ED_COMMENT SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:ED_COMMENT - -*ReiheFuellen .uno:FillSeries -Oben sc.RadioButton.25623.4 -Unten sc.RadioButton.25623.5 -Rechts sc.RadioButton.25623.3 -Links sc.RadioButton.25623.2 -Arithmetisch sc.RadioButton.25623.12 -Geometrisch sc.RadioButton.25623.13 -Datum sc.RadioButton.25623.14 -AutoAusfuellen sc.RadioButton.25623.15 -Tag sc.RadioButton.25623.22 -WochenTag sc.RadioButton.25623.23 -Monat sc.RadioButton.25623.24 -Jahr sc.RadioButton.25623.25 -StartWert sc.Edit.25623.52 -EndWert sc.Edit.25623.49 -Inkrement sc.Edit.25623.39 +*PNGOptionen sym:svtools.ModalDialog.16486 +Kompression sym:svtools.NumericField.16486.1 +Interlaced sym:svtools.CheckBox.16486.1 + +*PPMOptionen sym:filter.ModalDialog.17411 +Binaer sym:filter.RadioButton.17411.1 +Ascii sym:filter.RadioButton.17411.2 + +*QuelleAuswaehlen sym:SC_HID_DATAPILOT_TYPE +AktuelleSelektion sym:sc.RadioButton.25733.4 +AngemeldeteDatenquelle sym:sc.RadioButton.25733.5 +ExterneQuelle sym:sc.RadioButton.25733.6 + +*Rechtschreibung sym:CUI_HID_SPELLCHECK +Original sym:CUI_HID_SPELLDLG_SETWORD +Ersetzen sym:CUI_HID_SPLDLG_BUTTON_CHANGE +AlleErsetzen sym:CUI_HID_SPLDLG_BUTTON_CHANGEALL +Ignorieren sym:CUI_HID_SPLDLG_BUTTON_IGNORE +AlleIgnorieren sym:CUI_HID_SPLDLG_BUTTON_IGNOREALL +Sprache sym:cui.ListBox.10032.36 +RechtschreibungSchliessen sym:CUI_HID_SPLDLG_BUTTON_CLOSE + +*Redlining sym:SW_HID_REDLINE_ACCEPT +TabControl sym:SVX_HID_REDLINING_TABCONTROL +TabListe sym:SVX_HID_REDLINING_VIEW_PAGE +Liste sym:SVX_HID_REDLINING_VIEW_DG_VIEW +ListItem sym:SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE +Akzeptieren sym:SVX_HID_REDLINING_VIEW_PB_ACCEPT +AlleAkzeptieren sym:SVX_HID_REDLINING_VIEW_PB_ACCEPTALL +Ablehnen sym:SVX_HID_REDLINING_VIEW_PB_REJECT +AlleAblehnen sym:SVX_HID_REDLINING_VIEW_PB_REJECTALL +Undo sym:SVX_HID_REDLINING_VIEW_PB_UNDO + +TabFilter sym:SVX_HID_REDLINING_FILTER_PAGE cui:TABPAGE:SID_REDLIN_FILTER_PAGE +Datum sym:SVX_HID_REDLINING_FILTER_CB_DATE cui:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE +DatumListe sym:SVX_HID_REDLINING_FILTER_LB_DATE cui:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE +Datum1 sym:SVX_HID_REDLINING_FILTER_DF_DATE cui:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE +Zeit1 sym:SVX_HID_REDLINING_FILTER_TF_DATE cui:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE +Aktuell1 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK +Datum2 sym:SVX_HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 +Zeit2 sym:SVX_HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 +Aktuell2 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK2 SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 +Autor sym:SVX_HID_REDLINING_FILTER_CB_AUTOR SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_AUTOR +AutoListe sym:SVX_HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AUTOR +Bereich sym:SVX_HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE +BereichText sym:SVX_HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE +Button sym:SVX_HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF +Aktion sym:SVX_HID_REDLINING_FILTER_CB_ACTION SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_ACTION +Aktionsliste sym:SVX_HID_REDLINING_FILTER_LB_ACTION SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_ACTION +Comment sym:SVX_HID_REDLINING_FILTER_CB_COMMENT SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_COMMENT +CommentText sym:SVX_HID_REDLINING_FILTER_ED_COMMENT SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:ED_COMMENT + +*ReiheFuellen sym:.uno:FillSeries +Oben sym:sc.RadioButton.25623.4 +Unten sym:sc.RadioButton.25623.5 +Rechts sym:sc.RadioButton.25623.3 +Links sym:sc.RadioButton.25623.2 +Arithmetisch sym:sc.RadioButton.25623.12 +Geometrisch sym:sc.RadioButton.25623.13 +Datum sym:sc.RadioButton.25623.14 +AutoAusfuellen sym:sc.RadioButton.25623.15 +Tag sym:sc.RadioButton.25623.22 +WochenTag sym:sc.RadioButton.25623.23 +Monat sym:sc.RadioButton.25623.24 +Jahr sym:sc.RadioButton.25623.25 +StartWert sym:sc.Edit.25623.52 +EndWert sym:sc.Edit.25623.49 +Inkrement sym:sc.Edit.25623.39 *Schriften STARMATH:MODALDIALOG:RID_FONTDIALOG Schriftart STARMATH:COMBOBOX:RID_FONTDIALOG:1 Fett STARMATH:CHECKBOX:RID_FONTDIALOG:1 Kursiv STARMATH:CHECKBOX:RID_FONTDIALOG:2 -*Schriftarten .uno:ChangeFont -Variablen starmath.ListBox.20004.1 -Funktionen starmath.ListBox.20004.2 -Zahlen starmath.ListBox.20004.3 -Text starmath.ListBox.20004.4 -Serif starmath.ListBox.20004.5 -Sans starmath.ListBox.20004.6 -Fixed starmath.ListBox.20004.7 -Aendern starmath.MenuButton.20004.1 -Standard starmath.PushButton.20004.2 - -*Schriftgroessen .uno:ChangeFontSize +*Schriftarten sym:.uno:ChangeFont +Variablen sym:starmath.ListBox.20004.1 +Funktionen sym:starmath.ListBox.20004.2 +Zahlen sym:starmath.ListBox.20004.3 +Text sym:starmath.ListBox.20004.4 +Serif sym:starmath.ListBox.20004.5 +Sans sym:starmath.ListBox.20004.6 +Fixed sym:starmath.ListBox.20004.7 +Aendern sym:starmath.MenuButton.20004.1 +Standard sym:starmath.PushButton.20004.2 + +*Schriftgroessen sym:.uno:ChangeFontSize BasisGroesse STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:1 TextGroesse STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:4 Indizes STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:5 @@ -176,194 +176,194 @@ Standard STARMATH:PUSHBUTTON:RID_FONTSIZEDIALOG:1 *ScriptEinfuegen SW:MODALDIALOG:DLG_JAVAEDIT Scripttyp SW:EDIT:DLG_JAVAEDIT:ED_TYPE HierDerText SW:MULTILINEEDIT:DLG_JAVAEDIT:ED_EDIT -ScriptURL sw.RadioButton.21110.19 -ScriptURLText sw.Edit.21110.20 -ScriptURLWaehlen sw.PushButton.21110.21 -ScriptText sw.RadioButton.21110.12 -NaechstesScript sw.ImageButton.21110.16 -VorherigesScript sw.ImageButton.21110.15 - -*SeiteEinfuegen .uno:InsertPage -AutoLayout SD_HID_SD_CTL_NEWFOIL -Hintergrund SD_HID_SD_CHGFOIL_BACKGROUND -ObjekteAufDemHintergund SD_HID_SD_CHGFOIL_OBJECTS - -*SeitenLayout .uno:ModifyPage -AutoLayout SD_HID_SD_CHGFOIL_LAYOUT -Hintergrund SD_HID_SD_CHGFOIL_BACKGROUND -SeitenName SD_HID_SD_CHGFOIL_NAME -ObjekteAufDemHintergrund SD_HID_SD_CHGFOIL_OBJECTS - -*SeitenObjekteEinfuegen SD_HID_DLG_INSERT_PAGES_OBJS -Verknuepfung sd.CheckBox.938.1 -DeleteUnusedBackgrounds sd.CheckBox.938.2 -InsertObjectsList SD_HID_SD_PAGEOBJSTLB - -*Seitenvorlage .uno:PresentationLayout -Laden sd.PushButton.868.2 -HintergrundseiteAustauschen sd.CheckBox.868.1 -DeleteUnusedBackgrounds sd.CheckBox.868.2 - -*SeitenvorlageLaden SW_HID_FILEDLG_LOADTEMPLATE -Bereiche sfx2.ListBox.2053.21 -Beschreibung sfx2.MultiLineEdit.2053.71 -Schluesselworte sfx2.Edit.2053.61 -Thema sfx2.Edit.2053.55 -Titel sfx2.Edit.2053.56 -Vorlagen sfx2.ListBox.2053.52 -Vorschau sfx2.CheckBox.2053.51 -Zusaetze sfx2.MoreButton.2053.32 - -*Serienbrief .uno:MergeDialog -DatensaetzeAlle sw.RadioButton.22758.2 -DatensaetzeMarkiert sw.RadioButton.22758.3 -DatensaetzeVonBis sw.RadioButton.22758.4 -Von sw.NumericField.22758.5 -Bis sw.NumericField.22758.7 -Drucker sw.RadioButton.22758.11 -Mailing sw.RadioButton.22758.12 -AlsDatei sw.RadioButton.22758.23 -DateiButton sw.PushButton.22758.26 -Pfadeingabe sw.Edit.22758.25 -EinzelneDruckjobserzeugen sw.CheckBox.22758.18 -Adressfeld sw.ListBox.22758.14 -Anhaenge sw.Edit.22758.33 -AnhaengeAuswahl sw.PushButton.22758.34 -Betreff sw.Edit.22758.16 -FormatHTML sw.CheckBox.22758.21 -FormatRTF sw.CheckBox.22758.22 -FormatStarWriter sw.CheckBox.22758.20 -Datenbankfeldliste sw.ListBox.22758.30 - -*Sonderzeichen .uno:InsertSymbol -Schrift cui.ListBox.10010.12 -SchriftListe CUI_HID_CHARMAP_CTL_SHOWSET -Loeschen cui.PushButton.10010.20 -Zeichenanzeige CUI_HID_CHARMAP_CTL_SHOWCHAR -Textanzeige CUI_HID_CHARMAP_CTL_SHOWTEXT -Subset cui.ListBox.10010.31 - -*SonstigesJavaabschaltung cui.ModalDialog.10225 -NichtMehrAnzeigen cui.CheckBox.10225.222 - -*Sortieren .uno:SortDialog -Schluessel1 sw.CheckBox.21669.5 -Spalte1 sw.NumericField.21669.6 -Schluesseltyp1 sw.ListBox.21669.7 -Aufsteigend1 sw.RadioButton.21669.18 -Absteigend1 sw.RadioButton.21669.19 -Schluessel2 sw.CheckBox.21669.8 -Spalte2 sw.NumericField.21669.9 -Schluesseltyp2 sw.ListBox.21669.10 -Aufsteigend2 sw.RadioButton.21669.29 -Absteigend2 sw.RadioButton.21669.30 -Schluessel3 sw.CheckBox.21669.11 -Spalte3 sw.NumericField.21669.12 -Aufsteigend3 sw.RadioButton.21669.31 -Absteigend3 sw.RadioButton.21669.32 -Schluesseltyp3 sw.ListBox.21669.13 -Spalten sw.RadioButton.21669.15 -Zeilen sw.RadioButton.21669.16 -Tabulator sw.RadioButton.21669.21 -Zeichen sw.RadioButton.21669.22 -Zeichentext sw.Edit.21669.23 -Sonderzeichen sw.PushButton.21669.34 -Sprache sw.ListBox.21669.36 -ExakterVergleich sw.CheckBox.21669.38 - -*SpalteAusblenden .uno:HideColumn - -*SpalteEinblenden .uno:ShowColumn - -*SpaltenbreiteCalc .uno:ColumnWidth -Breite sc.MetricField.25708.1 HID_SC_MTRIN_VAL -Standardwert sc.CheckBox.25708.1 HID_SC_MTRIN_DEF - -*SpaltenBreite .uno:SetColumnWidth -Spalte sw.NumericField.21456.2 -Breite sw.MetricField.21456.4 - -*Spaltenzuordnung EXTENSIONS_HID_DLG_MAPPING -Kuerzel extensions.ListBox.15701.6 -Literaturart extensions.ListBox.15701.9 -Autor extensions.ListBox.15701.15 -Titel extensions.ListBox.15701.17 -Jahr extensions.ListBox.15701.21 -ISBN extensions.ListBox.15701.23 -Buchtitel extensions.ListBox.15701.25 -Kapitel extensions.ListBox.15701.27 -Ausgabe extensions.ListBox.15701.29 -Herausgeber extensions.ListBox.15701.31 -Ausgabeart extensions.ListBox.15701.33 -Institution extensions.ListBox.15701.35 -Zeitschrift extensions.ListBox.15701.37 -Monat extensions.ListBox.15701.19 -Notiz extensions.ListBox.15701.39 -Anmerkung extensions.ListBox.15701.13 -Nummer extensions.ListBox.15701.41 -Organisation extensions.ListBox.15701.43 -Seiten extensions.ListBox.15701.45 -Verlag extensions.ListBox.15701.47 -Adresse extensions.ListBox.15701.11 -Hochschule extensions.ListBox.15701.49 -Serie extensions.ListBox.15701.51 -ArtDesReport extensions.ListBox.15701.53 -Band extensions.ListBox.15701.55 -URL extensions.ListBox.15701.57 -Benutzerfeld1 extensions.ListBox.15701.59 -Benutzerfeld2 extensions.ListBox.15701.61 -Benutzerfeld3 extensions.ListBox.15701.63 -Benutzerfeld4 extensions.ListBox.15701.65 -Benutzerfeld5 extensions.ListBox.15701.67 - -*SpalteOptimaleBreite .uno:SetOptimalColumnWidth -Extra sc.MetricField.25709.1 HID_SC_MTRIN_VAL -Standardwert sc.CheckBox.25709.1 HID_SC_MTRIN_DEF - -*Spezialfilter .uno:DataFilterSpecialFilter -BefindenBereich sc.ListBox.25613.51 -Befinden sc.Edit.25613.52 -GrossKleinschreibung sc.CheckBox.25613.2 -RegulaererAusdruck sc.CheckBox.25613.3 -BereichEnthaeltSpaltenkoepfe sc.CheckBox.25613.4 -KeineDuplikate sc.CheckBox.25613.1 -Persistent sc.CheckBox.25613.12 -FilterergebnisAusgeben sc.CheckBox.25613.5 -AusgebenBereich sc.ListBox.25613.6 -Ausgeben sc.Edit.25613.7 -Zusaetze sc.MoreButton.25613.1 -FilterkriterienMin sc.ImageButton.25613.53 -FilterergebnisMin sc.ImageButton.25613.8 - -*StandardFilter .uno:DataFilterStandardFilter -FeldName1 sc.ListBox.25612.24 -Feldname2 sc.ListBox.25612.25 -Feldname3 sc.ListBox.25612.26 -Feldname4 sc.ListBox.25612.38 -Bedingung1 sc.ListBox.25612.29 -Bedingung2 sc.ListBox.25612.30 -Bedingung3 sc.ListBox.25612.31 -Bedingung4 sc.ListBox.25612.39 -Wert1 sc.ComboBox.25612.32 -Wert2 sc.ComboBox.25612.33 -Wert3 sc.ComboBox.25612.34 -Wert4 sc.ComboBox.25612.40 -Verknuepfung1 sc.ListBox.25612.27 -Verknuepfung2 sc.ListBox.25612.28 -Verknuepfung3 sc.ListBox.25612.37 -Verknuepfung4 sc.ListBox.25612.42 -Zusaetze sc.MoreButton.25612.1 -GrossKleinschreibung sc.CheckBox.25612.2 -BereicheEnthaeltSpaltenkoepfe sc.CheckBox.25612.4 -RegulaererAusdruck sc.CheckBox.25612.3 -KeineDuplikate sc.CheckBox.25612.1 -FilterergebnisNach sc.CheckBox.25612.5 -AusgebenBereich sc.ListBox.25612.6 -Ausgeben sc.Edit.25612.7 -DialogMin sc.ImageButton.25612.8 -Persistent sc.CheckBox.25612.12 - -*Statusbar FWK_HID_STATUSBAR +ScriptURL sym:sw.RadioButton.21110.19 +ScriptURLText sym:sw.Edit.21110.20 +ScriptURLWaehlen sym:sw.PushButton.21110.21 +ScriptText sym:sw.RadioButton.21110.12 +NaechstesScript sym:sw.ImageButton.21110.16 +VorherigesScript sym:sw.ImageButton.21110.15 + +*SeiteEinfuegen sym:.uno:InsertPage +AutoLayout sym:SD_HID_SD_CTL_NEWFOIL +Hintergrund sym:SD_HID_SD_CHGFOIL_BACKGROUND +ObjekteAufDemHintergund sym:SD_HID_SD_CHGFOIL_OBJECTS + +*SeitenLayout sym:.uno:ModifyPage +AutoLayout sym:SD_HID_SD_CHGFOIL_LAYOUT +Hintergrund sym:SD_HID_SD_CHGFOIL_BACKGROUND +SeitenName sym:SD_HID_SD_CHGFOIL_NAME +ObjekteAufDemHintergrund sym:SD_HID_SD_CHGFOIL_OBJECTS + +*SeitenObjekteEinfuegen sym:SD_HID_DLG_INSERT_PAGES_OBJS +Verknuepfung sym:sd.CheckBox.938.1 +DeleteUnusedBackgrounds sym:sd.CheckBox.938.2 +InsertObjectsList sym:SD_HID_SD_PAGEOBJSTLB + +*Seitenvorlage sym:.uno:PresentationLayout +Laden sym:sd.PushButton.868.2 +HintergrundseiteAustauschen sym:sd.CheckBox.868.1 +DeleteUnusedBackgrounds sym:sd.CheckBox.868.2 + +*SeitenvorlageLaden sym:SW_HID_FILEDLG_LOADTEMPLATE +Bereiche sym:sfx2.ListBox.2053.21 +Beschreibung sym:sfx2.MultiLineEdit.2053.71 +Schluesselworte sym:sfx2.Edit.2053.61 +Thema sym:sfx2.Edit.2053.55 +Titel sym:sfx2.Edit.2053.56 +Vorlagen sym:sfx2.ListBox.2053.52 +Vorschau sym:sfx2.CheckBox.2053.51 +Zusaetze sym:sfx2.MoreButton.2053.32 + +*Serienbrief sym:.uno:MergeDialog +DatensaetzeAlle sym:sw.RadioButton.22758.2 +DatensaetzeMarkiert sym:sw.RadioButton.22758.3 +DatensaetzeVonBis sym:sw.RadioButton.22758.4 +Von sym:sw.NumericField.22758.5 +Bis sym:sw.NumericField.22758.7 +Drucker sym:sw.RadioButton.22758.11 +Mailing sym:sw.RadioButton.22758.12 +AlsDatei sym:sw.RadioButton.22758.23 +DateiButton sym:sw.PushButton.22758.26 +Pfadeingabe sym:sw.Edit.22758.25 +EinzelneDruckjobserzeugen sym:sw.CheckBox.22758.18 +Adressfeld sym:sw.ListBox.22758.14 +Anhaenge sym:sw.Edit.22758.33 +AnhaengeAuswahl sym:sw.PushButton.22758.34 +Betreff sym:sw.Edit.22758.16 +FormatHTML sym:sw.CheckBox.22758.21 +FormatRTF sym:sw.CheckBox.22758.22 +FormatStarWriter sym:sw.CheckBox.22758.20 +Datenbankfeldliste sym:sw.ListBox.22758.30 + +*Sonderzeichen sym:.uno:InsertSymbol +Schrift sym:cui.ListBox.10010.12 +SchriftListe sym:CUI_HID_CHARMAP_CTL_SHOWSET +Loeschen sym:cui.PushButton.10010.20 +Zeichenanzeige sym:CUI_HID_CHARMAP_CTL_SHOWCHAR +Textanzeige sym:CUI_HID_CHARMAP_CTL_SHOWTEXT +Subset sym:cui.ListBox.10010.31 + +*SonstigesJavaabschaltung sym:cui.ModalDialog.10225 +NichtMehrAnzeigen sym:cui.CheckBox.10225.222 + +*Sortieren sym:.uno:SortDialog +Schluessel1 sym:sw.CheckBox.21669.5 +Spalte1 sym:sw.NumericField.21669.6 +Schluesseltyp1 sym:sw.ListBox.21669.7 +Aufsteigend1 sym:sw.RadioButton.21669.18 +Absteigend1 sym:sw.RadioButton.21669.19 +Schluessel2 sym:sw.CheckBox.21669.8 +Spalte2 sym:sw.NumericField.21669.9 +Schluesseltyp2 sym:sw.ListBox.21669.10 +Aufsteigend2 sym:sw.RadioButton.21669.29 +Absteigend2 sym:sw.RadioButton.21669.30 +Schluessel3 sym:sw.CheckBox.21669.11 +Spalte3 sym:sw.NumericField.21669.12 +Aufsteigend3 sym:sw.RadioButton.21669.31 +Absteigend3 sym:sw.RadioButton.21669.32 +Schluesseltyp3 sym:sw.ListBox.21669.13 +Spalten sym:sw.RadioButton.21669.15 +Zeilen sym:sw.RadioButton.21669.16 +Tabulator sym:sw.RadioButton.21669.21 +Zeichen sym:sw.RadioButton.21669.22 +Zeichentext sym:sw.Edit.21669.23 +Sonderzeichen sym:sw.PushButton.21669.34 +Sprache sym:sw.ListBox.21669.36 +ExakterVergleich sym:sw.CheckBox.21669.38 + +*SpalteAusblenden sym:.uno:HideColumn + +*SpalteEinblenden sym:.uno:ShowColumn + +*SpaltenbreiteCalc sym:.uno:ColumnWidth +Breite sym:sc.MetricField.25708.1 HID_SC_MTRIN_VAL +Standardwert sym:sc.CheckBox.25708.1 HID_SC_MTRIN_DEF + +*SpaltenBreite sym:.uno:SetColumnWidth +Spalte sym:sw.NumericField.21456.2 +Breite sym:sw.MetricField.21456.4 + +*Spaltenzuordnung sym:EXTENSIONS_HID_DLG_MAPPING +Kuerzel sym:extensions.ListBox.15701.6 +Literaturart sym:extensions.ListBox.15701.9 +Autor sym:extensions.ListBox.15701.15 +Titel sym:extensions.ListBox.15701.17 +Jahr sym:extensions.ListBox.15701.21 +ISBN sym:extensions.ListBox.15701.23 +Buchtitel sym:extensions.ListBox.15701.25 +Kapitel sym:extensions.ListBox.15701.27 +Ausgabe sym:extensions.ListBox.15701.29 +Herausgeber sym:extensions.ListBox.15701.31 +Ausgabeart sym:extensions.ListBox.15701.33 +Institution sym:extensions.ListBox.15701.35 +Zeitschrift sym:extensions.ListBox.15701.37 +Monat sym:extensions.ListBox.15701.19 +Notiz sym:extensions.ListBox.15701.39 +Anmerkung sym:extensions.ListBox.15701.13 +Nummer sym:extensions.ListBox.15701.41 +Organisation sym:extensions.ListBox.15701.43 +Seiten sym:extensions.ListBox.15701.45 +Verlag sym:extensions.ListBox.15701.47 +Adresse sym:extensions.ListBox.15701.11 +Hochschule sym:extensions.ListBox.15701.49 +Serie sym:extensions.ListBox.15701.51 +ArtDesReport sym:extensions.ListBox.15701.53 +Band sym:extensions.ListBox.15701.55 +URL sym:extensions.ListBox.15701.57 +Benutzerfeld1 sym:extensions.ListBox.15701.59 +Benutzerfeld2 sym:extensions.ListBox.15701.61 +Benutzerfeld3 sym:extensions.ListBox.15701.63 +Benutzerfeld4 sym:extensions.ListBox.15701.65 +Benutzerfeld5 sym:extensions.ListBox.15701.67 + +*SpalteOptimaleBreite sym:.uno:SetOptimalColumnWidth +Extra sym:sc.MetricField.25709.1 HID_SC_MTRIN_VAL +Standardwert sym:sc.CheckBox.25709.1 HID_SC_MTRIN_DEF + +*Spezialfilter sym:.uno:DataFilterSpecialFilter +BefindenBereich sym:sc.ListBox.25613.51 +Befinden sym:sc.Edit.25613.52 +GrossKleinschreibung sym:sc.CheckBox.25613.2 +RegulaererAusdruck sym:sc.CheckBox.25613.3 +BereichEnthaeltSpaltenkoepfe sym:sc.CheckBox.25613.4 +KeineDuplikate sym:sc.CheckBox.25613.1 +Persistent sym:sc.CheckBox.25613.12 +FilterergebnisAusgeben sym:sc.CheckBox.25613.5 +AusgebenBereich sym:sc.ListBox.25613.6 +Ausgeben sym:sc.Edit.25613.7 +Zusaetze sym:sc.MoreButton.25613.1 +FilterkriterienMin sym:sc.ImageButton.25613.53 +FilterergebnisMin sym:sc.ImageButton.25613.8 + +*StandardFilter sym:.uno:DataFilterStandardFilter +FeldName1 sym:sc.ListBox.25612.24 +Feldname2 sym:sc.ListBox.25612.25 +Feldname3 sym:sc.ListBox.25612.26 +Feldname4 sym:sc.ListBox.25612.38 +Bedingung1 sym:sc.ListBox.25612.29 +Bedingung2 sym:sc.ListBox.25612.30 +Bedingung3 sym:sc.ListBox.25612.31 +Bedingung4 sym:sc.ListBox.25612.39 +Wert1 sym:sc.ComboBox.25612.32 +Wert2 sym:sc.ComboBox.25612.33 +Wert3 sym:sc.ComboBox.25612.34 +Wert4 sym:sc.ComboBox.25612.40 +Verknuepfung1 sym:sc.ListBox.25612.27 +Verknuepfung2 sym:sc.ListBox.25612.28 +Verknuepfung3 sym:sc.ListBox.25612.37 +Verknuepfung4 sym:sc.ListBox.25612.42 +Zusaetze sym:sc.MoreButton.25612.1 +GrossKleinschreibung sym:sc.CheckBox.25612.2 +BereicheEnthaeltSpaltenkoepfe sym:sc.CheckBox.25612.4 +RegulaererAusdruck sym:sc.CheckBox.25612.3 +KeineDuplikate sym:sc.CheckBox.25612.1 +FilterergebnisNach sym:sc.CheckBox.25612.5 +AusgebenBereich sym:sc.ListBox.25612.6 +Ausgeben sym:sc.Edit.25612.7 +DialogMin sym:sc.ImageButton.25612.8 +Persistent sym:sc.CheckBox.25612.12 + +*Statusbar sym:FWK_HID_STATUSBAR '*Standardbrowser extensions:ModalDialog:MD_PROTCHK_DIALOG 'StarOfficeVerwenden extensions:RadioButton:MD_PROTCHK_DIALOG:RB_STAROFFICE @@ -374,23 +374,23 @@ Persistent sc.CheckBox.25612.12 +Stylist Gestalter -*SVMOptionen svtools.ModalDialog.16372 -Original svtools.RadioButton.16372.1 -Groesse svtools.RadioButton.16372.2 -Breite svtools.MetricField.16372.1 -Hoehe svtools.MetricField.16372.2 - -*SymboleMath starmath.ModalDialog.20008 -Symbolset starmath.ListBox.20008.1 -Bearbeiten starmath.PushButton.20008.1 -Uebernehmen starmath.PushButton.20008.2 -Symbols STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW - -*SzenarioAnlegen SC:MODALDIALOG:RID_SCDLG_NEWSCENARIO .uno:ScenarioManager -SzenarioName sc.Edit.25643.11 -Kommentar sc.MultiLineEdit.25643.13 +*SVMOptionen sym:svtools.ModalDialog.16372 +Original sym:svtools.RadioButton.16372.1 +Groesse sym:svtools.RadioButton.16372.2 +Breite sym:svtools.MetricField.16372.1 +Hoehe sym:svtools.MetricField.16372.2 + +*SymboleMath sym:starmath.ModalDialog.20008 +Symbolset sym:starmath.ListBox.20008.1 +Bearbeiten sym:starmath.PushButton.20008.1 +Uebernehmen sym:starmath.PushButton.20008.2 +Symbols sym:STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW + +*SzenarioAnlegen SC:MODALDIALOG:RID_SCDLG_NEWSCENARIO sym:.uno:ScenarioManager +SzenarioName sym:sc.Edit.25643.11 +Kommentar sym:sc.MultiLineEdit.25643.13 RahmenAnzeigen SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_SHOWFRAME Rahmenfarbe SC:LISTBOX:RID_SCDLG_NEWSCENARIO:LB_COLOR Zurueckkopieren SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_TWOWAY GanzeTabelle SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_COPYALL -PreventChanges sc.CheckBox.25643.28 +PreventChanges sym:sc.CheckBox.25643.28 diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win index 9ad323b4c43e..4ec6848cd0b0 100644 --- a/testautomation/global/win/dial_t_z.win +++ b/testautomation/global/win/dial_t_z.win @@ -1,148 +1,148 @@ -*TabelleAuftrennen .uno:SplitTable +*TabelleAuftrennen sym:.uno:SplitTable UeberschriftKopieren SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_CNTNT EigeneMitVorlage SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_PARA Eigene SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_NOPARA Keine SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BORDER -*TabelleAusblenden .uno:Hide - -*TabellenFormat SW_HID_FORMAT_TABLE - -*TabelleEinblenden .uno:Show -AusgeblendeteTabelle SC:MULTILISTBOX:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST SC_HID_SC_SELENTRY_LIST - -*TabelleEinfuegenCalc sc.ModalDialog.25646 -Vor sc.RadioButton.25646.11 -Nach sc.RadioButton.25646.12 -Anzahl sc.NumericField.25646.23 -NeuErstellen sc.RadioButton.25646.21 -AusDateiErstellen sc.RadioButton.25646.26 -TabellenName sc.Edit.25646.25 -Auswahl sc.MultiListBox.25646.27 -Verknuepfen sc.CheckBox.25646.29 -Durchsuchen sc.PushButton.25646.28 -Tabellen sc.PushButton.25646.28 - -*TabelleEinfuegenWriter .uno:InsertTable -TabellenName sw.Edit.21450.11 -Spalten sw.NumericField.21450.4 -Zeilen sw.NumericField.21450.5 -UeberschriftWiederholen sw.CheckBox.21450.14 -TabelleNichtTrennen sw.CheckBox.21450.15 -Umrandung sw.CheckBox.21450.16 +*TabelleAusblenden sym:.uno:Hide + +*TabellenFormat sym:SW_HID_FORMAT_TABLE + +*TabelleEinblenden sym:.uno:Show +AusgeblendeteTabelle SC:MULTILISTBOX:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST sym:SC_HID_SC_SELENTRY_LIST + +*TabelleEinfuegenCalc sym:sc.ModalDialog.25646 +Vor sym:sc.RadioButton.25646.11 +Nach sym:sc.RadioButton.25646.12 +Anzahl sym:sc.NumericField.25646.23 +NeuErstellen sym:sc.RadioButton.25646.21 +AusDateiErstellen sym:sc.RadioButton.25646.26 +TabellenName sym:sc.Edit.25646.25 +Auswahl sym:sc.MultiListBox.25646.27 +Verknuepfen sym:sc.CheckBox.25646.29 +Durchsuchen sym:sc.PushButton.25646.28 +Tabellen sym:sc.PushButton.25646.28 + +*TabelleEinfuegenWriter sym:.uno:InsertTable +TabellenName sym:sw.Edit.21450.11 +Spalten sym:sw.NumericField.21450.4 +Zeilen sym:sw.NumericField.21450.5 +UeberschriftWiederholen sym:sw.CheckBox.21450.14 +TabelleNichtTrennen sym:sw.CheckBox.21450.15 +Umrandung sym:sw.CheckBox.21450.16 Autoformat SW:PUSHBUTTON:DLG_INSERT_TABLE:BT_AUTOFORMAT -Ueberschrift sw.CheckBox.21450.13 - -*TabellenFuellen .uno:InsertContents -AuswahlAllesEinfuegen sc.CheckBox.25618.20 -AuswahlZeichenketten sc.CheckBox.25618.21 -AuswahlZahlen sc.CheckBox.25618.22 -AuswahlDatumZeit sc.CheckBox.25618.23 -AuswahlFormeln sc.CheckBox.25618.24 -AuswahlNotizen sc.CheckBox.25618.26 -AuswahlFormate sc.CheckBox.25618.25 -Objects sc.CheckBox.25618.41 -RechenopperationenKeine sc.RadioButton.25618.27 -RechenopperationenAddieren sc.RadioButton.25618.28 -RechenopperationenSubtrahieren sc.RadioButton.25618.29 -RechenopperationenMultiplizieren sc.RadioButton.25618.30 -RechenopperationenDividieren sc.RadioButton.25618.31 -LeerzeilenUeberspringen sc.CheckBox.25618.33 -Verknuepfen sc.CheckBox.25618.35 -Transponieren sc.CheckBox.25618.34 +Ueberschrift sym:sw.CheckBox.21450.13 + +*TabellenFuellen sym:.uno:InsertContents +AuswahlAllesEinfuegen sym:sc.CheckBox.25618.20 +AuswahlZeichenketten sym:sc.CheckBox.25618.21 +AuswahlZahlen sym:sc.CheckBox.25618.22 +AuswahlDatumZeit sym:sc.CheckBox.25618.23 +AuswahlFormeln sym:sc.CheckBox.25618.24 +AuswahlNotizen sym:sc.CheckBox.25618.26 +AuswahlFormate sym:sc.CheckBox.25618.25 +Objects sym:sc.CheckBox.25618.41 +RechenopperationenKeine sym:sc.RadioButton.25618.27 +RechenopperationenAddieren sym:sc.RadioButton.25618.28 +RechenopperationenSubtrahieren sym:sc.RadioButton.25618.29 +RechenopperationenMultiplizieren sym:sc.RadioButton.25618.30 +RechenopperationenDividieren sym:sc.RadioButton.25618.31 +LeerzeilenUeberspringen sym:sc.CheckBox.25618.33 +Verknuepfen sym:sc.CheckBox.25618.35 +Transponieren sym:sc.CheckBox.25618.34 NichtVerschieben SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE NachUnten SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN NachRechts SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT -*TabelleSchuetzen .uno:Protect -Passwort SC_HID_PASSWD_TABLE -Bestaetigung sfx2.Edit.2316.16 -IstVerdeckt sfx2.Edit.2316.12 - -*TabelleUmbenennen .uno:Name -TabellenName SC_HID_SC_RENAME_NAME sc.Edit.25620.10 - -*TabellenVerbinden .uno:MergeTable -MitVorherigerTabelleVerbinden sw.RadioButton.21465.5 -MitNachfolgenderTabelleVerbinden sw.RadioButton.21465.6 - -*TabelleVerschiebenKopieren .uno:Move -InsDokument sc.ListBox.25619.2 -EinfuegenVor sc.ListBox.25619.4 -Kopieren sc.CheckBox.25619.5 - -*TB_SC_Themenauswahl WIZARDS_HID_DLGSTYLES_DIALOG -ThemenListe WIZARDS_HID_DLGSTYLES_LISTBOX -Schliessen WIZARDS_HID_DLGSTYLES_CANCEL -Uebernehmen WIZARDS_HID_DLGSTYLES_OKAY - -*TB_Farbe SVX_HID_POPUP_COLOR -Automatic SVX_HID_POPUP_COLOR_CTRL - -*TB_ImagemapEditor SVX_HID_IMAPDLG_TOOLBOX -Zuweisen SVX_HID_IMAPDLG_APPLY -Oeffnen SVX_HID_IMAPDLG_OPEN -Speichern SVX_HID_IMAPDLG_SAVEAS -Auswahl SVX_HID_IMAPDLG_SELECT -Rechteck SVX_HID_IMAPDLG_RECT -Ellipse SVX_HID_IMAPDLG_CIRCLE -Polygon SVX_HID_IMAPDLG_POLY -Freihandpolygon SVX_HID_IMAPDLG_FREEPOLY -Punktebearbeiten SVX_HID_IMAPDLG_POLYEDIT -Punkteverschieben SVX_HID_IMAPDLG_POLYMOVE -Punkteeinfuegen SVX_HID_IMAPDLG_POLYINSERT -Punkteloeschen SVX_HID_IMAPDLG_POLYDELETE -Rueckgaengig SVX_HID_IMAPDLG_UNDO -Wiederholen SVX_HID_IMAPDLG_REDO -Aktiv SVX_HID_IMAPDLG_ACTIVE -Makro SVX_HID_IMAPDLG_MACRO -Eigenschaften SVX_HID_IMAPDLG_PROPERTY - -*TB_Umrandung SVX_HID_POPUP_FRAME - -*TB_Umrandungsstil SVX_HID_POPUP_LINE - -*TextbausteineUmbenennen SW_HID_RENAME_GLOSSARY +*TabelleSchuetzen sym:.uno:Protect +Passwort sym:SC_HID_PASSWD_TABLE +Bestaetigung sym:sfx2.Edit.2316.16 +IstVerdeckt sym:sfx2.Edit.2316.12 + +*TabelleUmbenennen sym:.uno:Name +TabellenName sym:SC_HID_SC_RENAME_NAME sym:sc.Edit.25620.10 + +*TabellenVerbinden sym:.uno:MergeTable +MitVorherigerTabelleVerbinden sym:sw.RadioButton.21465.5 +MitNachfolgenderTabelleVerbinden sym:sw.RadioButton.21465.6 + +*TabelleVerschiebenKopieren sym:.uno:Move +InsDokument sym:sc.ListBox.25619.2 +EinfuegenVor sym:sc.ListBox.25619.4 +Kopieren sym:sc.CheckBox.25619.5 + +*TB_SC_Themenauswahl sym:WIZARDS_HID_DLGSTYLES_DIALOG +ThemenListe sym:WIZARDS_HID_DLGSTYLES_LISTBOX +Schliessen sym:WIZARDS_HID_DLGSTYLES_CANCEL +Uebernehmen sym:WIZARDS_HID_DLGSTYLES_OKAY + +*TB_Farbe sym:SVX_HID_POPUP_COLOR +Automatic sym:SVX_HID_POPUP_COLOR_CTRL + +*TB_ImagemapEditor sym:SVX_HID_IMAPDLG_TOOLBOX +Zuweisen sym:SVX_HID_IMAPDLG_APPLY +Oeffnen sym:SVX_HID_IMAPDLG_OPEN +Speichern sym:SVX_HID_IMAPDLG_SAVEAS +Auswahl sym:SVX_HID_IMAPDLG_SELECT +Rechteck sym:SVX_HID_IMAPDLG_RECT +Ellipse sym:SVX_HID_IMAPDLG_CIRCLE +Polygon sym:SVX_HID_IMAPDLG_POLY +Freihandpolygon sym:SVX_HID_IMAPDLG_FREEPOLY +Punktebearbeiten sym:SVX_HID_IMAPDLG_POLYEDIT +Punkteverschieben sym:SVX_HID_IMAPDLG_POLYMOVE +Punkteeinfuegen sym:SVX_HID_IMAPDLG_POLYINSERT +Punkteloeschen sym:SVX_HID_IMAPDLG_POLYDELETE +Rueckgaengig sym:SVX_HID_IMAPDLG_UNDO +Wiederholen sym:SVX_HID_IMAPDLG_REDO +Aktiv sym:SVX_HID_IMAPDLG_ACTIVE +Makro sym:SVX_HID_IMAPDLG_MACRO +Eigenschaften sym:SVX_HID_IMAPDLG_PROPERTY + +*TB_Umrandung sym:SVX_HID_POPUP_FRAME + +*TB_Umrandungsstil sym:SVX_HID_POPUP_LINE + +*TextbausteineUmbenennen sym:SW_HID_RENAME_GLOSSARY Name SW:EDIT:DLG_RENAME_GLOS:ED_ON Neu SW:EDIT:DLG_RENAME_GLOS:ED_NN KuerzelAlt SW:EDIT:DLG_RENAME_GLOS:ED_OS KuerzelNeu SW:EDIT:DLG_RENAME_GLOS:ED_NS -*TextInTabelleUmwandeln .uno:ConvertTableText sw:ModalDialog:DLG_CONV_TEXT_TABLE -Tabulator sw.RadioButton.21452.1 -Semikolon sw.RadioButton.21452.3 -Absatz sw.RadioButton.21452.4 +*TextInTabelleUmwandeln sym:.uno:ConvertTableText sw:ModalDialog:DLG_CONV_TEXT_TABLE +Tabulator sym:sw.RadioButton.21452.1 +Semikolon sym:sw.RadioButton.21452.3 +Absatz sym:sw.RadioButton.21452.4 Andere SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:RB_OTHER AndereText SW:EDIT:DLG_CONV_TEXT_TABLE:ED_OTHER GleicheBreite SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN Autoformat SW:PUSHBUTTON:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT -Ueberschrift sw.CheckBox.21452.13 -Wiederholen sw.CheckBox.21452.14 -NichtTrennen sw.CheckBox.21452.15 -Umrandung sw.CheckBox.21452.16 +Ueberschrift sym:sw.CheckBox.21452.13 +Wiederholen sym:sw.CheckBox.21452.14 +NichtTrennen sym:sw.CheckBox.21452.15 +Umrandung sym:sw.CheckBox.21452.16 -*TextmarkeEinfuegen .uno:InsertBookmark -Textmarken sw.ComboBox.21667.1 -Loeschen sw.PushButton.21667.22 +*TextmarkeEinfuegen sym:.uno:InsertBookmark +Textmarken sym:sw.ComboBox.21667.1 +Loeschen sym:sw.PushButton.21667.22 -*Ueberblenden .uno:Morphing -Attributierung sd.CheckBox.653.1 -GleicheOrientierung sd.CheckBox.653.2 -Schritte sd.MetricField.653.1 +*Ueberblenden sym:.uno:Morphing +Attributierung sym:sd.CheckBox.653.1 +GleicheOrientierung sym:sd.CheckBox.653.2 +Schritte sym:sd.MetricField.653.1 -*UeberStarCalc .uno:About +*UeberStarCalc sym:.uno:About -*UeberStarChart .uno:About +*UeberStarChart sym:.uno:About -*UeberStarDraw .uno:About +*UeberStarDraw sym:.uno:About -*UeberStarImage .uno:About +*UeberStarImage sym:.uno:About -*UeberStarMath .uno:About +*UeberStarMath sym:.uno:About -*UeberStarWriter .uno:About +*UeberStarWriter sym:.uno:About -*UmbruchEinfuegen .uno:InsertBreak +*UmbruchEinfuegen sym:.uno:InsertBreak Zeilenumbruch SW:RADIOBUTTON:DLG_BREAK:RB_LINE Spaltenumbruch SW:RADIOBUTTON:DLG_BREAK:RB_COL Seitenumbruch SW:RADIOBUTTON:DLG_BREAK:RB_PAGE @@ -150,19 +150,19 @@ Vorlage SW:LISTBOX:DLG_BREAK:LB_COLL SeitennummerAendern SW:CHECKBOX:DLG_BREAK:CB_PAGENUM Seitennummer SW:NUMERICFIELD:DLG_BREAK:ED_PAGENUM -*UmwandelnInPolygon SD_HID_VECTORIZE_DLG -Farbanzahl sd.NumericField.654.1 -Punktreduktion sd.MetricField.654.3 -LoecherFuellen sd.CheckBox.654.1 -Kachelgroesse sd.MetricField.654.4 -Vorschau sd.PushButton.654.1 +*UmwandelnInPolygon sym:SD_HID_VECTORIZE_DLG +Farbanzahl sym:sd.NumericField.654.1 +Punktreduktion sym:sd.MetricField.654.3 +LoecherFuellen sym:sd.CheckBox.654.1 +Kachelgroesse sym:sd.MetricField.654.4 +Vorschau sym:sd.PushButton.654.1 -*UntenFuellen .uno:FillDown +*UntenFuellen sym:.uno:FillDown -*UndoRedoBox SVX_HID_SVXTBX_UNDO_REDO_CTRL -UndoRedoList svx.ListBox.10845.11 +*UndoRedoBox sym:SVX_HID_SVXTBX_UNDO_REDO_CTRL +UndoRedoList sym:svx.ListBox.10845.11 -*Verbinder CUI_HID_PAGE_CONNECTION SVX:TABPAGE:RID_SVXPAGE_CONNECTION +*Verbinder sym:CUI_HID_PAGE_CONNECTION SVX:TABPAGE:RID_SVXPAGE_CONNECTION Linie1 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1 Linie2 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2 Linie3 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3 @@ -171,18 +171,18 @@ AnfangHorizontal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1 AnfangVertikal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1 EndeHorizontal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2 EndeVertikal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2 -Vorschau CUI_HID_PAGE_CONNECTION_CTL_PREVIEW +Vorschau sym:CUI_HID_PAGE_CONNECTION_CTL_PREVIEW -*VerknuepfungenBearbeiten cui.ModalDialog.32002 -Liste CUI_HID_LINKDLG_TABLB -VerknuepfungBearbeiten cui.PushButton.32002.36 -Automatisch cui.RadioButton.32002.42 -Manuell cui.RadioButton.32002.43 -Aktualisieren cui.PushButton.32002.35 -Aendern cui.PushButton.32002.37 -Loesen cui.PushButton.32002.38 +*VerknuepfungenBearbeiten sym:cui.ModalDialog.32002 +Liste sym:CUI_HID_LINKDLG_TABLB +VerknuepfungBearbeiten sym:cui.PushButton.32002.36 +Automatisch sym:cui.RadioButton.32002.42 +Manuell sym:cui.RadioButton.32002.43 +Aktualisieren sym:cui.PushButton.32002.35 +Aendern sym:cui.PushButton.32002.37 +Loesen sym:cui.PushButton.32002.38 -*VersendenMonitor SW_HID_MERGE_PRINTMONITOR +*VersendenMonitor sym:SW_HID_MERGE_PRINTMONITOR *Versionen SFX2:MODALDIALOG:DLG_VERSIONS Speichern SFX2:PUSHBUTTON:DLG_VERSIONS:PB_SAVE @@ -190,143 +190,143 @@ ImmerVersionSpeichern SFX2:CHECKBOX:DLG_VERSIONS:CB_SAVEONCLOSE Anzeigen SFX2:PUSHBUTTON:DLG_VERSIONS:PB_VIEW Loeschen SFX2:PUSHBUTTON:DLG_VERSIONS:PB_DELETE Oeffnen SFX2:PUSHBUTTON:DLG_VERSIONS:PB_OPEN -Vergleichen sfx2.PushButton.2377.17 +Vergleichen sym:sfx2.PushButton.2377.17 *VersionskommentarEingeben SFX2:MODALDIALOG:DLG_COMMENTS Kommentar SFX2:MULTILINEEDIT:DLG_COMMENTS:ME_VERSIONS Schliessen SFX2:PUSHBUTTON:DLG_COMMENTS:PB_CLOSE -*VerteilenDlg CUI_HID_PAGE_DISTRIBUTE -KeineHorizontal cui.RadioButton.10236.2 -Links cui.RadioButton.10236.3 -MitteHorizontal cui.RadioButton.10236.4 -AbstandHorizontal cui.RadioButton.10236.5 -Rechts cui.RadioButton.10236.6 -KeineVertikal cui.RadioButton.10236.8 -Oben cui.RadioButton.10236.9 -MitteVertikal cui.RadioButton.10236.10 -AbstandVertikal cui.RadioButton.10236.11 -Unten cui.RadioButton.10236.12 - -*VerzeichniseintragEinfuegen .uno:InsertIndexesEntry -EintragOk SW_HID_INSERT_IDX_MRK_OK -EinfuegenSchliessen SW_HID_INSERT_IDX_MRK_CLOSE -Verzeichniseintrag SW_HID_INSERT_IDX_MRK_ENTRY -Verzeichnis SW_HID_INSERT_IDX_MRK_TYPE -Schluessel1 SW_HID_INSERT_IDX_MRK_PRIM_KEY -Schluessel2 SW_HID_INSERT_IDX_MRK_SEC_KEY -Stufe SW_HID_INSERT_IDX_MRK_LEVEL -EintragLoeschen SW_HID_INSERT_IDX_MRK_DELETE -EintragNeu SW_HID_INSERT_IDX_MRK_NEW -Haupteintrag SW_HID_INSERT_IDX_MRK_MAIN_ENTRY -AufAlleGleichenAnwenden SW_HID_INSERT_IDX_MRK_APPLY_ALL -EntryPhoneticReading SW_HID_INSERT_IDX_MRK_PHONETIC_READING - -*VerzeichniseintragBearbeiten .uno:IndexEntryDialog -EintragOk SW_HID_INSERT_IDX_MRK_OK -BearbeitenSchliessen SW_HID_INSERT_IDX_MRK_CLOSE -Verzeichnis SW_HID_INSERT_IDX_MRK_TYPE -Verzeichniseintrag SW_HID_INSERT_IDX_MRK_ENTRY -Schluessel1 SW_HID_INSERT_IDX_MRK_PRIM_KEY -Schluessel2 SW_HID_INSERT_IDX_MRK_SEC_KEY -Stufe SW_HID_INSERT_IDX_MRK_LEVEL -EintragLoeschen SW_HID_INSERT_IDX_MRK_DELETE -EintragNeu SW_HID_INSERT_IDX_MRK_NEW -Naechster SW_HID_INSERT_IDX_MRK_NEXT -Vorheriger SW_HID_INSERT_IDX_MRK_PREV - -*VorlageErzeugen .uno:StyleNewByExample SID_TEMPLATE_NEW_BY_EXAMPLE -Vorlagenname sfx2.ComboBox.2323.1 - -*Vorlagenkatalog .uno:StyleCatalog -Vorlagen sfx2.ListBox.1461.10 -Ansicht SFX2_HID_TEMPLATE_FMT -Bereich sfx2.ListBox.1461.8 -Neu sfx2.PushButton.1461.6 -Aendern sfx2.PushButton.1461.5 -Loeschen sfx2.PushButton.1461.4 -Verwalten sfx2.PushButton.1461.3 - -*Vorschau .uno:PreviewWindow - -*VorlageZuweisen SW_HID_DLG_ADD_IDX_STYLES -ZuweisenLinks sw.ImageButton.20894.110 -ZuweisenRechts sw.ImageButton.20894.111 - -*WBereicheBearbeiten SW_HID_BIB_BASE +*VerteilenDlg sym:CUI_HID_PAGE_DISTRIBUTE +KeineHorizontal sym:cui.RadioButton.10236.2 +Links sym:cui.RadioButton.10236.3 +MitteHorizontal sym:cui.RadioButton.10236.4 +AbstandHorizontal sym:cui.RadioButton.10236.5 +Rechts sym:cui.RadioButton.10236.6 +KeineVertikal sym:cui.RadioButton.10236.8 +Oben sym:cui.RadioButton.10236.9 +MitteVertikal sym:cui.RadioButton.10236.10 +AbstandVertikal sym:cui.RadioButton.10236.11 +Unten sym:cui.RadioButton.10236.12 + +*VerzeichniseintragEinfuegen sym:.uno:InsertIndexesEntry +EintragOk sym:SW_HID_INSERT_IDX_MRK_OK +EinfuegenSchliessen sym:SW_HID_INSERT_IDX_MRK_CLOSE +Verzeichniseintrag sym:SW_HID_INSERT_IDX_MRK_ENTRY +Verzeichnis sym:SW_HID_INSERT_IDX_MRK_TYPE +Schluessel1 sym:SW_HID_INSERT_IDX_MRK_PRIM_KEY +Schluessel2 sym:SW_HID_INSERT_IDX_MRK_SEC_KEY +Stufe sym:SW_HID_INSERT_IDX_MRK_LEVEL +EintragLoeschen sym:SW_HID_INSERT_IDX_MRK_DELETE +EintragNeu sym:SW_HID_INSERT_IDX_MRK_NEW +Haupteintrag sym:SW_HID_INSERT_IDX_MRK_MAIN_ENTRY +AufAlleGleichenAnwenden sym:SW_HID_INSERT_IDX_MRK_APPLY_ALL +EntryPhoneticReading sym:SW_HID_INSERT_IDX_MRK_PHONETIC_READING + +*VerzeichniseintragBearbeiten sym:.uno:IndexEntryDialog +EintragOk sym:SW_HID_INSERT_IDX_MRK_OK +BearbeitenSchliessen sym:SW_HID_INSERT_IDX_MRK_CLOSE +Verzeichnis sym:SW_HID_INSERT_IDX_MRK_TYPE +Verzeichniseintrag sym:SW_HID_INSERT_IDX_MRK_ENTRY +Schluessel1 sym:SW_HID_INSERT_IDX_MRK_PRIM_KEY +Schluessel2 sym:SW_HID_INSERT_IDX_MRK_SEC_KEY +Stufe sym:SW_HID_INSERT_IDX_MRK_LEVEL +EintragLoeschen sym:SW_HID_INSERT_IDX_MRK_DELETE +EintragNeu sym:SW_HID_INSERT_IDX_MRK_NEW +Naechster sym:SW_HID_INSERT_IDX_MRK_NEXT +Vorheriger sym:SW_HID_INSERT_IDX_MRK_PREV + +*VorlageErzeugen sym:.uno:StyleNewByExample SID_TEMPLATE_NEW_BY_EXAMPLE +Vorlagenname sym:sfx2.ComboBox.2323.1 + +*Vorlagenkatalog sym:.uno:StyleCatalog +Vorlagen sym:sfx2.ListBox.1461.10 +Ansicht sym:SFX2_HID_TEMPLATE_FMT +Bereich sym:sfx2.ListBox.1461.8 +Neu sym:sfx2.PushButton.1461.6 +Aendern sym:sfx2.PushButton.1461.5 +Loeschen sym:sfx2.PushButton.1461.4 +Verwalten sym:sfx2.PushButton.1461.3 + +*Vorschau sym:.uno:PreviewWindow + +*VorlageZuweisen sym:SW_HID_DLG_ADD_IDX_STYLES +ZuweisenLinks sym:sw.ImageButton.20894.110 +ZuweisenRechts sym:sw.ImageButton.20894.111 + +*WBereicheBearbeiten sym:SW_HID_BIB_BASE Bereichname SW:EDIT:DLG_BIB_BASE:ED_NAME Bereich SW:LISTBOX:DLG_BIB_BASE:LB_PATH -Liste SW_HID_GLOS_GROUP_TREE -Neu sw.PushButton.21666.3 -Loeschen sw.PushButton.21666.4 -Umbenennen sw.PushButton.21666.11 - -*WMFOptionen svtools.ModalDialog.16372 -Original svtools.RadioButton.16372.1 -Groesse svtools.RadioButton.16372.2 -Breite svtools.MetricField.16372.1 -Hoehe svtools.MetricField.16372.2 - -*Zahlenformat CUI_HID_NUMBERFORMAT -Kategorie cui.ListBox.10041.9 -KategorieFormat CUI_HID_NUMBERFORMAT_LB_FORMAT +Liste sym:SW_HID_GLOS_GROUP_TREE +Neu sym:sw.PushButton.21666.3 +Loeschen sym:sw.PushButton.21666.4 +Umbenennen sym:sw.PushButton.21666.11 + +*WMFOptionen sym:svtools.ModalDialog.16372 +Original sym:svtools.RadioButton.16372.1 +Groesse sym:svtools.RadioButton.16372.2 +Breite sym:svtools.MetricField.16372.1 +Hoehe sym:svtools.MetricField.16372.2 + +*Zahlenformat sym:CUI_HID_NUMBERFORMAT +Kategorie sym:cui.ListBox.10041.9 +KategorieFormat sym:CUI_HID_NUMBERFORMAT_LB_FORMAT 'FormatZahl -FormatCode cui.Edit.10041.14 -Hinzufuegen CUI_HID_NUMBERFORMAT_TBI_ADD -Entfernen CUI_HID_NUMBERFORMAT_TBI_REMOVE -Sprache cui.ListBox.10041.13 -Nachkommastellen cui.NumericField.10041.22 -FuehrendeNullen cui.NumericField.10041.24 -NegativInRot cui.CheckBox.10041.25 -Tausenderpunkt cui.CheckBox.10041.26 - -*ZeileAusblenden .uno:HideRow - -*Zeilenhoehe .uno:RowHeight -Hoehe sc.MetricField.25710.1 HID_SC_MTRIN_VAL -Standwardwert sc.CheckBox.25710.1 HID_SC_MTRIN_DEF - -*ZeileOptimaleHoehe .uno:SetOptimalRowHeight -Extra sc.MetricField.25711.1 HID_SC_MTRIN_VAL -Standardwert sc.CheckBox.25711.1 HID_SC_MTRIN_DEF - -*ZellvorlageCalc SFX2_HID_MANAGE_STYLES - -*ZeileEinblenden .uno:ShowRow - -*ZellenEinfuegen .uno:InsertCell -ZellenNachUnten sc.RadioButton.25616.11 -ZellenNachRechts sc.RadioButton.25616.12 -GanzeZeile sc.RadioButton.25616.16 -GanzeSpalte sc.RadioButton.25616.17 - -*ZellenLoeschen .uno:DeleteCell -Auswahl sc.RadioButton.25615.10 -Zellennachoben sc.RadioButton.25615.10 -Zellennachlinks sc.RadioButton.25615.13 -GanzeZeilen sc.RadioButton.25615.14 -GanzeSpalten sc.RadioButton.25615.15 - -*ZellenHoehe .uno:SetRowHeight -Hoehe sw.MetricField.21454.1 -Dynamisch sw.CheckBox.21454.2 - -*ZellenTeilen cui.ModalDialog.10043 -Anzahl cui.NumericField.10043.2 -Horizontal cui.ImageRadioButton.10043.10 -Vertikal cui.ImageRadioButton.10043.12 -GleichmaessigTeilen cui.CheckBox.10043.11 - -*ZielImDokument CUI_HID_HYPERLINK_MARKWND +FormatCode sym:cui.Edit.10041.14 +Hinzufuegen sym:CUI_HID_NUMBERFORMAT_TBI_ADD +Entfernen sym:CUI_HID_NUMBERFORMAT_TBI_REMOVE +Sprache sym:cui.ListBox.10041.13 +Nachkommastellen sym:cui.NumericField.10041.22 +FuehrendeNullen sym:cui.NumericField.10041.24 +NegativInRot sym:cui.CheckBox.10041.25 +Tausenderpunkt sym:cui.CheckBox.10041.26 + +*ZeileAusblenden sym:.uno:HideRow + +*Zeilenhoehe sym:.uno:RowHeight +Hoehe sym:sc.MetricField.25710.1 HID_SC_MTRIN_VAL +Standwardwert sym:sc.CheckBox.25710.1 HID_SC_MTRIN_DEF + +*ZeileOptimaleHoehe sym:.uno:SetOptimalRowHeight +Extra sym:sc.MetricField.25711.1 HID_SC_MTRIN_VAL +Standardwert sym:sc.CheckBox.25711.1 HID_SC_MTRIN_DEF + +*ZellvorlageCalc sym:SFX2_HID_MANAGE_STYLES + +*ZeileEinblenden sym:.uno:ShowRow + +*ZellenEinfuegen sym:.uno:InsertCell +ZellenNachUnten sym:sc.RadioButton.25616.11 +ZellenNachRechts sym:sc.RadioButton.25616.12 +GanzeZeile sym:sc.RadioButton.25616.16 +GanzeSpalte sym:sc.RadioButton.25616.17 + +*ZellenLoeschen sym:.uno:DeleteCell +Auswahl sym:sc.RadioButton.25615.10 +Zellennachoben sym:sc.RadioButton.25615.10 +Zellennachlinks sym:sc.RadioButton.25615.13 +GanzeZeilen sym:sc.RadioButton.25615.14 +GanzeSpalten sym:sc.RadioButton.25615.15 + +*ZellenHoehe sym:.uno:SetRowHeight +Hoehe sym:sw.MetricField.21454.1 +Dynamisch sym:sw.CheckBox.21454.2 + +*ZellenTeilen sym:cui.ModalDialog.10043 +Anzahl sym:cui.NumericField.10043.2 +Horizontal sym:cui.ImageRadioButton.10043.10 +Vertikal sym:cui.ImageRadioButton.10043.12 +GleichmaessigTeilen sym:cui.CheckBox.10043.11 + +*ZielImDokument sym:CUI_HID_HYPERLINK_MARKWND 'Uebernehmen Kein Eintrag in Hid.Lst 'Schliessen Kein Eintrag in Hid.Lst -*Zielwertsuche .uno:GoalSeekDialog -Formelzelle sc.Edit.25630.1 -Vorgaben1 sc.ImageButton.25630.1 -Zielwert sc.Edit.25630.2 -VariableZelle sc.Edit.25630.3 -Vorgaben2 sc.ImageButton.25630.2 +*Zielwertsuche sym:.uno:GoalSeekDialog +Formelzelle sym:sc.Edit.25630.1 +Vorgaben1 sym:sc.ImageButton.25630.1 +Zielwert sym:sc.Edit.25630.2 +VariableZelle sym:sc.Edit.25630.3 +Vorgaben2 sym:sc.ImageButton.25630.2 -*Zusammenfassen .uno:AutoFormat +*Zusammenfassen sym:.uno:AutoFormat Mindestgroesse cui:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN diff --git a/testautomation/global/win/dokument.win b/testautomation/global/win/dokument.win index 9628f5bcbaa7..491161cbb438 100644 --- a/testautomation/global/win/dokument.win +++ b/testautomation/global/win/dokument.win @@ -1,45 +1,43 @@ ' german Part -*DokumentWriter SW_HID_EDIT_WIN -*DokumentWriterWeb SW_HID_EDIT_WIN -*DokumentCalc SC_HID_SC_WIN_GRIDWIN -*DokumentDraw SD_HID_SDGRAPHICVIEWSHELL SD_HID_SD_WIN_DOCUMENT -*DokumentImpress SD_HID_SDDRAWVIEWSHELL SD_HID_SD_WIN_DOCUMENT -*DokumentImpressDiatisch SD_IF_SDSLIDEVIEWSHELL -*DokumentImpressGliederungsmodus SD_HID_SDOUTLINEVIEWSHELL -*DokumentImpressNotizen .uno:NotesMode -*DokumentImpressHandzettel .uno:HandoutMode -*DokumentChart CHART2_HID_SCH_WIN_DOCUMENT -*DokumentGlobalDoc SW_HID_EDIT_WIN +*DokumentWriter sym:SW_HID_EDIT_WIN +*DokumentWriterWeb sym:SW_HID_EDIT_WIN +*DokumentCalc sym:SC_HID_SC_WIN_GRIDWIN +*DokumentDraw sym:SD_HID_SDGRAPHICVIEWSHELL sym:SD_HID_SD_WIN_DOCUMENT +*DokumentImpress sym:SD_HID_SDDRAWVIEWSHELL sym:SD_HID_SD_WIN_DOCUMENT +*DokumentImpressGliederungsmodus sym:SD_HID_SDOUTLINEVIEWSHELL +*DokumentImpressNotizen sym:.uno:NotesMode +*DokumentImpressHandzettel sym:.uno:HandoutMode +*DokumentChart sym:CHART2_HID_SCH_WIN_DOCUMENT +*DokumentGlobalDoc sym:SW_HID_EDIT_WIN -*DokumentMath STARMATH_HID_SMA_WIN_DOCUMENT -*DokumentImageMap SVX_HID_IMAPDLG_GRAPHWND -*DokumentPraesentation SD_HID_SD_WIN_PRESENTATION +*DokumentMath sym:STARMATH_HID_SMA_WIN_DOCUMENT +*DokumentImageMap sym:SVX_HID_IMAPDLG_GRAPHWND +*DokumentPraesentation sym:SD_HID_SD_WIN_PRESENTATION -*KommandosMath STARMATH_HID_SMA_COMMAND_WIN -Kommandos STARMATH_HID_SMA_COMMAND_WIN_EDIT +*KommandosMath sym:STARMATH_HID_SMA_COMMAND_WIN +Kommandos sym:STARMATH_HID_SMA_COMMAND_WIN_EDIT *DokSeitenansichtWriter HID_PagePreview *DokSeitenansichtCalc HID_SC_Win_Preview ' english Part -*DocumentWriter SW_HID_EDIT_WIN -*DocumentWriterWeb SW_HID_EDIT_WIN -*DocumentHTMLSourceView SW_HID_SOURCE_EDITWIN -*DocumentCalc SC_HID_SC_WIN_GRIDWIN -*DocumentDraw SD_HID_SDGRAPHICVIEWSHELL SD_HID_SD_WIN_DOCUMENT -*DocumentImpress SD_HID_SDDRAWVIEWSHELL SD_HID_SD_WIN_DOCUMENT -*DocumentImpressSlideView SD_IF_SDSLIDEVIEWSHELL -*DocumentImpressOutlineView SD_HID_SDOUTLINEVIEWSHELL -*DocumentImpressNotesView .uno:NotesMode -*DocumentImpressHandoutView .uno:HandoutMode -*DocumentChart CHART2_HID_SCH_WIN_DOCUMENT -*DocumentMasterDoc SW_HID_EDIT_WIN -*DocumentMath STARMATH_HID_SMA_WIN_DOCUMENT -*DocumentImageMap SVX_HID_IMAPDLG_GRAPHWND -*DocumentPresentation SD_HID_SD_WIN_PRESENTATION -*DocumentBackground FWK_HID_BACKINGWINDOW +*DocumentWriter sym:SW_HID_EDIT_WIN +*DocumentWriterWeb sym:SW_HID_EDIT_WIN +*DocumentHTMLSourceView sym:SW_HID_SOURCE_EDITWIN +*DocumentCalc sym:SC_HID_SC_WIN_GRIDWIN +*DocumentDraw sym:SD_HID_SDGRAPHICVIEWSHELL sym:SD_HID_SD_WIN_DOCUMENT +*DocumentImpress sym:SD_HID_SDDRAWVIEWSHELL sym:SD_HID_SD_WIN_DOCUMENT +*DocumentImpressOutlineView sym:SD_HID_SDOUTLINEVIEWSHELL +*DocumentImpressNotesView sym:.uno:NotesMode +*DocumentImpressHandoutView sym:.uno:HandoutMode +*DocumentChart sym:CHART2_HID_SCH_WIN_DOCUMENT +*DocumentMasterDoc sym:SW_HID_EDIT_WIN +*DocumentMath sym:STARMATH_HID_SMA_WIN_DOCUMENT +*DocumentImageMap sym:SVX_HID_IMAPDLG_GRAPHWND +*DocumentPresentation sym:SD_HID_SD_WIN_PRESENTATION +*DocumentBackground sym:FWK_HID_BACKINGWINDOW TextDocument .HelpId:StartCenter:WriterButton Spreadsheet .HelpId:StartCenter:CalcButton Presentation .HelpId:StartCenter:ImpressButton @@ -52,24 +50,24 @@ Extensions .HelpId:StartCenter:Extensions Register .HelpId:StartCenter:Register Info .HelpId:StartCenter:Info -*CommandsMath STARMATH_HID_SMA_COMMAND_WIN -Commands STARMATH_HID_SMA_COMMAND_WIN_EDIT +*CommandsMath sym:STARMATH_HID_SMA_COMMAND_WIN +Commands sym:STARMATH_HID_SMA_COMMAND_WIN_EDIT *DocPageViewWriter HID_PagePreview *DocPageViewCalc HID_SC_Win_Preview ' to access the buttons in the lower left corner -*DocumentDrawImpress SD_HID_SDGRAPHICVIEWSHELL -ViewSlideButton SD_HID_SD_BTN_PAGE -ViewLayerButton SD_HID_SD_BTN_LAYER -ViewMasterButton SD_HID_SD_BTN_MASTERPAGE -TabBar SD_HID_SD_TABBAR_PAGES -LayerTabBar SD_HID_SD_TABBAR_LAYERS +*DocumentDrawImpress sym:SD_HID_SDGRAPHICVIEWSHELL +ViewSlideButton sym:SD_HID_SD_BTN_PAGE +ViewLayerButton sym:SD_HID_SD_BTN_LAYER +ViewMasterButton sym:SD_HID_SD_BTN_MASTERPAGE +TabBar sym:SD_HID_SD_TABBAR_PAGES +LayerTabBar sym:SD_HID_SD_TABBAR_LAYERS ' these are the buttons on the right side -ButtonDrawingView SD_HID_SD_BTN_DRAW -ButtonOutlineView SD_HID_SD_BTN_OUTLINE -ButtonSlideView SD_HID_SD_BTN_SLIDE -ButtonNotesView SD_HID_SD_BTN_NOTES -ButtonHandoutView SD_HID_SD_BTN_HANDOUT -ButtonStartSlideShow SD_HID_SD_BTN_PRESENTATION +ButtonDrawingView sym:SD_HID_SD_BTN_DRAW +ButtonOutlineView sym:SD_HID_SD_BTN_OUTLINE +ButtonSlideView sym:SD_HID_SD_BTN_SLIDE +ButtonNotesView sym:SD_HID_SD_BTN_NOTES +ButtonHandoutView sym:SD_HID_SD_BTN_HANDOUT +ButtonStartSlideShow sym:SD_HID_SD_BTN_PRESENTATION diff --git a/testautomation/global/win/e_mathop.win b/testautomation/global/win/e_mathop.win index 1b6b3ccb9c68..9beb74b31ebc 100644 --- a/testautomation/global/win/e_mathop.win +++ b/testautomation/global/win/e_mathop.win @@ -1,202 +1,202 @@ -*SelectionMath STARMATH_HID_SMA_OPERATOR_WIN -TB_Group STARMATH_HID_SMA_SELECTION_TBX -UnaryBinary STARMATH_HID_SMA_UNBINOPS_CAT -Relations STARMATH_HID_SMA_RELATIONS_CAT -SetOperations STARMATH_HID_SMA_SETOPERATIONS_CAT -Functions STARMATH_HID_SMA_FUNCTIONS_CAT -Operators STARMATH_HID_SMA_OPERATORS_CAT -Attributes STARMATH_HID_SMA_ATTRIBUTES_CAT -Others STARMATH_HID_SMA_MISC_CAT -Brackets STARMATH_HID_SMA_BRACKETS_CAT -Format STARMATH_HID_SMA_FORMAT_CAT +*SelectionMath sym:STARMATH_HID_SMA_OPERATOR_WIN +TB_Group sym:STARMATH_HID_SMA_SELECTION_TBX +UnaryBinary sym:STARMATH_HID_SMA_UNBINOPS_CAT +Relations sym:STARMATH_HID_SMA_RELATIONS_CAT +SetOperations sym:STARMATH_HID_SMA_SETOPERATIONS_CAT +Functions sym:STARMATH_HID_SMA_FUNCTIONS_CAT +Operators sym:STARMATH_HID_SMA_OPERATORS_CAT +Attributes sym:STARMATH_HID_SMA_ATTRIBUTES_CAT +Others sym:STARMATH_HID_SMA_MISC_CAT +Brackets sym:STARMATH_HID_SMA_BRACKETS_CAT +Format sym:STARMATH_HID_SMA_FORMAT_CAT -TB_UnaryBinary STARMATH_HID_SMA_UNBINOPS_TBX -Plus STARMATH_HID_SMA_PLUSX -Minus STARMATH_HID_SMA_MINUSX -PlusMinus STARMATH_HID_SMA_PLUSMINUSX -MinusPlus STARMATH_HID_SMA_MINUSPLUSX -BooleanNot STARMATH_HID_SMA_NEGX -Addition STARMATH_HID_SMA_XPLUSY -Multiplication STARMATH_HID_SMA_XCDOTY -MultiplicationX STARMATH_HID_SMA_XTIMESY -MultiplicationStar STARMATH_HID_SMA_XSYMTIMESY -BooleanAND STARMATH_HID_SMA_XANDY -Subtraction STARMATH_HID_SMA_XMINUSY -DivisionFraction STARMATH_HID_SMA_XOVERY -Division STARMATH_HID_SMA_XDIVY -DivisionSlash STARMATH_HID_SMA_XSYMDIVIDEY -BooleanOR STARMATH_HID_SMA_XORY -Catenate STARMATH_HID_SMA_XCIRCY +TB_UnaryBinary sym:STARMATH_HID_SMA_UNBINOPS_TBX +Plus sym:STARMATH_HID_SMA_PLUSX +Minus sym:STARMATH_HID_SMA_MINUSX +PlusMinus sym:STARMATH_HID_SMA_PLUSMINUSX +MinusPlus sym:STARMATH_HID_SMA_MINUSPLUSX +BooleanNot sym:STARMATH_HID_SMA_NEGX +Addition sym:STARMATH_HID_SMA_XPLUSY +Multiplication sym:STARMATH_HID_SMA_XCDOTY +MultiplicationX sym:STARMATH_HID_SMA_XTIMESY +MultiplicationStar sym:STARMATH_HID_SMA_XSYMTIMESY +BooleanAND sym:STARMATH_HID_SMA_XANDY +Subtraction sym:STARMATH_HID_SMA_XMINUSY +DivisionFraction sym:STARMATH_HID_SMA_XOVERY +Division sym:STARMATH_HID_SMA_XDIVY +DivisionSlash sym:STARMATH_HID_SMA_XSYMDIVIDEY +BooleanOR sym:STARMATH_HID_SMA_XORY +Catenate sym:STARMATH_HID_SMA_XCIRCY -TB_Relations STARMATH_HID_SMA_RELATIONS_TBX -IsEqual STARMATH_HID_SMA_XEQY -IsNotEqual STARMATH_HID_SMA_XNEQY -IsApprocimatelyEqual STARMATH_HID_SMA_XAPPROXY -Divides STARMATH_HID_SMA_XDIVIDESY -DoesNotDivide STARMATH_HID_SMA_XNDIVIDESY -IsLessThan STARMATH_HID_SMA_XLTY -IsGreaterThan STARMATH_HID_SMA_XGTY -IsSimilarOrEqual STARMATH_HID_SMA_XSIMEQY -IsParallelTo STARMATH_HID_SMA_XPARALLELY -IsOrthogonalTo STARMATH_HID_SMA_XORTHOY -IsLessThanOrEqualTo STARMATH_HID_SMA_XLESLANTY -IsGreaterThanOrEqualTo STARMATH_HID_SMA_XGESLANTY -IsSimilarTo STARMATH_HID_SMA_XSIMY -IsCongruentTo STARMATH_HID_SMA_XEQUIVY -IsLessThanOrEqualTo2 STARMATH_HID_SMA_XLEY -IsGreaterThanOrEqualTo2 STARMATH_HID_SMA_XGEY -IsProportionalTo STARMATH_HID_SMA_XPROPY -Toward STARMATH_HID_SMA_XTOWARDY -DoubleArrowLeft STARMATH_HID_SMA_DLARROW -DoubleArrowLeftAndRight STARMATH_HID_SMA_DLRARROW -DoubleArrowRight STARMATH_HID_SMA_DRARROW +TB_Relations sym:STARMATH_HID_SMA_RELATIONS_TBX +IsEqual sym:STARMATH_HID_SMA_XEQY +IsNotEqual sym:STARMATH_HID_SMA_XNEQY +IsApprocimatelyEqual sym:STARMATH_HID_SMA_XAPPROXY +Divides sym:STARMATH_HID_SMA_XDIVIDESY +DoesNotDivide sym:STARMATH_HID_SMA_XNDIVIDESY +IsLessThan sym:STARMATH_HID_SMA_XLTY +IsGreaterThan sym:STARMATH_HID_SMA_XGTY +IsSimilarOrEqual sym:STARMATH_HID_SMA_XSIMEQY +IsParallelTo sym:STARMATH_HID_SMA_XPARALLELY +IsOrthogonalTo sym:STARMATH_HID_SMA_XORTHOY +IsLessThanOrEqualTo sym:STARMATH_HID_SMA_XLESLANTY +IsGreaterThanOrEqualTo sym:STARMATH_HID_SMA_XGESLANTY +IsSimilarTo sym:STARMATH_HID_SMA_XSIMY +IsCongruentTo sym:STARMATH_HID_SMA_XEQUIVY +IsLessThanOrEqualTo2 sym:STARMATH_HID_SMA_XLEY +IsGreaterThanOrEqualTo2 sym:STARMATH_HID_SMA_XGEY +IsProportionalTo sym:STARMATH_HID_SMA_XPROPY +Toward sym:STARMATH_HID_SMA_XTOWARDY +DoubleArrowLeft sym:STARMATH_HID_SMA_DLARROW +DoubleArrowLeftAndRight sym:STARMATH_HID_SMA_DLRARROW +DoubleArrowRight sym:STARMATH_HID_SMA_DRARROW -TB_SetOperators STARMATH_HID_SMA_SETOPERATIONS_TBX -IsIn STARMATH_HID_SMA_XINY -IsNotIn STARMATH_HID_SMA_XNOTINY -Owns STARMATH_HID_SMA_XOWNSY -EmptySet STARMATH_HID_SMA_EMPTYSET -Intersection STARMATH_HID_SMA_XINTERSECTIONY -Union STARMATH_HID_SMA_XUNIONY -Difference STARMATH_HID_SMA_XSETMINUSY -QuotientSet STARMATH_HID_SMA_XSLASHY -Aleph STARMATH_HID_SMA_ALEPH -Subset STARMATH_HID_SMA_XSUBSETY -SubsetOrEqualTo STARMATH_HID_SMA_XSUBSETEQY -Superset STARMATH_HID_SMA_XSUPSETY -SupersetOrEqualTo STARMATH_HID_SMA_XSUPSETEQY -NotSubset STARMATH_HID_SMA_XNSUBSETY -NotSubsetOrEqual STARMATH_HID_SMA_XNSUBSETEQY -NotSuperset STARMATH_HID_SMA_XNSUPSETY -NotSupersetOrEqual STARMATH_HID_SMA_XNSUPSETEQY -NaturalNumbersSet STARMATH_HID_SMA_SETN -IntegersSet STARMATH_HID_SMA_SETZ -RelationalNumbersSet STARMATH_HID_SMA_SETQ -RealNumbersSet STARMATH_HID_SMA_SETR -ComplexNumbersSet STARMATH_HID_SMA_SETC +TB_SetOperators sym:STARMATH_HID_SMA_SETOPERATIONS_TBX +IsIn sym:STARMATH_HID_SMA_XINY +IsNotIn sym:STARMATH_HID_SMA_XNOTINY +Owns sym:STARMATH_HID_SMA_XOWNSY +EmptySet sym:STARMATH_HID_SMA_EMPTYSET +Intersection sym:STARMATH_HID_SMA_XINTERSECTIONY +Union sym:STARMATH_HID_SMA_XUNIONY +Difference sym:STARMATH_HID_SMA_XSETMINUSY +QuotientSet sym:STARMATH_HID_SMA_XSLASHY +Aleph sym:STARMATH_HID_SMA_ALEPH +Subset sym:STARMATH_HID_SMA_XSUBSETY +SubsetOrEqualTo sym:STARMATH_HID_SMA_XSUBSETEQY +Superset sym:STARMATH_HID_SMA_XSUPSETY +SupersetOrEqualTo sym:STARMATH_HID_SMA_XSUPSETEQY +NotSubset sym:STARMATH_HID_SMA_XNSUBSETY +NotSubsetOrEqual sym:STARMATH_HID_SMA_XNSUBSETEQY +NotSuperset sym:STARMATH_HID_SMA_XNSUPSETY +NotSupersetOrEqual sym:STARMATH_HID_SMA_XNSUPSETEQY +NaturalNumbersSet sym:STARMATH_HID_SMA_SETN +IntegersSet sym:STARMATH_HID_SMA_SETZ +RelationalNumbersSet sym:STARMATH_HID_SMA_SETQ +RealNumbersSet sym:STARMATH_HID_SMA_SETR +ComplexNumbersSet sym:STARMATH_HID_SMA_SETC -TB_Functions STARMATH_HID_SMA_FUNCTIONS_TBX -ExponentialFunction STARMATH_HID_SMA_EX -NaturalLogarithm STARMATH_HID_SMA_LNX -ExponentialFunction2 STARMATH_HID_SMA_EXPX -Logarithm STARMATH_HID_SMA_LOGX -Power STARMATH_HID_SMA_RSUPX -Sine STARMATH_HID_SMA_SINX -Cosine STARMATH_HID_SMA_COSX -Tangent STARMATH_HID_SMA_TANX -Cotangent STARMATH_HID_SMA_COTX -SquareRoot STARMATH_HID_SMA_SQRTX -Arcsine STARMATH_HID_SMA_ARCSINX -Arccosine STARMATH_HID_SMA_ARCCOSX -Arctangent STARMATH_HID_SMA_ARCTANX -Arccotangent STARMATH_HID_SMA_ARCCOTX -NthRoot STARMATH_HID_SMA_NROOTXY -HyperbolicSine STARMATH_HID_SMA_SINHX -HyperbolicCosine STARMATH_HID_SMA_COSHX -HyperbolicTangent STARMATH_HID_SMA_TANHX -HyperbolicCotangent STARMATH_HID_SMA_COTHX -AbsoluteValue STARMATH_HID_SMA_ABSX -AreaHyperbolicSine STARMATH_HID_SMA_ARSINHX -AreaHyperbolicCosine STARMATH_HID_SMA_ARCOSHX -AreaHyperbolicTangent STARMATH_HID_SMA_ARTANHX -AreaHyperbolicCotangent STARMATH_HID_SMA_ARCOTHX -Factorial STARMATH_HID_SMA_FACTX +TB_Functions sym:STARMATH_HID_SMA_FUNCTIONS_TBX +ExponentialFunction sym:STARMATH_HID_SMA_EX +NaturalLogarithm sym:STARMATH_HID_SMA_LNX +ExponentialFunction2 sym:STARMATH_HID_SMA_EXPX +Logarithm sym:STARMATH_HID_SMA_LOGX +Power sym:STARMATH_HID_SMA_RSUPX +Sine sym:STARMATH_HID_SMA_SINX +Cosine sym:STARMATH_HID_SMA_COSX +Tangent sym:STARMATH_HID_SMA_TANX +Cotangent sym:STARMATH_HID_SMA_COTX +SquareRoot sym:STARMATH_HID_SMA_SQRTX +Arcsine sym:STARMATH_HID_SMA_ARCSINX +Arccosine sym:STARMATH_HID_SMA_ARCCOSX +Arctangent sym:STARMATH_HID_SMA_ARCTANX +Arccotangent sym:STARMATH_HID_SMA_ARCCOTX +NthRoot sym:STARMATH_HID_SMA_NROOTXY +HyperbolicSine sym:STARMATH_HID_SMA_SINHX +HyperbolicCosine sym:STARMATH_HID_SMA_COSHX +HyperbolicTangent sym:STARMATH_HID_SMA_TANHX +HyperbolicCotangent sym:STARMATH_HID_SMA_COTHX +AbsoluteValue sym:STARMATH_HID_SMA_ABSX +AreaHyperbolicSine sym:STARMATH_HID_SMA_ARSINHX +AreaHyperbolicCosine sym:STARMATH_HID_SMA_ARCOSHX +AreaHyperbolicTangent sym:STARMATH_HID_SMA_ARTANHX +AreaHyperbolicCotangent sym:STARMATH_HID_SMA_ARCOTHX +Factorial sym:STARMATH_HID_SMA_FACTX -TB_Operators STARMATH_HID_SMA_OPERATORS_TBX -Limes STARMATH_HID_SMA_LIMX -Sum STARMATH_HID_SMA_SUMX -Product STARMATH_HID_SMA_PRODX -Coproduct STARMATH_HID_SMA_COPRODX -UpperAndLowerLimit STARMATH_HID_SMA_FROMXTOY -Integral STARMATH_HID_SMA_INTX -DoubleIntegral STARMATH_HID_SMA_IINTX -TripleIntegral STARMATH_HID_SMA_IIINTX -LowerLimit STARMATH_HID_SMA_FROMX -CurveIntegral STARMATH_HID_SMA_LINTX -DoubleCurveIntegral STARMATH_HID_SMA_LLINTX -TripleCurveIntegral STARMATH_HID_SMA_LLLINTX -UpperLimit STARMATH_HID_SMA_TOX +TB_Operators sym:STARMATH_HID_SMA_OPERATORS_TBX +Limes sym:STARMATH_HID_SMA_LIMX +Sum sym:STARMATH_HID_SMA_SUMX +Product sym:STARMATH_HID_SMA_PRODX +Coproduct sym:STARMATH_HID_SMA_COPRODX +UpperAndLowerLimit sym:STARMATH_HID_SMA_FROMXTOY +Integral sym:STARMATH_HID_SMA_INTX +DoubleIntegral sym:STARMATH_HID_SMA_IINTX +TripleIntegral sym:STARMATH_HID_SMA_IIINTX +LowerLimit sym:STARMATH_HID_SMA_FROMX +CurveIntegral sym:STARMATH_HID_SMA_LINTX +DoubleCurveIntegral sym:STARMATH_HID_SMA_LLINTX +TripleCurveIntegral sym:STARMATH_HID_SMA_LLLINTX +UpperLimit sym:STARMATH_HID_SMA_TOX -TB_Attributes STARMATH_HID_SMA_ATTRIBUTES_TBX -AccentToTheRight STARMATH_HID_SMA_ACUTEX -AccentToTheLeft STARMATH_HID_SMA_GRAVEX -ReverseCircumflex STARMATH_HID_SMA_CHECKX -Breve STARMATH_HID_SMA_BREVEX -Circle STARMATH_HID_SMA_CIRCLEX -VectorArrow STARMATH_HID_SMA_VECX -Tilde STARMATH_HID_SMA_TILDEX -Circumflex STARMATH_HID_SMA_HATX -LineAbove STARMATH_HID_SMA_BARX -Dot STARMATH_HID_SMA_DOTX -LargeVectorArrow STARMATH_HID_SMA_WIDEVECX -LargeTilde STARMATH_HID_SMA_WIDETILDEX -LargeCircumflex STARMATH_HID_SMA_WIDEHATX -DoubleDot STARMATH_HID_SMA_DDOTX -LineOver STARMATH_HID_SMA_OVERLINEX -LineBelow STARMATH_HID_SMA_UNDERLINEX -LineThrough STARMATH_HID_SMA_OVERSTRIKEX -TripleDot STARMATH_HID_SMA_DDDOTX -Transparent STARMATH_HID_SMA_PHANTOMX -BoldFont STARMATH_HID_SMA_BOLDX -ItalicFont STARMATH_HID_SMA_ITALX -Resize STARMATH_HID_SMA_SIZEXY -ChangeFont STARMATH_HID_SMA_FONTXY +TB_Attributes sym:STARMATH_HID_SMA_ATTRIBUTES_TBX +AccentToTheRight sym:STARMATH_HID_SMA_ACUTEX +AccentToTheLeft sym:STARMATH_HID_SMA_GRAVEX +ReverseCircumflex sym:STARMATH_HID_SMA_CHECKX +Breve sym:STARMATH_HID_SMA_BREVEX +Circle sym:STARMATH_HID_SMA_CIRCLEX +VectorArrow sym:STARMATH_HID_SMA_VECX +Tilde sym:STARMATH_HID_SMA_TILDEX +Circumflex sym:STARMATH_HID_SMA_HATX +LineAbove sym:STARMATH_HID_SMA_BARX +Dot sym:STARMATH_HID_SMA_DOTX +LargeVectorArrow sym:STARMATH_HID_SMA_WIDEVECX +LargeTilde sym:STARMATH_HID_SMA_WIDETILDEX +LargeCircumflex sym:STARMATH_HID_SMA_WIDEHATX +DoubleDot sym:STARMATH_HID_SMA_DDOTX +LineOver sym:STARMATH_HID_SMA_OVERLINEX +LineBelow sym:STARMATH_HID_SMA_UNDERLINEX +LineThrough sym:STARMATH_HID_SMA_OVERSTRIKEX +TripleDot sym:STARMATH_HID_SMA_DDDOTX +Transparent sym:STARMATH_HID_SMA_PHANTOMX +BoldFont sym:STARMATH_HID_SMA_BOLDX +ItalicFont sym:STARMATH_HID_SMA_ITALX +Resize sym:STARMATH_HID_SMA_SIZEXY +ChangeFont sym:STARMATH_HID_SMA_FONTXY -TB_Others STARMATH_HID_SMA_FORMAT_TBX -Infinity STARMATH_HID_SMA_INFINITY -Partial STARMATH_HID_SMA_PARTIAL -Nabla STARMATH_HID_SMA_NABLA -ThereExists STARMATH_HID_SMA_EXISTS -ForAll STARMATH_HID_SMA_FORALL -HBar STARMATH_HID_SMA_HBAR -LambdaBar STARMATH_HID_SMA_LAMBDABAR -RealPart STARMATH_HID_SMA_RE -ImaginaryPart STARMATH_HID_SMA_IM -WeierstrassP STARMATH_HID_SMA_WP -LeftArrow STARMATH_HID_SMA_LEFTARROW -RightArrow STARMATH_HID_SMA_RIGHTARROW -UpArrow STARMATH_HID_SMA_UPARROW -DownArrow STARMATH_HID_SMA_DOWNARROW -DotsBottom STARMATH_HID_SMA_DOTSLOW -CenterDots STARMATH_HID_SMA_DOTSAXIS -DotsVertically STARMATH_HID_SMA_DOTSVERT -DotsToTop STARMATH_HID_SMA_DOTSUP -AlignDotsDown STARMATH_HID_SMA_DOTSDOWN +TB_Others sym:STARMATH_HID_SMA_FORMAT_TBX +Infinity sym:STARMATH_HID_SMA_INFINITY +Partial sym:STARMATH_HID_SMA_PARTIAL +Nabla sym:STARMATH_HID_SMA_NABLA +ThereExists sym:STARMATH_HID_SMA_EXISTS +ForAll sym:STARMATH_HID_SMA_FORALL +HBar sym:STARMATH_HID_SMA_HBAR +LambdaBar sym:STARMATH_HID_SMA_LAMBDABAR +RealPart sym:STARMATH_HID_SMA_RE +ImaginaryPart sym:STARMATH_HID_SMA_IM +WeierstrassP sym:STARMATH_HID_SMA_WP +LeftArrow sym:STARMATH_HID_SMA_LEFTARROW +RightArrow sym:STARMATH_HID_SMA_RIGHTARROW +UpArrow sym:STARMATH_HID_SMA_UPARROW +DownArrow sym:STARMATH_HID_SMA_DOWNARROW +DotsBottom sym:STARMATH_HID_SMA_DOTSLOW +CenterDots sym:STARMATH_HID_SMA_DOTSAXIS +DotsVertically sym:STARMATH_HID_SMA_DOTSVERT +DotsToTop sym:STARMATH_HID_SMA_DOTSUP +AlignDotsDown sym:STARMATH_HID_SMA_DOTSDOWN -TB_Brackets STARMATH_HID_SMA_BRACKETS_TBX -RoundBrackets STARMATH_HID_SMA_LRPARENTX -SquareBrackets STARMATH_HID_SMA_LRBRACKETX -DoubleSquareBrackets STARMATH_HID_SMA_LRDBRACKETX -SingleLines STARMATH_HID_SMA_LRLINEX -DoubleLines STARMATH_HID_SMA_LRDLINEX -Braces STARMATH_HID_SMA_LRBRACEX -PointedBrackets STARMATH_HID_SMA_LRANGLEX -OperatorBrackets STARMATH_HID_SMA_LMRANGLEXY -GroupBrackets STARMATH_HID_SMA_LRGROUPX -RoundBracketsScaleable STARMATH_HID_SMA_SLRPARENTX -SquareBracketsScaleable STARMATH_HID_SMA_SLRBRACKETX -SquareBracketsScaleable2 STARMATH_HID_SMA_SLRDBRACKETX -SingleLinesScaleable STARMATH_HID_SMA_SLRLINEX -DoubleLinesScaleable STARMATH_HID_SMA_SLRDLINEX -BracesScaleable STARMATH_HID_SMA_SLRBRACEX -PointedBracketsScaleable STARMATH_HID_SMA_SLRANGLEX -OperatorBrackets2 STARMATH_HID_SMA_SLMRANGLEXY -BracesTopScalable STARMATH_HID_SMA_XOVERBRACEY -BracesBottomScalable STARMATH_HID_SMA_XUNDERBRACEY +TB_Brackets sym:STARMATH_HID_SMA_BRACKETS_TBX +RoundBrackets sym:STARMATH_HID_SMA_LRPARENTX +SquareBrackets sym:STARMATH_HID_SMA_LRBRACKETX +DoubleSquareBrackets sym:STARMATH_HID_SMA_LRDBRACKETX +SingleLines sym:STARMATH_HID_SMA_LRLINEX +DoubleLines sym:STARMATH_HID_SMA_LRDLINEX +Braces sym:STARMATH_HID_SMA_LRBRACEX +PointedBrackets sym:STARMATH_HID_SMA_LRANGLEX +OperatorBrackets sym:STARMATH_HID_SMA_LMRANGLEXY +GroupBrackets sym:STARMATH_HID_SMA_LRGROUPX +RoundBracketsScaleable sym:STARMATH_HID_SMA_SLRPARENTX +SquareBracketsScaleable sym:STARMATH_HID_SMA_SLRBRACKETX +SquareBracketsScaleable2 sym:STARMATH_HID_SMA_SLRDBRACKETX +SingleLinesScaleable sym:STARMATH_HID_SMA_SLRLINEX +DoubleLinesScaleable sym:STARMATH_HID_SMA_SLRDLINEX +BracesScaleable sym:STARMATH_HID_SMA_SLRBRACEX +PointedBracketsScaleable sym:STARMATH_HID_SMA_SLRANGLEX +OperatorBrackets2 sym:STARMATH_HID_SMA_SLMRANGLEXY +BracesTopScalable sym:STARMATH_HID_SMA_XOVERBRACEY +BracesBottomScalable sym:STARMATH_HID_SMA_XUNDERBRACEY -TB_Format STARMATH_HID_SMA_FORMAT_TBX -SuperscriptLeft STARMATH_HID_SMA_LSUPX -SuperscriptTop STARMATH_HID_SMA_CSUPX -SuperscriptRight STARMATH_HID_SMA_RSUPX -VerticalStack2Elements STARMATH_HID_SMA_BINOMXY -NewLine STARMATH_HID_SMA_NEWLINE -SubscriptLeft STARMATH_HID_SMA_LSUBX -SubscriptBottom STARMATH_HID_SMA_CSUBX -SubscriptRight STARMATH_HID_SMA_RSUBX -VerticalStack STARMATH_HID_SMA_STACK -SmallGap STARMATH_HID_SMA_SBLANK -AlignLeft STARMATH_HID_SMA_ALIGNLX -AlignCenter STARMATH_HID_SMA_ALIGNCX -AlignRight STARMATH_HID_SMA_ALIGNRX -MatrixStack STARMATH_HID_SMA_MATRIX -Gap STARMATH_HID_SMA_BLANK +TB_Format sym:STARMATH_HID_SMA_FORMAT_TBX +SuperscriptLeft sym:STARMATH_HID_SMA_LSUPX +SuperscriptTop sym:STARMATH_HID_SMA_CSUPX +SuperscriptRight sym:STARMATH_HID_SMA_RSUPX +VerticalStack2Elements sym:STARMATH_HID_SMA_BINOMXY +NewLine sym:STARMATH_HID_SMA_NEWLINE +SubscriptLeft sym:STARMATH_HID_SMA_LSUBX +SubscriptBottom sym:STARMATH_HID_SMA_CSUBX +SubscriptRight sym:STARMATH_HID_SMA_RSUBX +VerticalStack sym:STARMATH_HID_SMA_STACK +SmallGap sym:STARMATH_HID_SMA_SBLANK +AlignLeft sym:STARMATH_HID_SMA_ALIGNLX +AlignCenter sym:STARMATH_HID_SMA_ALIGNCX +AlignRight sym:STARMATH_HID_SMA_ALIGNRX +MatrixStack sym:STARMATH_HID_SMA_MATRIX +Gap sym:STARMATH_HID_SMA_BLANK diff --git a/testautomation/global/win/edia_a_c.win b/testautomation/global/win/edia_a_c.win index 3a0617478895..3335ebef64a3 100644 --- a/testautomation/global/win/edia_a_c.win +++ b/testautomation/global/win/edia_a_c.win @@ -1,389 +1,382 @@ -*AcceptOrRejectChangesArea sc.ModelessDialog.25729 -AreaEditField sc.Edit.25729.11 -ShrinkButton sc.ImageButton.25729.12 - -*ActivationOrder extensions.ModalDialog.1001 -ControlList EXTENSIONS_HID_PROP_TABORDER_CONTROLS -MoveUp extensions.PushButton.1001.1 -MoveDown extensions.PushButton.1001.2 -AutoOrder extensions.PushButton.1001.3 - -*AddBookmark sfx2.ModalDialog.620 -Bookmarkname sfx2.Edit.620.11 - -*AddConditionDLG SVX_HID_XFORMS_ADDCONDITION_DLG -Condition svx.MultiLineEdit.18013.11 -EditNamespaces svx.PushButton.18013.14 - -*AddingPackages DESKTOP_HID_PACKAGE_MANAGER_PROGRESS -Cancel DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL - -*AddUserInterface BASCTL_HID_BASICIDE_ADDNEW_LANGUAGE -AvailableLanguagesListbox basctl.ListBox.16872.2 -AddNewControl BASCTL_HID_BASICIDE_ADDNEW_CONTROL - -*AddTables DBACCESS_HID_DLG_JOIN_TABADD -TableName DBACCESS_HID_JOINSH_ADDTAB_TABLELIST -AddTable dbaccess.PushButton.19214.1 -Tables dbaccess.RadioButton.19214.1 -Queries dbaccess.RadioButton.19214.2 -QueryName DBACCESS_HID_JOINSH_ADDTAB_QUERYLIST -CloseDlg DBACCESS_HID_JOINSH_ADDTAB_CLOSE - -*AddressBookSource svtools.ModalDialog.16484 -DataSource svtools.ComboBox.16484.3 -Administrate svtools.PushButton.16484.4 -Table svtools.ComboBox.16484.6 - -*AddressSourceAutopilot EXTENSIONS_HID_ABSPILOT -TabAdditionalSettings extensions.TabPage.19701 -TabAddressDataSourceAutoPilot extensions.TabPage.19700 -TabDataSourceName extensions.TabPage.19704 -TabSelectTable extensions.TabPage.19721 -CancelButton EXTENSIONS_HID_ABSPILOT_CANCEL -BackButton EXTENSIONS_HID_ABSPILOT_PREVIOUS -NextButton EXTENSIONS_HID_ABSPILOT_NEXT -CreateButton EXTENSIONS_HID_ABSPILOT_FINISH - -*Advanced DBACCESS_HID_DSADMIN_ADVANCED -SQL92Check DBACCESS_HID_DSADMIN_SQL92CHECK -BooleanComparison DBACCESS_HID_DSADMIN_BOOLEANCOMPARISON -AppendAlias DBACCESS_HID_DSADMIN_APPENDTABLEALIAS -ParameterSubstiti DBACCESS_HID_DSADMIN_PARAMETERNAMESUBST -Ignoreprivileges DBACCESS_HID_DSADMIN_IGNOREDRIVER_PRIV -HostName DBACCESS_HID_DSADMIN_HOSTNAME -PortNumber DBACCESS_HID_DSADMIN_PORTNUMBER -TabControl DBACCESS_HID_DSADMIN_TABCONTROL +*AcceptOrRejectChangesArea sym:sc.ModelessDialog.25729 +AreaEditField sym:sc.Edit.25729.11 +ShrinkButton sym:sc.ImageButton.25729.12 + +*ActivationOrder sym:extensions.ModalDialog.1001 +ControlList sym:EXTENSIONS_HID_PROP_TABORDER_CONTROLS +MoveUp sym:extensions.PushButton.1001.1 +MoveDown sym:extensions.PushButton.1001.2 +AutoOrder sym:extensions.PushButton.1001.3 + +*AddBookmark sym:sfx2.ModalDialog.620 +Bookmarkname sym:sfx2.Edit.620.11 + +*AddConditionDLG sym:SVX_HID_XFORMS_ADDCONDITION_DLG +Condition sym:svx.MultiLineEdit.18013.11 +EditNamespaces sym:svx.PushButton.18013.14 + +*AddingPackages sym:DESKTOP_HID_PACKAGE_MANAGER_PROGRESS +Cancel sym:DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL + +*AddUserInterface sym:BASCTL_HID_BASICIDE_ADDNEW_LANGUAGE +AvailableLanguagesListbox sym:basctl.ListBox.16872.2 +AddNewControl sym:BASCTL_HID_BASICIDE_ADDNEW_CONTROL + +*AddTables sym:DBACCESS_HID_DLG_JOIN_TABADD +TableName sym:DBACCESS_HID_JOINSH_ADDTAB_TABLELIST +AddTable sym:dbaccess.PushButton.19214.1 +Tables sym:dbaccess.RadioButton.19214.1 +Queries sym:dbaccess.RadioButton.19214.2 +QueryName sym:DBACCESS_HID_JOINSH_ADDTAB_QUERYLIST +CloseDlg sym:DBACCESS_HID_JOINSH_ADDTAB_CLOSE + +*AddressBookSource sym:svtools.ModalDialog.16484 +DataSource sym:svtools.ComboBox.16484.3 +Administrate sym:svtools.PushButton.16484.4 +Table sym:svtools.ComboBox.16484.6 + +*AddressSourceAutopilot sym:EXTENSIONS_HID_ABSPILOT +TabAdditionalSettings sym:extensions.TabPage.19701 +TabAddressDataSourceAutoPilot sym:extensions.TabPage.19700 +TabDataSourceName sym:extensions.TabPage.19704 +TabSelectTable sym:extensions.TabPage.19721 +CancelButton sym:EXTENSIONS_HID_ABSPILOT_CANCEL +BackButton sym:EXTENSIONS_HID_ABSPILOT_PREVIOUS +NextButton sym:EXTENSIONS_HID_ABSPILOT_NEXT +CreateButton sym:EXTENSIONS_HID_ABSPILOT_FINISH + +*Advanced sym:DBACCESS_HID_DSADMIN_ADVANCED +SQL92Check sym:DBACCESS_HID_DSADMIN_SQL92CHECK +BooleanComparison sym:DBACCESS_HID_DSADMIN_BOOLEANCOMPARISON +AppendAlias sym:DBACCESS_HID_DSADMIN_APPENDTABLEALIAS +ParameterSubstiti sym:DBACCESS_HID_DSADMIN_PARAMETERNAMESUBST +Ignoreprivileges sym:DBACCESS_HID_DSADMIN_IGNOREDRIVER_PRIV +HostName sym:DBACCESS_HID_DSADMIN_HOSTNAME +PortNumber sym:DBACCESS_HID_DSADMIN_PORTNUMBER +TabControl sym:DBACCESS_HID_DSADMIN_TABCONTROL 'TabPage2 dbaccess:TabPage:PAGE_DS_ADABAS_SETTINGS -TabGeneratedValues dbaccess.TabPage.19222 -RetrieveGeneratedValues DBACCESS_HID_DSADMIN_AUTORETRIEVEENABLED -AutoIncrementStatement DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE -QueryGeneratedValues DBACCESS_HID_DSADMIN_RETRIEVE_AUTO -AdvancedSettingsSpecial dbaccess.TabPage.19223 -DisplayVersionColumns DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL -EnableOuterJoin DBACCESS_HID_DSADMIN_ENABLEOUTERJOIN -CheckRequiredFields DBACCESS_HID_DSADMIN_CHECK_REQUIRED_FIELDS - - -*Aging .uno:GraphicFilterSepia -AgingDegree cui.MetricField.10334.2 - -*AlienWarning SFX2_HID_WARNING_ALIENFORMAT -DoNotShowAgain sfx2.CheckBox.2308.16 - -*AppendLibraries basctl.ModalDialog.14890 -Libraries BASCTL_HID_BASICIDE_LIBSDLG_TREE -InsertAsReference basctl.CheckBox.14890.35 -ReplaceExistingLibraries basctl.CheckBox.14890.36 - -*ApplyGallery CUI_HID_GALLERY_APPLY - -*AssingComponent cui.ModalDialog.10297 -ComponentMethodName cui.Edit.10297.45 - -*AssignMacro cui.TabPage.10296 -EventListBox CUI_HID_SVX_MACRO_LB_EVENT -AssignButton cui.PushButton.10296.2 -Component cui.PushButton.10296.7 -RemoveButton cui.PushButton.10296.3 - -*AutopilotAgenda WIZARDS_HID_AGWIZ -ItemScrollbar WIZARDS_HID_AGWIZ_5_SCROLL_BAR -TopicText1 WIZARDS_HID_AGWIZ_5_TXT_TOPIC_1 -ResposibleText1 WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_1 -MinutesText1 WIZARDS_HID_AGWIZ_5_TXT_MINUTES_1 -TopicText2 WIZARDS_HID_AGWIZ_5_TXT_TOPIC_2 -ResposibleText2 WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_2 -MinutesText2 WIZARDS_HID_AGWIZ_5_TXT_MINUTES_2 -TopicText3 WIZARDS_HID_AGWIZ_5_TXT_TOPIC_3 -ResposibleText3 WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_3 -MinutesText3 WIZARDS_HID_AGWIZ_5_TXT_MINUTES_3 -TopicText4 WIZARDS_HID_AGWIZ_5_TXT_TOPIC_4 -ResposibleText4 WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_4 -MinutesText4 WIZARDS_HID_AGWIZ_5_TXT_MINUTES_4 -TopicText5 WIZARDS_HID_AGWIZ_5_TXT_TOPIC_5 -ResponsibleText5 WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_5 -MinutesText5 WIZARDS_HID_AGWIZ_5_TXT_MINUTES_5 -PagedesignList WIZARDS_HID_AGWIZ_1_LIST_PAGEDESIGN -CBMinutes WIZARDS_HID_AGWIZ_1_CHK_MINUTES -DateText WIZARDS_HID_AGWIZ_2_TXT_DATE -TimeText WIZARDS_HID_AGWIZ_2_TXT_TIME -TitleText WIZARDS_HID_AGWIZ_2_TXT_TITLE -LocationText WIZARDS_HID_AGWIZ_2_TXT_LOCATION -CBMeetingType WIZARDS_HID_AGWIZ_3_CHK_MEETING_TYPE -CBRead WIZARDS_HID_AGWIZ_3_CHK_READ -CBBring WIZARDS_HID_AGWIZ_3_CHK_BRING -CBNotes WIZARDS_HID_AGWIZ_3_CHK_NOTES -CBCalledBy WIZARDS_HID_AGWIZ_4_CHK_CALLED_BY -CBFacilitator WIZARDS_HID_AGWIZ_4_CHK_FACILITATOR -CBNotetaker WIZARDS_HID_AGWIZ_4_CHK_NOTETAKER -CBTimeKeeper WIZARDS_HID_AGWIZ_4_CHK_TIMEKEEPER -CBAttendees WIZARDS_HID_AGWIZ_4_CHK_ATTENDEES -CBObservers WIZARDS_HID_AGWIZ_4_CHK_OBSERVERS -CBRessourcePersons WIZARDS_HID_AGWIZ_4_CHK_RESOURCEPERSONS -InsertButton WIZARDS_HID_AGWIZ_5_BTN_INSERT -RemoveButton WIZARDS_HID_AGWIZ_5_BTN_REMOVE -UpButton WIZARDS_HID_AGWIZ_5_BTN_UP -DownButton WIZARDS_HID_AGWIZ_5_BTN_DOWN -TemplateName WIZARDS_HID_AGWIZ_6_TXT_TEMPLATENAME -TemplatePath WIZARDS_HID_AGWIZ_6_TXT_TEMPLATEPATH -SaveAsButton WIZARDS_HID_AGWIZ_6_BTN_TEMPLATEPATH -CreateAgenda WIZARDS_HID_AGWIZ_6_OPT_CREATEAGENDA -MakeChanges WIZARDS_HID_AGWIZ_6_OPT_MAKECHANGES -BackButton WIZARDS_HID_AGWIZ_NEXT -NextButton WIZARDS_HID_AGWIZ_PREV -CreateButton WIZARDS_HID_AGWIZ_CREATE -CancelButton WIZARDS_HID_AGWIZ_CANCEL - -*AutopilotFax WIZARDS_HID_FAXWIZARD -Business WIZARDS_HID_FAXWIZ_OPTBUSINESSFAX -Personal WIZARDS_HID_FAXWIZ_OPTPRIVATEFAX -BusinessStyle WIZARDS_HID_FAXWIZ_LSTBUSINESSSTYLE -PersonalStyle WIZARDS_HID_LSTPRIVATESTYLE -Logo WIZARDS_HID_CHKUSELOGO -Date WIZARDS_HID_CHKUSEDATE -CommForm WIZARDS_HID_CHKUSECOMMUNICATIONTYPE -ListCommForm WIZARDS_HID_LSTCOMMUNICATIONTYPE -Subject WIZARDS_HID_CHKUSESUBJECT -Salutation WIZARDS_HID_CHKUSESALUTATION -ListSalutation WIZARDS_HID_LSTSALUTATION -ComplimentaryClose WIZARDS_HID_CHKUSEGREETING -ListGreetings WIZARDS_HID_LSTGREETING -Footer WIZARDS_HID_CHKUSEFOOTER -UseReturnAddress WIZARDS_HID_OPTSENDERPLACEHOLDER -NewSenderAddress WIZARDS_HID_OPTSENDERDEFINE -SenderName WIZARDS_HID_TXTSENDERNAME -SenderStreet WIZARDS_HID_TXTSENDERSTREET -SenderPostcode WIZARDS_HID_TXTSENDERPOSTCODE -SenderState WIZARDS_HID_TXTSENDERSTATE -SenderCity WIZARDS_HID_TXTSENDERCITY -SenderFax WIZARDS_HID_TXTSENDERFAX -RecipientUsePlaceholder WIZARDS_HID_OPTRECEIVERPLACEHOLDER -RecipientUseDatabase WIZARDS_HID_OPTRECEIVERDATABASE -FooterText WIZARDS_HID_TXTFOOTER -FooterOnNextPages WIZARDS_HID_CHKFOOTERNEXTPAGES -FooterPageNumbers WIZARDS_HID_CHKFOOTERPAGENUMBERS -TemplateName WIZARDS_HID_TXTTEMPLATENAME -TextPath WIZARDS_HID_FAXWIZ_TXTPATH -CreateFax WIZARDS_HID_OPTCREATEFAX -MakeChanges WIZARDS_HID_OPTMAKECHANGES -UseAddressDatabase WIZARDS_HID_FILETEMPLATEPATH -BusinessFax RID_TOOLBOX_INSERT -PageDesignBusiness RID_TOOLBOX_INSCELLS -PersonalFax RID_TOOLBOX_INSOBJ -MailView HID_INTERFACE_SFXMAILVIEW -ReturnAddressUseUserData HID_INTERFACE_SFXFRAMESETVIEW -NewReturnAddress HID_INTERFACE_SFXFRAMESETSOURCEVIEW -Street HID_INTERFACE_SFXHELP_VIEWSH -SaveAsButton WIZARDS_HID_FAXWIZ_CMDPATH -BackButton WIZARDS_HID_FAXWIZARD_BACK -NextButton WIZARDS_HID_FAXWIZARD_NEXT -FinishButton WIZARDS_HID_FAXWIZARD_CREATE -CancelButton WIZARDS_HID_FAXWIZARD_CANCEL - -*AutopilotGroupElement extensions.ModalDialog.19721 -BackButton EXTENSIONS_HID_GROUPWIZARD_PREVIOUS -NextButton EXTENSIONS_HID_GROUPWIZARD_NEXT -CancelButton EXTENSIONS_HID_GROUPWIZARD_CANCEL -CreateButton EXTENSIONS_HID_GROUPWIZARD_FINISH -TabGroupBoxData extensions.TabPage.19722 -TabDefaultFieldSelection extensions.TabPage.19723 -TabDatabaseValues extensions.TabPage.19724 -TabCreateOptionGroup extensions.TabPage.19726 - -*AutopilotLetter WIZARDS_HID_LTRWIZARD -Business WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER -BusinessStyle WIZARDS_HID_LTRWIZ_LSTBUSINESSSTYLE -LetterHead WIZARDS_HID_LTRWIZ_CHKBUSINESSPAPER -Formal WIZARDS_HID_LTRWIZ_OPTPRIVOFFICIALLETTER -FormalStyle WIZARDS_HID_LTRWIZ_LSTPRIVOFFICIALSTYLE -Personal WIZARDS_HID_LTRWIZ_OPTPRIVATELETTER -PersonalStyle WIZARDS_HID_LTRWIZ_LSTPRIVATESTYLE -Logo WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYLOGO -LogoHeight WIZARDS_HID_LTRWIZ_NUMLOGOHEIGHT -LogoXpos WIZARDS_HID_LTRWIZ_NUMLOGOX -LogoWidth WIZARDS_HID_LTRWIZ_NUMLOGOWIDTH -LogoYpos WIZARDS_HID_LTRWIZ_NUMLOGOY -ReturnAddress WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYADDRESS -AddressHeight WIZARDS_HID_LTRWIZ_NUMADDRESSHEIGHT -AddressXpos WIZARDS_HID_LTRWIZ_NUMADDRESSX -AddressWidth WIZARDS_HID_LTRWIZ_NUMADDRESSWIDTH -AddressYpos WIZARDS_HID_LTRWIZ_NUMADDRESSY -ReturnAddressCompany WIZARDS_HID_LTRWIZ_CHKCOMPANYRECEIVER -IncludeFooter WIZARDS_HID_LTRWIZ_CHKPAPERFOOTER -FooterHeight WIZARDS_HID_LTRWIZ_NUMFOOTERHEIGHT -LetterPageNorm WIZARDS_HID_LTRWIZ_LSTLETTERNORM -LetterUseLogo WIZARDS_HID_LTRWIZ_CHKUSELOGO -ReturnAddressUse WIZARDS_HID_LTRWIZ_CHKUSEADDRESSRECEIVER -LetterSigns WIZARDS_HID_LTRWIZ_CHKUSESIGNS -SubjectLine WIZARDS_HID_LTRWIZ_CHKUSESUBJECT -Salutation WIZARDS_HID_LTRWIZ_CHKUSESALUTATION -ListSalutation WIZARDS_HID_LTRWIZ_LSTSALUTATION -UseFoldMarks WIZARDS_HID_LTRWIZ_CHKUSEBENDMARKS -ComplimantaryClose WIZARDS_HID_LTRWIZ_CHKUSEGREETING -ListGreetings WIZARDS_HID_LTRWIZ_LSTGREETING -UseFooter WIZARDS_HID_LTRWIZ_CHKUSEFOOTER -UseReturnAddress WIZARDS_HID_LTRWIZ_OPTSENDERPLACEHOLDER -NewSenderAddress WIZARDS_HID_LTRWIZ_OPTSENDERDEFINE -SenderName WIZARDS_HID_LTRWIZ_TXTSENDERNAME -SenderStreet WIZARDS_HID_LTRWIZ_TXTSENDERSTREET -SenderPostcode WIZARDS_HID_LTRWIZ_TXTSENDERPOSTCODE -SenderState WIZARDS_HID_LTRWIZ_TXTSENDERSTATE_TEXT -SenderCity WIZARDS_HID_LTRWIZ_TXTSENDERCITY -UsePlaceholder WIZARDS_HID_LTRWIZ_OPTRECEIVERPLACEHOLDER -UseAddressDatabase WIZARDS_HID_LTRWIZ_OPTRECEIVERDATABASE -TextFooter WIZARDS_HID_LTRWIZ_TXTFOOTER -IncludeFromPage2 WIZARDS_HID_LTRWIZ_CHKFOOTERNEXTPAGES -IncludePageNumbers WIZARDS_HID_LTRWIZ_CHKFOOTERPAGENUMBERS -TemplateName WIZARDS_HID_LTRWIZ_TXTTEMPLATENAME -TemplatePath WIZARDS_HID_LTRWIZ_TXTPATH -SaveAsButton WIZARDS_HID_LTRWIZ_CMDPATH -CreateLetter WIZARDS_HID_LTRWIZ_OPTCREATELETTER -ModifyLetter WIZARDS_HID_LTRWIZ_OPTMAKECHANGES -BackButton WIZARDS_HID_LTRWIZARD_BACK -NextButton WIZARDS_HID_LTRWIZARD_NEXT -FinishButton WIZARDS_HID_LTRWIZARD_CREATE -CancelButton WIZARDS_HID_LTRWIZARD_CANCEL - - - - -*AutoPilotListComboBox extensions.ModalDialog.19722 -TabListBoxData extensions.TabPage.19721 -TabTableSelection extensions.TabPage.19727 -TabFieldLink extensions.TabPage.19729 -TabDatabaseField extensions.TabPage.19725 -BackButton EXTENSIONS_HID_LISTWIZARD_PREVIOUS -NextButton EXTENSIONS_HID_LISTWIZARD_NEXT -CancelButton EXTENSIONS_HID_LISTWIZARD_CANCEL -CreateButton EXTENSIONS_HID_LISTWIZARD_FINISH - -*AutopilotTableElement extensions.ModalDialog.19723 -TabTableFieldSelection extensions.TabPage.19730 -BackButton EXTENSIONS_HID_GRIDWIZARD_PREVIOUS -NextButton EXTENSIONS_HID_GRIDWIZARD_NEXT -CancelButton EXTENSIONS_HID_GRIDWIZARD_CANCEL -CreateButton EXTENSIONS_HID_GRIDWIZARD_FINISH - -*BackgroundImages WIZARDS_HID_BG -Image1 WIZARDS_HID_BG_BTN_IMG1 -Image2 WIZARDS_HID_BG_BTN_IMG2 -Image3 WIZARDS_HID_BG_BTN_IMG3 -Image4 WIZARDS_HID_BG_BTN_IMG14 -Image5 WIZARDS_HID_BG_BTN_IMG5 -Image6 WIZARDS_HID_BG_BTN_IMG6 -Image7 WIZARDS_HID_BG_BTN_IMG7 -Image8 WIZARDS_HID_BG_BTN_IMG8 -Image9 WIZARDS_HID_BG_BTN_IMG9 -Image10 WIZARDS_HID_BG_BTN_IMG10 -Image11 WIZARDS_HID_BG_BTN_IMG11 -Image12 WIZARDS_HID_BG_BTN_IMG12 -Back WIZARDS_HID_BG_BTN_BACK -Forward WIZARDS_HID_BG_BTN_FW -None WIZARDS_HID_BG_BTN_NONE -Other WIZARDS_HID_BG_BTN_OTHER -CancelB WIZARDS_HID_BG_BTN_CANCEL - -*BasicIDE BASCTL_HID_BASICIDE_MODULWINDOW -EditWindow BASCTL_HID_BASICIDE_EDITORWINDOW -BreakPointsWindow BASCTL_HID_BASICIDE_BREAKPOINTWINDOW -DialogWindow BASCTL_HID_BASICIDE_DIALOGWINDOW -Tabbar BASCTL_HID_BASICIDE_TABBAR -Watch BASCTL_HID_BASICIDE_WATCHWINDOW -WatchEdit BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT -WatchList BASCTL_HID_BASICIDE_WATCHWINDOW_LIST -Remove BASCTL_HID_BASICIDE_REMOVEWATCH -Calls BASCTL_HID_BASICIDE_STACKWINDOW -CallsList BASCTL_HID_BASICIDE_STACKWINDOW_LIST -GotoAll BASCTL_HID_BASICIDE_GOTOALL - -*Bibliography EXTENSIONS_HID_BIB_CONTROL_PARENT -ShortName EXTENSIONS_HID_BIB_IDENTIFIER_POS -Type EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS -Year EXTENSIONS_HID_BIB_YEAR_POS -Author EXTENSIONS_HID_BIB_AUTHOR_POS -Title EXTENSIONS_HID_BIB_TITLE_POS -Publisher EXTENSIONS_HID_BIB_PUBLISHER_POS -Address EXTENSIONS_HID_BIB_ADDRESS_POS -ISBN EXTENSIONS_HID_BIB_ISBN_POS -Chapter EXTENSIONS_HID_BIB_CHAPTER_POS -Pages EXTENSIONS_HID_BIB_PAGES_POS -Editor EXTENSIONS_HID_BIB_EDITOR_POS -Edition EXTENSIONS_HID_BIB_EDITION_POS -Booktitle EXTENSIONS_HID_BIB_BOOKTITLE_POS -Volume EXTENSIONS_HID_BIB_VOLUME_POS -HowPublished EXTENSIONS_HID_BIB_HOWPUBLISHED_POS -Organization EXTENSIONS_HID_BIB_ORGANIZATIONS_POS -Institution EXTENSIONS_HID_BIB_INSTITUTION_POS -School EXTENSIONS_HID_BIB_SCHOOL_POS -Report EXTENSIONS_HID_BIB_REPORTTYPE_POS -Month EXTENSIONS_HID_BIB_MONTH_POS -Journal EXTENSIONS_HID_BIB_JOURNAL_POS -Number EXTENSIONS_HID_BIB_NUMBER_POS -Series EXTENSIONS_HID_BIB_SERIES_POS -Annote EXTENSIONS_HID_BIB_ANNOTE_POS -Note EXTENSIONS_HID_BIB_NOTE_POS -URL EXTENSIONS_HID_BIB_URL_POS -Custom1 EXTENSIONS_HID_BIB_CUSTOM1_POS -Custom2 EXTENSIONS_HID_BIB_CUSTOM2_POS -Custom3 EXTENSIONS_HID_BIB_CUSTOM3_POS -Custom4 EXTENSIONS_HID_BIB_CUSTOM4_POS -Custom5 EXTENSIONS_HID_BIB_CUSTOM5_POS - -*Breakpoints basctl.ModalDialog.14930 -BreakpointsList basctl.ComboBox.14930.2 -NewButton basctl.PushButton.14930.5 -Remove basctl.PushButton.14930.6 -ActiveBox basctl.CheckBox.14930.7 -Pass basctl.NumericField.14930.10 - -*CellWarning SC_HID_SC_REPLCELLSWARN - -*ChangeIcon CUI_HID_SVX_CONFIG_ICON_SELECTOR -Import cui.PushButton.390.397 - -*ChangePassword DBACCESS_HID_DLG_PASSWORD -OldPassword dbaccess.Edit.19223.19 -Password dbaccess.Edit.19223.21 -ConfirmPassword dbaccess.Edit.19223.23 - -*ChartType CHART2_HID_DIAGRAM_TYPE -ChooseType CHART2_HID_SCH_CTL_TYPE -Variant CHART2_HID_SCH_CTL_VARIANT -XAxisWithCategories chart2.CheckBox.910.1 -Look3D chart2.CheckBox.910.2 -Scheme3D chart2.ListBox.910.1 -BarColumnShape CHART2_HID_SCH_LB_BAR_GEOMETRY -StackSeries chart2.CheckBox.910.3 -Ontop chart2.RadioButton.910.2 -Percent chart2.RadioButton.910.3 -Deep chart2.RadioButton.910.4 -SmoothLines chart2.CheckBox.910.4 -SmoothLineProperties chart2.PushButton.910.1 -NumberOfLines CHART2_HID_SCH_NUM_OF_LINES - -*ChartWizard CHART2_HID_SCH_CHART_AUTO_FORMAT -RoadMap CHART2_HID_SCH_WIZARD_ROADMAP -GoNext SVT_HID_WIZARD_NEXT -GoBack SVT_HID_WIZARD_PREVIOUS - -*CheckForUpdates EXTENSIONS_HID_CHECK_FOR_UPD_DLG -CloseBtn EXTENSIONS_HID_CHECK_FOR_UPD_CLOSE -Cancel EXTENSIONS_HID_CHECK_FOR_UPD_CANCEL -Pause EXTENSIONS_HID_CHECK_FOR_UPD_PAUSE -Resume EXTENSIONS_HID_CHECK_FOR_UPD_RESUME -Download EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD -Download2 EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD2 -Install EXTENSIONS_HID_CHECK_FOR_UPD_INSTALL -Status EXTENSIONS_HID_CHECK_FOR_UPD_STATUS -Description EXTENSIONS_HID_CHECK_FOR_UPD_DESCRIPTION - -'*ChooseDatabase WIZARDS_HID_DLGFORM_DIALOG +TabGeneratedValues sym:dbaccess.TabPage.19222 +RetrieveGeneratedValues sym:DBACCESS_HID_DSADMIN_AUTORETRIEVEENABLED +AutoIncrementStatement sym:DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE +QueryGeneratedValues sym:DBACCESS_HID_DSADMIN_RETRIEVE_AUTO +AdvancedSettingsSpecial sym:dbaccess.TabPage.19223 +DisplayVersionColumns sym:DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL +EnableOuterJoin sym:DBACCESS_HID_DSADMIN_ENABLEOUTERJOIN +CheckRequiredFields sym:DBACCESS_HID_DSADMIN_CHECK_REQUIRED_FIELDS + + +*Aging sym:.uno:GraphicFilterSepia +AgingDegree sym:cui.MetricField.10334.2 + +*AlienWarning sym:SFX2_HID_WARNING_ALIENFORMAT +DoNotShowAgain sym:sfx2.CheckBox.2308.16 + +*AppendLibraries sym:basctl.ModalDialog.14890 +Libraries sym:BASCTL_HID_BASICIDE_LIBSDLG_TREE +InsertAsReference sym:basctl.CheckBox.14890.35 +ReplaceExistingLibraries sym:basctl.CheckBox.14890.36 + +*ApplyGallery sym:CUI_HID_GALLERY_APPLY + +*AssingComponent sym:cui.ModalDialog.10297 +ComponentMethodName sym:cui.Edit.10297.45 + +*AssignMacro sym:cui.TabPage.10296 +EventListBox sym:CUI_HID_SVX_MACRO_LB_EVENT +AssignButton sym:cui.PushButton.10296.2 +Component sym:cui.PushButton.10296.7 +RemoveButton sym:cui.PushButton.10296.3 + +*AutopilotAgenda sym:WIZARDS_HID_AGWIZ +ItemScrollbar sym:WIZARDS_HID_AGWIZ_5_SCROLL_BAR +TopicText1 sym:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_1 +ResposibleText1 sym:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_1 +MinutesText1 sym:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_1 +TopicText2 sym:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_2 +ResposibleText2 sym:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_2 +MinutesText2 sym:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_2 +TopicText3 sym:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_3 +ResposibleText3 sym:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_3 +MinutesText3 sym:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_3 +TopicText4 sym:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_4 +ResposibleText4 sym:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_4 +MinutesText4 sym:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_4 +TopicText5 sym:WIZARDS_HID_AGWIZ_5_TXT_TOPIC_5 +ResponsibleText5 sym:WIZARDS_HID_AGWIZ_5_TXT_RESPONSIBLE_5 +MinutesText5 sym:WIZARDS_HID_AGWIZ_5_TXT_MINUTES_5 +PagedesignList sym:WIZARDS_HID_AGWIZ_1_LIST_PAGEDESIGN +CBMinutes sym:WIZARDS_HID_AGWIZ_1_CHK_MINUTES +DateText sym:WIZARDS_HID_AGWIZ_2_TXT_DATE +TimeText sym:WIZARDS_HID_AGWIZ_2_TXT_TIME +TitleText sym:WIZARDS_HID_AGWIZ_2_TXT_TITLE +LocationText sym:WIZARDS_HID_AGWIZ_2_TXT_LOCATION +CBMeetingType sym:WIZARDS_HID_AGWIZ_3_CHK_MEETING_TYPE +CBRead sym:WIZARDS_HID_AGWIZ_3_CHK_READ +CBBring sym:WIZARDS_HID_AGWIZ_3_CHK_BRING +CBNotes sym:WIZARDS_HID_AGWIZ_3_CHK_NOTES +CBCalledBy sym:WIZARDS_HID_AGWIZ_4_CHK_CALLED_BY +CBFacilitator sym:WIZARDS_HID_AGWIZ_4_CHK_FACILITATOR +CBNotetaker sym:WIZARDS_HID_AGWIZ_4_CHK_NOTETAKER +CBTimeKeeper sym:WIZARDS_HID_AGWIZ_4_CHK_TIMEKEEPER +CBAttendees sym:WIZARDS_HID_AGWIZ_4_CHK_ATTENDEES +CBObservers sym:WIZARDS_HID_AGWIZ_4_CHK_OBSERVERS +CBRessourcePersons sym:WIZARDS_HID_AGWIZ_4_CHK_RESOURCEPERSONS +InsertButton sym:WIZARDS_HID_AGWIZ_5_BTN_INSERT +RemoveButton sym:WIZARDS_HID_AGWIZ_5_BTN_REMOVE +UpButton sym:WIZARDS_HID_AGWIZ_5_BTN_UP +DownButton sym:WIZARDS_HID_AGWIZ_5_BTN_DOWN +TemplateName sym:WIZARDS_HID_AGWIZ_6_TXT_TEMPLATENAME +TemplatePath sym:WIZARDS_HID_AGWIZ_6_TXT_TEMPLATEPATH +SaveAsButton sym:WIZARDS_HID_AGWIZ_6_BTN_TEMPLATEPATH +CreateAgenda sym:WIZARDS_HID_AGWIZ_6_OPT_CREATEAGENDA +MakeChanges sym:WIZARDS_HID_AGWIZ_6_OPT_MAKECHANGES +BackButton sym:WIZARDS_HID_AGWIZ_NEXT +NextButton sym:WIZARDS_HID_AGWIZ_PREV +CreateButton sym:WIZARDS_HID_AGWIZ_CREATE +CancelButton sym:WIZARDS_HID_AGWIZ_CANCEL + +*AutopilotFax sym:WIZARDS_HID_FAXWIZARD +Business sym:WIZARDS_HID_FAXWIZ_OPTBUSINESSFAX +Personal sym:WIZARDS_HID_FAXWIZ_OPTPRIVATEFAX +BusinessStyle sym:WIZARDS_HID_FAXWIZ_LSTBUSINESSSTYLE +PersonalStyle sym:WIZARDS_HID_LSTPRIVATESTYLE +Logo sym:WIZARDS_HID_CHKUSELOGO +Date sym:WIZARDS_HID_CHKUSEDATE +CommForm sym:WIZARDS_HID_CHKUSECOMMUNICATIONTYPE +ListCommForm sym:WIZARDS_HID_LSTCOMMUNICATIONTYPE +Subject sym:WIZARDS_HID_CHKUSESUBJECT +Salutation sym:WIZARDS_HID_CHKUSESALUTATION +ListSalutation sym:WIZARDS_HID_LSTSALUTATION +ComplimentaryClose sym:WIZARDS_HID_CHKUSEGREETING +ListGreetings sym:WIZARDS_HID_LSTGREETING +Footer sym:WIZARDS_HID_CHKUSEFOOTER +UseReturnAddress sym:WIZARDS_HID_OPTSENDERPLACEHOLDER +NewSenderAddress sym:WIZARDS_HID_OPTSENDERDEFINE +SenderName sym:WIZARDS_HID_TXTSENDERNAME +SenderStreet sym:WIZARDS_HID_TXTSENDERSTREET +SenderPostcode sym:WIZARDS_HID_TXTSENDERPOSTCODE +SenderState sym:WIZARDS_HID_TXTSENDERSTATE +SenderCity sym:WIZARDS_HID_TXTSENDERCITY +SenderFax sym:WIZARDS_HID_TXTSENDERFAX +RecipientUsePlaceholder sym:WIZARDS_HID_OPTRECEIVERPLACEHOLDER +RecipientUseDatabase sym:WIZARDS_HID_OPTRECEIVERDATABASE +FooterText sym:WIZARDS_HID_TXTFOOTER +FooterOnNextPages sym:WIZARDS_HID_CHKFOOTERNEXTPAGES +FooterPageNumbers sym:WIZARDS_HID_CHKFOOTERPAGENUMBERS +TemplateName sym:WIZARDS_HID_TXTTEMPLATENAME +TextPath sym:WIZARDS_HID_FAXWIZ_TXTPATH +CreateFax sym:WIZARDS_HID_OPTCREATEFAX +MakeChanges sym:WIZARDS_HID_OPTMAKECHANGES +UseAddressDatabase sym:WIZARDS_HID_FILETEMPLATEPATH +SaveAsButton sym:WIZARDS_HID_FAXWIZ_CMDPATH +BackButton sym:WIZARDS_HID_FAXWIZARD_BACK +NextButton sym:WIZARDS_HID_FAXWIZARD_NEXT +FinishButton sym:WIZARDS_HID_FAXWIZARD_CREATE +CancelButton sym:WIZARDS_HID_FAXWIZARD_CANCEL + +*AutopilotGroupElement sym:extensions.ModalDialog.19721 +BackButton sym:EXTENSIONS_HID_GROUPWIZARD_PREVIOUS +NextButton sym:EXTENSIONS_HID_GROUPWIZARD_NEXT +CancelButton sym:EXTENSIONS_HID_GROUPWIZARD_CANCEL +CreateButton sym:EXTENSIONS_HID_GROUPWIZARD_FINISH +TabGroupBoxData sym:extensions.TabPage.19722 +TabDefaultFieldSelection sym:extensions.TabPage.19723 +TabDatabaseValues sym:extensions.TabPage.19724 +TabCreateOptionGroup sym:extensions.TabPage.19726 + +*AutopilotLetter sym:WIZARDS_HID_LTRWIZARD +Business sym:WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER +BusinessStyle sym:WIZARDS_HID_LTRWIZ_LSTBUSINESSSTYLE +LetterHead sym:WIZARDS_HID_LTRWIZ_CHKBUSINESSPAPER +Formal sym:WIZARDS_HID_LTRWIZ_OPTPRIVOFFICIALLETTER +FormalStyle sym:WIZARDS_HID_LTRWIZ_LSTPRIVOFFICIALSTYLE +Personal sym:WIZARDS_HID_LTRWIZ_OPTPRIVATELETTER +PersonalStyle sym:WIZARDS_HID_LTRWIZ_LSTPRIVATESTYLE +Logo sym:WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYLOGO +LogoHeight sym:WIZARDS_HID_LTRWIZ_NUMLOGOHEIGHT +LogoXpos sym:WIZARDS_HID_LTRWIZ_NUMLOGOX +LogoWidth sym:WIZARDS_HID_LTRWIZ_NUMLOGOWIDTH +LogoYpos sym:WIZARDS_HID_LTRWIZ_NUMLOGOY +ReturnAddress sym:WIZARDS_HID_LTRWIZ_CHKPAPERCOMPANYADDRESS +AddressHeight sym:WIZARDS_HID_LTRWIZ_NUMADDRESSHEIGHT +AddressXpos sym:WIZARDS_HID_LTRWIZ_NUMADDRESSX +AddressWidth sym:WIZARDS_HID_LTRWIZ_NUMADDRESSWIDTH +AddressYpos sym:WIZARDS_HID_LTRWIZ_NUMADDRESSY +ReturnAddressCompany sym:WIZARDS_HID_LTRWIZ_CHKCOMPANYRECEIVER +IncludeFooter sym:WIZARDS_HID_LTRWIZ_CHKPAPERFOOTER +FooterHeight sym:WIZARDS_HID_LTRWIZ_NUMFOOTERHEIGHT +LetterPageNorm sym:WIZARDS_HID_LTRWIZ_LSTLETTERNORM +LetterUseLogo sym:WIZARDS_HID_LTRWIZ_CHKUSELOGO +ReturnAddressUse sym:WIZARDS_HID_LTRWIZ_CHKUSEADDRESSRECEIVER +LetterSigns sym:WIZARDS_HID_LTRWIZ_CHKUSESIGNS +SubjectLine sym:WIZARDS_HID_LTRWIZ_CHKUSESUBJECT +Salutation sym:WIZARDS_HID_LTRWIZ_CHKUSESALUTATION +ListSalutation sym:WIZARDS_HID_LTRWIZ_LSTSALUTATION +UseFoldMarks sym:WIZARDS_HID_LTRWIZ_CHKUSEBENDMARKS +ComplimantaryClose sym:WIZARDS_HID_LTRWIZ_CHKUSEGREETING +ListGreetings sym:WIZARDS_HID_LTRWIZ_LSTGREETING +UseFooter sym:WIZARDS_HID_LTRWIZ_CHKUSEFOOTER +UseReturnAddress sym:WIZARDS_HID_LTRWIZ_OPTSENDERPLACEHOLDER +NewSenderAddress sym:WIZARDS_HID_LTRWIZ_OPTSENDERDEFINE +SenderName sym:WIZARDS_HID_LTRWIZ_TXTSENDERNAME +SenderStreet sym:WIZARDS_HID_LTRWIZ_TXTSENDERSTREET +SenderPostcode sym:WIZARDS_HID_LTRWIZ_TXTSENDERPOSTCODE +SenderState sym:WIZARDS_HID_LTRWIZ_TXTSENDERSTATE_TEXT +SenderCity sym:WIZARDS_HID_LTRWIZ_TXTSENDERCITY +UsePlaceholder sym:WIZARDS_HID_LTRWIZ_OPTRECEIVERPLACEHOLDER +UseAddressDatabase sym:WIZARDS_HID_LTRWIZ_OPTRECEIVERDATABASE +TextFooter sym:WIZARDS_HID_LTRWIZ_TXTFOOTER +IncludeFromPage2 sym:WIZARDS_HID_LTRWIZ_CHKFOOTERNEXTPAGES +IncludePageNumbers sym:WIZARDS_HID_LTRWIZ_CHKFOOTERPAGENUMBERS +TemplateName sym:WIZARDS_HID_LTRWIZ_TXTTEMPLATENAME +TemplatePath sym:WIZARDS_HID_LTRWIZ_TXTPATH +SaveAsButton sym:WIZARDS_HID_LTRWIZ_CMDPATH +CreateLetter sym:WIZARDS_HID_LTRWIZ_OPTCREATELETTER +ModifyLetter sym:WIZARDS_HID_LTRWIZ_OPTMAKECHANGES +BackButton sym:WIZARDS_HID_LTRWIZARD_BACK +NextButton sym:WIZARDS_HID_LTRWIZARD_NEXT +FinishButton sym:WIZARDS_HID_LTRWIZARD_CREATE +CancelButton sym:WIZARDS_HID_LTRWIZARD_CANCEL + + + + +*AutoPilotListComboBox sym:extensions.ModalDialog.19722 +TabListBoxData sym:extensions.TabPage.19721 +TabTableSelection sym:extensions.TabPage.19727 +TabFieldLink sym:extensions.TabPage.19729 +TabDatabaseField sym:extensions.TabPage.19725 +BackButton sym:EXTENSIONS_HID_LISTWIZARD_PREVIOUS +NextButton sym:EXTENSIONS_HID_LISTWIZARD_NEXT +CancelButton sym:EXTENSIONS_HID_LISTWIZARD_CANCEL +CreateButton sym:EXTENSIONS_HID_LISTWIZARD_FINISH + +*AutopilotTableElement sym:extensions.ModalDialog.19723 +TabTableFieldSelection sym:extensions.TabPage.19730 +BackButton sym:EXTENSIONS_HID_GRIDWIZARD_PREVIOUS +NextButton sym:EXTENSIONS_HID_GRIDWIZARD_NEXT +CancelButton sym:EXTENSIONS_HID_GRIDWIZARD_CANCEL +CreateButton sym:EXTENSIONS_HID_GRIDWIZARD_FINISH + +*BackgroundImages sym:WIZARDS_HID_BG +Image1 sym:WIZARDS_HID_BG_BTN_IMG1 +Image2 sym:WIZARDS_HID_BG_BTN_IMG2 +Image3 sym:WIZARDS_HID_BG_BTN_IMG3 +Image4 sym:WIZARDS_HID_BG_BTN_IMG14 +Image5 sym:WIZARDS_HID_BG_BTN_IMG5 +Image6 sym:WIZARDS_HID_BG_BTN_IMG6 +Image7 sym:WIZARDS_HID_BG_BTN_IMG7 +Image8 sym:WIZARDS_HID_BG_BTN_IMG8 +Image9 sym:WIZARDS_HID_BG_BTN_IMG9 +Image10 sym:WIZARDS_HID_BG_BTN_IMG10 +Image11 sym:WIZARDS_HID_BG_BTN_IMG11 +Image12 sym:WIZARDS_HID_BG_BTN_IMG12 +Back sym:WIZARDS_HID_BG_BTN_BACK +Forward sym:WIZARDS_HID_BG_BTN_FW +None sym:WIZARDS_HID_BG_BTN_NONE +Other sym:WIZARDS_HID_BG_BTN_OTHER +CancelB sym:WIZARDS_HID_BG_BTN_CANCEL + +*BasicIDE sym:BASCTL_HID_BASICIDE_MODULWINDOW +EditWindow sym:BASCTL_HID_BASICIDE_EDITORWINDOW +BreakPointsWindow sym:BASCTL_HID_BASICIDE_BREAKPOINTWINDOW +DialogWindow sym:BASCTL_HID_BASICIDE_DIALOGWINDOW +Tabbar sym:BASCTL_HID_BASICIDE_TABBAR +Watch sym:BASCTL_HID_BASICIDE_WATCHWINDOW +WatchEdit sym:BASCTL_HID_BASICIDE_WATCHWINDOW_EDIT +WatchList sym:BASCTL_HID_BASICIDE_WATCHWINDOW_LIST +Remove sym:BASCTL_HID_BASICIDE_REMOVEWATCH +Calls sym:BASCTL_HID_BASICIDE_STACKWINDOW +CallsList sym:BASCTL_HID_BASICIDE_STACKWINDOW_LIST +GotoAll sym:BASCTL_HID_BASICIDE_GOTOALL + +*Bibliography sym:EXTENSIONS_HID_BIB_CONTROL_PARENT +ShortName sym:EXTENSIONS_HID_BIB_IDENTIFIER_POS +Type sym:EXTENSIONS_HID_BIB_AUTHORITYTYPE_POS +Year sym:EXTENSIONS_HID_BIB_YEAR_POS +Author sym:EXTENSIONS_HID_BIB_AUTHOR_POS +Title sym:EXTENSIONS_HID_BIB_TITLE_POS +Publisher sym:EXTENSIONS_HID_BIB_PUBLISHER_POS +Address sym:EXTENSIONS_HID_BIB_ADDRESS_POS +ISBN sym:EXTENSIONS_HID_BIB_ISBN_POS +Chapter sym:EXTENSIONS_HID_BIB_CHAPTER_POS +Pages sym:EXTENSIONS_HID_BIB_PAGES_POS +Editor sym:EXTENSIONS_HID_BIB_EDITOR_POS +Edition sym:EXTENSIONS_HID_BIB_EDITION_POS +Booktitle sym:EXTENSIONS_HID_BIB_BOOKTITLE_POS +Volume sym:EXTENSIONS_HID_BIB_VOLUME_POS +HowPublished sym:EXTENSIONS_HID_BIB_HOWPUBLISHED_POS +Organization sym:EXTENSIONS_HID_BIB_ORGANIZATIONS_POS +Institution sym:EXTENSIONS_HID_BIB_INSTITUTION_POS +School sym:EXTENSIONS_HID_BIB_SCHOOL_POS +Report sym:EXTENSIONS_HID_BIB_REPORTTYPE_POS +Month sym:EXTENSIONS_HID_BIB_MONTH_POS +Journal sym:EXTENSIONS_HID_BIB_JOURNAL_POS +Number sym:EXTENSIONS_HID_BIB_NUMBER_POS +Series sym:EXTENSIONS_HID_BIB_SERIES_POS +Annote sym:EXTENSIONS_HID_BIB_ANNOTE_POS +Note sym:EXTENSIONS_HID_BIB_NOTE_POS +URL sym:EXTENSIONS_HID_BIB_URL_POS +Custom1 sym:EXTENSIONS_HID_BIB_CUSTOM1_POS +Custom2 sym:EXTENSIONS_HID_BIB_CUSTOM2_POS +Custom3 sym:EXTENSIONS_HID_BIB_CUSTOM3_POS +Custom4 sym:EXTENSIONS_HID_BIB_CUSTOM4_POS +Custom5 sym:EXTENSIONS_HID_BIB_CUSTOM5_POS + +*Breakpoints sym:basctl.ModalDialog.14930 +BreakpointsList sym:basctl.ComboBox.14930.2 +NewButton sym:basctl.PushButton.14930.5 +Remove sym:basctl.PushButton.14930.6 +ActiveBox sym:basctl.CheckBox.14930.7 +Pass sym:basctl.NumericField.14930.10 + +*CellWarning sym:SC_HID_SC_REPLCELLSWARN + +*ChangeIcon sym:CUI_HID_SVX_CONFIG_ICON_SELECTOR +Import sym:cui.PushButton.390.397 + +*ChangePassword sym:DBACCESS_HID_DLG_PASSWORD +OldPassword sym:dbaccess.Edit.19223.19 +Password sym:dbaccess.Edit.19223.21 +ConfirmPassword sym:dbaccess.Edit.19223.23 + +*ChartType sym:CHART2_HID_DIAGRAM_TYPE +ChooseType sym:CHART2_HID_SCH_CTL_TYPE +Variant sym:CHART2_HID_SCH_CTL_VARIANT +XAxisWithCategories sym:chart2.CheckBox.910.1 +Look3D sym:chart2.CheckBox.910.2 +Scheme3D sym:chart2.ListBox.910.1 +BarColumnShape sym:CHART2_HID_SCH_LB_BAR_GEOMETRY +StackSeries sym:chart2.CheckBox.910.3 +Ontop sym:chart2.RadioButton.910.2 +Percent sym:chart2.RadioButton.910.3 +Deep sym:chart2.RadioButton.910.4 +SmoothLines sym:chart2.CheckBox.910.4 +SmoothLineProperties sym:chart2.PushButton.910.1 +NumberOfLines sym:CHART2_HID_SCH_NUM_OF_LINES + +*ChartWizard sym:CHART2_HID_SCH_CHART_AUTO_FORMAT +RoadMap sym:CHART2_HID_SCH_WIZARD_ROADMAP +GoNext sym:SVT_HID_WIZARD_NEXT +GoBack sym:SVT_HID_WIZARD_PREVIOUS + +*CheckForUpdates sym:EXTENSIONS_HID_CHECK_FOR_UPD_DLG +CloseBtn sym:EXTENSIONS_HID_CHECK_FOR_UPD_CLOSE +Cancel sym:EXTENSIONS_HID_CHECK_FOR_UPD_CANCEL +Pause sym:EXTENSIONS_HID_CHECK_FOR_UPD_PAUSE +Resume sym:EXTENSIONS_HID_CHECK_FOR_UPD_RESUME +Download sym:EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD +Download2 sym:EXTENSIONS_HID_CHECK_FOR_UPD_DOWNLOAD2 +Install sym:EXTENSIONS_HID_CHECK_FOR_UPD_INSTALL +Status sym:EXTENSIONS_HID_CHECK_FOR_UPD_STATUS +Description sym:EXTENSIONS_HID_CHECK_FOR_UPD_DESCRIPTION + +'*ChooseDatabase sym:WIZARDS_HID_DLGFORM_DIALOG 'DataSource HID_DLGFORM_CMBAVAILDATABASE 'TablesOrQueries HID_DLGFORM_LBTABLES -'CancelBtn WIZARDS_HID_DLGFORM_CMDCANCEL -'BackBtn WIZARDS_HID_DLGFORM_CMDPREV -'NextBtn WIZARDS_HID_DLGFORM_CMDNEXT +'CancelBtn sym:WIZARDS_HID_DLGFORM_CMDCANCEL +'BackBtn sym:WIZARDS_HID_DLGFORM_CMDPREV +'NextBtn sym:WIZARDS_HID_DLGFORM_CMDNEXT 'MoveSelected HID_DLGFORM_CMDMOVESELECTED 'MoveAll HID_DLGFORM_CMDMOVEALL 'RemoveSelected HID_DLGFORM_CMDREMOVESELECTED @@ -392,87 +385,87 @@ Description EXTENSIONS_HID_CHECK_FOR_UPD_DESCRIPTION 'BinaryFieldsAsImages HID_DLGFORM_OPTBINARIESASGRAPHICS 'ExistingFields HID_DLGFORM_FIELDSAVAILABLE 'FieldsInForm HID_DLGFORM_FIELDSSELECTED -'ColumnarLabelsLeft WIZARDS_HID_DLGFORM_CMDLEFTLABELED -'ColumnarLabelsOnTop WIZARDS_HID_DLGFORM_CMDTOPLABELED -'AsDataSheet WIZARDS_HID_DLGFORM_CMDTABLESTYLE +'ColumnarLabelsLeft sym:WIZARDS_HID_DLGFORM_CMDLEFTLABELED +'ColumnarLabelsOnTop sym:WIZARDS_HID_DLGFORM_CMDTOPLABELED +'AsDataSheet sym:WIZARDS_HID_DLGFORM_CMDTABLESTYLE 'InBlocksLabelsLeft HID_DLGFORM_CMDLEFTJUSTIFIED -'InBlocksLabelsAbove WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED -'PageStyles WIZARDS_HID_DLGFORM_LSTSTYLES -'NoBorder WIZARDS_HID_DLGFORM_CMDNOBORDER -'ThreeDLook WIZARDS_HID_DLGFORM_CMD3DBORDER -'FlatLook WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER +'InBlocksLabelsAbove sym:WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED +'PageStyles sym:WIZARDS_HID_DLGFORM_LSTSTYLES +'NoBorder sym:WIZARDS_HID_DLGFORM_CMDNOBORDER +'ThreeDLook sym:WIZARDS_HID_DLGFORM_CMD3DBORDER +'FlatLook sym:WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER 'TiledLook HID_DLGFORM_OPTBACKGRAPHICTILED 'ScaledLook HID_DLGFORM_OPTBACKGRAPHICAREA -'AlignLeft WIZARDS_HID_DLGFORM_CMDALIGNLEFT -'AlignRight WIZARDS_HID_DLGFORM_CMDALIGNRIGHT - -*ContainerView DBACCESS_UID_APP_CONTAINER_VIEW -'PreviewButton DBACCESS_HID_APP_VIEW_PREVIEW_CB -'PreviewWindow DBACCESS_HID_APP_VIEW_PREVIEW_1 -QueriesTree DBACCESS_HID_APP_QUERY_TREE -TableTree DBACCESS_HID_APP_TABLE_TREE -TablePreview DBACCESS_HID_APP_VIEW_PREVIEW_2 -FormTree DBACCESS_HID_APP_FORM_TREE - -*ControlPropertiesDialog SVX_UID_FORMPROPBROWSER_FRAME - -*ControlPropertiesTabControl EXTENSIONS_HID_FM_PROPDLG_TABCTR -TabGeneralControl EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL -TabDataControl EXTENSIONS_HID_FM_PROPDLG_TAB_DATA -TabEventsControl EXTENSIONS_HID_FM_PROPDLG_TAB_EVT - -*CreateNewAdabasDatabase DBACCESS_HID_DLG_ADABAS_NEWDB -DatabaseName DBACCESS_HID_DLG_ADABAS_DBNAME -Administrator DBACCESS_HID_DLG_ADABAS_SYSUSR -AdminPasswordBtn DBACCESS_HID_DLG_ADABAS_SYSPWD -ControlUser DBACCESS_HID_DLG_ADABAS_CONUSR -ControlPasswordBtn DBACCESS_HID_DLG_ADABAS_CONPWD -DomainUser DBACCESS_HID_DLG_ADABAS_USR -DomainPasswordBtn DBACCESS_HID_DLG_ADABAS_DOMAINPWD -Restore DBACCESS_HID_DLG_ADABAS_RESTORE -RestoreBtn DBACCESS_HID_DLG_ADABAS_PBRESTORE -SysDevSpace DBACCESS_HID_DLG_ADABAS_SYSDEVSPACE -SysDevSpaceBtn DBACCESS_HID_DLG_ADABAS_PBSYSDEVSPACE -Transactionlog DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG -TransactionlogBtn DBACCESS_HID_DLG_ADABAS_PBTRANSACTIONLOG -DataDevSpace DBACCESS_HID_DLG_ADABAS_DATADEVSPACE -DataDevSpaceBtn DBACCESS_HID_DLG_ADABAS_PBDATADEVSPACE -TransactionFilesize DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG_SIZE -DatabaseSize DBACCESS_HID_DLG_ADABAS_DATADEVSPACE_SIZE -DataBuffersize DBACCESS_HID_DLG_ADABAS_CACHE_SIZE - -*ConnectionType DBACCESS_HID_DSADMIN_TYPE_DIALOG -BackBtn DBACCESS_HID_DBWIZ_PREVIOUS -CreateBtn DBACCESS_HID_DBWIZ_FINISH -NextBtn DBACCESS_HID_DBWIZ_NEXT - -*CopyDatabaseTable dbaccess.ModalDialog.19216 -Back dbaccess.PushButton.19216.10 -NextBt dbaccess.PushButton.19216.9 - -*ConfirmDelete svtools.ModalDialog.16376 -Delete svtools.PushButton.16376.4 -DeleteAll svtools.PushButton.16376.6 -DoNotDelete svtools.PushButton.16376.5 - -*CopyToDialog SW_HID_MM_COPYTO -CC sw.Edit.22073.43 -BCC sw.Edit.22073.45 - -*CustomizeAddressList SW_HID_MM_CUSTOMIZE_ADDRESS_LIST -AddressListElements sw.ListBox.22067.2 -Add sw.PushButton.22067.3 -Delete sw.PushButton.22067.4 -Rename sw.PushButton.22067.5 -MoveUp sw.ImageButton.22067.6 -MoveDown sw.ImageButton.22067.7 - -*CustomizeMenuName CUI_HID_SVX_CONFIG_NAME_SUBMENU -Eingabefeld cui.Edit.10062.1 - -*CustomizeMenuReName CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM -Eingabefeld cui.Edit.10062.1 - -*CustomizeToolbarsReName CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM -Eingabefeld cui.Edit.10062.1 +'AlignLeft sym:WIZARDS_HID_DLGFORM_CMDALIGNLEFT +'AlignRight sym:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT + +*ContainerView sym:DBACCESS_UID_APP_CONTAINER_VIEW +'PreviewButton sym:DBACCESS_HID_APP_VIEW_PREVIEW_CB +'PreviewWindow sym:DBACCESS_HID_APP_VIEW_PREVIEW_1 +QueriesTree sym:DBACCESS_HID_APP_QUERY_TREE +TableTree sym:DBACCESS_HID_APP_TABLE_TREE +TablePreview sym:DBACCESS_HID_APP_VIEW_PREVIEW_2 +FormTree sym:DBACCESS_HID_APP_FORM_TREE + +*ControlPropertiesDialog sym:SVX_UID_FORMPROPBROWSER_FRAME + +*ControlPropertiesTabControl sym:EXTENSIONS_HID_FM_PROPDLG_TABCTR +TabGeneralControl sym:EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL +TabDataControl sym:EXTENSIONS_HID_FM_PROPDLG_TAB_DATA +TabEventsControl sym:EXTENSIONS_HID_FM_PROPDLG_TAB_EVT + +*CreateNewAdabasDatabase sym:DBACCESS_HID_DLG_ADABAS_NEWDB +DatabaseName sym:DBACCESS_HID_DLG_ADABAS_DBNAME +Administrator sym:DBACCESS_HID_DLG_ADABAS_SYSUSR +AdminPasswordBtn sym:DBACCESS_HID_DLG_ADABAS_SYSPWD +ControlUser sym:DBACCESS_HID_DLG_ADABAS_CONUSR +ControlPasswordBtn sym:DBACCESS_HID_DLG_ADABAS_CONPWD +DomainUser sym:DBACCESS_HID_DLG_ADABAS_USR +DomainPasswordBtn sym:DBACCESS_HID_DLG_ADABAS_DOMAINPWD +Restore sym:DBACCESS_HID_DLG_ADABAS_RESTORE +RestoreBtn sym:DBACCESS_HID_DLG_ADABAS_PBRESTORE +SysDevSpace sym:DBACCESS_HID_DLG_ADABAS_SYSDEVSPACE +SysDevSpaceBtn sym:DBACCESS_HID_DLG_ADABAS_PBSYSDEVSPACE +Transactionlog sym:DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG +TransactionlogBtn sym:DBACCESS_HID_DLG_ADABAS_PBTRANSACTIONLOG +DataDevSpace sym:DBACCESS_HID_DLG_ADABAS_DATADEVSPACE +DataDevSpaceBtn sym:DBACCESS_HID_DLG_ADABAS_PBDATADEVSPACE +TransactionFilesize sym:DBACCESS_HID_DLG_ADABAS_TRANSACTIONLOG_SIZE +DatabaseSize sym:DBACCESS_HID_DLG_ADABAS_DATADEVSPACE_SIZE +DataBuffersize sym:DBACCESS_HID_DLG_ADABAS_CACHE_SIZE + +*ConnectionType sym:DBACCESS_HID_DSADMIN_TYPE_DIALOG +BackBtn sym:DBACCESS_HID_DBWIZ_PREVIOUS +CreateBtn sym:DBACCESS_HID_DBWIZ_FINISH +NextBtn sym:DBACCESS_HID_DBWIZ_NEXT + +*CopyDatabaseTable sym:dbaccess.ModalDialog.19216 +Back sym:dbaccess.PushButton.19216.10 +NextBt sym:dbaccess.PushButton.19216.9 + +*ConfirmDelete sym:svtools.ModalDialog.16376 +Delete sym:svtools.PushButton.16376.4 +DeleteAll sym:svtools.PushButton.16376.6 +DoNotDelete sym:svtools.PushButton.16376.5 + +*CopyToDialog sym:SW_HID_MM_COPYTO +CC sym:sw.Edit.22073.43 +BCC sym:sw.Edit.22073.45 + +*CustomizeAddressList sym:SW_HID_MM_CUSTOMIZE_ADDRESS_LIST +AddressListElements sym:sw.ListBox.22067.2 +Add sym:sw.PushButton.22067.3 +Delete sym:sw.PushButton.22067.4 +Rename sym:sw.PushButton.22067.5 +MoveUp sym:sw.ImageButton.22067.6 +MoveDown sym:sw.ImageButton.22067.7 + +*CustomizeMenuName sym:CUI_HID_SVX_CONFIG_NAME_SUBMENU +Eingabefeld sym:cui.Edit.10062.1 + +*CustomizeMenuReName sym:CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM +Eingabefeld sym:cui.Edit.10062.1 + +*CustomizeToolbarsReName sym:CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM +Eingabefeld sym:cui.Edit.10062.1 diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index b31b32eef6c6..b912e7e6f509 100644 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -1,508 +1,508 @@ -*Database DBACCESS_UID_APP_VIEW +*Database sym:DBACCESS_UID_APP_VIEW 'UID_APP_VIEW_BORDER_WIN -DatabaseSplitter DBACCESS_UID_APP_VIEW_VERT_SPLIT -DatabaseDetailView DBACCESS_UID_APP_DETAIL_VIEW -CreationList DBACCESS_HID_APP_CREATION_LIST -DatabaseSwapView DBACCESS_UID_APP_SWAP_VIEW -DatabaseSwapIconView DBACCESS_HID_APP_SWAP_ICONCONTROL -DatabaseQueriesView DBACCESS_HID_APP_QUERY_TREE -DatabaseReportsView DBACCESS_HID_APP_REPORT_TREE -DatabaseTablesView DBACCESS_HID_APP_TABLE_TREE - -*DatabaseBeamer DBACCESS_UID_CTL_CONTENT - -*DatabaseProperties DBACCESS_HID_DSADMIN_DIALOG -TabControl DBACCESS_HID_DSADMIN_TABCONTROL -TabConnection dbaccess.TabPage.19206 +DatabaseSplitter sym:DBACCESS_UID_APP_VIEW_VERT_SPLIT +DatabaseDetailView sym:DBACCESS_UID_APP_DETAIL_VIEW +CreationList sym:DBACCESS_HID_APP_CREATION_LIST +DatabaseSwapView sym:DBACCESS_UID_APP_SWAP_VIEW +DatabaseSwapIconView sym:DBACCESS_HID_APP_SWAP_ICONCONTROL +DatabaseQueriesView sym:DBACCESS_HID_APP_QUERY_TREE +DatabaseReportsView sym:DBACCESS_HID_APP_REPORT_TREE +DatabaseTablesView sym:DBACCESS_HID_APP_TABLE_TREE + +*DatabaseBeamer sym:DBACCESS_UID_CTL_CONTENT + +*DatabaseProperties sym:DBACCESS_HID_DSADMIN_DIALOG +TabControl sym:DBACCESS_HID_DSADMIN_TABCONTROL +TabConnection sym:dbaccess.TabPage.19206 'URL dbaccess:Edit:PAGE_CONNECTION:ET_CONNECTURL -Browse DBACCESS_HID_DSADMIN_BROWSECONN -Username dbaccess.Edit.19206.1 -PasswordRequired dbaccess.CheckBox.19206.1 -DriverClass DBACCESS_HID_DSADMIN_DRIVERCLASS -TestDriverClass dbaccess.PushButton.19206.1 -TestConnection dbaccess.PushButton.19206.2 -Reset SFX2_HID_TABDLG_RESET_BTN -TabdBase DBACCESS_HID_DSADMIN_PAGE_DBASE -TabTextBase DBACCESS_HID_DSADMIN_PAGE_TEXT - -*DatabaseWizard DBACCESS_HID_DLG_DATABASE_WIZARD -AdabasDBName DBACCESS_HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME -BackBtn DBACCESS_HID_DBWIZ_PREVIOUS -CancelBtn DBACCESS_HID_DBWIZ_CANCEL -ConnectToDatabase DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE -FinishBtn DBACCESS_HID_DBWIZ_FINISH -CreateNewDatabase DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE -DatabaseType DBACCESS_HID_DSADMIN_DSTYPE -dBasePath DBACCESS_HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION -DocumentList dbaccess.ListBox.19200.3 -LDAPHostName DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER -BaseDN DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN -NextBtn DBACCESS_HID_DBWIZ_NEXT -OpenBtn dbaccess.PushButton.19200.6 -OpenExistingDoc dbaccess.RadioButton.19200.3 -PasswordRequired DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED -SpreadsheetPath DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH -TextPath DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE -UserName DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME -AdabasBrowse DBACCESS_HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME -MySQLODBC DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC -MySQLJDBC DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC -MySQLDatabaseName DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME -MySQLODBCDSName DBACCESS_HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE -MySQLHostName DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER -MySQLPort DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT -AdoURL DBACCESS_HID_PAGE_DBWIZARD_ADO_ET_ADOURL -StartTableWizard DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD - -*CreateDatabaseLink cui.ModalDialog.17024 -DatabaseFile .uno:OpenUrl -Browse cui.PushButton.17024.1 -RegisteredName cui.Edit.17024.1 - -*Diagramdata CHART2_HID_DIAGRAM_DATA -Toolbox2 CHART2_HID_SCH_TBX_DATA -InsertRow CHART2_HID_SCH_TBI_DATA_INSERT_ROW -InsertColumn CHART2_HID_SCH_TBI_DATA_INSERT_COL -InsertTextColumn CHART2_HID_SCH_TBI_DATA_INSERT_TEXT_COL -DeleteRow CHART2_HID_SCH_TBI_DATA_DELETE_ROW -DeleteColumn CHART2_HID_SCH_TBI_DATA_DELETE_COL -SwapColumns CHART2_HID_SCH_TBI_DATA_SWAP_COL -SwapRows CHART2_HID_SCH_TBI_DATA_SWAP_ROW -Tables CHART2_HID_SCH_CTL_DATA -DataSeriesLabel CHART2_HID_SCH_DATA_SERIES_LABEL - -*DigitalSignature XMLSECURITY_HID_XMLSEC_DLG_DIGSIG -ViewCertificate xmlsecurity.PushButton.1000.55 -CertificateList XMLSECURITY_HID_XMLSEC_CTRL_SIGNATURESDLG -Add xmlsecurity.PushButton.1000.2 -Remove xmlsecurity.PushButton.1000.3 - -*DuplicateNameWarning CUI_HID_WARN_NAME_DUPLICATE - -*EditInputList SW_HID_FLD_DROPDOWN -AllListEntrys sw.ListBox.21112.2 -NextListEntry sw.PushButton.21112.5 -EditListEntry sw.PushButton.21112.7 - -*EditSymbols starmath.ModalDialog.20009 -OldSymbol starmath.ComboBox.20009.1 -OldSymbolSet starmath.ComboBox.20009.2 -Symbol starmath.ComboBox.20009.4 -SymbolSet starmath.ComboBox.20009.5 -Font starmath.ListBox.20009.1 -Subset starmath.ListBox.20009.111 -Typeface starmath.ComboBox.20009.3 -Add starmath.PushButton.20009.1 -Modify starmath.PushButton.20009.2 -Delete starmath.PushButton.20009.3 -Symbols STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW - -*ExecuteSQLCommand dbaccess.ModalDialog.19222 -CommandToExecute dbaccess.MultiLineEdit.19222.3 -ExecuteBtn dbaccess.PushButton.19222.4 -PreviousCommands dbaccess.ListBox.19222.6 -Status dbaccess.MultiLineEdit.19222.8 -CloseBtn dbaccess.PushButton.19222.11 - -*ExportBasicLibraryDlg basctl.ModalDialog.14893 -ExportAsPackage basctl.RadioButton.14893.42 -ExportAsLibrary basctl.RadioButton.14893.43 - -*ExtensionSoftwareLicenseAgreement desktop.ModalDialog.6500 -LicenseText desktop.MultiLineEdit.6500.51 -ScrollDown desktop.PushButton.6500.50 -Accept DESKTOP_UID_BTN_LICENSE_ACCEPT - -*ExtensionUpdate DESKTOP_HID_DEPLOYMENT_GUI_UPDATE -ShowAllUpdates desktop.CheckBox.2010.5 -UpdateDescriptions desktop.MultiLineEdit.2010.7 -DownloadAndInstall desktop.PushButton.2010.10 -AvailableUpdatesList DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES -UpdatePublisherText DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER -ReleaseNotesText DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES - - -*FilterDialog DBACCESS_HID_DLG_FILTERCRIT -Fieldname1 dbaccess.ListBox.19206.1 -Condition1 dbaccess.ListBox.19206.2 -Value1 dbaccess.Edit.19206.1 -Operator2 dbaccess.ListBox.19206.7 -Fieldname2 dbaccess.ListBox.19206.3 -Condition2 dbaccess.ListBox.19206.4 -Value2 dbaccess.Edit.19206.2 -Operator3 dbaccess.ListBox.19206.8 -Fieldname3 dbaccess.ListBox.19206.5 -Condition3 dbaccess.ListBox.19206.6 -Value3 dbaccess.Edit.19206.3 - -*FilterNavigator SVX_HID_FILTER_NAVIGATOR - -*FilterWarning CUI_HID_SVXDLG_FILTER_WARNING - -*FindEntry SW_HID_MM_FIND_ENTRY -FindString sw.Edit.22065.2 -FindOnlyIn sw.CheckBox.22065.3 -FindOnlyInWhat sw.ListBox.22065.4 -FindNow sw.PushButton.22065.5 - -*FontworkGallery svx.ModalDialog.10002 -SelectAFontworkStyle SVX_HID_CTL_FONTWORK_FAVORITES - -*FontworkCharacterSpacingCustom svx.ModalDialog.10019 -Value svx.MetricField.10019.7 +Browse sym:DBACCESS_HID_DSADMIN_BROWSECONN +Username sym:dbaccess.Edit.19206.1 +PasswordRequired sym:dbaccess.CheckBox.19206.1 +DriverClass sym:DBACCESS_HID_DSADMIN_DRIVERCLASS +TestDriverClass sym:dbaccess.PushButton.19206.1 +TestConnection sym:dbaccess.PushButton.19206.2 +Reset sym:SFX2_HID_TABDLG_RESET_BTN +TabdBase sym:DBACCESS_HID_DSADMIN_PAGE_DBASE +TabTextBase sym:DBACCESS_HID_DSADMIN_PAGE_TEXT + +*DatabaseWizard sym:DBACCESS_HID_DLG_DATABASE_WIZARD +AdabasDBName sym:DBACCESS_HID_PAGE_DBWIZARD_ADABAS_ET_ADABASNAME +BackBtn sym:DBACCESS_HID_DBWIZ_PREVIOUS +CancelBtn sym:DBACCESS_HID_DBWIZ_CANCEL +ConnectToDatabase sym:DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_GETEXISTINGDATABASE +FinishBtn sym:DBACCESS_HID_DBWIZ_FINISH +CreateNewDatabase sym:DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE +DatabaseType sym:DBACCESS_HID_DSADMIN_DSTYPE +dBasePath sym:DBACCESS_HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION +DocumentList sym:dbaccess.ListBox.19200.3 +LDAPHostName sym:DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER +BaseDN sym:DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN +NextBtn sym:DBACCESS_HID_DBWIZ_NEXT +OpenBtn sym:dbaccess.PushButton.19200.6 +OpenExistingDoc sym:dbaccess.RadioButton.19200.3 +PasswordRequired sym:DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED +SpreadsheetPath sym:DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH +TextPath sym:DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE +UserName sym:DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_ET_GENERALUSERNAME +AdabasBrowse sym:DBACCESS_HID_PAGE_DBWIZARD_ADABAS_PB_ADABASNAME +MySQLODBC sym:DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAODBC +MySQLJDBC sym:DBACCESS_HID_PAGE_DBWIZARD_MYSQL_RB_CONNECTVIAJDBC +MySQLDatabaseName sym:DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLDBNAME +MySQLODBCDSName sym:DBACCESS_HID_PAGE_DBWIZARD_ODBC_ET_NAMEOFODBCDATASOURCE +MySQLHostName sym:DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLHOSTSERVER +MySQLPort sym:DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT +AdoURL sym:DBACCESS_HID_PAGE_DBWIZARD_ADO_ET_ADOURL +StartTableWizard sym:DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD + +*CreateDatabaseLink sym:cui.ModalDialog.17024 +DatabaseFile sym:.uno:OpenUrl +Browse sym:cui.PushButton.17024.1 +RegisteredName sym:cui.Edit.17024.1 + +*Diagramdata sym:CHART2_HID_DIAGRAM_DATA +Toolbox2 sym:CHART2_HID_SCH_TBX_DATA +InsertRow sym:CHART2_HID_SCH_TBI_DATA_INSERT_ROW +InsertColumn sym:CHART2_HID_SCH_TBI_DATA_INSERT_COL +InsertTextColumn sym:CHART2_HID_SCH_TBI_DATA_INSERT_TEXT_COL +DeleteRow sym:CHART2_HID_SCH_TBI_DATA_DELETE_ROW +DeleteColumn sym:CHART2_HID_SCH_TBI_DATA_DELETE_COL +SwapColumns sym:CHART2_HID_SCH_TBI_DATA_SWAP_COL +SwapRows sym:CHART2_HID_SCH_TBI_DATA_SWAP_ROW +Tables sym:CHART2_HID_SCH_CTL_DATA +DataSeriesLabel sym:CHART2_HID_SCH_DATA_SERIES_LABEL + +*DigitalSignature sym:XMLSECURITY_HID_XMLSEC_DLG_DIGSIG +ViewCertificate sym:xmlsecurity.PushButton.1000.55 +CertificateList sym:XMLSECURITY_HID_XMLSEC_CTRL_SIGNATURESDLG +Add sym:xmlsecurity.PushButton.1000.2 +Remove sym:xmlsecurity.PushButton.1000.3 + +*DuplicateNameWarning sym:CUI_HID_WARN_NAME_DUPLICATE + +*EditInputList sym:SW_HID_FLD_DROPDOWN +AllListEntrys sym:sw.ListBox.21112.2 +NextListEntry sym:sw.PushButton.21112.5 +EditListEntry sym:sw.PushButton.21112.7 + +*EditSymbols sym:starmath.ModalDialog.20009 +OldSymbol sym:starmath.ComboBox.20009.1 +OldSymbolSet sym:starmath.ComboBox.20009.2 +Symbol sym:starmath.ComboBox.20009.4 +SymbolSet sym:starmath.ComboBox.20009.5 +Font sym:starmath.ListBox.20009.1 +Subset sym:starmath.ListBox.20009.111 +Typeface sym:starmath.ComboBox.20009.3 +Add sym:starmath.PushButton.20009.1 +Modify sym:starmath.PushButton.20009.2 +Delete sym:starmath.PushButton.20009.3 +Symbols sym:STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW + +*ExecuteSQLCommand sym:dbaccess.ModalDialog.19222 +CommandToExecute sym:dbaccess.MultiLineEdit.19222.3 +ExecuteBtn sym:dbaccess.PushButton.19222.4 +PreviousCommands sym:dbaccess.ListBox.19222.6 +Status sym:dbaccess.MultiLineEdit.19222.8 +CloseBtn sym:dbaccess.PushButton.19222.11 + +*ExportBasicLibraryDlg sym:basctl.ModalDialog.14893 +ExportAsPackage sym:basctl.RadioButton.14893.42 +ExportAsLibrary sym:basctl.RadioButton.14893.43 + +*ExtensionSoftwareLicenseAgreement sym:desktop.ModalDialog.6500 +LicenseText sym:desktop.MultiLineEdit.6500.51 +ScrollDown sym:desktop.PushButton.6500.50 +Accept sym:DESKTOP_UID_BTN_LICENSE_ACCEPT + +*ExtensionUpdate sym:DESKTOP_HID_DEPLOYMENT_GUI_UPDATE +ShowAllUpdates sym:desktop.CheckBox.2010.5 +UpdateDescriptions sym:desktop.MultiLineEdit.2010.7 +DownloadAndInstall sym:desktop.PushButton.2010.10 +AvailableUpdatesList sym:DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES +UpdatePublisherText sym:DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER +ReleaseNotesText sym:DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES + + +*FilterDialog sym:DBACCESS_HID_DLG_FILTERCRIT +Fieldname1 sym:dbaccess.ListBox.19206.1 +Condition1 sym:dbaccess.ListBox.19206.2 +Value1 sym:dbaccess.Edit.19206.1 +Operator2 sym:dbaccess.ListBox.19206.7 +Fieldname2 sym:dbaccess.ListBox.19206.3 +Condition2 sym:dbaccess.ListBox.19206.4 +Value2 sym:dbaccess.Edit.19206.2 +Operator3 sym:dbaccess.ListBox.19206.8 +Fieldname3 sym:dbaccess.ListBox.19206.5 +Condition3 sym:dbaccess.ListBox.19206.6 +Value3 sym:dbaccess.Edit.19206.3 + +*FilterNavigator sym:SVX_HID_FILTER_NAVIGATOR + +*FilterWarning sym:CUI_HID_SVXDLG_FILTER_WARNING + +*FindEntry sym:SW_HID_MM_FIND_ENTRY +FindString sym:sw.Edit.22065.2 +FindOnlyIn sym:sw.CheckBox.22065.3 +FindOnlyInWhat sym:sw.ListBox.22065.4 +FindNow sym:sw.PushButton.22065.5 + +*FontworkGallery sym:svx.ModalDialog.10002 +SelectAFontworkStyle sym:SVX_HID_CTL_FONTWORK_FAVORITES + +*FontworkCharacterSpacingCustom sym:svx.ModalDialog.10019 +Value sym:svx.MetricField.10019.7 *FontWorkAlignment FontWork1TBO *FontWorkCharacterSpacing FontWork2TBO -*FormatColumn SW_HID_FORMAT_COLUMN -ApplyTo sw.ListBox.21004.54 -Columns sw.NumericField.20813.2 -ColumnValueset SW_HID_COLUMN_VALUESET -BalanceColumns sw.CheckBox.20813.58 -Width1 sw.MetricField.20813.25 -Width2 sw.MetricField.20813.26 -Width3 sw.MetricField.20813.27 -ColumnRight sw.ImageButton.20813.31 -ColumnLeft sw.ImageButton.20813.30 -Space12 sw.MetricField.20813.46 -Space23 sw.MetricField.20813.47 -AutoWidth sw.CheckBox.20813.4 -Line sw.ListBox.20813.34 -Height sw.MetricField.20813.36 -Position sw.ListBox.20813.38 -TextDirection sw.ListBox.20813.61 - -*NamespaceDLG SVX_HID_XFORMS_NAMESPACEITEM_DLG -Namespaces SVX_HID_XFORMS_NAMESPACEITEM_LIST -Add svx.PushButton.18014.12 -Edit svx.PushButton.18014.13 -Delete svx.PushButton.18014.14 - -*DatabaseTableSaveAs DBACCESS_HID_DLG_SAVE_AS -Catalog dbaccess.ComboBox.19211.1 -Schema dbaccess.ComboBox.19211.2 -TableName dbaccess.Edit.19211.3 - -*DatabaseSelection DBACCESS_HID_TLB_TREELISTBOX - -*TableView DBACCESS_HID_CTL_TABBROWSER -DataWindow DBACCESS_UID_DATABROWSE_DATAWINDOW -CurrentRecord SVX_HID_GRID_TRAVEL_ABSOLUTE -AllRecords SVX_HID_GRID_NUMBEROFRECORDS -FirstRecord SVX_HID_GRID_TRAVEL_FIRST -PreviousRecord SVX_HID_GRID_TRAVEL_PREV -NextRecord SVX_HID_GRID_TRAVEL_NEXT -LastRecord SVX_HID_GRID_TRAVEL_LAST -NewRecord SVX_HID_GRID_TRAVEL_NEW -TableHeader DBACCESS_HID_DATABROWSE_HEADER - -'*DataSourceAdministration DBACCESS_HID_DSADMIN_DIALOG -'TabControl DBACCESS_HID_DSADMIN_TABCONTROL +*FormatColumn sym:SW_HID_FORMAT_COLUMN +ApplyTo sym:sw.ListBox.21004.54 +Columns sym:sw.NumericField.20813.2 +ColumnValueset sym:SW_HID_COLUMN_VALUESET +BalanceColumns sym:sw.CheckBox.20813.58 +Width1 sym:sw.MetricField.20813.25 +Width2 sym:sw.MetricField.20813.26 +Width3 sym:sw.MetricField.20813.27 +ColumnRight sym:sw.ImageButton.20813.31 +ColumnLeft sym:sw.ImageButton.20813.30 +Space12 sym:sw.MetricField.20813.46 +Space23 sym:sw.MetricField.20813.47 +AutoWidth sym:sw.CheckBox.20813.4 +Line sym:sw.ListBox.20813.34 +Height sym:sw.MetricField.20813.36 +Position sym:sw.ListBox.20813.38 +TextDirection sym:sw.ListBox.20813.61 + +*NamespaceDLG sym:SVX_HID_XFORMS_NAMESPACEITEM_DLG +Namespaces sym:SVX_HID_XFORMS_NAMESPACEITEM_LIST +Add sym:svx.PushButton.18014.12 +Edit sym:svx.PushButton.18014.13 +Delete sym:svx.PushButton.18014.14 + +*DatabaseTableSaveAs sym:DBACCESS_HID_DLG_SAVE_AS +Catalog sym:dbaccess.ComboBox.19211.1 +Schema sym:dbaccess.ComboBox.19211.2 +TableName sym:dbaccess.Edit.19211.3 + +*DatabaseSelection sym:DBACCESS_HID_TLB_TREELISTBOX + +*TableView sym:DBACCESS_HID_CTL_TABBROWSER +DataWindow sym:DBACCESS_UID_DATABROWSE_DATAWINDOW +CurrentRecord sym:SVX_HID_GRID_TRAVEL_ABSOLUTE +AllRecords sym:SVX_HID_GRID_NUMBEROFRECORDS +FirstRecord sym:SVX_HID_GRID_TRAVEL_FIRST +PreviousRecord sym:SVX_HID_GRID_TRAVEL_PREV +NextRecord sym:SVX_HID_GRID_TRAVEL_NEXT +LastRecord sym:SVX_HID_GRID_TRAVEL_LAST +NewRecord sym:SVX_HID_GRID_TRAVEL_NEW +TableHeader sym:DBACCESS_HID_DATABROWSE_HEADER + +'*DataSourceAdministration sym:DBACCESS_HID_DSADMIN_DIALOG +'TabControl sym:DBACCESS_HID_DSADMIN_TABCONTROL 'NewDataSource HID_DSADMIN_DATASOURCE_NEWDS 'DatabaseSourceList HID_DSADMIN_DATASOURCE_DSLIST -'TabGeneral DBACCESS_HID_DSADMIN_PAGE_GENERAL -'TabADO DBACCESS_HID_DSADMIN_PAGE_ADO -'TabdBase DBACCESS_HID_DSADMIN_PAGE_DBASE -'TabODBC DBACCESS_HID_DSADMIN_PAGE_ODBC +'TabGeneral sym:DBACCESS_HID_DSADMIN_PAGE_GENERAL +'TabADO sym:DBACCESS_HID_DSADMIN_PAGE_ADO +'TabdBase sym:DBACCESS_HID_DSADMIN_PAGE_DBASE +'TabODBC sym:DBACCESS_HID_DSADMIN_PAGE_ODBC 'TabAdabasStatistics dbaccess:TabPage:TAB_PAG_ADABAS_SETTINGS -'TabAdabasUserSettings DBACCESS_HID_TAB_PAGE_USERADMIN -'TabJDBC DBACCESS_HID_DSADMIN_PAGE_JDBC -'TabLDAP DBACCESS_HID_DSADMIN_PAGE_LDAP -'TabTextBase DBACCESS_HID_DSADMIN_PAGE_TEXT -'TabTables DBACCESS_HID_DSADMIN_TABLE_SUBSCRIPTION -'TabQueries DBACCESS_HID_DSADMIN_QUERYADMINISTRATION -'TabBaseBookmarks DBACCESS_HID_DSADMIN_DOCUMENTLINKS -'Apply SFX2_HID_TABDLG_APPLY_BTN -'Reset SFX2_HID_TABDLG_RESET_BTN - -*DatabaseIndexes dbaccess.ModalDialog.19219 -NewIndex DBACCESS_HID_DLGIDX_NEWINDEX -DropIndex DBACCESS_HID_DLGIDX_DROPINDEX -RenameIndex DBACCESS_HID_DLGIDX_RENAMEINDEX -SaveIndex DBACCESS_HID_DLGIDX_SAVEINDEX -ResetIndex DBACCESS_HID_DLGIDX_RESETINDEX -IndexList DBACCESS_HID_DLGIDX_INDEXLIST -Unique dbaccess.CheckBox.19219.1 -'IndexDetails DBACCESS_UID_DLGINDEX_INDEXDETAILS_BACK -IndexDetails DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN +'TabAdabasUserSettings sym:DBACCESS_HID_TAB_PAGE_USERADMIN +'TabJDBC sym:DBACCESS_HID_DSADMIN_PAGE_JDBC +'TabLDAP sym:DBACCESS_HID_DSADMIN_PAGE_LDAP +'TabTextBase sym:DBACCESS_HID_DSADMIN_PAGE_TEXT +'TabTables sym:DBACCESS_HID_DSADMIN_TABLE_SUBSCRIPTION +'TabQueries sym:DBACCESS_HID_DSADMIN_QUERYADMINISTRATION +'TabBaseBookmarks sym:DBACCESS_HID_DSADMIN_DOCUMENTLINKS +'Apply sym:SFX2_HID_TABDLG_APPLY_BTN +'Reset sym:SFX2_HID_TABDLG_RESET_BTN + +*DatabaseIndexes sym:dbaccess.ModalDialog.19219 +NewIndex sym:DBACCESS_HID_DLGIDX_NEWINDEX +DropIndex sym:DBACCESS_HID_DLGIDX_DROPINDEX +RenameIndex sym:DBACCESS_HID_DLGIDX_RENAMEINDEX +SaveIndex sym:DBACCESS_HID_DLGIDX_SAVEINDEX +ResetIndex sym:DBACCESS_HID_DLGIDX_RESETINDEX +IndexList sym:DBACCESS_HID_DLGIDX_INDEXLIST +Unique sym:dbaccess.CheckBox.19219.1 +'IndexDetails sym:DBACCESS_UID_DLGINDEX_INDEXDETAILS_BACK +IndexDetails sym:DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN '--0: CONTROL: No entries in Hid.Lst '--0: CHECKBOX: No entries in Hid.Lst -'--38973: LISTBOX: Select one or more fields. DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD -IndexFields DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD +'--38973: LISTBOX: Select one or more fields. sym:DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD +IndexFields sym:DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD '--0: CONTROL: No entries in Hid.Lst '--0: PUSHBUTTON: No entries in Hid.Lst -'--38974: LISTBOX: Select the sort order. DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER +'--38974: LISTBOX: Select the sort order. sym:DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER '--0: CONTROL: No entries in Hid.Lst '--0: PUSHBUTTON: No entries in Hid.Lst -DatabaseIndexesClose dbaccess.PushButton.19219.1 - -*RecordSearch CUI_HID_FM_DLG_SEARCH -SearchForText cui.RadioButton.18007.3 -SearchForNull cui.RadioButton.18007.4 -SearchForNotNull cui.RadioButton.18007.5 -SearchText CUI_HID_SEARCH_TEXT -Formular cui.ListBox.18007.1 -AllFields CUI_HID_SEARCH_ALLFIELDS -FieldSelection CUI_HID_SEARCH_FIELDSELECTION -Position CUI_HID_SEARCH_POSITION -FieldFormat CUI_HID_SEARCH_FORMATTER -MatchCase CUI_HID_SEARCH_CASE -Backwards CUI_HID_SEARCH_BACKWARD -FromTop CUI_HID_SEARCH_STARTOVER -Wildcard CUI_HID_SEARCH_WILDCARD -Regular CUI_HID_SEARCH_REGULAR -SimilaritySearch CUI_HID_SEARCH_APPROX -More CUI_HID_SEARCH_APPROXSETTINGS -Search CUI_HID_SEARCH_BTN_SEARCH -CloseBtn CUI_HID_SEARCH_BTN_CLOSE -RecordCount CUI_UID_SEARCH_RECORDSTATUS +DatabaseIndexesClose sym:dbaccess.PushButton.19219.1 + +*RecordSearch sym:CUI_HID_FM_DLG_SEARCH +SearchForText sym:cui.RadioButton.18007.3 +SearchForNull sym:cui.RadioButton.18007.4 +SearchForNotNull sym:cui.RadioButton.18007.5 +SearchText sym:CUI_HID_SEARCH_TEXT +Formular sym:cui.ListBox.18007.1 +AllFields sym:CUI_HID_SEARCH_ALLFIELDS +FieldSelection sym:CUI_HID_SEARCH_FIELDSELECTION +Position sym:CUI_HID_SEARCH_POSITION +FieldFormat sym:CUI_HID_SEARCH_FORMATTER +MatchCase sym:CUI_HID_SEARCH_CASE +Backwards sym:CUI_HID_SEARCH_BACKWARD +FromTop sym:CUI_HID_SEARCH_STARTOVER +Wildcard sym:CUI_HID_SEARCH_WILDCARD +Regular sym:CUI_HID_SEARCH_REGULAR +SimilaritySearch sym:CUI_HID_SEARCH_APPROX +More sym:CUI_HID_SEARCH_APPROXSETTINGS +Search sym:CUI_HID_SEARCH_BTN_SEARCH +CloseBtn sym:CUI_HID_SEARCH_BTN_CLOSE +RecordCount sym:CUI_UID_SEARCH_RECORDSTATUS *DataSourceSelection dbaccess:Modaldialog:DLG_DATASOURCE_SELECTION -SourceList dbaccess.ListBox.19204.1 -Organize dbaccess.PushButton.19204.5 -Create dbaccess.PushButton.19204.9 +SourceList sym:dbaccess.ListBox.19204.1 +Organize sym:dbaccess.PushButton.19204.5 +Create sym:dbaccess.PushButton.19204.9 -*DataSourcesNotAvailable SW_HID_DATA_SOURCES_UNAVAILABLE +*DataSourcesNotAvailable sym:SW_HID_DATA_SOURCES_UNAVAILABLE -*DocumentConverter WIZARDS_HID_DLGIMPORT_DIALOG +*DocumentConverter sym:WIZARDS_HID_DLGIMPORT_DIALOG 'first page -StarOffice WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS -TextDoc WIZARDS_HID_DLGIMPORT_0_CHKWRITER -Spreadsheet WIZARDS_HID_DLGIMPORT_0_CHKCALC -Drawing WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS -Master WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL -MicrosoftOffice WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS -Word WIZARDS_HID_DLGIMPORT_2_CHKWORD -Excel WIZARDS_HID_DLGIMPORT_2_CHKEXCEL -PowerPoint WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT -CreateLogFile WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE +StarOffice sym:WIZARDS_HID_DLGIMPORT_0_OPTSODOCUMENTS +TextDoc sym:WIZARDS_HID_DLGIMPORT_0_CHKWRITER +Spreadsheet sym:WIZARDS_HID_DLGIMPORT_0_CHKCALC +Drawing sym:WIZARDS_HID_DLGIMPORT_0_CHKIMPRESS +Master sym:WIZARDS_HID_DLGIMPORT_0_CHKMATHGLOBAL +MicrosoftOffice sym:WIZARDS_HID_DLGIMPORT_0_OPTMSDOCUMENTS +Word sym:WIZARDS_HID_DLGIMPORT_2_CHKWORD +Excel sym:WIZARDS_HID_DLGIMPORT_2_CHKEXCEL +PowerPoint sym:WIZARDS_HID_DLGIMPORT_2_CHKPOWERPOINT +CreateLogFile sym:WIZARDS_HID_DLGIMPORT_0_CHKLOGFILE 'second page -Template WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE -IncludingSubdirectoriesTemplate WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE -ImportFormTemplates WIZARDS_HID_DLGIMPORT_2_LBTEMPLATEPATH -ImportFormTemplatesSearch WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT -SaveToTemplates WIZARDS_HID_DLGIMPORT_2_EDTEMPLATEPATH -SaveToTemplatesSearch WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 - -Document WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT -IncludingSubdirectoriesDocument WIZARDS_HID_DLGIMPORT_2_CBDOCUMENTRECURSE -ImportFormDocument WIZARDS_HID_DLGIMPORT_2_LBDOCUMENTPATH -ImportFormDocumentSearch WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT -SaveToDocument WIZARDS_HID_DLGIMPORT_2_EDDOCUMENTPATH -SaveToDocumentSearch WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 +Template sym:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATE +IncludingSubdirectoriesTemplate sym:WIZARDS_HID_DLGIMPORT_2_CBTEMPLATERECURSE +ImportFormTemplates sym:WIZARDS_HID_DLGIMPORT_2_LBTEMPLATEPATH +ImportFormTemplatesSearch sym:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT +SaveToTemplates sym:WIZARDS_HID_DLGIMPORT_2_EDTEMPLATEPATH +SaveToTemplatesSearch sym:WIZARDS_HID_DLGIMPORT_2_CMDTEMPLATEPATHSELECT2 + +Document sym:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENT +IncludingSubdirectoriesDocument sym:WIZARDS_HID_DLGIMPORT_2_CBDOCUMENTRECURSE +ImportFormDocument sym:WIZARDS_HID_DLGIMPORT_2_LBDOCUMENTPATH +ImportFormDocumentSearch sym:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT +SaveToDocument sym:WIZARDS_HID_DLGIMPORT_2_EDDOCUMENTPATH +SaveToDocumentSearch sym:WIZARDS_HID_DLGIMPORT_2_CMDDOCUMENTPATHSELECT2 'third page -Summary WIZARDS_HID_DLGIMPORT_3_TBSUMMARY +Summary sym:WIZARDS_HID_DLGIMPORT_3_TBSUMMARY 'all pages -BackButton WIZARDS_HID_DLGIMPORT_0_CMDPREV -CancelButton WIZARDS_HID_DLGIMPORT_0_CMDCANCEL -HelpButton WIZARDS_HID_DLGIMPORT_0_CMDHELP -ContinueButton WIZARDS_HID_DLGIMPORT_0_CMDNEXT - -*ExternalData sc.ModalDialog.25736 -URLField SC_HID_SCDLG_LINKAREAURL -FileChoose sc.PushButton.25736.6 -TableListBox sc.MultiListBox.25736.9 -Update sc.CheckBox.25736.10 -UpdateTime sc.NumericField.25736.11 - -*FindAndReplace .uno:SearchDialog -SearchFor svx.ComboBox.10020.11 -SearchForStyle svx.ListBox.10020.12 -ReplaceWith svx.ComboBox.10020.16 -ReplaceWithStyle svx.ListBox.10020.17 -SearchNow svx.PushButton.10020.20 -SearchAll svx.PushButton.10020.21 -ReplaceBtn svx.PushButton.10020.23 -ReplaceAll svx.PushButton.10020.24 -MatchCase svx.CheckBox.10020.25 -WholeWordsOnly svx.CheckBox.10020.26 -More svx.MoreButton.10020.31 -CurrentSelectionOnly svx.CheckBox.10020.41 -Backwards svx.CheckBox.10020.42 -RegularExpressions svx.CheckBox.10020.43 -SimilaritySearch svx.CheckBox.10020.44 -SimilaritySearchFor svx.PushButton.10020.45 -SearchForStyles svx.CheckBox.10020.46 -MatchFullHalfWidth svx.CheckBox.10020.47 -SoundsLike svx.CheckBox.10020.48 -SoundsLikeOptions svx.PushButton.10020.49 -Attributes svx.PushButton.10020.50 -Formats svx.PushButton.10020.51 -NoFormat svx.PushButton.10020.52 -SearchIn svx.ListBox.10020.55 -Rows svx.RadioButton.10020.57 -Columns svx.RadioButton.10020.58 -SearchInAllSheets svx.CheckBox.10020.59 -Notes svx.CheckBox.10020.60 - -*FormFolderNameDialog DBACCESS_HID_DLG_SAVE_AS -FolderName dbaccess.Edit.19211.3 -FolderReName DBACCESS_HID_DLG_RENAME - -*FormPropertiesDialog SVX_UID_FORMPROPBROWSER_FRAME -FormPropertiesTabControl EXTENSIONS_HID_FM_PROPDLG_TABCTR -TabGeneralForm EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL -TabDataForm EXTENSIONS_HID_FM_PROPDLG_TAB_DATA -TabEventsForm EXTENSIONS_HID_FM_PROPDLG_TAB_EVT - -*FormSaveDialog DBACCESS_HID_EXPLORERDLG_COLLECTION -NewFolder dbaccess.ImageButton.19227.1 -OneLevelUp dbaccess.ImageButton.19227.2 -FormName dbaccess.Edit.19227.1 -SaveBtn dbaccess.PushButton.19227.3 - -*FormWizard WIZARDS_HID_DLGFORM_DIALOG -TablesOrQueriesMaster WIZARDS_HID_DLGFORM_MASTER_LBTABLES -CancelBtn WIZARDS_HID_DLGFORM_CMDCANCEL -BackBtn WIZARDS_HID_DLGFORM_CMDPREV -NextBtn WIZARDS_HID_DLGFORM_CMDNEXT -MasterMoveSelected WIZARDS_HID_DLGFORM_MASTER_CMDMOVESELECTED -MasterMoveAll WIZARDS_HID_DLGFORM_MASTER_CMDMOVEALL -MasterRemoveSelected WIZARDS_HID_DLGFORM_MASTER_CMDREMOVESELECTED -MasterRemoveAll WIZARDS_HID_DLGFORM_MASTER_CMDREMOVEALL -AvailableMasterFields WIZARDS_HID_DLGFORM_MASTER_FIELDSAVAILABLE -FieldsInForm WIZARDS_HID_DLGFORM_MASTER_FIELDSSELECTED -ColumnarLabelsLeft WIZARDS_HID_DLGFORM_CMDLEFTLABELED -ColumnarLabelsOnTop WIZARDS_HID_DLGFORM_CMDTOPLABELED -AsDataSheet WIZARDS_HID_DLGFORM_CMDTABLESTYLE -InBlocksLabelsAbove WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED -PageStyles WIZARDS_HID_DLGFORM_LSTSTYLES -NoBorder WIZARDS_HID_DLGFORM_CMDNOBORDER -ThreeDLook WIZARDS_HID_DLGFORM_CMD3DBORDER -FlatLook WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER -AlignLeft WIZARDS_HID_DLGFORM_CMDALIGNLEFT -AlignRight WIZARDS_HID_DLGFORM_CMDALIGNRIGHT -FinishBtn WIZARDS_HID_DLGFORM_CMDFINISH - -*FunctionsCalc SC_HID_FUNCTION_BOX -FunctionInsert sc.ImageButton.26248.1 -Category sc.ListBox.26248.1 -FunctionList sc.ListBox.26248.2 - -*FunctionWizard FORMULA_HID_FORMULADLG_FORMULA -FunctionWizardTabControl formula.TabControl.31003.18 -TabFunctionWizardFormula FORMULA_HID_FORMULA_FAP_FORMULA -CategoryLB FORMULA_HID_FORMULA_LB_CATEGORY -FunctionLB FORMULA_HID_FORMULA_LB_FUNCTION -TabFunktion FORMULA_HID_FORMULATAB_FUNCTION -Functionsbutton1 FORMULA_HID_FORMULA_FAP_BTN_FX1 -Editfield1 FORMULA_HID_FORMULA_FAP_EDIT1 -Shrink1 FORMULA_HID_FORMULA_FAP_BTN_REF1 -Maximize formula.ImageButton.31003.20 -Functionsbutton2 FORMULA_HID_FORMULA_FAP_BTN_FX2 -Editfield2 FORMULA_HID_FORMULA_FAP_EDIT2 -Shrink2 FORMULA_HID_FORMULA_FAP_BTN_REF2 -Functionsbutton3 FORMULA_HID_FORMULA_FAP_BTN_FX3 -Editfield3 FORMULA_HID_FORMULA_FAP_EDIT3 -Shrink3 FORMULA_HID_FORMULA_FAP_BTN_REF3 -Functionsbutton4 FORMULA_HID_FORMULA_FAP_BTN_FX4 -Editfield4 FORMULA_HID_FORMULA_FAP_EDIT4 -Shrink4 FORMULA_HID_FORMULA_FAP_BTN_REF4 -TabFunctionWizardStructure FORMULA_HID_FORMULATAB_STRUCT -Structure FORMULA_HID_FORMULA_FAP_STRUCT -Formel FORMULA_HID_FORMULA_FAP_FORMULA -Matrix formula.CheckBox.31003.11 -Backward formula.PushButton.31003.8 -Forward formula.PushButton.31003.9 -NextBt formula.PushButton.31005.9 - -*FTPConnection WIZARDS_HID_FTP -ServerName WIZARDS_HID_FTP_SERVER -UserName WIZARDS_HID_FTP_USERNAME -Password WIZARDS_HID_FTP_PASS -Connect WIZARDS_HID_FTP_TEST -ChooseARemoteDirectory WIZARDS_HID_FTP_TXT_PATH -ChooseARemoteDirectoryB WIZARDS_HID_FTP_BTN_PATH -CancelB WIZARDS_HID_FTP_CANCEL - -*LoginDialog UUI_HID_DLG_LOGIN -LoginName UUI_HID_LOGIN_DLG_USER_NAME -LoginPassword UUI_HID_LOGIN_DLG_PASSWORD -LoginSavePassword UUI_HID_LOGIN_DLG_REMEMBER_PASSWORD -Path UUI_HID_LOGIN_DLG_PATH -Browse UUI_HID_LOGIN_DLG_BROWSE -Account UUI_HID_LOGIN_DLG_ACCOUNT -UseSystemCredentials UUI_HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS - -*Gallery .uno:Gallery -NewTheme SVX_HID_GALLERY_NEWTHEME +BackButton sym:WIZARDS_HID_DLGIMPORT_0_CMDPREV +CancelButton sym:WIZARDS_HID_DLGIMPORT_0_CMDCANCEL +HelpButton sym:WIZARDS_HID_DLGIMPORT_0_CMDHELP +ContinueButton sym:WIZARDS_HID_DLGIMPORT_0_CMDNEXT + +*ExternalData sym:sc.ModalDialog.25736 +URLField sym:SC_HID_SCDLG_LINKAREAURL +FileChoose sym:sc.PushButton.25736.6 +TableListBox sym:sc.MultiListBox.25736.9 +Update sym:sc.CheckBox.25736.10 +UpdateTime sym:sc.NumericField.25736.11 + +*FindAndReplace sym:.uno:SearchDialog +SearchFor sym:svx.ComboBox.10020.11 +SearchForStyle sym:svx.ListBox.10020.12 +ReplaceWith sym:svx.ComboBox.10020.16 +ReplaceWithStyle sym:svx.ListBox.10020.17 +SearchNow sym:svx.PushButton.10020.20 +SearchAll sym:svx.PushButton.10020.21 +ReplaceBtn sym:svx.PushButton.10020.23 +ReplaceAll sym:svx.PushButton.10020.24 +MatchCase sym:svx.CheckBox.10020.25 +WholeWordsOnly sym:svx.CheckBox.10020.26 +More sym:svx.MoreButton.10020.31 +CurrentSelectionOnly sym:svx.CheckBox.10020.41 +Backwards sym:svx.CheckBox.10020.42 +RegularExpressions sym:svx.CheckBox.10020.43 +SimilaritySearch sym:svx.CheckBox.10020.44 +SimilaritySearchFor sym:svx.PushButton.10020.45 +SearchForStyles sym:svx.CheckBox.10020.46 +MatchFullHalfWidth sym:svx.CheckBox.10020.47 +SoundsLike sym:svx.CheckBox.10020.48 +SoundsLikeOptions sym:svx.PushButton.10020.49 +Attributes sym:svx.PushButton.10020.50 +Formats sym:svx.PushButton.10020.51 +NoFormat sym:svx.PushButton.10020.52 +SearchIn sym:svx.ListBox.10020.55 +Rows sym:svx.RadioButton.10020.57 +Columns sym:svx.RadioButton.10020.58 +SearchInAllSheets sym:svx.CheckBox.10020.59 +Notes sym:svx.CheckBox.10020.60 + +*FormFolderNameDialog sym:DBACCESS_HID_DLG_SAVE_AS +FolderName sym:dbaccess.Edit.19211.3 +FolderReName sym:DBACCESS_HID_DLG_RENAME + +*FormPropertiesDialog sym:SVX_UID_FORMPROPBROWSER_FRAME +FormPropertiesTabControl sym:EXTENSIONS_HID_FM_PROPDLG_TABCTR +TabGeneralForm sym:EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL +TabDataForm sym:EXTENSIONS_HID_FM_PROPDLG_TAB_DATA +TabEventsForm sym:EXTENSIONS_HID_FM_PROPDLG_TAB_EVT + +*FormSaveDialog sym:DBACCESS_HID_EXPLORERDLG_COLLECTION +NewFolder sym:dbaccess.ImageButton.19227.1 +OneLevelUp sym:dbaccess.ImageButton.19227.2 +FormName sym:dbaccess.Edit.19227.1 +SaveBtn sym:dbaccess.PushButton.19227.3 + +*FormWizard sym:WIZARDS_HID_DLGFORM_DIALOG +TablesOrQueriesMaster sym:WIZARDS_HID_DLGFORM_MASTER_LBTABLES +CancelBtn sym:WIZARDS_HID_DLGFORM_CMDCANCEL +BackBtn sym:WIZARDS_HID_DLGFORM_CMDPREV +NextBtn sym:WIZARDS_HID_DLGFORM_CMDNEXT +MasterMoveSelected sym:WIZARDS_HID_DLGFORM_MASTER_CMDMOVESELECTED +MasterMoveAll sym:WIZARDS_HID_DLGFORM_MASTER_CMDMOVEALL +MasterRemoveSelected sym:WIZARDS_HID_DLGFORM_MASTER_CMDREMOVESELECTED +MasterRemoveAll sym:WIZARDS_HID_DLGFORM_MASTER_CMDREMOVEALL +AvailableMasterFields sym:WIZARDS_HID_DLGFORM_MASTER_FIELDSAVAILABLE +FieldsInForm sym:WIZARDS_HID_DLGFORM_MASTER_FIELDSSELECTED +ColumnarLabelsLeft sym:WIZARDS_HID_DLGFORM_CMDLEFTLABELED +ColumnarLabelsOnTop sym:WIZARDS_HID_DLGFORM_CMDTOPLABELED +AsDataSheet sym:WIZARDS_HID_DLGFORM_CMDTABLESTYLE +InBlocksLabelsAbove sym:WIZARDS_HID_DLGFORM_CMDTOPJUSTIFIED +PageStyles sym:WIZARDS_HID_DLGFORM_LSTSTYLES +NoBorder sym:WIZARDS_HID_DLGFORM_CMDNOBORDER +ThreeDLook sym:WIZARDS_HID_DLGFORM_CMD3DBORDER +FlatLook sym:WIZARDS_HID_DLGFORM_CMDSIMPLEBORDER +AlignLeft sym:WIZARDS_HID_DLGFORM_CMDALIGNLEFT +AlignRight sym:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT +FinishBtn sym:WIZARDS_HID_DLGFORM_CMDFINISH + +*FunctionsCalc sym:SC_HID_FUNCTION_BOX +FunctionInsert sym:sc.ImageButton.26248.1 +Category sym:sc.ListBox.26248.1 +FunctionList sym:sc.ListBox.26248.2 + +*FunctionWizard sym:FORMULA_HID_FORMULADLG_FORMULA +FunctionWizardTabControl sym:formula.TabControl.31003.18 +TabFunctionWizardFormula sym:FORMULA_HID_FORMULA_FAP_FORMULA +CategoryLB sym:FORMULA_HID_FORMULA_LB_CATEGORY +FunctionLB sym:FORMULA_HID_FORMULA_LB_FUNCTION +TabFunktion sym:FORMULA_HID_FORMULATAB_FUNCTION +Functionsbutton1 sym:FORMULA_HID_FORMULA_FAP_BTN_FX1 +Editfield1 sym:FORMULA_HID_FORMULA_FAP_EDIT1 +Shrink1 sym:FORMULA_HID_FORMULA_FAP_BTN_REF1 +Maximize sym:formula.ImageButton.31003.20 +Functionsbutton2 sym:FORMULA_HID_FORMULA_FAP_BTN_FX2 +Editfield2 sym:FORMULA_HID_FORMULA_FAP_EDIT2 +Shrink2 sym:FORMULA_HID_FORMULA_FAP_BTN_REF2 +Functionsbutton3 sym:FORMULA_HID_FORMULA_FAP_BTN_FX3 +Editfield3 sym:FORMULA_HID_FORMULA_FAP_EDIT3 +Shrink3 sym:FORMULA_HID_FORMULA_FAP_BTN_REF3 +Functionsbutton4 sym:FORMULA_HID_FORMULA_FAP_BTN_FX4 +Editfield4 sym:FORMULA_HID_FORMULA_FAP_EDIT4 +Shrink4 sym:FORMULA_HID_FORMULA_FAP_BTN_REF4 +TabFunctionWizardStructure sym:FORMULA_HID_FORMULATAB_STRUCT +Structure sym:FORMULA_HID_FORMULA_FAP_STRUCT +Formel sym:FORMULA_HID_FORMULA_FAP_FORMULA +Matrix sym:formula.CheckBox.31003.11 +Backward sym:formula.PushButton.31003.8 +Forward sym:formula.PushButton.31003.9 +NextBt sym:formula.PushButton.31005.9 + +*FTPConnection sym:WIZARDS_HID_FTP +ServerName sym:WIZARDS_HID_FTP_SERVER +UserName sym:WIZARDS_HID_FTP_USERNAME +Password sym:WIZARDS_HID_FTP_PASS +Connect sym:WIZARDS_HID_FTP_TEST +ChooseARemoteDirectory sym:WIZARDS_HID_FTP_TXT_PATH +ChooseARemoteDirectoryB sym:WIZARDS_HID_FTP_BTN_PATH +CancelB sym:WIZARDS_HID_FTP_CANCEL + +*LoginDialog sym:UUI_HID_DLG_LOGIN +LoginName sym:UUI_HID_LOGIN_DLG_USER_NAME +LoginPassword sym:UUI_HID_LOGIN_DLG_PASSWORD +LoginSavePassword sym:UUI_HID_LOGIN_DLG_REMEMBER_PASSWORD +Path sym:UUI_HID_LOGIN_DLG_PATH +Browse sym:UUI_HID_LOGIN_DLG_BROWSE +Account sym:UUI_HID_LOGIN_DLG_ACCOUNT +UseSystemCredentials sym:UUI_HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS + +*Gallery sym:.uno:Gallery +NewTheme sym:SVX_HID_GALLERY_NEWTHEME 'NewThemeName NEW_TITLE_FOR_GALLERY_THEME_EDITFIELD -Gallerys SVX_HID_GALLERY_THEMELIST -ListView SVX_HID_GALLERY_LISTVIEW -IconView SVX_HID_GALLERY_ICONVIEW -View SVX_HID_GALLERY_WINDOW - -*GalleryNewTitle SVX_HID_GALLERY_TITLE -Title CUI_HID_GALLERY_TITLE_EDIT - -*HelpAgent SVT_HID_HELPAGENT_WINDOW - -*HangulHanjaConversion CUI_HID_DIALOG_HANGULHANJA -Original CUI_HID_SPELLDLG_SETWORD -Word CUI_HID_HANGULDLG_EDIT_NEWWORD -Find cui.PushButton.10001.1 -Suggestions CUI_HID_HANGULDLG_SUGGESTIONS_LIST -HangulAndHanja cui.RadioButton.10001.1 -HanjaHangul cui.RadioButton.10001.2 -HangulHanja cui.RadioButton.10001.3 -HanjaAsRubyAbove cui.RadioButton.10001.4 -HanjaAsRubyBelow cui.RadioButton.10001.5 -HangulAsRubyAbove cui.RadioButton.10001.6 -HangulAsRubyBelow cui.RadioButton.10001.7 -HangulOnly cui.CheckBox.10001.2 -HanjaOnly cui.CheckBox.10001.3 -ReplaceByCharacter cui.CheckBox.10001.1 -Ignore CUI_HID_HANGULDLG_BUTTON_IGNORE -AlwaysIgnore CUI_HID_HANGULDLG_BUTTON_IGNOREALL -ReplaceBtn CUI_HID_HANGULDLG_BUTTON_CHANGE -AlwaysReplace CUI_HID_HANGULDLG_BUTTON_CHANGEALL -Options CUI_HID_HANGULDLG_BUTTON_OPTIONS -Grid CUI_HID_HANGULDLG_SUGGESTIONS_GRID - -*HangulHanjaOptions CUI_HID_HANGULHANJA_OPT_DLG -NewDictionary cui.PushButton.10004.1 -EditDictionary cui.PushButton.10004.2 -DeleteDictionary cui.PushButton.10004.3 -UserDefineDictionary CUI_HID_HANGULHANJA_OPT_DICTS_LB -IgnorePostPositionalWord cui.CheckBox.10004.1 -ShowEntries cui.CheckBox.10004.3 -ReplaceUniqueEntries cui.CheckBox.10004.4 - -*HangulHanjaNewDictionary CUI_HID_HANGULHANJA_NEWDICT_DLG -DictionaryName cui.Edit.10006.1 - -*HangulHanjaEditDictionary CUI_HID_HANGULHANJA_EDIT_DLG -Book cui.ListBox.10005.1 -Original cui.ComboBox.10005.2 -Suggestion1 cui.Edit.10005.1 -Suggestion2 cui.Edit.10005.2 -Suggestion3 cui.Edit.10005.3 -Suggestion4 cui.Edit.10005.4 -NewEntry cui.PushButton.10005.1 -DeleteEntry cui.PushButton.10005.2 - -*Hyphenation CUI_HID_HYPHENATE svx:ModalDialog:RID_SVXDLG_HYPHENATE -Wort cui.Edit.10030.10 -Vor cui.ImageButton.10030.11 -Zurueck cui.ImageButton.10030.12 -Weiter cui.PushButton.10030.20 -Entfernen cui.PushButton.10030.21 -HyphenateAll cui.PushButton.10030.25 - -*HyphenationOptions CUI_HID_LNGDLG_NUM_PREBREAK -ZeichenVorUmbruch cui.NumericField.10830.308 - -*HTMLImportOptions sc.ModalDialog.25756 -Automatic sc.RadioButton.25756.5 -Custom sc.RadioButton.25756.6 -CustomLanguage sc.ListBox.25756.7 -DetectSpecialNumbers sc.CheckBox.25756.9 - -*HyperlinkDialog CUI_HID_HYPERLINK_DIALOG -CloseButton CUI_HID_ICCDIALOG_CANCEL_BTN -ApplyButton CUI_HID_ICCDIALOG_OK_BTN -BackButton CUI_HID_ICCDIALOG_RESET_BTN +Gallerys sym:SVX_HID_GALLERY_THEMELIST +ListView sym:SVX_HID_GALLERY_LISTVIEW +IconView sym:SVX_HID_GALLERY_ICONVIEW +View sym:SVX_HID_GALLERY_WINDOW + +*GalleryNewTitle sym:SVX_HID_GALLERY_TITLE +Title sym:CUI_HID_GALLERY_TITLE_EDIT + +*HelpAgent sym:SVT_HID_HELPAGENT_WINDOW + +*HangulHanjaConversion sym:CUI_HID_DIALOG_HANGULHANJA +Original sym:CUI_HID_SPELLDLG_SETWORD +Word sym:CUI_HID_HANGULDLG_EDIT_NEWWORD +Find sym:cui.PushButton.10001.1 +Suggestions sym:CUI_HID_HANGULDLG_SUGGESTIONS_LIST +HangulAndHanja sym:cui.RadioButton.10001.1 +HanjaHangul sym:cui.RadioButton.10001.2 +HangulHanja sym:cui.RadioButton.10001.3 +HanjaAsRubyAbove sym:cui.RadioButton.10001.4 +HanjaAsRubyBelow sym:cui.RadioButton.10001.5 +HangulAsRubyAbove sym:cui.RadioButton.10001.6 +HangulAsRubyBelow sym:cui.RadioButton.10001.7 +HangulOnly sym:cui.CheckBox.10001.2 +HanjaOnly sym:cui.CheckBox.10001.3 +ReplaceByCharacter sym:cui.CheckBox.10001.1 +Ignore sym:CUI_HID_HANGULDLG_BUTTON_IGNORE +AlwaysIgnore sym:CUI_HID_HANGULDLG_BUTTON_IGNOREALL +ReplaceBtn sym:CUI_HID_HANGULDLG_BUTTON_CHANGE +AlwaysReplace sym:CUI_HID_HANGULDLG_BUTTON_CHANGEALL +Options sym:CUI_HID_HANGULDLG_BUTTON_OPTIONS +Grid sym:CUI_HID_HANGULDLG_SUGGESTIONS_GRID + +*HangulHanjaOptions sym:CUI_HID_HANGULHANJA_OPT_DLG +NewDictionary sym:cui.PushButton.10004.1 +EditDictionary sym:cui.PushButton.10004.2 +DeleteDictionary sym:cui.PushButton.10004.3 +UserDefineDictionary sym:CUI_HID_HANGULHANJA_OPT_DICTS_LB +IgnorePostPositionalWord sym:cui.CheckBox.10004.1 +ShowEntries sym:cui.CheckBox.10004.3 +ReplaceUniqueEntries sym:cui.CheckBox.10004.4 + +*HangulHanjaNewDictionary sym:CUI_HID_HANGULHANJA_NEWDICT_DLG +DictionaryName sym:cui.Edit.10006.1 + +*HangulHanjaEditDictionary sym:CUI_HID_HANGULHANJA_EDIT_DLG +Book sym:cui.ListBox.10005.1 +Original sym:cui.ComboBox.10005.2 +Suggestion1 sym:cui.Edit.10005.1 +Suggestion2 sym:cui.Edit.10005.2 +Suggestion3 sym:cui.Edit.10005.3 +Suggestion4 sym:cui.Edit.10005.4 +NewEntry sym:cui.PushButton.10005.1 +DeleteEntry sym:cui.PushButton.10005.2 + +*Hyphenation sym:CUI_HID_HYPHENATE svx:ModalDialog:RID_SVXDLG_HYPHENATE +Wort sym:cui.Edit.10030.10 +Vor sym:cui.ImageButton.10030.11 +Zurueck sym:cui.ImageButton.10030.12 +Weiter sym:cui.PushButton.10030.20 +Entfernen sym:cui.PushButton.10030.21 +HyphenateAll sym:cui.PushButton.10030.25 + +*HyphenationOptions sym:CUI_HID_LNGDLG_NUM_PREBREAK +ZeichenVorUmbruch sym:cui.NumericField.10830.308 + +*HTMLImportOptions sym:sc.ModalDialog.25756 +Automatic sym:sc.RadioButton.25756.5 +Custom sym:sc.RadioButton.25756.6 +CustomLanguage sym:sc.ListBox.25756.7 +DetectSpecialNumbers sym:sc.CheckBox.25756.9 + +*HyperlinkDialog sym:CUI_HID_HYPERLINK_DIALOG +CloseButton sym:CUI_HID_ICCDIALOG_CANCEL_BTN +ApplyButton sym:CUI_HID_ICCDIALOG_OK_BTN +BackButton sym:CUI_HID_ICCDIALOG_RESET_BTN diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win index 33d053e6e914..3108b7cd401e 100644 --- a/testautomation/global/win/edia_i_o.win +++ b/testautomation/global/win/edia_i_o.win @@ -1,294 +1,294 @@ -*IconSets WIZARDS_HID_IS -Image1 WIZARDS_HID_IS_BTN_IMG1 -Image2 WIZARDS_HID_IS_BTN_IMG2 -Image3 WIZARDS_HID_IS_BTN_IMG3 -Image4 WIZARDS_HID_IS_BTN_IMG4 -Image5 WIZARDS_HID_IS_BTN_IMG5 -Image6 WIZARDS_HID_IS_BTN_IMG6 -Image7 WIZARDS_HID_IS_BTN_IMG7 -Image8 WIZARDS_HID_IS_BTN_IMG8 -Image9 WIZARDS_HID_IS_BTN_IMG9 -Image10 WIZARDS_HID_IS_BTN_IMG10 -Image11 WIZARDS_HID_IS_BTN_IMG11 -Image12 WIZARDS_HID_IS_BTN_IMG12 -Image13 WIZARDS_HID_IS_BTN_IMG13 -Image14 WIZARDS_HID_IS_BTN_IMG14 -Image15 WIZARDS_HID_IS_BTN_IMG15 -Image16 WIZARDS_HID_IS_BTN_IMG16 -Image17 WIZARDS_HID_IS_BTN_IMG17 -Image18 WIZARDS_HID_IS_BTN_IMG18 -Image19 WIZARDS_HID_IS_BTN_IMG19 -Image20 WIZARDS_HID_IS_BTN_IMG20 -Image21 WIZARDS_HID_IS_BTN_IMG21 -Image22 WIZARDS_HID_IS_BTN_IMG22 -Image23 WIZARDS_HID_IS_BTN_IMG23 -Image24 WIZARDS_HID_IS_BTN_IMG24 -Image25 WIZARDS_HID_IS_BTN_IMG25 -Image26 WIZARDS_HID_IS_BTN_IMG26 -Image27 WIZARDS_HID_IS_BTN_IMG27 -Image28 WIZARDS_HID_IS_BTN_IMG28 -Image29 WIZARDS_HID_IS_BTN_IMG29 -Image30 WIZARDS_HID_IS_BTN_IMG30 -Image31 WIZARDS_HID_IS_BTN_IMG31 -Image32 WIZARDS_HID_IS_BTN_IMG32 -None WIZARDS_HID_IS_BTN_NONE -CancelB WIZARDS_HID_IS_BTN_CANCEL - -*Indexes dbaccess.ModalDialog.19201 -Table dbaccess.ComboBox.19201.1 -TableIndexes dbaccess.ListBox.19201.1 -FreeIndexes dbaccess.ListBox.19201.2 -Add dbaccess.ImageButton.19201.1 -Remove dbaccess.ImageButton.19201.2 -AddAll dbaccess.ImageButton.19201.3 -RemoveAll dbaccess.ImageButton.19201.4 - -*InsertAxesDialog CHART2_HID_INSERT_AXIS -MajorXaxis CHART2_HID_SCH_CB_XAXIS -MajorYaxis CHART2_HID_SCH_CB_YAXIS -MajorZaxis CHART2_HID_SCH_CB_ZAXIS -SecondaryXaxis CHART2_HID_SCH_CB_SECONDARY_XAXIS -SecondaryYaxis CHART2_HID_SCH_CB_SECONDARY_YAXIS -SecondaryZaxis CHART2_HID_SCH_CB_SECONDARY_ZAXIS - -*InsertDataColumns SW_HID_AP_INSERT_DB_SEL -TableBtn sw.RadioButton.22052.2 -FieldsBtn sw.RadioButton.22052.3 -TextBtn sw.RadioButton.22052.4 -DatabaseColumnsTable sw.ListBox.22052.20 -DatabaseColumns sw.ListBox.22052.15 -FromDatabase sw.RadioButton.22052.12 -FromUser sw.RadioButton.22052.13 -FromUserList sw.ListBox.22052.14 -ToEditButton sw.ImageButton.22052.16 -FieldsInList sw.MultiLineEdit.22052.17 -ParagraphStyle sw.ListBox.22052.19 -AllToButton sw.ImageButton.22052.21 -OneToButton sw.ImageButton.22052.22 -OneFromButton sw.ImageButton.22052.23 -AllFromButton sw.ImageButton.22052.24 -TableColumns sw.ListBox.22052.26 -InsertTableHeading sw.CheckBox.22052.28 -ApplyColumnName sw.RadioButton.22052.29 -CreateRowOnly sw.RadioButton.22052.30 -Properties sw.PushButton.22052.31 -AutoFormat sw.PushButton.22052.32 - -*InsertLabelsDialog CHART2_HID_INSERT_DESCRIPTION -ShowValue CHART2_HID_SCH_DATALABEL_VALUE -AsNumber CHART2_HID_SCH_DATALABEL_NUMBER -AsPercentage CHART2_HID_SCH_DATALABEL_PERCENT -ShowLabelText CHART2_HID_SCH_DATALABEL_TEXT -ShowLegendIconWithLabel CHART2_HID_SCH_DATALABEL_SYMBOL - -*InsertGridsDialog CHART2_HID_INSERT_GRIDS -MainGridXaxis CHART2_HID_SCH_CB_XGRID -MainGridYaxis CHART2_HID_SCH_CB_YGRID -MainGridZaxis CHART2_HID_SCH_CB_ZGRID -MinorGridXaxis CHART2_HID_SCH_CB_SECONDARY_XGRID -MinorGridYaxis CHART2_HID_SCH_CB_SECONDARY_YGRID -MinorGridZaxis CHART2_HID_SCH_CB_SECONDARY_ZGRID +*IconSets sym:WIZARDS_HID_IS +Image1 sym:WIZARDS_HID_IS_BTN_IMG1 +Image2 sym:WIZARDS_HID_IS_BTN_IMG2 +Image3 sym:WIZARDS_HID_IS_BTN_IMG3 +Image4 sym:WIZARDS_HID_IS_BTN_IMG4 +Image5 sym:WIZARDS_HID_IS_BTN_IMG5 +Image6 sym:WIZARDS_HID_IS_BTN_IMG6 +Image7 sym:WIZARDS_HID_IS_BTN_IMG7 +Image8 sym:WIZARDS_HID_IS_BTN_IMG8 +Image9 sym:WIZARDS_HID_IS_BTN_IMG9 +Image10 sym:WIZARDS_HID_IS_BTN_IMG10 +Image11 sym:WIZARDS_HID_IS_BTN_IMG11 +Image12 sym:WIZARDS_HID_IS_BTN_IMG12 +Image13 sym:WIZARDS_HID_IS_BTN_IMG13 +Image14 sym:WIZARDS_HID_IS_BTN_IMG14 +Image15 sym:WIZARDS_HID_IS_BTN_IMG15 +Image16 sym:WIZARDS_HID_IS_BTN_IMG16 +Image17 sym:WIZARDS_HID_IS_BTN_IMG17 +Image18 sym:WIZARDS_HID_IS_BTN_IMG18 +Image19 sym:WIZARDS_HID_IS_BTN_IMG19 +Image20 sym:WIZARDS_HID_IS_BTN_IMG20 +Image21 sym:WIZARDS_HID_IS_BTN_IMG21 +Image22 sym:WIZARDS_HID_IS_BTN_IMG22 +Image23 sym:WIZARDS_HID_IS_BTN_IMG23 +Image24 sym:WIZARDS_HID_IS_BTN_IMG24 +Image25 sym:WIZARDS_HID_IS_BTN_IMG25 +Image26 sym:WIZARDS_HID_IS_BTN_IMG26 +Image27 sym:WIZARDS_HID_IS_BTN_IMG27 +Image28 sym:WIZARDS_HID_IS_BTN_IMG28 +Image29 sym:WIZARDS_HID_IS_BTN_IMG29 +Image30 sym:WIZARDS_HID_IS_BTN_IMG30 +Image31 sym:WIZARDS_HID_IS_BTN_IMG31 +Image32 sym:WIZARDS_HID_IS_BTN_IMG32 +None sym:WIZARDS_HID_IS_BTN_NONE +CancelB sym:WIZARDS_HID_IS_BTN_CANCEL + +*Indexes sym:dbaccess.ModalDialog.19201 +Table sym:dbaccess.ComboBox.19201.1 +TableIndexes sym:dbaccess.ListBox.19201.1 +FreeIndexes sym:dbaccess.ListBox.19201.2 +Add sym:dbaccess.ImageButton.19201.1 +Remove sym:dbaccess.ImageButton.19201.2 +AddAll sym:dbaccess.ImageButton.19201.3 +RemoveAll sym:dbaccess.ImageButton.19201.4 + +*InsertAxesDialog sym:CHART2_HID_INSERT_AXIS +MajorXaxis sym:CHART2_HID_SCH_CB_XAXIS +MajorYaxis sym:CHART2_HID_SCH_CB_YAXIS +MajorZaxis sym:CHART2_HID_SCH_CB_ZAXIS +SecondaryXaxis sym:CHART2_HID_SCH_CB_SECONDARY_XAXIS +SecondaryYaxis sym:CHART2_HID_SCH_CB_SECONDARY_YAXIS +SecondaryZaxis sym:CHART2_HID_SCH_CB_SECONDARY_ZAXIS + +*InsertDataColumns sym:SW_HID_AP_INSERT_DB_SEL +TableBtn sym:sw.RadioButton.22052.2 +FieldsBtn sym:sw.RadioButton.22052.3 +TextBtn sym:sw.RadioButton.22052.4 +DatabaseColumnsTable sym:sw.ListBox.22052.20 +DatabaseColumns sym:sw.ListBox.22052.15 +FromDatabase sym:sw.RadioButton.22052.12 +FromUser sym:sw.RadioButton.22052.13 +FromUserList sym:sw.ListBox.22052.14 +ToEditButton sym:sw.ImageButton.22052.16 +FieldsInList sym:sw.MultiLineEdit.22052.17 +ParagraphStyle sym:sw.ListBox.22052.19 +AllToButton sym:sw.ImageButton.22052.21 +OneToButton sym:sw.ImageButton.22052.22 +OneFromButton sym:sw.ImageButton.22052.23 +AllFromButton sym:sw.ImageButton.22052.24 +TableColumns sym:sw.ListBox.22052.26 +InsertTableHeading sym:sw.CheckBox.22052.28 +ApplyColumnName sym:sw.RadioButton.22052.29 +CreateRowOnly sym:sw.RadioButton.22052.30 +Properties sym:sw.PushButton.22052.31 +AutoFormat sym:sw.PushButton.22052.32 + +*InsertLabelsDialog sym:CHART2_HID_INSERT_DESCRIPTION +ShowValue sym:CHART2_HID_SCH_DATALABEL_VALUE +AsNumber sym:CHART2_HID_SCH_DATALABEL_NUMBER +AsPercentage sym:CHART2_HID_SCH_DATALABEL_PERCENT +ShowLabelText sym:CHART2_HID_SCH_DATALABEL_TEXT +ShowLegendIconWithLabel sym:CHART2_HID_SCH_DATALABEL_SYMBOL + +*InsertGridsDialog sym:CHART2_HID_INSERT_GRIDS +MainGridXaxis sym:CHART2_HID_SCH_CB_XGRID +MainGridYaxis sym:CHART2_HID_SCH_CB_YGRID +MainGridZaxis sym:CHART2_HID_SCH_CB_ZGRID +MinorGridXaxis sym:CHART2_HID_SCH_CB_SECONDARY_XGRID +MinorGridYaxis sym:CHART2_HID_SCH_CB_SECONDARY_YGRID +MinorGridZaxis sym:CHART2_HID_SCH_CB_SECONDARY_ZGRID -*InsertLegendDialog CHART2_HID_INSERT_CHART_LEGEND -Display CHART2_HID_SCH_LEGEND_SHOW -PositionLeft CHART2_HID_SCH_LEGEND_POS_LEFT -PositionTop CHART2_HID_SCH_LEGEND_POS_TOP -PositionRight CHART2_HID_SCH_LEGEND_POS_RIGHT -PositionBottom CHART2_HID_SCH_LEGEND_POS_BOTTOM - -*InsertPaste sd.ModalDialog.678 -Before sd.RadioButton.678.1 -After sd.RadioButton.678.2 +*InsertLegendDialog sym:CHART2_HID_INSERT_CHART_LEGEND +Display sym:CHART2_HID_SCH_LEGEND_SHOW +PositionLeft sym:CHART2_HID_SCH_LEGEND_POS_LEFT +PositionTop sym:CHART2_HID_SCH_LEGEND_POS_TOP +PositionRight sym:CHART2_HID_SCH_LEGEND_POS_RIGHT +PositionBottom sym:CHART2_HID_SCH_LEGEND_POS_BOTTOM + +*InsertPaste sym:sd.ModalDialog.678 +Before sym:sd.RadioButton.678.1 +After sym:sd.RadioButton.678.2 -*InsertTrendlinesDialog CHART2_HID_INSERT_STATISTICS -None CHART2_HID_SCH_TRENDLINE_RB_NONE -Linear CHART2_HID_SCH_TRENDLINE_RB_LINEAR -Logarithmic CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC -Exponential CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL -Power CHART2_HID_SCH_TRENDLINE_RB_POWER -ShowEquation CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION -ShowCorrelationCoefficient CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED - -*InsertTitleDialog CHART2_HID_INSERT_TITLE -MainTitle CHART2_HID_SCH_TITLE_MAIN -SubTitle CHART2_HID_SCH_TITLE_SUB -TitleXaxis CHART2_HID_SCH_TITLE_X -TitleYaxis CHART2_HID_SCH_TITLE_Y -TitleZaxis CHART2_HID_SCH_TITLE_Z -SecondTitleXaxis CHART2_HID_SCH_TITLE_SECONDARY_X -SecondTitleYaxis CHART2_HID_SCH_TITLE_SECONDARY_Y - - -*InsertYErrorBarsDLG chart2.ModalDialog.842 -MeanValue CHART2_HID_SCH_STATISTIK_MEANVALUE -NoFunction CHART2_HID_SCH_STATISTIK_NO_ERROR -Variance CHART2_HID_SCH_STATISTIK_VARIANT -StandardDeviation CHART2_HID_SCH_STATISTIK_SIGMA -Percentage CHART2_HID_SCH_STATISTIK_PERCENT -ErrorMargin CHART2_HID_SCH_STATISTIK_BIGERROR -ConstantValue CHART2_HID_SCH_STATISTIK_CONSTERROR -PercentageValue CHART2_HID_SCH_STATISTIK_PERCENT_VALUE -ErrorMarginValue CHART2_HID_SCH_STATISTIK_BIGERROR_VALUE -ConstantValuePlus CHART2_HID_SCH_STATISTIK_PLUS_VALUE -ConstantValueMinus CHART2_HID_SCH_STATISTIK_MINUS_VALUE -ErrorIndicator CHART2_HID_SCH_CT_INDICATE +*InsertTrendlinesDialog sym:CHART2_HID_INSERT_STATISTICS +None sym:CHART2_HID_SCH_TRENDLINE_RB_NONE +Linear sym:CHART2_HID_SCH_TRENDLINE_RB_LINEAR +Logarithmic sym:CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC +Exponential sym:CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL +Power sym:CHART2_HID_SCH_TRENDLINE_RB_POWER +ShowEquation sym:CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION +ShowCorrelationCoefficient sym:CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED + +*InsertTitleDialog sym:CHART2_HID_INSERT_TITLE +MainTitle sym:CHART2_HID_SCH_TITLE_MAIN +SubTitle sym:CHART2_HID_SCH_TITLE_SUB +TitleXaxis sym:CHART2_HID_SCH_TITLE_X +TitleYaxis sym:CHART2_HID_SCH_TITLE_Y +TitleZaxis sym:CHART2_HID_SCH_TITLE_Z +SecondTitleXaxis sym:CHART2_HID_SCH_TITLE_SECONDARY_X +SecondTitleYaxis sym:CHART2_HID_SCH_TITLE_SECONDARY_Y + + +*InsertYErrorBarsDLG sym:chart2.ModalDialog.842 +MeanValue sym:CHART2_HID_SCH_STATISTIK_MEANVALUE +NoFunction sym:CHART2_HID_SCH_STATISTIK_NO_ERROR +Variance sym:CHART2_HID_SCH_STATISTIK_VARIANT +StandardDeviation sym:CHART2_HID_SCH_STATISTIK_SIGMA +Percentage sym:CHART2_HID_SCH_STATISTIK_PERCENT +ErrorMargin sym:CHART2_HID_SCH_STATISTIK_BIGERROR +ConstantValue sym:CHART2_HID_SCH_STATISTIK_CONSTERROR +PercentageValue sym:CHART2_HID_SCH_STATISTIK_PERCENT_VALUE +ErrorMarginValue sym:CHART2_HID_SCH_STATISTIK_BIGERROR_VALUE +ConstantValuePlus sym:CHART2_HID_SCH_STATISTIK_PLUS_VALUE +ConstantValueMinus sym:CHART2_HID_SCH_STATISTIK_MINUS_VALUE +ErrorIndicator sym:CHART2_HID_SCH_CT_INDICATE -*JavaClassPath CUI_HID_OPTIONS_JAVA_CLASSPATH -ClassPath cui.ListBox.10255.11 -AddArchive cui.PushButton.10255.20 -AddFolder cui.PushButton.10255.21 -Remove cui.PushButton.10255.22 - -*JavaStartParameter CUI_HID_OPTIONS_JAVA_PARAMETER -StartParameter cui.Edit.10254.11 -Assign cui.PushButton.10254.12 -AssignedStartParameters cui.ListBox.10254.21 -Remove cui.PushButton.10254.23 - -*JoinProperties DBACCESS_HID_DLG_QRY_JOIN -Type DBACCESS_HID_DLG_QRY_JOINTYPE -QueryHelpText DBACCESS_HID_DLG_QRY_HELPTEXT -FielsInvolved DBACCESS_HID_RELDLG_KEYFIELDS -LeftFieldCell DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL -RightFieldCell DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL - -*LabelFieldSelection extensions.ModalDialog.1000 - -*LicenseAgreementDialog FWK_HID_LICENSEDIALOG -LicenseText framework.MultiLineEdit.256.11 -ScrollBtn framework.PushButton.256.18 -DeclineBtn framework.PushButton.256.22 -AcceptBtn framework.PushButton.256.23 - -*FormLinkDialog extensions.ModalDialog.1002 -LinkDetail1 EXTENSIONS_UID_FIELDLINK_DETAIL1 -LinkMaster1 EXTENSIONS_UID_FIELDLINK_MASTER1 -LinkDetail2 EXTENSIONS_UID_FIELDLINK_DETAIL2 -LinkMaster2 EXTENSIONS_UID_FIELDLINK_MASTER2 -LinkDetail3 EXTENSIONS_UID_FIELDLINK_DETAIL3 -LinkMaster3 EXTENSIONS_UID_FIELDLINK_MASTER3 -LinkDetail4 EXTENSIONS_UID_FIELDLINK_DETAIL4 -LinkMaster4 EXTENSIONS_UID_FIELDLINK_MASTER4 -SuggestBtn extensions.PushButton.1002.4 - -*MacroMigration dbaccess.ModalDialog.19200 -DatabaseFile .uno:OpenUrl -Browse dbaccess.PushButton.19201.1 -BackButton SVT_HID_WIZARD_PREVIOUS -NextButton SVT_HID_WIZARD_NEXT -BackupLocation DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION - -*MailMerge SW_HID_MAIL_MERGE_CREATE_FROM -ThisDocument sw.RadioButton.22812.2 -UseTemplate sw.RadioButton.22812.3 +*JavaClassPath sym:CUI_HID_OPTIONS_JAVA_CLASSPATH +ClassPath sym:cui.ListBox.10255.11 +AddArchive sym:cui.PushButton.10255.20 +AddFolder sym:cui.PushButton.10255.21 +Remove sym:cui.PushButton.10255.22 + +*JavaStartParameter sym:CUI_HID_OPTIONS_JAVA_PARAMETER +StartParameter sym:cui.Edit.10254.11 +Assign sym:cui.PushButton.10254.12 +AssignedStartParameters sym:cui.ListBox.10254.21 +Remove sym:cui.PushButton.10254.23 + +*JoinProperties sym:DBACCESS_HID_DLG_QRY_JOIN +Type sym:DBACCESS_HID_DLG_QRY_JOINTYPE +QueryHelpText sym:DBACCESS_HID_DLG_QRY_HELPTEXT +FielsInvolved sym:DBACCESS_HID_RELDLG_KEYFIELDS +LeftFieldCell sym:DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL +RightFieldCell sym:DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL + +*LabelFieldSelection sym:extensions.ModalDialog.1000 + +*LicenseAgreementDialog sym:FWK_HID_LICENSEDIALOG +LicenseText sym:framework.MultiLineEdit.256.11 +ScrollBtn sym:framework.PushButton.256.18 +DeclineBtn sym:framework.PushButton.256.22 +AcceptBtn sym:framework.PushButton.256.23 + +*FormLinkDialog sym:extensions.ModalDialog.1002 +LinkDetail1 sym:EXTENSIONS_UID_FIELDLINK_DETAIL1 +LinkMaster1 sym:EXTENSIONS_UID_FIELDLINK_MASTER1 +LinkDetail2 sym:EXTENSIONS_UID_FIELDLINK_DETAIL2 +LinkMaster2 sym:EXTENSIONS_UID_FIELDLINK_MASTER2 +LinkDetail3 sym:EXTENSIONS_UID_FIELDLINK_DETAIL3 +LinkMaster3 sym:EXTENSIONS_UID_FIELDLINK_MASTER3 +LinkDetail4 sym:EXTENSIONS_UID_FIELDLINK_DETAIL4 +LinkMaster4 sym:EXTENSIONS_UID_FIELDLINK_MASTER4 +SuggestBtn sym:extensions.PushButton.1002.4 + +*MacroMigration sym:dbaccess.ModalDialog.19200 +DatabaseFile sym:.uno:OpenUrl +Browse sym:dbaccess.PushButton.19201.1 +BackButton sym:SVT_HID_WIZARD_PREVIOUS +NextButton sym:SVT_HID_WIZARD_NEXT +BackupLocation sym:DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION + +*MailMerge sym:SW_HID_MAIL_MERGE_CREATE_FROM +ThisDocument sym:sw.RadioButton.22812.2 +UseTemplate sym:sw.RadioButton.22812.3 *MailMergeFloat active -ReturnToMailMergeWizard SW_HID_RETURN_TO_MAILMERGE - -*MailMergeInsertFields SW_HID_MAIL_MERGE_INSERT_FIELDS -UseExisting sw.RadioButton.22813.8 -CreateNewConnection sw.RadioButton.22813.9 - -*ManageNamespaceDLG SVX_HID_XFORMS_MANAGENAMESPACE_DLG -Prefix svx.Edit.18015.11 -URL svx.Edit.18015.13 - -*MailMergeWizard sw.ModalDialog.22053 -BackButton SW_HID_MM_PREV_PAGE -NextButton SW_HID_MM_NEXT_PAGE - -*ManageUILanguages BASCTL_HID_BASICIDE_MANAGE_LANGUAGE -PresentLanguages basctl.ListBox.16870.2 -Add basctl.PushButton.16870.3 -Delete basctl.PushButton.16870.4 -Default basctl.PushButton.16870.5 - -*MasterPasswordDefine UUI_HID_DLG_MASTERPASSWORD_CRT -Password1 uui.Edit.14521.21 -Password2 uui.Edit.14521.23 - -*MasterPasswordEnter UUI_HID_DLG_MASTERPASSWORD_UUI -Password uui.Edit.14512.21 - -*MatchFields SW_HID_MM_ASSIGNFIELDS -Title SW_HID_MM_HEADER_0 -FirstName SW_HID_MM_HEADER_1 -LastName SW_HID_MM_HEADER_2 -Company SW_HID_MM_HEADER_3 -Address1 SW_HID_MM_HEADER_4 -Address2 SW_HID_MM_HEADER_5 -City SW_HID_MM_HEADER_6 -State SW_HID_MM_HEADER_7 -ZIP SW_HID_MM_HEADER_8 -Country SW_HID_MM_HEADER_9 -PhonePrivate SW_HID_MM_HEADER_10 -PhoneBusiness SW_HID_MM_HEADER_11 -Email SW_HID_MM_HEADER_12 -Gender SW_HID_MM_HEADER_13 - -*Mplayer AVMEDIA_HID_AVMEDIA_PLAYERWINDOW -Mopen AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN -mInsert AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT -mPlay AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY -mPause AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE -mStop AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP -mLoop AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP -mTimeslider AVMEDIA_HID_AVMEDIA_TIMESLIDER -mMute AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE -mVolume AVMEDIA_HID_AVMEDIA_VOLUMESLIDER -mZoomlistbox AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX -mTimeedit AVMEDIA_HID_AVMEDIA_TIMEEDIT - -*MenuOrganiser CUI_HID_SVX_CONFIG_MENU_ORGANIZER -MenuName cui.Edit.379.388 -ButtonUp cui.ImageButton.379.382 -ButtonDown cui.ImageButton.379.383 - -*ModifyLink sfx2.ModalDialog.517 -ModifyDDEApplication sfx2.Edit.517.50 -ModifyDDEFile sfx2.Edit.517.51 -ModifyDDECategory sfx2.Edit.517.52 - -*Mosaic .uno:GraphicFilterMosaic -Width cui.MetricField.10332.2 -Height cui.MetricField.10332.4 -EnhanceEdges cui.CheckBox.10332.5 - -*NewAddressList SW_HID_MM_CREATEADDRESSLIST -New sw.PushButton.22064.3 -Delete sw.PushButton.22064.4 -Find sw.PushButton.22064.5 -Customize sw.PushButton.22064.6 -ShowFirst sw.PushButton.22064.8 -ShowPrevious sw.PushButton.22064.9 -ShowNumber sw.NumericField.22064.10 -ShowNext sw.PushButton.22064.11 -ShowLast sw.PushButton.22064.12 - -*NewAddressBlock SW_HID_MM_CUSTOMIZEADDRESSBLOCK -SelectField SW_HID_MM_CUSTOMFIELDS -Add sw.ImageButton.22068.42 -Remove sw.ImageButton.22068.43 -Arrange sw.MultiLineEdit.22068.49 -MoveUp sw.ImageButton.22068.50 -MoveLeft sw.ImageButton.22068.51 -MoveRight sw.ImageButton.22068.52 -MoveDown sw.ImageButton.22068.53 -Select sw.ComboBox.22068.55 - -*NewToolbar cui.ModalDialog.401 -ToolbarName cui.Edit.401.402 -SaveIn cui.ListBox.401.324 - -*NewsletterLayout WIZARDS_HID_DLGNEWSLTR_DIALOG -Newsletter WIZARDS_HID_DLGNEWSLTR_OPTSTANDARDLAYOUT -CommemorativePublication WIZARDS_HID_DLGNEWSLTR_OPTPARTYLAYOUT -Brochure WIZARDS_HID_DLGNEWSLTR_OPTBROCHURELAYOUT -Single WIZARDS_HID_DLGNEWSLTR_OPTSINGLESIDED -Duplex WIZARDS_HID_DLGNEWSLTR_OPTDOUBLESIDED -OKButton WIZARDS_HID_DLGNEWSLTR_CMDGOON - -*OLEObjektInsert .uno:InsertObject +ReturnToMailMergeWizard sym:SW_HID_RETURN_TO_MAILMERGE + +*MailMergeInsertFields sym:SW_HID_MAIL_MERGE_INSERT_FIELDS +UseExisting sym:sw.RadioButton.22813.8 +CreateNewConnection sym:sw.RadioButton.22813.9 + +*ManageNamespaceDLG sym:SVX_HID_XFORMS_MANAGENAMESPACE_DLG +Prefix sym:svx.Edit.18015.11 +URL sym:svx.Edit.18015.13 + +*MailMergeWizard sym:sw.ModalDialog.22053 +BackButton sym:SW_HID_MM_PREV_PAGE +NextButton sym:SW_HID_MM_NEXT_PAGE + +*ManageUILanguages sym:BASCTL_HID_BASICIDE_MANAGE_LANGUAGE +PresentLanguages sym:basctl.ListBox.16870.2 +Add sym:basctl.PushButton.16870.3 +Delete sym:basctl.PushButton.16870.4 +Default sym:basctl.PushButton.16870.5 + +*MasterPasswordDefine sym:UUI_HID_DLG_MASTERPASSWORD_CRT +Password1 sym:uui.Edit.14521.21 +Password2 sym:uui.Edit.14521.23 + +*MasterPasswordEnter sym:UUI_HID_DLG_MASTERPASSWORD_UUI +Password sym:uui.Edit.14512.21 + +*MatchFields sym:SW_HID_MM_ASSIGNFIELDS +Title sym:SW_HID_MM_HEADER_0 +FirstName sym:SW_HID_MM_HEADER_1 +LastName sym:SW_HID_MM_HEADER_2 +Company sym:SW_HID_MM_HEADER_3 +Address1 sym:SW_HID_MM_HEADER_4 +Address2 sym:SW_HID_MM_HEADER_5 +City sym:SW_HID_MM_HEADER_6 +State sym:SW_HID_MM_HEADER_7 +ZIP sym:SW_HID_MM_HEADER_8 +Country sym:SW_HID_MM_HEADER_9 +PhonePrivate sym:SW_HID_MM_HEADER_10 +PhoneBusiness sym:SW_HID_MM_HEADER_11 +Email sym:SW_HID_MM_HEADER_12 +Gender sym:SW_HID_MM_HEADER_13 + +*Mplayer sym:AVMEDIA_HID_AVMEDIA_PLAYERWINDOW +Mopen sym:AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_OPEN +mInsert sym:AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_INSERT +mPlay sym:AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY +mPause sym:AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE +mStop sym:AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP +mLoop sym:AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_LOOP +mTimeslider sym:AVMEDIA_HID_AVMEDIA_TIMESLIDER +mMute sym:AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_MUTE +mVolume sym:AVMEDIA_HID_AVMEDIA_VOLUMESLIDER +mZoomlistbox sym:AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX +mTimeedit sym:AVMEDIA_HID_AVMEDIA_TIMEEDIT + +*MenuOrganiser sym:CUI_HID_SVX_CONFIG_MENU_ORGANIZER +MenuName sym:cui.Edit.379.388 +ButtonUp sym:cui.ImageButton.379.382 +ButtonDown sym:cui.ImageButton.379.383 + +*ModifyLink sym:sfx2.ModalDialog.517 +ModifyDDEApplication sym:sfx2.Edit.517.50 +ModifyDDEFile sym:sfx2.Edit.517.51 +ModifyDDECategory sym:sfx2.Edit.517.52 + +*Mosaic sym:.uno:GraphicFilterMosaic +Width sym:cui.MetricField.10332.2 +Height sym:cui.MetricField.10332.4 +EnhanceEdges sym:cui.CheckBox.10332.5 + +*NewAddressList sym:SW_HID_MM_CREATEADDRESSLIST +New sym:sw.PushButton.22064.3 +Delete sym:sw.PushButton.22064.4 +Find sym:sw.PushButton.22064.5 +Customize sym:sw.PushButton.22064.6 +ShowFirst sym:sw.PushButton.22064.8 +ShowPrevious sym:sw.PushButton.22064.9 +ShowNumber sym:sw.NumericField.22064.10 +ShowNext sym:sw.PushButton.22064.11 +ShowLast sym:sw.PushButton.22064.12 + +*NewAddressBlock sym:SW_HID_MM_CUSTOMIZEADDRESSBLOCK +SelectField sym:SW_HID_MM_CUSTOMFIELDS +Add sym:sw.ImageButton.22068.42 +Remove sym:sw.ImageButton.22068.43 +Arrange sym:sw.MultiLineEdit.22068.49 +MoveUp sym:sw.ImageButton.22068.50 +MoveLeft sym:sw.ImageButton.22068.51 +MoveRight sym:sw.ImageButton.22068.52 +MoveDown sym:sw.ImageButton.22068.53 +Select sym:sw.ComboBox.22068.55 + +*NewToolbar sym:cui.ModalDialog.401 +ToolbarName sym:cui.Edit.401.402 +SaveIn sym:cui.ListBox.401.324 + +*NewsletterLayout sym:WIZARDS_HID_DLGNEWSLTR_DIALOG +Newsletter sym:WIZARDS_HID_DLGNEWSLTR_OPTSTANDARDLAYOUT +CommemorativePublication sym:WIZARDS_HID_DLGNEWSLTR_OPTPARTYLAYOUT +Brochure sym:WIZARDS_HID_DLGNEWSLTR_OPTBROCHURELAYOUT +Single sym:WIZARDS_HID_DLGNEWSLTR_OPTSINGLESIDED +Duplex sym:WIZARDS_HID_DLGNEWSLTR_OPTDOUBLESIDED +OKButton sym:WIZARDS_HID_DLGNEWSLTR_CMDGOON + +*OLEObjektInsert sym:.uno:InsertObject NeuErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT AusDateiErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE Objekttyp cui:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE @@ -296,8 +296,8 @@ OleDatei cui:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH Verknuepfen cui:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK Durchsuchen cui:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH -*InsertTableImpress cui.ModalDialog.10044 -NumberOfColumns cui.NumericField.10044.2 -NumberOfRows cui.NumericField.10044.4 +*InsertTableImpress sym:cui.ModalDialog.10044 +NumberOfColumns sym:cui.NumericField.10044.2 +NumberOfRows sym:cui.NumericField.10044.4 -*TableDesign sd.ModalDialog.20974 +*TableDesign sym:sd.ModalDialog.20974 diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win index 597e1c2114c7..e6955236dda9 100644 --- a/testautomation/global/win/edia_p_s.win +++ b/testautomation/global/win/edia_p_s.win @@ -1,75 +1,75 @@ -*PackageManager DESKTOP_HID_PACKAGE_MANAGER -Add desktop.PushButton.2000.12 -Updates desktop.PushButton.2000.13 -BrowsePackages DESKTOP_HID_EXTENSION_MANAGER_LISTBOX -Options DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS -Enable DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE -Disable DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE -Remove DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE - -*Pagelayout_UndoDeleteWarning SD_HID_SD_UNDODELETEWARNING_DLG -DontShowAgain SD_HID_SD_UNDODELETEWARNING_CBX - -*ParameterInput dbaccess.ModalDialog.19205 -Parameters dbaccess.ListBox.19205.1 -Value dbaccess.Edit.19205.4 -NextParameter dbaccess.PushButton.19205.6 - -*PasswordDLG SFX2_HID_PASSWD -UserName sfx2.Edit.2316.12 -Password sfx2.Edit.2316.14 -PasswordConfirm sfx2.Edit.2316.16 - -*PasswdDLG SVX_HID_PASSWORD -OldPassword svx.Edit.10141.11 -NewPassword svx.Edit.10141.21 -Confirm svx.Edit.10141.23 - -*PDFOptions HID_FILTER_PDF_OPTIONS -RangeAll filter.RadioButton.20201.2 -RangePages filter.RadioButton.20201.3 -RangeSelection filter.RadioButton.20201.4 -RangePagesEdit filter.Edit.20201.5 -LosslessCompression filter.RadioButton.20201.10 -JpegCompression filter.RadioButton.20201.11 -ImagesQuality filter.MetricField.20201.13 -ReduceImageResolution filter.CheckBox.20201.14 -ReduceImageResolutionDPI filter.ComboBox.20201.15 -TaggedPDF filter.CheckBox.20201.17 -ExportNotes filter.CheckBox.20201.18 -TransitionEffects filter.CheckBox.20201.19 -FormsFormat filter.ListBox.20201.22 -ExportBlankPages filter.CheckBox.20201.24 - -*PDFOptionsInitialView HID_FILTER_PDF_INITIAL_VIEW -PageOnly filter.RadioButton.20203.81 -BookmarksAndPage filter.RadioButton.20203.82 -ThumbnailsAndPage filter.RadioButton.20203.83 -MagnificationDefault filter.RadioButton.20203.85 -FitInWindow filter.RadioButton.20203.86 -FitWidth filter.RadioButton.20203.87 -FitVisible filter.RadioButton.20203.88 -PageLayoutDefault filter.RadioButton.20203.94 -SinglePage filter.RadioButton.20203.95 -Continuous filter.RadioButton.20203.96 -ContinuousFacing filter.RadioButton.20203.97 - -*PDFOptionsUserInterface HID_FILTER_PDF_USER_INTERFACE -ResizeWindow filter.CheckBox.20202.101 -CenterWindow filter.CheckBox.20202.102 -OpenInFullscreen filter.CheckBox.20202.103 -DisplayDocumentTitle filter.CheckBox.20202.104 -HideMenubar filter.CheckBox.20202.106 -HideToolbar filter.CheckBox.20202.107 -HideWindowControls filter.CheckBox.20202.108 - -*Posterize .uno:GraphicFilterPoster -PosterColors cui.NumericField.10335.2 - -*PortfolioCurrency WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY -Currency WIZARDS_HID_DLGDEPOT_LSTMARKETS -OKButton WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY -CancelButton WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY +*PackageManager sym:DESKTOP_HID_PACKAGE_MANAGER +Add sym:desktop.PushButton.2000.12 +Updates sym:desktop.PushButton.2000.13 +BrowsePackages sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX +Options sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS +Enable sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE +Disable sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_DISABLE +Remove sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE + +*Pagelayout_UndoDeleteWarning sym:SD_HID_SD_UNDODELETEWARNING_DLG +DontShowAgain sym:SD_HID_SD_UNDODELETEWARNING_CBX + +*ParameterInput sym:dbaccess.ModalDialog.19205 +Parameters sym:dbaccess.ListBox.19205.1 +Value sym:dbaccess.Edit.19205.4 +NextParameter sym:dbaccess.PushButton.19205.6 + +*PasswordDLG sym:SFX2_HID_PASSWD +UserName sym:sfx2.Edit.2316.12 +Password sym:sfx2.Edit.2316.14 +PasswordConfirm sym:sfx2.Edit.2316.16 + +*PasswdDLG sym:SVX_HID_PASSWORD +OldPassword sym:svx.Edit.10141.11 +NewPassword sym:svx.Edit.10141.21 +Confirm sym:svx.Edit.10141.23 + +*PDFOptions sym:HID_FILTER_PDF_OPTIONS +RangeAll sym:filter.RadioButton.20201.2 +RangePages sym:filter.RadioButton.20201.3 +RangeSelection sym:filter.RadioButton.20201.4 +RangePagesEdit sym:filter.Edit.20201.5 +LosslessCompression sym:filter.RadioButton.20201.10 +JpegCompression sym:filter.RadioButton.20201.11 +ImagesQuality sym:filter.MetricField.20201.13 +ReduceImageResolution sym:filter.CheckBox.20201.14 +ReduceImageResolutionDPI sym:filter.ComboBox.20201.15 +TaggedPDF sym:filter.CheckBox.20201.17 +ExportNotes sym:filter.CheckBox.20201.18 +TransitionEffects sym:filter.CheckBox.20201.19 +FormsFormat sym:filter.ListBox.20201.22 +ExportBlankPages sym:filter.CheckBox.20201.24 + +*PDFOptionsInitialView sym:HID_FILTER_PDF_INITIAL_VIEW +PageOnly sym:filter.RadioButton.20203.81 +BookmarksAndPage sym:filter.RadioButton.20203.82 +ThumbnailsAndPage sym:filter.RadioButton.20203.83 +MagnificationDefault sym:filter.RadioButton.20203.85 +FitInWindow sym:filter.RadioButton.20203.86 +FitWidth sym:filter.RadioButton.20203.87 +FitVisible sym:filter.RadioButton.20203.88 +PageLayoutDefault sym:filter.RadioButton.20203.94 +SinglePage sym:filter.RadioButton.20203.95 +Continuous sym:filter.RadioButton.20203.96 +ContinuousFacing sym:filter.RadioButton.20203.97 + +*PDFOptionsUserInterface sym:HID_FILTER_PDF_USER_INTERFACE +ResizeWindow sym:filter.CheckBox.20202.101 +CenterWindow sym:filter.CheckBox.20202.102 +OpenInFullscreen sym:filter.CheckBox.20202.103 +DisplayDocumentTitle sym:filter.CheckBox.20202.104 +HideMenubar sym:filter.CheckBox.20202.106 +HideToolbar sym:filter.CheckBox.20202.107 +HideWindowControls sym:filter.CheckBox.20202.108 + +*Posterize sym:.uno:GraphicFilterPoster +PosterColors sym:cui.NumericField.10335.2 + +*PortfolioCurrency sym:WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY +Currency sym:WIZARDS_HID_DLGDEPOT_LSTMARKETS +OKButton sym:WIZARDS_HID_DLGDEPOT_0_CMDGOON_HISTORY +CancelButton sym:WIZARDS_HID_DLGDEPOT_0_CMDCANCEL_HISTORY *Printing .HelpId:vcl:PrintDialog:Dialog PreviewWindow .HelpId:vcl:PrintDialog:Preview @@ -157,471 +157,471 @@ PrintAsSingleJobs .HelpId:vcl:PrintDialog:OptPage:SingleJobs PrintReverse .HelpId:vcl:PrintDialog:OptPage:Reverse PaperTrayFromPrefs .HelpId:vcl:PrintDialog:PrintPaperFromSetup:CheckBox -*PurchaseStarOffice TAB_HID_LICENSING_DIALOG -TabPurchase TAB_HID_TP_PURCHASE -getSerialNumber tab.PushButton.503.4 -TabUnlockStarOffice TAB_HID_TP_UNLOCK -SerialNumberA tab.Edit.504.3 -SerialNumberB tab.Edit.504.4 -SerialNumberC tab.Edit.504.5 -TabSummary TAB_HID_TP_SUMMARY - -*QueryEditWindow DBACCESS_HID_CTL_QRYSQLEDIT - -*QueryDesignTable DBACCESS_HID_CTL_QRYDGNTAB - -*QueryDesignCriterion DBACCESS_HID_CTL_QRYDGNCRIT -Visible DBACCESS_HID_QRYDGN_ROW_VISIBLE -Table DBACCESS_HID_QRYDGN_ROW_TABLE -Field DBACCESS_HID_QRYDGN_ROW_FIELD -Sort DBACCESS_HID_QRYDGN_ROW_ORDER -Functions DBACCESS_HID_QRYDGN_ROW_FUNCTION -AliasName DBACCESS_HID_QRYDGN_ROW_ALIAS -Criterion DBACCESS_HID_QRYDGN_ROW_CRIT - -*QueryWizard WIZARDS_HID_QUERYWIZARD -Summary WIZARDS_HID_QUERYWIZARD_TXTSUMMARY -Tables WIZARDS_HID_QUERYWIZARD_LSTTABLES -AvailableFields WIZARDS_HID_QUERYWIZARD_LSTFIELDS -Add WIZARDS_HID_QUERYWIZARD_CMDMOVESELECTED -AddAll WIZARDS_HID_QUERYWIZARD_CMDMOVEALL -Remove WIZARDS_HID_QUERYWIZARD_CMDREMOVESELECTED -RemoveAll WIZARDS_HID_QUERYWIZARD_CMDREMOVEALL -FieldsInQuery WIZARDS_HID_QUERYWIZARD_LSTSELFIELDS -Up WIZARDS_HID_QUERYWIZARD_CMDMOVEUP -Down WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN -Sort1 WIZARDS_HID_QUERYWIZARD_SORT1 -Ascending1 WIZARDS_HID_QUERYWIZARD_OPTASCEND1 -Descending1 WIZARDS_HID_QUERYWIZARD_OPTDESCEND1 -Sort2 WIZARDS_HID_QUERYWIZARD_SORT2 -Ascending2 WIZARDS_HID_QUERYWIZARD_OPTASCEND2 -Descending2 WIZARDS_HID_QUERYWIZARD_OPTDESCEND2 -Sort3 WIZARDS_HID_QUERYWIZARD_SORT3 -Ascending3 WIZARDS_HID_QUERYWIZARD_OPTASCEND3 -Descending3 WIZARDS_HID_QUERYWIZARD_OPTDESCEND3 -Sort4 WIZARDS_HID_QUERYWIZARD_SORT4 -Ascending4 WIZARDS_HID_QUERYWIZARD_OPTASCEND4 -Descending4 WIZARDS_HID_QUERYWIZARD_OPTDESCEND4 -FieldName1 WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_1 -Condition1 WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_1 -Value1 WIZARDS_HID_QUERYWIZARD_TXTVALUE_1 -FieldName2 WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_2 -Condition2 WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_2 -Value2 WIZARDS_HID_QUERYWIZARD_TXTVALUE_2 -FieldName3 WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_3 -Condition3 WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_3 -Value3 WIZARDS_HID_QUERYWIZARD_TXTVALUE_3 -Alias1 WIZARDS_HID_QUERYWIZARD_TXTTITLE_1 -QueryTitle WIZARDS_HID_QUERYWIZARD_TXTQUERYTITLE -DisplayQuery WIZARDS_HID_QUERYWIZARD_OPTDISPLAYQUERY -ModifyQuery WIZARDS_HID_QUERYWIZARD_OPTMODIFYQUERY -BackBtn WIZARDS_HID_QUERYWIZARD_BACK -NextBtn WIZARDS_HID_QUERYWIZARD_NEXT -FinishBtn WIZARDS_HID_QUERYWIZARD_CREATE -CancelBtn WIZARDS_HID_QUERYWIZARD_CANCEL - -MatchAll WIZARDS_HID_QUERYWIZARD_OPTMATCHALL -MatchAny WIZARDS_HID_QUERYWIZARD_OPTMATCHANY -AggregatFunction1 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 -AggregatField1 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 -AggregatFunction2 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 -AggregatField2 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 -AggregatFunction3 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 -AggregatField3 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 -AggregatFunction4 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 -AggregatField4 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 -AggregatFunction5 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 -AggregatField5 WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 -DetailQuery WIZARDS_HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY -SummaryQuery WIZARDS_HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY -PlusBtn WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEPLUS -MinusBtn WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS - -*RelationDesign DBACCESS_HID_CTL_RELATIONTAB - -*RelationProperties dbaccess.ModalDialog.19217 -UpdateNoAction DBACCESS_HID_DLG_REL_NO_CASC_UPD -UpdateCascade DBACCESS_HID_DLG_REL_CASC_UPD -UpdateSetNull DBACCESS_HID_DLG_REL_CASC_UPD_NULL -UpdateSetDefault DBACCESS_HID_DLG_REL_CASC_UPD_DEFAULT -DeleteNoAction DBACCESS_HID_DLG_REL_NO_CASC_DEL -DeleteCascade DBACCESS_HID_DLG_REL_CASC_DEL -DeleteSetNull DBACCESS_HID_DLG_REL_CASC_DEL_NULL -DeleteSetDefault DBACCESS_HID_DLG_REL_CASC_DEL_DEFAULT - -LeftTable DBACCESS_HID_DLG_QRY_LEFT_TABLE -RightTable DBACCESS_HID_DLG_QRY_RIGHT_TABLE -FielsInvolved DBACCESS_HID_RELDLG_KEYFIELDS -RightFieldCell DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL - -*Relief .uno:GraphicFilterRelief -LightSource CUI_HID_GRFFILTER_EMBOSS_LIGHT - -*RenameAutoFormat SC_HID_SC_REN_AFMT_DLG -RenameAutoFormatName SC_HID_SC_REN_AFMT_NAME - -*RenameElement SW_HID_MM_ADD_RENAME_ENTRY -FieldTitle sw.Edit.22066.2 - -*RenameMenu CUI_HID_SVX_CONFIG_RENAME_MENU -NewName cui.Edit.10062.1 - -*RenameToolbar CUI_HID_SVX_CONFIG_RENAME_TOOLBAR -NewName cui.Edit.10062.1 - -*Registration SVT_HID_REGISTRATION_DIALOG -Now svtools.RadioButton.16485.3 -Later svtools.RadioButton.16485.4 -Never svtools.RadioButton.16485.5 -AlreadyRegistered svtools.RadioButton.16485.6 - -*ReportWizard WIZARDS_HID_DLGREPORT_DIALOG -CancelBtn WIZARDS_HID_DLGREPORT_0_CMDCANCEL -BackBtn WIZARDS_HID_DLGREPORT_0_CMDPREV -NextBtn WIZARDS_HID_DLGREPORT_0_CMDNEXT -FinishBtn WIZARDS_HID_DLGREPORT_0_CMDFINISH -Add WIZARDS_HID_DLGREPORT_1_CMDMOVESELECTED -AddAll WIZARDS_HID_DLGREPORT_1_CMDMOVEALL -RemoveSelected WIZARDS_HID_DLGREPORT_1_CMDREMOVESELECTED -RemoveAll WIZARDS_HID_DLGREPORT_1_CMDREMOVEALL -Tables WIZARDS_HID_DLGREPORT_1_LBTABLES -AvailableFields WIZARDS_HID_DLGREPORT_1_FIELDSAVAILABLE -SelectedFields WIZARDS_HID_DLGREPORT_1_FIELDSSELECTED -AvailGrouping WIZARDS_HID_DLGREPORT_2_GROUPING -SelectedGrouping WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST -AddSelected2 WIZARDS_HID_DLGREPORT_2_CMDGROUP -RemoveSelected2 WIZARDS_HID_DLGREPORT_2_CMDUNGROUP -SortBy1 WIZARDS_HID_DLGREPORT_3_SORT1 -Ascending1 WIZARDS_HID_DLGREPORT_3_OPTASCEND1 -Descending1 WIZARDS_HID_DLGREPORT_3_OPTDESCEND1 -SortBy2 WIZARDS_HID_DLGREPORT_3_SORT3 -Ascending2 WIZARDS_HID_DLGREPORT_3_OPTASCEND2 -Descending2 WIZARDS_HID_DLGREPORT_3_OPTDESCEND2 -SortBy3 WIZARDS_HID_DLGREPORT_3_SORT4 -Ascending3 WIZARDS_HID_DLGREPORT_3_OPTASCEND3 -Descending3 WIZARDS_HID_DLGREPORT_3_OPTDESCEND3 -SortBy4 WIZARDS_HID_DLGREPORT_3_SORT4 -Ascending4 WIZARDS_HID_DLGREPORT_3_OPTASCEND4 -Descending4 WIZARDS_HID_DLGREPORT_3_OPTDESCEND4 -ReportTitle WIZARDS_HID_DLGREPORT_4_TITLE -DataLqayout WIZARDS_HID_DLGREPORT_4_DATALAYOUT -PageLayout WIZARDS_HID_DLGREPORT_4_PAGELAYOUT -Landscape WIZARDS_HID_DLGREPORT_4_LANDSCAPE -Portrait WIZARDS_HID_DLGREPORT_4_PORTRAIT -DynamicReportTemplate WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE -StaticReport WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT -TemplatePath WIZARDS_HID_DLGREPORT_5_TXTTEMPLATEPATH -TemplatePathBtn WIZARDS_HID_DLGREPORT_5_CMDTEMPLATEPATH -ModifyReportTemplate WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE -UseReportTemplateImmediately WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE -StaticPath WIZARDS_HID_DLGREPORT_5_TXTDOCUMENTPATH -StaticPathBtn WIZARDS_HID_DLGREPORT_5_CMDDOCUMENTPATH -CreateLinkToDatabase WIZARDS_HID_DLGREPORT_5_CHKLINKTODB - -*ResolveConflicts SC_HID_SCDLG_CONFLICTS -KeepMine sc.PushButton.25749.3 -KeepOther sc.PushButton.25749.4 -KeepAllMine sc.PushButton.25749.6 -KeepAllOthers sc.PushButton.25749.7 - -*RubyDialog SVX_HID_RUBY_DIALOG -BasisText1 svx.Edit.10247.10 -RubyText1 svx.Edit.10247.14 -BasisText2 svx.Edit.10247.11 -RubyText2 svx.Edit.10247.15 -BasisText3 svx.Edit.10247.12 -RubyText3 svx.Edit.10247.16 -BasisText4 svx.Edit.10247.13 -RubyText4 svx.Edit.10247.17 -AutoDetection svx.CheckBox.10247.1 -Adjust svx.ListBox.10247.23 -CharacterStyle svx.ListBox.10247.3 -CallStylist svx.PushButton.10247.4 -DialogClose svx.PushButton.10247.8 -RubyPosition svx.ListBox.10247.25 - -*SaveLabelFormat SW_HID_SAVE_LABEL_DLG -Label sw.ComboBox.22760.3 -Type sw.Edit.22760.5 - -*ScriptOrganizer CUI_HID_SCRIPTORG_DIALOG -ScriptTreeList CUI_HID_SCRIPTSBOX -PBRun cui.PushButton.10258.3 -PBCreate cui.PushButton.10258.5 -PBEdit cui.PushButton.10258.6 -PBRename cui.PushButton.10258.7 -PBDelete cui.PushButton.10258.8 - -*ScriptNameDlg cui.ModalDialog.10290 -EFObjectName cui.Edit.10290.14 - -*ScriptSelector CUI_HID_SELECTOR_DIALOG -LibraryTreeList CUI_HID_SELECTOR_CATEGORIES -ScriptList CUI_HID_SELECTOR_COMMANDS - -*SelectAddressList SW_HID_MM_ADDRESSLISTDIALOG -Addresses SW_HID_MM_ADDRESSLIST_HB -AddressList SW_HID_MM_ADDRESSLIST_TLB -Add sw.PushButton.22061.7 -Create sw.PushButton.22061.8 -Filter sw.PushButton.22061.6 -Edit sw.PushButton.22061.4 -ChangeTable sw.PushButton.22061.17 - -*SelectAddressBlock SW_HID_MM_SELECTADDRESSBLOCK -NewBtn sw.PushButton.22069.21 -Customize sw.PushButton.22069.23 -Delete sw.PushButton.22069.22 -NeverInclude sw.RadioButton.22069.25 -AlwaysInclude sw.RadioButton.22069.26 -ConditionalInclude sw.RadioButton.22069.27 -Filter sw.Edit.22069.28 - -*SelectCertificate XMLSECURITY_HID_XMLSEC_DLG_CERTCHOOSER -ChooseCertificate XMLSECURITY_HID_XMLSEC_CTRL_CHOOSESIGNATURES -ViewCertificate xmlsecurity.PushButton.1001.55 - -*SelectSheets .uno:SelectTables -SheetSelectionBox SC_HID_SELECTTABLES - -*ServerAuthentication SW_HID_MM_SERVERAUTHENTICATION -SMTPauthentication sw.CheckBox.21570.50 -SMTPoutgoing sw.RadioButton.21570.51 -IncomingMailServer sw.RadioButton.21570.52 -OutgoingUserName sw.Edit.21570.55 -OutgoingPassword sw.Edit.21570.57 -Server sw.Edit.21570.11 -Port sw.NumericField.21570.13 -POP3 sw.RadioButton.21570.67 -IMAP sw.RadioButton.21570.68 -User sw.Edit.21570.60 -Password sw.Edit.21570.64 - -*SetDefaultLanguage BASCTL_HID_BASICIDE_SETDEFAULT_LANGUAGE -DefaultLanguageListbox basctl.ListBox.16872.2 - -*ShareDocument .uno:ShareDocument -ShareCalc sc.CheckBox.25750.1 +*PurchaseStarOffice sym:TAB_HID_LICENSING_DIALOG +TabPurchase sym:TAB_HID_TP_PURCHASE +getSerialNumber sym:tab.PushButton.503.4 +TabUnlockStarOffice sym:TAB_HID_TP_UNLOCK +SerialNumberA sym:tab.Edit.504.3 +SerialNumberB sym:tab.Edit.504.4 +SerialNumberC sym:tab.Edit.504.5 +TabSummary sym:TAB_HID_TP_SUMMARY + +*QueryEditWindow sym:DBACCESS_HID_CTL_QRYSQLEDIT + +*QueryDesignTable sym:DBACCESS_HID_CTL_QRYDGNTAB + +*QueryDesignCriterion sym:DBACCESS_HID_CTL_QRYDGNCRIT +Visible sym:DBACCESS_HID_QRYDGN_ROW_VISIBLE +Table sym:DBACCESS_HID_QRYDGN_ROW_TABLE +Field sym:DBACCESS_HID_QRYDGN_ROW_FIELD +Sort sym:DBACCESS_HID_QRYDGN_ROW_ORDER +Functions sym:DBACCESS_HID_QRYDGN_ROW_FUNCTION +AliasName sym:DBACCESS_HID_QRYDGN_ROW_ALIAS +Criterion sym:DBACCESS_HID_QRYDGN_ROW_CRIT + +*QueryWizard sym:WIZARDS_HID_QUERYWIZARD +Summary sym:WIZARDS_HID_QUERYWIZARD_TXTSUMMARY +Tables sym:WIZARDS_HID_QUERYWIZARD_LSTTABLES +AvailableFields sym:WIZARDS_HID_QUERYWIZARD_LSTFIELDS +Add sym:WIZARDS_HID_QUERYWIZARD_CMDMOVESELECTED +AddAll sym:WIZARDS_HID_QUERYWIZARD_CMDMOVEALL +Remove sym:WIZARDS_HID_QUERYWIZARD_CMDREMOVESELECTED +RemoveAll sym:WIZARDS_HID_QUERYWIZARD_CMDREMOVEALL +FieldsInQuery sym:WIZARDS_HID_QUERYWIZARD_LSTSELFIELDS +Up sym:WIZARDS_HID_QUERYWIZARD_CMDMOVEUP +Down sym:WIZARDS_HID_QUERYWIZARD_CMDMOVEDOWN +Sort1 sym:WIZARDS_HID_QUERYWIZARD_SORT1 +Ascending1 sym:WIZARDS_HID_QUERYWIZARD_OPTASCEND1 +Descending1 sym:WIZARDS_HID_QUERYWIZARD_OPTDESCEND1 +Sort2 sym:WIZARDS_HID_QUERYWIZARD_SORT2 +Ascending2 sym:WIZARDS_HID_QUERYWIZARD_OPTASCEND2 +Descending2 sym:WIZARDS_HID_QUERYWIZARD_OPTDESCEND2 +Sort3 sym:WIZARDS_HID_QUERYWIZARD_SORT3 +Ascending3 sym:WIZARDS_HID_QUERYWIZARD_OPTASCEND3 +Descending3 sym:WIZARDS_HID_QUERYWIZARD_OPTDESCEND3 +Sort4 sym:WIZARDS_HID_QUERYWIZARD_SORT4 +Ascending4 sym:WIZARDS_HID_QUERYWIZARD_OPTASCEND4 +Descending4 sym:WIZARDS_HID_QUERYWIZARD_OPTDESCEND4 +FieldName1 sym:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_1 +Condition1 sym:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_1 +Value1 sym:WIZARDS_HID_QUERYWIZARD_TXTVALUE_1 +FieldName2 sym:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_2 +Condition2 sym:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_2 +Value2 sym:WIZARDS_HID_QUERYWIZARD_TXTVALUE_2 +FieldName3 sym:WIZARDS_HID_QUERYWIZARD_LSTFIELDNAME_3 +Condition3 sym:WIZARDS_HID_QUERYWIZARD_LSTOPERATOR_3 +Value3 sym:WIZARDS_HID_QUERYWIZARD_TXTVALUE_3 +Alias1 sym:WIZARDS_HID_QUERYWIZARD_TXTTITLE_1 +QueryTitle sym:WIZARDS_HID_QUERYWIZARD_TXTQUERYTITLE +DisplayQuery sym:WIZARDS_HID_QUERYWIZARD_OPTDISPLAYQUERY +ModifyQuery sym:WIZARDS_HID_QUERYWIZARD_OPTMODIFYQUERY +BackBtn sym:WIZARDS_HID_QUERYWIZARD_BACK +NextBtn sym:WIZARDS_HID_QUERYWIZARD_NEXT +FinishBtn sym:WIZARDS_HID_QUERYWIZARD_CREATE +CancelBtn sym:WIZARDS_HID_QUERYWIZARD_CANCEL + +MatchAll sym:WIZARDS_HID_QUERYWIZARD_OPTMATCHALL +MatchAny sym:WIZARDS_HID_QUERYWIZARD_OPTMATCHANY +AggregatFunction1 sym:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_1 +AggregatField1 sym:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_1 +AggregatFunction2 sym:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_2 +AggregatField2 sym:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_2 +AggregatFunction3 sym:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_3 +AggregatField3 sym:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_3 +AggregatFunction4 sym:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_4 +AggregatField4 sym:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_4 +AggregatFunction5 sym:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFUNCTION_5 +AggregatField5 sym:WIZARDS_HID_QUERYWIZARD_LSTAGGREGATEFIELDS_5 +DetailQuery sym:WIZARDS_HID_QUERYWIZARD_OPTAGGREGATEDETAILQUERY +SummaryQuery sym:WIZARDS_HID_QUERYWIZARD_OPTAGGREGATESUMMARYQUERY +PlusBtn sym:WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEPLUS +MinusBtn sym:WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS + +*RelationDesign sym:DBACCESS_HID_CTL_RELATIONTAB + +*RelationProperties sym:dbaccess.ModalDialog.19217 +UpdateNoAction sym:DBACCESS_HID_DLG_REL_NO_CASC_UPD +UpdateCascade sym:DBACCESS_HID_DLG_REL_CASC_UPD +UpdateSetNull sym:DBACCESS_HID_DLG_REL_CASC_UPD_NULL +UpdateSetDefault sym:DBACCESS_HID_DLG_REL_CASC_UPD_DEFAULT +DeleteNoAction sym:DBACCESS_HID_DLG_REL_NO_CASC_DEL +DeleteCascade sym:DBACCESS_HID_DLG_REL_CASC_DEL +DeleteSetNull sym:DBACCESS_HID_DLG_REL_CASC_DEL_NULL +DeleteSetDefault sym:DBACCESS_HID_DLG_REL_CASC_DEL_DEFAULT + +LeftTable sym:DBACCESS_HID_DLG_QRY_LEFT_TABLE +RightTable sym:DBACCESS_HID_DLG_QRY_RIGHT_TABLE +FielsInvolved sym:DBACCESS_HID_RELDLG_KEYFIELDS +RightFieldCell sym:DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL + +*Relief sym:.uno:GraphicFilterRelief +LightSource sym:CUI_HID_GRFFILTER_EMBOSS_LIGHT + +*RenameAutoFormat sym:SC_HID_SC_REN_AFMT_DLG +RenameAutoFormatName sym:SC_HID_SC_REN_AFMT_NAME + +*RenameElement sym:SW_HID_MM_ADD_RENAME_ENTRY +FieldTitle sym:sw.Edit.22066.2 + +*RenameMenu sym:CUI_HID_SVX_CONFIG_RENAME_MENU +NewName sym:cui.Edit.10062.1 + +*RenameToolbar sym:CUI_HID_SVX_CONFIG_RENAME_TOOLBAR +NewName sym:cui.Edit.10062.1 + +*Registration sym:SVT_HID_REGISTRATION_DIALOG +Now sym:svtools.RadioButton.16485.3 +Later sym:svtools.RadioButton.16485.4 +Never sym:svtools.RadioButton.16485.5 +AlreadyRegistered sym:svtools.RadioButton.16485.6 + +*ReportWizard sym:WIZARDS_HID_DLGREPORT_DIALOG +CancelBtn sym:WIZARDS_HID_DLGREPORT_0_CMDCANCEL +BackBtn sym:WIZARDS_HID_DLGREPORT_0_CMDPREV +NextBtn sym:WIZARDS_HID_DLGREPORT_0_CMDNEXT +FinishBtn sym:WIZARDS_HID_DLGREPORT_0_CMDFINISH +Add sym:WIZARDS_HID_DLGREPORT_1_CMDMOVESELECTED +AddAll sym:WIZARDS_HID_DLGREPORT_1_CMDMOVEALL +RemoveSelected sym:WIZARDS_HID_DLGREPORT_1_CMDREMOVESELECTED +RemoveAll sym:WIZARDS_HID_DLGREPORT_1_CMDREMOVEALL +Tables sym:WIZARDS_HID_DLGREPORT_1_LBTABLES +AvailableFields sym:WIZARDS_HID_DLGREPORT_1_FIELDSAVAILABLE +SelectedFields sym:WIZARDS_HID_DLGREPORT_1_FIELDSSELECTED +AvailGrouping sym:WIZARDS_HID_DLGREPORT_2_GROUPING +SelectedGrouping sym:WIZARDS_HID_DLGREPORT_2_PREGROUPINGDEST +AddSelected2 sym:WIZARDS_HID_DLGREPORT_2_CMDGROUP +RemoveSelected2 sym:WIZARDS_HID_DLGREPORT_2_CMDUNGROUP +SortBy1 sym:WIZARDS_HID_DLGREPORT_3_SORT1 +Ascending1 sym:WIZARDS_HID_DLGREPORT_3_OPTASCEND1 +Descending1 sym:WIZARDS_HID_DLGREPORT_3_OPTDESCEND1 +SortBy2 sym:WIZARDS_HID_DLGREPORT_3_SORT3 +Ascending2 sym:WIZARDS_HID_DLGREPORT_3_OPTASCEND2 +Descending2 sym:WIZARDS_HID_DLGREPORT_3_OPTDESCEND2 +SortBy3 sym:WIZARDS_HID_DLGREPORT_3_SORT4 +Ascending3 sym:WIZARDS_HID_DLGREPORT_3_OPTASCEND3 +Descending3 sym:WIZARDS_HID_DLGREPORT_3_OPTDESCEND3 +SortBy4 sym:WIZARDS_HID_DLGREPORT_3_SORT4 +Ascending4 sym:WIZARDS_HID_DLGREPORT_3_OPTASCEND4 +Descending4 sym:WIZARDS_HID_DLGREPORT_3_OPTDESCEND4 +ReportTitle sym:WIZARDS_HID_DLGREPORT_4_TITLE +DataLqayout sym:WIZARDS_HID_DLGREPORT_4_DATALAYOUT +PageLayout sym:WIZARDS_HID_DLGREPORT_4_PAGELAYOUT +Landscape sym:WIZARDS_HID_DLGREPORT_4_LANDSCAPE +Portrait sym:WIZARDS_HID_DLGREPORT_4_PORTRAIT +DynamicReportTemplate sym:WIZARDS_HID_DLGREPORT_5_OPTDYNTEMPLATE +StaticReport sym:WIZARDS_HID_DLGREPORT_5_OPTSTATDOCUMENT +TemplatePath sym:WIZARDS_HID_DLGREPORT_5_TXTTEMPLATEPATH +TemplatePathBtn sym:WIZARDS_HID_DLGREPORT_5_CMDTEMPLATEPATH +ModifyReportTemplate sym:WIZARDS_HID_DLGREPORT_5_OPTEDITTEMPLATE +UseReportTemplateImmediately sym:WIZARDS_HID_DLGREPORT_5_OPTUSETEMPLATE +StaticPath sym:WIZARDS_HID_DLGREPORT_5_TXTDOCUMENTPATH +StaticPathBtn sym:WIZARDS_HID_DLGREPORT_5_CMDDOCUMENTPATH +CreateLinkToDatabase sym:WIZARDS_HID_DLGREPORT_5_CHKLINKTODB + +*ResolveConflicts sym:SC_HID_SCDLG_CONFLICTS +KeepMine sym:sc.PushButton.25749.3 +KeepOther sym:sc.PushButton.25749.4 +KeepAllMine sym:sc.PushButton.25749.6 +KeepAllOthers sym:sc.PushButton.25749.7 + +*RubyDialog sym:SVX_HID_RUBY_DIALOG +BasisText1 sym:svx.Edit.10247.10 +RubyText1 sym:svx.Edit.10247.14 +BasisText2 sym:svx.Edit.10247.11 +RubyText2 sym:svx.Edit.10247.15 +BasisText3 sym:svx.Edit.10247.12 +RubyText3 sym:svx.Edit.10247.16 +BasisText4 sym:svx.Edit.10247.13 +RubyText4 sym:svx.Edit.10247.17 +AutoDetection sym:svx.CheckBox.10247.1 +Adjust sym:svx.ListBox.10247.23 +CharacterStyle sym:svx.ListBox.10247.3 +CallStylist sym:svx.PushButton.10247.4 +DialogClose sym:svx.PushButton.10247.8 +RubyPosition sym:svx.ListBox.10247.25 + +*SaveLabelFormat sym:SW_HID_SAVE_LABEL_DLG +Label sym:sw.ComboBox.22760.3 +Type sym:sw.Edit.22760.5 + +*ScriptOrganizer sym:CUI_HID_SCRIPTORG_DIALOG +ScriptTreeList sym:CUI_HID_SCRIPTSBOX +PBRun sym:cui.PushButton.10258.3 +PBCreate sym:cui.PushButton.10258.5 +PBEdit sym:cui.PushButton.10258.6 +PBRename sym:cui.PushButton.10258.7 +PBDelete sym:cui.PushButton.10258.8 + +*ScriptNameDlg sym:cui.ModalDialog.10290 +EFObjectName sym:cui.Edit.10290.14 + +*ScriptSelector sym:CUI_HID_SELECTOR_DIALOG +LibraryTreeList sym:CUI_HID_SELECTOR_CATEGORIES +ScriptList sym:CUI_HID_SELECTOR_COMMANDS + +*SelectAddressList sym:SW_HID_MM_ADDRESSLISTDIALOG +Addresses sym:SW_HID_MM_ADDRESSLIST_HB +AddressList sym:SW_HID_MM_ADDRESSLIST_TLB +Add sym:sw.PushButton.22061.7 +Create sym:sw.PushButton.22061.8 +Filter sym:sw.PushButton.22061.6 +Edit sym:sw.PushButton.22061.4 +ChangeTable sym:sw.PushButton.22061.17 + +*SelectAddressBlock sym:SW_HID_MM_SELECTADDRESSBLOCK +NewBtn sym:sw.PushButton.22069.21 +Customize sym:sw.PushButton.22069.23 +Delete sym:sw.PushButton.22069.22 +NeverInclude sym:sw.RadioButton.22069.25 +AlwaysInclude sym:sw.RadioButton.22069.26 +ConditionalInclude sym:sw.RadioButton.22069.27 +Filter sym:sw.Edit.22069.28 + +*SelectCertificate sym:XMLSECURITY_HID_XMLSEC_DLG_CERTCHOOSER +ChooseCertificate sym:XMLSECURITY_HID_XMLSEC_CTRL_CHOOSESIGNATURES +ViewCertificate sym:xmlsecurity.PushButton.1001.55 + +*SelectSheets sym:.uno:SelectTables +SheetSelectionBox sym:SC_HID_SELECTTABLES + +*ServerAuthentication sym:SW_HID_MM_SERVERAUTHENTICATION +SMTPauthentication sym:sw.CheckBox.21570.50 +SMTPoutgoing sym:sw.RadioButton.21570.51 +IncomingMailServer sym:sw.RadioButton.21570.52 +OutgoingUserName sym:sw.Edit.21570.55 +OutgoingPassword sym:sw.Edit.21570.57 +Server sym:sw.Edit.21570.11 +Port sym:sw.NumericField.21570.13 +POP3 sym:sw.RadioButton.21570.67 +IMAP sym:sw.RadioButton.21570.68 +User sym:sw.Edit.21570.60 +Password sym:sw.Edit.21570.64 + +*SetDefaultLanguage sym:BASCTL_HID_BASICIDE_SETDEFAULT_LANGUAGE +DefaultLanguageListbox sym:basctl.ListBox.16872.2 + +*ShareDocument sym:.uno:ShareDocument +ShareCalc sym:sc.CheckBox.25750.1 +ShowChanges Aenderungenanzeigen -TabFilterPage SVX_HID_REDLINING_FILTER_PAGE -ShowDate SVX_HID_REDLINING_FILTER_CB_DATE -DateList SVX_HID_REDLINING_FILTER_LB_DATE -Date1 SVX_HID_REDLINING_FILTER_DF_DATE -Time1 SVX_HID_REDLINING_FILTER_TF_DATE -Now1 SVX_HID_REDLINING_FILTER_IB_CLOCK -Date2 SVX_HID_REDLINING_FILTER_DF_DATE2 -Time2 SVX_HID_REDLINING_FILTER_TF_DATE2 -Now2 SVX_HID_REDLINING_FILTER_IB_CLOCK2 -ShowAuthor SVX_HID_REDLINING_FILTER_CB_AUTOR -AuthorList SVX_HID_REDLINING_FILTER_LB_AUTOR -ShowRange SVX_HID_REDLINING_FILTER_CB_RANGE -RangeText SVX_HID_REDLINING_FILTER_ED_RANGE -ShrinkRange SVX_HID_REDLINING_FILTER_BTN_REF -AktionList SVX_HID_REDLINING_FILTER_LB_ACTION -ShowChangesCalc sc.CheckBox.25727.13 -ShowAcceptedChanges sc.CheckBox.25727.6 -ShowRejectedChanges sc.CheckBox.25727.7 -ShowComment SVX_HID_REDLINING_FILTER_CB_COMMENT -EditComment SVX_HID_REDLINING_FILTER_ED_COMMENT -RangeCalc sc.Edit.25727.15 -Shrink sc.ImageButton.25727.16 - -*SmoothLineProperties CHART2_HID_SCH_DLG_SPLINE_PROPERTIES -CubicSpline chart2.RadioButton.904.5 -BSpline chart2.RadioButton.904.6 -Resolution chart2.MetricField.904.2 -DataPointsOrder chart2.MetricField.904.1 - -*Solarization .uno:GraphicFilterSolarize -Value cui.MetricField.10333.2 -Invert cui.CheckBox.10333.3 - -*Solver .uno:SolverDialog -TargetCell sc.Edit.25742.1 -Shrink sc.ImageButton.25742.1 -OptimizeMaximum sc.RadioButton.25742.1 -OptimizeMinimum sc.RadioButton.25742.2 -OptimizeValueOf sc.RadioButton.25742.3 -OptimizeValueEdit sc.Edit.25742.2 -OptimizeValueEditShrink sc.ImageButton.25742.2 -ChangingCells sc.Edit.25742.3 -ChangingCellsShrink sc.ImageButton.25742.3 -CellReference1 sc.Edit.25742.4 -CellReferenceShrink1 sc.ImageButton.25742.4 -Operator1 sc.ListBox.25742.1 -Value1 sc.Edit.25742.8 -ValueShrink1 sc.ImageButton.25742.8 -Remove1 sc.ImageButton.25742.12 -CellReference2 sc.Edit.25742.5 -CellReferenceShrink2 sc.ImageButton.25742.5 -Operator2 sc.ListBox.25742.2 -Value2 sc.Edit.25742.9 -ValueShrink2 sc.ImageButton.25742.9 -Remove2 sc.ImageButton.25742.13 -CellReference3 sc.Edit.25742.6 -CellReferenceShrink3 sc.ImageButton.25742.6 -Operator3 sc.ListBox.25742.3 -Value3 sc.Edit.25742.10 -ValueShrink3 sc.ImageButton.25742.10 -Remove3 sc.ImageButton.25742.14 -CellReference4 sc.Edit.25742.7 -CellReferenceShrink4 sc.ImageButton.25742.7 -Operator4 sc.ListBox.25742.4 -Value4 sc.Edit.25742.11 -ValueShrink4 sc.ImageButton.25742.11 -Remove4 sc.ImageButton.25742.15 -Options sc.PushButton.25742.1 -Solve sc.PushButton.25742.4 - -*SolverOptions SC_HID_SC_SOLVEROPTIONS -SolverEngine sc.ListBox.25743.1 -SolverSettings SC_HID_SC_SOLVEROPTIONS_LB -SolverSettingsEdit sc.PushButton.25743.1 - -*SolverEditSetting SC_HID_SC_SOLVER_INTEGER -SolverNumeric sc.NumericField.25744.1 - -*SolvingResult SC_HID_SC_SOLVER_SUCCESS - -*NoSolution SC_HID_SC_SOLVER_NOSOLUTION - -*SortOrder DBACCESS_HID_DLG_ORDERCRIT -Fieldname1 dbaccess.ListBox.19207.1 -Order1 dbaccess.ListBox.19207.4 -Fieldname2 dbaccess.ListBox.19207.2 -Order2 dbaccess.ListBox.19207.5 -Fieldname3 dbaccess.ListBox.19207.3 -Order3 dbaccess.ListBox.19207.6 - -*SortRange sc.ModalDialog.25751 -ExtendSelection sc.PushButton.25751.3 -CurrentSelection sc.PushButton.25751.4 - -*Spellcheck CUI_HID_SPELLCHECK -NotInDictionary cui.MultiLineEdit.10032.34 -Suggestions cui.ListBox.10032.32 -DictionaryLanguage cui.ListBox.10032.36 -IgnoreOnce CUI_HID_SPLDLG_BUTTON_IGNORE -IgnoreAll CUI_HID_SPLDLG_BUTTON_IGNOREALL -AddToDictionary cui.MenuButton.10032.39 -Change CUI_HID_SPLDLG_BUTTON_CHANGE -ChangeAll CUI_HID_SPLDLG_BUTTON_CHANGEALL -AutoCorrect cui.PushButton.10032.42 -SpellcheckOptions cui.PushButton.10032.44 -SpellcheckUndo cui.PushButton.10032.46 -SpellcheckClose CUI_HID_SPLDLG_BUTTON_CLOSE - -*SQLException dbaccess.ModalDialog.19203 -Errors DBACCESS_HID_SQLERROR_EXCHAIN_ERRORS -Errortext DBACCESS_HID_SQLERROR_EXCHAIN_TEXT - -*HelpContent SFX2_HID_HELP_ONHELP -HelpContentUP SW_HID_SCRL_PAGEUP -HelpContentDOWN SW_HID_SCRL_PAGEDOWN -HelpContentNAVIGATION SW_HID_SCRL_NAVI - -*StarOfficeHelp SFX2_HID_HELP_WINDOW -HelpAbout SFX2_HID_HELP_LISTBOX -TABCONTROL SFX2_HID_HELP_TABCONTROL - -ContentPage SFX2_HID_HELP_TABPAGE_CONTENTS -SearchContent SFX2_HID_HELP_TREELISTBOX_CONTENTS - -IndexPage SFX2_HID_HELP_TABPAGE_INDEX -SearchIndex sfx2.ComboBox.617.11 -DisplayIndex sfx2.PushButton.617.12 - -FindPage SFX2_HID_HELP_TABPAGE_SEARCH -SearchFind sfx2.ComboBox.618.11 -FindButton sfx2.PushButton.618.12 -Result sfx2.ListBox.618.16 -FindInHeadingsOnly sfx2.CheckBox.618.15 -FindFullWords sfx2.CheckBox.618.14 -DisplayFind sfx2.PushButton.618.17 - -BookmarksPage SFX2_HID_HELP_TABPAGE_BOOKMARKS -Bookmarks sfx2.ListBox.619.11 -DisplayBookmarks sfx2.PushButton.619.12 - -HelpWindow SW_HID_EDIT_WIN - -Index SFX2_HID_HELP_TOOLBOXITEM_INDEX -GoToStart SFX2_HID_HELP_TOOLBOXITEM_START -Backward SFX2_HID_HELP_TOOLBOXITEM_BACKWARD -Forward SFX2_HID_HELP_TOOLBOXITEM_FORWARD -PrintButton SFX2_HID_HELP_TOOLBOXITEM_PRINT -SetBookmarks SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS - -*SaveScheme CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME - -SchemeName CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME - -*SecurityWarning UUI_HID_XMLSECDLG_MACROWARN -ViewSignature uui.PushButton.14530.4 -TrustAlways uui.CheckBox.14530.6 - -*Slides sd.DockingWindow.792 -SlidesControl SD_HID_SD_WIN_DOCUMENT - -*Pagepane sd.DockingWindow.793 -Pagecontrol SD_HID_SD_WIN_DOCUMENT - -*Spacing .uno:ChangeDistance -Category starmath.MenuButton.20005.1 -Default starmath.PushButton.20005.1 -SpacingSpacing STARMATH_HID_SMA_DEFAULT_DIST -LineSpacing STARMATH_HID_SMA_LINE_DIST -RootSpacing STARMATH_HID_SMA_ROOT_DIST -Superscript STARMATH_HID_SMA_SUP_DIST -Subscript STARMATH_HID_SMA_SUB_DIST -Numerator STARMATH_HID_SMA_NUMERATOR_DIST -Denominator STARMATH_HID_SMA_DENOMINATOR_DIST -ExcessLength STARMATH_HID_SMA_FRACLINE_EXCWIDTH -Weight STARMATH_HID_SMA_FRACLINE_LINEWIDTH -UpperLimit STARMATH_HID_SMA_UPPERLIMIT_DIST -LowerLimit STARMATH_HID_SMA_LOWERLIMIT_DIST -ExcessSize STARMATH_HID_SMA_BRACKET_EXCHEIGHT -BracketSpacing STARMATH_HID_SMA_BRACKET_DIST -ExcessSizeAll STARMATH_HID_SMA_BRACKET_EXCHEIGHT2 -ScaleAllBrackets starmath.CheckBox.20005.1 -MatrixLineSpacing STARMATH_HID_SMA_MATRIXROW_DIST -ColumnSpacing STARMATH_HID_SMA_MATRIXCOL_DIST -PrimaryHeight STARMATH_HID_SMA_ATTRIBUT_DIST -MinimunSpacing STARMATH_HID_SMA_INTERATTRIBUT_DIST -OperatorsExcessSize STARMATH_HID_SMA_OPERATOR_EXCHEIGHT -OperatorsSpacing STARMATH_HID_SMA_OPERATOR_DIST -BordersLeft STARMATH_HID_SMA_LEFTBORDER_DIST -BordersRight STARMATH_HID_SMA_RIGHTBORDER_DIST -BordersTop STARMATH_HID_SMA_UPPERBORDER_DIST -BordersBottom STARMATH_HID_SMA_LOWERBORDER_DIST - -*StarOfficeCalendar1 WIZARDS_HID_DLGHOLIDAYCAL_DIALOG -Area WIZARDS_HID_DLGHOLIDAYCAL_1_CMBSTATE -YearOverview WIZARDS_HID_DLGHOLIDAYCAL_1_OPYEAR -MonthOverview WIZARDS_HID_DLGHOLIDAYCAL_1_OPMONTH -Year WIZARDS_HID_DLGHOLIDAYCAL_1_EDYEAR -Month WIZARDS_HID_DLGHOLIDAYCAL_1_EDMONTH -Preview WIZARDS_HID_DLGHOLIDAYCAL_1_PREVIEW -Cancel WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL -PersonalData WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA -Create WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK - -*StarOfficeCalendar2 WIZARDS_HID_DLGHOLIDAYCAL_DIALOG -Event WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENT -OneTime WIZARDS_HID_DLGHOLIDAYCAL_2_CHKEVENT -Day WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTDAY -Month WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTMONTH -Year WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTYEAR -Insert WIZARDS_HID_DLGHOLIDAYCAL_2_CMDINSERT -Delete WIZARDS_HID_DLGHOLIDAYCAL_2_CMDDELETE -List WIZARDS_HID_DLGHOLIDAYCAL_2_LBOWNDATA -Cancel WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL -Back WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA -Create WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK - -*StoredPasswordsDialog CUI_HID_DLG_WEBCONNECTION_INFO -Remove cui.PushButton.10301.12 -RemoveAll cui.PushButton.10301.13 -changePassword cui.PushButton.10301.14 +TabFilterPage sym:SVX_HID_REDLINING_FILTER_PAGE +ShowDate sym:SVX_HID_REDLINING_FILTER_CB_DATE +DateList sym:SVX_HID_REDLINING_FILTER_LB_DATE +Date1 sym:SVX_HID_REDLINING_FILTER_DF_DATE +Time1 sym:SVX_HID_REDLINING_FILTER_TF_DATE +Now1 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK +Date2 sym:SVX_HID_REDLINING_FILTER_DF_DATE2 +Time2 sym:SVX_HID_REDLINING_FILTER_TF_DATE2 +Now2 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK2 +ShowAuthor sym:SVX_HID_REDLINING_FILTER_CB_AUTOR +AuthorList sym:SVX_HID_REDLINING_FILTER_LB_AUTOR +ShowRange sym:SVX_HID_REDLINING_FILTER_CB_RANGE +RangeText sym:SVX_HID_REDLINING_FILTER_ED_RANGE +ShrinkRange sym:SVX_HID_REDLINING_FILTER_BTN_REF +AktionList sym:SVX_HID_REDLINING_FILTER_LB_ACTION +ShowChangesCalc sym:sc.CheckBox.25727.13 +ShowAcceptedChanges sym:sc.CheckBox.25727.6 +ShowRejectedChanges sym:sc.CheckBox.25727.7 +ShowComment sym:SVX_HID_REDLINING_FILTER_CB_COMMENT +EditComment sym:SVX_HID_REDLINING_FILTER_ED_COMMENT +RangeCalc sym:sc.Edit.25727.15 +Shrink sym:sc.ImageButton.25727.16 + +*SmoothLineProperties sym:CHART2_HID_SCH_DLG_SPLINE_PROPERTIES +CubicSpline sym:chart2.RadioButton.904.5 +BSpline sym:chart2.RadioButton.904.6 +Resolution sym:chart2.MetricField.904.2 +DataPointsOrder sym:chart2.MetricField.904.1 + +*Solarization sym:.uno:GraphicFilterSolarize +Value sym:cui.MetricField.10333.2 +Invert sym:cui.CheckBox.10333.3 + +*Solver sym:.uno:SolverDialog +TargetCell sym:sc.Edit.25742.1 +Shrink sym:sc.ImageButton.25742.1 +OptimizeMaximum sym:sc.RadioButton.25742.1 +OptimizeMinimum sym:sc.RadioButton.25742.2 +OptimizeValueOf sym:sc.RadioButton.25742.3 +OptimizeValueEdit sym:sc.Edit.25742.2 +OptimizeValueEditShrink sym:sc.ImageButton.25742.2 +ChangingCells sym:sc.Edit.25742.3 +ChangingCellsShrink sym:sc.ImageButton.25742.3 +CellReference1 sym:sc.Edit.25742.4 +CellReferenceShrink1 sym:sc.ImageButton.25742.4 +Operator1 sym:sc.ListBox.25742.1 +Value1 sym:sc.Edit.25742.8 +ValueShrink1 sym:sc.ImageButton.25742.8 +Remove1 sym:sc.ImageButton.25742.12 +CellReference2 sym:sc.Edit.25742.5 +CellReferenceShrink2 sym:sc.ImageButton.25742.5 +Operator2 sym:sc.ListBox.25742.2 +Value2 sym:sc.Edit.25742.9 +ValueShrink2 sym:sc.ImageButton.25742.9 +Remove2 sym:sc.ImageButton.25742.13 +CellReference3 sym:sc.Edit.25742.6 +CellReferenceShrink3 sym:sc.ImageButton.25742.6 +Operator3 sym:sc.ListBox.25742.3 +Value3 sym:sc.Edit.25742.10 +ValueShrink3 sym:sc.ImageButton.25742.10 +Remove3 sym:sc.ImageButton.25742.14 +CellReference4 sym:sc.Edit.25742.7 +CellReferenceShrink4 sym:sc.ImageButton.25742.7 +Operator4 sym:sc.ListBox.25742.4 +Value4 sym:sc.Edit.25742.11 +ValueShrink4 sym:sc.ImageButton.25742.11 +Remove4 sym:sc.ImageButton.25742.15 +Options sym:sc.PushButton.25742.1 +Solve sym:sc.PushButton.25742.4 + +*SolverOptions sym:SC_HID_SC_SOLVEROPTIONS +SolverEngine sym:sc.ListBox.25743.1 +SolverSettings sym:SC_HID_SC_SOLVEROPTIONS_LB +SolverSettingsEdit sym:sc.PushButton.25743.1 + +*SolverEditSetting sym:SC_HID_SC_SOLVER_INTEGER +SolverNumeric sym:sc.NumericField.25744.1 + +*SolvingResult sym:SC_HID_SC_SOLVER_SUCCESS + +*NoSolution sym:SC_HID_SC_SOLVER_NOSOLUTION + +*SortOrder sym:DBACCESS_HID_DLG_ORDERCRIT +Fieldname1 sym:dbaccess.ListBox.19207.1 +Order1 sym:dbaccess.ListBox.19207.4 +Fieldname2 sym:dbaccess.ListBox.19207.2 +Order2 sym:dbaccess.ListBox.19207.5 +Fieldname3 sym:dbaccess.ListBox.19207.3 +Order3 sym:dbaccess.ListBox.19207.6 + +*SortRange sym:sc.ModalDialog.25751 +ExtendSelection sym:sc.PushButton.25751.3 +CurrentSelection sym:sc.PushButton.25751.4 + +*Spellcheck sym:CUI_HID_SPELLCHECK +NotInDictionary sym:cui.MultiLineEdit.10032.34 +Suggestions sym:cui.ListBox.10032.32 +DictionaryLanguage sym:cui.ListBox.10032.36 +IgnoreOnce sym:CUI_HID_SPLDLG_BUTTON_IGNORE +IgnoreAll sym:CUI_HID_SPLDLG_BUTTON_IGNOREALL +AddToDictionary sym:cui.MenuButton.10032.39 +Change sym:CUI_HID_SPLDLG_BUTTON_CHANGE +ChangeAll sym:CUI_HID_SPLDLG_BUTTON_CHANGEALL +AutoCorrect sym:cui.PushButton.10032.42 +SpellcheckOptions sym:cui.PushButton.10032.44 +SpellcheckUndo sym:cui.PushButton.10032.46 +SpellcheckClose sym:CUI_HID_SPLDLG_BUTTON_CLOSE + +*SQLException sym:dbaccess.ModalDialog.19203 +Errors sym:DBACCESS_HID_SQLERROR_EXCHAIN_ERRORS +Errortext sym:DBACCESS_HID_SQLERROR_EXCHAIN_TEXT + +*HelpContent sym:SFX2_HID_HELP_ONHELP +HelpContentUP sym:SW_HID_SCRL_PAGEUP +HelpContentDOWN sym:SW_HID_SCRL_PAGEDOWN +HelpContentNAVIGATION sym:SW_HID_SCRL_NAVI + +*StarOfficeHelp sym:SFX2_HID_HELP_WINDOW +HelpAbout sym:SFX2_HID_HELP_LISTBOX +TABCONTROL sym:SFX2_HID_HELP_TABCONTROL + +ContentPage sym:SFX2_HID_HELP_TABPAGE_CONTENTS +SearchContent sym:SFX2_HID_HELP_TREELISTBOX_CONTENTS + +IndexPage sym:SFX2_HID_HELP_TABPAGE_INDEX +SearchIndex sym:sfx2.ComboBox.617.11 +DisplayIndex sym:sfx2.PushButton.617.12 + +FindPage sym:SFX2_HID_HELP_TABPAGE_SEARCH +SearchFind sym:sfx2.ComboBox.618.11 +FindButton sym:sfx2.PushButton.618.12 +Result sym:sfx2.ListBox.618.16 +FindInHeadingsOnly sym:sfx2.CheckBox.618.15 +FindFullWords sym:sfx2.CheckBox.618.14 +DisplayFind sym:sfx2.PushButton.618.17 + +BookmarksPage sym:SFX2_HID_HELP_TABPAGE_BOOKMARKS +Bookmarks sym:sfx2.ListBox.619.11 +DisplayBookmarks sym:sfx2.PushButton.619.12 + +HelpWindow sym:SW_HID_EDIT_WIN + +Index sym:SFX2_HID_HELP_TOOLBOXITEM_INDEX +GoToStart sym:SFX2_HID_HELP_TOOLBOXITEM_START +Backward sym:SFX2_HID_HELP_TOOLBOXITEM_BACKWARD +Forward sym:SFX2_HID_HELP_TOOLBOXITEM_FORWARD +PrintButton sym:SFX2_HID_HELP_TOOLBOXITEM_PRINT +SetBookmarks sym:SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS + +*SaveScheme sym:CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME + +SchemeName sym:CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME + +*SecurityWarning sym:UUI_HID_XMLSECDLG_MACROWARN +ViewSignature sym:uui.PushButton.14530.4 +TrustAlways sym:uui.CheckBox.14530.6 + +*Slides sym:sd.DockingWindow.792 +SlidesControl sym:SD_HID_SD_WIN_DOCUMENT + +*Pagepane sym:sd.DockingWindow.793 +Pagecontrol sym:SD_HID_SD_WIN_DOCUMENT + +*Spacing sym:.uno:ChangeDistance +Category sym:starmath.MenuButton.20005.1 +Default sym:starmath.PushButton.20005.1 +SpacingSpacing sym:STARMATH_HID_SMA_DEFAULT_DIST +LineSpacing sym:STARMATH_HID_SMA_LINE_DIST +RootSpacing sym:STARMATH_HID_SMA_ROOT_DIST +Superscript sym:STARMATH_HID_SMA_SUP_DIST +Subscript sym:STARMATH_HID_SMA_SUB_DIST +Numerator sym:STARMATH_HID_SMA_NUMERATOR_DIST +Denominator sym:STARMATH_HID_SMA_DENOMINATOR_DIST +ExcessLength sym:STARMATH_HID_SMA_FRACLINE_EXCWIDTH +Weight sym:STARMATH_HID_SMA_FRACLINE_LINEWIDTH +UpperLimit sym:STARMATH_HID_SMA_UPPERLIMIT_DIST +LowerLimit sym:STARMATH_HID_SMA_LOWERLIMIT_DIST +ExcessSize sym:STARMATH_HID_SMA_BRACKET_EXCHEIGHT +BracketSpacing sym:STARMATH_HID_SMA_BRACKET_DIST +ExcessSizeAll sym:STARMATH_HID_SMA_BRACKET_EXCHEIGHT2 +ScaleAllBrackets sym:starmath.CheckBox.20005.1 +MatrixLineSpacing sym:STARMATH_HID_SMA_MATRIXROW_DIST +ColumnSpacing sym:STARMATH_HID_SMA_MATRIXCOL_DIST +PrimaryHeight sym:STARMATH_HID_SMA_ATTRIBUT_DIST +MinimunSpacing sym:STARMATH_HID_SMA_INTERATTRIBUT_DIST +OperatorsExcessSize sym:STARMATH_HID_SMA_OPERATOR_EXCHEIGHT +OperatorsSpacing sym:STARMATH_HID_SMA_OPERATOR_DIST +BordersLeft sym:STARMATH_HID_SMA_LEFTBORDER_DIST +BordersRight sym:STARMATH_HID_SMA_RIGHTBORDER_DIST +BordersTop sym:STARMATH_HID_SMA_UPPERBORDER_DIST +BordersBottom sym:STARMATH_HID_SMA_LOWERBORDER_DIST + +*StarOfficeCalendar1 sym:WIZARDS_HID_DLGHOLIDAYCAL_DIALOG +Area sym:WIZARDS_HID_DLGHOLIDAYCAL_1_CMBSTATE +YearOverview sym:WIZARDS_HID_DLGHOLIDAYCAL_1_OPYEAR +MonthOverview sym:WIZARDS_HID_DLGHOLIDAYCAL_1_OPMONTH +Year sym:WIZARDS_HID_DLGHOLIDAYCAL_1_EDYEAR +Month sym:WIZARDS_HID_DLGHOLIDAYCAL_1_EDMONTH +Preview sym:WIZARDS_HID_DLGHOLIDAYCAL_1_PREVIEW +Cancel sym:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL +PersonalData sym:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA +Create sym:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK + +*StarOfficeCalendar2 sym:WIZARDS_HID_DLGHOLIDAYCAL_DIALOG +Event sym:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENT +OneTime sym:WIZARDS_HID_DLGHOLIDAYCAL_2_CHKEVENT +Day sym:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTDAY +Month sym:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTMONTH +Year sym:WIZARDS_HID_DLGHOLIDAYCAL_2_EDEVENTYEAR +Insert sym:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDINSERT +Delete sym:WIZARDS_HID_DLGHOLIDAYCAL_2_CMDDELETE +List sym:WIZARDS_HID_DLGHOLIDAYCAL_2_LBOWNDATA +Cancel sym:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDCANCEL +Back sym:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA +Create sym:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK + +*StoredPasswordsDialog sym:CUI_HID_DLG_WEBCONNECTION_INFO +Remove sym:cui.PushButton.10301.12 +RemoveAll sym:cui.PushButton.10301.13 +changePassword sym:cui.PushButton.10301.14 diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win index f63625b29cf6..74d59f33ac4e 100644 --- a/testautomation/global/win/edia_t_z.win +++ b/testautomation/global/win/edia_t_z.win @@ -1,145 +1,145 @@ -*TabColor .uno:TabBgColor +*TabColor sym:.uno:TabBgColor -*TableDesignTable DBACCESS_HID_TABDESIGN_BACKGROUND -TableWindow DBACCESS_HID_CTL_TABLEEDIT -Fieldname DBACCESS_HID_TABDESIGN_NAMECELL -FieldType DBACCESS_HID_TABDESIGN_TYPECELL -Description DBACCESS_HID_TABDESIGN_HELPTEXT +*TableDesignTable sym:DBACCESS_HID_TABDESIGN_BACKGROUND +TableWindow sym:DBACCESS_HID_CTL_TABLEEDIT +Fieldname sym:DBACCESS_HID_TABDESIGN_NAMECELL +FieldType sym:DBACCESS_HID_TABDESIGN_TYPECELL +Description sym:DBACCESS_HID_TABDESIGN_HELPTEXT -*TablesFilter DBACCESS_HID_DSADMIN_TABLE_SUBSCRIPTION -Tables DBACCESS_HID_DSADMIN_TABLE_SELECTOR +*TablesFilter sym:DBACCESS_HID_DSADMIN_TABLE_SUBSCRIPTION +Tables sym:DBACCESS_HID_DSADMIN_TABLE_SELECTOR -*TableToolbox DBACCESS_HID_DSADMIN_TABLE_TOOLBOX -CreateDesign DBACCESS_HID_BROWSER_TABLE_CREATE_DESIGN -EditTable DBACCESS_HID_BROWSER_TABLE_EDIT -DeleteTable DBACCESS_HID_BROWSER_TABLE_DELETE +*TableToolbox sym:DBACCESS_HID_DSADMIN_TABLE_TOOLBOX +CreateDesign sym:DBACCESS_HID_BROWSER_TABLE_CREATE_DESIGN +EditTable sym:DBACCESS_HID_BROWSER_TABLE_EDIT +DeleteTable sym:DBACCESS_HID_BROWSER_TABLE_DELETE -*TableWizard WIZARDS_HID_DLGTABLE_DIALOG -Business WIZARDS_HID_DLGTABLE_OPTBUSINESS -Personal WIZARDS_HID_DLGTABLE_OPTPRIVATE -Tables WIZARDS_HID_DLGTABLE_LBTABLES -Fields WIZARDS_HID_DLGTABLE_FIELDSAVAILABLE -SelectedFields WIZARDS_HID_DLGTABLE_FIELDSSELECTED -Add WIZARDS_HID_DLGTABLE_CMDMOVESELECTED -AddAll WIZARDS_HID_DLGTABLE_CMDMOVEALL -Remove WIZARDS_HID_DLGTABLE_CMDREMOVESELECTED -RemoveAll WIZARDS_HID_DLGTABLE_CMDREMOVEALL -Up WIZARDS_HID_DLGTABLE_CMDMOVEUP -Down WIZARDS_HID_DLGTABLE_CMDMOVEDOWN -FieldNames WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES -FieldsUp WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP -FieldsDown WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN -FieldsRemove WIZARDS_HID_DLGTABLE_CMDMINUS -FieldsAdd WIZARDS_HID_DLGTABLE_CMDPLUS -FieldName WIZARDS_HID_DLGTABLE_COLNAME -TableName WIZARDS_HID_DLGTABLE_TXT_NAME -InsertData WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE -ModifyDesing WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE -CreateForm WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD -BackBtn WIZARDS_HID_DLGTABLE_CMDPREV -NextBtn WIZARDS_HID_DLGTABLE_CMDNEXT -FinishBtn WIZARDS_HID_DLGTABLE_CMDFINISH -CancelBtn WIZARDS_HID_DLGTABLE_CMDCANCEL +*TableWizard sym:WIZARDS_HID_DLGTABLE_DIALOG +Business sym:WIZARDS_HID_DLGTABLE_OPTBUSINESS +Personal sym:WIZARDS_HID_DLGTABLE_OPTPRIVATE +Tables sym:WIZARDS_HID_DLGTABLE_LBTABLES +Fields sym:WIZARDS_HID_DLGTABLE_FIELDSAVAILABLE +SelectedFields sym:WIZARDS_HID_DLGTABLE_FIELDSSELECTED +Add sym:WIZARDS_HID_DLGTABLE_CMDMOVESELECTED +AddAll sym:WIZARDS_HID_DLGTABLE_CMDMOVEALL +Remove sym:WIZARDS_HID_DLGTABLE_CMDREMOVESELECTED +RemoveAll sym:WIZARDS_HID_DLGTABLE_CMDREMOVEALL +Up sym:WIZARDS_HID_DLGTABLE_CMDMOVEUP +Down sym:WIZARDS_HID_DLGTABLE_CMDMOVEDOWN +FieldNames sym:WIZARDS_HID_DLGTABLE_LB_SELFIELDNAMES +FieldsUp sym:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDUP +FieldsDown sym:WIZARDS_HID_DLGTABLE_CMDMOVEFIELDDOWN +FieldsRemove sym:WIZARDS_HID_DLGTABLE_CMDMINUS +FieldsAdd sym:WIZARDS_HID_DLGTABLE_CMDPLUS +FieldName sym:WIZARDS_HID_DLGTABLE_COLNAME +TableName sym:WIZARDS_HID_DLGTABLE_TXT_NAME +InsertData sym:WIZARDS_HID_DLGTABLE_OPT_WORKWITHTABLE +ModifyDesing sym:WIZARDS_HID_DLGTABLE_OPT_MODIFYTABLE +CreateForm sym:WIZARDS_HID_DLGTABLE_OPT_STARTFORMWIZARD +BackBtn sym:WIZARDS_HID_DLGTABLE_CMDPREV +NextBtn sym:WIZARDS_HID_DLGTABLE_CMDNEXT +FinishBtn sym:WIZARDS_HID_DLGTABLE_CMDFINISH +CancelBtn sym:WIZARDS_HID_DLGTABLE_CMDCANCEL ' not nice solved, but can't do better right now; complains -> TBO -*Tasks sd.DockingWindow.794 -View SFX2_HID_TASKPANE_VIEW_MENU -'? SD_HID_SD_WIN_DOCUMENT +*Tasks sym:sd.DockingWindow.794 +View sym:SFX2_HID_TASKPANE_VIEW_MENU +'? sym:SD_HID_SD_WIN_DOCUMENT ' Master Pages -UsedInThisPresentationPreview SD_HID_SD_TASK_PANE_PREVIEW_CURRENT -RecentlyUsedPreview SD_HID_SD_TASK_PANE_PREVIEW_RECENT -AvailableForUsePreview SD_HID_SD_TASK_PANE_PREVIEW_ALL +UsedInThisPresentationPreview sym:SD_HID_SD_TASK_PANE_PREVIEW_CURRENT +RecentlyUsedPreview sym:SD_HID_SD_TASK_PANE_PREVIEW_RECENT +AvailableForUsePreview sym:SD_HID_SD_TASK_PANE_PREVIEW_ALL ' Layouts -LayoutsPreview SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS +LayoutsPreview sym:SD_HID_SD_TASK_PANE_PREVIEW_LAYOUTS ' Custom Animation -EffectAdd SD_HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT -EffectChange SD_HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT -EffectRemove SD_HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT -EffectStart SD_HID_SD_CUSTOMANIMATIONPANE_LB_START -EffectProperty SD_HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY -EffectDirection SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX -EffectOptions SD_HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE -EffectSpeed SD_HID_SD_CUSTOMANIMATIONPANE_CB_SPEED -EffectList SD_HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST -EffectUp SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP -EffectDown SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN -EffectPlay SD_HID_SD_CUSTOMANIMATIONPANE_PB_PLAY -EffectSlideShow SD_HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW -EffectAutomaticPreview SD_HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW +EffectAdd sym:SD_HID_SD_CUSTOMANIMATIONPANE_PB_ADD_EFFECT +EffectChange sym:SD_HID_SD_CUSTOMANIMATIONPANE_PB_CHANGE_EFFECT +EffectRemove sym:SD_HID_SD_CUSTOMANIMATIONPANE_PB_REMOVE_EFFECT +EffectStart sym:SD_HID_SD_CUSTOMANIMATIONPANE_LB_START +EffectProperty sym:SD_HID_SD_CUSTOMANIMATIONPANE_LB_PROPERTY +EffectDirection sym:SD_HID_SD_CUSTOMANIMATIONPANE_PRESETPROPERTYBOX +EffectOptions sym:SD_HID_SD_CUSTOMANIMATIONPANE_PB_PROPERTY_MORE +EffectSpeed sym:SD_HID_SD_CUSTOMANIMATIONPANE_CB_SPEED +EffectList sym:SD_HID_SD_CUSTOMANIMATIONPANE_CT_CUSTOM_ANIMATION_LIST +EffectUp sym:SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_UP +EffectDown sym:SD_HID_SD_CUSTOMANIMATIONPANE_PB_MOVE_DOWN +EffectPlay sym:SD_HID_SD_CUSTOMANIMATIONPANE_PB_PLAY +EffectSlideShow sym:SD_HID_SD_CUSTOMANIMATIONPANE_PB_SLIDE_SHOW +EffectAutomaticPreview sym:SD_HID_SD_CUSTOMANIMATIONPANE_CB_AUTOPREVIEW ' Slide Transition -TransitionApplyToSelectedSlide SD_HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS -TransitionSpeed SD_HID_SD_SLIDETRANSITIONPANE_LB_SPEED -TransitionSound SD_HID_SD_SLIDETRANSITIONPANE_LB_SOUND -TransitionLoopUntilNextSound SD_HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND -TransitionOnMouseClick SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE -TransitionAutomaticallyAfter SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO -TransitionAutomaticallyAfterTime SD_HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER -TransitionApplyToAllSlides SD_HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL -TransitionPlay SD_HID_SD_SLIDETRANSITIONPANE_PB_PLAY -TransitionSlideShow SD_HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW -TransitionAutomaticPreview SD_HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW +TransitionApplyToSelectedSlide sym:SD_HID_SD_SLIDETRANSITIONPANE_LB_SLIDE_TRANSITIONS +TransitionSpeed sym:SD_HID_SD_SLIDETRANSITIONPANE_LB_SPEED +TransitionSound sym:SD_HID_SD_SLIDETRANSITIONPANE_LB_SOUND +TransitionLoopUntilNextSound sym:SD_HID_SD_SLIDETRANSITIONPANE_CB_LOOP_SOUND +TransitionOnMouseClick sym:SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_ON_MOUSE +TransitionAutomaticallyAfter sym:SD_HID_SD_SLIDETRANSITIONPANE_RB_ADVANCE_AUTO +TransitionAutomaticallyAfterTime sym:SD_HID_SD_SLIDETRANSITIONPANE_MF_ADVANCE_AUTO_AFTER +TransitionApplyToAllSlides sym:SD_HID_SD_SLIDETRANSITIONPANE_PB_APPLY_TO_ALL +TransitionPlay sym:SD_HID_SD_SLIDETRANSITIONPANE_PB_PLAY +TransitionSlideShow sym:SD_HID_SD_SLIDETRANSITIONPANE_PB_SLIDE_SHOW +TransitionAutomaticPreview sym:SD_HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW -*MasterPages SD_HID_SD_SLIDE_DESIGNS -*UsedInThisPresentation SD_HID_SD_CURRENT_MASTERS -*RecentlyUsed SD_HID_SD_RECENT_MASTERS -*AvailableForUse SD_HID_SD_ALL_MASTERS -*Layouts SD_HID_SD_SLIDE_LAYOUTS -*CustomAnimation SD_HID_SD_CUSTOM_ANIMATIONS -*SlideTransition SD_HID_SD_SLIDE_TRANSITIONS +*MasterPages sym:SD_HID_SD_SLIDE_DESIGNS +*UsedInThisPresentation sym:SD_HID_SD_CURRENT_MASTERS +*RecentlyUsed sym:SD_HID_SD_RECENT_MASTERS +*AvailableForUse sym:SD_HID_SD_ALL_MASTERS +*Layouts sym:SD_HID_SD_SLIDE_LAYOUTS +*CustomAnimation sym:SD_HID_SD_CUSTOM_ANIMATIONS +*SlideTransition sym:SD_HID_SD_SLIDE_TRANSITIONS -*TemplateAndDocuments SVT_HID_TEMPLATEDLG_DIALOG -Organize svtools.PushButton.16420.11 -Edit svtools.PushButton.16420.12 -Backward SVT_HID_TEMPLATEDLG_TB_BACK -UpOneLevel SVT_HID_TEMPLATEDLG_TB_PREV -Print SVT_HID_TEMPLATEDLG_TB_PRINT -Docinfo SVT_HID_TEMPLATEDLG_TB_DOCINFO -Preview SVT_HID_TEMPLATEDLG_TB_PREVIEW -Category SVT_HID_TEMPLATEDLG_ICONCTRL -Filelist SVT_HID_TEMPLATEDLG_FILEVIEW +*TemplateAndDocuments sym:SVT_HID_TEMPLATEDLG_DIALOG +Organize sym:svtools.PushButton.16420.11 +Edit sym:svtools.PushButton.16420.12 +Backward sym:SVT_HID_TEMPLATEDLG_TB_BACK +UpOneLevel sym:SVT_HID_TEMPLATEDLG_TB_PREV +Print sym:SVT_HID_TEMPLATEDLG_TB_PRINT +Docinfo sym:SVT_HID_TEMPLATEDLG_TB_DOCINFO +Preview sym:SVT_HID_TEMPLATEDLG_TB_PREVIEW +Category sym:SVT_HID_TEMPLATEDLG_ICONCTRL +Filelist sym:SVT_HID_TEMPLATEDLG_FILEVIEW -*TemplatesBasicMessage WIZARDS_HID_DLGCORRESPONDENCE_DIALOG -OptAgenda1 WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA1 -OptAgenda2 WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA2 -OneRecepient WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER1 -AdressDatabase WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER2 -CmdAgdGoOn WIZARDS_HID_DLGCORRESPONDENCE_AGENDAOKAY -OKButton WIZARDS_HID_DLGCORRESPONDENCE_LETTEROKAY -CancelButton WIZARDS_HID_DLGCORRESPONDENCE_CANCEL +*TemplatesBasicMessage sym:WIZARDS_HID_DLGCORRESPONDENCE_DIALOG +OptAgenda1 sym:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA1 +OptAgenda2 sym:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONAGENDA2 +OneRecepient sym:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER1 +AdressDatabase sym:WIZARDS_HID_DLGCORRESPONDENCE_OPTIONLETTER2 +CmdAgdGoOn sym:WIZARDS_HID_DLGCORRESPONDENCE_AGENDAOKAY +OKButton sym:WIZARDS_HID_DLGCORRESPONDENCE_LETTEROKAY +CancelButton sym:WIZARDS_HID_DLGCORRESPONDENCE_CANCEL +ToolsOptionsDlg ExtrasOptionenDlg +UseOfThisTemplate TemplatesBasicMessage -*TestAccountSettings SW_HID_MM_TESTACCOUNTSETTINGS -IDontKnow SW_HID_MM_TESTACCOUNTSETTINGS_HB -TaskStatusListBox SW_HID_MM_TESTACCOUNTSETTINGS_TLB -Errors sw.MultiLineEdit.21569.34 -Stop sw.PushButton.21569.36 +*TestAccountSettings sym:SW_HID_MM_TESTACCOUNTSETTINGS +IDontKnow sym:SW_HID_MM_TESTACCOUNTSETTINGS_HB +TaskStatusListBox sym:SW_HID_MM_TESTACCOUNTSETTINGS_TLB +Errors sym:sw.MultiLineEdit.21569.34 +Stop sym:sw.PushButton.21569.36 -*TestXMLFilter FILTER_HID_XML_FILTER_TEST_DIALOG -XSLTForExport FILTER_HID_XML_FILTER_TEST_EXPORT_XSLT_FILE -ExportBrowseBtn FILTER_HID_XML_FILTER_TEST_EXPORT_BROWSE -CurrentDocument FILTER_HID_XML_FILTER_TEST_EXPORT_CURRENT -FixedCurrentFile FILTER_HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE -XSLTForImport FILTER_HID_XML_FILTER_TEST_IMPORT_XSLT_FILE -TemplateForImport FILTER_HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE -DisplaySource FILTER_HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE -ImportBrowseBtn FILTER_HID_XML_FILTER_TEST_IMPORT_BROWSE -RecentFile FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT -FixedRecentFile FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT_FILE -CloseBtn FILTER_HID_XML_FILTER_TEST_CLOSE +*TestXMLFilter sym:FILTER_HID_XML_FILTER_TEST_DIALOG +XSLTForExport sym:FILTER_HID_XML_FILTER_TEST_EXPORT_XSLT_FILE +ExportBrowseBtn sym:FILTER_HID_XML_FILTER_TEST_EXPORT_BROWSE +CurrentDocument sym:FILTER_HID_XML_FILTER_TEST_EXPORT_CURRENT +FixedCurrentFile sym:FILTER_HID_XML_FILTER_TEST_EXPORT_CURRENT_FILE +XSLTForImport sym:FILTER_HID_XML_FILTER_TEST_IMPORT_XSLT_FILE +TemplateForImport sym:FILTER_HID_XML_FILTER_TEST_IMPORT_TEMPLATE_FILE +DisplaySource sym:FILTER_HID_XML_FILTER_TEST_IMPORT_DISPLAY_SOURCE +ImportBrowseBtn sym:FILTER_HID_XML_FILTER_TEST_IMPORT_BROWSE +RecentFile sym:FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT +FixedRecentFile sym:FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT_FILE +CloseBtn sym:FILTER_HID_XML_FILTER_TEST_CLOSE -*Thesaurus .uno:Thesaurus -CurrentWord cui.ComboBox.10031.16 -RecallCurrentWord cui.ImageButton.10031.9 -Alternatives CUI_HID_CT_THES_ALTERNATIVES -ReplaceWith cui.Edit.10031.22 -Language cui.MenuButton.10031.12 +*Thesaurus sym:.uno:Thesaurus +CurrentWord sym:cui.ComboBox.10031.16 +RecallCurrentWord sym:cui.ImageButton.10031.9 +Alternatives sym:CUI_HID_CT_THES_ALTERNATIVES +ReplaceWith sym:cui.Edit.10031.22 +Language sym:cui.MenuButton.10031.12 *TextImport SC:MODALDIALOG:RID_SCDLG_ASCII CharacterSet SC:LISTBOX:RID_SCDLG_ASCII:LB_CHARSET -Language sc.ListBox.25695.8 +Language sym:sc.ListBox.25695.8 FromRow SC:NUMERICFIELD:RID_SCDLG_ASCII:NF_AT_ROW FixedWidth SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_FIXED Separated SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_SEPARATED @@ -151,158 +151,158 @@ Other SC:CHECKBOX:RID_SCDLG_ASCII:CKB_OTHER OtherText SC:EDIT:RID_SCDLG_ASCII:ED_OTHER MergeDelimiter SC:CHECKBOX:RID_SCDLG_ASCII:CB_ASONCE TextDelimiter SC:COMBOBOX:RID_SCDLG_ASCII:CB_TEXTSEP -QuotedAsText sc.CheckBox.25695.24 -DetectSpecialNumbers sc.CheckBox.25695.25 +QuotedAsText sym:sc.CheckBox.25695.24 +DetectSpecialNumbers sym:sc.CheckBox.25695.25 Type SC:LISTBOX:RID_SCDLG_ASCII:LB_TYPE1 -Preview SC_HID_SC_ASCII_TABCTR +Preview sym:SC_HID_SC_ASCII_TABCTR -*UnsatisfiedDependencies desktop.ModalDialog.2001 -UnsatisfiedDependencyList desktop.ListBox.2001.2 +*UnsatisfiedDependencies sym:desktop.ModalDialog.2001 +UnsatisfiedDependencyList sym:desktop.ListBox.2001.2 -*WarningPrintTransparency sfx2.ModalDialog.2399 -NoButton sfx2.PushButton.2399.63 -DoNotShowAgain sfx2.CheckBox.2399.65 +*WarningPrintTransparency sym:sfx2.ModalDialog.2399 +NoButton sym:sfx2.PushButton.2399.63 +DoNotShowAgain sym:sfx2.CheckBox.2399.65 -*WebWizard WIZARDS_HID0_WEBWIZARD -IntroductionChooseSettings WIZARDS_HID1_LST_SESSIONS -IntroductionDelete WIZARDS_HID1_BTN_DEL_SES -Back WIZARDS_HID0_NEXT -NextButton WIZARDS_HID0_PREV -Finish WIZARDS_HID0_CREATE -CancelB WIZARDS_HID0_CANCEL -DocumentsWebSiteContent WIZARDS_HID2_LST_DOCS -DocumentsAdd WIZARDS_HID2_BTN_ADD_DOC -DocumentsRemove WIZARDS_HID2_BTN_REM_DOC -DocumentsUp WIZARDS_HID2_BTN_DOC_UP -DocumentsDown WIZARDS_HID2_BTN_DOC_DOWN -DocumentsExportFileFormat WIZARDS_HID2_LST_DOC_EXPORT -DocumentsInformationTitle WIZARDS_HID2_TXT_DOC_TITLE -DocumentsInformationsummary WIZARDS_HID2_TXT_DOC_DESC -DocumentsInformationAuthor WIZARDS_HID2_TXT_DOC_AUTHOR -MainLayoutLayout1 WIZARDS_HID3_IL_LAYOUTS_IMG1 -MainLayoutLayout2 WIZARDS_HID3_IL_LAYOUTS_IMG2 -MainLayoutLayout3 WIZARDS_HID3_IL_LAYOUTS_IMG3 -MainLayoutLayout4 WIZARDS_HID3_IL_LAYOUTS_IMG4 -MainLayoutLayout5 WIZARDS_HID3_IL_LAYOUTS_IMG5 -MainLayoutLayout6 WIZARDS_HID3_IL_LAYOUTS_IMG6 -MainLayoutLayout7 WIZARDS_HID3_IL_LAYOUTS_IMG7 -MainLayoutLayout8 WIZARDS_HID3_IL_LAYOUTS_IMG8 -MainLayoutLayout9 WIZARDS_HID3_IL_LAYOUTS_IMG9 -MainLayoutLayout10 WIZARDS_HID3_IL_LAYOUTS_IMG10 -MainLayoutLayout11 WIZARDS_HID3_IL_LAYOUTS_IMG11 -MainLayoutLayout12 WIZARDS_HID3_IL_LAYOUTS_IMG12 -MainLayoutLayout13 WIZARDS_HID3_IL_LAYOUTS_IMG13 -MainLayoutLayout14 WIZARDS_HID3_IL_LAYOUTS_IMG14 -MainLayoutLayout15 WIZARDS_HID3_IL_LAYOUTS_IMG15 -LayoutDetailsFileName WIZARDS_HID4_CHK_DISPLAY_FILENAME -LayoutDetailsDescription WIZARDS_HID4_CHK_DISPLAY_DESCRIPTION -LayoutDetailsAuthor WIZARDS_HID4_CHK_DISPLAY_AUTHOR -LayoutDetailsCreationDate WIZARDS_HID4_CHK_DISPLAY_CR_DATE -LayoutDetailsLastChangeDate WIZARDS_HID4_CHK_DISPLAY_UP_DATE -LayoutDetailsFileFormat WIZARDS_HID4_CHK_DISPLAY_FORMAT -LayoutDetailsFileFormatIcon WIZARDS_HID4_CHK_DISPLAY_F_ICON -LayoutDetailsNumberOfPages WIZARDS_HID4_CHK_DISPLAY_PAGES -LayoutDetailsSizeInKB WIZARDS_HID4_CHK_DISPLAY_SIZE -LayoutDetails640x480 WIZARDS_HID4_GRP_OPTIMAIZE_640 -LayoutDetails800x600 WIZARDS_HID4_GRP_OPTIMAIZE_800 -LayoutDetails1024x768 WIZARDS_HID4_GRP_OPTIMAIZE_1024 -StyleStyle WIZARDS_HID5_LST_STYLES -StyleBackgroundImage WIZARDS_HID5_BTN_BACKGND -StyleIconSet WIZARDS_HID5_BTN_ICONS -WebSiteInformationTitle WIZARDS_HID6_TXT_SITE_TITLE -WebSiteInformationDescription WIZARDS_HID6_TXT_SITE_DESC -WebSiteInformationEmail WIZARDS_HID6_TXT_SITE_EMAIL -WebSiteInformationCopyrightNotice WIZARDS_HID6_TXT_SITE_COPYRIGHT -WebSiteInformationCreated WIZARDS_HID6_DATE_SITE_CREATED -WebSiteInformationModified WIZARDS_HID6_DATE_SITE_UPDATED -PreviewPreciew WIZARDS_HID7_BTN_PREVIEW -PreviewToALocalFolderCB WIZARDS_HID7_CHK_PUBLISH_LOCAL -PreviewToALocalFolderTF WIZARDS_HID7_TXT_LOCAL -PublishToALocalFolderB WIZARDS_HID7_BTN_LOCAL -PublishToAZIPArchiveCB WIZARDS_HID7_CHK_PUBLISH_ZIP -PublishToAZIPArchiveTF WIZARDS_HID7_TXT_ZIP -PublishToAZIPArchiveB WIZARDS_HID7_BTN_ZIP -PublishToAWebServer WIZARDS_HID7_CHK_PUBLISH_FTP -PublishFTPConfigure WIZARDS_HID7_BTN_FTP -PublishSaveSettings WIZARDS_HID7_CHK_SAVE -PublishSaveAs WIZARDS_HID7_TXT_SAVE +*WebWizard sym:WIZARDS_HID0_WEBWIZARD +IntroductionChooseSettings sym:WIZARDS_HID1_LST_SESSIONS +IntroductionDelete sym:WIZARDS_HID1_BTN_DEL_SES +Back sym:WIZARDS_HID0_NEXT +NextButton sym:WIZARDS_HID0_PREV +Finish sym:WIZARDS_HID0_CREATE +CancelB sym:WIZARDS_HID0_CANCEL +DocumentsWebSiteContent sym:WIZARDS_HID2_LST_DOCS +DocumentsAdd sym:WIZARDS_HID2_BTN_ADD_DOC +DocumentsRemove sym:WIZARDS_HID2_BTN_REM_DOC +DocumentsUp sym:WIZARDS_HID2_BTN_DOC_UP +DocumentsDown sym:WIZARDS_HID2_BTN_DOC_DOWN +DocumentsExportFileFormat sym:WIZARDS_HID2_LST_DOC_EXPORT +DocumentsInformationTitle sym:WIZARDS_HID2_TXT_DOC_TITLE +DocumentsInformationsummary sym:WIZARDS_HID2_TXT_DOC_DESC +DocumentsInformationAuthor sym:WIZARDS_HID2_TXT_DOC_AUTHOR +MainLayoutLayout1 sym:WIZARDS_HID3_IL_LAYOUTS_IMG1 +MainLayoutLayout2 sym:WIZARDS_HID3_IL_LAYOUTS_IMG2 +MainLayoutLayout3 sym:WIZARDS_HID3_IL_LAYOUTS_IMG3 +MainLayoutLayout4 sym:WIZARDS_HID3_IL_LAYOUTS_IMG4 +MainLayoutLayout5 sym:WIZARDS_HID3_IL_LAYOUTS_IMG5 +MainLayoutLayout6 sym:WIZARDS_HID3_IL_LAYOUTS_IMG6 +MainLayoutLayout7 sym:WIZARDS_HID3_IL_LAYOUTS_IMG7 +MainLayoutLayout8 sym:WIZARDS_HID3_IL_LAYOUTS_IMG8 +MainLayoutLayout9 sym:WIZARDS_HID3_IL_LAYOUTS_IMG9 +MainLayoutLayout10 sym:WIZARDS_HID3_IL_LAYOUTS_IMG10 +MainLayoutLayout11 sym:WIZARDS_HID3_IL_LAYOUTS_IMG11 +MainLayoutLayout12 sym:WIZARDS_HID3_IL_LAYOUTS_IMG12 +MainLayoutLayout13 sym:WIZARDS_HID3_IL_LAYOUTS_IMG13 +MainLayoutLayout14 sym:WIZARDS_HID3_IL_LAYOUTS_IMG14 +MainLayoutLayout15 sym:WIZARDS_HID3_IL_LAYOUTS_IMG15 +LayoutDetailsFileName sym:WIZARDS_HID4_CHK_DISPLAY_FILENAME +LayoutDetailsDescription sym:WIZARDS_HID4_CHK_DISPLAY_DESCRIPTION +LayoutDetailsAuthor sym:WIZARDS_HID4_CHK_DISPLAY_AUTHOR +LayoutDetailsCreationDate sym:WIZARDS_HID4_CHK_DISPLAY_CR_DATE +LayoutDetailsLastChangeDate sym:WIZARDS_HID4_CHK_DISPLAY_UP_DATE +LayoutDetailsFileFormat sym:WIZARDS_HID4_CHK_DISPLAY_FORMAT +LayoutDetailsFileFormatIcon sym:WIZARDS_HID4_CHK_DISPLAY_F_ICON +LayoutDetailsNumberOfPages sym:WIZARDS_HID4_CHK_DISPLAY_PAGES +LayoutDetailsSizeInKB sym:WIZARDS_HID4_CHK_DISPLAY_SIZE +LayoutDetails640x480 sym:WIZARDS_HID4_GRP_OPTIMAIZE_640 +LayoutDetails800x600 sym:WIZARDS_HID4_GRP_OPTIMAIZE_800 +LayoutDetails1024x768 sym:WIZARDS_HID4_GRP_OPTIMAIZE_1024 +StyleStyle sym:WIZARDS_HID5_LST_STYLES +StyleBackgroundImage sym:WIZARDS_HID5_BTN_BACKGND +StyleIconSet sym:WIZARDS_HID5_BTN_ICONS +WebSiteInformationTitle sym:WIZARDS_HID6_TXT_SITE_TITLE +WebSiteInformationDescription sym:WIZARDS_HID6_TXT_SITE_DESC +WebSiteInformationEmail sym:WIZARDS_HID6_TXT_SITE_EMAIL +WebSiteInformationCopyrightNotice sym:WIZARDS_HID6_TXT_SITE_COPYRIGHT +WebSiteInformationCreated sym:WIZARDS_HID6_DATE_SITE_CREATED +WebSiteInformationModified sym:WIZARDS_HID6_DATE_SITE_UPDATED +PreviewPreciew sym:WIZARDS_HID7_BTN_PREVIEW +PreviewToALocalFolderCB sym:WIZARDS_HID7_CHK_PUBLISH_LOCAL +PreviewToALocalFolderTF sym:WIZARDS_HID7_TXT_LOCAL +PublishToALocalFolderB sym:WIZARDS_HID7_BTN_LOCAL +PublishToAZIPArchiveCB sym:WIZARDS_HID7_CHK_PUBLISH_ZIP +PublishToAZIPArchiveTF sym:WIZARDS_HID7_TXT_ZIP +PublishToAZIPArchiveB sym:WIZARDS_HID7_BTN_ZIP +PublishToAWebServer sym:WIZARDS_HID7_CHK_PUBLISH_FTP +PublishFTPConfigure sym:WIZARDS_HID7_BTN_FTP +PublishSaveSettings sym:WIZARDS_HID7_CHK_SAVE +PublishSaveAs sym:WIZARDS_HID7_TXT_SAVE -*WebWizardStatus WIZARDS_HID0_STATUS_DIALOG +*WebWizardStatus sym:WIZARDS_HID0_STATUS_DIALOG -*WelcomeDialog DESKTOP_HID_FIRSTSTART_DIALOG -HelpBtn DESKTOP_UID_FIRSTSTART_HELP -BackBtn DESKTOP_HID_FIRSTSTART_PREV -NextBtn DESKTOP_HID_FIRSTSTART_NEXT -OKBtn DESKTOP_HID_FIRSTSTART_FINISH -CancelBtn DESKTOP_HID_FIRSTSTART_CANCEL +*WelcomeDialog sym:DESKTOP_HID_FIRSTSTART_DIALOG +HelpBtn sym:DESKTOP_UID_FIRSTSTART_HELP +BackBtn sym:DESKTOP_HID_FIRSTSTART_PREV +NextBtn sym:DESKTOP_HID_FIRSTSTART_NEXT +OKBtn sym:DESKTOP_HID_FIRSTSTART_FINISH +CancelBtn sym:DESKTOP_HID_FIRSTSTART_CANCEL -*XFormAddInstance SVX_HID_XFORMS_ADDINSTANCE_DLG -InstanceName svx.Edit.18018.12 -InstanceURL .uno:OpenUrl -BrowseBtn svx.PushButton.18018.15 -LinkInstance svx.CheckBox.18018.16 +*XFormAddInstance sym:SVX_HID_XFORMS_ADDINSTANCE_DLG +InstanceName sym:svx.Edit.18018.12 +InstanceURL sym:.uno:OpenUrl +BrowseBtn sym:svx.PushButton.18018.15 +LinkInstance sym:svx.CheckBox.18018.16 -*XFormAddItemDLG SVX_HID_XFORMS_ADDDATAITEM_DLG -ElementName svx.Edit.18012.12 -DefaultValue svx.Edit.18012.14 -DataType svx.ListBox.18012.18 -Required svx.CheckBox.18012.19 -RequiredBtn svx.PushButton.18012.20 -Relevant svx.CheckBox.18012.21 -RelevantBtn svx.PushButton.18012.22 -Constraint svx.CheckBox.18012.23 -ConstraintBtn svx.PushButton.18012.24 -Calculate svx.CheckBox.18012.27 -CalculateBtn svx.PushButton.18012.28 -ReadOnly svx.CheckBox.18012.25 -ReadOnlyBtn svx.PushButton.18012.26 +*XFormAddItemDLG sym:SVX_HID_XFORMS_ADDDATAITEM_DLG +ElementName sym:svx.Edit.18012.12 +DefaultValue sym:svx.Edit.18012.14 +DataType sym:svx.ListBox.18012.18 +Required sym:svx.CheckBox.18012.19 +RequiredBtn sym:svx.PushButton.18012.20 +Relevant sym:svx.CheckBox.18012.21 +RelevantBtn sym:svx.PushButton.18012.22 +Constraint sym:svx.CheckBox.18012.23 +ConstraintBtn sym:svx.PushButton.18012.24 +Calculate sym:svx.CheckBox.18012.27 +CalculateBtn sym:svx.PushButton.18012.28 +ReadOnly sym:svx.CheckBox.18012.25 +ReadOnlyBtn sym:svx.PushButton.18012.26 -*XFormAddModel SVX_HID_XFORMS_ADDMODEL_DLG -ModelName svx.Edit.18017.12 +*XFormAddModel sym:SVX_HID_XFORMS_ADDMODEL_DLG +ModelName sym:svx.Edit.18017.12 -*XFormAddSubmission SVX_HID_XFORMS_ADDSUBMISSION_DLG -SubmitName svx.Edit.18016.12 -SubmitAction svx.Edit.18016.14 -SubmitMethod svx.ListBox.18016.16 -SubmitBindingExpression svx.Edit.18016.18 -SubmitBindingExpressionBtn svx.PushButton.18016.19 -SubmitBinding svx.ListBox.18016.21 -SubmitReplace svx.ListBox.18016.23 +*XFormAddSubmission sym:SVX_HID_XFORMS_ADDSUBMISSION_DLG +SubmitName sym:svx.Edit.18016.12 +SubmitAction sym:svx.Edit.18016.14 +SubmitMethod sym:svx.ListBox.18016.16 +SubmitBindingExpression sym:svx.Edit.18016.18 +SubmitBindingExpressionBtn sym:svx.PushButton.18016.19 +SubmitBinding sym:svx.ListBox.18016.21 +SubmitReplace sym:svx.ListBox.18016.23 -*XFormsDataNavigator .uno:ShowDataNavigator -XFormsDataNavigatorTabControl SVX_HID_XFORMS_TAB_CONTROL +*XFormsDataNavigator sym:.uno:ShowDataNavigator +XFormsDataNavigatorTabControl sym:SVX_HID_XFORMS_TAB_CONTROL 'Instance svx:TabPage:RID_SVX_TP_XFORMS_INSTANCE -Models SVX_HID_XFORMS_MODELS_LIST -ModelsBtn SVX_HID_XFORMS_MODELS_MENUBTN -TabPages svx.TabPage.18020 -ItemList SVX_HID_XFORMS_ITEMS_LIST -InstanceBtn SVX_HID_XFORMS_INSTANCES_MENUBTN +Models sym:SVX_HID_XFORMS_MODELS_LIST +ModelsBtn sym:SVX_HID_XFORMS_MODELS_MENUBTN +TabPages sym:svx.TabPage.18020 +ItemList sym:SVX_HID_XFORMS_ITEMS_LIST +InstanceBtn sym:SVX_HID_XFORMS_INSTANCES_MENUBTN -*XFormToolbar SVX_HID_XFORMS_TOOLBOX -AddElement SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT -AddAttribute SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE -EditElement SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT -RemoveElement SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE -AddSubmission SVX_HID_XFORMS_TOOLBOX_ITEM_ADD -AddBinding SVX_HID_XFORMS_TOOLBOX_ITEM_ADD +*XFormToolbar sym:SVX_HID_XFORMS_TOOLBOX +AddElement sym:SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ELEMENT +AddAttribute sym:SVX_HID_XFORMS_TOOLBOX_ITEM_ADD_ATTRIBUTE +EditElement sym:SVX_HID_XFORMS_TOOLBOX_ITEM_EDIT +RemoveElement sym:SVX_HID_XFORMS_TOOLBOX_ITEM_REMOVE +AddSubmission sym:SVX_HID_XFORMS_TOOLBOX_ITEM_ADD +AddBinding sym:SVX_HID_XFORMS_TOOLBOX_ITEM_ADD -*XMLFilter FILTER_HID_XML_FILTER_TABDIALOG -TabControl FILTER_HID_XML_FILTER_TABPAGE_CTRL -TabXMLGeneral FILTER_HID_XML_FILTER_TABPAGE_BASIC -TabXMLTransformation FILTER_HID_XML_FILTER_TABPAGE_XSLT +*XMLFilter sym:FILTER_HID_XML_FILTER_TABDIALOG +TabControl sym:FILTER_HID_XML_FILTER_TABPAGE_CTRL +TabXMLGeneral sym:FILTER_HID_XML_FILTER_TABPAGE_BASIC +TabXMLTransformation sym:FILTER_HID_XML_FILTER_TABPAGE_XSLT -*XMLFilterOutput FILTER_HID_XML_SOURCE_FILE_DIALOG -ValidateOutput FILTER_HID_XML_FILTER_TEST_VALIDATE_OUPUT -Validate FILTER_HID_XML_SOURCE_FILE_VALIDATE -FilterOutput FILTER_HID_XML_FILTER_OUTPUT_WINDOW +*XMLFilterOutput sym:FILTER_HID_XML_SOURCE_FILE_DIALOG +ValidateOutput sym:FILTER_HID_XML_FILTER_TEST_VALIDATE_OUPUT +Validate sym:FILTER_HID_XML_SOURCE_FILE_VALIDATE +FilterOutput sym:FILTER_HID_XML_FILTER_OUTPUT_WINDOW -*XMLFilterSettings FILTER_HID_XML_FILTER_SETTINGS_DIALOG -FilterList FILTER_HID_XML_FILTER_LIST -NewBtn FILTER_HID_XML_FILTER_NEW -EditBtn FILTER_HID_XML_FILTER_EDIT -TestXSLTs FILTER_HID_XML_FILTER_TEST -DeleteBtn FILTER_HID_XML_FILTER_DELETE -SaveToPackage FILTER_HID_XML_FILTER_SAVE -OpenPackage FILTER_HID_XML_FILTER_OPEN -CloseBtn FILTER_HID_XML_FILTER_CLOSE +*XMLFilterSettings sym:FILTER_HID_XML_FILTER_SETTINGS_DIALOG +FilterList sym:FILTER_HID_XML_FILTER_LIST +NewBtn sym:FILTER_HID_XML_FILTER_NEW +EditBtn sym:FILTER_HID_XML_FILTER_EDIT +TestXSLTs sym:FILTER_HID_XML_FILTER_TEST +DeleteBtn sym:FILTER_HID_XML_FILTER_DELETE +SaveToPackage sym:FILTER_HID_XML_FILTER_SAVE +OpenPackage sym:FILTER_HID_XML_FILTER_OPEN +CloseBtn sym:FILTER_HID_XML_FILTER_CLOSE diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win index c33dd7af9ec3..3650c9ffaaa5 100644 --- a/testautomation/global/win/etab_a_d.win +++ b/testautomation/global/win/etab_a_d.win @@ -1,474 +1,474 @@ -*TabAccessibility CUI_HID_OPTIONS_ACCESSIBILITYCONFIG -ForPagePreviews cui.CheckBox.10250.2 -HelpTips cui.CheckBox.10250.4 -After cui.NumericField.10250.5 -AllowAnimatedGraphics cui.CheckBox.10250.7 -AllowAnimatedText cui.CheckBox.10250.8 -AlwaysUseAutomaticFontColor cui.CheckBox.10250.9 -SupportAssistiveTechnologyTools cui.CheckBox.10250.11 -UseTextSelectionCursor cui.CheckBox.10250.12 -AutomaticDetectHC cui.CheckBox.10250.13 - -*TabAdabas DBACCESS_HID_DSADMIN_PAGE_ADABAS -Hostname dbaccess.Edit.19205.5 -CacheSize dbaccess.NumericField.19205.2 -DataIncrement dbaccess.NumericField.19205.1 -CotrolUser dbaccess.Edit.19205.2 -ControlPassword dbaccess.Edit.19205.1 -ShutdownService dbaccess.CheckBox.19205.1 -Charset DBACCESS_HID_DSADMIN_CHARSET -Extended dbaccess.PushButton.19205.1 - -*TabAdabasUserSettings DBACCESS_HID_TAB_PAGE_USERADMIN -User DBACCESS_HID_TAB_PAGE_LBUSER -AddUser DBACCESS_HID_TAB_PAGE_PBUSER -ChangePassword DBACCESS_HID_TAB_PAGE_PBCHGPWD -DeleteUser DBACCESS_HID_TAB_PAGE_PBUSERDELETE -AccessRights DBACCESS_HID_TAB_PAGE_TBLGRANTS - -*TabAdditionalSettings extensions.TabPage.19701 -Settings extensions.PushButton.19701.1 - -*TabAddressDataSourceAutoPilot extensions.TabPage.19700 -Mozilla extensions.RadioButton.19700.1 -LDAP extensions.RadioButton.19700.6 -Outlook extensions.RadioButton.19700.7 -WinSystem extensions.RadioButton.19700.8 -Other extensions.RadioButton.19700.9 - -*TabADO DBACCESS_HID_DSADMIN_PAGE_ADO -URL DBACCESS_HID_DSADMIN_CONNURL_ADOPAGE -UserName DBACCESS_HID_DSADMIN_USER_ADO -PasswordRequired DBACCESS_HID_DSADMIN_PWDREC_ADO - -*TabAppearance CUI_HID_OPTIONS_COLORCONFIG -Scheme cui.ListBox.10249.3 -Save cui.PushButton.10249.4 -Delete cui.PushButton.10249.5 -ColorList CUI_HID_OPTIONS_COLORCONFIG_COLORLIST_WIN -LBGeneralDocBg CUI_HID_COLORPAGE_DOCCOLOR_LB -CBGeneralTextBd CUI_HID_COLORPAGE_DOCBOUNDARIES_CB -LBGeneralTextBd CUI_HID_COLORPAGE_DOCBOUNDARIES_LB -LBGeneralAppBg CUI_HID_COLORPAGE_APPBACKGROUND_LB -CBGeneralObjBd CUI_HID_COLORPAGE_OBJECTBOUNDARIES_CB -LBGeneralObjBd CUI_HID_COLORPAGE_OBJECTBOUNDARIES_LB -CBGeneralTableBd CUI_HID_COLORPAGE_TABLEBOUNDARIES_CB -LBGeneralTableBd CUI_HID_COLORPAGE_TABLEBOUNDARIES_LB -LBGeneralFont CUI_HID_COLORPAGE_FONTCOLOR_LB -CBGeneralUnvisitedLinks CUI_HID_COLORPAGE_LINKS_CB -LBGeneralUnvisitedLinks CUI_HID_COLORPAGE_LINKS_LB -CBGeneralVisitedLinks CUI_HID_COLORPAGE_LINKSVISITED_CB -LBGeneralVisitedLinks CUI_HID_COLORPAGE_LINKSVISITED_LB -LBGeneralAutoSpellcheck CUI_HID_COLORPAGE_SPELL_LB -LBWriterGrid CUI_HID_COLORPAGE_WRITERTEXTGRID_LB -CBWriterFieldShadings CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_CB -LBWriterFieldShadings CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_LB -CBWriterIndexShadings CUI_HID_COLORPAGE_WRITERIDXSHADINGS_CB -LBWriterIndexShadings CUI_HID_COLORPAGE_WRITERIDXSHADINGS_LB -LBWriterNoteIndicator CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_LB -LBWriterScriptIndicator CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB -CBWriterSectionBd CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB -LBWriterSectionBd CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB -LBWriterPageBreaks CUI_HID_COLORPAGE_WRITERPAGEBREAKS_LB -LBWriterDirectCursor CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_LB -LBHtmlSGML CUI_HID_COLORPAGE_HTMLSGML_LB -LBHtmlComment CUI_HID_COLORPAGE_HTMLCOMMENT_LB -LBHtmlKeyword CUI_HID_COLORPAGE_HTMLKEYWORD_LB -LBHtmlText CUI_HID_COLORPAGE_HTMLUNKNOWN_LB -LBCalcGridlines CUI_HID_COLORPAGE_CALCGRID_LB -LBCalcPageBreaks CUI_HID_COLORPAGE_CALCPAGEBREAK_LB -LBCalcManualBreaks CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB -LBCalcAutoBreaks CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB -LBCalcDetective CUI_HID_COLORPAGE_CALCDETECTIVE_LB -LBCalcDetectiveError CUI_HID_COLORPAGE_CALCDETECTIVEERROR_LB -LBCalcReferences CUI_HID_COLORPAGE_CALCREFERENCE_LB -LBCalcNotesBg CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_LB -LBDrawingGrid CUI_HID_COLORPAGE_DRAWGRID_LB -LBBasicIdentifier CUI_HID_COLORPAGE_BASICIDENTIFIER_LB -LBBasicComment CUI_HID_COLORPAGE_BASICCOMMENT_LB -LBBasicNumber CUI_HID_COLORPAGE_BASICNUMBER_LB -LBBasicString CUI_HID_COLORPAGE_BASICSTRING_LB -LBBasicOperator CUI_HID_COLORPAGE_BASICOPERATOR_LB -LBBasicReservedExpression CUI_HID_COLORPAGE_BASICKEYWORD_LB -LBBasicError CUI_HID_COLORPAGE_BASICERROR_LB - -*TabArea CUI_HID_AREA_AREA -BackgroundColour cui.CheckBox.10056.21 -BackgroundColourList cui.ListBox.10056.22 -FillOptions cui.ListBox.10056.19 -ColourList cui.ListBox.10056.1 -GradientList cui.ListBox.10056.2 -HatchingList cui.ListBox.10056.3 -BitmapList cui.ListBox.10056.4 -Automatic cui.TriStateBox.10056.3 -Increments cui.NumericField.10056.1 -Tile cui.TriStateBox.10056.4 -Stretch cui.TriStateBox.10056.5 -Relative cui.TriStateBox.10056.1 -Original cui.TriStateBox.10056.6 -Width cui.MetricField.10056.4 -Height cui.MetricField.10056.5 -XOffset cui.MetricField.10056.1 -YOffset cui.MetricField.10056.2 -Row cui.RadioButton.10056.6 -Column cui.RadioButton.10056.7 -Offset cui.MetricField.10056.3 - -*TabAsianLayout CUI_HID_SVXPAGE_CHAR_TWOLINES -TwoLinesEachLine cui.CheckBox.10242.401 -BeginningCharacter cui.ListBox.10242.412 -EndCharacter cui.ListBox.10242.414 - -*TabAsianLayoutOptions CUI_HID_OPTIONS_ASIAN_LAYOUT -WesternCharactersOnly cui.RadioButton.10246.2 -WesternTextAndPunctuation cui.RadioButton.10246.3 -NoCompression cui.RadioButton.10246.5 -CompressPunctuationOnly cui.RadioButton.10246.6 -CompressPunctuationAndJapaneseKana cui.RadioButton.10246.7 -Language cui.ListBox.10246.12 -Standard cui.CheckBox.10246.9 -NoStartOfLine cui.Edit.10246.14 -NoEndOfLine cui.Edit.10246.16 - -*TabAsianTypography CUI_HID_SVXPAGE_PARA_ASIAN -ApplyList cui.TriStateBox.10245.4 -AllowHangingPunctuation cui.TriStateBox.10245.2 -ApplySpacingBetween cui.TriStateBox.10245.7 - -*TabAutoCaption SW_HID_OPTCAPTION_PAGE -ObjectList SW_HID_OPTCAPTION_CLB -Category sw.ComboBox.20878.14 -Numbering sw.ListBox.20878.16 -CaptionSeparator sw.Edit.20878.18 -Position sw.ListBox.20878.20 -Level sw.ListBox.20878.23 -ChapterSeparator sw.Edit.20878.25 -CharacterStyle sw.ListBox.20878.28 -ApplyBorderAndShadow sw.CheckBox.20878.29 - -*TabBaseBookmarks DBACCESS_HID_DSADMIN_DOCUMENTLINKS -Bookmarklist DBACCESS_HID_DSADMIN_DOCUMENTS - -*TabBullet CUI_HID_SVXPAGE_PICK_BULLET -Auswahl CUI_HID_VALUESET_BULLET -Optionen SW_HID_NUM_FORMAT_BTN -Zurueck SFX2_HID_TABDLG_RESET_BTN -Remove SW_HID_NUM_RESET - -*TabChartAxisLabel CHART2_HID_SCH_TP_AXIS_LABEL - ShowLabels chart2.CheckBox.920.1 - Tile chart2.RadioButton.920.14 - StaggerOdd chart2.RadioButton.920.15 - StaggerEven chart2.RadioButton.920.16 - Automatic chart2.RadioButton.920.17 - Overlap chart2.CheckBox.920.11 - Break chart2.CheckBox.920.12 - AngleKnob CHART2_HID_SCH_ALIGNMENT_CTR_DIAL - AngleText CHART2_HID_SCH_ALIGNMENT_DEGREES - VerticallyStacked CHART2_HID_SCH_ALIGNMENT_STACKED - TextDirection chart2.ListBox.920.20 +*TabAccessibility sym:CUI_HID_OPTIONS_ACCESSIBILITYCONFIG +ForPagePreviews sym:cui.CheckBox.10250.2 +HelpTips sym:cui.CheckBox.10250.4 +After sym:cui.NumericField.10250.5 +AllowAnimatedGraphics sym:cui.CheckBox.10250.7 +AllowAnimatedText sym:cui.CheckBox.10250.8 +AlwaysUseAutomaticFontColor sym:cui.CheckBox.10250.9 +SupportAssistiveTechnologyTools sym:cui.CheckBox.10250.11 +UseTextSelectionCursor sym:cui.CheckBox.10250.12 +AutomaticDetectHC sym:cui.CheckBox.10250.13 + +*TabAdabas sym:DBACCESS_HID_DSADMIN_PAGE_ADABAS +Hostname sym:dbaccess.Edit.19205.5 +CacheSize sym:dbaccess.NumericField.19205.2 +DataIncrement sym:dbaccess.NumericField.19205.1 +CotrolUser sym:dbaccess.Edit.19205.2 +ControlPassword sym:dbaccess.Edit.19205.1 +ShutdownService sym:dbaccess.CheckBox.19205.1 +Charset sym:DBACCESS_HID_DSADMIN_CHARSET +Extended sym:dbaccess.PushButton.19205.1 + +*TabAdabasUserSettings sym:DBACCESS_HID_TAB_PAGE_USERADMIN +User sym:DBACCESS_HID_TAB_PAGE_LBUSER +AddUser sym:DBACCESS_HID_TAB_PAGE_PBUSER +ChangePassword sym:DBACCESS_HID_TAB_PAGE_PBCHGPWD +DeleteUser sym:DBACCESS_HID_TAB_PAGE_PBUSERDELETE +AccessRights sym:DBACCESS_HID_TAB_PAGE_TBLGRANTS + +*TabAdditionalSettings sym:extensions.TabPage.19701 +Settings sym:extensions.PushButton.19701.1 + +*TabAddressDataSourceAutoPilot sym:extensions.TabPage.19700 +Mozilla sym:extensions.RadioButton.19700.1 +LDAP sym:extensions.RadioButton.19700.6 +Outlook sym:extensions.RadioButton.19700.7 +WinSystem sym:extensions.RadioButton.19700.8 +Other sym:extensions.RadioButton.19700.9 + +*TabADO sym:DBACCESS_HID_DSADMIN_PAGE_ADO +URL sym:DBACCESS_HID_DSADMIN_CONNURL_ADOPAGE +UserName sym:DBACCESS_HID_DSADMIN_USER_ADO +PasswordRequired sym:DBACCESS_HID_DSADMIN_PWDREC_ADO + +*TabAppearance sym:CUI_HID_OPTIONS_COLORCONFIG +Scheme sym:cui.ListBox.10249.3 +Save sym:cui.PushButton.10249.4 +Delete sym:cui.PushButton.10249.5 +ColorList sym:CUI_HID_OPTIONS_COLORCONFIG_COLORLIST_WIN +LBGeneralDocBg sym:CUI_HID_COLORPAGE_DOCCOLOR_LB +CBGeneralTextBd sym:CUI_HID_COLORPAGE_DOCBOUNDARIES_CB +LBGeneralTextBd sym:CUI_HID_COLORPAGE_DOCBOUNDARIES_LB +LBGeneralAppBg sym:CUI_HID_COLORPAGE_APPBACKGROUND_LB +CBGeneralObjBd sym:CUI_HID_COLORPAGE_OBJECTBOUNDARIES_CB +LBGeneralObjBd sym:CUI_HID_COLORPAGE_OBJECTBOUNDARIES_LB +CBGeneralTableBd sym:CUI_HID_COLORPAGE_TABLEBOUNDARIES_CB +LBGeneralTableBd sym:CUI_HID_COLORPAGE_TABLEBOUNDARIES_LB +LBGeneralFont sym:CUI_HID_COLORPAGE_FONTCOLOR_LB +CBGeneralUnvisitedLinks sym:CUI_HID_COLORPAGE_LINKS_CB +LBGeneralUnvisitedLinks sym:CUI_HID_COLORPAGE_LINKS_LB +CBGeneralVisitedLinks sym:CUI_HID_COLORPAGE_LINKSVISITED_CB +LBGeneralVisitedLinks sym:CUI_HID_COLORPAGE_LINKSVISITED_LB +LBGeneralAutoSpellcheck sym:CUI_HID_COLORPAGE_SPELL_LB +LBWriterGrid sym:CUI_HID_COLORPAGE_WRITERTEXTGRID_LB +CBWriterFieldShadings sym:CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_CB +LBWriterFieldShadings sym:CUI_HID_COLORPAGE_WRITERFIELDSHADINGS_LB +CBWriterIndexShadings sym:CUI_HID_COLORPAGE_WRITERIDXSHADINGS_CB +LBWriterIndexShadings sym:CUI_HID_COLORPAGE_WRITERIDXSHADINGS_LB +LBWriterNoteIndicator sym:CUI_HID_COLORPAGE_WRITERNOTESINDICATOR_LB +LBWriterScriptIndicator sym:CUI_HID_COLORPAGE_WRITERSCRIPTINDICATOR_LB +CBWriterSectionBd sym:CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_CB +LBWriterSectionBd sym:CUI_HID_COLORPAGE_WRITERSECTIONBOUNDARIES_LB +LBWriterPageBreaks sym:CUI_HID_COLORPAGE_WRITERPAGEBREAKS_LB +LBWriterDirectCursor sym:CUI_HID_COLORPAGE_WRITERDIRECTCURSOR_LB +LBHtmlSGML sym:CUI_HID_COLORPAGE_HTMLSGML_LB +LBHtmlComment sym:CUI_HID_COLORPAGE_HTMLCOMMENT_LB +LBHtmlKeyword sym:CUI_HID_COLORPAGE_HTMLKEYWORD_LB +LBHtmlText sym:CUI_HID_COLORPAGE_HTMLUNKNOWN_LB +LBCalcGridlines sym:CUI_HID_COLORPAGE_CALCGRID_LB +LBCalcPageBreaks sym:CUI_HID_COLORPAGE_CALCPAGEBREAK_LB +LBCalcManualBreaks sym:CUI_HID_COLORPAGE_CALCPAGEBREAKMANUAL_LB +LBCalcAutoBreaks sym:CUI_HID_COLORPAGE_CALCPAGEBREAKAUTOMATIC_LB +LBCalcDetective sym:CUI_HID_COLORPAGE_CALCDETECTIVE_LB +LBCalcDetectiveError sym:CUI_HID_COLORPAGE_CALCDETECTIVEERROR_LB +LBCalcReferences sym:CUI_HID_COLORPAGE_CALCREFERENCE_LB +LBCalcNotesBg sym:CUI_HID_COLORPAGE_CALCNOTESBACKGROUND_LB +LBDrawingGrid sym:CUI_HID_COLORPAGE_DRAWGRID_LB +LBBasicIdentifier sym:CUI_HID_COLORPAGE_BASICIDENTIFIER_LB +LBBasicComment sym:CUI_HID_COLORPAGE_BASICCOMMENT_LB +LBBasicNumber sym:CUI_HID_COLORPAGE_BASICNUMBER_LB +LBBasicString sym:CUI_HID_COLORPAGE_BASICSTRING_LB +LBBasicOperator sym:CUI_HID_COLORPAGE_BASICOPERATOR_LB +LBBasicReservedExpression sym:CUI_HID_COLORPAGE_BASICKEYWORD_LB +LBBasicError sym:CUI_HID_COLORPAGE_BASICERROR_LB + +*TabArea sym:CUI_HID_AREA_AREA +BackgroundColour sym:cui.CheckBox.10056.21 +BackgroundColourList sym:cui.ListBox.10056.22 +FillOptions sym:cui.ListBox.10056.19 +ColourList sym:cui.ListBox.10056.1 +GradientList sym:cui.ListBox.10056.2 +HatchingList sym:cui.ListBox.10056.3 +BitmapList sym:cui.ListBox.10056.4 +Automatic sym:cui.TriStateBox.10056.3 +Increments sym:cui.NumericField.10056.1 +Tile sym:cui.TriStateBox.10056.4 +Stretch sym:cui.TriStateBox.10056.5 +Relative sym:cui.TriStateBox.10056.1 +Original sym:cui.TriStateBox.10056.6 +Width sym:cui.MetricField.10056.4 +Height sym:cui.MetricField.10056.5 +XOffset sym:cui.MetricField.10056.1 +YOffset sym:cui.MetricField.10056.2 +Row sym:cui.RadioButton.10056.6 +Column sym:cui.RadioButton.10056.7 +Offset sym:cui.MetricField.10056.3 + +*TabAsianLayout sym:CUI_HID_SVXPAGE_CHAR_TWOLINES +TwoLinesEachLine sym:cui.CheckBox.10242.401 +BeginningCharacter sym:cui.ListBox.10242.412 +EndCharacter sym:cui.ListBox.10242.414 + +*TabAsianLayoutOptions sym:CUI_HID_OPTIONS_ASIAN_LAYOUT +WesternCharactersOnly sym:cui.RadioButton.10246.2 +WesternTextAndPunctuation sym:cui.RadioButton.10246.3 +NoCompression sym:cui.RadioButton.10246.5 +CompressPunctuationOnly sym:cui.RadioButton.10246.6 +CompressPunctuationAndJapaneseKana sym:cui.RadioButton.10246.7 +Language sym:cui.ListBox.10246.12 +Standard sym:cui.CheckBox.10246.9 +NoStartOfLine sym:cui.Edit.10246.14 +NoEndOfLine sym:cui.Edit.10246.16 + +*TabAsianTypography sym:CUI_HID_SVXPAGE_PARA_ASIAN +ApplyList sym:cui.TriStateBox.10245.4 +AllowHangingPunctuation sym:cui.TriStateBox.10245.2 +ApplySpacingBetween sym:cui.TriStateBox.10245.7 + +*TabAutoCaption sym:SW_HID_OPTCAPTION_PAGE +ObjectList sym:SW_HID_OPTCAPTION_CLB +Category sym:sw.ComboBox.20878.14 +Numbering sym:sw.ListBox.20878.16 +CaptionSeparator sym:sw.Edit.20878.18 +Position sym:sw.ListBox.20878.20 +Level sym:sw.ListBox.20878.23 +ChapterSeparator sym:sw.Edit.20878.25 +CharacterStyle sym:sw.ListBox.20878.28 +ApplyBorderAndShadow sym:sw.CheckBox.20878.29 + +*TabBaseBookmarks sym:DBACCESS_HID_DSADMIN_DOCUMENTLINKS +Bookmarklist sym:DBACCESS_HID_DSADMIN_DOCUMENTS + +*TabBullet sym:CUI_HID_SVXPAGE_PICK_BULLET +Auswahl sym:CUI_HID_VALUESET_BULLET +Optionen sym:SW_HID_NUM_FORMAT_BTN +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +Remove sym:SW_HID_NUM_RESET + +*TabChartAxisLabel sym:CHART2_HID_SCH_TP_AXIS_LABEL + ShowLabels sym:chart2.CheckBox.920.1 + Tile sym:chart2.RadioButton.920.14 + StaggerOdd sym:chart2.RadioButton.920.15 + StaggerEven sym:chart2.RadioButton.920.16 + Automatic sym:chart2.RadioButton.920.17 + Overlap sym:chart2.CheckBox.920.11 + Break sym:chart2.CheckBox.920.12 + AngleKnob sym:CHART2_HID_SCH_ALIGNMENT_CTR_DIAL + AngleText sym:CHART2_HID_SCH_ALIGNMENT_DEGREES + VerticallyStacked sym:CHART2_HID_SCH_ALIGNMENT_STACKED + TextDirection sym:chart2.ListBox.920.20 -*TabChartAxisNumbers CUI_HID_NUMBERFORMAT - Category cui.ListBox.10041.9 - FormatCurrency cui.ListBox.10041.33 - FormatString CUI_HID_NUMBERFORMAT_LB_FORMAT - Language cui.ListBox.10041.13 - Sourceformat cui.CheckBox.10041.34 - DecimalPlaces cui.NumericField.10041.22 - LeadingZeroes cui.NumericField.10041.24 - NegativNumbersRed cui.CheckBox.10041.25 - ThousandsSeparator cui.CheckBox.10041.26 - FormatCode cui.Edit.10041.14 - AddButton CUI_HID_NUMBERFORMAT_TBI_ADD - EditCommentButton CUI_HID_NUMBERFORMAT_TBI_INFO - RemoveButton CUI_HID_NUMBERFORMAT_TBI_REMOVE - Comment cui.Edit.10041.28 +*TabChartAxisNumbers sym:CUI_HID_NUMBERFORMAT + Category sym:cui.ListBox.10041.9 + FormatCurrency sym:cui.ListBox.10041.33 + FormatString sym:CUI_HID_NUMBERFORMAT_LB_FORMAT + Language sym:cui.ListBox.10041.13 + Sourceformat sym:cui.CheckBox.10041.34 + DecimalPlaces sym:cui.NumericField.10041.22 + LeadingZeroes sym:cui.NumericField.10041.24 + NegativNumbersRed sym:cui.CheckBox.10041.25 + ThousandsSeparator sym:cui.CheckBox.10041.26 + FormatCode sym:cui.Edit.10041.14 + AddButton sym:CUI_HID_NUMBERFORMAT_TBI_ADD + EditCommentButton sym:CUI_HID_NUMBERFORMAT_TBI_INFO + RemoveButton sym:CUI_HID_NUMBERFORMAT_TBI_REMOVE + Comment sym:cui.Edit.10041.28 -*TabChartAxisScale chart2.TabPage.903 -MinimumValue chart2.SpinField.903.3 -MinimumAutomatic chart2.CheckBox.903.1 -MaximumValue chart2.SpinField.903.2 -MaximumAutomatic chart2.CheckBox.903.2 -MajorIntervalValue chart2.SpinField.903.1 -MajorIntervalAutomatic chart2.CheckBox.903.3 -MinorIntervalCount chart2.MetricField.903.10 -MinorIntervalCountAutomatic chart2.CheckBox.903.4 -ReferenceValue chart2.SpinField.903.4 -RreferenceValueAutomatic chart2.CheckBox.903.5 -LogarithmicScale chart2.CheckBox.903.6 -ReverseDirection chart2.CheckBox.903.7 - -*TabChartAxisPositioning chart2.TabPage.904 -CrossOtherAxisAt chart2.ListBox.904.1 -AxisAtValue chart2.SpinField.904.3 -AxisAtCategory chart2.ComboBox.904.4 -Hidden_Checkbox1 chart2.CheckBox.904.1 -PlaceLabels chart2.ListBox.904.2 -Hidden_Spinfield1 chart2.SpinField.904.5 -MajorIntervalMarksInner chart2.CheckBox.904.2 -MajorIntervalMarksOuter chart2.CheckBox.904.3 -MinorIntervalMarksInner chart2.CheckBox.904.4 -MinorIntervalMarksOuter chart2.CheckBox.904.5 -PlaceMarks chart2.ListBox.904.6 -Hidden_Checkbox2 chart2.CheckBox.904.6 -Hidden_MoreBtn chart2.PushButton.904.1 -Hidden_Checkbox3 chart2.CheckBox.904.7 -Hidden_More2 chart2.PushButton.904.2 - -*TabChartTypeDataRange chart2.TabPage.911 - DataRange chart2.Edit.911.1 - SelectDataRange chart2.ImageButton.911.1 - Rows chart2.RadioButton.911.1 - Columns chart2.RadioButton.911.2 - FirstRowAsLabel chart2.CheckBox.911.1 - FirstColumnAsLabel chart2.CheckBox.911.2 +*TabChartAxisScale sym:chart2.TabPage.903 +MinimumValue sym:chart2.SpinField.903.3 +MinimumAutomatic sym:chart2.CheckBox.903.1 +MaximumValue sym:chart2.SpinField.903.2 +MaximumAutomatic sym:chart2.CheckBox.903.2 +MajorIntervalValue sym:chart2.SpinField.903.1 +MajorIntervalAutomatic sym:chart2.CheckBox.903.3 +MinorIntervalCount sym:chart2.MetricField.903.10 +MinorIntervalCountAutomatic sym:chart2.CheckBox.903.4 +ReferenceValue sym:chart2.SpinField.903.4 +RreferenceValueAutomatic sym:chart2.CheckBox.903.5 +LogarithmicScale sym:chart2.CheckBox.903.6 +ReverseDirection sym:chart2.CheckBox.903.7 + +*TabChartAxisPositioning sym:chart2.TabPage.904 +CrossOtherAxisAt sym:chart2.ListBox.904.1 +AxisAtValue sym:chart2.SpinField.904.3 +AxisAtCategory sym:chart2.ComboBox.904.4 +Hidden_Checkbox1 sym:chart2.CheckBox.904.1 +PlaceLabels sym:chart2.ListBox.904.2 +Hidden_Spinfield1 sym:chart2.SpinField.904.5 +MajorIntervalMarksInner sym:chart2.CheckBox.904.2 +MajorIntervalMarksOuter sym:chart2.CheckBox.904.3 +MinorIntervalMarksInner sym:chart2.CheckBox.904.4 +MinorIntervalMarksOuter sym:chart2.CheckBox.904.5 +PlaceMarks sym:chart2.ListBox.904.6 +Hidden_Checkbox2 sym:chart2.CheckBox.904.6 +Hidden_MoreBtn sym:chart2.PushButton.904.1 +Hidden_Checkbox3 sym:chart2.CheckBox.904.7 +Hidden_More2 sym:chart2.PushButton.904.2 + +*TabChartTypeDataRange sym:chart2.TabPage.911 + DataRange sym:chart2.Edit.911.1 + SelectDataRange sym:chart2.ImageButton.911.1 + Rows sym:chart2.RadioButton.911.1 + Columns sym:chart2.RadioButton.911.2 + FirstRowAsLabel sym:chart2.CheckBox.911.1 + FirstColumnAsLabel sym:chart2.CheckBox.911.2 +TabDataRangesDataRange TabChartTypeDataRange +TabFormatDataRangesDataRange TabChartTypeDataRange -*TabChartTypeDataSeries chart2.TabPage.914 - DataRanges CHART2_HID_SCH_DATA_RANGES_LIST - RangeFor chart2.Edit.914.80 - SelectRange chart2.ImageButton.914.90 - Categories chart2.Edit.914.120 - SelectCategories chart2.ImageButton.914.130 - AddButton chart2.PushButton.914.30 - RemoveButton chart2.PushButton.914.40 - MoveUp chart2.PushButton.914.140 - MoveDown chart2.PushButton.914.150 - DataSeries CHART2_HID_SCH_SERIES_LIST +*TabChartTypeDataSeries sym:chart2.TabPage.914 + DataRanges sym:CHART2_HID_SCH_DATA_RANGES_LIST + RangeFor sym:chart2.Edit.914.80 + SelectRange sym:chart2.ImageButton.914.90 + Categories sym:chart2.Edit.914.120 + SelectCategories sym:chart2.ImageButton.914.130 + AddButton sym:chart2.PushButton.914.30 + RemoveButton sym:chart2.PushButton.914.40 + MoveUp sym:chart2.PushButton.914.140 + MoveDown sym:chart2.PushButton.914.150 + DataSeries sym:CHART2_HID_SCH_SERIES_LIST +TabDataRangesDataSeries TabChartTypeDataSeries +TabFormatDataRangesDataSeries TabChartTypeDataSeries -*TabChartPieOptions chart2.TabPage.909 -Clockwise chart2.CheckBox.909.1 -StartingAngle CHART2_HID_SCH_STARTING_ANGLE_DIAL -Degrees chart2.NumericField.909.1 - -*TabChartTypeChartElements chart2.TabPage.912 -Title CHART2_HID_SCH_TITLE_MAIN -Subtitle CHART2_HID_SCH_TITLE_SUB -TitleXaxis CHART2_HID_SCH_TITLE_X -TitleYaxis CHART2_HID_SCH_TITLE_Y -TitleZaxis CHART2_HID_SCH_TITLE_Z -SecondTitleXaxis CHART2_HID_SCH_TITLE_SECONDARY_X -SecondTitleYaxis CHART2_HID_SCH_TITLE_SECONDARY_Y -Display CHART2_HID_SCH_LEGEND_SHOW -PositionLeft CHART2_HID_SCH_LEGEND_POS_LEFT -PositionTop CHART2_HID_SCH_LEGEND_POS_TOP -PositionRight CHART2_HID_SCH_LEGEND_POS_RIGHT -PositionBottom CHART2_HID_SCH_LEGEND_POS_BOTTOM -GridLinesXaxis CHART2_HID_SCH_CB_XGRID -GridLinesYaxis CHART2_HID_SCH_CB_YGRID -GridLinesZaxis CHART2_HID_SCH_CB_ZGRID +*TabChartPieOptions sym:chart2.TabPage.909 +Clockwise sym:chart2.CheckBox.909.1 +StartingAngle sym:CHART2_HID_SCH_STARTING_ANGLE_DIAL +Degrees sym:chart2.NumericField.909.1 + +*TabChartTypeChartElements sym:chart2.TabPage.912 +Title sym:CHART2_HID_SCH_TITLE_MAIN +Subtitle sym:CHART2_HID_SCH_TITLE_SUB +TitleXaxis sym:CHART2_HID_SCH_TITLE_X +TitleYaxis sym:CHART2_HID_SCH_TITLE_Y +TitleZaxis sym:CHART2_HID_SCH_TITLE_Z +SecondTitleXaxis sym:CHART2_HID_SCH_TITLE_SECONDARY_X +SecondTitleYaxis sym:CHART2_HID_SCH_TITLE_SECONDARY_Y +Display sym:CHART2_HID_SCH_LEGEND_SHOW +PositionLeft sym:CHART2_HID_SCH_LEGEND_POS_LEFT +PositionTop sym:CHART2_HID_SCH_LEGEND_POS_TOP +PositionRight sym:CHART2_HID_SCH_LEGEND_POS_RIGHT +PositionBottom sym:CHART2_HID_SCH_LEGEND_POS_BOTTOM +GridLinesXaxis sym:CHART2_HID_SCH_CB_XGRID +GridLinesYaxis sym:CHART2_HID_SCH_CB_YGRID +GridLinesZaxis sym:CHART2_HID_SCH_CB_ZGRID -*TabChartTypeChartLocation chart2.TabPage.913 -InsertInSheet chart2.ListBox.913.1 - -*TabCreateOptionGroup extensions.TabPage.19726 -GroupCaption extensions.Edit.19726.3 - -*TabConnections cui.TabPage.17022 -DriverList CUI_HID_OFA_CONNPOOL_DRIVERLIST -ConnectionPoolingEnabled cui.CheckBox.17022.2 -EnablePoolingForThisDriver cui.CheckBox.17022.7 -Timeout cui.NumericField.17022.9 - -*TabConnection dbaccess.TabPage.19206 -dBasePath DBACCESS_HID_DSADMIN_DBASE_PATH -SelectPath DBACCESS_HID_DSADMIN_BROWSECONN -Username dbaccess.Edit.19206.1 -PasswordRequired dbaccess.CheckBox.19206.1 -JDBCDriverClass DBACCESS_HID_DSADMIN_DRIVERCLASS -TestDriver dbaccess.PushButton.19206.1 -MySQLODBCDatasource DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE -TestConnection dbaccess.PushButton.19206.2 -MySQLJDBCDatasource DBACCESS_HID_DSADMIN_MYSQL_DATABASE -AdabasDatasource DBACCESS_HID_DSADMIN_ADABAS_DATABASE -OracleJDBCDatasource DBACCESS_HID_DSADMIN_ORACLE_DATABASE -ConnectUrl DBACCESS_HID_DSADMIN_URL_GENERAL -OdbcDatasourceName DBACCESS_HID_DSADMIN_ODBC_DATASOURCE -SpreadsheetPath DBACCESS_HID_DSADMIN_CALC_PATH -HostName DBACCESS_HID_DSADMIN_LDAP_HOSTNAME -BaseDN DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN -TextPath DBACCESS_HID_DSADMIN_FLAT_PATH - -*TabCopyDatabaseTable DBACCESS_HID_TAB_WIZ_COPYTABLE -TableName DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT -DefinitionAndData dbaccess.RadioButton.19212.1 -Definition dbaccess.RadioButton.19212.2 -AsTableView dbaccess.RadioButton.19212.3 -AttachData dbaccess.RadioButton.19212.4 -CreatePrimaryKey dbaccess.CheckBox.19212.5 -PrimaryKeyName dbaccess.Edit.19212.3 - -*TabColumnSelect DBACCESS_HID_TAB_WIZ_COLUMN_SELECT -LeftColumNames dbaccess.MultiListBox.19209.1 -Add dbaccess.ImageButton.19209.1 -AddAll dbaccess.ImageButton.19209.3 -Remove dbaccess.ImageButton.19209.2 -RemoveAll dbaccess.ImageButton.19209.4 -RightColumNames dbaccess.MultiListBox.19209.2 - -*TabCompatibility SW_HID_OPTCOMPATIBILITY_PAGE -Options SW_HID_COMPATIBILITY_OPTIONS_BOX -Formatting sw.ListBox.20903.12 -Reset sw.PushButton.20903.15 -Default sw.PushButton.20903.16 - -*TabComplexTextLayout CUI_HID_OPTIONS_CTL -UseSequenceChecking cui.CheckBox.10252.11 -Logical cui.RadioButton.10252.22 -Visual cui.RadioButton.10252.23 -Numerals cui.ListBox.10252.32 -Restricted cui.CheckBox.10252.12 -TypeAndReplace cui.CheckBox.10252.13 - -*TabCustomizeEvents CUI_HID_SVX_CONFIG_EVENT -SaveIn cui.ListBox.10295.11 -EventListbox CUI_HID_SVX_MACRO_LB_EVENT -AssignMacro cui.PushButton.10295.2 -RemoveMacro cui.PushButton.10295.3 -ResetBtn SFX2_HID_TABDLG_RESET_BTN - -*TabCustomizeMenu CUI_HID_SVX_CONFIG_MENU -Menu cui.ListBox.10292.311 -BtnNew cui.PushButton.10292.312 -MenuBtn cui.MenuButton.10292.314 -AddCommands cui.PushButton.10292.326 -Command cui.MenuButton.10292.318 -BtnUp cui.ImageButton.10292.319 -BtnDown cui.ImageButton.10292.320 -SaveIn cui.ListBox.10292.324 -ResetBtn SFX2_HID_TABDLG_RESET_BTN -Entries CUI_HID_SVX_CONFIG_MENU_CONTENTS - -*TabCustomizeToolbars CUI_HID_SVX_CONFIG_TOOLBAR -Menu cui.ListBox.10292.311 -BtnNew CUI_HID_SVX_NEW_TOOLBAR -MenuBtn CUI_HID_SVX_MODIFY_TOOLBAR -AddCommands CUI_HID_SVX_NEW_TOOLBAR_ITEM -Command CUI_HID_SVX_MODIFY_TOOLBAR_ITEM -BtnUp cui.ImageButton.10292.319 -BtnDown cui.ImageButton.10292.320 -SaveIn CUI_HID_SVX_SAVE_IN -ToolbarContents CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS -ResetBtn SFX2_HID_TABDLG_RESET_BTN +*TabChartTypeChartLocation sym:chart2.TabPage.913 +InsertInSheet sym:chart2.ListBox.913.1 + +*TabCreateOptionGroup sym:extensions.TabPage.19726 +GroupCaption sym:extensions.Edit.19726.3 + +*TabConnections sym:cui.TabPage.17022 +DriverList sym:CUI_HID_OFA_CONNPOOL_DRIVERLIST +ConnectionPoolingEnabled sym:cui.CheckBox.17022.2 +EnablePoolingForThisDriver sym:cui.CheckBox.17022.7 +Timeout sym:cui.NumericField.17022.9 + +*TabConnection sym:dbaccess.TabPage.19206 +dBasePath sym:DBACCESS_HID_DSADMIN_DBASE_PATH +SelectPath sym:DBACCESS_HID_DSADMIN_BROWSECONN +Username sym:dbaccess.Edit.19206.1 +PasswordRequired sym:dbaccess.CheckBox.19206.1 +JDBCDriverClass sym:DBACCESS_HID_DSADMIN_DRIVERCLASS +TestDriver sym:dbaccess.PushButton.19206.1 +MySQLODBCDatasource sym:DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE +TestConnection sym:dbaccess.PushButton.19206.2 +MySQLJDBCDatasource sym:DBACCESS_HID_DSADMIN_MYSQL_DATABASE +AdabasDatasource sym:DBACCESS_HID_DSADMIN_ADABAS_DATABASE +OracleJDBCDatasource sym:DBACCESS_HID_DSADMIN_ORACLE_DATABASE +ConnectUrl sym:DBACCESS_HID_DSADMIN_URL_GENERAL +OdbcDatasourceName sym:DBACCESS_HID_DSADMIN_ODBC_DATASOURCE +SpreadsheetPath sym:DBACCESS_HID_DSADMIN_CALC_PATH +HostName sym:DBACCESS_HID_DSADMIN_LDAP_HOSTNAME +BaseDN sym:DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN +TextPath sym:DBACCESS_HID_DSADMIN_FLAT_PATH + +*TabCopyDatabaseTable sym:DBACCESS_HID_TAB_WIZ_COPYTABLE +TableName sym:DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT +DefinitionAndData sym:dbaccess.RadioButton.19212.1 +Definition sym:dbaccess.RadioButton.19212.2 +AsTableView sym:dbaccess.RadioButton.19212.3 +AttachData sym:dbaccess.RadioButton.19212.4 +CreatePrimaryKey sym:dbaccess.CheckBox.19212.5 +PrimaryKeyName sym:dbaccess.Edit.19212.3 + +*TabColumnSelect sym:DBACCESS_HID_TAB_WIZ_COLUMN_SELECT +LeftColumNames sym:dbaccess.MultiListBox.19209.1 +Add sym:dbaccess.ImageButton.19209.1 +AddAll sym:dbaccess.ImageButton.19209.3 +Remove sym:dbaccess.ImageButton.19209.2 +RemoveAll sym:dbaccess.ImageButton.19209.4 +RightColumNames sym:dbaccess.MultiListBox.19209.2 + +*TabCompatibility sym:SW_HID_OPTCOMPATIBILITY_PAGE +Options sym:SW_HID_COMPATIBILITY_OPTIONS_BOX +Formatting sym:sw.ListBox.20903.12 +Reset sym:sw.PushButton.20903.15 +Default sym:sw.PushButton.20903.16 + +*TabComplexTextLayout sym:CUI_HID_OPTIONS_CTL +UseSequenceChecking sym:cui.CheckBox.10252.11 +Logical sym:cui.RadioButton.10252.22 +Visual sym:cui.RadioButton.10252.23 +Numerals sym:cui.ListBox.10252.32 +Restricted sym:cui.CheckBox.10252.12 +TypeAndReplace sym:cui.CheckBox.10252.13 + +*TabCustomizeEvents sym:CUI_HID_SVX_CONFIG_EVENT +SaveIn sym:cui.ListBox.10295.11 +EventListbox sym:CUI_HID_SVX_MACRO_LB_EVENT +AssignMacro sym:cui.PushButton.10295.2 +RemoveMacro sym:cui.PushButton.10295.3 +ResetBtn sym:SFX2_HID_TABDLG_RESET_BTN + +*TabCustomizeMenu sym:CUI_HID_SVX_CONFIG_MENU +Menu sym:cui.ListBox.10292.311 +BtnNew sym:cui.PushButton.10292.312 +MenuBtn sym:cui.MenuButton.10292.314 +AddCommands sym:cui.PushButton.10292.326 +Command sym:cui.MenuButton.10292.318 +BtnUp sym:cui.ImageButton.10292.319 +BtnDown sym:cui.ImageButton.10292.320 +SaveIn sym:cui.ListBox.10292.324 +ResetBtn sym:SFX2_HID_TABDLG_RESET_BTN +Entries sym:CUI_HID_SVX_CONFIG_MENU_CONTENTS + +*TabCustomizeToolbars sym:CUI_HID_SVX_CONFIG_TOOLBAR +Menu sym:cui.ListBox.10292.311 +BtnNew sym:CUI_HID_SVX_NEW_TOOLBAR +MenuBtn sym:CUI_HID_SVX_MODIFY_TOOLBAR +AddCommands sym:CUI_HID_SVX_NEW_TOOLBAR_ITEM +Command sym:CUI_HID_SVX_MODIFY_TOOLBAR_ITEM +BtnUp sym:cui.ImageButton.10292.319 +BtnDown sym:cui.ImageButton.10292.320 +SaveIn sym:CUI_HID_SVX_SAVE_IN +ToolbarContents sym:CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS +ResetBtn sym:SFX2_HID_TABDLG_RESET_BTN -*TabDatabaseField extensions.TabPage.19725 -YesSaveIt extensions.RadioButton.19725.3 -NoValueForm extensions.RadioButton.19725.4 -Fieldbox extensions.ListBox.19725.4 - -*TabDatabaseValues extensions.TabPage.19724 -YesSaveIt extensions.RadioButton.19725.3 -NoValueForm extensions.RadioButton.19725.4 -Fieldbox extensions.ListBox.19725.4 -WhichValue extensions.Edit.19724.2 -OptionFields extensions.ListBox.19724.3 - -*TabDataControl EXTENSIONS_HID_FM_PROPDLG_TAB_DATA -DataField EXTENSIONS_HID_PROP_CONTROLSOURCE -EmptyStringIsNull EXTENSIONS_HID_PROP_EMPTY_IS_NULL -FilterProposal EXTENSIONS_HID_PROP_FILTERPROPOSAL -TypeOfListContent EXTENSIONS_HID_PROP_LISTSOURCETYPE -ListContent EXTENSIONS_HID_PROP_LISTSOURCE -BoundField EXTENSIONS_HID_PROP_BOUNDCOLUMN -CellBound EXTENSIONS_HID_PROP_BOUND_CELL -CellContentType EXTENSIONS_HID_PROP_CELL_EXCHANGE_TYPE -CellRange EXTENSIONS_HID_PROP_LIST_CELL_RANGE -ReferenceValue EXTENSIONS_HID_PROP_REFVALUE -ReferenceValueOff EXTENSIONS_HID_PROP_UNCHECKEDREFVALUE +*TabDatabaseField sym:extensions.TabPage.19725 +YesSaveIt sym:extensions.RadioButton.19725.3 +NoValueForm sym:extensions.RadioButton.19725.4 +Fieldbox sym:extensions.ListBox.19725.4 + +*TabDatabaseValues sym:extensions.TabPage.19724 +YesSaveIt sym:extensions.RadioButton.19725.3 +NoValueForm sym:extensions.RadioButton.19725.4 +Fieldbox sym:extensions.ListBox.19725.4 +WhichValue sym:extensions.Edit.19724.2 +OptionFields sym:extensions.ListBox.19724.3 + +*TabDataControl sym:EXTENSIONS_HID_FM_PROPDLG_TAB_DATA +DataField sym:EXTENSIONS_HID_PROP_CONTROLSOURCE +EmptyStringIsNull sym:EXTENSIONS_HID_PROP_EMPTY_IS_NULL +FilterProposal sym:EXTENSIONS_HID_PROP_FILTERPROPOSAL +TypeOfListContent sym:EXTENSIONS_HID_PROP_LISTSOURCETYPE +ListContent sym:EXTENSIONS_HID_PROP_LISTSOURCE +BoundField sym:EXTENSIONS_HID_PROP_BOUNDCOLUMN +CellBound sym:EXTENSIONS_HID_PROP_BOUND_CELL +CellContentType sym:EXTENSIONS_HID_PROP_CELL_EXCHANGE_TYPE +CellRange sym:EXTENSIONS_HID_PROP_LIST_CELL_RANGE +ReferenceValue sym:EXTENSIONS_HID_PROP_REFVALUE +ReferenceValueOff sym:EXTENSIONS_HID_PROP_UNCHECKEDREFVALUE 'Controls in XForm Mode -XFormDataModel EXTENSIONS_HID_PROP_XML_DATA_MODEL -XFormBindExpression EXTENSIONS_HID_PROP_BIND_EXPRESSION -XFormBindExpressionName EXTENSIONS_HID_PROP_BINDING_NAME -XFormBindExpressionBtn EXTENSIONS_UID_PROP_DLG_BIND_EXPRESSION -XFormRequired EXTENSIONS_HID_PROP_XSD_REQUIRED -XFormRequiredBtn EXTENSIONS_UID_PROP_DLG_XSD_REQUIRED -XFormReleveant EXTENSIONS_HID_PROP_XSD_RELEVANT -XFormReleveantBtn EXTENSIONS_UID_PROP_DLG_XSD_RELEVANT -XFormReadOnly EXTENSIONS_HID_PROP_XSD_READONLY -XFormReadOnlyBtn EXTENSIONS_UID_PROP_DLG_XSD_READONLY -XFormConstraint EXTENSIONS_HID_PROP_XSD_CONSTRAINT -XFormConstraintBtn EXTENSIONS_UID_PROP_DLG_XSD_CONSTRAINT -XFormCalculation EXTENSIONS_HID_PROP_XSD_CALCULATION -XFormCalculationBtn EXTENSIONS_UID_PROP_DLG_XSD_CALCULATION -XFormDataType EXTENSIONS_HID_PROP_XSD_DATA_TYPE -XFormAddDataTypeBtn EXTENSIONS_UID_PROP_ADD_DATA_TYPE -XFormRemoveDataTypeBtn EXTENSIONS_UID_PROP_REMOVE_DATA_TYPE - -*TabDataForm EXTENSIONS_HID_FM_PROPDLG_TAB_DATA -DataSource EXTENSIONS_HID_PROP_DATASOURCE -ContentType EXTENSIONS_HID_PROP_CURSORSOURCETYPE -Content EXTENSIONS_HID_PROP_CURSORSOURCE -AnalyzeSQLCommand EXTENSIONS_HID_PROP_ESCAPE_PROCESSING -Filter EXTENSIONS_HID_PROP_FILTER -FilterDLGButton EXTENSIONS_UID_PROP_DLG_FILTER -Sort EXTENSIONS_HID_PROP_SORT_CRITERIA -AllowAdditions EXTENSIONS_HID_PROP_ALLOW_ADDITIONS -AllowModifications EXTENSIONS_HID_PROP_ALLOW_EDITS -DeleteData EXTENSIONS_HID_PROP_ALLOW_DELETIONS -AddDataOnly EXTENSIONS_HID_PROP_DATAENTRY -NavigationBar EXTENSIONS_HID_PROP_NAVIGATION -Cycle EXTENSIONS_HID_PROP_CYCLE -LinkMasterFields EXTENSIONS_HID_PROP_MASTERFIELDS -LinkSlaveFields EXTENSIONS_HID_PROP_SLAVEFIELDS -FormLinkDLGButton EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS -OpenQueryDesign EXTENSIONS_UID_PROP_DLG_SQLCOMMAND -SortDLGButton EXTENSIONS_UID_PROP_DLG_ORDER - -*TabDataPointLayout chart2.TabPage.907 - BarColumnShape CHART2_HID_SCH_LB_BAR_GEOMETRY - -*TabDataSeriesLabels CHART2_HID_SCH_DATA_DESCR -ShowValue CHART2_HID_SCH_DATALABEL_VALUE -AsNumber CHART2_HID_SCH_DATALABEL_NUMBER -AsPercentage CHART2_HID_SCH_DATALABEL_PERCENT -ShowLabelText CHART2_HID_SCH_DATALABEL_TEXT -ShowLegendIconWithLabel CHART2_HID_SCH_DATALABEL_SYMBOL -NumberFormat CHART2_HID_SCH_PB_NUMBERFORMAT -PercentageFormat CHART2_HID_SCH_PB_PERCENT_NUMBERFORMAT -Separator CHART2_HID_SCH_DATALABEL_SEPARATOR -Placement CHART2_HID_SCH_DATALABEL_PLACEMENT -TextDirection CHART2_HID_SCH_TEXTDIRECTION -RotateAngle CHART2_HID_SCH_DATALABEL_ROTATION_KNOB -RotateDegrees CHART2_HID_SCH_DATALABEL_ROTATION_EDIT +XFormDataModel sym:EXTENSIONS_HID_PROP_XML_DATA_MODEL +XFormBindExpression sym:EXTENSIONS_HID_PROP_BIND_EXPRESSION +XFormBindExpressionName sym:EXTENSIONS_HID_PROP_BINDING_NAME +XFormBindExpressionBtn sym:EXTENSIONS_UID_PROP_DLG_BIND_EXPRESSION +XFormRequired sym:EXTENSIONS_HID_PROP_XSD_REQUIRED +XFormRequiredBtn sym:EXTENSIONS_UID_PROP_DLG_XSD_REQUIRED +XFormReleveant sym:EXTENSIONS_HID_PROP_XSD_RELEVANT +XFormReleveantBtn sym:EXTENSIONS_UID_PROP_DLG_XSD_RELEVANT +XFormReadOnly sym:EXTENSIONS_HID_PROP_XSD_READONLY +XFormReadOnlyBtn sym:EXTENSIONS_UID_PROP_DLG_XSD_READONLY +XFormConstraint sym:EXTENSIONS_HID_PROP_XSD_CONSTRAINT +XFormConstraintBtn sym:EXTENSIONS_UID_PROP_DLG_XSD_CONSTRAINT +XFormCalculation sym:EXTENSIONS_HID_PROP_XSD_CALCULATION +XFormCalculationBtn sym:EXTENSIONS_UID_PROP_DLG_XSD_CALCULATION +XFormDataType sym:EXTENSIONS_HID_PROP_XSD_DATA_TYPE +XFormAddDataTypeBtn sym:EXTENSIONS_UID_PROP_ADD_DATA_TYPE +XFormRemoveDataTypeBtn sym:EXTENSIONS_UID_PROP_REMOVE_DATA_TYPE + +*TabDataForm sym:EXTENSIONS_HID_FM_PROPDLG_TAB_DATA +DataSource sym:EXTENSIONS_HID_PROP_DATASOURCE +ContentType sym:EXTENSIONS_HID_PROP_CURSORSOURCETYPE +Content sym:EXTENSIONS_HID_PROP_CURSORSOURCE +AnalyzeSQLCommand sym:EXTENSIONS_HID_PROP_ESCAPE_PROCESSING +Filter sym:EXTENSIONS_HID_PROP_FILTER +FilterDLGButton sym:EXTENSIONS_UID_PROP_DLG_FILTER +Sort sym:EXTENSIONS_HID_PROP_SORT_CRITERIA +AllowAdditions sym:EXTENSIONS_HID_PROP_ALLOW_ADDITIONS +AllowModifications sym:EXTENSIONS_HID_PROP_ALLOW_EDITS +DeleteData sym:EXTENSIONS_HID_PROP_ALLOW_DELETIONS +AddDataOnly sym:EXTENSIONS_HID_PROP_DATAENTRY +NavigationBar sym:EXTENSIONS_HID_PROP_NAVIGATION +Cycle sym:EXTENSIONS_HID_PROP_CYCLE +LinkMasterFields sym:EXTENSIONS_HID_PROP_MASTERFIELDS +LinkSlaveFields sym:EXTENSIONS_HID_PROP_SLAVEFIELDS +FormLinkDLGButton sym:EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS +OpenQueryDesign sym:EXTENSIONS_UID_PROP_DLG_SQLCOMMAND +SortDLGButton sym:EXTENSIONS_UID_PROP_DLG_ORDER + +*TabDataPointLayout sym:chart2.TabPage.907 + BarColumnShape sym:CHART2_HID_SCH_LB_BAR_GEOMETRY + +*TabDataSeriesLabels sym:CHART2_HID_SCH_DATA_DESCR +ShowValue sym:CHART2_HID_SCH_DATALABEL_VALUE +AsNumber sym:CHART2_HID_SCH_DATALABEL_NUMBER +AsPercentage sym:CHART2_HID_SCH_DATALABEL_PERCENT +ShowLabelText sym:CHART2_HID_SCH_DATALABEL_TEXT +ShowLegendIconWithLabel sym:CHART2_HID_SCH_DATALABEL_SYMBOL +NumberFormat sym:CHART2_HID_SCH_PB_NUMBERFORMAT +PercentageFormat sym:CHART2_HID_SCH_PB_PERCENT_NUMBERFORMAT +Separator sym:CHART2_HID_SCH_DATALABEL_SEPARATOR +Placement sym:CHART2_HID_SCH_DATALABEL_PLACEMENT +TextDirection sym:CHART2_HID_SCH_TEXTDIRECTION +RotateAngle sym:CHART2_HID_SCH_DATALABEL_ROTATION_KNOB +RotateDegrees sym:CHART2_HID_SCH_DATALABEL_ROTATION_EDIT +TabDataPointLabels TabDataSeriesLabels -*TabDataSeriesOptions chart2.TabPage.908 -PrimaryYaxis chart2.RadioButton.908.2 -SecondaryYaxis chart2.RadioButton.908.3 -Gap chart2.MetricField.908.4 -Overlap chart2.MetricField.908.5 -ConnectionLines chart2.CheckBox.908.9 -ShowBarsSideBySide chart2.CheckBox.908.10 -LeaveGap chart2.RadioButton.908.13 -AssumeZero chart2.RadioButton.908.14 -ContinueLine chart2.RadioButton.908.15 -IncludeHiddenCells chart2.CheckBox.908.16 - -*TabDataSourceName extensions.TabPage.19704 -SourceName extensions.Edit.19704.1 - -*TabdBase DBACCESS_HID_DSADMIN_PAGE_DBASE -CharSet DBACCESS_HID_DSADMIN_CHARSET -DisplayInactiveRecords DBACCESS_HID_DSADMIN_SHOWDELETED -Indexes DBACCESS_HID_DSADMIN_DBASE_INDICIES - -*TabDefaultFieldSelection extensions.TabPage.19723 -YesFollowing extensions.RadioButton.19723.1 -NoSelected extensions.RadioButton.19723.2 -Selection extensions.ListBox.19723.3 - -*TabDialogs basctl.TabPage.14889 -ModuleList BASCTL_HID_BASICIDE_MODULES_TREE -Edit basctl.PushButton.14889.4 -NewModule basctl.PushButton.14889.6 -NewDialog basctl.PushButton.14889.7 -Delete basctl.PushButton.14889.8 +*TabDataSeriesOptions sym:chart2.TabPage.908 +PrimaryYaxis sym:chart2.RadioButton.908.2 +SecondaryYaxis sym:chart2.RadioButton.908.3 +Gap sym:chart2.MetricField.908.4 +Overlap sym:chart2.MetricField.908.5 +ConnectionLines sym:chart2.CheckBox.908.9 +ShowBarsSideBySide sym:chart2.CheckBox.908.10 +LeaveGap sym:chart2.RadioButton.908.13 +AssumeZero sym:chart2.RadioButton.908.14 +ContinueLine sym:chart2.RadioButton.908.15 +IncludeHiddenCells sym:chart2.CheckBox.908.16 + +*TabDataSourceName sym:extensions.TabPage.19704 +SourceName sym:extensions.Edit.19704.1 + +*TabdBase sym:DBACCESS_HID_DSADMIN_PAGE_DBASE +CharSet sym:DBACCESS_HID_DSADMIN_CHARSET +DisplayInactiveRecords sym:DBACCESS_HID_DSADMIN_SHOWDELETED +Indexes sym:DBACCESS_HID_DSADMIN_DBASE_INDICIES + +*TabDefaultFieldSelection sym:extensions.TabPage.19723 +YesFollowing sym:extensions.RadioButton.19723.1 +NoSelected sym:extensions.RadioButton.19723.2 +Selection sym:extensions.ListBox.19723.3 + +*TabDialogs sym:basctl.TabPage.14889 +ModuleList sym:BASCTL_HID_BASICIDE_MODULES_TREE +Edit sym:basctl.PushButton.14889.4 +NewModule sym:basctl.PushButton.14889.6 +NewDialog sym:basctl.PushButton.14889.7 +Delete sym:basctl.PushButton.14889.8 diff --git a/testautomation/global/win/etab_e_g.win b/testautomation/global/win/etab_e_g.win index 42d33ef010e3..32502385ef81 100644 --- a/testautomation/global/win/etab_e_g.win +++ b/testautomation/global/win/etab_e_g.win @@ -1,374 +1,374 @@ -*TabEffect sd.TabPage.20871 -Sound sd.ListBox.20871.11 -Play sd.PushButton.20871.12 -AfterAnimation sd.ListBox.20871.14 -Dimcolor sd.ListBox.20871.16 -TextAnimation sd.ListBox.20871.18 -DelayBetweenCharacters sd.MetricField.20871.19 +*TabEffect sym:sd.TabPage.20871 +Sound sym:sd.ListBox.20871.11 +Play sym:sd.PushButton.20871.12 +AfterAnimation sym:sd.ListBox.20871.14 +Dimcolor sym:sd.ListBox.20871.16 +TextAnimation sym:sd.ListBox.20871.18 +DelayBetweenCharacters sym:sd.MetricField.20871.19 -*TabEmail CUI_HID_OPTIONS_MAIL -EmailProgram cui.Edit.10155.4 -EmailOpen cui.PushButton.10155.5 +*TabEmail sym:CUI_HID_OPTIONS_MAIL +EmailProgram sym:cui.Edit.10155.4 +EmailOpen sym:cui.PushButton.10155.5 -*TabEntrance SD_HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE -Effects sd.ListBox.20874.1 -Speed sd.ComboBox.20874.3 -AutomaticPreview sd.CheckBox.20874.4 +*TabEntrance sym:SD_HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE +Effects sym:sd.ListBox.20874.1 +Speed sym:sd.ComboBox.20874.3 +AutomaticPreview sym:sd.CheckBox.20874.4 -*TabEmphasis SD_HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS -Effects sd.ListBox.20874.1 -Speed sd.ComboBox.20874.3 -AutomaticPreview sd.CheckBox.20874.4 +*TabEmphasis sym:SD_HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS +Effects sym:sd.ListBox.20874.1 +Speed sym:sd.ComboBox.20874.3 +AutomaticPreview sym:sd.CheckBox.20874.4 -*TabExit SD_HID_SD_CUSTOMANIMATIONDIALOG_EXIT -Effects sd.ListBox.20874.1 -Speed sd.ComboBox.20874.3 -AutomaticPreview sd.CheckBox.20874.4 +*TabExit sym:SD_HID_SD_CUSTOMANIMATIONDIALOG_EXIT +Effects sym:sd.ListBox.20874.1 +Speed sym:sd.ComboBox.20874.3 +AutomaticPreview sym:sd.CheckBox.20874.4 -*TabMotionPaths SD_HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH -Effects sd.ListBox.20874.1 -Speed sd.ComboBox.20874.3 -AutomaticPreview sd.CheckBox.20874.4 +*TabMotionPaths sym:SD_HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH +Effects sym:sd.ListBox.20874.1 +Speed sym:sd.ComboBox.20874.3 +AutomaticPreview sym:sd.CheckBox.20874.4 -*TabEnvelope SW_HID_ENV_ENV -Addressee sw.MultiLineEdit.22752.2 -Sender sw.CheckBox.22752.10 -SenderText sw.MultiLineEdit.22752.11 -Database sw.ListBox.22752.4 -Table sw.ListBox.22752.6 -Datenbasefield sw.ListBox.22752.9 -Apply sw.ImageButton.22752.7 -Print SW_HID_ENVELOP_PRINT -Insert SW_HID_ENVELOP_INSERT -Back SFX2_HID_TABDLG_RESET_BTN +*TabEnvelope sym:SW_HID_ENV_ENV +Addressee sym:sw.MultiLineEdit.22752.2 +Sender sym:sw.CheckBox.22752.10 +SenderText sym:sw.MultiLineEdit.22752.11 +Database sym:sw.ListBox.22752.4 +Table sym:sw.ListBox.22752.6 +Datenbasefield sym:sw.ListBox.22752.9 +Apply sym:sw.ImageButton.22752.7 +Print sym:SW_HID_ENVELOP_PRINT +Insert sym:SW_HID_ENVELOP_INSERT +Back sym:SFX2_HID_TABDLG_RESET_BTN -*TabEventsControl EXTENSIONS_HID_FM_PROPDLG_TAB_EVT -evtActionPerformed EXTENSIONS_HID_EVT_ACTIONPERFORMED -evtFocusGained EXTENSIONS_HID_EVT_FOCUSGAINED -evtFocusLost EXTENSIONS_HID_EVT_FOCUSLOST -evtKeyTyped EXTENSIONS_HID_EVT_KEYTYPED -evtKeyUp EXTENSIONS_HID_EVT_KEYUP -evtMouseEntered EXTENSIONS_HID_EVT_MOUSEENTERED -evtMouseDragged EXTENSIONS_HID_EVT_MOUSEDRAGGED -evtMouseMoved EXTENSIONS_HID_EVT_MOUSEMOVED -evtMousePressed EXTENSIONS_HID_EVT_MOUSEPRESSED -evtMouseRelesased EXTENSIONS_HID_EVT_MOUSERELEASED -evtMouseExited EXTENSIONS_HID_EVT_MOUSEEXITED -ScriptSelectorButton EXTENSIONS_UID_EVT_MACRODLG -PBActionPerformed EXTENSIONS_UID_BRWEVT_ACTIONPERFORMED -PBFocusGained EXTENSIONS_UID_BRWEVT_FOCUSGAINED -PBFocusLost EXTENSIONS_UID_BRWEVT_FOCUSLOST -PBKeyTyped EXTENSIONS_UID_BRWEVT_KEYTYPED -PBKeyUp EXTENSIONS_UID_BRWEVT_KEYUP -PBMouseEntered EXTENSIONS_UID_BRWEVT_MOUSEENTERED -PMBMouseDragged EXTENSIONS_UID_BRWEVT_MOUSEDRAGGED -PBMouseMoved EXTENSIONS_UID_BRWEVT_MOUSEMOVED -PBMousePressed EXTENSIONS_UID_BRWEVT_MOUSEPRESSED -PBMouseRelesed EXTENSIONS_UID_BRWEVT_MOUSERELEASED -PBMouseExited EXTENSIONS_UID_BRWEVT_MOUSEEXITED +*TabEventsControl sym:EXTENSIONS_HID_FM_PROPDLG_TAB_EVT +evtActionPerformed sym:EXTENSIONS_HID_EVT_ACTIONPERFORMED +evtFocusGained sym:EXTENSIONS_HID_EVT_FOCUSGAINED +evtFocusLost sym:EXTENSIONS_HID_EVT_FOCUSLOST +evtKeyTyped sym:EXTENSIONS_HID_EVT_KEYTYPED +evtKeyUp sym:EXTENSIONS_HID_EVT_KEYUP +evtMouseEntered sym:EXTENSIONS_HID_EVT_MOUSEENTERED +evtMouseDragged sym:EXTENSIONS_HID_EVT_MOUSEDRAGGED +evtMouseMoved sym:EXTENSIONS_HID_EVT_MOUSEMOVED +evtMousePressed sym:EXTENSIONS_HID_EVT_MOUSEPRESSED +evtMouseRelesased sym:EXTENSIONS_HID_EVT_MOUSERELEASED +evtMouseExited sym:EXTENSIONS_HID_EVT_MOUSEEXITED +ScriptSelectorButton sym:EXTENSIONS_UID_EVT_MACRODLG +PBActionPerformed sym:EXTENSIONS_UID_BRWEVT_ACTIONPERFORMED +PBFocusGained sym:EXTENSIONS_UID_BRWEVT_FOCUSGAINED +PBFocusLost sym:EXTENSIONS_UID_BRWEVT_FOCUSLOST +PBKeyTyped sym:EXTENSIONS_UID_BRWEVT_KEYTYPED +PBKeyUp sym:EXTENSIONS_UID_BRWEVT_KEYUP +PBMouseEntered sym:EXTENSIONS_UID_BRWEVT_MOUSEENTERED +PMBMouseDragged sym:EXTENSIONS_UID_BRWEVT_MOUSEDRAGGED +PBMouseMoved sym:EXTENSIONS_UID_BRWEVT_MOUSEMOVED +PBMousePressed sym:EXTENSIONS_UID_BRWEVT_MOUSEPRESSED +PBMouseRelesed sym:EXTENSIONS_UID_BRWEVT_MOUSERELEASED +PBMouseExited sym:EXTENSIONS_UID_BRWEVT_MOUSEEXITED -*TabEventsForm EXTENSIONS_HID_FM_PROPDLG_TAB_EVT +*TabEventsForm sym:EXTENSIONS_HID_FM_PROPDLG_TAB_EVT -*TabFieldLink extensions.TabPage.19729 -ValueTable extensions.ComboBox.19729.1 -ListTable extensions.ComboBox.19729.2 +*TabFieldLink sym:extensions.TabPage.19729 +ValueTable sym:extensions.ComboBox.19729.1 +ListTable sym:extensions.ComboBox.19729.2 -*TabFieldProperties DBACCESS_HID_TAB_DESIGN_FIELDCONTROL -IntLength DBACCESS_HID_TAB_ENT_LEN -DecimalPlaces DBACCESS_HID_TAB_ENT_SCALE -EntryRequired DBACCESS_HID_TAB_ENT_REQUIRED -TxtLength DBACCESS_HID_TAB_ENT_TEXT_LEN -DefaultValue DBACCESS_HID_TAB_ENT_DEFAULT -FormatExample DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE -BrowseBtm DBACCESS_HID_TAB_ENT_FORMAT +*TabFieldProperties sym:DBACCESS_HID_TAB_DESIGN_FIELDCONTROL +IntLength sym:DBACCESS_HID_TAB_ENT_LEN +DecimalPlaces sym:DBACCESS_HID_TAB_ENT_SCALE +EntryRequired sym:DBACCESS_HID_TAB_ENT_REQUIRED +TxtLength sym:DBACCESS_HID_TAB_ENT_TEXT_LEN +DefaultValue sym:DBACCESS_HID_TAB_ENT_DEFAULT +FormatExample sym:DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE +BrowseBtm sym:DBACCESS_HID_TAB_ENT_FORMAT -*TabFieldSelection extensions.TabPage.19728 -ExistingFields extensions.ListBox.19728.6 -DisplayField extensions.Edit.19728.4 +*TabFieldSelection sym:extensions.TabPage.19728 +ExistingFields sym:extensions.ListBox.19728.6 +DisplayField sym:extensions.Edit.19728.4 -*TabFirstStartOnlineUpdate DESKTOP_HID_FIRSTSTART_UPDATE_CHECK -CheckForUpdates desktop.CheckBox.3008.3 +*TabFirstStartOnlineUpdate sym:DESKTOP_HID_FIRSTSTART_UPDATE_CHECK +CheckForUpdates sym:desktop.CheckBox.3008.3 -*TabFirstStartLicense DESKTOP_HID_FIRSTSTART_LICENSE -LicenseText desktop.MultiLineEdit.3007.6 -ScrollDown desktop.PushButton.3007.7 +*TabFirstStartLicense sym:DESKTOP_HID_FIRSTSTART_LICENSE +LicenseText sym:desktop.MultiLineEdit.3007.6 +ScrollDown sym:desktop.PushButton.3007.7 -*TabFirstStartRegistration DESKTOP_HID_FIRSTSTART_REGISTRATION -RegisterNow desktop.RadioButton.3004.5 -RegisterLater desktop.RadioButton.3004.6 -DoNotWantRegister desktop.RadioButton.3004.7 +*TabFirstStartRegistration sym:DESKTOP_HID_FIRSTSTART_REGISTRATION +RegisterNow sym:desktop.RadioButton.3004.5 +RegisterLater sym:desktop.RadioButton.3004.6 +DoNotWantRegister sym:desktop.RadioButton.3004.7 -*TabFirstStartUser DESKTOP_HID_FIRSTSTART_USER -FirstName desktop.Edit.3006.16 -LastName desktop.Edit.3006.17 -Initials desktop.Edit.3006.19 -FathersName desktop.Edit.3006.18 +*TabFirstStartUser sym:DESKTOP_HID_FIRSTSTART_USER +FirstName sym:desktop.Edit.3006.16 +LastName sym:desktop.Edit.3006.17 +Initials sym:desktop.Edit.3006.19 +FathersName sym:desktop.Edit.3006.18 -*TabFirstStartWelcome DESKTOP_HID_FIRSTSTART_WELCOME +*TabFirstStartWelcome sym:DESKTOP_HID_FIRSTSTART_WELCOME -*TabFont CUI_HID_SVXPAGE_CHAR_NAME -Font cui.ComboBox.10239.424 -Style cui.ComboBox.10239.426 -Size cui.MetricBox.10239.428 -Language cui.ListBox.10239.430 -FontWest cui.ComboBox.10239.102 -StyleWest cui.ComboBox.10239.104 -SizeWest cui.MetricBox.10239.106 -LanguageWest cui.ListBox.10239.108 -FontEast cui.ComboBox.10239.112 -StyleEast cui.ComboBox.10239.114 -SizeEast cui.MetricBox.10239.116 -LanguageEast cui.ListBox.10239.118 -FontCTL cui.ComboBox.10239.122 -StyleCTL cui.ComboBox.10239.124 -SizeCTL cui.MetricBox.10239.126 -LanguageCTL cui.ListBox.10239.128 -Color cui.ListBox.10239.142 +*TabFont sym:CUI_HID_SVXPAGE_CHAR_NAME +Font sym:cui.ComboBox.10239.424 +Style sym:cui.ComboBox.10239.426 +Size sym:cui.MetricBox.10239.428 +Language sym:cui.ListBox.10239.430 +FontWest sym:cui.ComboBox.10239.102 +StyleWest sym:cui.ComboBox.10239.104 +SizeWest sym:cui.MetricBox.10239.106 +LanguageWest sym:cui.ListBox.10239.108 +FontEast sym:cui.ComboBox.10239.112 +StyleEast sym:cui.ComboBox.10239.114 +SizeEast sym:cui.MetricBox.10239.116 +LanguageEast sym:cui.ListBox.10239.118 +FontCTL sym:cui.ComboBox.10239.122 +StyleCTL sym:cui.ComboBox.10239.124 +SizeCTL sym:cui.MetricBox.10239.126 +LanguageCTL sym:cui.ListBox.10239.128 +Color sym:cui.ListBox.10239.142 -*TabFontEffects CUI_HID_SVXPAGE_CHAR_EFFECTS -Underline cui.ListBox.10240.228 -Color cui.ListBox.10240.230 -Effects cui.ListBox.10240.205 -StrikeThrough cui.ListBox.10240.226 -IndividualWords cui.CheckBox.10240.231 -Emphasis cui.ListBox.10240.242 -Position cui.ListBox.10240.244 -Outline cui.TriStateBox.10240.208 -Overline cui.ListBox.10240.222 -OverlineColor cui.ListBox.10240.224 -Shadow cui.TriStateBox.10240.209 -Blinking cui.TriStateBox.10240.210 -Relief cui.ListBox.10240.207 -FontColor cui.ListBox.10240.202 -Hidden cui.TriStateBox.10240.211 +*TabFontEffects sym:CUI_HID_SVXPAGE_CHAR_EFFECTS +Underline sym:cui.ListBox.10240.228 +Color sym:cui.ListBox.10240.230 +Effects sym:cui.ListBox.10240.205 +StrikeThrough sym:cui.ListBox.10240.226 +IndividualWords sym:cui.CheckBox.10240.231 +Emphasis sym:cui.ListBox.10240.242 +Position sym:cui.ListBox.10240.244 +Outline sym:cui.TriStateBox.10240.208 +Overline sym:cui.ListBox.10240.222 +OverlineColor sym:cui.ListBox.10240.224 +Shadow sym:cui.TriStateBox.10240.209 +Blinking sym:cui.TriStateBox.10240.210 +Relief sym:cui.ListBox.10240.207 +FontColor sym:cui.ListBox.10240.202 +Hidden sym:cui.TriStateBox.10240.211 -*TabFontPosition CUI_HID_SVXPAGE_CHAR_POSITION -SuperScript cui.RadioButton.10241.301 -Normal cui.RadioButton.10241.302 -Subscript cui.RadioButton.10241.303 -RaiseLower cui.MetricField.10241.305 -RelativeFontSize cui.MetricField.10241.308 -Automatic cui.CheckBox.10241.306 -n0Degree cui.RadioButton.10241.311 -n90Degree cui.RadioButton.10241.312 -n270Degree cui.RadioButton.10241.313 -FitToLine cui.CheckBox.10241.314 -ScaleWith cui.MetricField.10241.316 -Spacing cui.ListBox.10241.321 -SpacingBy cui.MetricField.10241.323 -PairKerning cui.CheckBox.10241.324 -Super cui.RadioButton.10241.301 +*TabFontPosition sym:CUI_HID_SVXPAGE_CHAR_POSITION +SuperScript sym:cui.RadioButton.10241.301 +Normal sym:cui.RadioButton.10241.302 +Subscript sym:cui.RadioButton.10241.303 +RaiseLower sym:cui.MetricField.10241.305 +RelativeFontSize sym:cui.MetricField.10241.308 +Automatic sym:cui.CheckBox.10241.306 +n0Degree sym:cui.RadioButton.10241.311 +n90Degree sym:cui.RadioButton.10241.312 +n270Degree sym:cui.RadioButton.10241.313 +FitToLine sym:cui.CheckBox.10241.314 +ScaleWith sym:cui.MetricField.10241.316 +Spacing sym:cui.ListBox.10241.321 +SpacingBy sym:cui.MetricField.10241.323 +PairKerning sym:cui.CheckBox.10241.324 +Super sym:cui.RadioButton.10241.301 -*TabFormat3dViewGeometry CHART2_HID_3D_VIEW - AxisRotationXaxis chart2.MetricField.915.1 - AxisRotationYaxis chart2.MetricField.915.2 - AxisRotationZaxis chart2.MetricField.915.3 - Perspective chart2.CheckBox.915.1 +*TabFormat3dViewGeometry sym:CHART2_HID_3D_VIEW + AxisRotationXaxis sym:chart2.MetricField.915.1 + AxisRotationYaxis sym:chart2.MetricField.915.2 + AxisRotationZaxis sym:chart2.MetricField.915.3 + Perspective sym:chart2.CheckBox.915.1 -*TabFormat3dViewAppearance chart2.TabPage.916 - Scheme chart2.ListBox.916.2 +*TabFormat3dViewAppearance sym:chart2.TabPage.916 + Scheme sym:chart2.ListBox.916.2 RoundedEdges chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_ROUNDEDEDGE - Shading chart2.CheckBox.916.2 - ObjectBorders chart2.CheckBox.916.1 + Shading sym:chart2.CheckBox.916.2 + ObjectBorders sym:chart2.CheckBox.916.1 -*TabFormat3dViewIllumination chart2.TabPage.917 - LightSource1 chart2.ImageButton.917.3 - LightSource2 chart2.ImageButton.917.4 - LightSource3 chart2.ImageButton.917.5 - LightSource4 chart2.ImageButton.917.6 - LightSource5 chart2.ImageButton.917.7 - LightSource6 chart2.ImageButton.917.8 - LightSource7 chart2.ImageButton.917.9 - LightSource8 chart2.ImageButton.917.10 - Color chart2.ListBox.917.2 - ColorSelect chart2.ImageButton.917.2 - AmbientLight chart2.ListBox.917.1 - AmbientLightSelect chart2.ImageButton.917.1 +*TabFormat3dViewIllumination sym:chart2.TabPage.917 + LightSource1 sym:chart2.ImageButton.917.3 + LightSource2 sym:chart2.ImageButton.917.4 + LightSource3 sym:chart2.ImageButton.917.5 + LightSource4 sym:chart2.ImageButton.917.6 + LightSource5 sym:chart2.ImageButton.917.7 + LightSource6 sym:chart2.ImageButton.917.8 + LightSource7 sym:chart2.ImageButton.917.9 + LightSource8 sym:chart2.ImageButton.917.10 + Color sym:chart2.ListBox.917.2 + ColorSelect sym:chart2.ImageButton.917.2 + AmbientLight sym:chart2.ListBox.917.1 + AmbientLightSelect sym:chart2.ImageButton.917.1 -*TabFormatChartTitleAlignment CHART2_HID_SCH_ALIGNMENT - AngleKnob CHART2_HID_SCH_ALIGNMENT_CTR_DIAL - AngleText CHART2_HID_SCH_ALIGNMENT_DEGREES - VerticallyStacked CHART2_HID_SCH_ALIGNMENT_STACKED - TextDirection CHART2_HID_SCH_TEXTDIRECTION_TITLE - TextDirection2 CHART2_HID_SCH_TEXTDIRECTION_EQUATION +*TabFormatChartTitleAlignment sym:CHART2_HID_SCH_ALIGNMENT + AngleKnob sym:CHART2_HID_SCH_ALIGNMENT_CTR_DIAL + AngleText sym:CHART2_HID_SCH_ALIGNMENT_DEGREES + VerticallyStacked sym:CHART2_HID_SCH_ALIGNMENT_STACKED + TextDirection sym:CHART2_HID_SCH_TEXTDIRECTION_TITLE + TextDirection2 sym:CHART2_HID_SCH_TEXTDIRECTION_EQUATION -*TabFormatChartLine CUI_HID_LINE_LINE - Style cui.ListBox.10051.2 - Color cui.ListBox.10051.1 - Width cui.MetricField.10051.1 - Transparency cui.MetricField.10051.5 - StyleLeft cui.ListBox.10051.3 - WidthLeft cui.MetricField.10051.3 - CenterLeft cui.TriStateBox.10051.4 - StyleRight cui.ListBox.10051.4 - WidthRight cui.MetricField.10051.2 - CenterRight cui.TriStateBox.10051.5 - SynchroniteEnds cui.CheckBox.10051.1 - CornerStyle cui.ListBox.10051.5 - IconSelect cui.MenuButton.10051.26 - IconWidth cui.MetricField.10051.22 - IconHeigth cui.MetricField.10051.23 - KeepRatio cui.CheckBox.10051.24 +*TabFormatChartLine sym:CUI_HID_LINE_LINE + Style sym:cui.ListBox.10051.2 + Color sym:cui.ListBox.10051.1 + Width sym:cui.MetricField.10051.1 + Transparency sym:cui.MetricField.10051.5 + StyleLeft sym:cui.ListBox.10051.3 + WidthLeft sym:cui.MetricField.10051.3 + CenterLeft sym:cui.TriStateBox.10051.4 + StyleRight sym:cui.ListBox.10051.4 + WidthRight sym:cui.MetricField.10051.2 + CenterRight sym:cui.TriStateBox.10051.5 + SynchroniteEnds sym:cui.CheckBox.10051.1 + CornerStyle sym:cui.ListBox.10051.5 + IconSelect sym:cui.MenuButton.10051.26 + IconWidth sym:cui.MetricField.10051.22 + IconHeigth sym:cui.MetricField.10051.23 + KeepRatio sym:cui.CheckBox.10051.24 +TabFormatChartBorders TabFormatChartLine -*TabFormatEnvelope SW_HID_ENV_FMT -AddresseeFromLeft sw.MetricField.22753.14 -AddresseeFromRight sw.MetricField.22753.16 -AddresseeEdit sw.MenuButton.22753.18 -SenderFromLeft sw.MetricField.22753.24 -SenderFromRight sw.MetricField.22753.26 -SenderEdit sw.MenuButton.22753.28 -SizeFormat sw.ListBox.22753.33 -SizeWidth sw.MetricField.22753.35 -SizeHeight sw.MetricField.22753.37 +*TabFormatEnvelope sym:SW_HID_ENV_FMT +AddresseeFromLeft sym:sw.MetricField.22753.14 +AddresseeFromRight sym:sw.MetricField.22753.16 +AddresseeEdit sym:sw.MenuButton.22753.18 +SenderFromLeft sym:sw.MetricField.22753.24 +SenderFromRight sym:sw.MetricField.22753.26 +SenderEdit sym:sw.MenuButton.22753.28 +SizeFormat sym:sw.ListBox.22753.33 +SizeWidth sym:sw.MetricField.22753.35 +SizeHeight sym:sw.MetricField.22753.37 -*TabGeneral DBACCESS_HID_DSADMIN_PAGE_GENERAL -DatabaseType DBACCESS_HID_DSADMIN_DSTYPE -StatusMessage DBACCESS_HID_DSADMIN_SPECIAL_MESSAGE +*TabGeneral sym:DBACCESS_HID_DSADMIN_PAGE_GENERAL +DatabaseType sym:DBACCESS_HID_DSADMIN_DSTYPE +StatusMessage sym:DBACCESS_HID_DSADMIN_SPECIAL_MESSAGE -*TabGeneralForm EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL -Encoding EXTENSIONS_HID_PROP_SUBMIT_ENCODING -Frame EXTENSIONS_HID_PROP_TARGET_FRAME -SubmitMethod EXTENSIONS_HID_PROP_SUBMIT_METHOD -URL EXTENSIONS_HID_PROP_TARGET_URL +*TabGeneralForm sym:EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL +Encoding sym:EXTENSIONS_HID_PROP_SUBMIT_ENCODING +Frame sym:EXTENSIONS_HID_PROP_TARGET_FRAME +SubmitMethod sym:EXTENSIONS_HID_PROP_SUBMIT_METHOD +URL sym:EXTENSIONS_HID_PROP_TARGET_URL -*TabGeneralControl EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL -Accuracy EXTENSIONS_HID_PROP_DECIMAL_ACCURACY -Align EXTENSIONS_HID_PROP_ALIGN -AutoComplete EXTENSIONS_HID_PROP_AUTOCOMPLETE -Background EXTENSIONS_HID_PROP_BACKGROUNDCOLOR -BackgroundButton EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR -BlockIncrement EXTENSIONS_HID_PROP_BLOCKINCREMENT -Border EXTENSIONS_HID_PROP_BORDER -BorderColor EXTENSIONS_HID_PROP_BORDERCOLOR -ButtonType EXTENSIONS_HID_PROP_BUTTONTYPE -CharacterSet EXTENSIONS_HID_PROP_FONT -CharacterSetButton EXTENSIONS_UID_PROP_DLG_FONT_TYPE -CurrencySymbol EXTENSIONS_HID_PROP_CURRENCYSYMBOL -CurrSymPosition EXTENSIONS_HID_PROP_CURRSYM_POSITION -DateField EXTENSIONS_HID_PROP_DATE -DateFormat EXTENSIONS_HID_PROP_DATEFORMAT -DateMax EXTENSIONS_HID_PROP_DATEMAX -DateMin EXTENSIONS_HID_PROP_DATEMIN -DefaultButton EXTENSIONS_HID_PROP_DEFAULT_BUTTON -DefaultSelection EXTENSIONS_HID_PROP_SELECTEDITEMS -DefaultSelection2 EXTENSIONS_HID_PROP_DEFAULT_SELECT_SEQ -DefaultSelectionButton EXTENSIONS_UID_PROP_DLG_SELECTION -DefaultState EXTENSIONS_HID_PROP_DEFAULT_STATE -DefaultSpinValue EXTENSIONS_HID_PROP_DEFAULT_SPINVALUE -DefaultValue EXTENSIONS_HID_PROP_DEFAULTVALUE -Delay EXTENSIONS_HID_PROP_REPEAT_DELAY -DropDown EXTENSIONS_HID_PROP_DROPDOWN -EditMask EXTENSIONS_HID_PROP_EDITMASK -EffectiveMax EXTENSIONS_HID_PROP_EFFECTIVEMAX -EffectiveMin EXTENSIONS_HID_PROP_EFFECTIVEMIN -Enabled EXTENSIONS_HID_PROP_ENABLED -FillColor EXTENSIONS_HID_PROP_FILLCOLOR -FillColorButton EXTENSIONS_UID_PROP_DLG_FILLCOLOR -FilteringSorting EXTENSIONS_HID_PROP_SHOW_FILTERSORT -FormatKey EXTENSIONS_HID_PROP_FORMATKEY -FormatkeyButton EXTENSIONS_UID_PROP_DLG_NUMBER_FORMAT -Frame EXTENSIONS_HID_PROP_TARGET_FRAME -Graphics EXTENSIONS_HID_PROP_IMAGE_URL -GraphicsAlignment EXTENSIONS_HID_PROP_IMAGEPOSITION -GraphicsButton EXTENSIONS_UID_PROP_DLG_IMAGE_URL -Height EXTENSIONS_HID_PROP_HEIGHT -Help EXTENSIONS_HID_PROP_HELPTEXT -HelpText EXTENSIONS_HID_PROP_HELPTEXT -HelpURL EXTENSIONS_HID_PROP_HELPURL -HiddenValue EXTENSIONS_HID_PROP_HIDDEN_VALUE -HideSelection EXTENSIONS_HID_PROP_HIDEINACTIVESELECTION -HorizontalScroll EXTENSIONS_HID_PROP_HSCROLL -IconSize EXTENSIONS_HID_PROP_ICONSIZE -Information EXTENSIONS_HID_PROP_TAG -Label EXTENSIONS_HID_PROP_LABEL -LabelField EXTENSIONS_HID_PROP_CONTROLLABEL -LabelFieldButton EXTENSIONS_UID_PROP_DLG_CONTROLLABEL -LineCount EXTENSIONS_HID_PROP_LINECOUNT -LineIncrement EXTENSIONS_HID_PROP_LINEINCREMENT -ListEntries EXTENSIONS_HID_PROP_STRINGITEMLIST -LiteralMask EXTENSIONS_HID_PROP_LITERALMASK -MaxTextLen EXTENSIONS_HID_PROP_MAXTEXTLEN -MultiLine EXTENSIONS_HID_PROP_MULTILINE -Multiselection EXTENSIONS_HID_PROP_MULTISELECTION -NameText EXTENSIONS_HID_PROP_NAME -Navigation EXTENSIONS_HID_PROP_SHOW_NAVIGATION -NavigationBar EXTENSIONS_HID_PROP_NAVIGATIONBAR -Order EXTENSIONS_HID_PROP_TABINDEX -Orientation EXTENSIONS_HID_PROP_ORIENTATION -Password EXTENSIONS_HID_PROP_ECHO_CHAR -PosX EXTENSIONS_HID_PROP_POSITIONX -PosY EXTENSIONS_HID_PROP_POSITIONY -Printable EXTENSIONS_HID_PROP_PRINTABLE -ProgressValue EXTENSIONS_HID_PROP_PROGRESSVALUE -ProgressValueMax EXTENSIONS_HID_PROP_PROGRESSVALUE_MAX -ProgressValueMin EXTENSIONS_HID_PROP_PROGRESSVALUE_MIN -PushButtonType EXTENSIONS_HID_PROP_PUSHBUTTONTYPE -PageStep EXTENSIONS_HID_PROP_STEP -Positioning EXTENSIONS_HID_PROP_SHOW_POSITION -Readonly EXTENSIONS_HID_PROP_READONLY -RecordActions EXTENSIONS_HID_PROP_SHOW_RECORDACTIONS -RecordMarker EXTENSIONS_HID_PROP_RECORDMARKER -Repeat EXTENSIONS_HID_PROP_REPEAT -RowHeight EXTENSIONS_HID_PROP_ROWHEIGHT -Scale EXTENSIONS_HID_PROP_SCALEIMAGE -Scrollbars EXTENSIONS_HID_PROP_SHOW_SCROLLBARS -ScrollValue EXTENSIONS_HID_PROP_SCROLLVALUE -ScrollValueMin EXTENSIONS_HID_PROP_SCROLLVALUE_MIN -ScrollValueMax EXTENSIONS_HID_PROP_SCROLLVALUE_MAX -ScrollValueDefault EXTENSIONS_HID_PROP_DEFAULT_SCROLLVALUE -Spin EXTENSIONS_HID_PROP_SPIN -SpinIncrement EXTENSIONS_HID_PROP_SPININCREMENT -SpinValueMin EXTENSIONS_HID_PROP_SPINVALUE_MIN -SpinValueMax EXTENSIONS_HID_PROP_SPINVALUE_MAX -Status EXTENSIONS_HID_PROP_STATE -Submission EXTENSIONS_HID_PROP_SUBMISSION_ID -TakeFocus EXTENSIONS_HID_PROP_FOCUSONCLICK -ToggleProp EXTENSIONS_HID_PROP_TOGGLE +*TabGeneralControl sym:EXTENSIONS_HID_FM_PROPDLG_TAB_GENERAL +Accuracy sym:EXTENSIONS_HID_PROP_DECIMAL_ACCURACY +Align sym:EXTENSIONS_HID_PROP_ALIGN +AutoComplete sym:EXTENSIONS_HID_PROP_AUTOCOMPLETE +Background sym:EXTENSIONS_HID_PROP_BACKGROUNDCOLOR +BackgroundButton sym:EXTENSIONS_UID_PROP_DLG_BACKGROUNDCOLOR +BlockIncrement sym:EXTENSIONS_HID_PROP_BLOCKINCREMENT +Border sym:EXTENSIONS_HID_PROP_BORDER +BorderColor sym:EXTENSIONS_HID_PROP_BORDERCOLOR +ButtonType sym:EXTENSIONS_HID_PROP_BUTTONTYPE +CharacterSet sym:EXTENSIONS_HID_PROP_FONT +CharacterSetButton sym:EXTENSIONS_UID_PROP_DLG_FONT_TYPE +CurrencySymbol sym:EXTENSIONS_HID_PROP_CURRENCYSYMBOL +CurrSymPosition sym:EXTENSIONS_HID_PROP_CURRSYM_POSITION +DateField sym:EXTENSIONS_HID_PROP_DATE +DateFormat sym:EXTENSIONS_HID_PROP_DATEFORMAT +DateMax sym:EXTENSIONS_HID_PROP_DATEMAX +DateMin sym:EXTENSIONS_HID_PROP_DATEMIN +DefaultButton sym:EXTENSIONS_HID_PROP_DEFAULT_BUTTON +DefaultSelection sym:EXTENSIONS_HID_PROP_SELECTEDITEMS +DefaultSelection2 sym:EXTENSIONS_HID_PROP_DEFAULT_SELECT_SEQ +DefaultSelectionButton sym:EXTENSIONS_UID_PROP_DLG_SELECTION +DefaultState sym:EXTENSIONS_HID_PROP_DEFAULT_STATE +DefaultSpinValue sym:EXTENSIONS_HID_PROP_DEFAULT_SPINVALUE +DefaultValue sym:EXTENSIONS_HID_PROP_DEFAULTVALUE +Delay sym:EXTENSIONS_HID_PROP_REPEAT_DELAY +DropDown sym:EXTENSIONS_HID_PROP_DROPDOWN +EditMask sym:EXTENSIONS_HID_PROP_EDITMASK +EffectiveMax sym:EXTENSIONS_HID_PROP_EFFECTIVEMAX +EffectiveMin sym:EXTENSIONS_HID_PROP_EFFECTIVEMIN +Enabled sym:EXTENSIONS_HID_PROP_ENABLED +FillColor sym:EXTENSIONS_HID_PROP_FILLCOLOR +FillColorButton sym:EXTENSIONS_UID_PROP_DLG_FILLCOLOR +FilteringSorting sym:EXTENSIONS_HID_PROP_SHOW_FILTERSORT +FormatKey sym:EXTENSIONS_HID_PROP_FORMATKEY +FormatkeyButton sym:EXTENSIONS_UID_PROP_DLG_NUMBER_FORMAT +Frame sym:EXTENSIONS_HID_PROP_TARGET_FRAME +Graphics sym:EXTENSIONS_HID_PROP_IMAGE_URL +GraphicsAlignment sym:EXTENSIONS_HID_PROP_IMAGEPOSITION +GraphicsButton sym:EXTENSIONS_UID_PROP_DLG_IMAGE_URL +Height sym:EXTENSIONS_HID_PROP_HEIGHT +Help sym:EXTENSIONS_HID_PROP_HELPTEXT +HelpText sym:EXTENSIONS_HID_PROP_HELPTEXT +HelpURL sym:EXTENSIONS_HID_PROP_HELPURL +HiddenValue sym:EXTENSIONS_HID_PROP_HIDDEN_VALUE +HideSelection sym:EXTENSIONS_HID_PROP_HIDEINACTIVESELECTION +HorizontalScroll sym:EXTENSIONS_HID_PROP_HSCROLL +IconSize sym:EXTENSIONS_HID_PROP_ICONSIZE +Information sym:EXTENSIONS_HID_PROP_TAG +Label sym:EXTENSIONS_HID_PROP_LABEL +LabelField sym:EXTENSIONS_HID_PROP_CONTROLLABEL +LabelFieldButton sym:EXTENSIONS_UID_PROP_DLG_CONTROLLABEL +LineCount sym:EXTENSIONS_HID_PROP_LINECOUNT +LineIncrement sym:EXTENSIONS_HID_PROP_LINEINCREMENT +ListEntries sym:EXTENSIONS_HID_PROP_STRINGITEMLIST +LiteralMask sym:EXTENSIONS_HID_PROP_LITERALMASK +MaxTextLen sym:EXTENSIONS_HID_PROP_MAXTEXTLEN +MultiLine sym:EXTENSIONS_HID_PROP_MULTILINE +Multiselection sym:EXTENSIONS_HID_PROP_MULTISELECTION +NameText sym:EXTENSIONS_HID_PROP_NAME +Navigation sym:EXTENSIONS_HID_PROP_SHOW_NAVIGATION +NavigationBar sym:EXTENSIONS_HID_PROP_NAVIGATIONBAR +Order sym:EXTENSIONS_HID_PROP_TABINDEX +Orientation sym:EXTENSIONS_HID_PROP_ORIENTATION +Password sym:EXTENSIONS_HID_PROP_ECHO_CHAR +PosX sym:EXTENSIONS_HID_PROP_POSITIONX +PosY sym:EXTENSIONS_HID_PROP_POSITIONY +Printable sym:EXTENSIONS_HID_PROP_PRINTABLE +ProgressValue sym:EXTENSIONS_HID_PROP_PROGRESSVALUE +ProgressValueMax sym:EXTENSIONS_HID_PROP_PROGRESSVALUE_MAX +ProgressValueMin sym:EXTENSIONS_HID_PROP_PROGRESSVALUE_MIN +PushButtonType sym:EXTENSIONS_HID_PROP_PUSHBUTTONTYPE +PageStep sym:EXTENSIONS_HID_PROP_STEP +Positioning sym:EXTENSIONS_HID_PROP_SHOW_POSITION +Readonly sym:EXTENSIONS_HID_PROP_READONLY +RecordActions sym:EXTENSIONS_HID_PROP_SHOW_RECORDACTIONS +RecordMarker sym:EXTENSIONS_HID_PROP_RECORDMARKER +Repeat sym:EXTENSIONS_HID_PROP_REPEAT +RowHeight sym:EXTENSIONS_HID_PROP_ROWHEIGHT +Scale sym:EXTENSIONS_HID_PROP_SCALEIMAGE +Scrollbars sym:EXTENSIONS_HID_PROP_SHOW_SCROLLBARS +ScrollValue sym:EXTENSIONS_HID_PROP_SCROLLVALUE +ScrollValueMin sym:EXTENSIONS_HID_PROP_SCROLLVALUE_MIN +ScrollValueMax sym:EXTENSIONS_HID_PROP_SCROLLVALUE_MAX +ScrollValueDefault sym:EXTENSIONS_HID_PROP_DEFAULT_SCROLLVALUE +Spin sym:EXTENSIONS_HID_PROP_SPIN +SpinIncrement sym:EXTENSIONS_HID_PROP_SPININCREMENT +SpinValueMin sym:EXTENSIONS_HID_PROP_SPINVALUE_MIN +SpinValueMax sym:EXTENSIONS_HID_PROP_SPINVALUE_MAX +Status sym:EXTENSIONS_HID_PROP_STATE +Submission sym:EXTENSIONS_HID_PROP_SUBMISSION_ID +TakeFocus sym:EXTENSIONS_HID_PROP_FOCUSONCLICK +ToggleProp sym:EXTENSIONS_HID_PROP_TOGGLE -StrictFormat EXTENSIONS_HID_PROP_STRICTFORMAT -SymbolColor EXTENSIONS_HID_PROP_SYMBOLCOLOR -SymbolColorButton EXTENSIONS_UID_PROP_DLG_SYMBOLCOLOR -TabOrderButton EXTENSIONS_UID_PROP_DLG_TABINDEX -TabStop EXTENSIONS_HID_PROP_TABSTOP -TextText EXTENSIONS_HID_PROP_TEXT -TextType EXTENSIONS_HID_PROP_TEXTTYPE -ThousandSeperator EXTENSIONS_HID_PROP_SHOWTHOUSANDSEP -TimeField EXTENSIONS_HID_PROP_TIME -TimeFormat EXTENSIONS_HID_PROP_TIMEFORMAT -TimeMax EXTENSIONS_HID_PROP_TIMEMAX -TimeMin EXTENSIONS_HID_PROP_TIMEMIN -TriState EXTENSIONS_HID_PROP_TRISTATE -URL EXTENSIONS_HID_PROP_TARGET_URL -URLButton EXTENSIONS_UID_PROP_DLG_ATTR_TARGET_URL -Value EXTENSIONS_HID_PROP_VALUE -ValueMax EXTENSIONS_HID_PROP_VALUEMAX -ValueMin EXTENSIONS_HID_PROP_VALUEMIN -ValueStep EXTENSIONS_HID_PROP_VALUESTEP -VerticalScroll EXTENSIONS_HID_PROP_VSCROLL -VisibleSize EXTENSIONS_HID_PROP_VISIBLESIZE -Width EXTENSIONS_HID_PROP_WIDTH -WordBreak EXTENSIONS_HID_PROP_WORDBREAK +StrictFormat sym:EXTENSIONS_HID_PROP_STRICTFORMAT +SymbolColor sym:EXTENSIONS_HID_PROP_SYMBOLCOLOR +SymbolColorButton sym:EXTENSIONS_UID_PROP_DLG_SYMBOLCOLOR +TabOrderButton sym:EXTENSIONS_UID_PROP_DLG_TABINDEX +TabStop sym:EXTENSIONS_HID_PROP_TABSTOP +TextText sym:EXTENSIONS_HID_PROP_TEXT +TextType sym:EXTENSIONS_HID_PROP_TEXTTYPE +ThousandSeperator sym:EXTENSIONS_HID_PROP_SHOWTHOUSANDSEP +TimeField sym:EXTENSIONS_HID_PROP_TIME +TimeFormat sym:EXTENSIONS_HID_PROP_TIMEFORMAT +TimeMax sym:EXTENSIONS_HID_PROP_TIMEMAX +TimeMin sym:EXTENSIONS_HID_PROP_TIMEMIN +TriState sym:EXTENSIONS_HID_PROP_TRISTATE +URL sym:EXTENSIONS_HID_PROP_TARGET_URL +URLButton sym:EXTENSIONS_UID_PROP_DLG_ATTR_TARGET_URL +Value sym:EXTENSIONS_HID_PROP_VALUE +ValueMax sym:EXTENSIONS_HID_PROP_VALUEMAX +ValueMin sym:EXTENSIONS_HID_PROP_VALUEMIN +ValueStep sym:EXTENSIONS_HID_PROP_VALUESTEP +VerticalScroll sym:EXTENSIONS_HID_PROP_VSCROLL +VisibleSize sym:EXTENSIONS_HID_PROP_VISIBLESIZE +Width sym:EXTENSIONS_HID_PROP_WIDTH +WordBreak sym:EXTENSIONS_HID_PROP_WORDBREAK -*TabGrid SW_HID_TEXTGRID_PAGE -NoGrid sw.RadioButton.20901.2 -LinesGrid sw.RadioButton.20901.3 -CharsGrid sw.RadioButton.20901.4 -LinesPerPage sw.NumericField.20901.8 -TextSize sw.MetricField.20901.11 -CharsPerLine sw.NumericField.20901.13 -RubySize sw.MetricField.20901.16 -RubyBelow sw.CheckBox.20901.17 -Display sw.CheckBox.20901.19 -PrintGrid sw.CheckBox.20901.20 -Color sw.ListBox.20901.22 +*TabGrid sym:SW_HID_TEXTGRID_PAGE +NoGrid sym:sw.RadioButton.20901.2 +LinesGrid sym:sw.RadioButton.20901.3 +CharsGrid sym:sw.RadioButton.20901.4 +LinesPerPage sym:sw.NumericField.20901.8 +TextSize sym:sw.MetricField.20901.11 +CharsPerLine sym:sw.NumericField.20901.13 +RubySize sym:sw.MetricField.20901.16 +RubyBelow sym:sw.CheckBox.20901.17 +Display sym:sw.CheckBox.20901.19 +PrintGrid sym:sw.CheckBox.20901.20 +Color sym:sw.ListBox.20901.22 -*TabGroupBoxData extensions.TabPage.19722 -Address .uno:OpenUrl -Names extensions.Edit.19722.1 -AddTo extensions.PushButton.19722.1 -RemoveFrom extensions.PushButton.19722.2 -OptionFields extensions.ListBox.19722.3 +*TabGroupBoxData sym:extensions.TabPage.19722 +Address sym:.uno:OpenUrl +Names sym:extensions.Edit.19722.1 +AddTo sym:extensions.PushButton.19722.1 +RemoveFrom sym:extensions.PushButton.19722.2 +OptionFields sym:extensions.ListBox.19722.3 diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win index 54fa7db1a4c1..b000facbf04c 100644 --- a/testautomation/global/win/etab_h_o.win +++ b/testautomation/global/win/etab_h_o.win @@ -1,239 +1,239 @@ -*TabHelpTextFrame DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME -HelpText DBACCESS_HID_TABLE_DESIGN_HELP_WINDOW - -*TabInternet SFX2_HID_DOCINFORELOAD -DoNotRefreshAutomatically sfx2.RadioButton.273.63 -RefreshThisDocument sfx2.RadioButton.273.64 -RedirectFromThisDocument sfx2.RadioButton.273.65 -TimeReload sfx2.NumericField.273.67 -TimeForward sfx2.NumericField.273.70 -URL sfx2.Edit.273.44 -BrowseURL sfx2.PushButton.273.74 -Frame sfx2.ComboBox.273.73 - -*TabOOoImprovement cui.TabPage.10302 -ParticipateYes cui.RadioButton.10302.12 -ParticipateNo cui.RadioButton.10302.13 -ShowData cui.PushButton.10302.19 - -*TabJava CUI_HID_OPTIONS_JAVA -UseJava cui.CheckBox.10253.11 -JavaList CUI_HID_OPTIONS_JAVA_LIST -Add cui.PushButton.10253.20 -Parameters cui.PushButton.10253.21 -ClassPath cui.PushButton.10253.22 - -*TabJapaneseFind CUI_HID_SVXPAGE_JSEARCH_OPTIONS -MatchCase cui.CheckBox.10840.101 -MatchFullHalf cui.CheckBox.10840.102 -MatchHiraganaKatakana cui.CheckBox.10840.103 -MatchContractions cui.CheckBox.10840.104 -MatchMinusDashChoOn cui.CheckBox.10840.105 -MatchRepeatcharacterMarks cui.CheckBox.10840.106 -MatchVariantFormKanji cui.CheckBox.10840.107 -MatchOldKanaForms cui.CheckBox.10840.108 -MatchDiZiDuZu cui.CheckBox.10840.109 -MatchBaVaHaFa cui.CheckBox.10840.110 -MatchTsiThiChiDhiZi cui.CheckBox.10840.111 -MatchHyuFyuByuVyu cui.CheckBox.10840.112 -MatchDeSheZeJe cui.CheckBox.10840.113 -MatchIaIya cui.CheckBox.10840.114 -MatchKiKu cui.CheckBox.10840.115 -PunctuationCharacters cui.CheckBox.10840.201 -WhitespaceCharacters cui.CheckBox.10840.202 -ProlongedSoundmarks cui.CheckBox.10840.203 -MiddleDots cui.CheckBox.10840.204 - -*TabJDBC DBACCESS_HID_DSADMIN_PAGE_JDBC -JDBCDriverClass DBACCESS_HID_DSADMIN_DRIVERCLASS -AutoRetrieveEnabled DBACCESS_HID_DSADMIN_AUTORETRIEVEENABLED -AutoIncrementStatement DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE -RetrieveQuery DBACCESS_HID_DSADMIN_RETRIEVE_AUTO -SQL92Check DBACCESS_HID_DSADMIN_SQL92CHECK - -*TabLDAP DBACCESS_HID_DSADMIN_PAGE_LDAP -BaseDN DBACCESS_HID_DSADMIN_LDAP_BASEDN -PortNumber DBACCESS_HID_DSADMIN_LDAP_PORTNUMBER -Records DBACCESS_HID_DSADMIN_LDAP_ROWCOUNT - -*TabLegendPosition CHART2_HID_SCH_LEGEND_POS - PostionLeft CHART2_HID_SCH_LEGEND_POS_LEFT - PostionTop CHART2_HID_SCH_LEGEND_POS_TOP - PostionRight CHART2_HID_SCH_LEGEND_POS_RIGHT - PostionBottom CHART2_HID_SCH_LEGEND_POS_BOTTOM - TextDirection chart2.ListBox.900.4 - -*TabListBoxData extensions.TabPage.19721 -DataSource extensions.ListBox.19721.1 -Table extensions.ListBox.19721.2 - -*TabLocalizedOptions CUI_HID_OFAPAGE_AUTOCORR_QUOTE -LocalizedOptionsList CUI_HID_OFAPAGE_QUOTE_CLB -LocalizedOptions CUI_HID_OFAPAGE_QUOTE_SW_CLB -SingleQuotesReplace cui.Checkbox.17009.57 -SingleQuotesStart cui.PushButton.17009.46 -SingleQuotesEnd cui.PushButton.17009.48 -SingleQuotesDefault cui.PushButton.17009.49 -DoubleQuotesReplace cui.CheckBox.17009.11 -DoubleQuotesStart cui.PushButton.17009.13 -DoubleQuotesEnd cui.PushButton.17009.15 -DoubleQuotesDefault cui.PushButton.17009.50 - -*TabMailMergeEMail SW_HID_TP_MAILCONFIG -YourName sw.Edit.20904.3 -EmailAddress sw.Edit.20904.5 -SendReplies sw.CheckBox.20904.6 -ReplyAddress sw.Edit.20904.8 -ServerName sw.Edit.20904.11 -Port sw.NumericField.20904.13 -UseSecure sw.CheckBox.20904.14 -ServerAuthentication sw.PushButton.20904.16 -TestSettings sw.PushButton.20904.21 - -*TabMailMergeSourceDocument SW_HID_MM_DOCSELECTPAGE -UseTheCurrentDocument sw.RadioButton.22054.2 -CreateANewDocument sw.RadioButton.22054.3 -StartFromExistingDocument sw.RadioButton.22054.4 -StartFromATemplate sw.RadioButton.22054.6 -StartFromRecentlySaved sw.RadioButton.22054.8 -BrowseDocument sw.PushButton.22054.5 -BrowseTemplate sw.PushButton.22054.7 -RecentDocument sw.ListBox.22054.9 - -*TabMailMergeDocumentType SW_HID_MM_OUTPUTTYPEPAGE -Letter sw.RadioButton.22055.2 -MailMessage sw.RadioButton.22055.3 - -*TabMailMergeAddressBlock SW_HID_MM_ADDRESSBLOCKPAGE -SelectAddressListButton sw.PushButton.22056.2 -Addressblock sw.CheckBox.22056.6 -More sw.PushButton.22056.5 -MatchFields sw.PushButton.22056.9 -PreviewAddressBlock sw.ImageButton.22056.11 -PreviewNextAddressBlock sw.ImageButton.22056.12 -MatchFieldsButton sw.PushButton.22056.9 -SuppressLines sw.CheckBox.22056.75 - -*TabMailMergeGreetingsPage SW_HID_MM_GREETINGSPAGE -GreetingPersonalized SW_HID_MM_GREETINGS_CB_PERSONALIZED -GreetingListBoxFemale SW_HID_MM_GREETINGS_LB_FEMALE -GreetingButtonFemale SW_HID_MM_GREETINGS_PB_FEMALE -GreetingListBoxMale SW_HID_MM_GREETINGS_LB_MALE -GreetingButtonMale SW_HID_MM_GREETINGS_PB_MALE -GreetingListBoxFemaleColumn SW_HID_MM_GREETINGS_LB_FEMALECOLUMN -GreetingComboBoxFemale SW_HID_MM_GREETINGS_CB_FEMALEFIELD -GreetingComboBoxNeutral SW_HID_MM_GREETINGS_CB_NEUTRAL -MatchFields sw.PushButton.22057.18 -PreviewPreviousSalutation sw.ImageButton.22057.20 -PreviewNextSalutation sw.ImageButton.22057.21 - -*TabMailMergeLayoutPage SW_HID_MM_LAYOUT_PAGE -LayoutAlignButton sw.CheckBox.22072.12 -LayoutLeftBorder sw.MetricField.22072.4 -LayoutTopBorder sw.MetricField.22072.6 -LayoutTopButton sw.PushButton.22072.9 -LayoutDownButton sw.PushButton.22072.11 -LayoutScrollPageUp SW_HID_SCRL_PAGEUP -LayoutScrollPageDown SW_HID_SCRL_PAGEDOWN -LayoutHelpContentNavigation SW_HID_SCRL_NAVI -LayoutZoomListBox sw.ListBox.22072.15 - -*TabMailMergeOutputPage SW_HID_MM_OUTPUTPAGE -RBSaveStartDoc sw.RadioButton.22060.3 -RBSaveMergedDoc sw.RadioButton.22060.4 -RBPrintMerged sw.RadioButton.22060.5 -RBSendAsMail sw.RadioButton.22060.6 -PBSaveStartDoc sw.PushButton.22060.8 -RBSaveAsOneDocument sw.RadioButton.22060.12 -RBSaveIndividual sw.RadioButton.22060.13 -RBPrintAll sw.RadioButton.22060.24 -RBSendAll sw.RadioButton.22060.39 -RBStartFrom sw.RadioButton.22060.15 -NFFirstDataSet sw.NumericField.22060.16 -NFLastDataSet sw.NumericField.22060.18 -PBSaveNow sw.PushButton.22060.19 -LBChoosePrinter sw.ListBox.22060.22 -PBPrinterSettings sw.PushButton.22060.23 -PBPrintNow sw.PushButton.22060.26 -LBMailTo sw.ListBox.22060.32 -PBCopyTo sw.PushButton.22060.33 -PBEditSubject sw.Edit.22060.35 -PBSendAs sw.ListBox.22060.37 -EFEditAttachmentName sw.Edit.22060.52 -PBProperties sw.PushButton.22060.38 -PBSendDocuments sw.PushButton.22060.40 - -*TabMailMergePersonalize SW_HID_MM_MERGEPAGE -EditIndividualButton sw.PushButton.22059.3 -SearchDocumentButton sw.Edit.22059.6 -FindButton sw.PushButton.22059.7 -FindWholeWordsButton sw.CheckBox.22059.8 -ToTopCheckBox sw.CheckBox.22059.9 -MatchCaseCheckBox sw.CheckBox.22059.10 - -*TabMailMergePrepare SW_HID_MM_PREPAREMERGEPAGE -FirstRecordButton sw.PushButton.22058.3 -PreviousRecordButton sw.PushButton.22058.4 -SelectRecord sw.NumericField.22058.5 -NextRecordButton sw.PushButton.22058.6 -LastRecordButton sw.PushButton.22058.7 -ExcludeCheckBox sw.CheckBox.22058.8 -EditButton sw.PushButton.22058.10 +*TabHelpTextFrame sym:DBACCESS_HID_TAB_DESIGN_HELP_TEXT_FRAME +HelpText sym:DBACCESS_HID_TABLE_DESIGN_HELP_WINDOW + +*TabInternet sym:SFX2_HID_DOCINFORELOAD +DoNotRefreshAutomatically sym:sfx2.RadioButton.273.63 +RefreshThisDocument sym:sfx2.RadioButton.273.64 +RedirectFromThisDocument sym:sfx2.RadioButton.273.65 +TimeReload sym:sfx2.NumericField.273.67 +TimeForward sym:sfx2.NumericField.273.70 +URL sym:sfx2.Edit.273.44 +BrowseURL sym:sfx2.PushButton.273.74 +Frame sym:sfx2.ComboBox.273.73 + +*TabOOoImprovement sym:cui.TabPage.10302 +ParticipateYes sym:cui.RadioButton.10302.12 +ParticipateNo sym:cui.RadioButton.10302.13 +ShowData sym:cui.PushButton.10302.19 + +*TabJava sym:CUI_HID_OPTIONS_JAVA +UseJava sym:cui.CheckBox.10253.11 +JavaList sym:CUI_HID_OPTIONS_JAVA_LIST +Add sym:cui.PushButton.10253.20 +Parameters sym:cui.PushButton.10253.21 +ClassPath sym:cui.PushButton.10253.22 + +*TabJapaneseFind sym:CUI_HID_SVXPAGE_JSEARCH_OPTIONS +MatchCase sym:cui.CheckBox.10840.101 +MatchFullHalf sym:cui.CheckBox.10840.102 +MatchHiraganaKatakana sym:cui.CheckBox.10840.103 +MatchContractions sym:cui.CheckBox.10840.104 +MatchMinusDashChoOn sym:cui.CheckBox.10840.105 +MatchRepeatcharacterMarks sym:cui.CheckBox.10840.106 +MatchVariantFormKanji sym:cui.CheckBox.10840.107 +MatchOldKanaForms sym:cui.CheckBox.10840.108 +MatchDiZiDuZu sym:cui.CheckBox.10840.109 +MatchBaVaHaFa sym:cui.CheckBox.10840.110 +MatchTsiThiChiDhiZi sym:cui.CheckBox.10840.111 +MatchHyuFyuByuVyu sym:cui.CheckBox.10840.112 +MatchDeSheZeJe sym:cui.CheckBox.10840.113 +MatchIaIya sym:cui.CheckBox.10840.114 +MatchKiKu sym:cui.CheckBox.10840.115 +PunctuationCharacters sym:cui.CheckBox.10840.201 +WhitespaceCharacters sym:cui.CheckBox.10840.202 +ProlongedSoundmarks sym:cui.CheckBox.10840.203 +MiddleDots sym:cui.CheckBox.10840.204 + +*TabJDBC sym:DBACCESS_HID_DSADMIN_PAGE_JDBC +JDBCDriverClass sym:DBACCESS_HID_DSADMIN_DRIVERCLASS +AutoRetrieveEnabled sym:DBACCESS_HID_DSADMIN_AUTORETRIEVEENABLED +AutoIncrementStatement sym:DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE +RetrieveQuery sym:DBACCESS_HID_DSADMIN_RETRIEVE_AUTO +SQL92Check sym:DBACCESS_HID_DSADMIN_SQL92CHECK + +*TabLDAP sym:DBACCESS_HID_DSADMIN_PAGE_LDAP +BaseDN sym:DBACCESS_HID_DSADMIN_LDAP_BASEDN +PortNumber sym:DBACCESS_HID_DSADMIN_LDAP_PORTNUMBER +Records sym:DBACCESS_HID_DSADMIN_LDAP_ROWCOUNT + +*TabLegendPosition sym:CHART2_HID_SCH_LEGEND_POS + PostionLeft sym:CHART2_HID_SCH_LEGEND_POS_LEFT + PostionTop sym:CHART2_HID_SCH_LEGEND_POS_TOP + PostionRight sym:CHART2_HID_SCH_LEGEND_POS_RIGHT + PostionBottom sym:CHART2_HID_SCH_LEGEND_POS_BOTTOM + TextDirection sym:chart2.ListBox.900.4 + +*TabListBoxData sym:extensions.TabPage.19721 +DataSource sym:extensions.ListBox.19721.1 +Table sym:extensions.ListBox.19721.2 + +*TabLocalizedOptions sym:CUI_HID_OFAPAGE_AUTOCORR_QUOTE +LocalizedOptionsList sym:CUI_HID_OFAPAGE_QUOTE_CLB +LocalizedOptions sym:CUI_HID_OFAPAGE_QUOTE_SW_CLB +SingleQuotesReplace sym:cui.Checkbox.17009.57 +SingleQuotesStart sym:cui.PushButton.17009.46 +SingleQuotesEnd sym:cui.PushButton.17009.48 +SingleQuotesDefault sym:cui.PushButton.17009.49 +DoubleQuotesReplace sym:cui.CheckBox.17009.11 +DoubleQuotesStart sym:cui.PushButton.17009.13 +DoubleQuotesEnd sym:cui.PushButton.17009.15 +DoubleQuotesDefault sym:cui.PushButton.17009.50 + +*TabMailMergeEMail sym:SW_HID_TP_MAILCONFIG +YourName sym:sw.Edit.20904.3 +EmailAddress sym:sw.Edit.20904.5 +SendReplies sym:sw.CheckBox.20904.6 +ReplyAddress sym:sw.Edit.20904.8 +ServerName sym:sw.Edit.20904.11 +Port sym:sw.NumericField.20904.13 +UseSecure sym:sw.CheckBox.20904.14 +ServerAuthentication sym:sw.PushButton.20904.16 +TestSettings sym:sw.PushButton.20904.21 + +*TabMailMergeSourceDocument sym:SW_HID_MM_DOCSELECTPAGE +UseTheCurrentDocument sym:sw.RadioButton.22054.2 +CreateANewDocument sym:sw.RadioButton.22054.3 +StartFromExistingDocument sym:sw.RadioButton.22054.4 +StartFromATemplate sym:sw.RadioButton.22054.6 +StartFromRecentlySaved sym:sw.RadioButton.22054.8 +BrowseDocument sym:sw.PushButton.22054.5 +BrowseTemplate sym:sw.PushButton.22054.7 +RecentDocument sym:sw.ListBox.22054.9 + +*TabMailMergeDocumentType sym:SW_HID_MM_OUTPUTTYPEPAGE +Letter sym:sw.RadioButton.22055.2 +MailMessage sym:sw.RadioButton.22055.3 + +*TabMailMergeAddressBlock sym:SW_HID_MM_ADDRESSBLOCKPAGE +SelectAddressListButton sym:sw.PushButton.22056.2 +Addressblock sym:sw.CheckBox.22056.6 +More sym:sw.PushButton.22056.5 +MatchFields sym:sw.PushButton.22056.9 +PreviewAddressBlock sym:sw.ImageButton.22056.11 +PreviewNextAddressBlock sym:sw.ImageButton.22056.12 +MatchFieldsButton sym:sw.PushButton.22056.9 +SuppressLines sym:sw.CheckBox.22056.75 + +*TabMailMergeGreetingsPage sym:SW_HID_MM_GREETINGSPAGE +GreetingPersonalized sym:SW_HID_MM_GREETINGS_CB_PERSONALIZED +GreetingListBoxFemale sym:SW_HID_MM_GREETINGS_LB_FEMALE +GreetingButtonFemale sym:SW_HID_MM_GREETINGS_PB_FEMALE +GreetingListBoxMale sym:SW_HID_MM_GREETINGS_LB_MALE +GreetingButtonMale sym:SW_HID_MM_GREETINGS_PB_MALE +GreetingListBoxFemaleColumn sym:SW_HID_MM_GREETINGS_LB_FEMALECOLUMN +GreetingComboBoxFemale sym:SW_HID_MM_GREETINGS_CB_FEMALEFIELD +GreetingComboBoxNeutral sym:SW_HID_MM_GREETINGS_CB_NEUTRAL +MatchFields sym:sw.PushButton.22057.18 +PreviewPreviousSalutation sym:sw.ImageButton.22057.20 +PreviewNextSalutation sym:sw.ImageButton.22057.21 + +*TabMailMergeLayoutPage sym:SW_HID_MM_LAYOUT_PAGE +LayoutAlignButton sym:sw.CheckBox.22072.12 +LayoutLeftBorder sym:sw.MetricField.22072.4 +LayoutTopBorder sym:sw.MetricField.22072.6 +LayoutTopButton sym:sw.PushButton.22072.9 +LayoutDownButton sym:sw.PushButton.22072.11 +LayoutScrollPageUp sym:SW_HID_SCRL_PAGEUP +LayoutScrollPageDown sym:SW_HID_SCRL_PAGEDOWN +LayoutHelpContentNavigation sym:SW_HID_SCRL_NAVI +LayoutZoomListBox sym:sw.ListBox.22072.15 + +*TabMailMergeOutputPage sym:SW_HID_MM_OUTPUTPAGE +RBSaveStartDoc sym:sw.RadioButton.22060.3 +RBSaveMergedDoc sym:sw.RadioButton.22060.4 +RBPrintMerged sym:sw.RadioButton.22060.5 +RBSendAsMail sym:sw.RadioButton.22060.6 +PBSaveStartDoc sym:sw.PushButton.22060.8 +RBSaveAsOneDocument sym:sw.RadioButton.22060.12 +RBSaveIndividual sym:sw.RadioButton.22060.13 +RBPrintAll sym:sw.RadioButton.22060.24 +RBSendAll sym:sw.RadioButton.22060.39 +RBStartFrom sym:sw.RadioButton.22060.15 +NFFirstDataSet sym:sw.NumericField.22060.16 +NFLastDataSet sym:sw.NumericField.22060.18 +PBSaveNow sym:sw.PushButton.22060.19 +LBChoosePrinter sym:sw.ListBox.22060.22 +PBPrinterSettings sym:sw.PushButton.22060.23 +PBPrintNow sym:sw.PushButton.22060.26 +LBMailTo sym:sw.ListBox.22060.32 +PBCopyTo sym:sw.PushButton.22060.33 +PBEditSubject sym:sw.Edit.22060.35 +PBSendAs sym:sw.ListBox.22060.37 +EFEditAttachmentName sym:sw.Edit.22060.52 +PBProperties sym:sw.PushButton.22060.38 +PBSendDocuments sym:sw.PushButton.22060.40 + +*TabMailMergePersonalize sym:SW_HID_MM_MERGEPAGE +EditIndividualButton sym:sw.PushButton.22059.3 +SearchDocumentButton sym:sw.Edit.22059.6 +FindButton sym:sw.PushButton.22059.7 +FindWholeWordsButton sym:sw.CheckBox.22059.8 +ToTopCheckBox sym:sw.CheckBox.22059.9 +MatchCaseCheckBox sym:sw.CheckBox.22059.10 + +*TabMailMergePrepare sym:SW_HID_MM_PREPAREMERGEPAGE +FirstRecordButton sym:sw.PushButton.22058.3 +PreviousRecordButton sym:sw.PushButton.22058.4 +SelectRecord sym:sw.NumericField.22058.5 +NextRecordButton sym:sw.PushButton.22058.6 +LastRecordButton sym:sw.PushButton.22058.7 +ExcludeCheckBox sym:sw.CheckBox.22058.8 +EditButton sym:sw.PushButton.22058.10 *TabMediaWiki sym:vnd.com.sun.star.wiki:settings -*TabMemory CUI_HID_OFA_TP_MEMORY -UndoSteps cui.NumericField.17150.12 -StarOffice cui.NumericField.17150.18 -MemoryPerObject cui.NumericField.17150.20 -RemoveFromMemoryAfter cui.TimeField.17150.22 -NumberOfObjects cui.NumericField.17150.25 -LoadQuickstarter cui.CheckBox.17150.27 - -*TabMozillaPlugin cui.TabPage.12161 -Enable cui.CheckBox.12161.2 - -*TabMySQLJDBC dbaccess.TabPage.19220 -HostName DBACCESS_HID_DSADMIN_HOSTNAME -PortNumber DBACCESS_HID_DSADMIN_PORTNUMBER -DriverClass dbaccess.Edit.19220.4 -Charset DBACCESS_HID_DSADMIN_CHARSET -TestClass dbaccess.PushButton.19220.5 - -*TabMySQLODBC dbaccess.TabPage.19217 -Charset DBACCESS_HID_DSADMIN_CHARSET - -*TabNameMatching dbaccess.TabPage.19211 -RightColumnNames DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL -LeftColumnNames DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN -LeftColumnUp dbaccess.ImageButton.19211.12 -LeftColumnDown dbaccess.ImageButton.19211.13 -RightColumnUp dbaccess.ImageButton.19211.14 -RightColumnDown dbaccess.ImageButton.19211.15 -ColumnAll dbaccess.PushButton.19211.16 -ColumnNone dbaccess.PushButton.19211.17 - -*TabODBC DBACCESS_HID_DSADMIN_PAGE_ODBC -Options DBACCESS_HID_DSADMIN_ODBC_OPTIONS -CharSet DBACCESS_HID_DSADMIN_CHARSET -SQL92Check DBACCESS_HID_DSADMIN_SQL92CHECK -UseCatalogs DBACCESS_HID_DSADMIN_USECATALOG +*TabMemory sym:CUI_HID_OFA_TP_MEMORY +UndoSteps sym:cui.NumericField.17150.12 +StarOffice sym:cui.NumericField.17150.18 +MemoryPerObject sym:cui.NumericField.17150.20 +RemoveFromMemoryAfter sym:cui.TimeField.17150.22 +NumberOfObjects sym:cui.NumericField.17150.25 +LoadQuickstarter sym:cui.CheckBox.17150.27 + +*TabMozillaPlugin sym:cui.TabPage.12161 +Enable sym:cui.CheckBox.12161.2 + +*TabMySQLJDBC sym:dbaccess.TabPage.19220 +HostName sym:DBACCESS_HID_DSADMIN_HOSTNAME +PortNumber sym:DBACCESS_HID_DSADMIN_PORTNUMBER +DriverClass sym:dbaccess.Edit.19220.4 +Charset sym:DBACCESS_HID_DSADMIN_CHARSET +TestClass sym:dbaccess.PushButton.19220.5 + +*TabMySQLODBC sym:dbaccess.TabPage.19217 +Charset sym:DBACCESS_HID_DSADMIN_CHARSET + +*TabNameMatching sym:dbaccess.TabPage.19211 +RightColumnNames sym:DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL +LeftColumnNames sym:DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN +LeftColumnUp sym:dbaccess.ImageButton.19211.12 +LeftColumnDown sym:dbaccess.ImageButton.19211.13 +RightColumnUp sym:dbaccess.ImageButton.19211.14 +RightColumnDown sym:dbaccess.ImageButton.19211.15 +ColumnAll sym:dbaccess.PushButton.19211.16 +ColumnNone sym:dbaccess.PushButton.19211.17 + +*TabODBC sym:DBACCESS_HID_DSADMIN_PAGE_ODBC +Options sym:DBACCESS_HID_DSADMIN_ODBC_OPTIONS +CharSet sym:DBACCESS_HID_DSADMIN_CHARSET +SQL92Check sym:DBACCESS_HID_DSADMIN_SQL92CHECK +UseCatalogs sym:DBACCESS_HID_DSADMIN_USECATALOG +TabOfficeView TabAnsichtAllgemein -*TabOnlineUpdate CUI_HID_SVX_OPTIONS_ONLINEUPDATE -CheckAutomatically cui.CheckBox.10298.11 -EveryDay cui.RadioButton.10298.12 -EveryWeek cui.RadioButton.10298.13 -EveryMonth cui.RadioButton.10298.14 -CheckNow cui.PushButton.10298.15 -DownloadAutomatically cui.CheckBox.10298.16 -Change cui.PushButton.10298.19 - -*TabOracleJDBC dbaccess.TabPage.19227 -HostName DBACCESS_HID_DSADMIN_HOSTNAME -PortNumber DBACCESS_HID_DSADMIN_PORTNUMBER -DriverClass dbaccess.Edit.19227.4 -Charset DBACCESS_HID_DSADMIN_CHARSET -TestClass dbaccess.PushButton.19227.5 +*TabOnlineUpdate sym:CUI_HID_SVX_OPTIONS_ONLINEUPDATE +CheckAutomatically sym:cui.CheckBox.10298.11 +EveryDay sym:cui.RadioButton.10298.12 +EveryWeek sym:cui.RadioButton.10298.13 +EveryMonth sym:cui.RadioButton.10298.14 +CheckNow sym:cui.PushButton.10298.15 +DownloadAutomatically sym:cui.CheckBox.10298.16 +Change sym:cui.PushButton.10298.19 + +*TabOracleJDBC sym:dbaccess.TabPage.19227 +HostName sym:DBACCESS_HID_DSADMIN_HOSTNAME +PortNumber sym:DBACCESS_HID_DSADMIN_PORTNUMBER +DriverClass sym:dbaccess.Edit.19227.4 +Charset sym:DBACCESS_HID_DSADMIN_CHARSET +TestClass sym:dbaccess.PushButton.19227.5 diff --git a/testautomation/global/win/etab_p_s.win b/testautomation/global/win/etab_p_s.win index e8ef50214231..4817a23b3d0e 100644 --- a/testautomation/global/win/etab_p_s.win +++ b/testautomation/global/win/etab_p_s.win @@ -1,121 +1,121 @@ -*TabPersonalDataMigration DESKTOP_HID_FIRSTSTART_MIGRATION -TransferPersonalData desktop.CheckBox.3005.3 +*TabPersonalDataMigration sym:DESKTOP_HID_FIRSTSTART_MIGRATION +TransferPersonalData sym:desktop.CheckBox.3005.3 -*TabPositionAndSize CUI_HID_TRANS_POSITION_SIZE -PositionX cui.MetricField.10087.7 -PositionY cui.MetricField.10087.8 -Width cui.MetricField.10087.17 -Height cui.MetricField.10087.18 -KeepRatio cui.CheckBox.10087.22 -ProtectPosition cui.TriStateBox.10087.45 -ProtectSize cui.TriStateBox.10087.46 -FitWidthText cui.TriStateBox.10087.13 -FitHeightText cui.TriStateBox.10087.12 -AnchorPosition cui.ListBox.10087.40 -Anchor cui.ListBox.10087.35 -PositionPosition CUI_HID_TPPOSITION_CTRL -SizePosition CUI_HID_TPSIZE_CTRL +*TabPositionAndSize sym:CUI_HID_TRANS_POSITION_SIZE +PositionX sym:cui.MetricField.10087.7 +PositionY sym:cui.MetricField.10087.8 +Width sym:cui.MetricField.10087.17 +Height sym:cui.MetricField.10087.18 +KeepRatio sym:cui.CheckBox.10087.22 +ProtectPosition sym:cui.TriStateBox.10087.45 +ProtectSize sym:cui.TriStateBox.10087.46 +FitWidthText sym:cui.TriStateBox.10087.13 +FitHeightText sym:cui.TriStateBox.10087.12 +AnchorPosition sym:cui.ListBox.10087.40 +Anchor sym:cui.ListBox.10087.35 +PositionPosition sym:CUI_HID_TPPOSITION_CTRL +SizePosition sym:CUI_HID_TPSIZE_CTRL -*TabPositionAndSizeWriter CUI_HID_SVXPAGE_SWPOSSIZE -Width cui.MetricField.10288.3 -Height cui.MetricField.10288.5 -KeepRatio cui.CheckBox.10288.6 -Topage cui.RadioButton.10288.9 -Toparagraph cui.RadioButton.10288.10 -Tocharacter cui.RadioButton.10288.11 -Ascharacter cui.RadioButton.10288.12 -ToFrame cui.RadioButton.10288.13 -ProtectPosition cui.TriStateBox.10288.15 -ProtectSize cui.TriStateBox.10288.16 -Horizontal cui.ListBox.10288.19 -Horizontalby cui.MetricField.10288.21 -Horizontalto cui.ListBox.10288.23 -Mirror cui.CheckBox.10288.24 -Vertical cui.ListBox.10288.26 -Verticalby cui.MetricField.10288.28 -Verticalto cui.ListBox.10288.30 -Followtextflow cui.CheckBox.10288.31 +*TabPositionAndSizeWriter sym:CUI_HID_SVXPAGE_SWPOSSIZE +Width sym:cui.MetricField.10288.3 +Height sym:cui.MetricField.10288.5 +KeepRatio sym:cui.CheckBox.10288.6 +Topage sym:cui.RadioButton.10288.9 +Toparagraph sym:cui.RadioButton.10288.10 +Tocharacter sym:cui.RadioButton.10288.11 +Ascharacter sym:cui.RadioButton.10288.12 +ToFrame sym:cui.RadioButton.10288.13 +ProtectPosition sym:cui.TriStateBox.10288.15 +ProtectSize sym:cui.TriStateBox.10288.16 +Horizontal sym:cui.ListBox.10288.19 +Horizontalby sym:cui.MetricField.10288.21 +Horizontalto sym:cui.ListBox.10288.23 +Mirror sym:cui.CheckBox.10288.24 +Vertical sym:cui.ListBox.10288.26 +Verticalby sym:cui.MetricField.10288.28 +Verticalto sym:cui.ListBox.10288.30 +Followtextflow sym:cui.CheckBox.10288.31 -*TabPrintStarOffice SFX2_HID_TP_COMMONPRINTOPTIONS -Printer sfx2.RadioButton.2398.3 -PrintToFile sfx2.RadioButton.2398.4 -ReduceTransparency sfx2.CheckBox.2398.10 -Automatically sfx2.RadioButton.2398.11 -NoTransparency sfx2.RadioButton.2398.12 -ReduceGradients sfx2.CheckBox.2398.20 -GradientStripes sfx2.RadioButton.2398.21 -Stripes sfx2.NumericField.2398.23 -IntermediateColor sfx2.RadioButton.2398.22 -ReduceBitmaps sfx2.CheckBox.2398.30 -GoodPrintQuality sfx2.RadioButton.2398.31 -NormalPrintQuality sfx2.RadioButton.2398.32 -Resolution sfx2.RadioButton.2398.33 -IncludeTransparentObjects sfx2.CheckBox.2398.34 -DPI sfx2.ListBox.2398.35 -ConvertColorsToGrayscale sfx2.CheckBox.2398.40 -PaperSize sfx2.CheckBox.2398.51 -PaperOrientation sfx2.CheckBox.2398.52 -Transparency sfx2.CheckBox.2398.53 +*TabPrintStarOffice sym:SFX2_HID_TP_COMMONPRINTOPTIONS +Printer sym:sfx2.RadioButton.2398.3 +PrintToFile sym:sfx2.RadioButton.2398.4 +ReduceTransparency sym:sfx2.CheckBox.2398.10 +Automatically sym:sfx2.RadioButton.2398.11 +NoTransparency sym:sfx2.RadioButton.2398.12 +ReduceGradients sym:sfx2.CheckBox.2398.20 +GradientStripes sym:sfx2.RadioButton.2398.21 +Stripes sym:sfx2.NumericField.2398.23 +IntermediateColor sym:sfx2.RadioButton.2398.22 +ReduceBitmaps sym:sfx2.CheckBox.2398.30 +GoodPrintQuality sym:sfx2.RadioButton.2398.31 +NormalPrintQuality sym:sfx2.RadioButton.2398.32 +Resolution sym:sfx2.RadioButton.2398.33 +IncludeTransparentObjects sym:sfx2.CheckBox.2398.34 +DPI sym:sfx2.ListBox.2398.35 +ConvertColorsToGrayscale sym:sfx2.CheckBox.2398.40 +PaperSize sym:sfx2.CheckBox.2398.51 +PaperOrientation sym:sfx2.CheckBox.2398.52 +Transparency sym:sfx2.CheckBox.2398.53 -*TabPrintCalcOptions SC_HID_SCPAGE_PRINT -SuppressOutput sc.CheckBox.25674.2 -PrintOnly sc.CheckBox.25674.4 +*TabPrintCalcOptions sym:SC_HID_SCPAGE_PRINT +SuppressOutput sym:sc.CheckBox.25674.2 +PrintOnly sym:sc.CheckBox.25674.4 -*TabProxyServer CUI_HID_OPTIONS_PROXY -ProxyServer cui.ListBox.10157.2 -HttpProxy cui.Edit.10157.3 -HttpPort cui.Edit.10157.4 -HttpsProxy cui.Edit.10157.14 -HttpsPort cui.Edit.10157.15 -FtpProxy cui.Edit.10157.5 -FtpPort cui.Edit.10157.6 -NoProxy cui.Edit.10157.11 +*TabProxyServer sym:CUI_HID_OPTIONS_PROXY +ProxyServer sym:cui.ListBox.10157.2 +HttpProxy sym:cui.Edit.10157.3 +HttpPort sym:cui.Edit.10157.4 +HttpsProxy sym:cui.Edit.10157.14 +HttpsPort sym:cui.Edit.10157.15 +FtpProxy sym:cui.Edit.10157.5 +FtpPort sym:cui.Edit.10157.6 +NoProxy sym:cui.Edit.10157.11 -*TabRegisteredDatabase cui.TabPage.17023 -RegisteredDatabases CUI_HID_DBPATH_CTL_PATH -NewBtn cui.PushButton.17023.13 -EditBtn cui.PushButton.17023.14 -DeleteBtn cui.PushButton.17023.18 +*TabRegisteredDatabase sym:cui.TabPage.17023 +RegisteredDatabases sym:CUI_HID_DBPATH_CTL_PATH +NewBtn sym:cui.PushButton.17023.13 +EditBtn sym:cui.PushButton.17023.14 +DeleteBtn sym:cui.PushButton.17023.18 -*TabSectionIndent SW_HID_SECTION_INDENTS_PAGE -IndentBefore sw.MetricField.20902.3 -IndentAfter sw.MetricField.20902.5 +*TabSectionIndent sym:SW_HID_SECTION_INDENTS_PAGE +IndentBefore sym:sw.MetricField.20902.3 +IndentAfter sym:sw.MetricField.20902.5 -*TabSecurity cui.TabPage.10200 -MacroSecurity cui.PushButton.10200.21 -PersistentlySavePasswords cui.CheckBox.10200.14 -Options cui.PushButton.10200.12 -MasterPassword cui.PushButton.10200.18 -ShowPasswords cui.PushButton.10200.15 +*TabSecurity sym:cui.TabPage.10200 +MacroSecurity sym:cui.PushButton.10200.21 +PersistentlySavePasswords sym:cui.CheckBox.10200.14 +Options sym:cui.PushButton.10200.12 +MasterPassword sym:cui.PushButton.10200.18 +ShowPasswords sym:cui.PushButton.10200.15 -*TabSecurityProperties SFX2_HID_DOCINFOSECURITY -EnterPasswordToOpen SFX2_HID_SECURITYTAB_PASSWORD_TO_OPEN -ReEnterPasswordToOpen SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN -EnterPasswordToModify SFX2_HID_SECURITYTAB_PASSWORD_TO_MODIFY -ReEnterPasswordToModify SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY -RecommendToOpenDocumentReadOnly SFX2_HID_SECURITYTAB_OPEN_FILE_READONLY -RecordChanges SFX2_HID_SECURITYTAB_RECORD_CHANGES -Protect SFX2_HID_SECURITYTAB_PROTECTION +*TabSecurityProperties sym:SFX2_HID_DOCINFOSECURITY +EnterPasswordToOpen sym:SFX2_HID_SECURITYTAB_PASSWORD_TO_OPEN +ReEnterPasswordToOpen sym:SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_OPEN +EnterPasswordToModify sym:SFX2_HID_SECURITYTAB_PASSWORD_TO_MODIFY +ReEnterPasswordToModify sym:SFX2_HID_SECURITYTAB_CONFIRM_PASSWORD_TO_MODIFY +RecommendToOpenDocumentReadOnly sym:SFX2_HID_SECURITYTAB_OPEN_FILE_READONLY +RecordChanges sym:SFX2_HID_SECURITYTAB_RECORD_CHANGES +Protect sym:SFX2_HID_SECURITYTAB_PROTECTION -*TabSecurityOptionsAndWarnings CUI_HID_DLG_SECURITY_OPTIONS -SavingOrSendingDocuments cui.CheckBox.10300.13 -SigningDocuments cui.CheckBox.10300.15 -PrintingDocuments cui.CheckBox.10300.17 -CreatingPDFfiles cui.CheckBox.10300.19 -RemovePersonalInformationOnSaving cui.CheckBox.10300.22 -RecommendPasswordProtectionOnSaving cui.CheckBox.10300.24 -CtrlClickRequiredToFollowHyperlinks cui.CheckBox.10300.26 +*TabSecurityOptionsAndWarnings sym:CUI_HID_DLG_SECURITY_OPTIONS +SavingOrSendingDocuments sym:cui.CheckBox.10300.13 +SigningDocuments sym:cui.CheckBox.10300.15 +PrintingDocuments sym:cui.CheckBox.10300.17 +CreatingPDFfiles sym:cui.CheckBox.10300.19 +RemovePersonalInformationOnSaving sym:cui.CheckBox.10300.22 +RecommendPasswordProtectionOnSaving sym:cui.CheckBox.10300.24 +CtrlClickRequiredToFollowHyperlinks sym:cui.CheckBox.10300.26 -*TabSecurityLevel XMLSECURITY_HID_XMLSEC_TP_SECLEVEL -VeryHigh xmlsecurity.RadioButton.1007.2 -High xmlsecurity.RadioButton.1007.3 -Medium xmlsecurity.RadioButton.1007.4 -Low xmlsecurity.RadioButton.1007.5 +*TabSecurityLevel sym:XMLSECURITY_HID_XMLSEC_TP_SECLEVEL +VeryHigh sym:xmlsecurity.RadioButton.1007.2 +High sym:xmlsecurity.RadioButton.1007.3 +Medium sym:xmlsecurity.RadioButton.1007.4 +Low sym:xmlsecurity.RadioButton.1007.5 -*TabSendAsEmail .uno:MailWindow +*TabSendAsEmail sym:.uno:MailWindow -*TabQueries DBACCESS_HID_DSADMIN_QUERYADMINISTRATION -Queries DBACCESS_HID_DSADMIN_QUERIES -NewQuery DBACCESS_HID_DSADMIN_QUERIES_NEW -Edit DBACCESS_HID_DSADMIN_QUERIES_EDIT -DeleteQuery DBACCESS_HID_DSADMIN_QUERIES_DELETE +*TabQueries sym:DBACCESS_HID_DSADMIN_QUERYADMINISTRATION +Queries sym:DBACCESS_HID_DSADMIN_QUERIES +NewQuery sym:DBACCESS_HID_DSADMIN_QUERIES_NEW +Edit sym:DBACCESS_HID_DSADMIN_QUERIES_EDIT +DeleteQuery sym:DBACCESS_HID_DSADMIN_QUERIES_DELETE diff --git a/testautomation/global/win/etab_t_z.win b/testautomation/global/win/etab_t_z.win index 4d4d54139b5f..4d01fb8a479a 100644 --- a/testautomation/global/win/etab_t_z.win +++ b/testautomation/global/win/etab_t_z.win @@ -1,149 +1,149 @@ -*TabTableFieldSelection extensions.TabPage.19730 -ExistingFields extensions.ListBox.19730.7 -SelectedFields extensions.ListBox.19730.8 -AddTo extensions.PushButton.19730.3 -AddAllTo extensions.PushButton.19730.4 -RemoveFrom extensions.PushButton.19730.5 -RemoveAllFrom extensions.PushButton.19730.6 - -*TabTableSelection extensions.TabPage.19727 -TableSelection extensions.ListBox.19727.5 - -*TabTextAnimation sd.TabPage.20873 -GroupText sd.ListBox.20873.2 -AutomaticallyAfter sd.Checkbox.20873.3 -AutomaticallyAfterValue sd.MetricField.20873.4 -AnimateAttachedShape sd.Checkbox.20873.5 -InReverseOrder sd.Checkbox.20873.6 - -*TabTextBase DBACCESS_HID_DSADMIN_PAGE_TEXT -CVSFiles DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES -Custom DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES -CustomTxt DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION -TextContainsHeaders DBACCESS_HID_DSADMIN_TEXT_HEADER -FieldSeparator DBACCESS_HID_DSADMIN_FIELD_SEPARATOR -TextSeparator DBACCESS_HID_DSADMIN_TEXT_SEPARATOR -DecimalSeparator DBACCESS_HID_DSADMIN_DECIMAL_SEPARATOR -ThousandsSeparator DBACCESS_HID_DSADMIN_THOUSANDS_SEPARATOR -Extension DBACCESS_HID_DSADMIN_EXTENSION -CharSet DBACCESS_HID_DSADMIN_CHARSET -PlainTextFiles DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES - -*TabTiming sd.TabPage.20872 -TimingStart sd.ListBox.20872.2 -Delay sd.MetricField.20872.4 -Speed sd.ComboBox.20872.6 -Repeat sd.ComboBox.20872.8 -Rewind sd.CheckBox.20872.9 -TriggerAnimate sd.RadioButton.20872.11 -TriggerStart sd.RadioButton.20872.12 -Shape sd.ListBox.20872.13 - -*TabTransparency CUI_HID_AREA_TRANSPARENCE -NoTransparency cui.RadioButton.10054.8 -Transparency cui.RadioButton.10054.9 -Gradient cui.RadioButton.10054.10 -TransparencyPercent cui.MetricField.10054.10 -Type cui.ListBox.10054.3 -CenterX cui.MetricField.10054.4 -CenterY cui.MetricField.10054.5 -Angle cui.MetricField.10054.6 -Border cui.MetricField.10054.7 -StartValue cui.MetricField.10054.8 -EndValue cui.MetricField.10054.9 - -*TabTrendLineType chart2.TabPage.918 -None CHART2_HID_SCH_TRENDLINE_RB_NONE -Linear CHART2_HID_SCH_TRENDLINE_RB_LINEAR -Logarithmic CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC -Exponential CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL -Power CHART2_HID_SCH_TRENDLINE_RB_POWER -ShowEquation CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION -ShowCorrelationCoefficient CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED - - -*TabTrustedSources XMLSECURITY_HID_XMLSEC_TP_TRUSTSOURCES -SourcesAdd xmlsecurity.PushButton.1008.3 -SourcesView xmlsecurity.PushButton.1008.4 -SourcesRemove xmlsecurity.PushButton.1008.5 -LocationsListBox xmlsecurity.ListBox.1008.8 -LocationsAdd xmlsecurity.PushButton.1008.9 -LocationsRemove xmlsecurity.PushButton.1008.10 - -*TabType SW_HID_FRM_STD -Width sw.MetricField.20831.28 -Height sw.MetricField.20831.30 -RelativeWidth sw.CheckBox.20831.100 -Automatic sw.CheckBox.20831.46 -RelativeHeight sw.CheckBox.20831.101 -KeepRatio sw.CheckBox.20831.102 -AutoHoehe sw.CheckBox.20831.31 -AnchorAtPage sw.RadioButton.20831.1 -AnchorAtParagraph sw.RadioButton.20831.2 -AnchorAtCharacter sw.RadioButton.20831.3 -AnchorAsCharacter sw.RadioButton.20831.4 -AnchorAtFrame sw.RadioButton.20831.5 -Horizontal sw.ListBox.20831.34 -HorizontalBy sw.MetricField.20831.36 +*TabTableFieldSelection sym:extensions.TabPage.19730 +ExistingFields sym:extensions.ListBox.19730.7 +SelectedFields sym:extensions.ListBox.19730.8 +AddTo sym:extensions.PushButton.19730.3 +AddAllTo sym:extensions.PushButton.19730.4 +RemoveFrom sym:extensions.PushButton.19730.5 +RemoveAllFrom sym:extensions.PushButton.19730.6 + +*TabTableSelection sym:extensions.TabPage.19727 +TableSelection sym:extensions.ListBox.19727.5 + +*TabTextAnimation sym:sd.TabPage.20873 +GroupText sym:sd.ListBox.20873.2 +AutomaticallyAfter sym:sd.Checkbox.20873.3 +AutomaticallyAfterValue sym:sd.MetricField.20873.4 +AnimateAttachedShape sym:sd.Checkbox.20873.5 +InReverseOrder sym:sd.Checkbox.20873.6 + +*TabTextBase sym:DBACCESS_HID_DSADMIN_PAGE_TEXT +CVSFiles sym:DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES +Custom sym:DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSOTHERFILES +CustomTxt sym:DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_OWNEXTENSION +TextContainsHeaders sym:DBACCESS_HID_DSADMIN_TEXT_HEADER +FieldSeparator sym:DBACCESS_HID_DSADMIN_FIELD_SEPARATOR +TextSeparator sym:DBACCESS_HID_DSADMIN_TEXT_SEPARATOR +DecimalSeparator sym:DBACCESS_HID_DSADMIN_DECIMAL_SEPARATOR +ThousandsSeparator sym:DBACCESS_HID_DSADMIN_THOUSANDS_SEPARATOR +Extension sym:DBACCESS_HID_DSADMIN_EXTENSION +CharSet sym:DBACCESS_HID_DSADMIN_CHARSET +PlainTextFiles sym:DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES + +*TabTiming sym:sd.TabPage.20872 +TimingStart sym:sd.ListBox.20872.2 +Delay sym:sd.MetricField.20872.4 +Speed sym:sd.ComboBox.20872.6 +Repeat sym:sd.ComboBox.20872.8 +Rewind sym:sd.CheckBox.20872.9 +TriggerAnimate sym:sd.RadioButton.20872.11 +TriggerStart sym:sd.RadioButton.20872.12 +Shape sym:sd.ListBox.20872.13 + +*TabTransparency sym:CUI_HID_AREA_TRANSPARENCE +NoTransparency sym:cui.RadioButton.10054.8 +Transparency sym:cui.RadioButton.10054.9 +Gradient sym:cui.RadioButton.10054.10 +TransparencyPercent sym:cui.MetricField.10054.10 +Type sym:cui.ListBox.10054.3 +CenterX sym:cui.MetricField.10054.4 +CenterY sym:cui.MetricField.10054.5 +Angle sym:cui.MetricField.10054.6 +Border sym:cui.MetricField.10054.7 +StartValue sym:cui.MetricField.10054.8 +EndValue sym:cui.MetricField.10054.9 + +*TabTrendLineType sym:chart2.TabPage.918 +None sym:CHART2_HID_SCH_TRENDLINE_RB_NONE +Linear sym:CHART2_HID_SCH_TRENDLINE_RB_LINEAR +Logarithmic sym:CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC +Exponential sym:CHART2_HID_SCH_TRENDLINE_RB_EXPONENTIAL +Power sym:CHART2_HID_SCH_TRENDLINE_RB_POWER +ShowEquation sym:CHART2_HID_SCH_TRENDLINE_SHOW_EQUATION +ShowCorrelationCoefficient sym:CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED + + +*TabTrustedSources sym:XMLSECURITY_HID_XMLSEC_TP_TRUSTSOURCES +SourcesAdd sym:xmlsecurity.PushButton.1008.3 +SourcesView sym:xmlsecurity.PushButton.1008.4 +SourcesRemove sym:xmlsecurity.PushButton.1008.5 +LocationsListBox sym:xmlsecurity.ListBox.1008.8 +LocationsAdd sym:xmlsecurity.PushButton.1008.9 +LocationsRemove sym:xmlsecurity.PushButton.1008.10 + +*TabType sym:SW_HID_FRM_STD +Width sym:sw.MetricField.20831.28 +Height sym:sw.MetricField.20831.30 +RelativeWidth sym:sw.CheckBox.20831.100 +Automatic sym:sw.CheckBox.20831.46 +RelativeHeight sym:sw.CheckBox.20831.101 +KeepRatio sym:sw.CheckBox.20831.102 +AutoHoehe sym:sw.CheckBox.20831.31 +AnchorAtPage sym:sw.RadioButton.20831.1 +AnchorAtParagraph sym:sw.RadioButton.20831.2 +AnchorAtCharacter sym:sw.RadioButton.20831.3 +AnchorAsCharacter sym:sw.RadioButton.20831.4 +AnchorAtFrame sym:sw.RadioButton.20831.5 +Horizontal sym:sw.ListBox.20831.34 +HorizontalBy sym:sw.MetricField.20831.36 HorizontalTo SW:LISTBOX:TP_FRM_STD:LB_HORI_RELATION MirrorOnEvenPages SW:CHECKBOX:TP_FRM_STD:CB_MIRROR -Vertical sw.ListBox.20831.39 -VerticalBy sw.MetricField.20831.41 +Vertical sym:sw.ListBox.20831.39 +VerticalBy sym:sw.MetricField.20831.41 VerticalTo SW:LISTBOX:TP_FRM_STD:LB_VERT_RELATION -OriginalSize sw.PushButton.20831.44 -FollowTextflow sw.CheckBox.20831.129 +OriginalSize sym:sw.PushButton.20831.44 +FollowTextflow sym:sw.CheckBox.20831.129 -*TabTypeSelect DBACCESS_HID_TAB_WIZ_TYPE_SELECT -ColumnNames dbaccess.MultiListBox.19210.2 -ColumnName DBACCESS_HID_TAB_ENT_COLUMNNAME -ColumnType DBACCESS_HID_TAB_ENT_TYPE -ColumnLength DBACCESS_HID_TAB_ENT_TEXT_LEN -ColumnAutoValue dbaccess.NumericField.19210.1 -ColumnAuto dbaccess.PushButton.19210.5 +*TabTypeSelect sym:DBACCESS_HID_TAB_WIZ_TYPE_SELECT +ColumnNames sym:dbaccess.MultiListBox.19210.2 +ColumnName sym:DBACCESS_HID_TAB_ENT_COLUMNNAME +ColumnType sym:DBACCESS_HID_TAB_ENT_TYPE +ColumnLength sym:DBACCESS_HID_TAB_ENT_TEXT_LEN +ColumnAutoValue sym:dbaccess.NumericField.19210.1 +ColumnAuto sym:dbaccess.PushButton.19210.5 *TabWeblog sym:vnd.com.sun.star.blogger:settings -*TabXMLGeneral FILTER_HID_XML_FILTER_TABPAGE_BASIC -FilterName FILTER_HID_XML_FILTER_NAME -Application FILTER_HID_XML_FILTER_APPLICATION -UIName FILTER_HID_XML_FILTER_INTERFACE_NAME -FileExtension FILTER_HID_XML_FILTER_EXTENSION -Comments FILTER_HID_XML_FILTER_DESCRIPTION - -*TabXMLTransformation FILTER_HID_XML_FILTER_TABPAGE_XSLT -DocType FILTER_HID_XML_FILTER_DOCTYPE -DTD FILTER_HID_XML_FILTER_DTD -DTDBrowse FILTER_HID_XML_FILTER_DTD_BROWSE -XSLTForExport FILTER_HID_XML_FILTER_EXPORT_XSLT -XSLTForExportBrowse FILTER_HID_XML_FILTER_EXPORT_XSLT_BROWSE -XSLTForImport FILTER_HID_XML_FILTER_IMPORT_XSLT -XSLTForImportBrowse FILTER_HID_XML_FILTER_IMPORT_XSLT_BROWSE -TemplateForImprt FILTER_HID_XML_FILTER_IMPORT_TEMPLATE -BrowseTemplateForImport FILTER_HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE - -*TabXMLSecDetails XMLSECURITY_HID_XMLSEC_TP_DETAILS -XMLSecDetailsListBox XMLSECURITY_HID_XMLSEC_CTRL_ELEMENTS -XMLSecDetailsEditField xmlsecurity.MultiLineEdit.1004.2 - -*TabXMLSecGeneral XMLSECURITY_HID_XMLSEC_TP_GENERAL - -*TabXMLSecCertPath XMLSECURITY_HID_XMLSEC_TP_CERTPATH -XMLSecViewSigTree XMLSECURITY_HID_XMLSEC_CTRL_VIEWSIGNATURES -XMLViewCertButton xmlsecurity.PushButton.1005.55 -XMLSecCertStatus xmlsecurity.MultiLineEdit.1005.3 - -*TabYErrorBars chart2.TabPage.919 -MeanValue CHART2_HID_SCH_STATISTIK_MEANVALUE -NoFunction CHART2_HID_SCH_STATISTIK_NO_ERROR -Variance CHART2_HID_SCH_STATISTIK_VARIANT -StandardDeviation CHART2_HID_SCH_STATISTIK_SIGMA -Percentage CHART2_HID_SCH_STATISTIK_PERCENT -ErrorMargin CHART2_HID_SCH_STATISTIK_BIGERROR -ConstantValue CHART2_HID_SCH_STATISTIK_CONSTERROR -PercentageValue CHART2_HID_SCH_STATISTIK_PERCENT_VALUE -ErrorMarginValue CHART2_HID_SCH_STATISTIK_BIGERROR_VALUE -ConstantValuePlus CHART2_HID_SCH_STATISTIK_PLUS_VALUE -ConstantValueMinus CHART2_HID_SCH_STATISTIK_MINUS_VALUE -ErrorIndicator CHART2_HID_SCH_CT_INDICATE - -*WordCount SW_HID_DLG_WORDCOUNT +*TabXMLGeneral sym:FILTER_HID_XML_FILTER_TABPAGE_BASIC +FilterName sym:FILTER_HID_XML_FILTER_NAME +Application sym:FILTER_HID_XML_FILTER_APPLICATION +UIName sym:FILTER_HID_XML_FILTER_INTERFACE_NAME +FileExtension sym:FILTER_HID_XML_FILTER_EXTENSION +Comments sym:FILTER_HID_XML_FILTER_DESCRIPTION + +*TabXMLTransformation sym:FILTER_HID_XML_FILTER_TABPAGE_XSLT +DocType sym:FILTER_HID_XML_FILTER_DOCTYPE +DTD sym:FILTER_HID_XML_FILTER_DTD +DTDBrowse sym:FILTER_HID_XML_FILTER_DTD_BROWSE +XSLTForExport sym:FILTER_HID_XML_FILTER_EXPORT_XSLT +XSLTForExportBrowse sym:FILTER_HID_XML_FILTER_EXPORT_XSLT_BROWSE +XSLTForImport sym:FILTER_HID_XML_FILTER_IMPORT_XSLT +XSLTForImportBrowse sym:FILTER_HID_XML_FILTER_IMPORT_XSLT_BROWSE +TemplateForImprt sym:FILTER_HID_XML_FILTER_IMPORT_TEMPLATE +BrowseTemplateForImport sym:FILTER_HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE + +*TabXMLSecDetails sym:XMLSECURITY_HID_XMLSEC_TP_DETAILS +XMLSecDetailsListBox sym:XMLSECURITY_HID_XMLSEC_CTRL_ELEMENTS +XMLSecDetailsEditField sym:xmlsecurity.MultiLineEdit.1004.2 + +*TabXMLSecGeneral sym:XMLSECURITY_HID_XMLSEC_TP_GENERAL + +*TabXMLSecCertPath sym:XMLSECURITY_HID_XMLSEC_TP_CERTPATH +XMLSecViewSigTree sym:XMLSECURITY_HID_XMLSEC_CTRL_VIEWSIGNATURES +XMLViewCertButton sym:xmlsecurity.PushButton.1005.55 +XMLSecCertStatus sym:xmlsecurity.MultiLineEdit.1005.3 + +*TabYErrorBars sym:chart2.TabPage.919 +MeanValue sym:CHART2_HID_SCH_STATISTIK_MEANVALUE +NoFunction sym:CHART2_HID_SCH_STATISTIK_NO_ERROR +Variance sym:CHART2_HID_SCH_STATISTIK_VARIANT +StandardDeviation sym:CHART2_HID_SCH_STATISTIK_SIGMA +Percentage sym:CHART2_HID_SCH_STATISTIK_PERCENT +ErrorMargin sym:CHART2_HID_SCH_STATISTIK_BIGERROR +ConstantValue sym:CHART2_HID_SCH_STATISTIK_CONSTERROR +PercentageValue sym:CHART2_HID_SCH_STATISTIK_PERCENT_VALUE +ErrorMarginValue sym:CHART2_HID_SCH_STATISTIK_BIGERROR_VALUE +ConstantValuePlus sym:CHART2_HID_SCH_STATISTIK_PLUS_VALUE +ConstantValueMinus sym:CHART2_HID_SCH_STATISTIK_MINUS_VALUE +ErrorIndicator sym:CHART2_HID_SCH_CT_INDICATE + +*WordCount sym:SW_HID_DLG_WORDCOUNT diff --git a/testautomation/global/win/etoolbox.win b/testautomation/global/win/etoolbox.win index ff990cb2beca..c4efd376e50d 100644 --- a/testautomation/global/win/etoolbox.win +++ b/testautomation/global/win/etoolbox.win @@ -9,53 +9,53 @@ ' Bibliography Database -*TB_Bibliography EXTENSIONS_HID_BIB_DB_TBX -Table EXTENSIONS_HID_BIB_TBX_TABLE -SearchKey EXTENSIONS_HID_BIB_TBX_SEARCH -AutoFilter EXTENSIONS_HID_BIB_TBX_AUTOFILTER -StandardFilter .uno:FilterCrit -RemoveFilter .uno:RemoveFilterSort -ColumnArrangement EXTENSIONS_HID_BIB_MAPPINGDLG -DataSource EXTENSIONS_HID_BIB_CHANGESOURCE +*TB_Bibliography sym:EXTENSIONS_HID_BIB_DB_TBX +Table sym:EXTENSIONS_HID_BIB_TBX_TABLE +SearchKey sym:EXTENSIONS_HID_BIB_TBX_SEARCH +AutoFilter sym:EXTENSIONS_HID_BIB_TBX_AUTOFILTER +StandardFilter sym:.uno:FilterCrit +RemoveFilter sym:.uno:RemoveFilterSort +ColumnArrangement sym:EXTENSIONS_HID_BIB_MAPPINGDLG +DataSource sym:EXTENSIONS_HID_BIB_CHANGESOURCE -*TB_Help SFX2_HID_HELP_TOOLBOX -Index SFX2_HID_HELP_TOOLBOXITEM_INDEX -GoToStart SFX2_HID_HELP_TOOLBOXITEM_START -Backward SFX2_HID_HELP_TOOLBOXITEM_BACKWARD -Forward SFX2_HID_HELP_TOOLBOXITEM_FORWARD -PrintButton SFX2_HID_HELP_TOOLBOXITEM_PRINT -SetBookmarks SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS -DisplayHelpAtStartUp SFX2_HID_HELP_ONSTARTUP_BOX +*TB_Help sym:SFX2_HID_HELP_TOOLBOX +Index sym:SFX2_HID_HELP_TOOLBOXITEM_INDEX +GoToStart sym:SFX2_HID_HELP_TOOLBOXITEM_START +Backward sym:SFX2_HID_HELP_TOOLBOXITEM_BACKWARD +Forward sym:SFX2_HID_HELP_TOOLBOXITEM_FORWARD +PrintButton sym:SFX2_HID_HELP_TOOLBOXITEM_PRINT +SetBookmarks sym:SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS +DisplayHelpAtStartUp sym:SFX2_HID_HELP_ONSTARTUP_BOX -*TB_MacroControls HID_BASICIDE_CONTROLS -CommandButton .uno:InsertPushbutton -CheckBox .uno:Checkbox -Label .uno:InsertFixedText -ListBox .uno:InsertListbox -HScrollBar .uno:HScrollbar -VScrollBar .uno:VScrollbar -HLine .uno:HFixedLine -VLine .uno:VFixedLine -FrameControl .uno:Groupbox -DateField .uno:AddDateField -TimeField .uno:InsertTimeField -NumericField .uno:InsertNumericField -FormattedField .uno:InsertFormattedField -FileControl .uno:InsertFileControl -Properties .uno:ShowPropBrowser -ImageControl .uno:InsertImageControl -OptionButton .uno:Radiobutton -TextField .uno:InsertEdit -ComboBox .uno:Combobox -Progressbar .uno:ProgressBar -CurrencyField .uno:InsertCurrencyField -PatternField .uno:InsertPatternField -SelectMode .uno:SelectMode -Testmode .uno:TestMode +*TB_MacroControls sym:BASCTL_HID_BASICIDE_CONTROLS +CommandButton sym:.uno:InsertPushbutton +CheckBox sym:.uno:Checkbox +Label sym:.uno:InsertFixedText +ListBox sym:.uno:InsertListbox +HScrollBar sym:.uno:HScrollbar +VScrollBar sym:.uno:VScrollbar +HLine sym:.uno:HFixedLine +VLine sym:.uno:VFixedLine +FrameControl sym:.uno:Groupbox +DateField sym:.uno:AddDateField +TimeField sym:.uno:InsertTimeField +NumericField sym:.uno:InsertNumericField +FormattedField sym:.uno:InsertFormattedField +FileControl sym:.uno:InsertFileControl +Properties sym:.uno:ShowPropBrowser +ImageControl sym:.uno:InsertImageControl +OptionButton sym:.uno:Radiobutton +TextField sym:.uno:InsertEdit +ComboBox sym:.uno:Combobox +Progressbar sym:.uno:ProgressBar +CurrencyField sym:.uno:InsertCurrencyField +PatternField sym:.uno:InsertPatternField +SelectMode sym:.uno:SelectMode +Testmode sym:.uno:TestMode -*TB_MacroRecording .uno:MacroRecordingFloat -StopRecording .uno:StopRecording +*TB_MacroRecording sym:.uno:MacroRecordingFloat +StopRecording sym:.uno:StopRecording -*TB_Relation DBACCESS_HID_TLB_RELATIONDESIGN -AddTables .uno:AddTable +*TB_Relation sym:DBACCESS_HID_TLB_RELATIONDESIGN +AddTables sym:.uno:AddTable diff --git a/testautomation/global/win/mathop.win b/testautomation/global/win/mathop.win index fd208db24f50..e4f7d3cf0ba0 100644 --- a/testautomation/global/win/mathop.win +++ b/testautomation/global/win/mathop.win @@ -1,204 +1,204 @@ -*AuswahlMath STARMATH_HID_SMA_OPERATOR_WIN -TB_Gruppen STARMATH_HID_SMA_SELECTION_TBX -UnaereBinaere STARMATH_HID_SMA_UNBINOPS_CAT -Relationen STARMATH_HID_SMA_RELATIONS_CAT -MengenOperatoren STARMATH_HID_SMA_SETOPERATIONS_CAT -Funktionen STARMATH_HID_SMA_FUNCTIONS_CAT -Operatoren STARMATH_HID_SMA_OPERATORS_CAT -Attribute STARMATH_HID_SMA_ATTRIBUTES_CAT HID_SMA_ATTRIBUTS_CAT -Klammerungen STARMATH_HID_SMA_BRACKETS_CAT HID_SMA_PARENTHESES_CAT -Formatierungen STARMATH_HID_SMA_FORMAT_CAT -Sonstiges STARMATH_HID_SMA_MISC_CAT +*AuswahlMath sym:STARMATH_HID_SMA_OPERATOR_WIN +TB_Gruppen sym:STARMATH_HID_SMA_SELECTION_TBX +UnaereBinaere sym:STARMATH_HID_SMA_UNBINOPS_CAT +Relationen sym:STARMATH_HID_SMA_RELATIONS_CAT +MengenOperatoren sym:STARMATH_HID_SMA_SETOPERATIONS_CAT +Funktionen sym:STARMATH_HID_SMA_FUNCTIONS_CAT +Operatoren sym:STARMATH_HID_SMA_OPERATORS_CAT +Attribute sym:STARMATH_HID_SMA_ATTRIBUTES_CAT HID_SMA_ATTRIBUTS_CAT +Klammerungen sym:STARMATH_HID_SMA_BRACKETS_CAT HID_SMA_PARENTHESES_CAT +Formatierungen sym:STARMATH_HID_SMA_FORMAT_CAT +Sonstiges sym:STARMATH_HID_SMA_MISC_CAT -TB_UnaereBinaere STARMATH_HID_SMA_UNBINOPS_TBX -Plus STARMATH_HID_SMA_PLUSX -Minus STARMATH_HID_SMA_MINUSX -PlusMinus STARMATH_HID_SMA_PLUSMINUSX -MinusPlus STARMATH_HID_SMA_MINUSPLUSX -Additions STARMATH_HID_SMA_XPLUSY -Multiplikation STARMATH_HID_SMA_XCDOTY -MultiplikationKreuz STARMATH_HID_SMA_XTIMESY -MultiplikationStern STARMATH_HID_SMA_XSYMTIMESY -Subtraktions STARMATH_HID_SMA_XMINUSY -Division STARMATH_HID_SMA_XOVERY -DivisionDoppelpunkt STARMATH_HID_SMA_XDIVY -DivisionSchraegstrich STARMATH_HID_SMA_XSYMDIVIDEY -LogischesNICHT STARMATH_HID_SMA_NEGX -LogischesUND STARMATH_HID_SMA_XANDY -LogischesODER STARMATH_HID_SMA_XORY -Verkettung STARMATH_HID_SMA_XCIRCY +TB_UnaereBinaere sym:STARMATH_HID_SMA_UNBINOPS_TBX +Plus sym:STARMATH_HID_SMA_PLUSX +Minus sym:STARMATH_HID_SMA_MINUSX +PlusMinus sym:STARMATH_HID_SMA_PLUSMINUSX +MinusPlus sym:STARMATH_HID_SMA_MINUSPLUSX +Additions sym:STARMATH_HID_SMA_XPLUSY +Multiplikation sym:STARMATH_HID_SMA_XCDOTY +MultiplikationKreuz sym:STARMATH_HID_SMA_XTIMESY +MultiplikationStern sym:STARMATH_HID_SMA_XSYMTIMESY +Subtraktions sym:STARMATH_HID_SMA_XMINUSY +Division sym:STARMATH_HID_SMA_XOVERY +DivisionDoppelpunkt sym:STARMATH_HID_SMA_XDIVY +DivisionSchraegstrich sym:STARMATH_HID_SMA_XSYMDIVIDEY +LogischesNICHT sym:STARMATH_HID_SMA_NEGX +LogischesUND sym:STARMATH_HID_SMA_XANDY +LogischesODER sym:STARMATH_HID_SMA_XORY +Verkettung sym:STARMATH_HID_SMA_XCIRCY -TB_Relationen STARMATH_HID_SMA_RELATIONS_TBX -IstGleich STARMATH_HID_SMA_XEQY -IstUngleich STARMATH_HID_SMA_XNEQY -IstKongruentZu STARMATH_HID_SMA_XEQUIVY -IstOrthogonalZu STARMATH_HID_SMA_XORTHOY -IstKleinerAls STARMATH_HID_SMA_XLTY -IstGroesserAls STARMATH_HID_SMA_XGTY -IstUngefaehrGleich STARMATH_HID_SMA_XAPPROXY -Teilt STARMATH_HID_SMA_XDIVIDESY -TeiltNicht STARMATH_HID_SMA_XNDIVIDESY -IstParallelZu STARMATH_HID_SMA_XPARALLELY -IstKleinerGleich STARMATH_HID_SMA_XLESLANTY -IstGroesserGleich STARMATH_HID_SMA_XGESLANTY -IstAehnlichOderGlech STARMATH_HID_SMA_XSIMEQY -IstProportionalZu STARMATH_HID_SMA_XPROPY -IstKleinerGleich2 STARMATH_HID_SMA_XLEY -IstGroesserGleich2 STARMATH_HID_SMA_XGEY -IstAehnlichZu STARMATH_HID_SMA_XSIMY -StrebtGegen STARMATH_HID_SMA_XTOWARDY -DoppelterPfeilNachLinks STARMATH_HID_SMA_DLARROW -DoppelterPfeilNachLinksUndRechts STARMATH_HID_SMA_DLRARROW -DoppelterPfeilNachRechts STARMATH_HID_SMA_DRARROW +TB_Relationen sym:STARMATH_HID_SMA_RELATIONS_TBX +IstGleich sym:STARMATH_HID_SMA_XEQY +IstUngleich sym:STARMATH_HID_SMA_XNEQY +IstKongruentZu sym:STARMATH_HID_SMA_XEQUIVY +IstOrthogonalZu sym:STARMATH_HID_SMA_XORTHOY +IstKleinerAls sym:STARMATH_HID_SMA_XLTY +IstGroesserAls sym:STARMATH_HID_SMA_XGTY +IstUngefaehrGleich sym:STARMATH_HID_SMA_XAPPROXY +Teilt sym:STARMATH_HID_SMA_XDIVIDESY +TeiltNicht sym:STARMATH_HID_SMA_XNDIVIDESY +IstParallelZu sym:STARMATH_HID_SMA_XPARALLELY +IstKleinerGleich sym:STARMATH_HID_SMA_XLESLANTY +IstGroesserGleich sym:STARMATH_HID_SMA_XGESLANTY +IstAehnlichOderGlech sym:STARMATH_HID_SMA_XSIMEQY +IstProportionalZu sym:STARMATH_HID_SMA_XPROPY +IstKleinerGleich2 sym:STARMATH_HID_SMA_XLEY +IstGroesserGleich2 sym:STARMATH_HID_SMA_XGEY +IstAehnlichZu sym:STARMATH_HID_SMA_XSIMY +StrebtGegen sym:STARMATH_HID_SMA_XTOWARDY +DoppelterPfeilNachLinks sym:STARMATH_HID_SMA_DLARROW +DoppelterPfeilNachLinksUndRechts sym:STARMATH_HID_SMA_DLRARROW +DoppelterPfeilNachRechts sym:STARMATH_HID_SMA_DRARROW -TB_Mengenoperatoren STARMATH_HID_SMA_SETOPERATIONS_TBX -IstEnthaltenIn STARMATH_HID_SMA_XINY -IstNichtEnthaltenIn STARMATH_HID_SMA_XNOTINY -Enthaelt STARMATH_HID_SMA_XOWNSY -LeereMenge STARMATH_HID_SMA_EMPTYSET -Durchschnitt STARMATH_HID_SMA_XINTERSECTIONY -Vereinigung STARMATH_HID_SMA_XUNIONY -Differenz STARMATH_HID_SMA_XSETMINUSY -Quotientenmenge STARMATH_HID_SMA_XSLASHY -Aleph STARMATH_HID_SMA_ALEPH -Teilmenge STARMATH_HID_SMA_XSUBSETY -TeilmengeOderGleich STARMATH_HID_SMA_XSUBSETEQY -Obermenge STARMATH_HID_SMA_XSUPSETY -ObermengeOderGleich STARMATH_HID_SMA_XSUPSETEQY -NichtTeilmenge STARMATH_HID_SMA_XNSUBSETY -NichtTeilmengeOderGleich STARMATH_HID_SMA_XNSUBSETEQY -NichtObermenge STARMATH_HID_SMA_XNSUPSETY -NichtObermengeOderGleich STARMATH_HID_SMA_XNSUPSETEQY -MengeDerNatuerlichenZahlen STARMATH_HID_SMA_SETN -MengeDerGanzenZahlen STARMATH_HID_SMA_SETZ -MengeDerRationalenZahlen STARMATH_HID_SMA_SETQ -MengeDerReellenZahlen STARMATH_HID_SMA_SETR -MengeDerKomplexenZahlen STARMATH_HID_SMA_SETC +TB_Mengenoperatoren sym:STARMATH_HID_SMA_SETOPERATIONS_TBX +IstEnthaltenIn sym:STARMATH_HID_SMA_XINY +IstNichtEnthaltenIn sym:STARMATH_HID_SMA_XNOTINY +Enthaelt sym:STARMATH_HID_SMA_XOWNSY +LeereMenge sym:STARMATH_HID_SMA_EMPTYSET +Durchschnitt sym:STARMATH_HID_SMA_XINTERSECTIONY +Vereinigung sym:STARMATH_HID_SMA_XUNIONY +Differenz sym:STARMATH_HID_SMA_XSETMINUSY +Quotientenmenge sym:STARMATH_HID_SMA_XSLASHY +Aleph sym:STARMATH_HID_SMA_ALEPH +Teilmenge sym:STARMATH_HID_SMA_XSUBSETY +TeilmengeOderGleich sym:STARMATH_HID_SMA_XSUBSETEQY +Obermenge sym:STARMATH_HID_SMA_XSUPSETY +ObermengeOderGleich sym:STARMATH_HID_SMA_XSUPSETEQY +NichtTeilmenge sym:STARMATH_HID_SMA_XNSUBSETY +NichtTeilmengeOderGleich sym:STARMATH_HID_SMA_XNSUBSETEQY +NichtObermenge sym:STARMATH_HID_SMA_XNSUPSETY +NichtObermengeOderGleich sym:STARMATH_HID_SMA_XNSUPSETEQY +MengeDerNatuerlichenZahlen sym:STARMATH_HID_SMA_SETN +MengeDerGanzenZahlen sym:STARMATH_HID_SMA_SETZ +MengeDerRationalenZahlen sym:STARMATH_HID_SMA_SETQ +MengeDerReellenZahlen sym:STARMATH_HID_SMA_SETR +MengeDerKomplexenZahlen sym:STARMATH_HID_SMA_SETC -TB_Funktionen STARMATH_HID_SMA_FUNCTIONS_TBX -Absolutwert STARMATH_HID_SMA_ABSX -Fakultaet STARMATH_HID_SMA_FACTX -Quadratwurzel STARMATH_HID_SMA_SQRTX -NteWurzel STARMATH_HID_SMA_NROOTXY -NatuerlicheExponentialfunktion STARMATH_HID_SMA_EX -NatuerlicherLogarithmus STARMATH_HID_SMA_LNX -Exponentialfunktion STARMATH_HID_SMA_EXPX -Logarithmus STARMATH_HID_SMA_LOGX -Sinus STARMATH_HID_SMA_SINX -Cosinus STARMATH_HID_SMA_COSX -Tangens STARMATH_HID_SMA_TANX -Cotangens STARMATH_HID_SMA_COTX -Hyperbelsinus STARMATH_HID_SMA_SINHX -Hyperbelcosinus STARMATH_HID_SMA_COSHX -Hyperbeltangens STARMATH_HID_SMA_TANHX -Hyperbelcotangens STARMATH_HID_SMA_COTHX -Arcussinus STARMATH_HID_SMA_ARCSINX -Arcuscosinus STARMATH_HID_SMA_ARCCOSX -Arcustangens STARMATH_HID_SMA_ARCTANX -Arcuscotangens STARMATH_HID_SMA_ARCCOTX -Areahyperbelsinus STARMATH_HID_SMA_ARSINHX -Areahyperbelcosinus STARMATH_HID_SMA_ARCOSHX -Areahyperbeltangens STARMATH_HID_SMA_ARTANHX -Areahyperbelcotangens STARMATH_HID_SMA_ARCOTHX +TB_Funktionen sym:STARMATH_HID_SMA_FUNCTIONS_TBX +Absolutwert sym:STARMATH_HID_SMA_ABSX +Fakultaet sym:STARMATH_HID_SMA_FACTX +Quadratwurzel sym:STARMATH_HID_SMA_SQRTX +NteWurzel sym:STARMATH_HID_SMA_NROOTXY +NatuerlicheExponentialfunktion sym:STARMATH_HID_SMA_EX +NatuerlicherLogarithmus sym:STARMATH_HID_SMA_LNX +Exponentialfunktion sym:STARMATH_HID_SMA_EXPX +Logarithmus sym:STARMATH_HID_SMA_LOGX +Sinus sym:STARMATH_HID_SMA_SINX +Cosinus sym:STARMATH_HID_SMA_COSX +Tangens sym:STARMATH_HID_SMA_TANX +Cotangens sym:STARMATH_HID_SMA_COTX +Hyperbelsinus sym:STARMATH_HID_SMA_SINHX +Hyperbelcosinus sym:STARMATH_HID_SMA_COSHX +Hyperbeltangens sym:STARMATH_HID_SMA_TANHX +Hyperbelcotangens sym:STARMATH_HID_SMA_COTHX +Arcussinus sym:STARMATH_HID_SMA_ARCSINX +Arcuscosinus sym:STARMATH_HID_SMA_ARCCOSX +Arcustangens sym:STARMATH_HID_SMA_ARCTANX +Arcuscotangens sym:STARMATH_HID_SMA_ARCCOTX +Areahyperbelsinus sym:STARMATH_HID_SMA_ARSINHX +Areahyperbelcosinus sym:STARMATH_HID_SMA_ARCOSHX +Areahyperbeltangens sym:STARMATH_HID_SMA_ARTANHX +Areahyperbelcotangens sym:STARMATH_HID_SMA_ARCOTHX -TB_Operatoren STARMATH_HID_SMA_OPERATORS_TBX -Limes STARMATH_HID_SMA_LIMX -Summe STARMATH_HID_SMA_SUMX -Produkt STARMATH_HID_SMA_PRODX -Coprodukt STARMATH_HID_SMA_COPRODX -Integral STARMATH_HID_SMA_INTX -DoppeltesIntegral STARMATH_HID_SMA_IINTX -DreifachesIntegral STARMATH_HID_SMA_IIINTX +TB_Operatoren sym:STARMATH_HID_SMA_OPERATORS_TBX +Limes sym:STARMATH_HID_SMA_LIMX +Summe sym:STARMATH_HID_SMA_SUMX +Produkt sym:STARMATH_HID_SMA_PRODX +Coprodukt sym:STARMATH_HID_SMA_COPRODX +Integral sym:STARMATH_HID_SMA_INTX +DoppeltesIntegral sym:STARMATH_HID_SMA_IINTX +DreifachesIntegral sym:STARMATH_HID_SMA_IIINTX 'EsExistiertEin HID_SMA_EXISTSX -Kurvenintegral STARMATH_HID_SMA_LINTX -DoppeltesKurvenintegral STARMATH_HID_SMA_LLINTX -DreifachesKurvenintegral STARMATH_HID_SMA_LLLINTX +Kurvenintegral sym:STARMATH_HID_SMA_LINTX +DoppeltesKurvenintegral sym:STARMATH_HID_SMA_LLINTX +DreifachesKurvenintegral sym:STARMATH_HID_SMA_LLLINTX 'FuerAlle HID_SMA_FORALLX -UntereUndObereGrenze STARMATH_HID_SMA_FROMXTOY -UntereGrenze STARMATH_HID_SMA_FROMX -ObereGrenze STARMATH_HID_SMA_TOX +UntereUndObereGrenze sym:STARMATH_HID_SMA_FROMXTOY +UntereGrenze sym:STARMATH_HID_SMA_FROMX +ObereGrenze sym:STARMATH_HID_SMA_TOX -TB_Attribute STARMATH_HID_SMA_ATTRIBUTES_TBX -AccentNachRechts STARMATH_HID_SMA_ACUTEX -AccentNachLinks STARMATH_HID_SMA_GRAVEX -UmgekehrtesDach STARMATH_HID_SMA_CHECKX -Breve STARMATH_HID_SMA_BREVEX -Ueberstrich STARMATH_HID_SMA_BARX -Vektorpfeil STARMATH_HID_SMA_VECX -Dach STARMATH_HID_SMA_HATX -Tilde STARMATH_HID_SMA_TILDEX -Kreis STARMATH_HID_SMA_CIRCLEX -Punkt STARMATH_HID_SMA_DOTX -BreiterVektorpfeil STARMATH_HID_SMA_WIDEVECX -BreiteTilde STARMATH_HID_SMA_WIDETILDEX -BreitesDach STARMATH_HID_SMA_WIDEHATX -DoppelterPunkt STARMATH_HID_SMA_DDOTX -DreifacherPunkt STARMATH_HID_SMA_DDDOTX -LinieUeber STARMATH_HID_SMA_OVERLINEX -LinieUnter STARMATH_HID_SMA_UNDERLINEX -LinieDurch STARMATH_HID_SMA_OVERSTRIKEX -Transparent STARMATH_HID_SMA_PHANTOMX -Fettschrift STARMATH_HID_SMA_BOLDX -KursiveSchrift STARMATH_HID_SMA_ITALX -GroesseAendern STARMATH_HID_SMA_SIZEXY -FontAendern STARMATH_HID_SMA_FONTXY +TB_Attribute sym:STARMATH_HID_SMA_ATTRIBUTES_TBX +AccentNachRechts sym:STARMATH_HID_SMA_ACUTEX +AccentNachLinks sym:STARMATH_HID_SMA_GRAVEX +UmgekehrtesDach sym:STARMATH_HID_SMA_CHECKX +Breve sym:STARMATH_HID_SMA_BREVEX +Ueberstrich sym:STARMATH_HID_SMA_BARX +Vektorpfeil sym:STARMATH_HID_SMA_VECX +Dach sym:STARMATH_HID_SMA_HATX +Tilde sym:STARMATH_HID_SMA_TILDEX +Kreis sym:STARMATH_HID_SMA_CIRCLEX +Punkt sym:STARMATH_HID_SMA_DOTX +BreiterVektorpfeil sym:STARMATH_HID_SMA_WIDEVECX +BreiteTilde sym:STARMATH_HID_SMA_WIDETILDEX +BreitesDach sym:STARMATH_HID_SMA_WIDEHATX +DoppelterPunkt sym:STARMATH_HID_SMA_DDOTX +DreifacherPunkt sym:STARMATH_HID_SMA_DDDOTX +LinieUeber sym:STARMATH_HID_SMA_OVERLINEX +LinieUnter sym:STARMATH_HID_SMA_UNDERLINEX +LinieDurch sym:STARMATH_HID_SMA_OVERSTRIKEX +Transparent sym:STARMATH_HID_SMA_PHANTOMX +Fettschrift sym:STARMATH_HID_SMA_BOLDX +KursiveSchrift sym:STARMATH_HID_SMA_ITALX +GroesseAendern sym:STARMATH_HID_SMA_SIZEXY +FontAendern sym:STARMATH_HID_SMA_FONTXY -Unendlich STARMATH_HID_SMA_INFINITY -Partial STARMATH_HID_SMA_PARTIAL -Nabla STARMATH_HID_SMA_NABLA -EsExistiert STARMATH_HID_SMA_EXISTS -FuerAlle STARMATH_HID_SMA_FORALL -HQuer STARMATH_HID_SMA_HBAR -LambdaQuer STARMATH_HID_SMA_LAMBDABAR -Realteil STARMATH_HID_SMA_RE -Imaginaerteil STARMATH_HID_SMA_IM -WeierstrassP STARMATH_HID_SMA_WP -PfeilNachLinks STARMATH_HID_SMA_LEFTARROW -PfeilNachRechts STARMATH_HID_SMA_RIGHTARROW -PfeilNachOben STARMATH_HID_SMA_UPARROW -PfeilNachUnten STARMATH_HID_SMA_DOWNARROW -PunkteUnten STARMATH_HID_SMA_DOTSLOW -PunkteMittig STARMATH_HID_SMA_DOTSAXIS -PunkteVertikal STARMATH_HID_SMA_DOTSVERT -PunkteNachOben STARMATH_HID_SMA_DOTSUP -PunkteNachUnten STARMATH_HID_SMA_DOTSDOWN +Unendlich sym:STARMATH_HID_SMA_INFINITY +Partial sym:STARMATH_HID_SMA_PARTIAL +Nabla sym:STARMATH_HID_SMA_NABLA +EsExistiert sym:STARMATH_HID_SMA_EXISTS +FuerAlle sym:STARMATH_HID_SMA_FORALL +HQuer sym:STARMATH_HID_SMA_HBAR +LambdaQuer sym:STARMATH_HID_SMA_LAMBDABAR +Realteil sym:STARMATH_HID_SMA_RE +Imaginaerteil sym:STARMATH_HID_SMA_IM +WeierstrassP sym:STARMATH_HID_SMA_WP +PfeilNachLinks sym:STARMATH_HID_SMA_LEFTARROW +PfeilNachRechts sym:STARMATH_HID_SMA_RIGHTARROW +PfeilNachOben sym:STARMATH_HID_SMA_UPARROW +PfeilNachUnten sym:STARMATH_HID_SMA_DOWNARROW +PunkteUnten sym:STARMATH_HID_SMA_DOTSLOW +PunkteMittig sym:STARMATH_HID_SMA_DOTSAXIS +PunkteVertikal sym:STARMATH_HID_SMA_DOTSVERT +PunkteNachOben sym:STARMATH_HID_SMA_DOTSUP +PunkteNachUnten sym:STARMATH_HID_SMA_DOTSDOWN -TB_Klammerungen STARMATH_HID_SMA_BRACKETS_TBX -RundeKlammern STARMATH_HID_SMA_LRPARENTX -EckigeKlammern STARMATH_HID_SMA_LRBRACKETX -DoppelteEckigeKlammern STARMATH_HID_SMA_LRDBRACKETX -SpitzeKlammern STARMATH_HID_SMA_LRANGLEX -OperatorKlammern STARMATH_HID_SMA_LMRANGLEXY -GeschweifteKlammern STARMATH_HID_SMA_LRBRACEX -EinfacheLinien STARMATH_HID_SMA_LRLINEX -DoppelteLinien STARMATH_HID_SMA_LRDLINEX -GruppierungsKlammern STARMATH_HID_SMA_LRGROUPX -RundeKlammernSkalierbar STARMATH_HID_SMA_SLRPARENTX -EckigeKlammernSkalierbar STARMATH_HID_SMA_SLRBRACKETX -EckigeKlammernSkalierbar2 STARMATH_HID_SMA_SLRDBRACKETX -SpitzeKlammernSkalierbar STARMATH_HID_SMA_SLRANGLEX -GeschweifteKlammernSkalierbar STARMATH_HID_SMA_SLRBRACEX -EinfacheLinienSkalierbar STARMATH_HID_SMA_SLRLINEX -DoppelteLinienSkalierbar STARMATH_HID_SMA_SLRDLINEX -OperatorKlammernSkalierbar STARMATH_HID_SMA_SLMRANGLEXY -GeschweifteKlammerObenSkalierbar STARMATH_HID_SMA_XOVERBRACEY -GeschweifteKlammerUntenSkalierbar STARMATH_HID_SMA_XUNDERBRACEY +TB_Klammerungen sym:STARMATH_HID_SMA_BRACKETS_TBX +RundeKlammern sym:STARMATH_HID_SMA_LRPARENTX +EckigeKlammern sym:STARMATH_HID_SMA_LRBRACKETX +DoppelteEckigeKlammern sym:STARMATH_HID_SMA_LRDBRACKETX +SpitzeKlammern sym:STARMATH_HID_SMA_LRANGLEX +OperatorKlammern sym:STARMATH_HID_SMA_LMRANGLEXY +GeschweifteKlammern sym:STARMATH_HID_SMA_LRBRACEX +EinfacheLinien sym:STARMATH_HID_SMA_LRLINEX +DoppelteLinien sym:STARMATH_HID_SMA_LRDLINEX +GruppierungsKlammern sym:STARMATH_HID_SMA_LRGROUPX +RundeKlammernSkalierbar sym:STARMATH_HID_SMA_SLRPARENTX +EckigeKlammernSkalierbar sym:STARMATH_HID_SMA_SLRBRACKETX +EckigeKlammernSkalierbar2 sym:STARMATH_HID_SMA_SLRDBRACKETX +SpitzeKlammernSkalierbar sym:STARMATH_HID_SMA_SLRANGLEX +GeschweifteKlammernSkalierbar sym:STARMATH_HID_SMA_SLRBRACEX +EinfacheLinienSkalierbar sym:STARMATH_HID_SMA_SLRLINEX +DoppelteLinienSkalierbar sym:STARMATH_HID_SMA_SLRDLINEX +OperatorKlammernSkalierbar sym:STARMATH_HID_SMA_SLMRANGLEXY +GeschweifteKlammerObenSkalierbar sym:STARMATH_HID_SMA_XOVERBRACEY +GeschweifteKlammerUntenSkalierbar sym:STARMATH_HID_SMA_XUNDERBRACEY -TB_Formatierungen STARMATH_HID_SMA_FORMAT_TBX -NeueZeileBeginnen STARMATH_HID_SMA_NEWLINE -KleinerZwischenraum STARMATH_HID_SMA_SBLANK -Zwischenraum STARMATH_HID_SMA_BLANK -SubscriptRechts STARMATH_HID_SMA_RSUBX -VertikaleAnordnung2Elemente STARMATH_HID_SMA_BINOMXY -VertikaleAnordnung STARMATH_HID_SMA_STACK -MatrixAnordnung STARMATH_HID_SMA_MATRIX -SuperscriptRechts STARMATH_HID_SMA_RSUPX -LinksbuendigAusrichten STARMATH_HID_SMA_ALIGNLX -ZentriertHorizontalAusrichten STARMATH_HID_SMA_ALIGNCX -RechtsbuendigAusrichten STARMATH_HID_SMA_ALIGNRX -SubscriptLinks STARMATH_HID_SMA_LSUBX -SuperscriptLinks STARMATH_HID_SMA_LSUPX -SuperscriptOben STARMATH_HID_SMA_CSUPX -SubscriptUnten STARMATH_HID_SMA_CSUBX +TB_Formatierungen sym:STARMATH_HID_SMA_FORMAT_TBX +NeueZeileBeginnen sym:STARMATH_HID_SMA_NEWLINE +KleinerZwischenraum sym:STARMATH_HID_SMA_SBLANK +Zwischenraum sym:STARMATH_HID_SMA_BLANK +SubscriptRechts sym:STARMATH_HID_SMA_RSUBX +VertikaleAnordnung2Elemente sym:STARMATH_HID_SMA_BINOMXY +VertikaleAnordnung sym:STARMATH_HID_SMA_STACK +MatrixAnordnung sym:STARMATH_HID_SMA_MATRIX +SuperscriptRechts sym:STARMATH_HID_SMA_RSUPX +LinksbuendigAusrichten sym:STARMATH_HID_SMA_ALIGNLX +ZentriertHorizontalAusrichten sym:STARMATH_HID_SMA_ALIGNCX +RechtsbuendigAusrichten sym:STARMATH_HID_SMA_ALIGNRX +SubscriptLinks sym:STARMATH_HID_SMA_LSUBX +SuperscriptLinks sym:STARMATH_HID_SMA_LSUPX +SuperscriptOben sym:STARMATH_HID_SMA_CSUPX +SubscriptUnten sym:STARMATH_HID_SMA_CSUBX +OperatorenMath AuswahlMath diff --git a/testautomation/global/win/piloten.win b/testautomation/global/win/piloten.win index 59a592be2dd6..a49445436540 100644 --- a/testautomation/global/win/piloten.win +++ b/testautomation/global/win/piloten.win @@ -2,73 +2,73 @@ ' **** Autopilot Pr„sentation **** ' ************************************************************************************************ -*AutoPilotPraesentation1 SD_HID_SD_AUTOPILOT_PAGE1 -Backbutton sd.PushButton.900.3 -Nextbutton sd.PushButton.900.4 -EmptyPresentation sd.RadioButton.900.11 -FromTemplate sd.RadioButton.900.12 -TemplateRegion SD_HID_SD_AUTOPILOT_REGION -TemplateList SD_HID_SD_AUTOPILOT_TEMPLATES -Existingpresentation sd.RadioButton.900.15 -ExistingOpen sd.PushButton.900.17 -Existinglist SD_HID_SD_AUTOPILOT_OPEN -Preview sd.CheckBox.900.7 -Startwithwizard sd.CheckBox.900.8 +*AutoPilotPraesentation1 sym:SD_HID_SD_AUTOPILOT_PAGE1 +Backbutton sym:sd.PushButton.900.3 +Nextbutton sym:sd.PushButton.900.4 +EmptyPresentation sym:sd.RadioButton.900.11 +FromTemplate sym:sd.RadioButton.900.12 +TemplateRegion sym:SD_HID_SD_AUTOPILOT_REGION +TemplateList sym:SD_HID_SD_AUTOPILOT_TEMPLATES +Existingpresentation sym:sd.RadioButton.900.15 +ExistingOpen sym:sd.PushButton.900.17 +Existinglist sym:SD_HID_SD_AUTOPILOT_OPEN +Preview sym:sd.CheckBox.900.7 +Startwithwizard sym:sd.CheckBox.900.8 -*AutoPilotPraesentation2 SD_HID_SD_AUTOPILOT_PAGE2 -Backbutton sd.PushButton.900.3 -Nextbutton sd.PushButton.900.4 -Background SD_HID_SD_AUTOPILOT_PAGETEMPLATES -Backgroundchoice sd.ListBox.900.33 -Original sd.RadioButton.900.39 -Screen sd.RadioButton.900.35 -Overhead sd.RadioButton.900.37 -Slide sd.RadioButton.900.36 -Paper sd.RadioButton.900.38 -Preview sd.CheckBox.900.7 +*AutoPilotPraesentation2 sym:SD_HID_SD_AUTOPILOT_PAGE2 +Backbutton sym:sd.PushButton.900.3 +Nextbutton sym:sd.PushButton.900.4 +Background sym:SD_HID_SD_AUTOPILOT_PAGETEMPLATES +Backgroundchoice sym:sd.ListBox.900.33 +Original sym:sd.RadioButton.900.39 +Screen sym:sd.RadioButton.900.35 +Overhead sym:sd.RadioButton.900.37 +Slide sym:sd.RadioButton.900.36 +Paper sym:sd.RadioButton.900.38 +Preview sym:sd.CheckBox.900.7 -*AutoPilotPraesentation3 SD_HID_SD_AUTOPILOT_PAGE3 -Backbutton sd.PushButton.900.3 -Nextbutton sd.PushButton.900.4 -Effect sd.ListBox.900.43 -Speed sd.ListBox.900.45 -Default sd.RadioButton.900.47 -Automatic sd.RadioButton.900.48 -Timebutton sd.TimeField.900.50 -Break sd.TimeField.900.52 -Logo sd.CheckBox.900.53 -Preview sd.CheckBox.900.7 +*AutoPilotPraesentation3 sym:SD_HID_SD_AUTOPILOT_PAGE3 +Backbutton sym:sd.PushButton.900.3 +Nextbutton sym:sd.PushButton.900.4 +Effect sym:sd.ListBox.900.43 +Speed sym:sd.ListBox.900.45 +Default sym:sd.RadioButton.900.47 +Automatic sym:sd.RadioButton.900.48 +Timebutton sym:sd.TimeField.900.50 +Break sym:sd.TimeField.900.52 +Logo sym:sd.CheckBox.900.53 +Preview sym:sd.CheckBox.900.7 -*AutoPilotPraesentation4 SD_HID_SD_AUTOPILOT_PAGE4 -Backbutton sd.PushButton.900.3 -Nextbutton sd.PushButton.900.4 -AddName sd.Edit.900.23 -AddTopic sd.Edit.900.25 -Askinformation sd.MultiLineEdit.900.27 +*AutoPilotPraesentation4 sym:SD_HID_SD_AUTOPILOT_PAGE4 +Backbutton sym:sd.PushButton.900.3 +Nextbutton sym:sd.PushButton.900.4 +AddName sym:sd.Edit.900.23 +AddTopic sym:sd.Edit.900.25 +Askinformation sym:sd.MultiLineEdit.900.27 -*AutoPilotPraesentation5 SD_HID_SD_AUTOPILOT_PAGE5 -Backbutton sd.PushButton.900.3 -Nextbutton sd.PushButton.900.4 -Summary sd.CheckBox.900.63 -Preview sd.CheckBox.900.7 +*AutoPilotPraesentation5 sym:SD_HID_SD_AUTOPILOT_PAGE5 +Backbutton sym:sd.PushButton.900.3 +Nextbutton sym:sd.PushButton.900.4 +Summary sym:sd.CheckBox.900.63 +Preview sym:sd.CheckBox.900.7 -*AutoPilotEuroKonverter WIZARDS_HID_DLGCONVERT_DIALOG -Abbrechen WIZARDS_HID_DLGCONVERT_CBCANCEL -Hilfe WIZARDS_HID_DLGCONVERT_CBHELP -Zurueck WIZARDS_HID_DLGCONVERT_CBBACK -Konvertieren WIZARDS_HID_DLGCONVERT_CBGOON -AktuellesDokument WIZARDS_HID_DLGCONVERT_OBFILE -Verzeichnis WIZARDS_HID_DLGCONVERT_OBDIR -Waehrungen WIZARDS_HID_DLGCONVERT_COMBOBOX1 -Quelle WIZARDS_HID_DLGCONVERT_TBSOURCE -QuelleSuchen WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN -Unterverzeichnisse WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE -FelderUndTabellen WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS -TabellenschutzAufheben WIZARDS_HID_DLGCONVERT_CHKPROTECT -Ziel WIZARDS_HID_DLGCONVERT_TBTARGET -ZielSuchen WIZARDS_HID_DLGCONVERT_CBTARGETOPEN -KomplettesDokument WIZARDS_HID_DLGCONVERT_CHECKBOX1 -Zellvorlagen WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1 -WaehrungszellenTabellenblatt WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2 -WaehrungszellenDokument WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3 -AusgewaehlterBereich WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4 +*AutoPilotEuroKonverter sym:WIZARDS_HID_DLGCONVERT_DIALOG +Abbrechen sym:WIZARDS_HID_DLGCONVERT_CBCANCEL +Hilfe sym:WIZARDS_HID_DLGCONVERT_CBHELP +Zurueck sym:WIZARDS_HID_DLGCONVERT_CBBACK +Konvertieren sym:WIZARDS_HID_DLGCONVERT_CBGOON +AktuellesDokument sym:WIZARDS_HID_DLGCONVERT_OBFILE +Verzeichnis sym:WIZARDS_HID_DLGCONVERT_OBDIR +Waehrungen sym:WIZARDS_HID_DLGCONVERT_COMBOBOX1 +Quelle sym:WIZARDS_HID_DLGCONVERT_TBSOURCE +QuelleSuchen sym:WIZARDS_HID_DLGCONVERT_CBSOURCEOPEN +Unterverzeichnisse sym:WIZARDS_HID_DLGCONVERT_CHECKRECURSIVE +FelderUndTabellen sym:WIZARDS_HID_DLGCONVERT_CHKTEXTDOCUMENTS +TabellenschutzAufheben sym:WIZARDS_HID_DLGCONVERT_CHKPROTECT +Ziel sym:WIZARDS_HID_DLGCONVERT_TBTARGET +ZielSuchen sym:WIZARDS_HID_DLGCONVERT_CBTARGETOPEN +KomplettesDokument sym:WIZARDS_HID_DLGCONVERT_CHECKBOX1 +Zellvorlagen sym:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON1 +WaehrungszellenTabellenblatt sym:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON2 +WaehrungszellenDokument sym:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON3 +AusgewaehlterBereich sym:WIZARDS_HID_DLGCONVERT_OPTIONBUTTON4 diff --git a/testautomation/global/win/reportdesigner.win b/testautomation/global/win/reportdesigner.win index 05088ad1fad2..09af622f7ae9 100644 --- a/testautomation/global/win/reportdesigner.win +++ b/testautomation/global/win/reportdesigner.win @@ -1,7 +1,7 @@ -*ReportDesign REPORTDESIGN_UID_RPT_RPT_APP_VIEW +*ReportDesign sym:REPORTDESIGN_UID_RPT_RPT_APP_VIEW '--64509: TABPAGE: UID_APP_DESIGNVIEW -ReportWindow REPORTDESIGN_UID_RPT_REPORTWINDOW -SectionWindow REPORTDESIGN_UID_RPT_SECTIONSWINDOW +ReportWindow sym:REPORTDESIGN_UID_RPT_REPORTWINDOW +SectionWindow sym:REPORTDESIGN_UID_RPT_SECTIONSWINDOW ' HID_STARTMARKER ' HID_START_TITLE ' HID_START_IMAGE @@ -12,75 +12,75 @@ SectionWindow REPORTDESIGN_UID_RPT_SECTIONSWINDOW ' HID_START_TITLE ' HID_START_IMAGE ' UID_VIEWSWINDOW -' REPORTDESIGN_HID_REPORTSECTION +' sym:REPORTDESIGN_HID_REPORTSECTION ' HID_ENDMARKER -' REPORTDESIGN_HID_REPORTSECTION +' sym:REPORTDESIGN_HID_REPORTSECTION ' HID_ENDMARKER -' REPORTDESIGN_HID_REPORTSECTION +' sym:REPORTDESIGN_HID_REPORTSECTION ' HID_ENDMARKER -*ReportPageNumber REPORTDESIGN_HID_RPT_PAGENUMBERS_DLG -PageN reportdesign.RadioButton.30769.2 -PageNofM reportdesign.RadioButton.30769.3 -TopOfPage reportdesign.RadioButton.30769.5 -BottomOfpage reportdesign.RadioButton.30769.6 -PageNumberAlignment reportdesign.ListBox.30769.8 -ShowNumberOnFirstPage reportdesign.CheckBox.30769.9 +*ReportPageNumber sym:REPORTDESIGN_HID_RPT_PAGENUMBERS_DLG +PageN sym:reportdesign.RadioButton.30769.2 +PageNofM sym:reportdesign.RadioButton.30769.3 +TopOfPage sym:reportdesign.RadioButton.30769.5 +BottomOfpage sym:reportdesign.RadioButton.30769.6 +PageNumberAlignment sym:reportdesign.ListBox.30769.8 +ShowNumberOnFirstPage sym:reportdesign.CheckBox.30769.9 -*ReportDateTime REPORTDESIGN_HID_RPT_DATETIME_DLG -IncludeDate reportdesign.CheckBox.30770.1 -DateFormat reportdesign.ListBox.30770.3 -IncludeTime reportdesign.CheckBox.30770.5 -TimeFormat reportdesign.ListBox.30770.7 +*ReportDateTime sym:REPORTDESIGN_HID_RPT_DATETIME_DLG +IncludeDate sym:reportdesign.CheckBox.30770.1 +DateFormat sym:reportdesign.ListBox.30770.3 +IncludeTime sym:reportdesign.CheckBox.30770.5 +TimeFormat sym:reportdesign.ListBox.30770.7 -*ReportSortingGrouping REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG -Groups REPORTDESIGN_HID_RPT_GROUPSBRW -FieldExpression REPORTDESIGN_HID_RPT_FIELDEXPRESSION -MoveUp REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_UP -MoveDown REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_DOWN -Sorting reportdesign.ListBox.30768.17 -GroupHeader reportdesign.ListBox.30768.2 -GroupFooter reportdesign.ListBox.30768.4 -GroupOn reportdesign.ListBox.30768.6 -GroupIntervall reportdesign.NumericField.30768.8 -KeepTogether reportdesign.ListBox.30768.10 +*ReportSortingGrouping sym:REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG +Groups sym:REPORTDESIGN_HID_RPT_GROUPSBRW +FieldExpression sym:REPORTDESIGN_HID_RPT_FIELDEXPRESSION +MoveUp sym:REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_UP +MoveDown sym:REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_DOWN +Sorting sym:reportdesign.ListBox.30768.17 +GroupHeader sym:reportdesign.ListBox.30768.2 +GroupFooter sym:reportdesign.ListBox.30768.4 +GroupOn sym:reportdesign.ListBox.30768.6 +GroupIntervall sym:reportdesign.NumericField.30768.8 +KeepTogether sym:reportdesign.ListBox.30768.10 -*ReportNavigator REPORTDESIGN_HID_RPT_NAVIGATOR_DLG -NavigatorTree REPORTDESIGN_HID_REPORT_NAVIGATOR_TREE +*ReportNavigator sym:REPORTDESIGN_HID_RPT_NAVIGATOR_DLG +NavigatorTree sym:REPORTDESIGN_HID_REPORT_NAVIGATOR_TREE -*ReportGeneralProperties REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL -NameText EXTENSIONS_HID_PROP_NAME -GroupKeepTogether REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER -PageHeader REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION -PageFooter REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION -PrintRepeatedValues REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES -Height REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT -Width REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH -PositionX REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX -PositionY REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY -ConditionalPrintExpression REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION -BackgroundColor REPORTDESIGN_HID_RPT_PROP_BACKCOLOR -BackgroundTransparent REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT -Font REPORTDESIGN_HID_RPT_PROP_RPT_FONT -FontTypeDlg EXTENSIONS_UID_PROP_DLG_FONT_TYPE -PrintWhenGroupChange REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE -ControlBackgroundTransparent REPORTDESIGN_HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT +*ReportGeneralProperties sym:REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL +NameText sym:EXTENSIONS_HID_PROP_NAME +GroupKeepTogether sym:REPORTDESIGN_HID_RPT_PROP_GROUPKEEPTOGETHER +PageHeader sym:REPORTDESIGN_HID_RPT_PROP_PAGEHEADEROPTION +PageFooter sym:REPORTDESIGN_HID_RPT_PROP_PAGEFOOTEROPTION +PrintRepeatedValues sym:REPORTDESIGN_HID_RPT_PROP_PRINTREPEATEDVALUES +Height sym:REPORTDESIGN_HID_RPT_PROP_RPT_HEIGHT +Width sym:REPORTDESIGN_HID_RPT_PROP_RPT_WIDTH +PositionX sym:REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONX +PositionY sym:REPORTDESIGN_HID_RPT_PROP_RPT_POSITIONY +ConditionalPrintExpression sym:REPORTDESIGN_HID_RPT_PROP_CONDITIONALPRINTEXPRESSION +BackgroundColor sym:REPORTDESIGN_HID_RPT_PROP_BACKCOLOR +BackgroundTransparent sym:REPORTDESIGN_HID_RPT_PROP_BACKTRANSPARENT +Font sym:REPORTDESIGN_HID_RPT_PROP_RPT_FONT +FontTypeDlg sym:EXTENSIONS_UID_PROP_DLG_FONT_TYPE +PrintWhenGroupChange sym:REPORTDESIGN_HID_RPT_PROP_PRINTWHENGROUPCHANGE +ControlBackgroundTransparent sym:REPORTDESIGN_HID_RPT_PROP_CONTROLBACKGROUNDTRANSPARENT -*ReportDataProperties REPORTDESIGN_HID_RPT_PROPDLG_TAB_DATA -ContentType EXTENSIONS_HID_PROP_CURSORSOURCETYPE -Content EXTENSIONS_HID_PROP_CURSORSOURCE -OpenQueryDesign EXTENSIONS_UID_PROP_DLG_SQLCOMMAND -AnalyzeSQLCommand EXTENSIONS_HID_PROP_ESCAPE_PROCESSING -Filter EXTENSIONS_HID_PROP_FILTER -FilterDLGButton EXTENSIONS_UID_PROP_DLG_FILTER -DataField REPORTDESIGN_HID_RPT_PROP_DATAFIELD -OpenFormularWizard REPORTDESIGN_UID_RPT_PROP_FORMULA +*ReportDataProperties sym:REPORTDESIGN_HID_RPT_PROPDLG_TAB_DATA +ContentType sym:EXTENSIONS_HID_PROP_CURSORSOURCETYPE +Content sym:EXTENSIONS_HID_PROP_CURSORSOURCE +OpenQueryDesign sym:EXTENSIONS_UID_PROP_DLG_SQLCOMMAND +AnalyzeSQLCommand sym:EXTENSIONS_HID_PROP_ESCAPE_PROCESSING +Filter sym:EXTENSIONS_HID_PROP_FILTER +FilterDLGButton sym:EXTENSIONS_UID_PROP_DLG_FILTER +DataField sym:REPORTDESIGN_HID_RPT_PROP_DATAFIELD +OpenFormularWizard sym:REPORTDESIGN_UID_RPT_PROP_FORMULA -*ReportPropertiesTabControl EXTENSIONS_HID_FM_PROPDLG_TABCTR -ReportGeneralProperties REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL -ReportDataProperties REPORTDESIGN_HID_RPT_PROPDLG_TAB_DATA +*ReportPropertiesTabControl sym:EXTENSIONS_HID_FM_PROPDLG_TABCTR +ReportGeneralProperties sym:REPORTDESIGN_HID_RPT_PROPDLG_TAB_GENERAL +ReportDataProperties sym:REPORTDESIGN_HID_RPT_PROPDLG_TAB_DATA -*ReportAddField REPORTDESIGN_HID_RPT_FIELD_SEL_WIN -ReportAddFieldList REPORTDESIGN_HID_RPT_FIELD_SEL +*ReportAddField sym:REPORTDESIGN_HID_RPT_FIELD_SEL_WIN +ReportAddFieldList sym:REPORTDESIGN_HID_RPT_FIELD_SEL -*ConditionalFormating REPORTDESIGN_HID_RPT_CONDFORMAT_DLG +*ConditionalFormating sym:REPORTDESIGN_HID_RPT_CONDFORMAT_DLG diff --git a/testautomation/global/win/spadmin.win b/testautomation/global/win/spadmin.win index 65e5b44447e9..fca6f74e11b3 100644 --- a/testautomation/global/win/spadmin.win +++ b/testautomation/global/win/spadmin.win @@ -1,107 +1,107 @@ -*SPRenamePrinterDLG padmin.ModalDialog.1003 -EFPrinterName padmin.Edit.1003.2 -CBUnidentifiedObject padmin.ComboBox.1003.5 - -*SPFontNameDLG padmin.ModalDialog.1030 -PBRename padmin.PushButton.1030.6 -PBRemove padmin.PushButton.1030.3 -PBAdd padmin.PushButton.1030.5 -LBFontList padmin.ListBox.1030.4 - -*SPFontImportDLG padmin.ModalDialog.1065 -PBSelectAll padmin.PushButton.1065.6 -LBFontList padmin.ListBox.1065.7 -EFFontPath padmin.Edit.1065.3 -PBFontPath padmin.PushButton.1065.4 -CBCreateSoftlinks padmin.CheckBox.1065.18 - -*FilePicker SVT_HID_EXPLORERDLG_FILE -EFFileName SFX2_HID_FILEDLG_AUTOCOMPLETEBOX -LBFileList fpicker.ListBox.16374.35 -PBSelect fpicker.PushButton.16374.16 -PBUpOneLevel fpicker.MenuButton.16374.14 -PBNewDir fpicker.ImageButton.16374.11 -MBDefaultDir fpicker.MenuButton.16374.15 -TLBStandard SFX2_HID_FILEDLG_STANDARD - -*SPPrinterWizard padmin.ModalDialog.2000 -TabPWDeviceSelector padmin.TabPage.2001 -TabPWDriverSelector padmin.TabPage.2002 -TabPWQueueCommand padmin.TabPage.2004 -TabPWPrinterName padmin.TabPage.2003 -PBBack padmin.PushButton.2000.4 -PBNext padmin.PushButton.2000.3 - -*TabPWDeviceSelector padmin.TabPage.2001 -RBAdd padmin.RadioButton.2001.2 -RBFax padmin.RadioButton.2001.3 -RBPdf padmin.RadioButton.2001.4 -RBImport padmin.RadioButton.2001.5 - -*TabPWDriverSelector padmin.TabPage.2002 -LBChooseDriver padmin.ListBox.2002.2 -PBImport padmin.PushButton.2002.3 -PBDelete padmin.PushButton.2002.4 - -*TabPWFaxDriverSelector padmin.TabPage.2006 -RBDefault padmin.RadioButton.2006.2 -RBSelect padmin.RadioButton.2006.3 - -*TabPWQueueCommand padmin.TabPage.2004 -CBCommand padmin.ComboBox.2004.2 -PBHelp padmin.PushButton.2004.3 -EFPdfDir padmin.Edit.2004.7 -PBPdfDir padmin.PushButton.2004.8 - -*TabPWPrinterName padmin.TabPage.2003 -EFPrinterName padmin.Edit.2003.4 -EFFaxName padmin.Edit.2003.5 -CBUseAsDefault padmin.CheckBox.2003.7 -CBRemoveFaxNumber padmin.CheckBox.2003.8 - -*SPAdmin padmin.ModalDialog.1000 -LBPrinters padmin.ListBox.1000.4 -PBProperties padmin.PushButton.1000.6 -PBRename padmin.PushButton.1000.7 -PBDefault padmin.PushButton.1000.2 -PBRemove padmin.PushButton.1000.3 -PBTestpage padmin.PushButton.1000.8 -PBNewPrinter padmin.PushButton.1000.19 - -*TabSPACommand padmin.TabPage.4006 -EFlpr padmin.ComboBox.4006.5 -LBConfigureAs padmin.ListBox.4006.8 -PBPdfDir padmin.PushButton.4006.17 -EFPdfDir padmin.Edit.4006.16 -CBRemoveFaxNumber padmin.CheckBox.4006.19 -PBHelp padmin.PushButton.4006.4 -PBRemove padmin.PushButton.4006.15 - -*TabSPAPaper padmin.TabPage.4004 -LBPaperSize padmin.ListBox.4004.2 -LBOrientation padmin.ListBox.4004.4 -LBDuplex padmin.ListBox.4004.6 -LBPaperTray padmin.ListBox.4004.8 - -*TabSPADevice padmin.TabPage.4003 -LBOption padmin.ListBox.4003.4 -LBCurrentValue padmin.ListBox.4003.6 -LBColor padmin.ListBox.4003.10 - -*TabSPAFontReplacement padmin.TabPage.4005 -MLReplacedFonts padmin.MultiListBox.4005.2 -CBReplaceFont padmin.ComboBox.4005.4 -LBByPrinterFont padmin.ListBox.4005.6 -PBAdd padmin.PushButton.4005.7 -PBRemove padmin.PushButton.4005.8 -CBEnableReplacement padmin.CheckBox.4005.9 - -*TabSPAOther padmin.TabPage.4002 -MFLeftMargin padmin.MetricField.4002.2 -MFTopMargin padmin.MetricField.4002.4 -MFRightMargin padmin.MetricField.4002.6 -MFBottomMargin padmin.MetricField.4002.8 -EFComment padmin.Edit.4002.10 -PBDefault padmin.PushButton.4002.11 +*SPRenamePrinterDLG sym:padmin.ModalDialog.1003 +EFPrinterName sym:padmin.Edit.1003.2 +CBUnidentifiedObject sym:padmin.ComboBox.1003.5 + +*SPFontNameDLG sym:padmin.ModalDialog.1030 +PBRename sym:padmin.PushButton.1030.6 +PBRemove sym:padmin.PushButton.1030.3 +PBAdd sym:padmin.PushButton.1030.5 +LBFontList sym:padmin.ListBox.1030.4 + +*SPFontImportDLG sym:padmin.ModalDialog.1065 +PBSelectAll sym:padmin.PushButton.1065.6 +LBFontList sym:padmin.ListBox.1065.7 +EFFontPath sym:padmin.Edit.1065.3 +PBFontPath sym:padmin.PushButton.1065.4 +CBCreateSoftlinks sym:padmin.CheckBox.1065.18 + +*FilePicker sym:SVT_HID_EXPLORERDLG_FILE +EFFileName sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX +LBFileList sym:fpicker.ListBox.16374.35 +PBSelect sym:fpicker.PushButton.16374.16 +PBUpOneLevel sym:fpicker.MenuButton.16374.14 +PBNewDir sym:fpicker.ImageButton.16374.11 +MBDefaultDir sym:fpicker.MenuButton.16374.15 +TLBStandard sym:SFX2_HID_FILEDLG_STANDARD + +*SPPrinterWizard sym:padmin.ModalDialog.2000 +TabPWDeviceSelector sym:padmin.TabPage.2001 +TabPWDriverSelector sym:padmin.TabPage.2002 +TabPWQueueCommand sym:padmin.TabPage.2004 +TabPWPrinterName sym:padmin.TabPage.2003 +PBBack sym:padmin.PushButton.2000.4 +PBNext sym:padmin.PushButton.2000.3 + +*TabPWDeviceSelector sym:padmin.TabPage.2001 +RBAdd sym:padmin.RadioButton.2001.2 +RBFax sym:padmin.RadioButton.2001.3 +RBPdf sym:padmin.RadioButton.2001.4 +RBImport sym:padmin.RadioButton.2001.5 + +*TabPWDriverSelector sym:padmin.TabPage.2002 +LBChooseDriver sym:padmin.ListBox.2002.2 +PBImport sym:padmin.PushButton.2002.3 +PBDelete sym:padmin.PushButton.2002.4 + +*TabPWFaxDriverSelector sym:padmin.TabPage.2006 +RBDefault sym:padmin.RadioButton.2006.2 +RBSelect sym:padmin.RadioButton.2006.3 + +*TabPWQueueCommand sym:padmin.TabPage.2004 +CBCommand sym:padmin.ComboBox.2004.2 +PBHelp sym:padmin.PushButton.2004.3 +EFPdfDir sym:padmin.Edit.2004.7 +PBPdfDir sym:padmin.PushButton.2004.8 + +*TabPWPrinterName sym:padmin.TabPage.2003 +EFPrinterName sym:padmin.Edit.2003.4 +EFFaxName sym:padmin.Edit.2003.5 +CBUseAsDefault sym:padmin.CheckBox.2003.7 +CBRemoveFaxNumber sym:padmin.CheckBox.2003.8 + +*SPAdmin sym:padmin.ModalDialog.1000 +LBPrinters sym:padmin.ListBox.1000.4 +PBProperties sym:padmin.PushButton.1000.6 +PBRename sym:padmin.PushButton.1000.7 +PBDefault sym:padmin.PushButton.1000.2 +PBRemove sym:padmin.PushButton.1000.3 +PBTestpage sym:padmin.PushButton.1000.8 +PBNewPrinter sym:padmin.PushButton.1000.19 + +*TabSPACommand sym:padmin.TabPage.4006 +EFlpr sym:padmin.ComboBox.4006.5 +LBConfigureAs sym:padmin.ListBox.4006.8 +PBPdfDir sym:padmin.PushButton.4006.17 +EFPdfDir sym:padmin.Edit.4006.16 +CBRemoveFaxNumber sym:padmin.CheckBox.4006.19 +PBHelp sym:padmin.PushButton.4006.4 +PBRemove sym:padmin.PushButton.4006.15 + +*TabSPAPaper sym:padmin.TabPage.4004 +LBPaperSize sym:padmin.ListBox.4004.2 +LBOrientation sym:padmin.ListBox.4004.4 +LBDuplex sym:padmin.ListBox.4004.6 +LBPaperTray sym:padmin.ListBox.4004.8 + +*TabSPADevice sym:padmin.TabPage.4003 +LBOption sym:padmin.ListBox.4003.4 +LBCurrentValue sym:padmin.ListBox.4003.6 +LBColor sym:padmin.ListBox.4003.10 + +*TabSPAFontReplacement sym:padmin.TabPage.4005 +MLReplacedFonts sym:padmin.MultiListBox.4005.2 +CBReplaceFont sym:padmin.ComboBox.4005.4 +LBByPrinterFont sym:padmin.ListBox.4005.6 +PBAdd sym:padmin.PushButton.4005.7 +PBRemove sym:padmin.PushButton.4005.8 +CBEnableReplacement sym:padmin.CheckBox.4005.9 + +*TabSPAOther sym:padmin.TabPage.4002 +MFLeftMargin sym:padmin.MetricField.4002.2 +MFTopMargin sym:padmin.MetricField.4002.4 +MFRightMargin sym:padmin.MetricField.4002.6 +MFBottomMargin sym:padmin.MetricField.4002.8 +EFComment sym:padmin.Edit.4002.10 +PBDefault sym:padmin.PushButton.4002.11 diff --git a/testautomation/global/win/sys_dial.win b/testautomation/global/win/sys_dial.win index f9086ea869b1..d4850dfa5315 100644 --- a/testautomation/global/win/sys_dial.win +++ b/testautomation/global/win/sys_dial.win @@ -1,115 +1,115 @@ ' **** general Printersettings-Dialog ( File/Printer settings ) ' **** -*DruckerEinrichten svtools.ModalDialog.16511 -Drucker svtools.ListBox.16511.2 -Eigenschaften svtools.PushButton.16511.3 +*DruckerEinrichten sym:svtools.ModalDialog.16511 +Drucker sym:svtools.ListBox.16511.2 +Eigenschaften sym:svtools.PushButton.16511.3 '************************************************************************ '************ all file-dialogs '************ -*GeneralFileDialog SVT_HID_EXPLORERDLG_FILE -UebergeordneterOrdner fpicker.MenuButton.16374.14 -NeuerOrdner fpicker.ImageButton.16374.11 -Standard fpicker.MenuButton.16374.15 -DateiAuswahl SFX2_HID_FILEDLG_STANDARD -Dateiname SFX2_HID_FILEDLG_AUTOCOMPLETEBOX -Dateityp fpicker.ListBox.16374.35 -Oeffnen fpicker.PushButton.16374.16 -Auswaehlen fpicker.PushButton.16374.16 +*GeneralFileDialog sym:SVT_HID_EXPLORERDLG_FILE +UebergeordneterOrdner sym:fpicker.MenuButton.16374.14 +NeuerOrdner sym:fpicker.ImageButton.16374.11 +Standard sym:fpicker.MenuButton.16374.15 +DateiAuswahl sym:SFX2_HID_FILEDLG_STANDARD +Dateiname sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX +Dateityp sym:fpicker.ListBox.16374.35 +Oeffnen sym:fpicker.PushButton.16374.16 +Auswaehlen sym:fpicker.PushButton.16374.16 +GrafikEinfuegenDlg GeneralFileDialog -Pfad SFX2_HID_FILEDLG_AUTOCOMPLETEBOX SFX2_HID_FILEDLG_PATH_FILENAME -Stil SVT_HID_FILEOPEN_IMAGE_TEMPLATE -Verknuepfen SFX2_HID_FILEDLG_LINK_CB HID_IMPGRF_CB_LINK -Vorschau SFX2_HID_FILEDLG_PREVIEW_CB HID_IMPGRF_CB_PREVIEW -Link SFX2_HID_FILEDLG_LINK_CB -Preview SFX2_HID_FILEDLG_PREVIEW_CB +Pfad sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX sym:SFX2_HID_FILEDLG_PATH_FILENAME +Stil sym:SVT_HID_FILEOPEN_IMAGE_TEMPLATE +Verknuepfen sym:SFX2_HID_FILEDLG_LINK_CB HID_IMPGRF_CB_LINK +Vorschau sym:SFX2_HID_FILEDLG_PREVIEW_CB HID_IMPGRF_CB_PREVIEW +Link sym:SFX2_HID_FILEDLG_LINK_CB +Preview sym:SFX2_HID_FILEDLG_PREVIEW_CB +OeffnenDlg GeneralFileDialog -Pfad SFX2_HID_FILEDLG_AUTOCOMPLETEBOX SFX2_HID_FILEDLG_PATH_FILENAME -Version SVT_HID_FILEOPEN_VERSION -NurLesen SVT_HID_FILEOPEN_READONLY -Einfuegen SFX2_HID_FILEDLG_INSERT_BTN -Play SVT_HID_FILESAVE_DOPLAY +Pfad sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX sym:SFX2_HID_FILEDLG_PATH_FILENAME +Version sym:SVT_HID_FILEOPEN_VERSION +NurLesen sym:SVT_HID_FILEOPEN_READONLY +Einfuegen sym:SFX2_HID_FILEDLG_INSERT_BTN +Play sym:SVT_HID_FILESAVE_DOPLAY +KonkordanzdateiOeffnen GeneralFileDialog +VorlagenLaden GeneralFileDialog -Text SW_HID_LTEMPL_TEXT -Rahmen SW_HID_LTEMPL_FRAME -Seite SW_HID_LTEMPL_PAGE -Numerierung SW_HID_LTEMPL_NUMBERING -Ueberschreiben SW_HID_LTEMPL_OVERRIDE +Text sym:SW_HID_LTEMPL_TEXT +Rahmen sym:SW_HID_LTEMPL_FRAME +Seite sym:SW_HID_LTEMPL_PAGE +Numerierung sym:SW_HID_LTEMPL_NUMBERING +Ueberschreiben sym:SW_HID_LTEMPL_OVERRIDE ' Vorlagen HID_LTEMPL_TEMPLATES -*SpeichernDlg SVT_HID_FILESAVE_DIALOG -Dateiname SVT_HID_FILESAVE_FILEURL -Vorlage SVT_HID_FILESAVE_TEMPLATE -Dateityp SVT_HID_FILESAVE_FILETYPE -Speichern SVT_HID_FILESAVE_DOSAVE -NeuerOrdner SVT_HID_FILESAVE_CREATEDIRECTORY -Standard SVT_HID_FILESAVE_DEFAULTDIRECTORY -DateiAuswahl SVT_HID_FILESAVE_FILEVIEW -Passwort SVT_HID_FILESAVE_SAVEWITHPASSWORD -AutomatischeDateinamenserweiterung SVT_HID_FILESAVE_AUTOEXTENSION -UebergeordneterOrdner SVT_HID_FILESAVE_LEVELUP +*SpeichernDlg sym:SVT_HID_FILESAVE_DIALOG +Dateiname sym:SVT_HID_FILESAVE_FILEURL +Vorlage sym:SVT_HID_FILESAVE_TEMPLATE +Dateityp sym:SVT_HID_FILESAVE_FILETYPE +Speichern sym:SVT_HID_FILESAVE_DOSAVE +NeuerOrdner sym:SVT_HID_FILESAVE_CREATEDIRECTORY +Standard sym:SVT_HID_FILESAVE_DEFAULTDIRECTORY +DateiAuswahl sym:SVT_HID_FILESAVE_FILEVIEW +Passwort sym:SVT_HID_FILESAVE_SAVEWITHPASSWORD +AutomatischeDateinamenserweiterung sym:SVT_HID_FILESAVE_AUTOEXTENSION +UebergeordneterOrdner sym:SVT_HID_FILESAVE_LEVELUP +ExportierenDlg SpeichernDlg -Selektion SVT_HID_FILESAVE_SELECTION +Selektion sym:SVT_HID_FILESAVE_SELECTION ' **** Hyperlink-File-Dialog ' **** -*HyperlinkAuswahlDlg SW_HID_FILEDLG_CHARDLG -UebergeordneterOrdner fpicker.MenuButton.16374.14 -NeuerOrdner fpicker.ImageButton.16374.11 -Standard fpicker.MenuButton.16374.15 -DateiAuswahl SFX2_HID_FILEDLG_STANDARD -Dateiname SFX2_HID_FILEDLG_AUTOCOMPLETEBOX -Dateityp fpicker.ListBox.16374.35 -Oeffnen fpicker.PushButton.16374.16 -NurLesen fpicker.CheckBox.16374.40 +*HyperlinkAuswahlDlg sym:SW_HID_FILEDLG_CHARDLG +UebergeordneterOrdner sym:fpicker.MenuButton.16374.14 +NeuerOrdner sym:fpicker.ImageButton.16374.11 +Standard sym:fpicker.MenuButton.16374.15 +DateiAuswahl sym:SFX2_HID_FILEDLG_STANDARD +Dateiname sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX +Dateityp sym:fpicker.ListBox.16374.35 +Oeffnen sym:fpicker.PushButton.16374.16 +NurLesen sym:fpicker.CheckBox.16374.40 ' **** general Color-Dialog ( under tools / options / staroffice / color / edit ) ' **** -*FarbeDlg svtools.ModalDialog.996 +*FarbeDlg sym:svtools.ModalDialog.996 'Grundfarben 'BenutzerdefinierteFarben -Cyan svtools.MetricField.996.7 -Magenta svtools.MetricField.996.8 -Yellow svtools.MetricField.996.9 -Key svtools.MetricField.996.10 -Rot svtools.NumericField.996.1 -Gruen svtools.NumericField.996.2 -Blau svtools.NumericField.996.3 -Farbton svtools.NumericField.996.4 -Saettigung svtools.NumericField.996.5 -Hell svtools.NumericField.996.6 -Links svtools.PushButton.996.1 -Rechts svtools.PushButton.996.2 - -*SendMasterDocument SVT_HID_FILESAVE_DIALOG -Dateiname SW_HID_SEND_MASTER_CTRL_EDIT_FILEURL -Vorlage SW_HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE -Filter SW_HID_SEND_MASTER_CTRL_LISTBOX_FILTER -AutomatischeDateinamenserweiterung SW_HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION -Speichern SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_OK -Cancel SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL -DateiAuswahl SW_HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW -UebergeordneterOrdner SVT_HID_FILESAVE_LEVELUP -NeuerOrdner SVT_HID_FILESAVE_CREATEDIRECTORY -Standard SVT_HID_FILESAVE_DEFAULTDIRECTORY - -*SendHTMLDocument SVT_HID_FILESAVE_DIALOG -Dateiname SW_HID_SEND_HTML_CTRL_EDIT_FILEURL -Vorlage SW_HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE -Filter SW_HID_SEND_HTML_CTRL_LISTBOX_FILTER -AutomatischeDateinamenserweiterung SW_HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION -Speichern SW_HID_SEND_HTML_CTRL_PUSHBUTTON_OK -Cancel SW_HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL -DateiAuswahl SW_HID_SEND_HTML_CTRL_CONTROL_FILEVIEW -UebergeordneterOrdner SVT_HID_FILESAVE_LEVELUP -NeuerOrdner SVT_HID_FILESAVE_CREATEDIRECTORY -Standard SVT_HID_FILESAVE_DEFAULTDIRECTORY +Cyan sym:svtools.MetricField.996.7 +Magenta sym:svtools.MetricField.996.8 +Yellow sym:svtools.MetricField.996.9 +Key sym:svtools.MetricField.996.10 +Rot sym:svtools.NumericField.996.1 +Gruen sym:svtools.NumericField.996.2 +Blau sym:svtools.NumericField.996.3 +Farbton sym:svtools.NumericField.996.4 +Saettigung sym:svtools.NumericField.996.5 +Hell sym:svtools.NumericField.996.6 +Links sym:svtools.PushButton.996.1 +Rechts sym:svtools.PushButton.996.2 + +*SendMasterDocument sym:SVT_HID_FILESAVE_DIALOG +Dateiname sym:SW_HID_SEND_MASTER_CTRL_EDIT_FILEURL +Vorlage sym:SW_HID_SEND_MASTER_CTRL_LISTBOX_TEMPLATE +Filter sym:SW_HID_SEND_MASTER_CTRL_LISTBOX_FILTER +AutomatischeDateinamenserweiterung sym:SW_HID_SEND_MASTER_CTRL_CHECKBOX_AUTOEXTENSION +Speichern sym:SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_OK +Cancel sym:SW_HID_SEND_MASTER_CTRL_PUSHBUTTON_CANCEL +DateiAuswahl sym:SW_HID_SEND_MASTER_CTRL_CONTROL_FILEVIEW +UebergeordneterOrdner sym:SVT_HID_FILESAVE_LEVELUP +NeuerOrdner sym:SVT_HID_FILESAVE_CREATEDIRECTORY +Standard sym:SVT_HID_FILESAVE_DEFAULTDIRECTORY + +*SendHTMLDocument sym:SVT_HID_FILESAVE_DIALOG +Dateiname sym:SW_HID_SEND_HTML_CTRL_EDIT_FILEURL +Vorlage sym:SW_HID_SEND_HTML_CTRL_LISTBOX_TEMPLATE +Filter sym:SW_HID_SEND_HTML_CTRL_LISTBOX_FILTER +AutomatischeDateinamenserweiterung sym:SW_HID_SEND_HTML_CTRL_CHECKBOX_AUTOEXTENSION +Speichern sym:SW_HID_SEND_HTML_CTRL_PUSHBUTTON_OK +Cancel sym:SW_HID_SEND_HTML_CTRL_PUSHBUTTON_CANCEL +DateiAuswahl sym:SW_HID_SEND_HTML_CTRL_CONTROL_FILEVIEW +UebergeordneterOrdner sym:SVT_HID_FILESAVE_LEVELUP +NeuerOrdner sym:SVT_HID_FILESAVE_CREATEDIRECTORY +Standard sym:SVT_HID_FILESAVE_DEFAULTDIRECTORY ' **** Messageboxes amd Lastversion-message set to the active operator @@ -119,12 +119,12 @@ Standard SVT_HID_FILESAVE_DEFAULTDIRECTORY ' **** new folder-dialog ' **** -*NeuerOrdner fpicker.ModalDialog.16375 -OrdnerName fpicker.Edit.16375.11 +*NeuerOrdner sym:fpicker.ModalDialog.16375 +OrdnerName sym:fpicker.Edit.16375.11 ' **** Translationwidow fuer das Ubersetzungstooling ' **** -*TranslationWindow svtools.WorkWindow.12348 svtools:FloatingWindow:TT_INLINE_TRANSLATION +*TranslationWindow sym:svtools.WorkWindow.12348 svtools:FloatingWindow:TT_INLINE_TRANSLATION ' **** specal longnames for bas test ' **** author marc.schwanz@sun.com diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win index 499ead027bf1..ca6f725f75c3 100644 --- a/testautomation/global/win/tab_a_d.win +++ b/testautomation/global/win/tab_a_d.win @@ -1,6 +1,6 @@ *Active -*TabAenderungenWriter SW_HID_REDLINE_OPT +*TabAenderungenWriter sym:SW_HID_REDLINE_OPT EinfuegenAttribute SW:LISTBOX:TP_REDLINE_OPT:LB_INS_ATTR EinfuegenFarbe SW:LISTBOX:TP_REDLINE_OPT:LB_INS_COL LoeschenAttribute SW:LISTBOX:TP_REDLINE_OPT:LB_DEL_ATTR @@ -10,103 +10,103 @@ AendernFarbe SW:LISTBOX:TP_REDLINE_OPT:LB_CHG_COL ZeilenMarkierung SW:LISTBOX:TP_REDLINE_OPT:LB_MARKPOS ZeilenFarbe SW:LISTBOX:TP_REDLINE_OPT:LB_LC_COL -*TabAenderungenCalc SC_HID_SCPAGE_OPREDLINE SC:TABPAGE:RID_SCPAGE_OPREDLINE +*TabAenderungenCalc sym:SC_HID_SCPAGE_OPREDLINE SC:TABPAGE:RID_SCPAGE_OPREDLINE Aenderungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_CONTENT Loeschungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_REMOVE Einfuegungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_INSERT Verschiebungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_MOVE -*TabAllgemein CUI_HID_OPTIONS_GENERAL -Firma cui.Edit.12001.11 -VorName cui.Edit.12001.15 -ZuName cui.Edit.12001.16 -NameDesVaters cui.Edit.12001.14 -Strasse cui.Edit.12001.20 -Apartmentnummer cui.Edit.12001.21 -Land cui.Edit.12001.29 -PLZ cui.Edit.12001.23 -Ort cui.Edit.12001.24 -Kuerzel cui.Edit.12001.17 -TelPriv cui.Edit.12001.34 -TelGe cui.Edit.12001.35 -Fax cui.Edit.12001.37 -EMail cui.Edit.12001.38 -Titel cui.Edit.12001.31 -Position cui.Edit.12001.32 -City cui.Edit.12001.25 -Zip cui.Edit.12001.27 -Street cui.Edit.12001.20 +*TabAllgemein sym:CUI_HID_OPTIONS_GENERAL +Firma sym:cui.Edit.12001.11 +VorName sym:cui.Edit.12001.15 +ZuName sym:cui.Edit.12001.16 +NameDesVaters sym:cui.Edit.12001.14 +Strasse sym:cui.Edit.12001.20 +Apartmentnummer sym:cui.Edit.12001.21 +Land sym:cui.Edit.12001.29 +PLZ sym:cui.Edit.12001.23 +Ort sym:cui.Edit.12001.24 +Kuerzel sym:cui.Edit.12001.17 +TelPriv sym:cui.Edit.12001.34 +TelGe sym:cui.Edit.12001.35 +Fax sym:cui.Edit.12001.37 +EMail sym:cui.Edit.12001.38 +Titel sym:cui.Edit.12001.31 +Position sym:cui.Edit.12001.32 +City sym:cui.Edit.12001.25 +Zip sym:cui.Edit.12001.27 +Street sym:cui.Edit.12001.20 State cui:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE -Zurueck SFX2_HID_TABDLG_RESET_BTN +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +TabAllgemeines TabAllgemein -*TabAllgemeinGallery CUI_HID_GALLERY_PROPERTIES_GENERAL -NeuesThema CUI_HID_GALLERY_EDIT_MSNAME - -*TabAnsichtAllgemein CUI_HID_OFA_TP_VIEW -FontScale cui.MetricField.17102.22 -IconStyle cui.ListBox.17102.56 -IconScale cui.ListBox.17102.54 -FontAntiAliasing cui.CheckBox.17102.63 -AAPixel cui.NumericField.17102.64 -VorschauInSchriftlisten cui.CheckBox.17102.60 -SchriftenHistorie cui.CheckBox.17102.62 -UseHardwareAcceleration cui.CheckBox.17102.68 -UseAntiAliasing cui.CheckBox.17102.69 -IconsInMenueAnzeigen cui.ListBox.17102.41 -MausAktion cui.ListBox.17102.34 -MousePositioning cui.ListBox.17102.31 -UseSystemFont cui.CheckBox.17102.57 -Transparency cui.CheckBox.17102.71 -SelectionOpacity cui.MetricField.17102.72 - -*TabAusnahmen CUI_HID_OFAPAGE_AUTOCORR_EXCEPT -Abkuerzungen cui.Edit.17004.17 -AbkuerzungenListe cui.ListBox.17004.18 -AbkuerzungenNeu cui.PushButton.17004.19 -AbkuerzungenLoeschen cui.PushButton.17004.20 -AbkuerzungenAutomatisch cui.CheckBox.17004.43 -Woerter cui.Edit.17004.22 -WoerterListe cui.ListBox.17004.23 -WoerterNeu cui.PushButton.17004.24 -WoerterLoeschen cui.PushButton.17004.25 -WoerterAutomatisch cui.CheckBox.17004.44 -Zurueck SFX2_HID_TABDLG_RESET_BTN -WelcheSprache CUI_HID_AUTOCORR_LANGUAGE - -*TabAusrichtung CUI_HID_ALIGNMENT -ListeHAusrichtung cui.ListBox.10090.12 -ListeVAusrichtung cui.ListBox.10090.16 +*TabAllgemeinGallery sym:CUI_HID_GALLERY_PROPERTIES_GENERAL +NeuesThema sym:CUI_HID_GALLERY_EDIT_MSNAME + +*TabAnsichtAllgemein sym:CUI_HID_OFA_TP_VIEW +FontScale sym:cui.MetricField.17102.22 +IconStyle sym:cui.ListBox.17102.56 +IconScale sym:cui.ListBox.17102.54 +FontAntiAliasing sym:cui.CheckBox.17102.63 +AAPixel sym:cui.NumericField.17102.64 +VorschauInSchriftlisten sym:cui.CheckBox.17102.60 +SchriftenHistorie sym:cui.CheckBox.17102.62 +UseHardwareAcceleration sym:cui.CheckBox.17102.68 +UseAntiAliasing sym:cui.CheckBox.17102.69 +IconsInMenueAnzeigen sym:cui.ListBox.17102.41 +MausAktion sym:cui.ListBox.17102.34 +MousePositioning sym:cui.ListBox.17102.31 +UseSystemFont sym:cui.CheckBox.17102.57 +Transparency sym:cui.CheckBox.17102.71 +SelectionOpacity sym:cui.MetricField.17102.72 + +*TabAusnahmen sym:CUI_HID_OFAPAGE_AUTOCORR_EXCEPT +Abkuerzungen sym:cui.Edit.17004.17 +AbkuerzungenListe sym:cui.ListBox.17004.18 +AbkuerzungenNeu sym:cui.PushButton.17004.19 +AbkuerzungenLoeschen sym:cui.PushButton.17004.20 +AbkuerzungenAutomatisch sym:cui.CheckBox.17004.43 +Woerter sym:cui.Edit.17004.22 +WoerterListe sym:cui.ListBox.17004.23 +WoerterNeu sym:cui.PushButton.17004.24 +WoerterLoeschen sym:cui.PushButton.17004.25 +WoerterAutomatisch sym:cui.CheckBox.17004.44 +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +WelcheSprache sym:CUI_HID_AUTOCORR_LANGUAGE + +*TabAusrichtung sym:CUI_HID_ALIGNMENT +ListeHAusrichtung sym:cui.ListBox.10090.12 +ListeVAusrichtung sym:cui.ListBox.10090.16 Einzug cui:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT -Zeilenumbruch cui.TriStateBox.10090.41 -Silbentrennung cui.TriStateBox.10090.42 +Zeilenumbruch sym:cui.TriStateBox.10090.41 +Silbentrennung sym:cui.TriStateBox.10090.42 Grad cui:NUMERICFIELD:RID_SVXPAGE_ALIGNMENT:NF_DEGREES -Bezugskante CUI_HID_ALIGNMENT_CTR_BORDER_LOCK -VertikaleAusrichtung cui.TriStateBox.10090.27 -Gestapelt cui.TriStateBox.10090.21 -ShrinkToFit cui.TriStateBox.10090.45 -SetAlignmentOptions cui.ListBox.10090.44 -AlignmentDial CUI_HID_ALIGNMENT_CTR_DIAL - -*TabAusrichtungAbsatz CUI_HID_FORMAT_PARAGRAPH_ALIGN +Bezugskante sym:CUI_HID_ALIGNMENT_CTR_BORDER_LOCK +VertikaleAusrichtung sym:cui.TriStateBox.10090.27 +Gestapelt sym:cui.TriStateBox.10090.21 +ShrinkToFit sym:cui.TriStateBox.10090.45 +SetAlignmentOptions sym:cui.ListBox.10090.44 +AlignmentDial sym:CUI_HID_ALIGNMENT_CTR_DIAL + +*TabAusrichtungAbsatz sym:CUI_HID_FORMAT_PARAGRAPH_ALIGN Links cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN Rechts cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN Zentriert cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN Blocksatz cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN LetzteZeile cui:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE EinzelnesWortAustreiben cui:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND -VertikaleTextausrichtung cui.ListBox.10187.36 -TextrasterFangen cui.CheckBox.10187.38 -TextDirection cui.ListBox.10187.92 - -*TabBedingung SW_HID_COND_COLL -AlsBedingteVorlage sw.CheckBox.20848.1 -Kontextliste SW_HID_COND_COLL_TABLIST -Absatzvorlagen sw.ListBox.20848.7 -Vorlagen sw.ListBox.20848.8 -Entfernen sw.PushButton.20848.9 -Zuweisen sw.PushButton.20848.10 +VertikaleTextausrichtung sym:cui.ListBox.10187.36 +TextrasterFangen sym:cui.CheckBox.10187.38 +TextDirection sym:cui.ListBox.10187.92 + +*TabBedingung sym:SW_HID_COND_COLL +AlsBedingteVorlage sym:sw.CheckBox.20848.1 +Kontextliste sym:SW_HID_COND_COLL_TABLIST +Absatzvorlagen sym:sw.ListBox.20848.7 +Vorlagen sym:sw.ListBox.20848.8 +Entfernen sym:sw.PushButton.20848.9 +Zuweisen sym:sw.PushButton.20848.10 '*TabBeleuchtung HID_PAGE_LIGHT3D svx:TabPage:RID_SVXPAGE_LIGHT3D 'QuellFarbfilter svx:ListBox:RID_SVXPAGE_LIGHT3D:LB_LIGHT_COLOR @@ -114,108 +114,108 @@ Zuweisen sw.PushButton.20848.10 'Richtung 'UmgebungsFarbfilter svx:ListBox:RID_SVXPAGE_LIGHT3D:LB_COLOR 'UmgebungsIntensitaet svx:MetricField:RID_SVXPAGE_LIGHT3D:MTR_FLD_INTENSITY -'Zurueck SFX2_HID_TABDLG_RESET_BTN - -*TabBemassung CUI_HID_PAGE_MEASURE -Liniendistanz cui.MetricField.10161.1 -HLUebergang cui.MetricField.10161.2 -HLDistanz cui.MetricField.10161.3 -LinkeHL cui.MetricField.10161.4 -RechteHL cui.MetricField.10161.5 -AnzeigeUnterhalb cui.TriStateBox.10161.1 -AnzeigeParallel cui.TriStateBox.10161.5 -MetrikAnzeigen cui.TriStateBox.10161.2 -Textposition CUI_HID_MEASURE_CTL_POSITION -AutomatischVertikal cui.TriStateBox.10161.3 -AutomatischHorizontal cui.TriStateBox.10161.4 - -*TabBenutzer SFX2_HID_DOCINFOUSER -Info0 sfx2.Edit.265.16 -Info1 sfx2.Edit.265.18 -Info2 sfx2.Edit.265.20 -Info3 sfx2.Edit.265.22 -Infofelder sfx2.PushButton.265.34 +'Zurueck sym:SFX2_HID_TABDLG_RESET_BTN + +*TabBemassung sym:CUI_HID_PAGE_MEASURE +Liniendistanz sym:cui.MetricField.10161.1 +HLUebergang sym:cui.MetricField.10161.2 +HLDistanz sym:cui.MetricField.10161.3 +LinkeHL sym:cui.MetricField.10161.4 +RechteHL sym:cui.MetricField.10161.5 +AnzeigeUnterhalb sym:cui.TriStateBox.10161.1 +AnzeigeParallel sym:cui.TriStateBox.10161.5 +MetrikAnzeigen sym:cui.TriStateBox.10161.2 +Textposition sym:CUI_HID_MEASURE_CTL_POSITION +AutomatischVertikal sym:cui.TriStateBox.10161.3 +AutomatischHorizontal sym:cui.TriStateBox.10161.4 + +*TabBenutzer sym:SFX2_HID_DOCINFOUSER +Info0 sym:sfx2.Edit.265.16 +Info1 sym:sfx2.Edit.265.18 +Info2 sym:sfx2.Edit.265.20 +Info3 sym:sfx2.Edit.265.22 +Infofelder sym:sfx2.PushButton.265.34 +TabBenutzerdaten TabAllgemein -*TabBerechnen SC_HID_SCPAGE_CALC -Iterationen sc.CheckBox.25660.1 -Schritte sc.NumericField.25660.4 -Nachkommastellen sc.NumericField.25660.7 -MinimalerAenderungswert sc.Edit.25660.5 -Standard sc.RadioButton.25660.9 -StarCalc10 sc.RadioButton.25660.10 -Jahr1904 sc.RadioButton.25660.11 -GrossKleinschreibung sc.CheckBox.25660.15 -GenauigkeitWieAngezeigt sc.CheckBox.25660.17 -Suchkriterien sc.CheckBox.25660.18 -RegulaererAusdruck sc.CheckBox.25660.20 -SpaltenZeilenbeschriftung sc.CheckBox.25660.19 -LimitDecimals sc.CheckBox.25660.21 - -*TabBereiche SW_HID_INSERT_SECTION_PAGE -Bereichsliste sw.ComboBox.20885.20 -Geschuetzt sw.CheckBox.20885.10 -Ausblenden sw.CheckBox.20885.8 -BedingungText sw.Edit.20885.13 -Verknuepfung sw.CheckBox.20885.5 -DDE sw.CheckBox.20885.1 -DateiVerknuepfung sw.Edit.20885.16 -Bereich sw.ComboBox.20885.38 -Auswaehlen sw.PushButton.20885.40 -Passwort sw.CheckBox.20885.9 -EnterPasswort sw.PushButton.20885.51 - -*TabBeschreibung SFX2_HID_DOCINFODESC -Titel sfx2.Edit.263.10 -Thema sfx2.Edit.263.12 -Schluesselwoerter sfx2.Edit.263.14 -Beschreibung sfx2.MultiLineEdit.263.24 - -*TabBibliotheken basctl.TabPage.14888 -Bibliothek basctl.ListBox.14888.12 -Bibliotheksliste BASCTL_HID_BASICIDE_LIBS_TREE -Bearbeiten basctl.PushButton.14888.4 -Passwort basctl.PushButton.14888.11 -Neu basctl.PushButton.14888.9 -Hinzufuegen basctl.PushButton.14888.10 -Export basctl.PushButton.14888.14 -Loeschen basctl.PushButton.14888.8 - -*TabBitmap CUI_HID_AREA_BITMAP +*TabBerechnen sym:SC_HID_SCPAGE_CALC +Iterationen sym:sc.CheckBox.25660.1 +Schritte sym:sc.NumericField.25660.4 +Nachkommastellen sym:sc.NumericField.25660.7 +MinimalerAenderungswert sym:sc.Edit.25660.5 +Standard sym:sc.RadioButton.25660.9 +StarCalc10 sym:sc.RadioButton.25660.10 +Jahr1904 sym:sc.RadioButton.25660.11 +GrossKleinschreibung sym:sc.CheckBox.25660.15 +GenauigkeitWieAngezeigt sym:sc.CheckBox.25660.17 +Suchkriterien sym:sc.CheckBox.25660.18 +RegulaererAusdruck sym:sc.CheckBox.25660.20 +SpaltenZeilenbeschriftung sym:sc.CheckBox.25660.19 +LimitDecimals sym:sc.CheckBox.25660.21 + +*TabBereiche sym:SW_HID_INSERT_SECTION_PAGE +Bereichsliste sym:sw.ComboBox.20885.20 +Geschuetzt sym:sw.CheckBox.20885.10 +Ausblenden sym:sw.CheckBox.20885.8 +BedingungText sym:sw.Edit.20885.13 +Verknuepfung sym:sw.CheckBox.20885.5 +DDE sym:sw.CheckBox.20885.1 +DateiVerknuepfung sym:sw.Edit.20885.16 +Bereich sym:sw.ComboBox.20885.38 +Auswaehlen sym:sw.PushButton.20885.40 +Passwort sym:sw.CheckBox.20885.9 +EnterPasswort sym:sw.PushButton.20885.51 + +*TabBeschreibung sym:SFX2_HID_DOCINFODESC +Titel sym:sfx2.Edit.263.10 +Thema sym:sfx2.Edit.263.12 +Schluesselwoerter sym:sfx2.Edit.263.14 +Beschreibung sym:sfx2.MultiLineEdit.263.24 + +*TabBibliotheken sym:basctl.TabPage.14888 +Bibliothek sym:basctl.ListBox.14888.12 +Bibliotheksliste sym:BASCTL_HID_BASICIDE_LIBS_TREE +Bearbeiten sym:basctl.PushButton.14888.4 +Passwort sym:basctl.PushButton.14888.11 +Neu sym:basctl.PushButton.14888.9 +Hinzufuegen sym:basctl.PushButton.14888.10 +Export sym:basctl.PushButton.14888.14 +Loeschen sym:basctl.PushButton.14888.8 + +*TabBitmap sym:CUI_HID_AREA_BITMAP 'PixelEditor -Vordergrund cui.ListBox.10058.1 -Hintergrund cui.ListBox.10058.3 -Tabelle cui.ListBox.10058.4 -Hinzufuegen cui.PushButton.10058.1 -Aendern cui.PushButton.10058.3 -Import cui.PushButton.10058.2 -Loeschen cui.PushButton.10058.4 -Oeffnen cui.ImageButton.10058.5 -Speichern cui.ImageButton.10058.6 -Zurueck SFX2_HID_TABDLG_RESET_BTN - -*TabDateien CUI_HID_GALLERY_BROWSER -Dateityp cui.ComboBox.10364.1 -Suche cui.PushButton.10364.4 -Dateiliste cui.MultiListBox.10364.1 -Hinzufuegen cui.PushButton.10364.5 -HinzufuegenAlle cui.PushButton.10364.1 -Vorschau cui.CheckBox.10364.3 - -*TabDatenbank SW_HID_FLD_DB +Vordergrund sym:cui.ListBox.10058.1 +Hintergrund sym:cui.ListBox.10058.3 +Tabelle sym:cui.ListBox.10058.4 +Hinzufuegen sym:cui.PushButton.10058.1 +Aendern sym:cui.PushButton.10058.3 +Import sym:cui.PushButton.10058.2 +Loeschen sym:cui.PushButton.10058.4 +Oeffnen sym:cui.ImageButton.10058.5 +Speichern sym:cui.ImageButton.10058.6 +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN + +*TabDateien sym:CUI_HID_GALLERY_BROWSER +Dateityp sym:cui.ComboBox.10364.1 +Suche sym:cui.PushButton.10364.4 +Dateiliste sym:cui.MultiListBox.10364.1 +Hinzufuegen sym:cui.PushButton.10364.5 +HinzufuegenAlle sym:cui.PushButton.10364.1 +Vorschau sym:cui.CheckBox.10364.3 + +*TabDatenbank sym:SW_HID_FLD_DB Feldtyp SW:LISTBOX:TP_FLD_DB:LB_DBTYPE -Datenbankauswahl SW_HID_DB_SELECTION_TLB +Datenbankauswahl sym:SW_HID_DB_SELECTION_TLB Bedingung SW:EDIT:TP_FLD_DB:ED_DBCONDITION Satznummer SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER AusDatenbank SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT Selbstdefiniert SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT Formatliste SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT Zahlenformat SW:LISTBOX:TP_FLD_DB:LB_DBNUMFORMAT -Einfuegen SW_HID_FIELD_INSERT -Schliessen SW_HID_FIELD_CLOSE +Einfuegen sym:SW_HID_FIELD_INSERT +Schliessen sym:SW_HID_FIELD_CLOSE -*TabDirektCursor SW_HID_OPTSHDWCRSR +*TabDirektCursor sym:SW_HID_OPTSHDWCRSR DirektCursor SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF Absatzausrichtung SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN LinkerAbsatzrand SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT @@ -229,80 +229,80 @@ Leerzeichen SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SPACE GeschLeerzeichen SW:CHECKBOX:TP_OPTSHDWCRSR:CB_HSPACE WeicheTrenner SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SHYPH Umbrueche SW:CHECKBOX:TP_OPTSHDWCRSR:CB_BREAK -VersteckteAbsatze sw.CheckBox.20870.36 -FeldVersteckterText sw.CheckBox.20870.10 -VersteckterText sw.CheckBox.20870.61 - -*TabDokument SFX2_HID_DOCINFODOC -Dokumentname sfx2.Edit.264.51 -Schreibgeschuetzt sfx2.CheckBox.264.48 -DigitalSignature sfx2.PushButton.264.79 -Loeschen sfx2.PushButton.264.62 -BenutzerdatenVerwenden sfx2.CheckBox.264.49 - -FileTypeInfo sfx2.Edit.264.54 -FileLocationInfo sfx2.Edit.264.2 -FileSizeInfo sfx2.Edit.264.56 -FileCreatedInfo sfx2.Edit.264.8 -FileChangedInfo sfx2.Edit.264.4 -FileSignedInfo sfx2.Edit.264.77 -FileLastPrintedInfo sfx2.Edit.264.59 -FileEditTimeInfo sfx2.Edit.264.36 -FileRevisionInfo sfx2.Edit.264.38 -FileTemplateinfo sfx2.Edit.264.33 - -*TabDokumentFeldbefehle SW_HID_FLD_DOK +VersteckteAbsatze sym:sw.CheckBox.20870.36 +FeldVersteckterText sym:sw.CheckBox.20870.10 +VersteckterText sym:sw.CheckBox.20870.61 + +*TabDokument sym:SFX2_HID_DOCINFODOC +Dokumentname sym:sfx2.Edit.264.51 +Schreibgeschuetzt sym:sfx2.CheckBox.264.48 +DigitalSignature sym:sfx2.PushButton.264.79 +Loeschen sym:sfx2.PushButton.264.62 +BenutzerdatenVerwenden sym:sfx2.CheckBox.264.49 + +FileTypeInfo sym:sfx2.Edit.264.54 +FileLocationInfo sym:sfx2.Edit.264.2 +FileSizeInfo sym:sfx2.Edit.264.56 +FileCreatedInfo sym:sfx2.Edit.264.8 +FileChangedInfo sym:sfx2.Edit.264.4 +FileSignedInfo sym:sfx2.Edit.264.77 +FileLastPrintedInfo sym:sfx2.Edit.264.59 +FileEditTimeInfo sym:sfx2.Edit.264.36 +FileRevisionInfo sym:sfx2.Edit.264.38 +FileTemplateinfo sym:sfx2.Edit.264.33 + +*TabDokumentFeldbefehle sym:SW_HID_FLD_DOK Feldtyp SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE Auswahl SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION Formatliste SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT Zahlenformat SW:LISTBOX:TP_FLD_DOK:LB_DOKNUMFORMAT Editfeld SW:EDIT:TP_FLD_DOK:ED_DOKVALUE InhaltFix SW:CHECKBOX:TP_FLD_DOK:CB_DOKFIXEDCONTENT -Einfuegen SW_HID_FIELD_INSERT -Schliessen SW_HID_FIELD_CLOSE +Einfuegen sym:SW_HID_FIELD_INSERT +Schliessen sym:SW_HID_FIELD_CLOSE -*TabDokumentinfo SFX2_HID_DOCINFODESC -Beschreibung sfx2.MultiLineEdit.263.24 -Schluesselworte sfx2.Edit.263.14 -Thema sfx2.Edit.263.12 -Titel sfx2.Edit.263.10 +*TabDokumentinfo sym:SFX2_HID_DOCINFODESC +Beschreibung sym:sfx2.MultiLineEdit.263.24 +Schluesselworte sym:sfx2.Edit.263.14 +Thema sym:sfx2.Edit.263.12 +Titel sym:sfx2.Edit.263.10 -*TabDokumentInfoFeldbefehle SW_HID_FLD_DOKINF -Feldtyp SW_HID_FIELD_DINF_TYPE +*TabDokumentInfoFeldbefehle sym:SW_HID_FLD_DOKINF +Feldtyp sym:SW_HID_FIELD_DINF_TYPE Auswahl SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFSELECTION Zahlenformat SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFFORMAT InhaltFix SW:CHECKBOX:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT -Einfuegen SW_HID_FIELD_INSERT -Schliessen SW_HID_FIELD_CLOSE - -*TabDrehung CUI_HID_TRANS_ANGLE -PositionX cui.MetricField.10048.7 -PositionY cui.MetricField.10048.8 -Winkel cui.MetricField.10048.19 -Drehpunkt CUI_HID_TPROTATION_CTRL1 -Drehwinkel CUI_HID_TPROTATION_CTRL2 - -*TabDruckenDraw SD_HID_SD_PRINT_OPTIONS sc:hidspecial:HID_SC_WIN_PREVIEW -Zeichnung sd.CheckBox.549.6 -Notizen sd.CheckBox.549.7 -Handzettel sd.CheckBox.549.8 -Gliederung sd.CheckBox.549.9 -Seitenname sd.CheckBox.549.2 -Datum sd.CheckBox.549.3 -Zeit sd.CheckBox.549.4 -AusgeblendeteSeitenDrucken sd.CheckBox.549.1 -Standard sd.RadioButton.549.1 -AnSeitengroesseAnpassen sd.RadioButton.549.2 -SeitenKacheln sd.RadioButton.549.3 -Prospekt sd.RadioButton.549.4 -Vorderseite sd.CheckBox.549.12 -Rueckseite sd.CheckBox.549.13 -AusDruckereinstellung sd.CheckBox.549.10 +Einfuegen sym:SW_HID_FIELD_INSERT +Schliessen sym:SW_HID_FIELD_CLOSE + +*TabDrehung sym:CUI_HID_TRANS_ANGLE +PositionX sym:cui.MetricField.10048.7 +PositionY sym:cui.MetricField.10048.8 +Winkel sym:cui.MetricField.10048.19 +Drehpunkt sym:CUI_HID_TPROTATION_CTRL1 +Drehwinkel sym:CUI_HID_TPROTATION_CTRL2 + +*TabDruckenDraw sym:SD_HID_SD_PRINT_OPTIONS sc:hidspecial:HID_SC_WIN_PREVIEW +Zeichnung sym:sd.CheckBox.549.6 +Notizen sym:sd.CheckBox.549.7 +Handzettel sym:sd.CheckBox.549.8 +Gliederung sym:sd.CheckBox.549.9 +Seitenname sym:sd.CheckBox.549.2 +Datum sym:sd.CheckBox.549.3 +Zeit sym:sd.CheckBox.549.4 +AusgeblendeteSeitenDrucken sym:sd.CheckBox.549.1 +Standard sym:sd.RadioButton.549.1 +AnSeitengroesseAnpassen sym:sd.RadioButton.549.2 +SeitenKacheln sym:sd.RadioButton.549.3 +Prospekt sym:sd.RadioButton.549.4 +Vorderseite sym:sd.CheckBox.549.12 +Rueckseite sym:sd.CheckBox.549.13 +AusDruckereinstellung sym:sd.CheckBox.549.10 StandardAusgabe SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_COLOR Graustufen SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_GRAYSCALE SchwarzWeiss SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_BLACKWHITE -*TabDruckenHTML SW_HID_OPTPRINT_PAGE +*TabDruckenHTML sym:SW_HID_OPTPRINT_PAGE Grafiken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF Kontrollfelder SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD Hintergrund SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND @@ -313,62 +313,62 @@ NurNotizen SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY Dokumentende SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END Seitenende SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND AusDruckereinstellung SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP -LeereSeitenDrucken sw.CheckBox.20826.92 +LeereSeitenDrucken sym:sw.CheckBox.20826.92 Fax SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX -*TabDruckenWriter SW_HID_OPTPRINT_PAGE -Grafiken sw.CheckBox.20826.61 -Kontrollfelder sw.CheckBox.20826.69 -Hintergrund sw.CheckBox.20826.79 -HiddenText sw.CheckBox.20826.93 -TextPlaceholder sw.CheckBox.20826.94 -RightToLeft sw.CheckBox.20826.140 +*TabDruckenWriter sym:SW_HID_OPTPRINT_PAGE +Grafiken sym:sw.CheckBox.20826.61 +Kontrollfelder sym:sw.CheckBox.20826.69 +Hintergrund sym:sw.CheckBox.20826.79 +HiddenText sym:sw.CheckBox.20826.93 +TextPlaceholder sym:sw.CheckBox.20826.94 +RightToLeft sym:sw.CheckBox.20826.140 SchwarzDrucken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT -LinkeSeiten sw.CheckBox.20826.64 -RechteSeiten sw.CheckBox.20826.65 -Prospekt sw.CheckBox.20826.67 -Keine sw.RadioButton.20826.80 -NurNotizen sw.RadioButton.20826.81 -Dokumentende sw.RadioButton.20826.82 -Seitenende sw.RadioButton.20826.83 -AusDruckereinstellung sw.CheckBox.20826.70 -LeereSeitenDrucken sw.CheckBox.20826.92 -Fax sw.ListBox.20826.86 -Zurueck SFX2_HID_TABDLG_RESET_BTN - -*TabDruckenMath starmath.TabPage.20007 -DruckeTitelzeile starmath.CheckBox.20007.11 -DruckeFormeltext starmath.CheckBox.20007.12 -DruckeRahmen starmath.CheckBox.20007.13 -Originalgroesse starmath.RadioButton.20007.21 -DerSeiteAnpassen starmath.RadioButton.20007.22 -Skalierung starmath.RadioButton.20007.23 -Prozent starmath.MetricField.20007.24 -Ignorieren starmath.CheckBox.20007.31 - -*TabDruckerEtiketten SW_HID_LAB_PRT -GanzeSeite sw.RadioButton.22757.1 -EinzelnesEtikett sw.RadioButton.22757.2 -Spalte sw.NumericField.22757.5 -Zeile sw.NumericField.22757.7 -Einrichten sw.PushButton.22757.8 +LinkeSeiten sym:sw.CheckBox.20826.64 +RechteSeiten sym:sw.CheckBox.20826.65 +Prospekt sym:sw.CheckBox.20826.67 +Keine sym:sw.RadioButton.20826.80 +NurNotizen sym:sw.RadioButton.20826.81 +Dokumentende sym:sw.RadioButton.20826.82 +Seitenende sym:sw.RadioButton.20826.83 +AusDruckereinstellung sym:sw.CheckBox.20826.70 +LeereSeitenDrucken sym:sw.CheckBox.20826.92 +Fax sym:sw.ListBox.20826.86 +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN + +*TabDruckenMath sym:starmath.TabPage.20007 +DruckeTitelzeile sym:starmath.CheckBox.20007.11 +DruckeFormeltext sym:starmath.CheckBox.20007.12 +DruckeRahmen sym:starmath.CheckBox.20007.13 +Originalgroesse sym:starmath.RadioButton.20007.21 +DerSeiteAnpassen sym:starmath.RadioButton.20007.22 +Skalierung sym:starmath.RadioButton.20007.23 +Prozent sym:starmath.MetricField.20007.24 +Ignorieren sym:starmath.CheckBox.20007.31 + +*TabDruckerEtiketten sym:SW_HID_LAB_PRT +GanzeSeite sym:sw.RadioButton.22757.1 +EinzelnesEtikett sym:sw.RadioButton.22757.2 +Spalte sym:sw.NumericField.22757.5 +Zeile sym:sw.NumericField.22757.7 +Einrichten sym:sw.PushButton.22757.8 InhaltSynchronisieren SW:CHECKBOX:TP_LAB_PRT:CB_SYNCHRON -NeuesDok SW_HID_LABEL_INSERT -Zurueck SFX2_HID_TABDLG_RESET_BTN - -*TabDruckerBriefumschlag SW_HID_ENV_PRT -Art1 SW_HID_ITM_HOR_LEFT -Art2 SW_HID_ITM_HOR_CNTR -Art3 SW_HID_ITM_HOR_RGHT -Art4 SW_HID_ITM_VER_LEFT -Art5 SW_HID_ITM_VER_CNTR -Art6 SW_HID_ITM_VER_RGHT -VonObenBedrucken sw.RadioButton.22754.7 -VonUntenBedrucken sw.RadioButton.22754.8 -NachRechts sw.MetricField.22754.10 -NachUnten sw.MetricField.22754.12 -Einrichten sw.PushButton.22754.15 -Drucken SW_HID_ENVELOP_PRINT -Zurueck SFX2_HID_TABDLG_RESET_BTN +NeuesDok sym:SW_HID_LABEL_INSERT +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN + +*TabDruckerBriefumschlag sym:SW_HID_ENV_PRT +Art1 sym:SW_HID_ITM_HOR_LEFT +Art2 sym:SW_HID_ITM_HOR_CNTR +Art3 sym:SW_HID_ITM_HOR_RGHT +Art4 sym:SW_HID_ITM_VER_LEFT +Art5 sym:SW_HID_ITM_VER_CNTR +Art6 sym:SW_HID_ITM_VER_RGHT +VonObenBedrucken sym:sw.RadioButton.22754.7 +VonUntenBedrucken sym:sw.RadioButton.22754.8 +NachRechts sym:sw.MetricField.22754.10 +NachUnten sym:sw.MetricField.22754.12 +Einrichten sym:sw.PushButton.22754.15 +Drucken sym:SW_HID_ENVELOP_PRINT +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN diff --git a/testautomation/global/win/tab_e_g.win b/testautomation/global/win/tab_e_g.win index e588dff1e415..6b0e8539cf5f 100644 --- a/testautomation/global/win/tab_e_g.win +++ b/testautomation/global/win/tab_e_g.win @@ -1,112 +1,112 @@ -*TabEigenschaften .uno:InsertObjectFloatingFrame -FrameName cui.Edit.32011.4 -Inhalt cui.Edit.32011.6 -Oeffnen cui.PushButton.32011.7 -An cui.RadioButton.32011.13 -Aus cui.RadioButton.32011.14 -Automatisch cui.RadioButton.32011.15 -UmrandungAn cui.RadioButton.32011.18 -UmrandungAus cui.RadioButton.32011.20 -Breite cui.NumericField.32011.10 -Hoehe cui.NumericField.32011.8 -BreiteStandard cui.CheckBox.32011.22 -HoeheStandard cui.CheckBox.32011.22 +*TabEigenschaften sym:.uno:InsertObjectFloatingFrame +FrameName sym:cui.Edit.32011.4 +Inhalt sym:cui.Edit.32011.6 +Oeffnen sym:cui.PushButton.32011.7 +An sym:cui.RadioButton.32011.13 +Aus sym:cui.RadioButton.32011.14 +Automatisch sym:cui.RadioButton.32011.15 +UmrandungAn sym:cui.RadioButton.32011.18 +UmrandungAus sym:cui.RadioButton.32011.20 +Breite sym:cui.NumericField.32011.10 +Hoehe sym:cui.NumericField.32011.8 +BreiteStandard sym:cui.CheckBox.32011.22 +HoeheStandard sym:cui.CheckBox.32011.22 *TabEingabehilfe SC:TABPAGE:TP_VALIDATION_INPUTHELP EingabehilfenbeiSelektion SC:TRISTATEBOX:TP_VALIDATION_INPUTHELP:TSB_HELP Titel SC:EDIT:TP_VALIDATION_INPUTHELP:EDT_TITLE EingabeHilfe SC:MULTILINEEDIT:TP_VALIDATION_INPUTHELP:EDT_INPUTHELP -*TabEinzuegeUndAbstaende CUI_HID_FORMAT_PARAGRAPH_STD -Automatisch cui.CheckBox.10006.48 -Vonlinks cui.MetricField.10006.11 -ErsteZeile cui.MetricField.10006.13 -VonRechts cui.MetricField.10006.15 -Oben cui.MetricField.10006.21 -Unten cui.MetricField.10006.23 -Zeilenabstand cui.ListBox.10006.40 -Um cui.MetricField.10006.42 +*TabEinzuegeUndAbstaende sym:CUI_HID_FORMAT_PARAGRAPH_STD +Automatisch sym:cui.CheckBox.10006.48 +Vonlinks sym:cui.MetricField.10006.11 +ErsteZeile sym:cui.MetricField.10006.13 +VonRechts sym:cui.MetricField.10006.15 +Oben sym:cui.MetricField.10006.21 +Unten sym:cui.MetricField.10006.23 +Zeilenabstand sym:cui.ListBox.10006.40 +Um sym:cui.MetricField.10006.42 Von cui:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC -Registerhaltigkeit cui.CheckBox.10006.84 +Registerhaltigkeit sym:cui.CheckBox.10006.84 -*TabEndnoten SW_HID_ENDNOTE_OPTIONS -Numerierung sw.ListBox.21013.10 -BeginnBei sw.NumericField.21013.12 -Davor sw.Edit.21013.46 -Dahinter sw.Edit.21013.48 -Absatz sw.ListBox.21013.30 -Seite sw.ListBox.21013.31 -ZeichenvorlageEndnotenbereich sw.ListBox.21013.50 -ZeichenvorlageTextbereich sw.ListBox.21013.53 +*TabEndnoten sym:SW_HID_ENDNOTE_OPTIONS +Numerierung sym:sw.ListBox.21013.10 +BeginnBei sym:sw.NumericField.21013.12 +Davor sym:sw.Edit.21013.46 +Dahinter sym:sw.Edit.21013.48 +Absatz sym:sw.ListBox.21013.30 +Seite sym:sw.ListBox.21013.31 +ZeichenvorlageEndnotenbereich sym:sw.ListBox.21013.50 +ZeichenvorlageTextbereich sym:sw.ListBox.21013.53 -*TabErsetzung CUI_HID_OFAPAGE_AUTOCORR_REPLACE -NurText cui.CheckBox.17003.34 -Kuerzel cui.Edit.17003.31 -ErsetzenDurch cui.Edit.17003.32 -Liste CUI_HID_OFACTL_AUTOCORR_REPLACE -Neu cui.PushButton.17003.35 -Loeschen cui.PushButton.17003.36 -Zurueck SFX2_HID_TABDLG_RESET_BTN -WelcheSprache CUI_HID_AUTOCORR_LANGUAGE +*TabErsetzung sym:CUI_HID_OFAPAGE_AUTOCORR_REPLACE +NurText sym:cui.CheckBox.17003.34 +Kuerzel sym:cui.Edit.17003.31 +ErsetzenDurch sym:cui.Edit.17003.32 +Liste sym:CUI_HID_OFACTL_AUTOCORR_REPLACE +Neu sym:cui.PushButton.17003.35 +Loeschen sym:cui.PushButton.17003.36 +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +WelcheSprache sym:CUI_HID_AUTOCORR_LANGUAGE -*TabEtiketten SW_HID_LAB_LAB -Adresse sw.CheckBox.22755.2 -Aufschrift sw.MultiLineEdit.22755.3 -Anschrift sw.ListBox.22755.5 -Tabelle sw.ListBox.22755.7 -Datenbankfeld sw.ListBox.22755.18 -Uebernehmen sw.ImageButton.22755.19 -Endlos sw.RadioButton.22755.9 -Bogen sw.RadioButton.22755.10 -Marke sw.ListBox.22755.12 -Typ sw.ListBox.22755.14 -NeuesDok SW_HID_LABEL_INSERT -Zurueck SFX2_HID_TABDLG_RESET_BTN +*TabEtiketten sym:SW_HID_LAB_LAB +Adresse sym:sw.CheckBox.22755.2 +Aufschrift sym:sw.MultiLineEdit.22755.3 +Anschrift sym:sw.ListBox.22755.5 +Tabelle sym:sw.ListBox.22755.7 +Datenbankfeld sym:sw.ListBox.22755.18 +Uebernehmen sym:sw.ImageButton.22755.19 +Endlos sym:sw.RadioButton.22755.9 +Bogen sym:sw.RadioButton.22755.10 +Marke sym:sw.ListBox.22755.12 +Typ sym:sw.ListBox.22755.14 +NeuesDok sym:SW_HID_LABEL_INSERT +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN -*TabEtikettenMedium SW_HID_BUSINESS_FMT_PAGE -Endlos SW_HID_BUSINESS_FMT_PAGE_CONT -Bogen SW_HID_BUSINESS_FMT_PAGE_SHEET -Marke SW_HID_BUSINESS_FMT_PAGE_BRAND -Typ SW_HID_BUSINESS_FMT_PAGE_TYPE -NeuesDok SW_HID_LABEL_INSERT -Zurueck SFX2_HID_TABDLG_RESET_BTN +*TabEtikettenMedium sym:SW_HID_BUSINESS_FMT_PAGE +Endlos sym:SW_HID_BUSINESS_FMT_PAGE_CONT +Bogen sym:SW_HID_BUSINESS_FMT_PAGE_SHEET +Marke sym:SW_HID_BUSINESS_FMT_PAGE_BRAND +Typ sym:SW_HID_BUSINESS_FMT_PAGE_TYPE +NeuesDok sym:SW_HID_LABEL_INSERT +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN -*TabFangenEinrasten SD_HID_SD_OPTIONS_SNAP sc:hidspecial:HID_SC_WIN_PREVIEW +*TabFangenEinrasten sym:SD_HID_SD_OPTIONS_SNAP sc:hidspecial:HID_SC_WIN_PREVIEW -*TabFarben CUI_HID_OPTIONS_COLOR -FarbName cui.Edit.10060.1 -Farbe cui.ListBox.10060.1 -Farbmodell cui.ListBox.10060.2 -R CUI_HID_TPCOLOR_RGB_1 -G CUI_HID_TPCOLOR_RGB_2 -B CUI_HID_TPCOLOR_RGB_3 -C CUI_HID_TPCOLOR_CMYK_1 -M CUI_HID_TPCOLOR_CMYK_2 -Y CUI_HID_TPCOLOR_CMYK_3 -K cui.MetricField.10060.4 -Aendern cui.PushButton.10060.3 -Hinzufuegen cui.PushButton.10060.1 -Loeschen cui.PushButton.10060.4 -Oeffnen cui.ImageButton.10060.5 -Speichern cui.ImageButton.10060.6 -Bearbeiten cui.PushButton.10060.2 +*TabFarben sym:CUI_HID_OPTIONS_COLOR +FarbName sym:cui.Edit.10060.1 +Farbe sym:cui.ListBox.10060.1 +Farbmodell sym:cui.ListBox.10060.2 +R sym:CUI_HID_TPCOLOR_RGB_1 +G sym:CUI_HID_TPCOLOR_RGB_2 +B sym:CUI_HID_TPCOLOR_RGB_3 +C sym:CUI_HID_TPCOLOR_CMYK_1 +M sym:CUI_HID_TPCOLOR_CMYK_2 +Y sym:CUI_HID_TPCOLOR_CMYK_3 +K sym:cui.MetricField.10060.4 +Aendern sym:cui.PushButton.10060.3 +Hinzufuegen sym:cui.PushButton.10060.1 +Loeschen sym:cui.PushButton.10060.4 +Oeffnen sym:cui.ImageButton.10060.5 +Speichern sym:cui.ImageButton.10060.6 +Bearbeiten sym:cui.PushButton.10060.2 -*TabFarbverlaeufe CUI_HID_AREA_GRADIENT -Typ cui.ListBox.10059.4 -ZentrumX cui.MetricField.10059.2 -ZentrumY cui.MetricField.10059.3 -Winkel cui.MetricField.10059.1 -Rand cui.MetricField.10059.6 -Von cui.ListBox.10059.1 -Bis cui.ListBox.10059.2 -VonWert cui.MetricField.10059.4 -BisWert cui.MetricField.10059.5 -Tabelle cui.ListBox.10059.3 -Hinzufuegen cui.PushButton.10059.1 -Aendern cui.PushButton.10059.3 -Loeschen cui.PushButton.10059.4 -Oeffnen cui.ImageButton.10059.5 -Speichern cui.ImageButton.10059.6 +*TabFarbverlaeufe sym:CUI_HID_AREA_GRADIENT +Typ sym:cui.ListBox.10059.4 +ZentrumX sym:cui.MetricField.10059.2 +ZentrumY sym:cui.MetricField.10059.3 +Winkel sym:cui.MetricField.10059.1 +Rand sym:cui.MetricField.10059.6 +Von sym:cui.ListBox.10059.1 +Bis sym:cui.ListBox.10059.2 +VonWert sym:cui.MetricField.10059.4 +BisWert sym:cui.MetricField.10059.5 +Tabelle sym:cui.ListBox.10059.3 +Hinzufuegen sym:cui.PushButton.10059.1 +Aendern sym:cui.PushButton.10059.3 +Loeschen sym:cui.PushButton.10059.4 +Oeffnen sym:cui.ImageButton.10059.5 +Speichern sym:cui.ImageButton.10059.6 *TabFehlermeldung SC:TABPAGE:TP_VALIDATION_ERROR FehlermeldungbeiEingabe SC:TRISTATEBOX:TP_VALIDATION_ERROR:TSB_SHOW @@ -115,36 +115,36 @@ Titel SC:EDIT:TP_VALIDATION_ERROR:EDT_TITLE Fehlermeldung SC:MULTILINEEDIT:TP_VALIDATION_ERROR:EDT_ERROR Durchsuchen SC:PUSHBUTTON:TP_VALIDATION_ERROR:BTN_SEARCH -*TabFussEndnoten SW_HID_SECTION_FTNENDNOTES_PAGE -FussnotenAmTextendeSammeln sw.CheckBox.20897.6 -FussnotenNummerNeuStarten sw.CheckBox.20897.7 -FussnotenEigenesFormat sw.CheckBox.20897.11 -FussnotenNummerierung sw.ListBox.20897.37 -FussnotenBeginn sw.NumericField.20897.24 -FussnotenDavor sw.Edit.20897.17 -FussnotenDahinter sw.Edit.20897.18 -EndnotenAmBereichsendeSammeln sw.CheckBox.20897.3 -EndnotenNummerNeuStarten sw.CheckBox.20897.4 -EndnotenEigenesFormat sw.CheckBox.20897.12 -EndnotenNumerierung sw.ListBox.20897.36 -EndnotenBeginn sw.NumericField.20897.23 -EndnotenDavor sw.Edit.20897.14 -EndnotenDahinter sw.Edit.20897.15 +*TabFussEndnoten sym:SW_HID_SECTION_FTNENDNOTES_PAGE +FussnotenAmTextendeSammeln sym:sw.CheckBox.20897.6 +FussnotenNummerNeuStarten sym:sw.CheckBox.20897.7 +FussnotenEigenesFormat sym:sw.CheckBox.20897.11 +FussnotenNummerierung sym:sw.ListBox.20897.37 +FussnotenBeginn sym:sw.NumericField.20897.24 +FussnotenDavor sym:sw.Edit.20897.17 +FussnotenDahinter sym:sw.Edit.20897.18 +EndnotenAmBereichsendeSammeln sym:sw.CheckBox.20897.3 +EndnotenNummerNeuStarten sym:sw.CheckBox.20897.4 +EndnotenEigenesFormat sym:sw.CheckBox.20897.12 +EndnotenNumerierung sym:sw.ListBox.20897.36 +EndnotenBeginn sym:sw.NumericField.20897.23 +EndnotenDavor sym:sw.Edit.20897.14 +EndnotenDahinter sym:sw.Edit.20897.15 -*TabFormatEtiketten SW_HID_LAB_FMT -HAbstand sw.MetricField.22756.3 -VAbstand sw.MetricField.22756.5 -Breite sw.MetricField.22756.7 -Hoehe sw.MetricField.22756.9 -RandLinks sw.MetricField.22756.11 -RandRechts sw.MetricField.22756.13 -Spalten sw.NumericField.22756.15 -Zeilen sw.NumericField.22756.17 -NeuesDok SW_HID_LABEL_INSERT -Zurueck SFX2_HID_TABDLG_RESET_BTN -FormatSpeichern sw.PushButton.22756.19 +*TabFormatEtiketten sym:SW_HID_LAB_FMT +HAbstand sym:sw.MetricField.22756.3 +VAbstand sym:sw.MetricField.22756.5 +Breite sym:sw.MetricField.22756.7 +Hoehe sym:sw.MetricField.22756.9 +RandLinks sym:sw.MetricField.22756.11 +RandRechts sym:sw.MetricField.22756.13 +Spalten sym:sw.NumericField.22756.15 +Zeilen sym:sw.NumericField.22756.17 +NeuesDok sym:SW_HID_LABEL_INSERT +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +FormatSpeichern sym:sw.PushButton.22756.19 -*TabFunktionen SW_HID_FLD_FUNC +*TabFunktionen sym:SW_HID_FLD_FUNC Feldtyp SW:LISTBOX:TP_FLD_FUNC:LB_FUNCTYPE Formatliste SW:LISTBOX:TP_FLD_FUNC:LB_FUNCFORMAT Auswahl SW:LISTBOX:TP_FLD_FUNC:LB_FUNCSELECTION @@ -158,29 +158,29 @@ Makroname SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME Platzhalter SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME Texteinfuegen SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE Wert SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE -Einfuegen SW_HID_FIELD_INSERT -Schliessen SW_HID_FIELD_CLOSE -AddListEntry sw.PushButton.20868.82 -NewListEntry sw.Edit.20868.81 -EntrysList sw.ListBox.20868.84 -RemoveEntry sw.PushButton.20868.85 -MoveUpEntry sw.PushButton.20868.86 -MoveDownEntry sw.PushButton.20868.87 -EntryName sw.Edit.20868.89 +Einfuegen sym:SW_HID_FIELD_INSERT +Schliessen sym:SW_HID_FIELD_CLOSE +AddListEntry sym:sw.PushButton.20868.82 +NewListEntry sym:sw.Edit.20868.81 +EntrysList sym:sw.ListBox.20868.84 +RemoveEntry sym:sw.PushButton.20868.85 +MoveUpEntry sym:sw.PushButton.20868.86 +MoveDownEntry sym:sw.PushButton.20868.87 +EntryName sym:sw.Edit.20868.89 -*TabFussnote SW_HID_FOOTNOTE_PAGE -HoeheWieSeite sw.RadioButton.20818.1 -HoeheFussnoteOption sw.RadioButton.20818.2 -HoeheFussnote sw.MetricField.20818.3 -AbstandTextkoerper sw.MetricField.20818.5 -Position sw.ListBox.20818.23 -Art sw.ListBox.20818.21 -Breite sw.MetricField.20818.25 -Abstand sw.MetricField.20818.27 +*TabFussnote sym:SW_HID_FOOTNOTE_PAGE +HoeheWieSeite sym:sw.RadioButton.20818.1 +HoeheFussnoteOption sym:sw.RadioButton.20818.2 +HoeheFussnote sym:sw.MetricField.20818.3 +AbstandTextkoerper sym:sw.MetricField.20818.5 +Position sym:sw.ListBox.20818.23 +Art sym:sw.ListBox.20818.21 +Breite sym:sw.MetricField.20818.25 +Abstand sym:sw.MetricField.20818.27 -*TabFussnoten SW_HID_FOOTNOTE_OPTIONS +*TabFussnoten sym:SW_HID_FOOTNOTE_OPTIONS Numerierung SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMVIEW Pro SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMCOUNT BeginnBei SW:NUMERICFIELD:TP_FOOTNOTEOPTION:FLD_OFFSET @@ -192,111 +192,111 @@ Seitenende SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_PAGE Dokumentende SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_CHAPTER Davor SW:EDIT:TP_FOOTNOTEOPTION:ED_PREFIX Dahinter SW:EDIT:TP_FOOTNOTEOPTION:ED_SUFFIX -ZeichenvorlageTextbereich sw.ListBox.21012.53 -ZeichenvorlageFussnotenbereich sw.ListBox.21012.50 +ZeichenvorlageTextbereich sym:sw.ListBox.21012.53 +ZeichenvorlageFussnotenbereich sym:sw.ListBox.21012.50 -*TabFusszeile SVX_HID_FORMAT_FOOTER -FusszeileMitAbstand svx.CheckBox.10026.10 svx:CheckBox:RID_SVXPAGE_FOOTER:CB_FOOTER -Abstand svx.MetricField.10026.12 -Hoehe svx.MetricField.10026.14 +*TabFusszeile sym:SVX_HID_FORMAT_FOOTER +FusszeileMitAbstand sym:svx.CheckBox.10026.10 svx:CheckBox:RID_SVXPAGE_FOOTER:CB_FOOTER +Abstand sym:svx.MetricField.10026.12 +Hoehe sym:svx.MetricField.10026.14 Hoehedynamisch SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN -RechterRandFusszeile svx.MetricField.10026.19 -LinkerRandFusszeile svx.MetricField.10026.17 -InhaltLinksRechtsGleich svx.CheckBox.10026.20 -Zusaetze svx.PushButton.10026.40 svx:PushButton:RID_SVXPAGE_FOOTER:PB_BACKGROUND -Bearbeiten SC_HID_SC_FOOTER_EDIT +RechterRandFusszeile sym:svx.MetricField.10026.19 +LinkerRandFusszeile sym:svx.MetricField.10026.17 +InhaltLinksRechtsGleich sym:svx.CheckBox.10026.20 +Zusaetze sym:svx.PushButton.10026.40 svx:PushButton:RID_SVXPAGE_FOOTER:PB_BACKGROUND +Bearbeiten sym:SC_HID_SC_FOOTER_EDIT -*TabFusszeileCalc SC_HID_SCPAGE_HFED_FR -LinkerBereich SC_HID_SC_HF_FRL -MittlererBereich SC_HID_SC_HF_FRC -RechterBereich SC_HID_SC_HF_FRR -PredefinedFooter SC_HID_SC_HF_FR_DEFINED -TextAttribute SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT -Datei SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE -Tabelle SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE -Seitennummer SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE -Seitenanzahl SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES -Datum SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE -Zeit SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME -Hoehedynamisch svx.CheckBox.10026.15 +*TabFusszeileCalc sym:SC_HID_SCPAGE_HFED_FR +LinkerBereich sym:SC_HID_SC_HF_FRL +MittlererBereich sym:SC_HID_SC_HF_FRC +RechterBereich sym:SC_HID_SC_HF_FRR +PredefinedFooter sym:SC_HID_SC_HF_FR_DEFINED +TextAttribute sym:SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT +Datei sym:SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE +Tabelle sym:SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE +Seitennummer sym:SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE +Seitenanzahl sym:SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES +Datum sym:SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE +Zeit sym:SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME +Hoehedynamisch sym:svx.CheckBox.10026.15 -*TabFusszeileCalcLinks SC_HID_SCPAGE_HFED_FL -LinkerBereich SC_HID_SC_HF_FLL -MittlererBereich SC_HID_SC_HF_FLC -RechterBereich SC_HID_SC_HF_FLR -PredefinedFooterLeft SC_HID_SC_HF_FL_DEFINED -TextAttribute SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT -Datei SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE -Tabelle SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE -Seitennummer SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE -Seitenanzahl SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES -Datum SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE -Zeit SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME +*TabFusszeileCalcLinks sym:SC_HID_SCPAGE_HFED_FL +LinkerBereich sym:SC_HID_SC_HF_FLL +MittlererBereich sym:SC_HID_SC_HF_FLC +RechterBereich sym:SC_HID_SC_HF_FLR +PredefinedFooterLeft sym:SC_HID_SC_HF_FL_DEFINED +TextAttribute sym:SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT +Datei sym:SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE +Tabelle sym:SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE +Seitennummer sym:SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE +Seitenanzahl sym:SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES +Datum sym:SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE +Zeit sym:SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME -*TabGeschaeft SW_HID_TP_BUSINESS_DATA -Firma sw.Edit.20896.55 -Firma2 sw.Edit.20896.57 -Slogan sw.Edit.20896.59 -Strasse sw.Edit.20896.36 -PLZ sw.Edit.20896.38 -Ort sw.Edit.20896.39 -Land sw.Edit.20896.41 -Bundesland sw.Edit.20896.53 -Position sw.Edit.20896.61 -Telefon sw.Edit.20896.46 -Handy sw.Edit.20896.47 -Fax sw.Edit.20896.49 -Homepage sw.Edit.20896.51 -Email sw.Edit.20896.52 +*TabGeschaeft sym:SW_HID_TP_BUSINESS_DATA +Firma sym:sw.Edit.20896.55 +Firma2 sym:sw.Edit.20896.57 +Slogan sym:sw.Edit.20896.59 +Strasse sym:sw.Edit.20896.36 +PLZ sym:sw.Edit.20896.38 +Ort sym:sw.Edit.20896.39 +Land sym:sw.Edit.20896.41 +Bundesland sym:sw.Edit.20896.53 +Position sym:sw.Edit.20896.61 +Telefon sym:sw.Edit.20896.46 +Handy sym:sw.Edit.20896.47 +Fax sym:sw.Edit.20896.49 +Homepage sym:sw.Edit.20896.51 +Email sym:sw.Edit.20896.52 -*TabGrafik SW_HID_GRF_EXT -Vertikal sw.CheckBox.20835.47 -Horizontal sw.CheckBox.20835.46 -AufAllenSeiten sw.RadioButton.20835.64 -JedeLinkeSeite sw.RadioButton.20835.65 -JedeRechteSeite sw.RadioButton.20835.66 -Dateiname sw.Edit.20835.54 -Durchsuchen sw.PushButton.20835.53 +*TabGrafik sym:SW_HID_GRF_EXT +Vertikal sym:sw.CheckBox.20835.47 +Horizontal sym:sw.CheckBox.20835.46 +AufAllenSeiten sym:sw.RadioButton.20835.64 +JedeLinkeSeite sym:sw.RadioButton.20835.65 +JedeRechteSeite sym:sw.RadioButton.20835.66 +Dateiname sym:sw.Edit.20835.54 +Durchsuchen sym:sw.PushButton.20835.53 -*TabGrafiken CUI_HID_SVXPAGE_PICK_BMP -Auswahl CUI_HID_VALUESET_NUMBMP -Optionen SW_HID_NUM_FORMAT_BTN -Zurueck SFX2_HID_TABDLG_RESET_BTN -LinkGraphics cui.CheckBox.10218.224 +*TabGrafiken sym:CUI_HID_SVXPAGE_PICK_BMP +Auswahl sym:CUI_HID_VALUESET_NUMBMP +Optionen sym:SW_HID_NUM_FORMAT_BTN +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +LinkGraphics sym:cui.CheckBox.10218.224 -*TabGrundfarben CUI_HID_OPTIONS_CHART_DEFCOLORS -Farbliste cui.ListBox.10299.2 -Standard cui.PushButton.10299.5 +*TabGrundfarben sym:CUI_HID_OPTIONS_CHART_DEFCOLORS +Farbliste sym:cui.ListBox.10299.2 +Standard sym:cui.PushButton.10299.5 -*TabGrundschriften SW_HID_STD_FONT -StandardSchrift sw.ComboBox.20847.91 -Ueberschrift sw.ComboBox.20847.93 -Liste sw.ComboBox.20847.95 -Beschriftung sw.ComboBox.20847.97 -Verzeichnis sw.ComboBox.20847.99 -AktuellesDokument sw.CheckBox.20847.102 -Standard sw.PushButton.20847.101 -StandardSchriftGroesse sw.MetricBox.20847.108 -UeberschriftGroesse sw.MetricBox.20847.109 -ListeGroesse sw.MetricBox.20847.110 -BeschriftungGroesse sw.MetricBox.20847.111 -VerzeichnisGroesse sw.MetricBox.20847.112 +*TabGrundschriften sym:SW_HID_STD_FONT +StandardSchrift sym:sw.ComboBox.20847.91 +Ueberschrift sym:sw.ComboBox.20847.93 +Liste sym:sw.ComboBox.20847.95 +Beschriftung sym:sw.ComboBox.20847.97 +Verzeichnis sym:sw.ComboBox.20847.99 +AktuellesDokument sym:sw.CheckBox.20847.102 +Standard sym:sw.PushButton.20847.101 +StandardSchriftGroesse sym:sw.MetricBox.20847.108 +UeberschriftGroesse sym:sw.MetricBox.20847.109 +ListeGroesse sym:sw.MetricBox.20847.110 +BeschriftungGroesse sym:sw.MetricBox.20847.111 +VerzeichnisGroesse sym:sw.MetricBox.20847.112 +TabGrundschriftenAsian TabGrundschriften +TabGrundschriftenCTL TabGrundschriften -*TabGruppe1 SC_HID_SCPAGE_SUBT_GROUP1 -GruppierenNach SC_HID_SC_SUBT_GROUP -Teilergebnisse SC_HID_SC_SUBT_COLS -Berechnungsvorschrift SC_HID_SC_SUBT_FUNC +*TabGruppe1 sym:SC_HID_SCPAGE_SUBT_GROUP1 +GruppierenNach sym:SC_HID_SC_SUBT_GROUP +Teilergebnisse sym:SC_HID_SC_SUBT_COLS +Berechnungsvorschrift sym:SC_HID_SC_SUBT_FUNC -*TabGruppe2 SC_HID_SCPAGE_SUBT_GROUP2 -GruppierenNach SC_HID_SC_SUBT_GROUP -Teilergebnisse SC_HID_SC_SUBT_COLS -Berechnungsvorschrift SC_HID_SC_SUBT_FUNC +*TabGruppe2 sym:SC_HID_SCPAGE_SUBT_GROUP2 +GruppierenNach sym:SC_HID_SC_SUBT_GROUP +Teilergebnisse sym:SC_HID_SC_SUBT_COLS +Berechnungsvorschrift sym:SC_HID_SC_SUBT_FUNC -*TabGruppe3 SC_HID_SCPAGE_SUBT_GROUP3 -GruppierenNach SC_HID_SC_SUBT_GROUP -Teilergebnisse SC_HID_SC_SUBT_COLS -Berechnungsvorschrift SC_HID_SC_SUBT_FUNC +*TabGruppe3 sym:SC_HID_SCPAGE_SUBT_GROUP3 +GruppierenNach sym:SC_HID_SC_SUBT_GROUP +Teilergebnisse sym:SC_HID_SC_SUBT_COLS +Berechnungsvorschrift sym:SC_HID_SC_SUBT_FUNC diff --git a/testautomation/global/win/tab_h_o.win b/testautomation/global/win/tab_h_o.win index 561e6f2f53c3..b6cc052bb7de 100644 --- a/testautomation/global/win/tab_h_o.win +++ b/testautomation/global/win/tab_h_o.win @@ -1,122 +1,122 @@ -*TabHintergrund CUI_HID_BACKGROUND -Als cui.ListBox.10001.1 -Fuer cui.ListBox.10001.32 +*TabHintergrund sym:CUI_HID_BACKGROUND +Als sym:cui.ListBox.10001.1 +Fuer sym:cui.ListBox.10001.32 FuerAbsatz cui:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX -Hintergrundfarbe CUI_HID_BACKGROUND_CTL_BGDCOLORSET -Verknuepfen cui.CheckBox.10001.22 -Vorschau cui.CheckBox.10001.23 -Durchsuchen cui.PushButton.10001.20 -Position cui.RadioButton.10001.27 -Flaeche cui.RadioButton.10001.25 -Kachel cui.RadioButton.10001.26 -ArtPosition CUI_HID_BACKGROUND_CTL_POSITION -'ArtPosition cui.RadioButton.10001.27 +Hintergrundfarbe sym:CUI_HID_BACKGROUND_CTL_BGDCOLORSET +Verknuepfen sym:cui.CheckBox.10001.22 +Vorschau sym:cui.CheckBox.10001.23 +Durchsuchen sym:cui.PushButton.10001.20 +Position sym:cui.RadioButton.10001.27 +Flaeche sym:cui.RadioButton.10001.25 +Kachel sym:cui.RadioButton.10001.26 +ArtPosition sym:CUI_HID_BACKGROUND_CTL_POSITION +'ArtPosition sym:cui.RadioButton.10001.27 'Muster HID_BACKGROUND_CTL_PATTERNSET 'Musterfarbe HID_BACKGROUND_CTL_PATCOLORSET -*TabHTML cui.TabPage.17000 -Groesse1 cui.NumericField.17000.3 -Groesse2 cui.NumericField.17000.5 -Groesse3 cui.NumericField.17000.7 -Groesse4 cui.NumericField.17000.9 -Groesse5 cui.NumericField.17000.11 -Groesse6 cui.NumericField.17000.13 -Groesse7 cui.NumericField.17000.15 -UnbekannteHTML cui.CheckBox.17000.21 -FontEinstellungen cui.CheckBox.17000.22 +*TabHTML sym:cui.TabPage.17000 +Groesse1 sym:cui.NumericField.17000.3 +Groesse2 sym:cui.NumericField.17000.5 +Groesse3 sym:cui.NumericField.17000.7 +Groesse4 sym:cui.NumericField.17000.9 +Groesse5 sym:cui.NumericField.17000.11 +Groesse6 sym:cui.NumericField.17000.13 +Groesse7 sym:cui.NumericField.17000.15 +UnbekannteHTML sym:cui.CheckBox.17000.21 +FontEinstellungen sym:cui.CheckBox.17000.22 Export cui:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT -StarBasic cui.CheckBox.17000.31 -Grafikenkopieren cui.CheckBox.17000.37 +StarBasic sym:cui.CheckBox.17000.31 +Grafikenkopieren sym:cui.CheckBox.17000.37 Drucklayout cui:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION -WarnungAnzeigen cui.CheckBox.17000.32 -Zeichensatz cui.ListBox.17000.41 -UseEnglishLocaleForNumbers cui.CheckBox.17000.23 - -*TabHyperlinkRahmen SW_HID_FRM_URL -URL sw.Edit.20842.59 -Durchsuchen sw.PushButton.20842.103 -NameText sw.Edit.20842.111 -Frame sw.ComboBox.20842.96 -Server sw.CheckBox.20842.98 -Client sw.CheckBox.20842.99 - -*TabHyperlinkZeichen SW_HID_CHAR_URL -URLName sw.Edit.20843.52 -Durchsuchen sw.PushButton.20843.60 -Ereignisse sw.PushButton.20843.59 -Hinweis sw.Edit.20843.64 -Targetframe sw.ComboBox.20843.61 -BesuchterLink sw.ListBox.20843.56 -UnbesuchterLink sw.ListBox.20843.58 -NameText sw.Edit.20843.66 -Zurueck SFX2_HID_TABDLG_RESET_BTN - -*Hyperlink CUI_HID_HYPERLINK_INTERNET -Auswahl CUI_HID_ICCDIALOG_CHOICECTRL -Zurueck CUI_HID_ICCDIALOG_RESET_BTN -Uebernehmen CUI_HID_ICCDIALOG_OK_BTN +WarnungAnzeigen sym:cui.CheckBox.17000.32 +Zeichensatz sym:cui.ListBox.17000.41 +UseEnglishLocaleForNumbers sym:cui.CheckBox.17000.23 + +*TabHyperlinkRahmen sym:SW_HID_FRM_URL +URL sym:sw.Edit.20842.59 +Durchsuchen sym:sw.PushButton.20842.103 +NameText sym:sw.Edit.20842.111 +Frame sym:sw.ComboBox.20842.96 +Server sym:sw.CheckBox.20842.98 +Client sym:sw.CheckBox.20842.99 + +*TabHyperlinkZeichen sym:SW_HID_CHAR_URL +URLName sym:sw.Edit.20843.52 +Durchsuchen sym:sw.PushButton.20843.60 +Ereignisse sym:sw.PushButton.20843.59 +Hinweis sym:sw.Edit.20843.64 +Targetframe sym:sw.ComboBox.20843.61 +BesuchterLink sym:sw.ListBox.20843.56 +UnbesuchterLink sym:sw.ListBox.20843.58 +NameText sym:sw.Edit.20843.66 +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN + +*Hyperlink sym:CUI_HID_HYPERLINK_INTERNET +Auswahl sym:CUI_HID_ICCDIALOG_CHOICECTRL +Zurueck sym:CUI_HID_ICCDIALOG_RESET_BTN +Uebernehmen sym:CUI_HID_ICCDIALOG_OK_BTN +TabHyperlinkInternet Hyperlink -Internet cui.RadioButton.10228.2 -FTP cui.RadioButton.10228.3 -Telnet cui.RadioButton.10228.4 -ZielUrl CUI_HID_HYPERDLG_INET_PATH -Frame cui.ComboBox.10228.32 -Form cui.ListBox.10228.34 -Hinweis cui.Edit.10228.36 -NameText cui.Edit.10228.38 -Ereignisse cui.ImageButton.10228.39 -Loginname cui.Edit.10228.8 -Passwort cui.Edit.10228.10 -AnonymerBenutzer cui.CheckBox.10228.11 -WWWBrowser cui.ImageButton.10228.12 -Target cui.ImageButton.10228.13 - -*TabHyperlinkMailUndNews CUI_HID_HYPERLINK_MAIL -EMail cui.RadioButton.10229.2 -News cui.RadioButton.10229.3 -Receiver CUI_HID_HYPERDLG_MAIL_PATH -Betreff cui.Edit.10229.7 -Adressbuch cui.ImageButton.10229.8 -Frame cui.ComboBox.10229.32 -Form cui.ListBox.10229.34 -Hinweis cui.Edit.10229.36 -NameText cui.Edit.10229.38 -Ereignisse cui.ImageButton.10229.39 -Auswahl CUI_HID_ICCDIALOG_CHOICECTRL -Zurueck CUI_HID_ICCDIALOG_RESET_BTN -Uebernehmen CUI_HID_ICCDIALOG_OK_BTN - -*TabHyperlinkDokument CUI_HID_HYPERLINK_DOCUMENT -Path CUI_HID_HYPERDLG_DOC_PATH -DateiOeffnen cui.ImageButton.10230.4 -Ziel cui.Edit.10230.7 -Target cui.ImageButton.10230.12 -Frame cui.ComboBox.10230.32 -Form cui.ListBox.10230.34 -Hinweis cui.Edit.10230.36 -NameText cui.Edit.10230.38 -Ereignisse cui.ImageButton.10230.39 -Auswahl CUI_HID_ICCDIALOG_CHOICECTRL -Zurueck CUI_HID_ICCDIALOG_RESET_BTN -Uebernehmen CUI_HID_ICCDIALOG_OK_BTN - -*TabHyperlinkNeuesDokument CUI_HID_HYPERLINK_NEWDOCUMENT -SofortBearbeiten cui.RadioButton.10231.2 -SpaeterBearbeiten cui.RadioButton.10231.3 -Datei cui.Edit.10231.5 -Dateityp cui.ListBox.10231.7 -Pfad cui.ImageButton.10231.8 -Frame cui.ComboBox.10231.32 -Form cui.ListBox.10231.34 -Hinweis cui.Edit.10231.36 -NameText cui.Edit.10231.38 -Ereignisse cui.ImageButton.10231.39 -Auswahl CUI_HID_ICCDIALOG_CHOICECTRL -Zurueck CUI_HID_ICCDIALOG_RESET_BTN -Uebernehmen CUI_HID_ICCDIALOG_OK_BTN - -*TabInhaltCalc SC_HID_SCPAGE_CONTENT +Internet sym:cui.RadioButton.10228.2 +FTP sym:cui.RadioButton.10228.3 +Telnet sym:cui.RadioButton.10228.4 +ZielUrl sym:CUI_HID_HYPERDLG_INET_PATH +Frame sym:cui.ComboBox.10228.32 +Form sym:cui.ListBox.10228.34 +Hinweis sym:cui.Edit.10228.36 +NameText sym:cui.Edit.10228.38 +Ereignisse sym:cui.ImageButton.10228.39 +Loginname sym:cui.Edit.10228.8 +Passwort sym:cui.Edit.10228.10 +AnonymerBenutzer sym:cui.CheckBox.10228.11 +WWWBrowser sym:cui.ImageButton.10228.12 +Target sym:cui.ImageButton.10228.13 + +*TabHyperlinkMailUndNews sym:CUI_HID_HYPERLINK_MAIL +EMail sym:cui.RadioButton.10229.2 +News sym:cui.RadioButton.10229.3 +Receiver sym:CUI_HID_HYPERDLG_MAIL_PATH +Betreff sym:cui.Edit.10229.7 +Adressbuch sym:cui.ImageButton.10229.8 +Frame sym:cui.ComboBox.10229.32 +Form sym:cui.ListBox.10229.34 +Hinweis sym:cui.Edit.10229.36 +NameText sym:cui.Edit.10229.38 +Ereignisse sym:cui.ImageButton.10229.39 +Auswahl sym:CUI_HID_ICCDIALOG_CHOICECTRL +Zurueck sym:CUI_HID_ICCDIALOG_RESET_BTN +Uebernehmen sym:CUI_HID_ICCDIALOG_OK_BTN + +*TabHyperlinkDokument sym:CUI_HID_HYPERLINK_DOCUMENT +Path sym:CUI_HID_HYPERDLG_DOC_PATH +DateiOeffnen sym:cui.ImageButton.10230.4 +Ziel sym:cui.Edit.10230.7 +Target sym:cui.ImageButton.10230.12 +Frame sym:cui.ComboBox.10230.32 +Form sym:cui.ListBox.10230.34 +Hinweis sym:cui.Edit.10230.36 +NameText sym:cui.Edit.10230.38 +Ereignisse sym:cui.ImageButton.10230.39 +Auswahl sym:CUI_HID_ICCDIALOG_CHOICECTRL +Zurueck sym:CUI_HID_ICCDIALOG_RESET_BTN +Uebernehmen sym:CUI_HID_ICCDIALOG_OK_BTN + +*TabHyperlinkNeuesDokument sym:CUI_HID_HYPERLINK_NEWDOCUMENT +SofortBearbeiten sym:cui.RadioButton.10231.2 +SpaeterBearbeiten sym:cui.RadioButton.10231.3 +Datei sym:cui.Edit.10231.5 +Dateityp sym:cui.ListBox.10231.7 +Pfad sym:cui.ImageButton.10231.8 +Frame sym:cui.ComboBox.10231.32 +Form sym:cui.ListBox.10231.34 +Hinweis sym:cui.Edit.10231.36 +NameText sym:cui.Edit.10231.38 +Ereignisse sym:cui.ImageButton.10231.39 +Auswahl sym:CUI_HID_ICCDIALOG_CHOICECTRL +Zurueck sym:CUI_HID_ICCDIALOG_RESET_BTN +Uebernehmen sym:CUI_HID_ICCDIALOG_OK_BTN + +*TabInhaltCalc sym:SC_HID_SCPAGE_CONTENT Formeln SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_FORMULA Nullwerte SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_NIL Notizanzeiger SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_ANNOT @@ -139,81 +139,81 @@ Tabellenregister SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_TBLREG Gliederungssymbole SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_OUTLINE Referenzenfarbig SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_RFIND -*TabInhalteDraw SD_HID_SD_OPTIONS_CONTENTS SD_HID_SD_OPTIONS_SNAP -LinealeSichtbar sd.CheckBox.597.14 -HilfslinienBeimBewegen sd.CheckBox.597.1 -KontrolpunkteImBezierEditor sd.CheckBox.597.2 -KonturFuerIndividuelleObjekte sd.CheckBox.597.15 +*TabInhalteDraw sym:SD_HID_SD_OPTIONS_CONTENTS sym:SD_HID_SD_OPTIONS_SNAP +LinealeSichtbar sym:sd.CheckBox.597.14 +HilfslinienBeimBewegen sym:sd.CheckBox.597.1 +KontrolpunkteImBezierEditor sym:sd.CheckBox.597.2 +KonturFuerIndividuelleObjekte sym:sd.CheckBox.597.15 -*TabInhalteHTML SW_HID_CONTENT_OPT +*TabInhalteHTML sym:SW_HID_CONTENT_OPT GrafikenUndObjekte SW:CHECKBOX:TP_CONTENT_OPT:CB_GRF Tabellen SW:CHECKBOX:TP_CONTENT_OPT:CB_TBL Zeichnungen SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST Feldnamen SW:CHECKBOX:TP_CONTENT_OPT:CB_FIELD Notizen SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT -Hilfslinien sw.CheckBox.20845.14 +Hilfslinien sym:sw.CheckBox.20845.14 FarbigeHandles SW:CHECKBOX:TP_CONTENT_OPT:CB_HANDLE GrosseHandles SW:CHECKBOX:TP_CONTENT_OPT:CB_BIGHANDLE -HorizontaleBildlaufleiste sw.CheckBox.20845.15 +HorizontaleBildlaufleiste sym:sw.CheckBox.20845.15 VertikaleBildlaufleiste SW:CHECKBOX:TP_CONTENT_OPT:CB_VSCROLL -HorizontalesLineal sw.CheckBox.20845.17 -VertikalesLineal sw.CheckBox.20845.18 -RechtsAusgerichtet sw.CheckBox.20845.24 +HorizontalesLineal sym:sw.CheckBox.20845.17 +VertikalesLineal sym:sw.CheckBox.20845.18 +RechtsAusgerichtet sym:sw.CheckBox.20845.24 WeichesScrollen SW:CHECKBOX:TP_CONTENT_OPT:CB_SMOOTH_SCROLL -Lineal sw.CheckBox.20845.12 -HorizontalesLinealMasseinheit sw.ListBox.20845.88 -VertikalesLinealMasseinheit sw.ListBox.20845.89 -Masseinheit sw.ListBox.20845.27 +Lineal sym:sw.CheckBox.20845.12 +HorizontalesLinealMasseinheit sym:sw.ListBox.20845.88 +VertikalesLinealMasseinheit sym:sw.ListBox.20845.89 +Masseinheit sym:sw.ListBox.20845.27 -*TabInhalteWriter SW_HID_CONTENT_OPT +*TabInhalteWriter sym:SW_HID_CONTENT_OPT GrafikenUndObjekte SW:CHECKBOX:TP_CONTENT_OPT:CB_GRF Tabellen SW:CHECKBOX:TP_CONTENT_OPT:CB_TBL Zeichnungen SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST Feldname SW:CHECKBOX:TP_CONTENT_OPT:CB_FIELD Notizen SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT -Hilfslinien sw.CheckBox.20845.14 +Hilfslinien sym:sw.CheckBox.20845.14 FarbigeHandles SW:CHECKBOX:TP_CONTENT_OPT:CB_HANDLE GrosseHandles SW:CHECKBOX:TP_CONTENT_OPT:CB_BIGHANDLE -HorizontaleBildlaufleiste sw.CheckBox.20845.15 +HorizontaleBildlaufleiste sym:sw.CheckBox.20845.15 VertikaleBildlaufleiste SW:CHECKBOX:TP_CONTENT_OPT:CB_VSCROLL -HorizontalesLineal sw.CheckBox.20845.17 -VertikalesLineal sw.CheckBox.20845.18 -RechtsAusgerichtet sw.CheckBox.20845.24 +HorizontalesLineal sym:sw.CheckBox.20845.17 +VertikalesLineal sym:sw.CheckBox.20845.18 +RechtsAusgerichtet sym:sw.CheckBox.20845.24 WeichesScrollen SW:CHECKBOX:TP_CONTENT_OPT:CB_SMOOTH_SCROLL -Lineal sw.CheckBox.20845.12 -HorizontalesLinealMasseinheit sw.ListBox.20845.88 -VertikalesLinealMasseinheit sw.ListBox.20845.89 - -*TabInitialen SW_HID_DROPCAPS -Anzeigen sw.CheckBox.20810.13 -Anzahl sw.NumericField.20810.2 -AbstandZumText sw.MetricField.20810.6 -Zeilen sw.NumericField.20810.4 -Initialentext sw.Edit.20810.9 -Zeichenvorlage sw.ListBox.20810.11 -GanzesWort sw.CheckBox.20810.16 - -*TabInteraktion .uno:AnimationEffects -AktionBeiMausklick sd.ListBox.787.3 -ListeSprungZuDokument SD_HID_CTL_ACTION_DLG_2 -ListeSprungZuSeiteObjekt SD_HID_CTL_ACTION_DLG_1 -ListeObjektAktion sd.ListBox.787.4 -Durchsuchen sd.PushButton.787.1 -Suchen sd.PushButton.787.2 -Effekt sd.ListBox.787.4 +Lineal sym:sw.CheckBox.20845.12 +HorizontalesLinealMasseinheit sym:sw.ListBox.20845.88 +VertikalesLinealMasseinheit sym:sw.ListBox.20845.89 + +*TabInitialen sym:SW_HID_DROPCAPS +Anzeigen sym:sw.CheckBox.20810.13 +Anzahl sym:sw.NumericField.20810.2 +AbstandZumText sym:sw.MetricField.20810.6 +Zeilen sym:sw.NumericField.20810.4 +Initialentext sym:sw.Edit.20810.9 +Zeichenvorlage sym:sw.ListBox.20810.11 +GanzesWort sym:sw.CheckBox.20810.16 + +*TabInteraktion sym:.uno:AnimationEffects +AktionBeiMausklick sym:sd.ListBox.787.3 +ListeSprungZuDokument sym:SD_HID_CTL_ACTION_DLG_2 +ListeSprungZuSeiteObjekt sym:SD_HID_CTL_ACTION_DLG_1 +ListeObjektAktion sym:sd.ListBox.787.4 +Durchsuchen sym:sd.PushButton.787.1 +Suchen sym:sd.PushButton.787.2 +Effekt sym:sd.ListBox.787.4 'Effekt sd:ListBox:TP_ANIMATION:LB_EFFECT 'Langsam sd:RadioButton:TP_ANIMATION:RBT_SLOW 'Schnell sd:RadioButton:TP_ANIMATION:RBT_MEDIUM 'Mittel sd:RadioButton:TP_ANIMATION:RBT_FAST 'KlangbeiObjektausblenden sd:TriStateBox:TP_ANIMATION:TSB_SOUND -Seite sd.Edit.787.2 -Dokument sd.Edit.787.3 -Objekt sd.Edit.787.4 -Makro sd.Edit.787.5 -KlangWahl sd.Edit.787.1 +Seite sym:sd.Edit.787.2 +Dokument sym:sd.Edit.787.3 +Objekt sym:sd.Edit.787.4 +Makro sym:sd.Edit.787.5 +KlangWahl sym:sd.Edit.787.1 'KlangVollstaendigAbspielen sd:TriStateBox:TP_ANIMATION:TSB_PLAY_FULL -*TabKapitelnumerierung SW_HID_TP_OUTLINE_NUM +*TabKapitelnumerierung sym:SW_HID_TP_OUTLINE_NUM Ebene SW:LISTBOX:TP_OUTLINE_NUM:LB_LEVEL Absatzvorlage SW:LISTBOX:TP_OUTLINE_NUM:LB_COLL Zeichenvorlage SW:LISTBOX:TP_OUTLINE_NUM:LB_CHARFMT @@ -222,70 +222,70 @@ Vollstaendig SW:NUMERICFIELD:TP_OUTLINE_NUM:NF_ALL_LEVEL Davor SW:EDIT:TP_OUTLINE_NUM:ED_PREFIX Dahinter SW:EDIT:TP_OUTLINE_NUM:ED_SUFFIX BeginBei SW:NUMERICFIELD:TP_OUTLINE_NUM:ED_START -Form SW_HID_OUTLINE_FORM - -*TabKopfzeile SVX_HID_FORMAT_HEADER -KopfzeileMitAbstand svx.CheckBox.10027.10 svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEADER -Abstand svx.MetricField.10027.12 -Hoehe svx.MetricField.10027.14 -Hoehedynamisch svx.CheckBox.10027.15 -RechterRandKopfzeile svx.MetricField.10027.19 -LinkerRandKopfzeile svx.MetricField.10027.17 -InhaltLinksRechtsGleich svx.CheckBox.10027.20 -Zusaetze svx.PushButton.10027.40 -Bearbeiten SC_HID_SC_HEADER_EDIT - -*TabKopfzeileCalc SC_HID_SCPAGE_HFED_HR -LinkerBereich SC_HID_SC_HF_HRL -MittlererBereich SC_HID_SC_HF_HRC -RechterBereich SC_HID_SC_HF_HRR -PredefinedHeader SC_HID_SC_HF_HR_DEFINED -TextAttribute SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT -Datei SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE -Tabelle SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE -Seitennummer SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE -Seitenanzahl SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES -Datum SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE -Zeit SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME - -*TabKopfzeileCalcLinks SC_HID_SCPAGE_HFED_HL -LinkerBereich SC_HID_SC_HF_HLL -MittlererBereich SC_HID_SC_HF_HLC -RechterBereich SC_HID_SC_HF_HLR -PredefinedHeaderLeft SC_HID_SC_HF_HL_DEFINED -TextAttribute SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT -Datei SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE -Tabelle SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE -Seitennummer SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE -Seitenanzahl SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES -Datum SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE -Zeit SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME - -*TabLaden SW_HID_OPTLOAD_PAGE -Immer sw.RadioButton.20880.12 -AufNachfrage sw.RadioButton.20880.13 -Nie sw.RadioButton.20880.14 -Feldbefehle sw.CheckBox.20880.16 -Diagramme sw.CheckBox.20880.17 -Masseinheit sw.ListBox.20880.19 -Tabulatorenabstand sw.MetricField.20880.22 - -*TabLauftext cui.TabPage.10184 . -Effekt cui.ListBox.10184.1 -NachOben cui.ImageButton.10184.1 -NachLinks cui.ImageButton.10184.2 -NachUnten cui.ImageButton.10184.4 -NachRechts cui.ImageButton.10184.3 -TextSichtbarBeimStarten cui.TriStateBox.10184.1 -TextSichtbarBeimBeenden cui.TriStateBox.10184.2 -Endlos cui.TriStateBox.10184.3 -Anzahl cui.NumericField.10184.1 -Automatisch cui.TriStateBox.10184.5 -Verzoegerung cui.MetricField.10184.2 -Pixel cui.TriStateBox.10184.4 -Schrittweite cui.MetricField.10184.1 - -*TabLayoutCalc SC_HID_SCPAGE_LAYOUT +Form sym:SW_HID_OUTLINE_FORM + +*TabKopfzeile sym:SVX_HID_FORMAT_HEADER +KopfzeileMitAbstand sym:svx.CheckBox.10027.10 svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEADER +Abstand sym:svx.MetricField.10027.12 +Hoehe sym:svx.MetricField.10027.14 +Hoehedynamisch sym:svx.CheckBox.10027.15 +RechterRandKopfzeile sym:svx.MetricField.10027.19 +LinkerRandKopfzeile sym:svx.MetricField.10027.17 +InhaltLinksRechtsGleich sym:svx.CheckBox.10027.20 +Zusaetze sym:svx.PushButton.10027.40 +Bearbeiten sym:SC_HID_SC_HEADER_EDIT + +*TabKopfzeileCalc sym:SC_HID_SCPAGE_HFED_HR +LinkerBereich sym:SC_HID_SC_HF_HRL +MittlererBereich sym:SC_HID_SC_HF_HRC +RechterBereich sym:SC_HID_SC_HF_HRR +PredefinedHeader sym:SC_HID_SC_HF_HR_DEFINED +TextAttribute sym:SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT +Datei sym:SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE +Tabelle sym:SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE +Seitennummer sym:SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE +Seitenanzahl sym:SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES +Datum sym:SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE +Zeit sym:SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME + +*TabKopfzeileCalcLinks sym:SC_HID_SCPAGE_HFED_HL +LinkerBereich sym:SC_HID_SC_HF_HLL +MittlererBereich sym:SC_HID_SC_HF_HLC +RechterBereich sym:SC_HID_SC_HF_HLR +PredefinedHeaderLeft sym:SC_HID_SC_HF_HL_DEFINED +TextAttribute sym:SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT +Datei sym:SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE +Tabelle sym:SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE +Seitennummer sym:SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE +Seitenanzahl sym:SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES +Datum sym:SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE +Zeit sym:SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME + +*TabLaden sym:SW_HID_OPTLOAD_PAGE +Immer sym:sw.RadioButton.20880.12 +AufNachfrage sym:sw.RadioButton.20880.13 +Nie sym:sw.RadioButton.20880.14 +Feldbefehle sym:sw.CheckBox.20880.16 +Diagramme sym:sw.CheckBox.20880.17 +Masseinheit sym:sw.ListBox.20880.19 +Tabulatorenabstand sym:sw.MetricField.20880.22 + +*TabLauftext sym:cui.TabPage.10184 . +Effekt sym:cui.ListBox.10184.1 +NachOben sym:cui.ImageButton.10184.1 +NachLinks sym:cui.ImageButton.10184.2 +NachUnten sym:cui.ImageButton.10184.4 +NachRechts sym:cui.ImageButton.10184.3 +TextSichtbarBeimStarten sym:cui.TriStateBox.10184.1 +TextSichtbarBeimBeenden sym:cui.TriStateBox.10184.2 +Endlos sym:cui.TriStateBox.10184.3 +Anzahl sym:cui.NumericField.10184.1 +Automatisch sym:cui.TriStateBox.10184.5 +Verzoegerung sym:cui.MetricField.10184.2 +Pixel sym:cui.TriStateBox.10184.4 +Schrittweite sym:cui.MetricField.10184.1 + +*TabLayoutCalc sym:SC_HID_SCPAGE_LAYOUT Masseinheit SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_UNIT Tabulator SC:METRICFIELD:RID_SCPAGE_LAYOUT:MF_TAB Eingabebestaetigung SC:CHECKBOX:RID_SCPAGE_LAYOUT:CB_ALIGN @@ -293,121 +293,121 @@ Eingabetaste SC:CHECKBOX:RID_SCPAGE_LAYOUT:CB_EDITMODE FormatierungAusdehnen SC:CHECKBOX:RID_SCPAGE_LAYOUT:CB_FORMAT SelektionNach SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_ALIGN ' Referenzenfarbig sc:CheckBox:RID_SCPAGE_LAYOUT:CB_RFIND -Referenzenausdehnen sc.CheckBox.25718.76 -SelektionHervorheben sc.CheckBox.25718.77 -ImmerAktualisieren sc.RadioButton.25718.2 -AufNachfrageAktualisieren sc.RadioButton.25718.3 -NieAktualisieren sc.RadioButton.25718.4 -Druckermasse sc.CheckBox.25718.78 -Ueberschreibwarnung sc.CheckBox.25718.79 - -*TabLegende CUI_HID_CAPTION -Art CUI_HID_CAPTION_CTL_TYPE +Referenzenausdehnen sym:sc.CheckBox.25718.76 +SelektionHervorheben sym:sc.CheckBox.25718.77 +ImmerAktualisieren sym:sc.RadioButton.25718.2 +AufNachfrageAktualisieren sym:sc.RadioButton.25718.3 +NieAktualisieren sym:sc.RadioButton.25718.4 +Druckermasse sym:sc.CheckBox.25718.78 +Ueberschreibwarnung sym:sc.CheckBox.25718.79 + +*TabLegende sym:CUI_HID_CAPTION +Art sym:CUI_HID_CAPTION_CTL_TYPE Abstand cui:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND Ansatz cui:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ Laenge cui:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE Position cui:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL Optimal cui:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE -*TabLinguistik CUI_HID_OPTIONS_LINGU -Sprachmodule CUI_HID_CLB_LINGU_MODULES -SprachmoduleBearbeiten cui.PushButton.12007.113 -Optionen CUI_HID_CLB_LINGU_OPTIONS -OptionenBearbeiten cui.PushButton.12007.123 -Benutzerwoerterbuch CUI_HID_CLB_EDIT_MODULES_DICS -Neu cui.PushButton.12007.314 -Bearbeiten cui.PushButton.12007.315 -Loeschen cui.PushButton.12007.316 - -*TabLinie CUI_HID_LINE_LINE -Breite cui.MetricField.10051.1 -BreiteLinks cui.MetricField.10051.3 -BreiteRechts cui.MetricField.10051.2 -EndenSynchronisieren cui.CheckBox.10051.1 -Farbe cui.ListBox.10051.1 -Stil cui.ListBox.10051.2 -StilLinks cui.ListBox.10051.3 -StilRechts cui.ListBox.10051.4 -Transparenz cui.MetricField.10051.5 -ZentriertLinks cui.TriStateBox.10051.4 -ZentriertRechts cui.TriStateBox.10051.5 -CornerStyle cui.ListBox.10051.5 - -*TabLinienenden CUI_HID_LINE_ENDDEF -Aendern cui.PushButton.10053.2 -Hinzufuegen cui.PushButton.10053.1 -Liste cui.ListBox.10053.1 -Loeschen cui.PushButton.10053.3 -Oeffnen cui.ImageButton.10053.5 -Speichern cui.ImageButton.10053.6 -Textfeld cui.Edit.10053.1 - -*TabLinienstile CUI_HID_LINE_DEF -Abstand cui.MetricField.10052.1 -Aendern cui.PushButton.10052.2 -AnLinienbreite cui.CheckBox.10052.1 -AnzahlLinks cui.NumericField.10052.1 -AnzahlRechts cui.NumericField.10052.2 -Hinzufuegen cui.PushButton.10052.1 -LaengeLinks cui.MetricField.10052.3 -LaengeRechts cui.MetricField.10052.4 -Linienstil cui.ListBox.10052.2 -Loeschen cui.PushButton.10052.3 -Oeffnen cui.ImageButton.10052.5 -Speichern cui.ImageButton.10052.6 -TypLinks cui.ListBox.10052.3 -TypRechts cui.ListBox.10052.1 - -*TabLiteraturAllgemein EXTENSIONS_HID_BIB_CONTROL_PAGE - -*TabMakro cui.TabPage.10303 -Ereignis CUI_HID_MACRO_LB_EVENT -Bereich CUI_HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP -Makroname CUI_HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS -Zuweisen cui.PushButton.10303.3 -Aufheben cui.PushButton.10303.4 -Scripttyp cui.ListBox.10303.8 - -*TabMicrosoftOffice97 cui.TabPage.17020 -WinwordBasicLaden cui.CheckBox.17020.1 -WinwordBasicSpeichern cui.CheckBox.17020.2 -ExcelBasicLaden cui.CheckBox.17020.3 -ExecutableCode cui.CheckBox.17020.4 -ExcelBasicSpeichern cui.CheckBox.17020.5 -PowerpointBasicLaden cui.CheckBox.17020.6 -PowerpointBasicSpeichern cui.CheckBox.17020.7 - -*TabMicrosoftOffice2 cui.TabPage.17021 -Auswahl CUI_HID_OFAPAGE_MSFLTR2_CLB - -*TabModule basctl.TabPage.14887 -Modulliste BASCTL_HID_BASICIDE_MODULES_TREE -Bearbeiten basctl.PushButton.14887.4 -NeuesModul basctl.PushButton.14887.6 -NeuerDialog basctl.PushButton.14887.7 -Loeschen basctl.PushButton.14887.8 - -*TabNumerierungsart CUI_HID_SVXPAGE_PICK_SINGLE_NUM -Auswahl CUI_HID_VALUESET_SINGLENUM -Optionen SW_HID_NUM_FORMAT_BTN -Zurueck SFX2_HID_TABDLG_RESET_BTN - -*TabNumerierung CUI_HID_SVXPAGE_PICK_NUM -Auswahl CUI_HID_VALUESET_NUM -Optionen SW_HID_NUM_FORMAT_BTN -Zurueck SFX2_HID_TABDLG_RESET_BTN +*TabLinguistik sym:CUI_HID_OPTIONS_LINGU +Sprachmodule sym:CUI_HID_CLB_LINGU_MODULES +SprachmoduleBearbeiten sym:cui.PushButton.12007.113 +Optionen sym:CUI_HID_CLB_LINGU_OPTIONS +OptionenBearbeiten sym:cui.PushButton.12007.123 +Benutzerwoerterbuch sym:CUI_HID_CLB_EDIT_MODULES_DICS +Neu sym:cui.PushButton.12007.314 +Bearbeiten sym:cui.PushButton.12007.315 +Loeschen sym:cui.PushButton.12007.316 + +*TabLinie sym:CUI_HID_LINE_LINE +Breite sym:cui.MetricField.10051.1 +BreiteLinks sym:cui.MetricField.10051.3 +BreiteRechts sym:cui.MetricField.10051.2 +EndenSynchronisieren sym:cui.CheckBox.10051.1 +Farbe sym:cui.ListBox.10051.1 +Stil sym:cui.ListBox.10051.2 +StilLinks sym:cui.ListBox.10051.3 +StilRechts sym:cui.ListBox.10051.4 +Transparenz sym:cui.MetricField.10051.5 +ZentriertLinks sym:cui.TriStateBox.10051.4 +ZentriertRechts sym:cui.TriStateBox.10051.5 +CornerStyle sym:cui.ListBox.10051.5 + +*TabLinienenden sym:CUI_HID_LINE_ENDDEF +Aendern sym:cui.PushButton.10053.2 +Hinzufuegen sym:cui.PushButton.10053.1 +Liste sym:cui.ListBox.10053.1 +Loeschen sym:cui.PushButton.10053.3 +Oeffnen sym:cui.ImageButton.10053.5 +Speichern sym:cui.ImageButton.10053.6 +Textfeld sym:cui.Edit.10053.1 + +*TabLinienstile sym:CUI_HID_LINE_DEF +Abstand sym:cui.MetricField.10052.1 +Aendern sym:cui.PushButton.10052.2 +AnLinienbreite sym:cui.CheckBox.10052.1 +AnzahlLinks sym:cui.NumericField.10052.1 +AnzahlRechts sym:cui.NumericField.10052.2 +Hinzufuegen sym:cui.PushButton.10052.1 +LaengeLinks sym:cui.MetricField.10052.3 +LaengeRechts sym:cui.MetricField.10052.4 +Linienstil sym:cui.ListBox.10052.2 +Loeschen sym:cui.PushButton.10052.3 +Oeffnen sym:cui.ImageButton.10052.5 +Speichern sym:cui.ImageButton.10052.6 +TypLinks sym:cui.ListBox.10052.3 +TypRechts sym:cui.ListBox.10052.1 + +*TabLiteraturAllgemein sym:EXTENSIONS_HID_BIB_CONTROL_PAGE + +*TabMakro sym:cui.TabPage.10303 +Ereignis sym:CUI_HID_MACRO_LB_EVENT +Bereich sym:CUI_HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP +Makroname sym:CUI_HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS +Zuweisen sym:cui.PushButton.10303.3 +Aufheben sym:cui.PushButton.10303.4 +Scripttyp sym:cui.ListBox.10303.8 + +*TabMicrosoftOffice97 sym:cui.TabPage.17020 +WinwordBasicLaden sym:cui.CheckBox.17020.1 +WinwordBasicSpeichern sym:cui.CheckBox.17020.2 +ExcelBasicLaden sym:cui.CheckBox.17020.3 +ExecutableCode sym:cui.CheckBox.17020.4 +ExcelBasicSpeichern sym:cui.CheckBox.17020.5 +PowerpointBasicLaden sym:cui.CheckBox.17020.6 +PowerpointBasicSpeichern sym:cui.CheckBox.17020.7 + +*TabMicrosoftOffice2 sym:cui.TabPage.17021 +Auswahl sym:CUI_HID_OFAPAGE_MSFLTR2_CLB + +*TabModule sym:basctl.TabPage.14887 +Modulliste sym:BASCTL_HID_BASICIDE_MODULES_TREE +Bearbeiten sym:basctl.PushButton.14887.4 +NeuesModul sym:basctl.PushButton.14887.6 +NeuerDialog sym:basctl.PushButton.14887.7 +Loeschen sym:basctl.PushButton.14887.8 + +*TabNumerierungsart sym:CUI_HID_SVXPAGE_PICK_SINGLE_NUM +Auswahl sym:CUI_HID_VALUESET_SINGLENUM +Optionen sym:SW_HID_NUM_FORMAT_BTN +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN + +*TabNumerierung sym:CUI_HID_SVXPAGE_PICK_NUM +Auswahl sym:CUI_HID_VALUESET_NUM +Optionen sym:SW_HID_NUM_FORMAT_BTN +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +TabGliederung TabNumerierung *TabNumerierungAbsatz Hid_NUMPARA Vorlage SW:LISTBOX:TP_NUMPARA:LB_NUMBER_STYLE NumerierungNeuBeginnen SW:TRISTATEBOX:TP_NUMPARA:CB_NEW_START SW:CHECKBOX:TP_NUMPARA:CB_NEW_START -StartWith sw.TriStateBox.20873.4 +StartWith sym:sw.TriStateBox.20873.4 NumerierungBeginnenBei SW:NUMERICFIELD:TP_NUMPARA:NF_NEW_START ZeilenumerierungZeilenMitzaehlen SW:TRISTATEBOX:TP_NUMPARA:CB_COUNT_PARA SW:CHECKBOX:TP_NUMPARA:CB_COUNT_PARA ZeilenumerierungNeuBeginnen SW:TRISTATEBOX:TP_NUMPARA:CB_RESTART_PARACOUNT SW:CHECKBOX:TP_NUMPARA:CB_RESTART_PARACOUNT ZeilenumerierungBeginnenBei SW:NUMERICFIELD:TP_NUMPARA:NF_RESTART_PARA -OutlineLevel sw.ListBox.20873.13 +OutlineLevel sym:sw.ListBox.20873.13 +TabNumerierungKapitelnumerierung TabKapitelnumerierung @@ -422,24 +422,24 @@ OutlineLevel sw.ListBox.20873.13 ' Brennweite svx:MetricField:RID_SVXPAGE_3DATTR:MTR_FLD_FOCAL_LENGTH ' BrennweiteTyp HID_3DATTR_CTL_FOCALLENGTH -*TabOptionen CUI_HID_OFAPAGE_AUTOCORR_OPTIONS -Einstellungen CUI_HID_OFAPAGE_AUTOCORR_CLB +*TabOptionen sym:CUI_HID_OFAPAGE_AUTOCORR_OPTIONS +Einstellungen sym:CUI_HID_OFAPAGE_AUTOCORR_CLB -*TabOptionenAutokorrektur CUI_HID_OFAPAGE_AUTOFMT_OPTIONS -Einstellungen CUI_HID_OFAPAGE_AUTOFORMAT_CLB +*TabOptionenAutokorrektur sym:CUI_HID_OFAPAGE_AUTOFMT_OPTIONS +Einstellungen sym:CUI_HID_OFAPAGE_AUTOFORMAT_CLB Bearbeiten cui:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT -*TabOptionenTeilergebnisse SC_HID_SCPAGE_SUBT_OPTIONS -NeueSeiteBeiGruppenwechsel sc.CheckBox.25633.21 -GrossKleinschreibung sc.CheckBox.25633.22 -BereichVorherNachSortieren sc.CheckBox.25633.23 -FormateEinschliessen sc.CheckBox.25633.33 -BenutzerdefinierteSortierreihenfolge sc.CheckBox.25633.34 +*TabOptionenTeilergebnisse sym:SC_HID_SCPAGE_SUBT_OPTIONS +NeueSeiteBeiGruppenwechsel sym:sc.CheckBox.25633.21 +GrossKleinschreibung sym:sc.CheckBox.25633.22 +BereichVorherNachSortieren sym:sc.CheckBox.25633.23 +FormateEinschliessen sym:sc.CheckBox.25633.33 +BenutzerdefinierteSortierreihenfolge sym:sc.CheckBox.25633.34 SortierreihenfolgeAnzeige SC:LISTBOX:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF -Aufsteigend sc.RadioButton.25633.31 +Aufsteigend sym:sc.RadioButton.25633.31 Absteigend SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING -*TabOptionenNumerierung CUI_HID_SVXPAGE_NUM_OPTIONS +*TabOptionenNumerierung sym:CUI_HID_SVXPAGE_NUM_OPTIONS Ebene cui:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL Numerierung cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT Davor cui:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX @@ -455,35 +455,35 @@ Hoehe cui:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT Abgleich cui:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO Ausrichtung cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT -*TabHeaderFooterSlide SD_HID_SD_TABPAGE_HEADERFOOTER_SLIDE -DateTime sd.CheckBox.1000.2 -DateTimeFixed sd.RadioButton.1000.3 -DateTimeFixedText sd.Edit.1000.4 -DateTimeVariable sd.RadioButton.1000.5 -DateTimeFormat sd.ListBox.1000.6 -DateTimeLanguage sd.ListBox.1000.8 -Header sd.CheckBox.1000.22 -HeaderFixedText sd.Edit.1000.24 -Footer sd.CheckBox.1000.10 -FooterFixedText sd.Edit.1000.12 -Slidenumber sd.CheckBox.1000.14 -Donotshowonfirstslide sd.CheckBox.1000.16 -Applytoall sd.PushButton.1000.17 -Apply sd.PushButton.1000.18 - -*TabHeaderFooterNotesHandout SD_HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT -Header sd.CheckBox.1000.22 -HeaderFixedText sd.Edit.1000.24 -DateTime sd.CheckBox.1000.2 -DateTimeFixed sd.RadioButton.1000.3 -DateTimeFixedText sd.Edit.1000.4 -DateTimeVariable sd.RadioButton.1000.5 -DateTimeFormat sd.ListBox.1000.6 -DateTimeLanguage sd.ListBox.1000.8 -Footer sd.CheckBox.1000.10 -FooterFixedText sd.Edit.1000.12 -Slidenumber sd.CheckBox.1000.14 -Donotshowonfirstslide sd.CheckBox.1000.16 -Applytoall sd.PushButton.1000.17 -Apply sd.PushButton.1000.18 +*TabHeaderFooterSlide sym:SD_HID_SD_TABPAGE_HEADERFOOTER_SLIDE +DateTime sym:sd.CheckBox.1000.2 +DateTimeFixed sym:sd.RadioButton.1000.3 +DateTimeFixedText sym:sd.Edit.1000.4 +DateTimeVariable sym:sd.RadioButton.1000.5 +DateTimeFormat sym:sd.ListBox.1000.6 +DateTimeLanguage sym:sd.ListBox.1000.8 +Header sym:sd.CheckBox.1000.22 +HeaderFixedText sym:sd.Edit.1000.24 +Footer sym:sd.CheckBox.1000.10 +FooterFixedText sym:sd.Edit.1000.12 +Slidenumber sym:sd.CheckBox.1000.14 +Donotshowonfirstslide sym:sd.CheckBox.1000.16 +Applytoall sym:sd.PushButton.1000.17 +Apply sym:sd.PushButton.1000.18 + +*TabHeaderFooterNotesHandout sym:SD_HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT +Header sym:sd.CheckBox.1000.22 +HeaderFixedText sym:sd.Edit.1000.24 +DateTime sym:sd.CheckBox.1000.2 +DateTimeFixed sym:sd.RadioButton.1000.3 +DateTimeFixedText sym:sd.Edit.1000.4 +DateTimeVariable sym:sd.RadioButton.1000.5 +DateTimeFormat sym:sd.ListBox.1000.6 +DateTimeLanguage sym:sd.ListBox.1000.8 +Footer sym:sd.CheckBox.1000.10 +FooterFixedText sym:sd.Edit.1000.12 +Slidenumber sym:sd.CheckBox.1000.14 +Donotshowonfirstslide sym:sd.CheckBox.1000.16 +Applytoall sym:sd.PushButton.1000.17 +Apply sym:sd.PushButton.1000.18 diff --git a/testautomation/global/win/tab_p_s.win b/testautomation/global/win/tab_p_s.win index aa7755b33632..74e8fd8ad85d 100644 --- a/testautomation/global/win/tab_p_s.win +++ b/testautomation/global/win/tab_p_s.win @@ -1,21 +1,21 @@ -*TabPfade CUI_HID_OPTIONS_PATH -Standard cui.PushButton.12006.14 +*TabPfade sym:CUI_HID_OPTIONS_PATH +Standard sym:cui.PushButton.12006.14 Bearbeiten cui:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH -Typ CUI_HID_OPTPATH_CTL_PATH +Typ sym:CUI_HID_OPTPATH_CTL_PATH -*TabPositionNumerierung CUI_HID_SVXPAGE_NUM_POSITION +*TabPositionNumerierung sym:CUI_HID_SVXPAGE_NUM_POSITION Level cui:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL -Alignment cui.ListBox.10220.255 -NumberFollowedBy cui.ListBox.10220.251 -NumberFollowedByAt cui.MetricField.10220.253 -AlignedAt cui.MetricField.10220.257 -IndentAt cui.MetricField.10220.259 +Alignment sym:cui.ListBox.10220.255 +NumberFollowedBy sym:cui.ListBox.10220.251 +NumberFollowedByAt sym:cui.MetricField.10220.253 +AlignedAt sym:cui.MetricField.10220.257 +IndentAt sym:cui.MetricField.10220.259 Ausrichtung cui:LISTBOX:RID_SVXPAGE_NUM_POSITION:LB_ALIGN AbstandTextNumerierung cui:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST Relativ cui:CHECKBOX:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE Standard cui:PUSHBUTTON:RID_SVXPAGE_NUM_POSITION:PB_STANDARD -*TabPositionKapitelnumerierung SW_HID_NUM_POSITION +*TabPositionKapitelnumerierung sym:SW_HID_NUM_POSITION Level sw:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL NumberAlignment sw:LISTBOX:TP_NUM_POSITION:LB_ALIGN AlignedAt sw:METRICFIELD:TP_NUM_POSITION:MF_BORDERDIST @@ -23,123 +23,123 @@ AbstandTextNumerierung sw:METRICFIELD:TP_NUM_POSITION:MF_NUMDIST IndentAt sw:METRICFIELD:TP_NUM_POSITION:MF_INDENT Relativ sw:CHECKBOX:TP_NUM_POSITION:CB_RELATIVE Standard sw:PUSHBUTTON:TP_NUM_POSITION:PB_STANDARD -LabelFollowedBy sw.ListBox.20872.18 -AbstandTextNumerierung2 sw.MetricField.20872.20 -NumberingAlignment sw.ListBox.20872.22 -AlignedAt2 sw.MetricField.20872.24 -IndentAt2 sw.MetricField.20872.26 +LabelFollowedBy sym:sw.ListBox.20872.18 +AbstandTextNumerierung2 sym:sw.MetricField.20872.20 +NumberingAlignment sym:sw.ListBox.20872.22 +AlignedAt2 sym:sw.MetricField.20872.24 +IndentAt2 sym:sw.MetricField.20872.26 -*TabPrivat SW_HID_TP_PRIVATE_DATA -Vorname sw.Edit.20895.32 -Nachname sw.Edit.20895.33 -Kuerzel sw.Edit.20895.34 -Strasse sw.Edit.20895.36 -PLZ sw.Edit.20895.38 -Ort sw.Edit.20895.39 -Land sw.Edit.20895.41 -Bundesland sw.Edit.20895.53 -Titel sw.Edit.20895.44 -Beruf sw.Edit.20895.43 -Telefon sw.Edit.20895.46 -Handy sw.Edit.20895.47 -Fax sw.Edit.20895.49 -Homepage sw.Edit.20895.51 -Email sw.Edit.20895.52 +*TabPrivat sym:SW_HID_TP_PRIVATE_DATA +Vorname sym:sw.Edit.20895.32 +Nachname sym:sw.Edit.20895.33 +Kuerzel sym:sw.Edit.20895.34 +Strasse sym:sw.Edit.20895.36 +PLZ sym:sw.Edit.20895.38 +Ort sym:sw.Edit.20895.39 +Land sym:sw.Edit.20895.41 +Bundesland sym:sw.Edit.20895.53 +Titel sym:sw.Edit.20895.44 +Beruf sym:sw.Edit.20895.43 +Telefon sym:sw.Edit.20895.46 +Handy sym:sw.Edit.20895.47 +Fax sym:sw.Edit.20895.49 +Homepage sym:sw.Edit.20895.51 +Email sym:sw.Edit.20895.52 -*TabRaster SVX_HID_OPTIONS_GRID -FangrasterBenutzen svx.CheckBox.10152.4 -RasterSichtbar svx.CheckBox.10152.8 -FangenFangbereich svx.MetricField.10152.30 -AchsenSynchronisieren svx.CheckBox.10152.5 -RasterAufloesungXAchse svx.MetricField.10152.12 -RasterAufloesungYAchse svx.MetricField.10152.9 -RasterUnterteilungXAchse svx.NumericField.10152.13 -RasterUnterteilungYAchse svx.NumericField.10152.14 -AnFanglinien svx.CheckBox.10152.25 -AnSeitenraendern svx.CheckBox.10152.26 -AmObjektrahmen svx.CheckBox.10152.27 -AnObjektpunkten svx.CheckBox.10152.28 -BeimErzeugenUndBewegen svx.CheckBox.10152.32 -LaengereKantenlaenge svx.CheckBox.10152.33 -BeimDrehen svx.CheckBox.10152.34 -Punktreduktion svx.MetricField.10152.37 -Winkel svx.MetricField.10152.35 +*TabRaster sym:SVX_HID_OPTIONS_GRID +FangrasterBenutzen sym:svx.CheckBox.10152.4 +RasterSichtbar sym:svx.CheckBox.10152.8 +FangenFangbereich sym:svx.MetricField.10152.30 +AchsenSynchronisieren sym:svx.CheckBox.10152.5 +RasterAufloesungXAchse sym:svx.MetricField.10152.12 +RasterAufloesungYAchse sym:svx.MetricField.10152.9 +RasterUnterteilungXAchse sym:svx.NumericField.10152.13 +RasterUnterteilungYAchse sym:svx.NumericField.10152.14 +AnFanglinien sym:svx.CheckBox.10152.25 +AnSeitenraendern sym:svx.CheckBox.10152.26 +AmObjektrahmen sym:svx.CheckBox.10152.27 +AnObjektpunkten sym:svx.CheckBox.10152.28 +BeimErzeugenUndBewegen sym:svx.CheckBox.10152.32 +LaengereKantenlaenge sym:svx.CheckBox.10152.33 +BeimDrehen sym:svx.CheckBox.10152.34 +Punktreduktion sym:svx.MetricField.10152.37 +Winkel sym:svx.MetricField.10152.35 -*TabReferenzen SW_HID_FLD_REF +*TabReferenzen sym:SW_HID_FLD_REF Feldtyp SW:LISTBOX:TP_FLD_REF:LB_REFTYPE Auswahl SW:LISTBOX:TP_FLD_REF:LB_REFSELECTION Formatliste SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT Namefeld SW:EDIT:TP_FLD_REF:ED_REFNAME Wert SW:EDIT:TP_FLD_REF:ED_REFVALUE -Einfuegen SW_HID_FIELD_INSERT -Schliessen SW_HID_FIELD_CLOSE +Einfuegen sym:SW_HID_FIELD_INSERT +Schliessen sym:SW_HID_FIELD_CLOSE -*TabSchatten CUI_HID_AREA_SHADOW -Anzeigen cui.TriStateBox.10061.2 -Position CUI_HID_TPSHADOW_CTRL -Entfernung cui.MetricField.10061.1 -Farbe cui.ListBox.10061.10 -Transparenz cui.MetricField.10061.11 +*TabSchatten sym:CUI_HID_AREA_SHADOW +Anzeigen sym:cui.TriStateBox.10061.2 +Position sym:CUI_HID_TPSHADOW_CTRL +Entfernung sym:cui.MetricField.10061.1 +Farbe sym:cui.ListBox.10061.10 +Transparenz sym:cui.MetricField.10061.11 -*TabSchraegstellen CUI_HID_TRANS_SLANT -Radius cui.MetricField.10049.29 -Winkel cui.MetricField.10049.19 +*TabSchraegstellen sym:CUI_HID_TRANS_SLANT +Radius sym:cui.MetricField.10049.29 +Winkel sym:cui.MetricField.10049.19 -*TabSchraffuren CUI_HID_AREA_HATCH -Abstand cui.MetricField.10057.1 -Winkel cui.MetricField.10057.3 -Definition CUI_HID_TPHATCH_CTRL -Linientyp cui.ListBox.10057.1 -Linienfarbe cui.ListBox.10057.3 -Tabelle cui.ListBox.10057.4 -Hinzufuegen cui.PushButton.10057.1 -Aendern cui.PushButton.10057.3 -Loeschen cui.PushButton.10057.4 -Oeffnen cui.ImageButton.10057.5 -Speichern cui.ImageButton.10057.6 +*TabSchraffuren sym:CUI_HID_AREA_HATCH +Abstand sym:cui.MetricField.10057.1 +Winkel sym:cui.MetricField.10057.3 +Definition sym:CUI_HID_TPHATCH_CTRL +Linientyp sym:cui.ListBox.10057.1 +Linienfarbe sym:cui.ListBox.10057.3 +Tabelle sym:cui.ListBox.10057.4 +Hinzufuegen sym:cui.PushButton.10057.1 +Aendern sym:cui.PushButton.10057.3 +Loeschen sym:cui.PushButton.10057.4 +Oeffnen sym:cui.ImageButton.10057.5 +Speichern sym:cui.ImageButton.10057.6 -*TabSchriftErsetzung CUI_HID_OFA_FONT_SUBSTITUTION -Anwenden cui.CheckBox.10018.21 -Schriftart cui.ComboBox.10018.3 -Liste CUI_HID_OFA_FONT_SUBST_CLB -ErsetzenDurch cui.ComboBox.10018.5 -Uebernehmen CUI_HID_OFA_SUBST_APPLY -Loeschen CUI_HID_OFA_SUBST_DELETE -Fonts cui.ListBox.10018.24 -NonProportional cui.CheckBox.10018.25 -Size cui.ListBox.10018.27 +*TabSchriftErsetzung sym:CUI_HID_OFA_FONT_SUBSTITUTION +Anwenden sym:cui.CheckBox.10018.21 +Schriftart sym:cui.ComboBox.10018.3 +Liste sym:CUI_HID_OFA_FONT_SUBST_CLB +ErsetzenDurch sym:cui.ComboBox.10018.5 +Uebernehmen sym:CUI_HID_OFA_SUBST_APPLY +Loeschen sym:CUI_HID_OFA_SUBST_DELETE +Fonts sym:cui.ListBox.10018.24 +NonProportional sym:cui.CheckBox.10018.25 +Size sym:cui.ListBox.10018.27 -*TabSeite CUI_HID_FORMAT_PAGE -Links cui.MetricField.10025.11 -Rechts cui.MetricField.10025.13 -Oben cui.MetricField.10025.15 -Unten cui.MetricField.10025.17 -Seitenlayout cui.ListBox.10025.20 -Numerierung cui.ListBox.10025.30 -Papierformat cui.ListBox.10025.50 -Breite cui.MetricField.10025.54 -Hoehe cui.MetricField.10025.56 -Schacht cui.ListBox.10025.58 -Horizontal cui.CheckBox.10025.70 -Vertikal cui.CheckBox.10025.71 -Hoch cui.RadioButton.10025.51 -Quer cui.RadioButton.10025.52 +*TabSeite sym:CUI_HID_FORMAT_PAGE +Links sym:cui.MetricField.10025.11 +Rechts sym:cui.MetricField.10025.13 +Oben sym:cui.MetricField.10025.15 +Unten sym:cui.MetricField.10025.17 +Seitenlayout sym:cui.ListBox.10025.20 +Numerierung sym:cui.ListBox.10025.30 +Papierformat sym:cui.ListBox.10025.50 +Breite sym:cui.MetricField.10025.54 +Hoehe sym:cui.MetricField.10025.56 +Schacht sym:cui.ListBox.10025.58 +Horizontal sym:cui.CheckBox.10025.70 +Vertikal sym:cui.CheckBox.10025.71 +Hoch sym:cui.RadioButton.10025.51 +Quer sym:cui.RadioButton.10025.52 Einschalten cui:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER AbsatzVorlage cui:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER -Textfluss cui.ListBox.10025.36 -FitObject cui.CheckBox.10025.72 +Textfluss sym:cui.ListBox.10025.36 +FitObject sym:cui.CheckBox.10025.72 -*TabSonstigesAllgemein CUI_HID_OFA_TP_MISC -Zweistellig cui.NumericField.17100.42 -Aktivieren cui.CheckBox.17100.13 -Zuruecksetzen cui.PushButton.17100.14 -Tips cui.CheckBox.17100.11 -ExtendedTips cui.CheckBox.17100.12 -StarOfficeDialogeBenutzen cui.CheckBox.17100.55 -DruckenStatus cui.CheckBox.17100.61 -StyleSheet cui.ListBox.17100.16 +*TabSonstigesAllgemein sym:CUI_HID_OFA_TP_MISC +Zweistellig sym:cui.NumericField.17100.42 +Aktivieren sym:cui.CheckBox.17100.13 +Zuruecksetzen sym:cui.PushButton.17100.14 +Tips sym:cui.CheckBox.17100.11 +ExtendedTips sym:cui.CheckBox.17100.12 +StarOfficeDialogeBenutzen sym:cui.CheckBox.17100.55 +DruckenStatus sym:cui.CheckBox.17100.61 +StyleSheet sym:cui.ListBox.17100.16 -*TabSonstigesDraw SD_HID_SD_OPTIONS_MISC +*TabSonstigesDraw sym:SD_HID_SD_OPTIONS_MISC Schnellbearbeitung SD:CHECKBOX:TP_OPTIONS_MISC:CBX_QUICKEDIT TextbereichSelektierbar SD:CHECKBOX:TP_OPTIONS_MISC:CBX_PICKTHROUGH SeitenlayoutdialogZeigen SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE @@ -149,139 +149,139 @@ ObjekteImmerVerschiebbar SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS SetzenAufKreis SD:CHECKBOX:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION MitAktuellerSeite SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE Praesentationsdialoge SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE -MitAutopilotStarten sd.CheckBox.599.6 -Masseinheit sd.ListBox.599.1 -Tabulatorabstand sd.MetricField.599.4 -AlleAbsatzabstaendeAddieren sd.CheckBox.599.28 -Zeichnungsmasstab sd.ComboBox.599.29 -Originalbreite sd.MetricField.599.31 -Originalhoehe sd.MetricField.599.33 -UsePrinterMetrics sd.CheckBox.599.40 +MitAutopilotStarten sym:sd.CheckBox.599.6 +Masseinheit sym:sd.ListBox.599.1 +Tabulatorabstand sym:sd.MetricField.599.4 +AlleAbsatzabstaendeAddieren sym:sd.CheckBox.599.28 +Zeichnungsmasstab sym:sd.ComboBox.599.29 +Originalbreite sym:sd.MetricField.599.31 +Originalhoehe sym:sd.MetricField.599.33 +UsePrinterMetrics sym:sd.CheckBox.599.40 +TabSonstigesWriter TabLaden -*TabSortierkriterien SC_HID_SCPAGE_SORT_FIELDS -SortierenNach sc.ListBox.25610.4 -AnschliessendNach1 sc.ListBox.25610.5 -AnschliessendNach2 sc.ListBox.25610.6 -Aufsteigend1 sc.RadioButton.25610.7 -Absteigend1 sc.RadioButton.25610.10 -Aufsteigend2 sc.RadioButton.25610.8 -Absteigend2 sc.RadioButton.25610.11 -Aufsteigend3 sc.RadioButton.25610.9 -Absteigend3 sc.RadioButton.25610.12 +*TabSortierkriterien sym:SC_HID_SCPAGE_SORT_FIELDS +SortierenNach sym:sc.ListBox.25610.4 +AnschliessendNach1 sym:sc.ListBox.25610.5 +AnschliessendNach2 sym:sc.ListBox.25610.6 +Aufsteigend1 sym:sc.RadioButton.25610.7 +Absteigend1 sym:sc.RadioButton.25610.10 +Aufsteigend2 sym:sc.RadioButton.25610.8 +Absteigend2 sym:sc.RadioButton.25610.11 +Aufsteigend3 sym:sc.RadioButton.25610.9 +Absteigend3 sym:sc.RadioButton.25610.12 -*TabSortierlisten SC_HID_SCPAGE_USERLISTS -Listen sc.ListBox.25635.1 -Eintraege sc.MultiLineEdit.25635.2 -ListeKopierenAus sc.Edit.25635.3 -Neu sc.PushButton.25635.1 -Loeschen sc.PushButton.25635.3 -Kopieren sc.PushButton.25635.4 -Aendern sc.PushButton.25635.2 -Abbruch sc.PushButton.25635.1 +*TabSortierlisten sym:SC_HID_SCPAGE_USERLISTS +Listen sym:sc.ListBox.25635.1 +Eintraege sym:sc.MultiLineEdit.25635.2 +ListeKopierenAus sym:sc.Edit.25635.3 +Neu sym:sc.PushButton.25635.1 +Loeschen sym:sc.PushButton.25635.3 +Kopieren sym:sc.PushButton.25635.4 +Aendern sym:sc.PushButton.25635.2 +Abbruch sym:sc.PushButton.25635.1 -*TabSortierenOptionen SC_HID_SCPAGE_SORT_OPTIONS -GrossKleinschreibungBeachten sc.CheckBox.25611.8 -BereichEnthaeltSpaltenkoepfe sc.CheckBox.25611.9 -FormateEinschliessen sc.CheckBox.25611.10 -SortierergebnisseAusgebenNach sc.CheckBox.25611.11 -AusgabebereichName sc.ListBox.25611.3 -AusgabebereichZellen sc.Edit.25611.4 -BenutzerdefinierteSortierreihenfolge sc.CheckBox.25611.7 +*TabSortierenOptionen sym:SC_HID_SCPAGE_SORT_OPTIONS +GrossKleinschreibungBeachten sym:sc.CheckBox.25611.8 +BereichEnthaeltSpaltenkoepfe sym:sc.CheckBox.25611.9 +FormateEinschliessen sym:sc.CheckBox.25611.10 +SortierergebnisseAusgebenNach sym:sc.CheckBox.25611.11 +AusgabebereichName sym:sc.ListBox.25611.3 +AusgabebereichZellen sym:sc.Edit.25611.4 +BenutzerdefinierteSortierreihenfolge sym:sc.CheckBox.25611.7 SortierreihenfolgeListe SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER -VonObenNachUnten sc.RadioButton.25611.12 -VonLinksNachRechts sc.RadioButton.25611.13 -Sprache sc.ListBox.25611.17 -Optionen sc.ListBox.25611.19 +VonObenNachUnten sym:sc.RadioButton.25611.12 +VonLinksNachRechts sym:sc.RadioButton.25611.13 +Sprache sym:sc.ListBox.25611.17 +Optionen sym:sc.ListBox.25611.19 -*TabSpalten SW_HID_COLUMN -Anzahl sw.NumericField.20813.2 -ColumnValueset SW_HID_COLUMN_VALUESET -BalanceColumns sw.CheckBox.20813.58 -Spaltenbreite1 sw.MetricField.20813.25 -Spaltenbreite2 sw.MetricField.20813.26 -Spaltenbreite3 sw.MetricField.20813.27 -Spaltenbreite4 sw.MetricField.20813.25 -Spaltenbreite5 sw.MetricField.20813.26 -Spaltenbreite6 sw.MetricField.20813.27 -Spaltenbreite7 sw.MetricField.20813.25 -Spaltenbreite8 sw.MetricField.20813.26 -Spaltenbreite9 sw.MetricField.20813.27 -Vor sw.ImageButton.20813.31 -Zurueck sw.ImageButton.20813.30 -Abstand12 sw.MetricField.20813.46 -Abstand23 sw.MetricField.20813.47 -Abstand34 sw.MetricField.20813.46 -Abstand45 sw.MetricField.20813.47 -Abstand56 sw.MetricField.20813.46 -Abstand67 sw.MetricField.20813.47 -Abstand78 sw.MetricField.20813.46 -Abstand89 sw.MetricField.20813.47 -AutomBreite sw.CheckBox.20813.4 -Art sw.ListBox.20813.34 -Hoehe sw.MetricField.20813.36 -Position sw.ListBox.20813.38 -TextDirection sw.ListBox.20813.61 -Zuruecksetzen SFX2_HID_TABDLG_RESET_BTN +*TabSpalten sym:SW_HID_COLUMN +Anzahl sym:sw.NumericField.20813.2 +ColumnValueset sym:SW_HID_COLUMN_VALUESET +BalanceColumns sym:sw.CheckBox.20813.58 +Spaltenbreite1 sym:sw.MetricField.20813.25 +Spaltenbreite2 sym:sw.MetricField.20813.26 +Spaltenbreite3 sym:sw.MetricField.20813.27 +Spaltenbreite4 sym:sw.MetricField.20813.25 +Spaltenbreite5 sym:sw.MetricField.20813.26 +Spaltenbreite6 sym:sw.MetricField.20813.27 +Spaltenbreite7 sym:sw.MetricField.20813.25 +Spaltenbreite8 sym:sw.MetricField.20813.26 +Spaltenbreite9 sym:sw.MetricField.20813.27 +Vor sym:sw.ImageButton.20813.31 +Zurueck sym:sw.ImageButton.20813.30 +Abstand12 sym:sw.MetricField.20813.46 +Abstand23 sym:sw.MetricField.20813.47 +Abstand34 sym:sw.MetricField.20813.46 +Abstand45 sym:sw.MetricField.20813.47 +Abstand56 sym:sw.MetricField.20813.46 +Abstand67 sym:sw.MetricField.20813.47 +Abstand78 sym:sw.MetricField.20813.46 +Abstand89 sym:sw.MetricField.20813.47 +AutomBreite sym:sw.CheckBox.20813.4 +Art sym:sw.ListBox.20813.34 +Hoehe sym:sw.MetricField.20813.36 +Position sym:sw.ListBox.20813.38 +TextDirection sym:sw.ListBox.20813.61 +Zuruecksetzen sym:SFX2_HID_TABDLG_RESET_BTN -*TabSpaltenTabelle SW_HID_TABLE_COLUMN -BreiteAnpassen sw.CheckBox.21461.122 -ProportionalAendern sw.CheckBox.21461.123 -VerfuegbarerPlatz sw.MetricField.21461.126 -Spalte1 sw.MetricField.21461.108 -Spalte2 sw.MetricField.21461.110 -Spalte3 sw.MetricField.21461.112 -Spalte4 sw.MetricField.21461.114 -Spalte5 sw.MetricField.21461.116 -Spalte6 sw.MetricField.21461.118 -Zurueck sw.ImageButton.21461.121 -Weiter sw.ImageButton.21461.120 -Zuruecksetzen SFX2_HID_TABDLG_RESET_BTN +*TabSpaltenTabelle sym:SW_HID_TABLE_COLUMN +BreiteAnpassen sym:sw.CheckBox.21461.122 +ProportionalAendern sym:sw.CheckBox.21461.123 +VerfuegbarerPlatz sym:sw.MetricField.21461.126 +Spalte1 sym:sw.MetricField.21461.108 +Spalte2 sym:sw.MetricField.21461.110 +Spalte3 sym:sw.MetricField.21461.112 +Spalte4 sym:sw.MetricField.21461.114 +Spalte5 sym:sw.MetricField.21461.116 +Spalte6 sym:sw.MetricField.21461.118 +Zurueck sym:sw.ImageButton.21461.121 +Weiter sym:sw.ImageButton.21461.120 +Zuruecksetzen sym:SFX2_HID_TABDLG_RESET_BTN -*TabSpeichern CUI_HID_OPTIONS_SAVE -BenutzerspezifischeEinstellungen cui.CheckBox.12000.11 +*TabSpeichern sym:CUI_HID_OPTIONS_SAVE +BenutzerspezifischeEinstellungen sym:cui.CheckBox.12000.11 DokumenteigenschaftenBearbeiten cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_DOCINFO -Sicherungskopie cui.CheckBox.12000.15 -AutomatischSpeichern cui.CheckBox.12000.16 +Sicherungskopie sym:cui.CheckBox.12000.15 +AutomatischSpeichern sym:cui.CheckBox.12000.16 Minuten cui:NUMERICFIELD:RID_SFXPAGE_SAVE:ED_AUTOSAVE -NoPrettyPrinting cui.CheckBox.12000.20 +NoPrettyPrinting sym:cui.CheckBox.12000.20 URLimDateisystem cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS URLimInternet cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET -Dokumenttyp cui.ListBox.12000.45 -Filter cui.ListBox.12000.47 -WarnWhenSavingAlienFormat cui.CheckBox.12000.22 -LoadPrinterSettingsWithDocument cui.CheckBox.12000.12 +Dokumenttyp sym:cui.ListBox.12000.45 +Filter sym:cui.ListBox.12000.47 +WarnWhenSavingAlienFormat sym:cui.CheckBox.12000.22 +LoadPrinterSettingsWithDocument sym:cui.CheckBox.12000.12 -*TabSprachen CUI_HID_OFA_TP_LANGUAGES -UILanguage cui.ListBox.17105.31 -Gebietsschema cui.ListBox.17105.17 -DecimalSeparator cui.CheckBox.17105.28 -StandardWaehrung cui.ListBox.17105.19 -Westlich cui.ListBox.17105.6 -Asiatisch cui.ListBox.17105.8 -AktuellesDokument cui.CheckBox.17105.11 -Aktivieren cui.CheckBox.17105.13 -LanguageComplexScript cui.ListBox.17105.10 -ComplexScriptEnabled cui.CheckBox.17105.15 +*TabSprachen sym:CUI_HID_OFA_TP_LANGUAGES +UILanguage sym:cui.ListBox.17105.31 +Gebietsschema sym:cui.ListBox.17105.17 +DecimalSeparator sym:cui.CheckBox.17105.28 +StandardWaehrung sym:cui.ListBox.17105.19 +Westlich sym:cui.ListBox.17105.6 +Asiatisch sym:cui.ListBox.17105.8 +AktuellesDokument sym:cui.CheckBox.17105.11 +Aktivieren sym:cui.CheckBox.17105.13 +LanguageComplexScript sym:cui.ListBox.17105.10 +ComplexScriptEnabled sym:cui.CheckBox.17105.15 -*TabStatistik SW_HID_DOC_STAT -Aktualisieren sw.PushButton.20815.19 +*TabStatistik sym:SW_HID_DOC_STAT +Aktualisieren sym:sw.PushButton.20815.19 -*TabStatistikCalc sc.TabPage.25683 +*TabStatistikCalc sym:sc.TabPage.25683 -*TabSuche CUI_HID_OPTIONS_SEARCH -SuchenIn cui.ListBox.10160.40 -DienstName cui.Edit.10160.41 -Und cui.RadioButton.10160.43 -Oder cui.RadioButton.10160.44 -Exakt cui.RadioButton.10160.45 -Praefix cui.Edit.10160.46 -Suffix cui.Edit.10160.47 -Trenner cui.Edit.10160.48 -Schreibstil cui.ListBox.10160.49 -Hinzufuegen cui.PushButton.10160.55 -Aendern cui.PushButton.10160.53 -Loeschen cui.PushButton.10160.54 -Neu cui.PushButton.10160.56 +*TabSuche sym:CUI_HID_OPTIONS_SEARCH +SuchenIn sym:cui.ListBox.10160.40 +DienstName sym:cui.Edit.10160.41 +Und sym:cui.RadioButton.10160.43 +Oder sym:cui.RadioButton.10160.44 +Exakt sym:cui.RadioButton.10160.45 +Praefix sym:cui.Edit.10160.46 +Suffix sym:cui.Edit.10160.47 +Trenner sym:cui.Edit.10160.48 +Schreibstil sym:cui.ListBox.10160.49 +Hinzufuegen sym:cui.PushButton.10160.55 +Aendern sym:cui.PushButton.10160.53 +Loeschen sym:cui.PushButton.10160.54 +Neu sym:cui.PushButton.10160.56 diff --git a/testautomation/global/win/tab_t_z.win b/testautomation/global/win/tab_t_z.win index cc52a1628c7a..20bc803286bd 100644 --- a/testautomation/global/win/tab_t_z.win +++ b/testautomation/global/win/tab_t_z.win @@ -1,41 +1,41 @@ -*TabTabelle SW_HID_FORMAT_TABLE -TabellenName sw.Edit.20834.103 -Breite sw.MetricField.20834.1 -Relativ sw.CheckBox.20834.4 -Automatisch sw.RadioButton.20834.14 -Links sw.RadioButton.20834.10 -Rechts sw.RadioButton.20834.11 -Zentriert sw.RadioButton.20834.12 -Vonlinks sw.RadioButton.20834.144 -Manuell sw.RadioButton.20834.13 -NachLinks sw.MetricField.20834.51 -NachRechts sw.MetricField.20834.52 -NachOben sw.MetricField.20834.21 -NachUnten sw.MetricField.20834.23 -TextDirection sw.ListBox.20834.44 +*TabTabelle sym:SW_HID_FORMAT_TABLE +TabellenName sym:sw.Edit.20834.103 +Breite sym:sw.MetricField.20834.1 +Relativ sym:sw.CheckBox.20834.4 +Automatisch sym:sw.RadioButton.20834.14 +Links sym:sw.RadioButton.20834.10 +Rechts sym:sw.RadioButton.20834.11 +Zentriert sym:sw.RadioButton.20834.12 +Vonlinks sym:sw.RadioButton.20834.144 +Manuell sym:sw.RadioButton.20834.13 +NachLinks sym:sw.MetricField.20834.51 +NachRechts sym:sw.MetricField.20834.52 +NachOben sym:sw.MetricField.20834.21 +NachUnten sym:sw.MetricField.20834.23 +TextDirection sym:sw.ListBox.20834.44 -*TabTabelleCalc SC_HID_SCPAGE_TABLE -ZeilenSpaltenKoepfe sc.CheckBox.25647.11 -Tabellengitter sc.CheckBox.25647.10 -Notizen sc.CheckBox.25647.12 -GrafikenObjekte sc.CheckBox.25647.14 -Diagramme sc.CheckBox.25647.13 -Zeichenobjekte sc.CheckBox.25647.15 -Formeln sc.CheckBox.25647.16 -Nullwerte sc.CheckBox.25647.17 -SeitenreihenfolgeObenUnten sc.RadioButton.25647.20 -SeitenreihenfolgeLinksRechts sc.RadioButton.25647.21 -ErsteSeitenzahl sc.CheckBox.25647.25 -NummerErsteSeite sc.NumericField.25647.26 +*TabTabelleCalc sym:SC_HID_SCPAGE_TABLE +ZeilenSpaltenKoepfe sym:sc.CheckBox.25647.11 +Tabellengitter sym:sc.CheckBox.25647.10 +Notizen sym:sc.CheckBox.25647.12 +GrafikenObjekte sym:sc.CheckBox.25647.14 +Diagramme sym:sc.CheckBox.25647.13 +Zeichenobjekte sym:sc.CheckBox.25647.15 +Formeln sym:sc.CheckBox.25647.16 +Nullwerte sym:sc.CheckBox.25647.17 +SeitenreihenfolgeObenUnten sym:sc.RadioButton.25647.20 +SeitenreihenfolgeLinksRechts sym:sc.RadioButton.25647.21 +ErsteSeitenzahl sym:sc.CheckBox.25647.25 +NummerErsteSeite sym:sc.NumericField.25647.26 'SkalierungAllesAuf sc:RadioButton:RID_SCPAGE_TABLE:BTN_SCALEALL -SkalierungProzent sc.MetricField.25647.32 +SkalierungProzent sym:sc.MetricField.25647.32 'MaxSeitenzahl sc:RadioButton:RID_SCPAGE_TABLE:BTN_SCALEPAGENUM -AnzahlMaxSeiten sc.NumericField.25647.34 -ScalingMode sc.ListBox.25647.31 -ScalePageWidth sc.NumericField.25647.35 -ScalePageHeight sc.NumericField.25647.36 +AnzahlMaxSeiten sym:sc.NumericField.25647.34 +ScalingMode sym:sc.ListBox.25647.31 +ScalePageWidth sym:sc.NumericField.25647.35 +ScalePageHeight sym:sc.NumericField.25647.36 -*TabTabelleOptionen SW_HID_OPTTABLE_PAGE +*TabTabelleOptionen sym:SW_HID_OPTTABLE_PAGE VerschiebenZeile SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWMOVE VerschiebenSpalte SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLMOVE EinfuegenZeile SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWINSERT @@ -44,103 +44,103 @@ VerhaltenFix SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIX FixProportional SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIXPROP Variabel SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_VAR -Ueberschrift sw.CheckBox.20856.101 -Wiederholen sw.CheckBox.20856.102 -NichtTrennen sw.CheckBox.20856.103 -Umrandung sw.CheckBox.20856.104 -AutomatischeZahlenerkennung sw.CheckBox.20856.105 -Zahlenformaterkennung sw.CheckBox.20856.109 -AutomatischeAusrichtung sw.CheckBox.20856.106 +Ueberschrift sym:sw.CheckBox.20856.101 +Wiederholen sym:sw.CheckBox.20856.102 +NichtTrennen sym:sw.CheckBox.20856.103 +Umrandung sym:sw.CheckBox.20856.104 +AutomatischeZahlenerkennung sym:sw.CheckBox.20856.105 +Zahlenformaterkennung sym:sw.CheckBox.20856.109 +AutomatischeAusrichtung sym:sw.CheckBox.20856.106 -*TabTabulatoren CUI_HID_TABULATOR -AlleLoeschen cui.PushButton.10002.52 -Fuellzeichen1 cui.RadioButton.10002.40 -Fuellzeichen2 cui.RadioButton.10002.41 -Fuellzeichen3 cui.RadioButton.10002.42 -Fuellzeichen4 cui.RadioButton.10002.43 -Fuellzeichen5 cui.RadioButton.10002.44 -FuellzeichenZeichen cui.Edit.10002.45 -Loeschen cui.PushButton.10002.51 -Neu cui.PushButton.10002.50 -Position cui.MetricBox.10002.10 -TypLinks cui.RadioButton.10002.20 -TypRechts cui.RadioButton.10002.22 -TypZentriert cui.RadioButton.10002.24 -TypDezimal cui.RadioButton.10002.26 -TypZeichen cui.Edit.10002.28 +*TabTabulatoren sym:CUI_HID_TABULATOR +AlleLoeschen sym:cui.PushButton.10002.52 +Fuellzeichen1 sym:cui.RadioButton.10002.40 +Fuellzeichen2 sym:cui.RadioButton.10002.41 +Fuellzeichen3 sym:cui.RadioButton.10002.42 +Fuellzeichen4 sym:cui.RadioButton.10002.43 +Fuellzeichen5 sym:cui.RadioButton.10002.44 +FuellzeichenZeichen sym:cui.Edit.10002.45 +Loeschen sym:cui.PushButton.10002.51 +Neu sym:cui.PushButton.10002.50 +Position sym:cui.MetricBox.10002.10 +TypLinks sym:cui.RadioButton.10002.20 +TypRechts sym:cui.RadioButton.10002.22 +TypZentriert sym:cui.RadioButton.10002.24 +TypDezimal sym:cui.RadioButton.10002.26 +TypZeichen sym:cui.Edit.10002.28 -*TabTabulator CUI_HID_TABULATOR -AlleLoeschen cui.PushButton.10002.52 -Fuellzeichen1 cui.RadioButton.10002.40 -Fuellzeichen2 cui.RadioButton.10002.41 -Fuellzeichen3 cui.RadioButton.10002.42 -Fuellzeichen4 cui.RadioButton.10002.43 -Fuellzeichen5 cui.RadioButton.10002.44 -FuellzeichenZeichen cui.Edit.10002.45 -Loeschen cui.PushButton.10002.51 -Neu cui.PushButton.10002.50 -Position cui.MetricBox.10002.10 -TypLinks cui.RadioButton.10002.20 -TypRechts cui.RadioButton.10002.22 -TypZentriert cui.RadioButton.10002.24 -TypDezimal cui.RadioButton.10002.26 -TypZeichen cui.Edit.10002.28 +*TabTabulator sym:CUI_HID_TABULATOR +AlleLoeschen sym:cui.PushButton.10002.52 +Fuellzeichen1 sym:cui.RadioButton.10002.40 +Fuellzeichen2 sym:cui.RadioButton.10002.41 +Fuellzeichen3 sym:cui.RadioButton.10002.42 +Fuellzeichen4 sym:cui.RadioButton.10002.43 +Fuellzeichen5 sym:cui.RadioButton.10002.44 +FuellzeichenZeichen sym:cui.Edit.10002.45 +Loeschen sym:cui.PushButton.10002.51 +Neu sym:cui.PushButton.10002.50 +Position sym:cui.MetricBox.10002.10 +TypLinks sym:cui.RadioButton.10002.20 +TypRechts sym:cui.RadioButton.10002.22 +TypZentriert sym:cui.RadioButton.10002.24 +TypDezimal sym:cui.RadioButton.10002.26 +TypZeichen sym:cui.Edit.10002.28 -*TabTastatur CUI_HID_CONFIG_ACCEL -Tastatur CUI_HID_ACCELCONFIG_LISTBOX -Bereich CUI_HID_CONFIGGROUP_ACC_LISTBOX -Funktion CUI_HID_CONFIGFUNCTION_ACC_LISTBOX -Aendern cui.PushButton.10293.3 -Loeschen cui.PushButton.10293.4 -Zuruecksetzen cui.PushButton.10293.20 -Laden cui.PushButton.10293.40 -Speichern cui.PushButton.10293.41 -StarOffice cui.RadioButton.10293.44 -Application cui.RadioButton.10293.45 +*TabTastatur sym:CUI_HID_CONFIG_ACCEL +Tastatur sym:CUI_HID_ACCELCONFIG_LISTBOX +Bereich sym:CUI_HID_CONFIGGROUP_ACC_LISTBOX +Funktion sym:CUI_HID_CONFIGFUNCTION_ACC_LISTBOX +Aendern sym:cui.PushButton.10293.3 +Loeschen sym:cui.PushButton.10293.4 +Zuruecksetzen sym:cui.PushButton.10293.20 +Laden sym:cui.PushButton.10293.40 +Speichern sym:cui.PushButton.10293.41 +StarOffice sym:cui.RadioButton.10293.44 +Application sym:cui.RadioButton.10293.45 -*TabTeilergebnisseOptionen SC_HID_SCPAGE_SUBT_OPTIONS -NeueSeiteBeiGruppenwechsel sc.CheckBox.25633.21 -GrossKleinschreibungBeachten sc.CheckBox.25633.22 -BereichVorherNachGruppenSortieren sc.CheckBox.25633.23 -FormateEinschliessen sc.CheckBox.25633.33 -BenutzerdefinierteSortierreihenfolge sc.CheckBox.25633.34 -SortierreihenfolgeAnzeige sc.ListBox.25633.35 -Aufsteigend sc.RadioButton.25633.31 -Absteigend sc.RadioButton.25633.32 +*TabTeilergebnisseOptionen sym:SC_HID_SCPAGE_SUBT_OPTIONS +NeueSeiteBeiGruppenwechsel sym:sc.CheckBox.25633.21 +GrossKleinschreibungBeachten sym:sc.CheckBox.25633.22 +BereichVorherNachGruppenSortieren sym:sc.CheckBox.25633.23 +FormateEinschliessen sym:sc.CheckBox.25633.33 +BenutzerdefinierteSortierreihenfolge sym:sc.CheckBox.25633.34 +SortierreihenfolgeAnzeige sym:sc.ListBox.25633.35 +Aufsteigend sym:sc.RadioButton.25633.31 +Absteigend sym:sc.RadioButton.25633.32 -*TabText CUI_HID_PAGE_TEXTATTR -BreiteAnTextAnpassen cui.TriStateBox.10153.2 -HoeheAnTextAnpassen cui.TriStateBox.10153.1 -AmRahmenAnpassen cui.TriStateBox.10153.3 -Konturfluss cui.TriStateBox.10153.5 -WordWrap cui.TriStateBox.10153.6 -ResizeShape cui.TriStateBox.10153.7 -Links cui.MetricField.10153.1 -Rechts cui.MetricField.10153.2 -Oben cui.MetricField.10153.3 -Unten cui.MetricField.10153.4 -AnchorPosition CUI_HID_TEXTATTR_CTL_POSITION -GanzeBreite cui.TriStateBox.10153.4 +*TabText sym:CUI_HID_PAGE_TEXTATTR +BreiteAnTextAnpassen sym:cui.TriStateBox.10153.2 +HoeheAnTextAnpassen sym:cui.TriStateBox.10153.1 +AmRahmenAnpassen sym:cui.TriStateBox.10153.3 +Konturfluss sym:cui.TriStateBox.10153.5 +WordWrap sym:cui.TriStateBox.10153.6 +ResizeShape sym:cui.TriStateBox.10153.7 +Links sym:cui.MetricField.10153.1 +Rechts sym:cui.MetricField.10153.2 +Oben sym:cui.MetricField.10153.3 +Unten sym:cui.MetricField.10153.4 +AnchorPosition sym:CUI_HID_TEXTATTR_CTL_POSITION +GanzeBreite sym:cui.TriStateBox.10153.4 -*TabTextfluss CUI_HID_FORMAT_PARAGRAPH_EXT -Automatisch cui.TriStateBox.10007.50 -AbZeichenende cui.NumericField.10007.52 -AbZeichenAnfang cui.NumericField.10007.55 -Trennstellen cui.NumericField.10007.83 -Umbruch cui.TriStateBox.10007.60 -UmbruchTyp cui.ListBox.10007.62 -UmbruchPosition cui.ListBox.10007.64 -MitSeitenvorlage cui.TriStateBox.10007.65 -Vorlage cui.ListBox.10007.66 -AbsatzNichtTrennen cui.TriStateBox.10007.67 -AbsaetzeZusammenhalten cui.TriStateBox.10007.80 -Schusterjungenregelung cui.TriStateBox.10007.68 -SchusterZeilen cui.NumericField.10007.69 -Hurenkinderregelung cui.TriStateBox.10007.71 -HurenkinderZeilen cui.NumericField.10007.72 +*TabTextfluss sym:CUI_HID_FORMAT_PARAGRAPH_EXT +Automatisch sym:cui.TriStateBox.10007.50 +AbZeichenende sym:cui.NumericField.10007.52 +AbZeichenAnfang sym:cui.NumericField.10007.55 +Trennstellen sym:cui.NumericField.10007.83 +Umbruch sym:cui.TriStateBox.10007.60 +UmbruchTyp sym:cui.ListBox.10007.62 +UmbruchPosition sym:cui.ListBox.10007.64 +MitSeitenvorlage sym:cui.TriStateBox.10007.65 +Vorlage sym:cui.ListBox.10007.66 +AbsatzNichtTrennen sym:cui.TriStateBox.10007.67 +AbsaetzeZusammenhalten sym:cui.TriStateBox.10007.80 +Schusterjungenregelung sym:cui.TriStateBox.10007.68 +SchusterZeilen sym:cui.NumericField.10007.69 +Hurenkinderregelung sym:cui.TriStateBox.10007.71 +HurenkinderZeilen sym:cui.NumericField.10007.72 Seitenzahl cui:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM -*TabTextflussTabelle SW_HID_TABLE_TEXTFLOW +*TabTextflussTabelle sym:SW_HID_TABLE_TEXTFLOW Umbruch SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGEBREAK MitSeitenvorlage SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGECOLL UeberschriftWiederholen SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_HEADLINE @@ -152,57 +152,57 @@ Davor SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE Danach SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER Seitenvorlage SW:LISTBOX:TP_TABLE_TEXTFLOW:LB_PAGECOLL Seitennummer SW:NUMERICFIELD:TP_TABLE_TEXTFLOW:NF_PAGENUM -ZeileTrennen sw.TriStateBox.20852.146 -TextDirection sw.ListBox.20852.44 -VerticalAlignment sw.ListBox.20852.151 +ZeileTrennen sym:sw.TriStateBox.20852.146 +TextDirection sym:sw.ListBox.20852.44 +VerticalAlignment sym:sw.ListBox.20852.151 -*TabTransparenz CUI_HID_AREA_TRANSPARENCE -KeineTransparenz cui.RadioButton.10054.8 -LineareTransparenz cui.RadioButton.10054.9 -Transparenzverlauf cui.RadioButton.10054.10 -MFLinTransparenz cui.MetricField.10054.10 -TransparenzverlaufTyp cui.ListBox.10054.3 -MFZentrumX cui.MetricField.10054.4 -MFZentrumY cui.MetricField.10054.5 -MFWinkel cui.MetricField.10054.6 -MFRand cui.MetricField.10054.7 -MFStartwert cui.MetricField.10054.8 -MFEndwert cui.MetricField.10054.9 +*TabTransparenz sym:CUI_HID_AREA_TRANSPARENCE +KeineTransparenz sym:cui.RadioButton.10054.8 +LineareTransparenz sym:cui.RadioButton.10054.9 +Transparenzverlauf sym:cui.RadioButton.10054.10 +MFLinTransparenz sym:cui.MetricField.10054.10 +TransparenzverlaufTyp sym:cui.ListBox.10054.3 +MFZentrumX sym:cui.MetricField.10054.4 +MFZentrumY sym:cui.MetricField.10054.5 +MFWinkel sym:cui.MetricField.10054.6 +MFRand sym:cui.MetricField.10054.7 +MFStartwert sym:cui.MetricField.10054.8 +MFEndwert sym:cui.MetricField.10054.9 -*TabUmlauf SW_HID_FRM_EXT -Kein sw.ImageRadioButton.20849.2 -Links sw.ImageRadioButton.20849.3 -Rechts sw.ImageRadioButton.20849.4 -Parallel sw.ImageRadioButton.20849.5 -Durchlauf sw.ImageRadioButton.20849.6 -Dynamisch sw.ImageRadioButton.20849.7 -AbstaendeLinks sw.MetricField.20849.14 +*TabUmlauf sym:SW_HID_FRM_EXT +Kein sym:sw.ImageRadioButton.20849.2 +Links sym:sw.ImageRadioButton.20849.3 +Rechts sym:sw.ImageRadioButton.20849.4 +Parallel sym:sw.ImageRadioButton.20849.5 +Durchlauf sym:sw.ImageRadioButton.20849.6 +Dynamisch sym:sw.ImageRadioButton.20849.7 +AbstaendeLinks sym:sw.MetricField.20849.14 AbstaendeRechts SW:METRICFIELD:TP_FRM_WRAP:ED_RIGHT_MARGIN sw:MetricField:TP_FRM_EXT:ED_RIGHT_MARGIN AbstaendeOben SW:METRICFIELD:TP_FRM_WRAP:ED_TOP_MARGIN sw:MetricField:TP_FRM_EXT:ED_TOP_MARGIN AbstaendeUnten SW:METRICFIELD:TP_FRM_WRAP:ED_BOTTOM_MARGIN sw:MetricField:TP_FRM_EXT:ED_BOTTOM_MARGIN -ErsterAbsatz sw.CheckBox.20849.8 -ImHintergrund sw.CheckBox.20849.22 -Kontur sw.CheckBox.20849.23 -NurAussen sw.CheckBox.20849.25 +ErsterAbsatz sym:sw.CheckBox.20849.8 +ImHintergrund sym:sw.CheckBox.20849.22 +Kontur sym:sw.CheckBox.20849.23 +NurAussen sym:sw.CheckBox.20849.25 -*TabUmrandung CUI_HID_BORDER -Vorgaben CUI_HID_BORDER_CTL_PRESETS -Stil cui.ListBox.10005.21 -StilFarbe cui.ListBox.10005.22 -Position CUI_HID_BORDER_CTL_SHADOWS -Groesse cui.MetricField.10005.34 -SchattenFarbe cui.ListBox.10005.36 -Zurueck SFX2_HID_TABDLG_RESET_BTN -Standard SFX2_HID_TABDLG_STANDARD_BTN -Links cui.MetricField.10005.52 -Rechts cui.MetricField.10005.54 -Oben cui.MetricField.10005.56 -Unten cui.MetricField.10005.58 -Synchronisieren cui.CheckBox.10005.59 +*TabUmrandung sym:CUI_HID_BORDER +Vorgaben sym:CUI_HID_BORDER_CTL_PRESETS +Stil sym:cui.ListBox.10005.21 +StilFarbe sym:cui.ListBox.10005.22 +Position sym:CUI_HID_BORDER_CTL_SHADOWS +Groesse sym:cui.MetricField.10005.34 +SchattenFarbe sym:cui.ListBox.10005.36 +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +Standard sym:SFX2_HID_TABDLG_STANDARD_BTN +Links sym:cui.MetricField.10005.52 +Rechts sym:cui.MetricField.10005.54 +Oben sym:cui.MetricField.10005.56 +Unten sym:cui.MetricField.10005.58 +Synchronisieren sym:cui.CheckBox.10005.59 +TabUmrandungChart TabLinie -*TabVariablen SW_HID_FLD_VAR +*TabVariablen sym:SW_HID_FLD_VAR Feldtyp SW:LISTBOX:TP_FLD_VAR:LB_VARTYPE Auswahl SW:LISTBOX:TP_FLD_VAR:LB_VARSELECTION Formatliste SW:LISTBOX:TP_FLD_VAR:LB_VARFORMAT @@ -213,147 +213,147 @@ Hinweis SW:EDIT:TP_FLD_VAR:ED_VARVALUE Korrektur SW:EDIT:TP_FLD_VAR:ED_VARVALUE Formel SW:EDIT:TP_FLD_VAR:ED_VARVALUE Unsichtbar SW:CHECKBOX:TP_FLD_VAR:CB_VARINVISIBLE -Uebernehmen SW_HID_FLDVAR_APPLY -Loeschen SW_HID_FLDVAR_DELETE -Einfuegen SW_HID_FIELD_INSERT -Schliessen SW_HID_FIELD_CLOSE +Uebernehmen sym:SW_HID_FLDVAR_APPLY +Loeschen sym:SW_HID_FLDVAR_DELETE +Einfuegen sym:SW_HID_FIELD_INSERT +Schliessen sym:SW_HID_FIELD_CLOSE -*TabVerbinder CUI_HID_PAGE_CONNECTION -Linie1 cui.MetricField.10191.1 -Linie2 cui.MetricField.10191.2 -Linie3 cui.MetricField.10191.3 -AnfangHorizontal cui.MetricField.10191.4 -AnfangVertikal cui.MetricField.10191.6 -EndeHorizontal cui.MetricField.10191.5 -EndeVertikal cui.MetricField.10191.7 -Typ cui.ListBox.10191.1 +*TabVerbinder sym:CUI_HID_PAGE_CONNECTION +Linie1 sym:cui.MetricField.10191.1 +Linie2 sym:cui.MetricField.10191.2 +Linie3 sym:cui.MetricField.10191.3 +AnfangHorizontal sym:cui.MetricField.10191.4 +AnfangVertikal sym:cui.MetricField.10191.6 +EndeHorizontal sym:cui.MetricField.10191.5 +EndeVertikal sym:cui.MetricField.10191.7 +Typ sym:cui.ListBox.10191.1 -*TabVerwalten SFX2_HID_MANAGE_STYLES -VorlagenName sfx2.Edit.267.2 -Aktualisieren sfx2.CheckBox.267.12 -Folgevorlage sfx2.ListBox.267.4 -VerknuepftMit sfx2.ListBox.267.6 -Bereich sfx2.ListBox.267.8 -Enthaelt sfx2.MultiLineEdit.267.11 -Zurueck SFX2_HID_TABDLG_RESET_BTN -Standard SFX2_HID_TABDLG_STANDARD_BTN +*TabVerwalten sym:SFX2_HID_MANAGE_STYLES +VorlagenName sym:sfx2.Edit.267.2 +Aktualisieren sym:sfx2.CheckBox.267.12 +Folgevorlage sym:sfx2.ListBox.267.4 +VerknuepftMit sym:sfx2.ListBox.267.6 +Bereich sym:sfx2.ListBox.267.8 +Enthaelt sym:sfx2.MultiLineEdit.267.11 +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +Standard sym:SFX2_HID_TABDLG_STANDARD_BTN -*TabVerzeichnisseVerzeichnis SW_HID_TP_TOX_SELECT -VerzeichnisTyp sw.ListBox.20890.2 -VerzeichnisTitel sw.Edit.20890.15 -VerzeichnisGeschuetzt sw.CheckBox.20890.3 -ErstellenFuer sw.ListBox.20890.7 -AuswertenBis sw.NumericField.20890.9 -ErzeugenAusGliederung sw.CheckBox.20890.11 -ErzeugenAusVorlagen sw.CheckBox.20890.13 -VorlagenAuswahl sw.PushButton.20890.14 -ErzeugenAusMarkierungen sw.CheckBox.20890.21 -ZusammenfassenGleicherEintraege sw.CheckBox.20890.23 -ZusammenfassenMitEff sw.CheckBox.20890.24 -ZusammenfassenMitStrich sw.CheckBox.20890.33 -GrossKlein sw.CheckBox.20890.25 -AutomatischGross sw.CheckBox.20890.26 -EigenerEintrag sw.CheckBox.20890.27 -Konkordanzdatei sw.CheckBox.20890.28 -KonkordanzAuswahl sw.MenuButton.20890.29 -Beschriftungen sw.RadioButton.20890.19 -Objektnamen sw.RadioButton.20890.20 -Kategorie sw.ListBox.20890.106 -Anzeige sw.ListBox.20890.108 -Vorlagen sw.CheckBox.20890.13 -WelcheVorlage sw.PushButton.20890.14 -Tabellen sw.CheckBox.20890.114 -Textrahmen sw.CheckBox.20890.115 -Grafiken sw.CheckBox.20890.116 -OLEObjekte sw.CheckBox.20890.17 -Ursprungskapitel sw.CheckBox.20890.18 -ErzeugenAusObjekt SW_HID_OLE_CHECKLB -EintraegeNumerieren sw.CheckBox.20890.122 -Klammern sw.ListBox.20890.124 -SortLanguage sw.ListBox.20890.146 -SortKeyType sw.ListBox.20890.148 +*TabVerzeichnisseVerzeichnis sym:SW_HID_TP_TOX_SELECT +VerzeichnisTyp sym:sw.ListBox.20890.2 +VerzeichnisTitel sym:sw.Edit.20890.15 +VerzeichnisGeschuetzt sym:sw.CheckBox.20890.3 +ErstellenFuer sym:sw.ListBox.20890.7 +AuswertenBis sym:sw.NumericField.20890.9 +ErzeugenAusGliederung sym:sw.CheckBox.20890.11 +ErzeugenAusVorlagen sym:sw.CheckBox.20890.13 +VorlagenAuswahl sym:sw.PushButton.20890.14 +ErzeugenAusMarkierungen sym:sw.CheckBox.20890.21 +ZusammenfassenGleicherEintraege sym:sw.CheckBox.20890.23 +ZusammenfassenMitEff sym:sw.CheckBox.20890.24 +ZusammenfassenMitStrich sym:sw.CheckBox.20890.33 +GrossKlein sym:sw.CheckBox.20890.25 +AutomatischGross sym:sw.CheckBox.20890.26 +EigenerEintrag sym:sw.CheckBox.20890.27 +Konkordanzdatei sym:sw.CheckBox.20890.28 +KonkordanzAuswahl sym:sw.MenuButton.20890.29 +Beschriftungen sym:sw.RadioButton.20890.19 +Objektnamen sym:sw.RadioButton.20890.20 +Kategorie sym:sw.ListBox.20890.106 +Anzeige sym:sw.ListBox.20890.108 +Vorlagen sym:sw.CheckBox.20890.13 +WelcheVorlage sym:sw.PushButton.20890.14 +Tabellen sym:sw.CheckBox.20890.114 +Textrahmen sym:sw.CheckBox.20890.115 +Grafiken sym:sw.CheckBox.20890.116 +OLEObjekte sym:sw.CheckBox.20890.17 +Ursprungskapitel sym:sw.CheckBox.20890.18 +ErzeugenAusObjekt sym:SW_HID_OLE_CHECKLB +EintraegeNumerieren sym:sw.CheckBox.20890.122 +Klammern sym:sw.ListBox.20890.124 +SortLanguage sym:sw.ListBox.20890.146 +SortKeyType sym:sw.ListBox.20890.148 -*TabVerzeichnisseEintraege SW_HID_TP_TOX_ENTRY -AuswahlEbene SW_HID_INSERT_INDEX_ENTRY_LEVEL_LB -Kapitelnummer sw.PushButton.20891.36 -Kapitelinfo sw.PushButton.20891.38 -Eintragstext sw.PushButton.20891.37 -Tabulator sw.PushButton.20891.40 -Tabulatorposition sw.MetricField.20891.52 -Seitennummer sw.PushButton.20891.39 -Hyperlink sw.PushButton.20891.41 -ZeichenvorlageBearbeiten sw.PushButton.20891.44 -Zeichenvorlage sw.ListBox.20891.48 -ZeichenvorlageAuswahl sw.ListBox.20891.43 -ZeichenvorlageHaupteintraege sw.ListBox.20891.57 -Fuellzeichen sw.ComboBox.20891.46 -AlphabetischesTrennzeichen sw.CheckBox.20891.58 -SchluesselKommasepariert sw.CheckBox.20891.59 -AmRechtenRand sw.CheckBox.20891.53 -PositionTabulatorRelativ sw.CheckBox.20891.54 -Aufbau SW_HID_TOKEN_WINDOW -AufbauText SW_HID_TOX_ENTRY_EDIT -AufbauAuswahl SW_HID_TOX_ENTRY_BUTTON -AufbauEinfuegen sw.PushButton.20891.120 -AufbauEntfernen sw.PushButton.20891.121 +*TabVerzeichnisseEintraege sym:SW_HID_TP_TOX_ENTRY +AuswahlEbene sym:SW_HID_INSERT_INDEX_ENTRY_LEVEL_LB +Kapitelnummer sym:sw.PushButton.20891.36 +Kapitelinfo sym:sw.PushButton.20891.38 +Eintragstext sym:sw.PushButton.20891.37 +Tabulator sym:sw.PushButton.20891.40 +Tabulatorposition sym:sw.MetricField.20891.52 +Seitennummer sym:sw.PushButton.20891.39 +Hyperlink sym:sw.PushButton.20891.41 +ZeichenvorlageBearbeiten sym:sw.PushButton.20891.44 +Zeichenvorlage sym:sw.ListBox.20891.48 +ZeichenvorlageAuswahl sym:sw.ListBox.20891.43 +ZeichenvorlageHaupteintraege sym:sw.ListBox.20891.57 +Fuellzeichen sym:sw.ComboBox.20891.46 +AlphabetischesTrennzeichen sym:sw.CheckBox.20891.58 +SchluesselKommasepariert sym:sw.CheckBox.20891.59 +AmRechtenRand sym:sw.CheckBox.20891.53 +PositionTabulatorRelativ sym:sw.CheckBox.20891.54 +Aufbau sym:SW_HID_TOKEN_WINDOW +AufbauText sym:SW_HID_TOX_ENTRY_EDIT +AufbauAuswahl sym:SW_HID_TOX_ENTRY_BUTTON +AufbauEinfuegen sym:sw.PushButton.20891.120 +AufbauEntfernen sym:sw.PushButton.20891.121 -*TabVerzeichnisseVorlagen SW_HID_TOX_STYLES_PAGE -ZuordnungStufen sw.ListBox.20892.29 -ZuordnungAbsatzvorlagen sw.ListBox.20892.31 -Standard sw.PushButton.20892.26 -Zuordnen sw.ImageButton.20892.32 -Bearbeiten sw.PushButton.20892.40 +*TabVerzeichnisseVorlagen sym:SW_HID_TOX_STYLES_PAGE +ZuordnungStufen sym:sw.ListBox.20892.29 +ZuordnungAbsatzvorlagen sym:sw.ListBox.20892.31 +Standard sym:sw.PushButton.20892.26 +Zuordnen sym:sw.ImageButton.20892.32 +Bearbeiten sym:sw.PushButton.20892.40 -*TabVisitenkarten SW_HID_TP_VISITING_CARDS -Inhalt SW_HID_BUSINESS_CARD_CONTENT -WelcherAutotext sw.ListBox.20893.5 +*TabVisitenkarten sym:SW_HID_TP_VISITING_CARDS +Inhalt sym:SW_HID_BUSINESS_CARD_CONTENT +WelcherAutotext sym:sw.ListBox.20893.5 *TabWerte SC:TABPAGE:TP_VALIDATION_VALUES Zulassen SC:LISTBOX:TP_VALIDATION_VALUES:LB_ALLOW -LeerzellenZulassen sc.CheckBox.696.3 +LeerzellenZulassen sym:sc.CheckBox.696.3 Daten SC:LISTBOX:TP_VALIDATION_VALUES:LB_VALUE Wert SC:EDIT:TP_VALIDATION_VALUES:EDT_MIN Minimum SC:EDIT:TP_VALIDATION_VALUES:EDT_MIN -Maximum sc.Edit.696.9 -ShowSelectionList sc.CheckBox.696.27 -ListSortEntries sc.CheckBox.696.28 -CriteriaListEntries sc.MultiLineEdit.696.29 -SourceShrink sc.ImageButton.696.88 -ValidityReset SFX2_HID_TABDLG_RESET_BTN +Maximum sym:sc.Edit.696.9 +ShowSelectionList sym:sc.CheckBox.696.27 +ListSortEntries sym:sc.CheckBox.696.28 +CriteriaListEntries sym:sc.MultiLineEdit.696.29 +SourceShrink sym:sc.ImageButton.696.88 +ValidityReset sym:SFX2_HID_TABDLG_RESET_BTN -*TabWortergaenzung CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS -WoerterErgaenzen cui.CheckBox.17019.121 -VorschlaegeSammeln cui.CheckBox.17019.122 -AlsTipphilfe cui.CheckBox.17019.125 -MinWortlaenge cui.NumericField.17019.128 -MaxEintraege cui.NumericField.17019.129 -AnnehmenMit cui.ListBox.17019.131 -GesammelteWorte cui.MultiListBox.17019.132 -EintragLoeschen cui.PushButton.17019.133 -AppendSpace cui.CheckBox.17019.123 -KeepList cui.CheckBox.17019.124 +*TabWortergaenzung sym:CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS +WoerterErgaenzen sym:cui.CheckBox.17019.121 +VorschlaegeSammeln sym:cui.CheckBox.17019.122 +AlsTipphilfe sym:cui.CheckBox.17019.125 +MinWortlaenge sym:cui.NumericField.17019.128 +MaxEintraege sym:cui.NumericField.17019.129 +AnnehmenMit sym:cui.ListBox.17019.131 +GesammelteWorte sym:cui.MultiListBox.17019.132 +EintragLoeschen sym:cui.PushButton.17019.133 +AppendSpace sym:cui.CheckBox.17019.123 +KeepList sym:cui.CheckBox.17019.124 -*TabZahlen CUI_HID_NUMBERFORMAT -Kategorie cui.ListBox.10041.9 -ZahlenFormat CUI_HID_NUMBERFORMAT_LB_FORMAT -Sprache cui.ListBox.10041.13 -FormatPreview CUI_HID_NUMBERFORMAT_WND_NUMBER_PREVIEW -FormatCode cui.Edit.10041.14 -FuehrendeNullen cui.NumericField.10041.24 -Nachkommastellen cui.NumericField.10041.22 -NegativInRot cui.CheckBox.10041.25 -Tausenderpunkt cui.CheckBox.10041.26 -PBHinzufuegen CUI_HID_NUMBERFORMAT_TBI_ADD -PBEntfernen CUI_HID_NUMBERFORMAT_TBI_REMOVE -PBInfo CUI_HID_NUMBERFORMAT_TBI_INFO +*TabZahlen sym:CUI_HID_NUMBERFORMAT +Kategorie sym:cui.ListBox.10041.9 +ZahlenFormat sym:CUI_HID_NUMBERFORMAT_LB_FORMAT +Sprache sym:cui.ListBox.10041.13 +FormatPreview sym:CUI_HID_NUMBERFORMAT_WND_NUMBER_PREVIEW +FormatCode sym:cui.Edit.10041.14 +FuehrendeNullen sym:cui.NumericField.10041.24 +Nachkommastellen sym:cui.NumericField.10041.22 +NegativInRot sym:cui.CheckBox.10041.25 +Tausenderpunkt sym:cui.CheckBox.10041.26 +PBHinzufuegen sym:CUI_HID_NUMBERFORMAT_TBI_ADD +PBEntfernen sym:CUI_HID_NUMBERFORMAT_TBI_REMOVE +PBInfo sym:CUI_HID_NUMBERFORMAT_TBI_INFO Kommentar cui:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT -Zurueck SFX2_HID_TABDLG_RESET_BTN -FormatSprache cui.ListBox.10041.33 -Standard SFX2_HID_TABDLG_STANDARD_BTN -Standardformat cui.CheckBox.10041.34 +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +FormatSprache sym:cui.ListBox.10041.33 +Standard sym:SFX2_HID_TABDLG_STANDARD_BTN +Standardformat sym:cui.CheckBox.10041.34 -*TabZeilennumerierung SW_HID_LINENUMBERING +*TabZeilennumerierung sym:SW_HID_LINENUMBERING Einschalten SW:CHECKBOX:TP_LINENUMBERING:CB_NUMBERING_ON Vorlage SW:LISTBOX:TP_LINENUMBERING:LB_CHAR_STYLE Format SW:LISTBOX:TP_LINENUMBERING:LB_FORMAT @@ -365,37 +365,37 @@ Alle SW:NUMERICFIELD:TP_LINENUMBERING:NF_DIV_INTERVAL Leerzeilen SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_EMPTYLINES ZeilenInTextrahmen SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_FRAMELINES -*TabZellschutz SC_HID_SCPAGE_PROTECTION -Gesperrt sc.TriStateBox.25607.1 -AllesAusblenden sc.TriStateBox.25607.3 -FormelAusblenden sc.TriStateBox.25607.2 -FuerAusdruckAusblenden sc.TriStateBox.25607.6 -Zurueck SFX2_HID_TABDLG_RESET_BTN -Standard SFX2_HID_TABDLG_STANDARD_BTN +*TabZellschutz sym:SC_HID_SCPAGE_PROTECTION +Gesperrt sym:sc.TriStateBox.25607.1 +AllesAusblenden sym:sc.TriStateBox.25607.3 +FormelAusblenden sym:sc.TriStateBox.25607.2 +FuerAusdruckAusblenden sym:sc.TriStateBox.25607.6 +Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +Standard sym:SFX2_HID_TABDLG_STANDARD_BTN -*TabZuschneiden CUI_HID_SVXPAGE_GRFCROP -Links cui.MetricField.10238.17 -Rechts cui.MetricField.10238.18 -Oben cui.MetricField.10238.19 -Unten cui.MetricField.10238.14 -GroesseBeibehalten cui.RadioButton.10238.23 -MassstabBeibehalten cui.RadioButton.10238.24 -GroesseBreite cui.MetricField.10238.20 -GroesseHoehe cui.MetricField.10238.15 -MassstabBreite cui.MetricField.10238.21 -MassstabHoehe cui.MetricField.10238.16 -Originalgroesse cui.PushButton.10238.22 +*TabZuschneiden sym:CUI_HID_SVXPAGE_GRFCROP +Links sym:cui.MetricField.10238.17 +Rechts sym:cui.MetricField.10238.18 +Oben sym:cui.MetricField.10238.19 +Unten sym:cui.MetricField.10238.14 +GroesseBeibehalten sym:cui.RadioButton.10238.23 +MassstabBeibehalten sym:cui.RadioButton.10238.24 +GroesseBreite sym:cui.MetricField.10238.20 +GroesseHoehe sym:cui.MetricField.10238.15 +MassstabBreite sym:cui.MetricField.10238.21 +MassstabHoehe sym:cui.MetricField.10238.16 +Originalgroesse sym:cui.PushButton.10238.22 -*TabZusaetze SW_HID_FRM_ADD -ObjektName sw.Edit.20851.111 -Alternativtext sw.Edit.20851.113 -InhaltSchuetzen sw.CheckBox.20851.119 -PositionSchuetzen sw.CheckBox.20851.120 -GroesseSchuetzen sw.CheckBox.20851.121 -Drucken sw.CheckBox.20851.124 +*TabZusaetze sym:SW_HID_FRM_ADD +ObjektName sym:sw.Edit.20851.111 +Alternativtext sym:sw.Edit.20851.113 +InhaltSchuetzen sym:sw.CheckBox.20851.119 +PositionSchuetzen sym:sw.CheckBox.20851.120 +GroesseSchuetzen sym:sw.CheckBox.20851.121 +Drucken sym:sw.CheckBox.20851.124 Editierbar SW:CHECKBOX:TP_FRM_ADD:CB_EDIT_IN_READONLY -PreviousLink sw.ListBox.20851.115 -NextLink sw.ListBox.20851.117 -TextDirection sw.ListBox.20851.128 +PreviousLink sym:sw.ListBox.20851.115 +NextLink sym:sw.ListBox.20851.117 +TextDirection sym:sw.ListBox.20851.128 +TabZusaetzeEtiketten TabDruckerEtiketten diff --git a/testautomation/global/win/w_autop.win b/testautomation/global/win/w_autop.win index dad715fbf731..6bb8c7041595 100644 --- a/testautomation/global/win/w_autop.win +++ b/testautomation/global/win/w_autop.win @@ -1,29 +1,29 @@ -*AutopilotBrief1 SW_HID_LETTER_PAGE1 -*AutopilotBrief2 SW_HID_LETTER_PAGE2 -*AutopilotBrief3 SW_HID_LETTER_PAGE3 -*AutopilotBrief4 SW_HID_LETTER_PAGE4 -*AutopilotBrief5 SW_HID_LETTER_PAGE5 -*AutopilotBrief6 SW_HID_LETTER_PAGE6 -*AutopilotBrief7 SW_HID_LETTER_PAGE7 -*AutopilotBrief8 SW_HID_LETTER_PAGE8 -*AutopilotBrief9 SW_HID_LETTER_PAGE9 -*AutopilotFax1 SW_HID_FAX_PAGE1 -*AutopilotFax2 SW_HID_FAX_PAGE2 -*AutopilotFax3 SW_HID_FAX_PAGE3 -*AutopilotFax4 SW_HID_FAX_PAGE4 -*AutopilotFax5 SW_HID_FAX_PAGE5 -*AutopilotFax6 SW_HID_FAX_PAGE6 -*AutopilotFax7 SW_HID_FAX_PAGE7 -*AutopilotFax8 SW_HID_FAX_PAGE8 -*AutopilotMemo1 SW_HID_MEMO_PAGE1 -*AutopilotMemo2 SW_HID_MEMO_PAGE2 -*AutopilotMemo3 SW_HID_MEMO_PAGE3 -*AutopilotMemo4 SW_HID_MEMO_PAGE4 -*AutopilotMemo5 SW_HID_MEMO_PAGE5 -*AutopilotAgenda1 SW_HID_AGENDA_PAGE1 -*AutopilotAgenda2 SW_HID_AGENDA_PAGE2 -*AutopilotAgenda3 SW_HID_AGENDA_PAGE3 -*AutopilotAgenda4 SW_HID_AGENDA_PAGE4 -*AutopilotAgenda5 SW_HID_AGENDA_PAGE5 -*AutopilotAgenda6 SW_HID_AGENDA_PAGE6 +*AutopilotBrief1 sym:SW_HID_LETTER_PAGE1 +*AutopilotBrief2 sym:SW_HID_LETTER_PAGE2 +*AutopilotBrief3 sym:SW_HID_LETTER_PAGE3 +*AutopilotBrief4 sym:SW_HID_LETTER_PAGE4 +*AutopilotBrief5 sym:SW_HID_LETTER_PAGE5 +*AutopilotBrief6 sym:SW_HID_LETTER_PAGE6 +*AutopilotBrief7 sym:SW_HID_LETTER_PAGE7 +*AutopilotBrief8 sym:SW_HID_LETTER_PAGE8 +*AutopilotBrief9 sym:SW_HID_LETTER_PAGE9 +*AutopilotFax1 sym:SW_HID_FAX_PAGE1 +*AutopilotFax2 sym:SW_HID_FAX_PAGE2 +*AutopilotFax3 sym:SW_HID_FAX_PAGE3 +*AutopilotFax4 sym:SW_HID_FAX_PAGE4 +*AutopilotFax5 sym:SW_HID_FAX_PAGE5 +*AutopilotFax6 sym:SW_HID_FAX_PAGE6 +*AutopilotFax7 sym:SW_HID_FAX_PAGE7 +*AutopilotFax8 sym:SW_HID_FAX_PAGE8 +*AutopilotMemo1 sym:SW_HID_MEMO_PAGE1 +*AutopilotMemo2 sym:SW_HID_MEMO_PAGE2 +*AutopilotMemo3 sym:SW_HID_MEMO_PAGE3 +*AutopilotMemo4 sym:SW_HID_MEMO_PAGE4 +*AutopilotMemo5 sym:SW_HID_MEMO_PAGE5 +*AutopilotAgenda1 sym:SW_HID_AGENDA_PAGE1 +*AutopilotAgenda2 sym:SW_HID_AGENDA_PAGE2 +*AutopilotAgenda3 sym:SW_HID_AGENDA_PAGE3 +*AutopilotAgenda4 sym:SW_HID_AGENDA_PAGE4 +*AutopilotAgenda5 sym:SW_HID_AGENDA_PAGE5 +*AutopilotAgenda6 sym:SW_HID_AGENDA_PAGE6 -- cgit From 20c80bc1e2cdddd49e1c5e710f930eb78142a1b1 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 24 Sep 2010 19:31:59 +0200 Subject: CWS changehid: wrong strlen for helpids; autohelpid treatment was different to old version and so testtool got confused --- tools/inc/tools/resmgr.hxx | 2 +- tools/source/rc/resmgr.cxx | 105 ++++++++++++++++++++++++++++++--------------- 2 files changed, 71 insertions(+), 36 deletions(-) diff --git a/tools/inc/tools/resmgr.hxx b/tools/inc/tools/resmgr.hxx index 93442701d939..4b79040921b3 100644 --- a/tools/inc/tools/resmgr.hxx +++ b/tools/inc/tools/resmgr.hxx @@ -189,7 +189,7 @@ public: // Groesse eines Strings in der Resource static sal_uInt32 GetStringSize( sal_uInt32 nLen ) { nLen++; return (nLen + nLen%2); } - static sal_uInt32 GetStringSize( const BYTE* pStr ); + static sal_uInt32 GetStringSize( const BYTE* pStr, sal_uInt32& nLen ); // return a int64 static sal_uInt64 GetUInt64( void* pDatum ); diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index d64d262ea43c..afdf8f62c343 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1352,7 +1352,8 @@ sal_uInt64 ResMgr::GetUInt64( void* pDatum ) // ----------------------------------------------------------------------- sal_uInt32 ResMgr::GetStringWithoutHook( UniString& rStr, const BYTE* pStr ) { - sal_uInt32 nRet = GetStringSize( pStr ); + sal_uInt32 nLen=0; + sal_uInt32 nRet = GetStringSize( pStr, nLen ); UniString aString( (sal_Char*)pStr, RTL_TEXTENCODING_UTF8, RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_MAPTOPRIVATE | RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_DEFAULT | @@ -1373,16 +1374,18 @@ sal_uInt32 ResMgr::GetString( UniString& rStr, const BYTE* pStr ) sal_uInt32 ResMgr::GetByteString( rtl::OString& rStr, const BYTE* pStr ) { - sal_uInt32 nRet = GetStringSize( pStr ); - rStr = rtl::OString( (const sal_Char*)pStr, nRet ); + sal_uInt32 nLen=0; + sal_uInt32 nRet = GetStringSize( pStr, nLen ); + rStr = rtl::OString( (const sal_Char*)pStr, nLen ); return nRet; } // ------------------------------------------------------------------ -sal_uInt32 ResMgr::GetStringSize( const BYTE* pStr ) +sal_uInt32 ResMgr::GetStringSize( const BYTE* pStr, sal_uInt32& nLen ) { - return GetStringSize( strlen( (const char*)pStr ) ); + nLen = static_cast< sal_uInt32 >( strlen( (const char*)pStr ) ); + return GetStringSize( nLen ); } // ----------------------------------------------------------------------- @@ -1805,7 +1808,7 @@ rtl::OString ResMgr::GetAutoHelpId() return pFallbackResMgr->GetAutoHelpId(); OSL_ENSURE( nCurStack, "resource stack empty in Auto help id generation" ); - if( nCurStack < 1 ) + if( nCurStack < 1 || nCurStack > 2 ) return rtl::OString(); // prepare HID, start with resource prefix @@ -1817,35 +1820,67 @@ rtl::OString ResMgr::GetAutoHelpId() const ImpRCStack *pRC = StackTop(); OSL_ENSURE( pRC, "missing resource stack level" ); - switch( pRC->pResource->GetRT() ) { // maximal 32 - case RSC_TABCONTROL: aHID.append( "TabControl" ); break; - case RSC_RADIOBUTTON: aHID.append( "RadioButton" ); break; - case RSC_CHECKBOX: aHID.append( "CheckBox" ); break; - case RSC_TRISTATEBOX: aHID.append( "TristateBox" ); break; - case RSC_EDIT: aHID.append( "Edit" ); break; - case RSC_MULTILINEEDIT: aHID.append( "MultilineEdit" ); break; - case RSC_MULTILISTBOX: aHID.append( "MultiListBox" ); break; - case RSC_LISTBOX: aHID.append( "ListBox" ); break; - case RSC_COMBOBOX: aHID.append( "Combobox" ); break; - case RSC_PUSHBUTTON: aHID.append( "PushButton" ); break; - case RSC_SPINFIELD: aHID.append( "SpinField" ); break; - case RSC_PATTERNFIELD: aHID.append( "PatternField" ); break; - case RSC_NUMERICFIELD: aHID.append( "NumericField" ); break; - case RSC_METRICFIELD: aHID.append( "MetricField" ); break; - case RSC_CURRENCYFIELD: aHID.append( "CurrencyField" ); break; - case RSC_DATEFIELD: aHID.append( "DateField" ); break; - case RSC_TIMEFIELD: aHID.append( "TimeField" ); break; - case RSC_IMAGERADIOBUTTON: aHID.append( "ImageRadioButton" ); break; - case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break; - case RSC_METRICBOX: aHID.append( "MetricBox" ); break; - case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break; - case RSC_DATEBOX: aHID.append( "DateBox" ); break; - case RSC_TIMEBOX: aHID.append( "TimeBox" ); break; - case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break; - case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break; - case RSC_MOREBUTTON: aHID.append( "MoreButton" ); break; - default: - ; + if ( nCurStack == 1 ) + { + // auto help ids for top level windows + switch( pRC->pResource->GetRT() ) { + case RSC_DOCKINGWINDOW: aHID.append( "DockingWindow" ); break; + case RSC_WORKWIN: aHID.append( "WorkWindow" ); break; + case RSC_MODELESSDIALOG: aHID.append( "ModelessDialog" ); break; + case RSC_FLOATINGWINDOW: aHID.append( "FloatingWindow" ); break; + case RSC_MODALDIALOG: aHID.append( "ModalDialog" ); break; + case RSC_TABPAGE: aHID.append( "TabPage" ); break; + default: return rtl::OString(); + } + } + else + { + // only controls with the following parents get auto help ids + const ImpRCStack *pRC1 = StackTop(1); + switch( pRC1->pResource->GetRT() ) { + case RSC_DOCKINGWINDOW: + case RSC_WORKWIN: + case RSC_MODELESSDIALOG: + case RSC_FLOATINGWINDOW: + case RSC_MODALDIALOG: + case RSC_TABPAGE: + // intentionally no breaks! + // auto help ids for controls + switch( pRC->pResource->GetRT() ) { + case RSC_TABCONTROL: aHID.append( "TabControl" ); break; + case RSC_RADIOBUTTON: aHID.append( "RadioButton" ); break; + case RSC_CHECKBOX: aHID.append( "CheckBox" ); break; + case RSC_TRISTATEBOX: aHID.append( "TristateBox" ); break; + case RSC_EDIT: aHID.append( "Edit" ); break; + case RSC_MULTILINEEDIT: aHID.append( "MultilineEdit" ); break; + case RSC_MULTILISTBOX: aHID.append( "MultiListBox" ); break; + case RSC_LISTBOX: aHID.append( "ListBox" ); break; + case RSC_COMBOBOX: aHID.append( "Combobox" ); break; + case RSC_PUSHBUTTON: aHID.append( "PushButton" ); break; + case RSC_SPINFIELD: aHID.append( "SpinField" ); break; + case RSC_PATTERNFIELD: aHID.append( "PatternField" ); break; + case RSC_NUMERICFIELD: aHID.append( "NumericField" ); break; + case RSC_METRICFIELD: aHID.append( "MetricField" ); break; + case RSC_CURRENCYFIELD: aHID.append( "CurrencyField" ); break; + case RSC_DATEFIELD: aHID.append( "DateField" ); break; + case RSC_TIMEFIELD: aHID.append( "TimeField" ); break; + case RSC_IMAGERADIOBUTTON: aHID.append( "ImageRadioButton" ); break; + case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break; + case RSC_METRICBOX: aHID.append( "MetricBox" ); break; + case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break; + case RSC_DATEBOX: aHID.append( "DateBox" ); break; + case RSC_TIMEBOX: aHID.append( "TimeBox" ); break; + case RSC_IMAGEBUTTON: aHID.append( "ImageButton" ); break; + case RSC_MENUBUTTON: aHID.append( "MenuButton" ); break; + case RSC_MOREBUTTON: aHID.append( "MoreButton" ); break; + default: + // no type, no auto HID + return rtl::OString(); + } + break; + default: + return rtl::OString(); + } } // append resource id hierarchy -- cgit From fe8bc0c2c2a2dec162d9da30bb0684f1d00b842c Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 24 Sep 2010 19:54:00 +0200 Subject: CWS changehid: several fixes to work with old testtool --- automation/source/server/cmdbasestream.cxx | 28 ++++++++++++++++++++-------- automation/source/server/retstrm.hxx | 7 +------ automation/source/server/sta_list.cxx | 2 +- 3 files changed, 22 insertions(+), 15 deletions(-) diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx index 827ea93a4796..7f867c3a997c 100644 --- a/automation/source/server/cmdbasestream.cxx +++ b/automation/source/server/cmdbasestream.cxx @@ -68,7 +68,10 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG { 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); } @@ -77,7 +80,10 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_String { 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); } @@ -86,7 +92,10 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_BOOL b { 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); } @@ -95,7 +104,10 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG { 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); @@ -106,7 +118,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(nMethod); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) Write(comm_USHORT(PARAM_ULONG_1)); // Typ der folgenden Parameter Write(nNr); } @@ -115,7 +127,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_Strin { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(nMethod); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) Write(comm_USHORT(PARAM_STR_1)); // Typ der folgenden Parameter Write(pString); } @@ -124,7 +136,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(nMethod); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) Write(comm_USHORT(PARAM_BOOL_1)); // Typ der folgenden Parameter Write(bBool); } @@ -133,7 +145,7 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_USHOR { Write(comm_USHORT(SIReturn)); Write(nRet); - Write(nMethod); + Write((comm_ULONG)nMethod); //HELPID BACKWARD (no ULONG needed) Write(comm_USHORT(PARAM_USHORT_1)); // Typ der folgenden Parameter Write(nNr); } diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx index 0771664e0158..a7033714ba6d 100644 --- a/automation/source/server/retstrm.hxx +++ b/automation/source/server/retstrm.hxx @@ -40,7 +40,6 @@ 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( rtl::OString aUId, String aString ); @@ -49,10 +48,6 @@ public: 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 );} -// needed for RemoteCommand and Profiling - void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nMethod, nNr );} - void GenReturn( comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, nMethod, bBool );} - // MacroRecorder 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 );} @@ -62,8 +57,8 @@ public: 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 ); -// and Profiling void GenReturn( USHORT nRet, USHORT nMethod, String aString ); // MacroRecorder diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx index c491e66885cc..f663665c20b6 100644 --- a/automation/source/server/sta_list.cxx +++ b/automation/source/server/sta_list.cxx @@ -1083,7 +1083,7 @@ void StatementList::ReportError(String aMessage, ULONG nWhatever) void StatementList::DirectLog( ULONG nType, String aMessage ) { if ( pRet ) - pRet->GenReturn( RET_DirectLoging, nType, aMessage ); + pRet->GenReturn( RET_DirectLoging, (USHORT) nType, aMessage ); } -- cgit From 9c29290a086270b46c3ebc435e03fa684644f794 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 24 Sep 2010 19:55:28 +0200 Subject: CWS changehid: need to go back to slot for uno commands that shall be executed with parameters as old testtool can't execute them; this compatibility hack can be removed once autotesting switched to new testtool --- testautomation/global/sid/e_all.sid | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid index 56a3f3d9e371..21f075c44d69 100644 --- a/testautomation/global/sid/e_all.sid +++ b/testautomation/global/sid/e_all.sid @@ -12,7 +12,7 @@ ' **** ' **** All applications FileNewFromTemplate sym:.uno:NewDoc -FileOpen sym:.uno:Open +FileOpen OpenFileSlot FileAutopilotLetter service:com.sun.star.wizards.letter.CallWizard?start FileAutopilotFax service:com.sun.star.wizards.fax.CallWizard?start FileAutopilotAgenda service:com.sun.star.wizards.agenda.CallWizard?start -- cgit From 20846c50fec84a1fa688ea1d307bcf4e0d3fbcca Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 24 Sep 2010 22:08:55 +0200 Subject: CWS changehid: some manual fixes due to wrongly written identifier names in original files --- testautomation/global/win/dial_a_c.win | 66 +++++----- testautomation/global/win/dial_d_h.win | 230 ++++++++++++++++----------------- testautomation/global/win/dial_i_o.win | 92 ++++++------- testautomation/global/win/dial_p_s.win | 72 +++++------ testautomation/global/win/dial_t_z.win | 86 ++++++------ testautomation/global/win/dokument.win | 8 +- testautomation/global/win/edia_d_h.win | 2 +- testautomation/global/win/edia_i_o.win | 12 +- testautomation/global/win/edia_t_z.win | 28 ++-- testautomation/global/win/etab_e_g.win | 2 +- testautomation/global/win/etab_t_z.win | 6 +- testautomation/global/win/tab_a_d.win | 136 +++++++++---------- testautomation/global/win/tab_e_g.win | 72 +++++------ testautomation/global/win/tab_h_o.win | 170 ++++++++++++------------ testautomation/global/win/tab_p_s.win | 68 +++++----- testautomation/global/win/tab_t_z.win | 98 +++++++------- 16 files changed, 574 insertions(+), 574 deletions(-) diff --git a/testautomation/global/win/dial_a_c.win b/testautomation/global/win/dial_a_c.win index 57a248ce0a98..2fb5c1bd024b 100644 --- a/testautomation/global/win/dial_a_c.win +++ b/testautomation/global/win/dial_a_c.win @@ -7,17 +7,17 @@ ZeichenEntfernen sym:cui.NumericField.10023.19 *Aenderungenanzeigen sym:.uno:AcceptChanges TabControl sym:SVX_HID_REDLINING_TABCONTROL TabFilter sym:SVX_HID_REDLINING_FILTER_PAGE SVX:TABPAGE:SID_REDLIN_FILTER_PAGE -Datum sym:SVX_HID_REDLINING_FILTER_CB_DATE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE -DatumListe sym:SVX_HID_REDLINING_FILTER_LB_DATE SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE +Datum sym:SVX_HID_REDLINING_FILTER_CB_DATE svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_DATE +DatumListe sym:SVX_HID_REDLINING_FILTER_LB_DATE svx:ListBox:SID_REDLIN_FILTER_PAGE:LB_DATE Datum1 sym:SVX_HID_REDLINING_FILTER_DF_DATE SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE Zeit1 sym:SVX_HID_REDLINING_FILTER_TF_DATE SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE -Aktuell1 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK +Aktuell1 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK svx:ImageButton:SID_REDLIN_FILTER_PAGE:IB_CLOCK Datum2 sym:SVX_HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 Zeit2 sym:SVX_HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 -Aktuell2 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK2 SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 -Autor sym:SVX_HID_REDLINING_FILTER_CB_AUTOR SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_AUTOR -AutoListe sym:SVX_HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AUTOR -Bereich sym:SVX_HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE +Aktuell2 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK2 svx:ImageButton:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 +Autor sym:SVX_HID_REDLINING_FILTER_CB_AUTOR svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_AUTOR +AutoListe sym:SVX_HID_REDLINING_FILTER_LB_AUTOR svx:ListBox:SID_REDLIN_FILTER_PAGE:LB_AUTOR +Bereich sym:SVX_HID_REDLINING_FILTER_CB_RANGE svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_RANGE BereichText sym:SVX_HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE Button sym:SVX_HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF Aktion sym:SVX_HID_REDLINING_FILTER_CB_RANGE @@ -88,7 +88,7 @@ ImDateisystem sym:sw.CheckBox.21661.68 ImInternet sym:sw.CheckBox.21661.69 Menue sym:sw.MenuButton.21661.52 Bereiche sym:sw.PushButton.21661.54 -Pfade SW:PUSHBUTTON:DLG_GLOSSARY:PB_PATH +Pfade sym:sw.PushButton.21661.56 Vorschau_anzeigen sym:sw.CheckBox.21661.73 *AutoFormatCalc sym:.uno:AutoFormat @@ -119,36 +119,36 @@ Ausrichtung sym:sw.CheckBox.21459.25 Umrandung sym:sw.CheckBox.21459.21 Schriftart sym:sw.CheckBox.21459.23 Muster sym:sw.CheckBox.21459.24 -Zahlenformat SW:CHECKBOX:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT -Umbenennen SW:PUSHBUTTON:DLG_AUTOFMT_TABLE:BTN_RENAME +Zahlenformat sym:sw.CheckBox.21459.20 +Umbenennen sym:sw.PushButton.21459.107 *BedingteFormatierung sym:SC_HID_SCDLG_CONDFORMAT sc:ModelessDialog:RID_SCDLG_CONDFORMAT Bedingung1 sym:sc.CheckBox.25700.1 PopupList1 sym:sc.ListBox.25700.2 Vergleich1 sym:sc.ListBox.25700.3 TextField1 sym:sc.Edit.25700.4 -TextField12 SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND1_2 +TextField12 sym:sc.Edit.25700.7 Zellvorlage1 sym:sc.ListBox.25700.10 Minimieren1 sym:sc.ImageButton.25700.5 -Minimieren12 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND1_2 +Minimieren12 sym:sc.ImageButton.25700.8 NewStyle1 sym:sc.PushButton.25700.34 Bedingung2 sym:sc.CheckBox.25700.11 PopupList2 sym:sc.ListBox.25700.12 Vergleich2 sym:sc.ListBox.25700.13 TextField2 sym:sc.Edit.25700.14 -TextField22 SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND2_2 +TextField22 sym:sc.Edit.25700.17 Zellvorlage2 sym:sc.ListBox.25700.20 Minimieren2 sym:sc.ImageButton.25700.15 -Minimieren22 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND2_2 +Minimieren22 sym:sc.ImageButton.25700.18 NewStyle2 sym:sc.PushButton.25700.35 Bedingung3 sym:sc.CheckBox.25700.21 PopupList3 sym:sc.ListBox.25700.22 Vergleich3 sym:sc.ListBox.25700.23 TextField3 sym:sc.Edit.25700.24 -TextField32 SC:EDIT:RID_SCDLG_CONDFORMAT:EDT_COND3_2 +TextField32 sym:sc.Edit.25700.27 Zellvorlage3 sym:sc.ListBox.25700.30 Minimieren3 sym:sc.ImageButton.25700.25 -Minimieren32 SC:IMAGEBUTTON:RID_SCDLG_CONDFORMAT:RB_COND3_2 +Minimieren32 sym:sc.ImageButton.25700.28 NewStyle3 sym:sc.PushButton.25700.36 *Bemassung sym:CUI_HID_PAGE_MEASURE @@ -189,7 +189,7 @@ NameBenutzerverzeichnis sym:sw.Edit.21967.39 *BereicheBearbeiten sym:.uno:EditRegion Bereich sym:SW_HID_REGION_TREE -BereichsName SW:EDIT:MD_EDIT_REGION:ED_RANAME +BereichsName sym:sw.Edit.20269.19 Geschuetzt sym:sw.TriStateBox.20269.10 Ausblenden sym:sw.TriStateBox.20269.8 Bedingung sym:sw.Edit.20269.13 @@ -197,7 +197,7 @@ Verknuepfung sym:sw.TriStateBox.20269.5 DDE sym:sw.CheckBox.20269.1 Dateiname sym:sw.Edit.20269.16 OptionenBereich sym:sw.ComboBox.20269.38 -Aufheben SW:PUSHBUTTON:MD_EDIT_REGION:CB_DISMISS +Aufheben sym:sw.PushButton.20269.2 ' Spalten sw:PushButton:MD_INS_REGION:PB_COLUMNS Durchsuchen sym:sw.PushButton.20269.40 Passwort sym:sw.CheckBox.20269.9 @@ -205,22 +205,22 @@ Optionen sym:sw.PushButton.20269.43 EnterPasswort sym:sw.PushButton.20269.51 *BereicheBearbeitenAutoText sym:SW_HID_BIB_BASE -Bereich SW:EDIT:DLG_BIB_BASE:ED_NAME -Pfad SW:LISTBOX:DLG_BIB_BASE:LB_PATH +Bereich sym:sw.Edit.21666.10 +Pfad sym:sw.ListBox.21666.8 Liste sym:SW_HID_GLOS_GROUP_TREE -Neu SW:PUSHBUTTON:DLG_BIB_BASE:PB_NEW -Loeschen SW:PUSHBUTTON:DLG_BIB_BASE:PB_DELETE -Umbenennen SW:PUSHBUTTON:DLG_BIB_BASE:PB_RENAME +Neu sym:sw.PushButton.21666.3 +Loeschen sym:sw.PushButton.21666.4 +Umbenennen sym:sw.PushButton.21666.11 *BereicheSchuetzen sym:SW_HID_DLG_PASSWD_SECTION PasswortName sym:sfx2.Edit.2316.14 PasswortBestaetigen sym:sfx2.Edit.2316.16 *Beschriftung sym:SW_HID_DLG_CAPTION sym:.uno:InsertCaptionDialog -Kategorie SW:COMBOBOX:DLG_CAPTION:BOX_CATEGORY -Numerierung SW:LISTBOX:DLG_CAPTION:BOX_FORMAT -BeschriftungsText SW:EDIT:DLG_CAPTION:EDT_TEXT -Position SW:LISTBOX:DLG_CAPTION:BOX_POS +Kategorie sym:sw.ComboBox.21011.5 +Numerierung sym:sw.ListBox.21011.7 +BeschriftungsText sym:sw.Edit.21011.9 +Position sym:sw.ListBox.21011.11 WeitereOptionen sym:sw.PushButton.21011.14 Separator sym:sw.Edit.21011.25 @@ -232,12 +232,12 @@ Spaltenkoepfe sym:sc.RadioButton.25716.15 Zeilenkoepfe sym:sc.RadioButton.25716.16 Hinzufuegen sym:sc.PushButton.25716.3 Loeschen sym:sc.PushButton.25716.4 -Datenbereich SC:EDIT:RID_SCDLG_COLROWNAMERANGES:ED_DATA -ButtonDatenbereich SC:IMAGEBUTTON:RID_SCDLG_COLROWNAMERANGES:RB_DATA +Datenbereich sym:sc.Edit.25716.17 +ButtonDatenbereich sym:sc.ImageButton.25716.18 *Bildschirmpraesentation sym:.uno:Presentation AlleDias sym:sd.RadioButton.20003.1 -AbDia SD:RADIOBUTTON:DLG_START_PRESENTATION:RBT_AT_DIA +AbDia sym:sd.RadioButton.20003.2 AbDiaName sym:sd.ListBox.20003.1 RangeCustomSlideShow sym:sd.RadioButton.20003.3 'IndividuellePraesentation sym:sd.RadioButton.20003.3 @@ -247,12 +247,12 @@ Fenster sym:sd.RadioButton.20003.5 Auto sym:sd.RadioButton.20003.6 Zeit sym:sd.TimeField.20003.1 LogoAnzeigen sym:sd.CheckBox.20003.1 -DiawechselManuel SD:CHECKBOX:DLG_START_PRESENTATION:CBX_MANUEL +DiawechselManuel sym:sd.CheckBox.20003.2 MauszeigerSichtbar sym:sd.CheckBox.20003.3 -MauszeigerAlsStift SD:CHECKBOX:DLG_START_PRESENTATION:CBX_PEN +MauszeigerAlsStift sym:sd.CheckBox.20003.4 NavigatorSichtbar sym:sd.CheckBox.20003.5 AnimationenZulassen sym:sd.CheckBox.20003.6 -DiawechselAufHintergrund SD:CHECKBOX:DLG_START_PRESENTATION:CBX_CHANGE_PAGE +DiawechselAufHintergrund sym:sd.CheckBox.20003.7 PraesentationImmerImVordergrund sym:sd.CheckBox.20003.8 *BMPOptionen sym:svtools.ModalDialog.16371 diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win index e645f5a649d7..9ef74d6e5ad0 100644 --- a/testautomation/global/win/dial_d_h.win +++ b/testautomation/global/win/dial_d_h.win @@ -28,13 +28,13 @@ Pfade sym:cui.ListBox.10201.11 Zusaetze sym:sc.MoreButton.25638.4 DataPilotRange sym:sc.Edit.25638.42 DataPilotRangeShrink sym:sc.ImageButton.25638.41 -AusgabeAb SC:LISTBOX:RID_SCDLG_PIVOT_LAYOUT:LB_OUTAREA -Bereich SC:EDIT:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA -Minimieren SC:IMAGEBUTTON:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA -LeerzeilenIgnorieren SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_IGNEMPTYROWS -KategorieErkennung SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_DETECTCAT -GesamtSpalten SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALCOL -GesamtZeilen SC:CHECKBOX:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALROW +AusgabeAb sym:sc.ListBox.25638.22 +Bereich sym:sc.Edit.25638.23 +Minimieren sym:sc.ImageButton.25638.24 +LeerzeilenIgnorieren sym:sc.CheckBox.25638.25 +KategorieErkennung sym:sc.CheckBox.25638.26 +GesamtSpalten sym:sc.CheckBox.25638.27 +GesamtZeilen sym:sc.CheckBox.25638.28 Entfernen sym:sc.PushButton.25638.5 Optionen sym:sc.PushButton.25638.6 AddFilter sym:sc.CheckBox.25638.29 @@ -99,57 +99,57 @@ Bearbeiten sym:sfx2.PushButton.2054.12 Verwalten sym:sfx2.PushButton.2054.20 *Drei_D_Effekte sym:.uno:Window3D -Geometrie SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_GEO -Darstellung SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_REPRESENTATION -Beleuchtung SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT -Texturen SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEXTURE -Material SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_MATERIAL -Aktualisieren SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_UPDATE -Zuweisen SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_ASSIGN -Perspektive SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_PERSPECTIVE -Rotationskoerper SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LATHE_OBJ -In_3D_Umwandeln SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_CHANGE_TO_3D -Objektspezifisch SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ -Flach SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT -Kugelfoermig SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE -NormalenUmkehren SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT -ZweiSeitigeBeleuchtung SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING -Doppelseitig SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED -Drei_DSchatten SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_SHADOW_3D -Lichquelle1 SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_1 -Lichquelle2 SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_2 -Lichquelle3 SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_3 -Lichquelle4 SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_4 -Lichquelle5 SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_5 -Lichquelle6 SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_6 -Lichquelle7 SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_7 -Lichquelle8 SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_8 -FarbeUeberDialogAmbient SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_AMBIENT_COLOR -FarbeUeberDialogSpecular SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_SPECULAR_COLOR -FarbeUeberDialogEmission SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_EMISSION_COLOR -FarbeUeberDialogLicht SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LIGHT_COLOR -Schwarzweiss SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE -FarbeTextur SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_COLOR -Textur SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_REPLACE -Textur_Schattierung SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_MODULATE -Textur_Schattierung_Farbe SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_BLEND -ObjektspezifischX SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X -ObjektspezifischY SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y -ParallelX SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X -KreisfoermigX SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X -ParallelY SVX:IMAGEBUTTON:RID_SVXFLOAt_3D:BTN_TEX_PARALLEL_Y -KreisfoermigY SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y -Filtern SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_TEX_FILTER -MaterialFarbe SVX:LISTBOX:RID_SVXFLOAT_3D:LB_MAT_COLOR -EmissionsFarbe SVX:LISTBOX:RID_SVXFLOAT_3D:LB_MAT_EMISSION -SpecularFarbe SVX:LISTBOX:RID_SVXFLOAT_3D:LB_MAT_SPECULAR -MaterialFarbeUeberDialog SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_MAT_COLOR -Materialeditor SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_MATERIAL -UmwandelnIn3D SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_CHANGE_TO_3D -UmwandelnInRotationskoerper SVX:IMAGEBUTTON:RID_SVXFLOAT_3D:BTN_LATHE_OBJ -Umgebungslicht SVX:LISTBOX:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT -Horizontale_Segmente SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_HORIZONTAL -Vertikale_Segmente SVX:NUMERICFIELD:RID_SVXFLOAT_3D:NUM_VERTICAL +Geometrie sym:svx.ImageButton.10209.2 +Darstellung sym:svx.ImageButton.10209.3 +Beleuchtung sym:svx.ImageButton.10209.4 +Texturen sym:svx.ImageButton.10209.5 +Material sym:svx.ImageButton.10209.6 +Aktualisieren sym:svx.ImageButton.10209.7 +Zuweisen sym:svx.ImageButton.10209.8 +Perspektive sym:svx.ImageButton.10209.9 +Rotationskoerper sym:svx.ImageButton.10209.11 +In_3D_Umwandeln sym:svx.ImageButton.10209.10 +Objektspezifisch sym:svx.ImageButton.10209.38 +Flach sym:svx.ImageButton.10209.39 +Kugelfoermig sym:svx.ImageButton.10209.40 +NormalenUmkehren sym:svx.ImageButton.10209.42 +ZweiSeitigeBeleuchtung sym:svx.ImageButton.10209.41 +Doppelseitig sym:svx.ImageButton.10209.44 +Drei_DSchatten sym:svx.ImageButton.10209.47 +Lichquelle1 sym:svx.ImageButton.10209.60 +Lichquelle2 sym:svx.ImageButton.10209.61 +Lichquelle3 sym:svx.ImageButton.10209.62 +Lichquelle4 sym:svx.ImageButton.10209.63 +Lichquelle5 sym:svx.ImageButton.10209.64 +Lichquelle6 sym:svx.ImageButton.10209.65 +Lichquelle7 sym:svx.ImageButton.10209.66 +Lichquelle8 sym:svx.ImageButton.10209.67 +FarbeUeberDialogAmbient sym:svx.ImageButton.10209.79 +FarbeUeberDialogSpecular sym:svx.ImageButton.10209.120 +FarbeUeberDialogEmission sym:svx.ImageButton.10209.117 +FarbeUeberDialogLicht sym:svx.ImageButton.10209.76 +Schwarzweiss sym:svx.ImageButton.10209.91 +FarbeTextur sym:svx.ImageButton.10209.92 +Textur sym:svx.ImageButton.10209.94 +Textur_Schattierung sym:svx.ImageButton.10209.95 +Textur_Schattierung_Farbe sym:svx.ImageButton.10209.96 +ObjektspezifischX sym:svx.ImageButton.10209.100 +ObjektspezifischY sym:svx.ImageButton.10209.104 +ParallelX sym:svx.ImageButton.10209.98 +KreisfoermigX sym:svx.ImageButton.10209.99 +ParallelY sym:svx.ImageButton.10209.102 +KreisfoermigY sym:svx.ImageButton.10209.103 +Filtern sym:svx.ImageButton.10209.106 +MaterialFarbe sym:svx.ListBox.10209.113 +EmissionsFarbe sym:svx.ListBox.10209.116 +SpecularFarbe sym:svx.ListBox.10209.119 +MaterialFarbeUeberDialog sym:svx.ImageButton.10209.114 +Materialeditor sym:svx.ImageButton.10209.6 +UmwandelnIn3D sym:svx.ImageButton.10209.10 +UmwandelnInRotationskoerper sym:svx.ImageButton.10209.11 +Umgebungslicht sym:svx.ListBox.10209.78 +Horizontale_Segmente sym:svx.NumericField.10209.25 +Vertikale_Segmente sym:svx.NumericField.10209.27 Kantenrundung sym:svx.MetricField.10209.30 Tiefenskalierung sym:svx.MetricField.10209.32 Endwinkel sym:svx.MetricField.10209.34 @@ -266,9 +266,9 @@ Druckbar sym:sd.CheckBox.259.8 Gesperrt sym:sd.CheckBox.259.9 *Eingabefeld sym:SW_HID_FLD_INPUT -Titel SW:EDIT:DLG_FLD_INPUT:ED_LABEL +Titel sym:sw.Edit.21105.7 EingabeText sym:sw.MultiLineEdit.21105.3 -Weiter SW:PUSHBUTTON:DLG_FLD_INPUT:PB_NEXT +Weiter sym:sw.PushButton.21105.8 *EMFOptionen sym:svtools.ModalDialog.16372 Original sym:svtools.RadioButton.16372.1 @@ -287,7 +287,7 @@ LZWKodierung sym:filter.RadioButton.17408.5 Keine sym:filter.RadioButton.17408.6 *EtikettenSynchronisieren sym:SW_HID_SYNC_BTN -Synchronisieren SW:PUSHBUTTON:DLG_SYNC_BTN:BTN_SYNC +Synchronisieren sym:sw.PushButton.22759.20 *ExportCalc sym:SC_HID_SC_INPORTOPT Zeichensatzliste sym:sc.ListBox.25663.10 @@ -318,55 +318,55 @@ Zurueck sym:cui.PushButton.17015.4 *FeldAuswahl sym:SVX_HID_FIELD_SEL_WIN Liste sym:SVX_HID_FIELD_SEL -*FeldbefehlBearbeitenDraw SD:MODALDIALOG:DLG_FIELD_MODIFY -FeldtypFix SD:RADIOBUTTON:DLG_FIELD_MODIFY:RBT_FIX -FeldtypVariabel SD:RADIOBUTTON:DLG_FIELD_MODIFY:RBT_VAR +*FeldbefehlBearbeitenDraw sym:sd.ModalDialog.448 +FeldtypFix sym:sd.RadioButton.448.1 +FeldtypVariabel sym:sd.RadioButton.448.2 *FeldbefehlBearbeitenDatenbank sym:SW_HID_EDIT_FLD_DB Bearbeiten sym:SW_HID_FLDEDT_ADDRESS -Feldtyp SW:LISTBOX:TP_FLD_DB:LB_DBTYPE +Feldtyp sym:sw.ListBox.20864.2 Datenbankauswahl sym:SW_HID_DB_SELECTION_TLB -Bedingung SW:EDIT:TP_FLD_DB:ED_DBCONDITION -Satznummer SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER -AusDatenbank SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT -Selbstdefiniert SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT -Formatliste SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT -Zahlenformat SW:LISTBOX:TP_FLD_DB:LB_DBNUMFORMAT +Bedingung sym:sw.Edit.20864.8 +Satznummer sym:sw.Edit.20864.9 +AusDatenbank sym:sw.RadioButton.20864.13 +Selbstdefiniert sym:sw.RadioButton.20864.12 +Formatliste sym:sw.ListBox.20864.10 +Zahlenformat sym:sw.ListBox.20864.11 *FeldbefehlBearbeitenDokument sym:SW_HID_EDIT_FLD_DOK Bearbeiten sym:SW_HID_FLDEDT_ADDRESS -Feldtyp SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE -Auswahl SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION -Editfeld SW:EDIT:TP_FLD_DOK:ED_DOKVALUE -DokLevel SW:NUMERICFIELD:TP_FLD_DOK:ED_DOKLEVEL -Formatliste SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT -Zahlenformat SW:LISTBOX:TP_FLD_DOK:LB_DOKNUMFORMAT -InhaltFix SW:CHECKBOX:TP_FLD_DOK:CB_DOKFIXEDCONTENT +Feldtyp sym:sw.ListBox.20867.48 +Auswahl sym:sw.ListBox.20867.50 +Editfeld sym:sw.Edit.20867.55 +DokLevel sym:sw.NumericField.20867.56 +Formatliste sym:sw.ListBox.20867.52 +Zahlenformat sym:sw.ListBox.20867.51 +InhaltFix sym:sw.CheckBox.20867.58 VorigerFeldbefehl sym:SW_HID_DLG_FLDEDT_PREV NaechsterFeldbefehl sym:SW_HID_DLG_FLDEDT_NEXT *FeldbefehlBearbeitenDokumentinfo sym:SW_HID_EDIT_FLD_DOKINF Bearbeiten sym:SW_HID_FLDEDT_ADDRESS Feldtyp sym:SW_HID_FIELD_DINF_TYPE -Auswahl SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFSELECTION -Zahlenformat SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFFORMAT -InhaltFix SW:CHECKBOX:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT +Auswahl sym:sw.ListBox.20865.18 +Zahlenformat sym:sw.ListBox.20865.20 +InhaltFix sym:sw.CheckBox.20865.21 *FeldbefehlBearbeitenFunktionen sym:SW_HID_EDIT_FLD_FUNC Bearbeiten sym:SW_HID_FLDEDT_ADDRESS -Feldtyp SW:LISTBOX:TP_FLD_FUNC:LB_FUNCTYPE -Auswahl SW:LISTBOX:TP_FLD_FUNC:LB_FUNCSELECTION -Formatliste SW:LISTBOX:TP_FLD_FUNC:LB_FUNCFORMAT -Bedingung SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME -Dann SW:EDIT:TP_FLD_FUNC:ED_FUNCCOND1 -Sonst SW:EDIT:TP_FLD_FUNC:ED_FUNCCOND2 -Wert SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE -MakroButton SW:PUSHBUTTON:TP_FLD_FUNC:BT_FUNCMACRO -Namefeld SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME -Hinweis SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE -Makroname SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME -Platzhalter SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME -Texteinfuegen SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE +Feldtyp sym:sw.ListBox.20868.65 +Auswahl sym:sw.ListBox.20868.66 +Formatliste sym:sw.ListBox.20868.69 +Bedingung sym:sw.Edit.20868.71 +Dann sym:sw.Edit.20868.75 +Sonst sym:sw.Edit.20868.77 +Wert sym:sw.Edit.20868.73 +MakroButton sym:sw.PushButton.20868.78 +Namefeld sym:sw.Edit.20868.71 +Hinweis sym:sw.Edit.20868.73 +Makroname sym:sw.Edit.20868.71 +Platzhalter sym:sw.Edit.20868.71 +Texteinfuegen sym:sw.Edit.20868.73 AddListEntry sym:sw.PushButton.20868.82 NewListEntry sym:sw.Edit.20868.81 EntrysList sym:sw.ListBox.20868.84 @@ -379,24 +379,24 @@ NaechsterFeldbefehl sym:SW_HID_DLG_FLDEDT_NEXT *FeldbefehlBearbeitenReferenz sym:SW_HID_EDIT_FLD_REF Bearbeiten sym:SW_HID_FLDEDT_ADDRESS -Feldtyp SW:LISTBOX:TP_FLD_REF:LB_REFTYPE -Auswahl SW:LISTBOX:TP_FLD_REF:LB_REFSELECTION -Formatliste SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT -Namefeld SW:EDIT:TP_FLD_REF:ED_REFNAME -Wert SW:EDIT:TP_FLD_REF:ED_REFVALUE +Feldtyp sym:sw.ListBox.20869.81 +Auswahl sym:sw.ListBox.20869.83 +Formatliste sym:sw.ListBox.20869.85 +Namefeld sym:sw.Edit.20869.88 +Wert sym:sw.Edit.20869.90 *FeldbefehlBearbeitenVariable sym:SW_HID_EDIT_FLD_VAR Bearbeiten sym:SW_HID_FLDEDT_ADDRESS -Feldtyp SW:LISTBOX:TP_FLD_VAR:LB_VARTYPE -Auswahl SW:LISTBOX:TP_FLD_VAR:LB_VARSELECTION -Formatliste SW:LISTBOX:TP_FLD_VAR:LB_VARFORMAT -Zahlenformat SW:LISTBOX:TP_FLD_VAR:LB_VARNUMFORMAT -NameText SW:EDIT:TP_FLD_VAR:ED_VARNAME -Wert SW:EDIT:TP_FLD_VAR:ED_VARVALUE -Hinweis SW:EDIT:TP_FLD_VAR:ED_VARVALUE -Korrektur SW:EDIT:TP_FLD_VAR:ED_VARVALUE -Formel SW:EDIT:TP_FLD_VAR:ED_VARVALUE -Unsichtbar SW:CHECKBOX:TP_FLD_VAR:CB_VARINVISIBLE +Feldtyp sym:sw.ListBox.20866.27 +Auswahl sym:sw.ListBox.20866.29 +Formatliste sym:sw.ListBox.20866.36 +Zahlenformat sym:sw.ListBox.20866.35 +NameText sym:sw.Edit.20866.31 +Wert sym:sw.Edit.20866.33 +Hinweis sym:sw.Edit.20866.33 +Korrektur sym:sw.Edit.20866.33 +Formel sym:sw.Edit.20866.33 +Unsichtbar sym:sw.CheckBox.20866.40 Uebernehmen sym:SW_HID_FLDVAR_APPLY Loeschen sym:SW_HID_FLDVAR_DELETE @@ -445,9 +445,9 @@ Liste sym:SVX_HID_FORM_NAVIGATOR Automatisch sym:sw.RadioButton.21662.1 Zeichen sym:sw.RadioButton.21662.2 ZeichenText sym:sw.Edit.21662.3 -Durchsuchen SW:PUSHBUTTON:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR -Fussnote SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_FTN -Endnote SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE +Durchsuchen sym:sw.PushButton.21662.4 +Fussnote sym:sw.RadioButton.21662.7 +Endnote sym:sw.RadioButton.21662.8 VorherigeFussnote sym:sw.ImageButton.21662.103 NachfolgendeFussnote sym:sw.ImageButton.21662.104 @@ -455,9 +455,9 @@ NachfolgendeFussnote sym:sw.ImageButton.21662.104 Automatisch sym:sw.RadioButton.21662.1 Zeichen sym:sw.RadioButton.21662.2 ZeichenText sym:sw.Edit.21662.3 -Durchsuchen SW:PUSHBUTTON:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR -Fussnote SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_FTN -Endnote SW:RADIOBUTTON:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE +Durchsuchen sym:sw.PushButton.21662.4 +Fussnote sym:sw.RadioButton.21662.7 +Endnote sym:sw.RadioButton.21662.8 *Gallerybeamer sym:.uno:Beamer Anzeige sym:SVX_HID_GALLERY_WINDOW diff --git a/testautomation/global/win/dial_i_o.win b/testautomation/global/win/dial_i_o.win index 822b6b4d4634..456b01556b61 100644 --- a/testautomation/global/win/dial_i_o.win +++ b/testautomation/global/win/dial_i_o.win @@ -31,20 +31,20 @@ Name sym:cui.Edit.10102.3 Description sym:cui.MultiLineEdit.10102.4 *IndividuellePraesentation sym:.uno:CustomShowDialog -Neu SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_NEW -Bearbeiten SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_EDIT -Loeschen SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_REMOVE -Kopieren SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_COPY -Starten SD:PUSHBUTTON:DLG_CUSTOMSHOW:BTN_STARTSHOW -IndividuellePraesentationBenutzen SD:CHECKBOX:DLG_CUSTOMSHOW:CBX_USE_CUSTOMSHOW +Neu sym:sd.PushButton.843.1 +Bearbeiten sym:sd.PushButton.843.2 +Loeschen sym:sd.PushButton.843.3 +Kopieren sym:sd.PushButton.843.4 +Starten sym:sd.PushButton.843.5 +IndividuellePraesentationBenutzen sym:sd.CheckBox.843.1 CustomSlideShowList sym:sd.ListBox.843.1 *IndividuellePraesentationDefinieren sym:SD_HID_DLG_DEFINE_CUSTOMSHOW -PraesentationName SD:EDIT:DLG_DEFINE_CUSTOMSHOW:EDT_NAME -SeitenPraesentation SD:MULTILISTBOX:DLG_DEFINE_CUSTOMSHOW:LB_PAGES +PraesentationName sym:sd.Edit.890.1 +SeitenPraesentation sym:sd.MultiListBox.890.1 SelectedSlides sym:SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL -Hinzufuegen SD:PUSHBUTTON:DLG_DEFINE_CUSTOMSHOW:BTN_ADD -Entfernen SD:PUSHBUTTON:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE +Hinzufuegen sym:sd.PushButton.890.1 +Entfernen sym:sd.PushButton.890.3 *InfofelderBearbeiten sym:SFX2_HID_DOCINFO_EDT Name0 sym:sfx2.Edit.266.5 @@ -59,9 +59,9 @@ Namen3 sym:sfx2.Edit.266.9 Namen4 sym:sfx2.Edit.266.11 *InhaltEinfuegen sym:CUI_HID_PASTE_DLG -AlsSymbol cui:CHECKBOX:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON -AndersSymbol cui:PUSHBUTTON:MD_PASTE_OBJECT:PB_CHANGE_ICON -VerknuepfungMit cui:RADIOBUTTON:MD_PASTE_OBJECT:RB_PASTE_LINK +AlsSymbol sym:cui.CheckBox.32001.12 +AndersSymbol sym:cui.PushButton.32001.14 +VerknuepfungMit sym:cui.RadioButton.32001.21 Auswahl sym:cui.ListBox.32001.7 EinfuegenAls sym:cui.RadioButton.32001.20 @@ -82,9 +82,9 @@ Addieren sym:sc.RadioButton.25618.28 Subtrahieren sym:sc.RadioButton.25618.29 Multiplizieren sym:sc.RadioButton.25618.30 Dividieren sym:sc.RadioButton.25618.31 -NichtVerschieben SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE -NachUnten SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN -NachRechts SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT +NichtVerschieben sym:sc.RadioButton.25618.37 +NachUnten sym:sc.RadioButton.25618.38 +NachRechts sym:sc.RadioButton.25618.39 *InhalteLoeschen sym:.uno:Delete Alles sym:sc.CheckBox.25617.10 @@ -116,20 +116,20 @@ Zurueck sym:CUI_HID_REDLINING_PREV Vor sym:CUI_HID_REDLINING_NEXT *Konsolidieren sym:.uno:DataConsolidate -Berechnungsvorschrift SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_FUNC -Konsolidierungsbereiche SC:MULTILISTBOX:RID_SCDLG_CONSOLIDATE:LB_CONSAREAS -Quelldatenbereich SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_DATA_AREA -Quelldaten SC:EDIT:RID_SCDLG_CONSOLIDATE:ED_DATA_AREA -ButtonQuelldaten SC:IMAGEBUTTON:RID_SCDLG_CONSOLIDATE:RB_DATA_AREA -AusgebenBereich SC:LISTBOX:RID_SCDLG_CONSOLIDATE:LB_DEST_AREA -Ausgeben SC:EDIT:RID_SCDLG_CONSOLIDATE:ED_DEST_AREA -ButtonAusgeben SC:IMAGEBUTTON:RID_SCDLG_CONSOLIDATE:RB_DEST_AREA -Zeilenbeschriftung SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_BYROW -Spaltenkoepfen SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_BYCOL -MitQuelldatenVerbinden SC:CHECKBOX:RID_SCDLG_CONSOLIDATE:BTN_REFS -Loeschen SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_REMOVE -Hinzufuegen SC:PUSHBUTTON:RID_SCDLG_CONSOLIDATE:BTN_ADD -Zusaetze SC:MOREBUTTON:RID_SCDLG_CONSOLIDATE:BTN_MORE +Berechnungsvorschrift sym:sc.ListBox.25639.12 +Konsolidierungsbereiche sym:sc.MultiListBox.25639.22 +Quelldatenbereich sym:sc.ListBox.25639.32 +Quelldaten sym:sc.Edit.25639.33 +ButtonQuelldaten sym:sc.ImageButton.25639.34 +AusgebenBereich sym:sc.ListBox.25639.42 +Ausgeben sym:sc.Edit.25639.43 +ButtonAusgeben sym:sc.ImageButton.25639.44 +Zeilenbeschriftung sym:sc.CheckBox.25639.51 +Spaltenkoepfen sym:sc.CheckBox.25639.52 +MitQuelldatenVerbinden sym:sc.CheckBox.25639.61 +Loeschen sym:sc.PushButton.25639.6 +Hinzufuegen sym:sc.PushButton.25639.5 +Zusaetze sym:sc.MoreButton.25639.4 *KonturEditor sym:svx.FloatingWindow.10461 Zuweisen sym:SVX_HID_CONTDLG_APPLY @@ -259,11 +259,11 @@ Vorgaben1 sym:sc.ImageButton.25662.1 Vorgaben2 sym:sc.ImageButton.25662.2 Vorgaben3 sym:sc.ImageButton.25662.3 -*MetOptionen FILTER:MODALDIALOG:DLG_EXPORT_EMET -Original FILTER:RADIOBUTTON:DLG_EXPORT_EMET:RB_ORIGINAL -Groesse FILTER:RADIOBUTTON:DLG_EXPORT_EMET:RB_SIZE -Breite FILTER:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEX -Hoehe FILTER:METRICFIELD:DLG_EXPORT_EMET:MTF_SIZEY +*MetOptionen sym:filter.ModalDialog.17402 +Original sym:filter.RadioButton.17402.1 +Groesse sym:filter.RadioButton.17402.2 +Breite sym:filter.MetricField.17402.1 +Hoehe sym:filter.MetricField.17402.2 *ModuleBearbeiten sym:CUI_HID_EDIT_MODULES Sprache sym:cui.ListBox.10831.319 @@ -410,9 +410,9 @@ Bibliotheksname sym:basctl.Edit.14892.41 Dialogname sym:basctl.Edit.14892.41 *NeuesFangobjekt sym:.uno:CapturePoint -Horizontal SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_HORIZONTAL -Vertikal SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_VERTICAL -Punkt SD:IMAGERADIOBUTTON:DLG_SNAPLINE:RB_POINT +Horizontal sym:sd.ImageRadioButton.312.11 +Vertikal sym:sd.ImageRadioButton.312.12 +Punkt sym:sd.ImageRadioButton.312.13 X sym:sd.MetricField.312.7 Y sym:sd.MetricField.312.9 @@ -422,8 +422,8 @@ Modulname sym:basctl.Edit.14892.41 *NotizBearbeiten sym:CUI_HID_POSTIT_DIALOG Texteingabe sym:cui.MultiLineEdit.10008.13 sw:MultiLineEdit:DLG_POSTIT:ED_EDIT Autor sym:cui.PushButton.10008.17 sw:PushButton:DLG_POSTIT:BTN_AUTHOR -Vor cui:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_NEXT -Zurueck cui:IMAGEBUTTON:RID_SVXDLG_POSTIT:BTN_PREV +Vor sym:cui.ImageButton.10008.16 +Zurueck sym:cui.ImageButton.10008.15 *NummernkreisOptionen sym:SW_HID_DLG_SEQUENCE_OPTION Ebene sym:sw.ListBox.21012.17 @@ -445,11 +445,11 @@ ObjektListe sym:BASCTL_HID_BASICIDE_OBJECTCAT Objektname sym:sw.Edit.20888.2 *OLEObjektEinfuegen sym:.uno:InsertObject -NeuErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT -AusDateiErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE -Objekttyp cui:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE -OleDatei cui:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH -Verknuepfen cui:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK -Durchsuchen cui:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH +NeuErstellen sym:cui.RadioButton.32010.10 +AusDateiErstellen sym:cui.RadioButton.32010.11 +Objekttyp sym:cui.ListBox.32010.12 +OleDatei sym:cui.Edit.32010.10 +Verknuepfen sym:cui.CheckBox.32010.12 +Durchsuchen sym:cui.PushButton.32010.11 +OptionenDlg ExtrasOptionenDlg diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win index 4e8048b05c2e..1b86ca492a7a 100644 --- a/testautomation/global/win/dial_p_s.win +++ b/testautomation/global/win/dial_p_s.win @@ -25,8 +25,8 @@ Ascii sym:filter.RadioButton.17409.2 *PfadeAuswaehlen sym:CUI_HID_MULTIPATH Pfade sym:CUI_HID_OPTIONS_MULTIPATH_LIST -Hinzufuegen cui:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH -Loeschen cui:PUSHBUTTON:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH +Hinzufuegen sym:cui.PushButton.10201.14 +Loeschen sym:cui.PushButton.10201.15 *PGMOptionen sym:filter.ModalDialog.17410 Binaer sym:filter.RadioButton.17410.1 @@ -75,9 +75,9 @@ RegularExpression sym:sc.CheckBox.25637.3 NoDuplication sym:sc.CheckBox.25637.1 *PlugInEinfuegen sym:.uno:InsertPlugin -DateiUrl cui:EDIT:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL -Durchsuchen cui:PUSHBUTTON:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL -Optionen cui:MULTILINEEDIT:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS +DateiUrl sym:cui.Edit.32008.10 +Durchsuchen sym:cui.PushButton.32008.11 +Optionen sym:cui.MultiLineEdit.32008.20 *PNGOptionen sym:svtools.ModalDialog.16486 Kompression sym:svtools.NumericField.16486.1 @@ -113,23 +113,23 @@ AlleAblehnen sym:SVX_HID_REDLINING_VIEW_PB_REJECTALL Undo sym:SVX_HID_REDLINING_VIEW_PB_UNDO TabFilter sym:SVX_HID_REDLINING_FILTER_PAGE cui:TABPAGE:SID_REDLIN_FILTER_PAGE -Datum sym:SVX_HID_REDLINING_FILTER_CB_DATE cui:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_DATE -DatumListe sym:SVX_HID_REDLINING_FILTER_LB_DATE cui:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_DATE +Datum sym:SVX_HID_REDLINING_FILTER_CB_DATE cui:CheckBox:SID_REDLIN_FILTER_PAGE:CB_DATE +DatumListe sym:SVX_HID_REDLINING_FILTER_LB_DATE cui:ListBox:SID_REDLIN_FILTER_PAGE:LB_DATE Datum1 sym:SVX_HID_REDLINING_FILTER_DF_DATE cui:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE Zeit1 sym:SVX_HID_REDLINING_FILTER_TF_DATE cui:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE -Aktuell1 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK +Aktuell1 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK svx:ImageButton:SID_REDLIN_FILTER_PAGE:IB_CLOCK Datum2 sym:SVX_HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 Zeit2 sym:SVX_HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 -Aktuell2 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK2 SVX:IMAGEBUTTON:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 -Autor sym:SVX_HID_REDLINING_FILTER_CB_AUTOR SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_AUTOR -AutoListe sym:SVX_HID_REDLINING_FILTER_LB_AUTOR SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_AUTOR -Bereich sym:SVX_HID_REDLINING_FILTER_CB_RANGE SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_RANGE +Aktuell2 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK2 svx:ImageButton:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 +Autor sym:SVX_HID_REDLINING_FILTER_CB_AUTOR svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_AUTOR +AutoListe sym:SVX_HID_REDLINING_FILTER_LB_AUTOR svx:ListBox:SID_REDLIN_FILTER_PAGE:LB_AUTOR +Bereich sym:SVX_HID_REDLINING_FILTER_CB_RANGE svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_RANGE BereichText sym:SVX_HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE Button sym:SVX_HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF -Aktion sym:SVX_HID_REDLINING_FILTER_CB_ACTION SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_ACTION -Aktionsliste sym:SVX_HID_REDLINING_FILTER_LB_ACTION SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:LB_ACTION -Comment sym:SVX_HID_REDLINING_FILTER_CB_COMMENT SVX:CHECKBOX:SID_REDLIN_FILTER_PAGE:CB_COMMENT -CommentText sym:SVX_HID_REDLINING_FILTER_ED_COMMENT SVX:LISTBOX:SID_REDLIN_FILTER_PAGE:ED_COMMENT +Aktion sym:SVX_HID_REDLINING_FILTER_CB_ACTION svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_ACTION +Aktionsliste sym:SVX_HID_REDLINING_FILTER_LB_ACTION svx:ListBox:SID_REDLIN_FILTER_PAGE:LB_ACTION +Comment sym:SVX_HID_REDLINING_FILTER_CB_COMMENT svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_COMMENT +CommentText sym:SVX_HID_REDLINING_FILTER_ED_COMMENT svx:ListBox:SID_REDLIN_FILTER_PAGE:ED_COMMENT *ReiheFuellen sym:.uno:FillSeries Oben sym:sc.RadioButton.25623.4 @@ -148,10 +148,10 @@ StartWert sym:sc.Edit.25623.52 EndWert sym:sc.Edit.25623.49 Inkrement sym:sc.Edit.25623.39 -*Schriften STARMATH:MODALDIALOG:RID_FONTDIALOG -Schriftart STARMATH:COMBOBOX:RID_FONTDIALOG:1 -Fett STARMATH:CHECKBOX:RID_FONTDIALOG:1 -Kursiv STARMATH:CHECKBOX:RID_FONTDIALOG:2 +*Schriften sym:starmath.ModalDialog.20002 +Schriftart sym:starmath.ComboBox.20002.1 +Fett sym:starmath.CheckBox.20002.1 +Kursiv sym:starmath.CheckBox.20002.2 *Schriftarten sym:.uno:ChangeFont Variablen sym:starmath.ListBox.20004.1 @@ -165,17 +165,17 @@ Aendern sym:starmath.MenuButton.20004.1 Standard sym:starmath.PushButton.20004.2 *Schriftgroessen sym:.uno:ChangeFontSize -BasisGroesse STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:1 -TextGroesse STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:4 -Indizes STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:5 -Funktionen STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:6 -Operatoren STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:7 -Grenzen STARMATH:METRICFIELD:RID_FONTSIZEDIALOG:8 -Standard STARMATH:PUSHBUTTON:RID_FONTSIZEDIALOG:1 - -*ScriptEinfuegen SW:MODALDIALOG:DLG_JAVAEDIT -Scripttyp SW:EDIT:DLG_JAVAEDIT:ED_TYPE -HierDerText SW:MULTILINEEDIT:DLG_JAVAEDIT:ED_EDIT +BasisGroesse sym:starmath.MetricField.20003.1 +TextGroesse sym:starmath.MetricField.20003.4 +Indizes sym:starmath.MetricField.20003.5 +Funktionen sym:starmath.MetricField.20003.6 +Operatoren sym:starmath.MetricField.20003.7 +Grenzen sym:starmath.MetricField.20003.8 +Standard sym:starmath.PushButton.20003.1 + +*ScriptEinfuegen sym:sw.ModalDialog.21110 +Scripttyp sym:sw.Edit.21110.11 +HierDerText sym:sw.MultiLineEdit.21110.13 ScriptURL sym:sw.RadioButton.21110.19 ScriptURLText sym:sw.Edit.21110.20 ScriptURLWaehlen sym:sw.PushButton.21110.21 @@ -386,11 +386,11 @@ Bearbeiten sym:starmath.PushButton.20008.1 Uebernehmen sym:starmath.PushButton.20008.2 Symbols sym:STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW -*SzenarioAnlegen SC:MODALDIALOG:RID_SCDLG_NEWSCENARIO sym:.uno:ScenarioManager +*SzenarioAnlegen sym:sc.ModalDialog.25643 sym:.uno:ScenarioManager SzenarioName sym:sc.Edit.25643.11 Kommentar sym:sc.MultiLineEdit.25643.13 -RahmenAnzeigen SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_SHOWFRAME -Rahmenfarbe SC:LISTBOX:RID_SCDLG_NEWSCENARIO:LB_COLOR -Zurueckkopieren SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_TWOWAY -GanzeTabelle SC:CHECKBOX:RID_SCDLG_NEWSCENARIO:CB_COPYALL +RahmenAnzeigen sym:sc.CheckBox.25643.21 +Rahmenfarbe sym:sc.ListBox.25643.22 +Zurueckkopieren sym:sc.CheckBox.25643.24 +GanzeTabelle sym:sc.CheckBox.25643.27 PreventChanges sym:sc.CheckBox.25643.28 diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win index 4ec6848cd0b0..3284682fa6ae 100644 --- a/testautomation/global/win/dial_t_z.win +++ b/testautomation/global/win/dial_t_z.win @@ -1,15 +1,15 @@ *TabelleAuftrennen sym:.uno:SplitTable -UeberschriftKopieren SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_CNTNT -EigeneMitVorlage SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_PARA -Eigene SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BOX_NOPARA -Keine SW:RADIOBUTTON:DLG_SPLIT_TABLE:RB_BORDER +UeberschriftKopieren sym:sw.RadioButton.21464.5 +EigeneMitVorlage sym:sw.RadioButton.21464.7 +Eigene sym:sw.RadioButton.21464.6 +Keine sym:sw.RadioButton.21464.8 *TabelleAusblenden sym:.uno:Hide *TabellenFormat sym:SW_HID_FORMAT_TABLE *TabelleEinblenden sym:.uno:Show -AusgeblendeteTabelle SC:MULTILISTBOX:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST sym:SC_HID_SC_SELENTRY_LIST +AusgeblendeteTabelle sym:sc.MultiListBox.25713.11 sym:SC_HID_SC_SELENTRY_LIST *TabelleEinfuegenCalc sym:sc.ModalDialog.25646 Vor sym:sc.RadioButton.25646.11 @@ -30,7 +30,7 @@ Zeilen sym:sw.NumericField.21450.5 UeberschriftWiederholen sym:sw.CheckBox.21450.14 TabelleNichtTrennen sym:sw.CheckBox.21450.15 Umrandung sym:sw.CheckBox.21450.16 -Autoformat SW:PUSHBUTTON:DLG_INSERT_TABLE:BT_AUTOFORMAT +Autoformat sym:sw.PushButton.21450.23 Ueberschrift sym:sw.CheckBox.21450.13 *TabellenFuellen sym:.uno:InsertContents @@ -50,9 +50,9 @@ RechenopperationenDividieren sym:sc.RadioButton.25618.31 LeerzeilenUeberspringen sym:sc.CheckBox.25618.33 Verknuepfen sym:sc.CheckBox.25618.35 Transponieren sym:sc.CheckBox.25618.34 -NichtVerschieben SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_NONE -NachUnten SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_DOWN -NachRechts SC:RADIOBUTTON:RID_SCDLG_INSCONT:BTN_MV_RIGHT +NichtVerschieben sym:sc.RadioButton.25618.37 +NachUnten sym:sc.RadioButton.25618.38 +NachRechts sym:sc.RadioButton.25618.39 *TabelleSchuetzen sym:.uno:Protect Passwort sym:SC_HID_PASSWD_TABLE @@ -103,19 +103,19 @@ Eigenschaften sym:SVX_HID_IMAPDLG_PROPERTY *TB_Umrandungsstil sym:SVX_HID_POPUP_LINE *TextbausteineUmbenennen sym:SW_HID_RENAME_GLOSSARY -Name SW:EDIT:DLG_RENAME_GLOS:ED_ON -Neu SW:EDIT:DLG_RENAME_GLOS:ED_NN -KuerzelAlt SW:EDIT:DLG_RENAME_GLOS:ED_OS -KuerzelNeu SW:EDIT:DLG_RENAME_GLOS:ED_NS +Name sym:sw.Edit.21675.5 +Neu sym:sw.Edit.21675.7 +KuerzelAlt sym:sw.Edit.21675.6 +KuerzelNeu sym:sw.Edit.21675.8 *TextInTabelleUmwandeln sym:.uno:ConvertTableText sw:ModalDialog:DLG_CONV_TEXT_TABLE Tabulator sym:sw.RadioButton.21452.1 Semikolon sym:sw.RadioButton.21452.3 Absatz sym:sw.RadioButton.21452.4 -Andere SW:RADIOBUTTON:DLG_CONV_TEXT_TABLE:RB_OTHER -AndereText SW:EDIT:DLG_CONV_TEXT_TABLE:ED_OTHER -GleicheBreite SW:CHECKBOX:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN -Autoformat SW:PUSHBUTTON:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT +Andere sym:sw.RadioButton.21452.6 +AndereText sym:sw.Edit.21452.7 +GleicheBreite sym:sw.CheckBox.21452.8 +Autoformat sym:sw.PushButton.21452.102 Ueberschrift sym:sw.CheckBox.21452.13 Wiederholen sym:sw.CheckBox.21452.14 NichtTrennen sym:sw.CheckBox.21452.15 @@ -143,12 +143,12 @@ Schritte sym:sd.MetricField.653.1 *UeberStarWriter sym:.uno:About *UmbruchEinfuegen sym:.uno:InsertBreak -Zeilenumbruch SW:RADIOBUTTON:DLG_BREAK:RB_LINE -Spaltenumbruch SW:RADIOBUTTON:DLG_BREAK:RB_COL -Seitenumbruch SW:RADIOBUTTON:DLG_BREAK:RB_PAGE -Vorlage SW:LISTBOX:DLG_BREAK:LB_COLL -SeitennummerAendern SW:CHECKBOX:DLG_BREAK:CB_PAGENUM -Seitennummer SW:NUMERICFIELD:DLG_BREAK:ED_PAGENUM +Zeilenumbruch sym:sw.RadioButton.20705.2 +Spaltenumbruch sym:sw.RadioButton.20705.3 +Seitenumbruch sym:sw.RadioButton.20705.1 +Vorlage sym:sw.ListBox.20705.5 +SeitennummerAendern sym:sw.CheckBox.20705.7 +Seitennummer sym:sw.NumericField.20705.8 *UmwandelnInPolygon sym:SD_HID_VECTORIZE_DLG Farbanzahl sym:sd.NumericField.654.1 @@ -163,14 +163,14 @@ Vorschau sym:sd.PushButton.654.1 UndoRedoList sym:svx.ListBox.10845.11 *Verbinder sym:CUI_HID_PAGE_CONNECTION SVX:TABPAGE:RID_SVXPAGE_CONNECTION -Linie1 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1 -Linie2 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2 -Linie3 cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3 -Typ cui:LISTBOX:RID_SVXPAGE_CONNECTION:LB_TYPE -AnfangHorizontal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1 -AnfangVertikal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1 -EndeHorizontal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2 -EndeVertikal cui:METRICFIELD:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2 +Linie1 sym:cui.MetricField.10191.1 +Linie2 sym:cui.MetricField.10191.2 +Linie3 sym:cui.MetricField.10191.3 +Typ sym:cui.ListBox.10191.1 +AnfangHorizontal sym:cui.MetricField.10191.4 +AnfangVertikal sym:cui.MetricField.10191.6 +EndeHorizontal sym:cui.MetricField.10191.5 +EndeVertikal sym:cui.MetricField.10191.7 Vorschau sym:CUI_HID_PAGE_CONNECTION_CTL_PREVIEW *VerknuepfungenBearbeiten sym:cui.ModalDialog.32002 @@ -184,17 +184,17 @@ Loesen sym:cui.PushButton.32002.38 *VersendenMonitor sym:SW_HID_MERGE_PRINTMONITOR -*Versionen SFX2:MODALDIALOG:DLG_VERSIONS -Speichern SFX2:PUSHBUTTON:DLG_VERSIONS:PB_SAVE -ImmerVersionSpeichern SFX2:CHECKBOX:DLG_VERSIONS:CB_SAVEONCLOSE -Anzeigen SFX2:PUSHBUTTON:DLG_VERSIONS:PB_VIEW -Loeschen SFX2:PUSHBUTTON:DLG_VERSIONS:PB_DELETE -Oeffnen SFX2:PUSHBUTTON:DLG_VERSIONS:PB_OPEN +*Versionen sym:sfx2.ModalDialog.2377 +Speichern sym:sfx2.PushButton.2377.2 +ImmerVersionSpeichern sym:sfx2.CheckBox.2377.3 +Anzeigen sym:sfx2.PushButton.2377.13 +Loeschen sym:sfx2.PushButton.2377.5 +Oeffnen sym:sfx2.PushButton.2377.6 Vergleichen sym:sfx2.PushButton.2377.17 -*VersionskommentarEingeben SFX2:MODALDIALOG:DLG_COMMENTS -Kommentar SFX2:MULTILINEEDIT:DLG_COMMENTS:ME_VERSIONS -Schliessen SFX2:PUSHBUTTON:DLG_COMMENTS:PB_CLOSE +*VersionskommentarEingeben sym:sfx2.ModalDialog.2378 +Kommentar sym:sfx2.MultiLineEdit.2378.14 +Schliessen sym:sfx2.PushButton.2378.8 *VerteilenDlg sym:CUI_HID_PAGE_DISTRIBUTE KeineHorizontal sym:cui.RadioButton.10236.2 @@ -254,8 +254,8 @@ ZuweisenLinks sym:sw.ImageButton.20894.110 ZuweisenRechts sym:sw.ImageButton.20894.111 *WBereicheBearbeiten sym:SW_HID_BIB_BASE -Bereichname SW:EDIT:DLG_BIB_BASE:ED_NAME -Bereich SW:LISTBOX:DLG_BIB_BASE:LB_PATH +Bereichname sym:sw.Edit.21666.10 +Bereich sym:sw.ListBox.21666.8 Liste sym:SW_HID_GLOS_GROUP_TREE Neu sym:sw.PushButton.21666.3 Loeschen sym:sw.PushButton.21666.4 @@ -329,4 +329,4 @@ VariableZelle sym:sc.Edit.25630.3 Vorgaben2 sym:sc.ImageButton.25630.2 *Zusammenfassen sym:.uno:AutoFormat -Mindestgroesse cui:METRICFIELD:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN +Mindestgroesse sym:cui.MetricField.17011.100 diff --git a/testautomation/global/win/dokument.win b/testautomation/global/win/dokument.win index 491161cbb438..7b44910a360d 100644 --- a/testautomation/global/win/dokument.win +++ b/testautomation/global/win/dokument.win @@ -18,8 +18,8 @@ *KommandosMath sym:STARMATH_HID_SMA_COMMAND_WIN Kommandos sym:STARMATH_HID_SMA_COMMAND_WIN_EDIT -*DokSeitenansichtWriter HID_PagePreview -*DokSeitenansichtCalc HID_SC_Win_Preview +*DokSeitenansichtWriter sym:SW_HID_PAGEPREVIEW +*DokSeitenansichtCalc sym:SC_HID_SC_WIN_PREVIEW ' english Part @@ -53,8 +53,8 @@ Info .HelpId:StartCenter:Info *CommandsMath sym:STARMATH_HID_SMA_COMMAND_WIN Commands sym:STARMATH_HID_SMA_COMMAND_WIN_EDIT -*DocPageViewWriter HID_PagePreview -*DocPageViewCalc HID_SC_Win_Preview +*DocPageViewWriter sym:SW_HID_PAGEPREVIEW +*DocPageViewCalc sym:SC_HID_SC_WIN_PREVIEW ' to access the buttons in the lower left corner *DocumentDrawImpress sym:SD_HID_SDGRAPHICVIEWSHELL diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index b912e7e6f509..712ea6e2f6fd 100644 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -258,7 +258,7 @@ Search sym:CUI_HID_SEARCH_BTN_SEARCH CloseBtn sym:CUI_HID_SEARCH_BTN_CLOSE RecordCount sym:CUI_UID_SEARCH_RECORDSTATUS -*DataSourceSelection dbaccess:Modaldialog:DLG_DATASOURCE_SELECTION +*DataSourceSelection sym:dbaccess.ModalDialog.19204 SourceList sym:dbaccess.ListBox.19204.1 Organize sym:dbaccess.PushButton.19204.5 Create sym:dbaccess.PushButton.19204.9 diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win index 3108b7cd401e..c4599a788b9d 100644 --- a/testautomation/global/win/edia_i_o.win +++ b/testautomation/global/win/edia_i_o.win @@ -289,12 +289,12 @@ Duplex sym:WIZARDS_HID_DLGNEWSLTR_OPTDOUBLESIDED OKButton sym:WIZARDS_HID_DLGNEWSLTR_CMDGOON *OLEObjektInsert sym:.uno:InsertObject -NeuErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT -AusDateiErstellen cui:RADIOBUTTON:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE -Objekttyp cui:LISTBOX:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE -OleDatei cui:EDIT:MD_INSERT_OLEOBJECT:ED_FILEPATH -Verknuepfen cui:CHECKBOX:MD_INSERT_OLEOBJECT:CB_FILELINK -Durchsuchen cui:PUSHBUTTON:MD_INSERT_OLEOBJECT:BTN_FILEPATH +NeuErstellen sym:cui.RadioButton.32010.10 +AusDateiErstellen sym:cui.RadioButton.32010.11 +Objekttyp sym:cui.ListBox.32010.12 +OleDatei sym:cui.Edit.32010.10 +Verknuepfen sym:cui.CheckBox.32010.12 +Durchsuchen sym:cui.PushButton.32010.11 *InsertTableImpress sym:cui.ModalDialog.10044 NumberOfColumns sym:cui.NumericField.10044.2 diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win index 74d59f33ac4e..1c85fef3d203 100644 --- a/testautomation/global/win/edia_t_z.win +++ b/testautomation/global/win/edia_t_z.win @@ -137,23 +137,23 @@ Alternatives sym:CUI_HID_CT_THES_ALTERNATIVES ReplaceWith sym:cui.Edit.10031.22 Language sym:cui.MenuButton.10031.12 -*TextImport SC:MODALDIALOG:RID_SCDLG_ASCII -CharacterSet SC:LISTBOX:RID_SCDLG_ASCII:LB_CHARSET +*TextImport sym:sc.ModalDialog.25695 +CharacterSet sym:sc.ListBox.25695.6 Language sym:sc.ListBox.25695.8 -FromRow SC:NUMERICFIELD:RID_SCDLG_ASCII:NF_AT_ROW -FixedWidth SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_FIXED -Separated SC:RADIOBUTTON:RID_SCDLG_ASCII:RB_SEPARATED -Tab SC:CHECKBOX:RID_SCDLG_ASCII:CKB_TAB -Semicolon SC:CHECKBOX:RID_SCDLG_ASCII:CKB_SEMICOLON -Comma SC:CHECKBOX:RID_SCDLG_ASCII:CKB_COMMA -SpaceCB SC:CHECKBOX:RID_SCDLG_ASCII:CKB_SPACE -Other SC:CHECKBOX:RID_SCDLG_ASCII:CKB_OTHER -OtherText SC:EDIT:RID_SCDLG_ASCII:ED_OTHER -MergeDelimiter SC:CHECKBOX:RID_SCDLG_ASCII:CB_ASONCE -TextDelimiter SC:COMBOBOX:RID_SCDLG_ASCII:CB_TEXTSEP +FromRow sym:sc.NumericField.25695.10 +FixedWidth sym:sc.RadioButton.25695.12 +Separated sym:sc.RadioButton.25695.13 +Tab sym:sc.CheckBox.25695.14 +Semicolon sym:sc.CheckBox.25695.18 +Comma sym:sc.CheckBox.25695.15 +SpaceCB sym:sc.CheckBox.25695.19 +Other sym:sc.CheckBox.25695.16 +OtherText sym:sc.Edit.25695.17 +MergeDelimiter sym:sc.CheckBox.25695.20 +TextDelimiter sym:sc.ComboBox.25695.21 QuotedAsText sym:sc.CheckBox.25695.24 DetectSpecialNumbers sym:sc.CheckBox.25695.25 -Type SC:LISTBOX:RID_SCDLG_ASCII:LB_TYPE1 +Type sym:sc.ListBox.25695.28 Preview sym:SC_HID_SC_ASCII_TABCTR *UnsatisfiedDependencies sym:desktop.ModalDialog.2001 diff --git a/testautomation/global/win/etab_e_g.win b/testautomation/global/win/etab_e_g.win index 32502385ef81..903af5df1925 100644 --- a/testautomation/global/win/etab_e_g.win +++ b/testautomation/global/win/etab_e_g.win @@ -168,7 +168,7 @@ Super sym:cui.RadioButton.10241.301 *TabFormat3dViewAppearance sym:chart2.TabPage.916 Scheme sym:chart2.ListBox.916.2 - RoundedEdges chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_ROUNDEDEDGE + RoundedEdges sym:chart2.Checkbox.916.3 Shading sym:chart2.CheckBox.916.2 ObjectBorders sym:chart2.CheckBox.916.1 diff --git a/testautomation/global/win/etab_t_z.win b/testautomation/global/win/etab_t_z.win index 4d01fb8a479a..9cc67c6638d0 100644 --- a/testautomation/global/win/etab_t_z.win +++ b/testautomation/global/win/etab_t_z.win @@ -85,11 +85,11 @@ AnchorAsCharacter sym:sw.RadioButton.20831.4 AnchorAtFrame sym:sw.RadioButton.20831.5 Horizontal sym:sw.ListBox.20831.34 HorizontalBy sym:sw.MetricField.20831.36 -HorizontalTo SW:LISTBOX:TP_FRM_STD:LB_HORI_RELATION -MirrorOnEvenPages SW:CHECKBOX:TP_FRM_STD:CB_MIRROR +HorizontalTo sym:sw.ListBox.20831.2 +MirrorOnEvenPages sym:sw.CheckBox.20831.37 Vertical sym:sw.ListBox.20831.39 VerticalBy sym:sw.MetricField.20831.41 -VerticalTo SW:LISTBOX:TP_FRM_STD:LB_VERT_RELATION +VerticalTo sym:sw.ListBox.20831.4 OriginalSize sym:sw.PushButton.20831.44 FollowTextflow sym:sw.CheckBox.20831.129 diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win index ca6f725f75c3..cc593c6c80c2 100644 --- a/testautomation/global/win/tab_a_d.win +++ b/testautomation/global/win/tab_a_d.win @@ -1,20 +1,20 @@ *Active *TabAenderungenWriter sym:SW_HID_REDLINE_OPT -EinfuegenAttribute SW:LISTBOX:TP_REDLINE_OPT:LB_INS_ATTR -EinfuegenFarbe SW:LISTBOX:TP_REDLINE_OPT:LB_INS_COL -LoeschenAttribute SW:LISTBOX:TP_REDLINE_OPT:LB_DEL_ATTR -LoeschenFarbe SW:LISTBOX:TP_REDLINE_OPT:LB_DEL_COL -AendernAttribute SW:LISTBOX:TP_REDLINE_OPT:LB_CHG_ATTR -AendernFarbe SW:LISTBOX:TP_REDLINE_OPT:LB_CHG_COL -ZeilenMarkierung SW:LISTBOX:TP_REDLINE_OPT:LB_MARKPOS -ZeilenFarbe SW:LISTBOX:TP_REDLINE_OPT:LB_LC_COL - -*TabAenderungenCalc sym:SC_HID_SCPAGE_OPREDLINE SC:TABPAGE:RID_SCPAGE_OPREDLINE -Aenderungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_CONTENT -Loeschungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_REMOVE -Einfuegungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_INSERT -Verschiebungen SC:LISTBOX:RID_SCPAGE_OPREDLINE:CLB_MOVE +EinfuegenAttribute sym:sw.ListBox.20874.2 +EinfuegenFarbe sym:sw.ListBox.20874.4 +LoeschenAttribute sym:sw.ListBox.20874.7 +LoeschenFarbe sym:sw.ListBox.20874.9 +AendernAttribute sym:sw.ListBox.20874.12 +AendernFarbe sym:sw.ListBox.20874.14 +ZeilenMarkierung sym:sw.ListBox.20874.18 +ZeilenFarbe sym:sw.ListBox.20874.20 + +*TabAenderungenCalc sym:SC_HID_SCPAGE_OPREDLINE sc:TabPage:RID_SCPAGE_OPREDLINE +Aenderungen sym:sc.ListBox.25728.1 +Loeschungen sym:sc.ListBox.25728.2 +Einfuegungen sym:sc.ListBox.25728.3 +Verschiebungen sym:sc.ListBox.25728.4 *TabAllgemein sym:CUI_HID_OPTIONS_GENERAL Firma sym:cui.Edit.12001.11 @@ -36,7 +36,7 @@ Position sym:cui.Edit.12001.32 City sym:cui.Edit.12001.25 Zip sym:cui.Edit.12001.27 Street sym:cui.Edit.12001.20 -State cui:EDIT:RID_SFXPAGE_GENERAL:ED_US_STATE +State sym:cui.Edit.12001.26 Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +TabAllgemeines TabAllgemein @@ -78,10 +78,10 @@ WelcheSprache sym:CUI_HID_AUTOCORR_LANGUAGE *TabAusrichtung sym:CUI_HID_ALIGNMENT ListeHAusrichtung sym:cui.ListBox.10090.12 ListeVAusrichtung sym:cui.ListBox.10090.16 -Einzug cui:METRICFIELD:RID_SVXPAGE_ALIGNMENT:ED_INDENT +Einzug sym:cui.MetricField.10090.14 Zeilenumbruch sym:cui.TriStateBox.10090.41 Silbentrennung sym:cui.TriStateBox.10090.42 -Grad cui:NUMERICFIELD:RID_SVXPAGE_ALIGNMENT:NF_DEGREES +Grad sym:cui.NumericField.10090.24 Bezugskante sym:CUI_HID_ALIGNMENT_CTR_BORDER_LOCK VertikaleAusrichtung sym:cui.TriStateBox.10090.27 Gestapelt sym:cui.TriStateBox.10090.21 @@ -90,12 +90,12 @@ SetAlignmentOptions sym:cui.ListBox.10090.44 AlignmentDial sym:CUI_HID_ALIGNMENT_CTR_DIAL *TabAusrichtungAbsatz sym:CUI_HID_FORMAT_PARAGRAPH_ALIGN -Links cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN -Rechts cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN -Zentriert cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN -Blocksatz cui:RADIOBUTTON:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN -LetzteZeile cui:LISTBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE -EinzelnesWortAustreiben cui:CHECKBOX:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND +Links sym:cui.RadioButton.10187.30 +Rechts sym:cui.RadioButton.10187.31 +Zentriert sym:cui.RadioButton.10187.32 +Blocksatz sym:cui.RadioButton.10187.33 +LetzteZeile sym:cui.ListBox.10187.50 +EinzelnesWortAustreiben sym:cui.CheckBox.10187.51 VertikaleTextausrichtung sym:cui.ListBox.10187.36 TextrasterFangen sym:cui.CheckBox.10187.38 TextDirection sym:cui.ListBox.10187.92 @@ -204,31 +204,31 @@ HinzufuegenAlle sym:cui.PushButton.10364.1 Vorschau sym:cui.CheckBox.10364.3 *TabDatenbank sym:SW_HID_FLD_DB -Feldtyp SW:LISTBOX:TP_FLD_DB:LB_DBTYPE +Feldtyp sym:sw.ListBox.20864.2 Datenbankauswahl sym:SW_HID_DB_SELECTION_TLB -Bedingung SW:EDIT:TP_FLD_DB:ED_DBCONDITION -Satznummer SW:EDIT:TP_FLD_DB:ED_DBSETNUMBER -AusDatenbank SW:RADIOBUTTON:TP_FLD_DB:RB_DBOWNFORMAT -Selbstdefiniert SW:RADIOBUTTON:TP_FLD_DB:RB_DBFORMAT -Formatliste SW:LISTBOX:TP_FLD_DB:LB_DBFORMAT -Zahlenformat SW:LISTBOX:TP_FLD_DB:LB_DBNUMFORMAT +Bedingung sym:sw.Edit.20864.8 +Satznummer sym:sw.Edit.20864.9 +AusDatenbank sym:sw.RadioButton.20864.13 +Selbstdefiniert sym:sw.RadioButton.20864.12 +Formatliste sym:sw.ListBox.20864.10 +Zahlenformat sym:sw.ListBox.20864.11 Einfuegen sym:SW_HID_FIELD_INSERT Schliessen sym:SW_HID_FIELD_CLOSE *TabDirektCursor sym:SW_HID_OPTSHDWCRSR -DirektCursor SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF -Absatzausrichtung SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN -LinkerAbsatzrand SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT -Tabulator SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLTAB -TabulatorUndLeerzeichen SW:RADIOBUTTON:TP_OPTSHDWCRSR:RB_SHDWCRSFILLSPACE -Zonen_Cursor SW:CHECKBOX:TP_OPTSHDWCRSR:CB_ALLOW_IN_PROT - -Absatzenden SW:CHECKBOX:TP_OPTSHDWCRSR:CB_PARA -Tabulatoren SW:CHECKBOX:TP_OPTSHDWCRSR:CB_TAB -Leerzeichen SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SPACE -GeschLeerzeichen SW:CHECKBOX:TP_OPTSHDWCRSR:CB_HSPACE -WeicheTrenner SW:CHECKBOX:TP_OPTSHDWCRSR:CB_SHYPH -Umbrueche SW:CHECKBOX:TP_OPTSHDWCRSR:CB_BREAK +DirektCursor sym:sw.CheckBox.20870.2 +Absatzausrichtung sym:sw.RadioButton.20870.5 +LinkerAbsatzrand sym:sw.RadioButton.20870.6 +Tabulator sym:sw.RadioButton.20870.7 +TabulatorUndLeerzeichen sym:sw.RadioButton.20870.8 +Zonen_Cursor sym:sw.CheckBox.20870.12 + +Absatzenden sym:sw.CheckBox.20870.5 +Tabulatoren sym:sw.CheckBox.20870.6 +Leerzeichen sym:sw.CheckBox.20870.7 +GeschLeerzeichen sym:sw.CheckBox.20870.8 +WeicheTrenner sym:sw.CheckBox.20870.9 +Umbrueche sym:sw.CheckBox.20870.11 VersteckteAbsatze sym:sw.CheckBox.20870.36 FeldVersteckterText sym:sw.CheckBox.20870.10 VersteckterText sym:sw.CheckBox.20870.61 @@ -252,12 +252,12 @@ FileRevisionInfo sym:sfx2.Edit.264.38 FileTemplateinfo sym:sfx2.Edit.264.33 *TabDokumentFeldbefehle sym:SW_HID_FLD_DOK -Feldtyp SW:LISTBOX:TP_FLD_DOK:LB_DOKTYPE -Auswahl SW:LISTBOX:TP_FLD_DOK:LB_DOKSELECTION -Formatliste SW:LISTBOX:TP_FLD_DOK:LB_DOKFORMAT -Zahlenformat SW:LISTBOX:TP_FLD_DOK:LB_DOKNUMFORMAT -Editfeld SW:EDIT:TP_FLD_DOK:ED_DOKVALUE -InhaltFix SW:CHECKBOX:TP_FLD_DOK:CB_DOKFIXEDCONTENT +Feldtyp sym:sw.ListBox.20867.48 +Auswahl sym:sw.ListBox.20867.50 +Formatliste sym:sw.ListBox.20867.52 +Zahlenformat sym:sw.ListBox.20867.51 +Editfeld sym:sw.Edit.20867.55 +InhaltFix sym:sw.CheckBox.20867.58 Einfuegen sym:SW_HID_FIELD_INSERT Schliessen sym:SW_HID_FIELD_CLOSE @@ -269,9 +269,9 @@ Titel sym:sfx2.Edit.263.10 *TabDokumentInfoFeldbefehle sym:SW_HID_FLD_DOKINF Feldtyp sym:SW_HID_FIELD_DINF_TYPE -Auswahl SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFSELECTION -Zahlenformat SW:LISTBOX:TP_FLD_DOKINF:LB_DOKINFFORMAT -InhaltFix SW:CHECKBOX:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT +Auswahl sym:sw.ListBox.20865.18 +Zahlenformat sym:sw.ListBox.20865.20 +InhaltFix sym:sw.CheckBox.20865.21 Einfuegen sym:SW_HID_FIELD_INSERT Schliessen sym:SW_HID_FIELD_CLOSE @@ -298,23 +298,23 @@ Prospekt sym:sd.RadioButton.549.4 Vorderseite sym:sd.CheckBox.549.12 Rueckseite sym:sd.CheckBox.549.13 AusDruckereinstellung sym:sd.CheckBox.549.10 -StandardAusgabe SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_COLOR -Graustufen SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_GRAYSCALE -SchwarzWeiss SD:RADIOBUTTON:TP_PRINT_OPTIONS:RBT_BLACKWHITE +StandardAusgabe sym:sd.RadioButton.549.5 +Graustufen sym:sd.RadioButton.549.6 +SchwarzWeiss sym:sd.RadioButton.549.7 *TabDruckenHTML sym:SW_HID_OPTPRINT_PAGE -Grafiken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PGRF -Kontrollfelder SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_CTRLFLD -Hintergrund SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BACKGROUND -SchwarzDrucken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT -Prospekt SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PROSPECT -Keine SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_NO -NurNotizen SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_ONLY -Dokumentende SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_END -Seitenende SW:RADIOBUTTON:TP_OPTPRINT_PAGE:RB_PAGEEND -AusDruckereinstellung SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP +Grafiken sym:sw.CheckBox.20826.61 +Kontrollfelder sym:sw.CheckBox.20826.69 +Hintergrund sym:sw.CheckBox.20826.79 +SchwarzDrucken sym:sw.CheckBox.20826.87 +Prospekt sym:sw.CheckBox.20826.67 +Keine sym:sw.RadioButton.20826.80 +NurNotizen sym:sw.RadioButton.20826.81 +Dokumentende sym:sw.RadioButton.20826.82 +Seitenende sym:sw.RadioButton.20826.83 +AusDruckereinstellung sym:sw.CheckBox.20826.70 LeereSeitenDrucken sym:sw.CheckBox.20826.92 -Fax SW:LISTBOX:TP_OPTPRINT_PAGE:LB_FAX +Fax sym:sw.ListBox.20826.86 *TabDruckenWriter sym:SW_HID_OPTPRINT_PAGE Grafiken sym:sw.CheckBox.20826.61 @@ -323,7 +323,7 @@ Hintergrund sym:sw.CheckBox.20826.79 HiddenText sym:sw.CheckBox.20826.93 TextPlaceholder sym:sw.CheckBox.20826.94 RightToLeft sym:sw.CheckBox.20826.140 -SchwarzDrucken SW:CHECKBOX:TP_OPTPRINT_PAGE:CB_BLACK_FONT +SchwarzDrucken sym:sw.CheckBox.20826.87 LinkeSeiten sym:sw.CheckBox.20826.64 RechteSeiten sym:sw.CheckBox.20826.65 Prospekt sym:sw.CheckBox.20826.67 @@ -352,7 +352,7 @@ EinzelnesEtikett sym:sw.RadioButton.22757.2 Spalte sym:sw.NumericField.22757.5 Zeile sym:sw.NumericField.22757.7 Einrichten sym:sw.PushButton.22757.8 -InhaltSynchronisieren SW:CHECKBOX:TP_LAB_PRT:CB_SYNCHRON +InhaltSynchronisieren sym:sw.CheckBox.22757.11 NeuesDok sym:SW_HID_LABEL_INSERT Zurueck sym:SFX2_HID_TABDLG_RESET_BTN diff --git a/testautomation/global/win/tab_e_g.win b/testautomation/global/win/tab_e_g.win index 6b0e8539cf5f..ef18ae5ebdbe 100644 --- a/testautomation/global/win/tab_e_g.win +++ b/testautomation/global/win/tab_e_g.win @@ -12,10 +12,10 @@ Hoehe sym:cui.NumericField.32011.8 BreiteStandard sym:cui.CheckBox.32011.22 HoeheStandard sym:cui.CheckBox.32011.22 -*TabEingabehilfe SC:TABPAGE:TP_VALIDATION_INPUTHELP -EingabehilfenbeiSelektion SC:TRISTATEBOX:TP_VALIDATION_INPUTHELP:TSB_HELP -Titel SC:EDIT:TP_VALIDATION_INPUTHELP:EDT_TITLE -EingabeHilfe SC:MULTILINEEDIT:TP_VALIDATION_INPUTHELP:EDT_INPUTHELP +*TabEingabehilfe sym:sc.TabPage.697 +EingabehilfenbeiSelektion sym:sc.TriStateBox.697.11 +Titel sym:sc.Edit.697.13 +EingabeHilfe sym:sc.MultiLineEdit.697.15 *TabEinzuegeUndAbstaende sym:CUI_HID_FORMAT_PARAGRAPH_STD Automatisch sym:cui.CheckBox.10006.48 @@ -26,7 +26,7 @@ Oben sym:cui.MetricField.10006.21 Unten sym:cui.MetricField.10006.23 Zeilenabstand sym:cui.ListBox.10006.40 Um sym:cui.MetricField.10006.42 -Von cui:METRICFIELD:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC +Von sym:cui.MetricField.10006.43 Registerhaltigkeit sym:cui.CheckBox.10006.84 *TabEndnoten sym:SW_HID_ENDNOTE_OPTIONS @@ -108,12 +108,12 @@ Loeschen sym:cui.PushButton.10059.4 Oeffnen sym:cui.ImageButton.10059.5 Speichern sym:cui.ImageButton.10059.6 -*TabFehlermeldung SC:TABPAGE:TP_VALIDATION_ERROR -FehlermeldungbeiEingabe SC:TRISTATEBOX:TP_VALIDATION_ERROR:TSB_SHOW -Aktion SC:LISTBOX:TP_VALIDATION_ERROR:LB_ACTION -Titel SC:EDIT:TP_VALIDATION_ERROR:EDT_TITLE -Fehlermeldung SC:MULTILINEEDIT:TP_VALIDATION_ERROR:EDT_ERROR -Durchsuchen SC:PUSHBUTTON:TP_VALIDATION_ERROR:BTN_SEARCH +*TabFehlermeldung sym:sc.TabPage.698 +FehlermeldungbeiEingabe sym:sc.TriStateBox.698.21 +Aktion sym:sc.ListBox.698.24 +Titel sym:sc.Edit.698.13 +Fehlermeldung sym:sc.MultiLineEdit.698.25 +Durchsuchen sym:sc.PushButton.698.26 *TabFussEndnoten sym:SW_HID_SECTION_FTNENDNOTES_PAGE FussnotenAmTextendeSammeln sym:sw.CheckBox.20897.6 @@ -145,19 +145,19 @@ Zurueck sym:SFX2_HID_TABDLG_RESET_BTN FormatSpeichern sym:sw.PushButton.22756.19 *TabFunktionen sym:SW_HID_FLD_FUNC -Feldtyp SW:LISTBOX:TP_FLD_FUNC:LB_FUNCTYPE -Formatliste SW:LISTBOX:TP_FLD_FUNC:LB_FUNCFORMAT -Auswahl SW:LISTBOX:TP_FLD_FUNC:LB_FUNCSELECTION -Bedingung SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME -Dann SW:EDIT:TP_FLD_FUNC:ED_FUNCCOND1 -Sonst SW:EDIT:TP_FLD_FUNC:ED_FUNCCOND2 -MakroButton SW:PUSHBUTTON:TP_FLD_FUNC:BT_FUNCMACRO -Namefeld SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME -Hinweis SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE -Makroname SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME -Platzhalter SW:EDIT:TP_FLD_FUNC:ED_FUNCNAME -Texteinfuegen SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE -Wert SW:EDIT:TP_FLD_FUNC:ED_FUNCVALUE +Feldtyp sym:sw.ListBox.20868.65 +Formatliste sym:sw.ListBox.20868.69 +Auswahl sym:sw.ListBox.20868.66 +Bedingung sym:sw.Edit.20868.71 +Dann sym:sw.Edit.20868.75 +Sonst sym:sw.Edit.20868.77 +MakroButton sym:sw.PushButton.20868.78 +Namefeld sym:sw.Edit.20868.71 +Hinweis sym:sw.Edit.20868.73 +Makroname sym:sw.Edit.20868.71 +Platzhalter sym:sw.Edit.20868.71 +Texteinfuegen sym:sw.Edit.20868.73 +Wert sym:sw.Edit.20868.73 Einfuegen sym:SW_HID_FIELD_INSERT Schliessen sym:SW_HID_FIELD_CLOSE AddListEntry sym:sw.PushButton.20868.82 @@ -181,17 +181,17 @@ Breite sym:sw.MetricField.20818.25 Abstand sym:sw.MetricField.20818.27 *TabFussnoten sym:SW_HID_FOOTNOTE_OPTIONS -Numerierung SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMVIEW -Pro SW:LISTBOX:TP_FOOTNOTEOPTION:LB_NUMCOUNT -BeginnBei SW:NUMERICFIELD:TP_FOOTNOTEOPTION:FLD_OFFSET -Absatz SW:LISTBOX:TP_FOOTNOTEOPTION:LB_PARA_TEMPL -Seite SW:LISTBOX:TP_FOOTNOTEOPTION:LB_PAGE_TEMPL -Folgeseite SW:EDIT:TP_FOOTNOTEOPTION:ED_CONT -Beginn SW:EDIT:TP_FOOTNOTEOPTION:ED_CONT_FROM -Seitenende SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_PAGE -Dokumentende SW:RADIOBUTTON:TP_FOOTNOTEOPTION:RB_POS_CHAPTER -Davor SW:EDIT:TP_FOOTNOTEOPTION:ED_PREFIX -Dahinter SW:EDIT:TP_FOOTNOTEOPTION:ED_SUFFIX +Numerierung sym:sw.ListBox.21012.10 +Pro sym:sw.ListBox.21012.11 +BeginnBei sym:sw.NumericField.21012.12 +Absatz sym:sw.ListBox.21012.30 +Seite sym:sw.ListBox.21012.31 +Folgeseite sym:sw.Edit.21012.41 +Beginn sym:sw.Edit.21012.43 +Seitenende sym:sw.RadioButton.21012.1 +Dokumentende sym:sw.RadioButton.21012.2 +Davor sym:sw.Edit.21012.46 +Dahinter sym:sw.Edit.21012.48 ZeichenvorlageTextbereich sym:sw.ListBox.21012.53 ZeichenvorlageFussnotenbereich sym:sw.ListBox.21012.50 @@ -199,7 +199,7 @@ ZeichenvorlageFussnotenbereich sym:sw.ListBox.21012.50 FusszeileMitAbstand sym:svx.CheckBox.10026.10 svx:CheckBox:RID_SVXPAGE_FOOTER:CB_FOOTER Abstand sym:svx.MetricField.10026.12 Hoehe sym:svx.MetricField.10026.14 -Hoehedynamisch SVX:CHECKBOX:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN +Hoehedynamisch sym:svx.CheckBox.10026.15 RechterRandFusszeile sym:svx.MetricField.10026.19 LinkerRandFusszeile sym:svx.MetricField.10026.17 InhaltLinksRechtsGleich sym:svx.CheckBox.10026.20 diff --git a/testautomation/global/win/tab_h_o.win b/testautomation/global/win/tab_h_o.win index b6cc052bb7de..b6490e85e6dd 100644 --- a/testautomation/global/win/tab_h_o.win +++ b/testautomation/global/win/tab_h_o.win @@ -1,7 +1,7 @@ *TabHintergrund sym:CUI_HID_BACKGROUND Als sym:cui.ListBox.10001.1 Fuer sym:cui.ListBox.10001.32 -FuerAbsatz cui:LISTBOX:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX +FuerAbsatz sym:cui.ListBox.10001.34 Hintergrundfarbe sym:CUI_HID_BACKGROUND_CTL_BGDCOLORSET Verknuepfen sym:cui.CheckBox.10001.22 Vorschau sym:cui.CheckBox.10001.23 @@ -24,10 +24,10 @@ Groesse6 sym:cui.NumericField.17000.13 Groesse7 sym:cui.NumericField.17000.15 UnbekannteHTML sym:cui.CheckBox.17000.21 FontEinstellungen sym:cui.CheckBox.17000.22 -Export cui:LISTBOX:RID_OFAPAGE_HTMLOPT:LB_EXPORT +Export sym:cui.ListBox.17000.39 StarBasic sym:cui.CheckBox.17000.31 Grafikenkopieren sym:cui.CheckBox.17000.37 -Drucklayout cui:CHECKBOX:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION +Drucklayout sym:cui.CheckBox.17000.38 WarnungAnzeigen sym:cui.CheckBox.17000.32 Zeichensatz sym:cui.ListBox.17000.41 UseEnglishLocaleForNumbers sym:cui.CheckBox.17000.23 @@ -117,27 +117,27 @@ Zurueck sym:CUI_HID_ICCDIALOG_RESET_BTN Uebernehmen sym:CUI_HID_ICCDIALOG_OK_BTN *TabInhaltCalc sym:SC_HID_SCPAGE_CONTENT -Formeln SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_FORMULA -Nullwerte SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_NIL -Notizanzeiger SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_ANNOT -WerteHervorheben SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_VALUE -Anker SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_ANCHOR -Textueberlauf SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_CLIP -ObjekteGrafiken SC:LISTBOX:RID_SCPAGE_CONTENT:LB_OBJGRF -Diagramme SC:LISTBOX:RID_SCPAGE_CONTENT:LB_DIAGRAM -Zeichenobjekte SC:LISTBOX:RID_SCPAGE_CONTENT:LB_DRAW -Gitterlinien SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_GRID -Farbe SC:LISTBOX:RID_SCPAGE_CONTENT:LB_COLOR -Seitenumbruch SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_PAGEBREAKS -Hilfslinien SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_GUIDELINE -EinfacheGriffe SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_HANDLES -GrosseGriffe SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_BIGHANDLES -ZeilenUndSpaltenkoepfe SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_ROWCOLHEADER -HorizontalerBildaufbau SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_HSCROLL -VertikalerBildaufbau SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_VSCROLL -Tabellenregister SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_TBLREG -Gliederungssymbole SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_OUTLINE -Referenzenfarbig SC:CHECKBOX:RID_SCPAGE_CONTENT:CB_RFIND +Formeln sym:sc.CheckBox.25717.21 +Nullwerte sym:sc.CheckBox.25717.22 +Notizanzeiger sym:sc.CheckBox.25717.23 +WerteHervorheben sym:sc.CheckBox.25717.24 +Anker sym:sc.CheckBox.25717.25 +Textueberlauf sym:sc.CheckBox.25717.33 +ObjekteGrafiken sym:sc.ListBox.25717.28 +Diagramme sym:sc.ListBox.25717.30 +Zeichenobjekte sym:sc.ListBox.25717.32 +Gitterlinien sym:sc.CheckBox.25717.57 +Farbe sym:sc.ListBox.25717.59 +Seitenumbruch sym:sc.CheckBox.25717.66 +Hilfslinien sym:sc.CheckBox.25717.60 +EinfacheGriffe sym:sc.CheckBox.25717.67 +GrosseGriffe sym:sc.CheckBox.25717.68 +ZeilenUndSpaltenkoepfe sym:sc.CheckBox.25717.51 +HorizontalerBildaufbau sym:sc.CheckBox.25717.52 +VertikalerBildaufbau sym:sc.CheckBox.25717.53 +Tabellenregister sym:sc.CheckBox.25717.54 +Gliederungssymbole sym:sc.CheckBox.25717.55 +Referenzenfarbig sym:sc.CheckBox.25717.75 *TabInhalteDraw sym:SD_HID_SD_OPTIONS_CONTENTS sym:SD_HID_SD_OPTIONS_SNAP LinealeSichtbar sym:sd.CheckBox.597.14 @@ -146,40 +146,40 @@ KontrolpunkteImBezierEditor sym:sd.CheckBox.597.2 KonturFuerIndividuelleObjekte sym:sd.CheckBox.597.15 *TabInhalteHTML sym:SW_HID_CONTENT_OPT -GrafikenUndObjekte SW:CHECKBOX:TP_CONTENT_OPT:CB_GRF -Tabellen SW:CHECKBOX:TP_CONTENT_OPT:CB_TBL -Zeichnungen SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST -Feldnamen SW:CHECKBOX:TP_CONTENT_OPT:CB_FIELD -Notizen SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT +GrafikenUndObjekte sym:sw.CheckBox.20845.1 +Tabellen sym:sw.CheckBox.20845.2 +Zeichnungen sym:sw.CheckBox.20845.3 +Feldnamen sym:sw.CheckBox.20845.4 +Notizen sym:sw.CheckBox.20845.23 Hilfslinien sym:sw.CheckBox.20845.14 -FarbigeHandles SW:CHECKBOX:TP_CONTENT_OPT:CB_HANDLE -GrosseHandles SW:CHECKBOX:TP_CONTENT_OPT:CB_BIGHANDLE +FarbigeHandles sym:sw.CheckBox.20845.59 +GrosseHandles sym:sw.CheckBox.20845.25 HorizontaleBildlaufleiste sym:sw.CheckBox.20845.15 -VertikaleBildlaufleiste SW:CHECKBOX:TP_CONTENT_OPT:CB_VSCROLL +VertikaleBildlaufleiste sym:sw.CheckBox.20845.16 HorizontalesLineal sym:sw.CheckBox.20845.17 VertikalesLineal sym:sw.CheckBox.20845.18 RechtsAusgerichtet sym:sw.CheckBox.20845.24 -WeichesScrollen SW:CHECKBOX:TP_CONTENT_OPT:CB_SMOOTH_SCROLL +WeichesScrollen sym:sw.CheckBox.20845.37 Lineal sym:sw.CheckBox.20845.12 HorizontalesLinealMasseinheit sym:sw.ListBox.20845.88 VertikalesLinealMasseinheit sym:sw.ListBox.20845.89 Masseinheit sym:sw.ListBox.20845.27 *TabInhalteWriter sym:SW_HID_CONTENT_OPT -GrafikenUndObjekte SW:CHECKBOX:TP_CONTENT_OPT:CB_GRF -Tabellen SW:CHECKBOX:TP_CONTENT_OPT:CB_TBL -Zeichnungen SW:CHECKBOX:TP_CONTENT_OPT:CB_DRWFAST -Feldname SW:CHECKBOX:TP_CONTENT_OPT:CB_FIELD -Notizen SW:CHECKBOX:TP_CONTENT_OPT:CB_POSTIT +GrafikenUndObjekte sym:sw.CheckBox.20845.1 +Tabellen sym:sw.CheckBox.20845.2 +Zeichnungen sym:sw.CheckBox.20845.3 +Feldname sym:sw.CheckBox.20845.4 +Notizen sym:sw.CheckBox.20845.23 Hilfslinien sym:sw.CheckBox.20845.14 -FarbigeHandles SW:CHECKBOX:TP_CONTENT_OPT:CB_HANDLE -GrosseHandles SW:CHECKBOX:TP_CONTENT_OPT:CB_BIGHANDLE +FarbigeHandles sym:sw.CheckBox.20845.59 +GrosseHandles sym:sw.CheckBox.20845.25 HorizontaleBildlaufleiste sym:sw.CheckBox.20845.15 -VertikaleBildlaufleiste SW:CHECKBOX:TP_CONTENT_OPT:CB_VSCROLL +VertikaleBildlaufleiste sym:sw.CheckBox.20845.16 HorizontalesLineal sym:sw.CheckBox.20845.17 VertikalesLineal sym:sw.CheckBox.20845.18 RechtsAusgerichtet sym:sw.CheckBox.20845.24 -WeichesScrollen SW:CHECKBOX:TP_CONTENT_OPT:CB_SMOOTH_SCROLL +WeichesScrollen sym:sw.CheckBox.20845.37 Lineal sym:sw.CheckBox.20845.12 HorizontalesLinealMasseinheit sym:sw.ListBox.20845.88 VertikalesLinealMasseinheit sym:sw.ListBox.20845.89 @@ -214,14 +214,14 @@ KlangWahl sym:sd.Edit.787.1 'KlangVollstaendigAbspielen sd:TriStateBox:TP_ANIMATION:TSB_PLAY_FULL *TabKapitelnumerierung sym:SW_HID_TP_OUTLINE_NUM -Ebene SW:LISTBOX:TP_OUTLINE_NUM:LB_LEVEL -Absatzvorlage SW:LISTBOX:TP_OUTLINE_NUM:LB_COLL -Zeichenvorlage SW:LISTBOX:TP_OUTLINE_NUM:LB_CHARFMT -Nummer SW:LISTBOX:TP_OUTLINE_NUM:LB_NUMBER -Vollstaendig SW:NUMERICFIELD:TP_OUTLINE_NUM:NF_ALL_LEVEL -Davor SW:EDIT:TP_OUTLINE_NUM:ED_PREFIX -Dahinter SW:EDIT:TP_OUTLINE_NUM:ED_SUFFIX -BeginBei SW:NUMERICFIELD:TP_OUTLINE_NUM:ED_START +Ebene sym:sw.ListBox.20876.131 +Absatzvorlage sym:sw.ListBox.20876.21 +Zeichenvorlage sym:sw.ListBox.20876.141 +Nummer sym:sw.ListBox.20876.23 +Vollstaendig sym:sw.NumericField.20876.109 +Davor sym:sw.Edit.20876.137 +Dahinter sym:sw.Edit.20876.135 +BeginBei sym:sw.NumericField.20876.41 Form sym:SW_HID_OUTLINE_FORM *TabKopfzeile sym:SVX_HID_FORMAT_HEADER @@ -286,12 +286,12 @@ Pixel sym:cui.TriStateBox.10184.4 Schrittweite sym:cui.MetricField.10184.1 *TabLayoutCalc sym:SC_HID_SCPAGE_LAYOUT -Masseinheit SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_UNIT -Tabulator SC:METRICFIELD:RID_SCPAGE_LAYOUT:MF_TAB -Eingabebestaetigung SC:CHECKBOX:RID_SCPAGE_LAYOUT:CB_ALIGN -Eingabetaste SC:CHECKBOX:RID_SCPAGE_LAYOUT:CB_EDITMODE -FormatierungAusdehnen SC:CHECKBOX:RID_SCPAGE_LAYOUT:CB_FORMAT -SelektionNach SC:LISTBOX:RID_SCPAGE_LAYOUT:LB_ALIGN +Masseinheit sym:sc.ListBox.25718.62 +Tabulator sym:sc.MetricField.25718.65 +Eingabebestaetigung sym:sc.CheckBox.25718.71 +Eingabetaste sym:sc.CheckBox.25718.73 +FormatierungAusdehnen sym:sc.CheckBox.25718.74 +SelektionNach sym:sc.ListBox.25718.72 ' Referenzenfarbig sc:CheckBox:RID_SCPAGE_LAYOUT:CB_RFIND Referenzenausdehnen sym:sc.CheckBox.25718.76 SelektionHervorheben sym:sc.CheckBox.25718.77 @@ -303,11 +303,11 @@ Ueberschreibwarnung sym:sc.CheckBox.25718.79 *TabLegende sym:CUI_HID_CAPTION Art sym:CUI_HID_CAPTION_CTL_TYPE -Abstand cui:METRICFIELD:RID_SVXPAGE_CAPTION:MF_ABSTAND -Ansatz cui:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ -Laenge cui:METRICFIELD:RID_SVXPAGE_CAPTION:MF_LAENGE -Position cui:LISTBOX:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL -Optimal cui:CHECKBOX:RID_SVXPAGE_CAPTION:CB_LAENGE +Abstand sym:cui.MetricField.10150.1 +Ansatz sym:cui.ListBox.10150.2 +Laenge sym:cui.MetricField.10150.3 +Position sym:cui.ListBox.10150.3 +Optimal sym:cui.CheckBox.10150.1 *TabLinguistik sym:CUI_HID_OPTIONS_LINGU Sprachmodule sym:CUI_HID_CLB_LINGU_MODULES @@ -399,14 +399,14 @@ Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +TabGliederung TabNumerierung -*TabNumerierungAbsatz Hid_NUMPARA -Vorlage SW:LISTBOX:TP_NUMPARA:LB_NUMBER_STYLE -NumerierungNeuBeginnen SW:TRISTATEBOX:TP_NUMPARA:CB_NEW_START SW:CHECKBOX:TP_NUMPARA:CB_NEW_START +*TabNumerierungAbsatz sym:SW_HID_NUMPARA +Vorlage sym:sw.ListBox.20873.1 +NumerierungNeuBeginnen sym:sw.TriStateBox.20873.3 sw:CheckBox:TP_NUMPARA:CB_NEW_START StartWith sym:sw.TriStateBox.20873.4 -NumerierungBeginnenBei SW:NUMERICFIELD:TP_NUMPARA:NF_NEW_START -ZeilenumerierungZeilenMitzaehlen SW:TRISTATEBOX:TP_NUMPARA:CB_COUNT_PARA SW:CHECKBOX:TP_NUMPARA:CB_COUNT_PARA -ZeilenumerierungNeuBeginnen SW:TRISTATEBOX:TP_NUMPARA:CB_RESTART_PARACOUNT SW:CHECKBOX:TP_NUMPARA:CB_RESTART_PARACOUNT -ZeilenumerierungBeginnenBei SW:NUMERICFIELD:TP_NUMPARA:NF_RESTART_PARA +NumerierungBeginnenBei sym:sw.NumericField.20873.6 +ZeilenumerierungZeilenMitzaehlen sym:sw.TriStateBox.20873.8 sw:CheckBox:TP_NUMPARA:CB_COUNT_PARA +ZeilenumerierungNeuBeginnen sym:sw.TriStateBox.20873.9 sw:CheckBox:TP_NUMPARA:CB_RESTART_PARACOUNT +ZeilenumerierungBeginnenBei sym:sw.NumericField.20873.11 OutlineLevel sym:sw.ListBox.20873.13 +TabNumerierungKapitelnumerierung TabKapitelnumerierung @@ -427,7 +427,7 @@ Einstellungen sym:CUI_HID_OFAPAGE_AUTOCORR_CLB *TabOptionenAutokorrektur sym:CUI_HID_OFAPAGE_AUTOFMT_OPTIONS Einstellungen sym:CUI_HID_OFAPAGE_AUTOFORMAT_CLB -Bearbeiten cui:PUSHBUTTON:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT +Bearbeiten sym:cui.PushButton.17010.61 *TabOptionenTeilergebnisse sym:SC_HID_SCPAGE_SUBT_OPTIONS NeueSeiteBeiGruppenwechsel sym:sc.CheckBox.25633.21 @@ -435,25 +435,25 @@ GrossKleinschreibung sym:sc.CheckBox.25633.22 BereichVorherNachSortieren sym:sc.CheckBox.25633.23 FormateEinschliessen sym:sc.CheckBox.25633.33 BenutzerdefinierteSortierreihenfolge sym:sc.CheckBox.25633.34 -SortierreihenfolgeAnzeige SC:LISTBOX:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF +SortierreihenfolgeAnzeige sym:sc.ListBox.25633.35 Aufsteigend sym:sc.RadioButton.25633.31 -Absteigend SC:RADIOBUTTON:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING +Absteigend sym:sc.RadioButton.25633.32 *TabOptionenNumerierung sym:CUI_HID_SVXPAGE_NUM_OPTIONS -Ebene cui:MULTILISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL -Numerierung cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_FMT -Davor cui:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX -Dahinter cui:EDIT:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX -Zeichenvorlage cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT -Vollstaendig cui:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL -BeginnBei cui:NUMERICFIELD:RID_SVXPAGE_NUM_OPTIONS:ED_START -FortlaufeneNumerierung cui:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL -Zeichen cui:PUSHBUTTON:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET -Auswahl cui:MENUBUTTON:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP -Breite cui:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH -Hoehe cui:METRICFIELD:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT -Abgleich cui:CHECKBOX:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO -Ausrichtung cui:LISTBOX:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT +Ebene sym:cui.MultiListBox.10219.152 +Numerierung sym:cui.ListBox.10219.158 +Davor sym:cui.Edit.10219.156 +Dahinter sym:cui.Edit.10219.160 +Zeichenvorlage sym:cui.ListBox.10219.168 +Vollstaendig sym:cui.NumericField.10219.169 +BeginnBei sym:cui.NumericField.10219.171 +FortlaufeneNumerierung sym:cui.CheckBox.10219.188 +Zeichen sym:cui.PushButton.10219.173 +Auswahl sym:cui.MenuButton.10219.184 +Breite sym:cui.MetricField.10219.179 +Hoehe sym:cui.MetricField.10219.181 +Abgleich sym:cui.CheckBox.10219.177 +Ausrichtung sym:cui.ListBox.10219.183 *TabHeaderFooterSlide sym:SD_HID_SD_TABPAGE_HEADERFOOTER_SLIDE DateTime sym:sd.CheckBox.1000.2 diff --git a/testautomation/global/win/tab_p_s.win b/testautomation/global/win/tab_p_s.win index 74e8fd8ad85d..9701c96c7d23 100644 --- a/testautomation/global/win/tab_p_s.win +++ b/testautomation/global/win/tab_p_s.win @@ -1,28 +1,28 @@ *TabPfade sym:CUI_HID_OPTIONS_PATH Standard sym:cui.PushButton.12006.14 -Bearbeiten cui:PUSHBUTTON:RID_SFXPAGE_PATH:BTN_PATH +Bearbeiten sym:cui.PushButton.12006.13 Typ sym:CUI_HID_OPTPATH_CTL_PATH *TabPositionNumerierung sym:CUI_HID_SVXPAGE_NUM_POSITION -Level cui:MULTILISTBOX:RID_SVXPAGE_NUM_POSITION:LB_LEVEL +Level sym:cui.MultiListBox.10220.152 Alignment sym:cui.ListBox.10220.255 NumberFollowedBy sym:cui.ListBox.10220.251 NumberFollowedByAt sym:cui.MetricField.10220.253 AlignedAt sym:cui.MetricField.10220.257 IndentAt sym:cui.MetricField.10220.259 -Ausrichtung cui:LISTBOX:RID_SVXPAGE_NUM_POSITION:LB_ALIGN -AbstandTextNumerierung cui:METRICFIELD:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST -Relativ cui:CHECKBOX:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE -Standard cui:PUSHBUTTON:RID_SVXPAGE_NUM_POSITION:PB_STANDARD +Ausrichtung sym:cui.ListBox.10220.51 +AbstandTextNumerierung sym:cui.MetricField.10220.164 +Relativ sym:cui.CheckBox.10220.185 +Standard sym:cui.PushButton.10220.187 *TabPositionKapitelnumerierung sym:SW_HID_NUM_POSITION -Level sw:MULTILISTBOX:TP_NUM_POSITION:LB_LEVEL -NumberAlignment sw:LISTBOX:TP_NUM_POSITION:LB_ALIGN -AlignedAt sw:METRICFIELD:TP_NUM_POSITION:MF_BORDERDIST -AbstandTextNumerierung sw:METRICFIELD:TP_NUM_POSITION:MF_NUMDIST -IndentAt sw:METRICFIELD:TP_NUM_POSITION:MF_INDENT -Relativ sw:CHECKBOX:TP_NUM_POSITION:CB_RELATIVE -Standard sw:PUSHBUTTON:TP_NUM_POSITION:PB_STANDARD +Level sym:sw.MultiListBox.20872.2 +NumberAlignment sym:sw.ListBox.20872.12 +AlignedAt sym:sw.MetricField.20872.5 +AbstandTextNumerierung sym:sw.MetricField.20872.10 +IndentAt sym:sw.MetricField.20872.8 +Relativ sym:sw.CheckBox.20872.6 +Standard sym:sw.PushButton.20872.13 LabelFollowedBy sym:sw.ListBox.20872.18 AbstandTextNumerierung2 sym:sw.MetricField.20872.20 NumberingAlignment sym:sw.ListBox.20872.22 @@ -66,11 +66,11 @@ Punktreduktion sym:svx.MetricField.10152.37 Winkel sym:svx.MetricField.10152.35 *TabReferenzen sym:SW_HID_FLD_REF -Feldtyp SW:LISTBOX:TP_FLD_REF:LB_REFTYPE -Auswahl SW:LISTBOX:TP_FLD_REF:LB_REFSELECTION -Formatliste SW:LISTBOX:TP_FLD_REF:LB_REFFORMAT -Namefeld SW:EDIT:TP_FLD_REF:ED_REFNAME -Wert SW:EDIT:TP_FLD_REF:ED_REFVALUE +Feldtyp sym:sw.ListBox.20869.81 +Auswahl sym:sw.ListBox.20869.83 +Formatliste sym:sw.ListBox.20869.85 +Namefeld sym:sw.Edit.20869.88 +Wert sym:sw.Edit.20869.90 Einfuegen sym:SW_HID_FIELD_INSERT Schliessen sym:SW_HID_FIELD_CLOSE @@ -124,8 +124,8 @@ Horizontal sym:cui.CheckBox.10025.70 Vertikal sym:cui.CheckBox.10025.71 Hoch sym:cui.RadioButton.10025.51 Quer sym:cui.RadioButton.10025.52 -Einschalten cui:CHECKBOX:RID_SVXPAGE_PAGE:CB_REGISTER -AbsatzVorlage cui:LISTBOX:RID_SVXPAGE_PAGE:LB_REGISTER +Einschalten sym:cui.CheckBox.10025.60 +AbsatzVorlage sym:cui.ListBox.10025.62 Textfluss sym:cui.ListBox.10025.36 FitObject sym:cui.CheckBox.10025.72 @@ -140,15 +140,15 @@ DruckenStatus sym:cui.CheckBox.17100.61 StyleSheet sym:cui.ListBox.17100.16 *TabSonstigesDraw sym:SD_HID_SD_OPTIONS_MISC -Schnellbearbeitung SD:CHECKBOX:TP_OPTIONS_MISC:CBX_QUICKEDIT -TextbereichSelektierbar SD:CHECKBOX:TP_OPTIONS_MISC:CBX_PICKTHROUGH -SeitenlayoutdialogZeigen SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE -CacheFuerHintergrund SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE -KopieBeimVerschieben SD:CHECKBOX:TP_OPTIONS_MISC:CBX_COPY -ObjekteImmerVerschiebbar SD:CHECKBOX:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS -SetzenAufKreis SD:CHECKBOX:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION -MitAktuellerSeite SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE -Praesentationsdialoge SD:CHECKBOX:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE +Schnellbearbeitung sym:sd.CheckBox.599.24 +TextbereichSelektierbar sym:sd.CheckBox.599.9 +SeitenlayoutdialogZeigen sym:sd.CheckBox.599.6 +CacheFuerHintergrund sym:sd.CheckBox.599.25 +KopieBeimVerschieben sym:sd.CheckBox.599.13 +ObjekteImmerVerschiebbar sym:sd.CheckBox.599.19 +SetzenAufKreis sym:sd.CheckBox.599.21 +MitAktuellerSeite sym:sd.CheckBox.599.26 +Praesentationsdialoge sym:sd.CheckBox.599.6 MitAutopilotStarten sym:sd.CheckBox.599.6 Masseinheit sym:sd.ListBox.599.1 Tabulatorabstand sym:sd.MetricField.599.4 @@ -189,7 +189,7 @@ SortierergebnisseAusgebenNach sym:sc.CheckBox.25611.11 AusgabebereichName sym:sc.ListBox.25611.3 AusgabebereichZellen sym:sc.Edit.25611.4 BenutzerdefinierteSortierreihenfolge sym:sc.CheckBox.25611.7 -SortierreihenfolgeListe SC:LISTBOX:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER +SortierreihenfolgeListe sym:sc.ListBox.25611.2 VonObenNachUnten sym:sc.RadioButton.25611.12 VonLinksNachRechts sym:sc.RadioButton.25611.13 Sprache sym:sc.ListBox.25611.17 @@ -241,13 +241,13 @@ Zuruecksetzen sym:SFX2_HID_TABDLG_RESET_BTN *TabSpeichern sym:CUI_HID_OPTIONS_SAVE BenutzerspezifischeEinstellungen sym:cui.CheckBox.12000.11 -DokumenteigenschaftenBearbeiten cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_DOCINFO +DokumenteigenschaftenBearbeiten sym:cui.CheckBox.12000.14 Sicherungskopie sym:cui.CheckBox.12000.15 AutomatischSpeichern sym:cui.CheckBox.12000.16 -Minuten cui:NUMERICFIELD:RID_SFXPAGE_SAVE:ED_AUTOSAVE +Minuten sym:cui.NumericField.12000.17 NoPrettyPrinting sym:cui.CheckBox.12000.20 -URLimDateisystem cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS -URLimInternet cui:CHECKBOX:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET +URLimDateisystem sym:cui.CheckBox.12000.41 +URLimInternet sym:cui.CheckBox.12000.42 Dokumenttyp sym:cui.ListBox.12000.45 Filter sym:cui.ListBox.12000.47 WarnWhenSavingAlienFormat sym:cui.CheckBox.12000.22 diff --git a/testautomation/global/win/tab_t_z.win b/testautomation/global/win/tab_t_z.win index 20bc803286bd..f7cc0dfcf0d3 100644 --- a/testautomation/global/win/tab_t_z.win +++ b/testautomation/global/win/tab_t_z.win @@ -36,13 +36,13 @@ ScalePageWidth sym:sc.NumericField.25647.35 ScalePageHeight sym:sc.NumericField.25647.36 *TabTabelleOptionen sym:SW_HID_OPTTABLE_PAGE -VerschiebenZeile SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWMOVE -VerschiebenSpalte SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLMOVE -EinfuegenZeile SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_ROWINSERT -EinfuegenSpalte SW:METRICFIELD:TP_OPTTABLE_PAGE:MF_COLINSERT -VerhaltenFix SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIX -FixProportional SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_FIXPROP -Variabel SW:RADIOBUTTON:TP_OPTTABLE_PAGE:RB_VAR +VerschiebenZeile sym:sw.MetricField.20856.112 +VerschiebenSpalte sym:sw.MetricField.20856.114 +EinfuegenZeile sym:sw.MetricField.20856.117 +EinfuegenSpalte sym:sw.MetricField.20856.119 +VerhaltenFix sym:sw.RadioButton.20856.121 +FixProportional sym:sw.RadioButton.20856.122 +Variabel sym:sw.RadioButton.20856.123 Ueberschrift sym:sw.CheckBox.20856.101 Wiederholen sym:sw.CheckBox.20856.102 @@ -138,20 +138,20 @@ Schusterjungenregelung sym:cui.TriStateBox.10007.68 SchusterZeilen sym:cui.NumericField.10007.69 Hurenkinderregelung sym:cui.TriStateBox.10007.71 HurenkinderZeilen sym:cui.NumericField.10007.72 -Seitenzahl cui:NUMERICFIELD:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM +Seitenzahl sym:cui.NumericField.10007.76 *TabTextflussTabelle sym:SW_HID_TABLE_TEXTFLOW -Umbruch SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGEBREAK -MitSeitenvorlage SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_PAGECOLL -UeberschriftWiederholen SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_HEADLINE -TabelleNichtTrennen SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_SPLIT -MitFolgendemAbsatzZusammenhalten SW:CHECKBOX:TP_TABLE_TEXTFLOW:CB_KEEP -Seite SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_BREAKPAGE -Spalte SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_BREAKCOLUMN -Davor SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE -Danach SW:RADIOBUTTON:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER -Seitenvorlage SW:LISTBOX:TP_TABLE_TEXTFLOW:LB_PAGECOLL -Seitennummer SW:NUMERICFIELD:TP_TABLE_TEXTFLOW:NF_PAGENUM +Umbruch sym:sw.CheckBox.20852.131 +MitSeitenvorlage sym:sw.CheckBox.20852.136 +UeberschriftWiederholen sym:sw.CheckBox.20852.40 +TabelleNichtTrennen sym:sw.CheckBox.20852.145 +MitFolgendemAbsatzZusammenhalten sym:sw.CheckBox.20852.144 +Seite sym:sw.RadioButton.20852.132 +Spalte sym:sw.RadioButton.20852.133 +Davor sym:sw.RadioButton.20852.134 +Danach sym:sw.RadioButton.20852.135 +Seitenvorlage sym:sw.ListBox.20852.137 +Seitennummer sym:sw.NumericField.20852.139 ZeileTrennen sym:sw.TriStateBox.20852.146 TextDirection sym:sw.ListBox.20852.44 VerticalAlignment sym:sw.ListBox.20852.151 @@ -177,9 +177,9 @@ Parallel sym:sw.ImageRadioButton.20849.5 Durchlauf sym:sw.ImageRadioButton.20849.6 Dynamisch sym:sw.ImageRadioButton.20849.7 AbstaendeLinks sym:sw.MetricField.20849.14 -AbstaendeRechts SW:METRICFIELD:TP_FRM_WRAP:ED_RIGHT_MARGIN sw:MetricField:TP_FRM_EXT:ED_RIGHT_MARGIN -AbstaendeOben SW:METRICFIELD:TP_FRM_WRAP:ED_TOP_MARGIN sw:MetricField:TP_FRM_EXT:ED_TOP_MARGIN -AbstaendeUnten SW:METRICFIELD:TP_FRM_WRAP:ED_BOTTOM_MARGIN sw:MetricField:TP_FRM_EXT:ED_BOTTOM_MARGIN +AbstaendeRechts sym:sw.MetricField.20849.16 sw:MetricField:TP_FRM_EXT:ED_RIGHT_MARGIN +AbstaendeOben sym:sw.MetricField.20849.18 sw:MetricField:TP_FRM_EXT:ED_TOP_MARGIN +AbstaendeUnten sym:sw.MetricField.20849.19 sw:MetricField:TP_FRM_EXT:ED_BOTTOM_MARGIN ErsterAbsatz sym:sw.CheckBox.20849.8 ImHintergrund sym:sw.CheckBox.20849.22 Kontur sym:sw.CheckBox.20849.23 @@ -203,16 +203,16 @@ Synchronisieren sym:cui.CheckBox.10005.59 +TabUmrandungChart TabLinie *TabVariablen sym:SW_HID_FLD_VAR -Feldtyp SW:LISTBOX:TP_FLD_VAR:LB_VARTYPE -Auswahl SW:LISTBOX:TP_FLD_VAR:LB_VARSELECTION -Formatliste SW:LISTBOX:TP_FLD_VAR:LB_VARFORMAT -Zahlenformat SW:LISTBOX:TP_FLD_VAR:LB_VARNUMFORMAT -NameText SW:EDIT:TP_FLD_VAR:ED_VARNAME -Wert SW:EDIT:TP_FLD_VAR:ED_VARVALUE -Hinweis SW:EDIT:TP_FLD_VAR:ED_VARVALUE -Korrektur SW:EDIT:TP_FLD_VAR:ED_VARVALUE -Formel SW:EDIT:TP_FLD_VAR:ED_VARVALUE -Unsichtbar SW:CHECKBOX:TP_FLD_VAR:CB_VARINVISIBLE +Feldtyp sym:sw.ListBox.20866.27 +Auswahl sym:sw.ListBox.20866.29 +Formatliste sym:sw.ListBox.20866.36 +Zahlenformat sym:sw.ListBox.20866.35 +NameText sym:sw.Edit.20866.31 +Wert sym:sw.Edit.20866.33 +Hinweis sym:sw.Edit.20866.33 +Korrektur sym:sw.Edit.20866.33 +Formel sym:sw.Edit.20866.33 +Unsichtbar sym:sw.CheckBox.20866.40 Uebernehmen sym:SW_HID_FLDVAR_APPLY Loeschen sym:SW_HID_FLDVAR_DELETE Einfuegen sym:SW_HID_FIELD_INSERT @@ -309,12 +309,12 @@ Bearbeiten sym:sw.PushButton.20892.40 Inhalt sym:SW_HID_BUSINESS_CARD_CONTENT WelcherAutotext sym:sw.ListBox.20893.5 -*TabWerte SC:TABPAGE:TP_VALIDATION_VALUES -Zulassen SC:LISTBOX:TP_VALIDATION_VALUES:LB_ALLOW +*TabWerte sym:sc.TabPage.696 +Zulassen sym:sc.ListBox.696.2 LeerzellenZulassen sym:sc.CheckBox.696.3 -Daten SC:LISTBOX:TP_VALIDATION_VALUES:LB_VALUE -Wert SC:EDIT:TP_VALIDATION_VALUES:EDT_MIN -Minimum SC:EDIT:TP_VALIDATION_VALUES:EDT_MIN +Daten sym:sc.ListBox.696.5 +Wert sym:sc.Edit.696.7 +Minimum sym:sc.Edit.696.7 Maximum sym:sc.Edit.696.9 ShowSelectionList sym:sc.CheckBox.696.27 ListSortEntries sym:sc.CheckBox.696.28 @@ -347,23 +347,23 @@ Tausenderpunkt sym:cui.CheckBox.10041.26 PBHinzufuegen sym:CUI_HID_NUMBERFORMAT_TBI_ADD PBEntfernen sym:CUI_HID_NUMBERFORMAT_TBI_REMOVE PBInfo sym:CUI_HID_NUMBERFORMAT_TBI_INFO -Kommentar cui:EDIT:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT +Kommentar sym:cui.Edit.10041.28 Zurueck sym:SFX2_HID_TABDLG_RESET_BTN FormatSprache sym:cui.ListBox.10041.33 Standard sym:SFX2_HID_TABDLG_STANDARD_BTN Standardformat sym:cui.CheckBox.10041.34 *TabZeilennumerierung sym:SW_HID_LINENUMBERING -Einschalten SW:CHECKBOX:TP_LINENUMBERING:CB_NUMBERING_ON -Vorlage SW:LISTBOX:TP_LINENUMBERING:LB_CHAR_STYLE -Format SW:LISTBOX:TP_LINENUMBERING:LB_FORMAT -Position SW:LISTBOX:TP_LINENUMBERING:LB_POS -Abstand SW:METRICFIELD:TP_LINENUMBERING:MF_OFFSET -Intervall SW:NUMERICFIELD:TP_LINENUMBERING:NF_NUM_INVERVAL -TeilerText SW:EDIT:TP_LINENUMBERING:ED_DIVISOR -Alle SW:NUMERICFIELD:TP_LINENUMBERING:NF_DIV_INTERVAL -Leerzeilen SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_EMPTYLINES -ZeilenInTextrahmen SW:CHECKBOX:TP_LINENUMBERING:CB_COUNT_FRAMELINES +Einschalten sym:sw.CheckBox.20875.1 +Vorlage sym:sw.ListBox.20875.3 +Format sym:sw.ListBox.20875.5 +Position sym:sw.ListBox.20875.7 +Abstand sym:sw.MetricField.20875.9 +Intervall sym:sw.NumericField.20875.11 +TeilerText sym:sw.Edit.20875.15 +Alle sym:sw.NumericField.20875.17 +Leerzeilen sym:sw.CheckBox.20875.20 +ZeilenInTextrahmen sym:sw.CheckBox.20875.21 *TabZellschutz sym:SC_HID_SCPAGE_PROTECTION Gesperrt sym:sc.TriStateBox.25607.1 @@ -393,7 +393,7 @@ InhaltSchuetzen sym:sw.CheckBox.20851.119 PositionSchuetzen sym:sw.CheckBox.20851.120 GroesseSchuetzen sym:sw.CheckBox.20851.121 Drucken sym:sw.CheckBox.20851.124 -Editierbar SW:CHECKBOX:TP_FRM_ADD:CB_EDIT_IN_READONLY +Editierbar sym:sw.CheckBox.20851.123 PreviousLink sym:sw.ListBox.20851.115 NextLink sym:sw.ListBox.20851.117 TextDirection sym:sw.ListBox.20851.128 -- cgit From fb91baaf8b807d19f7a0c1b7a4c48faddb3002bc Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 24 Sep 2010 22:09:20 +0200 Subject: CWS changehid: sym prefix removed from commands --- testautomation/global/sid/all.sid | 986 +++++++++++++++---------------- testautomation/global/sid/bars.sid | 1038 ++++++++++++++++----------------- testautomation/global/sid/context.sid | 20 +- testautomation/global/sid/e_all.sid | 1020 ++++++++++++++++---------------- testautomation/global/sid/others.sid | 40 +- 5 files changed, 1552 insertions(+), 1552 deletions(-) diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid index a5162431e8fa..ca4233437934 100644 --- a/testautomation/global/sid/all.sid +++ b/testautomation/global/sid/all.sid @@ -10,17 +10,17 @@ ' *** Nicht mehr aktuelle Slots, *** ' ** die aber noch verwendet werden ** ' ** -DateiNeu sym:.uno:NewDoc -DateiLetzteVersion sym:.uno:Reload SID_LASTVERSIONDOC -DateiVersenden sym:.uno:SendMail -DateiScannenQuelleAuswaehlen sym:.uno:TwainSelect -DateiScannenAnfordern sym:.uno:TwainSelect -BearbeitenAllesMarkieren sym:.uno:Select -EinfuegenObjekt sym:.uno:InsertObject -EinfuegenObjektObjekte sym:.uno:InsertObject -EinfuegenObjektWriter sym:.uno:InsertObjectDialog -EinfuegenRahmenfenster sym:.uno:InsertObjectFloatingFrame -ExtrasNumerierungAufzaehlung sym:.uno:BulletsAndNumberingDialog +DateiNeu .uno:NewDoc +DateiLetzteVersion .uno:Reload SID_LASTVERSIONDOC +DateiVersenden .uno:SendMail +DateiScannenQuelleAuswaehlen .uno:TwainSelect +DateiScannenAnfordern .uno:TwainSelect +BearbeitenAllesMarkieren .uno:Select +EinfuegenObjekt .uno:InsertObject +EinfuegenObjektObjekte .uno:InsertObject +EinfuegenObjektWriter .uno:InsertObjectDialog +EinfuegenRahmenfenster .uno:InsertObjectFloatingFrame +ExtrasNumerierungAufzaehlung .uno:BulletsAndNumberingDialog ' *************************************************** @@ -28,123 +28,123 @@ ExtrasNumerierungAufzaehlung sym:.uno:BulletsAndNumberingDialog ' ********* DateiMen� ********* ' **** ' **** Alle -DateiNeuAusVorlage sym:.uno:NewDoc -DateiOeffnen sym:.uno:Open +DateiNeuAusVorlage .uno:NewDoc +DateiOeffnen .uno:Open DateiAutopilotBrief service:com.sun.star.wizards.letter.CallWizard?start DateiAutopilotFax service:com.sun.star.wizards.fax.CallWizard?start DateiAutopilotAgenda service:com.sun.star.wizards.agenda.CallWizard?start -DateiAutopilotPraesentation sym:.uno:AutoPilotPresentations -DateiSchliessenUndZurueck sym:.uno:CloseDoc -DateiKopieAktualisieren sym:.uno:Save -DateiKopieSpeichern sym:.uno:SaveAs -DateiSchliessen sym:.uno:CloseDoc -DateiSpeichern sym:.uno:Save -DateiSpeichernUnter sym:.uno:SaveAs -DateiAllesSpeichern sym:.uno:SaveAll -DateiExportieren sym:.uno:ExportTo -DateiSendenDokumentAlseMail sym:.uno:SendMail -DateiVersionen sym:.uno:VersionDialog -DateiNeuLaden sym:.uno:Reload SID_LASTVERSIONDOC -DateiEigenschaften sym:.uno:SetDocumentProperties -DateiDokumentvorlageSpeichern sym:.uno:SaveAsTemplate -DateiDokumentvorlageVerwalten sym:.uno:Organizer -DateiDokumentvorlageBearbeiten sym:.uno:OpenTemplate -DateiSeitenansicht sym:.uno:PrintPreview -DateiDrucken sym:.uno:Print -DateiDruckereinstellung sym:.uno:PrinterSetup -DateiBeenden sym:.uno:Quit +DateiAutopilotPraesentation .uno:AutoPilotPresentations +DateiSchliessenUndZurueck .uno:CloseDoc +DateiKopieAktualisieren .uno:Save +DateiKopieSpeichern .uno:SaveAs +DateiSchliessen .uno:CloseDoc +DateiSpeichern .uno:Save +DateiSpeichernUnter .uno:SaveAs +DateiAllesSpeichern .uno:SaveAll +DateiExportieren .uno:ExportTo +DateiSendenDokumentAlseMail .uno:SendMail +DateiVersionen .uno:VersionDialog +DateiNeuLaden .uno:Reload SID_LASTVERSIONDOC +DateiEigenschaften .uno:SetDocumentProperties +DateiDokumentvorlageSpeichern .uno:SaveAsTemplate +DateiDokumentvorlageVerwalten .uno:Organizer +DateiDokumentvorlageBearbeiten .uno:OpenTemplate +DateiSeitenansicht .uno:PrintPreview +DateiDrucken .uno:Print +DateiDruckereinstellung .uno:PrinterSetup +DateiBeenden .uno:Quit ' **** Writer -DateiSendenGliederungAnPraesentation sym:.uno:SendOutlineToStarImpress -DateiSendenGliederungZumClipboard sym:.uno:SendOutlineToClipboard -DateiSendenAutoabstractErzeugen sym:.uno:CreateAbstract -DateiSendenAutoabstractAnPraesentation sym:.uno:SendAbstractToStarImpress -DateiSendenGlobaldokumentErzeugen sym:.uno:NewGlobalDoc -DateiSendenHTMLDokumentErzeugen sym:.uno:NewHtmlDoc -DateiSerienbrief sym:.uno:MergeDialog +DateiSendenGliederungAnPraesentation .uno:SendOutlineToStarImpress +DateiSendenGliederungZumClipboard .uno:SendOutlineToClipboard +DateiSendenAutoabstractErzeugen .uno:CreateAbstract +DateiSendenAutoabstractAnPraesentation .uno:SendAbstractToStarImpress +DateiSendenGlobaldokumentErzeugen .uno:NewGlobalDoc +DateiSendenHTMLDokumentErzeugen .uno:NewHtmlDoc +DateiSerienbrief .uno:MergeDialog ' **** Impress / Draw -DateiSeiteEinrichten sym:.uno:PageSetup -Dateieinpacken sym:.uno:PackAndGo +DateiSeiteEinrichten .uno:PageSetup +Dateieinpacken .uno:PackAndGo ' **** Image / Chart / Math -DateiDokumentAlsEMail sym:.uno:SendMail +DateiDokumentAlsEMail .uno:SendMail ' *********************************** ' ********* Bearbeitenmenue ********* ' **** ' **** Alle -BearbeitenRueckgaengig sym:.uno:Undo -BearbeitenWiederholen sym:.uno:Redo -BearbeitenLetzterBefehl sym:.uno:RepeatAction -BearbeitenAusschneiden sym:.uno:Cut -BearbeitenKopieren sym:.uno:Copy -BearbeitenEinfuegen sym:.uno:Paste -BearbeitenLoeschen sym:.uno:Delete -BearbeitenAllesAuswaehlen sym:.uno:SelectAll -BearbeitenSuchenErsetzen sym:.uno:SearchDialog -BearbeitenNavigator sym:.uno:Navigator -BearbeitenAutoText sym:.uno:EditGlossary -BearbeitenPlugIn sym:.uno:PlugInsActive -BearbeitenImageMap sym:.uno:ImageMapDialog -BearbeitenLiteraturdatenbank sym:.uno:BibliographyComponent +BearbeitenRueckgaengig .uno:Undo +BearbeitenWiederholen .uno:Redo +BearbeitenLetzterBefehl .uno:RepeatAction +BearbeitenAusschneiden .uno:Cut +BearbeitenKopieren .uno:Copy +BearbeitenEinfuegen .uno:Paste +BearbeitenLoeschen .uno:Delete +BearbeitenAllesAuswaehlen .uno:SelectAll +BearbeitenSuchenErsetzen .uno:SearchDialog +BearbeitenNavigator .uno:Navigator +BearbeitenAutoText .uno:EditGlossary +BearbeitenPlugIn .uno:PlugInsActive +BearbeitenImageMap .uno:ImageMapDialog +BearbeitenLiteraturdatenbank .uno:BibliographyComponent ' **** Writer BearbeitenInhalteEinfuegenWriter .uno:PasteSpecial -BearbeitenAenderungenAufzeichnen sym:.uno:TrackChanges -BearbeitenAenderungenAnzeigen sym:.uno:ShowTrackedChanges -BearbeitenAenderungenAkzeptierenOderVerwerfen sym:.uno:AcceptTrackedChanges -BearbeitenAenderungenKommentar sym:.uno:CommentChangeTracking -BearbeitenAenderungenDokumentZusammenfuehren sym:.uno:MergeDocuments -BearbeitenDokumentVergleichen sym:.uno:CompareDocuments -BearbeitenVerknuepfungenWriter sym:.uno:LinkDialog -BearbeitenDatenbankAustauschen sym:.uno:ChangeDatabaseField -BearbeitenFeldbefehl sym:.uno:FieldDialog -BearbeitenFussnote sym:.uno:EditFootnote -BearbeitenVerzeichniseintrag sym:.uno:IndexEntryDialog -BearbeitenHyperlink sym:.uno:EditHyperlink +BearbeitenAenderungenAufzeichnen .uno:TrackChanges +BearbeitenAenderungenAnzeigen .uno:ShowTrackedChanges +BearbeitenAenderungenAkzeptierenOderVerwerfen .uno:AcceptTrackedChanges +BearbeitenAenderungenKommentar .uno:CommentChangeTracking +BearbeitenAenderungenDokumentZusammenfuehren .uno:MergeDocuments +BearbeitenDokumentVergleichen .uno:CompareDocuments +BearbeitenVerknuepfungenWriter .uno:LinkDialog +BearbeitenDatenbankAustauschen .uno:ChangeDatabaseField +BearbeitenFeldbefehl .uno:FieldDialog +BearbeitenFussnote .uno:EditFootnote +BearbeitenVerzeichniseintrag .uno:IndexEntryDialog +BearbeitenHyperlink .uno:EditHyperlink ' **** Calc BearbeitenInhalteEinfuegenCalc .uno:PasteSpecial -BearbeitenAenderungenAufzeichnenCalc sym:.uno:TraceChangeMode -BearbeitenAenderungenSchuetzen sym:.uno:ProtectTraceChangeMode -BearbeitenAenderungenKommentarCalc sym:.uno:CommentChange -BearbeitenAenderungenAnzeigenCalc sym:.uno:ShowChanges -BearbeitenAenderungenAkzeptierenOderVerwerfenCalc sym:.uno:AcceptChanges -BearbeitenAenderungenDokumentZusammenfuehrenCalc sym:.uno:MergeDocuments -BearbeitenDokumentVergleichenCalc sym:.uno:CompareDocuments -BearbeitenVerknuepfungenCalc sym:.uno:EditLinks -BearbeitenKopfUndFusszeilen sym:.uno:EditHeaderAndFooter -BearbeitenAusfuellenLinks sym:.uno:FillLeft -BearbeitenAusfuellenOben sym:.uno:FillUp -BearbeitenAusfuellenRechts sym:.uno:FillRight -BearbeitenAusfuellenReihe sym:.uno:FillSeries -BearbeitenAusfuellenTabelle sym:.uno:FillTable -BearbeitenAusfuellenUnten sym:.uno:FillDown -BearbeitenInhalteLoeschen sym:.uno:Delete -BearbeitenZellenLoeschen sym:.uno:DeleteCell -BearbeitenTabelleLoeschen sym:.uno:Remove -BearbeitenTabelleVerschiebenKopieren sym:.uno:Move -BearbeitenManuellenUmbruchLoeschenSpaltenumbruch sym:.uno:DeleteColumnbreak -BearbeitenManuellenUmbruchLoeschenZeilenumbruch sym:.uno:DeleteRowbreak +BearbeitenAenderungenAufzeichnenCalc .uno:TraceChangeMode +BearbeitenAenderungenSchuetzen .uno:ProtectTraceChangeMode +BearbeitenAenderungenKommentarCalc .uno:CommentChange +BearbeitenAenderungenAnzeigenCalc .uno:ShowChanges +BearbeitenAenderungenAkzeptierenOderVerwerfenCalc .uno:AcceptChanges +BearbeitenAenderungenDokumentZusammenfuehrenCalc .uno:MergeDocuments +BearbeitenDokumentVergleichenCalc .uno:CompareDocuments +BearbeitenVerknuepfungenCalc .uno:EditLinks +BearbeitenKopfUndFusszeilen .uno:EditHeaderAndFooter +BearbeitenAusfuellenLinks .uno:FillLeft +BearbeitenAusfuellenOben .uno:FillUp +BearbeitenAusfuellenRechts .uno:FillRight +BearbeitenAusfuellenReihe .uno:FillSeries +BearbeitenAusfuellenTabelle .uno:FillTable +BearbeitenAusfuellenUnten .uno:FillDown +BearbeitenInhalteLoeschen .uno:Delete +BearbeitenZellenLoeschen .uno:DeleteCell +BearbeitenTabelleLoeschen .uno:Remove +BearbeitenTabelleVerschiebenKopieren .uno:Move +BearbeitenManuellenUmbruchLoeschenSpaltenumbruch .uno:DeleteColumnbreak +BearbeitenManuellenUmbruchLoeschenZeilenumbruch .uno:DeleteRowbreak ' **** Draw / Impress BearbeitenInhalteEinfuegenDraw .uno:PasteSpecial -BearbeitenVerknuepfungenDraw sym:.uno:ManageLinks -BearbeitenDuplizieren sym:.uno:CopyObjects -BearbeitenUeberblenden sym:.uno:Morphing -BearbeitenSeiteLoeschen sym:.uno:DeletePage -BearbeitenEbeneLoeschen sym:.uno:DeleteLayer -BearbeitenFeldbefehlDraw sym:.uno:ModifyField +BearbeitenVerknuepfungenDraw .uno:ManageLinks +BearbeitenDuplizieren .uno:CopyObjects +BearbeitenUeberblenden .uno:Morphing +BearbeitenSeiteLoeschen .uno:DeletePage +BearbeitenEbeneLoeschen .uno:DeleteLayer +BearbeitenFeldbefehlDraw .uno:ModifyField ' **** Image / Chart / Math -BearbeitenAllesAuswaehlenMath sym:.uno:Select -BearbeitenNaechsterMarker sym:.uno:NextMark -BearbeitenVorherigerMarker sym:.uno:PrevMark -BearbeitenNaechsterFehler sym:.uno:NextError -BearbeitenVorherigerFehler sym:.uno:PrevError +BearbeitenAllesAuswaehlenMath .uno:Select +BearbeitenNaechsterMarker .uno:NextMark +BearbeitenVorherigerMarker .uno:PrevMark +BearbeitenNaechsterFehler .uno:NextError +BearbeitenVorherigerFehler .uno:PrevError BearbeitenDiagrammdaten sym:CHART2_HID_DIAGRAM_DATA @@ -152,496 +152,496 @@ BearbeitenDiagrammdaten sym:CHART2_HID_DIAGRAM_DATA ' ********* Ansichtmenue ********* ' **** ' **** Alle -AnsichtMassstab sym:.uno:Zoom -AnsichtBrowser sym:.uno:Beamer -AnsichtHyperlinkleiste sym:.uno:InsertHyperlink -AnsichtStatusleiste sym:.uno:StatusBarVisible sym:.uno:StatusBarVisible -AnsichtGanzerBildschirm sym:.uno:FullScreen SID_FULLSCREEN +AnsichtMassstab .uno:Zoom +AnsichtBrowser .uno:Beamer +AnsichtHyperlinkleiste .uno:InsertHyperlink +AnsichtStatusleiste .uno:StatusBarVisible .uno:StatusBarVisible +AnsichtGanzerBildschirm .uno:FullScreen SID_FULLSCREEN ' **** Writer -AnsichtLineal sym:.uno:Ruler -AnsichtAktuelleDatenbank sym:.uno:DataImport -AnsichtTextbegrenzungen sym:.uno:ViewBounds -AnsichtMarkierungen sym:.uno:Marks -AnsichtFeldbefehle sym:.uno:Fieldnames -AnsichtSteuerzeichen sym:.uno:ControlCodes -AnsichtOnlineLayout sym:.uno:BrowseView -AnsichtVersteckteAbsaetze sym:.uno:ShowHiddenParagraphs -AnsichtHTMLBearbeitung sym:.uno:HtmlMode +AnsichtLineal .uno:Ruler +AnsichtAktuelleDatenbank .uno:DataImport +AnsichtTextbegrenzungen .uno:ViewBounds +AnsichtMarkierungen .uno:Marks +AnsichtFeldbefehle .uno:Fieldnames +AnsichtSteuerzeichen .uno:ControlCodes +AnsichtOnlineLayout .uno:BrowseView +AnsichtVersteckteAbsaetze .uno:ShowHiddenParagraphs +AnsichtHTMLBearbeitung .uno:HtmlMode AnsichtHTMLQuelltextWriter sym:SW_HID_SOURCEVIEW ' **** Calc -AnsichtRechenleiste sym:.uno:InputLineVisible -AnsichtSpaltenZeilenkoepfe sym:.uno:ViewRowColumnHeaders -AnsichtWerteHervorheben sym:.uno:ViewValueHighlighting -AnsichtSeitenumbruchVorschau sym:.uno:PagebreakMode +AnsichtRechenleiste .uno:InputLineVisible +AnsichtSpaltenZeilenkoepfe .uno:ViewRowColumnHeaders +AnsichtWerteHervorheben .uno:ViewValueHighlighting +AnsichtSeitenumbruchVorschau .uno:PagebreakMode ' **** Draw / Impress -AnsichtFarbleiste sym:.uno:ColorControl -AnsichtLineale sym:.uno:ShowRuler -AnsichtZeichnung sym:.uno:DrawingMode -AnsichtGliederung sym:.uno:OutlineMode -AnsichtDiasortierung sym:.uno:DiaMode -AnsichtNotizen sym:.uno:NotesMode -AnsichtHandzettel sym:.uno:HandoutMode -AnsichtBildschirmpraesentation sym:.uno:Presentation -AnsichtVorschau sym:.uno:PreviewWindow -AnsichtSeite sym:.uno:PageMode -AnsichtHintergrund sym:.uno:MasterPage -AnsichtHintergrundZeichnung sym:.uno:SlideMasterPage -AnsichtHintergrundTitel sym:.uno:TitleMasterPage -AnsichtHintergrundNotizen sym:.uno:NotesMasterPage -AnsichtHintergrundHandzettel sym:.uno:HandoutMasterPage -AnsichtEbene sym:.uno:LayerMode +AnsichtFarbleiste .uno:ColorControl +AnsichtLineale .uno:ShowRuler +AnsichtZeichnung .uno:DrawingMode +AnsichtGliederung .uno:OutlineMode +AnsichtDiasortierung .uno:DiaMode +AnsichtNotizen .uno:NotesMode +AnsichtHandzettel .uno:HandoutMode +AnsichtBildschirmpraesentation .uno:Presentation +AnsichtVorschau .uno:PreviewWindow +AnsichtSeite .uno:PageMode +AnsichtHintergrund .uno:MasterPage +AnsichtHintergrundZeichnung .uno:SlideMasterPage +AnsichtHintergrundTitel .uno:TitleMasterPage +AnsichtHintergrundNotizen .uno:NotesMasterPage +AnsichtHintergrundHandzettel .uno:HandoutMasterPage +AnsichtEbene .uno:LayerMode ' **** Image -AnsichtFuenfzig sym:.uno:View50 -AnsichtEinhundert sym:.uno:View100 -AnsichtZweihundert sym:.uno:View200 -AnsichtVergroessern sym:.uno:ZoomIn -AnsichtVerkleinern sym:.uno:ZoomOut -AnsichtAllesAnzeigen sym:.uno:Adjust -AnsichtAktualisieren sym:.uno:Draw -AnsichtOperatoren sym:.uno:ToolBox +AnsichtFuenfzig .uno:View50 +AnsichtEinhundert .uno:View100 +AnsichtZweihundert .uno:View200 +AnsichtVergroessern .uno:ZoomIn +AnsichtVerkleinern .uno:ZoomOut +AnsichtAllesAnzeigen .uno:Adjust +AnsichtAktualisieren .uno:Draw +AnsichtOperatoren .uno:ToolBox ' **** Math -AnsichtAutomatischesNeuzeichnen sym:.uno:RedrawAutomatic +AnsichtAutomatischesNeuzeichnen .uno:RedrawAutomatic ' **** Frameset -AnsichtHTMLQuelltextFrame sym:.uno:SourceView +AnsichtHTMLQuelltextFrame .uno:SourceView ' **** WriterWeb -AnsichtDruckLayout sym:.uno:PrintLayout -AnsichtHTMLQuelltext sym:.uno:SourceView +AnsichtDruckLayout .uno:PrintLayout +AnsichtHTMLQuelltext .uno:SourceView ' *********************************** ' ********* Einfuegenmenue ********** ' **** ' **** Alle -EinfuegenGrafikAusDatei sym:.uno:InsertGraphic -EinfuegenGrafikDiagramm sym:.uno:InsertObjectChart -EinfuegenObjektOLEObjekt sym:.uno:InsertObject -EinfuegenObjektPlugIn sym:.uno:InsertPlugin -EinfuegenObjektKlang sym:.uno:InsertSound -EinfuegenObjektVideo sym:.uno:InsertVideo -EinfuegenFrame sym:.uno:InsertObjectFloatingFrame +EinfuegenGrafikAusDatei .uno:InsertGraphic +EinfuegenGrafikDiagramm .uno:InsertObjectChart +EinfuegenObjektOLEObjekt .uno:InsertObject +EinfuegenObjektPlugIn .uno:InsertPlugin +EinfuegenObjektKlang .uno:InsertSound +EinfuegenObjektVideo .uno:InsertVideo +EinfuegenFrame .uno:InsertObjectFloatingFrame ' **** Writer EinfuegenSonderzeichenWriter .uno:InsertSymbol -EinfuegenFormelWriter sym:.uno:InsertObjectStarMath -EinfuegenTabelleWriter sym:.uno:InsertTable -EinfuegenDateiWriter sym:.uno:InsertDoc -EinfuegenManuellerUmbruch sym:.uno:InsertBreak -EinfuegenFeldbefehlDatum sym:.uno:InsertDateField -EinfuegenFeldbefehlUhrzeit sym:.uno:InsertTimeField -EinfuegenFeldbefehlSeitennummer sym:.uno:InsertPageNumberField -EinfuegenFeldbefehlSeitenanzahl sym:.uno:InsertPageCountField -EinfuegenFeldbefehlThema sym:.uno:InsertTopicField -EinfuegenFeldbefehlTitel sym:.uno:InsertTitleField -EinfuegenFeldbefehlAutor sym:.uno:InsertAuthorField -EinfuegenFeldbefehlAndere sym:.uno:InsertField -EinfuegenBereich sym:.uno:InsertSection -EinfuegenHyperlink sym:.uno:HyperlinkDialog -EinfuegenFussnote sym:.uno:InsertFootnoteDialog -EinfuegenBeschriftung sym:.uno:InsertCaptionDialog -EinfuegenTextmarke sym:.uno:InsertBookmark -EinfuegenQuerverweis sym:.uno:InsertReferenceField -EinfuegenNotizWriter sym:.uno:InsertAnnotation -EinfuegenScript sym:.uno:InsertScript -EinfuegenVerzeichnis sym:.uno:InsertMultiIndex -EinfuegenVerzeichnisseEintrag sym:.uno:InsertIndexesEntry -EinfuegenVerzeichnisLiteraturverzeichnis sym:.uno:InsertAuthoritiesEntry -EinfuegenBriefumschlag sym:.uno:InsertEnvelope -EinfuegenEtiketten sym:.uno:InsertLabels -EinfuegenVisitenkarten sym:.uno:InsertBusinessCard -EinfuegenHorizontaleLinie sym:.uno:InsertGraphicRuler -EinfuegenRahmen sym:.uno:InsertFrame -EinfuegenGrafikScannenQuelleAuswaehlen sym:.uno:TwainSelect -EinfuegenGrafikScannenAnfordern sym:.uno:TwainTransfer +EinfuegenFormelWriter .uno:InsertObjectStarMath +EinfuegenTabelleWriter .uno:InsertTable +EinfuegenDateiWriter .uno:InsertDoc +EinfuegenManuellerUmbruch .uno:InsertBreak +EinfuegenFeldbefehlDatum .uno:InsertDateField +EinfuegenFeldbefehlUhrzeit .uno:InsertTimeField +EinfuegenFeldbefehlSeitennummer .uno:InsertPageNumberField +EinfuegenFeldbefehlSeitenanzahl .uno:InsertPageCountField +EinfuegenFeldbefehlThema .uno:InsertTopicField +EinfuegenFeldbefehlTitel .uno:InsertTitleField +EinfuegenFeldbefehlAutor .uno:InsertAuthorField +EinfuegenFeldbefehlAndere .uno:InsertField +EinfuegenBereich .uno:InsertSection +EinfuegenHyperlink .uno:HyperlinkDialog +EinfuegenFussnote .uno:InsertFootnoteDialog +EinfuegenBeschriftung .uno:InsertCaptionDialog +EinfuegenTextmarke .uno:InsertBookmark +EinfuegenQuerverweis .uno:InsertReferenceField +EinfuegenNotizWriter .uno:InsertAnnotation +EinfuegenScript .uno:InsertScript +EinfuegenVerzeichnis .uno:InsertMultiIndex +EinfuegenVerzeichnisseEintrag .uno:InsertIndexesEntry +EinfuegenVerzeichnisLiteraturverzeichnis .uno:InsertAuthoritiesEntry +EinfuegenBriefumschlag .uno:InsertEnvelope +EinfuegenEtiketten .uno:InsertLabels +EinfuegenVisitenkarten .uno:InsertBusinessCard +EinfuegenHorizontaleLinie .uno:InsertGraphicRuler +EinfuegenRahmen .uno:InsertFrame +EinfuegenGrafikScannenQuelleAuswaehlen .uno:TwainSelect +EinfuegenGrafikScannenAnfordern .uno:TwainTransfer ' **** Calc -EinfuegenSonderzeichenCalc sym:.uno:InsertSymbol -EinfuegenGrafikAusBildbearbeitungCalc sym:.uno:InsertObjectStarImage -EinfuegenFormelCalc sym:.uno:InsertObjectStarMath -EinfuegenTabelleCalc sym:.uno:Insert -EinfuegenManuellerUmbruchSpaltenumbruch sym:.uno:InsertColumnBreak -EinfuegenManuellerUmbruchZeilenumbruch sym:.uno:InsertRowBreak -EinfuegenZellen sym:.uno:InsertCell -EinfuegenZeilenCalc sym:.uno:InsertRows -EinfuegenSpaltenCalc sym:.uno:InsertColumns -EinfuegenFunktion sym:.uno:FunctionDialog -EinfuegenNamenEinfuegen sym:.uno:InsertName -EinfuegenNamenFestlegen sym:.uno:DefineName -EinfuegenNamenUebernehmen sym:.uno:CreateNames -EinfuegenNamenBeschriftungen sym:.uno:DefineLabelRange -EinfuegenNotizCalc sym:.uno:InsertAnnotation -EinfuegenExterneDatenQuelle sym:.uno:InsertExternalDataSource +EinfuegenSonderzeichenCalc .uno:InsertSymbol +EinfuegenGrafikAusBildbearbeitungCalc .uno:InsertObjectStarImage +EinfuegenFormelCalc .uno:InsertObjectStarMath +EinfuegenTabelleCalc .uno:Insert +EinfuegenManuellerUmbruchSpaltenumbruch .uno:InsertColumnBreak +EinfuegenManuellerUmbruchZeilenumbruch .uno:InsertRowBreak +EinfuegenZellen .uno:InsertCell +EinfuegenZeilenCalc .uno:InsertRows +EinfuegenSpaltenCalc .uno:InsertColumns +EinfuegenFunktion .uno:FunctionDialog +EinfuegenNamenEinfuegen .uno:InsertName +EinfuegenNamenFestlegen .uno:DefineName +EinfuegenNamenUebernehmen .uno:CreateNames +EinfuegenNamenBeschriftungen .uno:DefineLabelRange +EinfuegenNotizCalc .uno:InsertAnnotation +EinfuegenExterneDatenQuelle .uno:InsertExternalDataSource ' **** Einfuegenmenue : Draw EinfuegenSonderzeichenDraw .uno:InsertSymbol -EinfuegenGrafikAusBildbearbeitungDraw sym:.uno:InsertImage -EinfuegenFormelDraw sym:.uno:InsertMath -EinfuegenTabelleDraw sym:.uno:InsertSpreadsheet -EinfuegenDateiDraw sym:.uno:ImportFromFile -EinfuegenSeite sym:.uno:InsertPage -EinfuegenSeiteDuplizieren sym:.uno:DuplicatePage -EinfuegenSeitenAusGliederung sym:.uno:ExpandPage -EinfuegenUebersichtsseite sym:.uno:SummaryPage -EinfuegenEbene sym:.uno:InsertLayer -EinfuegenFangliniePunkt sym:.uno:CapturePoint -EinfuegenFeldbefehlDatumFix sym:.uno:InsertDateFieldFix -EinfuegenFeldbefehlDatumVariabel sym:.uno:InsertDateFieldVar -EinfuegenFeldbefehlUhrzeitFix sym:.uno:InsertTimeFieldFix -EinfuegenFeldbefehlUhrzeitVariabel sym:.uno:InsertTimeFieldVar -EinfuegenFeldbefehlAutorDraw sym:.uno:InsertAuthorField -EinfuegenFeldbefehlSeitennummerDraw sym:.uno:InsertPageField -EinfuegenFeldbefehlDateiname sym:.uno:InsertFileField -EinfuegenQuelleAuswaehlen sym:.uno:TwainSelect -EinfuegenAnfordern sym:.uno:TwainTransfer -EinfuegenSymbol sym:.uno:ChoosePolygon +EinfuegenGrafikAusBildbearbeitungDraw .uno:InsertImage +EinfuegenFormelDraw .uno:InsertMath +EinfuegenTabelleDraw .uno:InsertSpreadsheet +EinfuegenDateiDraw .uno:ImportFromFile +EinfuegenSeite .uno:InsertPage +EinfuegenSeiteDuplizieren .uno:DuplicatePage +EinfuegenSeitenAusGliederung .uno:ExpandPage +EinfuegenUebersichtsseite .uno:SummaryPage +EinfuegenEbene .uno:InsertLayer +EinfuegenFangliniePunkt .uno:CapturePoint +EinfuegenFeldbefehlDatumFix .uno:InsertDateFieldFix +EinfuegenFeldbefehlDatumVariabel .uno:InsertDateFieldVar +EinfuegenFeldbefehlUhrzeitFix .uno:InsertTimeFieldFix +EinfuegenFeldbefehlUhrzeitVariabel .uno:InsertTimeFieldVar +EinfuegenFeldbefehlAutorDraw .uno:InsertAuthorField +EinfuegenFeldbefehlSeitennummerDraw .uno:InsertPageField +EinfuegenFeldbefehlDateiname .uno:InsertFileField +EinfuegenQuelleAuswaehlen .uno:TwainSelect +EinfuegenAnfordern .uno:TwainTransfer +EinfuegenSymbol .uno:ChoosePolygon ' *********************************** ' *********** Formatmenue *********** ' **** ' **** Alle -FormatZeichen sym:.uno:FontDialog +FormatZeichen .uno:FontDialog FormatLinie .uno:FormatLine FormatFlaeche .uno:FormatArea -FormatAbsatz sym:.uno:ParagraphDialog -FormatVorlagenkatalog sym:.uno:StyleCatalog -FormatVorlagenLaden sym:.uno:LoadStyles -FormatGestalter sym:.uno:DesignerDialog -'FormatStylist sym:.uno:DesignerDialog -FormatKontrollfeld sym:.uno:ControlProperties -FormatFormularEigenschaften sym:.uno:FormProperties -FormatGrossBuchstaben sym:.uno:ChangeCaseToUpper -FormatKleinBuchstaben sym:.uno:ChangeCaseToLower +FormatAbsatz .uno:ParagraphDialog +FormatVorlagenkatalog .uno:StyleCatalog +FormatVorlagenLaden .uno:LoadStyles +FormatGestalter .uno:DesignerDialog +'FormatStylist .uno:DesignerDialog +FormatKontrollfeld .uno:ControlProperties +FormatFormularEigenschaften .uno:FormProperties +FormatGrossBuchstaben .uno:ChangeCaseToUpper +FormatKleinBuchstaben .uno:ChangeCaseToLower ' **** Writer -FormatStandardWriter sym:.uno:ResetAttributes -FormatSeiteWriter sym:.uno:PageDialog -FormatBereiche sym:.uno:EditRegion -FormatNumerierungAufzaehlung sym:.uno:BulletsAndNumberingDialog -FormatAutoformatWaehrendDerEingabe sym:.uno:OnlineAutoFormat -FormatAutoFormatAutomatisch sym:.uno:OnlineAutoFormat -FormatAutoformatDokumentFormatieren sym:.uno:AutoFormatApply -FormatAutoFormatAutoFormat sym:.uno:AutoFormat -FormatAutoFormatEinstellungen sym:.uno:AutoFormat -FormatTabelle sym:.uno:TableDialog -FormatTabelleAuftrennen sym:.uno:SplitTable -FormatTabellenVerbinden sym:.uno:MergeTable -FormatZahlenformat sym:.uno:TableNumberFormatDialog -FormatZelleVerbinden sym:.uno:MergeCells -FormatZelleTeilen sym:.uno:SplitCell -FormatZelleOben sym:.uno:CellVertTop -FormatZelleMitte sym:.uno:CellVertCenter -FormatZelleUnten sym:.uno:CellVertBottom -FormatZelleSchuetzen sym:.uno:Protect -FormatZelleSchutzAufheben sym:.uno:UnsetCellsReadOnly -FormatZeileHoehe sym:.uno:SetRowHeight -FormatZeileOptimaleHoehe sym:.uno:SetOptimalRowHeight -FormatZeileZeilenGleichmaessigVerteilen sym:.uno:DistributeRows -FormatZeileSelektieren sym:.uno:EntireRow -FormatZeileEinfuegen sym:.uno:InsertRowDialog -FormatZeileLoeschen sym:.uno:DeleteRows -FormatSpalteBreiteWriter sym:.uno:SetColumnWidth -FormatSpalteOptimaleBreiteWriter sym:.uno:SetOptimalColumnWidth -FormatSpalteSpaltenGleichmaessigVerteilen sym:.uno:DistributeColumns -FormatSpalteSelektieren sym:.uno:EntireColumn -FormatSpalteEinfuegen sym:.uno:InsertColumnDialog -FormatSpalteLoeschen sym:.uno:DeleteColumns -FormatGrafik sym:.uno:GraphicDialog -FormatRahmen sym:.uno:FrameDialog -FormatObjekt sym:.uno:FrameDialog -FormatAnordnungGanzNachVorn sym:.uno:BringToFront -FormatAnordnungWeiterNachVorn sym:.uno:ObjectForwardOne -FormatAnordnungWeiterNachHinten sym:.uno:ObjectBackOne -FormatAnordnungGanzNachHinten sym:.uno:SendToBack -FormatAnordnungInDenVordergrund sym:.uno:SetObjectToForeground -FormatAnordnungInDenHintergrund sym:.uno:SetObjectToBackground -FormatAusrichtungLinks sym:.uno:AlignLeft -FormatAusrichtungZentriert sym:.uno:AlignHorizontalCenter -FormatAusrichtungRechts sym:.uno:AlignRight -FormatAusrichtungOben sym:.uno:AlignTop -FormatAusrichtungMitte sym:.uno:AlignVerticalCenter -FormatAusrichtungUnten sym:.uno:AlignBottom -FormatVerankerungAnDerSeite sym:.uno:SetAnchorToPage -FormatVerankerungAmAbsatz sym:.uno:SetAnchorToPara -FormatVerankerungAmZeichen sym:.uno:SetAnchorToChar -FormatUmlaufKeinUmlauf sym:.uno:WrapOff -FormatUmlaufSeitenumlauf sym:.uno:WrapOn -FormatUmlaufIdealerSeitenumlauf sym:.uno:WrapIdeal -FormatUmlaufDurchlauf sym:.uno:WrapThrough -FormatUmlaufImHintergrund sym:.uno:WrapThroughTransparent -FormatUmlaufKontur sym:.uno:WrapContour -FormatUmlaufKonturBearbeiten sym:.uno:ContourDialog -FormatUmlaufErsterAbsatz sym:.uno:WrapAnchorOnly -FormatUmlaufBearbeiten sym:.uno:TextWrap -FormatPositionUndGroesse sym:.uno:TransformDialog -FormatSpiegelnVertikal sym:.uno:FlipVertical -FormatSpiegelnHorizontal sym:.uno:FlipHorizontal -FormatObjektAusrichtungLinks sym:.uno:ObjectAlignLeft -FormatObjektAusrichtungZentriert sym:.uno:AlignCenter -FormatObjektAusrichtungRechts sym:.uno:ObjectAlignRight -FormatObjektAusrichtungOben sym:.uno:AlignUp -FormatObjektAusrichtungMitte sym:.uno:AlignMiddle -FormatObjektAusrichtungUnten sym:.uno:AlignDown -FormatPunkteBearbeiten sym:.uno:ToggleObjectBezierMode -FormatGruppeGruppieren sym:.uno:FormatGroup -FormatGruppeAufheben sym:.uno:FormatUngroup -FormatGruppeBetreten sym:.uno:EnterGroup -FormatGruppeVerlassen sym:.uno:LeaveGroup -FormatStilFett sym:.uno:Bold -FormatStilKursiv sym:.uno:Italic -FormatStilUnterstreichen sym:.uno:Underline -FormatStilDurchstreichen sym:.uno:Strikeout -FormatStilSchatten sym:.uno:Shadowed -FormatStilKontur sym:.uno:OutlineFont -FormatStilHochstellen sym:.uno:SuperScript -FormatStilTiefstellen sym:.uno:SubScript -FormatZeilenabstandEinzeilig sym:.uno:SpacePara1 -FormatZeilenabstand15Zeilig sym:.uno:SpacePara15 -FormatZeilenabstandZweizeilig sym:.uno:SpacePara2 -FormatAusrichtungLinksText sym:.uno:LeftPara -FormatAusrichtungRechtsText sym:.uno:RightPara -FormatAusrichtungZentriertText sym:.uno:CenterPara -FormatAusrichtungBlocksatzText sym:.uno:JustifyPara +FormatStandardWriter .uno:ResetAttributes +FormatSeiteWriter .uno:PageDialog +FormatBereiche .uno:EditRegion +FormatNumerierungAufzaehlung .uno:BulletsAndNumberingDialog +FormatAutoformatWaehrendDerEingabe .uno:OnlineAutoFormat +FormatAutoFormatAutomatisch .uno:OnlineAutoFormat +FormatAutoformatDokumentFormatieren .uno:AutoFormatApply +FormatAutoFormatAutoFormat .uno:AutoFormat +FormatAutoFormatEinstellungen .uno:AutoFormat +FormatTabelle .uno:TableDialog +FormatTabelleAuftrennen .uno:SplitTable +FormatTabellenVerbinden .uno:MergeTable +FormatZahlenformat .uno:TableNumberFormatDialog +FormatZelleVerbinden .uno:MergeCells +FormatZelleTeilen .uno:SplitCell +FormatZelleOben .uno:CellVertTop +FormatZelleMitte .uno:CellVertCenter +FormatZelleUnten .uno:CellVertBottom +FormatZelleSchuetzen .uno:Protect +FormatZelleSchutzAufheben .uno:UnsetCellsReadOnly +FormatZeileHoehe .uno:SetRowHeight +FormatZeileOptimaleHoehe .uno:SetOptimalRowHeight +FormatZeileZeilenGleichmaessigVerteilen .uno:DistributeRows +FormatZeileSelektieren .uno:EntireRow +FormatZeileEinfuegen .uno:InsertRowDialog +FormatZeileLoeschen .uno:DeleteRows +FormatSpalteBreiteWriter .uno:SetColumnWidth +FormatSpalteOptimaleBreiteWriter .uno:SetOptimalColumnWidth +FormatSpalteSpaltenGleichmaessigVerteilen .uno:DistributeColumns +FormatSpalteSelektieren .uno:EntireColumn +FormatSpalteEinfuegen .uno:InsertColumnDialog +FormatSpalteLoeschen .uno:DeleteColumns +FormatGrafik .uno:GraphicDialog +FormatRahmen .uno:FrameDialog +FormatObjekt .uno:FrameDialog +FormatAnordnungGanzNachVorn .uno:BringToFront +FormatAnordnungWeiterNachVorn .uno:ObjectForwardOne +FormatAnordnungWeiterNachHinten .uno:ObjectBackOne +FormatAnordnungGanzNachHinten .uno:SendToBack +FormatAnordnungInDenVordergrund .uno:SetObjectToForeground +FormatAnordnungInDenHintergrund .uno:SetObjectToBackground +FormatAusrichtungLinks .uno:AlignLeft +FormatAusrichtungZentriert .uno:AlignHorizontalCenter +FormatAusrichtungRechts .uno:AlignRight +FormatAusrichtungOben .uno:AlignTop +FormatAusrichtungMitte .uno:AlignVerticalCenter +FormatAusrichtungUnten .uno:AlignBottom +FormatVerankerungAnDerSeite .uno:SetAnchorToPage +FormatVerankerungAmAbsatz .uno:SetAnchorToPara +FormatVerankerungAmZeichen .uno:SetAnchorToChar +FormatUmlaufKeinUmlauf .uno:WrapOff +FormatUmlaufSeitenumlauf .uno:WrapOn +FormatUmlaufIdealerSeitenumlauf .uno:WrapIdeal +FormatUmlaufDurchlauf .uno:WrapThrough +FormatUmlaufImHintergrund .uno:WrapThroughTransparent +FormatUmlaufKontur .uno:WrapContour +FormatUmlaufKonturBearbeiten .uno:ContourDialog +FormatUmlaufErsterAbsatz .uno:WrapAnchorOnly +FormatUmlaufBearbeiten .uno:TextWrap +FormatPositionUndGroesse .uno:TransformDialog +FormatSpiegelnVertikal .uno:FlipVertical +FormatSpiegelnHorizontal .uno:FlipHorizontal +FormatObjektAusrichtungLinks .uno:ObjectAlignLeft +FormatObjektAusrichtungZentriert .uno:AlignCenter +FormatObjektAusrichtungRechts .uno:ObjectAlignRight +FormatObjektAusrichtungOben .uno:AlignUp +FormatObjektAusrichtungMitte .uno:AlignMiddle +FormatObjektAusrichtungUnten .uno:AlignDown +FormatPunkteBearbeiten .uno:ToggleObjectBezierMode +FormatGruppeGruppieren .uno:FormatGroup +FormatGruppeAufheben .uno:FormatUngroup +FormatGruppeBetreten .uno:EnterGroup +FormatGruppeVerlassen .uno:LeaveGroup +FormatStilFett .uno:Bold +FormatStilKursiv .uno:Italic +FormatStilUnterstreichen .uno:Underline +FormatStilDurchstreichen .uno:Strikeout +FormatStilSchatten .uno:Shadowed +FormatStilKontur .uno:OutlineFont +FormatStilHochstellen .uno:SuperScript +FormatStilTiefstellen .uno:SubScript +FormatZeilenabstandEinzeilig .uno:SpacePara1 +FormatZeilenabstand15Zeilig .uno:SpacePara15 +FormatZeilenabstandZweizeilig .uno:SpacePara2 +FormatAusrichtungLinksText .uno:LeftPara +FormatAusrichtungRechtsText .uno:RightPara +FormatAusrichtungZentriertText .uno:CenterPara +FormatAusrichtungBlocksatzText .uno:JustifyPara ' alt -FormatGruppierung sym:.uno:FormatGroup -FormatGruppierungAufheben sym:.uno:FormatUngroup +FormatGruppierung .uno:FormatGroup +FormatGruppierungAufheben .uno:FormatUngroup ' Formatmenue : Calc -FormatStandardCalc sym:.uno:ResetAttributes -FormatTextZeichnung sym:.uno:TextAttributes -FormatSeiteCalc sym:.uno:PageFormatDialog -FormatZelle sym:.uno:FormatCellDialog -FormatZeileAusblenden sym:.uno:HideRow -FormatZeileEinblenden sym:.uno:ShowRow -FormatZeileHoeheCalc sym:.uno:RowHeight -FormatZeileOptimaleHoeheCalc sym:.uno:SetOptimalRowHeight -FormatSpalteAusblenden sym:.uno:HideColumn -FormatSpalteBreiteCalc sym:.uno:ColumnWidth -FormatSpalteEinblenden sym:.uno:ShowColumn -FormatSpalteOptimaleBreiteCalc sym:.uno:SetOptimalColumnWidth -FormatTabelleAusblenden sym:.uno:Hide -FormatTabelleEinblenden sym:.uno:Show -FormatTabelleUmbenennen sym:.uno:RenameTable sym:.uno:Name -FormatZellenZusammenfassenAufheben sym:.uno:SplitCell -FormatZellenZusammenfassenFestlegen sym:.uno:MergeCells -FormatDruckbereicheAufheben sym:.uno:DeletePrintArea -FormatDruckbereicheBearbeiten sym:.uno:EditPrintArea -FormatDruckbereicheFestlegen sym:.uno:DefinePrintArea -FormatBedingteFormatierung sym:.uno:ConditionalFormatDialog -FormatVerankerungSeite sym:.uno:SetAnchorToPage -FormatVerankerungZelle sym:.uno:SetAnchorToCell -FormatSpiegelnVertikalCalc sym:.uno:ObjectMirrorVertical -FormatSpiegelnHorizontalCalc sym:.uno:ObjectMirrorHorizontal -FormatAnordnungGanzNachVornCalc sym:.uno:BringToFront -FormatAnordnungWeiterNachVornCalc sym:.uno:ObjectForwardOne -FormatAnordnungWeiterNachHintenCalc sym:.uno:ObjectBackOne -FormatAnordnungGanzNachHintenCalc sym:.uno:SendToBack -FormatAnordnungInDenHintergrundCalc sym:.uno:SetObjectToBackground -FormatAnordnungInDenVordergrundCalc sym:.uno:SetObjectToForeground -FormatAusrichtungLinksCalc sym:.uno:ObjectAlignLeft -FormatAusrichtungZentriertCalc sym:.uno:AlignCenter -FormatAusrichtungRechtsCalc sym:.uno:ObjectAlignRight -FormatAusrichtungObenCalc sym:.uno:AlignUp -FormatAusrichtungMitteCalc sym:.uno:AlignMiddle -FormatAusrichtungUntenCalc sym:.uno:AlignDown -FormatGruppeGruppierenCalc sym:.uno:FormatGroup -FormatGruppeAufhebenCalc sym:.uno:FormatUngroup -FormatGruppeBetretenCalc sym:.uno:EnterGroup -FormatGruppeVerlassenCalc sym:.uno:LeaveGroup +FormatStandardCalc .uno:ResetAttributes +FormatTextZeichnung .uno:TextAttributes +FormatSeiteCalc .uno:PageFormatDialog +FormatZelle .uno:FormatCellDialog +FormatZeileAusblenden .uno:HideRow +FormatZeileEinblenden .uno:ShowRow +FormatZeileHoeheCalc .uno:RowHeight +FormatZeileOptimaleHoeheCalc .uno:SetOptimalRowHeight +FormatSpalteAusblenden .uno:HideColumn +FormatSpalteBreiteCalc .uno:ColumnWidth +FormatSpalteEinblenden .uno:ShowColumn +FormatSpalteOptimaleBreiteCalc .uno:SetOptimalColumnWidth +FormatTabelleAusblenden .uno:Hide +FormatTabelleEinblenden .uno:Show +FormatTabelleUmbenennen .uno:RenameTable .uno:Name +FormatZellenZusammenfassenAufheben .uno:SplitCell +FormatZellenZusammenfassenFestlegen .uno:MergeCells +FormatDruckbereicheAufheben .uno:DeletePrintArea +FormatDruckbereicheBearbeiten .uno:EditPrintArea +FormatDruckbereicheFestlegen .uno:DefinePrintArea +FormatBedingteFormatierung .uno:ConditionalFormatDialog +FormatVerankerungSeite .uno:SetAnchorToPage +FormatVerankerungZelle .uno:SetAnchorToCell +FormatSpiegelnVertikalCalc .uno:ObjectMirrorVertical +FormatSpiegelnHorizontalCalc .uno:ObjectMirrorHorizontal +FormatAnordnungGanzNachVornCalc .uno:BringToFront +FormatAnordnungWeiterNachVornCalc .uno:ObjectForwardOne +FormatAnordnungWeiterNachHintenCalc .uno:ObjectBackOne +FormatAnordnungGanzNachHintenCalc .uno:SendToBack +FormatAnordnungInDenHintergrundCalc .uno:SetObjectToBackground +FormatAnordnungInDenVordergrundCalc .uno:SetObjectToForeground +FormatAusrichtungLinksCalc .uno:ObjectAlignLeft +FormatAusrichtungZentriertCalc .uno:AlignCenter +FormatAusrichtungRechtsCalc .uno:ObjectAlignRight +FormatAusrichtungObenCalc .uno:AlignUp +FormatAusrichtungMitteCalc .uno:AlignMiddle +FormatAusrichtungUntenCalc .uno:AlignDown +FormatGruppeGruppierenCalc .uno:FormatGroup +FormatGruppeAufhebenCalc .uno:FormatUngroup +FormatGruppeBetretenCalc .uno:EnterGroup +FormatGruppeVerlassenCalc .uno:LeaveGroup ' **** Draw / Impress -FormatSeiteDraw sym:.uno:PageSetup -FormatBemassung sym:.uno:MeasureAttributes -Format3D_Effekte sym:.uno:Window3D -FormatVerbinder sym:.uno:ConnectorAttributes -FormatAufzaehlungszeichen sym:.uno:OutlineBullet -FormatSeitenlayout sym:.uno:ModifyPage -FormatEbene sym:.uno:ModifyLayer -FormatDesign sym:.uno:PresentationLayout +FormatSeiteDraw .uno:PageSetup +FormatBemassung .uno:MeasureAttributes +Format3D_Effekte .uno:Window3D +FormatVerbinder .uno:ConnectorAttributes +FormatAufzaehlungszeichen .uno:OutlineBullet +FormatSeitenlayout .uno:ModifyPage +FormatEbene .uno:ModifyLayer +FormatDesign .uno:PresentationLayout ' **** Math -FormatSchriftarten sym:.uno:ChangeFont -FormatSchriftgroessen sym:.uno:ChangeFontSize -FormatAbstaende sym:.uno:ChangeDistance -FormatAusrichtung sym:.uno:ChangeAlignment +FormatSchriftarten .uno:ChangeFont +FormatSchriftgroessen .uno:ChangeFontSize +FormatAbstaende .uno:ChangeDistance +FormatAusrichtung .uno:ChangeAlignment ' *********************************** ' *********** Extrasmenue *********** ' **** ' **** Alle -ExtrasRechtschreibungAutomatisch sym:.uno:SpellOnline -ExtrasAutoKorrektur sym:.uno:AutoCorrectDlg -ExtrasMakro sym:.uno:MacroDialog -ExtrasAnpassen sym:.uno:ConfigureDialog -ExtrasOptionen sym:.uno:OptionsTreeDialog +ExtrasRechtschreibungAutomatisch .uno:SpellOnline +ExtrasAutoKorrektur .uno:AutoCorrectDlg +ExtrasMakro .uno:MacroDialog +ExtrasAnpassen .uno:ConfigureDialog +ExtrasOptionen .uno:OptionsTreeDialog ' **** Writer -ExtrasKapitelnumerierung sym:.uno:ChapterNumberingDialog -ExtrasZeilennumerierung sym:.uno:LineNumberingDialog -ExtrasSeitennummer sym:.uno:PageOffset -ExtrasFussnoten sym:.uno:FootnoteDialog -ExtrasTextInTabelle sym:.uno:ConvertTableText -ExtrasSortieren sym:.uno:SortDialog -ExtrasBerechnen sym:.uno:CalculateSel -ExtrasAktualisierenAllesAktualisieren sym:.uno:UpdateAll -ExtrasAktualisierenFelder sym:.uno:UpdateFields -ExtrasAktualisierenVerknuepfungen sym:.uno:UpdateAllLinks -ExtrasAktualisierenAktuellesVerzeichnis sym:.uno:UpdateCurIndex -ExtrasAktualisierenAlleVerzeichnisse sym:.uno:UpdateAllIndexes -ExtrasAktualisierenSeitenformatierung sym:.uno:Repaginate +ExtrasKapitelnumerierung .uno:ChapterNumberingDialog +ExtrasZeilennumerierung .uno:LineNumberingDialog +ExtrasSeitennummer .uno:PageOffset +ExtrasFussnoten .uno:FootnoteDialog +ExtrasTextInTabelle .uno:ConvertTableText +ExtrasSortieren .uno:SortDialog +ExtrasBerechnen .uno:CalculateSel +ExtrasAktualisierenAllesAktualisieren .uno:UpdateAll +ExtrasAktualisierenFelder .uno:UpdateFields +ExtrasAktualisierenVerknuepfungen .uno:UpdateAllLinks +ExtrasAktualisierenAktuellesVerzeichnis .uno:UpdateCurIndex +ExtrasAktualisierenAlleVerzeichnisse .uno:UpdateAllIndexes +ExtrasAktualisierenSeitenformatierung .uno:Repaginate ' **** WriterWeb -ExtrasSeitenformatierung sym:.uno:Repaginate +ExtrasSeitenformatierung .uno:Repaginate ' **** Calc -ExtrasDetektivAlleSpurenEntfernen sym:.uno:ClearArrows -ExtrasDetektivFuellModus sym:.uno:AuditingFillMode -ExtrasDetektivSpurZumFehler sym:.uno:ShowErrors -ExtrasDetektivSpurZumNachfolger sym:.uno:ShowDependents -ExtrasDetektivSpurZumNachfolgerEntfernen sym:.uno:ClearArrowDependents -ExtrasDetektivSpurZumVorgaenger sym:.uno:ShowPrecedents -ExtrasDetektivSpurZumVorgaengerEntfernen sym:.uno:ClearArrowPrecedents -ExtrasDetektivUngueltigeDatenEinkreisen sym:.uno:ShowInvalid sym:.uno:FillModeSelect -ExtrasDetektivAutomatischAktuakisieren sym:.uno:AutoRefreshArrows -ExtrasZielwertsuche sym:.uno:GoalSeekDialog -ExtrasSzenarien sym:.uno:ScenarioManager -ExtrasDokumentSchuetzenDokument sym:.uno:ToolProtectionDocument -ExtrasDokumentSchuetzenTabelle sym:.uno:Protect -ExtrasNeuBerechnen sym:.uno:Calculate -ExtrasAutomatischBerechnen sym:.uno:AutomaticCalculation -ExtrasAutoEingabe sym:.uno:AutoComplete +ExtrasDetektivAlleSpurenEntfernen .uno:ClearArrows +ExtrasDetektivFuellModus .uno:AuditingFillMode +ExtrasDetektivSpurZumFehler .uno:ShowErrors +ExtrasDetektivSpurZumNachfolger .uno:ShowDependents +ExtrasDetektivSpurZumNachfolgerEntfernen .uno:ClearArrowDependents +ExtrasDetektivSpurZumVorgaenger .uno:ShowPrecedents +ExtrasDetektivSpurZumVorgaengerEntfernen .uno:ClearArrowPrecedents +ExtrasDetektivUngueltigeDatenEinkreisen .uno:ShowInvalid .uno:FillModeSelect +ExtrasDetektivAutomatischAktuakisieren .uno:AutoRefreshArrows +ExtrasZielwertsuche .uno:GoalSeekDialog +ExtrasSzenarien .uno:ScenarioManager +ExtrasDokumentSchuetzenDokument .uno:ToolProtectionDocument +ExtrasDokumentSchuetzenTabelle .uno:Protect +ExtrasNeuBerechnen .uno:Calculate +ExtrasAutomatischBerechnen .uno:AutomaticCalculation +ExtrasAutoEingabe .uno:AutoComplete ' **** Draw / Impress -ExtrasThesaurusDraw sym:.uno:Thesaurus -ExtrasPipette sym:.uno:BmpMask +ExtrasThesaurusDraw .uno:Thesaurus +ExtrasPipette .uno:BmpMask ExtrasDiawechsel .uno:SlideChangeWindow -ExtrasAnimation sym:.uno:AnimationObjects +ExtrasAnimation .uno:AnimationObjects ExtrasEffekt .uno:AnimationEffects -ExtrasInteraktion sym:.uno:AnimationEffects -ExtrasPraesentationseinstellung sym:.uno:PresentationDialog -ExtrasIndividuellePraesentation sym:.uno:CustomShowDialog +ExtrasInteraktion .uno:AnimationEffects +ExtrasPraesentationseinstellung .uno:PresentationDialog +ExtrasIndividuellePraesentation .uno:CustomShowDialog ' **** Math -' ExtrasSymbole sym:.uno:Symbols -ExtrasSymboleKatalog sym:.uno:SymbolCatalogue +' ExtrasSymbole .uno:Symbols +ExtrasSymboleKatalog .uno:SymbolCatalogue ' ExtrasSymboleLaden SID_SYMBOLS_LOAD -ExtrasFormelImportieren sym:.uno:InsertFormula +ExtrasFormelImportieren .uno:InsertFormula ' *********************************** ' *********** Praesentationmenue ************ ' **** -PraesentationBildschirmpraesentation sym:.uno:Presentation -PraesentationPraesentationmitZeitnahme sym:.uno:RehearseTimings -PraesentationPraesentationseinstellungen sym:.uno:PresentationDialog -PraesentationIndividuellePraesentation sym:.uno:CustomShowDialog +PraesentationBildschirmpraesentation .uno:Presentation +PraesentationPraesentationmitZeitnahme .uno:RehearseTimings +PraesentationPraesentationseinstellungen .uno:PresentationDialog +PraesentationIndividuellePraesentation .uno:CustomShowDialog PraesentationDiawechsel .uno:SlideChangeWindow -PraesentationDiaAnzeigen sym:.uno:HideSlide -PraesentationAnimation sym:.uno:AnimationObjects +PraesentationDiaAnzeigen .uno:HideSlide +PraesentationAnimation .uno:AnimationObjects PraesentationEffekt .uno:AnimationEffects -PraesentationInteraktion sym:.uno:AnimationEffects +PraesentationInteraktion .uno:AnimationEffects ' *********************************** ' *********** Datenmenue ************ ' **** ' **** Calc -DatenBereichAuswaehlen sym:.uno:SelectDB -DatenBereichFestlegen sym:.uno:DefineDBName -DatenSortieren sym:.uno:DataSort -DatenFilterAutoFilter sym:.uno:DataFilterAutoFilter -DatenFilterAutoFilterAusblenden sym:.uno:DataFilterHideAutoFilter -DatenFilterFilterEntfernen sym:.uno:DataFilterRemoveFilter -DatenFilterSpezialfilter sym:.uno:DataFilterSpecialFilter -DatenFilterStandardfilter sym:.uno:DataFilterStandardFilter -DatenTeilergebnisse sym:.uno:DataSubTotals -DatenGueltigkeit sym:.uno:Validation -DatenDatenpilotAufrufen sym:.uno:DataDataPilotRun -DatenMehrfachoperationen sym:.uno:TableOperationDialog -DatenKonsolidieren sym:.uno:DataConsolidate -DatenGliederungAutoGliederung sym:.uno:AutoOutline -DatenGliederungDetailAusblenden sym:.uno:HideDetail -DatenGliederungDetailEinblenden sym:.uno:ShowDetail -DatenGliederungEntfernen sym:.uno:ClearOutline -DatenGliederungGruppierung sym:.uno:Group -DatenGliederungGruppierungAufheben sym:.uno:Ungroup -DatenDatenpilotAktualisieren sym:.uno:RecalcPivotTable -DatenDatenpilotLoeschen sym:.uno:DeletePivotTable -DatenBereichAktualisieren sym:.uno:DataAreaRefresh +DatenBereichAuswaehlen .uno:SelectDB +DatenBereichFestlegen .uno:DefineDBName +DatenSortieren .uno:DataSort +DatenFilterAutoFilter .uno:DataFilterAutoFilter +DatenFilterAutoFilterAusblenden .uno:DataFilterHideAutoFilter +DatenFilterFilterEntfernen .uno:DataFilterRemoveFilter +DatenFilterSpezialfilter .uno:DataFilterSpecialFilter +DatenFilterStandardfilter .uno:DataFilterStandardFilter +DatenTeilergebnisse .uno:DataSubTotals +DatenGueltigkeit .uno:Validation +DatenDatenpilotAufrufen .uno:DataDataPilotRun +DatenMehrfachoperationen .uno:TableOperationDialog +DatenKonsolidieren .uno:DataConsolidate +DatenGliederungAutoGliederung .uno:AutoOutline +DatenGliederungDetailAusblenden .uno:HideDetail +DatenGliederungDetailEinblenden .uno:ShowDetail +DatenGliederungEntfernen .uno:ClearOutline +DatenGliederungGruppierung .uno:Group +DatenGliederungGruppierungAufheben .uno:Ungroup +DatenDatenpilotAktualisieren .uno:RecalcPivotTable +DatenDatenpilotLoeschen .uno:DeletePivotTable +DatenBereichAktualisieren .uno:DataAreaRefresh ' *********************************** ' ********** Fenstermenue *********** ' **** ' **** Alle -FensterNeuesFenster sym:.uno:NewWindow +FensterNeuesFenster .uno:NewWindow 'FensterUeberlappend SID_CASCADEWINS 'FensterNebeneinander SID_TILEWINS 'FensterHorizontal SID_HORIZONTALWINS 'FensterVertikal SID_VERTICALWINS -FensterAlleSchliessen sym:.uno:CloseWins -FensterTeilen sym:.uno:SplitWindow -FensterFixieren sym:.uno:FreezePanes +FensterAlleSchliessen .uno:CloseWins +FensterTeilen .uno:SplitWindow +FensterFixieren .uno:FreezePanes ' *********************************** ' *********** Hilfemenue ************ ' **** ' **** Alle -HilfeInhalt sym:.uno:HelpIndex -HilfeHelferlein sym:.uno:HelperDialog -HilfeTip sym:.uno:HelpTip -HilfeAktiveHilfe sym:.uno:ActiveHelp -HilfeOnlineregistrierung sym:.uno:OnlineRegistrationDlg -HilfeInfoUeber sym:.uno:About +HilfeInhalt .uno:HelpIndex +HilfeHelferlein .uno:HelperDialog +HilfeTip .uno:HelpTip +HilfeAktiveHilfe .uno:ActiveHelp +HilfeOnlineregistrierung .uno:OnlineRegistrationDlg +HilfeInfoUeber .uno:About ' *********************************** ' ********** Aendernmenue *********** ' **** ' **** Draw / Impress -AendernPositionGroesse sym:.uno:TransformDialog -AendernSpiegelnVertikalDraw sym:.uno:MirrorVert -AendernSpiegelnHorizontalDraw sym:.uno:MirrorHorz -AendernUmwandelnInKurve sym:.uno:ChangeBezier -AendernUmwandelnInPolygon sym:.uno:ChangePolygon -AendernUmwandelnIn3D sym:.uno:ConvertInto3D -AendernUmwandelnIn3DRotationskoerper sym:.uno:ConvertInto3DLatheFast -AendernUmwandelnInMetafile sym:.uno:ConvertIntoMetaFile -AendernUmwandelnInBitmap sym:.uno:ConvertIntoBitmap -AendernAnordnungGanznachVorn sym:.uno:BringToFront -AendernAnordnungWeiterNachVorn sym:.uno:Forward -AendernAnordnungWeiterNachHinten sym:.uno:Backward -AendernAnordnungGanznachHinten sym:.uno:SendToBack -AendernAnordnungVorDasObjekt sym:.uno:BeforeObject -AendernAnordnungHinterDasObjekt sym:.uno:BehindObject -AendernAnordnungVertauschen sym:.uno:ReverseOrder -AendernVerteilen sym:.uno:DistributeSelection -AendernAusrichtungLinks sym:.uno:ObjectAlignLeft -AendernAusrichtungZentriert sym:.uno:AlignCenter -AendernAusrichtungRechts sym:.uno:ObjectAlignRight -AendernAusrichtungOben sym:.uno:AlignUp -AendernAusrichtungMitte sym:.uno:AlignMiddle -AendernAusrichtungUnten sym:.uno:AlignDown -AendernObjektBenennen sym:.uno:NameGroup -AendernFontWork sym:.uno:FontWork -AendernPipette sym:.uno:BmpMask -AendernGruppierung sym:.uno:FormatGroup -AendernGruppierungAufheben sym:.uno:FormatUngroup -AendernGruppierungBetreten sym:.uno:EnterGroup -AendernGruppierungVerlassen sym:.uno:LeaveGroup -AendernKombination sym:.uno:Combine -AendernKombinationAufheben sym:.uno:Dismantle -AendernVerbinden sym:.uno:Connect -AendernAufbrechen sym:.uno:Break -AendernShapeMerge sym:.uno:Merge -AendernShapeSubstract sym:.uno:Substract -AendernShapeIntersect sym:.uno:Intersect +AendernPositionGroesse .uno:TransformDialog +AendernSpiegelnVertikalDraw .uno:MirrorVert +AendernSpiegelnHorizontalDraw .uno:MirrorHorz +AendernUmwandelnInKurve .uno:ChangeBezier +AendernUmwandelnInPolygon .uno:ChangePolygon +AendernUmwandelnIn3D .uno:ConvertInto3D +AendernUmwandelnIn3DRotationskoerper .uno:ConvertInto3DLatheFast +AendernUmwandelnInMetafile .uno:ConvertIntoMetaFile +AendernUmwandelnInBitmap .uno:ConvertIntoBitmap +AendernAnordnungGanznachVorn .uno:BringToFront +AendernAnordnungWeiterNachVorn .uno:Forward +AendernAnordnungWeiterNachHinten .uno:Backward +AendernAnordnungGanznachHinten .uno:SendToBack +AendernAnordnungVorDasObjekt .uno:BeforeObject +AendernAnordnungHinterDasObjekt .uno:BehindObject +AendernAnordnungVertauschen .uno:ReverseOrder +AendernVerteilen .uno:DistributeSelection +AendernAusrichtungLinks .uno:ObjectAlignLeft +AendernAusrichtungZentriert .uno:AlignCenter +AendernAusrichtungRechts .uno:ObjectAlignRight +AendernAusrichtungOben .uno:AlignUp +AendernAusrichtungMitte .uno:AlignMiddle +AendernAusrichtungUnten .uno:AlignDown +AendernObjektBenennen .uno:NameGroup +AendernFontWork .uno:FontWork +AendernPipette .uno:BmpMask +AendernGruppierung .uno:FormatGroup +AendernGruppierungAufheben .uno:FormatUngroup +AendernGruppierungBetreten .uno:EnterGroup +AendernGruppierungVerlassen .uno:LeaveGroup +AendernKombination .uno:Combine +AendernKombinationAufheben .uno:Dismantle +AendernVerbinden .uno:Connect +AendernAufbrechen .uno:Break +AendernShapeMerge .uno:Merge +AendernShapeSubstract .uno:Substract +AendernShapeIntersect .uno:Intersect diff --git a/testautomation/global/sid/bars.sid b/testautomation/global/sid/bars.sid index 55df846f5e1f..b4477a7eb8aa 100644 --- a/testautomation/global/sid/bars.sid +++ b/testautomation/global/sid/bars.sid @@ -12,20 +12,20 @@ ' ***** Standardbar ' ** ' ** f�r alle -FL_URL sym:.uno:OpenUrl -FL_NeuLaden sym:.uno:Reload -FL_Bearbeiten sym:.uno:EditDoc -FL_Speichern sym:.uno:Save -FL_Verknuepfen sym:.uno:AddBookmark -FL_Drucken sym:.uno:PrintDefault -FL_Ausschneiden sym:.uno:Cut -FL_Kopieren sym:.uno:Copy -FL_Einsetzen sym:.uno:Paste -FL_Undo sym:.uno:Undo -FL_Redo sym:.uno:Redo -FL_Browser sym:.uno:Beamer -FL_Navigator sym:.uno:Navigator -FL_Gestalter sym:.uno:DesignerDialog +FL_URL .uno:OpenUrl +FL_NeuLaden .uno:Reload +FL_Bearbeiten .uno:EditDoc +FL_Speichern .uno:Save +FL_Verknuepfen .uno:AddBookmark +FL_Drucken .uno:PrintDefault +FL_Ausschneiden .uno:Cut +FL_Kopieren .uno:Copy +FL_Einsetzen .uno:Paste +FL_Undo .uno:Undo +FL_Redo .uno:Redo +FL_Browser .uno:Beamer +FL_Navigator .uno:Navigator +FL_Gestalter .uno:DesignerDialog ' ******************************************************* ' @@ -35,8 +35,8 @@ FL_Gestalter sym:.uno:DesignerDialog 'HL_URLName ofa:ComboBox:RID_SVXDLG_HYPERLINK:CB_NAME 'HL_URLListe ofa:ComboBox:RID_SVXDLG_HYPERLINK:CB_URL HL_Frame sym:SVX_HID_OFA_HYPERLINK_TARGET -HL_Link sym:.uno:SetHyperlink -HL_Bookmark sym:.uno:AddBookmark +HL_Link .uno:SetHyperlink +HL_Bookmark .uno:AddBookmark HL_Suchen sym:SVX_HID_OFA_HYPERLINK_SEARCH ' ******************************************************* @@ -45,161 +45,161 @@ HL_Suchen sym:SVX_HID_OFA_HYPERLINK_SEARCH ' ** ' ** Datenbank-Beamer -OL_DB_Beamer_StandardFilter sym:.uno:FilterCrit -OL_DB_Beamer_DatenInText sym:.uno:SbaBrwInsert +OL_DB_Beamer_StandardFilter .uno:FilterCrit +OL_DB_Beamer_DatenInText .uno:SbaBrwInsert ' ** Form Toolbar -FM_FormFilter_Start sym:.uno:FormFilter -FM_FF_Navigator sym:.uno:FormFilterNavigator -FM_FF_Execute sym:.uno:FormFilterExecute -FM_FF_Exit sym:.uno:FormFilterExit -FM_Remove_Filter sym:.uno:RemoveFilterSort - -FM_No_Record sym:.uno:AbsoluteRecord -FM_First_Record sym:.uno:FirstRecord -FM_Previous_Record sym:.uno:PrevRecord -FM_Next_Record sym:.uno:NextRecord -FM_Last_Record sym:.uno:LastRecord -FM_Save_Record sym:.uno:RecSave -'--10630: BUTTON: Allows you to undo a data entry. sym:.uno:RecUndo -FM_New_Record sym:.uno:NewRecord -FM_Delete_Record sym:.uno:DeleteRecord -'OB_DB_Beamer:Refresh sym:.uno:Refresh -FM_Search sym:.uno:RecSearch -FM_Sort_Asc sym:.uno:Sortup -FM_Sort_Des sym:.uno:SortDown -FM_AutoFilter sym:.uno:AutoFilter -'--10729: BUTTON: Prompts the database server to filter the visible data by specified criteria. sym:.uno:FormFilter -FM_Sort_Order sym:.uno:OrderCrit -FM_View_As_Grid sym:.uno:ViewFormAsGrid -FM_Apply_Filter sym:.uno:FormFiltered +FM_FormFilter_Start .uno:FormFilter +FM_FF_Navigator .uno:FormFilterNavigator +FM_FF_Execute .uno:FormFilterExecute +FM_FF_Exit .uno:FormFilterExit +FM_Remove_Filter .uno:RemoveFilterSort + +FM_No_Record .uno:AbsoluteRecord +FM_First_Record .uno:FirstRecord +FM_Previous_Record .uno:PrevRecord +FM_Next_Record .uno:NextRecord +FM_Last_Record .uno:LastRecord +FM_Save_Record .uno:RecSave +'--10630: BUTTON: Allows you to undo a data entry. .uno:RecUndo +FM_New_Record .uno:NewRecord +FM_Delete_Record .uno:DeleteRecord +'OB_DB_Beamer:Refresh .uno:Refresh +FM_Search .uno:RecSearch +FM_Sort_Asc .uno:Sortup +FM_Sort_Des .uno:SortDown +FM_AutoFilter .uno:AutoFilter +'--10729: BUTTON: Prompts the database server to filter the visible data by specified criteria. .uno:FormFilter +FM_Sort_Order .uno:OrderCrit +FM_View_As_Grid .uno:ViewFormAsGrid +FM_Apply_Filter .uno:FormFiltered ' ** Writer ' - normal -OL_Writer_Schriftart sym:.uno:CharFontName -OL_Writer_Schriftgroesse sym:.uno:FontHeight -OL_Writer_Fett sym:.uno:Bold -OL_Writer_Kursiv sym:.uno:Italic -OL_Writer_Unterstrichen sym:.uno:Underline -OL_Writer_Linksbuendig sym:.uno:LeftPara -OL_Writer_Zentriert sym:.uno:CenterPara -OL_Writer_Rechtsbuendig sym:.uno:RightPara -OL_Writer_Blocksatz sym:.uno:JustifyPara -OL_Writer_Numerierung sym:.uno:DefaultNumbering -OL_Writer_Aufzaehlung sym:.uno:DefaultBullet -OL_Writer_EinzugVermindern sym:.uno:DecrementIndent -OL_Writer_EinzugErhoehen sym:.uno:IncrementIndent -OL_Writer_Textfarbe sym:.uno:FontColor -OL_Writer_Zeichenhintergrund sym:.uno:BackColor -OL_Writer_Absatzhintergrund sym:.uno:BackgroundColor +OL_Writer_Schriftart .uno:CharFontName +OL_Writer_Schriftgroesse .uno:FontHeight +OL_Writer_Fett .uno:Bold +OL_Writer_Kursiv .uno:Italic +OL_Writer_Unterstrichen .uno:Underline +OL_Writer_Linksbuendig .uno:LeftPara +OL_Writer_Zentriert .uno:CenterPara +OL_Writer_Rechtsbuendig .uno:RightPara +OL_Writer_Blocksatz .uno:JustifyPara +OL_Writer_Numerierung .uno:DefaultNumbering +OL_Writer_Aufzaehlung .uno:DefaultBullet +OL_Writer_EinzugVermindern .uno:DecrementIndent +OL_Writer_EinzugErhoehen .uno:IncrementIndent +OL_Writer_Textfarbe .uno:FontColor +OL_Writer_Zeichenhintergrund .uno:BackColor +OL_Writer_Absatzhintergrund .uno:BackgroundColor ' ** Writer ' - Tabelle -OL_Tabelle_SW_FormelEingeben sym:.uno:InsertFormula -OL_Tabelle_SW_TabellenmodeFix sym:.uno:TableModeFix -OL_Tabelle_SW_TabellenmodeProportional sym:.uno:TableModeFixProp -OL_Tabelle_SW_TabellenmodeVariabel sym:.uno:TableModeVariable -OL_Tabelle_SW_ZelleVerbinden sym:.uno:MergeCells -OL_Tabelle_SW_ZelleTeilen sym:.uno:SplitCell -OL_Tabelle_SW_Optimieren sym:.uno:OptimizeTable -OL_Tabelle_SW_ZeileEinfuegen sym:.uno:InsertRowDialog -OL_Tabelle_SW_SpalteEinfuegen sym:.uno:InsertColumns -OL_Tabelle_SW_ZeileLoeschen sym:.uno:DeleteRows -OL_Tabelle_SW_SpalteLoeschen sym:.uno:DeleteColumns -OL_Tabelle_SW_Umrandung sym:.uno:SetBorderStyle -OL_Tabelle_SW_LinienStil sym:.uno:LineStyle -OL_Tabelle_SW_Hintergrundfarbe sym:.uno:BackgroundColor -OL_Tabelle_SW_ZeileAuswaehlen sym:.uno:EntireRow -OL_Tabelle_SW_SpalteAuswaehlen sym:.uno:EntireColumn -OL_Tabelle_SW_TabelleAuswaehlen sym:.uno:SelectTable +OL_Tabelle_SW_FormelEingeben .uno:InsertFormula +OL_Tabelle_SW_TabellenmodeFix .uno:TableModeFix +OL_Tabelle_SW_TabellenmodeProportional .uno:TableModeFixProp +OL_Tabelle_SW_TabellenmodeVariabel .uno:TableModeVariable +OL_Tabelle_SW_ZelleVerbinden .uno:MergeCells +OL_Tabelle_SW_ZelleTeilen .uno:SplitCell +OL_Tabelle_SW_Optimieren .uno:OptimizeTable +OL_Tabelle_SW_ZeileEinfuegen .uno:InsertRowDialog +OL_Tabelle_SW_SpalteEinfuegen .uno:InsertColumns +OL_Tabelle_SW_ZeileLoeschen .uno:DeleteRows +OL_Tabelle_SW_SpalteLoeschen .uno:DeleteColumns +OL_Tabelle_SW_Umrandung .uno:SetBorderStyle +OL_Tabelle_SW_LinienStil .uno:LineStyle +OL_Tabelle_SW_Hintergrundfarbe .uno:BackgroundColor +OL_Tabelle_SW_ZeileAuswaehlen .uno:EntireRow +OL_Tabelle_SW_SpalteAuswaehlen .uno:EntireColumn +OL_Tabelle_SW_TabelleAuswaehlen .uno:SelectTable ' ** Writer ' - Rahmen / Grafik / OLE-Objekte -OL_Objekt_SW_KeinUmlauf sym:.uno:WrapOff -OL_Objekt_SW_Umlauf sym:.uno:WrapOn -OL_Objekt_SW_Durchlauf sym:.uno:WrapThrough -OL_Objekt_SW_Links sym:.uno:AlignLeft -OL_Objekt_SW_Zentriert sym:.uno:AlignHorizontalCenter -OL_Objekt_SW_Rechts sym:.uno:AlignRight -OL_Objekt_SW_Oben sym:.uno:AlignTop -OL_Objekt_SW_Mitte sym:.uno:AlignVerticalCenter -OL_Objekt_SW_Unten sym:.uno:AlignBottom -OL_Objekt_SW_Umrandung sym:.uno:SetBorderStyle -OL_Objekt_SW_Linienstil sym:.uno:LineStyle -OL_Objekt_SW_LinienFarbe sym:.uno:FrameLineColor -OL_Objekt_SW_Hintergrundmuster sym:.uno:BackgroundPatternController -OL_Objekt_SW_Hintergrundfarbe sym:.uno:BackgroundColor -OL_Objekt_SW_GanzNachVorn sym:.uno:BringToFront -OL_Objekt_SW_GanzNachHinten sym:.uno:SendToBack -OL_Objekt_SW_Verankerungwechseln sym:.uno:ToggleAnchorType -OL_Objekt_SW_HorizontalSpiegeln sym:.uno:FlipHorizontal -OL_Objekt_SW_VertikalSpiegeln sym:.uno:FlipVertical -OL_Objekt_SW_PositionUndGroesse sym:.uno:TransformDialog -OL_Objekt_SW_InDenVordergrund sym:.uno:SetObjectToForeground -OL_Objekt_SW_InDenHintergrund sym:.uno:SetObjectToBackground -OL_Objekt_SW_EigenschaftenObjekt sym:.uno:FrameDialog -OL_Objekt_SW_EigenschaftenControls sym:.uno:ShowBrowser +OL_Objekt_SW_KeinUmlauf .uno:WrapOff +OL_Objekt_SW_Umlauf .uno:WrapOn +OL_Objekt_SW_Durchlauf .uno:WrapThrough +OL_Objekt_SW_Links .uno:AlignLeft +OL_Objekt_SW_Zentriert .uno:AlignHorizontalCenter +OL_Objekt_SW_Rechts .uno:AlignRight +OL_Objekt_SW_Oben .uno:AlignTop +OL_Objekt_SW_Mitte .uno:AlignVerticalCenter +OL_Objekt_SW_Unten .uno:AlignBottom +OL_Objekt_SW_Umrandung .uno:SetBorderStyle +OL_Objekt_SW_Linienstil .uno:LineStyle +OL_Objekt_SW_LinienFarbe .uno:FrameLineColor +OL_Objekt_SW_Hintergrundmuster .uno:BackgroundPatternController +OL_Objekt_SW_Hintergrundfarbe .uno:BackgroundColor +OL_Objekt_SW_GanzNachVorn .uno:BringToFront +OL_Objekt_SW_GanzNachHinten .uno:SendToBack +OL_Objekt_SW_Verankerungwechseln .uno:ToggleAnchorType +OL_Objekt_SW_HorizontalSpiegeln .uno:FlipHorizontal +OL_Objekt_SW_VertikalSpiegeln .uno:FlipVertical +OL_Objekt_SW_PositionUndGroesse .uno:TransformDialog +OL_Objekt_SW_InDenVordergrund .uno:SetObjectToForeground +OL_Objekt_SW_InDenHintergrund .uno:SetObjectToBackground +OL_Objekt_SW_EigenschaftenObjekt .uno:FrameDialog +OL_Objekt_SW_EigenschaftenControls .uno:ShowBrowser ' ** Writer ' - Numerierung / Aufzaehlung -OL_Numerierung_NumerierungAusschalten sym:.uno:RemoveBullets -OL_Numerierung_Hochstufen sym:.uno:IncrementLevel -OL_Numerierung_Hinunterstufen sym:.uno:DecrementLevel -OL_Numerierung_HochstufenMitUnterpunkten sym:.uno:IncrementSubLevels -OL_Numerierung_HinunterstufenMitUnterpunkten sym:.uno:DecrementSubLevels -OL_Numerierung_AbsatzOhnenNumerierung sym:.uno:InsertNeutralParagraph -OL_Numerierung_Hochschieben sym:.uno:MoveUp -OL_Numerierung_Hinunterschieben sym:.uno:MoveDown -OL_Numerierung_HochschiebenMitUnterpunkten sym:.uno:MoveUpSubItems -OL_Numerierung_HinunterschiebenMitUnterpunkten sym:.uno:MoveDownSubItems -OL_Numerierung_NumerierungNeuStarten sym:.uno:NumberingStart -OL_Numerierung_NumerierungAufzaehlung sym:.uno:BulletsAndNumberingDialog +OL_Numerierung_NumerierungAusschalten .uno:RemoveBullets +OL_Numerierung_Hochstufen .uno:IncrementLevel +OL_Numerierung_Hinunterstufen .uno:DecrementLevel +OL_Numerierung_HochstufenMitUnterpunkten .uno:IncrementSubLevels +OL_Numerierung_HinunterstufenMitUnterpunkten .uno:DecrementSubLevels +OL_Numerierung_AbsatzOhnenNumerierung .uno:InsertNeutralParagraph +OL_Numerierung_Hochschieben .uno:MoveUp +OL_Numerierung_Hinunterschieben .uno:MoveDown +OL_Numerierung_HochschiebenMitUnterpunkten .uno:MoveUpSubItems +OL_Numerierung_HinunterschiebenMitUnterpunkten .uno:MoveDownSubItems +OL_Numerierung_NumerierungNeuStarten .uno:NumberingStart +OL_Numerierung_NumerierungAufzaehlung .uno:BulletsAndNumberingDialog ' ** Calc ' - normal -OL_CALC_Schriftart sym:.uno:CharFontName -OL_CALC_Schriftgroesse sym:.uno:FontHeight -OL_CALC_Fett sym:.uno:Bold -OL_CALC_Kursiv sym:.uno:Italic -OL_CALC_Unterstrichen sym:.uno:Underline -OL_CALC_Schriftfarbe sym:.uno:Color -OL_CALC_Linksbuendig sym:.uno:LeftPara -OL_CALC_Zentriert sym:.uno:CenterPara -OL_CALC_Rechtsbuendig sym:.uno:RightPara -OL_CALC_Waehrungsformat sym:.uno:NumberFormatCurrency -OL_CALC_Prozentformat sym:.uno:NumberFormatPercent -OL_CALC_StandardWaehrungformat sym:.uno:NumberFormatStandard -OL_CALC_DezimalstellenHinzufuegen sym:.uno:NumberFormatIncDecimals -OL_CALC_DezimalstellenLoeschen sym:.uno:NumberFormatDecDecimals -OL_CALC_EinzugVermindern sym:.uno:DecrementIndent -OL_CALC_EinzugErhoehen sym:.uno:IncrementIndent -OL_CALC_Umrandung sym:.uno:SetBorderStyle -OL_CALC_Hintergrundfarbe sym:.uno:BackgroundColor -OL_CALC_VertikalOben sym:.uno:AlignTop -OL_CALC_VertikalMitte sym:.uno:AlignVCenter -OL_CALC_VertikalUnten sym:.uno:AlignBottom +OL_CALC_Schriftart .uno:CharFontName +OL_CALC_Schriftgroesse .uno:FontHeight +OL_CALC_Fett .uno:Bold +OL_CALC_Kursiv .uno:Italic +OL_CALC_Unterstrichen .uno:Underline +OL_CALC_Schriftfarbe .uno:Color +OL_CALC_Linksbuendig .uno:LeftPara +OL_CALC_Zentriert .uno:CenterPara +OL_CALC_Rechtsbuendig .uno:RightPara +OL_CALC_Waehrungsformat .uno:NumberFormatCurrency +OL_CALC_Prozentformat .uno:NumberFormatPercent +OL_CALC_StandardWaehrungformat .uno:NumberFormatStandard +OL_CALC_DezimalstellenHinzufuegen .uno:NumberFormatIncDecimals +OL_CALC_DezimalstellenLoeschen .uno:NumberFormatDecDecimals +OL_CALC_EinzugVermindern .uno:DecrementIndent +OL_CALC_EinzugErhoehen .uno:IncrementIndent +OL_CALC_Umrandung .uno:SetBorderStyle +OL_CALC_Hintergrundfarbe .uno:BackgroundColor +OL_CALC_VertikalOben .uno:AlignTop +OL_CALC_VertikalMitte .uno:AlignVCenter +OL_CALC_VertikalUnten .uno:AlignBottom ' ** Draw / Impress ' - normal OL_DRAW_Linie .uno:FormatLine -OL_DRAW_Linienendenstil sym:.uno:LineEndStyle -OL_DRAW_Linienstil sym:.uno:XLineStyle -OL_DRAW_Linienbreite sym:.uno:LineWidth -OL_DRAW_Linienfarbe sym:.uno:XLineColor +OL_DRAW_Linienendenstil .uno:LineEndStyle +OL_DRAW_Linienstil .uno:XLineStyle +OL_DRAW_Linienbreite .uno:LineWidth +OL_DRAW_Linienfarbe .uno:XLineColor OL_DRAW_Flaeche .uno:FormatArea -OL_DRAW_Flaechenstil sym:.uno:FillStyle -OL_DRAW_Flaechenfarbe sym:.uno:FillStyle +OL_DRAW_Flaechenstil .uno:FillStyle +OL_DRAW_Flaechenfarbe .uno:FillStyle OL_DRAW_Schatten .uno:FillShadow -OL_DRAW_Drehen sym:.uno:ToggleObjectRotateMode -OL_DRAW_PunkteBearbeiten sym:.uno:ToggleObjectBezierMode -OL_DRAW_Ausrichtung sym:.uno:ObjectAlign -OL_DRAW_GanzNachVorn sym:.uno:BringToFront -OL_DRAW_GanzNachHinten sym:.uno:SendToBack -OL_DRAW_InDenVordergrund sym:.uno:SetObjectToForeground -OL_DRAW_InDenHintergrund sym:.uno:SetObjectToBackground -OL_DRAW_VorDasObjekt sym:.uno:BeforeObject -OL_DRAW_HinterDasObjekt sym:.uno:BehindObject -OL_DRAW_VerankerungWechseln sym:.uno:ToggleAnchorType +OL_DRAW_Drehen .uno:ToggleObjectRotateMode +OL_DRAW_PunkteBearbeiten .uno:ToggleObjectBezierMode +OL_DRAW_Ausrichtung .uno:ObjectAlign +OL_DRAW_GanzNachVorn .uno:BringToFront +OL_DRAW_GanzNachHinten .uno:SendToBack +OL_DRAW_InDenVordergrund .uno:SetObjectToForeground +OL_DRAW_InDenHintergrund .uno:SetObjectToBackground +OL_DRAW_VorDasObjekt .uno:BeforeObject +OL_DRAW_HinterDasObjekt .uno:BehindObject +OL_DRAW_VerankerungWechseln .uno:ToggleAnchorType ' ** Draw / Impress ' - Diamode @@ -207,126 +207,126 @@ OL_DIA_Ueberblendeffekt .uno:DiaEffect OL_DIA_Geschwindigkeit .uno:DiaSpeed OL_DIA_Diawechsel .uno:DiaAuto OL_DIA_Zeit .uno:DiaTime -OL_DIA_PraesentationMitZeitnahme sym:.uno:RehearseTimings -OL_DIA_DiaAnzeigen sym:.uno:HideSlide -OL_DIA_DiasProReihe sym:.uno:PagesPerRow +OL_DIA_PraesentationMitZeitnahme .uno:RehearseTimings +OL_DIA_DiaAnzeigen .uno:HideSlide +OL_DIA_DiasProReihe .uno:PagesPerRow ' ** Draw / Impress ' - Bezierleiste -OL_BEZIER_Verschieben sym:.uno:BezierMove -OL_BEZIER_Einfuegen sym:.uno:BezierInsert -OL_BEZIER_Loeschen sym:.uno:BezierDelete -OL_BEZIER_Auftrennen sym:.uno:BezierCutLine -OL_BEZIER_InKurve sym:.uno:BezierConvert -OL_BEZIER_Ecke sym:.uno:BezierEdge -OL_BEZIER_Glatt sym:.uno:BezierSmooth -OL_BEZIER_Symmetrisch sym:.uno:BezierSymmetric -OL_BEZIER_Schliessen sym:.uno:BezierClose -OL_BEZIER_PunkteReduzieren sym:.uno:BezierEliminatePoints +OL_BEZIER_Verschieben .uno:BezierMove +OL_BEZIER_Einfuegen .uno:BezierInsert +OL_BEZIER_Loeschen .uno:BezierDelete +OL_BEZIER_Auftrennen .uno:BezierCutLine +OL_BEZIER_InKurve .uno:BezierConvert +OL_BEZIER_Ecke .uno:BezierEdge +OL_BEZIER_Glatt .uno:BezierSmooth +OL_BEZIER_Symmetrisch .uno:BezierSymmetric +OL_BEZIER_Schliessen .uno:BezierClose +OL_BEZIER_PunkteReduzieren .uno:BezierEliminatePoints ' ** Draw / Impress ' - Klebepunte -OL_KLEBE_PunkteEinfuegen sym:.uno:GlueInsertPoint -OL_KLEBE_Links sym:.uno:GlueEscapeDirectionLeft -OL_KLEBE_Oben sym:.uno:GlueEscapeDirectionTop -OL_KLEBE_Rechts sym:.uno:GlueEscapeDirectionRight -OL_KLEBE_Unten sym:.uno:GlueEscapeDirectionBottom -OL_KLEBE_PositionAnObjektAnpassen sym:.uno:GluePercent -OL_KLEBE_HorizontalLinks sym:.uno:GlueHorzAlignLeft -OL_KLEBE_HorizontalZentriert sym:.uno:GlueHorzAlignCenter -OL_KLEBE_HorizontalRechts sym:.uno:GlueHorzAlignRight -OL_KLEBE_VertikalOben sym:.uno:GlueVertAlignTop -OL_KLEBE_VertikalZentriert sym:.uno:GlueVertAlignCenter -OL_KLEBE_VertikalUnten sym:.uno:GlueVertAlignBottom +OL_KLEBE_PunkteEinfuegen .uno:GlueInsertPoint +OL_KLEBE_Links .uno:GlueEscapeDirectionLeft +OL_KLEBE_Oben .uno:GlueEscapeDirectionTop +OL_KLEBE_Rechts .uno:GlueEscapeDirectionRight +OL_KLEBE_Unten .uno:GlueEscapeDirectionBottom +OL_KLEBE_PositionAnObjektAnpassen .uno:GluePercent +OL_KLEBE_HorizontalLinks .uno:GlueHorzAlignLeft +OL_KLEBE_HorizontalZentriert .uno:GlueHorzAlignCenter +OL_KLEBE_HorizontalRechts .uno:GlueHorzAlignRight +OL_KLEBE_VertikalOben .uno:GlueVertAlignTop +OL_KLEBE_VertikalZentriert .uno:GlueVertAlignCenter +OL_KLEBE_VertikalUnten .uno:GlueVertAlignBottom ' ** Frameset ' - normal -OL_FRAME_HTMLQuelltext sym:.uno:SourceView +OL_FRAME_HTMLQuelltext .uno:SourceView ' ** Basicdokument ' - normal -OL_BASIC_Bibliothek sym:.uno:LibSelector -OL_BASIC_Uebersetzen sym:.uno:CompileBasic -OL_BASIC_Ausfuehren sym:.uno:RunBasic -OL_BASIC_Anhalten sym:.uno:BasicStop -OL_BASIC_Prozedurschritt sym:.uno:BasicStepOver -OL_BASIC_Einzelschritt sym:.uno:BasicStepInto -OL_BASIC_Haltepunkt sym:.uno:ToggleBreakPoint -OL_BASIC_BeobachterAnzeigen sym:.uno:AddWatch -OL_BASIC_Objektkatalog sym:.uno:ObjectCatalog -OL_BASIC_Makros sym:.uno:ChooseMacro -OL_BASIC_Module sym:.uno:ModuleDialog -OL_BASIC_KlammerSuchen sym:.uno:MatchGroup -OL_BASIC_Kontrollfelder sym:.uno:ChooseControls -OL_BASIC_QuelltextEinfuegen sym:.uno:LoadBasic -OL_BASIC_QuelltextSpeichern sym:.uno:SaveBasicAs +OL_BASIC_Bibliothek .uno:LibSelector +OL_BASIC_Uebersetzen .uno:CompileBasic +OL_BASIC_Ausfuehren .uno:RunBasic +OL_BASIC_Anhalten .uno:BasicStop +OL_BASIC_Prozedurschritt .uno:BasicStepOver +OL_BASIC_Einzelschritt .uno:BasicStepInto +OL_BASIC_Haltepunkt .uno:ToggleBreakPoint +OL_BASIC_BeobachterAnzeigen .uno:AddWatch +OL_BASIC_Objektkatalog .uno:ObjectCatalog +OL_BASIC_Makros .uno:ChooseMacro +OL_BASIC_Module .uno:ModuleDialog +OL_BASIC_KlammerSuchen .uno:MatchGroup +OL_BASIC_Kontrollfelder .uno:ChooseControls +OL_BASIC_QuelltextEinfuegen .uno:LoadBasic +OL_BASIC_QuelltextSpeichern .uno:SaveBasicAs ' ** Allgemeine Objektleisten ' ' ** Seitenansicht ' - normal -OL_SEITENANSICHT_VorherigeSeite sym:.uno:PageUp -OL_SEITENANSICHT_NaechsteSeite sym:.uno:PageDown -OL_SEITENANSICHT_ErsteSeite sym:.uno:GoToStartOfDoc -OL_SEITENANSICHT_LetzteSeite sym:.uno:GoToEndOfDoc -OL_SEITENANSICHT_ZweiSeiten sym:.uno:ShowTwoPages -OL_SEITENANSICHT_VierSeiten sym:.uno:ShowMultiplePages -OL_SEITENANSICHT_Massstab sym:.uno:Zoom -OL_SEITENANSICHT_GanzerBildschirm sym:.uno:FullScreen -OL_SEITENANSICHT_DruckenSeitenansicht sym:.uno:PrintPagePreView -OL_SEITENANSICHT_Schliessen sym:.uno:CloseWin -OL_SEITENANSICHT_SeitenAnsichtSchliessen sym:.uno:CloseWin -OL_SEITENANSICHT_Seitenlayout sym:.uno:PageFormatDialog -OL_SEITENANSICHT_MassstabVergroessern sym:.uno:ZoomIn -OL_SEITENANSICHT_MassstabVerkleinern sym:.uno:ZoomOut -OL_SEITENANSICHT_NaechsteSeiteCalc sym:.uno:NextPage -OL_SEITENANSICHT_VorherigeSeiteCalc sym:.uno:PreviousPage -OL_SEITENANSICHT_ErsteSeiteCalc sym:.uno:FirstPage -OL_SEITENANSICHT_LetzteSeiteCalc sym:.uno:LastPage +OL_SEITENANSICHT_VorherigeSeite .uno:PageUp +OL_SEITENANSICHT_NaechsteSeite .uno:PageDown +OL_SEITENANSICHT_ErsteSeite .uno:GoToStartOfDoc +OL_SEITENANSICHT_LetzteSeite .uno:GoToEndOfDoc +OL_SEITENANSICHT_ZweiSeiten .uno:ShowTwoPages +OL_SEITENANSICHT_VierSeiten .uno:ShowMultiplePages +OL_SEITENANSICHT_Massstab .uno:Zoom +OL_SEITENANSICHT_GanzerBildschirm .uno:FullScreen +OL_SEITENANSICHT_DruckenSeitenansicht .uno:PrintPagePreView +OL_SEITENANSICHT_Schliessen .uno:CloseWin +OL_SEITENANSICHT_SeitenAnsichtSchliessen .uno:CloseWin +OL_SEITENANSICHT_Seitenlayout .uno:PageFormatDialog +OL_SEITENANSICHT_MassstabVergroessern .uno:ZoomIn +OL_SEITENANSICHT_MassstabVerkleinern .uno:ZoomOut +OL_SEITENANSICHT_NaechsteSeiteCalc .uno:NextPage +OL_SEITENANSICHT_VorherigeSeiteCalc .uno:PreviousPage +OL_SEITENANSICHT_ErsteSeiteCalc .uno:FirstPage +OL_SEITENANSICHT_LetzteSeiteCalc .uno:LastPage ' ** Zeichenobjekt ' - Text -OL_ZO_Text_Schriftart sym:.uno:CharFontName -OL_ZO_Text_Schriftgroesse sym:.uno:FontHeight -OL_ZO_Text_Fett sym:.uno:Bold -OL_ZO_Text_Kursiv sym:.uno:Italic -OL_ZO_Text_Unterstrichen sym:.uno:Underline -OL_ZO_Text_Linksbuendig sym:.uno:LeftPara -OL_ZO_Text_Zentriert sym:.uno:CenterPara -OL_ZO_Text_Schriftfarbe sym:.uno:Color -OL_ZO_Text_Einzeilig sym:.uno:SpacePara1 -OL_ZO_Text_Eineinhalbzeilig sym:.uno:SpacePara15 -OL_ZO_Text_Zweizeilig sym:.uno:SpacePara2 -OL_ZO_Text_Hochstellen sym:.uno:SuperScript -OL_ZO_Text_Tiefstellen sym:.uno:SubScript -OL_ZO_Text_Zeichenformat sym:.uno:FontDialog -OL_ZO_Text_Absatzformat sym:.uno:ParagraphDialog -OL_ZO_Text_Hintergrundmuster sym:.uno:BackgroundPatternController -OL_ZO_Text_Hintergrundfarbe sym:.uno:BackgroundColor -OL_ZO_Text_Aufzaehlungszeichen sym:.uno:OutlineBullet +OL_ZO_Text_Schriftart .uno:CharFontName +OL_ZO_Text_Schriftgroesse .uno:FontHeight +OL_ZO_Text_Fett .uno:Bold +OL_ZO_Text_Kursiv .uno:Italic +OL_ZO_Text_Unterstrichen .uno:Underline +OL_ZO_Text_Linksbuendig .uno:LeftPara +OL_ZO_Text_Zentriert .uno:CenterPara +OL_ZO_Text_Schriftfarbe .uno:Color +OL_ZO_Text_Einzeilig .uno:SpacePara1 +OL_ZO_Text_Eineinhalbzeilig .uno:SpacePara15 +OL_ZO_Text_Zweizeilig .uno:SpacePara2 +OL_ZO_Text_Hochstellen .uno:SuperScript +OL_ZO_Text_Tiefstellen .uno:SubScript +OL_ZO_Text_Zeichenformat .uno:FontDialog +OL_ZO_Text_Absatzformat .uno:ParagraphDialog +OL_ZO_Text_Hintergrundmuster .uno:BackgroundPatternController +OL_ZO_Text_Hintergrundfarbe .uno:BackgroundColor +OL_ZO_Text_Aufzaehlungszeichen .uno:OutlineBullet ' ** Zeichenobjekt ' - Flaeche OL_ZO_FLAECHE_Linie .uno:FormatLine -OL_ZO_FLAECHE_Linienendenstil sym:.uno:LineEndStyle -OL_ZO_FLAECHE_Linienstil sym:.uno:XLineStyle -OL_ZO_FLAECHE_Linienbreite sym:.uno:LineWidth -OL_ZO_FLAECHE_Linienfarbe sym:.uno:XLineColor -OL_ZO_FLAECHE_Flaeche sym:.uno:FormatArea -OL_ZO_FLAECHE_Flaechenstil sym:.uno:FillStyle -OL_ZO_FLAECHE_Flaechenfarbe sym:.uno:FillStyle +OL_ZO_FLAECHE_Linienendenstil .uno:LineEndStyle +OL_ZO_FLAECHE_Linienstil .uno:XLineStyle +OL_ZO_FLAECHE_Linienbreite .uno:LineWidth +OL_ZO_FLAECHE_Linienfarbe .uno:XLineColor +OL_ZO_FLAECHE_Flaeche .uno:FormatArea +OL_ZO_FLAECHE_Flaechenstil .uno:FillStyle +OL_ZO_FLAECHE_Flaechenfarbe .uno:FillStyle OL_ZO_FLAECHE_Schatten .uno:FillShadow -OL_ZO_FLAECHE_Animation sym:.uno:AnimationObjects +OL_ZO_FLAECHE_Animation .uno:AnimationObjects OL_ZO_FLAECHE_Effekt .uno:EffectWindow -OL_ZO_FLAECHE_Interaktion sym:.uno:AnimationEffects -OL_ZO_FLAECHE_Drehen sym:.uno:ToggleObjectRotateMode -OL_ZO_FLAECHE_PunkteBearbeiten sym:.uno:ToggleObjectBezierMode -OL_ZO_FLAECHE_Ausrichtung sym:.uno:ObjectAlign -OL_ZO_FLAECHE_GanzNachVorn sym:.uno:BringToFront -OL_ZO_FLAECHE_GanzNachHinten sym:.uno:SendToBack -OL_ZO_FLAECHE_InDenVordergrund sym:.uno:SetObjectToForeground -OL_ZO_FLAECHE_InDenHintergrund sym:.uno:SetObjectToBackground -OL_ZO_FLAECHE_VerankerungWechseln sym:.uno:ToggleAnchorType +OL_ZO_FLAECHE_Interaktion .uno:AnimationEffects +OL_ZO_FLAECHE_Drehen .uno:ToggleObjectRotateMode +OL_ZO_FLAECHE_PunkteBearbeiten .uno:ToggleObjectBezierMode +OL_ZO_FLAECHE_Ausrichtung .uno:ObjectAlign +OL_ZO_FLAECHE_GanzNachVorn .uno:BringToFront +OL_ZO_FLAECHE_GanzNachHinten .uno:SendToBack +OL_ZO_FLAECHE_InDenVordergrund .uno:SetObjectToForeground +OL_ZO_FLAECHE_InDenHintergrund .uno:SetObjectToBackground +OL_ZO_FLAECHE_VerankerungWechseln .uno:ToggleAnchorType ' ******************************************************* ' @@ -334,118 +334,118 @@ OL_ZO_FLAECHE_VerankerungWechseln sym:.uno:ToggleAnchorType ' ' ** Writer ' - normal -WL_WRITER_Einfuegen sym:.uno:InsertCtrl -WL_WRITER_Feldbefehle sym:.uno:InsertFieldCtrl - WL_WRITER_Datum sym:.uno:InsertDateField - WL_WRITER_Uhrzeit sym:.uno:InsertTimeField - WL_WRITER_Seitennummer sym:.uno:InsertPageNumberField - WL_WRITER_Seitenanzahl sym:.uno:InsertPageCountField - WL_WRITER_Thema sym:.uno:InsertTopicField - WL_WRITER_Titel sym:.uno:InsertTitleField - WL_WRITER_Autor sym:.uno:InsertAuthorField - WL_WRITER_Andere sym:.uno:InsertField -WL_WRITER_ObjektEinfuegen sym:.uno:InsertObjCtrl -WL_WRITER_Zeichnen sym:.uno:InsertDraw -WL_WRITER_Kontrollfelder sym:.uno:ChooseControls -WL_WRITER_Formular sym:.uno:Config -WL_WRITER_AutoFormat sym:.uno:AutoFormat -WL_WRITER_Autotext sym:.uno:EditGlossary -WL_WRITER_AutomatischePruefung sym:.uno:SpellOnline -WL_WRITER_SuchenUndErsetzen sym:.uno:SearchDialog -WL_WRITER_SteuerzeichenEinAus sym:.uno:ControlCodes -WL_WRITER_GrafikenAusschalten sym:.uno:Graphic -WL_WRITER_Hyperlink sym:.uno:InsertHyperlink -WL_WRITER_OnlineLayout sym:.uno:BrowseView -WL_WRITER_SchattencursorEinschalten sym:.uno:ShadowCursor +WL_WRITER_Einfuegen .uno:InsertCtrl +WL_WRITER_Feldbefehle .uno:InsertFieldCtrl + WL_WRITER_Datum .uno:InsertDateField + WL_WRITER_Uhrzeit .uno:InsertTimeField + WL_WRITER_Seitennummer .uno:InsertPageNumberField + WL_WRITER_Seitenanzahl .uno:InsertPageCountField + WL_WRITER_Thema .uno:InsertTopicField + WL_WRITER_Titel .uno:InsertTitleField + WL_WRITER_Autor .uno:InsertAuthorField + WL_WRITER_Andere .uno:InsertField +WL_WRITER_ObjektEinfuegen .uno:InsertObjCtrl +WL_WRITER_Zeichnen .uno:InsertDraw +WL_WRITER_Kontrollfelder .uno:ChooseControls +WL_WRITER_Formular .uno:Config +WL_WRITER_AutoFormat .uno:AutoFormat +WL_WRITER_Autotext .uno:EditGlossary +WL_WRITER_AutomatischePruefung .uno:SpellOnline +WL_WRITER_SuchenUndErsetzen .uno:SearchDialog +WL_WRITER_SteuerzeichenEinAus .uno:ControlCodes +WL_WRITER_GrafikenAusschalten .uno:Graphic +WL_WRITER_Hyperlink .uno:InsertHyperlink +WL_WRITER_OnlineLayout .uno:BrowseView +WL_WRITER_SchattencursorEinschalten .uno:ShadowCursor ' ** Calc ' - normal -WL_CALC_Einfuegen sym:.uno:InsertCtrl -WL_CALC_ZellenEinfuegen sym:.uno:InsCellsCtrl -WL_CALC_ObjektEinfuegen sym:.uno:InsertObjCtrl -WL_CALC_Zeichnen sym:.uno:InsertDraw -WL_CALC_Kontrollfelder sym:.uno:ChooseControls -WL_CALC_Autoformat sym:.uno:AutoFormat -WL_CALC_AutomatischeRechtschreibung sym:.uno:SpellOnline -WL_CALC_SuchenUndErsetzen sym:.uno:SearchDialog -WL_CALC_AutoFilter sym:.uno:DataFilterAutoFilter -WL_CALC_SortierenAuf sym:.uno:SortAscending -WL_CALC_SortierenAb sym:.uno:SortDescending -WL_CALC_Gruppierung sym:.uno:Group -WL_CALC_GruppierungAufheben sym:.uno:Ungroup +WL_CALC_Einfuegen .uno:InsertCtrl +WL_CALC_ZellenEinfuegen .uno:InsCellsCtrl +WL_CALC_ObjektEinfuegen .uno:InsertObjCtrl +WL_CALC_Zeichnen .uno:InsertDraw +WL_CALC_Kontrollfelder .uno:ChooseControls +WL_CALC_Autoformat .uno:AutoFormat +WL_CALC_AutomatischeRechtschreibung .uno:SpellOnline +WL_CALC_SuchenUndErsetzen .uno:SearchDialog +WL_CALC_AutoFilter .uno:DataFilterAutoFilter +WL_CALC_SortierenAuf .uno:SortAscending +WL_CALC_SortierenAb .uno:SortDescending +WL_CALC_Gruppierung .uno:Group +WL_CALC_GruppierungAufheben .uno:Ungroup ' ** Draw / Impress ' - normal -WL_DRAW_Auswahl sym:.uno:SelectObject -WL_DRAW_Zoom sym:.uno:ZoomToolBox -WL_DRAW_Grafikeffekte sym:.uno:AdvancedMode -WL_DRAW_Anordnung sym:.uno:ObjectPosition -WL_DRAW_TextBoxen sym:.uno:TextToolbox -WL_DRAW_Rechteck sym:.uno:Rect -WL_DRAW_Ellipsen sym:.uno:EllipseToolbox -WL_DRAW_Kurven sym:.uno:LineToolbox -WL_DRAW_Linien sym:.uno:ArrowsToolbox -WL_DRAW_3DObjekte sym:.uno:Objects3DToolbox -WL_DRAW_Verbinder sym:.uno:ConnectorToolbox -WL_DRAW_Einfuegen sym:.uno:InsertToolbox -WL_DRAW_Kontrollfelder sym:.uno:ChooseControls -WL_DRAW_Praesentation sym:.uno:Presentation +WL_DRAW_Auswahl .uno:SelectObject +WL_DRAW_Zoom .uno:ZoomToolBox +WL_DRAW_Grafikeffekte .uno:AdvancedMode +WL_DRAW_Anordnung .uno:ObjectPosition +WL_DRAW_TextBoxen .uno:TextToolbox +WL_DRAW_Rechteck .uno:Rect +WL_DRAW_Ellipsen .uno:EllipseToolbox +WL_DRAW_Kurven .uno:LineToolbox +WL_DRAW_Linien .uno:ArrowsToolbox +WL_DRAW_3DObjekte .uno:Objects3DToolbox +WL_DRAW_Verbinder .uno:ConnectorToolbox +WL_DRAW_Einfuegen .uno:InsertToolbox +WL_DRAW_Kontrollfelder .uno:ChooseControls +WL_DRAW_Praesentation .uno:Presentation WL_DRAW_Effekt .uno:EffectWindow -WL_DRAW_Interaktion sym:.uno:AnimationObjects -WL_DRAW_3DEffekt sym:.uno:Window3D +WL_DRAW_Interaktion .uno:AnimationObjects +WL_DRAW_3DEffekt .uno:Window3D ' ** Draw / Impress ' - Gliederungsansicht -WL_GL_DRAW_Zoom sym:.uno:ZoomToolBox -WL_GL_DRAW_Hinunterstufen sym:.uno:OutlineRight -WL_GL_DRAW_Hochstufen sym:.uno:OutlineLeft -WL_GL_DRAW_Hochschieben sym:.uno:OutlineUp -WL_GL_DRAW_Hinunterschieben sym:.uno:OutlineDown -WL_GL_DRAW_NurErsteEbene sym:.uno:OutlineCollapseAll -WL_GL_DRAW_AlleEbenen sym:.uno:OutlineExpandAll -WL_GL_DRAW_UnterpunkteAusblenden sym:.uno:OutlineCollapse -WL_GL_DRAW_UnterpunkteAnzeigen sym:.uno:OutlineExpand -WL_GL_DRAW_FormatierungEinAus sym:.uno:OutlineFormat -WL_GL_DRAW_SchwarzweisDarstellung sym:.uno:ColorView -WL_GL_DRAW_Praesentation sym:.uno:Presentation +WL_GL_DRAW_Zoom .uno:ZoomToolBox +WL_GL_DRAW_Hinunterstufen .uno:OutlineRight +WL_GL_DRAW_Hochstufen .uno:OutlineLeft +WL_GL_DRAW_Hochschieben .uno:OutlineUp +WL_GL_DRAW_Hinunterschieben .uno:OutlineDown +WL_GL_DRAW_NurErsteEbene .uno:OutlineCollapseAll +WL_GL_DRAW_AlleEbenen .uno:OutlineExpandAll +WL_GL_DRAW_UnterpunkteAusblenden .uno:OutlineCollapse +WL_GL_DRAW_UnterpunkteAnzeigen .uno:OutlineExpand +WL_GL_DRAW_FormatierungEinAus .uno:OutlineFormat +WL_GL_DRAW_SchwarzweisDarstellung .uno:ColorView +WL_GL_DRAW_Praesentation .uno:Presentation ' ** Draw / Impress ' - Diamodus -WL_DIA_Zoom sym:.uno:ZoomToolBox -WL_DIA_Praesentation sym:.uno:Presentation +WL_DIA_Zoom .uno:ZoomToolBox +WL_DIA_Praesentation .uno:Presentation ' ** HTML-Dokument ' - normal -WL_WEB_Einfuegen sym:.uno:InsertCtrl -WL_WEB_Feldbefehle sym:.uno:InsertFieldCtrl - WL_WEB_Datum sym:.uno:InsertDateField - WL_WEB_Uhrzeit sym:.uno:InsertTimeField - WL_WEB_Seitennummer sym:.uno:InsertPageNumberField - WL_WEB_Seitenanzahl sym:.uno:InsertPageCountField - WL_WEB_Thema sym:.uno:InsertTopicField - WL_WEB_Titel sym:.uno:InsertTitleField +WL_WEB_Einfuegen .uno:InsertCtrl +WL_WEB_Feldbefehle .uno:InsertFieldCtrl + WL_WEB_Datum .uno:InsertDateField + WL_WEB_Uhrzeit .uno:InsertTimeField + WL_WEB_Seitennummer .uno:InsertPageNumberField + WL_WEB_Seitenanzahl .uno:InsertPageCountField + WL_WEB_Thema .uno:InsertTopicField + WL_WEB_Titel .uno:InsertTitleField 'WL_Web_Kopfzeile FN_INSERT_HEADER 'WL_Web_Fusszeile FN_INSERT_FOOTER -WL_WEB_Lauftext sym:.uno:Text_Marquee -WL_WEB_Kontrollfelder sym:.uno:ChooseControls -WL_WEB_SuchenUndErsetzen sym:.uno:SearchDialog -WL_WEB_SteuerzeichenEinAus sym:.uno:ControlCodes -WL_WEB_GrafikenAusschalten sym:.uno:Graphic -WL_WEB_Hyperlink sym:.uno:InsertHyperlink -WL_WEB_OnlineLayout sym:.uno:BrowseView -WL_WEB_SchattencursorEinschalten sym:.uno:ShadowCursor -WL_WEB_DruckLayout sym:.uno:PrintLayout -WL_WEB_HTMLQuelltextWeb sym:.uno:SourceView +WL_WEB_Lauftext .uno:Text_Marquee +WL_WEB_Kontrollfelder .uno:ChooseControls +WL_WEB_SuchenUndErsetzen .uno:SearchDialog +WL_WEB_SteuerzeichenEinAus .uno:ControlCodes +WL_WEB_GrafikenAusschalten .uno:Graphic +WL_WEB_Hyperlink .uno:InsertHyperlink +WL_WEB_OnlineLayout .uno:BrowseView +WL_WEB_SchattencursorEinschalten .uno:ShadowCursor +WL_WEB_DruckLayout .uno:PrintLayout +WL_WEB_HTMLQuelltextWeb .uno:SourceView ' ** Math ' - Normal -WL_MATH_Vergroessern sym:.uno:ZoomIn -WL_MATH_Verkleinern sym:.uno:ZoomOut -WL_MATH_ZoomHundertProzent sym:.uno:View100 -WL_MATH_GanzeFormel sym:.uno:Adjust -WL_MATH_FormelAktualisieren sym:.uno:Draw -WL_MATH_FormelSymbole sym:.uno:SymbolCatalogue +WL_MATH_Vergroessern .uno:ZoomIn +WL_MATH_Verkleinern .uno:ZoomOut +WL_MATH_ZoomHundertProzent .uno:View100 +WL_MATH_GanzeFormel .uno:Adjust +WL_MATH_FormelAktualisieren .uno:Draw +WL_MATH_FormelSymbole .uno:SymbolCatalogue ' ******************************************************* ' @@ -497,248 +497,248 @@ RL_WRITER_Arcustangens sym:SW_HID_MN_CALC_ATAN ' ***** Toolboxen ' ** ' ** Einfuegen Writer -WL_TB_SW_EINFUEGEN_Rahmen sym:.uno:InsertFrameInteract -WL_TB_SW_EINFUEGEN_Grafik sym:.uno:InsertGraphic -WL_TB_SW_EINFUEGEN_Tabelle sym:.uno:InsertTable -WL_TB_SW_EINFUEGEN_TextEinfuegen sym:.uno:InsertDoc -WL_TB_SW_EINFUEGEN_Fussnote sym:.uno:InsertFootnote -WL_TB_SW_EINFUEGEN_SpaltenAnzahl sym:.uno:InsertFrameInteractNoColumns -WL_TB_SW_EINFUEGEN_MehrspaltigenRahmen sym:.uno:InsertFrame -WL_TB_SW_EINFUEGEN_Verzeichnis sym:.uno:InsertIndexesEntry -WL_TB_SW_EINFUEGEN_TextMarke sym:.uno:InsertBookmark +WL_TB_SW_EINFUEGEN_Rahmen .uno:InsertFrameInteract +WL_TB_SW_EINFUEGEN_Grafik .uno:InsertGraphic +WL_TB_SW_EINFUEGEN_Tabelle .uno:InsertTable +WL_TB_SW_EINFUEGEN_TextEinfuegen .uno:InsertDoc +WL_TB_SW_EINFUEGEN_Fussnote .uno:InsertFootnote +WL_TB_SW_EINFUEGEN_SpaltenAnzahl .uno:InsertFrameInteractNoColumns +WL_TB_SW_EINFUEGEN_MehrspaltigenRahmen .uno:InsertFrame +WL_TB_SW_EINFUEGEN_Verzeichnis .uno:InsertIndexesEntry +WL_TB_SW_EINFUEGEN_TextMarke .uno:InsertBookmark ' ** ' ** Einfuegen-Objekt Writer -WL_TB_SW_Objekt_Diagramm sym:.uno:InsertObjectChart -WL_TB_SW_Objekt_FormelEinfuegen sym:.uno:InsertObjectStarMath -WL_TB_SW_Objekt_Rahmenfenster sym:.uno:InsertObjectFloatingFrame -WL_TB_SW_Objekt_Objekt sym:.uno:InsertObjectDialog +WL_TB_SW_Objekt_Diagramm .uno:InsertObjectChart +WL_TB_SW_Objekt_FormelEinfuegen .uno:InsertObjectStarMath +WL_TB_SW_Objekt_Rahmenfenster .uno:InsertObjectFloatingFrame +WL_TB_SW_Objekt_Objekt .uno:InsertObjectDialog ' ** ' ** Zeichenfunktionen -WL_TB_ZF_Auswahl sym:.uno:SelectObject -WL_TB_ZF_Linie sym:.uno:Line -WL_TB_ZF_Rechteck sym:.uno:Rect -WL_TB_ZF_Ellipse sym:.uno:Ellipse -WL_TB_ZF_Polygon sym:.uno:Polygon_Unfilled -WL_TB_ZF_Bezier sym:.uno:Bezier_Unfilled -WL_TB_ZF_Freihand sym:.uno:Freeline_Unfilled -WL_TB_ZF_Kreisbogen sym:.uno:Arc -WL_TB_ZF_Kreissektor sym:.uno:Pie -WL_TB_ZF_Kreissegment sym:.uno:CircleCut -WL_TB_ZF_Textobjekt sym:.uno:DrawText -WL_TB_ZF_Lauftext sym:.uno:Text_Marquee -WL_TB_ZF_Legende sym:.uno:DrawCaption +WL_TB_ZF_Auswahl .uno:SelectObject +WL_TB_ZF_Linie .uno:Line +WL_TB_ZF_Rechteck .uno:Rect +WL_TB_ZF_Ellipse .uno:Ellipse +WL_TB_ZF_Polygon .uno:Polygon_Unfilled +WL_TB_ZF_Bezier .uno:Bezier_Unfilled +WL_TB_ZF_Freihand .uno:Freeline_Unfilled +WL_TB_ZF_Kreisbogen .uno:Arc +WL_TB_ZF_Kreissektor .uno:Pie +WL_TB_ZF_Kreissegment .uno:CircleCut +WL_TB_ZF_Textobjekt .uno:DrawText +WL_TB_ZF_Lauftext .uno:Text_Marquee +WL_TB_ZF_Legende .uno:DrawCaption ' ** ' ** Kontrollfelder -WL_TB_CONTROLS_CommandButton sym:.uno:InsertPushbutton -WL_TB_CONTROLS_SpinButton sym:.uno:Spinbutton -WL_TB_CONTROLS_CheckBox sym:.uno:Checkbox -WL_TB_CONTROLS_OptionButton sym:.uno:Radiobutton -WL_TB_CONTROLS_Label sym:.uno:InsertFixedText -WL_TB_CONTROLS_TextFeld sym:.uno:InsertEdit -WL_TB_CONTROLS_ListBox sym:.uno:InsertListbox -WL_TB_CONTROLS_ComboBox sym:.uno:Combobox -WL_TB_CONTROLS_HScrollBar sym:.uno:HScrollbar -WL_TB_CONTROLS_VScrollBar sym:.uno:VScrollbar -WL_TB_CONTROLS_FrameControl sym:.uno:Groupbox -WL_TB_CONTROLS_Preview sym:.uno:Preview -WL_TB_CONTROLS_URLButton sym:.uno:URLButton -WL_TB_CONTROLS_Selektieren sym:.uno:SelectObject -WL_TB_CONTROLS_KontrollfeldEigenschaften sym:.uno:ShowBrowser -WL_TB_CONTROLS_Testmodus sym:.uno:TestMode +WL_TB_CONTROLS_CommandButton .uno:InsertPushbutton +WL_TB_CONTROLS_SpinButton .uno:Spinbutton +WL_TB_CONTROLS_CheckBox .uno:Checkbox +WL_TB_CONTROLS_OptionButton .uno:Radiobutton +WL_TB_CONTROLS_Label .uno:InsertFixedText +WL_TB_CONTROLS_TextFeld .uno:InsertEdit +WL_TB_CONTROLS_ListBox .uno:InsertListbox +WL_TB_CONTROLS_ComboBox .uno:Combobox +WL_TB_CONTROLS_HScrollBar .uno:HScrollbar +WL_TB_CONTROLS_VScrollBar .uno:VScrollbar +WL_TB_CONTROLS_FrameControl .uno:Groupbox +WL_TB_CONTROLS_Preview .uno:Preview +WL_TB_CONTROLS_URLButton .uno:URLButton +WL_TB_CONTROLS_Selektieren .uno:SelectObject +WL_TB_CONTROLS_KontrollfeldEigenschaften .uno:ShowBrowser +WL_TB_CONTROLS_Testmodus .uno:TestMode ' ** ' ** Zoomen im Draw -WL_SD_Groesser sym:.uno:ZoomPlus -WL_SD_Kleiner sym:.uno:ZoomMinus -WL_SD_VerschiebenZoom sym:.uno:ZoomPanning -WL_SD_VorherigeDarstellung sym:.uno:ZoomPrevious -WL_SD_NaechsteDarstellung sym:.uno:ZoomNext -WL_SD_EinsZuEins sym:.uno:Zoom100Percent -WL_SD_GanzeSeite sym:.uno:ZoomPage -WL_SD_Seitenbreite sym:.uno:ZoomPageWidth -WL_SD_Optimal sym:.uno:ZoomOptimal -WL_SD_Objektzoom sym:.uno:ZoomObjects +WL_SD_Groesser .uno:ZoomPlus +WL_SD_Kleiner .uno:ZoomMinus +WL_SD_VerschiebenZoom .uno:ZoomPanning +WL_SD_VorherigeDarstellung .uno:ZoomPrevious +WL_SD_NaechsteDarstellung .uno:ZoomNext +WL_SD_EinsZuEins .uno:Zoom100Percent +WL_SD_GanzeSeite .uno:ZoomPage +WL_SD_Seitenbreite .uno:ZoomPageWidth +WL_SD_Optimal .uno:ZoomOptimal +WL_SD_Objektzoom .uno:ZoomObjects ' ** ' ** Anordnung im Draw -WL_TB_ANORDNUNG_WeiterNachVorn sym:.uno:Forward -WL_TB_ANORDNUNG_WeiterNachHinten sym:.uno:Backward -WL_TB_ANORDNUNG_VorDasObjekt sym:.uno:BeforeObject -WL_TB_ANORDNUNG_HinterDasObjekt sym:.uno:BehindObject -WL_TB_ANORDNUNG_Vertauschen sym:.uno:ReverseOrder +WL_TB_ANORDNUNG_WeiterNachVorn .uno:Forward +WL_TB_ANORDNUNG_WeiterNachHinten .uno:Backward +WL_TB_ANORDNUNG_VorDasObjekt .uno:BeforeObject +WL_TB_ANORDNUNG_HinterDasObjekt .uno:BehindObject +WL_TB_ANORDNUNG_Vertauschen .uno:ReverseOrder ' ** ' ** Ausrichtung im Draw -WL_TB_AUSRICHTUNG_Links sym:.uno:ObjectAlignLeft -WL_TB_AUSRICHTUNG_Rechts sym:.uno:ObjectAlignRight -WL_TB_AUSRICHTUNG_Oben sym:.uno:AlignUp -WL_TB_AUSRICHTUNG_Mitte sym:.uno:AlignMiddle -WL_TB_AUSRICHTUNG_Unten sym:.uno:AlignDown -WL_TB_AUSRICHTUNG_Zentriert sym:.uno:AlignCenter +WL_TB_AUSRICHTUNG_Links .uno:ObjectAlignLeft +WL_TB_AUSRICHTUNG_Rechts .uno:ObjectAlignRight +WL_TB_AUSRICHTUNG_Oben .uno:AlignUp +WL_TB_AUSRICHTUNG_Mitte .uno:AlignMiddle +WL_TB_AUSRICHTUNG_Unten .uno:AlignDown +WL_TB_AUSRICHTUNG_Zentriert .uno:AlignCenter ' ** ' ** Effekte im Draw -WL_TB_SD_EFFEKTE_Spiegeln sym:.uno:Mirror -WL_TB_SD_EFFEKTE_Verzerren sym:.uno:Shear -WL_TB_SD_EFFEKTE_Rotationskoerper sym:.uno:ConvertInto3DLathe -WL_TB_SD_EFFEKTE_KlebepunkteBearbeiten sym:.uno:GlueEditMode -WL_TB_SD_EFFEKTE_SetzenAufKreisPerspektivisch sym:.uno:CrookRotate -WL_TB_SD_EFFEKTE_SetzenAufKreisSchraeggestellt sym:.uno:CrookSlant +WL_TB_SD_EFFEKTE_Spiegeln .uno:Mirror +WL_TB_SD_EFFEKTE_Verzerren .uno:Shear +WL_TB_SD_EFFEKTE_Rotationskoerper .uno:ConvertInto3DLathe +WL_TB_SD_EFFEKTE_KlebepunkteBearbeiten .uno:GlueEditMode +WL_TB_SD_EFFEKTE_SetzenAufKreisPerspektivisch .uno:CrookRotate +WL_TB_SD_EFFEKTE_SetzenAufKreisSchraeggestellt .uno:CrookSlant ' ** ' ** Ellipsen im Draw -WL_SD_Ellipsen sym:.uno:Ellipse -WL_SD_EllipseVoll sym:.uno:Ellipse -WL_SD_EllipseLeer sym:.uno:Ellipse_Unfilled -WL_SD_KreisVoll sym:.uno:Circle -WL_SD_KreisLeer sym:.uno:Circle_Unfilled -WL_SD_EllipsensegmentVoll sym:.uno:Pie -WL_SD_EllipsensegmentLeer sym:.uno:Pie_Unfilled -WL_SD_KreissegmentVoll sym:.uno:CirclePie -WL_SD_KreissegmentLeer sym:.uno:CirclePie_Unfilled -WL_SD_EllipsenabschnittVoll sym:.uno:EllipseCut -WL_SD_EllipsenabschnittLeer sym:.uno:EllipseCut_Unfilled -WL_SD_KreisabschnittVoll sym:.uno:CircleCut -WL_SD_KreisabschnittLeer sym:.uno:CircleCut_Unfilled -WL_SD_Kreisbogen sym:.uno:CircleArc +WL_SD_Ellipsen .uno:Ellipse +WL_SD_EllipseVoll .uno:Ellipse +WL_SD_EllipseLeer .uno:Ellipse_Unfilled +WL_SD_KreisVoll .uno:Circle +WL_SD_KreisLeer .uno:Circle_Unfilled +WL_SD_EllipsensegmentVoll .uno:Pie +WL_SD_EllipsensegmentLeer .uno:Pie_Unfilled +WL_SD_KreissegmentVoll .uno:CirclePie +WL_SD_KreissegmentLeer .uno:CirclePie_Unfilled +WL_SD_EllipsenabschnittVoll .uno:EllipseCut +WL_SD_EllipsenabschnittLeer .uno:EllipseCut_Unfilled +WL_SD_KreisabschnittVoll .uno:CircleCut +WL_SD_KreisabschnittLeer .uno:CircleCut_Unfilled +WL_SD_Kreisbogen .uno:CircleArc ' ** ' ** Kurven im Draw -WL_SD_KurveVoll sym:.uno:BezierFill -WL_SD_KurveLeer sym:.uno:Bezier_Unfilled -WL_SD_PolygonVoll sym:.uno:Polygon -WL_SD_Polygon sym:.uno:Polygon_Unfilled -WL_SD_PolygonWinkelVoll sym:.uno:Polygon_Diagonal -WL_SD_PolygonWinkel sym:.uno:Polygon_Diagonal_Unfilled -WL_SD_FreihandlinieVoll sym:.uno:Freeline -WL_SD_FreihandlinieLeer sym:.uno:Freeline_Unfilled +WL_SD_KurveVoll .uno:BezierFill +WL_SD_KurveLeer .uno:Bezier_Unfilled +WL_SD_PolygonVoll .uno:Polygon +WL_SD_Polygon .uno:Polygon_Unfilled +WL_SD_PolygonWinkelVoll .uno:Polygon_Diagonal +WL_SD_PolygonWinkel .uno:Polygon_Diagonal_Unfilled +WL_SD_FreihandlinieVoll .uno:Freeline +WL_SD_FreihandlinieLeer .uno:Freeline_Unfilled ' ** ' ** Linien und Pfeile im Draw -WL_SD_LinieZeichnen sym:.uno:Line -WL_SD_LinieMitPfeilende sym:.uno:LineArrowEnd -WL_SD_LinieMitPfeilKreisende sym:.uno:LineArrowCircle -WL_SD_LinieMitPfeilQuadratende sym:.uno:LineArrowSquare -WL_SD_LinieWinkel sym:.uno:Line_Diagonal -WL_SD_LinieMitPfeilanfang sym:.uno:LineArrowStart -WL_SD_LinieMitKreisPfeilende sym:.uno:LineCircleArrow -WL_SD_LinieMitQuadratKreisende sym:.uno:LineSquareArrow -WL_SD_Masslinie sym:.uno:MeasureLine -WL_SD_LinieMitPfeilenden sym:.uno:LineArrows +WL_SD_LinieZeichnen .uno:Line +WL_SD_LinieMitPfeilende .uno:LineArrowEnd +WL_SD_LinieMitPfeilKreisende .uno:LineArrowCircle +WL_SD_LinieMitPfeilQuadratende .uno:LineArrowSquare +WL_SD_LinieWinkel .uno:Line_Diagonal +WL_SD_LinieMitPfeilanfang .uno:LineArrowStart +WL_SD_LinieMitKreisPfeilende .uno:LineCircleArrow +WL_SD_LinieMitQuadratKreisende .uno:LineSquareArrow +WL_SD_Masslinie .uno:MeasureLine +WL_SD_LinieMitPfeilenden .uno:LineArrows ' ** ' ** Rechtecke im Draw -WL_SD_RechteckVoll sym:.uno:Rect -WL_SD_RechteckLeer sym:.uno:Rect_Unfilled -WL_SD_RechteckRundVoll sym:.uno:Rect_Rounded -WL_SD_RechteckRundLeer sym:.uno:Rect_Rounded_Unfilled -WL_SD_QuadratVoll sym:.uno:Square -WL_SD_QuadratLeer sym:.uno:Square_Unfilled -WL_SD_QuadratRundVoll sym:.uno:Square_Rounded -WL_SD_QuadratRundLeer sym:.uno:Square_Rounded_Unfilled +WL_SD_RechteckVoll .uno:Rect +WL_SD_RechteckLeer .uno:Rect_Unfilled +WL_SD_RechteckRundVoll .uno:Rect_Rounded +WL_SD_RechteckRundLeer .uno:Rect_Rounded_Unfilled +WL_SD_QuadratVoll .uno:Square +WL_SD_QuadratLeer .uno:Square_Unfilled +WL_SD_QuadratRundVoll .uno:Square_Rounded +WL_SD_QuadratRundLeer .uno:Square_Rounded_Unfilled ' ** ' ** Text im Draw -WL_SD_TextBox sym:.uno:TextToolbox -WL_SD_TextEinfuegenDraw sym:.uno:Text -WL_SD_TextRahmen sym:.uno:TextFitToSizeTool -WL_SD_TextLegende sym:.uno:DrawCaption +WL_SD_TextBox .uno:TextToolbox +WL_SD_TextEinfuegenDraw .uno:Text +WL_SD_TextRahmen .uno:TextFitToSizeTool +WL_SD_TextLegende .uno:DrawCaption ' ** ' ** Verbinder im Draw -WL_SD_VVerbinder sym:.uno:Connector -WL_SD_VPfeilAnfang sym:.uno:ConnectorArrowStart -WL_SD_VPfeilEnde sym:.uno:ConnectorArrowEnd -WL_SD_Vpfeile sym:.uno:ConnectorArrows -WL_SD_VkreisAnfang sym:.uno:ConnectorCircleStart -WL_SD_VkreisEnde sym:.uno:ConnectorCircleEnd -WL_SD_Vkreise sym:.uno:ConnectorCircles -WL_SD_LinienVerbinder sym:.uno:ConnectorLines -WL_SD_LPfeilAnfang sym:.uno:ConnectorLinesArrowStart -WL_SD_LPfeilEnde sym:.uno:ConnectorLinesArrowEnd -WL_SD_Lpfeile sym:.uno:ConnectorLinesArrows -WL_SD_LkreisAnfang sym:.uno:ConnectorLinesCircleStart -WL_SD_LkreisEnde sym:.uno:ConnectorLinesCircleEnd -WL_SD_Lkreise sym:.uno:ConnectorLinesCircles -WL_SD_Direktverbinder sym:.uno:ConnectorLine -WL_SD_DPfeilAnfang sym:.uno:ConnectorLineArrowStart -WL_SD_DPfeilEnde sym:.uno:ConnectorLineArrowEnd -WL_SD_Dpfeile sym:.uno:ConnectorLineArrows -WL_SD_DkreisAnfang sym:.uno:ConnectorLineCircleStart -WL_SD_DkreisEnde sym:.uno:ConnectorLineCircleEnd -WL_SD_DKreise sym:.uno:ConnectorLineCircles -WL_SD_KurvenVerbinder sym:.uno:ConnectorCurve -WL_SD_KPfeilAnfang sym:.uno:ConnectorCurveArrowStart -WL_SD_KPfeilEnde sym:.uno:ConnectorCurveArrowEnd -WL_SD_Kpfeile sym:.uno:ConnectorCurveArrows -WL_SD_KkreisAnfang sym:.uno:ConnectorCurveCircleStart -WL_SD_KkreisEnde sym:.uno:ConnectorCurveCircleEnd -WL_SD_KKreise sym:.uno:ConnectorCurveCircles +WL_SD_VVerbinder .uno:Connector +WL_SD_VPfeilAnfang .uno:ConnectorArrowStart +WL_SD_VPfeilEnde .uno:ConnectorArrowEnd +WL_SD_Vpfeile .uno:ConnectorArrows +WL_SD_VkreisAnfang .uno:ConnectorCircleStart +WL_SD_VkreisEnde .uno:ConnectorCircleEnd +WL_SD_Vkreise .uno:ConnectorCircles +WL_SD_LinienVerbinder .uno:ConnectorLines +WL_SD_LPfeilAnfang .uno:ConnectorLinesArrowStart +WL_SD_LPfeilEnde .uno:ConnectorLinesArrowEnd +WL_SD_Lpfeile .uno:ConnectorLinesArrows +WL_SD_LkreisAnfang .uno:ConnectorLinesCircleStart +WL_SD_LkreisEnde .uno:ConnectorLinesCircleEnd +WL_SD_Lkreise .uno:ConnectorLinesCircles +WL_SD_Direktverbinder .uno:ConnectorLine +WL_SD_DPfeilAnfang .uno:ConnectorLineArrowStart +WL_SD_DPfeilEnde .uno:ConnectorLineArrowEnd +WL_SD_Dpfeile .uno:ConnectorLineArrows +WL_SD_DkreisAnfang .uno:ConnectorLineCircleStart +WL_SD_DkreisEnde .uno:ConnectorLineCircleEnd +WL_SD_DKreise .uno:ConnectorLineCircles +WL_SD_KurvenVerbinder .uno:ConnectorCurve +WL_SD_KPfeilAnfang .uno:ConnectorCurveArrowStart +WL_SD_KPfeilEnde .uno:ConnectorCurveArrowEnd +WL_SD_Kpfeile .uno:ConnectorCurveArrows +WL_SD_KkreisAnfang .uno:ConnectorCurveCircleStart +WL_SD_KkreisEnde .uno:ConnectorCurveCircleEnd +WL_SD_KKreise .uno:ConnectorCurveCircles ' ** ' ** 3D-Objekte im Draw -WL_SD_Wuerfel sym:.uno:Cube -WL_SD_Kugel sym:.uno:Sphere -WL_SD_Zylinder sym:.uno:Cylinder -WL_SD_Kegel sym:.uno:Cone -WL_SD_Pyramide sym:.uno:Cyramid -WL_SD_Torus sym:.uno:Torus -WL_SD_Schale sym:.uno:Shell3D -WL_SD_Halbkugel sym:.uno:HalfSphere +WL_SD_Wuerfel .uno:Cube +WL_SD_Kugel .uno:Sphere +WL_SD_Zylinder .uno:Cylinder +WL_SD_Kegel .uno:Cone +WL_SD_Pyramide .uno:Cyramid +WL_SD_Torus .uno:Torus +WL_SD_Schale .uno:Shell3D +WL_SD_Halbkugel .uno:HalfSphere ' ** ' ** Einfuegen im Draw -WL_TB_SD_EINFUEGEN_Diagramm sym:.uno:InsertObjectChart -WL_TB_SD_EINFUEGEN_Formel sym:.uno:InsertMath -WL_TB_SD_EINFUEGEN_Objekt sym:.uno:InsertObject -WL_TB_SD_EINFUEGEN_Plugin sym:.uno:InsertPlugin -WL_TB_SD_EINFUEGEN_Tabelle sym:.uno:InsertSpreadsheet -WL_TB_SD_EINFUEGEN_Datei sym:.uno:ImportFromFile -WL_TB_SD_EINFUEGEN_Seite sym:.uno:InsertPage -WL_TB_SD_EINFUEGEN_StarImage sym:.uno:InsertImage +WL_TB_SD_EINFUEGEN_Diagramm .uno:InsertObjectChart +WL_TB_SD_EINFUEGEN_Formel .uno:InsertMath +WL_TB_SD_EINFUEGEN_Objekt .uno:InsertObject +WL_TB_SD_EINFUEGEN_Plugin .uno:InsertPlugin +WL_TB_SD_EINFUEGEN_Tabelle .uno:InsertSpreadsheet +WL_TB_SD_EINFUEGEN_Datei .uno:ImportFromFile +WL_TB_SD_EINFUEGEN_Seite .uno:InsertPage +WL_TB_SD_EINFUEGEN_StarImage .uno:InsertImage ' ** ' ** Einfuegen im Calc -WL_TB_SC_Einfuegen_Grafik sym:.uno:InsertGraphic -WL_TB_SC_Einfuegen_Sonderzeichen sym:.uno:InsertSymbol +WL_TB_SC_Einfuegen_Grafik .uno:InsertGraphic +WL_TB_SC_Einfuegen_Sonderzeichen .uno:InsertSymbol ' ** ' ** Einfuegen Objekte im Calc -WL_TB_SC_OBJEKT_Diagramm sym:.uno:DrawChart -WL_TB_SC_OBJEKT_Image sym:.uno:InsertObjectStarImage -WL_TB_SC_OBJEKT_Formel sym:.uno:InsertObjectStarMath -WL_TB_SC_OBJEKT_Frame sym:.uno:InsertObjectFloatingFrame -WL_TB_SC_OBJEKT_Objekt sym:.uno:InsertObject -WL_TB_SC_OBJEKT_Plugin sym:.uno:InsertPlugin +WL_TB_SC_OBJEKT_Diagramm .uno:DrawChart +WL_TB_SC_OBJEKT_Image .uno:InsertObjectStarImage +WL_TB_SC_OBJEKT_Formel .uno:InsertObjectStarMath +WL_TB_SC_OBJEKT_Frame .uno:InsertObjectFloatingFrame +WL_TB_SC_OBJEKT_Objekt .uno:InsertObject +WL_TB_SC_OBJEKT_Plugin .uno:InsertPlugin ' ** ' ** Einfuegen Zellen im Calc -WL_TB_SC_Zellen_ZellenNachUnten sym:.uno:InsertCellsDown -WL_TB_SC_Zellen_ZellenNachRechts sym:.uno:InsertCellsRight -WL_TB_SC_Zellen_GanzeZeile sym:.uno:InsertRows -WL_TB_SC_Zellen_GanzeSpalte sym:.uno:InsertColumns +WL_TB_SC_Zellen_ZellenNachUnten .uno:InsertCellsDown +WL_TB_SC_Zellen_ZellenNachRechts .uno:InsertCellsRight +WL_TB_SC_Zellen_GanzeZeile .uno:InsertRows +WL_TB_SC_Zellen_GanzeSpalte .uno:InsertColumns ' ** ' ** Optionsleiste im Draw / Impress -Opl_SD_PunkteBearbeiten sym:.uno:ToggleObjectBezierMode -Opl_SD_KlebepunkteBearbeiten sym:.uno:GlueEditMode +Opl_SD_PunkteBearbeiten .uno:ToggleObjectBezierMode +Opl_SD_KlebepunkteBearbeiten .uno:GlueEditMode Opl_SD_EffekteZulassen .uno:AnimationObjects -Opl_SD_DrehmodusNachKlick sym:.uno:ClickChangeRotation -Opl_SD_RasterSichtbar sym:.uno:GridVisible -Opl_SD_FanglinieSichtbar sym:.uno:HelplinesVisible -Opl_SD_HilfslinienBeimVerschieben sym:.uno:HelplinesMove -Opl_SD_RasterBenutzen sym:.uno:GridUse -Opl_SD_FanglinieBenutzen sym:.uno:HelplinesUse -Opl_SD_FangenAnSeitenraendern sym:.uno:SnapBorder -Opl_SD_FangenAnObjektRahmen sym:.uno:SnapFrame -Opl_SD_FangenAnObjektpunkten sym:.uno:SnapPoints -Opl_SD_Schnellbearbeitung sym:.uno:QuickEdit -Opl_SD_NurTextbreichSelektieren sym:.uno:PickThrough -Opl_SD_TextBearbeitenBeiDoppelklick sym:.uno:DoubleClickTextEdit -Opl_SD_EinfacheHandles sym:.uno:HandlesDraft -Opl_SD_GrosseHandles sym:.uno:BigHandles -Opl_SD_ObjektMitAttributen sym:.uno:SolidCreate -Opl_SD_AlleGruppierungenVerlassen sym:.uno:ConnectorLinesCircles +Opl_SD_DrehmodusNachKlick .uno:ClickChangeRotation +Opl_SD_RasterSichtbar .uno:GridVisible +Opl_SD_FanglinieSichtbar .uno:HelplinesVisible +Opl_SD_HilfslinienBeimVerschieben .uno:HelplinesMove +Opl_SD_RasterBenutzen .uno:GridUse +Opl_SD_FanglinieBenutzen .uno:HelplinesUse +Opl_SD_FangenAnSeitenraendern .uno:SnapBorder +Opl_SD_FangenAnObjektRahmen .uno:SnapFrame +Opl_SD_FangenAnObjektpunkten .uno:SnapPoints +Opl_SD_Schnellbearbeitung .uno:QuickEdit +Opl_SD_NurTextbreichSelektieren .uno:PickThrough +Opl_SD_TextBearbeitenBeiDoppelklick .uno:DoubleClickTextEdit +Opl_SD_EinfacheHandles .uno:HandlesDraft +Opl_SD_GrosseHandles .uno:BigHandles +Opl_SD_ObjektMitAttributen .uno:SolidCreate +Opl_SD_AlleGruppierungenVerlassen .uno:ConnectorLinesCircles diff --git a/testautomation/global/sid/context.sid b/testautomation/global/sid/context.sid index 43ef943d96eb..72d6dba96cb1 100644 --- a/testautomation/global/sid/context.sid +++ b/testautomation/global/sid/context.sid @@ -5,14 +5,14 @@ ' Minimieren SID_WIN_MINIMIZED ' ** Kontextmenue Calc -ZeilenLoeschen sym:.uno:DeleteRows -SpaltenLoeschen sym:.uno:DeleteColumns -' AnhaengenTabelle sym:.uno:Add ' ist zur 541 rausgenommen worden -NotizAnzeigen sym:.uno:NoteVisible +ZeilenLoeschen .uno:DeleteRows +SpaltenLoeschen .uno:DeleteColumns +' AnhaengenTabelle .uno:Add ' ist zur 541 rausgenommen worden +NotizAnzeigen .uno:NoteVisible ' Kontextmenue: Tabelle Calc -AlleTabellenAuswaehlen sym:.uno:TableSelectAll -SetTabColor sym:.uno:SetTabBgColor +AlleTabellenAuswaehlen .uno:TableSelectAll +SetTabColor .uno:SetTabBgColor ' ** Kontextmenue im Gestalter/Stylist Stylist_Neu sym:SFX2_HID_STYLIST_NEW @@ -22,10 +22,10 @@ Stylist_Loeschen sym:SFX2_HID_STYLIST_DELETE 'Open ' ** Kontextmenue Objekte -Obj_Originalgroesse sym:.uno:OriginalSize +Obj_Originalgroesse .uno:OriginalSize ' ** Kontextmenue SeitenUmbruchvorschau Calc -Skalierungaufheben sym:.uno:ResetPrintZoom +Skalierungaufheben .uno:ResetPrintZoom ' ** Kontextmenue automatische Rechtschreibung pruefen ARP_Ersetzung sym:SW_HID_LINGU_REPLACE @@ -36,5 +36,5 @@ ARP_Autokorrektur sym:SW_HID_LINGU_AUTOCORR ' ** Kontextmenue IMPRESS/DRAW -VorlageBearbeiten sym:.uno:EditStyle -ContextOriginalSize sym:.uno:OriginalSize +VorlageBearbeiten .uno:EditStyle +ContextOriginalSize .uno:OriginalSize diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid index 21f075c44d69..c8dd82f72992 100644 --- a/testautomation/global/sid/e_all.sid +++ b/testautomation/global/sid/e_all.sid @@ -11,135 +11,135 @@ ' ********* File Menu ********* ' **** ' **** All applications -FileNewFromTemplate sym:.uno:NewDoc -FileOpen OpenFileSlot +FileNewFromTemplate .uno:NewDoc +FileOpen SID_OPENDOC FileAutopilotLetter service:com.sun.star.wizards.letter.CallWizard?start FileAutopilotFax service:com.sun.star.wizards.fax.CallWizard?start FileAutopilotAgenda service:com.sun.star.wizards.agenda.CallWizard?start -FileAutopilotPresentation sym:.uno:AutoPilotPresentations -FileAutopilotAddressDataSource sym:.uno:AutoPilotAddressDataSource +FileAutopilotPresentation .uno:AutoPilotPresentations +FileAutopilotAddressDataSource .uno:AutoPilotAddressDataSource FirstTimeWizard service:com.sun.star.comp.desktop.FirstStart?start FileWizardsWebPage service:com.sun.star.wizards.web.CallWizard?start -FileCloseAndReturn sym:.uno:CloseDoc -FileSaveCopy sym:.uno:SaveAs +FileCloseAndReturn .uno:CloseDoc +FileSaveCopy .uno:SaveAs FileClose .uno:CloseDoc -FileSave sym:.uno:Save -FileSaveAs sym:.uno:SaveAs -FileSaveAll sym:.uno:SaveAll -FileExport sym:.uno:ExportTo -FileExportAsPDF sym:.uno:ExportToPDF -FileSendDocumentAsEmail sym:.uno:SendMail -FileSendDocumentAsPDF sym:.uno:SendMailDocAsPDF -FileVersions sym:.uno:VersionDialog -FileReload sym:.uno:Reload SID_LASTVERSIONDOC -FileProperties sym:.uno:SetDocumentProperties -FileTemplatesOrganize sym:.uno:Organizer -FileTemplatesSave sym:.uno:SaveAsTemplate -FileTemplatesEdit sym:.uno:OpenTemplate -FileTemplatesAddressbookSource sym:.uno:AddressBookSource -FilePageView sym:.uno:PrintPreview -FilePrint sym:.uno:Print -FilePrintersettings sym:.uno:PrinterSetup -FileExit sym:.uno:Quit +FileSave .uno:Save +FileSaveAs .uno:SaveAs +FileSaveAll .uno:SaveAll +FileExport .uno:ExportTo +FileExportAsPDF .uno:ExportToPDF +FileSendDocumentAsEmail .uno:SendMail +FileSendDocumentAsPDF .uno:SendMailDocAsPDF +FileVersions .uno:VersionDialog +FileReload .uno:Reload SID_LASTVERSIONDOC +FileProperties .uno:SetDocumentProperties +FileTemplatesOrganize .uno:Organizer +FileTemplatesSave .uno:SaveAsTemplate +FileTemplatesEdit .uno:OpenTemplate +FileTemplatesAddressbookSource .uno:AddressBookSource +FilePageView .uno:PrintPreview +FilePrint .uno:Print +FilePrintersettings .uno:PrinterSetup +FileExit .uno:Quit ' **** Writer -FileSendOutlineToPresentation sym:.uno:SendOutlineToStarImpress -FileSendOutlineToClipboard sym:.uno:SendOutlineToClipboard -FileSendCreateAutoabstract sym:.uno:CreateAbstract -FileSendAutoabstractToPresentation sym:.uno:SendAbstractToStarImpress -FileSendCreateMasterdocument sym:.uno:NewGlobalDoc -FileSendCreateHTMLDocument sym:.uno:NewHtmlDoc +FileSendOutlineToPresentation .uno:SendOutlineToStarImpress +FileSendOutlineToClipboard .uno:SendOutlineToClipboard +FileSendCreateAutoabstract .uno:CreateAbstract +FileSendAutoabstractToPresentation .uno:SendAbstractToStarImpress +FileSendCreateMasterdocument .uno:NewGlobalDoc +FileSendCreateHTMLDocument .uno:NewHtmlDoc ' **** Impress / Draw -FilePack sym:.uno:PackAndGo +FilePack .uno:PackAndGo ' *********************************** ' ********* Edit Menu ********* ' **** ' **** All applications -EditUndo sym:.uno:Undo -EditRedo sym:.uno:Redo -EditRepeat sym:.uno:RepeatAction -EditCut sym:.uno:Cut +EditUndo .uno:Undo +EditRedo .uno:Redo +EditRepeat .uno:RepeatAction +EditCut .uno:Cut EditCopy .uno:Copy EditDoc .uno:EditDoc -EditPaste sym:.uno:Paste -EditDelete sym:.uno:Delete -EditSelectAll sym:.uno:SelectAll -EditSearchAndReplace sym:.uno:SearchDialog -EditPlugIn sym:.uno:PlugInsActive -EditImageMap sym:.uno:ImageMapDialog +EditPaste .uno:Paste +EditDelete .uno:Delete +EditSelectAll .uno:SelectAll +EditSearchAndReplace .uno:SearchDialog +EditPlugIn .uno:PlugInsActive +EditImageMap .uno:ImageMapDialog EditObjectEdit .uno:ObjectMenue?VerbID:short=0 EditObjectProperties .uno:ObjectMenue?VerbID:short=-7 EditObjectOpen .uno:ObjectMenue?VerbID:short=2 EditObjectSaveCopyAs .uno:ObjectMenue?VerbID:short=-8 ' **** Writer -EditAutotext sym:.uno:EditGlossary +EditAutotext .uno:EditGlossary EditPasteSpecialWriter .uno:PasteSpecial -EditChangesRecord sym:.uno:TrackChanges -EditChangesShow sym:.uno:ShowTrackedChanges -EditChangesAcceptOrReject sym:.uno:AcceptTrackedChanges -EditChangesComment sym:.uno:CommentChangeTracking -EditChangesMergeDocument sym:.uno:MergeDocuments -EditCompareDocument sym:.uno:CompareDocuments -EditChangesProtectTrace sym:.uno:ProtectTraceChangeMode -EditLinksWriter sym:.uno:LinkDialog -EditExchangeDatabase sym:.uno:ChangeDatabaseField -EditFields sym:.uno:FieldDialog -EditFootnote sym:.uno:EditFootnote -EditIndexEntry sym:.uno:IndexEntryDialog -EditBibliographyEntry sym:.uno:AuthoritiesEntryDialog -EditHyperlink sym:.uno:EditHyperlink +EditChangesRecord .uno:TrackChanges +EditChangesShow .uno:ShowTrackedChanges +EditChangesAcceptOrReject .uno:AcceptTrackedChanges +EditChangesComment .uno:CommentChangeTracking +EditChangesMergeDocument .uno:MergeDocuments +EditCompareDocument .uno:CompareDocuments +EditChangesProtectTrace .uno:ProtectTraceChangeMode +EditLinksWriter .uno:LinkDialog +EditExchangeDatabase .uno:ChangeDatabaseField +EditFields .uno:FieldDialog +EditFootnote .uno:EditFootnote +EditIndexEntry .uno:IndexEntryDialog +EditBibliographyEntry .uno:AuthoritiesEntryDialog +EditHyperlink .uno:EditHyperlink EditSelectionModeStandard .uno:SelectionModeDefault EditSelectionModeBlock .uno:SelectionModeBlock ' **** Calc EditPasteSpecialCalc .uno:PasteSpecial -EditChangesRecordCalc sym:.uno:TraceChangeMode -EditChangesProtectTraceCalc sym:.uno:ProtectTraceChangeMode -EditChangesCommentsCalc sym:.uno:CommentChange -EditChangesShowCalc sym:.uno:ShowChanges -EditChangesAcceptOrDiscardCalc sym:.uno:AcceptChanges -EditChangesDocumentMergeDocumentCalc sym:.uno:MergeDocuments -EditCompareDocumentCalc sym:.uno:CompareDocuments -EditLinksCalc sym:.uno:EditLinks -EditHeadersAndFooters sym:.uno:EditHeaderAndFooter -EditFillLeft sym:.uno:FillLeft -EditFillUp sym:.uno:FillUp -EditFillRight sym:.uno:FillRight -EditFillSeries sym:.uno:FillSeries -EditFillSheet sym:.uno:FillTable -EditFillDown sym:.uno:FillDown -EditDeleteContents sym:.uno:Delete -EditDeleteCells sym:.uno:DeleteCell -EditDeleteSheet sym:.uno:Remove -EditCopyMoveSheet sym:.uno:Move -EditSheetSelect sym:.uno:SelectTables -EditRemoveManualBreakColumnBreak sym:.uno:DeleteColumnbreak -EditRemoveManualBreakRowBreak sym:.uno:DeleteRowbreak +EditChangesRecordCalc .uno:TraceChangeMode +EditChangesProtectTraceCalc .uno:ProtectTraceChangeMode +EditChangesCommentsCalc .uno:CommentChange +EditChangesShowCalc .uno:ShowChanges +EditChangesAcceptOrDiscardCalc .uno:AcceptChanges +EditChangesDocumentMergeDocumentCalc .uno:MergeDocuments +EditCompareDocumentCalc .uno:CompareDocuments +EditLinksCalc .uno:EditLinks +EditHeadersAndFooters .uno:EditHeaderAndFooter +EditFillLeft .uno:FillLeft +EditFillUp .uno:FillUp +EditFillRight .uno:FillRight +EditFillSeries .uno:FillSeries +EditFillSheet .uno:FillTable +EditFillDown .uno:FillDown +EditDeleteContents .uno:Delete +EditDeleteCells .uno:DeleteCell +EditDeleteSheet .uno:Remove +EditCopyMoveSheet .uno:Move +EditSheetSelect .uno:SelectTables +EditRemoveManualBreakColumnBreak .uno:DeleteColumnbreak +EditRemoveManualBreakRowBreak .uno:DeleteRowbreak EditObjectSaveCopyAsCalc .uno:ObjectMenue?VerbID:short=-8 ' **** Draw / Impress EditPasteSpecial .uno:PasteSpecial -EditLinksDraw sym:.uno:ManageLinks -EditDuplicate sym:.uno:CopyObjects -EditCrossFading sym:.uno:Morphing -EditRenameSlide sym:.uno:RenamePage -EditDeleteSlide sym:.uno:DeletePage -InsertLayer sym:.uno:InsertLayer -EditDeleteLayer sym:.uno:DeleteLayer -EditLayerRename sym:.uno:RenameLayer -EditfieldsDraw sym:.uno:ModifyField -EditHyperlinkDraw sym:.uno:EditHyperlink -EditGluePoints sym:.uno:GlueEditMode +EditLinksDraw .uno:ManageLinks +EditDuplicate .uno:CopyObjects +EditCrossFading .uno:Morphing +EditRenameSlide .uno:RenamePage +EditDeleteSlide .uno:DeletePage +InsertLayer .uno:InsertLayer +EditDeleteLayer .uno:DeleteLayer +EditLayerRename .uno:RenameLayer +EditfieldsDraw .uno:ModifyField +EditHyperlinkDraw .uno:EditHyperlink +EditGluePoints .uno:GlueEditMode ' **** Chart / Math -EditSelectAllMath sym:.uno:Select -EditNextMarker sym:.uno:NextMark -EditPreviousMarker sym:.uno:PrevMark -EditNextError sym:.uno:NextError -EditPreviousError sym:.uno:PrevError +EditSelectAllMath .uno:Select +EditNextMarker .uno:NextMark +EditPreviousMarker .uno:PrevMark +EditNextError .uno:NextError +EditPreviousError .uno:PrevError EditChartData .uno:DiagramData EditDataRanges .uno:DataRanges @@ -147,15 +147,15 @@ EditDataRanges .uno:DataRanges ' ********* View Menu ********* ' **** ' **** All applications -ViewZoom sym:.uno:Zoom -ViewBeamer sym:.uno:Beamer +ViewZoom .uno:Zoom +ViewBeamer .uno:Beamer ViewDataSources .uno:ViewDataSourceBrowser ViewToolbarsHyperlinkbar .uno:InsertHyperlink ViewToolbarsConfigure .uno:ConfigureDialog -ViewToolbarsStatusbar sym:.uno:StatusBarVisible -ViewFullScreen sym:.uno:FullScreen -ViewCurrentDatabase sym:.uno:ViewDataSourceBrowser -ViewNavigator sym:.uno:Navigator +ViewToolbarsStatusbar .uno:StatusBarVisible +ViewFullScreen .uno:FullScreen +ViewCurrentDatabase .uno:ViewDataSourceBrowser +ViewNavigator .uno:Navigator ViewToolbarsThreeDSettings .uno:AvailableToolbars?Toolbar:string=extrusionobjectbar ViewToolbarsAlign .uno:AvailableToolbars?Toolbar:string=alignmentbar ViewToolbarsBasicShapes .uno:AvailableToolbars?Toolbar:string=basicshapes @@ -204,34 +204,34 @@ ViewToolbarsPreviewbar .uno:AvailableToolbars?Toolbar:string=previewbar ViewToolbarsDrawObjectbar .uno:AvailableToolbars?Toolbar:string=drawobjectbar ' **** Writer -ViewRuler sym:.uno:Ruler -ViewCurrentDatabaseWriter sym:.uno:ViewDataSourceBrowser -ViewTextBoundaries sym:.uno:ViewBounds -ViewFieldShadings sym:.uno:Marks -ViewFields sym:.uno:Fieldnames -ViewNonprintingCharacters sym:.uno:ControlCodes -ViewOnlineLayout sym:.uno:BrowseView -ViewHiddenParagraphs sym:.uno:ShowHiddenParagraphs -ViewInputMethodStatus sym:.uno:ShowImeStatusWindow +ViewRuler .uno:Ruler +ViewCurrentDatabaseWriter .uno:ViewDataSourceBrowser +ViewTextBoundaries .uno:ViewBounds +ViewFieldShadings .uno:Marks +ViewFields .uno:Fieldnames +ViewNonprintingCharacters .uno:ControlCodes +ViewOnlineLayout .uno:BrowseView +ViewHiddenParagraphs .uno:ShowHiddenParagraphs +ViewInputMethodStatus .uno:ShowImeStatusWindow ' **** Calc ViewToolbarsFormulaBar .uno:InputLineVisible -ViewColumnAndRowHeaders sym:.uno:ViewRowColumnHeaders -ViewValueHightlighting sym:.uno:ViewValueHighlighting +ViewColumnAndRowHeaders .uno:ViewRowColumnHeaders +ViewValueHightlighting .uno:ViewValueHighlighting ViewNormalView .uno:NormalViewMode ViewPageBreakPreview .uno:PagebreakMode -ViewCurrentDatabaseCalc sym:.uno:ViewDataSourceBrowser +ViewCurrentDatabaseCalc .uno:ViewDataSourceBrowser ViewSelectionCalc .uno:Toolbox ' **** Draw / Impress -ViewBackground sym:.uno:MasterPage -ViewDrawing sym:.uno:SlideMasterPage -ViewGridVisible sym:.uno:GridVisible -ViewGridUse sym:.uno:GridUse -ViewGridFront sym:.uno:GridFront +ViewBackground .uno:MasterPage +ViewDrawing .uno:SlideMasterPage +ViewGridVisible .uno:GridVisible +ViewGridUse .uno:GridUse +ViewGridFront .uno:GridFront ViewHandout .uno:HandoutMode -ViewHeaderAndFooter sym:.uno:HeaderAndFooter -ViewLayer sym:.uno:LayerMode +ViewHeaderAndFooter .uno:HeaderAndFooter +ViewLayer .uno:LayerMode ViewLayerButton sym:SD_HID_SD_BTN_LAYER 59781 ViewMasterPage .uno:MasterPage ViewMasterButton .uno:MasterPageMenu @@ -239,53 +239,53 @@ ViewNormal .uno:NormalMultiPaneGUI ViewNotes .uno:NotesMode ViewOutline .uno:OutlineMode ViewPagePane .uno:LeftPaneDraw -ViewPreview sym:.uno:PreviewWindow +ViewPreview .uno:PreviewWindow ViewPreviewWindow .uno:PreviewWindow -ViewQualityColour sym:.uno:OutputQualityColor -ViewQualityGreyscale sym:.uno:OutputQualityGrayscale -ViewQualityBlackWhite sym:.uno:OutputQualityBlackWhite +ViewQualityColour .uno:OutputQualityColor +ViewQualityGreyscale .uno:OutputQualityGrayscale +ViewQualityBlackWhite .uno:OutputQualityBlackWhite ViewRightPane .uno:RightPane -ViewRulers sym:.uno:ShowRuler +ViewRulers .uno:ShowRuler ViewSlideShow .uno:Presentation ViewSlideSorter .uno:DiaMode -ViewSlide sym:.uno:PageMode +ViewSlide .uno:PageMode ViewSlideButton sym:SD_HID_SD_BTN_PAGE 59779 -ViewSnapLinesVisible sym:.uno:HelplinesVisible -ViewSnapLinesUse sym:.uno:HelplinesUse -ViewSnapLinesFront sym:.uno:HelplinesFront +ViewSnapLinesVisible .uno:HelplinesVisible +ViewSnapLinesUse .uno:HelplinesUse +ViewSnapLinesFront .uno:HelplinesFront ViewStatusBarVisible .uno:StatusBarVisible ViewShowImeStatusWindow .uno:ShowImeStatusWindow ViewShowRuler .uno:ShowRuler ViewTaskPane .uno:TaskPane ViewTaskSlide .uno:LeftPaneImpress -ViewTitle sym:.uno:TitleMasterPage +ViewTitle .uno:TitleMasterPage ViewToolbarsOptionbar .uno:AvailableToolbars?Toolbar:string=optionsbar ViewToolbarsColorBar .uno:ColorControl -ViewWorkspaceDrawingView sym:.uno:DrawingMode -ViewWorkspaceOutlineView sym:.uno:OutlineMode -ViewWorkspaceSlidesView sym:.uno:DiaMode -ViewWorkspaceNotesView sym:.uno:NotesMode -ViewWorkspaceHandoutView sym:.uno:HandoutMode +ViewWorkspaceDrawingView .uno:DrawingMode +ViewWorkspaceOutlineView .uno:OutlineMode +ViewWorkspaceSlidesView .uno:DiaMode +ViewWorkspaceNotesView .uno:NotesMode +ViewWorkspaceHandoutView .uno:HandoutMode ' **** Math -ViewAutoUpdateDisplay sym:.uno:RedrawAutomatic -ViewSelection sym:.uno:ToolBox -ViewZoomIn sym:.uno:ZoomIn -ViewZoomAll sym:.uno:ZoomOut -ViewShowAll sym:.uno:Adjust -ViewUpdate sym:.uno:Draw +ViewAutoUpdateDisplay .uno:RedrawAutomatic +ViewSelection .uno:ToolBox +ViewZoomIn .uno:ZoomIn +ViewZoomAll .uno:ZoomOut +ViewShowAll .uno:Adjust +ViewUpdate .uno:Draw ' **** WriterWeb -ViewPrintLayout sym:.uno:PrintLayout -ViewHTMLSource sym:.uno:SourceView +ViewPrintLayout .uno:PrintLayout +ViewHTMLSource .uno:SourceView ' *********************************** ' ********* Insert Menu ********** ' **** ' **** All applications -InsertGraphics sym:.uno:InsertGraphic +InsertGraphics .uno:InsertGraphic InsertChart .uno:InsertObjectChart -InsertGraphicsFromFile sym:.uno:InsertGraphic +InsertGraphicsFromFile .uno:InsertGraphic InsertMovieAndSound .uno:InsertAVMedia InsertFloatingFrame .uno:InsertObjectFloatingFrame InsertObjectOLEObject .uno:InsertObject @@ -304,58 +304,58 @@ InsertLRM .uno:InsertLRM InsertRLM .uno:InsertLRM ' **** Writer -InsertManualBreak sym:.uno:InsertBreak +InsertManualBreak .uno:InsertBreak InsertSpecialCharacterWriter .uno:InsertSymbol -InsertObjectFormulaWriter sym:.uno:InsertObjectStarMath -InsertTableWriter sym:.uno:InsertTable -InsertFileWriter sym:.uno:InsertDoc -InsertFieldsDate sym:.uno:InsertDateField -InsertFieldsTime sym:.uno:InsertTimeField -InsertFieldsPageNumbers sym:.uno:InsertPageNumberField -InsertFieldsPageCount sym:.uno:InsertPageCountField -InsertFieldsSubject sym:.uno:InsertTopicField -InsertFieldsTitle sym:.uno:InsertTitleField -InsertFieldsAuthor sym:.uno:InsertAuthorField -InsertFieldsOther sym:.uno:InsertField -InsertHeader sym:.uno:InsertPageHeader -InsertFooter sym:.uno:InsertPageFooter -InsertSection sym:.uno:InsertSection -InsertHyperlink sym:.uno:HyperlinkDialog -InsertFootnote sym:.uno:InsertFootnoteDialog -InsertCaption sym:.uno:InsertCaptionDialog -InsertBookmark sym:.uno:InsertBookmark -InsertReferenceField sym:.uno:InsertReferenceField -InsertNoteWriter sym:.uno:InsertAnnotation -InsertScript sym:.uno:InsertScript -InsertIndexes sym:.uno:InsertMultiIndex -InsertIndexesEntry sym:.uno:InsertIndexesEntry -InsertIndexesBibliographyEntry sym:.uno:InsertAuthoritiesEntry -InsertEnvelope sym:.uno:InsertEnvelope -InsertHorizontalLine sym:.uno:InsertGraphicRuler -InsertFrame sym:.uno:InsertFrame -InsertGraphicsScanSelectSource sym:.uno:TwainSelect -InsertGraphicsScanRequest sym:.uno:TwainTransfer +InsertObjectFormulaWriter .uno:InsertObjectStarMath +InsertTableWriter .uno:InsertTable +InsertFileWriter .uno:InsertDoc +InsertFieldsDate .uno:InsertDateField +InsertFieldsTime .uno:InsertTimeField +InsertFieldsPageNumbers .uno:InsertPageNumberField +InsertFieldsPageCount .uno:InsertPageCountField +InsertFieldsSubject .uno:InsertTopicField +InsertFieldsTitle .uno:InsertTitleField +InsertFieldsAuthor .uno:InsertAuthorField +InsertFieldsOther .uno:InsertField +InsertHeader .uno:InsertPageHeader +InsertFooter .uno:InsertPageFooter +InsertSection .uno:InsertSection +InsertHyperlink .uno:HyperlinkDialog +InsertFootnote .uno:InsertFootnoteDialog +InsertCaption .uno:InsertCaptionDialog +InsertBookmark .uno:InsertBookmark +InsertReferenceField .uno:InsertReferenceField +InsertNoteWriter .uno:InsertAnnotation +InsertScript .uno:InsertScript +InsertIndexes .uno:InsertMultiIndex +InsertIndexesEntry .uno:InsertIndexesEntry +InsertIndexesBibliographyEntry .uno:InsertAuthoritiesEntry +InsertEnvelope .uno:InsertEnvelope +InsertHorizontalLine .uno:InsertGraphicRuler +InsertFrame .uno:InsertFrame +InsertGraphicsScanSelectSource .uno:TwainSelect +InsertGraphicsScanRequest .uno:TwainTransfer ' **** Calc -InsertSpecialCharacterCalc sym:.uno:InsertSymbol -InsertGraphicsFromImageEditorCalc sym:.uno:InsertObjectStarImage +InsertSpecialCharacterCalc .uno:InsertSymbol +InsertGraphicsFromImageEditorCalc .uno:InsertObjectStarImage InsertChartCalc .uno:InsertObjectChart -InsertObjectFormulaCalc sym:.uno:InsertObjectStarMath -InsertSheetCalc sym:.uno:Insert -InsertManuelBreakColumnBreak sym:.uno:InsertColumnBreak -InsertManuelBreakRowBreak sym:.uno:InsertRowBreak -InsertCells sym:.uno:InsertCell -InsertRowsCalc sym:.uno:InsertRows -InsertColumnsCalc sym:.uno:InsertColumns -InsertFunction sym:.uno:FunctionDialog -InsertFunctionList sym:.uno:FunctionBox -InsertNamesInsert sym:.uno:InsertName -InsertNamesDefine sym:.uno:DefineName -InsertNameCreate sym:.uno:CreateNames -InsertNamesLabels sym:.uno:DefineLabelRange -InsertNoteCalc sym:.uno:InsertAnnotation -InsertLinkToExternalData sym:.uno:InsertExternalDataSource -InsertSheetFromFile sym:.uno:InsertSheetFromFile +InsertObjectFormulaCalc .uno:InsertObjectStarMath +InsertSheetCalc .uno:Insert +InsertManuelBreakColumnBreak .uno:InsertColumnBreak +InsertManuelBreakRowBreak .uno:InsertRowBreak +InsertCells .uno:InsertCell +InsertRowsCalc .uno:InsertRows +InsertColumnsCalc .uno:InsertColumns +InsertFunction .uno:FunctionDialog +InsertFunctionList .uno:FunctionBox +InsertNamesInsert .uno:InsertName +InsertNamesDefine .uno:DefineName +InsertNameCreate .uno:CreateNames +InsertNamesLabels .uno:DefineLabelRange +InsertNoteCalc .uno:InsertAnnotation +InsertLinkToExternalData .uno:InsertExternalDataSource +InsertSheetFromFile .uno:InsertSheetFromFile ' **** Draw InsertPage .uno:InsertPage @@ -364,32 +364,32 @@ InsertBullet .uno:InsertSymbol InsertCapturePoint .uno:CapturePoint InsertDuplicatePage .uno:DuplicatePage InsertSpecialCharacterDraw .uno:InsertSymbol -InsertGraficsDraw sym:.uno:InsertImage +InsertGraficsDraw .uno:InsertImage InsertGraphicMenu .uno:GraphicMenu -InsertObjectFormulaDraw sym:.uno:InsertMath +InsertObjectFormulaDraw .uno:InsertMath InsertObjectMenu .uno:ObjectMenu InsertImportFromFile .uno:ImportFromFile InsertSpreadsheet .uno:InsertSpreadsheet -InsertSpreadsheetDraw sym:.uno:InsertSpreadsheet -InsertFileDraw sym:.uno:ImportFromFile -InsertSlide sym:.uno:InsertPage -InsertDuplicateSlide sym:.uno:DuplicatePage -InsertExpandSlide sym:.uno:ExpandPage -InsertSummerySlide sym:.uno:SummaryPage -InsertFieldsDateFix sym:.uno:InsertDateFieldFix -InsertFieldsDateVariable sym:.uno:InsertDateFieldVar +InsertSpreadsheetDraw .uno:InsertSpreadsheet +InsertFileDraw .uno:ImportFromFile +InsertSlide .uno:InsertPage +InsertDuplicateSlide .uno:DuplicatePage +InsertExpandSlide .uno:ExpandPage +InsertSummerySlide .uno:SummaryPage +InsertFieldsDateFix .uno:InsertDateFieldFix +InsertFieldsDateVariable .uno:InsertDateFieldVar InsertFieldMenu .uno:FieldMenu -InsertFieldsTimeFix sym:.uno:InsertTimeFieldFix -InsertFieldsTimeVariable sym:.uno:InsertTimeFieldVar -InsertFieldsAuthorDraw sym:.uno:InsertAuthorField -InsertFieldsPageNumberDraw sym:.uno:InsertPageField +InsertFieldsTimeFix .uno:InsertTimeFieldFix +InsertFieldsTimeVariable .uno:InsertTimeFieldVar +InsertFieldsAuthorDraw .uno:InsertAuthorField +InsertFieldsPageNumberDraw .uno:InsertPageField InsertFieldsPageCountDraw .uno:InsertPagesField -InsertFieldsFileName sym:.uno:InsertFileField +InsertFieldsFileName .uno:InsertFileField InsertHyperlinkDialog .uno:HyperlinkDialog -InsertScanSelectSource sym:.uno:TwainSelect -InsertScanRequest sym:.uno:TwainTransfer -InsertSymbol sym:.uno:ChoosePolygon -InsertSnapPointLine sym:.uno:CapturePoint +InsertScanSelectSource .uno:TwainSelect +InsertScanRequest .uno:TwainTransfer +InsertSymbol .uno:ChoosePolygon +InsertSnapPointLine .uno:CapturePoint ' **** Chart InsertTitle .uno:InsertMenuTitles @@ -405,15 +405,15 @@ InsertYErrorBars .uno:InsertMenuYErrorBars ' *********** Format Menu *********** ' **** ' **** All applications -FormatCharacter sym:.uno:FontDialog -FormatLine sym:.uno:FormatLine -FormatArea sym:.uno:FormatArea -FormatParagraph sym:.uno:ParagraphDialog -FormatStylesCatalog sym:.uno:StyleCatalog -FormatStylesLoad sym:.uno:LoadStyles -FormatStylist sym:.uno:DesignerDialog -FormatControl sym:.uno:ControlProperties -FormatForm sym:.uno:FormProperties +FormatCharacter .uno:FontDialog +FormatLine .uno:FormatLine +FormatArea .uno:FormatArea +FormatParagraph .uno:ParagraphDialog +FormatStylesCatalog .uno:StyleCatalog +FormatStylesLoad .uno:LoadStyles +FormatStylist .uno:DesignerDialog +FormatControl .uno:ControlProperties +FormatForm .uno:FormProperties FormatChangeCaseToSentence .uno:ChangeCaseToSentenceCase FormatChangeCaseCapitalizeEveryWord .uno:ChangeCaseToTitleCase FormatChangeCaseToggleCase .uno:ChangeCaseToToggleCase @@ -426,143 +426,143 @@ FormatChangeCaseKatagana .uno:ChangeCaseToKatakana ' **** Writer FormatDefaultWriter .uno:ResetAttributes -FormatPageWriter sym:.uno:PageDialog -FormatSections sym:.uno:EditRegion -FormatNumberingBullets sym:.uno:BulletsAndNumberingDialog +FormatPageWriter .uno:PageDialog +FormatSections .uno:EditRegion +FormatNumberingBullets .uno:BulletsAndNumberingDialog FormatAutoformatWhileTyping .uno:OnlineAutoFormat FormatAutoformatApply .uno:AutoFormatApply FormatAutoFormatApplyAndEditChanges .uno:AutoFormatRedlineApply -FormatTable sym:.uno:TableDialog -FormatSplitTable sym:.uno:SplitTable -FormatMergeTables sym:.uno:MergeTable -FormatTextWriter sym:.uno:TextAttributes -FormatNumberFormat sym:.uno:TableNumberFormatDialog -FormatRowHeight sym:.uno:SetRowHeight -FormatRowOptimalHeight sym:.uno:SetOptimalRowHeight -FormatRowSpaceEqually sym:.uno:DistributeRows -FormatRowSelect sym:.uno:EntireRow -FormatRowInsert sym:.uno:InsertRowDialog -FormatRowDelete sym:.uno:DeleteRows -FormatRuby sym:.uno:RubyDialog -FormatColumns sym:.uno:FormatColumns -FormatColumnWidthWriter sym:.uno:SetColumnWidth -FormatColumnOptimalWidthWriter sym:.uno:SetOptimalColumnWidth -FormatColumnSpaceEqually sym:.uno:DistributeColumns -FormatColumnInsert sym:.uno:InsertColumnDialog -FormatGraphics sym:.uno:GraphicDialog -FormatFrame sym:.uno:FrameDialog -FormatObject sym:.uno:FrameDialog -FormatArrangeBringToFront sym:.uno:BringToFront -FormatArrangeBringForward sym:.uno:ObjectForwardOne -FormatArrangeSetBackward sym:.uno:ObjectBackOne -FormatArrangeSendToBack sym:.uno:SendToBack -FormatArrangeToForeground sym:.uno:SetObjectToForeground -FormatArrangeToBackground sym:.uno:SetObjectToBackground -FormatAlignmentLeft sym:.uno:AlignLeft -FormatAlignmentCentered sym:.uno:AlignHorizontalCenter -FormatAlignmentRight sym:.uno:AlignRight -FormatAlignmentTop sym:.uno:AlignTop -FormatAlignmentCenter sym:.uno:AlignVerticalCenter -FormatAlignmentBottom sym:.uno:AlignBottom -FormatAnchorToPage sym:.uno:SetAnchorToPage -FormatAnchorToParagraph sym:.uno:SetAnchorToPara -FormatAnchorAsCharacter sym:.uno:SetAnchorToChar -FormatAnchorToCharacter sym:.uno:SetAnchorAtChar -FormatAnchorToFrame sym:.uno:SetAnchorToFrame -FormatWrapNoWrap sym:.uno:WrapOff -FormatWrapPageWrap sym:.uno:WrapOn -FormatWrapOptimalPageWrap sym:.uno:WrapIdeal -FormatWrapThrough sym:.uno:WrapThrough -FormatWrapInBackground sym:.uno:WrapThroughTransparent -FormatWrapContour sym:.uno:WrapContour -FormatWrapEditContour sym:.uno:ContourDialog -FormatWrapFirstParagraph sym:.uno:WrapAnchorOnly -FormatWrapEdit sym:.uno:TextWrap +FormatTable .uno:TableDialog +FormatSplitTable .uno:SplitTable +FormatMergeTables .uno:MergeTable +FormatTextWriter .uno:TextAttributes +FormatNumberFormat .uno:TableNumberFormatDialog +FormatRowHeight .uno:SetRowHeight +FormatRowOptimalHeight .uno:SetOptimalRowHeight +FormatRowSpaceEqually .uno:DistributeRows +FormatRowSelect .uno:EntireRow +FormatRowInsert .uno:InsertRowDialog +FormatRowDelete .uno:DeleteRows +FormatRuby .uno:RubyDialog +FormatColumns .uno:FormatColumns +FormatColumnWidthWriter .uno:SetColumnWidth +FormatColumnOptimalWidthWriter .uno:SetOptimalColumnWidth +FormatColumnSpaceEqually .uno:DistributeColumns +FormatColumnInsert .uno:InsertColumnDialog +FormatGraphics .uno:GraphicDialog +FormatFrame .uno:FrameDialog +FormatObject .uno:FrameDialog +FormatArrangeBringToFront .uno:BringToFront +FormatArrangeBringForward .uno:ObjectForwardOne +FormatArrangeSetBackward .uno:ObjectBackOne +FormatArrangeSendToBack .uno:SendToBack +FormatArrangeToForeground .uno:SetObjectToForeground +FormatArrangeToBackground .uno:SetObjectToBackground +FormatAlignmentLeft .uno:AlignLeft +FormatAlignmentCentered .uno:AlignHorizontalCenter +FormatAlignmentRight .uno:AlignRight +FormatAlignmentTop .uno:AlignTop +FormatAlignmentCenter .uno:AlignVerticalCenter +FormatAlignmentBottom .uno:AlignBottom +FormatAnchorToPage .uno:SetAnchorToPage +FormatAnchorToParagraph .uno:SetAnchorToPara +FormatAnchorAsCharacter .uno:SetAnchorToChar +FormatAnchorToCharacter .uno:SetAnchorAtChar +FormatAnchorToFrame .uno:SetAnchorToFrame +FormatWrapNoWrap .uno:WrapOff +FormatWrapPageWrap .uno:WrapOn +FormatWrapOptimalPageWrap .uno:WrapIdeal +FormatWrapThrough .uno:WrapThrough +FormatWrapInBackground .uno:WrapThroughTransparent +FormatWrapContour .uno:WrapContour +FormatWrapEditContour .uno:ContourDialog +FormatWrapFirstParagraph .uno:WrapAnchorOnly +FormatWrapEdit .uno:TextWrap FormatNameObject .uno:NameGroup -FormatPositionAndSize sym:.uno:TransformDialog -FormatFlipVertically sym:.uno:FlipVertical -FormatFlipHorizontally sym:.uno:FlipHorizontal -FormatObjectAlignmentLeft sym:.uno:ObjectAlignLeft -FormatObjectAlignmentCentered sym:.uno:AlignCenter -FormatObjectAlignmentRight sym:.uno:ObjectAlignRight -FormatObjectAlignmentTop sym:.uno:AlignUp -FormatObjectAlignmentCenter sym:.uno:AlignMiddle -FormatObjectAlignmentBottom sym:.uno:AlignDown -FormatEditPoints sym:.uno:ToggleObjectBezierMode -FormatFontWork sym:.uno:FontWork -FormatGroupGroup sym:.uno:FormatGroup -FormatGroupUngroup sym:.uno:FormatUngroup -FormatGroupEditGroup sym:.uno:EnterGroup -FormatGroupExitGroup sym:.uno:LeaveGroup -FormatStyleBold sym:.uno:Bold -FormatStyleItalic sym:.uno:Italic -FormatStyleUnderline sym:.uno:Underline -FormatStyleStrikeThrough sym:.uno:Strikeout -FormatStyleShadow sym:.uno:Shadowed -FormatStyleOutline sym:.uno:OutlineFont -FormatStyleSuperscript sym:.uno:SuperScript -FormatStyleSubscript sym:.uno:SubScript -FormatLineSpacingSingleLine sym:.uno:SpacePara1 -FormatLineSpacing15Lines sym:.uno:SpacePara15 -FormatLineSpacingDouble sym:.uno:SpacePara2 -FormatAlignmentLeftText sym:.uno:LeftPara -FormatAlignmentRightText sym:.uno:RightPara -FormatAlignmentCenteredText sym:.uno:CenterPara -FormatAlignmentJustifiedText sym:.uno:JustifyPara -FormatReplaceWithTextBox sym:.uno:ConvertToEdit -FormatReplaceWithLabelField sym:.uno:ConvertToFixed -FormatReplaceWithListbox sym:.uno:ConvertToList -FormatReplaceWithCheckbox sym:.uno:ConvertToCheckBox -FormatReplaceWithRadiobutton sym:.uno:ConvertToRadio -FormatReplaceWithGroupbox sym:.uno:ConvertToGroup -FormatReplaceWithCombobox sym:.uno:ConvertToCombo -FormatReplaceWithImageButton sym:.uno:ConvertToImageBtn -FormatReplaceWithFileSelection sym:.uno:ConvertToFileControl -FormatReplaceWithDateField sym:.uno:ConvertToDate -FormatReplaceWithTimeField sym:.uno:ConvertToTime -FormatReplaceWithNumericalField sym:.uno:ConvertToNumeric -FormatReplaceWithCurrencyField sym:.uno:ConvertToCurrency -FormatReplaceWithPatternField sym:.uno:ConvertToPattern -FormatReplaceWithImageControl sym:.uno:ConvertToImageControl -FormatReplaceWithFormattedField sym:.uno:ConvertToFormatted -FormatReplaceWithScrollbar sym:.uno:ConvertToScrollBar -FormatReplaceWithSpinbutton sym:.uno:ConvertToSpinButton +FormatPositionAndSize .uno:TransformDialog +FormatFlipVertically .uno:FlipVertical +FormatFlipHorizontally .uno:FlipHorizontal +FormatObjectAlignmentLeft .uno:ObjectAlignLeft +FormatObjectAlignmentCentered .uno:AlignCenter +FormatObjectAlignmentRight .uno:ObjectAlignRight +FormatObjectAlignmentTop .uno:AlignUp +FormatObjectAlignmentCenter .uno:AlignMiddle +FormatObjectAlignmentBottom .uno:AlignDown +FormatEditPoints .uno:ToggleObjectBezierMode +FormatFontWork .uno:FontWork +FormatGroupGroup .uno:FormatGroup +FormatGroupUngroup .uno:FormatUngroup +FormatGroupEditGroup .uno:EnterGroup +FormatGroupExitGroup .uno:LeaveGroup +FormatStyleBold .uno:Bold +FormatStyleItalic .uno:Italic +FormatStyleUnderline .uno:Underline +FormatStyleStrikeThrough .uno:Strikeout +FormatStyleShadow .uno:Shadowed +FormatStyleOutline .uno:OutlineFont +FormatStyleSuperscript .uno:SuperScript +FormatStyleSubscript .uno:SubScript +FormatLineSpacingSingleLine .uno:SpacePara1 +FormatLineSpacing15Lines .uno:SpacePara15 +FormatLineSpacingDouble .uno:SpacePara2 +FormatAlignmentLeftText .uno:LeftPara +FormatAlignmentRightText .uno:RightPara +FormatAlignmentCenteredText .uno:CenterPara +FormatAlignmentJustifiedText .uno:JustifyPara +FormatReplaceWithTextBox .uno:ConvertToEdit +FormatReplaceWithLabelField .uno:ConvertToFixed +FormatReplaceWithListbox .uno:ConvertToList +FormatReplaceWithCheckbox .uno:ConvertToCheckBox +FormatReplaceWithRadiobutton .uno:ConvertToRadio +FormatReplaceWithGroupbox .uno:ConvertToGroup +FormatReplaceWithCombobox .uno:ConvertToCombo +FormatReplaceWithImageButton .uno:ConvertToImageBtn +FormatReplaceWithFileSelection .uno:ConvertToFileControl +FormatReplaceWithDateField .uno:ConvertToDate +FormatReplaceWithTimeField .uno:ConvertToTime +FormatReplaceWithNumericalField .uno:ConvertToNumeric +FormatReplaceWithCurrencyField .uno:ConvertToCurrency +FormatReplaceWithPatternField .uno:ConvertToPattern +FormatReplaceWithImageControl .uno:ConvertToImageControl +FormatReplaceWithFormattedField .uno:ConvertToFormatted +FormatReplaceWithScrollbar .uno:ConvertToScrollBar +FormatReplaceWithSpinbutton .uno:ConvertToSpinButton ' Formatmenue : Calc -FormatDefaultCalc sym:.uno:ResetAttributes -FormatTextCalc sym:.uno:TextAttributes -FormatPageCalc sym:.uno:PageFormatDialog -FormatCells sym:.uno:FormatCellDialog -FormatRowHide sym:.uno:HideRow -FormatRowShow sym:.uno:ShowRow -FormatRowHeightCalc sym:.uno:RowHeight -FormatRowOptimalHeightCalc sym:.uno:SetOptimalRowHeight -FormatColumnHide sym:.uno:HideColumn -FormatColumnWidthCalc sym:.uno:ColumnWidth -FormatColumnShow sym:.uno:ShowColumn -FormatColumnOptimalWidthCalc sym:.uno:SetOptimalColumnWidth -FormatSheetHide sym:.uno:Hide -FormatSheetShow sym:.uno:Show -FormatSheetRename sym:.uno:RenameTable sym:.uno:Name +FormatDefaultCalc .uno:ResetAttributes +FormatTextCalc .uno:TextAttributes +FormatPageCalc .uno:PageFormatDialog +FormatCells .uno:FormatCellDialog +FormatRowHide .uno:HideRow +FormatRowShow .uno:ShowRow +FormatRowHeightCalc .uno:RowHeight +FormatRowOptimalHeightCalc .uno:SetOptimalRowHeight +FormatColumnHide .uno:HideColumn +FormatColumnWidthCalc .uno:ColumnWidth +FormatColumnShow .uno:ShowColumn +FormatColumnOptimalWidthCalc .uno:SetOptimalColumnWidth +FormatSheetHide .uno:Hide +FormatSheetShow .uno:Show +FormatSheetRename .uno:RenameTable .uno:Name FormatSheetRightToLeft .uno:SheetRightToLeft FormatSheetTabColor .uno:SetTabBgColor FormatMergeCells .uno:ToggleMergeCells -FormatPrintRangesRemove sym:.uno:DeletePrintArea -FormatPrintRangesEdit sym:.uno:EditPrintArea -FormatPrintRangesDefine sym:.uno:DefinePrintArea -FormatPrintRangesAdd sym:.uno:AddPrintArea +FormatPrintRangesRemove .uno:DeletePrintArea +FormatPrintRangesEdit .uno:EditPrintArea +FormatPrintRangesDefine .uno:DefinePrintArea +FormatPrintRangesAdd .uno:AddPrintArea FormatAutoformat .uno:AutoFormat -FormatConditionalFormatting sym:.uno:ConditionalFormatDialog -FormatAnchorToPageCalc sym:.uno:SetAnchorToPage -FormatAnchorToCell sym:.uno:SetAnchorToCell -FormatFlipVerticallyCalc sym:.uno:ObjectMirrorVertical -FormatFlipHorizontalCalc sym:.uno:ObjectMirrorHorizontal -FormatArrangeBringToFrontCalc sym:.uno:BringToFront -FormatArrangeBringForwardCalc sym:.uno:ObjectForwardOne -FormatArrangeSendBackwardCalc sym:.uno:ObjectBackOne -FormatArrangeSendToBackCalc sym:.uno:SendToBack -FormatArrangeToBackgroundCalc sym:.uno:SetObjectToBackground -FormatArrangeToForegroundCalc sym:.uno:SetObjectToForeground +FormatConditionalFormatting .uno:ConditionalFormatDialog +FormatAnchorToPageCalc .uno:SetAnchorToPage +FormatAnchorToCell .uno:SetAnchorToCell +FormatFlipVerticallyCalc .uno:ObjectMirrorVertical +FormatFlipHorizontalCalc .uno:ObjectMirrorHorizontal +FormatArrangeBringToFrontCalc .uno:BringToFront +FormatArrangeBringForwardCalc .uno:ObjectForwardOne +FormatArrangeSendBackwardCalc .uno:ObjectBackOne +FormatArrangeSendToBackCalc .uno:SendToBack +FormatArrangeToBackgroundCalc .uno:SetObjectToBackground +FormatArrangeToForegroundCalc .uno:SetObjectToForeground FormatAlignmentHorizontalDefaultCalc .uno:CommonAlignHorizontalDefault FormatAlignmentLeftCalc .uno:CommonAlignLeft FormatAlignmentHorizontalCenterCalc .uno:CommonAlignHorizontalCenter @@ -571,45 +571,45 @@ FormatAlignmentJustifiedCalc .uno:CommonAlignJustified FormatAlignmentTopCalc .uno:CommonAlignTop FormatAlignmentverticalCenterCalc .uno:CommonAlignVerticalCenter FormatAlignmentBottomCalc .uno:CommonAlignBottom -FormatAlignmentObjectLeftCalc sym:.uno:ObjectAlignLeft -FormatAlignmentObjectCenteredCalc sym:.uno:AlignCenter -FormatAlignmentObjectRightCalc sym:.uno:ObjectAlignRight -FormatAlignmentObjectTopCalc sym:.uno:AlignUp -FormatAlignmentObjectCenterCalc sym:.uno:AlignMiddle -FormatAlignmentObjectBottomCalc sym:.uno:AlignDown -FormatGroupGroupCalc sym:.uno:FormatGroup -FormatGroupUngroupCalc sym:.uno:FormatUngroup -FormatGroupEditGroupCalc sym:.uno:EnterGroup -FormatGroupExitGroupCalc sym:.uno:LeaveGroup +FormatAlignmentObjectLeftCalc .uno:ObjectAlignLeft +FormatAlignmentObjectCenteredCalc .uno:AlignCenter +FormatAlignmentObjectRightCalc .uno:ObjectAlignRight +FormatAlignmentObjectTopCalc .uno:AlignUp +FormatAlignmentObjectCenterCalc .uno:AlignMiddle +FormatAlignmentObjectBottomCalc .uno:AlignDown +FormatGroupGroupCalc .uno:FormatGroup +FormatGroupUngroupCalc .uno:FormatUngroup +FormatGroupEditGroupCalc .uno:EnterGroup +FormatGroupExitGroupCalc .uno:LeaveGroup FormatPointsCalc .uno:ToggleObjectBezierMode ' **** Draw / Impress -Format3D_Effects sym:.uno:Window3D +Format3D_Effects .uno:Window3D FormatBullet .uno:OutlineBullet -FormatEditGroupDraw sym:.uno:EnterGroup -FormatExitGroupDraw sym:.uno:LeaveGroup +FormatEditGroupDraw .uno:EnterGroup +FormatExitGroupDraw .uno:LeaveGroup FormatDefaultFormatting .uno:SetDefault -FormatDimensioning sym:.uno:MeasureAttributes -FormatConnector sym:.uno:ConnectorAttributes +FormatDimensioning .uno:MeasureAttributes +FormatConnector .uno:ConnectorAttributes FormatModifyPage .uno:ModifyPage -FormatNumberingBulletsDraw sym:.uno:OutlineBullet -FormatPage sym:.uno:ModifyPage -FormatLayer sym:.uno:ModifyLayer -FormatModifyLayout sym:.uno:PresentationLayout -FormatGroupDraw sym:.uno:FormatGroup -FormatUngroupDraw sym:.uno:FormatUngroup -FormatSlideDraw sym:.uno:PageSetup -FormatStandardDraw sym:.uno:SetDefault +FormatNumberingBulletsDraw .uno:OutlineBullet +FormatPage .uno:ModifyPage +FormatLayer .uno:ModifyLayer +FormatModifyLayout .uno:PresentationLayout +FormatGroupDraw .uno:FormatGroup +FormatUngroupDraw .uno:FormatUngroup +FormatSlideDraw .uno:PageSetup +FormatStandardDraw .uno:SetDefault FormatSlideDesign .uno:PresentationLayout FormatStylesFormatting .uno:DesignerDialog FormatTransform .uno:TransformDialog FormatTransliterate .uno:TransliterateMenu FormatText .uno:TextAttributes -FormatTextDraw sym:.uno:TextAttributes +FormatTextDraw .uno:TextAttributes FormatCropPicture .uno:GrafAttrCrop ' **** Chart -'FormatStandardChart sym:.uno:SetDefault +'FormatStandardChart .uno:SetDefault FormatObjectProperties .uno:DiagramObjects FormatPositionAndSizeChart .uno:TransformDialog FormatArrangement .uno:ArrangeRow @@ -648,32 +648,32 @@ FormatDataRanges .uno:DataRanges Format3DView .uno:View3D FormatSelection .uno:FormatSelection ' **** Math -FormatFonts sym:.uno:ChangeFont -FormatFontSize sym:.uno:ChangeFontSize -FormatSpacing sym:.uno:ChangeDistance -FormatAlignment sym:.uno:ChangeAlignment -FormatTextMode sym:.uno:Textmode +FormatFonts .uno:ChangeFont +FormatFontSize .uno:ChangeFontSize +FormatSpacing .uno:ChangeDistance +FormatAlignment .uno:ChangeAlignment +FormatTextMode .uno:Textmode ' *********** Table Menu / Writer ****************************** TableInsertTable .uno:InsertTable TableInsertRowDialog .uno:InsertRowDialog TableInsertColumnDialog .uno:InsertColumnDialog -TableCellSplit sym:.uno:SplitCell -TableCellTop sym:.uno:CellVertTop -TableCellCenter sym:.uno:CellVertCenter -TableCellBottom sym:.uno:CellVertBottom -TableCellProtect sym:.uno:Protect -TableCellUnprotect sym:.uno:UnsetCellsReadOnly +TableCellSplit .uno:SplitCell +TableCellTop .uno:CellVertTop +TableCellCenter .uno:CellVertCenter +TableCellBottom .uno:CellVertBottom +TableCellProtect .uno:Protect +TableCellUnprotect .uno:UnsetCellsReadOnly TableDeleteTable .uno:DeleteTable TableDeleteRows .uno:DeleteRows -TableDeleteColumn sym:.uno:DeleteColumns +TableDeleteColumn .uno:DeleteColumns TableDeleteColumns .uno:DeleteColumns -TableSelectColumn sym:.uno:EntireColumn +TableSelectColumn .uno:EntireColumn TableSelectTable .uno:SelectTable TableSelectEntireRow .uno:EntireRow TableSelectEntireColumn .uno:EntireColumn TableSelectEntireCell .uno:EntireCell -TableMergeCell sym:.uno:MergeCells +TableMergeCell .uno:MergeCells TableMergeTable .uno:MergeTable TableMergeCells .uno:MergeCells TableSplitCell .uno:SplitCell @@ -700,13 +700,13 @@ TableProperties .uno:TableDialog ' **** ' **** All applications ToolsSpellcheck .uno:SpellDialog -ToolsSpellcheckAutoSpellcheck sym:.uno:SpellOnline +ToolsSpellcheckAutoSpellcheck .uno:SpellOnline ToolsLanguageHangulHanjaConversion .uno:HangulHanjaConversion ToolsLanguageChineseTranslation .uno:ChineseConversion ToolsLanguageThesaurus .uno:ThesaurusDialog -ToolsLanguageHyphenate sym:.uno:Hyphenate -ToolsAutocorrect sym:.uno:AutoCorrectDlg -ToolsXMLFilterSettings sym:.uno:OpenXMLFilterSettings +ToolsLanguageHyphenate .uno:Hyphenate +ToolsAutocorrect .uno:AutoCorrectDlg +ToolsXMLFilterSettings .uno:OpenXMLFilterSettings ToolsMacro .uno:MacroDialog ToolsMacroMacro .uno:MacroDialog ToolsMacrosRunMacro .uno:RunMacro @@ -715,186 +715,186 @@ ToolsMacrosOrganizeMacrosJavaScript .uno:ScriptOrganizer?ScriptOrganizer.Languag ToolsMacrosOrganizeMacrosPython .uno:ScriptOrganizer?ScriptOrganizer.Language:string=Python ToolsMacrosOrganizeDialogs .uno:MacroOrganizer?TabId:short=1 ToolsMacrosSignature .uno:MacroSignature -ToolsMacroRecordMacro sym:.uno:MacroRecorder -ToolsCustomize sym:.uno:ConfigureDialog -ToolsOptions sym:.uno:OptionsTreeDialog +ToolsMacroRecordMacro .uno:MacroRecorder +ToolsCustomize .uno:ConfigureDialog +ToolsOptions .uno:OptionsTreeDialog ToolsPackagemanager service:com.sun.star.deployment.ui.PackageManagerDialog ToolsMailMergeWizard .uno:MailMergeWizard ' **** Writer ToolsSpellcheckWriter .uno:SpellingAndGrammarDialog -ToolsOutlineNumbering sym:.uno:ChapterNumberingDialog -ToolsLineNumbering sym:.uno:LineNumberingDialog -ToolsPageNumber sym:.uno:PageOffset -ToolsFootnote sym:.uno:FootnoteDialog -ToolsTextInTable sym:.uno:ConvertTableText -ToolsSort sym:.uno:SortDialog -ToolsCalculate sym:.uno:CalculateSel -ToolsUpdateUpdateAll sym:.uno:UpdateAll -ToolsUpdateFields sym:.uno:UpdateFields -ToolsUpdateLinks sym:.uno:UpdateAllLinks -ToolsUpdateCurrentIndex sym:.uno:UpdateCurIndex -ToolsUpdateAllIndexes sym:.uno:UpdateAllIndexes -ToolsBibliographyDatabase sym:.uno:BibliographyComponent -ToolsWordCount sym:.uno:WordCountDialog +ToolsOutlineNumbering .uno:ChapterNumberingDialog +ToolsLineNumbering .uno:LineNumberingDialog +ToolsPageNumber .uno:PageOffset +ToolsFootnote .uno:FootnoteDialog +ToolsTextInTable .uno:ConvertTableText +ToolsSort .uno:SortDialog +ToolsCalculate .uno:CalculateSel +ToolsUpdateUpdateAll .uno:UpdateAll +ToolsUpdateFields .uno:UpdateFields +ToolsUpdateLinks .uno:UpdateAllLinks +ToolsUpdateCurrentIndex .uno:UpdateCurIndex +ToolsUpdateAllIndexes .uno:UpdateAllIndexes +ToolsBibliographyDatabase .uno:BibliographyComponent +ToolsWordCount .uno:WordCountDialog TableTableProperties .uno:TableDialog -ToolsLanguageHyphenation sym:.uno:Hyphenate +ToolsLanguageHyphenation .uno:Hyphenate ' **** WriterWeb -ToolsPageFormatting sym:.uno:Repaginate +ToolsPageFormatting .uno:Repaginate ' **** Calc -ToolsSpellcheckAutoCheckCalc sym:.uno:SpellOnline +ToolsSpellcheckAutoCheckCalc .uno:SpellOnline ToolsLanguageHyphenateCalc .uno:Hyphenate -ToolsDetectiveRemoveAllTraces sym:.uno:ClearArrows -ToolsDetectiveFillMode sym:.uno:AuditingFillMode -ToolsDetectiveTraceError sym:.uno:ShowErrors -ToolsDetectiveTraceDependents sym:.uno:ShowDependents -ToolsDetectiveRemoveDependents sym:.uno:ClearArrowDependents -ToolsDetectiveTracePrecedents sym:.uno:ShowPrecedents -ToolsDetectiveRemovePrecedents sym:.uno:ClearArrowPrecedents -ToolsDetectiveMarkInvalidData sym:.uno:ShowInvalid sym:.uno:FillModeSelect +ToolsDetectiveRemoveAllTraces .uno:ClearArrows +ToolsDetectiveFillMode .uno:AuditingFillMode +ToolsDetectiveTraceError .uno:ShowErrors +ToolsDetectiveTraceDependents .uno:ShowDependents +ToolsDetectiveRemoveDependents .uno:ClearArrowDependents +ToolsDetectiveTracePrecedents .uno:ShowPrecedents +ToolsDetectiveRemovePrecedents .uno:ClearArrowPrecedents +ToolsDetectiveMarkInvalidData .uno:ShowInvalid .uno:FillModeSelect ToolsDetectiveRefreshTraces .uno:RefreshArrows -ToolsDetectiveAutoUpdate sym:.uno:AutoRefreshArrows +ToolsDetectiveAutoUpdate .uno:AutoRefreshArrows ToolsSolver .uno:SolverDialog -ToolsGoalSeek sym:.uno:GoalSeekDialog -ToolsScenarios sym:.uno:ScenarioManager -ToolsProtectDocumentDocument sym:.uno:ToolProtectionDocument -ToolsProtectDocumentSheet sym:.uno:Protect -ToolsCellContentsRecalculate sym:.uno:Calculate -ToolsCellContentsAutoCalculate sym:.uno:AutomaticCalculation -ToolsCellContentsAutoInput sym:.uno:AutoComplete +ToolsGoalSeek .uno:GoalSeekDialog +ToolsScenarios .uno:ScenarioManager +ToolsProtectDocumentDocument .uno:ToolProtectionDocument +ToolsProtectDocumentSheet .uno:Protect +ToolsCellContentsRecalculate .uno:Calculate +ToolsCellContentsAutoCalculate .uno:AutomaticCalculation +ToolsCellContentsAutoInput .uno:AutoComplete ' **** Draw / Impress ToolsGallery .uno:Gallery -ToolsEyedropper sym:.uno:BmpMask +ToolsEyedropper .uno:BmpMask ToolsMediaPlayer .uno:AVMediaPlayer ToolsChineseTranslation .uno:ChineseConversion -ToolsLanguageHyphenationDraw sym:.uno:Hyphenation +ToolsLanguageHyphenationDraw .uno:Hyphenation ' **** Math -ToolsSymbolsCatalog sym:.uno:SymbolCatalogue -ToolsImportFormula sym:.uno:InsertFormula +ToolsSymbolsCatalog .uno:SymbolCatalogue +ToolsImportFormula .uno:InsertFormula ' ****************************************** ' *********** Slide Show Menu ************ ' **** -SlideShowSlideshow sym:.uno:Presentation -SlideShowPresentationSettings sym:.uno:PresentationDialog -SlideShowRehearseTimings sym:.uno:RehearseTimings +SlideShowSlideshow .uno:Presentation +SlideShowPresentationSettings .uno:PresentationDialog +SlideShowRehearseTimings .uno:RehearseTimings SlideShowInteraction .uno:AnimationEffects SlideShowAnimation .uno:CustomAnimation SlideShowSlideTransition .uno:SlideChangeWindow -SlideShowHideSlide sym:.uno:HideSlide -SlideShowShowSlide sym:.uno:ShowSlide -SlideShowCustomSlideshow sym:.uno:CustomShowDialog +SlideShowHideSlide .uno:HideSlide +SlideShowShowSlide .uno:ShowSlide +SlideShowCustomSlideshow .uno:CustomShowDialog SlideShowCustomAnimation .uno:CustomAnimation ' *********************************** ' *********** Datamenu ************ ' **** ' **** Calc -DataSelectRange sym:.uno:SelectDB -DataDefineRange sym:.uno:DefineDBName -DataSort sym:.uno:DataSort -DataFilterAutoFilter sym:.uno:DataFilterAutoFilter -DataFilterHideAutoFilter sym:.uno:DataFilterHideAutoFilter -DataFilterRemoveFilter sym:.uno:DataFilterRemoveFilter -DataFilterAdvancedFilter sym:.uno:DataFilterSpecialFilter -DataFilterStandardFilter sym:.uno:DataFilterStandardFilter -DataSubtotals sym:.uno:DataSubTotals -DataValidity sym:.uno:Validation +DataSelectRange .uno:SelectDB +DataDefineRange .uno:DefineDBName +DataSort .uno:DataSort +DataFilterAutoFilter .uno:DataFilterAutoFilter +DataFilterHideAutoFilter .uno:DataFilterHideAutoFilter +DataFilterRemoveFilter .uno:DataFilterRemoveFilter +DataFilterAdvancedFilter .uno:DataFilterSpecialFilter +DataFilterStandardFilter .uno:DataFilterStandardFilter +DataSubtotals .uno:DataSubTotals +DataValidity .uno:Validation DataTextToColumns .uno:TextToColumns -DataDataPilotStart sym:.uno:DataDataPilotRun -DataMultipleOperations sym:.uno:TableOperationDialog -DataConsolidate sym:.uno:DataConsolidate -DataOutlineAutoOutline sym:.uno:AutoOutline -DataOutlineHideDetails sym:.uno:HideDetail -DataOutlineShowDetails sym:.uno:ShowDetail -DataOutlineRemove sym:.uno:ClearOutline -DataOutlineGroup sym:.uno:Group -DataOutlineUngroup sym:.uno:Ungroup -DataDataPilotRefresh sym:.uno:RecalcPivotTable -DataDataPilotDelete sym:.uno:DeletePivotTable -DataRefreshRange sym:.uno:DataAreaRefresh +DataDataPilotStart .uno:DataDataPilotRun +DataMultipleOperations .uno:TableOperationDialog +DataConsolidate .uno:DataConsolidate +DataOutlineAutoOutline .uno:AutoOutline +DataOutlineHideDetails .uno:HideDetail +DataOutlineShowDetails .uno:ShowDetail +DataOutlineRemove .uno:ClearOutline +DataOutlineGroup .uno:Group +DataOutlineUngroup .uno:Ungroup +DataDataPilotRefresh .uno:RecalcPivotTable +DataDataPilotDelete .uno:DeletePivotTable +DataRefreshRange .uno:DataAreaRefresh ' *********************************** ' ********** Modify Menu *********** ' **** ' **** Draw -ModifyRotate sym:.uno:ToggleObjectRotateMode -ContextPositionAndSize sym:.uno:TransformDialog -ContextFlipVerticalDraw sym:.uno:MirrorVert -ContextFlipHorizontalDraw sym:.uno:MirrorHorz -ContextConvertIntoCurve sym:.uno:ChangeBezier -ContextConvertIntoPolygon sym:.uno:ChangePolygon -ContextConvertIntoContour sym:.uno:convert_to_contour -ContextConvertInto3D sym:.uno:ConvertInto3D -ContextConvertInto3DRotationObject sym:.uno:ConvertInto3DLatheFast -ContextConvertIntoMetafile sym:.uno:ConvertIntoMetaFile -ContextConvertIntoBitmap sym:.uno:ConvertIntoBitmap -ContextArrangeBringToFront sym:.uno:BringToFront -ContextArrangeBringForward sym:.uno:Forward -ContextArrangeBringBackward sym:.uno:Backward -ContextArrangeSendToBack sym:.uno:SendToBack -ContextArrangeInFrontOfObject sym:.uno:BeforeObject -ContextArrangeBehindObject sym:.uno:BehindObject -ContextArrangeReverse sym:.uno:ReverseOrder -ContextDistribution sym:.uno:DistributeSelection -ContextAlignmentLeft sym:.uno:ObjectAlignLeft -ContextAlignmentCentered sym:.uno:AlignCenter -ContextAlignmentRight sym:.uno:ObjectAlignRight -ContextAlignmentTop sym:.uno:AlignUp -ContextAlignmentCenter sym:.uno:AlignMiddle -ContextAlignmentBottom sym:.uno:AlignDown +ModifyRotate .uno:ToggleObjectRotateMode +ContextPositionAndSize .uno:TransformDialog +ContextFlipVerticalDraw .uno:MirrorVert +ContextFlipHorizontalDraw .uno:MirrorHorz +ContextConvertIntoCurve .uno:ChangeBezier +ContextConvertIntoPolygon .uno:ChangePolygon +ContextConvertIntoContour .uno:convert_to_contour +ContextConvertInto3D .uno:ConvertInto3D +ContextConvertInto3DRotationObject .uno:ConvertInto3DLatheFast +ContextConvertIntoMetafile .uno:ConvertIntoMetaFile +ContextConvertIntoBitmap .uno:ConvertIntoBitmap +ContextArrangeBringToFront .uno:BringToFront +ContextArrangeBringForward .uno:Forward +ContextArrangeBringBackward .uno:Backward +ContextArrangeSendToBack .uno:SendToBack +ContextArrangeInFrontOfObject .uno:BeforeObject +ContextArrangeBehindObject .uno:BehindObject +ContextArrangeReverse .uno:ReverseOrder +ContextDistribution .uno:DistributeSelection +ContextAlignmentLeft .uno:ObjectAlignLeft +ContextAlignmentCentered .uno:AlignCenter +ContextAlignmentRight .uno:ObjectAlignRight +ContextAlignmentTop .uno:AlignUp +ContextAlignmentCenter .uno:AlignMiddle +ContextAlignmentBottom .uno:AlignDown ContextDescriptionObject .uno:ObjectTitleDescription -ContextNameObject sym:.uno:NameGroup -ContextFontwork sym:.uno:FontWork -ContextEyedropper sym:.uno:BmpMask -ContextGroup sym:.uno:FormatGroup -ContextUngroup sym:.uno:FormatUngroup -ContextEnterGroup sym:.uno:EnterGroup -ContextExitGroup sym:.uno:LeaveGroup -ContextCombine sym:.uno:Combine -ContextSplit sym:.uno:Dismantle -ContextConnect sym:.uno:Connect -ContextBreak sym:.uno:Break -ModifyShapesMerge sym:.uno:Merge -ModifyShapesSubstract sym:.uno:Substract -ModifyShapesIntersect sym:.uno:Intersect -ContextOpenHyperlink sym:.uno:OpenHyperlinkOnCursor +ContextNameObject .uno:NameGroup +ContextFontwork .uno:FontWork +ContextEyedropper .uno:BmpMask +ContextGroup .uno:FormatGroup +ContextUngroup .uno:FormatUngroup +ContextEnterGroup .uno:EnterGroup +ContextExitGroup .uno:LeaveGroup +ContextCombine .uno:Combine +ContextSplit .uno:Dismantle +ContextConnect .uno:Connect +ContextBreak .uno:Break +ModifyShapesMerge .uno:Merge +ModifyShapesSubstract .uno:Substract +ModifyShapesIntersect .uno:Intersect +ContextOpenHyperlink .uno:OpenHyperlinkOnCursor ' *********************************** ' ********** Windows *********** ' **** ' **** All applications -WindowNewWindow sym:.uno:NewWindow +WindowNewWindow .uno:NewWindow WindowCloseWindow .uno:CloseWin ' **** Calc -WindowSplit sym:.uno:SplitWindow -WindowFreeze sym:.uno:FreezePanes +WindowSplit .uno:SplitWindow +WindowFreeze .uno:FreezePanes ' *********************************** ' *********** Help Menu ************ ' **** ' **** All applications -HelpContents sym:.uno:HelpIndex +HelpContents .uno:HelpIndex HelpWhatsThis .uno:ExtendedHelp -HelpHelpAgent sym:.uno:HelperDialog -HelpTips sym:.uno:HelpTip -HelpExtendedTips sym:.uno:ActiveHelp -HelpEntendedHelp sym:.uno:ActiveHelp +HelpHelpAgent .uno:HelperDialog +HelpTips .uno:HelpTip +HelpExtendedTips .uno:ActiveHelp +HelpEntendedHelp .uno:ActiveHelp HelpCheckForUpdates sym:vnd.sun.star.job:alias=UpdateCheck -HelpAboutStarOffice sym:.uno:About +HelpAboutStarOffice .uno:About HelpPurchaseStarOffice service:com.sun.star.tab.tabreg?purchase ' **************************************** ' *** Special Slots for Spreadsheet component *** ' **** ' **** Spreadsheet component -SpreadsheetEuroConverter sym:.uno:EuroConverter -ContextNameObjectCalc sym:.uno:RenameObject +SpreadsheetEuroConverter .uno:EuroConverter +ContextNameObjectCalc .uno:RenameObject ' **************************************** ' *** UNO Slots for Database component *** @@ -957,7 +957,7 @@ MigrateMacros .uno:DBMigrateScripts ' ******************************** ' *** UNO Slots for Basic IDE *** ' **** -ContextProperties sym:.uno:ShowPropBrowser +ContextProperties .uno:ShowPropBrowser ' Crash the office, allows to provide an automated test for the crash reporter Crash .uno:Crash diff --git a/testautomation/global/sid/others.sid b/testautomation/global/sid/others.sid index 1a5e340dc38b..99f9cb479ce2 100644 --- a/testautomation/global/sid/others.sid +++ b/testautomation/global/sid/others.sid @@ -4,36 +4,36 @@ ' *************************************************** ' ** to create a new document -NeuDirekt sym:.uno:AddDirect -NewDirect sym:.uno:AddDirect +NeuDirekt .uno:AddDirect +NewDirect .uno:AddDirect ' ** slots for file import -FileName sym:.uno:FileName +FileName .uno:FileName ' ** slots for file printing -PrinterName sym:.uno:Printer +PrinterName .uno:Printer ' ** to jump to a new table in calc -GeheZuTabelle sym:.uno:JumpToTable -GeheZuZelle sym:.uno:GoToCell -GeheZuDokument sym:.uno:GotoDocument -GeheZuObjekt sym:.uno:GoToObject -GoToTable sym:.uno:JumpToTable -GoToCell sym:.uno:GoToCell -GoToDocument sym:.uno:GotoDocument -GoToObject sym:.uno:GoToObject +GeheZuTabelle .uno:JumpToTable +GeheZuZelle .uno:GoToCell +GeheZuDokument .uno:GotoDocument +GeheZuObjekt .uno:GoToObject +GoToTable .uno:JumpToTable +GoToCell .uno:GoToCell +GoToDocument .uno:GotoDocument +GoToObject .uno:GoToObject ' ** activate OLE-Object -CalcOLEAktivieren sym:.uno:ActivateOLE -CalcOLEDeaktivieren sym:.uno:Deactivate -CalcActivateOLE sym:.uno:ActivateOLE -CalcDeactivateOLE sym:.uno:Deactivate +CalcOLEAktivieren .uno:ActivateOLE +CalcOLEDeaktivieren .uno:Deactivate +CalcActivateOLE .uno:ActivateOLE +CalcDeactivateOLE .uno:Deactivate ' ** show office version -GetVersion sym:.uno:VersionVisible +GetVersion .uno:VersionVisible ' ** Load / Save -IsDocImageLoading sym:.uno:IsLoadingImages -IsDocLoading sym:.uno:IsLoading -IsDocSaving sym:.uno:Saved +IsDocImageLoading .uno:IsLoadingImages +IsDocLoading .uno:IsLoading +IsDocSaving .uno:Saved -- cgit From 97547b76291f2b10045ce4c57b83672391a43db4 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Tue, 28 Sep 2010 13:16:08 +0200 Subject: automationdev300m87: #i112208# - And reverted last change - debug is off again. --- testautomation/global/tools/includes/required/t_files.inc | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index 585aa3c75e5d..65969e0b74a7 100644 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -623,17 +623,20 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean ' Find out what the name of the target file is going to be sTargetPath = hFileGetLocalPath( sSourcePath ) ' The path + file - ' Copy the file from anywhere to the local user directory if it does not + ' For debugging purposes set global variable gVerbose to TRUE + if ( gVerbose ) then + printlog( CFN & "Copying file" ) + printlog( CFN & "From: " & sSourcePath ) + printlog( CFN & "To..: " & sTargetPath ) + endif + + ' Copy the file from anywhere to the local user directory if it does not ' exist. This behavior was discussed on IRC if ( FileExists( sTargetPath ) ) then 'printlog( CFN & "Re-using existing local copy of workfile" ) warnlog( CFN & "Target file exists, it has not been deleted by prior test" ) endif - printlog( CFN & "Copying file" ) - printlog( CFN & "From: " & sSourcePath ) - printlog( CFN & "To..: " & sTargetPath ) - FileCopy( sSourcePath, sTargetPath ) ' Verify that the file has been created. return an empty string and warn -- cgit From 5bac830087fc7f5657ef8b5b0e4e57dbf0768acd Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Thu, 30 Sep 2010 13:18:23 +0200 Subject: automationdev300m87: #i112208# - c_updt_filemenu.in used own code to do hFileOpenLocally(), replaced it (old code left outcommented). Added deletion of workfile at the end of the test. --- .../spreadsheet/required/includes/c_upd_filemenu.inc | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc index a2e3f5a70598..4cf87e0e226a 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc @@ -371,11 +371,15 @@ end if Printlog " Enter some text" Kontext "DocumentCalc" DocumentCalc.Typekeys "The first doc!" + Printlog " Copy Test File spreadsheet/required/input/recentdocument.ods locally" - app.FileCopy convertpath(gTesttoolpath & "spreadsheet\required\input\recentdocument.ods"),gOfficePath + ConvertPath("user/work/recentdocument.ods") - Printlog " Load local copied testfile recentdocument.ods" - sTestFile = convertpath(gOfficePath & "user/work/recentdocument.ods") - Call hFileOpen(sTestFile) + hFileOpenLocally( gTesttoolpath & "spreadsheet\required\input\recentdocument.ods" ) + sTestFile = gLastWorkFile ' get the new file location + + 'app.FileCopy convertpath(gTesttoolpath & "spreadsheet\required\input\recentdocument.ods"),gOfficePath + ConvertPath("user/work/recentdocument.ods") + 'Printlog " Load local copied testfile recentdocument.ods" + 'sTestFile = convertpath(gOfficePath & "user/work/recentdocument.ods") + 'Call hFileOpen(sTestFile) '/// Close the document. Printlog " Close the document." '/// Now an item in File / Recent Documents should exist @@ -412,6 +416,8 @@ end if '/// Close starting document Printlog " Close starting document" Call hCloseDocument + Printlog " Delete local copy of the workfile" + hFileDelete( sTestFile ) endcase '----------------------------------------------------------- -- cgit From 86e601e36c69b8c7111d5cd015e391aacb39ae03 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 30 Sep 2010 17:04:05 +0200 Subject: CWS changehid: typos in control names for autohids --- tools/source/rc/resmgr.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index afdf8f62c343..a8dfda98f9cf 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1850,12 +1850,12 @@ rtl::OString ResMgr::GetAutoHelpId() case RSC_TABCONTROL: aHID.append( "TabControl" ); break; case RSC_RADIOBUTTON: aHID.append( "RadioButton" ); break; case RSC_CHECKBOX: aHID.append( "CheckBox" ); break; - case RSC_TRISTATEBOX: aHID.append( "TristateBox" ); break; + case RSC_TRISTATEBOX: aHID.append( "TriStateBox" ); break; case RSC_EDIT: aHID.append( "Edit" ); break; case RSC_MULTILINEEDIT: aHID.append( "MultilineEdit" ); break; case RSC_MULTILISTBOX: aHID.append( "MultiListBox" ); break; case RSC_LISTBOX: aHID.append( "ListBox" ); break; - case RSC_COMBOBOX: aHID.append( "Combobox" ); break; + case RSC_COMBOBOX: aHID.append( "ComboBox" ); break; case RSC_PUSHBUTTON: aHID.append( "PushButton" ); break; case RSC_SPINFIELD: aHID.append( "SpinField" ); break; case RSC_PATTERNFIELD: aHID.append( "PatternField" ); break; -- cgit From 4263bca190a3d67f350f6d888684e107aa4f2940 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 30 Sep 2010 17:04:23 +0200 Subject: CWS changehid: remove helpids duplicated from svtools --- sfx2/source/dialog/filedlghelper.cxx | 2 +- sfx2/source/inc/helpid.hrc | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index d5a9abe6b597..a166cf5da9b0 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -97,7 +97,7 @@ #include "filtergrouping.hxx" #include #include "filedlgimpl.hxx" - +#include #include //----------------------------------------------------------------------------- diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index c9054643fc11..e67291469f7d 100755 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc @@ -289,8 +289,6 @@ #define HID_MAILWIN_PRIO_BOX "SFX2_HID_MAILWIN_PRIO_BOX" #define HID_TABDLG_APPLY_BTN "SFX2_HID_TABDLG_APPLY_BTN" #define HID_TP_COMMONPRINTOPTIONS "SFX2_HID_TP_COMMONPRINTOPTIONS" -#define HID_FILEDLG_LINK_CB "SFX2_HID_FILEDLG_LINK_CB" -#define HID_FILEDLG_PREVIEW_CB "SFX2_HID_FILEDLG_PREVIEW_CB" #define HID_HELP_WINDOW "SFX2_HID_HELP_WINDOW" #define HID_HELP_LISTBOX "SFX2_HID_HELP_LISTBOX" #define HID_HELP_TABCONTROL "SFX2_HID_HELP_TABCONTROL" -- cgit From 7825ac7bb42ee7e9b336c34e063ad6c3426c527f Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 30 Sep 2010 17:04:56 +0200 Subject: CWS changehid: make sure that resource isn't closed when ImplAutoHelpId is called --- vcl/source/window/window.cxx | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 13ceaac01998..c7fa33ce8b76 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1206,18 +1206,20 @@ void Window::ImplLoadRes( const ResId& rResId ) { ULONG nObjMask = ReadLongRes(); + // we need to calculate auto helpids before the resource gets closed + // if the resource only contains flags, it will be closed before we try to read a help id + // so we always create an auto help id that might be overwritten later + // HelpId + rtl::OString aHelpId = ImplAutoHelpID( rResId.GetResMgr() ); + // ResourceStyle ULONG nRSStyle = ReadLongRes(); // WinBits ReadLongRes(); - - // HelpId - rtl::OString aHelpId; if( nObjMask & WINDOW_HELPID ) aHelpId = ReadByteStringRes(); - if( ! aHelpId.getLength() ) - aHelpId = ImplAutoHelpID( rResId.GetResMgr() ); + SetHelpId( aHelpId ); BOOL bPos = FALSE; -- cgit From 555e05338a62f551b5e018bd12e6b7a9a52f3e5d Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 1 Oct 2010 12:54:16 +0200 Subject: CWS changehid: error in conversion to string HIDs --- vcl/source/window/msgbox.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx index d21d881b38f0..d00d569883d5 100644 --- a/vcl/source/window/msgbox.cxx +++ b/vcl/source/window/msgbox.cxx @@ -232,7 +232,7 @@ MessBox::~MessBox() void MessBox::ImplPosControls() { - if ( GetHelpId() ) + if ( GetHelpId().getLength() ) { if ( !mbHelpBtn ) { -- cgit From 2bc146e36e0b7461821e192a3a0134fc1f5bd8f2 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 2 Oct 2010 14:03:34 +0200 Subject: CWS changehid: another typo in control names --- tools/source/rc/resmgr.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index a8dfda98f9cf..44ea4024f211 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1852,7 +1852,7 @@ rtl::OString ResMgr::GetAutoHelpId() case RSC_CHECKBOX: aHID.append( "CheckBox" ); break; case RSC_TRISTATEBOX: aHID.append( "TriStateBox" ); break; case RSC_EDIT: aHID.append( "Edit" ); break; - case RSC_MULTILINEEDIT: aHID.append( "MultilineEdit" ); break; + case RSC_MULTILINEEDIT: aHID.append( "MultiLineEdit" ); break; case RSC_MULTILISTBOX: aHID.append( "MultiListBox" ); break; case RSC_LISTBOX: aHID.append( "ListBox" ); break; case RSC_COMBOBOX: aHID.append( "ComboBox" ); break; -- cgit From ebd778ca3f232102bf5fa248fcf85ce604ca7df3 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 2 Oct 2010 14:04:40 +0200 Subject: CWS changehid: make sure that toolbox buttons for child windows and the child windows themselves have different HIDs --- sfx2/source/dialog/dockwin.cxx | 4 ++-- svx/source/gallery2/gallery.src | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 499987f5ff3b..0864b0e18c2b 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -931,7 +931,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); if ( pSlot ) { - rtl::OString aCmd(".uno:"); + rtl::OString aCmd("SFXDOCKINGWINDOW_"); aCmd += pSlot->GetUnoName(); SetUniqueId( aCmd ); } @@ -985,7 +985,7 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, const SfxSlot* pSlot = pSlotPool->GetSlot( pCW->GetType() ); if ( pSlot ) { - rtl::OString aCmd(".uno:"); + rtl::OString aCmd("SFXDOCKINGWINDOW_"); aCmd += pSlot->GetUnoName(); SetUniqueId( aCmd ); } diff --git a/svx/source/gallery2/gallery.src b/svx/source/gallery2/gallery.src index 81ab0f1ac6d9..39ee6e0e6b1b 100644 --- a/svx/source/gallery2/gallery.src +++ b/svx/source/gallery2/gallery.src @@ -35,7 +35,7 @@ DockingWindow RID_SVXDLG_GALLERYBROWSER { - HelpId = CMD_SID_GALLERY; + HelpId = "SVX_HID_GALLERY_BROWSER" ; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; -- cgit From a8a8e916ef7b626e3320a21ca5195ca66f0a704b Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Sat, 2 Oct 2010 14:05:06 +0200 Subject: CWS changehid: replace hard coded numeric HID --- sfx2/source/appl/newhelp.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 9289920b8e09..9235777e0d5a 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -3180,7 +3180,7 @@ void SfxHelpWindow_Impl::openDone(const ::rtl::OUString& sURL , xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("PreventHelpTips"), aBoolAny ); xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowGraphics"), aBoolAny ); xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("ShowTables"), aBoolAny ); - xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("HelpURL"), makeAny( DEFINE_CONST_OUSTRING("HID:68245") ) ); + xViewProps->setPropertyValue( DEFINE_CONST_OUSTRING("HelpURL"), makeAny( DEFINE_CONST_OUSTRING("HID:SFX2_HID_HELP_ONHELP") ) ); ::rtl::OUString sProperty( DEFINE_CONST_OUSTRING("IsExecuteHyperlinks") ); if ( xInfo->hasPropertyByName( sProperty ) ) xViewProps->setPropertyValue( sProperty, aBoolAny ); -- cgit From 3645e96db1ef4aa0e781337b9c478ebf60369890 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 5 Oct 2010 16:38:28 +0200 Subject: CWS changehid: remove duplicated definitions of HIDs --- svtools/inc/svtools/helpid.hrc | 25 ++++++++++++++++++++++--- svtools/util/hidother.src | 20 ++++++++++++++++++++ 2 files changed, 42 insertions(+), 3 deletions(-) diff --git a/svtools/inc/svtools/helpid.hrc b/svtools/inc/svtools/helpid.hrc index f19cf1a17aa3..ecf8ba4b1bf7 100644 --- a/svtools/inc/svtools/helpid.hrc +++ b/svtools/inc/svtools/helpid.hrc @@ -42,6 +42,28 @@ #define HID_FILEDLG_PATH "SVT_HID_FILEDLG_PATH" #define HID_FILEDLG_TYPE "SVT_HID_FILEDLG_TYPE" #define HID_FILEDLG_TYPES "SVT_HID_FILEDLG_TYPES" +#define HID_FILEDLG_LINK_CB "SVT_HID_FILEDLG_LINK_CB" +#define HID_FILEDLG_PREVIEW_CB "SVT_HID_FILEDLG_PREVIEW_CB" +#define HID_FILEDLG_STANDARD "SVT_HID_FILEDLG_STANDARD" +#define HID_FILEDLG_MANAGER "SVT_HID_FILEDLG_MANAGER" +#define HID_FILEDLG_URL "SVT_HID_FILEDLG_URL" +#define HID_FILEDLG_USE_PASSWD "SVT_HID_FILEDLG_USE_PASSWD" +#define HID_FILEDLG_READ_ONLY "SVT_HID_FILEDLG_READ_ONLY" +#define HID_FILEDLG_AUTOCOMPLETEBOX "SVT_HID_FILEDLG_AUTOCOMPLETEBOX" +#define HID_FILEDLG_SAVE_BTN "SVT_HID_FILEDLG_SAVE_BTN" +#define HID_FILEDLG_SAVE_FILENAME "SVT_HID_FILEDLG_SAVE_FILENAME" +#define HID_FILEDLG_SAVE_FILETYPE "SVT_HID_FILEDLG_SAVE_FILETYPE" +#define HID_FILEDLG_INSERT_BTN "SVT_HID_FILEDLG_INSERT_BTN" +#define HID_FILEDLG_PATH_BTN "SVT_HID_FILEDLG_PATH_BTN" +#define HID_FILEDLG_PATH_FILENAME "SVT_HID_FILEDLG_PATH_FILENAME" +#define HID_FILEDLG_FOLDER_BTN "SVT_HID_FILEDLG_FOLDER_BTN" +#define HID_FILEDLG_FOLDER_FILENAME "SVT_HID_FILEDLG_FOLDER_FILENAME" +#define HID_FILEDLG_SRCHFOLDER_BTN "SVT_HID_FILEDLG_SRCHFOLDER_BTN" +#define HID_FILEDLG_EDIT_FAVORITES "SVT_HID_FILEDLG_EDIT_FAVORITES" +#define HID_FILEDLG_NEW_FAVORITE "SVT_HID_FILEDLG_NEW_FAVORITE" +#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX "SVT_HID_FILEDLG_EDIT_FAVORITES_LISTBOX" +#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR "SVT_HID_FILEDLG_EDIT_FAVORITES_HEADERBAR" +#define HID_FILEDLG_EXPORTASPDF "SVT_HID_FILEDLG_EXPORTASPDF" // HelpID's fuer die Textkomponente #define HID_TEXTCPNT_OPEN_LINK "SVT_HID_TEXTCPNT_OPEN_LINK" @@ -93,9 +115,6 @@ #define HID_FILEOPEN_VERSION "SVT_HID_FILEOPEN_VERSION" #define HID_FILEOPEN_IMAGE_TEMPLATE "SVT_HID_FILEOPEN_IMAGE_TEMPLATE" -#define HID_FILEDLG_LINK_CB "SVT_HID_FILEDLG_LINK_CB" -#define HID_FILEDLG_PREVIEW_CB "SVT_HID_FILEDLG_PREVIEW_CB" - // uniqueid for the helpagent window (testtool) #define HID_HELPAGENT_WINDOW "SVT_HID_HELPAGENT_WINDOW" diff --git a/svtools/util/hidother.src b/svtools/util/hidother.src index 77dd98115221..03aea7ebdf7e 100644 --- a/svtools/util/hidother.src +++ b/svtools/util/hidother.src @@ -57,3 +57,23 @@ hidspecial HID_PRINTDIALOG_TOFILE { HelpID = HID_PRINTDIALOG_TOFIL hidspecial HID_WIZARD_NEXT { HelpID = HID_WIZARD_NEXT; }; hidspecial HID_WIZARD_PREVIOUS { HelpID = HID_WIZARD_PREVIOUS; }; +hidspecial HID_FILEDLG_LINK_CB { HelpID = HID_FILEDLG_LINK_CB; }; +hidspecial HID_FILEDLG_PREVIEW_CB { HelpID = HID_FILEDLG_PREVIEW_CB; }; +hidspecial HID_FILEDLG_FILE { HelpID = HID_FILEDLG_FILE; }; +hidspecial HID_FILEDLG_MANAGER { HelpID = HID_FILEDLG_MANAGER; }; +hidspecial HID_FILEDLG_READ_ONLY { HelpID = HID_FILEDLG_READ_ONLY; }; +hidspecial HID_FILEDLG_STANDARD { HelpID = HID_FILEDLG_STANDARD; }; +hidspecial HID_FILEDLG_URL { HelpID = HID_FILEDLG_URL; }; +hidspecial HID_FILEDLG_USE_PASSWD { HelpID = HID_FILEDLG_USE_PASSWD; }; +hidspecial HID_FILEDLG_AUTOCOMPLETEBOX { HelpID = HID_FILEDLG_AUTOCOMPLETEBOX; }; +hidspecial HID_FILEDLG_SAVE_BTN { HelpID = HID_FILEDLG_SAVE_BTN; }; +hidspecial HID_FILEDLG_SAVE_FILENAME { HelpID = HID_FILEDLG_SAVE_FILENAME; }; +hidspecial HID_FILEDLG_SAVE_FILETYPE { HelpID = HID_FILEDLG_SAVE_FILETYPE; }; +hidspecial HID_FILEDLG_INSERT_BTN { HelpID = HID_FILEDLG_INSERT_BTN; }; +hidspecial HID_FILEDLG_PATH_BTN { HelpID = HID_FILEDLG_PATH_BTN; }; +hidspecial HID_FILEDLG_PATH_FILENAME { HelpID = HID_FILEDLG_PATH_FILENAME; }; +hidspecial HID_FILEDLG_FOLDER_BTN { HelpID = HID_FILEDLG_FOLDER_BTN; }; +hidspecial HID_FILEDLG_FOLDER_FILENAME { HelpID = HID_FILEDLG_FOLDER_FILENAME; }; +hidspecial HID_FILEDLG_SRCHFOLDER_BTN { HelpID = HID_FILEDLG_SRCHFOLDER_BTN; }; +hidspecial HID_FILEDLG_EDIT_FAVORITES_LISTBOX { HelpID = HID_FILEDLG_EDIT_FAVORITES_LISTBOX; }; +hidspecial HID_FILEDLG_EDIT_FAVORITES_HEADERBAR { HelpID = HID_FILEDLG_EDIT_FAVORITES_HEADERBAR; }; -- cgit From cac4b2315361bc5b7b95689e3c2bd1a596013cae Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Tue, 5 Oct 2010 16:38:28 +0200 Subject: CWS changehid: remove duplicated definitions of HIDs --- fpicker/source/office/iodlg.hrc | 20 +------------------- sfx2/source/inc/helpid.hrc | 21 --------------------- sfx2/util/hidother.src | 20 -------------------- 3 files changed, 1 insertion(+), 60 deletions(-) diff --git a/fpicker/source/office/iodlg.hrc b/fpicker/source/office/iodlg.hrc index 60374f226edf..b87082b56cbd 100644 --- a/fpicker/source/office/iodlg.hrc +++ b/fpicker/source/office/iodlg.hrc @@ -28,9 +28,8 @@ #ifndef _SVTOOLS_IODLGIMPL_HRC #define _SVTOOLS_IODLGIMPL_HRC -#ifndef _SVTOOLS_HRC #include "svtools/svtools.hrc" -#endif +#include "svtools/helpid.hrc" // ModalDialog DLG_SVT_EXPLORERFILE @@ -86,22 +85,5 @@ #define SID_SFX_START 5000 #define SID_OPENURL (SID_SFX_START + 596) -#define HID_FILEDLG_STANDARD "FPICKER_HID_FILEDLG_STANDARD" -#define HID_FILEDLG_MANAGER "FPICKER_HID_FILEDLG_MANAGER" -#define HID_FILEDLG_URL "FPICKER_HID_FILEDLG_URL" -#define HID_FILEDLG_USE_PASSWD "FPICKER_HID_FILEDLG_USE_PASSWD" -#define HID_FILEDLG_READ_ONLY "FPICKER_HID_FILEDLG_READ_ONLY" - -#define HID_FILEDLG_AUTOCOMPLETEBOX "FPICKER_HID_FILEDLG_AUTOCOMPLETEBOX" -#define HID_FILEDLG_SAVE_BTN "FPICKER_HID_FILEDLG_SAVE_BTN" -#define HID_FILEDLG_SAVE_FILENAME "FPICKER_HID_FILEDLG_SAVE_FILENAME" -#define HID_FILEDLG_SAVE_FILETYPE "FPICKER_HID_FILEDLG_SAVE_FILETYPE" -#define HID_FILEDLG_INSERT_BTN "FPICKER_HID_FILEDLG_INSERT_BTN" -#define HID_FILEDLG_PATH_BTN "FPICKER_HID_FILEDLG_PATH_BTN" -#define HID_FILEDLG_PATH_FILENAME "FPICKER_HID_FILEDLG_PATH_FILENAME" -#define HID_FILEDLG_FOLDER_BTN "FPICKER_HID_FILEDLG_FOLDER_BTN" -#define HID_FILEDLG_FOLDER_FILENAME "FPICKER_HID_FILEDLG_FOLDER_FILENAME" -#define HID_FILEDLG_SRCHFOLDER_BTN "FPICKER_HID_FILEDLG_SRCHFOLDER_BTN" - #endif diff --git a/sfx2/source/inc/helpid.hrc b/sfx2/source/inc/helpid.hrc index e67291469f7d..ef5c168c36f0 100755 --- a/sfx2/source/inc/helpid.hrc +++ b/sfx2/source/inc/helpid.hrc @@ -53,12 +53,6 @@ #define HID_DOCINFORELOAD "SFX2_HID_DOCINFORELOAD" #define HID_NEWS_GROUPPAGE "SFX2_HID_NEWS_GROUPPAGE" #define HID_NEWS_SERVERPAGE "SFX2_HID_NEWS_SERVERPAGE" -#define HID_FILEDLG_STANDARD "SFX2_HID_FILEDLG_STANDARD" -#define HID_FILEDLG_MANAGER "SFX2_HID_FILEDLG_MANAGER" -#define HID_FILEDLG_URL "SFX2_HID_FILEDLG_URL" -#define HID_FILEDLG_FILE "SFX2_HID_FILEDLG_FILE" -#define HID_FILEDLG_USE_PASSWD "SFX2_HID_FILEDLG_USE_PASSWD" -#define HID_FILEDLG_READ_ONLY "SFX2_HID_FILEDLG_READ_ONLY" #define HID_EXPLORERCONTROL "SFX2_HID_EXPLORERCONTROL" #define HID_BROWSERCONTROL "SFX2_HID_BROWSERCONTROL" #define HID_CTL_ORGANIZER_LEFT "SFX2_HID_CTL_ORGANIZER_LEFT" @@ -234,26 +228,12 @@ #define HID_GROUPVIEW_SHOW_DOCS "SFX2_HID_GROUPVIEW_SHOW_DOCS" #define HID_EDIT_TEMPLATE "SFX2_HID_EDIT_TEMPLATE" #define HID_PDFOLDERS_GRAPHICS "SFX2_HID_PDFOLDERS_GRAPHICS" -#define HID_FILEDLG_AUTOCOMPLETEBOX "SFX2_HID_FILEDLG_AUTOCOMPLETEBOX" -#define HID_FILEDLG_SAVE_BTN "SFX2_HID_FILEDLG_SAVE_BTN" -#define HID_FILEDLG_SAVE_FILENAME "SFX2_HID_FILEDLG_SAVE_FILENAME" -#define HID_FILEDLG_SAVE_FILETYPE "SFX2_HID_FILEDLG_SAVE_FILETYPE" -#define HID_FILEDLG_INSERT_BTN "SFX2_HID_FILEDLG_INSERT_BTN" -#define HID_FILEDLG_PATH_BTN "SFX2_HID_FILEDLG_PATH_BTN" -#define HID_FILEDLG_PATH_FILENAME "SFX2_HID_FILEDLG_PATH_FILENAME" -#define HID_FILEDLG_FOLDER_BTN "SFX2_HID_FILEDLG_FOLDER_BTN" -#define HID_FILEDLG_FOLDER_FILENAME "SFX2_HID_FILEDLG_FOLDER_FILENAME" -#define HID_FILEDLG_SRCHFOLDER_BTN "SFX2_HID_FILEDLG_SRCHFOLDER_BTN" #define HID_PDFOLDERS_GROUPS "SFX2_HID_PDFOLDERS_GROUPS" #define HID_OPEN_CHOOSE_FILTER "SFX2_HID_OPEN_CHOOSE_FILTER" #define HID_PDFOLDERS_BOOKMARKS "SFX2_HID_PDFOLDERS_BOOKMARKS" #define HID_PDFOLDERS_FAVORITES_ADD "SFX2_HID_PDFOLDERS_FAVORITES_ADD" #define HID_PDFOLDERS_FAVORITES_REMOVE "SFX2_HID_PDFOLDERS_FAVORITES_REMOVE" #define HID_PDFOLDERS_HISTORY "SFX2_HID_PDFOLDERS_HISTORY" -#define HID_FILEDLG_EDIT_FAVORITES "SFX2_HID_FILEDLG_EDIT_FAVORITES" -#define HID_FILEDLG_NEW_FAVORITE "SFX2_HID_FILEDLG_NEW_FAVORITE" -#define HID_FILEDLG_EDIT_FAVORITES_LISTBOX "SFX2_HID_FILEDLG_EDIT_FAVORITES_LISTBOX" -#define HID_FILEDLG_EDIT_FAVORITES_HEADERBAR "SFX2_HID_FILEDLG_EDIT_FAVORITES_HEADERBAR" #define HID_CNT_CB_FORCE_BODY_EXPORT "SFX2_HID_CNT_CB_FORCE_BODY_EXPORT" #define HID_CNT_PAGE_REPSTATE_CONTROL "SFX2_HID_CNT_PAGE_REPSTATE_CONTROL" #define HID_TASKSTATUSBAR "SFX2_HID_TASKSTATUSBAR" @@ -319,7 +299,6 @@ #define HID_HELP_TEXT_SELECTION_MODE "SFX2_HID_HELP_TEXT_SELECTION_MODE" #define HID_WARNING_SECURITY_HYPERLINK "SFX2_HID_WARNING_SECURITY_HYPERLINK" -#define HID_FILEDLG_EXPORTASPDF "SFX2_HID_FILEDLG_EXPORTASPDF" #define HID_USERDEFBMP_TOOLBOX "SFX2_HID_USERDEFBMP_TOOLBOX" #define HID_CONFIG_LOAD "SFX2_HID_CONFIG_LOAD" diff --git a/sfx2/util/hidother.src b/sfx2/util/hidother.src index ccce4820cf2f..72bd77c5c011 100644 --- a/sfx2/util/hidother.src +++ b/sfx2/util/hidother.src @@ -31,12 +31,6 @@ hidspecial HID_APP_WIN { HelpID = HID_APP_WIN; }; hidspecial HID_DESKTOP { HelpID = HID_DESKTOP; }; hidspecial HID_DOCINFO_FRAME { HelpID = HID_DOCINFO_FRAME; }; hidspecial HID_EXPLORER_FRAME { HelpID = HID_EXPLORER_FRAME; }; -hidspecial HID_FILEDLG_FILE { HelpID = HID_FILEDLG_FILE; }; -hidspecial HID_FILEDLG_MANAGER { HelpID = HID_FILEDLG_MANAGER; }; -hidspecial HID_FILEDLG_READ_ONLY { HelpID = HID_FILEDLG_READ_ONLY; }; -hidspecial HID_FILEDLG_STANDARD { HelpID = HID_FILEDLG_STANDARD; }; -hidspecial HID_FILEDLG_URL { HelpID = HID_FILEDLG_URL; }; -hidspecial HID_FILEDLG_USE_PASSWD { HelpID = HID_FILEDLG_USE_PASSWD; }; hidspecial HID_PREVIEW_FRAME { HelpID = HID_PREVIEW_FRAME; }; hidspecial HID_PRINT_OPTIONS { HelpID = HID_PRINT_OPTIONS; }; hidspecial HID_TEMPLATE_FILTER { HelpID = HID_TEMPLATE_FILTER; }; @@ -70,18 +64,6 @@ hidspecial HID_CNT_LB_DESCRIPTION { HelpID = HID_CNT_LB_DESCRIPTIO hidspecial HID_GROUPVIEW_CONTENT_BIG { HelpID = HID_GROUPVIEW_CONTENT_BIG; }; hidspecial HID_GROUPVIEW_CONTENT_SMALL { HelpID = HID_GROUPVIEW_CONTENT_SMALL; }; hidspecial HID_GROUPVIEW_CONTENT_TREE { HelpID = HID_GROUPVIEW_CONTENT_TREE; }; -hidspecial HID_FILEDLG_AUTOCOMPLETEBOX { HelpID = HID_FILEDLG_AUTOCOMPLETEBOX; }; -hidspecial HID_FILEDLG_SAVE_BTN { HelpID = HID_FILEDLG_SAVE_BTN; }; -hidspecial HID_FILEDLG_SAVE_FILENAME { HelpID = HID_FILEDLG_SAVE_FILENAME; }; -hidspecial HID_FILEDLG_SAVE_FILETYPE { HelpID = HID_FILEDLG_SAVE_FILETYPE; }; -hidspecial HID_FILEDLG_INSERT_BTN { HelpID = HID_FILEDLG_INSERT_BTN; }; -hidspecial HID_FILEDLG_PATH_BTN { HelpID = HID_FILEDLG_PATH_BTN; }; -hidspecial HID_FILEDLG_PATH_FILENAME { HelpID = HID_FILEDLG_PATH_FILENAME; }; -hidspecial HID_FILEDLG_FOLDER_BTN { HelpID = HID_FILEDLG_FOLDER_BTN; }; -hidspecial HID_FILEDLG_FOLDER_FILENAME { HelpID = HID_FILEDLG_FOLDER_FILENAME; }; -hidspecial HID_FILEDLG_SRCHFOLDER_BTN { HelpID = HID_FILEDLG_SRCHFOLDER_BTN; }; -hidspecial HID_FILEDLG_EDIT_FAVORITES_LISTBOX { HelpID = HID_FILEDLG_EDIT_FAVORITES_LISTBOX; }; -hidspecial HID_FILEDLG_EDIT_FAVORITES_HEADERBAR { HelpID = HID_FILEDLG_EDIT_FAVORITES_HEADERBAR; }; hidspecial HID_BROWSERCONTROL { HelpID = HID_BROWSERCONTROL; }; hidspecial HID_TASKSTATUSBAR { HelpID = HID_TASKSTATUSBAR; }; hidspecial HID_CNT_PAGE_HEADER_TABBAR { HelpID = HID_CNT_PAGE_HEADER_TABBAR; }; @@ -106,8 +88,6 @@ hidspecial HID_CNT_SENT_VIEW_SENT_ARTICLES { HelpID = HID_CNT_SENT_VIEW_SEN hidspecial HID_CNT_SENT_VIEW_UNSENT_ARTICLES { HelpID = HID_CNT_SENT_VIEW_UNSENT_ARTICLES; }; hidspecial HID_CNT_SENT_VIEW_MARKED_ARTICLES { HelpID = HID_CNT_SENT_VIEW_MARKED_ARTICLES; }; hidspecial HID_TABDLG_APPLY_BTN { HelpID = HID_TABDLG_APPLY_BTN; }; -hidspecial HID_FILEDLG_LINK_CB { HelpID = HID_FILEDLG_LINK_CB; }; -hidspecial HID_FILEDLG_PREVIEW_CB { HelpID = HID_FILEDLG_PREVIEW_CB; }; hidspecial HID_HELP_WINDOW { HelpID = HID_HELP_WINDOW; }; hidspecial HID_HELP_TOOLBOX { HelpID = HID_HELP_TOOLBOX; }; hidspecial HID_HELP_TOOLBOXITEM_INDEX { HelpID = HID_HELP_TOOLBOXITEM_INDEX; }; -- cgit From 635f4fc3e86cb5c5bb49cbc1df8c9688b63a7ef6 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 7 Oct 2010 16:23:00 +0200 Subject: CWS changehid: some missing empty strings caused wrong offsets --- wizards/com/sun/star/wizards/common/HelpIds.java | 33 +++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/wizards/com/sun/star/wizards/common/HelpIds.java b/wizards/com/sun/star/wizards/common/HelpIds.java index 2cd0b8da86de..ad8faa2b2d42 100644 --- a/wizards/com/sun/star/wizards/common/HelpIds.java +++ b/wizards/com/sun/star/wizards/common/HelpIds.java @@ -118,6 +118,8 @@ public class HelpIds "", "", "", + "", + "", "HID:WIZARDS_HID_BG", // HID:34290 "HID:WIZARDS_HID_BG_BTN_OTHER", // HID:34291 "HID:WIZARDS_HID_BG_BTN_NONE", // HID:34292 @@ -552,7 +554,6 @@ public class HelpIds "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 @@ -776,6 +777,16 @@ public class HelpIds "", "", "", + "", + "", + "", + "", + "", + "", + "", + "", + "", + "", "HID:WIZARDS_HID_IS", // HID:41000 "", "HID:WIZARDS_HID_IS_BTN_NONE", // HID:41002 @@ -876,6 +887,26 @@ public class HelpIds "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 -- cgit From 1d00f1cf72d0951843dc22d803e2a93790171293 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 7 Oct 2010 17:50:23 +0200 Subject: CWS changehid: further adjustments for changed HIDs --- testautomation/global/sid/all.sid | 8 +- testautomation/global/sid/bars.sid | 2 +- testautomation/global/sid/e_all.sid | 12 +- testautomation/global/win/bars.win | 4 +- testautomation/global/win/dial_a_c.win | 50 ++--- testautomation/global/win/dial_d_h.win | 48 ++-- testautomation/global/win/dial_i_o.win | 62 ++--- testautomation/global/win/dial_p_s.win | 159 +++++++------ testautomation/global/win/dial_t_z.win | 48 ++-- testautomation/global/win/edia_a_c.win | 103 +++++---- testautomation/global/win/edia_d_h.win | 141 ++++++------ testautomation/global/win/edia_i_o.win | 36 +-- testautomation/global/win/edia_p_s.win | 78 +++---- testautomation/global/win/edia_t_z.win | 16 +- testautomation/global/win/etab_a_d.win | 250 ++++++++++----------- testautomation/global/win/etab_e_g.win | 86 +++---- testautomation/global/win/etab_h_o.win | 54 ++--- testautomation/global/win/etab_p_s.win | 48 ++-- testautomation/global/win/etab_t_z.win | 52 ++--- testautomation/global/win/etoolbox.win | 2 +- testautomation/global/win/spadmin.win | 206 ++++++++--------- testautomation/global/win/sys_dial.win | 90 ++++---- testautomation/global/win/tab_a_d.win | 76 +++---- testautomation/global/win/tab_t_z.win | 12 +- .../required/includes/c_upd_formatmenu.inc | 4 +- 25 files changed, 818 insertions(+), 829 deletions(-) mode change 100644 => 100755 testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc diff --git a/testautomation/global/sid/all.sid b/testautomation/global/sid/all.sid index ca4233437934..cd7dfce11ca0 100644 --- a/testautomation/global/sid/all.sid +++ b/testautomation/global/sid/all.sid @@ -11,7 +11,7 @@ ' ** die aber noch verwendet werden ** ' ** DateiNeu .uno:NewDoc -DateiLetzteVersion .uno:Reload SID_LASTVERSIONDOC +DateiLetzteVersion SID_RELOAD DateiVersenden .uno:SendMail DateiScannenQuelleAuswaehlen .uno:TwainSelect DateiScannenAnfordern .uno:TwainSelect @@ -44,7 +44,7 @@ DateiAllesSpeichern .uno:SaveAll DateiExportieren .uno:ExportTo DateiSendenDokumentAlseMail .uno:SendMail DateiVersionen .uno:VersionDialog -DateiNeuLaden .uno:Reload SID_LASTVERSIONDOC +DateiNeuLaden SID_RELOAD DateiEigenschaften .uno:SetDocumentProperties DateiDokumentvorlageSpeichern .uno:SaveAsTemplate DateiDokumentvorlageVerwalten .uno:Organizer @@ -52,7 +52,7 @@ DateiDokumentvorlageBearbeiten .uno:OpenTemplate DateiSeitenansicht .uno:PrintPreview DateiDrucken .uno:Print DateiDruckereinstellung .uno:PrinterSetup -DateiBeenden .uno:Quit +DateiBeenden SID_QUITAPP ' **** Writer DateiSendenGliederungAnPraesentation .uno:SendOutlineToStarImpress @@ -78,7 +78,7 @@ DateiDokumentAlsEMail .uno:SendMail ' **** Alle BearbeitenRueckgaengig .uno:Undo BearbeitenWiederholen .uno:Redo -BearbeitenLetzterBefehl .uno:RepeatAction +BearbeitenLetzterBefehl .uno:Repeat BearbeitenAusschneiden .uno:Cut BearbeitenKopieren .uno:Copy BearbeitenEinfuegen .uno:Paste diff --git a/testautomation/global/sid/bars.sid b/testautomation/global/sid/bars.sid index b4477a7eb8aa..227c3108277e 100644 --- a/testautomation/global/sid/bars.sid +++ b/testautomation/global/sid/bars.sid @@ -13,7 +13,7 @@ ' ** ' ** f�r alle FL_URL .uno:OpenUrl -FL_NeuLaden .uno:Reload +FL_NeuLaden SID_RELOAD FL_Bearbeiten .uno:EditDoc FL_Speichern .uno:Save FL_Verknuepfen .uno:AddBookmark diff --git a/testautomation/global/sid/e_all.sid b/testautomation/global/sid/e_all.sid index c8dd82f72992..8efe7443e8a3 100644 --- a/testautomation/global/sid/e_all.sid +++ b/testautomation/global/sid/e_all.sid @@ -21,17 +21,17 @@ FileAutopilotAddressDataSource .uno:AutoPilotAddressDataSource FirstTimeWizard service:com.sun.star.comp.desktop.FirstStart?start FileWizardsWebPage service:com.sun.star.wizards.web.CallWizard?start FileCloseAndReturn .uno:CloseDoc -FileSaveCopy .uno:SaveAs +FileSaveCopy SID_SAVEASDOC FileClose .uno:CloseDoc -FileSave .uno:Save -FileSaveAs .uno:SaveAs +FileSave SID_SAVEDOC +FileSaveAs SID_SAVEASDOC FileSaveAll .uno:SaveAll FileExport .uno:ExportTo FileExportAsPDF .uno:ExportToPDF FileSendDocumentAsEmail .uno:SendMail FileSendDocumentAsPDF .uno:SendMailDocAsPDF FileVersions .uno:VersionDialog -FileReload .uno:Reload SID_LASTVERSIONDOC +FileReload SID_RELOAD FileProperties .uno:SetDocumentProperties FileTemplatesOrganize .uno:Organizer FileTemplatesSave .uno:SaveAsTemplate @@ -40,7 +40,7 @@ FileTemplatesAddressbookSource .uno:AddressBookSource FilePageView .uno:PrintPreview FilePrint .uno:Print FilePrintersettings .uno:PrinterSetup -FileExit .uno:Quit +FileExit SID_QUITAPP ' **** Writer FileSendOutlineToPresentation .uno:SendOutlineToStarImpress @@ -59,7 +59,7 @@ FilePack .uno:PackAndGo ' **** All applications EditUndo .uno:Undo EditRedo .uno:Redo -EditRepeat .uno:RepeatAction +EditRepeat .uno:Repeat EditCut .uno:Cut EditCopy .uno:Copy EditDoc .uno:EditDoc diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win index 339e91be70a1..2f94a7f36e9c 100644 --- a/testautomation/global/win/bars.win +++ b/testautomation/global/win/bars.win @@ -1285,7 +1285,7 @@ ShowFormFunctions .uno:Config Save .uno:Save SaveAs .uno:SaveAs SortAscending .uno:Sortup -SortDescending .uno:Sortdown +SortDescending .uno:SortDown SortierenAb .uno:SortDescending SortierenAuf .uno:SortAscending SortOrder .uno:OrderCrit @@ -1338,7 +1338,7 @@ FormatSelection .uno:FormatSelection *ToolsCollectionBar .HelpId:insertcontrolsbar '------------------------------------------------------------------------- InsPushButton .uno:InsertPushbutton -InsCheckBox .uno:Checkbox +InsCheckBox .uno:CheckBox InsListBox .uno:InsertListbox InsFixedText .uno:InsertFixedText InsFrame .uno:Groupbox diff --git a/testautomation/global/win/dial_a_c.win b/testautomation/global/win/dial_a_c.win index 2fb5c1bd024b..01007b7d9e90 100644 --- a/testautomation/global/win/dial_a_c.win +++ b/testautomation/global/win/dial_a_c.win @@ -65,13 +65,13 @@ Lf sym:sw.RadioButton.20209.11 Auswahl sym:CUI_HID_SEARCHATTR_CTL_ATTR *Ausrichtung sym:.uno:ChangeAlignment -Links sym:starmath.RadioButton.20006.1 -Zentriert sym:starmath.RadioButton.20006.2 -Rechts sym:starmath.RadioButton.20006.3 +Links sym:sm.RadioButton.20006.1 +Zentriert sym:sm.RadioButton.20006.2 +Rechts sym:sm.RadioButton.20006.3 'Oben starmath:RadioButton:RID_ALIGNDIALOG:4 'Mitte starmath:RadioButton:RID_ALIGNDIALOG:5 'Unten starmath:RadioButton:RID_ALIGNDIALOG:6 -Standard sym:starmath.PushButton.20006.1 +Standard sym:sm.PushButton.20006.1 *AutoAbstractErzeugen sym:SW_HID_INSERT_ABSTRACT Ebenen sym:sw.NumericField.20208.5 @@ -213,8 +213,8 @@ Loeschen sym:sw.PushButton.21666.4 Umbenennen sym:sw.PushButton.21666.11 *BereicheSchuetzen sym:SW_HID_DLG_PASSWD_SECTION -PasswortName sym:sfx2.Edit.2316.14 -PasswortBestaetigen sym:sfx2.Edit.2316.16 +PasswortName sym:sfx.Edit.2316.14 +PasswortBestaetigen sym:sfx.Edit.2316.16 *Beschriftung sym:SW_HID_DLG_CAPTION sym:.uno:InsertCaptionDialog Kategorie sym:sw.ComboBox.21011.5 @@ -255,34 +255,34 @@ AnimationenZulassen sym:sd.CheckBox.20003.6 DiawechselAufHintergrund sym:sd.CheckBox.20003.7 PraesentationImmerImVordergrund sym:sd.CheckBox.20003.8 -*BMPOptionen sym:svtools.ModalDialog.16371 -Farbaufloesung sym:svtools.ListBox.16371.1 -RLEKodierung sym:svtools.CheckBox.16371.3 -Original sym:svtools.RadioButton.16371.1 -Aufloesung sym:svtools.RadioButton.16371.2 -DPI sym:svtools.ComboBox.16371.1 -Groesse sym:svtools.RadioButton.16371.3 -Breite sym:svtools.MetricField.16371.1 -Hoehe sym:svtools.MetricField.16371.2 +*BMPOptionen sym:svt.ModalDialog.16371 +Farbaufloesung sym:svt.ListBox.16371.1 +RLEKodierung sym:svt.CheckBox.16371.3 +Original sym:svt.RadioButton.16371.1 +Aufloesung sym:svt.RadioButton.16371.2 +DPI sym:svt.ComboBox.16371.1 +Groesse sym:svt.RadioButton.16371.3 +Breite sym:svt.MetricField.16371.1 +Hoehe sym:svt.MetricField.16371.2 *Browser sym:.uno:Beamer -*ChineseTranslation sym:svx.CB_USE_VARIANTS.300 +*ChineseTranslation sym:textconversiondlgs.ModalDialog.300 TChineseToSChinese sym:SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED SChineseToTChinese sym:SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL 'UseSARCharacter sym:SVX_HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS -TranslateCommonTerms sym:svx.CheckBox.300.2 -EditTerms sym:svx.PushButton.300.1 +TranslateCommonTerms sym:textconversiondlgs.CheckBox.300.2 +EditTerms sym:textconversiondlgs.PushButton.300.1 -*ChineseDictionary sym:svx.ModalDialog.301 +*ChineseDictionary sym:textconversiondlgs.ModalDialog.301 TChineseToSChinese sym:SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED SChineseToTChinese sym:SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL ReverseMapping sym:SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE -Term sym:svx.Edit.301.1 -Mapping sym:svx.Edit.301.2 -Property sym:svx.ListBox.301.1 +Term sym:textconversiondlgs.Edit.301.1 +Mapping sym:textconversiondlgs.Edit.301.2 +Property sym:textconversiondlgs.ListBox.301.1 SToTMappingContent sym:SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL TToSMappingContent sym:SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED -Add sym:svx.PushButton.301.1 -Modify sym:svx.PushButton.301.2 -Delete sym:svx.PushButton.301.3 +Add sym:textconversiondlgs.PushButton.301.1 +Modify sym:textconversiondlgs.PushButton.301.2 +Delete sym:textconversiondlgs.PushButton.301.3 diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win index 9ef74d6e5ad0..5a4a5d4361e6 100644 --- a/testautomation/global/win/dial_d_h.win +++ b/testautomation/global/win/dial_d_h.win @@ -88,15 +88,15 @@ Auswahl sym:EXTENSIONS_HID_SELECTION_TLB *DokumentSchuetzen sym:.uno:ToolProtectionDocument Passwort sym:SC_HID_PASSWD_DOC -Bestaetigung sym:sfx2.Edit.2316.16 -IstVerdeckt sym:sfx2.Edit.2316.12 +Bestaetigung sym:sfx.Edit.2316.16 +IstVerdeckt sym:sfx.Edit.2316.12 *DokumentVorlagen sym:.uno:SaveAsTemplate -NeueDokumentVorlage sym:sfx2.Edit.2054.7 -Bereiche sym:sfx2.ListBox.2054.2 -Vorlagen sym:sfx2.ListBox.2054.4 -Bearbeiten sym:sfx2.PushButton.2054.12 -Verwalten sym:sfx2.PushButton.2054.20 +NeueDokumentVorlage sym:sfx.Edit.2054.7 +Bereiche sym:sfx.ListBox.2054.2 +Vorlagen sym:sfx.ListBox.2054.4 +Bearbeiten sym:sfx.PushButton.2054.12 +Verwalten sym:sfx.PushButton.2054.20 *Drei_D_Effekte sym:.uno:Window3D Geometrie sym:svx.ImageButton.10209.2 @@ -231,13 +231,13 @@ Anfang sym:sd.ListBox.727.1 Ende sym:sd.ListBox.727.2 *DVVerwalten sym:.uno:Organizer -Befehle sym:sfx2.MenuButton.2055.105 -WelcheDatei sym:sfx2.PushButton.2055.3 +Befehle sym:sfx.MenuButton.2055.105 +WelcheDatei sym:sfx.PushButton.2055.3 ListeLinks sym:SFX2_HID_CTL_ORGANIZER_LEFT ListeRechts sym:SFX2_HID_CTL_ORGANIZER_RIGHT -PopuplisteLinks sym:sfx2.ListBox.2055.2 -PopuplisteRechts sym:sfx2.ListBox.2055.11 -AddressBook sym:sfx2.PushButton.2055.4 +PopuplisteLinks sym:sfx.ListBox.2055.2 +PopuplisteRechts sym:sfx.ListBox.2055.11 +AddressBook sym:sfx.PushButton.2055.4 *EinfuegenSpalten sym:.uno:InsertColumnDialog Anzahl sym:cui.NumericField.10156.2 @@ -270,11 +270,11 @@ Titel sym:sw.Edit.21105.7 EingabeText sym:sw.MultiLineEdit.21105.3 Weiter sym:sw.PushButton.21105.8 -*EMFOptionen sym:svtools.ModalDialog.16372 -Original sym:svtools.RadioButton.16372.1 -Groesse sym:svtools.RadioButton.16372.2 -Breite sym:svtools.MetricField.16372.1 -Hoehe sym:svtools.MetricField.16372.2 +*EMFOptionen sym:svt.ModalDialog.16372 +Original sym:svt.RadioButton.16372.1 +Groesse sym:svt.RadioButton.16372.2 +Breite sym:svt.MetricField.16372.1 +Hoehe sym:svt.MetricField.16372.2 *EPSOptionen sym:filter.ModalDialog.17408 VorschauTif sym:filter.CheckBox.17408.1 @@ -403,13 +403,13 @@ Loeschen sym:SW_HID_FLDVAR_DELETE *Filterauswahl sym:UUI_HID_DLG_FILTER_SELECT Filter sym:uui.ListBox.14510.31 -*FilterDlg sym:svtools.ModalDialog.16371 -Original sym:svtools.RadioButton.16371.1 -Aufloesung sym:svtools.RadioButton.16371.2 -Groesse sym:svtools.RadioButton.16371.3 -AufloesungDPI sym:svtools.ComboBox.16371.1 -Breite sym:svtools.MetricField.16371.1 -Hoehe sym:svtools.MetricField.16371.2 +*FilterDlg sym:svt.ModalDialog.16371 +Original sym:svt.RadioButton.16371.1 +Aufloesung sym:svt.RadioButton.16371.2 +Groesse sym:svt.RadioButton.16371.3 +AufloesungDPI sym:svt.ComboBox.16371.1 +Breite sym:svt.MetricField.16371.1 +Hoehe sym:svt.MetricField.16371.2 *Fontwork sym:.uno:FontWork KreisAuswahl sym:SVX_HID_FONTWORK_CTL_FORMS diff --git a/testautomation/global/win/dial_i_o.win b/testautomation/global/win/dial_i_o.win index 456b01556b61..35a5624234a4 100644 --- a/testautomation/global/win/dial_i_o.win +++ b/testautomation/global/win/dial_i_o.win @@ -47,16 +47,16 @@ Hinzufuegen sym:sd.PushButton.890.1 Entfernen sym:sd.PushButton.890.3 *InfofelderBearbeiten sym:SFX2_HID_DOCINFO_EDT -Name0 sym:sfx2.Edit.266.5 -Name1 sym:sfx2.Edit.266.7 -Name2 sym:sfx2.Edit.266.9 -Name3 sym:sfx2.Edit.266.11 +Name0 sym:sfx.Edit.266.5 +Name1 sym:sfx.Edit.266.7 +Name2 sym:sfx.Edit.266.9 +Name3 sym:sfx.Edit.266.11 *InfonamenBearbeiten sym:SFX2_HID_DOCINFO_EDT -Namen1 sym:sfx2.Edit.266.5 -Namen2 sym:sfx2.Edit.266.7 -Namen3 sym:sfx2.Edit.266.9 -Namen4 sym:sfx2.Edit.266.11 +Namen1 sym:sfx.Edit.266.5 +Namen2 sym:sfx.Edit.266.7 +Namen3 sym:sfx.Edit.266.9 +Namen4 sym:sfx.Edit.266.11 *InhaltEinfuegen sym:CUI_HID_PASTE_DLG AlsSymbol sym:cui.CheckBox.32001.12 @@ -105,10 +105,10 @@ Vorschau sym:sd.PushButton.654.1 +Interaktion TabInteraktion -*JPEGOptionen sym:svtools.ModalDialog.16481 -Qualitaet sym:svtools.NumericField.16481.1 -Graustufen sym:svtools.RadioButton.16481.1 -Echtfarben sym:svtools.RadioButton.16481.2 +*JPEGOptionen sym:svt.ModalDialog.16481 +Qualitaet sym:svt.NumericField.16481.1 +Graustufen sym:svt.RadioButton.16481.1 +Echtfarben sym:svt.RadioButton.16481.2 *Kommentar sym:CUI_HID_REDLINING_DLG KommentarText sym:CUI_HID_REDLINING_EDIT @@ -201,10 +201,10 @@ Benutzerfeld3 sym:SW_HID_AUTH_FIELD_CUSTOM3 Benutzerfeld4 sym:SW_HID_AUTH_FIELD_CUSTOM4 Benutzerfeld5 sym:SW_HID_AUTH_FIELD_CUSTOM5 -*Loeschbestaetigung sym:svtools.ModalDialog.16376 -Ja sym:svtools.PushButton.16376.4 -Alle sym:svtools.PushButton.16376.6 -Nein sym:svtools.PushButton.16376.5 +*Loeschbestaetigung sym:svt.ModalDialog.16376 +Ja sym:svt.PushButton.16376.4 +Alle sym:svt.PushButton.16376.6 +Nein sym:svt.PushButton.16376.5 *Makro sym:basctl.ModalDialog.14900 Makroname sym:basctl.Edit.14900.5 @@ -323,7 +323,7 @@ ZugeordnetZuButton sym:sc.ImageButton.25626.16 *NavigationsFenster sym:SW_HID_INSERT_CTRL Auswahl sym:SW_HID_NAVI_VS -*Navigator sym:.uno:Navigator +*Navigator sym:SFXDOCKINGWINDOW_Navigator *NavigatorCalc sym:SC_HID_SC_NAVIGATOR NavigatorToolboxCalc sym:SC_HID_SC_NAVIPI_TOOLBOX @@ -388,20 +388,20 @@ NachObenVerschieben sym:SW_HID_NAVI_TBX23 Inhaltsansicht sym:SW_HID_NAVI_TBX8 *Neu sym:.uno:NewDoc -Bereiche sym:sfx2.ListBox.2053.21 -Vorlagen sym:sfx2.ListBox.2053.52 -Zusaetze sym:sfx2.MoreButton.2053.32 -Vorschau sym:sfx2.CheckBox.2053.51 -Titel sym:sfx2.Edit.2053.56 -Thema sym:sfx2.Edit.2053.55 -Schluesselworte sym:sfx2.Edit.2053.61 -Beschreibung sym:sfx2.MultiLineEdit.2053.71 -Text sym:sfx2.CheckBox.2053.33 -Frame sym:sfx2.CheckBox.2053.34 -Pages sym:sfx2.CheckBox.2053.35 -Numbering sym:sfx2.CheckBox.2053.36 -Overwrite sym:sfx2.CheckBox.2053.37 -Fromfile sym:sfx2.PushButton.2053.38 +Bereiche sym:sfx.ListBox.2053.21 +Vorlagen sym:sfx.ListBox.2053.52 +Zusaetze sym:sfx.MoreButton.2053.32 +Vorschau sym:sfx.CheckBox.2053.51 +Titel sym:sfx.Edit.2053.56 +Thema sym:sfx.Edit.2053.55 +Schluesselworte sym:sfx.Edit.2053.61 +Beschreibung sym:sfx.MultiLineEdit.2053.71 +Text sym:sfx.CheckBox.2053.33 +Frame sym:sfx.CheckBox.2053.34 +Pages sym:sfx.CheckBox.2053.35 +Numbering sym:sfx.CheckBox.2053.36 +Overwrite sym:sfx.CheckBox.2053.37 +Fromfile sym:sfx.PushButton.2053.38 *NeueBibliothek sym:basctl.ModalDialog.14892 Bibliotheksname sym:basctl.Edit.14892.41 diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win index 1b86ca492a7a..71b07326a077 100644 --- a/testautomation/global/win/dial_p_s.win +++ b/testautomation/global/win/dial_p_s.win @@ -1,7 +1,7 @@ *Passwort sym:SFX2_HID_PASSWD -UserName sym:sfx2.Edit.2316.12 -PasswortName sym:sfx2.Edit.2316.14 -PasswortBestaetigen sym:sfx2.Edit.2316.16 +UserName sym:sfx.Edit.2316.12 +PasswortName sym:sfx.Edit.2316.14 +PasswortBestaetigen sym:sfx.Edit.2316.16 *PasswordFileOpen sym:UUI_HID_DLG_PASSWORD_UUI PasswortName sym:uui.Edit.14522.2 @@ -16,8 +16,8 @@ PasswordToModifyConfirm sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD *PasswortEingeben sym:.uno:ProtectTraceChangeMode SchutzAufheben sym:SC_HID_CHG_PROTECT -PasswortEingabe sym:sfx2.Edit.2316.12 -PasswortBestaetigen sym:sfx2.Edit.2316.16 +PasswortEingabe sym:sfx.Edit.2316.12 +PasswortBestaetigen sym:sfx.Edit.2316.16 *PBMOptionen sym:filter.ModalDialog.17409 Binaer sym:filter.RadioButton.17409.1 @@ -79,9 +79,9 @@ DateiUrl sym:cui.Edit.32008.10 Durchsuchen sym:cui.PushButton.32008.11 Optionen sym:cui.MultiLineEdit.32008.20 -*PNGOptionen sym:svtools.ModalDialog.16486 -Kompression sym:svtools.NumericField.16486.1 -Interlaced sym:svtools.CheckBox.16486.1 +*PNGOptionen sym:svt.ModalDialog.16486 +Kompression sym:svt.NumericField.16486.1 +Interlaced sym:svt.CheckBox.16486.1 *PPMOptionen sym:filter.ModalDialog.17411 Binaer sym:filter.RadioButton.17411.1 @@ -148,30 +148,30 @@ StartWert sym:sc.Edit.25623.52 EndWert sym:sc.Edit.25623.49 Inkrement sym:sc.Edit.25623.39 -*Schriften sym:starmath.ModalDialog.20002 -Schriftart sym:starmath.ComboBox.20002.1 -Fett sym:starmath.CheckBox.20002.1 -Kursiv sym:starmath.CheckBox.20002.2 +*Schriften sym:sm.ModalDialog.20002 +Schriftart sym:sm.ComboBox.20002.1 +Fett sym:sm.CheckBox.20002.1 +Kursiv sym:sm.CheckBox.20002.2 *Schriftarten sym:.uno:ChangeFont -Variablen sym:starmath.ListBox.20004.1 -Funktionen sym:starmath.ListBox.20004.2 -Zahlen sym:starmath.ListBox.20004.3 -Text sym:starmath.ListBox.20004.4 -Serif sym:starmath.ListBox.20004.5 -Sans sym:starmath.ListBox.20004.6 -Fixed sym:starmath.ListBox.20004.7 -Aendern sym:starmath.MenuButton.20004.1 -Standard sym:starmath.PushButton.20004.2 +Variablen sym:sm.ListBox.20004.1 +Funktionen sym:sm.ListBox.20004.2 +Zahlen sym:sm.ListBox.20004.3 +Text sym:sm.ListBox.20004.4 +Serif sym:sm.ListBox.20004.5 +Sans sym:sm.ListBox.20004.6 +Fixed sym:sm.ListBox.20004.7 +Aendern sym:sm.MenuButton.20004.1 +Standard sym:sm.PushButton.20004.2 *Schriftgroessen sym:.uno:ChangeFontSize -BasisGroesse sym:starmath.MetricField.20003.1 -TextGroesse sym:starmath.MetricField.20003.4 -Indizes sym:starmath.MetricField.20003.5 -Funktionen sym:starmath.MetricField.20003.6 -Operatoren sym:starmath.MetricField.20003.7 -Grenzen sym:starmath.MetricField.20003.8 -Standard sym:starmath.PushButton.20003.1 +BasisGroesse sym:sm.MetricField.20003.1 +TextGroesse sym:sm.MetricField.20003.4 +Indizes sym:sm.MetricField.20003.5 +Funktionen sym:sm.MetricField.20003.6 +Operatoren sym:sm.MetricField.20003.7 +Grenzen sym:sm.MetricField.20003.8 +Standard sym:sm.PushButton.20003.1 *ScriptEinfuegen sym:sw.ModalDialog.21110 Scripttyp sym:sw.Edit.21110.11 @@ -205,14 +205,14 @@ HintergrundseiteAustauschen sym:sd.CheckBox.868.1 DeleteUnusedBackgrounds sym:sd.CheckBox.868.2 *SeitenvorlageLaden sym:SW_HID_FILEDLG_LOADTEMPLATE -Bereiche sym:sfx2.ListBox.2053.21 -Beschreibung sym:sfx2.MultiLineEdit.2053.71 -Schluesselworte sym:sfx2.Edit.2053.61 -Thema sym:sfx2.Edit.2053.55 -Titel sym:sfx2.Edit.2053.56 -Vorlagen sym:sfx2.ListBox.2053.52 -Vorschau sym:sfx2.CheckBox.2053.51 -Zusaetze sym:sfx2.MoreButton.2053.32 +Bereiche sym:sfx.ListBox.2053.21 +Beschreibung sym:sfx.MultiLineEdit.2053.71 +Schluesselworte sym:sfx.Edit.2053.61 +Thema sym:sfx.Edit.2053.55 +Titel sym:sfx.Edit.2053.56 +Vorlagen sym:sfx.ListBox.2053.52 +Vorschau sym:sfx.CheckBox.2053.51 +Zusaetze sym:sfx.MoreButton.2053.32 *Serienbrief sym:.uno:MergeDialog DatensaetzeAlle sym:sw.RadioButton.22758.2 @@ -284,37 +284,37 @@ Spalte sym:sw.NumericField.21456.2 Breite sym:sw.MetricField.21456.4 *Spaltenzuordnung sym:EXTENSIONS_HID_DLG_MAPPING -Kuerzel sym:extensions.ListBox.15701.6 -Literaturart sym:extensions.ListBox.15701.9 -Autor sym:extensions.ListBox.15701.15 -Titel sym:extensions.ListBox.15701.17 -Jahr sym:extensions.ListBox.15701.21 -ISBN sym:extensions.ListBox.15701.23 -Buchtitel sym:extensions.ListBox.15701.25 -Kapitel sym:extensions.ListBox.15701.27 -Ausgabe sym:extensions.ListBox.15701.29 -Herausgeber sym:extensions.ListBox.15701.31 -Ausgabeart sym:extensions.ListBox.15701.33 -Institution sym:extensions.ListBox.15701.35 -Zeitschrift sym:extensions.ListBox.15701.37 -Monat sym:extensions.ListBox.15701.19 -Notiz sym:extensions.ListBox.15701.39 -Anmerkung sym:extensions.ListBox.15701.13 -Nummer sym:extensions.ListBox.15701.41 -Organisation sym:extensions.ListBox.15701.43 -Seiten sym:extensions.ListBox.15701.45 -Verlag sym:extensions.ListBox.15701.47 -Adresse sym:extensions.ListBox.15701.11 -Hochschule sym:extensions.ListBox.15701.49 -Serie sym:extensions.ListBox.15701.51 -ArtDesReport sym:extensions.ListBox.15701.53 -Band sym:extensions.ListBox.15701.55 -URL sym:extensions.ListBox.15701.57 -Benutzerfeld1 sym:extensions.ListBox.15701.59 -Benutzerfeld2 sym:extensions.ListBox.15701.61 -Benutzerfeld3 sym:extensions.ListBox.15701.63 -Benutzerfeld4 sym:extensions.ListBox.15701.65 -Benutzerfeld5 sym:extensions.ListBox.15701.67 +Kuerzel sym:bib.ListBox.15701.6 +Literaturart sym:bib.ListBox.15701.9 +Autor sym:bib.ListBox.15701.15 +Titel sym:bib.ListBox.15701.17 +Jahr sym:bib.ListBox.15701.21 +ISBN sym:bib.ListBox.15701.23 +Buchtitel sym:bib.ListBox.15701.25 +Kapitel sym:bib.ListBox.15701.27 +Ausgabe sym:bib.ListBox.15701.29 +Herausgeber sym:bib.ListBox.15701.31 +Ausgabeart sym:bib.ListBox.15701.33 +Institution sym:bib.ListBox.15701.35 +Zeitschrift sym:bib.ListBox.15701.37 +Monat sym:bib.ListBox.15701.19 +Notiz sym:bib.ListBox.15701.39 +Anmerkung sym:bib.ListBox.15701.13 +Nummer sym:bib.ListBox.15701.41 +Organisation sym:bib.ListBox.15701.43 +Seiten sym:bib.ListBox.15701.45 +Verlag sym:bib.ListBox.15701.47 +Adresse sym:bib.ListBox.15701.11 +Hochschule sym:bib.ListBox.15701.49 +Serie sym:bib.ListBox.15701.51 +ArtDesReport sym:bib.ListBox.15701.53 +Band sym:bib.ListBox.15701.55 +URL sym:bib.ListBox.15701.57 +Benutzerfeld1 sym:bib.ListBox.15701.59 +Benutzerfeld2 sym:bib.ListBox.15701.61 +Benutzerfeld3 sym:bib.ListBox.15701.63 +Benutzerfeld4 sym:bib.ListBox.15701.65 +Benutzerfeld5 sym:bib.ListBox.15701.67 *SpalteOptimaleBreite sym:.uno:SetOptimalColumnWidth Extra sym:sc.MetricField.25709.1 HID_SC_MTRIN_VAL @@ -365,25 +365,18 @@ Persistent sym:sc.CheckBox.25612.12 *Statusbar sym:FWK_HID_STATUSBAR -'*Standardbrowser extensions:ModalDialog:MD_PROTCHK_DIALOG -'StarOfficeVerwenden extensions:RadioButton:MD_PROTCHK_DIALOG:RB_STAROFFICE -'KeineAenderungen extensions:RadioButton:MD_PROTCHK_DIALOG:RB_OTHER -'ImmerUeberpruefen extensions:CheckBox:MD_PROTCHK_DIALOG:CB_PERFORM -'Zusaetze extensions:PushButton:MD_PROTCHK_DIALOG:BT_DETAILS -'Protokollauswahl HID_PROTOCOLS - +Stylist Gestalter -*SVMOptionen sym:svtools.ModalDialog.16372 -Original sym:svtools.RadioButton.16372.1 -Groesse sym:svtools.RadioButton.16372.2 -Breite sym:svtools.MetricField.16372.1 -Hoehe sym:svtools.MetricField.16372.2 +*SVMOptionen sym:svt.ModalDialog.16372 +Original sym:svt.RadioButton.16372.1 +Groesse sym:svt.RadioButton.16372.2 +Breite sym:svt.MetricField.16372.1 +Hoehe sym:svt.MetricField.16372.2 -*SymboleMath sym:starmath.ModalDialog.20008 -Symbolset sym:starmath.ListBox.20008.1 -Bearbeiten sym:starmath.PushButton.20008.1 -Uebernehmen sym:starmath.PushButton.20008.2 +*SymboleMath sym:sm.ModalDialog.20008 +Symbolset sym:sm.ListBox.20008.1 +Bearbeiten sym:sm.PushButton.20008.1 +Uebernehmen sym:sm.PushButton.20008.2 Symbols sym:STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW *SzenarioAnlegen sym:sc.ModalDialog.25643 sym:.uno:ScenarioManager diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win index 3284682fa6ae..89ce339186dd 100644 --- a/testautomation/global/win/dial_t_z.win +++ b/testautomation/global/win/dial_t_z.win @@ -56,8 +56,8 @@ NachRechts sym:sc.RadioButton.25618.39 *TabelleSchuetzen sym:.uno:Protect Passwort sym:SC_HID_PASSWD_TABLE -Bestaetigung sym:sfx2.Edit.2316.16 -IstVerdeckt sym:sfx2.Edit.2316.12 +Bestaetigung sym:sfx.Edit.2316.16 +IstVerdeckt sym:sfx.Edit.2316.12 *TabelleUmbenennen sym:.uno:Name TabellenName sym:SC_HID_SC_RENAME_NAME sym:sc.Edit.25620.10 @@ -184,17 +184,17 @@ Loesen sym:cui.PushButton.32002.38 *VersendenMonitor sym:SW_HID_MERGE_PRINTMONITOR -*Versionen sym:sfx2.ModalDialog.2377 -Speichern sym:sfx2.PushButton.2377.2 -ImmerVersionSpeichern sym:sfx2.CheckBox.2377.3 -Anzeigen sym:sfx2.PushButton.2377.13 -Loeschen sym:sfx2.PushButton.2377.5 -Oeffnen sym:sfx2.PushButton.2377.6 -Vergleichen sym:sfx2.PushButton.2377.17 +*Versionen sym:sfx.ModalDialog.2377 +Speichern sym:sfx.PushButton.2377.2 +ImmerVersionSpeichern sym:sfx.CheckBox.2377.3 +Anzeigen sym:sfx.PushButton.2377.13 +Loeschen sym:sfx.PushButton.2377.5 +Oeffnen sym:sfx.PushButton.2377.6 +Vergleichen sym:sfx.PushButton.2377.17 -*VersionskommentarEingeben sym:sfx2.ModalDialog.2378 -Kommentar sym:sfx2.MultiLineEdit.2378.14 -Schliessen sym:sfx2.PushButton.2378.8 +*VersionskommentarEingeben sym:sfx.ModalDialog.2378 +Kommentar sym:sfx.MultiLineEdit.2378.14 +Schliessen sym:sfx.PushButton.2378.8 *VerteilenDlg sym:CUI_HID_PAGE_DISTRIBUTE KeineHorizontal sym:cui.RadioButton.10236.2 @@ -236,16 +236,16 @@ Naechster sym:SW_HID_INSERT_IDX_MRK_NEXT Vorheriger sym:SW_HID_INSERT_IDX_MRK_PREV *VorlageErzeugen sym:.uno:StyleNewByExample SID_TEMPLATE_NEW_BY_EXAMPLE -Vorlagenname sym:sfx2.ComboBox.2323.1 +Vorlagenname sym:sfx.ComboBox.2323.1 *Vorlagenkatalog sym:.uno:StyleCatalog -Vorlagen sym:sfx2.ListBox.1461.10 +Vorlagen sym:sfx.ListBox.1461.10 Ansicht sym:SFX2_HID_TEMPLATE_FMT -Bereich sym:sfx2.ListBox.1461.8 -Neu sym:sfx2.PushButton.1461.6 -Aendern sym:sfx2.PushButton.1461.5 -Loeschen sym:sfx2.PushButton.1461.4 -Verwalten sym:sfx2.PushButton.1461.3 +Bereich sym:sfx.ListBox.1461.8 +Neu sym:sfx.PushButton.1461.6 +Aendern sym:sfx.PushButton.1461.5 +Loeschen sym:sfx.PushButton.1461.4 +Verwalten sym:sfx.PushButton.1461.3 *Vorschau sym:.uno:PreviewWindow @@ -261,11 +261,11 @@ Neu sym:sw.PushButton.21666.3 Loeschen sym:sw.PushButton.21666.4 Umbenennen sym:sw.PushButton.21666.11 -*WMFOptionen sym:svtools.ModalDialog.16372 -Original sym:svtools.RadioButton.16372.1 -Groesse sym:svtools.RadioButton.16372.2 -Breite sym:svtools.MetricField.16372.1 -Hoehe sym:svtools.MetricField.16372.2 +*WMFOptionen sym:svt.ModalDialog.16372 +Original sym:svt.RadioButton.16372.1 +Groesse sym:svt.RadioButton.16372.2 +Breite sym:svt.MetricField.16372.1 +Hoehe sym:svt.MetricField.16372.2 *Zahlenformat sym:CUI_HID_NUMBERFORMAT Kategorie sym:cui.ListBox.10041.9 diff --git a/testautomation/global/win/edia_a_c.win b/testautomation/global/win/edia_a_c.win index 3335ebef64a3..647de10e9357 100644 --- a/testautomation/global/win/edia_a_c.win +++ b/testautomation/global/win/edia_a_c.win @@ -2,14 +2,14 @@ AreaEditField sym:sc.Edit.25729.11 ShrinkButton sym:sc.ImageButton.25729.12 -*ActivationOrder sym:extensions.ModalDialog.1001 +*ActivationOrder sym:pcr.ModalDialog.1001 ControlList sym:EXTENSIONS_HID_PROP_TABORDER_CONTROLS -MoveUp sym:extensions.PushButton.1001.1 -MoveDown sym:extensions.PushButton.1001.2 -AutoOrder sym:extensions.PushButton.1001.3 +MoveUp sym:pcr.PushButton.1001.1 +MoveDown sym:pcr.PushButton.1001.2 +AutoOrder sym:pcr.PushButton.1001.3 -*AddBookmark sym:sfx2.ModalDialog.620 -Bookmarkname sym:sfx2.Edit.620.11 +*AddBookmark sym:sfx.ModalDialog.620 +Bookmarkname sym:sfx.Edit.620.11 *AddConditionDLG sym:SVX_HID_XFORMS_ADDCONDITION_DLG Condition sym:svx.MultiLineEdit.18013.11 @@ -24,22 +24,22 @@ AddNewControl sym:BASCTL_HID_BASICIDE_ADDNEW_CONTROL *AddTables sym:DBACCESS_HID_DLG_JOIN_TABADD TableName sym:DBACCESS_HID_JOINSH_ADDTAB_TABLELIST -AddTable sym:dbaccess.PushButton.19214.1 -Tables sym:dbaccess.RadioButton.19214.1 -Queries sym:dbaccess.RadioButton.19214.2 +AddTable sym:dbu.PushButton.19214.1 +Tables sym:dbu.RadioButton.19214.1 +Queries sym:dbu.RadioButton.19214.2 QueryName sym:DBACCESS_HID_JOINSH_ADDTAB_QUERYLIST CloseDlg sym:DBACCESS_HID_JOINSH_ADDTAB_CLOSE -*AddressBookSource sym:svtools.ModalDialog.16484 -DataSource sym:svtools.ComboBox.16484.3 -Administrate sym:svtools.PushButton.16484.4 -Table sym:svtools.ComboBox.16484.6 +*AddressBookSource sym:svt.ModalDialog.16484 +DataSource sym:svt.ComboBox.16484.3 +Administrate sym:svt.PushButton.16484.4 +Table sym:svt.ComboBox.16484.6 *AddressSourceAutopilot sym:EXTENSIONS_HID_ABSPILOT -TabAdditionalSettings sym:extensions.TabPage.19701 -TabAddressDataSourceAutoPilot sym:extensions.TabPage.19700 -TabDataSourceName sym:extensions.TabPage.19704 -TabSelectTable sym:extensions.TabPage.19721 +TabAdditionalSettings sym:abp.TabPage.19701 +TabAddressDataSourceAutoPilot sym:abp.TabPage.19700 +TabDataSourceName sym:abp.TabPage.19704 +TabSelectTable sym:abp.TabPage.19721 CancelButton sym:EXTENSIONS_HID_ABSPILOT_CANCEL BackButton sym:EXTENSIONS_HID_ABSPILOT_PREVIOUS NextButton sym:EXTENSIONS_HID_ABSPILOT_NEXT @@ -54,12 +54,11 @@ Ignoreprivileges sym:DBACCESS_HID_DSADMIN_IGNOREDRIVER_PRIV HostName sym:DBACCESS_HID_DSADMIN_HOSTNAME PortNumber sym:DBACCESS_HID_DSADMIN_PORTNUMBER TabControl sym:DBACCESS_HID_DSADMIN_TABCONTROL -'TabPage2 dbaccess:TabPage:PAGE_DS_ADABAS_SETTINGS -TabGeneratedValues sym:dbaccess.TabPage.19222 +TabGeneratedValues sym:dbu.TabPage.19222 RetrieveGeneratedValues sym:DBACCESS_HID_DSADMIN_AUTORETRIEVEENABLED AutoIncrementStatement sym:DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE QueryGeneratedValues sym:DBACCESS_HID_DSADMIN_RETRIEVE_AUTO -AdvancedSettingsSpecial sym:dbaccess.TabPage.19223 +AdvancedSettingsSpecial sym:dbu.TabPage.19223 DisplayVersionColumns sym:DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL EnableOuterJoin sym:DBACCESS_HID_DSADMIN_ENABLEOUTERJOIN CheckRequiredFields sym:DBACCESS_HID_DSADMIN_CHECK_REQUIRED_FIELDS @@ -69,7 +68,7 @@ CheckRequiredFields sym:DBACCESS_HID_DSADMIN_CHECK_REQUIRED_FIELDS AgingDegree sym:cui.MetricField.10334.2 *AlienWarning sym:SFX2_HID_WARNING_ALIENFORMAT -DoNotShowAgain sym:sfx2.CheckBox.2308.16 +DoNotShowAgain sym:sfx.CheckBox.2308.16 *AppendLibraries sym:basctl.ModalDialog.14890 Libraries sym:BASCTL_HID_BASICIDE_LIBSDLG_TREE @@ -174,15 +173,15 @@ NextButton sym:WIZARDS_HID_FAXWIZARD_NEXT FinishButton sym:WIZARDS_HID_FAXWIZARD_CREATE CancelButton sym:WIZARDS_HID_FAXWIZARD_CANCEL -*AutopilotGroupElement sym:extensions.ModalDialog.19721 +*AutopilotGroupElement sym:dbp.ModalDialog.19721 BackButton sym:EXTENSIONS_HID_GROUPWIZARD_PREVIOUS NextButton sym:EXTENSIONS_HID_GROUPWIZARD_NEXT CancelButton sym:EXTENSIONS_HID_GROUPWIZARD_CANCEL CreateButton sym:EXTENSIONS_HID_GROUPWIZARD_FINISH -TabGroupBoxData sym:extensions.TabPage.19722 -TabDefaultFieldSelection sym:extensions.TabPage.19723 -TabDatabaseValues sym:extensions.TabPage.19724 -TabCreateOptionGroup sym:extensions.TabPage.19726 +TabGroupBoxData sym:dbp.TabPage.19722 +TabDefaultFieldSelection sym:dbp.TabPage.19723 +TabDatabaseValues sym:dbp.TabPage.19724 +TabCreateOptionGroup sym:dbp.TabPage.19726 *AutopilotLetter sym:WIZARDS_HID_LTRWIZARD Business sym:WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER @@ -241,18 +240,18 @@ CancelButton sym:WIZARDS_HID_LTRWIZARD_CANCEL -*AutoPilotListComboBox sym:extensions.ModalDialog.19722 -TabListBoxData sym:extensions.TabPage.19721 -TabTableSelection sym:extensions.TabPage.19727 -TabFieldLink sym:extensions.TabPage.19729 -TabDatabaseField sym:extensions.TabPage.19725 +*AutoPilotListComboBox sym:dbp.ModalDialog.19722 +TabListBoxData sym:dbp.TabPage.19721 +TabTableSelection sym:dbp.TabPage.19727 +TabFieldLink sym:dbp.TabPage.19729 +TabDatabaseField sym:dbp.TabPage.19725 BackButton sym:EXTENSIONS_HID_LISTWIZARD_PREVIOUS NextButton sym:EXTENSIONS_HID_LISTWIZARD_NEXT CancelButton sym:EXTENSIONS_HID_LISTWIZARD_CANCEL CreateButton sym:EXTENSIONS_HID_LISTWIZARD_FINISH -*AutopilotTableElement sym:extensions.ModalDialog.19723 -TabTableFieldSelection sym:extensions.TabPage.19730 +*AutopilotTableElement sym:dbp.ModalDialog.19723 +TabTableFieldSelection sym:dbp.TabPage.19730 BackButton sym:EXTENSIONS_HID_GRIDWIZARD_PREVIOUS NextButton sym:EXTENSIONS_HID_GRIDWIZARD_NEXT CancelButton sym:EXTENSIONS_HID_GRIDWIZARD_CANCEL @@ -336,23 +335,23 @@ Pass sym:basctl.NumericField.14930.10 Import sym:cui.PushButton.390.397 *ChangePassword sym:DBACCESS_HID_DLG_PASSWORD -OldPassword sym:dbaccess.Edit.19223.19 -Password sym:dbaccess.Edit.19223.21 -ConfirmPassword sym:dbaccess.Edit.19223.23 +OldPassword sym:dbu.Edit.19223.19 +Password sym:dbu.Edit.19223.21 +ConfirmPassword sym:dbu.Edit.19223.23 *ChartType sym:CHART2_HID_DIAGRAM_TYPE ChooseType sym:CHART2_HID_SCH_CTL_TYPE Variant sym:CHART2_HID_SCH_CTL_VARIANT -XAxisWithCategories sym:chart2.CheckBox.910.1 -Look3D sym:chart2.CheckBox.910.2 -Scheme3D sym:chart2.ListBox.910.1 +XAxisWithCategories sym:chartcontroller.CheckBox.910.1 +Look3D sym:chartcontroller.CheckBox.910.2 +Scheme3D sym:chartcontroller.ListBox.910.1 BarColumnShape sym:CHART2_HID_SCH_LB_BAR_GEOMETRY -StackSeries sym:chart2.CheckBox.910.3 -Ontop sym:chart2.RadioButton.910.2 -Percent sym:chart2.RadioButton.910.3 -Deep sym:chart2.RadioButton.910.4 -SmoothLines sym:chart2.CheckBox.910.4 -SmoothLineProperties sym:chart2.PushButton.910.1 +StackSeries sym:chartcontroller.CheckBox.910.3 +Ontop sym:chartcontroller.RadioButton.910.2 +Percent sym:chartcontroller.RadioButton.910.3 +Deep sym:chartcontroller.RadioButton.910.4 +SmoothLines sym:chartcontroller.CheckBox.910.4 +SmoothLineProperties sym:chartcontroller.PushButton.910.1 NumberOfLines sym:CHART2_HID_SCH_NUM_OF_LINES *ChartWizard sym:CHART2_HID_SCH_CHART_AUTO_FORMAT @@ -439,14 +438,14 @@ BackBtn sym:DBACCESS_HID_DBWIZ_PREVIOUS CreateBtn sym:DBACCESS_HID_DBWIZ_FINISH NextBtn sym:DBACCESS_HID_DBWIZ_NEXT -*CopyDatabaseTable sym:dbaccess.ModalDialog.19216 -Back sym:dbaccess.PushButton.19216.10 -NextBt sym:dbaccess.PushButton.19216.9 +*CopyDatabaseTable sym:dbu.ModalDialog.19216 +Back sym:dbu.PushButton.19216.10 +NextBt sym:dbu.PushButton.19216.9 -*ConfirmDelete sym:svtools.ModalDialog.16376 -Delete sym:svtools.PushButton.16376.4 -DeleteAll sym:svtools.PushButton.16376.6 -DoNotDelete sym:svtools.PushButton.16376.5 +*ConfirmDelete sym:svt.ModalDialog.16376 +Delete sym:svt.PushButton.16376.4 +DeleteAll sym:svt.PushButton.16376.6 +DoNotDelete sym:svt.PushButton.16376.5 *CopyToDialog sym:SW_HID_MM_COPYTO CC sym:sw.Edit.22073.43 diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index 712ea6e2f6fd..6535e13de446 100644 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -13,14 +13,13 @@ DatabaseTablesView sym:DBACCESS_HID_APP_TABLE_TREE *DatabaseProperties sym:DBACCESS_HID_DSADMIN_DIALOG TabControl sym:DBACCESS_HID_DSADMIN_TABCONTROL -TabConnection sym:dbaccess.TabPage.19206 -'URL dbaccess:Edit:PAGE_CONNECTION:ET_CONNECTURL +TabConnection sym:dbu.TabPage.19206 Browse sym:DBACCESS_HID_DSADMIN_BROWSECONN -Username sym:dbaccess.Edit.19206.1 -PasswordRequired sym:dbaccess.CheckBox.19206.1 +Username sym:dbu.Edit.19206.1 +PasswordRequired sym:dbu.CheckBox.19206.1 DriverClass sym:DBACCESS_HID_DSADMIN_DRIVERCLASS -TestDriverClass sym:dbaccess.PushButton.19206.1 -TestConnection sym:dbaccess.PushButton.19206.2 +TestDriverClass sym:dbu.PushButton.19206.1 +TestConnection sym:dbu.PushButton.19206.2 Reset sym:SFX2_HID_TABDLG_RESET_BTN TabdBase sym:DBACCESS_HID_DSADMIN_PAGE_DBASE TabTextBase sym:DBACCESS_HID_DSADMIN_PAGE_TEXT @@ -34,12 +33,12 @@ FinishBtn sym:DBACCESS_HID_DBWIZ_FINISH CreateNewDatabase sym:DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE DatabaseType sym:DBACCESS_HID_DSADMIN_DSTYPE dBasePath sym:DBACCESS_HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION -DocumentList sym:dbaccess.ListBox.19200.3 +DocumentList sym:dbu.ListBox.19200.3 LDAPHostName sym:DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER BaseDN sym:DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN NextBtn sym:DBACCESS_HID_DBWIZ_NEXT -OpenBtn sym:dbaccess.PushButton.19200.6 -OpenExistingDoc sym:dbaccess.RadioButton.19200.3 +OpenBtn sym:dbu.PushButton.19200.6 +OpenExistingDoc sym:dbu.RadioButton.19200.3 PasswordRequired sym:DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED SpreadsheetPath sym:DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH TextPath sym:DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE @@ -72,10 +71,10 @@ Tables sym:CHART2_HID_SCH_CTL_DATA DataSeriesLabel sym:CHART2_HID_SCH_DATA_SERIES_LABEL *DigitalSignature sym:XMLSECURITY_HID_XMLSEC_DLG_DIGSIG -ViewCertificate sym:xmlsecurity.PushButton.1000.55 +ViewCertificate sym:xmlsec.PushButton.1000.55 CertificateList sym:XMLSECURITY_HID_XMLSEC_CTRL_SIGNATURESDLG -Add sym:xmlsecurity.PushButton.1000.2 -Remove sym:xmlsecurity.PushButton.1000.3 +Add sym:xmlsec.PushButton.1000.2 +Remove sym:xmlsec.PushButton.1000.3 *DuplicateNameWarning sym:CUI_HID_WARN_NAME_DUPLICATE @@ -84,56 +83,56 @@ AllListEntrys sym:sw.ListBox.21112.2 NextListEntry sym:sw.PushButton.21112.5 EditListEntry sym:sw.PushButton.21112.7 -*EditSymbols sym:starmath.ModalDialog.20009 -OldSymbol sym:starmath.ComboBox.20009.1 -OldSymbolSet sym:starmath.ComboBox.20009.2 -Symbol sym:starmath.ComboBox.20009.4 -SymbolSet sym:starmath.ComboBox.20009.5 -Font sym:starmath.ListBox.20009.1 -Subset sym:starmath.ListBox.20009.111 -Typeface sym:starmath.ComboBox.20009.3 -Add sym:starmath.PushButton.20009.1 -Modify sym:starmath.PushButton.20009.2 -Delete sym:starmath.PushButton.20009.3 +*EditSymbols sym:sm.ModalDialog.20009 +OldSymbol sym:sm.ComboBox.20009.1 +OldSymbolSet sym:sm.ComboBox.20009.2 +Symbol sym:sm.ComboBox.20009.4 +SymbolSet sym:sm.ComboBox.20009.5 +Font sym:sm.ListBox.20009.1 +Subset sym:sm.ListBox.20009.111 +Typeface sym:sm.ComboBox.20009.3 +Add sym:sm.PushButton.20009.1 +Modify sym:sm.PushButton.20009.2 +Delete sym:sm.PushButton.20009.3 Symbols sym:STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW -*ExecuteSQLCommand sym:dbaccess.ModalDialog.19222 -CommandToExecute sym:dbaccess.MultiLineEdit.19222.3 -ExecuteBtn sym:dbaccess.PushButton.19222.4 -PreviousCommands sym:dbaccess.ListBox.19222.6 -Status sym:dbaccess.MultiLineEdit.19222.8 -CloseBtn sym:dbaccess.PushButton.19222.11 +*ExecuteSQLCommand sym:dbu.ModalDialog.19222 +CommandToExecute sym:dbu.MultiLineEdit.19222.3 +ExecuteBtn sym:dbu.PushButton.19222.4 +PreviousCommands sym:dbu.ListBox.19222.6 +Status sym:dbu.MultiLineEdit.19222.8 +CloseBtn sym:dbu.PushButton.19222.11 *ExportBasicLibraryDlg sym:basctl.ModalDialog.14893 ExportAsPackage sym:basctl.RadioButton.14893.42 ExportAsLibrary sym:basctl.RadioButton.14893.43 -*ExtensionSoftwareLicenseAgreement sym:desktop.ModalDialog.6500 -LicenseText sym:desktop.MultiLineEdit.6500.51 -ScrollDown sym:desktop.PushButton.6500.50 +*ExtensionSoftwareLicenseAgreement sym:deploymentgui.ModalDialog.6500 +LicenseText sym:deploymentgui.MultiLineEdit.6500.51 +ScrollDown sym:deploymentgui.PushButton.6500.50 Accept sym:DESKTOP_UID_BTN_LICENSE_ACCEPT *ExtensionUpdate sym:DESKTOP_HID_DEPLOYMENT_GUI_UPDATE -ShowAllUpdates sym:desktop.CheckBox.2010.5 -UpdateDescriptions sym:desktop.MultiLineEdit.2010.7 -DownloadAndInstall sym:desktop.PushButton.2010.10 +ShowAllUpdates sym:deploymentgui.CheckBox.2010.5 +UpdateDescriptions sym:deploymentgui.MultiLineEdit.2010.7 +DownloadAndInstall sym:deploymentgui.PushButton.2010.10 AvailableUpdatesList sym:DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES UpdatePublisherText sym:DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER ReleaseNotesText sym:DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES *FilterDialog sym:DBACCESS_HID_DLG_FILTERCRIT -Fieldname1 sym:dbaccess.ListBox.19206.1 -Condition1 sym:dbaccess.ListBox.19206.2 -Value1 sym:dbaccess.Edit.19206.1 -Operator2 sym:dbaccess.ListBox.19206.7 -Fieldname2 sym:dbaccess.ListBox.19206.3 -Condition2 sym:dbaccess.ListBox.19206.4 -Value2 sym:dbaccess.Edit.19206.2 -Operator3 sym:dbaccess.ListBox.19206.8 -Fieldname3 sym:dbaccess.ListBox.19206.5 -Condition3 sym:dbaccess.ListBox.19206.6 -Value3 sym:dbaccess.Edit.19206.3 +Fieldname1 sym:dbu.ListBox.19206.1 +Condition1 sym:dbu.ListBox.19206.2 +Value1 sym:dbu.Edit.19206.1 +Operator2 sym:dbu.ListBox.19206.7 +Fieldname2 sym:dbu.ListBox.19206.3 +Condition2 sym:dbu.ListBox.19206.4 +Value2 sym:dbu.Edit.19206.2 +Operator3 sym:dbu.ListBox.19206.8 +Fieldname3 sym:dbu.ListBox.19206.5 +Condition3 sym:dbu.ListBox.19206.6 +Value3 sym:dbu.Edit.19206.3 *FilterNavigator sym:SVX_HID_FILTER_NAVIGATOR @@ -151,9 +150,8 @@ SelectAFontworkStyle sym:SVX_HID_CTL_FONTWORK_FAVORITES *FontworkCharacterSpacingCustom sym:svx.ModalDialog.10019 Value sym:svx.MetricField.10019.7 -*FontWorkAlignment FontWork1TBO - -*FontWorkCharacterSpacing FontWork2TBO +'*FontWorkAlignment FontWork1TBO +'*FontWorkCharacterSpacing FontWork2TBO *FormatColumn sym:SW_HID_FORMAT_COLUMN ApplyTo sym:sw.ListBox.21004.54 @@ -180,9 +178,9 @@ Edit sym:svx.PushButton.18014.13 Delete sym:svx.PushButton.18014.14 *DatabaseTableSaveAs sym:DBACCESS_HID_DLG_SAVE_AS -Catalog sym:dbaccess.ComboBox.19211.1 -Schema sym:dbaccess.ComboBox.19211.2 -TableName sym:dbaccess.Edit.19211.3 +Catalog sym:dbu.ComboBox.19211.1 +Schema sym:dbu.ComboBox.19211.2 +TableName sym:dbu.Edit.19211.3 *DatabaseSelection sym:DBACCESS_HID_TLB_TREELISTBOX @@ -205,7 +203,6 @@ TableHeader sym:DBACCESS_HID_DATABROWSE_HEADER 'TabADO sym:DBACCESS_HID_DSADMIN_PAGE_ADO 'TabdBase sym:DBACCESS_HID_DSADMIN_PAGE_DBASE 'TabODBC sym:DBACCESS_HID_DSADMIN_PAGE_ODBC -'TabAdabasStatistics dbaccess:TabPage:TAB_PAG_ADABAS_SETTINGS 'TabAdabasUserSettings sym:DBACCESS_HID_TAB_PAGE_USERADMIN 'TabJDBC sym:DBACCESS_HID_DSADMIN_PAGE_JDBC 'TabLDAP sym:DBACCESS_HID_DSADMIN_PAGE_LDAP @@ -216,14 +213,14 @@ TableHeader sym:DBACCESS_HID_DATABROWSE_HEADER 'Apply sym:SFX2_HID_TABDLG_APPLY_BTN 'Reset sym:SFX2_HID_TABDLG_RESET_BTN -*DatabaseIndexes sym:dbaccess.ModalDialog.19219 +*DatabaseIndexes sym:dbu.ModalDialog.19219 NewIndex sym:DBACCESS_HID_DLGIDX_NEWINDEX DropIndex sym:DBACCESS_HID_DLGIDX_DROPINDEX RenameIndex sym:DBACCESS_HID_DLGIDX_RENAMEINDEX SaveIndex sym:DBACCESS_HID_DLGIDX_SAVEINDEX ResetIndex sym:DBACCESS_HID_DLGIDX_RESETINDEX IndexList sym:DBACCESS_HID_DLGIDX_INDEXLIST -Unique sym:dbaccess.CheckBox.19219.1 +Unique sym:dbu.CheckBox.19219.1 'IndexDetails sym:DBACCESS_UID_DLGINDEX_INDEXDETAILS_BACK IndexDetails sym:DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN '--0: CONTROL: No entries in Hid.Lst @@ -235,7 +232,7 @@ IndexFields sym:DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD '--38974: LISTBOX: Select the sort order. sym:DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER '--0: CONTROL: No entries in Hid.Lst '--0: PUSHBUTTON: No entries in Hid.Lst -DatabaseIndexesClose sym:dbaccess.PushButton.19219.1 +DatabaseIndexesClose sym:dbu.PushButton.19219.1 *RecordSearch sym:CUI_HID_FM_DLG_SEARCH SearchForText sym:cui.RadioButton.18007.3 @@ -258,10 +255,10 @@ Search sym:CUI_HID_SEARCH_BTN_SEARCH CloseBtn sym:CUI_HID_SEARCH_BTN_CLOSE RecordCount sym:CUI_UID_SEARCH_RECORDSTATUS -*DataSourceSelection sym:dbaccess.ModalDialog.19204 -SourceList sym:dbaccess.ListBox.19204.1 -Organize sym:dbaccess.PushButton.19204.5 -Create sym:dbaccess.PushButton.19204.9 +*DataSourceSelection sym:dbu.ModalDialog.19204 +SourceList sym:dbu.ListBox.19204.1 +Organize sym:dbu.PushButton.19204.5 +Create sym:dbu.PushButton.19204.9 *DataSourcesNotAvailable sym:SW_HID_DATA_SOURCES_UNAVAILABLE @@ -340,7 +337,7 @@ SearchInAllSheets sym:svx.CheckBox.10020.59 Notes sym:svx.CheckBox.10020.60 *FormFolderNameDialog sym:DBACCESS_HID_DLG_SAVE_AS -FolderName sym:dbaccess.Edit.19211.3 +FolderName sym:dbu.Edit.19211.3 FolderReName sym:DBACCESS_HID_DLG_RENAME *FormPropertiesDialog sym:SVX_UID_FORMPROPBROWSER_FRAME @@ -350,10 +347,10 @@ TabDataForm sym:EXTENSIONS_HID_FM_PROPDLG_TAB_DATA TabEventsForm sym:EXTENSIONS_HID_FM_PROPDLG_TAB_EVT *FormSaveDialog sym:DBACCESS_HID_EXPLORERDLG_COLLECTION -NewFolder sym:dbaccess.ImageButton.19227.1 -OneLevelUp sym:dbaccess.ImageButton.19227.2 -FormName sym:dbaccess.Edit.19227.1 -SaveBtn sym:dbaccess.PushButton.19227.3 +NewFolder sym:dbu.ImageButton.19227.1 +OneLevelUp sym:dbu.ImageButton.19227.2 +FormName sym:dbu.Edit.19227.1 +SaveBtn sym:dbu.PushButton.19227.3 *FormWizard sym:WIZARDS_HID_DLGFORM_DIALOG TablesOrQueriesMaster sym:WIZARDS_HID_DLGFORM_MASTER_LBTABLES @@ -384,7 +381,7 @@ Category sym:sc.ListBox.26248.1 FunctionList sym:sc.ListBox.26248.2 *FunctionWizard sym:FORMULA_HID_FORMULADLG_FORMULA -FunctionWizardTabControl sym:formula.TabControl.31003.18 +FunctionWizardTabControl sym:forui.TabControl.31003.18 TabFunctionWizardFormula sym:FORMULA_HID_FORMULA_FAP_FORMULA CategoryLB sym:FORMULA_HID_FORMULA_LB_CATEGORY FunctionLB sym:FORMULA_HID_FORMULA_LB_FUNCTION @@ -392,7 +389,7 @@ TabFunktion sym:FORMULA_HID_FORMULATAB_FUNCTION Functionsbutton1 sym:FORMULA_HID_FORMULA_FAP_BTN_FX1 Editfield1 sym:FORMULA_HID_FORMULA_FAP_EDIT1 Shrink1 sym:FORMULA_HID_FORMULA_FAP_BTN_REF1 -Maximize sym:formula.ImageButton.31003.20 +Maximize sym:forui.ImageButton.31003.20 Functionsbutton2 sym:FORMULA_HID_FORMULA_FAP_BTN_FX2 Editfield2 sym:FORMULA_HID_FORMULA_FAP_EDIT2 Shrink2 sym:FORMULA_HID_FORMULA_FAP_BTN_REF2 @@ -405,10 +402,10 @@ Shrink4 sym:FORMULA_HID_FORMULA_FAP_BTN_REF4 TabFunctionWizardStructure sym:FORMULA_HID_FORMULATAB_STRUCT Structure sym:FORMULA_HID_FORMULA_FAP_STRUCT Formel sym:FORMULA_HID_FORMULA_FAP_FORMULA -Matrix sym:formula.CheckBox.31003.11 -Backward sym:formula.PushButton.31003.8 -Forward sym:formula.PushButton.31003.9 -NextBt sym:formula.PushButton.31005.9 +Matrix sym:forui.CheckBox.31003.11 +Backward sym:forui.PushButton.31003.8 +Forward sym:forui.PushButton.31003.9 +NextBt sym:forui.PushButton.31005.9 *FTPConnection sym:WIZARDS_HID_FTP ServerName sym:WIZARDS_HID_FTP_SERVER @@ -428,7 +425,7 @@ Browse sym:UUI_HID_LOGIN_DLG_BROWSE Account sym:UUI_HID_LOGIN_DLG_ACCOUNT UseSystemCredentials sym:UUI_HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS -*Gallery sym:.uno:Gallery +*Gallery sym:SVX_HID_GALLERY_BROWSER NewTheme sym:SVX_HID_GALLERY_NEWTHEME 'NewThemeName NEW_TITLE_FOR_GALLERY_THEME_EDITFIELD Gallerys sym:SVX_HID_GALLERY_THEMELIST diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win index c4599a788b9d..36e2db7b0ef6 100644 --- a/testautomation/global/win/edia_i_o.win +++ b/testautomation/global/win/edia_i_o.win @@ -34,14 +34,14 @@ Image32 sym:WIZARDS_HID_IS_BTN_IMG32 None sym:WIZARDS_HID_IS_BTN_NONE CancelB sym:WIZARDS_HID_IS_BTN_CANCEL -*Indexes sym:dbaccess.ModalDialog.19201 -Table sym:dbaccess.ComboBox.19201.1 -TableIndexes sym:dbaccess.ListBox.19201.1 -FreeIndexes sym:dbaccess.ListBox.19201.2 -Add sym:dbaccess.ImageButton.19201.1 -Remove sym:dbaccess.ImageButton.19201.2 -AddAll sym:dbaccess.ImageButton.19201.3 -RemoveAll sym:dbaccess.ImageButton.19201.4 +*Indexes sym:dbu.ModalDialog.19201 +Table sym:dbu.ComboBox.19201.1 +TableIndexes sym:dbu.ListBox.19201.1 +FreeIndexes sym:dbu.ListBox.19201.2 +Add sym:dbu.ImageButton.19201.1 +Remove sym:dbu.ImageButton.19201.2 +AddAll sym:dbu.ImageButton.19201.3 +RemoveAll sym:dbu.ImageButton.19201.4 *InsertAxesDialog sym:CHART2_HID_INSERT_AXIS MajorXaxis sym:CHART2_HID_SCH_CB_XAXIS @@ -119,7 +119,7 @@ SecondTitleXaxis sym:CHART2_HID_SCH_TITLE_SECONDARY_X SecondTitleYaxis sym:CHART2_HID_SCH_TITLE_SECONDARY_Y -*InsertYErrorBarsDLG sym:chart2.ModalDialog.842 +*InsertYErrorBarsDLG sym:chartcontroller.ModalDialog.842 MeanValue sym:CHART2_HID_SCH_STATISTIK_MEANVALUE NoFunction sym:CHART2_HID_SCH_STATISTIK_NO_ERROR Variance sym:CHART2_HID_SCH_STATISTIK_VARIANT @@ -152,7 +152,7 @@ FielsInvolved sym:DBACCESS_HID_RELDLG_KEYFIELDS LeftFieldCell sym:DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL RightFieldCell sym:DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL -*LabelFieldSelection sym:extensions.ModalDialog.1000 +*LabelFieldSelection sym:pcr.ModalDialog.1000 *LicenseAgreementDialog sym:FWK_HID_LICENSEDIALOG LicenseText sym:framework.MultiLineEdit.256.11 @@ -160,7 +160,7 @@ ScrollBtn sym:framework.PushButton.256.18 DeclineBtn sym:framework.PushButton.256.22 AcceptBtn sym:framework.PushButton.256.23 -*FormLinkDialog sym:extensions.ModalDialog.1002 +*FormLinkDialog sym:pcr.ModalDialog.1002 LinkDetail1 sym:EXTENSIONS_UID_FIELDLINK_DETAIL1 LinkMaster1 sym:EXTENSIONS_UID_FIELDLINK_MASTER1 LinkDetail2 sym:EXTENSIONS_UID_FIELDLINK_DETAIL2 @@ -169,11 +169,11 @@ LinkDetail3 sym:EXTENSIONS_UID_FIELDLINK_DETAIL3 LinkMaster3 sym:EXTENSIONS_UID_FIELDLINK_MASTER3 LinkDetail4 sym:EXTENSIONS_UID_FIELDLINK_DETAIL4 LinkMaster4 sym:EXTENSIONS_UID_FIELDLINK_MASTER4 -SuggestBtn sym:extensions.PushButton.1002.4 +SuggestBtn sym:pcr.PushButton.1002.4 -*MacroMigration sym:dbaccess.ModalDialog.19200 +*MacroMigration sym:dbu.ModalDialog.19200 DatabaseFile sym:.uno:OpenUrl -Browse sym:dbaccess.PushButton.19201.1 +Browse sym:dbu.PushButton.19201.1 BackButton sym:SVT_HID_WIZARD_PREVIOUS NextButton sym:SVT_HID_WIZARD_NEXT BackupLocation sym:DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION @@ -244,10 +244,10 @@ MenuName sym:cui.Edit.379.388 ButtonUp sym:cui.ImageButton.379.382 ButtonDown sym:cui.ImageButton.379.383 -*ModifyLink sym:sfx2.ModalDialog.517 -ModifyDDEApplication sym:sfx2.Edit.517.50 -ModifyDDEFile sym:sfx2.Edit.517.51 -ModifyDDECategory sym:sfx2.Edit.517.52 +*ModifyLink sym:sfx.ModalDialog.517 +ModifyDDEApplication sym:sfx.Edit.517.50 +ModifyDDEFile sym:sfx.Edit.517.51 +ModifyDDECategory sym:sfx.Edit.517.52 *Mosaic sym:.uno:GraphicFilterMosaic Width sym:cui.MetricField.10332.2 diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win index e6955236dda9..1029bc2e189f 100644 --- a/testautomation/global/win/edia_p_s.win +++ b/testautomation/global/win/edia_p_s.win @@ -1,6 +1,6 @@ *PackageManager sym:DESKTOP_HID_PACKAGE_MANAGER -Add sym:desktop.PushButton.2000.12 -Updates sym:desktop.PushButton.2000.13 +Add sym:deploymentgui.PushButton.2000.12 +Updates sym:deploymentgui.PushButton.2000.13 BrowsePackages sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX Options sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS Enable sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE @@ -10,15 +10,15 @@ Remove sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE *Pagelayout_UndoDeleteWarning sym:SD_HID_SD_UNDODELETEWARNING_DLG DontShowAgain sym:SD_HID_SD_UNDODELETEWARNING_CBX -*ParameterInput sym:dbaccess.ModalDialog.19205 -Parameters sym:dbaccess.ListBox.19205.1 -Value sym:dbaccess.Edit.19205.4 -NextParameter sym:dbaccess.PushButton.19205.6 +*ParameterInput sym:dbu.ModalDialog.19205 +Parameters sym:dbu.ListBox.19205.1 +Value sym:dbu.Edit.19205.4 +NextParameter sym:dbu.PushButton.19205.6 *PasswordDLG sym:SFX2_HID_PASSWD -UserName sym:sfx2.Edit.2316.12 -Password sym:sfx2.Edit.2316.14 -PasswordConfirm sym:sfx2.Edit.2316.16 +UserName sym:sfx.Edit.2316.12 +Password sym:sfx.Edit.2316.14 +PasswordConfirm sym:sfx.Edit.2316.16 *PasswdDLG sym:SVX_HID_PASSWORD OldPassword sym:svx.Edit.10141.11 @@ -239,7 +239,7 @@ MinusBtn sym:WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS *RelationDesign sym:DBACCESS_HID_CTL_RELATIONTAB -*RelationProperties sym:dbaccess.ModalDialog.19217 +*RelationProperties sym:dbu.ModalDialog.19217 UpdateNoAction sym:DBACCESS_HID_DLG_REL_NO_CASC_UPD UpdateCascade sym:DBACCESS_HID_DLG_REL_CASC_UPD UpdateSetNull sym:DBACCESS_HID_DLG_REL_CASC_UPD_NULL @@ -270,10 +270,10 @@ NewName sym:cui.Edit.10062.1 NewName sym:cui.Edit.10062.1 *Registration sym:SVT_HID_REGISTRATION_DIALOG -Now sym:svtools.RadioButton.16485.3 -Later sym:svtools.RadioButton.16485.4 -Never sym:svtools.RadioButton.16485.5 -AlreadyRegistered sym:svtools.RadioButton.16485.6 +Now sym:svt.RadioButton.16485.3 +Later sym:svt.RadioButton.16485.4 +Never sym:svt.RadioButton.16485.5 +AlreadyRegistered sym:svt.RadioButton.16485.6 *ReportWizard sym:WIZARDS_HID_DLGREPORT_DIALOG CancelBtn sym:WIZARDS_HID_DLGREPORT_0_CMDCANCEL @@ -379,7 +379,7 @@ Filter sym:sw.Edit.22069.28 *SelectCertificate sym:XMLSECURITY_HID_XMLSEC_DLG_CERTCHOOSER ChooseCertificate sym:XMLSECURITY_HID_XMLSEC_CTRL_CHOOSESIGNATURES -ViewCertificate sym:xmlsecurity.PushButton.1001.55 +ViewCertificate sym:xmlsec.PushButton.1001.55 *SelectSheets sym:.uno:SelectTables SheetSelectionBox sym:SC_HID_SELECTTABLES @@ -428,10 +428,10 @@ RangeCalc sym:sc.Edit.25727.15 Shrink sym:sc.ImageButton.25727.16 *SmoothLineProperties sym:CHART2_HID_SCH_DLG_SPLINE_PROPERTIES -CubicSpline sym:chart2.RadioButton.904.5 -BSpline sym:chart2.RadioButton.904.6 -Resolution sym:chart2.MetricField.904.2 -DataPointsOrder sym:chart2.MetricField.904.1 +CubicSpline sym:chartcontroller.RadioButton.904.5 +BSpline sym:chartcontroller.RadioButton.904.6 +Resolution sym:chartcontroller.MetricField.904.2 +DataPointsOrder sym:chartcontroller.MetricField.904.1 *Solarization sym:.uno:GraphicFilterSolarize Value sym:cui.MetricField.10333.2 @@ -487,12 +487,12 @@ SolverNumeric sym:sc.NumericField.25744.1 *NoSolution sym:SC_HID_SC_SOLVER_NOSOLUTION *SortOrder sym:DBACCESS_HID_DLG_ORDERCRIT -Fieldname1 sym:dbaccess.ListBox.19207.1 -Order1 sym:dbaccess.ListBox.19207.4 -Fieldname2 sym:dbaccess.ListBox.19207.2 -Order2 sym:dbaccess.ListBox.19207.5 -Fieldname3 sym:dbaccess.ListBox.19207.3 -Order3 sym:dbaccess.ListBox.19207.6 +Fieldname1 sym:dbu.ListBox.19207.1 +Order1 sym:dbu.ListBox.19207.4 +Fieldname2 sym:dbu.ListBox.19207.2 +Order2 sym:dbu.ListBox.19207.5 +Fieldname3 sym:dbu.ListBox.19207.3 +Order3 sym:dbu.ListBox.19207.6 *SortRange sym:sc.ModalDialog.25751 ExtendSelection sym:sc.PushButton.25751.3 @@ -512,7 +512,7 @@ SpellcheckOptions sym:cui.PushButton.10032.44 SpellcheckUndo sym:cui.PushButton.10032.46 SpellcheckClose sym:CUI_HID_SPLDLG_BUTTON_CLOSE -*SQLException sym:dbaccess.ModalDialog.19203 +*SQLException sym:dbu.ModalDialog.19203 Errors sym:DBACCESS_HID_SQLERROR_EXCHAIN_ERRORS Errortext sym:DBACCESS_HID_SQLERROR_EXCHAIN_TEXT @@ -529,20 +529,20 @@ ContentPage sym:SFX2_HID_HELP_TABPAGE_CONTENTS SearchContent sym:SFX2_HID_HELP_TREELISTBOX_CONTENTS IndexPage sym:SFX2_HID_HELP_TABPAGE_INDEX -SearchIndex sym:sfx2.ComboBox.617.11 -DisplayIndex sym:sfx2.PushButton.617.12 +SearchIndex sym:sfx.ComboBox.617.11 +DisplayIndex sym:sfx.PushButton.617.12 FindPage sym:SFX2_HID_HELP_TABPAGE_SEARCH -SearchFind sym:sfx2.ComboBox.618.11 -FindButton sym:sfx2.PushButton.618.12 -Result sym:sfx2.ListBox.618.16 -FindInHeadingsOnly sym:sfx2.CheckBox.618.15 -FindFullWords sym:sfx2.CheckBox.618.14 -DisplayFind sym:sfx2.PushButton.618.17 +SearchFind sym:sfx.ComboBox.618.11 +FindButton sym:sfx.PushButton.618.12 +Result sym:sfx.ListBox.618.16 +FindInHeadingsOnly sym:sfx.CheckBox.618.15 +FindFullWords sym:sfx.CheckBox.618.14 +DisplayFind sym:sfx.PushButton.618.17 BookmarksPage sym:SFX2_HID_HELP_TABPAGE_BOOKMARKS -Bookmarks sym:sfx2.ListBox.619.11 -DisplayBookmarks sym:sfx2.PushButton.619.12 +Bookmarks sym:sfx.ListBox.619.11 +DisplayBookmarks sym:sfx.PushButton.619.12 HelpWindow sym:SW_HID_EDIT_WIN @@ -568,8 +568,8 @@ SlidesControl sym:SD_HID_SD_WIN_DOCUMENT Pagecontrol sym:SD_HID_SD_WIN_DOCUMENT *Spacing sym:.uno:ChangeDistance -Category sym:starmath.MenuButton.20005.1 -Default sym:starmath.PushButton.20005.1 +Category sym:sm.MenuButton.20005.1 +Default sym:sm.PushButton.20005.1 SpacingSpacing sym:STARMATH_HID_SMA_DEFAULT_DIST LineSpacing sym:STARMATH_HID_SMA_LINE_DIST RootSpacing sym:STARMATH_HID_SMA_ROOT_DIST @@ -584,7 +584,7 @@ LowerLimit sym:STARMATH_HID_SMA_LOWERLIMIT_DIST ExcessSize sym:STARMATH_HID_SMA_BRACKET_EXCHEIGHT BracketSpacing sym:STARMATH_HID_SMA_BRACKET_DIST ExcessSizeAll sym:STARMATH_HID_SMA_BRACKET_EXCHEIGHT2 -ScaleAllBrackets sym:starmath.CheckBox.20005.1 +ScaleAllBrackets sym:sm.CheckBox.20005.1 MatrixLineSpacing sym:STARMATH_HID_SMA_MATRIXROW_DIST ColumnSpacing sym:STARMATH_HID_SMA_MATRIXCOL_DIST PrimaryHeight sym:STARMATH_HID_SMA_ATTRIBUT_DIST diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win index 1c85fef3d203..517b9396190f 100644 --- a/testautomation/global/win/edia_t_z.win +++ b/testautomation/global/win/edia_t_z.win @@ -88,8 +88,8 @@ TransitionAutomaticPreview sym:SD_HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW *SlideTransition sym:SD_HID_SD_SLIDE_TRANSITIONS *TemplateAndDocuments sym:SVT_HID_TEMPLATEDLG_DIALOG -Organize sym:svtools.PushButton.16420.11 -Edit sym:svtools.PushButton.16420.12 +Organize sym:svt.PushButton.16420.11 +Edit sym:svt.PushButton.16420.12 Backward sym:SVT_HID_TEMPLATEDLG_TB_BACK UpOneLevel sym:SVT_HID_TEMPLATEDLG_TB_PREV Print sym:SVT_HID_TEMPLATEDLG_TB_PRINT @@ -156,12 +156,12 @@ DetectSpecialNumbers sym:sc.CheckBox.25695.25 Type sym:sc.ListBox.25695.28 Preview sym:SC_HID_SC_ASCII_TABCTR -*UnsatisfiedDependencies sym:desktop.ModalDialog.2001 -UnsatisfiedDependencyList sym:desktop.ListBox.2001.2 +*UnsatisfiedDependencies sym:deploymentgui.ModalDialog.2001 +UnsatisfiedDependencyList sym:deploymentgui.ListBox.2001.2 -*WarningPrintTransparency sym:sfx2.ModalDialog.2399 -NoButton sym:sfx2.PushButton.2399.63 -DoNotShowAgain sym:sfx2.CheckBox.2399.65 +*WarningPrintTransparency sym:sfx.ModalDialog.2399 +NoButton sym:sfx.PushButton.2399.63 +DoNotShowAgain sym:sfx.CheckBox.2399.65 *WebWizard sym:WIZARDS_HID0_WEBWIZARD IntroductionChooseSettings sym:WIZARDS_HID1_LST_SESSIONS @@ -269,7 +269,7 @@ SubmitBindingExpressionBtn sym:svx.PushButton.18016.19 SubmitBinding sym:svx.ListBox.18016.21 SubmitReplace sym:svx.ListBox.18016.23 -*XFormsDataNavigator sym:.uno:ShowDataNavigator +*XFormsDataNavigator sym:SVX_HID_DATA_NAVIGATOR_WIN XFormsDataNavigatorTabControl sym:SVX_HID_XFORMS_TAB_CONTROL 'Instance svx:TabPage:RID_SVX_TP_XFORMS_INSTANCE Models sym:SVX_HID_XFORMS_MODELS_LIST diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win index 3650c9ffaaa5..30cb9938073a 100644 --- a/testautomation/global/win/etab_a_d.win +++ b/testautomation/global/win/etab_a_d.win @@ -10,14 +10,14 @@ UseTextSelectionCursor sym:cui.CheckBox.10250.12 AutomaticDetectHC sym:cui.CheckBox.10250.13 *TabAdabas sym:DBACCESS_HID_DSADMIN_PAGE_ADABAS -Hostname sym:dbaccess.Edit.19205.5 -CacheSize sym:dbaccess.NumericField.19205.2 -DataIncrement sym:dbaccess.NumericField.19205.1 -CotrolUser sym:dbaccess.Edit.19205.2 -ControlPassword sym:dbaccess.Edit.19205.1 -ShutdownService sym:dbaccess.CheckBox.19205.1 +Hostname sym:dbu.Edit.19205.5 +CacheSize sym:dbu.NumericField.19205.2 +DataIncrement sym:dbu.NumericField.19205.1 +CotrolUser sym:dbu.Edit.19205.2 +ControlPassword sym:dbu.Edit.19205.1 +ShutdownService sym:dbu.CheckBox.19205.1 Charset sym:DBACCESS_HID_DSADMIN_CHARSET -Extended sym:dbaccess.PushButton.19205.1 +Extended sym:dbu.PushButton.19205.1 *TabAdabasUserSettings sym:DBACCESS_HID_TAB_PAGE_USERADMIN User sym:DBACCESS_HID_TAB_PAGE_LBUSER @@ -26,15 +26,15 @@ ChangePassword sym:DBACCESS_HID_TAB_PAGE_PBCHGPWD DeleteUser sym:DBACCESS_HID_TAB_PAGE_PBUSERDELETE AccessRights sym:DBACCESS_HID_TAB_PAGE_TBLGRANTS -*TabAdditionalSettings sym:extensions.TabPage.19701 -Settings sym:extensions.PushButton.19701.1 +*TabAdditionalSettings sym:abp.TabPage.19701 +Settings sym:abp.PushButton.19701.1 -*TabAddressDataSourceAutoPilot sym:extensions.TabPage.19700 -Mozilla sym:extensions.RadioButton.19700.1 -LDAP sym:extensions.RadioButton.19700.6 -Outlook sym:extensions.RadioButton.19700.7 -WinSystem sym:extensions.RadioButton.19700.8 -Other sym:extensions.RadioButton.19700.9 +*TabAddressDataSourceAutoPilot sym:abp.TabPage.19700 +Mozilla sym:abp.RadioButton.19700.1 +LDAP sym:abp.RadioButton.19700.6 +Outlook sym:abp.RadioButton.19700.7 +WinSystem sym:abp.RadioButton.19700.8 +Other sym:abp.RadioButton.19700.9 *TabADO sym:DBACCESS_HID_DSADMIN_PAGE_ADO URL sym:DBACCESS_HID_DSADMIN_CONNURL_ADOPAGE @@ -156,17 +156,17 @@ Zurueck sym:SFX2_HID_TABDLG_RESET_BTN Remove sym:SW_HID_NUM_RESET *TabChartAxisLabel sym:CHART2_HID_SCH_TP_AXIS_LABEL - ShowLabels sym:chart2.CheckBox.920.1 - Tile sym:chart2.RadioButton.920.14 - StaggerOdd sym:chart2.RadioButton.920.15 - StaggerEven sym:chart2.RadioButton.920.16 - Automatic sym:chart2.RadioButton.920.17 - Overlap sym:chart2.CheckBox.920.11 - Break sym:chart2.CheckBox.920.12 + ShowLabels sym:chartcontroller.CheckBox.920.1 + Tile sym:chartcontroller.RadioButton.920.14 + StaggerOdd sym:chartcontroller.RadioButton.920.15 + StaggerEven sym:chartcontroller.RadioButton.920.16 + Automatic sym:chartcontroller.RadioButton.920.17 + Overlap sym:chartcontroller.CheckBox.920.11 + Break sym:chartcontroller.CheckBox.920.12 AngleKnob sym:CHART2_HID_SCH_ALIGNMENT_CTR_DIAL AngleText sym:CHART2_HID_SCH_ALIGNMENT_DEGREES VerticallyStacked sym:CHART2_HID_SCH_ALIGNMENT_STACKED - TextDirection sym:chart2.ListBox.920.20 + TextDirection sym:chartcontroller.ListBox.920.20 *TabChartAxisNumbers sym:CUI_HID_NUMBERFORMAT Category sym:cui.ListBox.10041.9 @@ -184,70 +184,70 @@ Remove sym:SW_HID_NUM_RESET RemoveButton sym:CUI_HID_NUMBERFORMAT_TBI_REMOVE Comment sym:cui.Edit.10041.28 -*TabChartAxisScale sym:chart2.TabPage.903 -MinimumValue sym:chart2.SpinField.903.3 -MinimumAutomatic sym:chart2.CheckBox.903.1 -MaximumValue sym:chart2.SpinField.903.2 -MaximumAutomatic sym:chart2.CheckBox.903.2 -MajorIntervalValue sym:chart2.SpinField.903.1 -MajorIntervalAutomatic sym:chart2.CheckBox.903.3 -MinorIntervalCount sym:chart2.MetricField.903.10 -MinorIntervalCountAutomatic sym:chart2.CheckBox.903.4 -ReferenceValue sym:chart2.SpinField.903.4 -RreferenceValueAutomatic sym:chart2.CheckBox.903.5 -LogarithmicScale sym:chart2.CheckBox.903.6 -ReverseDirection sym:chart2.CheckBox.903.7 - -*TabChartAxisPositioning sym:chart2.TabPage.904 -CrossOtherAxisAt sym:chart2.ListBox.904.1 -AxisAtValue sym:chart2.SpinField.904.3 -AxisAtCategory sym:chart2.ComboBox.904.4 -Hidden_Checkbox1 sym:chart2.CheckBox.904.1 -PlaceLabels sym:chart2.ListBox.904.2 -Hidden_Spinfield1 sym:chart2.SpinField.904.5 -MajorIntervalMarksInner sym:chart2.CheckBox.904.2 -MajorIntervalMarksOuter sym:chart2.CheckBox.904.3 -MinorIntervalMarksInner sym:chart2.CheckBox.904.4 -MinorIntervalMarksOuter sym:chart2.CheckBox.904.5 -PlaceMarks sym:chart2.ListBox.904.6 -Hidden_Checkbox2 sym:chart2.CheckBox.904.6 -Hidden_MoreBtn sym:chart2.PushButton.904.1 -Hidden_Checkbox3 sym:chart2.CheckBox.904.7 -Hidden_More2 sym:chart2.PushButton.904.2 - -*TabChartTypeDataRange sym:chart2.TabPage.911 - DataRange sym:chart2.Edit.911.1 - SelectDataRange sym:chart2.ImageButton.911.1 - Rows sym:chart2.RadioButton.911.1 - Columns sym:chart2.RadioButton.911.2 - FirstRowAsLabel sym:chart2.CheckBox.911.1 - FirstColumnAsLabel sym:chart2.CheckBox.911.2 +*TabChartAxisScale sym:chartcontroller.TabPage.903 +MinimumValue sym:chartcontroller.SpinField.903.3 +MinimumAutomatic sym:chartcontroller.CheckBox.903.1 +MaximumValue sym:chartcontroller.SpinField.903.2 +MaximumAutomatic sym:chartcontroller.CheckBox.903.2 +MajorIntervalValue sym:chartcontroller.SpinField.903.1 +MajorIntervalAutomatic sym:chartcontroller.CheckBox.903.3 +MinorIntervalCount sym:chartcontroller.MetricField.903.10 +MinorIntervalCountAutomatic sym:chartcontroller.CheckBox.903.4 +ReferenceValue sym:chartcontroller.SpinField.903.4 +RreferenceValueAutomatic sym:chartcontroller.CheckBox.903.5 +LogarithmicScale sym:chartcontroller.CheckBox.903.6 +ReverseDirection sym:chartcontroller.CheckBox.903.7 + +*TabChartAxisPositioning sym:chartcontroller.TabPage.904 +CrossOtherAxisAt sym:chartcontroller.ListBox.904.1 +AxisAtValue sym:chartcontroller.SpinField.904.3 +AxisAtCategory sym:chartcontroller.ComboBox.904.4 +Hidden_CheckBox1 sym:chartcontroller.CheckBox.904.1 +PlaceLabels sym:chartcontroller.ListBox.904.2 +Hidden_Spinfield1 sym:chartcontroller.SpinField.904.5 +MajorIntervalMarksInner sym:chartcontroller.CheckBox.904.2 +MajorIntervalMarksOuter sym:chartcontroller.CheckBox.904.3 +MinorIntervalMarksInner sym:chartcontroller.CheckBox.904.4 +MinorIntervalMarksOuter sym:chartcontroller.CheckBox.904.5 +PlaceMarks sym:chartcontroller.ListBox.904.6 +Hidden_CheckBox2 sym:chartcontroller.CheckBox.904.6 +Hidden_MoreBtn sym:chartcontroller.PushButton.904.1 +Hidden_CheckBox3 sym:chartcontroller.CheckBox.904.7 +Hidden_More2 sym:chartcontroller.PushButton.904.2 + +*TabChartTypeDataRange sym:chartcontroller.TabPage.911 + DataRange sym:chartcontroller.Edit.911.1 + SelectDataRange sym:chartcontroller.ImageButton.911.1 + Rows sym:chartcontroller.RadioButton.911.1 + Columns sym:chartcontroller.RadioButton.911.2 + FirstRowAsLabel sym:chartcontroller.CheckBox.911.1 + FirstColumnAsLabel sym:chartcontroller.CheckBox.911.2 +TabDataRangesDataRange TabChartTypeDataRange +TabFormatDataRangesDataRange TabChartTypeDataRange -*TabChartTypeDataSeries sym:chart2.TabPage.914 +*TabChartTypeDataSeries sym:chartcontroller.TabPage.914 DataRanges sym:CHART2_HID_SCH_DATA_RANGES_LIST - RangeFor sym:chart2.Edit.914.80 - SelectRange sym:chart2.ImageButton.914.90 - Categories sym:chart2.Edit.914.120 - SelectCategories sym:chart2.ImageButton.914.130 - AddButton sym:chart2.PushButton.914.30 - RemoveButton sym:chart2.PushButton.914.40 - MoveUp sym:chart2.PushButton.914.140 - MoveDown sym:chart2.PushButton.914.150 + RangeFor sym:chartcontroller.Edit.914.80 + SelectRange sym:chartcontroller.ImageButton.914.90 + Categories sym:chartcontroller.Edit.914.120 + SelectCategories sym:chartcontroller.ImageButton.914.130 + AddButton sym:chartcontroller.PushButton.914.30 + RemoveButton sym:chartcontroller.PushButton.914.40 + MoveUp sym:chartcontroller.PushButton.914.140 + MoveDown sym:chartcontroller.PushButton.914.150 DataSeries sym:CHART2_HID_SCH_SERIES_LIST +TabDataRangesDataSeries TabChartTypeDataSeries +TabFormatDataRangesDataSeries TabChartTypeDataSeries -*TabChartPieOptions sym:chart2.TabPage.909 -Clockwise sym:chart2.CheckBox.909.1 +*TabChartPieOptions sym:chartcontroller.TabPage.909 +Clockwise sym:chartcontroller.CheckBox.909.1 StartingAngle sym:CHART2_HID_SCH_STARTING_ANGLE_DIAL -Degrees sym:chart2.NumericField.909.1 +Degrees sym:chartcontroller.NumericField.909.1 -*TabChartTypeChartElements sym:chart2.TabPage.912 +*TabChartTypeChartElements sym:chartcontroller.TabPage.912 Title sym:CHART2_HID_SCH_TITLE_MAIN Subtitle sym:CHART2_HID_SCH_TITLE_SUB TitleXaxis sym:CHART2_HID_SCH_TITLE_X @@ -264,11 +264,11 @@ GridLinesXaxis sym:CHART2_HID_SCH_CB_XGRID GridLinesYaxis sym:CHART2_HID_SCH_CB_YGRID GridLinesZaxis sym:CHART2_HID_SCH_CB_ZGRID -*TabChartTypeChartLocation sym:chart2.TabPage.913 -InsertInSheet sym:chart2.ListBox.913.1 +*TabChartTypeChartLocation sym:chartcontroller.TabPage.913 +InsertInSheet sym:chartcontroller.ListBox.913.1 -*TabCreateOptionGroup sym:extensions.TabPage.19726 -GroupCaption sym:extensions.Edit.19726.3 +*TabCreateOptionGroup sym:dbp.TabPage.19726 +GroupCaption sym:dbp.Edit.19726.3 *TabConnections sym:cui.TabPage.17022 DriverList sym:CUI_HID_OFA_CONNPOOL_DRIVERLIST @@ -276,15 +276,15 @@ ConnectionPoolingEnabled sym:cui.CheckBox.17022.2 EnablePoolingForThisDriver sym:cui.CheckBox.17022.7 Timeout sym:cui.NumericField.17022.9 -*TabConnection sym:dbaccess.TabPage.19206 +*TabConnection sym:dbu.TabPage.19206 dBasePath sym:DBACCESS_HID_DSADMIN_DBASE_PATH SelectPath sym:DBACCESS_HID_DSADMIN_BROWSECONN -Username sym:dbaccess.Edit.19206.1 -PasswordRequired sym:dbaccess.CheckBox.19206.1 +Username sym:dbu.Edit.19206.1 +PasswordRequired sym:dbu.CheckBox.19206.1 JDBCDriverClass sym:DBACCESS_HID_DSADMIN_DRIVERCLASS -TestDriver sym:dbaccess.PushButton.19206.1 +TestDriver sym:dbu.PushButton.19206.1 MySQLODBCDatasource sym:DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE -TestConnection sym:dbaccess.PushButton.19206.2 +TestConnection sym:dbu.PushButton.19206.2 MySQLJDBCDatasource sym:DBACCESS_HID_DSADMIN_MYSQL_DATABASE AdabasDatasource sym:DBACCESS_HID_DSADMIN_ADABAS_DATABASE OracleJDBCDatasource sym:DBACCESS_HID_DSADMIN_ORACLE_DATABASE @@ -297,20 +297,20 @@ TextPath sym:DBACCESS_HID_DSADMIN_FLAT_PATH *TabCopyDatabaseTable sym:DBACCESS_HID_TAB_WIZ_COPYTABLE TableName sym:DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT -DefinitionAndData sym:dbaccess.RadioButton.19212.1 -Definition sym:dbaccess.RadioButton.19212.2 -AsTableView sym:dbaccess.RadioButton.19212.3 -AttachData sym:dbaccess.RadioButton.19212.4 -CreatePrimaryKey sym:dbaccess.CheckBox.19212.5 -PrimaryKeyName sym:dbaccess.Edit.19212.3 +DefinitionAndData sym:dbu.RadioButton.19212.1 +Definition sym:dbu.RadioButton.19212.2 +AsTableView sym:dbu.RadioButton.19212.3 +AttachData sym:dbu.RadioButton.19212.4 +CreatePrimaryKey sym:dbu.CheckBox.19212.5 +PrimaryKeyName sym:dbu.Edit.19212.3 *TabColumnSelect sym:DBACCESS_HID_TAB_WIZ_COLUMN_SELECT -LeftColumNames sym:dbaccess.MultiListBox.19209.1 -Add sym:dbaccess.ImageButton.19209.1 -AddAll sym:dbaccess.ImageButton.19209.3 -Remove sym:dbaccess.ImageButton.19209.2 -RemoveAll sym:dbaccess.ImageButton.19209.4 -RightColumNames sym:dbaccess.MultiListBox.19209.2 +LeftColumNames sym:dbu.MultiListBox.19209.1 +Add sym:dbu.ImageButton.19209.1 +AddAll sym:dbu.ImageButton.19209.3 +Remove sym:dbu.ImageButton.19209.2 +RemoveAll sym:dbu.ImageButton.19209.4 +RightColumNames sym:dbu.MultiListBox.19209.2 *TabCompatibility sym:SW_HID_OPTCOMPATIBILITY_PAGE Options sym:SW_HID_COMPATIBILITY_OPTIONS_BOX @@ -357,17 +357,17 @@ SaveIn sym:CUI_HID_SVX_SAVE_IN ToolbarContents sym:CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS ResetBtn sym:SFX2_HID_TABDLG_RESET_BTN -*TabDatabaseField sym:extensions.TabPage.19725 -YesSaveIt sym:extensions.RadioButton.19725.3 -NoValueForm sym:extensions.RadioButton.19725.4 -Fieldbox sym:extensions.ListBox.19725.4 - -*TabDatabaseValues sym:extensions.TabPage.19724 -YesSaveIt sym:extensions.RadioButton.19725.3 -NoValueForm sym:extensions.RadioButton.19725.4 -Fieldbox sym:extensions.ListBox.19725.4 -WhichValue sym:extensions.Edit.19724.2 -OptionFields sym:extensions.ListBox.19724.3 +*TabDatabaseField sym:dbp.TabPage.19725 +YesSaveIt sym:dbp.RadioButton.19725.3 +NoValueForm sym:dbp.RadioButton.19725.4 +Fieldbox sym:dbp.ListBox.19725.4 + +*TabDatabaseValues sym:dbp.TabPage.19724 +YesSaveIt sym:dbp.RadioButton.19725.3 +NoValueForm sym:dbp.RadioButton.19725.4 +Fieldbox sym:dbp.ListBox.19725.4 +WhichValue sym:dbp.Edit.19724.2 +OptionFields sym:dbp.ListBox.19724.3 *TabDataControl sym:EXTENSIONS_HID_FM_PROPDLG_TAB_DATA DataField sym:EXTENSIONS_HID_PROP_CONTROLSOURCE @@ -420,7 +420,7 @@ FormLinkDLGButton sym:EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS OpenQueryDesign sym:EXTENSIONS_UID_PROP_DLG_SQLCOMMAND SortDLGButton sym:EXTENSIONS_UID_PROP_DLG_ORDER -*TabDataPointLayout sym:chart2.TabPage.907 +*TabDataPointLayout sym:chartcontroller.TabPage.907 BarColumnShape sym:CHART2_HID_SCH_LB_BAR_GEOMETRY *TabDataSeriesLabels sym:CHART2_HID_SCH_DATA_DESCR @@ -439,30 +439,30 @@ RotateDegrees sym:CHART2_HID_SCH_DATALABEL_ROTATION_EDIT +TabDataPointLabels TabDataSeriesLabels -*TabDataSeriesOptions sym:chart2.TabPage.908 -PrimaryYaxis sym:chart2.RadioButton.908.2 -SecondaryYaxis sym:chart2.RadioButton.908.3 -Gap sym:chart2.MetricField.908.4 -Overlap sym:chart2.MetricField.908.5 -ConnectionLines sym:chart2.CheckBox.908.9 -ShowBarsSideBySide sym:chart2.CheckBox.908.10 -LeaveGap sym:chart2.RadioButton.908.13 -AssumeZero sym:chart2.RadioButton.908.14 -ContinueLine sym:chart2.RadioButton.908.15 -IncludeHiddenCells sym:chart2.CheckBox.908.16 - -*TabDataSourceName sym:extensions.TabPage.19704 -SourceName sym:extensions.Edit.19704.1 +*TabDataSeriesOptions sym:chartcontroller.TabPage.908 +PrimaryYaxis sym:chartcontroller.RadioButton.908.2 +SecondaryYaxis sym:chartcontroller.RadioButton.908.3 +Gap sym:chartcontroller.MetricField.908.4 +Overlap sym:chartcontroller.MetricField.908.5 +ConnectionLines sym:chartcontroller.CheckBox.908.9 +ShowBarsSideBySide sym:chartcontroller.CheckBox.908.10 +LeaveGap sym:chartcontroller.RadioButton.908.13 +AssumeZero sym:chartcontroller.RadioButton.908.14 +ContinueLine sym:chartcontroller.RadioButton.908.15 +IncludeHiddenCells sym:chartcontroller.CheckBox.908.16 + +*TabDataSourceName sym:abp.TabPage.19704 +SourceName sym:abp.Edit.19704.1 *TabdBase sym:DBACCESS_HID_DSADMIN_PAGE_DBASE CharSet sym:DBACCESS_HID_DSADMIN_CHARSET DisplayInactiveRecords sym:DBACCESS_HID_DSADMIN_SHOWDELETED Indexes sym:DBACCESS_HID_DSADMIN_DBASE_INDICIES -*TabDefaultFieldSelection sym:extensions.TabPage.19723 -YesFollowing sym:extensions.RadioButton.19723.1 -NoSelected sym:extensions.RadioButton.19723.2 -Selection sym:extensions.ListBox.19723.3 +*TabDefaultFieldSelection sym:dbp.TabPage.19723 +YesFollowing sym:dbp.RadioButton.19723.1 +NoSelected sym:dbp.RadioButton.19723.2 +Selection sym:dbp.ListBox.19723.3 *TabDialogs sym:basctl.TabPage.14889 ModuleList sym:BASCTL_HID_BASICIDE_MODULES_TREE diff --git a/testautomation/global/win/etab_e_g.win b/testautomation/global/win/etab_e_g.win index 903af5df1925..452b18888645 100644 --- a/testautomation/global/win/etab_e_g.win +++ b/testautomation/global/win/etab_e_g.win @@ -70,9 +70,9 @@ PBMouseExited sym:EXTENSIONS_UID_BRWEVT_MOUSEEXITED *TabEventsForm sym:EXTENSIONS_HID_FM_PROPDLG_TAB_EVT -*TabFieldLink sym:extensions.TabPage.19729 -ValueTable sym:extensions.ComboBox.19729.1 -ListTable sym:extensions.ComboBox.19729.2 +*TabFieldLink sym:dbp.TabPage.19729 +ValueTable sym:dbp.ComboBox.19729.1 +ListTable sym:dbp.ComboBox.19729.2 *TabFieldProperties sym:DBACCESS_HID_TAB_DESIGN_FIELDCONTROL IntLength sym:DBACCESS_HID_TAB_ENT_LEN @@ -83,27 +83,27 @@ DefaultValue sym:DBACCESS_HID_TAB_ENT_DEFAULT FormatExample sym:DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE BrowseBtm sym:DBACCESS_HID_TAB_ENT_FORMAT -*TabFieldSelection sym:extensions.TabPage.19728 -ExistingFields sym:extensions.ListBox.19728.6 -DisplayField sym:extensions.Edit.19728.4 +*TabFieldSelection sym:dbp.TabPage.19728 +ExistingFields sym:dbp.ListBox.19728.6 +DisplayField sym:dbp.Edit.19728.4 *TabFirstStartOnlineUpdate sym:DESKTOP_HID_FIRSTSTART_UPDATE_CHECK -CheckForUpdates sym:desktop.CheckBox.3008.3 +CheckForUpdates sym:dkt.CheckBox.3008.3 *TabFirstStartLicense sym:DESKTOP_HID_FIRSTSTART_LICENSE -LicenseText sym:desktop.MultiLineEdit.3007.6 -ScrollDown sym:desktop.PushButton.3007.7 +LicenseText sym:dkt.MultiLineEdit.3007.6 +ScrollDown sym:dkt.PushButton.3007.7 *TabFirstStartRegistration sym:DESKTOP_HID_FIRSTSTART_REGISTRATION -RegisterNow sym:desktop.RadioButton.3004.5 -RegisterLater sym:desktop.RadioButton.3004.6 -DoNotWantRegister sym:desktop.RadioButton.3004.7 +RegisterNow sym:dkt.RadioButton.3004.5 +RegisterLater sym:dkt.RadioButton.3004.6 +DoNotWantRegister sym:dkt.RadioButton.3004.7 *TabFirstStartUser sym:DESKTOP_HID_FIRSTSTART_USER -FirstName sym:desktop.Edit.3006.16 -LastName sym:desktop.Edit.3006.17 -Initials sym:desktop.Edit.3006.19 -FathersName sym:desktop.Edit.3006.18 +FirstName sym:dkt.Edit.3006.16 +LastName sym:dkt.Edit.3006.17 +Initials sym:dkt.Edit.3006.19 +FathersName sym:dkt.Edit.3006.18 *TabFirstStartWelcome sym:DESKTOP_HID_FIRSTSTART_WELCOME @@ -161,30 +161,30 @@ PairKerning sym:cui.CheckBox.10241.324 Super sym:cui.RadioButton.10241.301 *TabFormat3dViewGeometry sym:CHART2_HID_3D_VIEW - AxisRotationXaxis sym:chart2.MetricField.915.1 - AxisRotationYaxis sym:chart2.MetricField.915.2 - AxisRotationZaxis sym:chart2.MetricField.915.3 - Perspective sym:chart2.CheckBox.915.1 + AxisRotationXaxis sym:chartcontroller.MetricField.915.1 + AxisRotationYaxis sym:chartcontroller.MetricField.915.2 + AxisRotationZaxis sym:chartcontroller.MetricField.915.3 + Perspective sym:chartcontroller.CheckBox.915.1 -*TabFormat3dViewAppearance sym:chart2.TabPage.916 - Scheme sym:chart2.ListBox.916.2 - RoundedEdges sym:chart2.Checkbox.916.3 - Shading sym:chart2.CheckBox.916.2 - ObjectBorders sym:chart2.CheckBox.916.1 +*TabFormat3dViewAppearance sym:chartcontroller.TabPage.916 + Scheme sym:chartcontroller.ListBox.916.2 + RoundedEdges sym:chartcontroller.CheckBox.916.3 + Shading sym:chartcontroller.CheckBox.916.2 + ObjectBorders sym:chartcontroller.CheckBox.916.1 -*TabFormat3dViewIllumination sym:chart2.TabPage.917 - LightSource1 sym:chart2.ImageButton.917.3 - LightSource2 sym:chart2.ImageButton.917.4 - LightSource3 sym:chart2.ImageButton.917.5 - LightSource4 sym:chart2.ImageButton.917.6 - LightSource5 sym:chart2.ImageButton.917.7 - LightSource6 sym:chart2.ImageButton.917.8 - LightSource7 sym:chart2.ImageButton.917.9 - LightSource8 sym:chart2.ImageButton.917.10 - Color sym:chart2.ListBox.917.2 - ColorSelect sym:chart2.ImageButton.917.2 - AmbientLight sym:chart2.ListBox.917.1 - AmbientLightSelect sym:chart2.ImageButton.917.1 +*TabFormat3dViewIllumination sym:chartcontroller.TabPage.917 + LightSource1 sym:chartcontroller.ImageButton.917.3 + LightSource2 sym:chartcontroller.ImageButton.917.4 + LightSource3 sym:chartcontroller.ImageButton.917.5 + LightSource4 sym:chartcontroller.ImageButton.917.6 + LightSource5 sym:chartcontroller.ImageButton.917.7 + LightSource6 sym:chartcontroller.ImageButton.917.8 + LightSource7 sym:chartcontroller.ImageButton.917.9 + LightSource8 sym:chartcontroller.ImageButton.917.10 + Color sym:chartcontroller.ListBox.917.2 + ColorSelect sym:chartcontroller.ImageButton.917.2 + AmbientLight sym:chartcontroller.ListBox.917.1 + AmbientLightSelect sym:chartcontroller.ImageButton.917.1 *TabFormatChartTitleAlignment sym:CHART2_HID_SCH_ALIGNMENT AngleKnob sym:CHART2_HID_SCH_ALIGNMENT_CTR_DIAL @@ -365,10 +365,10 @@ Display sym:sw.CheckBox.20901.19 PrintGrid sym:sw.CheckBox.20901.20 Color sym:sw.ListBox.20901.22 -*TabGroupBoxData sym:extensions.TabPage.19722 +*TabGroupBoxData sym:dbp.TabPage.19722 Address sym:.uno:OpenUrl -Names sym:extensions.Edit.19722.1 -AddTo sym:extensions.PushButton.19722.1 -RemoveFrom sym:extensions.PushButton.19722.2 -OptionFields sym:extensions.ListBox.19722.3 +Names sym:dbp.Edit.19722.1 +AddTo sym:dbp.PushButton.19722.1 +RemoveFrom sym:dbp.PushButton.19722.2 +OptionFields sym:dbp.ListBox.19722.3 diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win index b000facbf04c..b2f3bbb6754a 100644 --- a/testautomation/global/win/etab_h_o.win +++ b/testautomation/global/win/etab_h_o.win @@ -2,14 +2,14 @@ HelpText sym:DBACCESS_HID_TABLE_DESIGN_HELP_WINDOW *TabInternet sym:SFX2_HID_DOCINFORELOAD -DoNotRefreshAutomatically sym:sfx2.RadioButton.273.63 -RefreshThisDocument sym:sfx2.RadioButton.273.64 -RedirectFromThisDocument sym:sfx2.RadioButton.273.65 -TimeReload sym:sfx2.NumericField.273.67 -TimeForward sym:sfx2.NumericField.273.70 -URL sym:sfx2.Edit.273.44 -BrowseURL sym:sfx2.PushButton.273.74 -Frame sym:sfx2.ComboBox.273.73 +DoNotRefreshAutomatically sym:sfx.RadioButton.273.63 +RefreshThisDocument sym:sfx.RadioButton.273.64 +RedirectFromThisDocument sym:sfx.RadioButton.273.65 +TimeReload sym:sfx.NumericField.273.67 +TimeForward sym:sfx.NumericField.273.70 +URL sym:sfx.Edit.273.44 +BrowseURL sym:sfx.PushButton.273.74 +Frame sym:sfx.ComboBox.273.73 *TabOOoImprovement sym:cui.TabPage.10302 ParticipateYes sym:cui.RadioButton.10302.12 @@ -61,16 +61,16 @@ Records sym:DBACCESS_HID_DSADMIN_LDAP_ROWCOUNT PostionTop sym:CHART2_HID_SCH_LEGEND_POS_TOP PostionRight sym:CHART2_HID_SCH_LEGEND_POS_RIGHT PostionBottom sym:CHART2_HID_SCH_LEGEND_POS_BOTTOM - TextDirection sym:chart2.ListBox.900.4 + TextDirection sym:chartcontroller.ListBox.900.4 -*TabListBoxData sym:extensions.TabPage.19721 -DataSource sym:extensions.ListBox.19721.1 -Table sym:extensions.ListBox.19721.2 +*TabListBoxData sym:dbp.TabPage.19721 +DataSource sym:dbp.ListBox.19721.1 +Table sym:dbp.ListBox.19721.2 *TabLocalizedOptions sym:CUI_HID_OFAPAGE_AUTOCORR_QUOTE LocalizedOptionsList sym:CUI_HID_OFAPAGE_QUOTE_CLB LocalizedOptions sym:CUI_HID_OFAPAGE_QUOTE_SW_CLB -SingleQuotesReplace sym:cui.Checkbox.17009.57 +SingleQuotesReplace sym:cui.CheckBox.17009.57 SingleQuotesStart sym:cui.PushButton.17009.46 SingleQuotesEnd sym:cui.PushButton.17009.48 SingleQuotesDefault sym:cui.PushButton.17009.49 @@ -193,25 +193,25 @@ LoadQuickstarter sym:cui.CheckBox.17150.27 *TabMozillaPlugin sym:cui.TabPage.12161 Enable sym:cui.CheckBox.12161.2 -*TabMySQLJDBC sym:dbaccess.TabPage.19220 +*TabMySQLJDBC sym:dbu.TabPage.19220 HostName sym:DBACCESS_HID_DSADMIN_HOSTNAME PortNumber sym:DBACCESS_HID_DSADMIN_PORTNUMBER -DriverClass sym:dbaccess.Edit.19220.4 +DriverClass sym:dbu.Edit.19220.4 Charset sym:DBACCESS_HID_DSADMIN_CHARSET -TestClass sym:dbaccess.PushButton.19220.5 +TestClass sym:dbu.PushButton.19220.5 -*TabMySQLODBC sym:dbaccess.TabPage.19217 +*TabMySQLODBC sym:dbu.TabPage.19217 Charset sym:DBACCESS_HID_DSADMIN_CHARSET -*TabNameMatching sym:dbaccess.TabPage.19211 +*TabNameMatching sym:dbu.TabPage.19211 RightColumnNames sym:DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL LeftColumnNames sym:DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN -LeftColumnUp sym:dbaccess.ImageButton.19211.12 -LeftColumnDown sym:dbaccess.ImageButton.19211.13 -RightColumnUp sym:dbaccess.ImageButton.19211.14 -RightColumnDown sym:dbaccess.ImageButton.19211.15 -ColumnAll sym:dbaccess.PushButton.19211.16 -ColumnNone sym:dbaccess.PushButton.19211.17 +LeftColumnUp sym:dbu.ImageButton.19211.12 +LeftColumnDown sym:dbu.ImageButton.19211.13 +RightColumnUp sym:dbu.ImageButton.19211.14 +RightColumnDown sym:dbu.ImageButton.19211.15 +ColumnAll sym:dbu.PushButton.19211.16 +ColumnNone sym:dbu.PushButton.19211.17 *TabODBC sym:DBACCESS_HID_DSADMIN_PAGE_ODBC Options sym:DBACCESS_HID_DSADMIN_ODBC_OPTIONS @@ -230,10 +230,10 @@ CheckNow sym:cui.PushButton.10298.15 DownloadAutomatically sym:cui.CheckBox.10298.16 Change sym:cui.PushButton.10298.19 -*TabOracleJDBC sym:dbaccess.TabPage.19227 +*TabOracleJDBC sym:dbu.TabPage.19227 HostName sym:DBACCESS_HID_DSADMIN_HOSTNAME PortNumber sym:DBACCESS_HID_DSADMIN_PORTNUMBER -DriverClass sym:dbaccess.Edit.19227.4 +DriverClass sym:dbu.Edit.19227.4 Charset sym:DBACCESS_HID_DSADMIN_CHARSET -TestClass sym:dbaccess.PushButton.19227.5 +TestClass sym:dbu.PushButton.19227.5 diff --git a/testautomation/global/win/etab_p_s.win b/testautomation/global/win/etab_p_s.win index 4817a23b3d0e..1f4706a4afb6 100644 --- a/testautomation/global/win/etab_p_s.win +++ b/testautomation/global/win/etab_p_s.win @@ -1,5 +1,5 @@ *TabPersonalDataMigration sym:DESKTOP_HID_FIRSTSTART_MIGRATION -TransferPersonalData sym:desktop.CheckBox.3005.3 +TransferPersonalData sym:dkt.CheckBox.3005.3 *TabPositionAndSize sym:CUI_HID_TRANS_POSITION_SIZE PositionX sym:cui.MetricField.10087.7 @@ -37,25 +37,25 @@ Verticalto sym:cui.ListBox.10288.30 Followtextflow sym:cui.CheckBox.10288.31 *TabPrintStarOffice sym:SFX2_HID_TP_COMMONPRINTOPTIONS -Printer sym:sfx2.RadioButton.2398.3 -PrintToFile sym:sfx2.RadioButton.2398.4 -ReduceTransparency sym:sfx2.CheckBox.2398.10 -Automatically sym:sfx2.RadioButton.2398.11 -NoTransparency sym:sfx2.RadioButton.2398.12 -ReduceGradients sym:sfx2.CheckBox.2398.20 -GradientStripes sym:sfx2.RadioButton.2398.21 -Stripes sym:sfx2.NumericField.2398.23 -IntermediateColor sym:sfx2.RadioButton.2398.22 -ReduceBitmaps sym:sfx2.CheckBox.2398.30 -GoodPrintQuality sym:sfx2.RadioButton.2398.31 -NormalPrintQuality sym:sfx2.RadioButton.2398.32 -Resolution sym:sfx2.RadioButton.2398.33 -IncludeTransparentObjects sym:sfx2.CheckBox.2398.34 -DPI sym:sfx2.ListBox.2398.35 -ConvertColorsToGrayscale sym:sfx2.CheckBox.2398.40 -PaperSize sym:sfx2.CheckBox.2398.51 -PaperOrientation sym:sfx2.CheckBox.2398.52 -Transparency sym:sfx2.CheckBox.2398.53 +Printer sym:sfx.RadioButton.2398.3 +PrintToFile sym:sfx.RadioButton.2398.4 +ReduceTransparency sym:sfx.CheckBox.2398.10 +Automatically sym:sfx.RadioButton.2398.11 +NoTransparency sym:sfx.RadioButton.2398.12 +ReduceGradients sym:sfx.CheckBox.2398.20 +GradientStripes sym:sfx.RadioButton.2398.21 +Stripes sym:sfx.NumericField.2398.23 +IntermediateColor sym:sfx.RadioButton.2398.22 +ReduceBitmaps sym:sfx.CheckBox.2398.30 +GoodPrintQuality sym:sfx.RadioButton.2398.31 +NormalPrintQuality sym:sfx.RadioButton.2398.32 +Resolution sym:sfx.RadioButton.2398.33 +IncludeTransparentObjects sym:sfx.CheckBox.2398.34 +DPI sym:sfx.ListBox.2398.35 +ConvertColorsToGrayscale sym:sfx.CheckBox.2398.40 +PaperSize sym:sfx.CheckBox.2398.51 +PaperOrientation sym:sfx.CheckBox.2398.52 +Transparency sym:sfx.CheckBox.2398.53 *TabPrintCalcOptions sym:SC_HID_SCPAGE_PRINT SuppressOutput sym:sc.CheckBox.25674.2 @@ -107,10 +107,10 @@ RecommendPasswordProtectionOnSaving sym:cui.CheckBox.10300.24 CtrlClickRequiredToFollowHyperlinks sym:cui.CheckBox.10300.26 *TabSecurityLevel sym:XMLSECURITY_HID_XMLSEC_TP_SECLEVEL -VeryHigh sym:xmlsecurity.RadioButton.1007.2 -High sym:xmlsecurity.RadioButton.1007.3 -Medium sym:xmlsecurity.RadioButton.1007.4 -Low sym:xmlsecurity.RadioButton.1007.5 +VeryHigh sym:xmlsec.RadioButton.1007.2 +High sym:xmlsec.RadioButton.1007.3 +Medium sym:xmlsec.RadioButton.1007.4 +Low sym:xmlsec.RadioButton.1007.5 *TabSendAsEmail sym:.uno:MailWindow diff --git a/testautomation/global/win/etab_t_z.win b/testautomation/global/win/etab_t_z.win index 9cc67c6638d0..6f6553a0fd7c 100644 --- a/testautomation/global/win/etab_t_z.win +++ b/testautomation/global/win/etab_t_z.win @@ -1,20 +1,20 @@ -*TabTableFieldSelection sym:extensions.TabPage.19730 -ExistingFields sym:extensions.ListBox.19730.7 -SelectedFields sym:extensions.ListBox.19730.8 -AddTo sym:extensions.PushButton.19730.3 -AddAllTo sym:extensions.PushButton.19730.4 -RemoveFrom sym:extensions.PushButton.19730.5 -RemoveAllFrom sym:extensions.PushButton.19730.6 +*TabTableFieldSelection sym:dbp.TabPage.19730 +ExistingFields sym:dbp.ListBox.19730.7 +SelectedFields sym:dbp.ListBox.19730.8 +AddTo sym:dbp.PushButton.19730.3 +AddAllTo sym:dbp.PushButton.19730.4 +RemoveFrom sym:dbp.PushButton.19730.5 +RemoveAllFrom sym:dbp.PushButton.19730.6 -*TabTableSelection sym:extensions.TabPage.19727 -TableSelection sym:extensions.ListBox.19727.5 +*TabTableSelection sym:dbp.TabPage.19727 +TableSelection sym:dbp.ListBox.19727.5 *TabTextAnimation sym:sd.TabPage.20873 GroupText sym:sd.ListBox.20873.2 -AutomaticallyAfter sym:sd.Checkbox.20873.3 +AutomaticallyAfter sym:sd.CheckBox.20873.3 AutomaticallyAfterValue sym:sd.MetricField.20873.4 -AnimateAttachedShape sym:sd.Checkbox.20873.5 -InReverseOrder sym:sd.Checkbox.20873.6 +AnimateAttachedShape sym:sd.CheckBox.20873.5 +InReverseOrder sym:sd.CheckBox.20873.6 *TabTextBase sym:DBACCESS_HID_DSADMIN_PAGE_TEXT CVSFiles sym:DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES @@ -52,7 +52,7 @@ Border sym:cui.MetricField.10054.7 StartValue sym:cui.MetricField.10054.8 EndValue sym:cui.MetricField.10054.9 -*TabTrendLineType sym:chart2.TabPage.918 +*TabTrendLineType sym:chartcontroller.TabPage.918 None sym:CHART2_HID_SCH_TRENDLINE_RB_NONE Linear sym:CHART2_HID_SCH_TRENDLINE_RB_LINEAR Logarithmic sym:CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC @@ -63,12 +63,12 @@ ShowCorrelationCoefficient sym:CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED *TabTrustedSources sym:XMLSECURITY_HID_XMLSEC_TP_TRUSTSOURCES -SourcesAdd sym:xmlsecurity.PushButton.1008.3 -SourcesView sym:xmlsecurity.PushButton.1008.4 -SourcesRemove sym:xmlsecurity.PushButton.1008.5 -LocationsListBox sym:xmlsecurity.ListBox.1008.8 -LocationsAdd sym:xmlsecurity.PushButton.1008.9 -LocationsRemove sym:xmlsecurity.PushButton.1008.10 +SourcesAdd sym:xmlsec.PushButton.1008.3 +SourcesView sym:xmlsec.PushButton.1008.4 +SourcesRemove sym:xmlsec.PushButton.1008.5 +LocationsListBox sym:xmlsec.ListBox.1008.8 +LocationsAdd sym:xmlsec.PushButton.1008.9 +LocationsRemove sym:xmlsec.PushButton.1008.10 *TabType sym:SW_HID_FRM_STD Width sym:sw.MetricField.20831.28 @@ -94,12 +94,12 @@ OriginalSize sym:sw.PushButton.20831.44 FollowTextflow sym:sw.CheckBox.20831.129 *TabTypeSelect sym:DBACCESS_HID_TAB_WIZ_TYPE_SELECT -ColumnNames sym:dbaccess.MultiListBox.19210.2 +ColumnNames sym:dbu.MultiListBox.19210.2 ColumnName sym:DBACCESS_HID_TAB_ENT_COLUMNNAME ColumnType sym:DBACCESS_HID_TAB_ENT_TYPE ColumnLength sym:DBACCESS_HID_TAB_ENT_TEXT_LEN -ColumnAutoValue sym:dbaccess.NumericField.19210.1 -ColumnAuto sym:dbaccess.PushButton.19210.5 +ColumnAutoValue sym:dbu.NumericField.19210.1 +ColumnAuto sym:dbu.PushButton.19210.5 *TabWeblog sym:vnd.com.sun.star.blogger:settings @@ -123,16 +123,16 @@ BrowseTemplateForImport sym:FILTER_HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE *TabXMLSecDetails sym:XMLSECURITY_HID_XMLSEC_TP_DETAILS XMLSecDetailsListBox sym:XMLSECURITY_HID_XMLSEC_CTRL_ELEMENTS -XMLSecDetailsEditField sym:xmlsecurity.MultiLineEdit.1004.2 +XMLSecDetailsEditField sym:xmlsec.MultiLineEdit.1004.2 *TabXMLSecGeneral sym:XMLSECURITY_HID_XMLSEC_TP_GENERAL *TabXMLSecCertPath sym:XMLSECURITY_HID_XMLSEC_TP_CERTPATH XMLSecViewSigTree sym:XMLSECURITY_HID_XMLSEC_CTRL_VIEWSIGNATURES -XMLViewCertButton sym:xmlsecurity.PushButton.1005.55 -XMLSecCertStatus sym:xmlsecurity.MultiLineEdit.1005.3 +XMLViewCertButton sym:xmlsec.PushButton.1005.55 +XMLSecCertStatus sym:xmlsec.MultiLineEdit.1005.3 -*TabYErrorBars sym:chart2.TabPage.919 +*TabYErrorBars sym:chartcontroller.TabPage.919 MeanValue sym:CHART2_HID_SCH_STATISTIK_MEANVALUE NoFunction sym:CHART2_HID_SCH_STATISTIK_NO_ERROR Variance sym:CHART2_HID_SCH_STATISTIK_VARIANT diff --git a/testautomation/global/win/etoolbox.win b/testautomation/global/win/etoolbox.win index c4efd376e50d..ae52177d7723 100644 --- a/testautomation/global/win/etoolbox.win +++ b/testautomation/global/win/etoolbox.win @@ -29,7 +29,7 @@ DisplayHelpAtStartUp sym:SFX2_HID_HELP_ONSTARTUP_BOX *TB_MacroControls sym:BASCTL_HID_BASICIDE_CONTROLS CommandButton sym:.uno:InsertPushbutton -CheckBox sym:.uno:Checkbox +CheckBox sym:.uno:CheckBox Label sym:.uno:InsertFixedText ListBox sym:.uno:InsertListbox HScrollBar sym:.uno:HScrollbar diff --git a/testautomation/global/win/spadmin.win b/testautomation/global/win/spadmin.win index fca6f74e11b3..851a616be527 100644 --- a/testautomation/global/win/spadmin.win +++ b/testautomation/global/win/spadmin.win @@ -1,107 +1,107 @@ -*SPRenamePrinterDLG sym:padmin.ModalDialog.1003 -EFPrinterName sym:padmin.Edit.1003.2 -CBUnidentifiedObject sym:padmin.ComboBox.1003.5 - -*SPFontNameDLG sym:padmin.ModalDialog.1030 -PBRename sym:padmin.PushButton.1030.6 -PBRemove sym:padmin.PushButton.1030.3 -PBAdd sym:padmin.PushButton.1030.5 -LBFontList sym:padmin.ListBox.1030.4 - -*SPFontImportDLG sym:padmin.ModalDialog.1065 -PBSelectAll sym:padmin.PushButton.1065.6 -LBFontList sym:padmin.ListBox.1065.7 -EFFontPath sym:padmin.Edit.1065.3 -PBFontPath sym:padmin.PushButton.1065.4 -CBCreateSoftlinks sym:padmin.CheckBox.1065.18 +*SPRenamePrinterDLG sym:spa.ModalDialog.1003 +EFPrinterName sym:spa.Edit.1003.2 +CBUnidentifiedObject sym:spa.ComboBox.1003.5 + +*SPFontNameDLG sym:spa.ModalDialog.1030 +PBRename sym:spa.PushButton.1030.6 +PBRemove sym:spa.PushButton.1030.3 +PBAdd sym:spa.PushButton.1030.5 +LBFontList sym:spa.ListBox.1030.4 + +*SPFontImportDLG sym:spa.ModalDialog.1065 +PBSelectAll sym:spa.PushButton.1065.6 +LBFontList sym:spa.ListBox.1065.7 +EFFontPath sym:spa.Edit.1065.3 +PBFontPath sym:spa.PushButton.1065.4 +CBCreateSoftlinks sym:spa.CheckBox.1065.18 *FilePicker sym:SVT_HID_EXPLORERDLG_FILE -EFFileName sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX -LBFileList sym:fpicker.ListBox.16374.35 -PBSelect sym:fpicker.PushButton.16374.16 -PBUpOneLevel sym:fpicker.MenuButton.16374.14 -PBNewDir sym:fpicker.ImageButton.16374.11 -MBDefaultDir sym:fpicker.MenuButton.16374.15 -TLBStandard sym:SFX2_HID_FILEDLG_STANDARD - -*SPPrinterWizard sym:padmin.ModalDialog.2000 -TabPWDeviceSelector sym:padmin.TabPage.2001 -TabPWDriverSelector sym:padmin.TabPage.2002 -TabPWQueueCommand sym:padmin.TabPage.2004 -TabPWPrinterName sym:padmin.TabPage.2003 -PBBack sym:padmin.PushButton.2000.4 -PBNext sym:padmin.PushButton.2000.3 - -*TabPWDeviceSelector sym:padmin.TabPage.2001 -RBAdd sym:padmin.RadioButton.2001.2 -RBFax sym:padmin.RadioButton.2001.3 -RBPdf sym:padmin.RadioButton.2001.4 -RBImport sym:padmin.RadioButton.2001.5 - -*TabPWDriverSelector sym:padmin.TabPage.2002 -LBChooseDriver sym:padmin.ListBox.2002.2 -PBImport sym:padmin.PushButton.2002.3 -PBDelete sym:padmin.PushButton.2002.4 - -*TabPWFaxDriverSelector sym:padmin.TabPage.2006 -RBDefault sym:padmin.RadioButton.2006.2 -RBSelect sym:padmin.RadioButton.2006.3 - -*TabPWQueueCommand sym:padmin.TabPage.2004 -CBCommand sym:padmin.ComboBox.2004.2 -PBHelp sym:padmin.PushButton.2004.3 -EFPdfDir sym:padmin.Edit.2004.7 -PBPdfDir sym:padmin.PushButton.2004.8 - -*TabPWPrinterName sym:padmin.TabPage.2003 -EFPrinterName sym:padmin.Edit.2003.4 -EFFaxName sym:padmin.Edit.2003.5 -CBUseAsDefault sym:padmin.CheckBox.2003.7 -CBRemoveFaxNumber sym:padmin.CheckBox.2003.8 - -*SPAdmin sym:padmin.ModalDialog.1000 -LBPrinters sym:padmin.ListBox.1000.4 -PBProperties sym:padmin.PushButton.1000.6 -PBRename sym:padmin.PushButton.1000.7 -PBDefault sym:padmin.PushButton.1000.2 -PBRemove sym:padmin.PushButton.1000.3 -PBTestpage sym:padmin.PushButton.1000.8 -PBNewPrinter sym:padmin.PushButton.1000.19 - -*TabSPACommand sym:padmin.TabPage.4006 -EFlpr sym:padmin.ComboBox.4006.5 -LBConfigureAs sym:padmin.ListBox.4006.8 -PBPdfDir sym:padmin.PushButton.4006.17 -EFPdfDir sym:padmin.Edit.4006.16 -CBRemoveFaxNumber sym:padmin.CheckBox.4006.19 -PBHelp sym:padmin.PushButton.4006.4 -PBRemove sym:padmin.PushButton.4006.15 - -*TabSPAPaper sym:padmin.TabPage.4004 -LBPaperSize sym:padmin.ListBox.4004.2 -LBOrientation sym:padmin.ListBox.4004.4 -LBDuplex sym:padmin.ListBox.4004.6 -LBPaperTray sym:padmin.ListBox.4004.8 - -*TabSPADevice sym:padmin.TabPage.4003 -LBOption sym:padmin.ListBox.4003.4 -LBCurrentValue sym:padmin.ListBox.4003.6 -LBColor sym:padmin.ListBox.4003.10 - -*TabSPAFontReplacement sym:padmin.TabPage.4005 -MLReplacedFonts sym:padmin.MultiListBox.4005.2 -CBReplaceFont sym:padmin.ComboBox.4005.4 -LBByPrinterFont sym:padmin.ListBox.4005.6 -PBAdd sym:padmin.PushButton.4005.7 -PBRemove sym:padmin.PushButton.4005.8 -CBEnableReplacement sym:padmin.CheckBox.4005.9 - -*TabSPAOther sym:padmin.TabPage.4002 -MFLeftMargin sym:padmin.MetricField.4002.2 -MFTopMargin sym:padmin.MetricField.4002.4 -MFRightMargin sym:padmin.MetricField.4002.6 -MFBottomMargin sym:padmin.MetricField.4002.8 -EFComment sym:padmin.Edit.4002.10 -PBDefault sym:padmin.PushButton.4002.11 +EFFileName sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX +LBFileList sym:fps_office.ListBox.16374.35 +PBSelect sym:fps_office.PushButton.16374.16 +PBUpOneLevel sym:fps_office.MenuButton.16374.14 +PBNewDir sym:fps_office.ImageButton.16374.11 +MBDefaultDir sym:fps_office.MenuButton.16374.15 +TLBStandard sym:SVT_HID_FILEDLG_STANDARD + +*SPPrinterWizard sym:spa.ModalDialog.2000 +TabPWDeviceSelector sym:spa.TabPage.2001 +TabPWDriverSelector sym:spa.TabPage.2002 +TabPWQueueCommand sym:spa.TabPage.2004 +TabPWPrinterName sym:spa.TabPage.2003 +PBBack sym:spa.PushButton.2000.4 +PBNext sym:spa.PushButton.2000.3 + +*TabPWDeviceSelector sym:spa.TabPage.2001 +RBAdd sym:spa.RadioButton.2001.2 +RBFax sym:spa.RadioButton.2001.3 +RBPdf sym:spa.RadioButton.2001.4 +RBImport sym:spa.RadioButton.2001.5 + +*TabPWDriverSelector sym:spa.TabPage.2002 +LBChooseDriver sym:spa.ListBox.2002.2 +PBImport sym:spa.PushButton.2002.3 +PBDelete sym:spa.PushButton.2002.4 + +*TabPWFaxDriverSelector sym:spa.TabPage.2006 +RBDefault sym:spa.RadioButton.2006.2 +RBSelect sym:spa.RadioButton.2006.3 + +*TabPWQueueCommand sym:spa.TabPage.2004 +CBCommand sym:spa.ComboBox.2004.2 +PBHelp sym:spa.PushButton.2004.3 +EFPdfDir sym:spa.Edit.2004.7 +PBPdfDir sym:spa.PushButton.2004.8 + +*TabPWPrinterName sym:spa.TabPage.2003 +EFPrinterName sym:spa.Edit.2003.4 +EFFaxName sym:spa.Edit.2003.5 +CBUseAsDefault sym:spa.CheckBox.2003.7 +CBRemoveFaxNumber sym:spa.CheckBox.2003.8 + +*SPAdmin sym:spa.ModalDialog.1000 +LBPrinters sym:spa.ListBox.1000.4 +PBProperties sym:spa.PushButton.1000.6 +PBRename sym:spa.PushButton.1000.7 +PBDefault sym:spa.PushButton.1000.2 +PBRemove sym:spa.PushButton.1000.3 +PBTestpage sym:spa.PushButton.1000.8 +PBNewPrinter sym:spa.PushButton.1000.19 + +*TabSPACommand sym:spa.TabPage.4006 +EFlpr sym:spa.ComboBox.4006.5 +LBConfigureAs sym:spa.ListBox.4006.8 +PBPdfDir sym:spa.PushButton.4006.17 +EFPdfDir sym:spa.Edit.4006.16 +CBRemoveFaxNumber sym:spa.CheckBox.4006.19 +PBHelp sym:spa.PushButton.4006.4 +PBRemove sym:spa.PushButton.4006.15 + +*TabSPAPaper sym:spa.TabPage.4004 +LBPaperSize sym:spa.ListBox.4004.2 +LBOrientation sym:spa.ListBox.4004.4 +LBDuplex sym:spa.ListBox.4004.6 +LBPaperTray sym:spa.ListBox.4004.8 + +*TabSPADevice sym:spa.TabPage.4003 +LBOption sym:spa.ListBox.4003.4 +LBCurrentValue sym:spa.ListBox.4003.6 +LBColor sym:spa.ListBox.4003.10 + +*TabSPAFontReplacement sym:spa.TabPage.4005 +MLReplacedFonts sym:spa.MultiListBox.4005.2 +CBReplaceFont sym:spa.ComboBox.4005.4 +LBByPrinterFont sym:spa.ListBox.4005.6 +PBAdd sym:spa.PushButton.4005.7 +PBRemove sym:spa.PushButton.4005.8 +CBEnableReplacement sym:spa.CheckBox.4005.9 + +*TabSPAOther sym:spa.TabPage.4002 +MFLeftMargin sym:spa.MetricField.4002.2 +MFTopMargin sym:spa.MetricField.4002.4 +MFRightMargin sym:spa.MetricField.4002.6 +MFBottomMargin sym:spa.MetricField.4002.8 +EFComment sym:spa.Edit.4002.10 +PBDefault sym:spa.PushButton.4002.11 diff --git a/testautomation/global/win/sys_dial.win b/testautomation/global/win/sys_dial.win index d4850dfa5315..f702445e3a8e 100644 --- a/testautomation/global/win/sys_dial.win +++ b/testautomation/global/win/sys_dial.win @@ -1,35 +1,35 @@ ' **** general Printersettings-Dialog ( File/Printer settings ) ' **** -*DruckerEinrichten sym:svtools.ModalDialog.16511 -Drucker sym:svtools.ListBox.16511.2 -Eigenschaften sym:svtools.PushButton.16511.3 +*DruckerEinrichten sym:svt.ModalDialog.16511 +Drucker sym:svt.ListBox.16511.2 +Eigenschaften sym:svt.PushButton.16511.3 '************************************************************************ '************ all file-dialogs '************ *GeneralFileDialog sym:SVT_HID_EXPLORERDLG_FILE -UebergeordneterOrdner sym:fpicker.MenuButton.16374.14 -NeuerOrdner sym:fpicker.ImageButton.16374.11 -Standard sym:fpicker.MenuButton.16374.15 -DateiAuswahl sym:SFX2_HID_FILEDLG_STANDARD -Dateiname sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX -Dateityp sym:fpicker.ListBox.16374.35 -Oeffnen sym:fpicker.PushButton.16374.16 -Auswaehlen sym:fpicker.PushButton.16374.16 +UebergeordneterOrdner sym:fps_office.MenuButton.16374.14 +NeuerOrdner sym:fps_office.ImageButton.16374.11 +Standard sym:fps_office.MenuButton.16374.15 +DateiAuswahl sym:SVT_HID_FILEDLG_STANDARD +Dateiname sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX +Dateityp sym:fps_office.ListBox.16374.35 +Oeffnen sym:fps_office.PushButton.16374.16 +Auswaehlen sym:fps_office.PushButton.16374.16 +GrafikEinfuegenDlg GeneralFileDialog -Pfad sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX sym:SFX2_HID_FILEDLG_PATH_FILENAME +Pfad sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX sym:SVT_HID_FILEDLG_PATH_FILENAME Stil sym:SVT_HID_FILEOPEN_IMAGE_TEMPLATE -Verknuepfen sym:SFX2_HID_FILEDLG_LINK_CB HID_IMPGRF_CB_LINK -Vorschau sym:SFX2_HID_FILEDLG_PREVIEW_CB HID_IMPGRF_CB_PREVIEW -Link sym:SFX2_HID_FILEDLG_LINK_CB -Preview sym:SFX2_HID_FILEDLG_PREVIEW_CB +Verknuepfen sym:SVT_HID_FILEDLG_LINK_CB HID_IMPGRF_CB_LINK +Vorschau sym:SVT_HID_FILEDLG_PREVIEW_CB HID_IMPGRF_CB_PREVIEW +Link sym:SVT_HID_FILEDLG_LINK_CB +Preview sym:SVT_HID_FILEDLG_PREVIEW_CB +OeffnenDlg GeneralFileDialog -Pfad sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX sym:SFX2_HID_FILEDLG_PATH_FILENAME +Pfad sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX sym:SVT_HID_FILEDLG_PATH_FILENAME Version sym:SVT_HID_FILEOPEN_VERSION NurLesen sym:SVT_HID_FILEOPEN_READONLY -Einfuegen sym:SFX2_HID_FILEDLG_INSERT_BTN +Einfuegen sym:SVT_HID_FILEDLG_INSERT_BTN Play sym:SVT_HID_FILESAVE_DOPLAY +KonkordanzdateiOeffnen GeneralFileDialog @@ -60,32 +60,32 @@ Selektion sym:SVT_HID_FILESAVE_SELECTION ' **** Hyperlink-File-Dialog ' **** *HyperlinkAuswahlDlg sym:SW_HID_FILEDLG_CHARDLG -UebergeordneterOrdner sym:fpicker.MenuButton.16374.14 -NeuerOrdner sym:fpicker.ImageButton.16374.11 -Standard sym:fpicker.MenuButton.16374.15 -DateiAuswahl sym:SFX2_HID_FILEDLG_STANDARD -Dateiname sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX -Dateityp sym:fpicker.ListBox.16374.35 -Oeffnen sym:fpicker.PushButton.16374.16 -NurLesen sym:fpicker.CheckBox.16374.40 +UebergeordneterOrdner sym:fps_office.MenuButton.16374.14 +NeuerOrdner sym:fps_office.ImageButton.16374.11 +Standard sym:fps_office.MenuButton.16374.15 +DateiAuswahl sym:SVT_HID_FILEDLG_STANDARD +Dateiname sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX +Dateityp sym:fps_office.ListBox.16374.35 +Oeffnen sym:fps_office.PushButton.16374.16 +NurLesen sym:fps_office.CheckBox.16374.40 ' **** general Color-Dialog ( under tools / options / staroffice / color / edit ) ' **** -*FarbeDlg sym:svtools.ModalDialog.996 +*FarbeDlg sym:svt.ModalDialog.996 'Grundfarben 'BenutzerdefinierteFarben -Cyan sym:svtools.MetricField.996.7 -Magenta sym:svtools.MetricField.996.8 -Yellow sym:svtools.MetricField.996.9 -Key sym:svtools.MetricField.996.10 -Rot sym:svtools.NumericField.996.1 -Gruen sym:svtools.NumericField.996.2 -Blau sym:svtools.NumericField.996.3 -Farbton sym:svtools.NumericField.996.4 -Saettigung sym:svtools.NumericField.996.5 -Hell sym:svtools.NumericField.996.6 -Links sym:svtools.PushButton.996.1 -Rechts sym:svtools.PushButton.996.2 +Cyan sym:svt.MetricField.996.7 +Magenta sym:svt.MetricField.996.8 +Yellow sym:svt.MetricField.996.9 +Key sym:svt.MetricField.996.10 +Rot sym:svt.NumericField.996.1 +Gruen sym:svt.NumericField.996.2 +Blau sym:svt.NumericField.996.3 +Farbton sym:svt.NumericField.996.4 +Saettigung sym:svt.NumericField.996.5 +Hell sym:svt.NumericField.996.6 +Links sym:svt.PushButton.996.1 +Rechts sym:svt.PushButton.996.2 *SendMasterDocument sym:SVT_HID_FILESAVE_DIALOG Dateiname sym:SW_HID_SEND_MASTER_CTRL_EDIT_FILEURL @@ -119,15 +119,15 @@ Standard sym:SVT_HID_FILESAVE_DEFAULTDIRECTORY ' **** new folder-dialog ' **** -*NeuerOrdner sym:fpicker.ModalDialog.16375 -OrdnerName sym:fpicker.Edit.16375.11 +*NeuerOrdner sym:fps_office.ModalDialog.16375 +OrdnerName sym:fps_office.Edit.16375.11 ' **** Translationwidow fuer das Ubersetzungstooling ' **** -*TranslationWindow sym:svtools.WorkWindow.12348 svtools:FloatingWindow:TT_INLINE_TRANSLATION +*TranslationWindow sym:svt.WorkWindow.12348 svtools:FloatingWindow:TT_INLINE_TRANSLATION ' **** specal longnames for bas test ' **** author marc.schwanz@sun.com -*MSC_Special_Dialog MSC_Super_ID -*MSC_Special_Dialog2 MSC_Super_ID2 -*MSC_Special_Dialog3 MSC_Super_ID3 +'*MSC_Special_Dialog MSC_Super_ID +'*MSC_Special_Dialog2 MSC_Super_ID2 +'*MSC_Special_Dialog3 MSC_Super_ID3 diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win index cc593c6c80c2..7154a82be35a 100644 --- a/testautomation/global/win/tab_a_d.win +++ b/testautomation/global/win/tab_a_d.win @@ -130,11 +130,11 @@ AutomatischVertikal sym:cui.TriStateBox.10161.3 AutomatischHorizontal sym:cui.TriStateBox.10161.4 *TabBenutzer sym:SFX2_HID_DOCINFOUSER -Info0 sym:sfx2.Edit.265.16 -Info1 sym:sfx2.Edit.265.18 -Info2 sym:sfx2.Edit.265.20 -Info3 sym:sfx2.Edit.265.22 -Infofelder sym:sfx2.PushButton.265.34 +Info0 sym:sfx.Edit.265.16 +Info1 sym:sfx.Edit.265.18 +Info2 sym:sfx.Edit.265.20 +Info3 sym:sfx.Edit.265.22 +Infofelder sym:sfx.PushButton.265.34 +TabBenutzerdaten TabAllgemein @@ -167,10 +167,10 @@ Passwort sym:sw.CheckBox.20885.9 EnterPasswort sym:sw.PushButton.20885.51 *TabBeschreibung sym:SFX2_HID_DOCINFODESC -Titel sym:sfx2.Edit.263.10 -Thema sym:sfx2.Edit.263.12 -Schluesselwoerter sym:sfx2.Edit.263.14 -Beschreibung sym:sfx2.MultiLineEdit.263.24 +Titel sym:sfx.Edit.263.10 +Thema sym:sfx.Edit.263.12 +Schluesselwoerter sym:sfx.Edit.263.14 +Beschreibung sym:sfx.MultiLineEdit.263.24 *TabBibliotheken sym:basctl.TabPage.14888 Bibliothek sym:basctl.ListBox.14888.12 @@ -234,22 +234,22 @@ FeldVersteckterText sym:sw.CheckBox.20870.10 VersteckterText sym:sw.CheckBox.20870.61 *TabDokument sym:SFX2_HID_DOCINFODOC -Dokumentname sym:sfx2.Edit.264.51 -Schreibgeschuetzt sym:sfx2.CheckBox.264.48 -DigitalSignature sym:sfx2.PushButton.264.79 -Loeschen sym:sfx2.PushButton.264.62 -BenutzerdatenVerwenden sym:sfx2.CheckBox.264.49 - -FileTypeInfo sym:sfx2.Edit.264.54 -FileLocationInfo sym:sfx2.Edit.264.2 -FileSizeInfo sym:sfx2.Edit.264.56 -FileCreatedInfo sym:sfx2.Edit.264.8 -FileChangedInfo sym:sfx2.Edit.264.4 -FileSignedInfo sym:sfx2.Edit.264.77 -FileLastPrintedInfo sym:sfx2.Edit.264.59 -FileEditTimeInfo sym:sfx2.Edit.264.36 -FileRevisionInfo sym:sfx2.Edit.264.38 -FileTemplateinfo sym:sfx2.Edit.264.33 +Dokumentname sym:sfx.Edit.264.51 +Schreibgeschuetzt sym:sfx.CheckBox.264.48 +DigitalSignature sym:sfx.PushButton.264.79 +Loeschen sym:sfx.PushButton.264.62 +BenutzerdatenVerwenden sym:sfx.CheckBox.264.49 + +FileTypeInfo sym:sfx.Edit.264.54 +FileLocationInfo sym:sfx.Edit.264.2 +FileSizeInfo sym:sfx.Edit.264.56 +FileCreatedInfo sym:sfx.Edit.264.8 +FileChangedInfo sym:sfx.Edit.264.4 +FileSignedInfo sym:sfx.Edit.264.77 +FileLastPrintedInfo sym:sfx.Edit.264.59 +FileEditTimeInfo sym:sfx.Edit.264.36 +FileRevisionInfo sym:sfx.Edit.264.38 +FileTemplateinfo sym:sfx.Edit.264.33 *TabDokumentFeldbefehle sym:SW_HID_FLD_DOK Feldtyp sym:sw.ListBox.20867.48 @@ -262,10 +262,10 @@ Einfuegen sym:SW_HID_FIELD_INSERT Schliessen sym:SW_HID_FIELD_CLOSE *TabDokumentinfo sym:SFX2_HID_DOCINFODESC -Beschreibung sym:sfx2.MultiLineEdit.263.24 -Schluesselworte sym:sfx2.Edit.263.14 -Thema sym:sfx2.Edit.263.12 -Titel sym:sfx2.Edit.263.10 +Beschreibung sym:sfx.MultiLineEdit.263.24 +Schluesselworte sym:sfx.Edit.263.14 +Thema sym:sfx.Edit.263.12 +Titel sym:sfx.Edit.263.10 *TabDokumentInfoFeldbefehle sym:SW_HID_FLD_DOKINF Feldtyp sym:SW_HID_FIELD_DINF_TYPE @@ -336,15 +336,15 @@ LeereSeitenDrucken sym:sw.CheckBox.20826.92 Fax sym:sw.ListBox.20826.86 Zurueck sym:SFX2_HID_TABDLG_RESET_BTN -*TabDruckenMath sym:starmath.TabPage.20007 -DruckeTitelzeile sym:starmath.CheckBox.20007.11 -DruckeFormeltext sym:starmath.CheckBox.20007.12 -DruckeRahmen sym:starmath.CheckBox.20007.13 -Originalgroesse sym:starmath.RadioButton.20007.21 -DerSeiteAnpassen sym:starmath.RadioButton.20007.22 -Skalierung sym:starmath.RadioButton.20007.23 -Prozent sym:starmath.MetricField.20007.24 -Ignorieren sym:starmath.CheckBox.20007.31 +*TabDruckenMath sym:sm.TabPage.20007 +DruckeTitelzeile sym:sm.CheckBox.20007.11 +DruckeFormeltext sym:sm.CheckBox.20007.12 +DruckeRahmen sym:sm.CheckBox.20007.13 +Originalgroesse sym:sm.RadioButton.20007.21 +DerSeiteAnpassen sym:sm.RadioButton.20007.22 +Skalierung sym:sm.RadioButton.20007.23 +Prozent sym:sm.MetricField.20007.24 +Ignorieren sym:sm.CheckBox.20007.31 *TabDruckerEtiketten sym:SW_HID_LAB_PRT GanzeSeite sym:sw.RadioButton.22757.1 diff --git a/testautomation/global/win/tab_t_z.win b/testautomation/global/win/tab_t_z.win index f7cc0dfcf0d3..5e5836e1d844 100644 --- a/testautomation/global/win/tab_t_z.win +++ b/testautomation/global/win/tab_t_z.win @@ -229,12 +229,12 @@ EndeVertikal sym:cui.MetricField.10191.7 Typ sym:cui.ListBox.10191.1 *TabVerwalten sym:SFX2_HID_MANAGE_STYLES -VorlagenName sym:sfx2.Edit.267.2 -Aktualisieren sym:sfx2.CheckBox.267.12 -Folgevorlage sym:sfx2.ListBox.267.4 -VerknuepftMit sym:sfx2.ListBox.267.6 -Bereich sym:sfx2.ListBox.267.8 -Enthaelt sym:sfx2.MultiLineEdit.267.11 +VorlagenName sym:sfx.Edit.267.2 +Aktualisieren sym:sfx.CheckBox.267.12 +Folgevorlage sym:sfx.ListBox.267.4 +VerknuepftMit sym:sfx.ListBox.267.6 +Bereich sym:sfx.ListBox.267.8 +Enthaelt sym:sfx.MultiLineEdit.267.11 Zurueck sym:SFX2_HID_TABDLG_RESET_BTN Standard sym:SFX2_HID_TABDLG_STANDARD_BTN diff --git a/testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc b/testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc old mode 100644 new mode 100755 index ba92cb53a0c6..887b25e385b4 --- a/testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_formatmenu.inc @@ -630,8 +630,8 @@ testcase tFormatPage end if '/// Check that listbox 'Paper tray' has items printlog " Check that listbox 'Paper tray' has items" - if Schacht < 1 then - warnlog "The text direction listbox is empty" + if Schacht.GetItemCount < 1 then + warnlog "The paper tray listbox is empty" end if '/// Increase 'Margins Left' printlog " Increase 'Margins Left'" -- cgit From a6b6674e94867a9cd3d957d2d6319a6750a22649 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Thu, 7 Oct 2010 17:51:46 +0200 Subject: CWS changehid: use hard coded ids for some slots until testtool can be exchanged so that executing .uno URLs with parameters is supported --- testautomation/global/hid/hid.lst | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100755 testautomation/global/hid/hid.lst diff --git a/testautomation/global/hid/hid.lst b/testautomation/global/hid/hid.lst new file mode 100755 index 000000000000..3257e92a9066 --- /dev/null +++ b/testautomation/global/hid/hid.lst @@ -0,0 +1,8 @@ +DEV300.m85 010101010101010 + +1 1 +SID_OPENDOC 5501 +SID_SAVEASDOC 5502 +SID_RELOAD 5508 +SID_QUITAPP 5300 +SID_SAVEDOC 5505 -- cgit From 4b2e694152106ac0ed6f8142ad77b8da74d82c79 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Fri, 8 Oct 2010 16:12:40 +0200 Subject: ause126: #i114866# applied patch from issue: fix parallel build issue --- python/Python-parallel-make.patch | 36 ++++++++++++++++++++++++++++++++++++ python/makefile.mk | 1 + 2 files changed, 37 insertions(+) create mode 100644 python/Python-parallel-make.patch diff --git a/python/Python-parallel-make.patch b/python/Python-parallel-make.patch new file mode 100644 index 000000000000..81ce8dabe35b --- /dev/null +++ b/python/Python-parallel-make.patch @@ -0,0 +1,36 @@ +--- misc/Python-2.6.1/Makefile.pre.in.fix-parallel-make 2010-07-22 15:01:39.567996932 -0400 ++++ misc/build/Python-2.6.1/Makefile.pre.in 2010-07-22 15:47:02.437998509 -0400 +@@ -207,6 +207,7 @@ SIGNAL_OBJS= @SIGNAL_OBJS@ + + ########################################################################## + # Grammar ++GRAMMAR_STAMP= $(srcdir)/grammar-stamp + GRAMMAR_H= $(srcdir)/Include/graminit.h + GRAMMAR_C= $(srcdir)/Python/graminit.c + GRAMMAR_INPUT= $(srcdir)/Grammar/Grammar +@@ -530,10 +531,24 @@ Modules/getpath.o: $(srcdir)/Modules/get + Modules/python.o: $(srcdir)/Modules/python.c + $(MAINCC) -c $(PY_CFLAGS) -o $@ $(srcdir)/Modules/python.c + ++# GNU "make" interprets rules with two dependents as two copies of the rule. ++# ++# In a parallel build this can lead to pgen being run twice, once for each of ++# GRAMMAR_H and GRAMMAR_C, leading to race conditions in which the compiler ++# reads a partially-overwritten copy of one of these files, leading to syntax ++# errors (or linker errors if the fragment happens to be syntactically valid C) ++# ++# See http://www.gnu.org/software/hello/manual/automake/Multiple-Outputs.html ++# for more information ++# ++# Introduce ".grammar-stamp" as a contrived single output from PGEN to avoid ++# this: ++$(GRAMMAR_H) $(GRAMMAR_C): $(GRAMMAR_STAMP) + +-$(GRAMMAR_H) $(GRAMMAR_C): $(PGEN) $(GRAMMAR_INPUT) ++$(GRAMMAR_STAMP): $(PGEN) $(GRAMMAR_INPUT) + -@$(INSTALL) -d Include + -$(PGEN) $(GRAMMAR_INPUT) $(GRAMMAR_H) $(GRAMMAR_C) ++ touch $(GRAMMAR_STAMP) + + $(PGEN): $(PGENOBJS) + $(CC) $(OPT) $(LDFLAGS) $(PGENOBJS) $(LIBS) -o $(PGEN) diff --git a/python/makefile.mk b/python/makefile.mk index 5caa7ac1d601..607ba93ab92d 100644 --- a/python/makefile.mk +++ b/python/makefile.mk @@ -49,6 +49,7 @@ TARFILE_NAME=Python-$(PYVERSION) TARFILE_MD5=e81c2f0953aa60f8062c05a4673f2be0 PATCH_FILES=\ Python-$(PYVERSION).patch \ + Python-parallel-make.patch \ Python-ssl.patch CONFIGURE_DIR= -- cgit From 48394896ff0211501a1b4991c662f84ee51d96d7 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 8 Oct 2010 16:42:03 +0200 Subject: CWS changehid: rollback changes for autohids --- testautomation/global/win/bars.win | 302 ++++----- testautomation/global/win/dial_a_c.win | 450 +++++++------- testautomation/global/win/dial_d_h.win | 878 +++++++++++++-------------- testautomation/global/win/dial_i_o.win | 476 +++++++-------- testautomation/global/win/dial_p_s.win | 639 +++++++++---------- testautomation/global/win/dial_t_z.win | 422 ++++++------- testautomation/global/win/dokument.win | 10 +- testautomation/global/win/edia_a_c.win | 180 +++--- testautomation/global/win/edia_d_h.win | 377 ++++++------ testautomation/global/win/edia_i_o.win | 216 +++---- testautomation/global/win/edia_p_s.win | 410 ++++++------- testautomation/global/win/edia_t_z.win | 122 ++-- testautomation/global/win/etab_a_d.win | 444 +++++++------- testautomation/global/win/etab_e_g.win | 310 +++++----- testautomation/global/win/etab_h_o.win | 300 ++++----- testautomation/global/win/etab_p_s.win | 166 ++--- testautomation/global/win/etab_t_z.win | 146 ++--- testautomation/global/win/etoolbox.win | 60 +- testautomation/global/win/piloten.win | 72 +-- testautomation/global/win/reportdesigner.win | 32 +- testautomation/global/win/spadmin.win | 206 +++---- testautomation/global/win/sys_dial.win | 90 +-- testautomation/global/win/tab_a_d.win | 556 ++++++++--------- testautomation/global/win/tab_e_g.win | 410 ++++++------- testautomation/global/win/tab_h_o.win | 726 +++++++++++----------- testautomation/global/win/tab_p_s.win | 458 +++++++------- testautomation/global/win/tab_t_z.win | 626 +++++++++---------- 27 files changed, 4555 insertions(+), 4529 deletions(-) diff --git a/testautomation/global/win/bars.win b/testautomation/global/win/bars.win index 2f94a7f36e9c..524a79fe00d2 100644 --- a/testautomation/global/win/bars.win +++ b/testautomation/global/win/bars.win @@ -57,16 +57,16 @@ Zentriert .uno:AlignCenter '------------------------------------------------------------------------- *Arrowsbar .HelpId:arrowsbar '------------------------------------------------------------------------- -LinieMitKreisPfeilende sym:.uno:LineCircleArrow -LinieMitPfeilKreisende sym:.uno:LineArrowCircle -LinieMitPfeilQuadratende sym:.uno:LineArrowSquare -LinieMitPfeilanfang sym:.uno:LineArrowStart -LinieMitPfeilende sym:.uno:LineArrowEnd -LinieMitPfeilenden sym:.uno:LineArrows -LinieMitQuadratKreisende sym:.uno:LineSquareArrow -LinieWinkel sym:.uno:Line_Diagonal -LinieZeichnen sym:.uno:Line -Masslinie sym:.uno:MeasureLine +LinieMitKreisPfeilende .uno:LineCircleArrow +LinieMitPfeilKreisende .uno:LineArrowCircle +LinieMitPfeilQuadratende .uno:LineArrowSquare +LinieMitPfeilanfang .uno:LineArrowStart +LinieMitPfeilende .uno:LineArrowEnd +LinieMitPfeilenden .uno:LineArrows +LinieMitQuadratKreisende .uno:LineSquareArrow +LinieWinkel .uno:Line_Diagonal +LinieZeichnen .uno:Line +Masslinie .uno:MeasureLine '------------------------------------------------------------------------- *Arrowshapes .HelpId:arrowshapes '------------------------------------------------------------------------- @@ -149,7 +149,7 @@ Line3 .uno:CalloutShapes.line-callout-3 *ChooseModebar .HelpId:choosemodebar '------------------------------------------------------------------------- Drehen .uno:ToggleObjectRotateMode -GluePoints sym:.uno:GlueEditMode +GluePoints .uno:GlueEditMode Rotationskoerper .uno:ConvertInto3DLathe SetzenAufKreisPerspektivisch .uno:CrookRotate SetzenAufKreisSchraeggestellt .uno:CrookSlant @@ -209,20 +209,20 @@ Vpfeile .uno:ConnectorArrows '------------------------------------------------------------------------- *DBQueryBrowsebar .HelpID:browserobjectbar '------------------------------------------------------------------------- -ApplyFilter sym:.uno:FormFiltered -Autofilter sym:.uno:AutoFilter -CloseDoc sym:.uno:CloseWin -DataToText sym:.uno:SbaBrwInsert -DefaultFilter sym:.uno:FilterCrit -Edit sym:.uno:EditDoc -Explorer sym:.uno:DSBrowserExplorer -Refresh sym:.uno:Refresh -RemoveFilter sym:.uno:RemoveFilterSort +ApplyFilter .uno:FormFiltered +Autofilter .uno:AutoFilter +CloseDoc .uno:CloseWin +DataToText .uno:SbaBrwInsert +DefaultFilter .uno:FilterCrit +Edit .uno:EditDoc +Explorer .uno:DSBrowserExplorer +Refresh .uno:Refresh +RemoveFilter .uno:RemoveFilterSort SaveNewDataEntry sym:DBACCESS_HID_BROWSER_SAVE_RECORD -Search sym:.uno:RecSearch -SortAscending sym:.uno:Sortup -SortDescending sym:.uno:SortDown -SortOrder sym:.uno:OrderCrit +Search .uno:RecSearch +SortAscending .uno:Sortup +SortDescending .uno:SortDown +SortOrder .uno:OrderCrit Undo sym:DBACCESS_HID_BROWSER_UNDO_RECORD '------------------------------------------------------------------------- *Designobjectbar .HelpId:designobjectbar @@ -248,7 +248,7 @@ Linie .uno:Line Polygon .uno:Polygon_Unfilled Rechteck .uno:Rect Textobjekt .uno:DrawText -Toolbox sym:.uno:DrawSelect +Toolbox .uno:DrawSelect VerticalCallout .uno:VerticalCaption VerticalText .uno:VerticalText LineArrowEnd .uno:LineArrowEnd @@ -308,7 +308,7 @@ Linienbreite .uno:LineWidth Linienendenstil .uno:LineEndStyle Linienfarbe .uno:XLineColor Linienstil .uno:XLineStyle -PunkteBearbeiten sym:.uno:ToggleObjectBezierMode +PunkteBearbeiten .uno:ToggleObjectBezierMode Schatten .uno:FillShadow DesignerDialog .uno:DesignerDialog VerankerungWechseln .uno:ToggleAnchorType @@ -327,21 +327,21 @@ Group .uno:FormatGroup '------------------------------------------------------------------------- *Ellipsesbar .HelpId:ellipsesbar '------------------------------------------------------------------------- -EllipseLeer sym:.uno:Ellipse_Unfilled -EllipseVoll sym:.uno:Ellipse -Ellipsen sym:.uno:EllipseToolbox -EllipsenabschnittLeer sym:.uno:EllipseCut_Unfilled -EllipsenabschnittVoll sym:.uno:EllipseCut -Ellipsenbogen sym:.uno:Arc -EllipsensegmentLeer sym:.uno:Pie_Unfilled -EllipsensegmentVoll sym:.uno:Pie -KreisLeer sym:.uno:Circle_Unfilled -KreisVoll sym:.uno:Circle -KreisabschnittLeer sym:.uno:CircleCut_Unfilled -KreisabschnittVoll sym:.uno:CircleCut -Kreisbogen sym:.uno:CircleArc -KreissegmentLeer sym:.uno:CirclePie_Unfilled -KreissegmentVoll sym:.uno:CirclePie +EllipseLeer .uno:Ellipse_Unfilled +EllipseVoll .uno:Ellipse +Ellipsen .uno:EllipseToolbox +EllipsenabschnittLeer .uno:EllipseCut_Unfilled +EllipsenabschnittVoll .uno:EllipseCut +Ellipsenbogen .uno:Arc +EllipsensegmentLeer .uno:Pie_Unfilled +EllipsensegmentVoll .uno:Pie +KreisLeer .uno:Circle_Unfilled +KreisVoll .uno:Circle +KreisabschnittLeer .uno:CircleCut_Unfilled +KreisabschnittVoll .uno:CircleCut +Kreisbogen .uno:CircleArc +KreissegmentLeer .uno:CirclePie_Unfilled +KreissegmentVoll .uno:CirclePie '------------------------------------------------------------------------- *ExtrusionObjectBar .HelpId:extrusionobjectbar '------------------------------------------------------------------------- @@ -590,22 +590,22 @@ ObjectAlign .uno:ObjectAlign *FrameObjectbar .HelpId:frameobjectbar '------------------------------------------------------------------------- Durchlauf .uno:WrapThrough -EigenschaftenControls sym:.uno:ShowBrowser +EigenschaftenControls .uno:ShowBrowser EigenschaftenObjekt .uno:FrameDialog GanzNachHinten .uno:SendToBack GanzNachVorn .uno:BringToFront Hintergrundfarbe .uno:BackgroundColor -Hintergrundmuster sym:.uno:BackgroundPatternController -HorizontalSpiegeln sym:.uno:FlipHorizontal -InDenHintergrund sym:.uno:SetObjectToBackground -InDenVordergrund sym:.uno:SetObjectToForeground +Hintergrundmuster .uno:BackgroundPatternController +HorizontalSpiegeln .uno:FlipHorizontal +InDenHintergrund .uno:SetObjectToBackground +InDenVordergrund .uno:SetObjectToForeground LinienFarbe .uno:FrameLineColor Linienstil .uno:LineStyle Links .uno:AlignLeft Mitte .uno:AlignVerticalCenter NoWrap .uno:WrapOff Oben .uno:AlignTop -PositionUndGroesse sym:.uno:TransformDialog +PositionUndGroesse .uno:TransformDialog Rechts .uno:AlignRight UmlaufDynamisch .uno:WrapIdeal UmlaufLinks .uno:WrapLeft @@ -615,7 +615,7 @@ Unten .uno:AlignBottom Verankerungwechseln .uno:ToggleAnchorType Verketten .uno:ChainFrames VerkettungLoesen .uno:UnhainFrames -VertikalSpiegeln sym:.uno:FlipVertical +VertikalSpiegeln .uno:FlipVertical Vorlage .uno:StyleApply Wrap .uno:WrapOn Zentriert .uno:AlignHorizontalCenter @@ -658,54 +658,54 @@ SendToBack .uno:SendToBack ToggleAnchorType .uno:ToggleAnchorType AreaFilling sym:SVX_HID_FILL_ATTR_LISTBOX AreaStyle sym:SVX_HID_FILL_TYPE_LISTBOX -Ausrichtung sym:.uno:ObjectAlign +Ausrichtung .uno:ObjectAlign Blauanteil .uno:GrafBlue ColorSettings .uno:ColorSettings Crop .uno:Crop -Drehen sym:.uno:ToggleObjectRotateMode -Durchlauf sym:.uno:WrapThrough -EigenschaftenControls sym:.uno:ShowBrowser -EigenschaftenObjekt sym:.uno:FrameDialog +Drehen .uno:ToggleObjectRotateMode +Durchlauf .uno:WrapThrough +EigenschaftenControls .uno:ShowBrowser +EigenschaftenObjekt .uno:FrameDialog Filter .uno:GraphicFilterToolbox Flaeche .uno:FormatArea -Flaechenfarbe sym:.uno:FillStyle -Flaechenstil sym:.uno:FillStyle +Flaechenfarbe .uno:FillStyle +Flaechenstil .uno:FillStyle Gamma .uno:GrafGamma -GanzNachHinten sym:.uno:SendToBack -GanzNachVorn sym:.uno:BringToFront -GrafikEigenschaften sym:.uno:GraphicDialog +GanzNachHinten .uno:SendToBack +GanzNachVorn .uno:BringToFront +GrafikEigenschaften .uno:GraphicDialog Grafikmodus .uno:GrafMode Gruenanteil .uno:GrafGreen Helligkeit .uno:GrafLuminance -Hintergrundfarbe sym:.uno:BackgroundColor -Hintergrundmuster sym:.uno:BackgroundPatternController +Hintergrundfarbe .uno:BackgroundColor +Hintergrundmuster .uno:BackgroundPatternController HorizontalSpiegeln .uno:FlipHorizontal -ImageMapEditor sym:.uno:ImageMapDialog -InDenHintergrund sym:.uno:SetObjectToBackground -InDenVordergrund sym:.uno:SetObjectToForeground -KeinUmlauf sym:.uno:WrapOff +ImageMapEditor .uno:ImageMapDialog +InDenHintergrund .uno:SetObjectToBackground +InDenVordergrund .uno:SetObjectToForeground +KeinUmlauf .uno:WrapOff Kontrast .uno:GrafContrast Linie .uno:FormatLine -Linienbreite sym:.uno:LineWidth -Linienendenstil sym:.uno:LineEndStyle -Linienfarbe sym:.uno:XLineColor -Linienstil sym:.uno:XLineStyle -Links sym:.uno:AlignLeft -Mitte sym:.uno:AlignVerticalCenter -Oben sym:.uno:AlignTop -PositionUndGroesse sym:.uno:TransformDialog -PunkteBearbeiten sym:.uno:ToggleObjectBezierMode -Rechts sym:.uno:AlignRight +Linienbreite .uno:LineWidth +Linienendenstil .uno:LineEndStyle +Linienfarbe .uno:XLineColor +Linienstil .uno:XLineStyle +Links .uno:AlignLeft +Mitte .uno:AlignVerticalCenter +Oben .uno:AlignTop +PositionUndGroesse .uno:TransformDialog +PunkteBearbeiten .uno:ToggleObjectBezierMode +Rechts .uno:AlignRight Rotanteil .uno:GrafRed Schatten .uno:FillShadow Transparenz .uno:GrafTransparence -Umlauf sym:.uno:WrapOn -UmlaufLinks sym:.uno:WrapLeft -UmlaufRechts sym:.uno:WrapRight -Umrandung sym:.uno:SetBorderStyle -Unten sym:.uno:AlignBottom +Umlauf .uno:WrapOn +UmlaufLinks .uno:WrapLeft +UmlaufRechts .uno:WrapRight +Umrandung .uno:SetBorderStyle +Unten .uno:AlignBottom VertikalSpiegeln .uno:FlipVertical -Zentriert sym:.uno:AlignHorizontalCenter +Zentriert .uno:AlignHorizontalCenter InsertGraphic .uno:InsertGraphic '------------------------------------------------------------------------- *GraphicFilterBar .HelpId:graffilterbar @@ -725,11 +725,11 @@ Mosaic .uno:GraphicFilterMosaic *Hyperlinkleiste sym:SVX_HID_OFA_HYPERLINK_DLG '------------------------------------------------------------------------- Frame sym:SVX_HID_OFA_HYPERLINK_TARGET -Link sym:.uno:SetHyperlink +Link .uno:SetHyperlink Suchen sym:SVX_HID_OFA_HYPERLINK_SEARCH UrlAdresse sym:SVX_HID_OFA_HYPERLINK_URL UrlName sym:SVX_HID_OFA_HYPERLINK_NAME -Verknuepfung sym:.uno:AddBookmark +Verknuepfung .uno:AddBookmark '------------------------------------------------------------------------- *Insertbar .HelpId:insertbar '------------------------------------------------------------------------- @@ -743,13 +743,13 @@ Frame .uno:InsertObjectFloatingFrame Fussnote .uno:InsertFootnote Grafik .uno:InsertGraphic InsertSpreadsheet .uno:InsertSpreadsheet -MehrspaltigeRahmen sym:.uno:InsertFrame +MehrspaltigeRahmen .uno:InsertFrame OLEObjekt .uno:InsertObject Plugin .uno:InsertPlugin Rahmen .uno:InsertFrameInteract Seite .uno:InsertPage Sonderzeichen .uno:InsertSymbol -Spalten sym:.uno:InsertFrameInteractNoColumns +Spalten .uno:InsertFrameInteractNoColumns Tabelle .uno:InsertTable Textmarke .uno:InsertBookmark Verzeichnis .uno:InsertIndexesEntry @@ -799,10 +799,10 @@ Controls .uno:ChooseControls FindParanthese .uno:MatchGroup InsertSourceText .uno:LoadBasic Library .uno:LibSelector -Macros sym:.uno:ChooseMacro +Macros .uno:ChooseMacro ManageBreakpoints .uno:ManageBreakPoints -Modules sym:.uno:ModuleDialog -ObjectCatalog sym:.uno:ObjectCatalog +Modules .uno:ModuleDialog +ObjectCatalog .uno:ObjectCatalog ProcedureStep .uno:BasicStepOver SaveSourceText .uno:SaveBasicAs SingleStep .uno:BasicStepInto @@ -833,15 +833,15 @@ BulletsOnOff .uno:DefaultBullet '------------------------------------------------------------------------- *OB_DB_Tabledesign sym:DBACCESS_HID_TLB_TABLEDESIGN '------------------------------------------------------------------------- -Copy sym:.uno:Copy -Cut sym:.uno:Cut -Edit sym:.uno:EditDoc +Copy .uno:Copy +Cut .uno:Cut +Edit .uno:EditDoc NoConnection sym:DBACCESS_HID_TABLE_DESIGN_NO_CONNECTION -Paste sym:.uno:Paste -Redo sym:.uno:Redo -Save sym:.uno:Save -SaveAs sym:.uno:SaveAs -Undo sym:.uno:Undo +Paste .uno:Paste +Redo .uno:Redo +Save .uno:Save +SaveAs .uno:SaveAs +Undo .uno:Undo '------------------------------------------------------------------------- *OL_SW_Rechenleiste sym:SW_HID_CALC_TOOLBOX '------------------------------------------------------------------------- @@ -886,7 +886,7 @@ ZeilenGleichmaessig .uno:DistributeRows *Optionsbar .HelpId:optionsbar '------------------------------------------------------------------------- AlleGruppenVerlassen .uno:LeaveAllGroups -AlleGruppierungenVerlassen sym:.uno:ConnectorLinesCircles +AlleGruppierungenVerlassen .uno:ConnectorLinesCircles DrehmodusNachKlick .uno:ClickChangeRotation EinfacheHandles .uno:HandlesDraft FangenAnObjektRahmen .uno:SnapFrame @@ -901,8 +901,8 @@ KeineFuellungen .uno:FillDraft GluePoints .uno:GlueEditMode NurHaarlinien .uno:LineDraft NurTextbreichSelektieren .uno:PickThrough -ObjektMitAttributen sym:.uno:SolidCreate -PunkteBearbeiten sym:.uno:ToggleObjectBezierMode +ObjektMitAttributen .uno:SolidCreate +PunkteBearbeiten .uno:ToggleObjectBezierMode RasterBenutzen .uno:GridUse RasterSichtbar .uno:GridVisible Schnellbearbeitung .uno:QuickEdit @@ -924,33 +924,33 @@ ZoomPlus .uno:ZoomPlus '------------------------------------------------------------------------- *Positionbar .HelpId:positionbar '------------------------------------------------------------------------- -GanzNachHinten sym:.uno:SendToBack -GanzNachVorn sym:.uno:BringToFront -HinterDasObjekt sym:.uno:BehindObject -Vertauschen sym:.uno:ReverseOrder -VorDasObjekt sym:.uno:BeforeObject -WeiterNachHinten sym:.uno:Backward -WeiterNachVorn sym:.uno:Forward +GanzNachHinten .uno:SendToBack +GanzNachVorn .uno:BringToFront +HinterDasObjekt .uno:BehindObject +Vertauschen .uno:ReverseOrder +VorDasObjekt .uno:BeforeObject +WeiterNachHinten .uno:Backward +WeiterNachVorn .uno:Forward '------------------------------------------------------------------------- *Previewbar .HelpId:previewbar '------------------------------------------------------------------------- -DruckenSeitenansicht sym:.uno:PrintPagePreView +DruckenSeitenansicht .uno:PrintPagePreView ErsteSeite .uno:FirstPage GanzerBildschirm .uno:FullScreen KopfUndFusszeilen .uno:EditHeaderAndFooter LetzteSeite .uno:LastPage Margins .uno:Margins -Massstab sym:.uno:Zoom +Massstab .uno:Zoom MassstabVergroessern .uno:ZoomIn MassstabVerkleinern .uno:ZoomOut NaechsteSeite .uno:NextPage ScalingFactor .uno:ScalingFactor -Schliessen sym:.uno:CloseWin +Schliessen .uno:CloseWin Seitenansicht .uno:ClosePreview Seitenlayout .uno:PageFormatDialog -VierSeiten sym:.uno:ShowMultiplePages +VierSeiten .uno:ShowMultiplePages VorherigeSeite .uno:PreviousPage -ZweiSeiten sym:.uno:ShowTwoPages +ZweiSeiten .uno:ShowTwoPages '------------------------------------------------------------------------- *PreviewObjectbar .HelpId:previewobjectbar '------------------------------------------------------------------------- @@ -961,11 +961,11 @@ Groesser .uno:ZoomPlus Kleiner .uno:ZoomMinus LetzteSeite .uno:GoToEndOfDoc Massstab .uno:PreviewZoom -MassstabVergroessern sym:.uno:ZoomIn -MassstabVerkleinern sym:.uno:ZoomOut +MassstabVergroessern .uno:ZoomIn +MassstabVerkleinern .uno:ZoomOut NaechsteSeite .uno:PageDown SeitenansichtSchliessen .uno:ClosePreview -Seitenlayout sym:.uno:PageFormatDialog +Seitenlayout .uno:PageFormatDialog Skalierung .uno:PreviewPrintOptions VierSeiten .uno:ShowMultiplePages VorherigeSeite .uno:PageUp @@ -984,14 +984,14 @@ Verwerfen sym:SC_HID_INSWIN_CANCEL '------------------------------------------------------------------------- *Rectanglesbar .HelpId:rectanglesbar '------------------------------------------------------------------------- -QuadratLeer sym:.uno:Square_Unfilled -QuadratRundLeer sym:.uno:Square_Rounded_Unfilled -QuadratRundVoll sym:.uno:Square_Rounded -QuadratVoll sym:.uno:Square -RechteckLeer sym:.uno:Rect_Unfilled -RechteckRundLeer sym:.uno:Rect_Rounded_Unfilled -RechteckRundVoll sym:.uno:Rect_Rounded -RechteckVoll sym:.uno:Rect +QuadratLeer .uno:Square_Unfilled +QuadratRundLeer .uno:Square_Rounded_Unfilled +QuadratRundVoll .uno:Square_Rounded +QuadratVoll .uno:Square +RechteckLeer .uno:Rect_Unfilled +RechteckRundLeer .uno:Rect_Rounded_Unfilled +RechteckRundVoll .uno:Rect_Rounded +RechteckVoll .uno:Rect '------------------------------------------------------------------------- *SD_Farbleiste sym:SVX_HID_CTRL_COLOR '------------------------------------------------------------------------- @@ -1035,22 +1035,22 @@ NativeSql .uno:SbaNativeSql '------------------------------------------------------------------------- Ausschneiden .uno:Cut Bearbeiten .uno:EditDoc -DokSchliessen sym:.uno:CloseDoc +DokSchliessen .uno:CloseDoc Drucken .uno:PrintDefault Einfuegen .uno:Paste ExportAsPDF .uno:ExportDirectToPDF FaxDrucken .uno:SendFax GalleryButton .uno:Gallery -Gesamtbild sym:.uno:FullScreen -GestalterButton sym:.uno:DesignerDialog +Gesamtbild .uno:FullScreen +GestalterButton .uno:DesignerDialog HyperlinkDialog .uno:HyperlinkDialog -HyperlinkLeisteButton sym:.uno:InsertHyperlink +HyperlinkLeisteButton .uno:InsertHyperlink Kopieren .uno:Copy NavigatorButton .uno:Navigator Neu .uno:AddDirect NeuDialog .uno:NewDoc Oeffnen .uno:Open -RecordMacroButton sym:.uno:MacroRecorder +RecordMacroButton .uno:MacroRecorder Redo .uno:Redo SortAscending .uno:SortAscending SortDescending .uno:SortDescending @@ -1116,17 +1116,17 @@ Sortieren .uno:OrderCrit Hintergrundfarbe .uno:BackgroundColor LinienStil .uno:LineStyle Optimieren .uno:OptimizeTable -Schriftart sym:.uno:CharFontName -Schriftgroesse sym:.uno:FontHeight +Schriftart .uno:CharFontName +Schriftgroesse .uno:FontHeight SpalteAuswaehlen .uno:EntireColumn SpalteEinfuegen .uno:InsertColumns SpalteLoeschen .uno:DeleteColumns TabelleAuswaehlen .uno:SelectTable -TabellenmodeFix sym:.uno:TableModeFix -TabellenmodeProportional sym:.uno:TableModeFixProp -TabellenmodeVariabel sym:.uno:TableModeVariable +TabellenmodeFix .uno:TableModeFix +TabellenmodeProportional .uno:TableModeFixProp +TabellenmodeVariabel .uno:TableModeVariable Umrandung .uno:SetBorderStyle -Vorlage sym:.uno:StyleApplyState +Vorlage .uno:StyleApplyState Vorlage2 sym:SVX_HID_STYLE_LISTBOX ZeileAuswaehlen .uno:EntireRow ZeileEinfuegen .uno:InsertRows @@ -1143,12 +1143,12 @@ TableProperties .uno:TableDialog '------------------------------------------------------------------------- *Textbar .HelpId:textbar '------------------------------------------------------------------------- -FitVerticalTextToFrame sym:.uno:VerticalTextFitToSizeTool -Legende sym:.uno:DrawCaption -Rahmen sym:.uno:TextFitToSizeTool -TextEinfuegen sym:.uno:Text -VerticalCallout sym:.uno:VerticalCaption -VerticalText sym:.uno:VerticalText +FitVerticalTextToFrame .uno:VerticalTextFitToSizeTool +Legende .uno:DrawCaption +Rahmen .uno:TextFitToSizeTool +TextEinfuegen .uno:Text +VerticalCallout .uno:VerticalCaption +VerticalText .uno:VerticalText '------------------------------------------------------------------------- *TextObjectbar .HelpId:textobjectbar '------------------------------------------------------------------------- @@ -1198,7 +1198,7 @@ BulletsOnOff2 .uno:Bullet '------------------------------------------------------------------------- *Toolbar .HelpId:toolbar '------------------------------------------------------------------------- -AlleEbenen sym:.uno:OutlineExpandAll +AlleEbenen .uno:OutlineExpandAll Anordnung .uno:ObjectPosition ApplyFilter .uno:FormFiltered ArrowsToolbox .uno:ArrowsToolbox @@ -1215,7 +1215,7 @@ ChangeBezier .uno:ChangeBezier ChangePolygon .uno:ChangePolygon ClearQuery .uno:DBClearQuery ConvertInto3D .uno:ConvertInto3D -ConvertInto3Dnew sym:.uno:ExtrusionToggle +ConvertInto3Dnew .uno:ExtrusionToggle ConvertInto3DLatheFast .uno:ConvertInto3DLatheFast Copy .uno:Copy CustomAnimation .uno:CustomAnimation @@ -1237,7 +1237,7 @@ Feldbefehle .uno:InsertFieldCtrl Filter .uno:DataFilterStandardFilter FlowChartShapes .uno:FlowChartShapes FontworkGalleryFloater .uno:FontworkGalleryFloater -FormatierungEinAus sym:.uno:OutlineFormat +FormatierungEinAus .uno:OutlineFormat FormControls .uno:Config FormelAktualisieren .uno:Draw FormelSymbole .uno:SymbolCatalogue @@ -1248,10 +1248,10 @@ GrafikenAusEin .uno:Graphic Gruppierung .uno:Group GruppierungAufheben .uno:Ungroup HTMLQuelltext sym:SW_HID_SOURCEVIEW -Hinunterschieben sym:.uno:OutlineDown -Hinunterstufen sym:.uno:OutlineRight -Hochschieben sym:.uno:OutlineUp -Hochstufen sym:.uno:OutlineLeft +Hinunterschieben .uno:OutlineDown +Hinunterstufen .uno:OutlineRight +Hochschieben .uno:OutlineUp +Hochstufen .uno:OutlineLeft Hyperlink .uno:InsertHyperlink Insert .uno:InsertToolbox InsertGraphic .uno:InsertGraphic @@ -1263,7 +1263,7 @@ LineArrowEnd .uno:LineArrowEnd Mirror .uno:Mirror NamenDefinieren .uno:DefineName NewDoc .uno:NewDoc -NurErsteEbene sym:.uno:OutlineCollapseAll +NurErsteEbene .uno:OutlineCollapseAll ObjectAlign .uno:ObjectAlign ObjektEinfuegen .uno:InsertObjCtrl ObjekteEinfuegen .uno:InsObjCtrl @@ -1280,12 +1280,12 @@ Redo .uno:Redo Refresh .uno:Refresh RemoveFilter .uno:RemoveFilterSort Rotate .uno:ToggleObjectRotateMode -SchwarzweisDarstellung sym:.uno:ColorView +SchwarzweisDarstellung .uno:ColorView ShowFormFunctions .uno:Config Save .uno:Save SaveAs .uno:SaveAs SortAscending .uno:Sortup -SortDescending .uno:SortDown +SortDescending .uno:Sortdown SortierenAb .uno:SortDescending SortierenAuf .uno:SortAscending SortOrder .uno:OrderCrit @@ -1300,8 +1300,8 @@ Thesaurus .uno:Thesaurus ToolsGallery .uno:Gallery Transform .uno:TransformDialog Undo .uno:Undo -UnterpunkteAnzeigen sym:.uno:OutlineExpand -UnterpunkteAusblenden sym:.uno:OutlineCollapse +UnterpunkteAnzeigen .uno:OutlineExpand +UnterpunkteAusblenden .uno:OutlineCollapse Verbinder .uno:ConnectorToolbox Vergroessern .uno:ZoomIn Verkleinern .uno:ZoomOut @@ -1338,7 +1338,7 @@ FormatSelection .uno:FormatSelection *ToolsCollectionBar .HelpId:insertcontrolsbar '------------------------------------------------------------------------- InsPushButton .uno:InsertPushbutton -InsCheckBox .uno:CheckBox +InsCheckBox .uno:Checkbox InsListBox .uno:InsertListbox InsFixedText .uno:InsertFixedText InsFrame .uno:Groupbox diff --git a/testautomation/global/win/dial_a_c.win b/testautomation/global/win/dial_a_c.win index 01007b7d9e90..2d6891d4d4e7 100644 --- a/testautomation/global/win/dial_a_c.win +++ b/testautomation/global/win/dial_a_c.win @@ -1,288 +1,294 @@ *Aehnlichkeitssuche sym:CUI_HID_SEARCHSIMILARITY -ZeichenHinzufuegen sym:cui.NumericField.10023.21 -ZeichenTauschen sym:cui.NumericField.10023.17 -Kombinieren sym:cui.CheckBox.10023.15 -ZeichenEntfernen sym:cui.NumericField.10023.19 +ZeichenHinzufuegen sym:cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_LONGER +ZeichenTauschen sym:cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_OTHER +Kombinieren sym:cui:CheckBox:RID_SVXDLG_SEARCHSIMILARITY:CB_RELAX +ZeichenEntfernen sym:cui:NumericField:RID_SVXDLG_SEARCHSIMILARITY:NF_SHORTER -*Aenderungenanzeigen sym:.uno:AcceptChanges +*Aenderungenanzeigen .uno:AcceptChanges TabControl sym:SVX_HID_REDLINING_TABCONTROL -TabFilter sym:SVX_HID_REDLINING_FILTER_PAGE SVX:TABPAGE:SID_REDLIN_FILTER_PAGE -Datum sym:SVX_HID_REDLINING_FILTER_CB_DATE svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_DATE -DatumListe sym:SVX_HID_REDLINING_FILTER_LB_DATE svx:ListBox:SID_REDLIN_FILTER_PAGE:LB_DATE -Datum1 sym:SVX_HID_REDLINING_FILTER_DF_DATE SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE -Zeit1 sym:SVX_HID_REDLINING_FILTER_TF_DATE SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE -Aktuell1 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK svx:ImageButton:SID_REDLIN_FILTER_PAGE:IB_CLOCK -Datum2 sym:SVX_HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 -Zeit2 sym:SVX_HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 -Aktuell2 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK2 svx:ImageButton:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 -Autor sym:SVX_HID_REDLINING_FILTER_CB_AUTOR svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_AUTOR -AutoListe sym:SVX_HID_REDLINING_FILTER_LB_AUTOR svx:ListBox:SID_REDLIN_FILTER_PAGE:LB_AUTOR -Bereich sym:SVX_HID_REDLINING_FILTER_CB_RANGE svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_RANGE -BereichText sym:SVX_HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE -Button sym:SVX_HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF +TabFilter sym:SVX_HID_REDLINING_FILTER_PAGE sym:svx:TabPage:SID_REDLIN_FILTER_PAGE +Datum sym:SVX_HID_REDLINING_FILTER_CB_DATE sym:svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_DATE +DatumListe sym:SVX_HID_REDLINING_FILTER_LB_DATE sym:svx:ListBox:SID_REDLIN_FILTER_PAGE:LB_DATE +Datum1 sym:SVX_HID_REDLINING_FILTER_DF_DATE sym:svx:DateField:SID_REDLIN_FILTER_PAGE:DF_DATE +Zeit1 sym:SVX_HID_REDLINING_FILTER_TF_DATE sym:svx:TimeField:SID_REDLIN_FILTER_PAGE:TF_DATE +Aktuell1 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK sym:svx:ImageButton:SID_REDLIN_FILTER_PAGE:IB_CLOCK +Datum2 sym:SVX_HID_REDLINING_FILTER_DF_DATE2 sym:svx:DateField:SID_REDLIN_FILTER_PAGE:DF_DATE2 +Zeit2 sym:SVX_HID_REDLINING_FILTER_TF_DATE2 sym:svx:TimeField:SID_REDLIN_FILTER_PAGE:TF_DATE2 +Aktuell2 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK2 sym:svx:ImageButton:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 +Autor sym:SVX_HID_REDLINING_FILTER_CB_AUTOR sym:svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_AUTOR +AutoListe sym:SVX_HID_REDLINING_FILTER_LB_AUTOR sym:svx:ListBox:SID_REDLIN_FILTER_PAGE:LB_AUTOR +Bereich sym:SVX_HID_REDLINING_FILTER_CB_RANGE sym:svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_RANGE +BereichText sym:SVX_HID_REDLINING_FILTER_ED_RANGE sym:svx:Edit:SID_REDLIN_FILTER_PAGE:ED_RANGE +Button sym:SVX_HID_REDLINING_FILTER_BTN_REF sym:svx:PushButton:SID_REDLIN_FILTER_PAGE:BTN_REF Aktion sym:SVX_HID_REDLINING_FILTER_CB_RANGE Aktionsliste sym:SVX_HID_REDLINING_FILTER_LB_ACTION -TabListe sym:SVX_HID_REDLINING_VIEW_PAGE SVX:TABPAGE:SID_REDLIN_VIEW_PAGE +TabListe sym:SVX_HID_REDLINING_VIEW_PAGE sym:svx:TabPage:SID_REDLIN_VIEW_PAGE Liste sym:SVX_HID_REDLINING_VIEW_DG_VIEW ListenInhalt sym:SVX_HID_REDLINING_VIEW_DG_VIEW_TABLE Listenkopf sym:SVX_HID_REDLINING_VIEW_DG_VIEW_HEADER -Akzeptieren sym:SVX_HID_REDLINING_VIEW_PB_ACCEPT SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_ACCEPT -AlleAkzeptieren sym:SVX_HID_REDLINING_VIEW_PB_ACCEPTALL SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_ACCEPTALL -Ablehnen sym:SVX_HID_REDLINING_VIEW_PB_REJECT SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_REJECT -AlleAblehnen sym:SVX_HID_REDLINING_VIEW_PB_REJECTALL SVX:PUSHBUTTON:SID_REDLIN_VIEW_PAGE:PB_REJECTALL +Akzeptieren sym:SVX_HID_REDLINING_VIEW_PB_ACCEPT sym:svx:PushButton:SID_REDLIN_VIEW_PAGE:PB_ACCEPT +AlleAkzeptieren sym:SVX_HID_REDLINING_VIEW_PB_ACCEPTALL sym:svx:PushButton:SID_REDLIN_VIEW_PAGE:PB_ACCEPTALL +Ablehnen sym:SVX_HID_REDLINING_VIEW_PB_REJECT sym:svx:PushButton:SID_REDLIN_VIEW_PAGE:PB_REJECT +AlleAblehnen sym:SVX_HID_REDLINING_VIEW_PB_REJECTALL sym:svx:PushButton:SID_REDLIN_VIEW_PAGE:PB_REJECTALL Rueckgaengig sym:SVX_HID_REDLINING_VIEW_PB_UNDO *AktualisierenGallery sym:SVX_HID_GALLERY_ACTUALIZE -*Animation sym:.uno:AnimationObjects -BildAufnehmen sym:sd.ImageButton.619.6 -AlleAufnehmen sym:sd.ImageButton.619.7 -BildLoeschen sym:sd.ImageButton.619.8 -AlleLoeschen sym:sd.ImageButton.619.9 -AnimationsgruppeGruppenobjekt sym:sd.RadioButton.619.1 -AnimationsgruppeBitmapobjekt sym:sd.RadioButton.619.2 -'Transparenzfarbe sd:ListBox:FLT_WIN_ANIMATION:LB_COLOR ' TBO 18.07.2002 removed from dialog -Anpassung sym:sd.ListBox.619.2 -AnzahlBilder sym:sd.NumericField.619.1 -AnzahlDurchlaeufe sym:sd.ListBox.619.3 -AnzeigedauerProBild sym:sd.TimeField.619.1 -Erstellen sym:sd.PushButton.619.10 -ErstesBild sym:sd.ImageButton.619.1 -Rueckwaerts sym:sd.ImageButton.619.2 -Stopp sym:sd.ImageButton.619.3 -Abspielen sym:sd.ImageButton.619.4 -LetztesBild sym:sd.ImageButton.619.5 +*Animation .uno:AnimationObjects +BildAufnehmen sym:sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ONE_OBJECT +AlleAufnehmen sym:sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ALL_OBJECTS +BildLoeschen sym:sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_BITMAP +AlleLoeschen sym:sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_ALL +AnimationsgruppeGruppenobjekt sym:sd:RadioButton:FLT_WIN_ANIMATION:RBT_GROUP +AnimationsgruppeBitmapobjekt sym:sd:RadioButton:FLT_WIN_ANIMATION:RBT_BITMAP +'Transparenzfarbe sym:sd:ListBox:FLT_WIN_ANIMATION:LB_COLOR ' TBO 18.07.2002 removed from dialog +Anpassung sym:sd:ListBox:FLT_WIN_ANIMATION:LB_ADJUSTMENT +AnzahlBilder sym:sd:NumericField:FLT_WIN_ANIMATION:NUM_FLD_BITMAP +AnzahlDurchlaeufe sym:sd:ListBox:FLT_WIN_ANIMATION:LB_LOOP_COUNT +AnzeigedauerProBild sym:sd:TimeField:FLT_WIN_ANIMATION:TIME_FIELD +Erstellen sym:sd:PushButton:FLT_WIN_ANIMATION:BTN_CREATE_GROUP +ErstesBild sym:sd:ImageButton:FLT_WIN_ANIMATION:BTN_FIRST +Rueckwaerts sym:sd:ImageButton:FLT_WIN_ANIMATION:BTN_REVERSE +Stopp sym:sd:ImageButton:FLT_WIN_ANIMATION:BTN_STOP +Abspielen sym:sd:ImageButton:FLT_WIN_ANIMATION:BTN_PLAY +LetztesBild sym:sd:ImageButton:FLT_WIN_ANIMATION:BTN_LAST + +*AppletEinfuegen .uno:InsertApplet +Klasse sym:cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSFILE +ClassLocation sym:cui:Edit:MD_INSERT_OBJECT_APPLET:ED_CLASSLOCATION +Suchen sym:cui:PushButton:MD_INSERT_OBJECT_APPLET:BTN_CLASS +Optionen sym:cui:MultiLineEdit:MD_INSERT_OBJECT_APPLET:ED_APPLET_OPTIONS *AsciiFilterOptionen sym:SW_HID_ASCII_FILTER -Zeichensatz sym:sw.ListBox.20209.3 -Schriftart sym:sw.ListBox.20209.5 -Sprache sym:sw.ListBox.20209.7 -CrLf sym:sw.RadioButton.20209.9 -Cr sym:sw.RadioButton.20209.10 -Lf sym:sw.RadioButton.20209.11 +Zeichensatz sym:sw:ListBox:DLG_ASCII_FILTER:LB_CHARSET +Schriftart sym:sw:ListBox:DLG_ASCII_FILTER:LB_FONT +Sprache sym:sw:ListBox:DLG_ASCII_FILTER:LB_LANGUAGE +CrLf sym:sw:RadioButton:DLG_ASCII_FILTER:RB_CRLF +Cr sym:sw:RadioButton:DLG_ASCII_FILTER:RB_CR +Lf sym:sw:RadioButton:DLG_ASCII_FILTER:RB_LF *Attribute sym:CUI_HID_SEARCHATTR Auswahl sym:CUI_HID_SEARCHATTR_CTL_ATTR -*Ausrichtung sym:.uno:ChangeAlignment -Links sym:sm.RadioButton.20006.1 -Zentriert sym:sm.RadioButton.20006.2 -Rechts sym:sm.RadioButton.20006.3 -'Oben starmath:RadioButton:RID_ALIGNDIALOG:4 -'Mitte starmath:RadioButton:RID_ALIGNDIALOG:5 -'Unten starmath:RadioButton:RID_ALIGNDIALOG:6 -Standard sym:sm.PushButton.20006.1 +*Ausrichtung .uno:ChangeAlignment +Links sym:starmath:RadioButton:RID_ALIGNDIALOG:1 +Zentriert sym:starmath:RadioButton:RID_ALIGNDIALOG:2 +Rechts sym:starmath:RadioButton:RID_ALIGNDIALOG:3 +'Oben sym:starmath:RadioButton:RID_ALIGNDIALOG:4 +'Mitte sym:starmath:RadioButton:RID_ALIGNDIALOG:5 +'Unten sym:starmath:RadioButton:RID_ALIGNDIALOG:6 +Standard sym:starmath:PushButton:RID_ALIGNDIALOG:1 *AutoAbstractErzeugen sym:SW_HID_INSERT_ABSTRACT -Ebenen sym:sw.NumericField.20208.5 -Kapitel sym:sw.NumericField.20208.3 +Ebenen sym:sw:NumericField:DLG_INSERT_ABSTRACT:NF_LEVEL +Kapitel sym:sw:NumericField:DLG_INSERT_ABSTRACT:NF_PARA -*Autokorrektur sym:.uno:AutoCorrectDlg +*Autokorrektur .uno:AutoCorrectDlg -*AutoText sym:.uno:EditGlossary -RestDesNamens sym:sw.CheckBox.21661.5 -NameText sym:sw.Edit.21661.4 +*AutoText .uno:EditGlossary +RestDesNamens sym:sw:CheckBox:DLG_GLOSSARY:CB_INSERT_TIP +NameText sym:sw:Edit:DLG_GLOSSARY:ED_NAME Liste sym:SW_HID_MD_GLOS_CATEGORY -Kuerzel sym:sw.Edit.21661.2 -ImDateisystem sym:sw.CheckBox.21661.68 -ImInternet sym:sw.CheckBox.21661.69 -Menue sym:sw.MenuButton.21661.52 -Bereiche sym:sw.PushButton.21661.54 -Pfade sym:sw.PushButton.21661.56 -Vorschau_anzeigen sym:sw.CheckBox.21661.73 +Kuerzel sym:sw:Edit:DLG_GLOSSARY:ED_SHORTNAME +ImDateisystem sym:sw:CheckBox:DLG_GLOSSARY:CB_FILE_REL +ImInternet sym:sw:CheckBox:DLG_GLOSSARY:CB_NET_REL +Menue sym:sw:MenuButton:DLG_GLOSSARY:PB_EDIT +Bereiche sym:sw:PushButton:DLG_GLOSSARY:PB_BIB +Pfade sym:sw:PushButton:DLG_GLOSSARY:PB_PATH +Vorschau_anzeigen sym:sw:CheckBox:DLG_GLOSSARY:CB_SHOW_EXAMPLE -*AutoFormatCalc sym:.uno:AutoFormat -FormatListe sym:sc.ListBox.25624.1 -Einfuegen sym:sc.PushButton.25624.105 -Loeschen sym:sc.PushButton.25624.106 -Zahlenformat sym:sc.CheckBox.25624.20 -Umrandung sym:sc.CheckBox.25624.21 -Schriftart sym:sc.CheckBox.25624.23 -Muster sym:sc.CheckBox.25624.24 -Ausrichtung sym:sc.CheckBox.25624.25 -BreiteHoeheAnpassen sym:sc.CheckBox.25624.26 -Zusaetze sym:sc.MoreButton.25624.104 +*AutoFormatCalc .uno:AutoFormat +FormatListe sym:sc:ListBox:RID_SCDLG_AUTOFORMAT:LB_FORMAT +Einfuegen sym:sc:PushButton:RID_SCDLG_AUTOFORMAT:BTN_ADD +Loeschen sym:sc:PushButton:RID_SCDLG_AUTOFORMAT:BTN_REMOVE +Zahlenformat sym:sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_NUMFORMAT +Umrandung sym:sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_BORDER +Schriftart sym:sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_FONT +Muster sym:sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_PATTERN +Ausrichtung sym:sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_ALIGNMENT +BreiteHoeheAnpassen sym:sc:CheckBox:RID_SCDLG_AUTOFORMAT:BTN_ADJUST +Zusaetze sym:sc:MoreButton:RID_SCDLG_AUTOFORMAT:BTN_MORE Umbenennen sym:SC_HID_SC_RENAME_AUTOFMT *AutoFormatHinzufuegenWriter sym:SW_HID_SWDLG_STRINPUT -TabellenName sym:sw.Edit.21460.1 +TabellenName sym:sw:Edit:DLG_SWDLG_STRINPUT:ED_INPUT *AutoFormatHinzufuegenCalc sym:SC_HID_SC_ADD_AUTOFMT TabellenName sym:SC_HID_SC_AUTOFMT_NAME *AutoFormatTabelle sym:SW_HID_AUTOFMT_TABLE -Formatbox sym:sw.ListBox.21459.1 -Einfuegen sym:sw.PushButton.21459.105 -Loeschen sym:sw.PushButton.21459.106 -Zusaetze sym:sw.MoreButton.21459.104 -Ausrichtung sym:sw.CheckBox.21459.25 -Umrandung sym:sw.CheckBox.21459.21 -Schriftart sym:sw.CheckBox.21459.23 -Muster sym:sw.CheckBox.21459.24 -Zahlenformat sym:sw.CheckBox.21459.20 -Umbenennen sym:sw.PushButton.21459.107 +Formatbox sym:sw:ListBox:DLG_AUTOFMT_TABLE:LB_FORMAT +Einfuegen sym:sw:PushButton:DLG_AUTOFMT_TABLE:BTN_ADD +Loeschen sym:sw:PushButton:DLG_AUTOFMT_TABLE:BTN_REMOVE +Zusaetze sym:sw:MoreButton:DLG_AUTOFMT_TABLE:BTN_MORE +Ausrichtung sym:sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_ALIGNMENT +Umrandung sym:sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_BORDER +Schriftart sym:sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_FONT +Muster sym:sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_PATTERN +Zahlenformat sym:sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT +Umbenennen sym:sw:PushButton:DLG_AUTOFMT_TABLE:BTN_RENAME -*BedingteFormatierung sym:SC_HID_SCDLG_CONDFORMAT sc:ModelessDialog:RID_SCDLG_CONDFORMAT -Bedingung1 sym:sc.CheckBox.25700.1 -PopupList1 sym:sc.ListBox.25700.2 -Vergleich1 sym:sc.ListBox.25700.3 -TextField1 sym:sc.Edit.25700.4 -TextField12 sym:sc.Edit.25700.7 -Zellvorlage1 sym:sc.ListBox.25700.10 -Minimieren1 sym:sc.ImageButton.25700.5 -Minimieren12 sym:sc.ImageButton.25700.8 -NewStyle1 sym:sc.PushButton.25700.34 -Bedingung2 sym:sc.CheckBox.25700.11 -PopupList2 sym:sc.ListBox.25700.12 -Vergleich2 sym:sc.ListBox.25700.13 -TextField2 sym:sc.Edit.25700.14 -TextField22 sym:sc.Edit.25700.17 -Zellvorlage2 sym:sc.ListBox.25700.20 -Minimieren2 sym:sc.ImageButton.25700.15 -Minimieren22 sym:sc.ImageButton.25700.18 -NewStyle2 sym:sc.PushButton.25700.35 -Bedingung3 sym:sc.CheckBox.25700.21 -PopupList3 sym:sc.ListBox.25700.22 -Vergleich3 sym:sc.ListBox.25700.23 -TextField3 sym:sc.Edit.25700.24 -TextField32 sym:sc.Edit.25700.27 -Zellvorlage3 sym:sc.ListBox.25700.30 -Minimieren3 sym:sc.ImageButton.25700.25 -Minimieren32 sym:sc.ImageButton.25700.28 -NewStyle3 sym:sc.PushButton.25700.36 +*BedingteFormatierung sym:SC_HID_SCDLG_CONDFORMAT sym:sc:ModelessDialog:RID_SCDLG_CONDFORMAT +Bedingung1 sym:sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND1 +PopupList1 sym:sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_1 +Vergleich1 sym:sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_2 +TextField1 sym:sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND1_1 +TextField12 sym:sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND1_2 +Zellvorlage1 sym:sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND1_TEMPLATE +Minimieren1 sym:sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND1_1 +Minimieren12 sym:sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND1_2 +NewStyle1 sym:sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND1_NEW +Bedingung2 sym:sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND2 +PopupList2 sym:sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_1 +Vergleich2 sym:sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_2 +TextField2 sym:sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND2_1 +TextField22 sym:sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND2_2 +Zellvorlage2 sym:sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND2_TEMPLATE +Minimieren2 sym:sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND2_1 +Minimieren22 sym:sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND2_2 +NewStyle2 sym:sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND2_NEW +Bedingung3 sym:sc:CheckBox:RID_SCDLG_CONDFORMAT:CBX_COND3 +PopupList3 sym:sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_1 +Vergleich3 sym:sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_2 +TextField3 sym:sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND3_1 +TextField32 sym:sc:Edit:RID_SCDLG_CONDFORMAT:EDT_COND3_2 +Zellvorlage3 sym:sc:ListBox:RID_SCDLG_CONDFORMAT:LB_COND3_TEMPLATE +Minimieren3 sym:sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND3_1 +Minimieren32 sym:sc:ImageButton:RID_SCDLG_CONDFORMAT:RB_COND3_2 +NewStyle3 sym:sc:PushButton:RID_SCDLG_CONDFORMAT:BTN_COND3_NEW *Bemassung sym:CUI_HID_PAGE_MEASURE -Liniendistanz sym:cui.MetricField.10161.1 -HLUeberhang sym:cui.MetricField.10161.2 -HLDistanz sym:cui.MetricField.10161.3 -LinkeHL sym:cui.MetricField.10161.4 -RechteHL sym:cui.MetricField.10161.5 -AnzeigeUnterhalb sym:cui.TriStateBox.10161.1 -AnzeigeParallel sym:cui.TriStateBox.10161.5 -MetrikAnzeigen sym:cui.TriStateBox.10161.2 -MetrikList sym:cui.ListBox.10161.1 +Liniendistanz sym:cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST +HLUeberhang sym:cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG +HLDistanz sym:cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST +LinkeHL sym:cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN +RechteHL sym:cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN +AnzeigeUnterhalb sym:cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE +AnzeigeParallel sym:cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL +MetrikAnzeigen sym:cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT +MetrikList sym:cui:ListBox:RID_SVXPAGE_MEASURE:LB_UNIT Textposition sym:CUI_HID_MEASURE_CTL_POSITION -AutomatischVertikal sym:cui.TriStateBox.10161.3 -AutomatischHorizontal sym:cui.TriStateBox.10161.4 +AutomatischVertikal sym:cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV +AutomatischHorizontal sym:cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH Preview sym:CUI_HID_MEASURE_CTL_PREVIEW -DecimalPlaces sym:cui.MetricField.10161.6 +DecimalPlaces sym:cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_DECIMALPLACES *BenutzerwoerterbuchAnlegen sym:CUI_HID_OPTIONS_DICT_NEW -WoerterbuchName sym:cui.Edit.12003.11 -Sprache sym:cui.ListBox.12003.13 -Ausnahme sym:cui.CheckBox.12003.14 +WoerterbuchName sym:cui:Edit:RID_SFXDLG_NEWDICT:ED_DICTNAME +Sprache sym:cui:ListBox:RID_SFXDLG_NEWDICT:LB_DICTLANG +Ausnahme sym:cui:CheckBox:RID_SFXDLG_NEWDICT:BTN_EXCEPT *BenutzerwoerterbuchBearbeiten sym:CUI_HID_OPTIONS_DICT_EDIT -Buch sym:cui.ListBox.12004.32 -Sprache sym:cui.ListBox.12004.13 -Inhalt sym:cui.Edit.12004.36 -Wort sym:cui.Edit.12004.36 -Aufnehmen sym:cui.PushButton.12004.39 -Neu sym:cui.PushButton.12004.39 -Entfernen sym:cui.PushButton.12004.40 -Loeschen sym:cui.PushButton.12004.40 -ReplaceBy sym:cui.Edit.12004.38 +Buch sym:cui:ListBox:RID_SFXDLG_EDITDICT:LB_ALLDICTS +Sprache sym:cui:ListBox:RID_SFXDLG_EDITDICT:LB_DICTLANG +Inhalt sym:cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD +Wort sym:cui:Edit:RID_SFXDLG_EDITDICT:ED_WORD +Aufnehmen sym:cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE +Neu sym:cui:PushButton:RID_SFXDLG_EDITDICT:PB_NEW_REPLACE +Entfernen sym:cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE +Loeschen sym:cui:PushButton:RID_SFXDLG_EDITDICT:PB_DELETE_REPLACE +ReplaceBy sym:cui:Edit:RID_SFXDLG_EDITDICT:ED_REPLACE WordList sym:CUI_HID_OPTIONS_DICT_EDIT_ENTRIES_LIST *BenutzerverzeichnisDefinieren sym:SW_HID_DLG_NEW_USER_IDX -NameBenutzerverzeichnis sym:sw.Edit.21967.39 +NameBenutzerverzeichnis sym:sw:Edit:DLG_NEW_USER_IDX:ED_NAME -*BereicheBearbeiten sym:.uno:EditRegion +*BereicheBearbeiten .uno:EditRegion Bereich sym:SW_HID_REGION_TREE -BereichsName sym:sw.Edit.20269.19 -Geschuetzt sym:sw.TriStateBox.20269.10 -Ausblenden sym:sw.TriStateBox.20269.8 -Bedingung sym:sw.Edit.20269.13 -Verknuepfung sym:sw.TriStateBox.20269.5 -DDE sym:sw.CheckBox.20269.1 -Dateiname sym:sw.Edit.20269.16 -OptionenBereich sym:sw.ComboBox.20269.38 -Aufheben sym:sw.PushButton.20269.2 -' Spalten sw:PushButton:MD_INS_REGION:PB_COLUMNS -Durchsuchen sym:sw.PushButton.20269.40 -Passwort sym:sw.CheckBox.20269.9 -Optionen sym:sw.PushButton.20269.43 -EnterPasswort sym:sw.PushButton.20269.51 +BereichsName sym:sw:Edit:MD_EDIT_REGION:ED_RANAME +Geschuetzt sym:sw:TriStateBox:MD_EDIT_REGION:CB_PROTECT +Ausblenden sym:sw:TriStateBox:MD_EDIT_REGION:CB_HIDE +Bedingung sym:sw:Edit:MD_EDIT_REGION:ED_CONDITION +Verknuepfung sym:sw:TriStateBox:MD_EDIT_REGION:CB_FILE +DDE sym:sw:CheckBox:MD_EDIT_REGION:CB_DDE +Dateiname sym:sw:Edit:MD_EDIT_REGION:ED_FILE +OptionenBereich sym:sw:ComboBox:MD_EDIT_REGION:LB_SUBREG +Aufheben sym:sw:PushButton:MD_EDIT_REGION:CB_DISMISS +' Spalten sym:sw:PushButton:MD_INS_REGION:PB_COLUMNS +Durchsuchen sym:sw:PushButton:MD_EDIT_REGION:PB_FILE +Passwort sym:sw:CheckBox:MD_EDIT_REGION:CB_PASSWD +Optionen sym:sw:PushButton:MD_EDIT_REGION:PB_OPTIONS +EnterPasswort sym:sw:PushButton:MD_EDIT_REGION:PB_PASSWD *BereicheBearbeitenAutoText sym:SW_HID_BIB_BASE -Bereich sym:sw.Edit.21666.10 -Pfad sym:sw.ListBox.21666.8 +Bereich sym:sw:Edit:DLG_BIB_BASE:ED_NAME +Pfad sym:sw:ListBox:DLG_BIB_BASE:LB_PATH Liste sym:SW_HID_GLOS_GROUP_TREE -Neu sym:sw.PushButton.21666.3 -Loeschen sym:sw.PushButton.21666.4 -Umbenennen sym:sw.PushButton.21666.11 +Neu sym:sw:PushButton:DLG_BIB_BASE:PB_NEW +Loeschen sym:sw:PushButton:DLG_BIB_BASE:PB_DELETE +Umbenennen sym:sw:PushButton:DLG_BIB_BASE:PB_RENAME *BereicheSchuetzen sym:SW_HID_DLG_PASSWD_SECTION -PasswortName sym:sfx.Edit.2316.14 -PasswortBestaetigen sym:sfx.Edit.2316.16 +PasswortName sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD +PasswortBestaetigen sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM -*Beschriftung sym:SW_HID_DLG_CAPTION sym:.uno:InsertCaptionDialog -Kategorie sym:sw.ComboBox.21011.5 -Numerierung sym:sw.ListBox.21011.7 -BeschriftungsText sym:sw.Edit.21011.9 -Position sym:sw.ListBox.21011.11 -WeitereOptionen sym:sw.PushButton.21011.14 -Separator sym:sw.Edit.21011.25 +*Beschriftung sym:SW_HID_DLG_CAPTION .uno:InsertCaptionDialog +Kategorie sym:sw:ComboBox:DLG_CAPTION:BOX_CATEGORY +Numerierung sym:sw:ListBox:DLG_CAPTION:BOX_FORMAT +BeschriftungsText sym:sw:Edit:DLG_CAPTION:EDT_TEXT +Position sym:sw:ListBox:DLG_CAPTION:BOX_POS +WeitereOptionen sym:sw:PushButton:DLG_CAPTION:BTN_OPTION +Separator sym:sw:Edit:DLG_CAPTION:EDT_SEP -*BeschriftungsbereichFestlegen sym:SC_HID_COLROWNAMERANGES sc:ModelessDialog:RID_SCDLG_COLROWNAMERANGES -Bereich sym:sc.ListBox.25716.11 -Zellbereich sym:sc.Edit.25716.13 -ButtonZellbereich sym:sc.ImageButton.25716.14 -Spaltenkoepfe sym:sc.RadioButton.25716.15 -Zeilenkoepfe sym:sc.RadioButton.25716.16 -Hinzufuegen sym:sc.PushButton.25716.3 -Loeschen sym:sc.PushButton.25716.4 -Datenbereich sym:sc.Edit.25716.17 -ButtonDatenbereich sym:sc.ImageButton.25716.18 +*BeschriftungsbereichFestlegen sym:SC_HID_COLROWNAMERANGES sym:sc:ModelessDialog:RID_SCDLG_COLROWNAMERANGES +Bereich sym:sc:ListBox:RID_SCDLG_COLROWNAMERANGES:LB_RANGE +Zellbereich sym:sc:Edit:RID_SCDLG_COLROWNAMERANGES:ED_AREA +ButtonZellbereich sym:sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_AREA +Spaltenkoepfe sym:sc:RadioButton:RID_SCDLG_COLROWNAMERANGES:BTN_COLHEAD +Zeilenkoepfe sym:sc:RadioButton:RID_SCDLG_COLROWNAMERANGES:BTN_ROWHEAD +Hinzufuegen sym:sc:PushButton:RID_SCDLG_COLROWNAMERANGES:BTN_ADD +Loeschen sym:sc:PushButton:RID_SCDLG_COLROWNAMERANGES:BTN_REMOVE +Datenbereich sym:sc:Edit:RID_SCDLG_COLROWNAMERANGES:ED_DATA +ButtonDatenbereich sym:sc:ImageButton:RID_SCDLG_COLROWNAMERANGES:RB_DATA -*Bildschirmpraesentation sym:.uno:Presentation -AlleDias sym:sd.RadioButton.20003.1 -AbDia sym:sd.RadioButton.20003.2 -AbDiaName sym:sd.ListBox.20003.1 -RangeCustomSlideShow sym:sd.RadioButton.20003.3 -'IndividuellePraesentation sym:sd.RadioButton.20003.3 -IndividuellePraesentationName sym:sd.ListBox.20003.2 -Standard sym:sd.RadioButton.20003.4 -Fenster sym:sd.RadioButton.20003.5 -Auto sym:sd.RadioButton.20003.6 -Zeit sym:sd.TimeField.20003.1 -LogoAnzeigen sym:sd.CheckBox.20003.1 -DiawechselManuel sym:sd.CheckBox.20003.2 -MauszeigerSichtbar sym:sd.CheckBox.20003.3 -MauszeigerAlsStift sym:sd.CheckBox.20003.4 -NavigatorSichtbar sym:sd.CheckBox.20003.5 -AnimationenZulassen sym:sd.CheckBox.20003.6 -DiawechselAufHintergrund sym:sd.CheckBox.20003.7 -PraesentationImmerImVordergrund sym:sd.CheckBox.20003.8 +*Bildschirmpraesentation .uno:Presentation +AlleDias sym:sd:RadioButton:DLG_START_PRESENTATION:RBT_ALL +AbDia sym:sd:RadioButton:DLG_START_PRESENTATION:RBT_AT_DIA +AbDiaName sym:sd:ListBox:DLG_START_PRESENTATION:LB_DIAS +RangeCustomSlideShow sym:sd:RadioButton:DLG_START_PRESENTATION:RBT_CUSTOMSHOW +'IndividuellePraesentation sym:sd:RadioButton:DLG_START_PRESENTATION:RBT_CUSTOMSHOW +IndividuellePraesentationName sym:sd:ListBox:DLG_START_PRESENTATION:LB_CUSTOMSHOW +Standard sym:sd:RadioButton:DLG_START_PRESENTATION:RBT_STANDARD +Fenster sym:sd:RadioButton:DLG_START_PRESENTATION:RBT_WINDOW +Auto sym:sd:RadioButton:DLG_START_PRESENTATION:RBT_AUTO +Zeit sym:sd:TimeField:DLG_START_PRESENTATION:TMF_PAUSE +LogoAnzeigen sym:sd:CheckBox:DLG_START_PRESENTATION:CBX_AUTOLOGO +DiawechselManuel sym:sd:CheckBox:DLG_START_PRESENTATION:CBX_MANUEL +MauszeigerSichtbar sym:sd:CheckBox:DLG_START_PRESENTATION:CBX_MOUSEPOINTER +MauszeigerAlsStift sym:sd:CheckBox:DLG_START_PRESENTATION:CBX_PEN +NavigatorSichtbar sym:sd:CheckBox:DLG_START_PRESENTATION:CBX_NAVIGATOR +AnimationenZulassen sym:sd:CheckBox:DLG_START_PRESENTATION:CBX_ANIMATION_ALLOWED +DiawechselAufHintergrund sym:sd:CheckBox:DLG_START_PRESENTATION:CBX_CHANGE_PAGE +PraesentationImmerImVordergrund sym:sd:CheckBox:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP -*BMPOptionen sym:svt.ModalDialog.16371 -Farbaufloesung sym:svt.ListBox.16371.1 -RLEKodierung sym:svt.CheckBox.16371.3 -Original sym:svt.RadioButton.16371.1 -Aufloesung sym:svt.RadioButton.16371.2 -DPI sym:svt.ComboBox.16371.1 -Groesse sym:svt.RadioButton.16371.3 -Breite sym:svt.MetricField.16371.1 -Hoehe sym:svt.MetricField.16371.2 +*BMPOptionen sym:svtools:ModalDialog:DLG_EXPORT_PIX +Farbaufloesung sym:svtools:ListBox:DLG_EXPORT_PIX:LB_COLORS +RLEKodierung sym:svtools:CheckBox:DLG_EXPORT_PIX:CBX_RLE +Original sym:svtools:RadioButton:DLG_EXPORT_PIX:RB_ORIGINAL_PIX +Aufloesung sym:svtools:RadioButton:DLG_EXPORT_PIX:RB_RES_PIX +DPI sym:svtools:ComboBox:DLG_EXPORT_PIX:CBB_RES_PIX +Groesse sym:svtools:RadioButton:DLG_EXPORT_PIX:RB_SIZE_PIX +Breite sym:svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEX_PIX +Hoehe sym:svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEY_PIX -*Browser sym:.uno:Beamer +*Browser .uno:Beamer -*ChineseTranslation sym:textconversiondlgs.ModalDialog.300 +*ChineseTranslation sym:svx:ModalDialog:DLG_CHINESETRANSLATION TChineseToSChinese sym:SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_SIMPLIFIED SChineseToTChinese sym:SVX_HID_SVX_CHINESE_TRANSLATION_RB_CONVERSION_TO_TRADITIONAL 'UseSARCharacter sym:SVX_HID_SVX_CHINESE_TRANSLATION_CB_USE_VARIANTS -TranslateCommonTerms sym:textconversiondlgs.CheckBox.300.2 -EditTerms sym:textconversiondlgs.PushButton.300.1 +TranslateCommonTerms sym:svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS +EditTerms sym:svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS -*ChineseDictionary sym:textconversiondlgs.ModalDialog.301 +*ChineseDictionary sym:svx:ModalDialog:DLG_CHINESEDICTIONARY TChineseToSChinese sym:SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_SIMPLIFIED SChineseToTChinese sym:SVX_HID_SVX_CHINESE_DICTIONARY_RB_CONVERSION_TO_TRADITIONAL ReverseMapping sym:SVX_HID_SVX_CHINESE_DICTIONARY_CB_REVERSE -Term sym:textconversiondlgs.Edit.301.1 -Mapping sym:textconversiondlgs.Edit.301.2 -Property sym:textconversiondlgs.ListBox.301.1 +Term sym:svx:Edit:DLG_CHINESEDICTIONARY:ED_TERM +Mapping sym:svx:Edit:DLG_CHINESEDICTIONARY:ED_MAPPING +Property sym:svx:ListBox:DLG_CHINESEDICTIONARY:LB_PROPERTY SToTMappingContent sym:SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_TRADITIONAL TToSMappingContent sym:SVX_HID_SVX_CHINESE_DICTIONARY_LB_TO_SIMPLIFIED -Add sym:textconversiondlgs.PushButton.301.1 -Modify sym:textconversiondlgs.PushButton.301.2 -Delete sym:textconversiondlgs.PushButton.301.3 +Add sym:svx:PushButton:DLG_CHINESEDICTIONARY:PB_ADD +Modify sym:svx:PushButton:DLG_CHINESEDICTIONARY:PB_MODIFY +Delete sym:svx:PushButton:DLG_CHINESEDICTIONARY:PB_DELETE diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win index 5a4a5d4361e6..2129f79d1b59 100644 --- a/testautomation/global/win/dial_d_h.win +++ b/testautomation/global/win/dial_d_h.win @@ -1,417 +1,417 @@ *DataFieldsFunctionDlg sym:SC_HID_SC_DPDATAFIELD -FunctionList sym:sc.MultiListBox.25737.1 -More sym:sc.MoreButton.25737.4 -ValueType sym:sc.ListBox.25737.2 -BaseField sym:sc.ListBox.25737.3 -BaseItem sym:sc.ListBox.25737.4 +FunctionList sym:sc:MultiListBox:RID_SCDLG_DPDATAFIELD:LB_FUNC +More sym:sc:MoreButton:RID_SCDLG_DPDATAFIELD:BTN_MORE +ValueType sym:sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_TYPE +BaseField sym:sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_BASEFIELD +BaseItem sym:sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_BASEITEM *DataFieldsOptionsDlg sym:SC_HID_SC_DPSUBT_OPT -Sortby sym:sc.ListBox.25738.5 -Ascending sym:sc.RadioButton.25738.4 -Descending sym:sc.RadioButton.25738.5 -Manual sym:sc.RadioButton.25738.6 -Layout sym:sc.ListBox.25738.6 -EmptyLine sym:sc.CheckBox.25738.2 -Show sym:sc.CheckBox.25738.3 -ShowItems sym:sc.NumericField.25738.1 -ShowFrom sym:sc.ListBox.25738.7 -UsingField sym:sc.ListBox.25738.8 +Sortby sym:sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SORT_BY +Ascending sym:sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_ASC +Descending sym:sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_DESC +Manual sym:sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_MAN +Layout sym:sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_LAYOUT +EmptyLine sym:sc:CheckBox:RID_SCDLG_DPSUBTOTAL_OPT:CB_LAYOUT_EMPTY +Show sym:sc:CheckBox:RID_SCDLG_DPSUBTOTAL_OPT:CB_SHOW +ShowItems sym:sc:NumericField:RID_SCDLG_DPSUBTOTAL_OPT:NF_SHOW +ShowFrom sym:sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SHOW_FROM +UsingField sym:sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SHOW_USING HideItems sym:SC_HID_SC_DPSUBT_HIDE -Hierarchy sym:sc.ListBox.25738.9 +Hierarchy sym:sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_HIERARCHY *DateienAuswaehlen sym:SW_HID_FILEDLG_MAILMRGE2 -Hinzufuegen sym:cui.PushButton.10201.14 -Loeschen sym:cui.PushButton.10201.15 -Pfade sym:cui.ListBox.10201.11 - -*Datenpilot sym:.uno:DataDataPilotRun -Zusaetze sym:sc.MoreButton.25638.4 -DataPilotRange sym:sc.Edit.25638.42 -DataPilotRangeShrink sym:sc.ImageButton.25638.41 -AusgabeAb sym:sc.ListBox.25638.22 -Bereich sym:sc.Edit.25638.23 -Minimieren sym:sc.ImageButton.25638.24 -LeerzeilenIgnorieren sym:sc.CheckBox.25638.25 -KategorieErkennung sym:sc.CheckBox.25638.26 -GesamtSpalten sym:sc.CheckBox.25638.27 -GesamtZeilen sym:sc.CheckBox.25638.28 -Entfernen sym:sc.PushButton.25638.5 -Optionen sym:sc.PushButton.25638.6 -AddFilter sym:sc.CheckBox.25638.29 -EnableDrillToDetails sym:sc.CheckBox.25638.30 +Hinzufuegen sym:cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH +Loeschen sym:cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH +Pfade sym:cui:ListBox:RID_SVXDLG_MULTIPATH:LB_MULTIPATH + +*Datenpilot .uno:DataDataPilotRun +Zusaetze sym:sc:MoreButton:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE +DataPilotRange sym:sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_INAREA +DataPilotRangeShrink sym:sc:ImageButton:RID_SCDLG_PIVOT_LAYOUT:RB_INAREA +AusgabeAb sym:sc:ListBox:RID_SCDLG_PIVOT_LAYOUT:LB_OUTAREA +Bereich sym:sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA +Minimieren sym:sc:ImageButton:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA +LeerzeilenIgnorieren sym:sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_IGNEMPTYROWS +KategorieErkennung sym:sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_DETECTCAT +GesamtSpalten sym:sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALCOL +GesamtZeilen sym:sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALROW +Entfernen sym:sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_REMOVE +Optionen sym:sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_OPTIONS +AddFilter sym:sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_FILTER +EnableDrillToDetails sym:sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_DRILLDOWN DataPilotPage sym:SC_HID_SC_DPLAY_PAGE DataPilotColumn sym:SC_HID_SC_DPLAY_COLUMN DataPilotRow sym:SC_HID_SC_DPLAY_ROW DataPilotData sym:SC_HID_SC_DPLAY_DATA DataPilotSelection sym:SC_HID_SC_DPLAY_SELECT -*DatenbankAustauschen sym:sw.ModalDialog.21109 +*DatenbankAustauschen sym:sw:ModalDialog:DLG_CHANGE_DB VerfuegbareDatenbanken sym:SW_HID_DB_SELECTION_TLB -*Datenbankauswahl sym:sw.ModalDialog.22050 - -*DatenbankbereichFestlegen sym:.uno:DefineDBName -BereichsName sym:sc.ComboBox.25627.11 -EnthaeltSpaltenkoepfe sym:sc.CheckBox.25627.21 -Hinzufuegen sym:sc.PushButton.25627.3 -Loeschen sym:sc.PushButton.25627.4 -Aendern sym:sc.PushButton.25627.3 -Bereich sym:sc.Edit.25627.13 -BereichMin sym:sc.ImageButton.25627.14 -Zusaetze sym:sc.MoreButton.25627.33 -Spaltenkoepfe sym:sc.CheckBox.25627.21 -Zellen sym:sc.CheckBox.25627.22 -Formatierung sym:sc.CheckBox.25627.23 -ImportierteDaten sym:sc.CheckBox.25627.24 - -*DatenbankbereichWaehlen sym:.uno:SelectDB +*Datenbankauswahl sym:sw:ModalDialog:DLG_DBSELECTION + +*DatenbankbereichFestlegen .uno:DefineDBName +BereichsName sym:sc:ComboBox:RID_SCDLG_DBNAMES:ED_NAME +EnthaeltSpaltenkoepfe sym:sc:CheckBox:RID_SCDLG_DBNAMES:BTN_HEADER +Hinzufuegen sym:sc:PushButton:RID_SCDLG_DBNAMES:BTN_ADD +Loeschen sym:sc:PushButton:RID_SCDLG_DBNAMES:BTN_REMOVE +Aendern sym:sc:PushButton:RID_SCDLG_DBNAMES:BTN_ADD +Bereich sym:sc:Edit:RID_SCDLG_DBNAMES:ED_DBAREA +BereichMin sym:sc:ImageButton:RID_SCDLG_DBNAMES:RB_DBAREA +Zusaetze sym:sc:MoreButton:RID_SCDLG_DBNAMES:BTN_MORE +Spaltenkoepfe sym:sc:CheckBox:RID_SCDLG_DBNAMES:BTN_HEADER +Zellen sym:sc:CheckBox:RID_SCDLG_DBNAMES:BTN_SIZE +Formatierung sym:sc:CheckBox:RID_SCDLG_DBNAMES:BTN_FORMAT +ImportierteDaten sym:sc:CheckBox:RID_SCDLG_DBNAMES:BTN_STRIPDATA + +*DatenbankbereichWaehlen .uno:SelectDB Bereiche sym:SC_HID_SC_SELENTRY_LIST *Datenfeld sym:SC_HID_SC_PIVOTSUBT -Keine sym:sc.RadioButton.25642.1 -Automatisch sym:sc.RadioButton.25642.2 -Benutzerdefiniert sym:sc.RadioButton.25642.3 -Funktionen sym:sc.MultiListBox.25642.1 -OhneDatenAnzeigen sym:sc.CheckBox.25642.1 -Options sym:sc.PushButton.25642.5 +Keine sym:sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_NONE +Automatisch sym:sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_AUTO +Benutzerdefiniert sym:sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_USER +Funktionen sym:sc:MultiListBox:RID_SCDLG_PIVOTSUBT:LB_FUNC +OhneDatenAnzeigen sym:sc:CheckBox:RID_SCDLG_PIVOTSUBT:CB_SHOWALL +Options sym:sc:PushButton:RID_SCDLG_PIVOTSUBT:BTN_OPTIONS *DatenquelleAuswaehlen sym:SC_HID_DATAPILOT_DATABASE -Datenbank sym:sc.ListBox.25735.19 -Datenquelle sym:sc.ComboBox.25735.21 -Art sym:sc.ListBox.25735.23 +Datenbank sym:sc:ListBox:RID_SCDLG_DAPIDATA:LB_DATABASE +Datenquelle sym:sc:ComboBox:RID_SCDLG_DAPIDATA:CB_OBJECT +Art sym:sc:ListBox:RID_SCDLG_DAPIDATA:LB_OBJTYPE *DatenquelleLiteraturdatenbank sym:EXTENSIONS_HID_DLG_DBCHANGE Auswahl sym:EXTENSIONS_HID_SELECTION_TLB -*Dokumenteigenschaften sym:.uno:SetDocumentProperties +*Dokumenteigenschaften .uno:SetDocumentProperties -*DokumentSchuetzen sym:.uno:ToolProtectionDocument +*DokumentSchuetzen .uno:ToolProtectionDocument Passwort sym:SC_HID_PASSWD_DOC -Bestaetigung sym:sfx.Edit.2316.16 -IstVerdeckt sym:sfx.Edit.2316.12 - -*DokumentVorlagen sym:.uno:SaveAsTemplate -NeueDokumentVorlage sym:sfx.Edit.2054.7 -Bereiche sym:sfx.ListBox.2054.2 -Vorlagen sym:sfx.ListBox.2054.4 -Bearbeiten sym:sfx.PushButton.2054.12 -Verwalten sym:sfx.PushButton.2054.20 - -*Drei_D_Effekte sym:.uno:Window3D -Geometrie sym:svx.ImageButton.10209.2 -Darstellung sym:svx.ImageButton.10209.3 -Beleuchtung sym:svx.ImageButton.10209.4 -Texturen sym:svx.ImageButton.10209.5 -Material sym:svx.ImageButton.10209.6 -Aktualisieren sym:svx.ImageButton.10209.7 -Zuweisen sym:svx.ImageButton.10209.8 -Perspektive sym:svx.ImageButton.10209.9 -Rotationskoerper sym:svx.ImageButton.10209.11 -In_3D_Umwandeln sym:svx.ImageButton.10209.10 -Objektspezifisch sym:svx.ImageButton.10209.38 -Flach sym:svx.ImageButton.10209.39 -Kugelfoermig sym:svx.ImageButton.10209.40 -NormalenUmkehren sym:svx.ImageButton.10209.42 -ZweiSeitigeBeleuchtung sym:svx.ImageButton.10209.41 -Doppelseitig sym:svx.ImageButton.10209.44 -Drei_DSchatten sym:svx.ImageButton.10209.47 -Lichquelle1 sym:svx.ImageButton.10209.60 -Lichquelle2 sym:svx.ImageButton.10209.61 -Lichquelle3 sym:svx.ImageButton.10209.62 -Lichquelle4 sym:svx.ImageButton.10209.63 -Lichquelle5 sym:svx.ImageButton.10209.64 -Lichquelle6 sym:svx.ImageButton.10209.65 -Lichquelle7 sym:svx.ImageButton.10209.66 -Lichquelle8 sym:svx.ImageButton.10209.67 -FarbeUeberDialogAmbient sym:svx.ImageButton.10209.79 -FarbeUeberDialogSpecular sym:svx.ImageButton.10209.120 -FarbeUeberDialogEmission sym:svx.ImageButton.10209.117 -FarbeUeberDialogLicht sym:svx.ImageButton.10209.76 -Schwarzweiss sym:svx.ImageButton.10209.91 -FarbeTextur sym:svx.ImageButton.10209.92 -Textur sym:svx.ImageButton.10209.94 -Textur_Schattierung sym:svx.ImageButton.10209.95 -Textur_Schattierung_Farbe sym:svx.ImageButton.10209.96 -ObjektspezifischX sym:svx.ImageButton.10209.100 -ObjektspezifischY sym:svx.ImageButton.10209.104 -ParallelX sym:svx.ImageButton.10209.98 -KreisfoermigX sym:svx.ImageButton.10209.99 -ParallelY sym:svx.ImageButton.10209.102 -KreisfoermigY sym:svx.ImageButton.10209.103 -Filtern sym:svx.ImageButton.10209.106 -MaterialFarbe sym:svx.ListBox.10209.113 -EmissionsFarbe sym:svx.ListBox.10209.116 -SpecularFarbe sym:svx.ListBox.10209.119 -MaterialFarbeUeberDialog sym:svx.ImageButton.10209.114 -Materialeditor sym:svx.ImageButton.10209.6 -UmwandelnIn3D sym:svx.ImageButton.10209.10 -UmwandelnInRotationskoerper sym:svx.ImageButton.10209.11 -Umgebungslicht sym:svx.ListBox.10209.78 -Horizontale_Segmente sym:svx.NumericField.10209.25 -Vertikale_Segmente sym:svx.NumericField.10209.27 -Kantenrundung sym:svx.MetricField.10209.30 -Tiefenskalierung sym:svx.MetricField.10209.32 -Endwinkel sym:svx.MetricField.10209.34 -Tiefe sym:svx.MetricField.10209.36 -Modus sym:svx.ListBox.10209.46 -Papierneigung sym:svx.MetricField.10209.49 -Entfernung sym:svx.MetricField.10209.52 -Brennweite sym:svx.MetricField.10209.54 +Bestaetigung sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM +IstVerdeckt sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER + +*DokumentVorlagen .uno:SaveAsTemplate +NeueDokumentVorlage sym:sfx2:Edit:DLG_DOC_TEMPLATE:ED_NAME +Bereiche sym:sfx2:ListBox:DLG_DOC_TEMPLATE:LB_SECTION +Vorlagen sym:sfx2:ListBox:DLG_DOC_TEMPLATE:LB_STYLESHEETS +Bearbeiten sym:sfx2:PushButton:DLG_DOC_TEMPLATE:BT_EDIT +Verwalten sym:sfx2:PushButton:DLG_DOC_TEMPLATE:BT_ORGANIZE + +*Drei_D_Effekte .uno:Window3D +Geometrie sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_GEO +Darstellung sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_REPRESENTATION +Beleuchtung sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT +Texturen sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEXTURE +Material sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_MATERIAL +Aktualisieren sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_UPDATE +Zuweisen sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_ASSIGN +Perspektive sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_PERSPECTIVE +Rotationskoerper sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_LATHE_OBJ +In_3D_Umwandeln sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_CHANGE_TO_3D +Objektspezifisch sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ +Flach sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT +Kugelfoermig sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE +NormalenUmkehren sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT +ZweiSeitigeBeleuchtung sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING +Doppelseitig sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED +Drei_DSchatten sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_SHADOW_3D +Lichquelle1 sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_1 +Lichquelle2 sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_2 +Lichquelle3 sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_3 +Lichquelle4 sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_4 +Lichquelle5 sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_5 +Lichquelle6 sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_6 +Lichquelle7 sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_7 +Lichquelle8 sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_8 +FarbeUeberDialogAmbient sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_AMBIENT_COLOR +FarbeUeberDialogSpecular sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_SPECULAR_COLOR +FarbeUeberDialogEmission sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_EMISSION_COLOR +FarbeUeberDialogLicht sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_COLOR +Schwarzweiss sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE +FarbeTextur sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_COLOR +Textur sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_REPLACE +Textur_Schattierung sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_MODULATE +Textur_Schattierung_Farbe sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_BLEND +ObjektspezifischX sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X +ObjektspezifischY sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y +ParallelX sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X +KreisfoermigX sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X +ParallelY sym:svx:ImageButton:RID_SVXFLOAt_3D:BTN_TEX_PARALLEL_Y +KreisfoermigY sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y +Filtern sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_FILTER +MaterialFarbe sym:svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_COLOR +EmissionsFarbe sym:svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_EMISSION +SpecularFarbe sym:svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_SPECULAR +MaterialFarbeUeberDialog sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_COLOR +Materialeditor sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_MATERIAL +UmwandelnIn3D sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_CHANGE_TO_3D +UmwandelnInRotationskoerper sym:svx:ImageButton:RID_SVXFLOAT_3D:BTN_LATHE_OBJ +Umgebungslicht sym:svx:ListBox:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT +Horizontale_Segmente sym:svx:NumericField:RID_SVXFLOAT_3D:NUM_HORIZONTAL +Vertikale_Segmente sym:svx:NumericField:RID_SVXFLOAT_3D:NUM_VERTICAL +Kantenrundung sym:svx:MetricField:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL +Tiefenskalierung sym:svx:MetricField:RID_SVXFLOAT_3D:MTR_BACKSCALE +Endwinkel sym:svx:MetricField:RID_SVXFLOAT_3D:MTR_END_ANGLE +Tiefe sym:svx:MetricField:RID_SVXFLOAT_3D:MTR_DEPTH +Modus sym:svx:ListBox:RID_SVXFLOAT_3D:LB_SHADEMODE +Papierneigung sym:svx:MetricField:RID_SVXFLOAT_3D:MTR_SLANT +Entfernung sym:svx:MetricField:RID_SVXFLOAT_3D:MTR_DISTANCE +Brennweite sym:svx:MetricField:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH *DruckbereicheBearbeiten sym:SC_HID_SCPAGE_AREAS -Druckbereich sym:sc.Edit.25685.11 -Wiederholungszeile sym:sc.Edit.25685.21 -Wiederholungsspalte sym:sc.Edit.25685.31 -DruckbereichListe sym:sc.ListBox.25685.13 -WiederholungszeileListe sym:sc.ListBox.25685.23 -WiederholungsspalteListe sym:sc.ListBox.25685.33 -DruckbereichButton sym:sc.ImageButton.25685.12 -WiederholungszeileButton sym:sc.ImageButton.25685.22 -WiederholungsspalteButton sym:sc.ImageButton.25685.32 +Druckbereich sym:sc:Edit:RID_SCDLG_AREAS:ED_PRINTAREA +Wiederholungszeile sym:sc:Edit:RID_SCDLG_AREAS:ED_REPEATROW +Wiederholungsspalte sym:sc:Edit:RID_SCDLG_AREAS:ED_REPEATCOL +DruckbereichListe sym:sc:ListBox:RID_SCDLG_AREAS:LB_PRINTAREA +WiederholungszeileListe sym:sc:ListBox:RID_SCDLG_AREAS:LB_REPEATROW +WiederholungsspalteListe sym:sc:ListBox:RID_SCDLG_AREAS:LB_REPEATCOL +DruckbereichButton sym:sc:ImageButton:RID_SCDLG_AREAS:RB_PRINTAREA +WiederholungszeileButton sym:sc:ImageButton:RID_SCDLG_AREAS:RB_REPEATROW +WiederholungsspalteButton sym:sc:ImageButton:RID_SCDLG_AREAS:RB_REPEATCOL *Druckbestaetigung sym:SFX2_HID_PRINTMONITOR *Druckoptionen sym:SW_HID_DLG_PRV_PRT_OPTIONS -Zeilen sym:sw.NumericField.20602.3 -Spalten sym:sw.NumericField.20602.5 -Links sym:sw.MetricField.20602.13 -Rechts sym:sw.MetricField.20602.15 -Oben sym:sw.MetricField.20602.17 -Unten sym:sw.MetricField.20602.19 -Horizontal sym:sw.MetricField.20602.21 -Vertikal sym:sw.MetricField.20602.23 -Querformat sym:sw.RadioButton.20602.24 -Hochformat sym:sw.RadioButton.20602.25 -Standard sym:sw.PushButton.20602.24 +Zeilen sym:sw:NumericField:DLG_PAGEPREVIEW_PRINTOPTIONS:NF_ROWS +Spalten sym:sw:NumericField:DLG_PAGEPREVIEW_PRINTOPTIONS:NF_COLS +Links sym:sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_LMARGIN +Rechts sym:sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_RMARGIN +Oben sym:sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_TMARGIN +Unten sym:sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_BMARGIN +Horizontal sym:sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_HMARGIN +Vertikal sym:sw:MetricField:DLG_PAGEPREVIEW_PRINTOPTIONS:MF_VMARGIN +Querformat sym:sw:RadioButton:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_LANDSCAPE +Hochformat sym:sw:RadioButton:DLG_PAGEPREVIEW_PRINTOPTIONS:RB_PORTRAIT +Standard sym:sw:PushButton:DLG_PAGEPREVIEW_PRINTOPTIONS:PB_STANDARD *DruckerZusaetzeDraw sym:SD_HID_SD_PRINT_OPTIONS -Zeichnung sym:sd.CheckBox.549.6 -Notizen sym:sd.CheckBox.549.7 -Handzettel sym:sd.CheckBox.549.8 -Gliederung sym:sd.CheckBox.549.9 -Seitenname sym:sd.CheckBox.549.2 -Datum sym:sd.CheckBox.549.3 -Zeit sym:sd.CheckBox.549.4 -AusgeblendeteSeiten sym:sd.CheckBox.549.1 -Standard sym:sd.RadioButton.549.1 -SeitengroesseAnpassen sym:sd.RadioButton.549.2 -SeitenKacheln sym:sd.RadioButton.549.3 -Prospekt sym:sd.RadioButton.549.4 -Vorderseite sym:sd.CheckBox.549.12 -Rueckseite sym:sd.CheckBox.549.13 -AusDruckereinstellung sym:sd.CheckBox.549.10 +Zeichnung sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_DRAW +Notizen sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_NOTES +Handzettel sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_HANDOUTS +Gliederung sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_OUTLINE +Seitenname sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAGENAME +Datum sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_DATE +Zeit sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_TIME +AusgeblendeteSeiten sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES +Standard sym:sd:RadioButton:TP_PRINT_OPTIONS:RBT_DEFAULT +SeitengroesseAnpassen sym:sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGESIZE +SeitenKacheln sym:sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGETILE +Prospekt sym:sd:RadioButton:TP_PRINT_OPTIONS:RBT_BOOKLET +Vorderseite sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_FRONT +Rueckseite sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_BACK +AusDruckereinstellung sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN *DruckerZusaetzeWriter sym:SW_HID_OPTPRINT_PAGE -Grafiken sym:sw.CheckBox.20826.61 -Kontrollfelder sym:sw.CheckBox.20826.69 -Hintergrund sym:sw.CheckBox.20826.79 -HiddenText sym:sw.CheckBox.20826.93 -TextPlaceholder sym:sw.CheckBox.20826.94 -RightToLeft sym:sw.CheckBox.20826.140 -SchwarzDrucken sym:sw.CheckBox.20826.87 -LinkeSeiten sym:sw.CheckBox.20826.64 -RechteSeiten sym:sw.CheckBox.20826.65 -Prospekt sym:sw.CheckBox.20826.67 -Keine sym:sw.RadioButton.20826.80 -NurNotizen sym:sw.RadioButton.20826.81 -Dokumentende sym:sw.RadioButton.20826.82 -Seitenende sym:sw.RadioButton.20826.83 -Fax sym:sw.ListBox.20826.86 -AusDruckereinstellung sym:sw.CheckBox.20826.70 - -*Duplizieren sym:.uno:CopyObjects -AnzahlAnKopien sym:sd.NumericField.727.1 -XAchse sym:sd.MetricField.727.2 -YAchse sym:sd.MetricField.727.3 -Drehwinkel sym:sd.MetricField.727.1 -Hoehe sym:sd.MetricField.727.5 -Breite sym:sd.MetricField.727.4 -Anfang sym:sd.ListBox.727.1 -Ende sym:sd.ListBox.727.2 - -*DVVerwalten sym:.uno:Organizer -Befehle sym:sfx.MenuButton.2055.105 -WelcheDatei sym:sfx.PushButton.2055.3 +Grafiken sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF +Kontrollfelder sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD +Hintergrund sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND +HiddenText sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT +TextPlaceholder sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_TEXT_PLACEHOLDER +RightToLeft sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL +SchwarzDrucken sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT +LinkeSeiten sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP +RechteSeiten sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP +Prospekt sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT +Keine sym:sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO +NurNotizen sym:sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY +Dokumentende sym:sw:RadioButton:TP_OPTPRINT_PAGE:RB_END +Seitenende sym:sw:RadioButton:TP_OPTPRINT_PAGE:RB_PAGEEND +Fax sym:sw:ListBox:TP_OPTPRINT_PAGE:LB_FAX +AusDruckereinstellung sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP + +*Duplizieren .uno:CopyObjects +AnzahlAnKopien sym:sd:NumericField:DLG_COPY:NUM_FLD_COPIES +XAchse sym:sd:MetricField:DLG_COPY:MTR_FLD_MOVE_X +YAchse sym:sd:MetricField:DLG_COPY:MTR_FLD_MOVE_Y +Drehwinkel sym:sd:MetricField:DLG_COPY:MTR_FLD_ANGLE +Hoehe sym:sd:MetricField:DLG_COPY:MTR_FLD_HEIGHT +Breite sym:sd:MetricField:DLG_COPY:MTR_FLD_WIDTH +Anfang sym:sd:ListBox:DLG_COPY:LB_START_COLOR +Ende sym:sd:ListBox:DLG_COPY:LB_END_COLOR + +*DVVerwalten .uno:Organizer +Befehle sym:sfx2:MenuButton:DLG_ORGANIZE:BTN_EDIT +WelcheDatei sym:sfx2:PushButton:DLG_ORGANIZE:BTN_FILES ListeLinks sym:SFX2_HID_CTL_ORGANIZER_LEFT ListeRechts sym:SFX2_HID_CTL_ORGANIZER_RIGHT -PopuplisteLinks sym:sfx.ListBox.2055.2 -PopuplisteRechts sym:sfx.ListBox.2055.11 -AddressBook sym:sfx.PushButton.2055.4 - -*EinfuegenSpalten sym:.uno:InsertColumnDialog -Anzahl sym:cui.NumericField.10156.2 -Davor sym:cui.RadioButton.10156.10 -Dahinter sym:cui.RadioButton.10156.11 - -*EinfuegenZeilen sym:.uno:InsertRowDialog -Anzahl sym:cui.NumericField.10156.2 -Davor sym:cui.RadioButton.10156.10 -Dahinter sym:cui.RadioButton.10156.11 - -*EbeneEinfuegenDlg sym:.uno:InsertLayer -EbenenName sym:sd.Edit.259.2 -LayerTitle sym:sd.Edit.259.4 -LayerDescription sym:sd.MultiLineEdit.259.6 -Sichtbar sym:sd.CheckBox.259.7 -Druckbar sym:sd.CheckBox.259.8 -Gesperrt sym:sd.CheckBox.259.9 - -*EbeneAendernDlg sym:.uno:ModifyLayer -EbenenName sym:sd.Edit.259.2 -LayerTitle sym:sd.Edit.259.4 -LayerDescription sym:sd.MultiLineEdit.259.6 -Sichtbar sym:sd.CheckBox.259.7 -Druckbar sym:sd.CheckBox.259.8 -Gesperrt sym:sd.CheckBox.259.9 +PopuplisteLinks sym:sfx2:ListBox:DLG_ORGANIZE:LB_LEFT_TYP +PopuplisteRechts sym:sfx2:ListBox:DLG_ORGANIZE:LB_RIGHT_TYP +AddressBook sym:sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE + +*EinfuegenSpalten .uno:InsertColumnDialog +Anzahl sym:cui:NumericField:DLG_INS_ROW_COL:ED_COUNT +Davor sym:cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE +Dahinter sym:cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER + +*EinfuegenZeilen .uno:InsertRowDialog +Anzahl sym:cui:NumericField:DLG_INS_ROW_COL:ED_COUNT +Davor sym:cui:RadioButton:DLG_INS_ROW_COL:CB_POS_BEFORE +Dahinter sym:cui:RadioButton:DLG_INS_ROW_COL:CB_POS_AFTER + +*EbeneEinfuegenDlg .uno:InsertLayer +EbenenName sym:sd:Edit:DLG_INSERT_LAYER:EDT_NAME +LayerTitle sym:sd:Edit:DLG_INSERT_LAYER:EDT_TITLE +LayerDescription sym:sd:MultiLineEdit:DLG_INSERT_LAYER:EDT_DESCRIPTION +Sichtbar sym:sd:CheckBox:DLG_INSERT_LAYER:CBX_VISIBLE +Druckbar sym:sd:CheckBox:DLG_INSERT_LAYER:CBX_PRINTABLE +Gesperrt sym:sd:CheckBox:DLG_INSERT_LAYER:CBX_LOCKED + +*EbeneAendernDlg .uno:ModifyLayer +EbenenName sym:sd:Edit:DLG_INSERT_LAYER:EDT_NAME +LayerTitle sym:sd:Edit:DLG_INSERT_LAYER:EDT_TITLE +LayerDescription sym:sd:MultiLineEdit:DLG_INSERT_LAYER:EDT_DESCRIPTION +Sichtbar sym:sd:CheckBox:DLG_INSERT_LAYER:CBX_VISIBLE +Druckbar sym:sd:CheckBox:DLG_INSERT_LAYER:CBX_PRINTABLE +Gesperrt sym:sd:CheckBox:DLG_INSERT_LAYER:CBX_LOCKED *Eingabefeld sym:SW_HID_FLD_INPUT -Titel sym:sw.Edit.21105.7 -EingabeText sym:sw.MultiLineEdit.21105.3 -Weiter sym:sw.PushButton.21105.8 - -*EMFOptionen sym:svt.ModalDialog.16372 -Original sym:svt.RadioButton.16372.1 -Groesse sym:svt.RadioButton.16372.2 -Breite sym:svt.MetricField.16372.1 -Hoehe sym:svt.MetricField.16372.2 - -*EPSOptionen sym:filter.ModalDialog.17408 -VorschauTif sym:filter.CheckBox.17408.1 -InterchangeEPSI sym:filter.CheckBox.17408.2 -Level1 sym:filter.RadioButton.17408.1 -Level2 sym:filter.RadioButton.17408.2 -Farbe sym:filter.RadioButton.17408.3 -Graustufen sym:filter.RadioButton.17408.4 -LZWKodierung sym:filter.RadioButton.17408.5 -Keine sym:filter.RadioButton.17408.6 +Titel sym:sw:Edit:DLG_FLD_INPUT:ED_LABEL +EingabeText sym:sw:MultiLineEdit:DLG_FLD_INPUT:ED_EDIT +Weiter sym:sw:PushButton:DLG_FLD_INPUT:PB_NEXT + +*EMFOptionen sym:svtools:ModalDialog:DLG_EXPORT_VEC +Original sym:svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC +Groesse sym:svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC +Breite sym:svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC +Hoehe sym:svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC + +*EPSOptionen sym:filter:ModalDialog:DLG_EXPORT_EPS +VorschauTif sym:filter:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_TIFF +InterchangeEPSI sym:filter:CheckBox:DLG_EXPORT_EPS:CB_PREVIEW_EPSI +Level1 sym:filter:RadioButton:DLG_EXPORT_EPS:RB_LEVEL1 +Level2 sym:filter:RadioButton:DLG_EXPORT_EPS:RB_LEVEL2 +Farbe sym:filter:RadioButton:DLG_EXPORT_EPS:RB_COLOR +Graustufen sym:filter:RadioButton:DLG_EXPORT_EPS:RB_GRAYSCALE +LZWKodierung sym:filter:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_LZW +Keine sym:filter:RadioButton:DLG_EXPORT_EPS:RB_COMPRESSION_NONE *EtikettenSynchronisieren sym:SW_HID_SYNC_BTN -Synchronisieren sym:sw.PushButton.22759.20 +Synchronisieren sym:sw:PushButton:DLG_SYNC_BTN:BTN_SYNC *ExportCalc sym:SC_HID_SC_INPORTOPT -Zeichensatzliste sym:sc.ListBox.25663.10 -Feldtrenner sym:sc.ComboBox.25663.5 -Texttrenner sym:sc.ComboBox.25663.7 -Zeichensatz sym:sc.ListBox.25663.9 -FixedWidth sym:sc.CheckBox.25663.12 -SaveAsShown sym:sc.CheckBox.25663.13 - -*ExterneDaten sym:sc.ModalDialog.25736 +Zeichensatzliste sym:sc:ListBox:RID_SCDLG_IMPORTOPT:LB_FONT +Feldtrenner sym:sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_FIELDSEP +Texttrenner sym:sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_TEXTSEP +Zeichensatz sym:sc:ListBox:RID_SCDLG_IMPORTOPT:DDLB_FONT +FixedWidth sym:sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_FIXEDWIDTH +SaveAsShown sym:sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_SAVESHOWN + +*ExterneDaten sym:sc:ModalDialog:RID_SCDLG_LINKAREA URLFeld sym:SC_HID_SCDLG_LINKAREAURL -DateiAuswahl sym:sc.PushButton.25736.6 -TabellenListBox sym:sc.MultiListBox.25736.9 -Aktualisieren sym:sc.CheckBox.25736.10 -Zeit sym:sc.NumericField.25736.11 +DateiAuswahl sym:sc:PushButton:RID_SCDLG_LINKAREA:BTN_BROWSE +TabellenListBox sym:sc:MultiListBox:RID_SCDLG_LINKAREA:LB_RANGES +Aktualisieren sym:sc:CheckBox:RID_SCDLG_LINKAREA:BTN_RELOAD +Zeit sym:sc:NumericField:RID_SCDLG_LINKAREA:NF_DELAY *ExterneDatenquelle sym:SC_HID_DATAPILOT_SERVICE -Service sym:sc.ListBox.25734.9 -Quelle sym:sc.Edit.25734.11 -Quellname sym:sc.Edit.25734.13 -Benutzer sym:sc.Edit.25734.15 -Kennwort sym:sc.Edit.25734.17 +Service sym:sc:ListBox:RID_SCDLG_DAPISERVICE:LB_SERVICE +Quelle sym:sc:Edit:RID_SCDLG_DAPISERVICE:ED_SOURCE +Quellname sym:sc:Edit:RID_SCDLG_DAPISERVICE:ED_NAME +Benutzer sym:sc:Edit:RID_SCDLG_DAPISERVICE:ED_USER +Kennwort sym:sc:Edit:RID_SCDLG_DAPISERVICE:ED_PASSWD *ExtrasOptionenDlg sym:CUI_HID_OFADLG_OPTIONS_TREE Optionsliste sym:CUI_HID_OFADLG_TREELISTBOX -Zurueck sym:cui.PushButton.17015.4 +Zurueck sym:cui:PushButton:RID_OFADLG_OPTIONS_TREE:PB_BACK *FeldAuswahl sym:SVX_HID_FIELD_SEL_WIN Liste sym:SVX_HID_FIELD_SEL -*FeldbefehlBearbeitenDraw sym:sd.ModalDialog.448 -FeldtypFix sym:sd.RadioButton.448.1 -FeldtypVariabel sym:sd.RadioButton.448.2 +*FeldbefehlBearbeitenDraw sym:sd:ModalDialog:DLG_FIELD_MODIFY +FeldtypFix sym:sd:RadioButton:DLG_FIELD_MODIFY:RBT_FIX +FeldtypVariabel sym:sd:RadioButton:DLG_FIELD_MODIFY:RBT_VAR *FeldbefehlBearbeitenDatenbank sym:SW_HID_EDIT_FLD_DB Bearbeiten sym:SW_HID_FLDEDT_ADDRESS -Feldtyp sym:sw.ListBox.20864.2 +Feldtyp sym:sw:ListBox:TP_FLD_DB:LB_DBTYPE Datenbankauswahl sym:SW_HID_DB_SELECTION_TLB -Bedingung sym:sw.Edit.20864.8 -Satznummer sym:sw.Edit.20864.9 -AusDatenbank sym:sw.RadioButton.20864.13 -Selbstdefiniert sym:sw.RadioButton.20864.12 -Formatliste sym:sw.ListBox.20864.10 -Zahlenformat sym:sw.ListBox.20864.11 +Bedingung sym:sw:Edit:TP_FLD_DB:ED_DBCONDITION +Satznummer sym:sw:Edit:TP_FLD_DB:ED_DBSETNUMBER +AusDatenbank sym:sw:RadioButton:TP_FLD_DB:RB_DBOWNFORMAT +Selbstdefiniert sym:sw:RadioButton:TP_FLD_DB:RB_DBFORMAT +Formatliste sym:sw:ListBox:TP_FLD_DB:LB_DBFORMAT +Zahlenformat sym:sw:ListBox:TP_FLD_DB:LB_DBNUMFORMAT *FeldbefehlBearbeitenDokument sym:SW_HID_EDIT_FLD_DOK Bearbeiten sym:SW_HID_FLDEDT_ADDRESS -Feldtyp sym:sw.ListBox.20867.48 -Auswahl sym:sw.ListBox.20867.50 -Editfeld sym:sw.Edit.20867.55 -DokLevel sym:sw.NumericField.20867.56 -Formatliste sym:sw.ListBox.20867.52 -Zahlenformat sym:sw.ListBox.20867.51 -InhaltFix sym:sw.CheckBox.20867.58 +Feldtyp sym:sw:ListBox:TP_FLD_DOK:LB_DOKTYPE +Auswahl sym:sw:ListBox:TP_FLD_DOK:LB_DOKSELECTION +Editfeld sym:sw:Edit:TP_FLD_DOK:ED_DOKVALUE +DokLevel sym:sw:NumericField:TP_FLD_DOK:ED_DOKLEVEL +Formatliste sym:sw:ListBox:TP_FLD_DOK:LB_DOKFORMAT +Zahlenformat sym:sw:ListBox:TP_FLD_DOK:LB_DOKNUMFORMAT +InhaltFix sym:sw:CheckBox:TP_FLD_DOK:CB_DOKFIXEDCONTENT VorigerFeldbefehl sym:SW_HID_DLG_FLDEDT_PREV NaechsterFeldbefehl sym:SW_HID_DLG_FLDEDT_NEXT *FeldbefehlBearbeitenDokumentinfo sym:SW_HID_EDIT_FLD_DOKINF Bearbeiten sym:SW_HID_FLDEDT_ADDRESS Feldtyp sym:SW_HID_FIELD_DINF_TYPE -Auswahl sym:sw.ListBox.20865.18 -Zahlenformat sym:sw.ListBox.20865.20 -InhaltFix sym:sw.CheckBox.20865.21 +Auswahl sym:sw:ListBox:TP_FLD_DOKINF:LB_DOKINFSELECTION +Zahlenformat sym:sw:ListBox:TP_FLD_DOKINF:LB_DOKINFFORMAT +InhaltFix sym:sw:CheckBox:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT *FeldbefehlBearbeitenFunktionen sym:SW_HID_EDIT_FLD_FUNC Bearbeiten sym:SW_HID_FLDEDT_ADDRESS -Feldtyp sym:sw.ListBox.20868.65 -Auswahl sym:sw.ListBox.20868.66 -Formatliste sym:sw.ListBox.20868.69 -Bedingung sym:sw.Edit.20868.71 -Dann sym:sw.Edit.20868.75 -Sonst sym:sw.Edit.20868.77 -Wert sym:sw.Edit.20868.73 -MakroButton sym:sw.PushButton.20868.78 -Namefeld sym:sw.Edit.20868.71 -Hinweis sym:sw.Edit.20868.73 -Makroname sym:sw.Edit.20868.71 -Platzhalter sym:sw.Edit.20868.71 -Texteinfuegen sym:sw.Edit.20868.73 -AddListEntry sym:sw.PushButton.20868.82 -NewListEntry sym:sw.Edit.20868.81 -EntrysList sym:sw.ListBox.20868.84 -RemoveEntry sym:sw.PushButton.20868.85 -MoveUpEntry sym:sw.PushButton.20868.86 -MoveDownEntry sym:sw.PushButton.20868.87 -EntryName sym:sw.Edit.20868.89 +Feldtyp sym:sw:ListBox:TP_FLD_FUNC:LB_FUNCTYPE +Auswahl sym:sw:ListBox:TP_FLD_FUNC:LB_FUNCSELECTION +Formatliste sym:sw:ListBox:TP_FLD_FUNC:LB_FUNCFORMAT +Bedingung sym:sw:Edit:TP_FLD_FUNC:ED_FUNCNAME +Dann sym:sw:Edit:TP_FLD_FUNC:ED_FUNCCOND1 +Sonst sym:sw:Edit:TP_FLD_FUNC:ED_FUNCCOND2 +Wert sym:sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE +MakroButton sym:sw:PushButton:TP_FLD_FUNC:BT_FUNCMACRO +Namefeld sym:sw:Edit:TP_FLD_FUNC:ED_FUNCNAME +Hinweis sym:sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE +Makroname sym:sw:Edit:TP_FLD_FUNC:ED_FUNCNAME +Platzhalter sym:sw:Edit:TP_FLD_FUNC:ED_FUNCNAME +Texteinfuegen sym:sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE +AddListEntry sym:sw:PushButton:TP_FLD_FUNC:PB_LISTADD +NewListEntry sym:sw:Edit:TP_FLD_FUNC:ED_LISTITEM +EntrysList sym:sw:ListBox:TP_FLD_FUNC:LB_LISTITEMS +RemoveEntry sym:sw:PushButton:TP_FLD_FUNC:PB_LISTREMOVE +MoveUpEntry sym:sw:PushButton:TP_FLD_FUNC:PB_LISTUP +MoveDownEntry sym:sw:PushButton:TP_FLD_FUNC:PB_LISTDOWN +EntryName sym:sw:Edit:TP_FLD_FUNC:ED_LISTNAME VorigerFeldbefehl sym:SW_HID_DLG_FLDEDT_PREV NaechsterFeldbefehl sym:SW_HID_DLG_FLDEDT_NEXT *FeldbefehlBearbeitenReferenz sym:SW_HID_EDIT_FLD_REF Bearbeiten sym:SW_HID_FLDEDT_ADDRESS -Feldtyp sym:sw.ListBox.20869.81 -Auswahl sym:sw.ListBox.20869.83 -Formatliste sym:sw.ListBox.20869.85 -Namefeld sym:sw.Edit.20869.88 -Wert sym:sw.Edit.20869.90 +Feldtyp sym:sw:ListBox:TP_FLD_REF:LB_REFTYPE +Auswahl sym:sw:ListBox:TP_FLD_REF:LB_REFSELECTION +Formatliste sym:sw:ListBox:TP_FLD_REF:LB_REFFORMAT +Namefeld sym:sw:Edit:TP_FLD_REF:ED_REFNAME +Wert sym:sw:Edit:TP_FLD_REF:ED_REFVALUE *FeldbefehlBearbeitenVariable sym:SW_HID_EDIT_FLD_VAR Bearbeiten sym:SW_HID_FLDEDT_ADDRESS -Feldtyp sym:sw.ListBox.20866.27 -Auswahl sym:sw.ListBox.20866.29 -Formatliste sym:sw.ListBox.20866.36 -Zahlenformat sym:sw.ListBox.20866.35 -NameText sym:sw.Edit.20866.31 -Wert sym:sw.Edit.20866.33 -Hinweis sym:sw.Edit.20866.33 -Korrektur sym:sw.Edit.20866.33 -Formel sym:sw.Edit.20866.33 -Unsichtbar sym:sw.CheckBox.20866.40 +Feldtyp sym:sw:ListBox:TP_FLD_VAR:LB_VARTYPE +Auswahl sym:sw:ListBox:TP_FLD_VAR:LB_VARSELECTION +Formatliste sym:sw:ListBox:TP_FLD_VAR:LB_VARFORMAT +Zahlenformat sym:sw:ListBox:TP_FLD_VAR:LB_VARNUMFORMAT +NameText sym:sw:Edit:TP_FLD_VAR:ED_VARNAME +Wert sym:sw:Edit:TP_FLD_VAR:ED_VARVALUE +Hinweis sym:sw:Edit:TP_FLD_VAR:ED_VARVALUE +Korrektur sym:sw:Edit:TP_FLD_VAR:ED_VARVALUE +Formel sym:sw:Edit:TP_FLD_VAR:ED_VARVALUE +Unsichtbar sym:sw:CheckBox:TP_FLD_VAR:CB_VARINVISIBLE Uebernehmen sym:SW_HID_FLDVAR_APPLY Loeschen sym:SW_HID_FLDVAR_DELETE *Filterauswahl sym:UUI_HID_DLG_FILTER_SELECT -Filter sym:uui.ListBox.14510.31 +Filter sym:uui:ListBox:DLG_FILTER_SELECT:LB_FILTERS -*FilterDlg sym:svt.ModalDialog.16371 -Original sym:svt.RadioButton.16371.1 -Aufloesung sym:svt.RadioButton.16371.2 -Groesse sym:svt.RadioButton.16371.3 -AufloesungDPI sym:svt.ComboBox.16371.1 -Breite sym:svt.MetricField.16371.1 -Hoehe sym:svt.MetricField.16371.2 +*FilterDlg sym:svtools:ModalDialog:DLG_EXPORT_PIX +Original sym:svtools:RadioButton:DLG_EXPORT_PIX:RB_ORIGINAL_PIX +Aufloesung sym:svtools:RadioButton:DLG_EXPORT_PIX:RB_RES_PIX +Groesse sym:svtools:RadioButton:DLG_EXPORT_PIX:RB_SIZE_PIX +AufloesungDPI sym:svtools:ComboBox:DLG_EXPORT_PIX:CBB_RES_PIX +Breite sym:svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEX_PIX +Hoehe sym:svtools:MetricField:DLG_EXPORT_PIX:MTF_SIZEY_PIX -*Fontwork sym:.uno:FontWork +*Fontwork .uno:FontWork KreisAuswahl sym:SVX_HID_FONTWORK_CTL_FORMS Aus sym:SVX_HID_FONTWORK_TBI_STYLE_OFF Drehen sym:SVX_HID_FONTWORK_TBI_STYLE_ROTATE @@ -423,65 +423,65 @@ Linksbuendig sym:SVX_HID_FONTWORK_TBI_ADJUST_LEFT Zentriert sym:SVX_HID_FONTWORK_TBI_ADJUST_CENTER Rechtsbuendig sym:SVX_HID_FONTWORK_TBI_ADJUST_RIGHT AutoTextgroesse sym:SVX_HID_FONTWORK_TBI_ADJUST_AUTOSIZE -Abstand sym:svx.MetricField.10093.1 -Einzug sym:svx.MetricField.10093.2 +Abstand sym:svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE +Einzug sym:svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART Kontur sym:SVX_HID_FONTWORK_TBI_SHOWFORM Buchstabenumrandung sym:SVX_HID_FONTWORK_TBI_OUTLINE SchattenaAus sym:SVX_HID_FONTWORK_TBI_SHADOW_OFF Senkrecht sym:SVX_HID_FONTWORK_TBI_SHADOW_NORMAL Kippen sym:SVX_HID_FONTWORK_TBI_SHADOW_SLANT -AbstandX sym:svx.MetricField.10093.3 -AbstandY sym:svx.MetricField.10093.4 -Schattenfarbe sym:svx.ListBox.10093.1 +AbstandX sym:svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X +AbstandY sym:svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y +Schattenfarbe sym:svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR *FormSpeichernUnter sym:SW_HID_NUM_NAMES -FormName sym:sw.Edit.21668.107 -FormListe sym:sw.ListBox.21668.106 +FormName sym:sw:Edit:DLG_NUM_NAMES:ED_FORM +FormListe sym:sw:ListBox:DLG_NUM_NAMES:LB_FORM -*FormularNavigator sym:.uno:ShowFmExplorer +*FormularNavigator .uno:ShowFmExplorer Liste sym:SVX_HID_FORM_NAVIGATOR -*FussnoteBearbeiten sym:.uno:EditFootnote -Automatisch sym:sw.RadioButton.21662.1 -Zeichen sym:sw.RadioButton.21662.2 -ZeichenText sym:sw.Edit.21662.3 -Durchsuchen sym:sw.PushButton.21662.4 -Fussnote sym:sw.RadioButton.21662.7 -Endnote sym:sw.RadioButton.21662.8 -VorherigeFussnote sym:sw.ImageButton.21662.103 -NachfolgendeFussnote sym:sw.ImageButton.21662.104 - -*FussnoteEinfuegen sym:.uno:InsertFootnoteDialog -Automatisch sym:sw.RadioButton.21662.1 -Zeichen sym:sw.RadioButton.21662.2 -ZeichenText sym:sw.Edit.21662.3 -Durchsuchen sym:sw.PushButton.21662.4 -Fussnote sym:sw.RadioButton.21662.7 -Endnote sym:sw.RadioButton.21662.8 - -*Gallerybeamer sym:.uno:Beamer +*FussnoteBearbeiten .uno:EditFootnote +Automatisch sym:sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO +Zeichen sym:sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_CHAR +ZeichenText sym:sw:Edit:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR +Durchsuchen sym:sw:PushButton:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR +Fussnote sym:sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_FTN +Endnote sym:sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE +VorherigeFussnote sym:sw:ImageButton:DLG_INS_FOOTNOTE:BT_PREV +NachfolgendeFussnote sym:sw:ImageButton:DLG_INS_FOOTNOTE:BT_NEXT + +*FussnoteEinfuegen .uno:InsertFootnoteDialog +Automatisch sym:sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO +Zeichen sym:sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_CHAR +ZeichenText sym:sw:Edit:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR +Durchsuchen sym:sw:PushButton:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR +Fussnote sym:sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_FTN +Endnote sym:sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE + +*Gallerybeamer .uno:Beamer Anzeige sym:SVX_HID_GALLERY_WINDOW -*Gestalter sym:.uno:DesignerDialog +*Gestalter .uno:DesignerDialog TBGestalterRight sym:SFX2_HID_TEMPLDLG_TOOLBOX_RIGHT TBGestalter sym:SFX2_HID_TEMPLDLG_TOOLBOX_LEFT -Absatzvorlagen sym:.uno:ParaStyle -Zeichenvorlagen sym:.uno:CharStyle -Rahmenvorlagen sym:.uno:FrameStyle -Seitenvorlagen sym:.uno:PageStyle -Grafikvorlagen sym:.uno:ParaStyle -Praesentationsvorlagen sym:.uno:ListStyle -Numerierungsvorlagen sym:.uno:ListStyle -Zellvorlagen sym:.uno:ParaStyle +Absatzvorlagen .uno:ParaStyle +Zeichenvorlagen .uno:CharStyle +Rahmenvorlagen .uno:FrameStyle +Seitenvorlagen .uno:PageStyle +Grafikvorlagen .uno:ParaStyle +Praesentationsvorlagen .uno:ListStyle +Numerierungsvorlagen .uno:ListStyle +Zellvorlagen .uno:ParaStyle Giesskanne sym:SFX2_HID_TEMPLDLG_WATERCAN AusSelektion sym:SFX2_HID_TEMPLDLG_NEWBYEXAMPLE Aktualisieren sym:SFX2_HID_TEMPLDLG_UPDATEBYEXAMPLE Vorlagenliste sym:SFX2_HID_TEMPLATE_FMT Gruppenliste sym:SFX2_HID_TEMPLATE_FILTER -*GifOptionen sym:filter.ModalDialog.17401 -Interlace sym:filter.CheckBox.17401.1 -TransparentSpeichern sym:filter.CheckBox.17401.2 +*GifOptionen sym:filter:ModalDialog:DLG_EXPORT_GIF +Interlace sym:filter:CheckBox:DLG_EXPORT_GIF:CBX_INTERLACED +TransparentSpeichern sym:filter:CheckBox:DLG_EXPORT_GIF:CBX_TRANSLUCENT *GridControlDialogStarter ACTIVE ShowGridcontrol sym:showGridcontrol @@ -490,32 +490,32 @@ ShowGridcontrol sym:showGridcontrol gridcontrolcontrol sym:gridcontrolself *GroupingDlg sym:SC_HID_SC_DPDATEGROUP -AutoStart sym:sc.RadioButton.25739.1 -ManualStart sym:sc.RadioButton.25739.2 -StartContent sym:sc.Edit.25739.1 -AutoEnd sym:sc.RadioButton.25739.3 -ManualEnd sym:sc.RadioButton.25739.4 -EndContent sym:sc.Edit.25739.2 -NumberOfDays sym:sc.RadioButton.25740.5 -DaysNumber sym:sc.NumericField.25740.4 -Intervals sym:sc.RadioButton.25740.6 +AutoStart sym:sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOSTART +ManualStart sym:sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANSTART +StartContent sym:sc:Edit:RID_SCDLG_DPNUMGROUP:ED_START +AutoEnd sym:sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOEND +ManualEnd sym:sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANEND +EndContent sym:sc:Edit:RID_SCDLG_DPNUMGROUP:ED_END +NumberOfDays sym:sc:RadioButton:RID_SCDLG_DPDATEGROUP:RB_NUMDAYS +DaysNumber sym:sc:NumericField:RID_SCDLG_DPDATEGROUP:ED_NUMDAYS +Intervals sym:sc:RadioButton:RID_SCDLG_DPDATEGROUP:RB_UNITS IntervalsList sym:SC_HID_SC_DPDATEGROUP_LB -GroupBy sym:sc.Edit.25739.3 +GroupBy sym:sc:Edit:RID_SCDLG_DPNUMGROUP:ED_BY *GroupingNumDlg sym:SC_HID_SC_DPNUMGROUP -AutoStart sym:sc.RadioButton.25739.1 -ManualStart sym:sc.RadioButton.25739.2 -StartContent sym:sc.Edit.25739.1 -AutoEnd sym:sc.RadioButton.25739.3 -ManualEnd sym:sc.RadioButton.25739.4 -EndContent sym:sc.Edit.25739.2 -GroupBy sym:sc.Edit.25739.3 - -*GruppierungAufheben sym:.uno:Ungroup +AutoStart sym:sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOSTART +ManualStart sym:sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANSTART +StartContent sym:sc:Edit:RID_SCDLG_DPNUMGROUP:ED_START +AutoEnd sym:sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOEND +ManualEnd sym:sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANEND +EndContent sym:sc:Edit:RID_SCDLG_DPNUMGROUP:ED_END +GroupBy sym:sc:Edit:RID_SCDLG_DPNUMGROUP:ED_BY + +*GruppierungAufheben .uno:Ungroup Zeilen sym:SC_HID_SC_GROUP_ROWS Spalten sym:SC_HID_SC_GROUP_COLS -*GruppierungAktivieren sym:.uno:Group +*GruppierungAktivieren .uno:Group Zeilen sym:SC_HID_SC_GROUP_ROWS Spalten sym:SC_HID_SC_GROUP_COLS @@ -523,65 +523,65 @@ Spalten sym:SC_HID_SC_GROUP_COLS Auswahl sym:SW_HID_VS_RULER *HTMLExport1 sym:SD_HID_SD_HTMLEXPORT_PAGE1 -NeuesDesign sym:sd.RadioButton.739.3 -ExistierendesDesign sym:sd.RadioButton.739.4 -DesignLoeschen sym:sd.PushButton.739.6 -DesignListe sym:sd.ListBox.739.5 -Weiter sym:sd.PushButton.739.201 -Zurueck sym:sd.PushButton.739.200 +NeuesDesign sym:sd:RadioButton:DLG_PUBLISHING:PAGE1_NEW_DESIGN +ExistierendesDesign sym:sd:RadioButton:DLG_PUBLISHING:PAGE1_OLD_DESIGN +DesignLoeschen sym:sd:PushButton:DLG_PUBLISHING:PAGE1_DEL_DESIGN +DesignListe sym:sd:ListBox:DLG_PUBLISHING:PAGE1_DESIGNS +Weiter sym:sd:PushButton:DLG_PUBLISHING:BUT_NEXT +Zurueck sym:sd:PushButton:DLG_PUBLISHING:BUT_LAST *HTMLExport2 sym:SD_HID_SD_HTMLEXPORT_PAGE2 -Standard sym:sd.RadioButton.739.22 -Frames sym:sd.RadioButton.739.23 -Automatisch sym:sd.RadioButton.739.24 -WebCast sym:sd.RadioButton.739.25 -ASP sym:sd.RadioButton.739.41 -PERL sym:sd.RadioButton.739.42 -BeamerURL sym:sd.Edit.739.44 -PraesentationURL sym:sd.Edit.739.46 -ScriptURL sym:sd.Edit.739.48 -TitelseiteErzeugen sym:sd.CheckBox.739.31 -NotizenAnzeigen sym:sd.CheckBox.739.32 -Weiter sym:sd.PushButton.739.201 -Zurueck sym:sd.PushButton.739.200 +Standard sym:sd:RadioButton:DLG_PUBLISHING:PAGE2_STANDARD +Frames sym:sd:RadioButton:DLG_PUBLISHING:PAGE2_FRAMES +Automatisch sym:sd:RadioButton:DLG_PUBLISHING:PAGE2_KIOSK +WebCast sym:sd:RadioButton:DLG_PUBLISHING:PAGE2_WEBCAST +ASP sym:sd:RadioButton:DLG_PUBLISHING:PAGE2_ASP +PERL sym:sd:RadioButton:DLG_PUBLISHING:PAGE2_PERL +BeamerURL sym:sd:Edit:DLG_PUBLISHING:PAGE2_INDEX +PraesentationURL sym:sd:Edit:DLG_PUBLISHING:PAGE2_URL +ScriptURL sym:sd:Edit:DLG_PUBLISHING:PAGE2_CGI +TitelseiteErzeugen sym:sd:CheckBox:DLG_PUBLISHING:PAGE2_CONTENT +NotizenAnzeigen sym:sd:CheckBox:DLG_PUBLISHING:PAGE2_NOTES +Weiter sym:sd:PushButton:DLG_PUBLISHING:BUT_NEXT +Zurueck sym:sd:PushButton:DLG_PUBLISHING:BUT_LAST *HTMLExport3 sym:SD_HID_SD_HTMLEXPORT_PAGE3 -PNG sym:sd.RadioButton.739.51 -GIF sym:sd.RadioButton.739.52 -JPG sym:sd.RadioButton.739.53 -Kompressionswert sym:sd.ComboBox.739.55 -NiedrigeAufloesung sym:sd.RadioButton.739.57 -MittlereAufloesung sym:sd.RadioButton.739.58 -HoheAufloesung sym:sd.RadioButton.739.59 -KlaengeExportieren sym:sd.CheckBox.739.61 -Weiter sym:sd.PushButton.739.201 -Zurueck sym:sd.PushButton.739.200 +PNG sym:sd:RadioButton:DLG_PUBLISHING:PAGE3_PNG +GIF sym:sd:RadioButton:DLG_PUBLISHING:PAGE3_GIF +JPG sym:sd:RadioButton:DLG_PUBLISHING:PAGE3_JPG +Kompressionswert sym:sd:ComboBox:DLG_PUBLISHING:PAGE3_QUALITY +NiedrigeAufloesung sym:sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_1 +MittlereAufloesung sym:sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_2 +HoheAufloesung sym:sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_3 +KlaengeExportieren sym:sd:CheckBox:DLG_PUBLISHING:PAGE3_SLD_SOUND +Weiter sym:sd:PushButton:DLG_PUBLISHING:BUT_NEXT +Zurueck sym:sd:PushButton:DLG_PUBLISHING:BUT_LAST *HTMLExport4 sym:SD_HID_SD_HTMLEXPORT_PAGE4 -Autor sym:sd.Edit.739.68 -EMail sym:sd.Edit.739.70 -Homepage sym:sd.Edit.739.72 -LinkAufKopie sym:sd.CheckBox.739.75 -AdditionalInformation sym:sd.MultiLineEdit.739.74 -Weiter sym:sd.PushButton.739.201 -Zurueck sym:sd.PushButton.739.200 +Autor sym:sd:Edit:DLG_PUBLISHING:PAGE4_AUTHOR +EMail sym:sd:Edit:DLG_PUBLISHING:PAGE4_EMAIL_EDIT +Homepage sym:sd:Edit:DLG_PUBLISHING:PAGE4_WWW_EDIT +LinkAufKopie sym:sd:CheckBox:DLG_PUBLISHING:PAGE4_DOWNLOAD +AdditionalInformation sym:sd:MultiLineEdit:DLG_PUBLISHING:PAGE4_MISC +Weiter sym:sd:PushButton:DLG_PUBLISHING:BUT_NEXT +Zurueck sym:sd:PushButton:DLG_PUBLISHING:BUT_LAST *HTMLExport5 sym:SD_HID_SD_HTMLEXPORT_PAGE5 -NurText sym:sd.CheckBox.739.82 -Weiter sym:sd.PushButton.739.201 -Zurueck sym:sd.PushButton.739.200 +NurText sym:sd:CheckBox:DLG_PUBLISHING:PAGE5_TEXTONLY +Weiter sym:sd:PushButton:DLG_PUBLISHING:BUT_NEXT +Zurueck sym:sd:PushButton:DLG_PUBLISHING:BUT_LAST *HTMLExport6 sym:SD_HID_SD_HTMLEXPORT_PAGE6 -FarbenAusDok sym:sd.RadioButton.739.109 -BrowserFarben sym:sd.RadioButton.739.102 -EigeneFarben sym:sd.RadioButton.739.103 -Hintergrund sym:sd.PushButton.739.104 -Text sym:sd.PushButton.739.105 -Hyperlink sym:sd.PushButton.739.106 -GesichteterLink sym:sd.PushButton.739.107 -AktiverLink sym:sd.PushButton.739.108 -Weiter sym:sd.PushButton.739.201 -Zurueck sym:sd.PushButton.739.200 +FarbenAusDok sym:sd:RadioButton:DLG_PUBLISHING:PAGE6_DOCCOLORS +BrowserFarben sym:sd:RadioButton:DLG_PUBLISHING:PAGE6_DEFAULT +EigeneFarben sym:sd:RadioButton:DLG_PUBLISHING:PAGE6_USER +Hintergrund sym:sd:PushButton:DLG_PUBLISHING:PAGE6_BACK +Text sym:sd:PushButton:DLG_PUBLISHING:PAGE6_TEXT +Hyperlink sym:sd:PushButton:DLG_PUBLISHING:PAGE6_LINK +GesichteterLink sym:sd:PushButton:DLG_PUBLISHING:PAGE6_VLINK +AktiverLink sym:sd:PushButton:DLG_PUBLISHING:PAGE6_ALINK +Weiter sym:sd:PushButton:DLG_PUBLISHING:BUT_NEXT +Zurueck sym:sd:PushButton:DLG_PUBLISHING:BUT_LAST *HTMLDesign sym:SD_HID_SD_HTMLEXPORT_DLG_DNAME -Designname sym:sd.Edit.740.3 +Designname sym:sd:Edit:DLG_DESIGNNAME:EDT_NAME diff --git a/testautomation/global/win/dial_i_o.win b/testautomation/global/win/dial_i_o.win index 35a5624234a4..93478238ed4e 100644 --- a/testautomation/global/win/dial_i_o.win +++ b/testautomation/global/win/dial_i_o.win @@ -1,4 +1,4 @@ -*ImageMapEditor sym:svx.ModelessDialog.10450 +*ImageMapEditor sym:svx:ModelessDialog:RID_SVXDLG_IMAP TB_ImagemapEditor sym:SVX_HID_IMAPDLG_TOOLBOX Zuweisen sym:SVX_HID_IMAPDLG_APPLY Oeffnen sym:SVX_HID_IMAPDLG_OPEN @@ -17,121 +17,121 @@ Wiederholen sym:SVX_HID_IMAPDLG_REDO Aktiv sym:SVX_HID_IMAPDLG_ACTIVE Makro sym:SVX_HID_IMAPDLG_MACRO Eigenschaften sym:SVX_HID_IMAPDLG_PROPERTY -BearbeitenImageMap sym:.uno:ImageMapDialog -Beschreibung sym:svx.Edit.10450.1 +BearbeitenImageMap .uno:ImageMapDialog +Beschreibung sym:svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT Dokument sym:SVX_HID_IMAPDLG_GRAPHWND -Adresse sym:.uno:OpenUrl -BearbeitenText sym:svx.Edit.10450.1 - -*ImageMapHyperlink sym:cui.ModalDialog.10102 -URL sym:cui.Edit.10102.2 -Alternativetext sym:cui.Edit.10102.1 -Frame sym:cui.ComboBox.10102.1 -Name sym:cui.Edit.10102.3 -Description sym:cui.MultiLineEdit.10102.4 - -*IndividuellePraesentation sym:.uno:CustomShowDialog -Neu sym:sd.PushButton.843.1 -Bearbeiten sym:sd.PushButton.843.2 -Loeschen sym:sd.PushButton.843.3 -Kopieren sym:sd.PushButton.843.4 -Starten sym:sd.PushButton.843.5 -IndividuellePraesentationBenutzen sym:sd.CheckBox.843.1 -CustomSlideShowList sym:sd.ListBox.843.1 +Adresse .uno:OpenUrl +BearbeitenText sym:svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT + +*ImageMapHyperlink sym:cui:ModalDialog:RID_SVXDLG_IMAPURL +URL sym:cui:Edit:RID_SVXDLG_IMAPURL:EDT_URL +Alternativetext sym:cui:Edit:RID_SVXDLG_IMAPURL:EDT_URLDESCRIPTION +Frame sym:cui:ComboBox:RID_SVXDLG_IMAPURL:CBB_TARGETS +Name sym:cui:Edit:RID_SVXDLG_IMAPURL:EDT_NAME +Description sym:cui:MultiLineEdit:RID_SVXDLG_IMAPURL:EDT_DESCRIPTION + +*IndividuellePraesentation .uno:CustomShowDialog +Neu sym:sd:PushButton:DLG_CUSTOMSHOW:BTN_NEW +Bearbeiten sym:sd:PushButton:DLG_CUSTOMSHOW:BTN_EDIT +Loeschen sym:sd:PushButton:DLG_CUSTOMSHOW:BTN_REMOVE +Kopieren sym:sd:PushButton:DLG_CUSTOMSHOW:BTN_COPY +Starten sym:sd:PushButton:DLG_CUSTOMSHOW:BTN_STARTSHOW +IndividuellePraesentationBenutzen sym:sd:CheckBox:DLG_CUSTOMSHOW:CBX_USE_CUSTOMSHOW +CustomSlideShowList sym:sd:ListBox:DLG_CUSTOMSHOW:LB_CUSTOMSHOWS *IndividuellePraesentationDefinieren sym:SD_HID_DLG_DEFINE_CUSTOMSHOW -PraesentationName sym:sd.Edit.890.1 -SeitenPraesentation sym:sd.MultiListBox.890.1 +PraesentationName sym:sd:Edit:DLG_DEFINE_CUSTOMSHOW:EDT_NAME +SeitenPraesentation sym:sd:MultiListBox:DLG_DEFINE_CUSTOMSHOW:LB_PAGES SelectedSlides sym:SD_HID_DLG_DEFINE_CUSTOMSHOW_CTL -Hinzufuegen sym:sd.PushButton.890.1 -Entfernen sym:sd.PushButton.890.3 +Hinzufuegen sym:sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_ADD +Entfernen sym:sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE *InfofelderBearbeiten sym:SFX2_HID_DOCINFO_EDT -Name0 sym:sfx.Edit.266.5 -Name1 sym:sfx.Edit.266.7 -Name2 sym:sfx.Edit.266.9 -Name3 sym:sfx.Edit.266.11 +Name0 sym:sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO1 +Name1 sym:sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO2 +Name2 sym:sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3 +Name3 sym:sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4 *InfonamenBearbeiten sym:SFX2_HID_DOCINFO_EDT -Namen1 sym:sfx.Edit.266.5 -Namen2 sym:sfx.Edit.266.7 -Namen3 sym:sfx.Edit.266.9 -Namen4 sym:sfx.Edit.266.11 +Namen1 sym:sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO1 +Namen2 sym:sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO2 +Namen3 sym:sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3 +Namen4 sym:sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4 *InhaltEinfuegen sym:CUI_HID_PASTE_DLG -AlsSymbol sym:cui.CheckBox.32001.12 -AndersSymbol sym:cui.PushButton.32001.14 -VerknuepfungMit sym:cui.RadioButton.32001.21 -Auswahl sym:cui.ListBox.32001.7 -EinfuegenAls sym:cui.RadioButton.32001.20 - -*InhalteEinfuegenCalc sym:.uno:InsertContents -AllesEinfuegen sym:sc.CheckBox.25618.20 -Zeichenketten sym:sc.CheckBox.25618.21 -Zahlen sym:sc.CheckBox.25618.22 -DatumZeit sym:sc.CheckBox.25618.23 -Formeln sym:sc.CheckBox.25618.24 -Notizen sym:sc.CheckBox.25618.26 -Formate sym:sc.CheckBox.25618.25 -Objects sym:sc.CheckBox.25618.41 -LeerzellenUeberspringen sym:sc.CheckBox.25618.33 -Transponieren sym:sc.CheckBox.25618.34 -Verknuepfen sym:sc.CheckBox.25618.35 -Keine sym:sc.RadioButton.25618.27 -Addieren sym:sc.RadioButton.25618.28 -Subtrahieren sym:sc.RadioButton.25618.29 -Multiplizieren sym:sc.RadioButton.25618.30 -Dividieren sym:sc.RadioButton.25618.31 -NichtVerschieben sym:sc.RadioButton.25618.37 -NachUnten sym:sc.RadioButton.25618.38 -NachRechts sym:sc.RadioButton.25618.39 - -*InhalteLoeschen sym:.uno:Delete -Alles sym:sc.CheckBox.25617.10 -Zeichenketten sym:sc.CheckBox.25617.11 -Zahlen sym:sc.CheckBox.25617.12 -DatumZeit sym:sc.CheckBox.25617.13 -Formeln sym:sc.CheckBox.25617.14 -Notizen sym:sc.CheckBox.25617.16 -Formate sym:sc.CheckBox.25617.15 -Objekte sym:sc.CheckBox.25617.17 +AlsSymbol sym:cui:CheckBox:MD_PASTE_OBJECT:CB_DISPLAY_AS_ICON +AndersSymbol sym:cui:PushButton:MD_PASTE_OBJECT:PB_CHANGE_ICON +VerknuepfungMit sym:cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE_LINK +Auswahl sym:cui:ListBox:MD_PASTE_OBJECT:LB_INSERT_LIST +EinfuegenAls sym:cui:RadioButton:MD_PASTE_OBJECT:RB_PASTE + +*InhalteEinfuegenCalc .uno:InsertContents +AllesEinfuegen sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSALL +Zeichenketten sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSSTRINGS +Zahlen sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSNUMBERS +DatumZeit sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSDATETIME +Formeln sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSFORMULAS +Notizen sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSNOTES +Formate sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSATTRS +Objects sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSOBJECTS +LeerzellenUeberspringen sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY +Transponieren sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_TRANSPOSE +Verknuepfen sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_LINK +Keine sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_NOOP +Addieren sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_ADD +Subtrahieren sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_SUB +Multiplizieren sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_MUL +Dividieren sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_DIV +NichtVerschieben sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_MV_NONE +NachUnten sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_MV_DOWN +NachRechts sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_MV_RIGHT + +*InhalteLoeschen .uno:Delete +Alles sym:sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELALL +Zeichenketten sym:sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELSTRINGS +Zahlen sym:sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELNUMBERS +DatumZeit sym:sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELDATETIME +Formeln sym:sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELFORMULAS +Notizen sym:sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELNOTES +Formate sym:sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELATTRS +Objekte sym:sc:CheckBox:RID_SCDLG_DELCONT:BTN_DELOBJECTS *InPolygonUmwandeln sym:SD_HID_VECTORIZE_DLG -Farbanzahl sym:sd.NumericField.654.1 -Punktreduktion sym:sd.MetricField.654.3 -LoecherFuellen sym:sd.CheckBox.654.1 -Kachelgroesse sym:sd.MetricField.654.4 -Vorschau sym:sd.PushButton.654.1 +Farbanzahl sym:sd:NumericField:DLG_VECTORIZE:NM_LAYERS +Punktreduktion sym:sd:MetricField:DLG_VECTORIZE:MT_REDUCE +LoecherFuellen sym:sd:CheckBox:DLG_VECTORIZE:CB_FILLHOLES +Kachelgroesse sym:sd:MetricField:DLG_VECTORIZE:MT_FILLHOLES +Vorschau sym:sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW +Interaktion TabInteraktion -*JPEGOptionen sym:svt.ModalDialog.16481 -Qualitaet sym:svt.NumericField.16481.1 -Graustufen sym:svt.RadioButton.16481.1 -Echtfarben sym:svt.RadioButton.16481.2 +*JPEGOptionen sym:svtools:ModalDialog:DLG_EXPORT_JPG +Qualitaet sym:svtools:NumericField:DLG_EXPORT_JPG:NUM_FLD_QUALITY +Graustufen sym:svtools:RadioButton:DLG_EXPORT_JPG:RB_GRAY +Echtfarben sym:svtools:RadioButton:DLG_EXPORT_JPG:RB_RGB *Kommentar sym:CUI_HID_REDLINING_DLG KommentarText sym:CUI_HID_REDLINING_EDIT Zurueck sym:CUI_HID_REDLINING_PREV Vor sym:CUI_HID_REDLINING_NEXT -*Konsolidieren sym:.uno:DataConsolidate -Berechnungsvorschrift sym:sc.ListBox.25639.12 -Konsolidierungsbereiche sym:sc.MultiListBox.25639.22 -Quelldatenbereich sym:sc.ListBox.25639.32 -Quelldaten sym:sc.Edit.25639.33 -ButtonQuelldaten sym:sc.ImageButton.25639.34 -AusgebenBereich sym:sc.ListBox.25639.42 -Ausgeben sym:sc.Edit.25639.43 -ButtonAusgeben sym:sc.ImageButton.25639.44 -Zeilenbeschriftung sym:sc.CheckBox.25639.51 -Spaltenkoepfen sym:sc.CheckBox.25639.52 -MitQuelldatenVerbinden sym:sc.CheckBox.25639.61 -Loeschen sym:sc.PushButton.25639.6 -Hinzufuegen sym:sc.PushButton.25639.5 -Zusaetze sym:sc.MoreButton.25639.4 - -*KonturEditor sym:svx.FloatingWindow.10461 +*Konsolidieren .uno:DataConsolidate +Berechnungsvorschrift sym:sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_FUNC +Konsolidierungsbereiche sym:sc:MultiListBox:RID_SCDLG_CONSOLIDATE:LB_CONSAREAS +Quelldatenbereich sym:sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_DATA_AREA +Quelldaten sym:sc:Edit:RID_SCDLG_CONSOLIDATE:ED_DATA_AREA +ButtonQuelldaten sym:sc:ImageButton:RID_SCDLG_CONSOLIDATE:RB_DATA_AREA +AusgebenBereich sym:sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_DEST_AREA +Ausgeben sym:sc:Edit:RID_SCDLG_CONSOLIDATE:ED_DEST_AREA +ButtonAusgeben sym:sc:ImageButton:RID_SCDLG_CONSOLIDATE:RB_DEST_AREA +Zeilenbeschriftung sym:sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_BYROW +Spaltenkoepfen sym:sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_BYCOL +MitQuelldatenVerbinden sym:sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_REFS +Loeschen sym:sc:PushButton:RID_SCDLG_CONSOLIDATE:BTN_REMOVE +Hinzufuegen sym:sc:PushButton:RID_SCDLG_CONSOLIDATE:BTN_ADD +Zusaetze sym:sc:MoreButton:RID_SCDLG_CONSOLIDATE:BTN_MORE + +*KonturEditor sym:svx:FloatingWindow:RID_SVXDLG_CONTOUR Zuweisen sym:SVX_HID_CONTDLG_APPLY Arbeitsbereich sym:SVX_HID_CONTDLG_WORKPLACE Auswahl sym:SVX_HID_CONTDLG_SELECT @@ -146,20 +146,20 @@ Autokontur sym:SVX_HID_CONTDLG_AUTOCONTOUR Widerrufen sym:SVX_HID_CONTDLG_UNDO Wiederholen sym:SVX_HID_CONTDLG_REDO Pipette sym:SVX_HID_CONTDLG_PIPETTE -Toleranz sym:svx.MetricField.10461.1 +Toleranz sym:svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE -*KopfFusszeilenSeitenvorlageStandard sym:.uno:EditHeaderAndFooter +*KopfFusszeilenSeitenvorlageStandard .uno:EditHeaderAndFooter *Linienenden sym:SVX_HID_POPUP_LINEEND Auswahl sym:SVX_HID_POPUP_LINEEND_CTRL *Linienstil sym:CUI_HID_DLG_MESSBOX -Aendern sym:cui.PushButton.10063.1 -Hinzufuegen sym:cui.PushButton.10063.2 +Aendern sym:cui:PushButton:RID_SVXDLG_MESSBOX:BTN_1 +Hinzufuegen sym:cui:PushButton:RID_SVXDLG_MESSBOX:BTN_2 -*LinksFuellen sym:.uno:FillLeft +*LinksFuellen .uno:FillLeft -*LiteratureintragEinfuegen sym:.uno:InsertAuthoritiesEntry +*LiteratureintragEinfuegen .uno:InsertAuthoritiesEntry EintragErzeugen sym:SW_HID_INSERT_AUTH_MRK_CREATE_ENTRY EintragEinfuegen sym:SW_HID_INSERT_AUTH_MRK_OK EintragSchliessen sym:SW_HID_INSERT_AUTH_MRK_CLOSE @@ -201,89 +201,89 @@ Benutzerfeld3 sym:SW_HID_AUTH_FIELD_CUSTOM3 Benutzerfeld4 sym:SW_HID_AUTH_FIELD_CUSTOM4 Benutzerfeld5 sym:SW_HID_AUTH_FIELD_CUSTOM5 -*Loeschbestaetigung sym:svt.ModalDialog.16376 -Ja sym:svt.PushButton.16376.4 -Alle sym:svt.PushButton.16376.6 -Nein sym:svt.PushButton.16376.5 +*Loeschbestaetigung sym:svtools:ModalDialog:DLG_SVT_QUERYDELETE +Ja sym:svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES +Alle sym:svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL +Nein sym:svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO -*Makro sym:basctl.ModalDialog.14900 -Makroname sym:basctl.Edit.14900.5 +*Makro sym:basctl:ModalDialog:RID_MACROCHOOSER +Makroname sym:basctl:Edit:RID_MACROCHOOSER:RID_ED_MACRONAME Makroliste sym:BASCTL_HID_BASICIDE_MACROS MakroAus sym:BASCTL_HID_BASICIDE_LIBS -Beschreibung sym:basctl.MultiLineEdit.14900.16 -Ausfuehren sym:basctl.PushButton.14900.8 -Speichern sym:basctl.PushButton.14900.8 -Zuordnen sym:basctl.PushButton.14900.13 -Bearbeiten sym:basctl.PushButton.14900.10 -Loeschen sym:basctl.PushButton.14900.12 -Neu sym:basctl.PushButton.14900.12 -Verwalten sym:basctl.PushButton.14900.11 -NewLibrary sym:basctl.PushButton.14900.19 -NewModule sym:basctl.PushButton.14900.20 - -*MakroOptionen sym:basctl.ModalDialog.14905 -Beschreibung sym:basctl.MultiLineEdit.14905.7 -HilfeIdentifikation sym:basctl.NumericField.14905.10 -HilfeDateiname sym:basctl.Edit.14905.12 - -*MakroZuweisen sym:cui.TabPage.10303 +Beschreibung sym:basctl:MultiLineEdit:RID_MACROCHOOSER:RID_ML_DESCRIPTION +Ausfuehren sym:basctl:PushButton:RID_MACROCHOOSER:RID_PB_RUN +Speichern sym:basctl:PushButton:RID_MACROCHOOSER:RID_PB_RUN +Zuordnen sym:basctl:PushButton:RID_MACROCHOOSER:RID_PB_ASSIGN +Bearbeiten sym:basctl:PushButton:RID_MACROCHOOSER:RID_PB_EDIT +Loeschen sym:basctl:PushButton:RID_MACROCHOOSER:RID_PB_DEL +Neu sym:basctl:PushButton:RID_MACROCHOOSER:RID_PB_DEL +Verwalten sym:basctl:PushButton:RID_MACROCHOOSER:RID_PB_ORG +NewLibrary sym:basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWLIB +NewModule sym:basctl:PushButton:RID_MACROCHOOSER:RID_PB_NEWMOD + +*MakroOptionen sym:basctl:ModalDialog:RID_MACROOPTIONS +Beschreibung sym:basctl:MultiLineEdit:RID_MACROOPTIONS:RID_ME_DESCR +HilfeIdentifikation sym:basctl:NumericField:RID_MACROOPTIONS:RID_NF_HELPID +HilfeDateiname sym:basctl:Edit:RID_MACROOPTIONS:RID_ED_HELPNAME + +*MakroZuweisen sym:cui:TabPage:RID_SVXPAGE_EVENTASSIGN Ereignis sym:CUI_HID_MACRO_LB_EVENT -Bereich sym:CUI_HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP -Makroname sym:CUI_HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS -Zuweisen sym:cui.PushButton.10303.3 -Aufheben sym:cui.PushButton.10303.4 -Scripttyp sym:cui.ListBox.10303.8 - -*Massstab sym:.uno:Zoom -Optimal sym:cui.RadioButton.10000.15 -GanzeSeite sym:cui.RadioButton.10000.16 -Seitenbreite sym:cui.RadioButton.10000.17 -Vergroesserung100 sym:cui.RadioButton.10000.18 -VergroesserungStufenlos sym:cui.RadioButton.10000.19 -Stufenlos sym:cui.MetricField.10000.20 -Automatic sym:cui.RadioButton.10000.22 -Singlepage sym:cui.RadioButton.10000.23 -Columns sym:cui.RadioButton.10000.24 -Columnsfield sym:cui.MetricField.10000.25 -Bookmode sym:cui.CheckBox.10000.26 +Bereich sym:CUI_HID_MACRO_GROUP sym:sfx2:ListBox:RID_SFX_TP_MACROASSIGN:LB_GROUP +Makroname sym:CUI_HID_MACRO_MACROS sym:sfx2:ListBox:RID_SFX_TP_MACROASSIGN:LB_MACROS +Zuweisen sym:cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN +Aufheben sym:cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE +Scripttyp sym:cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE + +*Massstab .uno:Zoom +Optimal sym:cui:RadioButton:RID_SVXDLG_ZOOM:BTN_OPTIMAL +GanzeSeite sym:cui:RadioButton:RID_SVXDLG_ZOOM:BTN_WHOLE_PAGE +Seitenbreite sym:cui:RadioButton:RID_SVXDLG_ZOOM:BTN_PAGE_WIDTH +Vergroesserung100 sym:cui:RadioButton:RID_SVXDLG_ZOOM:BTN_100 +VergroesserungStufenlos sym:cui:RadioButton:RID_SVXDLG_ZOOM:BTN_USER +Stufenlos sym:cui:MetricField:RID_SVXDLG_ZOOM:ED_USER +Automatic sym:cui:RadioButton:RID_SVXDLG_ZOOM:BTN_AUTOMATIC +Singlepage sym:cui:RadioButton:RID_SVXDLG_ZOOM:BTN_SINGLE +Columns sym:cui:RadioButton:RID_SVXDLG_ZOOM:BTN_COLUMNS +Columnsfield sym:cui:MetricField:RID_SVXDLG_ZOOM:ED_COLUMNS +Bookmode sym:cui:CheckBox:RID_SVXDLG_ZOOM:CHK_BOOK *MassstabSeitenansicht sym:SW_HID_PPREV_ZOOM -Spalten sym:sw.NumericField.20601.4 -Zeilen sym:sw.NumericField.20601.5 - -*Mehrfachoperationen sym:.uno:TableOperationDialog -Formeln sym:sc.Edit.25662.1 -Zeile sym:sc.Edit.25662.2 -Spalte sym:sc.Edit.25662.3 -Vorgaben1 sym:sc.ImageButton.25662.1 -Vorgaben2 sym:sc.ImageButton.25662.2 -Vorgaben3 sym:sc.ImageButton.25662.3 - -*MetOptionen sym:filter.ModalDialog.17402 -Original sym:filter.RadioButton.17402.1 -Groesse sym:filter.RadioButton.17402.2 -Breite sym:filter.MetricField.17402.1 -Hoehe sym:filter.MetricField.17402.2 +Spalten sym:sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_COL +Zeilen sym:sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_ROW + +*Mehrfachoperationen .uno:TableOperationDialog +Formeln sym:sc:Edit:RID_SCDLG_TABOP:ED_FORMULARANGE +Zeile sym:sc:Edit:RID_SCDLG_TABOP:ED_ROWCELL +Spalte sym:sc:Edit:RID_SCDLG_TABOP:ED_COLCELL +Vorgaben1 sym:sc:ImageButton:RID_SCDLG_TABOP:RB_FORMULARANGE +Vorgaben2 sym:sc:ImageButton:RID_SCDLG_TABOP:RB_ROWCELL +Vorgaben3 sym:sc:ImageButton:RID_SCDLG_TABOP:RB_COLCELL + +*MetOptionen sym:filter:ModalDialog:DLG_EXPORT_EMET +Original sym:filter:RadioButton:DLG_EXPORT_EMET:RB_ORIGINAL +Groesse sym:filter:RadioButton:DLG_EXPORT_EMET:RB_SIZE +Breite sym:filter:MetricField:DLG_EXPORT_EMET:MTF_SIZEX +Hoehe sym:filter:MetricField:DLG_EXPORT_EMET:MTF_SIZEY *ModuleBearbeiten sym:CUI_HID_EDIT_MODULES -Sprache sym:cui.ListBox.10831.319 +Sprache sym:cui:ListBox:RID_SVXDLG_EDIT_MODULES:LB_EDIT_MODULES_LANGUAGE Module sym:CUI_HID_CLB_EDIT_MODULES_MODULES -PrioPLus sym:cui.PushButton.10831.309 -PrioMinus sym:cui.PushButton.10831.310 -Zurueck sym:cui.PushButton.10831.311 +PrioPLus sym:cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_UP +PrioMinus sym:cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_DOWN +Zurueck sym:cui:PushButton:RID_SVXDLG_EDIT_MODULES:PB_EDIT_MODULES_PRIO_BACK Benutzerwoerterbuch sym:CUI_HID_CLB_EDIT_MODULES_DICS *DescriptionObject sym:CUI_HID_DLG_OBJECT_TITLE_DESC -DescriptionTitle sym:cui.Edit.10067.3 -DescriptionText sym:cui.MultiLineEdit.10067.4 +DescriptionTitle sym:cui:Edit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_TITLE +DescriptionText sym:cui:MultiLineEdit:RID_SVXDLG_OBJECT_TITLE_DESC:NTD_EDT_DESC *NameDlg sym:CUI_HID_DLG_NAME -Eingabefeld sym:cui.Edit.10062.1 +Eingabefeld sym:cui:Edit:RID_SVXDLG_NAME:EDT_STRING +LinieName NameDlg *NameDlgObject sym:CUI_HID_DLG_OBJECT_NAME -NameField sym:cui.Edit.10064.2 +NameField sym:cui:Edit:RID_SVXDLG_OBJECT_NAME:NTD_EDT_NAME +NameDlgGroup NameDlg NameField sym:SW_HID_FORMAT_NAME_OBJECT_NAME @@ -297,33 +297,33 @@ NameField sym:SD_HID_SD_NAMEDIALOG_LINEEND +NameDlgGroupCalc NameDlg NameField sym:SC_HID_SC_DRAW_RENAME -*NamenEinfuegen sym:.uno:InsertName -NamenAuswahl sym:sc.ListBox.25676.11 -Liste sym:sc.PushButton.25676.105 - -*NamenErzeugen sym:.uno:CreateNames -Kopfzeile sym:sc.CheckBox.25677.4 -LinkerSpalte sym:sc.CheckBox.25677.2 -Fusszeile sym:sc.CheckBox.25677.5 -RechterSpalte sym:sc.CheckBox.25677.3 - -*NamenFestlegen sym:.uno:DefineName -BereichsName sym:sc.ComboBox.25626.12 -ZugeordnetZu sym:sc.Edit.25626.15 -Filter sym:sc.CheckBox.25626.31 -Druckbereich sym:sc.CheckBox.25626.32 -Wiederholungsspalte sym:sc.CheckBox.25626.33 -Wiederholungszeile sym:sc.CheckBox.25626.34 -Hinzufuegen sym:sc.PushButton.25626.3 -Aendern sym:sc.PushButton.25626.3 -Loeschen sym:sc.PushButton.25626.4 -Zusaetze sym:sc.MoreButton.25626.6 -ZugeordnetZuButton sym:sc.ImageButton.25626.16 +*NamenEinfuegen .uno:InsertName +NamenAuswahl sym:sc:ListBox:RID_SCDLG_NAMES_PASTE:LB_ENTRYLIST +Liste sym:sc:PushButton:RID_SCDLG_NAMES_PASTE:BTN_ADD + +*NamenErzeugen .uno:CreateNames +Kopfzeile sym:sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_TOP +LinkerSpalte sym:sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_LEFT +Fusszeile sym:sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_BOTTOM +RechterSpalte sym:sc:CheckBox:RID_SCDLG_NAMES_CREATE:BTN_RIGHT + +*NamenFestlegen .uno:DefineName +BereichsName sym:sc:ComboBox:RID_SCDLG_NAMES:ED_NAME +ZugeordnetZu sym:sc:Edit:RID_SCDLG_NAMES:ED_ASSIGN +Filter sym:sc:CheckBox:RID_SCDLG_NAMES:BTN_CRITERIA +Druckbereich sym:sc:CheckBox:RID_SCDLG_NAMES:BTN_PRINTAREA +Wiederholungsspalte sym:sc:CheckBox:RID_SCDLG_NAMES:BTN_COLHEADER +Wiederholungszeile sym:sc:CheckBox:RID_SCDLG_NAMES:BTN_ROWHEADER +Hinzufuegen sym:sc:PushButton:RID_SCDLG_NAMES:BTN_ADD +Aendern sym:sc:PushButton:RID_SCDLG_NAMES:BTN_ADD +Loeschen sym:sc:PushButton:RID_SCDLG_NAMES:BTN_REMOVE +Zusaetze sym:sc:MoreButton:RID_SCDLG_NAMES:BTN_MORE +ZugeordnetZuButton sym:sc:ImageButton:RID_SCDLG_NAMES:RB_ASSIGN *NavigationsFenster sym:SW_HID_INSERT_CTRL Auswahl sym:SW_HID_NAVI_VS -*Navigator sym:SFXDOCKINGWINDOW_Navigator +*Navigator .uno:Navigator *NavigatorCalc sym:SC_HID_SC_NAVIGATOR NavigatorToolboxCalc sym:SC_HID_SC_NAVIPI_TOOLBOX @@ -387,69 +387,69 @@ NachUntenVerschieben sym:SW_HID_NAVI_TBX22 NachObenVerschieben sym:SW_HID_NAVI_TBX23 Inhaltsansicht sym:SW_HID_NAVI_TBX8 -*Neu sym:.uno:NewDoc -Bereiche sym:sfx.ListBox.2053.21 -Vorlagen sym:sfx.ListBox.2053.52 -Zusaetze sym:sfx.MoreButton.2053.32 -Vorschau sym:sfx.CheckBox.2053.51 -Titel sym:sfx.Edit.2053.56 -Thema sym:sfx.Edit.2053.55 -Schluesselworte sym:sfx.Edit.2053.61 -Beschreibung sym:sfx.MultiLineEdit.2053.71 -Text sym:sfx.CheckBox.2053.33 -Frame sym:sfx.CheckBox.2053.34 -Pages sym:sfx.CheckBox.2053.35 -Numbering sym:sfx.CheckBox.2053.36 -Overwrite sym:sfx.CheckBox.2053.37 -Fromfile sym:sfx.PushButton.2053.38 - -*NeueBibliothek sym:basctl.ModalDialog.14892 -Bibliotheksname sym:basctl.Edit.14892.41 - -*NeuerDialog sym:basctl.ModalDialog.14892 -Dialogname sym:basctl.Edit.14892.41 - -*NeuesFangobjekt sym:.uno:CapturePoint -Horizontal sym:sd.ImageRadioButton.312.11 -Vertikal sym:sd.ImageRadioButton.312.12 -Punkt sym:sd.ImageRadioButton.312.13 -X sym:sd.MetricField.312.7 -Y sym:sd.MetricField.312.9 - -*NeuesModul sym:basctl.ModalDialog.14892 -Modulname sym:basctl.Edit.14892.41 +*Neu .uno:NewDoc +Bereiche sym:sfx2:ListBox:DLG_NEW_FILE:LB_REGION +Vorlagen sym:sfx2:ListBox:DLG_NEW_FILE:LB_TEMPLATE +Zusaetze sym:sfx2:MoreButton:DLG_NEW_FILE:BT_MORE +Vorschau sym:sfx2:CheckBox:DLG_NEW_FILE:BTN_PREVIEW +Titel sym:sfx2:Edit:DLG_NEW_FILE:ED_TITLE +Thema sym:sfx2:Edit:DLG_NEW_FILE:ED_THEMA +Schluesselworte sym:sfx2:Edit:DLG_NEW_FILE:ED_KEYWORDS +Beschreibung sym:sfx2:MultiLineEdit:DLG_NEW_FILE:ED_DESC +Text sym:sfx2:CheckBox:DLG_NEW_FILE:CB_TEXT_STYLE +Frame sym:sfx2:CheckBox:DLG_NEW_FILE:CB_FRAME_STYLE +Pages sym:sfx2:CheckBox:DLG_NEW_FILE:CB_PAGE_STYLE +Numbering sym:sfx2:CheckBox:DLG_NEW_FILE:CB_NUM_STYLE +Overwrite sym:sfx2:CheckBox:DLG_NEW_FILE:CB_MERGE_STYLE +Fromfile sym:sfx2:PushButton:DLG_NEW_FILE:PB_LOAD_FILE + +*NeueBibliothek sym:basctl:ModalDialog:RID_DLG_NEWLIB +Bibliotheksname sym:basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME + +*NeuerDialog sym:basctl:ModalDialog:RID_DLG_NEWLIB +Dialogname sym:basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME + +*NeuesFangobjekt .uno:CapturePoint +Horizontal sym:sd:ImageRadioButton:DLG_SNAPLINE:RB_HORIZONTAL +Vertikal sym:sd:ImageRadioButton:DLG_SNAPLINE:RB_VERTICAL +Punkt sym:sd:ImageRadioButton:DLG_SNAPLINE:RB_POINT +X sym:sd:MetricField:DLG_SNAPLINE:MTR_FLD_X +Y sym:sd:MetricField:DLG_SNAPLINE:MTR_FLD_Y + +*NeuesModul sym:basctl:ModalDialog:RID_DLG_NEWLIB +Modulname sym:basctl:Edit:RID_DLG_NEWLIB:RID_ED_LIBNAME *NotizBearbeiten sym:CUI_HID_POSTIT_DIALOG -Texteingabe sym:cui.MultiLineEdit.10008.13 sw:MultiLineEdit:DLG_POSTIT:ED_EDIT -Autor sym:cui.PushButton.10008.17 sw:PushButton:DLG_POSTIT:BTN_AUTHOR -Vor sym:cui.ImageButton.10008.16 -Zurueck sym:cui.ImageButton.10008.15 +Texteingabe sym:cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT sym:sw:MultiLineEdit:DLG_POSTIT:ED_EDIT +Autor sym:cui:PushButton:RID_SVXDLG_POSTIT:BTN_AUTHOR sym:sw:PushButton:DLG_POSTIT:BTN_AUTHOR +Vor sym:cui:ImageButton:RID_SVXDLG_POSTIT:BTN_NEXT +Zurueck sym:cui:ImageButton:RID_SVXDLG_POSTIT:BTN_PREV *NummernkreisOptionen sym:SW_HID_DLG_SEQUENCE_OPTION -Ebene sym:sw.ListBox.21012.17 -Trenner sym:sw.Edit.21012.19 +Ebene sym:sw:ListBox:DLG_SEQUENCE_OPTION:LB_LEVEL +Trenner sym:sw:Edit:DLG_SEQUENCE_OPTION:ED_SEPARATOR +NotizEinfuegen NotizBearbeiten +NotizEinfuegenCalc NotizBearbeiten -Text sym:cui.MultiLineEdit.10008.13 +Text sym:cui:MultiLineEdit:RID_SVXDLG_POSTIT:ED_EDIT -*ObenFuellen sym:.uno:FillUp +*ObenFuellen .uno:FillUp -*Objekte sym:basctl.FloatingWindow.14920 +*Objekte sym:basctl:FloatingWindow:RID_BASICIDE_OBJCAT Toolbox sym:BASCTL_HID_BASICIDE_OBJECTS Zeigen sym:BASCTL_HID_BASICIDE_OBJCAT_SHOW ObjektListe sym:BASCTL_HID_BASICIDE_OBJECTCAT *ObjekteUmbenennen sym:SW_HID_RENAME_XNAMED -Objektname sym:sw.Edit.20888.2 - -*OLEObjektEinfuegen sym:.uno:InsertObject -NeuErstellen sym:cui.RadioButton.32010.10 -AusDateiErstellen sym:cui.RadioButton.32010.11 -Objekttyp sym:cui.ListBox.32010.12 -OleDatei sym:cui.Edit.32010.10 -Verknuepfen sym:cui.CheckBox.32010.12 -Durchsuchen sym:cui.PushButton.32010.11 +Objektname sym:sw:Edit:DLG_RENAME_XNAMED:ED_NEW_NAME + +*OLEObjektEinfuegen .uno:InsertObject +NeuErstellen sym:cui:RadioButton:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT +AusDateiErstellen sym:cui:RadioButton:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE +Objekttyp sym:cui:ListBox:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE +OleDatei sym:cui:Edit:MD_INSERT_OLEOBJECT:ED_FILEPATH +Verknuepfen sym:cui:CheckBox:MD_INSERT_OLEOBJECT:CB_FILELINK +Durchsuchen sym:cui:PushButton:MD_INSERT_OLEOBJECT:BTN_FILEPATH +OptionenDlg ExtrasOptionenDlg diff --git a/testautomation/global/win/dial_p_s.win b/testautomation/global/win/dial_p_s.win index 71b07326a077..4588cb599a2c 100644 --- a/testautomation/global/win/dial_p_s.win +++ b/testautomation/global/win/dial_p_s.win @@ -1,10 +1,10 @@ *Passwort sym:SFX2_HID_PASSWD -UserName sym:sfx.Edit.2316.12 -PasswortName sym:sfx.Edit.2316.14 -PasswortBestaetigen sym:sfx.Edit.2316.16 +UserName sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER +PasswortName sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD +PasswortBestaetigen sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM *PasswordFileOpen sym:UUI_HID_DLG_PASSWORD_UUI -PasswortName sym:uui.Edit.14522.2 +PasswortName sym:uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD *PasswordFileSave sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY Password sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_OPEN @@ -14,83 +14,83 @@ PasswordFileReadonly sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_FILE_READONLY PasswordToModify sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_PASSWORD_TO_MODIFY PasswordToModifyConfirm sym:CUI_HID_DLG_PASSWORD_TO_OPEN_MODIFY_CONFIRM_PASSWORD_TO_MODIFY -*PasswortEingeben sym:.uno:ProtectTraceChangeMode +*PasswortEingeben .uno:ProtectTraceChangeMode SchutzAufheben sym:SC_HID_CHG_PROTECT -PasswortEingabe sym:sfx.Edit.2316.12 -PasswortBestaetigen sym:sfx.Edit.2316.16 +PasswortEingabe sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER +PasswortBestaetigen sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM -*PBMOptionen sym:filter.ModalDialog.17409 -Binaer sym:filter.RadioButton.17409.1 -Ascii sym:filter.RadioButton.17409.2 +*PBMOptionen sym:filter:ModalDialog:DLG_EXPORT_EPBM +Binaer sym:filter:RadioButton:DLG_EXPORT_EPBM:RB_RAW +Ascii sym:filter:RadioButton:DLG_EXPORT_EPBM:RB_ASCII *PfadeAuswaehlen sym:CUI_HID_MULTIPATH Pfade sym:CUI_HID_OPTIONS_MULTIPATH_LIST -Hinzufuegen sym:cui.PushButton.10201.14 -Loeschen sym:cui.PushButton.10201.15 +Hinzufuegen sym:cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_ADD_MULTIPATH +Loeschen sym:cui:PushButton:RID_SVXDLG_MULTIPATH:BTN_DEL_MULTIPATH -*PGMOptionen sym:filter.ModalDialog.17410 -Binaer sym:filter.RadioButton.17410.1 -Ascii sym:filter.RadioButton.17410.2 +*PGMOptionen sym:filter:ModalDialog:DLG_EXPORT_EPGM +Binaer sym:filter:RadioButton:DLG_EXPORT_EPGM:RB_RAW +Ascii sym:filter:RadioButton:DLG_EXPORT_EPGM:RB_ASCII -*PICTOPtionen sym:filter.ModalDialog.17400 -Original sym:filter.RadioButton.17400.1 -Groesse sym:filter.RadioButton.17400.2 -Breite sym:filter.MetricField.17400.1 -Hoehe sym:filter.MetricField.17400.2 +*PICTOPtionen sym:filter:ModalDialog:DLG_EXPORT_EPCT +Original sym:filter:RadioButton:DLG_EXPORT_EPCT:RB_ORIGINAL +Groesse sym:filter:RadioButton:DLG_EXPORT_EPCT:RB_SIZE +Breite sym:filter:MetricField:DLG_EXPORT_EPCT:MTF_SIZEX +Hoehe sym:filter:MetricField:DLG_EXPORT_EPCT:MTF_SIZEY -*Pipette sym:.uno:BmpMask svx:DockingWindow:RID_SVXDLG_BMPMASK +*Pipette .uno:BmpMask sym:svx:DockingWindow:RID_SVXDLG_BMPMASK PipetteKnopf sym:SVX_HID_BMPMASK_TBI_PIPETTE Farbfeld sym:SVX_HID_BMPMASK_CTL_PIPETTE -Ersetzen sym:svx.PushButton.10420.1 -Quellfarbe1 sym:svx.CheckBox.10420.1 -Quellfarbe2 sym:svx.CheckBox.10420.4 -Quellfarbe3 sym:svx.CheckBox.10420.3 -Quellfarbe4 sym:svx.CheckBox.10420.2 -Toleranz1 sym:svx.MetricField.10420.2 -Toleranz2 sym:svx.MetricField.10420.4 -Toleranz3 sym:svx.MetricField.10420.1 -Toleranz4 sym:svx.MetricField.10420.3 -ErsetzenDurch1 sym:svx.ListBox.10420.1 -ErsetzenDurch2 sym:svx.ListBox.10420.2 -ErsetzenDurch3 sym:svx.ListBox.10420.3 -ErsetzenDurch4 sym:svx.ListBox.10420.4 -ErsetzenDurch5 sym:svx.ListBox.10420.5 -Tranzparenz sym:svx.CheckBox.10420.5 +Ersetzen sym:svx:PushButton:RID_SVXDLG_BMPMASK:BTN_EXEC +Quellfarbe1 sym:svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_1 +Quellfarbe2 sym:svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_2 +Quellfarbe3 sym:svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_3 +Quellfarbe4 sym:svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_4 +Toleranz1 sym:svx:MetricField:RID_SVXDLG_BMPMASK:SP_1 +Toleranz2 sym:svx:MetricField:RID_SVXDLG_BMPMASK:SP_2 +Toleranz3 sym:svx:MetricField:RID_SVXDLG_BMPMASK:SP_3 +Toleranz4 sym:svx:MetricField:RID_SVXDLG_BMPMASK:SP_4 +ErsetzenDurch1 sym:svx:ListBox:RID_SVXDLG_BMPMASK:LB_1 +ErsetzenDurch2 sym:svx:ListBox:RID_SVXDLG_BMPMASK:LB_2 +ErsetzenDurch3 sym:svx:ListBox:RID_SVXDLG_BMPMASK:LB_3 +ErsetzenDurch4 sym:svx:ListBox:RID_SVXDLG_BMPMASK:LB_4 +ErsetzenDurch5 sym:svx:ListBox:RID_SVXDLG_BMPMASK:LB_TRANS +Tranzparenz sym:svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_TRANS *PivotFilter sym:SC_HID_SC_PIVOTFILTER -Operator1 sym:sc.ListBox.25637.27 -Operator2 sym:sc.ListBox.25637.28 -FieldName1 sym:sc.ListBox.25637.24 -FieldName2 sym:sc.ListBox.25637.25 -FieldName3 sym:sc.ListBox.25637.26 -Condition1 sym:sc.ListBox.25637.29 -Condition2 sym:sc.ListBox.25637.30 -Condition3 sym:sc.ListBox.25637.31 -Value1 sym:sc.ComboBox.25637.32 -Value2 sym:sc.ComboBox.25637.33 -Value3 sym:sc.ComboBox.25637.34 -More sym:sc.MoreButton.25637.1 -CaseSensitive sym:sc.CheckBox.25637.2 -RegularExpression sym:sc.CheckBox.25637.3 -NoDuplication sym:sc.CheckBox.25637.1 - -*PlugInEinfuegen sym:.uno:InsertPlugin -DateiUrl sym:cui.Edit.32008.10 -Durchsuchen sym:cui.PushButton.32008.11 -Optionen sym:cui.MultiLineEdit.32008.20 - -*PNGOptionen sym:svt.ModalDialog.16486 -Kompression sym:svt.NumericField.16486.1 -Interlaced sym:svt.CheckBox.16486.1 - -*PPMOptionen sym:filter.ModalDialog.17411 -Binaer sym:filter.RadioButton.17411.1 -Ascii sym:filter.RadioButton.17411.2 +Operator1 sym:sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP1 +Operator2 sym:sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_OP2 +FieldName1 sym:sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD1 +FieldName2 sym:sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD2 +FieldName3 sym:sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_FIELD3 +Condition1 sym:sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND1 +Condition2 sym:sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND2 +Condition3 sym:sc:ListBox:RID_SCDLG_PIVOTFILTER:LB_COND3 +Value1 sym:sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL1 +Value2 sym:sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL2 +Value3 sym:sc:ComboBox:RID_SCDLG_PIVOTFILTER:ED_VAL3 +More sym:sc:MoreButton:RID_SCDLG_PIVOTFILTER:BTN_MORE +CaseSensitive sym:sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_CASE +RegularExpression sym:sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_REGEXP +NoDuplication sym:sc:CheckBox:RID_SCDLG_PIVOTFILTER:BTN_UNIQUE + +*PlugInEinfuegen .uno:InsertPlugin +DateiUrl sym:cui:Edit:MD_INSERT_OBJECT_PLUGIN:ED_FILEURL +Durchsuchen sym:cui:PushButton:MD_INSERT_OBJECT_PLUGIN:BTN_FILEURL +Optionen sym:cui:MultiLineEdit:MD_INSERT_OBJECT_PLUGIN:ED_PLUGINS_OPTIONS + +*PNGOptionen sym:svtools:ModalDialog:DLG_EXPORT_EPNG +Kompression sym:svtools:NumericField:DLG_EXPORT_EPNG:NUM_COMPRESSION +Interlaced sym:svtools:CheckBox:DLG_EXPORT_EPNG:CBX_INTERLACED + +*PPMOptionen sym:filter:ModalDialog:DLG_EXPORT_EPPM +Binaer sym:filter:RadioButton:DLG_EXPORT_EPPM:RB_RAW +Ascii sym:filter:RadioButton:DLG_EXPORT_EPPM:RB_ASCII *QuelleAuswaehlen sym:SC_HID_DATAPILOT_TYPE -AktuelleSelektion sym:sc.RadioButton.25733.4 -AngemeldeteDatenquelle sym:sc.RadioButton.25733.5 -ExterneQuelle sym:sc.RadioButton.25733.6 +AktuelleSelektion sym:sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_SELECTION +AngemeldeteDatenquelle sym:sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_DATABASE +ExterneQuelle sym:sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_EXTERNAL *Rechtschreibung sym:CUI_HID_SPELLCHECK Original sym:CUI_HID_SPELLDLG_SETWORD @@ -98,7 +98,7 @@ Ersetzen sym:CUI_HID_SPLDLG_BUTTON_CHANGE AlleErsetzen sym:CUI_HID_SPLDLG_BUTTON_CHANGEALL Ignorieren sym:CUI_HID_SPLDLG_BUTTON_IGNORE AlleIgnorieren sym:CUI_HID_SPLDLG_BUTTON_IGNOREALL -Sprache sym:cui.ListBox.10032.36 +Sprache sym:cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE RechtschreibungSchliessen sym:CUI_HID_SPLDLG_BUTTON_CLOSE *Redlining sym:SW_HID_REDLINE_ACCEPT @@ -112,278 +112,285 @@ Ablehnen sym:SVX_HID_REDLINING_VIEW_PB_REJECT AlleAblehnen sym:SVX_HID_REDLINING_VIEW_PB_REJECTALL Undo sym:SVX_HID_REDLINING_VIEW_PB_UNDO -TabFilter sym:SVX_HID_REDLINING_FILTER_PAGE cui:TABPAGE:SID_REDLIN_FILTER_PAGE -Datum sym:SVX_HID_REDLINING_FILTER_CB_DATE cui:CheckBox:SID_REDLIN_FILTER_PAGE:CB_DATE -DatumListe sym:SVX_HID_REDLINING_FILTER_LB_DATE cui:ListBox:SID_REDLIN_FILTER_PAGE:LB_DATE -Datum1 sym:SVX_HID_REDLINING_FILTER_DF_DATE cui:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE -Zeit1 sym:SVX_HID_REDLINING_FILTER_TF_DATE cui:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE -Aktuell1 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK svx:ImageButton:SID_REDLIN_FILTER_PAGE:IB_CLOCK -Datum2 sym:SVX_HID_REDLINING_FILTER_DF_DATE2 SVX:DATEFIELD:SID_REDLIN_FILTER_PAGE:DF_DATE2 -Zeit2 sym:SVX_HID_REDLINING_FILTER_TF_DATE2 SVX:TIMEFIELD:SID_REDLIN_FILTER_PAGE:TF_DATE2 -Aktuell2 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK2 svx:ImageButton:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 -Autor sym:SVX_HID_REDLINING_FILTER_CB_AUTOR svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_AUTOR -AutoListe sym:SVX_HID_REDLINING_FILTER_LB_AUTOR svx:ListBox:SID_REDLIN_FILTER_PAGE:LB_AUTOR -Bereich sym:SVX_HID_REDLINING_FILTER_CB_RANGE svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_RANGE -BereichText sym:SVX_HID_REDLINING_FILTER_ED_RANGE SVX:EDIT:SID_REDLIN_FILTER_PAGE:ED_RANGE -Button sym:SVX_HID_REDLINING_FILTER_BTN_REF SVX:PUSHBUTTON:SID_REDLIN_FILTER_PAGE:BTN_REF -Aktion sym:SVX_HID_REDLINING_FILTER_CB_ACTION svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_ACTION -Aktionsliste sym:SVX_HID_REDLINING_FILTER_LB_ACTION svx:ListBox:SID_REDLIN_FILTER_PAGE:LB_ACTION -Comment sym:SVX_HID_REDLINING_FILTER_CB_COMMENT svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_COMMENT -CommentText sym:SVX_HID_REDLINING_FILTER_ED_COMMENT svx:ListBox:SID_REDLIN_FILTER_PAGE:ED_COMMENT - -*ReiheFuellen sym:.uno:FillSeries -Oben sym:sc.RadioButton.25623.4 -Unten sym:sc.RadioButton.25623.5 -Rechts sym:sc.RadioButton.25623.3 -Links sym:sc.RadioButton.25623.2 -Arithmetisch sym:sc.RadioButton.25623.12 -Geometrisch sym:sc.RadioButton.25623.13 -Datum sym:sc.RadioButton.25623.14 -AutoAusfuellen sym:sc.RadioButton.25623.15 -Tag sym:sc.RadioButton.25623.22 -WochenTag sym:sc.RadioButton.25623.23 -Monat sym:sc.RadioButton.25623.24 -Jahr sym:sc.RadioButton.25623.25 -StartWert sym:sc.Edit.25623.52 -EndWert sym:sc.Edit.25623.49 -Inkrement sym:sc.Edit.25623.39 - -*Schriften sym:sm.ModalDialog.20002 -Schriftart sym:sm.ComboBox.20002.1 -Fett sym:sm.CheckBox.20002.1 -Kursiv sym:sm.CheckBox.20002.2 - -*Schriftarten sym:.uno:ChangeFont -Variablen sym:sm.ListBox.20004.1 -Funktionen sym:sm.ListBox.20004.2 -Zahlen sym:sm.ListBox.20004.3 -Text sym:sm.ListBox.20004.4 -Serif sym:sm.ListBox.20004.5 -Sans sym:sm.ListBox.20004.6 -Fixed sym:sm.ListBox.20004.7 -Aendern sym:sm.MenuButton.20004.1 -Standard sym:sm.PushButton.20004.2 - -*Schriftgroessen sym:.uno:ChangeFontSize -BasisGroesse sym:sm.MetricField.20003.1 -TextGroesse sym:sm.MetricField.20003.4 -Indizes sym:sm.MetricField.20003.5 -Funktionen sym:sm.MetricField.20003.6 -Operatoren sym:sm.MetricField.20003.7 -Grenzen sym:sm.MetricField.20003.8 -Standard sym:sm.PushButton.20003.1 - -*ScriptEinfuegen sym:sw.ModalDialog.21110 -Scripttyp sym:sw.Edit.21110.11 -HierDerText sym:sw.MultiLineEdit.21110.13 -ScriptURL sym:sw.RadioButton.21110.19 -ScriptURLText sym:sw.Edit.21110.20 -ScriptURLWaehlen sym:sw.PushButton.21110.21 -ScriptText sym:sw.RadioButton.21110.12 -NaechstesScript sym:sw.ImageButton.21110.16 -VorherigesScript sym:sw.ImageButton.21110.15 - -*SeiteEinfuegen sym:.uno:InsertPage +TabFilter sym:SVX_HID_REDLINING_FILTER_PAGE sym:cui:TabPage:SID_REDLIN_FILTER_PAGE +Datum sym:SVX_HID_REDLINING_FILTER_CB_DATE sym:cui:CheckBox:SID_REDLIN_FILTER_PAGE:CB_DATE +DatumListe sym:SVX_HID_REDLINING_FILTER_LB_DATE sym:cui:ListBox:SID_REDLIN_FILTER_PAGE:LB_DATE +Datum1 sym:SVX_HID_REDLINING_FILTER_DF_DATE sym:cui:DateField:SID_REDLIN_FILTER_PAGE:DF_DATE +Zeit1 sym:SVX_HID_REDLINING_FILTER_TF_DATE sym:cui:TimeField:SID_REDLIN_FILTER_PAGE:TF_DATE +Aktuell1 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK sym:svx:ImageButton:SID_REDLIN_FILTER_PAGE:IB_CLOCK +Datum2 sym:SVX_HID_REDLINING_FILTER_DF_DATE2 sym:svx:DateField:SID_REDLIN_FILTER_PAGE:DF_DATE2 +Zeit2 sym:SVX_HID_REDLINING_FILTER_TF_DATE2 sym:svx:TimeField:SID_REDLIN_FILTER_PAGE:TF_DATE2 +Aktuell2 sym:SVX_HID_REDLINING_FILTER_IB_CLOCK2 sym:svx:ImageButton:SID_REDLIN_FILTER_PAGE:IB_CLOCK2 +Autor sym:SVX_HID_REDLINING_FILTER_CB_AUTOR sym:svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_AUTOR +AutoListe sym:SVX_HID_REDLINING_FILTER_LB_AUTOR sym:svx:ListBox:SID_REDLIN_FILTER_PAGE:LB_AUTOR +Bereich sym:SVX_HID_REDLINING_FILTER_CB_RANGE sym:svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_RANGE +BereichText sym:SVX_HID_REDLINING_FILTER_ED_RANGE sym:svx:Edit:SID_REDLIN_FILTER_PAGE:ED_RANGE +Button sym:SVX_HID_REDLINING_FILTER_BTN_REF sym:svx:PushButton:SID_REDLIN_FILTER_PAGE:BTN_REF +Aktion sym:SVX_HID_REDLINING_FILTER_CB_ACTION sym:svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_ACTION +Aktionsliste sym:SVX_HID_REDLINING_FILTER_LB_ACTION sym:svx:ListBox:SID_REDLIN_FILTER_PAGE:LB_ACTION +Comment sym:SVX_HID_REDLINING_FILTER_CB_COMMENT sym:svx:CheckBox:SID_REDLIN_FILTER_PAGE:CB_COMMENT +CommentText sym:SVX_HID_REDLINING_FILTER_ED_COMMENT sym:svx:ListBox:SID_REDLIN_FILTER_PAGE:ED_COMMENT + +*ReiheFuellen .uno:FillSeries +Oben sym:sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_TOP +Unten sym:sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_BOTTOM +Rechts sym:sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_RIGHT +Links sym:sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_LEFT +Arithmetisch sym:sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_ARITHMETIC +Geometrisch sym:sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_GEOMETRIC +Datum sym:sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DATE +AutoAusfuellen sym:sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_AUTOFILL +Tag sym:sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DAY +WochenTag sym:sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_DAY_OF_WEEK +Monat sym:sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_MONTH +Jahr sym:sc:RadioButton:RID_SCDLG_FILLSERIES:BTN_YEAR +StartWert sym:sc:Edit:RID_SCDLG_FILLSERIES:ED_START_VALUES +EndWert sym:sc:Edit:RID_SCDLG_FILLSERIES:ED_END_VALUES +Inkrement sym:sc:Edit:RID_SCDLG_FILLSERIES:ED_INCREMENT + +*Schriften sym:starmath:ModalDialog:RID_FONTDIALOG +Schriftart sym:starmath:ComboBox:RID_FONTDIALOG:1 +Fett sym:starmath:CheckBox:RID_FONTDIALOG:1 +Kursiv sym:starmath:CheckBox:RID_FONTDIALOG:2 + +*Schriftarten .uno:ChangeFont +Variablen sym:starmath:ListBox:RID_FONTTYPEDIALOG:1 +Funktionen sym:starmath:ListBox:RID_FONTTYPEDIALOG:2 +Zahlen sym:starmath:ListBox:RID_FONTTYPEDIALOG:3 +Text sym:starmath:ListBox:RID_FONTTYPEDIALOG:4 +Serif sym:starmath:ListBox:RID_FONTTYPEDIALOG:5 +Sans sym:starmath:ListBox:RID_FONTTYPEDIALOG:6 +Fixed sym:starmath:ListBox:RID_FONTTYPEDIALOG:7 +Aendern sym:starmath:MenuButton:RID_FONTTYPEDIALOG:1 +Standard sym:starmath:PushButton:RID_FONTTYPEDIALOG:2 + +*Schriftgroessen .uno:ChangeFontSize +BasisGroesse sym:starmath:MetricField:RID_FONTSIZEDIALOG:1 +TextGroesse sym:starmath:MetricField:RID_FONTSIZEDIALOG:4 +Indizes sym:starmath:MetricField:RID_FONTSIZEDIALOG:5 +Funktionen sym:starmath:MetricField:RID_FONTSIZEDIALOG:6 +Operatoren sym:starmath:MetricField:RID_FONTSIZEDIALOG:7 +Grenzen sym:starmath:MetricField:RID_FONTSIZEDIALOG:8 +Standard sym:starmath:PushButton:RID_FONTSIZEDIALOG:1 + +*ScriptEinfuegen sym:sw:ModalDialog:DLG_JAVAEDIT +Scripttyp sym:sw:Edit:DLG_JAVAEDIT:ED_TYPE +HierDerText sym:sw:MultiLineEdit:DLG_JAVAEDIT:ED_EDIT +ScriptURL sym:sw:RadioButton:DLG_JAVAEDIT:RB_URL +ScriptURLText sym:sw:Edit:DLG_JAVAEDIT:ED_URL +ScriptURLWaehlen sym:sw:PushButton:DLG_JAVAEDIT:PB_URL +ScriptText sym:sw:RadioButton:DLG_JAVAEDIT:RB_EDIT +NaechstesScript sym:sw:ImageButton:DLG_JAVAEDIT:BTN_NEXT +VorherigesScript sym:sw:ImageButton:DLG_JAVAEDIT:BTN_PREV + +*SeiteEinfuegen .uno:InsertPage AutoLayout sym:SD_HID_SD_CTL_NEWFOIL Hintergrund sym:SD_HID_SD_CHGFOIL_BACKGROUND ObjekteAufDemHintergund sym:SD_HID_SD_CHGFOIL_OBJECTS -*SeitenLayout sym:.uno:ModifyPage +*SeitenLayout .uno:ModifyPage AutoLayout sym:SD_HID_SD_CHGFOIL_LAYOUT Hintergrund sym:SD_HID_SD_CHGFOIL_BACKGROUND SeitenName sym:SD_HID_SD_CHGFOIL_NAME ObjekteAufDemHintergrund sym:SD_HID_SD_CHGFOIL_OBJECTS *SeitenObjekteEinfuegen sym:SD_HID_DLG_INSERT_PAGES_OBJS -Verknuepfung sym:sd.CheckBox.938.1 -DeleteUnusedBackgrounds sym:sd.CheckBox.938.2 +Verknuepfung sym:sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_LINK +DeleteUnusedBackgrounds sym:sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_CHECK_MASTERS InsertObjectsList sym:SD_HID_SD_PAGEOBJSTLB -*Seitenvorlage sym:.uno:PresentationLayout -Laden sym:sd.PushButton.868.2 -HintergrundseiteAustauschen sym:sd.CheckBox.868.1 -DeleteUnusedBackgrounds sym:sd.CheckBox.868.2 +*Seitenvorlage .uno:PresentationLayout +Laden sym:sd:PushButton:DLG_PRESLT:BTN_LOAD +HintergrundseiteAustauschen sym:sd:CheckBox:DLG_PRESLT:CBX_MASTER_PAGE +DeleteUnusedBackgrounds sym:sd:CheckBox:DLG_PRESLT:CBX_CHECK_MASTERS *SeitenvorlageLaden sym:SW_HID_FILEDLG_LOADTEMPLATE -Bereiche sym:sfx.ListBox.2053.21 -Beschreibung sym:sfx.MultiLineEdit.2053.71 -Schluesselworte sym:sfx.Edit.2053.61 -Thema sym:sfx.Edit.2053.55 -Titel sym:sfx.Edit.2053.56 -Vorlagen sym:sfx.ListBox.2053.52 -Vorschau sym:sfx.CheckBox.2053.51 -Zusaetze sym:sfx.MoreButton.2053.32 - -*Serienbrief sym:.uno:MergeDialog -DatensaetzeAlle sym:sw.RadioButton.22758.2 -DatensaetzeMarkiert sym:sw.RadioButton.22758.3 -DatensaetzeVonBis sym:sw.RadioButton.22758.4 -Von sym:sw.NumericField.22758.5 -Bis sym:sw.NumericField.22758.7 -Drucker sym:sw.RadioButton.22758.11 -Mailing sym:sw.RadioButton.22758.12 -AlsDatei sym:sw.RadioButton.22758.23 -DateiButton sym:sw.PushButton.22758.26 -Pfadeingabe sym:sw.Edit.22758.25 -EinzelneDruckjobserzeugen sym:sw.CheckBox.22758.18 -Adressfeld sym:sw.ListBox.22758.14 -Anhaenge sym:sw.Edit.22758.33 -AnhaengeAuswahl sym:sw.PushButton.22758.34 -Betreff sym:sw.Edit.22758.16 -FormatHTML sym:sw.CheckBox.22758.21 -FormatRTF sym:sw.CheckBox.22758.22 -FormatStarWriter sym:sw.CheckBox.22758.20 -Datenbankfeldliste sym:sw.ListBox.22758.30 - -*Sonderzeichen sym:.uno:InsertSymbol -Schrift sym:cui.ListBox.10010.12 +Bereiche sym:sfx2:ListBox:DLG_NEW_FILE:LB_REGION +Beschreibung sym:sfx2:MultiLineEdit:DLG_NEW_FILE:ED_DESC +Schluesselworte sym:sfx2:Edit:DLG_NEW_FILE:ED_KEYWORDS +Thema sym:sfx2:Edit:DLG_NEW_FILE:ED_THEMA +Titel sym:sfx2:Edit:DLG_NEW_FILE:ED_TITLE +Vorlagen sym:sfx2:ListBox:DLG_NEW_FILE:LB_TEMPLATE +Vorschau sym:sfx2:CheckBox:DLG_NEW_FILE:BTN_PREVIEW +Zusaetze sym:sfx2:MoreButton:DLG_NEW_FILE:BT_MORE + +*Serienbrief .uno:MergeDialog +DatensaetzeAlle sym:sw:RadioButton:DLG_MAILMERGE:RB_ALL +DatensaetzeMarkiert sym:sw:RadioButton:DLG_MAILMERGE:RB_MARKED +DatensaetzeVonBis sym:sw:RadioButton:DLG_MAILMERGE:RB_FROM +Von sym:sw:NumericField:DLG_MAILMERGE:NF_FROM +Bis sym:sw:NumericField:DLG_MAILMERGE:NF_TO +Drucker sym:sw:RadioButton:DLG_MAILMERGE:RB_PRINTER +Mailing sym:sw:RadioButton:DLG_MAILMERGE:RB_MAILING +AlsDatei sym:sw:RadioButton:DLG_MAILMERGE:RB_FILE +DateiButton sym:sw:PushButton:DLG_MAILMERGE:PB_PATH +Pfadeingabe sym:sw:Edit:DLG_MAILMERGE:ED_PATH +EinzelneDruckjobserzeugen sym:sw:CheckBox:DLG_MAILMERGE:CB_SINGLE_JOBS +Adressfeld sym:sw:ListBox:DLG_MAILMERGE:LB_ADDRESSFLD +Anhaenge sym:sw:Edit:DLG_MAILMERGE:ED_ATTACH +AnhaengeAuswahl sym:sw:PushButton:DLG_MAILMERGE:PB_ATTACH +Betreff sym:sw:Edit:DLG_MAILMERGE:ED_SUBJECT +FormatHTML sym:sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_HTML +FormatRTF sym:sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_RTF +FormatStarWriter sym:sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_SW +Datenbankfeldliste sym:sw:ListBox:DLG_MAILMERGE:LB_COLUMN + +*Sonderzeichen .uno:InsertSymbol +Schrift sym:cui:ListBox:RID_SVXDLG_CHARMAP:LB_FONT SchriftListe sym:CUI_HID_CHARMAP_CTL_SHOWSET -Loeschen sym:cui.PushButton.10010.20 +Loeschen sym:cui:PushButton:RID_SVXDLG_CHARMAP:BTN_DELETE Zeichenanzeige sym:CUI_HID_CHARMAP_CTL_SHOWCHAR Textanzeige sym:CUI_HID_CHARMAP_CTL_SHOWTEXT -Subset sym:cui.ListBox.10010.31 - -*SonstigesJavaabschaltung sym:cui.ModalDialog.10225 -NichtMehrAnzeigen sym:cui.CheckBox.10225.222 - -*Sortieren sym:.uno:SortDialog -Schluessel1 sym:sw.CheckBox.21669.5 -Spalte1 sym:sw.NumericField.21669.6 -Schluesseltyp1 sym:sw.ListBox.21669.7 -Aufsteigend1 sym:sw.RadioButton.21669.18 -Absteigend1 sym:sw.RadioButton.21669.19 -Schluessel2 sym:sw.CheckBox.21669.8 -Spalte2 sym:sw.NumericField.21669.9 -Schluesseltyp2 sym:sw.ListBox.21669.10 -Aufsteigend2 sym:sw.RadioButton.21669.29 -Absteigend2 sym:sw.RadioButton.21669.30 -Schluessel3 sym:sw.CheckBox.21669.11 -Spalte3 sym:sw.NumericField.21669.12 -Aufsteigend3 sym:sw.RadioButton.21669.31 -Absteigend3 sym:sw.RadioButton.21669.32 -Schluesseltyp3 sym:sw.ListBox.21669.13 -Spalten sym:sw.RadioButton.21669.15 -Zeilen sym:sw.RadioButton.21669.16 -Tabulator sym:sw.RadioButton.21669.21 -Zeichen sym:sw.RadioButton.21669.22 -Zeichentext sym:sw.Edit.21669.23 -Sonderzeichen sym:sw.PushButton.21669.34 -Sprache sym:sw.ListBox.21669.36 -ExakterVergleich sym:sw.CheckBox.21669.38 - -*SpalteAusblenden sym:.uno:HideColumn - -*SpalteEinblenden sym:.uno:ShowColumn - -*SpaltenbreiteCalc sym:.uno:ColumnWidth -Breite sym:sc.MetricField.25708.1 HID_SC_MTRIN_VAL -Standardwert sym:sc.CheckBox.25708.1 HID_SC_MTRIN_DEF - -*SpaltenBreite sym:.uno:SetColumnWidth -Spalte sym:sw.NumericField.21456.2 -Breite sym:sw.MetricField.21456.4 +Subset sym:cui:ListBox:RID_SVXDLG_CHARMAP:LB_SUBSET + +*SonstigesJavaabschaltung sym:cui:ModalDialog:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE +NichtMehrAnzeigen sym:cui:CheckBox:RID_SVXDLG_OPT_JAVASCRIPT_DISABLE:CB_JSCPT_DISABLE + +*Sortieren .uno:SortDialog +Schluessel1 sym:sw:CheckBox:DLG_SORTING:CB_KEY1 +Spalte1 sym:sw:NumericField:DLG_SORTING:ED_KEY1 +Schluesseltyp1 sym:sw:ListBox:DLG_SORTING:DLB_KEY1 +Aufsteigend1 sym:sw:RadioButton:DLG_SORTING:RB_UP +Absteigend1 sym:sw:RadioButton:DLG_SORTING:RB_DN +Schluessel2 sym:sw:CheckBox:DLG_SORTING:CB_KEY2 +Spalte2 sym:sw:NumericField:DLG_SORTING:ED_KEY2 +Schluesseltyp2 sym:sw:ListBox:DLG_SORTING:DLB_KEY2 +Aufsteigend2 sym:sw:RadioButton:DLG_SORTING:RB_UP2 +Absteigend2 sym:sw:RadioButton:DLG_SORTING:RB_DN2 +Schluessel3 sym:sw:CheckBox:DLG_SORTING:CB_KEY3 +Spalte3 sym:sw:NumericField:DLG_SORTING:ED_KEY3 +Aufsteigend3 sym:sw:RadioButton:DLG_SORTING:RB_UP3 +Absteigend3 sym:sw:RadioButton:DLG_SORTING:RB_DN3 +Schluesseltyp3 sym:sw:ListBox:DLG_SORTING:DLB_KEY3 +Spalten sym:sw:RadioButton:DLG_SORTING:RB_COL +Zeilen sym:sw:RadioButton:DLG_SORTING:RB_ROW +Tabulator sym:sw:RadioButton:DLG_SORTING:RB_TAB +Zeichen sym:sw:RadioButton:DLG_SORTING:RB_TABCH +Zeichentext sym:sw:Edit:DLG_SORTING:ED_TABCH +Sonderzeichen sym:sw:PushButton:DLG_SORTING:PB_DELIM +Sprache sym:sw:ListBox:DLG_SORTING:LB_LANG +ExakterVergleich sym:sw:CheckBox:DLG_SORTING:CB_CASE + +*SpalteAusblenden .uno:HideColumn + +*SpalteEinblenden .uno:ShowColumn + +*SpaltenbreiteCalc .uno:ColumnWidth +Breite sym:sc:MetricField:RID_SCDLG_COL_MAN:ED_VALUE HID_SC_MTRIN_VAL +Standardwert sym:sc:CheckBox:RID_SCDLG_COL_MAN:BTN_DEFVAL HID_SC_MTRIN_DEF + +*SpaltenBreite .uno:SetColumnWidth +Spalte sym:sw:NumericField:DLG_COL_WIDTH:ED_COL +Breite sym:sw:MetricField:DLG_COL_WIDTH:ED_WIDTH *Spaltenzuordnung sym:EXTENSIONS_HID_DLG_MAPPING -Kuerzel sym:bib.ListBox.15701.6 -Literaturart sym:bib.ListBox.15701.9 -Autor sym:bib.ListBox.15701.15 -Titel sym:bib.ListBox.15701.17 -Jahr sym:bib.ListBox.15701.21 -ISBN sym:bib.ListBox.15701.23 -Buchtitel sym:bib.ListBox.15701.25 -Kapitel sym:bib.ListBox.15701.27 -Ausgabe sym:bib.ListBox.15701.29 -Herausgeber sym:bib.ListBox.15701.31 -Ausgabeart sym:bib.ListBox.15701.33 -Institution sym:bib.ListBox.15701.35 -Zeitschrift sym:bib.ListBox.15701.37 -Monat sym:bib.ListBox.15701.19 -Notiz sym:bib.ListBox.15701.39 -Anmerkung sym:bib.ListBox.15701.13 -Nummer sym:bib.ListBox.15701.41 -Organisation sym:bib.ListBox.15701.43 -Seiten sym:bib.ListBox.15701.45 -Verlag sym:bib.ListBox.15701.47 -Adresse sym:bib.ListBox.15701.11 -Hochschule sym:bib.ListBox.15701.49 -Serie sym:bib.ListBox.15701.51 -ArtDesReport sym:bib.ListBox.15701.53 -Band sym:bib.ListBox.15701.55 -URL sym:bib.ListBox.15701.57 -Benutzerfeld1 sym:bib.ListBox.15701.59 -Benutzerfeld2 sym:bib.ListBox.15701.61 -Benutzerfeld3 sym:bib.ListBox.15701.63 -Benutzerfeld4 sym:bib.ListBox.15701.65 -Benutzerfeld5 sym:bib.ListBox.15701.67 - -*SpalteOptimaleBreite sym:.uno:SetOptimalColumnWidth -Extra sym:sc.MetricField.25709.1 HID_SC_MTRIN_VAL -Standardwert sym:sc.CheckBox.25709.1 HID_SC_MTRIN_DEF - -*Spezialfilter sym:.uno:DataFilterSpecialFilter -BefindenBereich sym:sc.ListBox.25613.51 -Befinden sym:sc.Edit.25613.52 -GrossKleinschreibung sym:sc.CheckBox.25613.2 -RegulaererAusdruck sym:sc.CheckBox.25613.3 -BereichEnthaeltSpaltenkoepfe sym:sc.CheckBox.25613.4 -KeineDuplikate sym:sc.CheckBox.25613.1 -Persistent sym:sc.CheckBox.25613.12 -FilterergebnisAusgeben sym:sc.CheckBox.25613.5 -AusgebenBereich sym:sc.ListBox.25613.6 -Ausgeben sym:sc.Edit.25613.7 -Zusaetze sym:sc.MoreButton.25613.1 -FilterkriterienMin sym:sc.ImageButton.25613.53 -FilterergebnisMin sym:sc.ImageButton.25613.8 - -*StandardFilter sym:.uno:DataFilterStandardFilter -FeldName1 sym:sc.ListBox.25612.24 -Feldname2 sym:sc.ListBox.25612.25 -Feldname3 sym:sc.ListBox.25612.26 -Feldname4 sym:sc.ListBox.25612.38 -Bedingung1 sym:sc.ListBox.25612.29 -Bedingung2 sym:sc.ListBox.25612.30 -Bedingung3 sym:sc.ListBox.25612.31 -Bedingung4 sym:sc.ListBox.25612.39 -Wert1 sym:sc.ComboBox.25612.32 -Wert2 sym:sc.ComboBox.25612.33 -Wert3 sym:sc.ComboBox.25612.34 -Wert4 sym:sc.ComboBox.25612.40 -Verknuepfung1 sym:sc.ListBox.25612.27 -Verknuepfung2 sym:sc.ListBox.25612.28 -Verknuepfung3 sym:sc.ListBox.25612.37 -Verknuepfung4 sym:sc.ListBox.25612.42 -Zusaetze sym:sc.MoreButton.25612.1 -GrossKleinschreibung sym:sc.CheckBox.25612.2 -BereicheEnthaeltSpaltenkoepfe sym:sc.CheckBox.25612.4 -RegulaererAusdruck sym:sc.CheckBox.25612.3 -KeineDuplikate sym:sc.CheckBox.25612.1 -FilterergebnisNach sym:sc.CheckBox.25612.5 -AusgebenBereich sym:sc.ListBox.25612.6 -Ausgeben sym:sc.Edit.25612.7 -DialogMin sym:sc.ImageButton.25612.8 -Persistent sym:sc.CheckBox.25612.12 +Kuerzel sym:extensions:ListBox:RID_DLG_MAPPING:LB_IDENTIFIER +Literaturart sym:extensions:ListBox:RID_DLG_MAPPING:LB_AUTHORITYTYPE +Autor sym:extensions:ListBox:RID_DLG_MAPPING:LB_AUTHOR +Titel sym:extensions:ListBox:RID_DLG_MAPPING:LB_TITLE +Jahr sym:extensions:ListBox:RID_DLG_MAPPING:LB_YEAR +ISBN sym:extensions:ListBox:RID_DLG_MAPPING:LB_ISBN +Buchtitel sym:extensions:ListBox:RID_DLG_MAPPING:LB_BOOKTITLE +Kapitel sym:extensions:ListBox:RID_DLG_MAPPING:LB_CHAPTER +Ausgabe sym:extensions:ListBox:RID_DLG_MAPPING:LB_EDITION +Herausgeber sym:extensions:ListBox:RID_DLG_MAPPING:LB_EDITOR +Ausgabeart sym:extensions:ListBox:RID_DLG_MAPPING:LB_HOWPUBLISHED +Institution sym:extensions:ListBox:RID_DLG_MAPPING:LB_INSTITUTION +Zeitschrift sym:extensions:ListBox:RID_DLG_MAPPING:LB_JOURNAL +Monat sym:extensions:ListBox:RID_DLG_MAPPING:LB_MONTH +Notiz sym:extensions:ListBox:RID_DLG_MAPPING:LB_NOTE +Anmerkung sym:extensions:ListBox:RID_DLG_MAPPING:LB_ANNOTE +Nummer sym:extensions:ListBox:RID_DLG_MAPPING:LB_NUMBER +Organisation sym:extensions:ListBox:RID_DLG_MAPPING:LB_ORGANIZATIONS +Seiten sym:extensions:ListBox:RID_DLG_MAPPING:LB_PAGES +Verlag sym:extensions:ListBox:RID_DLG_MAPPING:LB_PUBLISHER +Adresse sym:extensions:ListBox:RID_DLG_MAPPING:LB_ADDRESS +Hochschule sym:extensions:ListBox:RID_DLG_MAPPING:LB_SCHOOL +Serie sym:extensions:ListBox:RID_DLG_MAPPING:LB_SERIES +ArtDesReport sym:extensions:ListBox:RID_DLG_MAPPING:LB_REPORTTYPE +Band sym:extensions:ListBox:RID_DLG_MAPPING:LB_VOLUME +URL sym:extensions:ListBox:RID_DLG_MAPPING:LB_URL +Benutzerfeld1 sym:extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM1 +Benutzerfeld2 sym:extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM2 +Benutzerfeld3 sym:extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM3 +Benutzerfeld4 sym:extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM4 +Benutzerfeld5 sym:extensions:ListBox:RID_DLG_MAPPING:LB_CUSTOM5 + +*SpalteOptimaleBreite .uno:SetOptimalColumnWidth +Extra sym:sc:MetricField:RID_SCDLG_COL_OPT:ED_VALUE HID_SC_MTRIN_VAL +Standardwert sym:sc:CheckBox:RID_SCDLG_COL_OPT:BTN_DEFVAL HID_SC_MTRIN_DEF + +*Spezialfilter .uno:DataFilterSpecialFilter +BefindenBereich sym:sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_CRITERIA_AREA +Befinden sym:sc:Edit:RID_SCDLG_SPEC_FILTER:ED_CRITERIA_AREA +GrossKleinschreibung sym:sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_CASE +RegulaererAusdruck sym:sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_REGEXP +BereichEnthaeltSpaltenkoepfe sym:sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_HEADER +KeineDuplikate sym:sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_UNIQUE +Persistent sym:sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_DEST_PERS +FilterergebnisAusgeben sym:sc:CheckBox:RID_SCDLG_SPEC_FILTER:BTN_COPY_RESULT +AusgebenBereich sym:sc:ListBox:RID_SCDLG_SPEC_FILTER:LB_COPY_AREA +Ausgeben sym:sc:Edit:RID_SCDLG_SPEC_FILTER:ED_COPY_AREA +Zusaetze sym:sc:MoreButton:RID_SCDLG_SPEC_FILTER:BTN_MORE +FilterkriterienMin sym:sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_CRITERIA_AREA +FilterergebnisMin sym:sc:ImageButton:RID_SCDLG_SPEC_FILTER:RB_COPY_AREA + +*StandardFilter .uno:DataFilterStandardFilter +FeldName1 sym:sc:ListBox:RID_SCDLG_FILTER:LB_FIELD1 +Feldname2 sym:sc:ListBox:RID_SCDLG_FILTER:LB_FIELD2 +Feldname3 sym:sc:ListBox:RID_SCDLG_FILTER:LB_FIELD3 +Feldname4 sym:sc:ListBox:RID_SCDLG_FILTER:LB_FIELD4 +Bedingung1 sym:sc:ListBox:RID_SCDLG_FILTER:LB_COND1 +Bedingung2 sym:sc:ListBox:RID_SCDLG_FILTER:LB_COND2 +Bedingung3 sym:sc:ListBox:RID_SCDLG_FILTER:LB_COND3 +Bedingung4 sym:sc:ListBox:RID_SCDLG_FILTER:LB_COND4 +Wert1 sym:sc:ComboBox:RID_SCDLG_FILTER:ED_VAL1 +Wert2 sym:sc:ComboBox:RID_SCDLG_FILTER:ED_VAL2 +Wert3 sym:sc:ComboBox:RID_SCDLG_FILTER:ED_VAL3 +Wert4 sym:sc:ComboBox:RID_SCDLG_FILTER:ED_VAL4 +Verknuepfung1 sym:sc:ListBox:RID_SCDLG_FILTER:LB_OP1 +Verknuepfung2 sym:sc:ListBox:RID_SCDLG_FILTER:LB_OP2 +Verknuepfung3 sym:sc:ListBox:RID_SCDLG_FILTER:LB_OP3 +Verknuepfung4 sym:sc:ListBox:RID_SCDLG_FILTER:LB_OP4 +Zusaetze sym:sc:MoreButton:RID_SCDLG_FILTER:BTN_MORE +GrossKleinschreibung sym:sc:CheckBox:RID_SCDLG_FILTER:BTN_CASE +BereicheEnthaeltSpaltenkoepfe sym:sc:CheckBox:RID_SCDLG_FILTER:BTN_HEADER +RegulaererAusdruck sym:sc:CheckBox:RID_SCDLG_FILTER:BTN_REGEXP +KeineDuplikate sym:sc:CheckBox:RID_SCDLG_FILTER:BTN_UNIQUE +FilterergebnisNach sym:sc:CheckBox:RID_SCDLG_FILTER:BTN_COPY_RESULT +AusgebenBereich sym:sc:ListBox:RID_SCDLG_FILTER:LB_COPY_AREA +Ausgeben sym:sc:Edit:RID_SCDLG_FILTER:ED_COPY_AREA +DialogMin sym:sc:ImageButton:RID_SCDLG_FILTER:RB_COPY_AREA +Persistent sym:sc:CheckBox:RID_SCDLG_FILTER:BTN_DEST_PERS *Statusbar sym:FWK_HID_STATUSBAR +'*Standardbrowser sym:extensions:ModalDialog:MD_PROTCHK_DIALOG +'StarOfficeVerwenden sym:extensions:RadioButton:MD_PROTCHK_DIALOG:RB_STAROFFICE +'KeineAenderungen sym:extensions:RadioButton:MD_PROTCHK_DIALOG:RB_OTHER +'ImmerUeberpruefen sym:extensions:CheckBox:MD_PROTCHK_DIALOG:CB_PERFORM +'Zusaetze sym:extensions:PushButton:MD_PROTCHK_DIALOG:BT_DETAILS +'Protokollauswahl HID_PROTOCOLS + +Stylist Gestalter -*SVMOptionen sym:svt.ModalDialog.16372 -Original sym:svt.RadioButton.16372.1 -Groesse sym:svt.RadioButton.16372.2 -Breite sym:svt.MetricField.16372.1 -Hoehe sym:svt.MetricField.16372.2 +*SVMOptionen sym:svtools:ModalDialog:DLG_EXPORT_VEC +Original sym:svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC +Groesse sym:svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC +Breite sym:svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC +Hoehe sym:svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC -*SymboleMath sym:sm.ModalDialog.20008 -Symbolset sym:sm.ListBox.20008.1 -Bearbeiten sym:sm.PushButton.20008.1 -Uebernehmen sym:sm.PushButton.20008.2 +*SymboleMath sym:starmath:ModalDialog:RID_SYMBOLDIALOG +Symbolset sym:starmath:ListBox:RID_SYMBOLDIALOG:1 +Bearbeiten sym:starmath:PushButton:RID_SYMBOLDIALOG:1 +Uebernehmen sym:starmath:PushButton:RID_SYMBOLDIALOG:2 Symbols sym:STARMATH_HID_SMA_CONTROL_SYMBOLSET_VIEW -*SzenarioAnlegen sym:sc.ModalDialog.25643 sym:.uno:ScenarioManager -SzenarioName sym:sc.Edit.25643.11 -Kommentar sym:sc.MultiLineEdit.25643.13 -RahmenAnzeigen sym:sc.CheckBox.25643.21 -Rahmenfarbe sym:sc.ListBox.25643.22 -Zurueckkopieren sym:sc.CheckBox.25643.24 -GanzeTabelle sym:sc.CheckBox.25643.27 -PreventChanges sym:sc.CheckBox.25643.28 +*SzenarioAnlegen sym:sc:ModalDialog:RID_SCDLG_NEWSCENARIO .uno:ScenarioManager +SzenarioName sym:sc:Edit:RID_SCDLG_NEWSCENARIO:ED_NAME +Kommentar sym:sc:MultiLineEdit:RID_SCDLG_NEWSCENARIO:ED_COMMENT +RahmenAnzeigen sym:sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_SHOWFRAME +Rahmenfarbe sym:sc:ListBox:RID_SCDLG_NEWSCENARIO:LB_COLOR +Zurueckkopieren sym:sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_TWOWAY +GanzeTabelle sym:sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_COPYALL +PreventChanges sym:sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_PROTECT diff --git a/testautomation/global/win/dial_t_z.win b/testautomation/global/win/dial_t_z.win index 89ce339186dd..31a842f3c48e 100644 --- a/testautomation/global/win/dial_t_z.win +++ b/testautomation/global/win/dial_t_z.win @@ -1,75 +1,75 @@ -*TabelleAuftrennen sym:.uno:SplitTable -UeberschriftKopieren sym:sw.RadioButton.21464.5 -EigeneMitVorlage sym:sw.RadioButton.21464.7 -Eigene sym:sw.RadioButton.21464.6 -Keine sym:sw.RadioButton.21464.8 +*TabelleAuftrennen .uno:SplitTable +UeberschriftKopieren sym:sw:RadioButton:DLG_SPLIT_TABLE:RB_CNTNT +EigeneMitVorlage sym:sw:RadioButton:DLG_SPLIT_TABLE:RB_BOX_PARA +Eigene sym:sw:RadioButton:DLG_SPLIT_TABLE:RB_BOX_NOPARA +Keine sym:sw:RadioButton:DLG_SPLIT_TABLE:RB_BORDER -*TabelleAusblenden sym:.uno:Hide +*TabelleAusblenden .uno:Hide *TabellenFormat sym:SW_HID_FORMAT_TABLE -*TabelleEinblenden sym:.uno:Show -AusgeblendeteTabelle sym:sc.MultiListBox.25713.11 sym:SC_HID_SC_SELENTRY_LIST - -*TabelleEinfuegenCalc sym:sc.ModalDialog.25646 -Vor sym:sc.RadioButton.25646.11 -Nach sym:sc.RadioButton.25646.12 -Anzahl sym:sc.NumericField.25646.23 -NeuErstellen sym:sc.RadioButton.25646.21 -AusDateiErstellen sym:sc.RadioButton.25646.26 -TabellenName sym:sc.Edit.25646.25 -Auswahl sym:sc.MultiListBox.25646.27 -Verknuepfen sym:sc.CheckBox.25646.29 -Durchsuchen sym:sc.PushButton.25646.28 -Tabellen sym:sc.PushButton.25646.28 - -*TabelleEinfuegenWriter sym:.uno:InsertTable -TabellenName sym:sw.Edit.21450.11 -Spalten sym:sw.NumericField.21450.4 -Zeilen sym:sw.NumericField.21450.5 -UeberschriftWiederholen sym:sw.CheckBox.21450.14 -TabelleNichtTrennen sym:sw.CheckBox.21450.15 -Umrandung sym:sw.CheckBox.21450.16 -Autoformat sym:sw.PushButton.21450.23 -Ueberschrift sym:sw.CheckBox.21450.13 - -*TabellenFuellen sym:.uno:InsertContents -AuswahlAllesEinfuegen sym:sc.CheckBox.25618.20 -AuswahlZeichenketten sym:sc.CheckBox.25618.21 -AuswahlZahlen sym:sc.CheckBox.25618.22 -AuswahlDatumZeit sym:sc.CheckBox.25618.23 -AuswahlFormeln sym:sc.CheckBox.25618.24 -AuswahlNotizen sym:sc.CheckBox.25618.26 -AuswahlFormate sym:sc.CheckBox.25618.25 -Objects sym:sc.CheckBox.25618.41 -RechenopperationenKeine sym:sc.RadioButton.25618.27 -RechenopperationenAddieren sym:sc.RadioButton.25618.28 -RechenopperationenSubtrahieren sym:sc.RadioButton.25618.29 -RechenopperationenMultiplizieren sym:sc.RadioButton.25618.30 -RechenopperationenDividieren sym:sc.RadioButton.25618.31 -LeerzeilenUeberspringen sym:sc.CheckBox.25618.33 -Verknuepfen sym:sc.CheckBox.25618.35 -Transponieren sym:sc.CheckBox.25618.34 -NichtVerschieben sym:sc.RadioButton.25618.37 -NachUnten sym:sc.RadioButton.25618.38 -NachRechts sym:sc.RadioButton.25618.39 - -*TabelleSchuetzen sym:.uno:Protect +*TabelleEinblenden .uno:Show +AusgeblendeteTabelle sym:sc:MultiListBox:RID_SCDLG_SHOW_TAB:LB_ENTRYLIST sym:SC_HID_SC_SELENTRY_LIST + +*TabelleEinfuegenCalc sym:sc:ModalDialog:RID_SCDLG_INSERT_TABLE +Vor sym:sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEFORE +Nach sym:sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_BEHIND +Anzahl sym:sc:NumericField:RID_SCDLG_INSERT_TABLE:NF_COUNT +NeuErstellen sym:sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_NEW +AusDateiErstellen sym:sc:RadioButton:RID_SCDLG_INSERT_TABLE:RB_FROMFILE +TabellenName sym:sc:Edit:RID_SCDLG_INSERT_TABLE:ED_TABNAME +Auswahl sym:sc:MultiListBox:RID_SCDLG_INSERT_TABLE:LB_TABLES +Verknuepfen sym:sc:CheckBox:RID_SCDLG_INSERT_TABLE:CB_LINK +Durchsuchen sym:sc:PushButton:RID_SCDLG_INSERT_TABLE:BTN_BROWSE +Tabellen sym:sc:PushButton:RID_SCDLG_INSERT_TABLE:BTN_BROWSE + +*TabelleEinfuegenWriter .uno:InsertTable +TabellenName sym:sw:Edit:DLG_INSERT_TABLE:ED_NAME +Spalten sym:sw:NumericField:DLG_INSERT_TABLE:ED_COL +Zeilen sym:sw:NumericField:DLG_INSERT_TABLE:ED_ROW +UeberschriftWiederholen sym:sw:CheckBox:DLG_INSERT_TABLE:CB_REPEAT_HEADER +TabelleNichtTrennen sym:sw:CheckBox:DLG_INSERT_TABLE:CB_DONT_SPLIT +Umrandung sym:sw:CheckBox:DLG_INSERT_TABLE:CB_BORDER +Autoformat sym:sw:PushButton:DLG_INSERT_TABLE:BT_AUTOFORMAT +Ueberschrift sym:sw:CheckBox:DLG_INSERT_TABLE:CB_HEADER + +*TabellenFuellen .uno:InsertContents +AuswahlAllesEinfuegen sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSALL +AuswahlZeichenketten sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSSTRINGS +AuswahlZahlen sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSNUMBERS +AuswahlDatumZeit sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSDATETIME +AuswahlFormeln sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSFORMULAS +AuswahlNotizen sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSNOTES +AuswahlFormate sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSATTRS +Objects sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_INSOBJECTS +RechenopperationenKeine sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_NOOP +RechenopperationenAddieren sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_ADD +RechenopperationenSubtrahieren sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_SUB +RechenopperationenMultiplizieren sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_MUL +RechenopperationenDividieren sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_OP_DIV +LeerzeilenUeberspringen sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_SKIP_EMPTY +Verknuepfen sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_LINK +Transponieren sym:sc:CheckBox:RID_SCDLG_INSCONT:BTN_TRANSPOSE +NichtVerschieben sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_MV_NONE +NachUnten sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_MV_DOWN +NachRechts sym:sc:RadioButton:RID_SCDLG_INSCONT:BTN_MV_RIGHT + +*TabelleSchuetzen .uno:Protect Passwort sym:SC_HID_PASSWD_TABLE -Bestaetigung sym:sfx.Edit.2316.16 -IstVerdeckt sym:sfx.Edit.2316.12 +Bestaetigung sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM +IstVerdeckt sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER -*TabelleUmbenennen sym:.uno:Name -TabellenName sym:SC_HID_SC_RENAME_NAME sym:sc.Edit.25620.10 +*TabelleUmbenennen .uno:Name +TabellenName sym:SC_HID_SC_RENAME_NAME sym:sc:Edit:RID_SCDLG_STRINPUT:ED_INPUT -*TabellenVerbinden sym:.uno:MergeTable -MitVorherigerTabelleVerbinden sym:sw.RadioButton.21465.5 -MitNachfolgenderTabelleVerbinden sym:sw.RadioButton.21465.6 +*TabellenVerbinden .uno:MergeTable +MitVorherigerTabelleVerbinden sym:sw:RadioButton:DLG_MERGE_TABLE:RB_MERGE_PREV +MitNachfolgenderTabelleVerbinden sym:sw:RadioButton:DLG_MERGE_TABLE:RB_MERGE_NEXT -*TabelleVerschiebenKopieren sym:.uno:Move -InsDokument sym:sc.ListBox.25619.2 -EinfuegenVor sym:sc.ListBox.25619.4 -Kopieren sym:sc.CheckBox.25619.5 +*TabelleVerschiebenKopieren .uno:Move +InsDokument sym:sc:ListBox:RID_SCDLG_MOVETAB:LB_DEST +EinfuegenVor sym:sc:ListBox:RID_SCDLG_MOVETAB:LB_INSERT +Kopieren sym:sc:CheckBox:RID_SCDLG_MOVETAB:BTN_COPY *TB_SC_Themenauswahl sym:WIZARDS_HID_DLGSTYLES_DIALOG ThemenListe sym:WIZARDS_HID_DLGSTYLES_LISTBOX @@ -103,112 +103,112 @@ Eigenschaften sym:SVX_HID_IMAPDLG_PROPERTY *TB_Umrandungsstil sym:SVX_HID_POPUP_LINE *TextbausteineUmbenennen sym:SW_HID_RENAME_GLOSSARY -Name sym:sw.Edit.21675.5 -Neu sym:sw.Edit.21675.7 -KuerzelAlt sym:sw.Edit.21675.6 -KuerzelNeu sym:sw.Edit.21675.8 +Name sym:sw:Edit:DLG_RENAME_GLOS:ED_ON +Neu sym:sw:Edit:DLG_RENAME_GLOS:ED_NN +KuerzelAlt sym:sw:Edit:DLG_RENAME_GLOS:ED_OS +KuerzelNeu sym:sw:Edit:DLG_RENAME_GLOS:ED_NS -*TextInTabelleUmwandeln sym:.uno:ConvertTableText sw:ModalDialog:DLG_CONV_TEXT_TABLE -Tabulator sym:sw.RadioButton.21452.1 -Semikolon sym:sw.RadioButton.21452.3 -Absatz sym:sw.RadioButton.21452.4 -Andere sym:sw.RadioButton.21452.6 -AndereText sym:sw.Edit.21452.7 -GleicheBreite sym:sw.CheckBox.21452.8 -Autoformat sym:sw.PushButton.21452.102 -Ueberschrift sym:sw.CheckBox.21452.13 -Wiederholen sym:sw.CheckBox.21452.14 -NichtTrennen sym:sw.CheckBox.21452.15 -Umrandung sym:sw.CheckBox.21452.16 +*TextInTabelleUmwandeln .uno:ConvertTableText sym:sw:ModalDialog:DLG_CONV_TEXT_TABLE +Tabulator sym:sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_TAB +Semikolon sym:sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_SEMI +Absatz sym:sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_PARA +Andere sym:sw:RadioButton:DLG_CONV_TEXT_TABLE:RB_OTHER +AndereText sym:sw:Edit:DLG_CONV_TEXT_TABLE:ED_OTHER +GleicheBreite sym:sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN +Autoformat sym:sw:PushButton:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT +Ueberschrift sym:sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_HEADER +Wiederholen sym:sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_REPEAT_HEADER +NichtTrennen sym:sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_DONT_SPLIT +Umrandung sym:sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_BORDER -*TextmarkeEinfuegen sym:.uno:InsertBookmark -Textmarken sym:sw.ComboBox.21667.1 -Loeschen sym:sw.PushButton.21667.22 +*TextmarkeEinfuegen .uno:InsertBookmark +Textmarken sym:sw:ComboBox:DLG_INSERT_BOOKMARK:CB_BOOKMARK +Loeschen sym:sw:PushButton:DLG_INSERT_BOOKMARK:BT_DELETE -*Ueberblenden sym:.uno:Morphing -Attributierung sym:sd.CheckBox.653.1 -GleicheOrientierung sym:sd.CheckBox.653.2 -Schritte sym:sd.MetricField.653.1 +*Ueberblenden .uno:Morphing +Attributierung sym:sd:CheckBox:DLG_MORPH:CBX_ATTRIBUTES +GleicheOrientierung sym:sd:CheckBox:DLG_MORPH:CBX_ORIENTATION +Schritte sym:sd:MetricField:DLG_MORPH:MTF_STEPS -*UeberStarCalc sym:.uno:About +*UeberStarCalc .uno:About -*UeberStarChart sym:.uno:About +*UeberStarChart .uno:About -*UeberStarDraw sym:.uno:About +*UeberStarDraw .uno:About -*UeberStarImage sym:.uno:About +*UeberStarImage .uno:About -*UeberStarMath sym:.uno:About +*UeberStarMath .uno:About -*UeberStarWriter sym:.uno:About +*UeberStarWriter .uno:About -*UmbruchEinfuegen sym:.uno:InsertBreak -Zeilenumbruch sym:sw.RadioButton.20705.2 -Spaltenumbruch sym:sw.RadioButton.20705.3 -Seitenumbruch sym:sw.RadioButton.20705.1 -Vorlage sym:sw.ListBox.20705.5 -SeitennummerAendern sym:sw.CheckBox.20705.7 -Seitennummer sym:sw.NumericField.20705.8 +*UmbruchEinfuegen .uno:InsertBreak +Zeilenumbruch sym:sw:RadioButton:DLG_BREAK:RB_LINE +Spaltenumbruch sym:sw:RadioButton:DLG_BREAK:RB_COL +Seitenumbruch sym:sw:RadioButton:DLG_BREAK:RB_PAGE +Vorlage sym:sw:ListBox:DLG_BREAK:LB_COLL +SeitennummerAendern sym:sw:CheckBox:DLG_BREAK:CB_PAGENUM +Seitennummer sym:sw:NumericField:DLG_BREAK:ED_PAGENUM *UmwandelnInPolygon sym:SD_HID_VECTORIZE_DLG -Farbanzahl sym:sd.NumericField.654.1 -Punktreduktion sym:sd.MetricField.654.3 -LoecherFuellen sym:sd.CheckBox.654.1 -Kachelgroesse sym:sd.MetricField.654.4 -Vorschau sym:sd.PushButton.654.1 +Farbanzahl sym:sd:NumericField:DLG_VECTORIZE:NM_LAYERS +Punktreduktion sym:sd:MetricField:DLG_VECTORIZE:MT_REDUCE +LoecherFuellen sym:sd:CheckBox:DLG_VECTORIZE:CB_FILLHOLES +Kachelgroesse sym:sd:MetricField:DLG_VECTORIZE:MT_FILLHOLES +Vorschau sym:sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW -*UntenFuellen sym:.uno:FillDown +*UntenFuellen .uno:FillDown *UndoRedoBox sym:SVX_HID_SVXTBX_UNDO_REDO_CTRL -UndoRedoList sym:svx.ListBox.10845.11 - -*Verbinder sym:CUI_HID_PAGE_CONNECTION SVX:TABPAGE:RID_SVXPAGE_CONNECTION -Linie1 sym:cui.MetricField.10191.1 -Linie2 sym:cui.MetricField.10191.2 -Linie3 sym:cui.MetricField.10191.3 -Typ sym:cui.ListBox.10191.1 -AnfangHorizontal sym:cui.MetricField.10191.4 -AnfangVertikal sym:cui.MetricField.10191.6 -EndeHorizontal sym:cui.MetricField.10191.5 -EndeVertikal sym:cui.MetricField.10191.7 +UndoRedoList sym:svx:ListBox:RID_SVXTBX_UNDO_REDO_CTRL:LB_SVXTBX_UNDO_REDO_CTRL + +*Verbinder sym:CUI_HID_PAGE_CONNECTION sym:svx:TabPage:RID_SVXPAGE_CONNECTION +Linie1 sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1 +Linie2 sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2 +Linie3 sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3 +Typ sym:cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE +AnfangHorizontal sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1 +AnfangVertikal sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1 +EndeHorizontal sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2 +EndeVertikal sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2 Vorschau sym:CUI_HID_PAGE_CONNECTION_CTL_PREVIEW -*VerknuepfungenBearbeiten sym:cui.ModalDialog.32002 +*VerknuepfungenBearbeiten sym:cui:ModalDialog:MD_UPDATE_BASELINKS Liste sym:CUI_HID_LINKDLG_TABLB -VerknuepfungBearbeiten sym:cui.PushButton.32002.36 -Automatisch sym:cui.RadioButton.32002.42 -Manuell sym:cui.RadioButton.32002.43 -Aktualisieren sym:cui.PushButton.32002.35 -Aendern sym:cui.PushButton.32002.37 -Loesen sym:cui.PushButton.32002.38 +VerknuepfungBearbeiten sym:cui:PushButton:MD_UPDATE_BASELINKS:PB_OPEN_SOURCE +Automatisch sym:cui:RadioButton:MD_UPDATE_BASELINKS:RB_AUTOMATIC +Manuell sym:cui:RadioButton:MD_UPDATE_BASELINKS:RB_MANUAL +Aktualisieren sym:cui:PushButton:MD_UPDATE_BASELINKS:PB_UPDATE_NOW +Aendern sym:cui:PushButton:MD_UPDATE_BASELINKS:PB_CHANGE_SOURCE +Loesen sym:cui:PushButton:MD_UPDATE_BASELINKS:PB_BREAK_LINK *VersendenMonitor sym:SW_HID_MERGE_PRINTMONITOR -*Versionen sym:sfx.ModalDialog.2377 -Speichern sym:sfx.PushButton.2377.2 -ImmerVersionSpeichern sym:sfx.CheckBox.2377.3 -Anzeigen sym:sfx.PushButton.2377.13 -Loeschen sym:sfx.PushButton.2377.5 -Oeffnen sym:sfx.PushButton.2377.6 -Vergleichen sym:sfx.PushButton.2377.17 +*Versionen sym:sfx2:ModalDialog:DLG_VERSIONS +Speichern sym:sfx2:PushButton:DLG_VERSIONS:PB_SAVE +ImmerVersionSpeichern sym:sfx2:CheckBox:DLG_VERSIONS:CB_SAVEONCLOSE +Anzeigen sym:sfx2:PushButton:DLG_VERSIONS:PB_VIEW +Loeschen sym:sfx2:PushButton:DLG_VERSIONS:PB_DELETE +Oeffnen sym:sfx2:PushButton:DLG_VERSIONS:PB_OPEN +Vergleichen sym:sfx2:PushButton:DLG_VERSIONS:PB_COMPARE -*VersionskommentarEingeben sym:sfx.ModalDialog.2378 -Kommentar sym:sfx.MultiLineEdit.2378.14 -Schliessen sym:sfx.PushButton.2378.8 +*VersionskommentarEingeben sym:sfx2:ModalDialog:DLG_COMMENTS +Kommentar sym:sfx2:MultiLineEdit:DLG_COMMENTS:ME_VERSIONS +Schliessen sym:sfx2:PushButton:DLG_COMMENTS:PB_CLOSE *VerteilenDlg sym:CUI_HID_PAGE_DISTRIBUTE -KeineHorizontal sym:cui.RadioButton.10236.2 -Links sym:cui.RadioButton.10236.3 -MitteHorizontal sym:cui.RadioButton.10236.4 -AbstandHorizontal sym:cui.RadioButton.10236.5 -Rechts sym:cui.RadioButton.10236.6 -KeineVertikal sym:cui.RadioButton.10236.8 -Oben sym:cui.RadioButton.10236.9 -MitteVertikal sym:cui.RadioButton.10236.10 -AbstandVertikal sym:cui.RadioButton.10236.11 -Unten sym:cui.RadioButton.10236.12 - -*VerzeichniseintragEinfuegen sym:.uno:InsertIndexesEntry +KeineHorizontal sym:cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_NONE +Links sym:cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_LEFT +MitteHorizontal sym:cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_CENTER +AbstandHorizontal sym:cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_DISTANCE +Rechts sym:cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_HOR_RIGHT +KeineVertikal sym:cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_NONE +Oben sym:cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_TOP +MitteVertikal sym:cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_CENTER +AbstandVertikal sym:cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_DISTANCE +Unten sym:cui:RadioButton:RID_SVXPAGE_DISTRIBUTE:BTN_VER_BOTTOM + +*VerzeichniseintragEinfuegen .uno:InsertIndexesEntry EintragOk sym:SW_HID_INSERT_IDX_MRK_OK EinfuegenSchliessen sym:SW_HID_INSERT_IDX_MRK_CLOSE Verzeichniseintrag sym:SW_HID_INSERT_IDX_MRK_ENTRY @@ -222,7 +222,7 @@ Haupteintrag sym:SW_HID_INSERT_IDX_MRK_MAIN_ENTRY AufAlleGleichenAnwenden sym:SW_HID_INSERT_IDX_MRK_APPLY_ALL EntryPhoneticReading sym:SW_HID_INSERT_IDX_MRK_PHONETIC_READING -*VerzeichniseintragBearbeiten sym:.uno:IndexEntryDialog +*VerzeichniseintragBearbeiten .uno:IndexEntryDialog EintragOk sym:SW_HID_INSERT_IDX_MRK_OK BearbeitenSchliessen sym:SW_HID_INSERT_IDX_MRK_CLOSE Verzeichnis sym:SW_HID_INSERT_IDX_MRK_TYPE @@ -235,98 +235,98 @@ EintragNeu sym:SW_HID_INSERT_IDX_MRK_NEW Naechster sym:SW_HID_INSERT_IDX_MRK_NEXT Vorheriger sym:SW_HID_INSERT_IDX_MRK_PREV -*VorlageErzeugen sym:.uno:StyleNewByExample SID_TEMPLATE_NEW_BY_EXAMPLE -Vorlagenname sym:sfx.ComboBox.2323.1 +*VorlageErzeugen .uno:StyleNewByExample SID_TEMPLATE_NEW_BY_EXAMPLE +Vorlagenname sym:sfx2:ComboBox:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL -*Vorlagenkatalog sym:.uno:StyleCatalog -Vorlagen sym:sfx.ListBox.1461.10 +*Vorlagenkatalog .uno:StyleCatalog +Vorlagen sym:sfx2:ListBox:RID_STYLECATALOG:BT_TOOL Ansicht sym:SFX2_HID_TEMPLATE_FMT -Bereich sym:sfx.ListBox.1461.8 -Neu sym:sfx.PushButton.1461.6 -Aendern sym:sfx.PushButton.1461.5 -Loeschen sym:sfx.PushButton.1461.4 -Verwalten sym:sfx.PushButton.1461.3 +Bereich sym:sfx2:ListBox:RID_STYLECATALOG:BT_FLIST +Neu sym:sfx2:PushButton:RID_STYLECATALOG:BT_NEW +Aendern sym:sfx2:PushButton:RID_STYLECATALOG:BT_EDIT +Loeschen sym:sfx2:PushButton:RID_STYLECATALOG:BT_DEL +Verwalten sym:sfx2:PushButton:RID_STYLECATALOG:BT_ORG -*Vorschau sym:.uno:PreviewWindow +*Vorschau .uno:PreviewWindow *VorlageZuweisen sym:SW_HID_DLG_ADD_IDX_STYLES -ZuweisenLinks sym:sw.ImageButton.20894.110 -ZuweisenRechts sym:sw.ImageButton.20894.111 +ZuweisenLinks sym:sw:ImageButton:DLG_ADD_IDX_STYLES:PB_LEFT +ZuweisenRechts sym:sw:ImageButton:DLG_ADD_IDX_STYLES:PB_RIGHT *WBereicheBearbeiten sym:SW_HID_BIB_BASE -Bereichname sym:sw.Edit.21666.10 -Bereich sym:sw.ListBox.21666.8 +Bereichname sym:sw:Edit:DLG_BIB_BASE:ED_NAME +Bereich sym:sw:ListBox:DLG_BIB_BASE:LB_PATH Liste sym:SW_HID_GLOS_GROUP_TREE -Neu sym:sw.PushButton.21666.3 -Loeschen sym:sw.PushButton.21666.4 -Umbenennen sym:sw.PushButton.21666.11 +Neu sym:sw:PushButton:DLG_BIB_BASE:PB_NEW +Loeschen sym:sw:PushButton:DLG_BIB_BASE:PB_DELETE +Umbenennen sym:sw:PushButton:DLG_BIB_BASE:PB_RENAME -*WMFOptionen sym:svt.ModalDialog.16372 -Original sym:svt.RadioButton.16372.1 -Groesse sym:svt.RadioButton.16372.2 -Breite sym:svt.MetricField.16372.1 -Hoehe sym:svt.MetricField.16372.2 +*WMFOptionen sym:svtools:ModalDialog:DLG_EXPORT_VEC +Original sym:svtools:RadioButton:DLG_EXPORT_VEC:RB_ORIGINAL_VEC +Groesse sym:svtools:RadioButton:DLG_EXPORT_VEC:RB_SIZE_VEC +Breite sym:svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEX_VEC +Hoehe sym:svtools:MetricField:DLG_EXPORT_VEC:MTF_SIZEY_VEC *Zahlenformat sym:CUI_HID_NUMBERFORMAT -Kategorie sym:cui.ListBox.10041.9 +Kategorie sym:cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY KategorieFormat sym:CUI_HID_NUMBERFORMAT_LB_FORMAT 'FormatZahl -FormatCode sym:cui.Edit.10041.14 +FormatCode sym:cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT Hinzufuegen sym:CUI_HID_NUMBERFORMAT_TBI_ADD Entfernen sym:CUI_HID_NUMBERFORMAT_TBI_REMOVE -Sprache sym:cui.ListBox.10041.13 -Nachkommastellen sym:cui.NumericField.10041.22 -FuehrendeNullen sym:cui.NumericField.10041.24 -NegativInRot sym:cui.CheckBox.10041.25 -Tausenderpunkt sym:cui.CheckBox.10041.26 +Sprache sym:cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE +Nachkommastellen sym:cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS +FuehrendeNullen sym:cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES +NegativInRot sym:cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED +Tausenderpunkt sym:cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND -*ZeileAusblenden sym:.uno:HideRow +*ZeileAusblenden .uno:HideRow -*Zeilenhoehe sym:.uno:RowHeight -Hoehe sym:sc.MetricField.25710.1 HID_SC_MTRIN_VAL -Standwardwert sym:sc.CheckBox.25710.1 HID_SC_MTRIN_DEF +*Zeilenhoehe .uno:RowHeight +Hoehe sym:sc:MetricField:RID_SCDLG_ROW_MAN:ED_VALUE HID_SC_MTRIN_VAL +Standwardwert sym:sc:CheckBox:RID_SCDLG_ROW_MAN:BTN_DEFVAL HID_SC_MTRIN_DEF -*ZeileOptimaleHoehe sym:.uno:SetOptimalRowHeight -Extra sym:sc.MetricField.25711.1 HID_SC_MTRIN_VAL -Standardwert sym:sc.CheckBox.25711.1 HID_SC_MTRIN_DEF +*ZeileOptimaleHoehe .uno:SetOptimalRowHeight +Extra sym:sc:MetricField:RID_SCDLG_ROW_OPT:ED_VALUE HID_SC_MTRIN_VAL +Standardwert sym:sc:CheckBox:RID_SCDLG_ROW_OPT:BTN_DEFVAL HID_SC_MTRIN_DEF *ZellvorlageCalc sym:SFX2_HID_MANAGE_STYLES -*ZeileEinblenden sym:.uno:ShowRow +*ZeileEinblenden .uno:ShowRow -*ZellenEinfuegen sym:.uno:InsertCell -ZellenNachUnten sym:sc.RadioButton.25616.11 -ZellenNachRechts sym:sc.RadioButton.25616.12 -GanzeZeile sym:sc.RadioButton.25616.16 -GanzeSpalte sym:sc.RadioButton.25616.17 +*ZellenEinfuegen .uno:InsertCell +ZellenNachUnten sym:sc:RadioButton:RID_SCDLG_INSCELL:BTN_CELLSDOWN +ZellenNachRechts sym:sc:RadioButton:RID_SCDLG_INSCELL:BTN_CELLSRIGHT +GanzeZeile sym:sc:RadioButton:RID_SCDLG_INSCELL:BTN_INSROWS +GanzeSpalte sym:sc:RadioButton:RID_SCDLG_INSCELL:BTN_INSCOLS -*ZellenLoeschen sym:.uno:DeleteCell -Auswahl sym:sc.RadioButton.25615.10 -Zellennachoben sym:sc.RadioButton.25615.10 -Zellennachlinks sym:sc.RadioButton.25615.13 -GanzeZeilen sym:sc.RadioButton.25615.14 -GanzeSpalten sym:sc.RadioButton.25615.15 +*ZellenLoeschen .uno:DeleteCell +Auswahl sym:sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSUP +Zellennachoben sym:sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSUP +Zellennachlinks sym:sc:RadioButton:RID_SCDLG_DELCELL:BTN_CELLSLEFT +GanzeZeilen sym:sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELROWS +GanzeSpalten sym:sc:RadioButton:RID_SCDLG_DELCELL:BTN_DELCOLS -*ZellenHoehe sym:.uno:SetRowHeight -Hoehe sym:sw.MetricField.21454.1 -Dynamisch sym:sw.CheckBox.21454.2 +*ZellenHoehe .uno:SetRowHeight +Hoehe sym:sw:MetricField:DLG_ROW_HEIGHT:ED_HEIGHT +Dynamisch sym:sw:CheckBox:DLG_ROW_HEIGHT:CB_AUTOHEIGHT -*ZellenTeilen sym:cui.ModalDialog.10043 -Anzahl sym:cui.NumericField.10043.2 -Horizontal sym:cui.ImageRadioButton.10043.10 -Vertikal sym:cui.ImageRadioButton.10043.12 -GleichmaessigTeilen sym:cui.CheckBox.10043.11 +*ZellenTeilen sym:cui:ModalDialog:RID_SVX_SPLITCELLDLG +Anzahl sym:cui:NumericField:RID_SVX_SPLITCELLDLG:ED_COUNT +Horizontal sym:cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_HORZ +Vertikal sym:cui:ImageRadioButton:RID_SVX_SPLITCELLDLG:RB_VERT +GleichmaessigTeilen sym:cui:CheckBox:RID_SVX_SPLITCELLDLG:CB_PROP *ZielImDokument sym:CUI_HID_HYPERLINK_MARKWND 'Uebernehmen Kein Eintrag in Hid.Lst 'Schliessen Kein Eintrag in Hid.Lst -*Zielwertsuche sym:.uno:GoalSeekDialog -Formelzelle sym:sc.Edit.25630.1 -Vorgaben1 sym:sc.ImageButton.25630.1 -Zielwert sym:sc.Edit.25630.2 -VariableZelle sym:sc.Edit.25630.3 -Vorgaben2 sym:sc.ImageButton.25630.2 +*Zielwertsuche .uno:GoalSeekDialog +Formelzelle sym:sc:Edit:RID_SCDLG_SOLVER:ED_FORMULACELL +Vorgaben1 sym:sc:ImageButton:RID_SCDLG_SOLVER:RB_FORMULACELL +Zielwert sym:sc:Edit:RID_SCDLG_SOLVER:ED_TARGETVAL +VariableZelle sym:sc:Edit:RID_SCDLG_SOLVER:ED_VARCELL +Vorgaben2 sym:sc:ImageButton:RID_SCDLG_SOLVER:RB_VARCELL -*Zusammenfassen sym:.uno:AutoFormat -Mindestgroesse sym:cui.MetricField.17011.100 +*Zusammenfassen .uno:AutoFormat +Mindestgroesse sym:cui:MetricField:RID_OFADLG_PRCNT_SET:ED_RIGHT_MARGIN diff --git a/testautomation/global/win/dokument.win b/testautomation/global/win/dokument.win index 7b44910a360d..63f5ecca924b 100644 --- a/testautomation/global/win/dokument.win +++ b/testautomation/global/win/dokument.win @@ -5,9 +5,10 @@ *DokumentCalc sym:SC_HID_SC_WIN_GRIDWIN *DokumentDraw sym:SD_HID_SDGRAPHICVIEWSHELL sym:SD_HID_SD_WIN_DOCUMENT *DokumentImpress sym:SD_HID_SDDRAWVIEWSHELL sym:SD_HID_SD_WIN_DOCUMENT +*DokumentImpressDiatisch SD_IF_SDSLIDEVIEWSHELL *DokumentImpressGliederungsmodus sym:SD_HID_SDOUTLINEVIEWSHELL -*DokumentImpressNotizen sym:.uno:NotesMode -*DokumentImpressHandzettel sym:.uno:HandoutMode +*DokumentImpressNotizen .uno:NotesMode +*DokumentImpressHandzettel .uno:HandoutMode *DokumentChart sym:CHART2_HID_SCH_WIN_DOCUMENT *DokumentGlobalDoc sym:SW_HID_EDIT_WIN @@ -29,9 +30,10 @@ Kommandos sym:STARMATH_HID_SMA_COMMAND_WIN_EDIT *DocumentCalc sym:SC_HID_SC_WIN_GRIDWIN *DocumentDraw sym:SD_HID_SDGRAPHICVIEWSHELL sym:SD_HID_SD_WIN_DOCUMENT *DocumentImpress sym:SD_HID_SDDRAWVIEWSHELL sym:SD_HID_SD_WIN_DOCUMENT +*DocumentImpressSlideView SD_IF_SDSLIDEVIEWSHELL *DocumentImpressOutlineView sym:SD_HID_SDOUTLINEVIEWSHELL -*DocumentImpressNotesView sym:.uno:NotesMode -*DocumentImpressHandoutView sym:.uno:HandoutMode +*DocumentImpressNotesView .uno:NotesMode +*DocumentImpressHandoutView .uno:HandoutMode *DocumentChart sym:CHART2_HID_SCH_WIN_DOCUMENT *DocumentMasterDoc sym:SW_HID_EDIT_WIN *DocumentMath sym:STARMATH_HID_SMA_WIN_DOCUMENT diff --git a/testautomation/global/win/edia_a_c.win b/testautomation/global/win/edia_a_c.win index 647de10e9357..d44b2464b2cc 100644 --- a/testautomation/global/win/edia_a_c.win +++ b/testautomation/global/win/edia_a_c.win @@ -1,45 +1,45 @@ -*AcceptOrRejectChangesArea sym:sc.ModelessDialog.25729 -AreaEditField sym:sc.Edit.25729.11 -ShrinkButton sym:sc.ImageButton.25729.12 +*AcceptOrRejectChangesArea sym:sc:ModelessDialog:RID_SCDLG_SIMPLEREF +AreaEditField sym:sc:Edit:RID_SCDLG_SIMPLEREF:ED_ASSIGN +ShrinkButton sym:sc:ImageButton:RID_SCDLG_SIMPLEREF:RB_ASSIGN -*ActivationOrder sym:pcr.ModalDialog.1001 +*ActivationOrder sym:extensions:ModalDialog:RID_DLG_TABORDER ControlList sym:EXTENSIONS_HID_PROP_TABORDER_CONTROLS -MoveUp sym:pcr.PushButton.1001.1 -MoveDown sym:pcr.PushButton.1001.2 -AutoOrder sym:pcr.PushButton.1001.3 +MoveUp sym:extensions:PushButton:RID_DLG_TABORDER:PB_MOVE_UP +MoveDown sym:extensions:PushButton:RID_DLG_TABORDER:PB_MOVE_DOWN +AutoOrder sym:extensions:PushButton:RID_DLG_TABORDER:PB_AUTO_ORDER -*AddBookmark sym:sfx.ModalDialog.620 -Bookmarkname sym:sfx.Edit.620.11 +*AddBookmark sym:sfx2:ModalDialog:DLG_HELP_ADDBOOKMARK +Bookmarkname sym:sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE *AddConditionDLG sym:SVX_HID_XFORMS_ADDCONDITION_DLG -Condition sym:svx.MultiLineEdit.18013.11 -EditNamespaces sym:svx.PushButton.18013.14 +Condition sym:svx:MultiLineEdit:RID_SVXDLG_ADD_CONDITION:ED_CONDITION +EditNamespaces sym:svx:PushButton:RID_SVXDLG_ADD_CONDITION:PB_EDIT_NAMESPACES *AddingPackages sym:DESKTOP_HID_PACKAGE_MANAGER_PROGRESS Cancel sym:DESKTOP_HID_PACKAGE_MANAGER_PROGRESS_CANCEL *AddUserInterface sym:BASCTL_HID_BASICIDE_ADDNEW_LANGUAGE -AvailableLanguagesListbox sym:basctl.ListBox.16872.2 +AvailableLanguagesListbox sym:basctl:ListBox:RID_DLG_SETDEF_LANGUAGE:LB_DEF_LANGUAGE AddNewControl sym:BASCTL_HID_BASICIDE_ADDNEW_CONTROL *AddTables sym:DBACCESS_HID_DLG_JOIN_TABADD TableName sym:DBACCESS_HID_JOINSH_ADDTAB_TABLELIST -AddTable sym:dbu.PushButton.19214.1 -Tables sym:dbu.RadioButton.19214.1 -Queries sym:dbu.RadioButton.19214.2 +AddTable sym:dbaccess:PushButton:DLG_JOIN_TABADD:PB_ADDTABLE +Tables sym:dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_TABLES +Queries sym:dbaccess:RadioButton:DLG_JOIN_TABADD:RB_CASE_QUERIES QueryName sym:DBACCESS_HID_JOINSH_ADDTAB_QUERYLIST CloseDlg sym:DBACCESS_HID_JOINSH_ADDTAB_CLOSE -*AddressBookSource sym:svt.ModalDialog.16484 -DataSource sym:svt.ComboBox.16484.3 -Administrate sym:svt.PushButton.16484.4 -Table sym:svt.ComboBox.16484.6 +*AddressBookSource sym:svtools:ModalDialog:DLG_ADDRESSBOOKSOURCE +DataSource sym:svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_DATASOURCE +Administrate sym:svtools:PushButton:DLG_ADDRESSBOOKSOURCE:PB_ADMINISTATE_DATASOURCES +Table sym:svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_TABLE *AddressSourceAutopilot sym:EXTENSIONS_HID_ABSPILOT -TabAdditionalSettings sym:abp.TabPage.19701 -TabAddressDataSourceAutoPilot sym:abp.TabPage.19700 -TabDataSourceName sym:abp.TabPage.19704 -TabSelectTable sym:abp.TabPage.19721 +TabAdditionalSettings sym:extensions:TabPage:RID_PAGE_ADMININVOKATION +TabAddressDataSourceAutoPilot sym:extensions:TabPage:RID_PAGE_SELECTABTYPE +TabDataSourceName sym:extensions:TabPage:RID_PAGE_FINAL +TabSelectTable sym:extensions:TabPage:RID_PAGE_TABLESELECTION CancelButton sym:EXTENSIONS_HID_ABSPILOT_CANCEL BackButton sym:EXTENSIONS_HID_ABSPILOT_PREVIOUS NextButton sym:EXTENSIONS_HID_ABSPILOT_NEXT @@ -54,37 +54,38 @@ Ignoreprivileges sym:DBACCESS_HID_DSADMIN_IGNOREDRIVER_PRIV HostName sym:DBACCESS_HID_DSADMIN_HOSTNAME PortNumber sym:DBACCESS_HID_DSADMIN_PORTNUMBER TabControl sym:DBACCESS_HID_DSADMIN_TABCONTROL -TabGeneratedValues sym:dbu.TabPage.19222 +'TabPage2 sym:dbaccess:TabPage:PAGE_DS_ADABAS_SETTINGS +TabGeneratedValues sym:dbaccess:TabPage:PAGE_GENERATED_VALUES RetrieveGeneratedValues sym:DBACCESS_HID_DSADMIN_AUTORETRIEVEENABLED AutoIncrementStatement sym:DBACCESS_HID_DSADMIN_AUTOINCREMENTVALUE QueryGeneratedValues sym:DBACCESS_HID_DSADMIN_RETRIEVE_AUTO -AdvancedSettingsSpecial sym:dbu.TabPage.19223 +AdvancedSettingsSpecial sym:dbaccess:TabPage:PAGE_ADVANCED_SETTINGS_SPECIAL DisplayVersionColumns sym:DBACCESS_HID_DSADMIN_SUPPRESS_VERSIONCL EnableOuterJoin sym:DBACCESS_HID_DSADMIN_ENABLEOUTERJOIN CheckRequiredFields sym:DBACCESS_HID_DSADMIN_CHECK_REQUIRED_FIELDS -*Aging sym:.uno:GraphicFilterSepia -AgingDegree sym:cui.MetricField.10334.2 +*Aging .uno:GraphicFilterSepia +AgingDegree sym:cui:MetricField:RID_SVX_GRFFILTER_DLG_SEPIA:DLG_FILTERSEPIA_MTR_SEPIA *AlienWarning sym:SFX2_HID_WARNING_ALIENFORMAT -DoNotShowAgain sym:sfx.CheckBox.2308.16 +DoNotShowAgain sym:sfx2:CheckBox:RID_DLG_ALIEN_WARNING:CB_WARNING_OFF -*AppendLibraries sym:basctl.ModalDialog.14890 +*AppendLibraries sym:basctl:ModalDialog:RID_DLG_LIBS Libraries sym:BASCTL_HID_BASICIDE_LIBSDLG_TREE -InsertAsReference sym:basctl.CheckBox.14890.35 -ReplaceExistingLibraries sym:basctl.CheckBox.14890.36 +InsertAsReference sym:basctl:CheckBox:RID_DLG_LIBS:RID_CB_REF +ReplaceExistingLibraries sym:basctl:CheckBox:RID_DLG_LIBS:RID_CB_REPL *ApplyGallery sym:CUI_HID_GALLERY_APPLY -*AssingComponent sym:cui.ModalDialog.10297 -ComponentMethodName sym:cui.Edit.10297.45 +*AssingComponent sym:cui:ModalDialog:RID_SVXDLG_ASSIGNCOMPONENT +ComponentMethodName sym:cui:Edit:RID_SVXDLG_ASSIGNCOMPONENT:EDIT_METHOD -*AssignMacro sym:cui.TabPage.10296 +*AssignMacro sym:cui:TabPage:RID_SVXPAGE_MACROASSIGN EventListBox sym:CUI_HID_SVX_MACRO_LB_EVENT -AssignButton sym:cui.PushButton.10296.2 -Component sym:cui.PushButton.10296.7 -RemoveButton sym:cui.PushButton.10296.3 +AssignButton sym:cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN +Component sym:cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_ASSIGN_COMPONENT +RemoveButton sym:cui:PushButton:RID_SVXPAGE_MACROASSIGN:PB_DELETE *AutopilotAgenda sym:WIZARDS_HID_AGWIZ ItemScrollbar sym:WIZARDS_HID_AGWIZ_5_SCROLL_BAR @@ -167,21 +168,28 @@ TextPath sym:WIZARDS_HID_FAXWIZ_TXTPATH CreateFax sym:WIZARDS_HID_OPTCREATEFAX MakeChanges sym:WIZARDS_HID_OPTMAKECHANGES UseAddressDatabase sym:WIZARDS_HID_FILETEMPLATEPATH +BusinessFax RID_TOOLBOX_INSERT +PageDesignBusiness RID_TOOLBOX_INSCELLS +PersonalFax RID_TOOLBOX_INSOBJ +MailView HID_INTERFACE_SFXMAILVIEW +ReturnAddressUseUserData HID_INTERFACE_SFXFRAMESETVIEW +NewReturnAddress HID_INTERFACE_SFXFRAMESETSOURCEVIEW +Street HID_INTERFACE_SFXHELP_VIEWSH SaveAsButton sym:WIZARDS_HID_FAXWIZ_CMDPATH BackButton sym:WIZARDS_HID_FAXWIZARD_BACK NextButton sym:WIZARDS_HID_FAXWIZARD_NEXT FinishButton sym:WIZARDS_HID_FAXWIZARD_CREATE CancelButton sym:WIZARDS_HID_FAXWIZARD_CANCEL -*AutopilotGroupElement sym:dbp.ModalDialog.19721 +*AutopilotGroupElement sym:extensions:ModalDialog:RID_DLG_GROUPBOXWIZARD BackButton sym:EXTENSIONS_HID_GROUPWIZARD_PREVIOUS NextButton sym:EXTENSIONS_HID_GROUPWIZARD_NEXT CancelButton sym:EXTENSIONS_HID_GROUPWIZARD_CANCEL CreateButton sym:EXTENSIONS_HID_GROUPWIZARD_FINISH -TabGroupBoxData sym:dbp.TabPage.19722 -TabDefaultFieldSelection sym:dbp.TabPage.19723 -TabDatabaseValues sym:dbp.TabPage.19724 -TabCreateOptionGroup sym:dbp.TabPage.19726 +TabGroupBoxData sym:extensions:TabPage:RID_PAGE_GROUPRADIOSELECTION +TabDefaultFieldSelection sym:extensions:TabPage:RID_PAGE_DEFAULTFIELDSELECTION +TabDatabaseValues sym:extensions:TabPage:RID_PAGE_OPTIONVALUES +TabCreateOptionGroup sym:extensions:TabPage:RID_PAGE_OPTIONS_FINAL *AutopilotLetter sym:WIZARDS_HID_LTRWIZARD Business sym:WIZARDS_HID_LTRWIZ_OPTBUSINESSLETTER @@ -240,18 +248,18 @@ CancelButton sym:WIZARDS_HID_LTRWIZARD_CANCEL -*AutoPilotListComboBox sym:dbp.ModalDialog.19722 -TabListBoxData sym:dbp.TabPage.19721 -TabTableSelection sym:dbp.TabPage.19727 -TabFieldLink sym:dbp.TabPage.19729 -TabDatabaseField sym:dbp.TabPage.19725 +*AutoPilotListComboBox sym:extensions:ModalDialog:RID_DLG_LISTCOMBOWIZARD +TabListBoxData sym:extensions:TabPage:RID_PAGE_TABLESELECTION +TabTableSelection sym:extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_TABLE +TabFieldLink sym:extensions:TabPage:RID_PAGE_LCW_FIELDLINK +TabDatabaseField sym:extensions:TabPage:RID_PAGE_OPTION_DBFIELD BackButton sym:EXTENSIONS_HID_LISTWIZARD_PREVIOUS NextButton sym:EXTENSIONS_HID_LISTWIZARD_NEXT CancelButton sym:EXTENSIONS_HID_LISTWIZARD_CANCEL CreateButton sym:EXTENSIONS_HID_LISTWIZARD_FINISH -*AutopilotTableElement sym:dbp.ModalDialog.19723 -TabTableFieldSelection sym:dbp.TabPage.19730 +*AutopilotTableElement sym:extensions:ModalDialog:RID_DLG_GRIDWIZARD +TabTableFieldSelection sym:extensions:TabPage:RID_PAGE_GW_FIELDSELECTION BackButton sym:EXTENSIONS_HID_GRIDWIZARD_PREVIOUS NextButton sym:EXTENSIONS_HID_GRIDWIZARD_NEXT CancelButton sym:EXTENSIONS_HID_GRIDWIZARD_CANCEL @@ -322,36 +330,36 @@ Custom3 sym:EXTENSIONS_HID_BIB_CUSTOM3_POS Custom4 sym:EXTENSIONS_HID_BIB_CUSTOM4_POS Custom5 sym:EXTENSIONS_HID_BIB_CUSTOM5_POS -*Breakpoints sym:basctl.ModalDialog.14930 -BreakpointsList sym:basctl.ComboBox.14930.2 -NewButton sym:basctl.PushButton.14930.5 -Remove sym:basctl.PushButton.14930.6 -ActiveBox sym:basctl.CheckBox.14930.7 -Pass sym:basctl.NumericField.14930.10 +*Breakpoints sym:basctl:ModalDialog:RID_BASICIDE_BREAKPOINTDLG +BreakpointsList sym:basctl:ComboBox:RID_BASICIDE_BREAKPOINTDLG:RID_CB_BRKPOINTS +NewButton sym:basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_NEW +Remove sym:basctl:PushButton:RID_BASICIDE_BREAKPOINTDLG:RID_PB_DEL +ActiveBox sym:basctl:CheckBox:RID_BASICIDE_BREAKPOINTDLG:RID_CHKB_ACTIVE +Pass sym:basctl:NumericField:RID_BASICIDE_BREAKPOINTDLG:RID_FLD_PASS *CellWarning sym:SC_HID_SC_REPLCELLSWARN *ChangeIcon sym:CUI_HID_SVX_CONFIG_ICON_SELECTOR -Import sym:cui.PushButton.390.397 +Import sym:cui:PushButton:MD_ICONSELECTOR:BTN_IMPORT *ChangePassword sym:DBACCESS_HID_DLG_PASSWORD -OldPassword sym:dbu.Edit.19223.19 -Password sym:dbu.Edit.19223.21 -ConfirmPassword sym:dbu.Edit.19223.23 +OldPassword sym:dbaccess:Edit:DLG_PASSWORD:ED_OLDPASSWORD +Password sym:dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD +ConfirmPassword sym:dbaccess:Edit:DLG_PASSWORD:ED_PASSWORD_REPEAT *ChartType sym:CHART2_HID_DIAGRAM_TYPE ChooseType sym:CHART2_HID_SCH_CTL_TYPE Variant sym:CHART2_HID_SCH_CTL_VARIANT -XAxisWithCategories sym:chartcontroller.CheckBox.910.1 -Look3D sym:chartcontroller.CheckBox.910.2 -Scheme3D sym:chartcontroller.ListBox.910.1 +XAxisWithCategories sym:chart2:CheckBox:TP_CHARTTYPE:CB_X_AXIS_CATEGORIES +Look3D sym:chart2:CheckBox:TP_CHARTTYPE:CB_3D_LOOK +Scheme3D sym:chart2:ListBox:TP_CHARTTYPE:LB_3D_SCHEME BarColumnShape sym:CHART2_HID_SCH_LB_BAR_GEOMETRY -StackSeries sym:chartcontroller.CheckBox.910.3 -Ontop sym:chartcontroller.RadioButton.910.2 -Percent sym:chartcontroller.RadioButton.910.3 -Deep sym:chartcontroller.RadioButton.910.4 -SmoothLines sym:chartcontroller.CheckBox.910.4 -SmoothLineProperties sym:chartcontroller.PushButton.910.1 +StackSeries sym:chart2:CheckBox:TP_CHARTTYPE:CB_STACKED +Ontop sym:chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y +Percent sym:chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y_PERCENT +Deep sym:chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Z +SmoothLines sym:chart2:CheckBox:TP_CHARTTYPE:CB_SPLINES +SmoothLineProperties sym:chart2:PushButton:TP_CHARTTYPE:PB_SPLINE_DIALOG NumberOfLines sym:CHART2_HID_SCH_NUM_OF_LINES *ChartWizard sym:CHART2_HID_SCH_CHART_AUTO_FORMAT @@ -438,33 +446,33 @@ BackBtn sym:DBACCESS_HID_DBWIZ_PREVIOUS CreateBtn sym:DBACCESS_HID_DBWIZ_FINISH NextBtn sym:DBACCESS_HID_DBWIZ_NEXT -*CopyDatabaseTable sym:dbu.ModalDialog.19216 -Back sym:dbu.PushButton.19216.10 -NextBt sym:dbu.PushButton.19216.9 +*CopyDatabaseTable sym:dbaccess:ModalDialog:WIZ_RTFCOPYTABLE +Back sym:dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_PREV +NextBt sym:dbaccess:PushButton:WIZ_RTFCOPYTABLE:PB_NEXT -*ConfirmDelete sym:svt.ModalDialog.16376 -Delete sym:svt.PushButton.16376.4 -DeleteAll sym:svt.PushButton.16376.6 -DoNotDelete sym:svt.PushButton.16376.5 +*ConfirmDelete sym:svtools:ModalDialog:DLG_SVT_QUERYDELETE +Delete sym:svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES +DeleteAll sym:svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL +DoNotDelete sym:svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO *CopyToDialog sym:SW_HID_MM_COPYTO -CC sym:sw.Edit.22073.43 -BCC sym:sw.Edit.22073.45 +CC sym:sw:Edit:DLG_MM_COPYTO:ED_CC +BCC sym:sw:Edit:DLG_MM_COPYTO:ED_BCC *CustomizeAddressList sym:SW_HID_MM_CUSTOMIZE_ADDRESS_LIST -AddressListElements sym:sw.ListBox.22067.2 -Add sym:sw.PushButton.22067.3 -Delete sym:sw.PushButton.22067.4 -Rename sym:sw.PushButton.22067.5 -MoveUp sym:sw.ImageButton.22067.6 -MoveDown sym:sw.ImageButton.22067.7 +AddressListElements sym:sw:ListBox:DLG_MM_CUSTOMIZE_ADDRESS_LIST:LB_FIELDS +Add sym:sw:PushButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_ADD +Delete sym:sw:PushButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_DELETE +Rename sym:sw:PushButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_RENAME +MoveUp sym:sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_UP +MoveDown sym:sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_DOWN *CustomizeMenuName sym:CUI_HID_SVX_CONFIG_NAME_SUBMENU -Eingabefeld sym:cui.Edit.10062.1 +Eingabefeld sym:cui:Edit:RID_SVXDLG_NAME:EDT_STRING *CustomizeMenuReName sym:CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM -Eingabefeld sym:cui.Edit.10062.1 +Eingabefeld sym:cui:Edit:RID_SVXDLG_NAME:EDT_STRING *CustomizeToolbarsReName sym:CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM -Eingabefeld sym:cui.Edit.10062.1 +Eingabefeld sym:cui:Edit:RID_SVXDLG_NAME:EDT_STRING diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index 6535e13de446..db303c007652 100644 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -13,13 +13,14 @@ DatabaseTablesView sym:DBACCESS_HID_APP_TABLE_TREE *DatabaseProperties sym:DBACCESS_HID_DSADMIN_DIALOG TabControl sym:DBACCESS_HID_DSADMIN_TABCONTROL -TabConnection sym:dbu.TabPage.19206 +TabConnection sym:dbaccess:TabPage:PAGE_CONNECTION +'URL sym:dbaccess:Edit:PAGE_CONNECTION:ET_CONNECTURL Browse sym:DBACCESS_HID_DSADMIN_BROWSECONN -Username sym:dbu.Edit.19206.1 -PasswordRequired sym:dbu.CheckBox.19206.1 +Username sym:dbaccess:Edit:PAGE_CONNECTION:ET_USERNAME +PasswordRequired sym:dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED DriverClass sym:DBACCESS_HID_DSADMIN_DRIVERCLASS -TestDriverClass sym:dbu.PushButton.19206.1 -TestConnection sym:dbu.PushButton.19206.2 +TestDriverClass sym:dbaccess:PushButton:PAGE_CONNECTION:PB_TESTDRIVERCLASS +TestConnection sym:dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION Reset sym:SFX2_HID_TABDLG_RESET_BTN TabdBase sym:DBACCESS_HID_DSADMIN_PAGE_DBASE TabTextBase sym:DBACCESS_HID_DSADMIN_PAGE_TEXT @@ -33,12 +34,12 @@ FinishBtn sym:DBACCESS_HID_DBWIZ_FINISH CreateNewDatabase sym:DBACCESS_HID_PAGE_DBWIZARD_GENERAL_RB_CREATEDBDATABASE DatabaseType sym:DBACCESS_HID_DSADMIN_DSTYPE dBasePath sym:DBACCESS_HID_PAGE_DBWIZARD_DBASE_ET_DBASELOCATION -DocumentList sym:dbu.ListBox.19200.3 +DocumentList sym:dbaccess:ListBox:PAGE_GENERAL:LB_DOCUMENTLIST LDAPHostName sym:DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_HOSTSERVER BaseDN sym:DBACCESS_HID_PAGE_DBWIZARD_LDAP_ET_BASEDN NextBtn sym:DBACCESS_HID_DBWIZ_NEXT -OpenBtn sym:dbu.PushButton.19200.6 -OpenExistingDoc sym:dbu.RadioButton.19200.3 +OpenBtn sym:dbaccess:PushButton:PAGE_GENERAL:PB_OPENDOCUMENT +OpenExistingDoc sym:dbaccess:RadioButton:PAGE_GENERAL:RB_OPENEXISTINGDOC PasswordRequired sym:DBACCESS_HID_PAGE_DBWIZARD_AUTHENTIFICATION_CB_GENERALPASSWORDREQUIRED SpreadsheetPath sym:DBACCESS_HID_PAGE_DBWIZARD_SPREADSHEET_ET_SPREADSHEETPATH TextPath sym:DBACCESS_HID_PAGE_DBWIZARD_TEXT_ET_LOCATIONTEXTFILE @@ -53,10 +54,10 @@ MySQLPort sym:DBACCESS_HID_PAGE_DBWIZARD_JDBC_ET_MYSQLPORT AdoURL sym:DBACCESS_HID_PAGE_DBWIZARD_ADO_ET_ADOURL StartTableWizard sym:DBACCESS_HID_PAGE_DBWIZARD_FINAL_CB_STARTTABLEWIZARD -*CreateDatabaseLink sym:cui.ModalDialog.17024 -DatabaseFile sym:.uno:OpenUrl -Browse sym:cui.PushButton.17024.1 -RegisteredName sym:cui.Edit.17024.1 +*CreateDatabaseLink sym:cui:ModalDialog:DLG_DOCUMENTLINK +DatabaseFile .uno:OpenUrl +Browse sym:cui:PushButton:DLG_DOCUMENTLINK:PB_BROWSEFILE +RegisteredName sym:cui:Edit:DLG_DOCUMENTLINK:ET_NAME *Diagramdata sym:CHART2_HID_DIAGRAM_DATA Toolbox2 sym:CHART2_HID_SCH_TBX_DATA @@ -71,116 +72,117 @@ Tables sym:CHART2_HID_SCH_CTL_DATA DataSeriesLabel sym:CHART2_HID_SCH_DATA_SERIES_LABEL *DigitalSignature sym:XMLSECURITY_HID_XMLSEC_DLG_DIGSIG -ViewCertificate sym:xmlsec.PushButton.1000.55 +ViewCertificate sym:xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_VIEWCERT CertificateList sym:XMLSECURITY_HID_XMLSEC_CTRL_SIGNATURESDLG -Add sym:xmlsec.PushButton.1000.2 -Remove sym:xmlsec.PushButton.1000.3 +Add sym:xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_ADDCERT +Remove sym:xmlsecurity:PushButton:RID_XMLSECDLG_DIGSIG:BTN_REMOVECERT *DuplicateNameWarning sym:CUI_HID_WARN_NAME_DUPLICATE *EditInputList sym:SW_HID_FLD_DROPDOWN -AllListEntrys sym:sw.ListBox.21112.2 -NextListEntry sym:sw.PushButton.21112.5 -EditListEntry sym:sw.PushButton.21112.7 - -*EditSymbols sym:sm.ModalDialog.20009 -OldSymbol sym:sm.ComboBox.20009.1 -OldSymbolSet sym:sm.ComboBox.20009.2 -Symbol sym:sm.ComboBox.20009.4 -SymbolSet sym:sm.ComboBox.20009.5 -Font sym:sm.ListBox.20009.1 -Subset sym:sm.ListBox.20009.111 -Typeface sym:sm.ComboBox.20009.3 -Add sym:sm.PushButton.20009.1 -Modify sym:sm.PushButton.20009.2 -Delete sym:sm.PushButton.20009.3 +AllListEntrys sym:sw:ListBox:DLG_FLD_DROPDOWN:LB_LISTITEMS +NextListEntry sym:sw:PushButton:DLG_FLD_DROPDOWN:PB_NEXT +EditListEntry sym:sw:PushButton:DLG_FLD_DROPDOWN:PB_EDIT + +*EditSymbols sym:starmath:ModalDialog:RID_SYMDEFINEDIALOG +OldSymbol sym:starmath:ComboBox:RID_SYMDEFINEDIALOG:1 +OldSymbolSet sym:starmath:ComboBox:RID_SYMDEFINEDIALOG:2 +Symbol sym:starmath:ComboBox:RID_SYMDEFINEDIALOG:4 +SymbolSet sym:starmath:ComboBox:RID_SYMDEFINEDIALOG:5 +Font sym:starmath:ListBox:RID_SYMDEFINEDIALOG:1 +Subset sym:starmath:ListBox:RID_SYMDEFINEDIALOG:LB_FONTS_SUBSET +Typeface sym:starmath:ComboBox:RID_SYMDEFINEDIALOG:3 +Add sym:starmath:PushButton:RID_SYMDEFINEDIALOG:1 +Modify sym:starmath:PushButton:RID_SYMDEFINEDIALOG:2 +Delete sym:starmath:PushButton:RID_SYMDEFINEDIALOG:3 Symbols sym:STARMATH_HID_SMA_CONTROL_FONTCHAR_VIEW -*ExecuteSQLCommand sym:dbu.ModalDialog.19222 -CommandToExecute sym:dbu.MultiLineEdit.19222.3 -ExecuteBtn sym:dbu.PushButton.19222.4 -PreviousCommands sym:dbu.ListBox.19222.6 -Status sym:dbu.MultiLineEdit.19222.8 -CloseBtn sym:dbu.PushButton.19222.11 +*ExecuteSQLCommand sym:dbaccess:ModalDialog:DLG_DIRECTSQL +CommandToExecute sym:dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_SQL +ExecuteBtn sym:dbaccess:PushButton:DLG_DIRECTSQL:PB_EXECUTE +PreviousCommands sym:dbaccess:ListBox:DLG_DIRECTSQL:LB_HISTORY +Status sym:dbaccess:MultiLineEdit:DLG_DIRECTSQL:ME_STATUS +CloseBtn sym:dbaccess:PushButton:DLG_DIRECTSQL:PB_CLOSE -*ExportBasicLibraryDlg sym:basctl.ModalDialog.14893 -ExportAsPackage sym:basctl.RadioButton.14893.42 -ExportAsLibrary sym:basctl.RadioButton.14893.43 +*ExportBasicLibraryDlg sym:basctl:ModalDialog:RID_DLG_EXPORT +ExportAsPackage sym:basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASPACKAGE +ExportAsLibrary sym:basctl:RadioButton:RID_DLG_EXPORT:RB_EXPORTASBASIC -*ExtensionSoftwareLicenseAgreement sym:deploymentgui.ModalDialog.6500 -LicenseText sym:deploymentgui.MultiLineEdit.6500.51 -ScrollDown sym:deploymentgui.PushButton.6500.50 +*ExtensionSoftwareLicenseAgreement sym:desktop:ModalDialog:RID_DLG_LICENSE +LicenseText sym:desktop:MultiLineEdit:RID_DLG_LICENSE:ML_LICENSE +ScrollDown sym:desktop:PushButton:RID_DLG_LICENSE:PB_LICENSE_DOWN Accept sym:DESKTOP_UID_BTN_LICENSE_ACCEPT *ExtensionUpdate sym:DESKTOP_HID_DEPLOYMENT_GUI_UPDATE -ShowAllUpdates sym:deploymentgui.CheckBox.2010.5 -UpdateDescriptions sym:deploymentgui.MultiLineEdit.2010.7 -DownloadAndInstall sym:deploymentgui.PushButton.2010.10 +ShowAllUpdates sym:desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL +UpdateDescriptions sym:desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS +DownloadAndInstall sym:desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK AvailableUpdatesList sym:DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_AVAILABLE_UPDATES UpdatePublisherText sym:DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_PUBLISHER ReleaseNotesText sym:DESKTOP_HID_DEPLOYMENT_GUI_UPDATE_RELEASENOTES *FilterDialog sym:DBACCESS_HID_DLG_FILTERCRIT -Fieldname1 sym:dbu.ListBox.19206.1 -Condition1 sym:dbu.ListBox.19206.2 -Value1 sym:dbu.Edit.19206.1 -Operator2 sym:dbu.ListBox.19206.7 -Fieldname2 sym:dbu.ListBox.19206.3 -Condition2 sym:dbu.ListBox.19206.4 -Value2 sym:dbu.Edit.19206.2 -Operator3 sym:dbu.ListBox.19206.8 -Fieldname3 sym:dbu.ListBox.19206.5 -Condition3 sym:dbu.ListBox.19206.6 -Value3 sym:dbu.Edit.19206.3 +Fieldname1 sym:dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD1 +Condition1 sym:dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP1 +Value1 sym:dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE1 +Operator2 sym:dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND2 +Fieldname2 sym:dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD2 +Condition2 sym:dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP2 +Value2 sym:dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE2 +Operator3 sym:dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOND3 +Fieldname3 sym:dbaccess:ListBox:DLG_FILTERCRIT:LB_WHEREFIELD3 +Condition3 sym:dbaccess:ListBox:DLG_FILTERCRIT:LB_WHERECOMP3 +Value3 sym:dbaccess:Edit:DLG_FILTERCRIT:ET_WHEREVALUE3 *FilterNavigator sym:SVX_HID_FILTER_NAVIGATOR *FilterWarning sym:CUI_HID_SVXDLG_FILTER_WARNING *FindEntry sym:SW_HID_MM_FIND_ENTRY -FindString sym:sw.Edit.22065.2 -FindOnlyIn sym:sw.CheckBox.22065.3 -FindOnlyInWhat sym:sw.ListBox.22065.4 -FindNow sym:sw.PushButton.22065.5 +FindString sym:sw:Edit:DLG_MM_FIND_ENTRY:ED_FIND +FindOnlyIn sym:sw:CheckBox:DLG_MM_FIND_ENTRY:CB_FINDONLY +FindOnlyInWhat sym:sw:ListBox:DLG_MM_FIND_ENTRY:LB_FINDONLY +FindNow sym:sw:PushButton:DLG_MM_FIND_ENTRY:PB_FIND -*FontworkGallery sym:svx.ModalDialog.10002 +*FontworkGallery sym:svx:ModalDialog:RID_SVX_MDLG_FONTWORK_GALLERY SelectAFontworkStyle sym:SVX_HID_CTL_FONTWORK_FAVORITES -*FontworkCharacterSpacingCustom sym:svx.ModalDialog.10019 -Value sym:svx.MetricField.10019.7 +*FontworkCharacterSpacingCustom sym:svx:ModalDialog:RID_SVX_MDLG_FONTWORK_CHARSPACING +Value sym:svx:MetricField:RID_SVX_MDLG_FONTWORK_CHARSPACING:MF_VALUE -'*FontWorkAlignment FontWork1TBO -'*FontWorkCharacterSpacing FontWork2TBO +*FontWorkAlignment FontWork1TBO + +*FontWorkCharacterSpacing FontWork2TBO *FormatColumn sym:SW_HID_FORMAT_COLUMN -ApplyTo sym:sw.ListBox.21004.54 -Columns sym:sw.NumericField.20813.2 +ApplyTo sym:sw:ListBox:DLG_COLUMN:LB_APPLY_TO +Columns sym:sw:NumericField:TP_COLUMN:ED_NUMBER ColumnValueset sym:SW_HID_COLUMN_VALUESET -BalanceColumns sym:sw.CheckBox.20813.58 -Width1 sym:sw.MetricField.20813.25 -Width2 sym:sw.MetricField.20813.26 -Width3 sym:sw.MetricField.20813.27 -ColumnRight sym:sw.ImageButton.20813.31 -ColumnLeft sym:sw.ImageButton.20813.30 -Space12 sym:sw.MetricField.20813.46 -Space23 sym:sw.MetricField.20813.47 -AutoWidth sym:sw.CheckBox.20813.4 -Line sym:sw.ListBox.20813.34 -Height sym:sw.MetricField.20813.36 -Position sym:sw.ListBox.20813.38 -TextDirection sym:sw.ListBox.20813.61 +BalanceColumns sym:sw:CheckBox:TP_COLUMN:CB_BALANCECOLS +Width1 sym:sw:MetricField:TP_COLUMN:ED_1 +Width2 sym:sw:MetricField:TP_COLUMN:ED_2 +Width3 sym:sw:MetricField:TP_COLUMN:ED_3 +ColumnRight sym:sw:ImageButton:TP_COLUMN:BTN_DOWN +ColumnLeft sym:sw:ImageButton:TP_COLUMN:BTN_UP +Space12 sym:sw:MetricField:TP_COLUMN:ED_DIST1 +Space23 sym:sw:MetricField:TP_COLUMN:ED_DIST2 +AutoWidth sym:sw:CheckBox:TP_COLUMN:CB_AUTO_WIDTH +Line sym:sw:ListBox:TP_COLUMN:LB_STYLE +Height sym:sw:MetricField:TP_COLUMN:ED_HEIGHT +Position sym:sw:ListBox:TP_COLUMN:LB_POSITION +TextDirection sym:sw:ListBox:TP_COLUMN:LB_TEXTDIRECTION *NamespaceDLG sym:SVX_HID_XFORMS_NAMESPACEITEM_DLG Namespaces sym:SVX_HID_XFORMS_NAMESPACEITEM_LIST -Add sym:svx.PushButton.18014.12 -Edit sym:svx.PushButton.18014.13 -Delete sym:svx.PushButton.18014.14 +Add sym:svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_ADD_NAMESPACE +Edit sym:svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_EDIT_NAMESPACE +Delete sym:svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_DELETE_NAMESPACE *DatabaseTableSaveAs sym:DBACCESS_HID_DLG_SAVE_AS -Catalog sym:dbu.ComboBox.19211.1 -Schema sym:dbu.ComboBox.19211.2 -TableName sym:dbu.Edit.19211.3 +Catalog sym:dbaccess:ComboBox:DLG_SAVE_AS:ET_CATALOG +Schema sym:dbaccess:ComboBox:DLG_SAVE_AS:ET_SCHEMA +TableName sym:dbaccess:Edit:DLG_SAVE_AS:ET_TITLE *DatabaseSelection sym:DBACCESS_HID_TLB_TREELISTBOX @@ -203,6 +205,7 @@ TableHeader sym:DBACCESS_HID_DATABROWSE_HEADER 'TabADO sym:DBACCESS_HID_DSADMIN_PAGE_ADO 'TabdBase sym:DBACCESS_HID_DSADMIN_PAGE_DBASE 'TabODBC sym:DBACCESS_HID_DSADMIN_PAGE_ODBC +'TabAdabasStatistics sym:dbaccess:TabPage:TAB_PAG_ADABAS_SETTINGS 'TabAdabasUserSettings sym:DBACCESS_HID_TAB_PAGE_USERADMIN 'TabJDBC sym:DBACCESS_HID_DSADMIN_PAGE_JDBC 'TabLDAP sym:DBACCESS_HID_DSADMIN_PAGE_LDAP @@ -213,14 +216,14 @@ TableHeader sym:DBACCESS_HID_DATABROWSE_HEADER 'Apply sym:SFX2_HID_TABDLG_APPLY_BTN 'Reset sym:SFX2_HID_TABDLG_RESET_BTN -*DatabaseIndexes sym:dbu.ModalDialog.19219 +*DatabaseIndexes sym:dbaccess:ModalDialog:DLG_INDEXDESIGN NewIndex sym:DBACCESS_HID_DLGIDX_NEWINDEX DropIndex sym:DBACCESS_HID_DLGIDX_DROPINDEX RenameIndex sym:DBACCESS_HID_DLGIDX_RENAMEINDEX SaveIndex sym:DBACCESS_HID_DLGIDX_SAVEINDEX ResetIndex sym:DBACCESS_HID_DLGIDX_RESETINDEX IndexList sym:DBACCESS_HID_DLGIDX_INDEXLIST -Unique sym:dbu.CheckBox.19219.1 +Unique sym:dbaccess:CheckBox:DLG_INDEXDESIGN:CB_UNIQUE 'IndexDetails sym:DBACCESS_UID_DLGINDEX_INDEXDETAILS_BACK IndexDetails sym:DBACCESS_UID_DLGINDEX_INDEXDETAILS_MAIN '--0: CONTROL: No entries in Hid.Lst @@ -232,14 +235,14 @@ IndexFields sym:DBACCESS_HID_DLGINDEX_INDEXDETAILS_FIELD '--38974: LISTBOX: Select the sort order. sym:DBACCESS_HID_DLGINDEX_INDEXDETAILS_SORTORDER '--0: CONTROL: No entries in Hid.Lst '--0: PUSHBUTTON: No entries in Hid.Lst -DatabaseIndexesClose sym:dbu.PushButton.19219.1 +DatabaseIndexesClose sym:dbaccess:PushButton:DLG_INDEXDESIGN:PB_CLOSE *RecordSearch sym:CUI_HID_FM_DLG_SEARCH -SearchForText sym:cui.RadioButton.18007.3 -SearchForNull sym:cui.RadioButton.18007.4 -SearchForNotNull sym:cui.RadioButton.18007.5 +SearchForText sym:cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORTEXT +SearchForNull sym:cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNULL +SearchForNotNull sym:cui:RadioButton:RID_SVXDLG_SEARCHFORM:RB_SEARCHFORNOTNULL SearchText sym:CUI_HID_SEARCH_TEXT -Formular sym:cui.ListBox.18007.1 +Formular sym:cui:ListBox:RID_SVXDLG_SEARCHFORM:LB_FORM AllFields sym:CUI_HID_SEARCH_ALLFIELDS FieldSelection sym:CUI_HID_SEARCH_FIELDSELECTION Position sym:CUI_HID_SEARCH_POSITION @@ -255,10 +258,10 @@ Search sym:CUI_HID_SEARCH_BTN_SEARCH CloseBtn sym:CUI_HID_SEARCH_BTN_CLOSE RecordCount sym:CUI_UID_SEARCH_RECORDSTATUS -*DataSourceSelection sym:dbu.ModalDialog.19204 -SourceList sym:dbu.ListBox.19204.1 -Organize sym:dbu.PushButton.19204.5 -Create sym:dbu.PushButton.19204.9 +*DataSourceSelection sym:dbaccess:ModalDialog:DLG_DATASOURCE_SELECTION +SourceList sym:dbaccess:ListBox:DLG_DATASOURCE_SELECTION:LB_DATASOURCE +Organize sym:dbaccess:PushButton:DLG_DATASOURCE_SELECTION:PB_MANAGE +Create sym:dbaccess:PushButton:DLG_DATASOURCE_SELECTION:PB_CREATE *DataSourcesNotAvailable sym:SW_HID_DATA_SOURCES_UNAVAILABLE @@ -299,45 +302,45 @@ CancelButton sym:WIZARDS_HID_DLGIMPORT_0_CMDCANCEL HelpButton sym:WIZARDS_HID_DLGIMPORT_0_CMDHELP ContinueButton sym:WIZARDS_HID_DLGIMPORT_0_CMDNEXT -*ExternalData sym:sc.ModalDialog.25736 +*ExternalData sym:sc:ModalDialog:RID_SCDLG_LINKAREA URLField sym:SC_HID_SCDLG_LINKAREAURL -FileChoose sym:sc.PushButton.25736.6 -TableListBox sym:sc.MultiListBox.25736.9 -Update sym:sc.CheckBox.25736.10 -UpdateTime sym:sc.NumericField.25736.11 - -*FindAndReplace sym:.uno:SearchDialog -SearchFor sym:svx.ComboBox.10020.11 -SearchForStyle sym:svx.ListBox.10020.12 -ReplaceWith sym:svx.ComboBox.10020.16 -ReplaceWithStyle sym:svx.ListBox.10020.17 -SearchNow sym:svx.PushButton.10020.20 -SearchAll sym:svx.PushButton.10020.21 -ReplaceBtn sym:svx.PushButton.10020.23 -ReplaceAll sym:svx.PushButton.10020.24 -MatchCase sym:svx.CheckBox.10020.25 -WholeWordsOnly sym:svx.CheckBox.10020.26 -More sym:svx.MoreButton.10020.31 -CurrentSelectionOnly sym:svx.CheckBox.10020.41 -Backwards sym:svx.CheckBox.10020.42 -RegularExpressions sym:svx.CheckBox.10020.43 -SimilaritySearch sym:svx.CheckBox.10020.44 -SimilaritySearchFor sym:svx.PushButton.10020.45 -SearchForStyles sym:svx.CheckBox.10020.46 -MatchFullHalfWidth sym:svx.CheckBox.10020.47 -SoundsLike sym:svx.CheckBox.10020.48 -SoundsLikeOptions sym:svx.PushButton.10020.49 -Attributes sym:svx.PushButton.10020.50 -Formats sym:svx.PushButton.10020.51 -NoFormat sym:svx.PushButton.10020.52 -SearchIn sym:svx.ListBox.10020.55 -Rows sym:svx.RadioButton.10020.57 -Columns sym:svx.RadioButton.10020.58 -SearchInAllSheets sym:svx.CheckBox.10020.59 -Notes sym:svx.CheckBox.10020.60 +FileChoose sym:sc:PushButton:RID_SCDLG_LINKAREA:BTN_BROWSE +TableListBox sym:sc:MultiListBox:RID_SCDLG_LINKAREA:LB_RANGES +Update sym:sc:CheckBox:RID_SCDLG_LINKAREA:BTN_RELOAD +UpdateTime sym:sc:NumericField:RID_SCDLG_LINKAREA:NF_DELAY + +*FindAndReplace .uno:SearchDialog +SearchFor sym:svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH +SearchForStyle sym:svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH +ReplaceWith sym:svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE +ReplaceWithStyle sym:svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE +SearchNow sym:svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH +SearchAll sym:svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL +ReplaceBtn sym:svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE +ReplaceAll sym:svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL +MatchCase sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE +WholeWordsOnly sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS +More sym:svx:MoreButton:RID_SVXDLG_SEARCH:BTN_MORE +CurrentSelectionOnly sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_SELECTIONS +Backwards sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_BACKWARDS +RegularExpressions sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_REGEXP +SimilaritySearch sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_SIMILARITY +SimilaritySearchFor sym:svx:PushButton:RID_SVXDLG_SEARCH:PB_SIMILARITY +SearchForStyles sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS +MatchFullHalfWidth sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_MATCH_FULL_HALF_WIDTH +SoundsLike sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_SOUNDS_LIKE +SoundsLikeOptions sym:svx:PushButton:RID_SVXDLG_SEARCH:PB_JAP_OPTIONS +Attributes sym:svx:PushButton:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE +Formats sym:svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT +NoFormat sym:svx:PushButton:RID_SVXDLG_SEARCH:BTN_NOFORMAT +SearchIn sym:svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN +Rows sym:svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS +Columns sym:svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS +SearchInAllSheets sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS +Notes sym:svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES *FormFolderNameDialog sym:DBACCESS_HID_DLG_SAVE_AS -FolderName sym:dbu.Edit.19211.3 +FolderName sym:dbaccess:Edit:DLG_SAVE_AS:ET_TITLE FolderReName sym:DBACCESS_HID_DLG_RENAME *FormPropertiesDialog sym:SVX_UID_FORMPROPBROWSER_FRAME @@ -347,10 +350,10 @@ TabDataForm sym:EXTENSIONS_HID_FM_PROPDLG_TAB_DATA TabEventsForm sym:EXTENSIONS_HID_FM_PROPDLG_TAB_EVT *FormSaveDialog sym:DBACCESS_HID_EXPLORERDLG_COLLECTION -NewFolder sym:dbu.ImageButton.19227.1 -OneLevelUp sym:dbu.ImageButton.19227.2 -FormName sym:dbu.Edit.19227.1 -SaveBtn sym:dbu.PushButton.19227.3 +NewFolder sym:dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_NEWFOLDER +OneLevelUp sym:dbaccess:ImageButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_UP +FormName sym:dbaccess:Edit:DLG_COLLECTION_VIEW:ED_EXPLORERFILE_FILENAME +SaveBtn sym:dbaccess:PushButton:DLG_COLLECTION_VIEW:BTN_EXPLORERFILE_SAVE *FormWizard sym:WIZARDS_HID_DLGFORM_DIALOG TablesOrQueriesMaster sym:WIZARDS_HID_DLGFORM_MASTER_LBTABLES @@ -376,12 +379,12 @@ AlignRight sym:WIZARDS_HID_DLGFORM_CMDALIGNRIGHT FinishBtn sym:WIZARDS_HID_DLGFORM_CMDFINISH *FunctionsCalc sym:SC_HID_FUNCTION_BOX -FunctionInsert sym:sc.ImageButton.26248.1 -Category sym:sc.ListBox.26248.1 -FunctionList sym:sc.ListBox.26248.2 +FunctionInsert sym:sc:ImageButton:FID_FUNCTION_BOX:IMB_INSERT +Category sym:sc:ListBox:FID_FUNCTION_BOX:CB_CAT +FunctionList sym:sc:ListBox:FID_FUNCTION_BOX:LB_FUNC *FunctionWizard sym:FORMULA_HID_FORMULADLG_FORMULA -FunctionWizardTabControl sym:forui.TabControl.31003.18 +FunctionWizardTabControl sym:formula:TabControl:RID_FORMULADLG_FORMULA:TC_FUNCTION TabFunctionWizardFormula sym:FORMULA_HID_FORMULA_FAP_FORMULA CategoryLB sym:FORMULA_HID_FORMULA_LB_CATEGORY FunctionLB sym:FORMULA_HID_FORMULA_LB_FUNCTION @@ -389,7 +392,7 @@ TabFunktion sym:FORMULA_HID_FORMULATAB_FUNCTION Functionsbutton1 sym:FORMULA_HID_FORMULA_FAP_BTN_FX1 Editfield1 sym:FORMULA_HID_FORMULA_FAP_EDIT1 Shrink1 sym:FORMULA_HID_FORMULA_FAP_BTN_REF1 -Maximize sym:forui.ImageButton.31003.20 +Maximize sym:formula:ImageButton:RID_FORMULADLG_FORMULA:RB_REF Functionsbutton2 sym:FORMULA_HID_FORMULA_FAP_BTN_FX2 Editfield2 sym:FORMULA_HID_FORMULA_FAP_EDIT2 Shrink2 sym:FORMULA_HID_FORMULA_FAP_BTN_REF2 @@ -402,10 +405,10 @@ Shrink4 sym:FORMULA_HID_FORMULA_FAP_BTN_REF4 TabFunctionWizardStructure sym:FORMULA_HID_FORMULATAB_STRUCT Structure sym:FORMULA_HID_FORMULA_FAP_STRUCT Formel sym:FORMULA_HID_FORMULA_FAP_FORMULA -Matrix sym:forui.CheckBox.31003.11 -Backward sym:forui.PushButton.31003.8 -Forward sym:forui.PushButton.31003.9 -NextBt sym:forui.PushButton.31005.9 +Matrix sym:formula:CheckBox:RID_FORMULADLG_FORMULA:BTN_MATRIX +Backward sym:formula:PushButton:RID_FORMULADLG_FORMULA:BTN_BACKWARD +Forward sym:formula:PushButton:RID_FORMULADLG_FORMULA:BTN_FORWARD +NextBt sym:formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_FORWARD *FTPConnection sym:WIZARDS_HID_FTP ServerName sym:WIZARDS_HID_FTP_SERVER @@ -425,7 +428,7 @@ Browse sym:UUI_HID_LOGIN_DLG_BROWSE Account sym:UUI_HID_LOGIN_DLG_ACCOUNT UseSystemCredentials sym:UUI_HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS -*Gallery sym:SVX_HID_GALLERY_BROWSER +*Gallery .uno:Gallery NewTheme sym:SVX_HID_GALLERY_NEWTHEME 'NewThemeName NEW_TITLE_FOR_GALLERY_THEME_EDITFIELD Gallerys sym:SVX_HID_GALLERY_THEMELIST @@ -441,18 +444,18 @@ Title sym:CUI_HID_GALLERY_TITLE_EDIT *HangulHanjaConversion sym:CUI_HID_DIALOG_HANGULHANJA Original sym:CUI_HID_SPELLDLG_SETWORD Word sym:CUI_HID_HANGULDLG_EDIT_NEWWORD -Find sym:cui.PushButton.10001.1 +Find sym:cui:PushButton:RID_SVX_MDLG_HANGULHANJA:PB_FIND Suggestions sym:CUI_HID_HANGULDLG_SUGGESTIONS_LIST -HangulAndHanja sym:cui.RadioButton.10001.1 -HanjaHangul sym:cui.RadioButton.10001.2 -HangulHanja sym:cui.RadioButton.10001.3 -HanjaAsRubyAbove sym:cui.RadioButton.10001.4 -HanjaAsRubyBelow sym:cui.RadioButton.10001.5 -HangulAsRubyAbove sym:cui.RadioButton.10001.6 -HangulAsRubyBelow sym:cui.RadioButton.10001.7 -HangulOnly sym:cui.CheckBox.10001.2 -HanjaOnly sym:cui.CheckBox.10001.3 -ReplaceByCharacter sym:cui.CheckBox.10001.1 +HangulAndHanja sym:cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_SIMPLE_CONVERSION +HanjaHangul sym:cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BRACKETED +HangulHanja sym:cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BRACKETED +HanjaAsRubyAbove sym:cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_ABOVE +HanjaAsRubyBelow sym:cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANGUL_HANJA_BELOW +HangulAsRubyAbove sym:cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_ABOVE +HangulAsRubyBelow sym:cui:RadioButton:RID_SVX_MDLG_HANGULHANJA:RB_HANJA_HANGUL_BELOW +HangulOnly sym:cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANGUL_ONLY +HanjaOnly sym:cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_HANJA_ONLY +ReplaceByCharacter sym:cui:CheckBox:RID_SVX_MDLG_HANGULHANJA:CB_REPLACE_BY_CHARACTER Ignore sym:CUI_HID_HANGULDLG_BUTTON_IGNORE AlwaysIgnore sym:CUI_HID_HANGULDLG_BUTTON_IGNOREALL ReplaceBtn sym:CUI_HID_HANGULDLG_BUTTON_CHANGE @@ -461,43 +464,43 @@ Options sym:CUI_HID_HANGULDLG_BUTTON_OPTIONS Grid sym:CUI_HID_HANGULDLG_SUGGESTIONS_GRID *HangulHanjaOptions sym:CUI_HID_HANGULHANJA_OPT_DLG -NewDictionary sym:cui.PushButton.10004.1 -EditDictionary sym:cui.PushButton.10004.2 -DeleteDictionary sym:cui.PushButton.10004.3 +NewDictionary sym:cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_NEW +EditDictionary sym:cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_EDIT +DeleteDictionary sym:cui:PushButton:RID_SVX_MDLG_HANGULHANJA_OPT:PB_HHO_DELETE UserDefineDictionary sym:CUI_HID_HANGULHANJA_OPT_DICTS_LB -IgnorePostPositionalWord sym:cui.CheckBox.10004.1 -ShowEntries sym:cui.CheckBox.10004.3 -ReplaceUniqueEntries sym:cui.CheckBox.10004.4 +IgnorePostPositionalWord sym:cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_IGNOREPOST +ShowEntries sym:cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_SHOWRECENTLYFIRST +ReplaceUniqueEntries sym:cui:CheckBox:RID_SVX_MDLG_HANGULHANJA_OPT:CB_AUTOREPLACEUNIQUE *HangulHanjaNewDictionary sym:CUI_HID_HANGULHANJA_NEWDICT_DLG -DictionaryName sym:cui.Edit.10006.1 +DictionaryName sym:cui:Edit:RID_SVX_MDLG_HANGULHANJA_NEWDICT:ED_DICTNAME *HangulHanjaEditDictionary sym:CUI_HID_HANGULHANJA_EDIT_DLG -Book sym:cui.ListBox.10005.1 -Original sym:cui.ComboBox.10005.2 -Suggestion1 sym:cui.Edit.10005.1 -Suggestion2 sym:cui.Edit.10005.2 -Suggestion3 sym:cui.Edit.10005.3 -Suggestion4 sym:cui.Edit.10005.4 -NewEntry sym:cui.PushButton.10005.1 -DeleteEntry sym:cui.PushButton.10005.2 - -*Hyphenation sym:CUI_HID_HYPHENATE svx:ModalDialog:RID_SVXDLG_HYPHENATE -Wort sym:cui.Edit.10030.10 -Vor sym:cui.ImageButton.10030.11 -Zurueck sym:cui.ImageButton.10030.12 -Weiter sym:cui.PushButton.10030.20 -Entfernen sym:cui.PushButton.10030.21 -HyphenateAll sym:cui.PushButton.10030.25 +Book sym:cui:ListBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_BOOK +Original sym:cui:ComboBox:RID_SVX_MDLG_HANGULHANJA_EDIT:LB_ORIGINAL +Suggestion1 sym:cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_1 +Suggestion2 sym:cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_2 +Suggestion3 sym:cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_3 +Suggestion4 sym:cui:Edit:RID_SVX_MDLG_HANGULHANJA_EDIT:ED_4 +NewEntry sym:cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_NEW +DeleteEntry sym:cui:PushButton:RID_SVX_MDLG_HANGULHANJA_EDIT:PB_HHE_DELETE + +*Hyphenation sym:CUI_HID_HYPHENATE sym:svx:ModalDialog:RID_SVXDLG_HYPHENATE +Wort sym:cui:Edit:RID_SVXDLG_HYPHENATE:ED_WORD +Vor sym:cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_LEFT +Zurueck sym:cui:ImageButton:RID_SVXDLG_HYPHENATE:BTN_RIGHT +Weiter sym:cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_CONTINUE +Entfernen sym:cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_DELETE +HyphenateAll sym:cui:PushButton:RID_SVXDLG_HYPHENATE:BTN_HYPH_ALL *HyphenationOptions sym:CUI_HID_LNGDLG_NUM_PREBREAK -ZeichenVorUmbruch sym:cui.NumericField.10830.308 +ZeichenVorUmbruch sym:cui:NumericField:RID_SVXDLG_LNG_ED_NUM_PREBREAK:ED_PREBREAK -*HTMLImportOptions sym:sc.ModalDialog.25756 -Automatic sym:sc.RadioButton.25756.5 -Custom sym:sc.RadioButton.25756.6 -CustomLanguage sym:sc.ListBox.25756.7 -DetectSpecialNumbers sym:sc.CheckBox.25756.9 +*HTMLImportOptions sym:sc:ModalDialog:RID_SCDLG_TEXT_IMPORT_OPTIONS +Automatic sym:sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_AUTOMATIC +Custom sym:sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_CUSTOM +CustomLanguage sym:sc:ListBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:LB_CUSTOM_LANG +DetectSpecialNumbers sym:sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE *HyperlinkDialog sym:CUI_HID_HYPERLINK_DIALOG CloseButton sym:CUI_HID_ICCDIALOG_CANCEL_BTN diff --git a/testautomation/global/win/edia_i_o.win b/testautomation/global/win/edia_i_o.win index 36e2db7b0ef6..9a1016deb8c6 100644 --- a/testautomation/global/win/edia_i_o.win +++ b/testautomation/global/win/edia_i_o.win @@ -34,14 +34,14 @@ Image32 sym:WIZARDS_HID_IS_BTN_IMG32 None sym:WIZARDS_HID_IS_BTN_NONE CancelB sym:WIZARDS_HID_IS_BTN_CANCEL -*Indexes sym:dbu.ModalDialog.19201 -Table sym:dbu.ComboBox.19201.1 -TableIndexes sym:dbu.ListBox.19201.1 -FreeIndexes sym:dbu.ListBox.19201.2 -Add sym:dbu.ImageButton.19201.1 -Remove sym:dbu.ImageButton.19201.2 -AddAll sym:dbu.ImageButton.19201.3 -RemoveAll sym:dbu.ImageButton.19201.4 +*Indexes sym:dbaccess:ModalDialog:DLG_DBASE_INDEXES +Table sym:dbaccess:ComboBox:DLG_DBASE_INDEXES:CB_TABLES +TableIndexes sym:dbaccess:ListBox:DLG_DBASE_INDEXES:LB_TABLEINDEXES +FreeIndexes sym:dbaccess:ListBox:DLG_DBASE_INDEXES:LB_FREEINDEXES +Add sym:dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADD +Remove sym:dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVE +AddAll sym:dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_ADDALL +RemoveAll sym:dbaccess:ImageButton:DLG_DBASE_INDEXES:IB_REMOVEALL *InsertAxesDialog sym:CHART2_HID_INSERT_AXIS MajorXaxis sym:CHART2_HID_SCH_CB_XAXIS @@ -52,27 +52,27 @@ SecondaryYaxis sym:CHART2_HID_SCH_CB_SECONDARY_YAXIS SecondaryZaxis sym:CHART2_HID_SCH_CB_SECONDARY_ZAXIS *InsertDataColumns sym:SW_HID_AP_INSERT_DB_SEL -TableBtn sym:sw.RadioButton.22052.2 -FieldsBtn sym:sw.RadioButton.22052.3 -TextBtn sym:sw.RadioButton.22052.4 -DatabaseColumnsTable sym:sw.ListBox.22052.20 -DatabaseColumns sym:sw.ListBox.22052.15 -FromDatabase sym:sw.RadioButton.22052.12 -FromUser sym:sw.RadioButton.22052.13 -FromUserList sym:sw.ListBox.22052.14 -ToEditButton sym:sw.ImageButton.22052.16 -FieldsInList sym:sw.MultiLineEdit.22052.17 -ParagraphStyle sym:sw.ListBox.22052.19 -AllToButton sym:sw.ImageButton.22052.21 -OneToButton sym:sw.ImageButton.22052.22 -OneFromButton sym:sw.ImageButton.22052.23 -AllFromButton sym:sw.ImageButton.22052.24 -TableColumns sym:sw.ListBox.22052.26 -InsertTableHeading sym:sw.CheckBox.22052.28 -ApplyColumnName sym:sw.RadioButton.22052.29 -CreateRowOnly sym:sw.RadioButton.22052.30 -Properties sym:sw.PushButton.22052.31 -AutoFormat sym:sw.PushButton.22052.32 +TableBtn sym:sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE +FieldsBtn sym:sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_FIELD +TextBtn sym:sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT +DatabaseColumnsTable sym:sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN +DatabaseColumns sym:sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TXT_DB_COLUMN +FromDatabase sym:sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB +FromUser sym:sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_USR +FromUserList sym:sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR +ToEditButton sym:sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_TOEDIT +FieldsInList sym:sw:MultiLineEdit:DLG_AP_INSERT_DB_SEL:ED_DB_TEXT +ParagraphStyle sym:sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DB_PARA_COLL +AllToButton sym:sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_TO +OneToButton sym:sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_TO +OneFromButton sym:sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_FROM +AllFromButton sym:sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_FROM +TableColumns sym:sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL +InsertTableHeading sym:sw:CheckBox:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON +ApplyColumnName sym:sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS +CreateRowOnly sym:sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY +Properties sym:sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT +AutoFormat sym:sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT *InsertLabelsDialog sym:CHART2_HID_INSERT_DESCRIPTION ShowValue sym:CHART2_HID_SCH_DATALABEL_VALUE @@ -96,9 +96,9 @@ PositionTop sym:CHART2_HID_SCH_LEGEND_POS_TOP PositionRight sym:CHART2_HID_SCH_LEGEND_POS_RIGHT PositionBottom sym:CHART2_HID_SCH_LEGEND_POS_BOTTOM -*InsertPaste sym:sd.ModalDialog.678 -Before sym:sd.RadioButton.678.1 -After sym:sd.RadioButton.678.2 +*InsertPaste sym:sd:ModalDialog:DLG_INSERT_PASTE +Before sym:sd:RadioButton:DLG_INSERT_PASTE:RB_BEFORE +After sym:sd:RadioButton:DLG_INSERT_PASTE:RB_AFTER *InsertTrendlinesDialog sym:CHART2_HID_INSERT_STATISTICS None sym:CHART2_HID_SCH_TRENDLINE_RB_NONE @@ -119,7 +119,7 @@ SecondTitleXaxis sym:CHART2_HID_SCH_TITLE_SECONDARY_X SecondTitleYaxis sym:CHART2_HID_SCH_TITLE_SECONDARY_Y -*InsertYErrorBarsDLG sym:chartcontroller.ModalDialog.842 +*InsertYErrorBarsDLG sym:chart2:ModalDialog:DLG_DATA_YERRORBAR MeanValue sym:CHART2_HID_SCH_STATISTIK_MEANVALUE NoFunction sym:CHART2_HID_SCH_STATISTIK_NO_ERROR Variance sym:CHART2_HID_SCH_STATISTIK_VARIANT @@ -134,16 +134,16 @@ ConstantValueMinus sym:CHART2_HID_SCH_STATISTIK_MINUS_VALUE ErrorIndicator sym:CHART2_HID_SCH_CT_INDICATE *JavaClassPath sym:CUI_HID_OPTIONS_JAVA_CLASSPATH -ClassPath sym:cui.ListBox.10255.11 -AddArchive sym:cui.PushButton.10255.20 -AddFolder sym:cui.PushButton.10255.21 -Remove sym:cui.PushButton.10255.22 +ClassPath sym:cui:ListBox:RID_SVXDLG_JAVA_CLASSPATH:LB_PATH +AddArchive sym:cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDARCHIVE +AddFolder sym:cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_ADDPATH +Remove sym:cui:PushButton:RID_SVXDLG_JAVA_CLASSPATH:PB_REMOVE_PATH *JavaStartParameter sym:CUI_HID_OPTIONS_JAVA_PARAMETER -StartParameter sym:cui.Edit.10254.11 -Assign sym:cui.PushButton.10254.12 -AssignedStartParameters sym:cui.ListBox.10254.21 -Remove sym:cui.PushButton.10254.23 +StartParameter sym:cui:Edit:RID_SVXDLG_JAVA_PARAMETER:ED_PARAMETER +Assign sym:cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_ASSIGN +AssignedStartParameters sym:cui:ListBox:RID_SVXDLG_JAVA_PARAMETER:LB_ASSIGNED +Remove sym:cui:PushButton:RID_SVXDLG_JAVA_PARAMETER:PB_REMOVE *JoinProperties sym:DBACCESS_HID_DLG_QRY_JOIN Type sym:DBACCESS_HID_DLG_QRY_JOINTYPE @@ -152,15 +152,15 @@ FielsInvolved sym:DBACCESS_HID_RELDLG_KEYFIELDS LeftFieldCell sym:DBACCESS_HID_RELATIONDIALOG_LEFTFIELDCELL RightFieldCell sym:DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL -*LabelFieldSelection sym:pcr.ModalDialog.1000 +*LabelFieldSelection sym:extensions:ModalDialog:RID_DLG_SELECTLABELCONTROL *LicenseAgreementDialog sym:FWK_HID_LICENSEDIALOG -LicenseText sym:framework.MultiLineEdit.256.11 -ScrollBtn sym:framework.PushButton.256.18 -DeclineBtn sym:framework.PushButton.256.22 -AcceptBtn sym:framework.PushButton.256.23 +LicenseText sym:framework:MultiLineEdit:DLG_LICENSE:ML_LICENSE +ScrollBtn sym:framework:PushButton:DLG_LICENSE:PB_PAGEDOWN +DeclineBtn sym:framework:PushButton:DLG_LICENSE:PB_DECLINE +AcceptBtn sym:framework:PushButton:DLG_LICENSE:PB_ACCEPT -*FormLinkDialog sym:pcr.ModalDialog.1002 +*FormLinkDialog sym:extensions:ModalDialog:RID_DLG_FORMLINKS LinkDetail1 sym:EXTENSIONS_UID_FIELDLINK_DETAIL1 LinkMaster1 sym:EXTENSIONS_UID_FIELDLINK_MASTER1 LinkDetail2 sym:EXTENSIONS_UID_FIELDLINK_DETAIL2 @@ -169,46 +169,46 @@ LinkDetail3 sym:EXTENSIONS_UID_FIELDLINK_DETAIL3 LinkMaster3 sym:EXTENSIONS_UID_FIELDLINK_MASTER3 LinkDetail4 sym:EXTENSIONS_UID_FIELDLINK_DETAIL4 LinkMaster4 sym:EXTENSIONS_UID_FIELDLINK_MASTER4 -SuggestBtn sym:pcr.PushButton.1002.4 +SuggestBtn sym:extensions:PushButton:RID_DLG_FORMLINKS:PB_SUGGEST -*MacroMigration sym:dbu.ModalDialog.19200 -DatabaseFile sym:.uno:OpenUrl -Browse sym:dbu.PushButton.19201.1 +*MacroMigration sym:dbaccess:ModalDialog:DLG_MACRO_MIGRATION +DatabaseFile .uno:OpenUrl +Browse sym:dbaccess:PushButton:TP_SAVE_DBDOC_AS:PB_BROWSE_SAVE_AS_LOCATION BackButton sym:SVT_HID_WIZARD_PREVIOUS NextButton sym:SVT_HID_WIZARD_NEXT BackupLocation sym:DBACCESS_HID_MACRO_MIGRATION_BACKUP_LOCATION *MailMerge sym:SW_HID_MAIL_MERGE_CREATE_FROM -ThisDocument sym:sw.RadioButton.22812.2 -UseTemplate sym:sw.RadioButton.22812.3 +ThisDocument sym:sw:RadioButton:DLG_MERGE_CREATE:RB_THISDOC +UseTemplate sym:sw:RadioButton:DLG_MERGE_CREATE:RB_TEMPLATE *MailMergeFloat active ReturnToMailMergeWizard sym:SW_HID_RETURN_TO_MAILMERGE *MailMergeInsertFields sym:SW_HID_MAIL_MERGE_INSERT_FIELDS -UseExisting sym:sw.RadioButton.22813.8 -CreateNewConnection sym:sw.RadioButton.22813.9 +UseExisting sym:sw:RadioButton:DLG_MERGE_FIELD_CONNECTIONS:RB_USEEXISTING +CreateNewConnection sym:sw:RadioButton:DLG_MERGE_FIELD_CONNECTIONS:RB_CREATENEW *ManageNamespaceDLG sym:SVX_HID_XFORMS_MANAGENAMESPACE_DLG -Prefix sym:svx.Edit.18015.11 -URL sym:svx.Edit.18015.13 +Prefix sym:svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_PREFIX +URL sym:svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_URL -*MailMergeWizard sym:sw.ModalDialog.22053 +*MailMergeWizard sym:sw:ModalDialog:DLG_MAILMERGEWIZARD BackButton sym:SW_HID_MM_PREV_PAGE NextButton sym:SW_HID_MM_NEXT_PAGE *ManageUILanguages sym:BASCTL_HID_BASICIDE_MANAGE_LANGUAGE -PresentLanguages sym:basctl.ListBox.16870.2 -Add sym:basctl.PushButton.16870.3 -Delete sym:basctl.PushButton.16870.4 -Default sym:basctl.PushButton.16870.5 +PresentLanguages sym:basctl:ListBox:RID_DLG_MANAGE_LANGUAGE:LB_LANGUAGE +Add sym:basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_ADD_LANG +Delete sym:basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_DEL_LANG +Default sym:basctl:PushButton:RID_DLG_MANAGE_LANGUAGE:PB_MAKE_DEFAULT *MasterPasswordDefine sym:UUI_HID_DLG_MASTERPASSWORD_CRT -Password1 sym:uui.Edit.14521.21 -Password2 sym:uui.Edit.14521.23 +Password1 sym:uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_CRT +Password2 sym:uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_REPEAT *MasterPasswordEnter sym:UUI_HID_DLG_MASTERPASSWORD_UUI -Password sym:uui.Edit.14512.21 +Password sym:uui:Edit:DLG_UUI_MASTERPASSWORD:ED_MASTERPASSWORD *MatchFields sym:SW_HID_MM_ASSIGNFIELDS Title sym:SW_HID_MM_HEADER_0 @@ -240,45 +240,45 @@ mZoomlistbox sym:AVMEDIA_HID_AVMEDIA_ZOOMLISTBOX mTimeedit sym:AVMEDIA_HID_AVMEDIA_TIMEEDIT *MenuOrganiser sym:CUI_HID_SVX_CONFIG_MENU_ORGANIZER -MenuName sym:cui.Edit.379.388 -ButtonUp sym:cui.ImageButton.379.382 -ButtonDown sym:cui.ImageButton.379.383 +MenuName sym:cui:Edit:MD_MENU_ORGANISER:EDIT_MENU_NAME +ButtonUp sym:cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_UP +ButtonDown sym:cui:ImageButton:MD_MENU_ORGANISER:BTN_MENU_DOWN -*ModifyLink sym:sfx.ModalDialog.517 -ModifyDDEApplication sym:sfx.Edit.517.50 -ModifyDDEFile sym:sfx.Edit.517.51 -ModifyDDECategory sym:sfx.Edit.517.52 +*ModifyLink sym:sfx2:ModalDialog:MD_DDE_LINKEDIT +ModifyDDEApplication sym:sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_APP +ModifyDDEFile sym:sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_TOPIC +ModifyDDECategory sym:sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_ITEM -*Mosaic sym:.uno:GraphicFilterMosaic -Width sym:cui.MetricField.10332.2 -Height sym:cui.MetricField.10332.4 -EnhanceEdges sym:cui.CheckBox.10332.5 +*Mosaic .uno:GraphicFilterMosaic +Width sym:cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_WIDTH +Height sym:cui:MetricField:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_MTR_HEIGHT +EnhanceEdges sym:cui:CheckBox:RID_SVX_GRFFILTER_DLG_MOSAIC:DLG_FILTERMOSAIC_CBX_EDGES *NewAddressList sym:SW_HID_MM_CREATEADDRESSLIST -New sym:sw.PushButton.22064.3 -Delete sym:sw.PushButton.22064.4 -Find sym:sw.PushButton.22064.5 -Customize sym:sw.PushButton.22064.6 -ShowFirst sym:sw.PushButton.22064.8 -ShowPrevious sym:sw.PushButton.22064.9 -ShowNumber sym:sw.NumericField.22064.10 -ShowNext sym:sw.PushButton.22064.11 -ShowLast sym:sw.PushButton.22064.12 +New sym:sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_NEW +Delete sym:sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_DELETE +Find sym:sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_FIND +Customize sym:sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_CUSTOMIZE +ShowFirst sym:sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_START +ShowPrevious sym:sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_PREV +ShowNumber sym:sw:NumericField:DLG_MM_CREATEADDRESSLIST:NF_SETNO +ShowNext sym:sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_NEXT +ShowLast sym:sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_END *NewAddressBlock sym:SW_HID_MM_CUSTOMIZEADDRESSBLOCK SelectField sym:SW_HID_MM_CUSTOMFIELDS -Add sym:sw.ImageButton.22068.42 -Remove sym:sw.ImageButton.22068.43 -Arrange sym:sw.MultiLineEdit.22068.49 -MoveUp sym:sw.ImageButton.22068.50 -MoveLeft sym:sw.ImageButton.22068.51 -MoveRight sym:sw.ImageButton.22068.52 -MoveDown sym:sw.ImageButton.22068.53 -Select sym:sw.ComboBox.22068.55 - -*NewToolbar sym:cui.ModalDialog.401 -ToolbarName sym:cui.Edit.401.402 -SaveIn sym:cui.ListBox.401.324 +Add sym:sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_INSERTFIELD +Remove sym:sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_REMOVEFIELD +Arrange sym:sw:MultiLineEdit:DLG_MM_CUSTOMIZEADDRESSBLOCK:ED_DRAG +MoveUp sym:sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_UP +MoveLeft sym:sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_LEFT +MoveRight sym:sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_RIGHT +MoveDown sym:sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_DOWN +Select sym:sw:ComboBox:DLG_MM_CUSTOMIZEADDRESSBLOCK:CB_FIELD + +*NewToolbar sym:cui:ModalDialog:MD_NEW_TOOLBAR +ToolbarName sym:cui:Edit:MD_NEW_TOOLBAR:EDT_STRING +SaveIn sym:cui:ListBox:MD_NEW_TOOLBAR:LB_SAVEIN *NewsletterLayout sym:WIZARDS_HID_DLGNEWSLTR_DIALOG Newsletter sym:WIZARDS_HID_DLGNEWSLTR_OPTSTANDARDLAYOUT @@ -288,16 +288,16 @@ Single sym:WIZARDS_HID_DLGNEWSLTR_OPTSINGLESIDED Duplex sym:WIZARDS_HID_DLGNEWSLTR_OPTDOUBLESIDED OKButton sym:WIZARDS_HID_DLGNEWSLTR_CMDGOON -*OLEObjektInsert sym:.uno:InsertObject -NeuErstellen sym:cui.RadioButton.32010.10 -AusDateiErstellen sym:cui.RadioButton.32010.11 -Objekttyp sym:cui.ListBox.32010.12 -OleDatei sym:cui.Edit.32010.10 -Verknuepfen sym:cui.CheckBox.32010.12 -Durchsuchen sym:cui.PushButton.32010.11 +*OLEObjektInsert .uno:InsertObject +NeuErstellen sym:cui:RadioButton:MD_INSERT_OLEOBJECT:RB_NEW_OBJECT +AusDateiErstellen sym:cui:RadioButton:MD_INSERT_OLEOBJECT:RB_OBJECT_FROMFILE +Objekttyp sym:cui:ListBox:MD_INSERT_OLEOBJECT:LB_OBJECTTYPE +OleDatei sym:cui:Edit:MD_INSERT_OLEOBJECT:ED_FILEPATH +Verknuepfen sym:cui:CheckBox:MD_INSERT_OLEOBJECT:CB_FILELINK +Durchsuchen sym:cui:PushButton:MD_INSERT_OLEOBJECT:BTN_FILEPATH -*InsertTableImpress sym:cui.ModalDialog.10044 -NumberOfColumns sym:cui.NumericField.10044.2 -NumberOfRows sym:cui.NumericField.10044.4 +*InsertTableImpress sym:cui:ModalDialog:RID_SVX_NEWTABLE_DLG +NumberOfColumns sym:cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_COLUMNS +NumberOfRows sym:cui:NumericField:RID_SVX_NEWTABLE_DLG:NF_ROWS -*TableDesign sym:sd.ModalDialog.20974 +*TableDesign sym:sd:ModalDialog:DLG_TABLEDESIGNPANE diff --git a/testautomation/global/win/edia_p_s.win b/testautomation/global/win/edia_p_s.win index 1029bc2e189f..11e9cef7ec00 100644 --- a/testautomation/global/win/edia_p_s.win +++ b/testautomation/global/win/edia_p_s.win @@ -1,6 +1,6 @@ *PackageManager sym:DESKTOP_HID_PACKAGE_MANAGER -Add sym:deploymentgui.PushButton.2000.12 -Updates sym:deploymentgui.PushButton.2000.13 +Add sym:desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_ADD +Updates sym:desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_CHECK_UPDATES BrowsePackages sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX Options sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_OPTIONS Enable sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_ENABLE @@ -10,61 +10,61 @@ Remove sym:DESKTOP_HID_EXTENSION_MANAGER_LISTBOX_REMOVE *Pagelayout_UndoDeleteWarning sym:SD_HID_SD_UNDODELETEWARNING_DLG DontShowAgain sym:SD_HID_SD_UNDODELETEWARNING_CBX -*ParameterInput sym:dbu.ModalDialog.19205 -Parameters sym:dbu.ListBox.19205.1 -Value sym:dbu.Edit.19205.4 -NextParameter sym:dbu.PushButton.19205.6 +*ParameterInput sym:dbaccess:ModalDialog:DLG_PARAMETERS +Parameters sym:dbaccess:ListBox:DLG_PARAMETERS:LB_ALLPARAMS +Value sym:dbaccess:Edit:DLG_PARAMETERS:ET_PARAM +NextParameter sym:dbaccess:PushButton:DLG_PARAMETERS:BT_TRAVELNEXT *PasswordDLG sym:SFX2_HID_PASSWD -UserName sym:sfx.Edit.2316.12 -Password sym:sfx.Edit.2316.14 -PasswordConfirm sym:sfx.Edit.2316.16 +UserName sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER +Password sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD +PasswordConfirm sym:sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM *PasswdDLG sym:SVX_HID_PASSWORD -OldPassword sym:svx.Edit.10141.11 -NewPassword sym:svx.Edit.10141.21 -Confirm sym:svx.Edit.10141.23 +OldPassword sym:svx:Edit:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD +NewPassword sym:svx:Edit:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD +Confirm sym:svx:Edit:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD *PDFOptions sym:HID_FILTER_PDF_OPTIONS -RangeAll sym:filter.RadioButton.20201.2 -RangePages sym:filter.RadioButton.20201.3 -RangeSelection sym:filter.RadioButton.20201.4 -RangePagesEdit sym:filter.Edit.20201.5 -LosslessCompression sym:filter.RadioButton.20201.10 -JpegCompression sym:filter.RadioButton.20201.11 -ImagesQuality sym:filter.MetricField.20201.13 -ReduceImageResolution sym:filter.CheckBox.20201.14 -ReduceImageResolutionDPI sym:filter.ComboBox.20201.15 -TaggedPDF sym:filter.CheckBox.20201.17 -ExportNotes sym:filter.CheckBox.20201.18 -TransitionEffects sym:filter.CheckBox.20201.19 -FormsFormat sym:filter.ListBox.20201.22 -ExportBlankPages sym:filter.CheckBox.20201.24 +RangeAll sym:filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL +RangePages sym:filter:RadioButton:RID_PDF_TAB_GENER:RB_RANGE +RangeSelection sym:filter:RadioButton:RID_PDF_TAB_GENER:RB_SELECTION +RangePagesEdit sym:filter:Edit:RID_PDF_TAB_GENER:ED_PAGES +LosslessCompression sym:filter:RadioButton:RID_PDF_TAB_GENER:RB_LOSSLESSCOMPRESSION +JpegCompression sym:filter:RadioButton:RID_PDF_TAB_GENER:RB_JPEGCOMPRESSION +ImagesQuality sym:filter:MetricField:RID_PDF_TAB_GENER:NF_QUALITY +ReduceImageResolution sym:filter:CheckBox:RID_PDF_TAB_GENER:CB_REDUCEIMAGERESOLUTION +ReduceImageResolutionDPI sym:filter:ComboBox:RID_PDF_TAB_GENER:CO_REDUCEIMAGERESOLUTION +TaggedPDF sym:filter:CheckBox:RID_PDF_TAB_GENER:CB_TAGGEDPDF +ExportNotes sym:filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTES +TransitionEffects sym:filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTBOOKMARKS +FormsFormat sym:filter:ListBox:RID_PDF_TAB_GENER:LB_FORMSFORMAT +ExportBlankPages sym:filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES *PDFOptionsInitialView sym:HID_FILTER_PDF_INITIAL_VIEW -PageOnly sym:filter.RadioButton.20203.81 -BookmarksAndPage sym:filter.RadioButton.20203.82 -ThumbnailsAndPage sym:filter.RadioButton.20203.83 -MagnificationDefault sym:filter.RadioButton.20203.85 -FitInWindow sym:filter.RadioButton.20203.86 -FitWidth sym:filter.RadioButton.20203.87 -FitVisible sym:filter.RadioButton.20203.88 -PageLayoutDefault sym:filter.RadioButton.20203.94 -SinglePage sym:filter.RadioButton.20203.95 -Continuous sym:filter.RadioButton.20203.96 -ContinuousFacing sym:filter.RadioButton.20203.97 +PageOnly sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_PAGEONLY +BookmarksAndPage sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_OUTLINE +ThumbnailsAndPage sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_THUMBS +MagnificationDefault sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_DEFAULT +FitInWindow sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIND +FitWidth sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIDTH +FitVisible sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_VISIBLE +PageLayoutDefault sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_DEFAULT +SinglePage sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_SINGPG +Continuous sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONT +ContinuousFacing sym:filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONTFAC *PDFOptionsUserInterface sym:HID_FILTER_PDF_USER_INTERFACE -ResizeWindow sym:filter.CheckBox.20202.101 -CenterWindow sym:filter.CheckBox.20202.102 -OpenInFullscreen sym:filter.CheckBox.20202.103 -DisplayDocumentTitle sym:filter.CheckBox.20202.104 -HideMenubar sym:filter.CheckBox.20202.106 -HideToolbar sym:filter.CheckBox.20202.107 -HideWindowControls sym:filter.CheckBox.20202.108 +ResizeWindow sym:filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_RESINIT +CenterWindow sym:filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_CNTRWIN +OpenInFullscreen sym:filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_OPNFULL +DisplayDocumentTitle sym:filter:CheckBox:RID_PDF_TAB_VPREFER:CB_DISPDOCTITLE +HideMenubar sym:filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVMENUBAR +HideToolbar sym:filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVTOOLBAR +HideWindowControls sym:filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVWINCTRL -*Posterize sym:.uno:GraphicFilterPoster -PosterColors sym:cui.NumericField.10335.2 +*Posterize .uno:GraphicFilterPoster +PosterColors sym:cui:NumericField:RID_SVX_GRFFILTER_DLG_POSTER:DLG_FILTERPOSTER_NUM_POSTER *PortfolioCurrency sym:WIZARDS_HID_DLGDEPOT_DIALOG_HISTORY Currency sym:WIZARDS_HID_DLGDEPOT_LSTMARKETS @@ -159,11 +159,11 @@ PaperTrayFromPrefs .HelpId:vcl:PrintDialog:PrintPaperFromSetup:CheckBox *PurchaseStarOffice sym:TAB_HID_LICENSING_DIALOG TabPurchase sym:TAB_HID_TP_PURCHASE -getSerialNumber sym:tab.PushButton.503.4 +getSerialNumber sym:tab:PushButton:TP_PURCHASE:PB_PURCHASE_GET TabUnlockStarOffice sym:TAB_HID_TP_UNLOCK -SerialNumberA sym:tab.Edit.504.3 -SerialNumberB sym:tab.Edit.504.4 -SerialNumberC sym:tab.Edit.504.5 +SerialNumberA sym:tab:Edit:TP_UNLOCK:ED_UNLOCK_A +SerialNumberB sym:tab:Edit:TP_UNLOCK:ED_UNLOCK_B +SerialNumberC sym:tab:Edit:TP_UNLOCK:ED_UNLOCK_C TabSummary sym:TAB_HID_TP_SUMMARY *QueryEditWindow sym:DBACCESS_HID_CTL_QRYSQLEDIT @@ -239,7 +239,7 @@ MinusBtn sym:WIZARDS_HID_QUERYWIZARD_BTNAGGREGATEMINUS *RelationDesign sym:DBACCESS_HID_CTL_RELATIONTAB -*RelationProperties sym:dbu.ModalDialog.19217 +*RelationProperties sym:dbaccess:ModalDialog:DLG_REL_PROPERTIES UpdateNoAction sym:DBACCESS_HID_DLG_REL_NO_CASC_UPD UpdateCascade sym:DBACCESS_HID_DLG_REL_CASC_UPD UpdateSetNull sym:DBACCESS_HID_DLG_REL_CASC_UPD_NULL @@ -254,26 +254,26 @@ RightTable sym:DBACCESS_HID_DLG_QRY_RIGHT_TABLE FielsInvolved sym:DBACCESS_HID_RELDLG_KEYFIELDS RightFieldCell sym:DBACCESS_HID_RELATIONDIALOG_RIGHTFIELDCELL -*Relief sym:.uno:GraphicFilterRelief +*Relief .uno:GraphicFilterRelief LightSource sym:CUI_HID_GRFFILTER_EMBOSS_LIGHT *RenameAutoFormat sym:SC_HID_SC_REN_AFMT_DLG RenameAutoFormatName sym:SC_HID_SC_REN_AFMT_NAME *RenameElement sym:SW_HID_MM_ADD_RENAME_ENTRY -FieldTitle sym:sw.Edit.22066.2 +FieldTitle sym:sw:Edit:DLG_MM_ADD_RENAME_ENTRY:ED_FIELDNAME *RenameMenu sym:CUI_HID_SVX_CONFIG_RENAME_MENU -NewName sym:cui.Edit.10062.1 +NewName sym:cui:Edit:RID_SVXDLG_NAME:EDT_STRING *RenameToolbar sym:CUI_HID_SVX_CONFIG_RENAME_TOOLBAR -NewName sym:cui.Edit.10062.1 +NewName sym:cui:Edit:RID_SVXDLG_NAME:EDT_STRING *Registration sym:SVT_HID_REGISTRATION_DIALOG -Now sym:svt.RadioButton.16485.3 -Later sym:svt.RadioButton.16485.4 -Never sym:svt.RadioButton.16485.5 -AlreadyRegistered sym:svt.RadioButton.16485.6 +Now sym:svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW +Later sym:svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_LATER +Never sym:svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NEVER +AlreadyRegistered sym:svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_DONE *ReportWizard sym:WIZARDS_HID_DLGREPORT_DIALOG CancelBtn sym:WIZARDS_HID_DLGREPORT_0_CMDCANCEL @@ -319,41 +319,41 @@ StaticPathBtn sym:WIZARDS_HID_DLGREPORT_5_CMDDOCUMENTPATH CreateLinkToDatabase sym:WIZARDS_HID_DLGREPORT_5_CHKLINKTODB *ResolveConflicts sym:SC_HID_SCDLG_CONFLICTS -KeepMine sym:sc.PushButton.25749.3 -KeepOther sym:sc.PushButton.25749.4 -KeepAllMine sym:sc.PushButton.25749.6 -KeepAllOthers sym:sc.PushButton.25749.7 +KeepMine sym:sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPMINE +KeepOther sym:sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPOTHER +KeepAllMine sym:sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLMINE +KeepAllOthers sym:sc:PushButton:RID_SCDLG_CONFLICTS:BTN_KEEPALLOTHERS *RubyDialog sym:SVX_HID_RUBY_DIALOG -BasisText1 sym:svx.Edit.10247.10 -RubyText1 sym:svx.Edit.10247.14 -BasisText2 sym:svx.Edit.10247.11 -RubyText2 sym:svx.Edit.10247.15 -BasisText3 sym:svx.Edit.10247.12 -RubyText3 sym:svx.Edit.10247.16 -BasisText4 sym:svx.Edit.10247.13 -RubyText4 sym:svx.Edit.10247.17 -AutoDetection sym:svx.CheckBox.10247.1 -Adjust sym:svx.ListBox.10247.23 -CharacterStyle sym:svx.ListBox.10247.3 -CallStylist sym:svx.PushButton.10247.4 -DialogClose sym:svx.PushButton.10247.8 -RubyPosition sym:svx.ListBox.10247.25 +BasisText1 sym:svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_1 +RubyText1 sym:svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_1 +BasisText2 sym:svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_2 +RubyText2 sym:svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_2 +BasisText3 sym:svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_3 +RubyText3 sym:svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_3 +BasisText4 sym:svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_4 +RubyText4 sym:svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_4 +AutoDetection sym:svx:CheckBox:RID_SVXDLG_RUBY:CB_AUTO_DETECT +Adjust sym:svx:ListBox:RID_SVXDLG_RUBY:LB_ADJUST +CharacterStyle sym:svx:ListBox:RID_SVXDLG_RUBY:LB_CHAR_STYLE +CallStylist sym:svx:PushButton:RID_SVXDLG_RUBY:PB_STYLIST +DialogClose sym:svx:PushButton:RID_SVXDLG_RUBY:PB_CLOSE +RubyPosition sym:svx:ListBox:RID_SVXDLG_RUBY:LB_POSITION *SaveLabelFormat sym:SW_HID_SAVE_LABEL_DLG -Label sym:sw.ComboBox.22760.3 -Type sym:sw.Edit.22760.5 +Label sym:sw:ComboBox:DLG_SAVE_LABEL:CB_MAKE +Type sym:sw:Edit:DLG_SAVE_LABEL:ED_TYPE *ScriptOrganizer sym:CUI_HID_SCRIPTORG_DIALOG ScriptTreeList sym:CUI_HID_SCRIPTSBOX -PBRun sym:cui.PushButton.10258.3 -PBCreate sym:cui.PushButton.10258.5 -PBEdit sym:cui.PushButton.10258.6 -PBRename sym:cui.PushButton.10258.7 -PBDelete sym:cui.PushButton.10258.8 +PBRun sym:cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RUN +PBCreate sym:cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_CREATE +PBEdit sym:cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_EDIT +PBRename sym:cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_RENAME +PBDelete sym:cui:PushButton:RID_DLG_SCRIPTORGANIZER:SF_PB_DEL -*ScriptNameDlg sym:cui.ModalDialog.10290 -EFObjectName sym:cui.Edit.10290.14 +*ScriptNameDlg sym:cui:ModalDialog:RID_DLG_NEWLIB +EFObjectName sym:cui:Edit:RID_DLG_NEWLIB:ED_LIBNAME *ScriptSelector sym:CUI_HID_SELECTOR_DIALOG LibraryTreeList sym:CUI_HID_SELECTOR_CATEGORIES @@ -362,46 +362,46 @@ ScriptList sym:CUI_HID_SELECTOR_COMMANDS *SelectAddressList sym:SW_HID_MM_ADDRESSLISTDIALOG Addresses sym:SW_HID_MM_ADDRESSLIST_HB AddressList sym:SW_HID_MM_ADDRESSLIST_TLB -Add sym:sw.PushButton.22061.7 -Create sym:sw.PushButton.22061.8 -Filter sym:sw.PushButton.22061.6 -Edit sym:sw.PushButton.22061.4 -ChangeTable sym:sw.PushButton.22061.17 +Add sym:sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_LOADLIST +Create sym:sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_CREATELIST +Filter sym:sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_FILTER +Edit sym:sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_EDIT +ChangeTable sym:sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_TABLE *SelectAddressBlock sym:SW_HID_MM_SELECTADDRESSBLOCK -NewBtn sym:sw.PushButton.22069.21 -Customize sym:sw.PushButton.22069.23 -Delete sym:sw.PushButton.22069.22 -NeverInclude sym:sw.RadioButton.22069.25 -AlwaysInclude sym:sw.RadioButton.22069.26 -ConditionalInclude sym:sw.RadioButton.22069.27 -Filter sym:sw.Edit.22069.28 +NewBtn sym:sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_NEW +Customize sym:sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_CUSTOMIZE +Delete sym:sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_DELETE +NeverInclude sym:sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_NEVER +AlwaysInclude sym:sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_ALWAYS +ConditionalInclude sym:sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_DEPENDENT +Filter sym:sw:Edit:DLG_MM_SELECTADDRESSBLOCK:ED_COUNTRY *SelectCertificate sym:XMLSECURITY_HID_XMLSEC_DLG_CERTCHOOSER ChooseCertificate sym:XMLSECURITY_HID_XMLSEC_CTRL_CHOOSESIGNATURES -ViewCertificate sym:xmlsec.PushButton.1001.55 +ViewCertificate sym:xmlsecurity:PushButton:RID_XMLSECDLG_CERTCHOOSER:BTN_VIEWCERT -*SelectSheets sym:.uno:SelectTables +*SelectSheets .uno:SelectTables SheetSelectionBox sym:SC_HID_SELECTTABLES *ServerAuthentication sym:SW_HID_MM_SERVERAUTHENTICATION -SMTPauthentication sym:sw.CheckBox.21570.50 -SMTPoutgoing sym:sw.RadioButton.21570.51 -IncomingMailServer sym:sw.RadioButton.21570.52 -OutgoingUserName sym:sw.Edit.21570.55 -OutgoingPassword sym:sw.Edit.21570.57 -Server sym:sw.Edit.21570.11 -Port sym:sw.NumericField.21570.13 -POP3 sym:sw.RadioButton.21570.67 -IMAP sym:sw.RadioButton.21570.68 -User sym:sw.Edit.21570.60 -Password sym:sw.Edit.21570.64 +SMTPauthentication sym:sw:CheckBox:DLG_MM_SERVERAUTHENTICATION:CB_AUTHENTICATION +SMTPoutgoing sym:sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SEP_AUTHENTICATION +IncomingMailServer sym:sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMPTAFTERPOP +OutgoingUserName sym:sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_USERNAME +OutgoingPassword sym:sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_OUTPASSWORD +Server sym:sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_SERVER +Port sym:sw:NumericField:DLG_MM_SERVERAUTHENTICATION:NF_PORT +POP3 sym:sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_POP3 +IMAP sym:sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_IMAP +User sym:sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INUSERNAME +Password sym:sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INPASSWORD *SetDefaultLanguage sym:BASCTL_HID_BASICIDE_SETDEFAULT_LANGUAGE -DefaultLanguageListbox sym:basctl.ListBox.16872.2 +DefaultLanguageListbox sym:basctl:ListBox:RID_DLG_SETDEF_LANGUAGE:LB_DEF_LANGUAGE -*ShareDocument sym:.uno:ShareDocument -ShareCalc sym:sc.CheckBox.25750.1 +*ShareDocument .uno:ShareDocument +ShareCalc sym:sc:CheckBox:RID_SCDLG_SHAREDOCUMENT:CB_SHARE +ShowChanges Aenderungenanzeigen TabFilterPage sym:SVX_HID_REDLINING_FILTER_PAGE @@ -419,100 +419,100 @@ ShowRange sym:SVX_HID_REDLINING_FILTER_CB_RANGE RangeText sym:SVX_HID_REDLINING_FILTER_ED_RANGE ShrinkRange sym:SVX_HID_REDLINING_FILTER_BTN_REF AktionList sym:SVX_HID_REDLINING_FILTER_LB_ACTION -ShowChangesCalc sym:sc.CheckBox.25727.13 -ShowAcceptedChanges sym:sc.CheckBox.25727.6 -ShowRejectedChanges sym:sc.CheckBox.25727.7 +ShowChangesCalc sym:sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT +ShowAcceptedChanges sym:sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_ACCEPT +ShowRejectedChanges sym:sc:CheckBox:RID_SCDLG_HIGHLIGHT_CHANGES:CB_HIGHLIGHT_REJECT ShowComment sym:SVX_HID_REDLINING_FILTER_CB_COMMENT EditComment sym:SVX_HID_REDLINING_FILTER_ED_COMMENT -RangeCalc sym:sc.Edit.25727.15 -Shrink sym:sc.ImageButton.25727.16 +RangeCalc sym:sc:Edit:RID_SCDLG_HIGHLIGHT_CHANGES:ED_ASSIGN +Shrink sym:sc:ImageButton:RID_SCDLG_HIGHLIGHT_CHANGES:RB_ASSIGN *SmoothLineProperties sym:CHART2_HID_SCH_DLG_SPLINE_PROPERTIES -CubicSpline sym:chartcontroller.RadioButton.904.5 -BSpline sym:chartcontroller.RadioButton.904.6 -Resolution sym:chartcontroller.MetricField.904.2 -DataPointsOrder sym:chartcontroller.MetricField.904.1 - -*Solarization sym:.uno:GraphicFilterSolarize -Value sym:cui.MetricField.10333.2 -Invert sym:cui.CheckBox.10333.3 - -*Solver sym:.uno:SolverDialog -TargetCell sym:sc.Edit.25742.1 -Shrink sym:sc.ImageButton.25742.1 -OptimizeMaximum sym:sc.RadioButton.25742.1 -OptimizeMinimum sym:sc.RadioButton.25742.2 -OptimizeValueOf sym:sc.RadioButton.25742.3 -OptimizeValueEdit sym:sc.Edit.25742.2 -OptimizeValueEditShrink sym:sc.ImageButton.25742.2 -ChangingCells sym:sc.Edit.25742.3 -ChangingCellsShrink sym:sc.ImageButton.25742.3 -CellReference1 sym:sc.Edit.25742.4 -CellReferenceShrink1 sym:sc.ImageButton.25742.4 -Operator1 sym:sc.ListBox.25742.1 -Value1 sym:sc.Edit.25742.8 -ValueShrink1 sym:sc.ImageButton.25742.8 -Remove1 sym:sc.ImageButton.25742.12 -CellReference2 sym:sc.Edit.25742.5 -CellReferenceShrink2 sym:sc.ImageButton.25742.5 -Operator2 sym:sc.ListBox.25742.2 -Value2 sym:sc.Edit.25742.9 -ValueShrink2 sym:sc.ImageButton.25742.9 -Remove2 sym:sc.ImageButton.25742.13 -CellReference3 sym:sc.Edit.25742.6 -CellReferenceShrink3 sym:sc.ImageButton.25742.6 -Operator3 sym:sc.ListBox.25742.3 -Value3 sym:sc.Edit.25742.10 -ValueShrink3 sym:sc.ImageButton.25742.10 -Remove3 sym:sc.ImageButton.25742.14 -CellReference4 sym:sc.Edit.25742.7 -CellReferenceShrink4 sym:sc.ImageButton.25742.7 -Operator4 sym:sc.ListBox.25742.4 -Value4 sym:sc.Edit.25742.11 -ValueShrink4 sym:sc.ImageButton.25742.11 -Remove4 sym:sc.ImageButton.25742.15 -Options sym:sc.PushButton.25742.1 -Solve sym:sc.PushButton.25742.4 +CubicSpline sym:chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_CUBIC +BSpline sym:chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_B +Resolution sym:chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_RESOLUTION +DataPointsOrder sym:chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_ORDER + +*Solarization .uno:GraphicFilterSolarize +Value sym:cui:MetricField:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_MTR_THRESHOLD +Invert sym:cui:CheckBox:RID_SVX_GRFFILTER_DLG_SOLARIZE:DLG_FILTERSOLARIZE_CBX_INVERT + +*Solver .uno:SolverDialog +TargetCell sym:sc:Edit:RID_SCDLG_OPTSOLVER:ED_OBJECTIVECELL +Shrink sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_OBJECTIVECELL +OptimizeMaximum sym:sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MAX +OptimizeMinimum sym:sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_MIN +OptimizeValueOf sym:sc:RadioButton:RID_SCDLG_OPTSOLVER:RB_VALUE +OptimizeValueEdit sym:sc:Edit:RID_SCDLG_OPTSOLVER:ED_TARGET +OptimizeValueEditShrink sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_TARGET +ChangingCells sym:sc:Edit:RID_SCDLG_OPTSOLVER:ED_VARIABLECELLS +ChangingCellsShrink sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_VARIABLECELLS +CellReference1 sym:sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT1 +CellReferenceShrink1 sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT1 +Operator1 sym:sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP1 +Value1 sym:sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT1 +ValueShrink1 sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT1 +Remove1 sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE1 +CellReference2 sym:sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT2 +CellReferenceShrink2 sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT2 +Operator2 sym:sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP2 +Value2 sym:sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT2 +ValueShrink2 sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT2 +Remove2 sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE2 +CellReference3 sym:sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT3 +CellReferenceShrink3 sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT3 +Operator3 sym:sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP3 +Value3 sym:sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT3 +ValueShrink3 sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT3 +Remove3 sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE3 +CellReference4 sym:sc:Edit:RID_SCDLG_OPTSOLVER:ED_LEFT4 +CellReferenceShrink4 sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_LEFT4 +Operator4 sym:sc:ListBox:RID_SCDLG_OPTSOLVER:LB_OP4 +Value4 sym:sc:Edit:RID_SCDLG_OPTSOLVER:ED_RIGHT4 +ValueShrink4 sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_RIGHT4 +Remove4 sym:sc:ImageButton:RID_SCDLG_OPTSOLVER:IB_DELETE4 +Options sym:sc:PushButton:RID_SCDLG_OPTSOLVER:BTN_OPTIONS +Solve sym:sc:PushButton:RID_SCDLG_OPTSOLVER:BTN_SOLVE *SolverOptions sym:SC_HID_SC_SOLVEROPTIONS -SolverEngine sym:sc.ListBox.25743.1 +SolverEngine sym:sc:ListBox:RID_SCDLG_SOLVEROPTIONS:LB_ENGINE SolverSettings sym:SC_HID_SC_SOLVEROPTIONS_LB -SolverSettingsEdit sym:sc.PushButton.25743.1 +SolverSettingsEdit sym:sc:PushButton:RID_SCDLG_SOLVEROPTIONS:BTN_EDIT *SolverEditSetting sym:SC_HID_SC_SOLVER_INTEGER -SolverNumeric sym:sc.NumericField.25744.1 +SolverNumeric sym:sc:NumericField:RID_SCDLG_SOLVER_INTEGER:NF_VALUE *SolvingResult sym:SC_HID_SC_SOLVER_SUCCESS *NoSolution sym:SC_HID_SC_SOLVER_NOSOLUTION *SortOrder sym:DBACCESS_HID_DLG_ORDERCRIT -Fieldname1 sym:dbu.ListBox.19207.1 -Order1 sym:dbu.ListBox.19207.4 -Fieldname2 sym:dbu.ListBox.19207.2 -Order2 sym:dbu.ListBox.19207.5 -Fieldname3 sym:dbu.ListBox.19207.3 -Order3 sym:dbu.ListBox.19207.6 +Fieldname1 sym:dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD1 +Order1 sym:dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE1 +Fieldname2 sym:dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD2 +Order2 sym:dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE2 +Fieldname3 sym:dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERFIELD3 +Order3 sym:dbaccess:ListBox:DLG_ORDERCRIT:LB_ORDERVALUE3 -*SortRange sym:sc.ModalDialog.25751 -ExtendSelection sym:sc.PushButton.25751.3 -CurrentSelection sym:sc.PushButton.25751.4 +*SortRange sym:sc:ModalDialog:RID_SCDLG_SORT_WARNING +ExtendSelection sym:sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_EXTSORT +CurrentSelection sym:sc:PushButton:RID_SCDLG_SORT_WARNING:BTN_CURSORT *Spellcheck sym:CUI_HID_SPELLCHECK -NotInDictionary sym:cui.MultiLineEdit.10032.34 -Suggestions sym:cui.ListBox.10032.32 -DictionaryLanguage sym:cui.ListBox.10032.36 +NotInDictionary sym:cui:MultiLineEdit:RID_SVXDLG_SPELLCHECK:ED_NEWWORD +Suggestions sym:cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_SUGGESTION +DictionaryLanguage sym:cui:ListBox:RID_SVXDLG_SPELLCHECK:LB_LANGUAGE IgnoreOnce sym:CUI_HID_SPLDLG_BUTTON_IGNORE IgnoreAll sym:CUI_HID_SPLDLG_BUTTON_IGNOREALL -AddToDictionary sym:cui.MenuButton.10032.39 +AddToDictionary sym:cui:MenuButton:RID_SVXDLG_SPELLCHECK:MB_ADDTODICT Change sym:CUI_HID_SPLDLG_BUTTON_CHANGE ChangeAll sym:CUI_HID_SPLDLG_BUTTON_CHANGEALL -AutoCorrect sym:cui.PushButton.10032.42 -SpellcheckOptions sym:cui.PushButton.10032.44 -SpellcheckUndo sym:cui.PushButton.10032.46 +AutoCorrect sym:cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_AUTOCORR +SpellcheckOptions sym:cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_OPTIONS +SpellcheckUndo sym:cui:PushButton:RID_SVXDLG_SPELLCHECK:PB_UNDO SpellcheckClose sym:CUI_HID_SPLDLG_BUTTON_CLOSE -*SQLException sym:dbu.ModalDialog.19203 +*SQLException sym:dbaccess:ModalDialog:DLG_SQLEXCEPTIONCHAIN Errors sym:DBACCESS_HID_SQLERROR_EXCHAIN_ERRORS Errortext sym:DBACCESS_HID_SQLERROR_EXCHAIN_TEXT @@ -529,20 +529,20 @@ ContentPage sym:SFX2_HID_HELP_TABPAGE_CONTENTS SearchContent sym:SFX2_HID_HELP_TREELISTBOX_CONTENTS IndexPage sym:SFX2_HID_HELP_TABPAGE_INDEX -SearchIndex sym:sfx.ComboBox.617.11 -DisplayIndex sym:sfx.PushButton.617.12 +SearchIndex sym:sfx2:ComboBox:TP_HELP_INDEX:CB_INDEX +DisplayIndex sym:sfx2:PushButton:TP_HELP_INDEX:PB_OPEN_INDEX FindPage sym:SFX2_HID_HELP_TABPAGE_SEARCH -SearchFind sym:sfx.ComboBox.618.11 -FindButton sym:sfx.PushButton.618.12 -Result sym:sfx.ListBox.618.16 -FindInHeadingsOnly sym:sfx.CheckBox.618.15 -FindFullWords sym:sfx.CheckBox.618.14 -DisplayFind sym:sfx.PushButton.618.17 +SearchFind sym:sfx2:ComboBox:TP_HELP_SEARCH:ED_SEARCH +FindButton sym:sfx2:PushButton:TP_HELP_SEARCH:PB_SEARCH +Result sym:sfx2:ListBox:TP_HELP_SEARCH:LB_RESULT +FindInHeadingsOnly sym:sfx2:CheckBox:TP_HELP_SEARCH:CB_SCOPE +FindFullWords sym:sfx2:CheckBox:TP_HELP_SEARCH:CB_FULLWORDS +DisplayFind sym:sfx2:PushButton:TP_HELP_SEARCH:PB_OPEN_SEARCH BookmarksPage sym:SFX2_HID_HELP_TABPAGE_BOOKMARKS -Bookmarks sym:sfx.ListBox.619.11 -DisplayBookmarks sym:sfx.PushButton.619.12 +Bookmarks sym:sfx2:ListBox:TP_HELP_BOOKMARKS:LB_BOOKMARKS +DisplayBookmarks sym:sfx2:PushButton:TP_HELP_BOOKMARKS:PB_BOOKMARKS HelpWindow sym:SW_HID_EDIT_WIN @@ -558,18 +558,18 @@ SetBookmarks sym:SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS SchemeName sym:CUI_HID_OPTIONS_COLORCONFIG_NAME_SCHEME *SecurityWarning sym:UUI_HID_XMLSECDLG_MACROWARN -ViewSignature sym:uui.PushButton.14530.4 -TrustAlways sym:uui.CheckBox.14530.6 +ViewSignature sym:uui:PushButton:RID_XMLSECDLG_MACROWARN:PB_VIEWSIGNS +TrustAlways sym:uui:CheckBox:RID_XMLSECDLG_MACROWARN:CB_ALWAYSTRUST -*Slides sym:sd.DockingWindow.792 +*Slides sym:sd:DockingWindow:FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW SlidesControl sym:SD_HID_SD_WIN_DOCUMENT -*Pagepane sym:sd.DockingWindow.793 +*Pagepane sym:sd:DockingWindow:FLT_LEFT_PANE_DRAW_DOCKING_WINDOW Pagecontrol sym:SD_HID_SD_WIN_DOCUMENT -*Spacing sym:.uno:ChangeDistance -Category sym:sm.MenuButton.20005.1 -Default sym:sm.PushButton.20005.1 +*Spacing .uno:ChangeDistance +Category sym:starmath:MenuButton:RID_DISTANCEDIALOG:1 +Default sym:starmath:PushButton:RID_DISTANCEDIALOG:1 SpacingSpacing sym:STARMATH_HID_SMA_DEFAULT_DIST LineSpacing sym:STARMATH_HID_SMA_LINE_DIST RootSpacing sym:STARMATH_HID_SMA_ROOT_DIST @@ -584,7 +584,7 @@ LowerLimit sym:STARMATH_HID_SMA_LOWERLIMIT_DIST ExcessSize sym:STARMATH_HID_SMA_BRACKET_EXCHEIGHT BracketSpacing sym:STARMATH_HID_SMA_BRACKET_DIST ExcessSizeAll sym:STARMATH_HID_SMA_BRACKET_EXCHEIGHT2 -ScaleAllBrackets sym:sm.CheckBox.20005.1 +ScaleAllBrackets sym:starmath:CheckBox:RID_DISTANCEDIALOG:1 MatrixLineSpacing sym:STARMATH_HID_SMA_MATRIXROW_DIST ColumnSpacing sym:STARMATH_HID_SMA_MATRIXCOL_DIST PrimaryHeight sym:STARMATH_HID_SMA_ATTRIBUT_DIST @@ -621,7 +621,7 @@ Back sym:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOWNDATA Create sym:WIZARDS_HID_DLGHOLIDAYCAL_0_CMDOK *StoredPasswordsDialog sym:CUI_HID_DLG_WEBCONNECTION_INFO -Remove sym:cui.PushButton.10301.12 -RemoveAll sym:cui.PushButton.10301.13 -changePassword sym:cui.PushButton.10301.14 +Remove sym:cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVE +RemoveAll sym:cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_REMOVEALL +changePassword sym:cui:PushButton:RID_SVXDLG_WEBCONNECTION_INFO:PB_CHANGE diff --git a/testautomation/global/win/edia_t_z.win b/testautomation/global/win/edia_t_z.win index 517b9396190f..caea134d589c 100644 --- a/testautomation/global/win/edia_t_z.win +++ b/testautomation/global/win/edia_t_z.win @@ -1,4 +1,4 @@ -*TabColor sym:.uno:TabBgColor +*TabColor .uno:TabBgColor *TableDesignTable sym:DBACCESS_HID_TABDESIGN_BACKGROUND TableWindow sym:DBACCESS_HID_CTL_TABLEEDIT @@ -42,7 +42,7 @@ FinishBtn sym:WIZARDS_HID_DLGTABLE_CMDFINISH CancelBtn sym:WIZARDS_HID_DLGTABLE_CMDCANCEL ' not nice solved, but can't do better right now; complains -> TBO -*Tasks sym:sd.DockingWindow.794 +*Tasks sym:sd:DockingWindow:FLT_TOOL_PANEL_DOCKING_WINDOW View sym:SFX2_HID_TASKPANE_VIEW_MENU '? sym:SD_HID_SD_WIN_DOCUMENT ' Master Pages @@ -88,8 +88,8 @@ TransitionAutomaticPreview sym:SD_HID_SD_SLIDETRANSITIONPANE_CB_AUTO_PREVIEW *SlideTransition sym:SD_HID_SD_SLIDE_TRANSITIONS *TemplateAndDocuments sym:SVT_HID_TEMPLATEDLG_DIALOG -Organize sym:svt.PushButton.16420.11 -Edit sym:svt.PushButton.16420.12 +Organize sym:svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_MANAGE +Edit sym:svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_EDIT Backward sym:SVT_HID_TEMPLATEDLG_TB_BACK UpOneLevel sym:SVT_HID_TEMPLATEDLG_TB_PREV Print sym:SVT_HID_TEMPLATEDLG_TB_PRINT @@ -114,8 +114,8 @@ CancelButton sym:WIZARDS_HID_DLGCORRESPONDENCE_CANCEL *TestAccountSettings sym:SW_HID_MM_TESTACCOUNTSETTINGS IDontKnow sym:SW_HID_MM_TESTACCOUNTSETTINGS_HB TaskStatusListBox sym:SW_HID_MM_TESTACCOUNTSETTINGS_TLB -Errors sym:sw.MultiLineEdit.21569.34 -Stop sym:sw.PushButton.21569.36 +Errors sym:sw:MultiLineEdit:DLG_MM_TESTACCOUNTSETTINGS:ED_ERROR +Stop sym:sw:PushButton:DLG_MM_TESTACCOUNTSETTINGS:PB_STOP *TestXMLFilter sym:FILTER_HID_XML_FILTER_TEST_DIALOG XSLTForExport sym:FILTER_HID_XML_FILTER_TEST_EXPORT_XSLT_FILE @@ -130,38 +130,38 @@ RecentFile sym:FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT FixedRecentFile sym:FILTER_HID_XML_FILTER_TEST_IMPORT_RECENT_FILE CloseBtn sym:FILTER_HID_XML_FILTER_TEST_CLOSE -*Thesaurus sym:.uno:Thesaurus -CurrentWord sym:cui.ComboBox.10031.16 -RecallCurrentWord sym:cui.ImageButton.10031.9 +*Thesaurus .uno:Thesaurus +CurrentWord sym:cui:ComboBox:RID_SVXDLG_THESAURUS:CB_WORD +RecallCurrentWord sym:cui:ImageButton:RID_SVXDLG_THESAURUS:BTN_LEFT Alternatives sym:CUI_HID_CT_THES_ALTERNATIVES -ReplaceWith sym:cui.Edit.10031.22 -Language sym:cui.MenuButton.10031.12 +ReplaceWith sym:cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL +Language sym:cui:MenuButton:RID_SVXDLG_THESAURUS:MB_LANGUAGE -*TextImport sym:sc.ModalDialog.25695 -CharacterSet sym:sc.ListBox.25695.6 -Language sym:sc.ListBox.25695.8 -FromRow sym:sc.NumericField.25695.10 -FixedWidth sym:sc.RadioButton.25695.12 -Separated sym:sc.RadioButton.25695.13 -Tab sym:sc.CheckBox.25695.14 -Semicolon sym:sc.CheckBox.25695.18 -Comma sym:sc.CheckBox.25695.15 -SpaceCB sym:sc.CheckBox.25695.19 -Other sym:sc.CheckBox.25695.16 -OtherText sym:sc.Edit.25695.17 -MergeDelimiter sym:sc.CheckBox.25695.20 -TextDelimiter sym:sc.ComboBox.25695.21 -QuotedAsText sym:sc.CheckBox.25695.24 -DetectSpecialNumbers sym:sc.CheckBox.25695.25 -Type sym:sc.ListBox.25695.28 +*TextImport sym:sc:ModalDialog:RID_SCDLG_ASCII +CharacterSet sym:sc:ListBox:RID_SCDLG_ASCII:LB_CHARSET +Language sym:sc:ListBox:RID_SCDLG_ASCII:LB_CUSTOMLANG +FromRow sym:sc:NumericField:RID_SCDLG_ASCII:NF_AT_ROW +FixedWidth sym:sc:RadioButton:RID_SCDLG_ASCII:RB_FIXED +Separated sym:sc:RadioButton:RID_SCDLG_ASCII:RB_SEPARATED +Tab sym:sc:CheckBox:RID_SCDLG_ASCII:CKB_TAB +Semicolon sym:sc:CheckBox:RID_SCDLG_ASCII:CKB_SEMICOLON +Comma sym:sc:CheckBox:RID_SCDLG_ASCII:CKB_COMMA +SpaceCB sym:sc:CheckBox:RID_SCDLG_ASCII:CKB_SPACE +Other sym:sc:CheckBox:RID_SCDLG_ASCII:CKB_OTHER +OtherText sym:sc:Edit:RID_SCDLG_ASCII:ED_OTHER +MergeDelimiter sym:sc:CheckBox:RID_SCDLG_ASCII:CB_ASONCE +TextDelimiter sym:sc:ComboBox:RID_SCDLG_ASCII:CB_TEXTSEP +QuotedAsText sym:sc:CheckBox:RID_SCDLG_ASCII:CB_QUOTED_AS_TEXT +DetectSpecialNumbers sym:sc:CheckBox:RID_SCDLG_ASCII:CB_DETECT_SPECIAL_NUMBER +Type sym:sc:ListBox:RID_SCDLG_ASCII:LB_TYPE1 Preview sym:SC_HID_SC_ASCII_TABCTR -*UnsatisfiedDependencies sym:deploymentgui.ModalDialog.2001 -UnsatisfiedDependencyList sym:deploymentgui.ListBox.2001.2 +*UnsatisfiedDependencies sym:desktop:ModalDialog:RID_DLG_DEPENDENCIES +UnsatisfiedDependencyList sym:desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST -*WarningPrintTransparency sym:sfx.ModalDialog.2399 -NoButton sym:sfx.PushButton.2399.63 -DoNotShowAgain sym:sfx.CheckBox.2399.65 +*WarningPrintTransparency sym:sfx2:ModalDialog:RID_WARN_PRINTTRANSPARENCY +NoButton sym:sfx2:PushButton:RID_WARN_PRINTTRANSPARENCY:BTN_PRINTTRANS_NO +DoNotShowAgain sym:sfx2:CheckBox:RID_WARN_PRINTTRANSPARENCY:CBX_NOPRINTTRANSWARN *WebWizard sym:WIZARDS_HID0_WEBWIZARD IntroductionChooseSettings sym:WIZARDS_HID1_LST_SESSIONS @@ -237,44 +237,44 @@ OKBtn sym:DESKTOP_HID_FIRSTSTART_FINISH CancelBtn sym:DESKTOP_HID_FIRSTSTART_CANCEL *XFormAddInstance sym:SVX_HID_XFORMS_ADDINSTANCE_DLG -InstanceName sym:svx.Edit.18018.12 -InstanceURL sym:.uno:OpenUrl -BrowseBtn sym:svx.PushButton.18018.15 -LinkInstance sym:svx.CheckBox.18018.16 +InstanceName sym:svx:Edit:RID_SVXDLG_ADD_INSTANCE:ED_INST_NAME +InstanceURL .uno:OpenUrl +BrowseBtn sym:svx:PushButton:RID_SVXDLG_ADD_INSTANCE:PB_FILEPICKER +LinkInstance sym:svx:CheckBox:RID_SVXDLG_ADD_INSTANCE:CB_INST_LINKINST *XFormAddItemDLG sym:SVX_HID_XFORMS_ADDDATAITEM_DLG -ElementName sym:svx.Edit.18012.12 -DefaultValue sym:svx.Edit.18012.14 -DataType sym:svx.ListBox.18012.18 -Required sym:svx.CheckBox.18012.19 -RequiredBtn sym:svx.PushButton.18012.20 -Relevant sym:svx.CheckBox.18012.21 -RelevantBtn sym:svx.PushButton.18012.22 -Constraint sym:svx.CheckBox.18012.23 -ConstraintBtn sym:svx.PushButton.18012.24 -Calculate sym:svx.CheckBox.18012.27 -CalculateBtn sym:svx.PushButton.18012.28 -ReadOnly sym:svx.CheckBox.18012.25 -ReadOnlyBtn sym:svx.PushButton.18012.26 +ElementName sym:svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME +DefaultValue sym:svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT +DataType sym:svx:ListBox:RID_SVXDLG_ADD_DATAITEM:LB_DATATYPE +Required sym:svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_REQUIRED +RequiredBtn sym:svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_REQUIRED +Relevant sym:svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_RELEVANT +RelevantBtn sym:svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_RELEVANT +Constraint sym:svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CONSTRAINT +ConstraintBtn sym:svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CONSTRAINT +Calculate sym:svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CALCULATE +CalculateBtn sym:svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CALCULATE +ReadOnly sym:svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_READONLY +ReadOnlyBtn sym:svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_READONLY *XFormAddModel sym:SVX_HID_XFORMS_ADDMODEL_DLG -ModelName sym:svx.Edit.18017.12 +ModelName sym:svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME *XFormAddSubmission sym:SVX_HID_XFORMS_ADDSUBMISSION_DLG -SubmitName sym:svx.Edit.18016.12 -SubmitAction sym:svx.Edit.18016.14 -SubmitMethod sym:svx.ListBox.18016.16 -SubmitBindingExpression sym:svx.Edit.18016.18 -SubmitBindingExpressionBtn sym:svx.PushButton.18016.19 -SubmitBinding sym:svx.ListBox.18016.21 -SubmitReplace sym:svx.ListBox.18016.23 +SubmitName sym:svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_NAME +SubmitAction sym:svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_ACTION +SubmitMethod sym:svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_METHOD +SubmitBindingExpression sym:svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_REF +SubmitBindingExpressionBtn sym:svx:PushButton:RID_SVXDLG_ADD_SUBMISSION:PB_SUBMIT_REF +SubmitBinding sym:svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_BIND +SubmitReplace sym:svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_REPLACE -*XFormsDataNavigator sym:SVX_HID_DATA_NAVIGATOR_WIN +*XFormsDataNavigator .uno:ShowDataNavigator XFormsDataNavigatorTabControl sym:SVX_HID_XFORMS_TAB_CONTROL -'Instance svx:TabPage:RID_SVX_TP_XFORMS_INSTANCE +'Instance sym:svx:TabPage:RID_SVX_TP_XFORMS_INSTANCE Models sym:SVX_HID_XFORMS_MODELS_LIST ModelsBtn sym:SVX_HID_XFORMS_MODELS_MENUBTN -TabPages sym:svx.TabPage.18020 +TabPages sym:svx:TabPage:RID_SVX_XFORMS_TABPAGES ItemList sym:SVX_HID_XFORMS_ITEMS_LIST InstanceBtn sym:SVX_HID_XFORMS_INSTANCES_MENUBTN diff --git a/testautomation/global/win/etab_a_d.win b/testautomation/global/win/etab_a_d.win index 30cb9938073a..17cf61f910ca 100644 --- a/testautomation/global/win/etab_a_d.win +++ b/testautomation/global/win/etab_a_d.win @@ -1,23 +1,23 @@ *TabAccessibility sym:CUI_HID_OPTIONS_ACCESSIBILITYCONFIG -ForPagePreviews sym:cui.CheckBox.10250.2 -HelpTips sym:cui.CheckBox.10250.4 -After sym:cui.NumericField.10250.5 -AllowAnimatedGraphics sym:cui.CheckBox.10250.7 -AllowAnimatedText sym:cui.CheckBox.10250.8 -AlwaysUseAutomaticFontColor sym:cui.CheckBox.10250.9 -SupportAssistiveTechnologyTools sym:cui.CheckBox.10250.11 -UseTextSelectionCursor sym:cui.CheckBox.10250.12 -AutomaticDetectHC sym:cui.CheckBox.10250.13 +ForPagePreviews sym:cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_PAGE_PREVIEWS +HelpTips sym:cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TIPHELP +After sym:cui:NumericField:RID_SVXPAGE_ACCESSIBILITYCONFIG:NF_TIPHELP +AllowAnimatedGraphics sym:cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_GRAPHICS +AllowAnimatedText sym:cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ANIMATED_TEXTS +AlwaysUseAutomaticFontColor sym:cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTOMATIC_FONT_COLOR +SupportAssistiveTechnologyTools sym:cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_ACCESSIBILITY_TOOL +UseTextSelectionCursor sym:cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_TEXTSELECTION +AutomaticDetectHC sym:cui:CheckBox:RID_SVXPAGE_ACCESSIBILITYCONFIG:CB_AUTO_DETECT_HC *TabAdabas sym:DBACCESS_HID_DSADMIN_PAGE_ADABAS -Hostname sym:dbu.Edit.19205.5 -CacheSize sym:dbu.NumericField.19205.2 -DataIncrement sym:dbu.NumericField.19205.1 -CotrolUser sym:dbu.Edit.19205.2 -ControlPassword sym:dbu.Edit.19205.1 -ShutdownService sym:dbu.CheckBox.19205.1 +Hostname sym:dbaccess:Edit:PAGE_ADABAS:ET_HOSTNAME +CacheSize sym:dbaccess:NumericField:PAGE_ADABAS:NF_CACHE_SIZE +DataIncrement sym:dbaccess:NumericField:PAGE_ADABAS:NF_DATA_INCREMENT +CotrolUser sym:dbaccess:Edit:PAGE_ADABAS:ET_CTRLUSERNAME +ControlPassword sym:dbaccess:Edit:PAGE_ADABAS:ET_CTRLPASSWORD +ShutdownService sym:dbaccess:CheckBox:PAGE_ADABAS:CB_SHUTDB Charset sym:DBACCESS_HID_DSADMIN_CHARSET -Extended sym:dbu.PushButton.19205.1 +Extended sym:dbaccess:PushButton:PAGE_ADABAS:PB_STAT *TabAdabasUserSettings sym:DBACCESS_HID_TAB_PAGE_USERADMIN User sym:DBACCESS_HID_TAB_PAGE_LBUSER @@ -26,15 +26,15 @@ ChangePassword sym:DBACCESS_HID_TAB_PAGE_PBCHGPWD DeleteUser sym:DBACCESS_HID_TAB_PAGE_PBUSERDELETE AccessRights sym:DBACCESS_HID_TAB_PAGE_TBLGRANTS -*TabAdditionalSettings sym:abp.TabPage.19701 -Settings sym:abp.PushButton.19701.1 +*TabAdditionalSettings sym:extensions:TabPage:RID_PAGE_ADMININVOKATION +Settings sym:extensions:PushButton:RID_PAGE_ADMININVOKATION:PB_INVOKE_ADMIN_DIALOG -*TabAddressDataSourceAutoPilot sym:abp.TabPage.19700 -Mozilla sym:abp.RadioButton.19700.1 -LDAP sym:abp.RadioButton.19700.6 -Outlook sym:abp.RadioButton.19700.7 -WinSystem sym:abp.RadioButton.19700.8 -Other sym:abp.RadioButton.19700.9 +*TabAddressDataSourceAutoPilot sym:extensions:TabPage:RID_PAGE_SELECTABTYPE +Mozilla sym:extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_MORK +LDAP sym:extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_LDAP +Outlook sym:extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOK +WinSystem sym:extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OUTLOOKEXPRESS +Other sym:extensions:RadioButton:RID_PAGE_SELECTABTYPE:RB_OTHER *TabADO sym:DBACCESS_HID_DSADMIN_PAGE_ADO URL sym:DBACCESS_HID_DSADMIN_CONNURL_ADOPAGE @@ -42,9 +42,9 @@ UserName sym:DBACCESS_HID_DSADMIN_USER_ADO PasswordRequired sym:DBACCESS_HID_DSADMIN_PWDREC_ADO *TabAppearance sym:CUI_HID_OPTIONS_COLORCONFIG -Scheme sym:cui.ListBox.10249.3 -Save sym:cui.PushButton.10249.4 -Delete sym:cui.PushButton.10249.5 +Scheme sym:cui:ListBox:RID_SVXPAGE_COLORCONFIG:LB_COLORSCHEME +Save sym:cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_SAVESCHEME +Delete sym:cui:PushButton:RID_SVXPAGE_COLORCONFIG:PB_DELETESCHEME ColorList sym:CUI_HID_OPTIONS_COLORCONFIG_COLORLIST_WIN LBGeneralDocBg sym:CUI_HID_COLORPAGE_DOCCOLOR_LB CBGeneralTextBd sym:CUI_HID_COLORPAGE_DOCBOUNDARIES_CB @@ -93,58 +93,58 @@ LBBasicReservedExpression sym:CUI_HID_COLORPAGE_BASICKEYWORD_LB LBBasicError sym:CUI_HID_COLORPAGE_BASICERROR_LB *TabArea sym:CUI_HID_AREA_AREA -BackgroundColour sym:cui.CheckBox.10056.21 -BackgroundColourList sym:cui.ListBox.10056.22 -FillOptions sym:cui.ListBox.10056.19 -ColourList sym:cui.ListBox.10056.1 -GradientList sym:cui.ListBox.10056.2 -HatchingList sym:cui.ListBox.10056.3 -BitmapList sym:cui.ListBox.10056.4 -Automatic sym:cui.TriStateBox.10056.3 -Increments sym:cui.NumericField.10056.1 -Tile sym:cui.TriStateBox.10056.4 -Stretch sym:cui.TriStateBox.10056.5 -Relative sym:cui.TriStateBox.10056.1 -Original sym:cui.TriStateBox.10056.6 -Width sym:cui.MetricField.10056.4 -Height sym:cui.MetricField.10056.5 -XOffset sym:cui.MetricField.10056.1 -YOffset sym:cui.MetricField.10056.2 -Row sym:cui.RadioButton.10056.6 -Column sym:cui.RadioButton.10056.7 -Offset sym:cui.MetricField.10056.3 +BackgroundColour sym:cui:CheckBox:RID_SVXPAGE_AREA:CB_HATCHBCKGRD +BackgroundColourList sym:cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHBCKGRDCOLOR +FillOptions sym:cui:ListBox:RID_SVXPAGE_AREA:LB_AREA_TYPE +ColourList sym:cui:ListBox:RID_SVXPAGE_AREA:LB_COLOR +GradientList sym:cui:ListBox:RID_SVXPAGE_AREA:LB_GRADIENT +HatchingList sym:cui:ListBox:RID_SVXPAGE_AREA:LB_HATCHING +BitmapList sym:cui:ListBox:RID_SVXPAGE_AREA:LB_BITMAP +Automatic sym:cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STEPCOUNT +Increments sym:cui:NumericField:RID_SVXPAGE_AREA:NUM_FLD_STEPCOUNT +Tile sym:cui:TriStateBox:RID_SVXPAGE_AREA:TSB_TILE +Stretch sym:cui:TriStateBox:RID_SVXPAGE_AREA:TSB_STRETCH +Relative sym:cui:TriStateBox:RID_SVXPAGE_AREA:TSB_SCALE +Original sym:cui:TriStateBox:RID_SVXPAGE_AREA:TSB_ORIGINAL +Width sym:cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_SIZE +Height sym:cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_SIZE +XOffset sym:cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_X_OFFSET +YOffset sym:cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_Y_OFFSET +Row sym:cui:RadioButton:RID_SVXPAGE_AREA:RBT_ROW +Column sym:cui:RadioButton:RID_SVXPAGE_AREA:RBT_COLUMN +Offset sym:cui:MetricField:RID_SVXPAGE_AREA:MTR_FLD_OFFSET *TabAsianLayout sym:CUI_HID_SVXPAGE_CHAR_TWOLINES -TwoLinesEachLine sym:cui.CheckBox.10242.401 -BeginningCharacter sym:cui.ListBox.10242.412 -EndCharacter sym:cui.ListBox.10242.414 +TwoLinesEachLine sym:cui:CheckBox:RID_SVXPAGE_CHAR_TWOLINES:CB_TWOLINES +BeginningCharacter sym:cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_STARTBRACKET +EndCharacter sym:cui:ListBox:RID_SVXPAGE_CHAR_TWOLINES:ED_ENDBRACKET *TabAsianLayoutOptions sym:CUI_HID_OPTIONS_ASIAN_LAYOUT -WesternCharactersOnly sym:cui.RadioButton.10246.2 -WesternTextAndPunctuation sym:cui.RadioButton.10246.3 -NoCompression sym:cui.RadioButton.10246.5 -CompressPunctuationOnly sym:cui.RadioButton.10246.6 -CompressPunctuationAndJapaneseKana sym:cui.RadioButton.10246.7 -Language sym:cui.ListBox.10246.12 -Standard sym:cui.CheckBox.10246.9 -NoStartOfLine sym:cui.Edit.10246.14 -NoEndOfLine sym:cui.Edit.10246.16 +WesternCharactersOnly sym:cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_KERNING +WesternTextAndPunctuation sym:cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_CHAR_PUNCT +NoCompression sym:cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_NO_COMP +CompressPunctuationOnly sym:cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_COMP +CompressPunctuationAndJapaneseKana sym:cui:RadioButton:RID_SVXPAGE_ASIAN_LAYOUT:RB_PUNCT_KANA_COMP +Language sym:cui:ListBox:RID_SVXPAGE_ASIAN_LAYOUT:LB_LANGUAGE +Standard sym:cui:CheckBox:RID_SVXPAGE_ASIAN_LAYOUT:CB_STANDARD +NoStartOfLine sym:cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_START +NoEndOfLine sym:cui:Edit:RID_SVXPAGE_ASIAN_LAYOUT:ED_END *TabAsianTypography sym:CUI_HID_SVXPAGE_PARA_ASIAN -ApplyList sym:cui.TriStateBox.10245.4 -AllowHangingPunctuation sym:cui.TriStateBox.10245.2 -ApplySpacingBetween sym:cui.TriStateBox.10245.7 +ApplyList sym:cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_FORBIDDEN +AllowHangingPunctuation sym:cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_HANG_PUNC +ApplySpacingBetween sym:cui:TriStateBox:RID_SVXPAGE_PARA_ASIAN:CB_AS_SCRIPT_SPACE *TabAutoCaption sym:SW_HID_OPTCAPTION_PAGE ObjectList sym:SW_HID_OPTCAPTION_CLB -Category sym:sw.ComboBox.20878.14 -Numbering sym:sw.ListBox.20878.16 -CaptionSeparator sym:sw.Edit.20878.18 -Position sym:sw.ListBox.20878.20 -Level sym:sw.ListBox.20878.23 -ChapterSeparator sym:sw.Edit.20878.25 -CharacterStyle sym:sw.ListBox.20878.28 -ApplyBorderAndShadow sym:sw.CheckBox.20878.29 +Category sym:sw:ComboBox:TP_OPTCAPTION_PAGE:BOX_CATEGORY +Numbering sym:sw:ListBox:TP_OPTCAPTION_PAGE:BOX_FORMAT +CaptionSeparator sym:sw:Edit:TP_OPTCAPTION_PAGE:EDT_TEXT +Position sym:sw:ListBox:TP_OPTCAPTION_PAGE:BOX_POS +Level sym:sw:ListBox:TP_OPTCAPTION_PAGE:LB_LEVEL +ChapterSeparator sym:sw:Edit:TP_OPTCAPTION_PAGE:ED_SEPARATOR +CharacterStyle sym:sw:ListBox:TP_OPTCAPTION_PAGE:LB_CHARSTYLE +ApplyBorderAndShadow sym:sw:CheckBox:TP_OPTCAPTION_PAGE:CB_APPLYBORDER *TabBaseBookmarks sym:DBACCESS_HID_DSADMIN_DOCUMENTLINKS Bookmarklist sym:DBACCESS_HID_DSADMIN_DOCUMENTS @@ -156,98 +156,98 @@ Zurueck sym:SFX2_HID_TABDLG_RESET_BTN Remove sym:SW_HID_NUM_RESET *TabChartAxisLabel sym:CHART2_HID_SCH_TP_AXIS_LABEL - ShowLabels sym:chartcontroller.CheckBox.920.1 - Tile sym:chartcontroller.RadioButton.920.14 - StaggerOdd sym:chartcontroller.RadioButton.920.15 - StaggerEven sym:chartcontroller.RadioButton.920.16 - Automatic sym:chartcontroller.RadioButton.920.17 - Overlap sym:chartcontroller.CheckBox.920.11 - Break sym:chartcontroller.CheckBox.920.12 + ShowLabels sym:chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR + Tile sym:chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_SIDEBYSIDE + StaggerOdd sym:chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_UPDOWN + StaggerEven sym:chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_DOWNUP + Automatic sym:chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_AUTOORDER + Overlap sym:chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTOVERLAP + Break sym:chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTBREAK AngleKnob sym:CHART2_HID_SCH_ALIGNMENT_CTR_DIAL AngleText sym:CHART2_HID_SCH_ALIGNMENT_DEGREES VerticallyStacked sym:CHART2_HID_SCH_ALIGNMENT_STACKED - TextDirection sym:chartcontroller.ListBox.920.20 + TextDirection sym:chart2:ListBox:TP_AXIS_LABEL:LB_AXIS_TEXTDIR *TabChartAxisNumbers sym:CUI_HID_NUMBERFORMAT - Category sym:cui.ListBox.10041.9 - FormatCurrency sym:cui.ListBox.10041.33 + Category sym:cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY + FormatCurrency sym:cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY FormatString sym:CUI_HID_NUMBERFORMAT_LB_FORMAT - Language sym:cui.ListBox.10041.13 - Sourceformat sym:cui.CheckBox.10041.34 - DecimalPlaces sym:cui.NumericField.10041.22 - LeadingZeroes sym:cui.NumericField.10041.24 - NegativNumbersRed sym:cui.CheckBox.10041.25 - ThousandsSeparator sym:cui.CheckBox.10041.26 - FormatCode sym:cui.Edit.10041.14 + Language sym:cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE + Sourceformat sym:cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT + DecimalPlaces sym:cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS + LeadingZeroes sym:cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES + NegativNumbersRed sym:cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED + ThousandsSeparator sym:cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND + FormatCode sym:cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT AddButton sym:CUI_HID_NUMBERFORMAT_TBI_ADD EditCommentButton sym:CUI_HID_NUMBERFORMAT_TBI_INFO RemoveButton sym:CUI_HID_NUMBERFORMAT_TBI_REMOVE - Comment sym:cui.Edit.10041.28 + Comment sym:cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT -*TabChartAxisScale sym:chartcontroller.TabPage.903 -MinimumValue sym:chartcontroller.SpinField.903.3 -MinimumAutomatic sym:chartcontroller.CheckBox.903.1 -MaximumValue sym:chartcontroller.SpinField.903.2 -MaximumAutomatic sym:chartcontroller.CheckBox.903.2 -MajorIntervalValue sym:chartcontroller.SpinField.903.1 -MajorIntervalAutomatic sym:chartcontroller.CheckBox.903.3 -MinorIntervalCount sym:chartcontroller.MetricField.903.10 -MinorIntervalCountAutomatic sym:chartcontroller.CheckBox.903.4 -ReferenceValue sym:chartcontroller.SpinField.903.4 -RreferenceValueAutomatic sym:chartcontroller.CheckBox.903.5 -LogarithmicScale sym:chartcontroller.CheckBox.903.6 -ReverseDirection sym:chartcontroller.CheckBox.903.7 - -*TabChartAxisPositioning sym:chartcontroller.TabPage.904 -CrossOtherAxisAt sym:chartcontroller.ListBox.904.1 -AxisAtValue sym:chartcontroller.SpinField.904.3 -AxisAtCategory sym:chartcontroller.ComboBox.904.4 -Hidden_CheckBox1 sym:chartcontroller.CheckBox.904.1 -PlaceLabels sym:chartcontroller.ListBox.904.2 -Hidden_Spinfield1 sym:chartcontroller.SpinField.904.5 -MajorIntervalMarksInner sym:chartcontroller.CheckBox.904.2 -MajorIntervalMarksOuter sym:chartcontroller.CheckBox.904.3 -MinorIntervalMarksInner sym:chartcontroller.CheckBox.904.4 -MinorIntervalMarksOuter sym:chartcontroller.CheckBox.904.5 -PlaceMarks sym:chartcontroller.ListBox.904.6 -Hidden_CheckBox2 sym:chartcontroller.CheckBox.904.6 -Hidden_MoreBtn sym:chartcontroller.PushButton.904.1 -Hidden_CheckBox3 sym:chartcontroller.CheckBox.904.7 -Hidden_More2 sym:chartcontroller.PushButton.904.2 - -*TabChartTypeDataRange sym:chartcontroller.TabPage.911 - DataRange sym:chartcontroller.Edit.911.1 - SelectDataRange sym:chartcontroller.ImageButton.911.1 - Rows sym:chartcontroller.RadioButton.911.1 - Columns sym:chartcontroller.RadioButton.911.2 - FirstRowAsLabel sym:chartcontroller.CheckBox.911.1 - FirstColumnAsLabel sym:chartcontroller.CheckBox.911.2 +*TabChartAxisScale sym:chart2:TabPage:TP_SCALE +MinimumValue sym:chart2:SpinField:TP_SCALE:EDT_MIN +MinimumAutomatic sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_MIN +MaximumValue sym:chart2:SpinField:TP_SCALE:EDT_MAX +MaximumAutomatic sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_MAX +MajorIntervalValue sym:chart2:SpinField:TP_SCALE:EDT_STEP_MAIN +MajorIntervalAutomatic sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_MAIN +MinorIntervalCount sym:chart2:MetricField:TP_SCALE:MT_STEPHELP +MinorIntervalCountAutomatic sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_HELP +ReferenceValue sym:chart2:SpinField:TP_SCALE:EDT_ORIGIN +RreferenceValueAutomatic sym:chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN +LogarithmicScale sym:chart2:CheckBox:TP_SCALE:CBX_LOGARITHM +ReverseDirection sym:chart2:CheckBox:TP_SCALE:CBX_REVERSE + +*TabChartAxisPositioning sym:chart2:TabPage:TP_AXIS_POSITIONS +CrossOtherAxisAt sym:chart2:ListBox:TP_AXIS_POSITIONS:LB_CROSSES_OTHER_AXIS_AT +AxisAtValue sym:chart2:SpinField:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT +AxisAtCategory sym:chart2:ComboBox:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT_CATEGORY +Hidden_Checkbox1 sym:chart2:CheckBox:TP_AXIS_POSITIONS:CB_AXIS_BETWEEN_CATEGORIES +PlaceLabels sym:chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_LABELS +Hidden_Spinfield1 sym:chart2:SpinField:TP_AXIS_POSITIONS:EDT_AXIS_LABEL_DISTANCE +MajorIntervalMarksInner sym:chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_INNER +MajorIntervalMarksOuter sym:chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_OUTER +MinorIntervalMarksInner sym:chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_INNER +MinorIntervalMarksOuter sym:chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_OUTER +PlaceMarks sym:chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_TICKS +Hidden_Checkbox2 sym:chart2:CheckBox:TP_AXIS_POSITIONS:CB_MAJOR_GRID +Hidden_MoreBtn sym:chart2:PushButton:TP_AXIS_POSITIONS:PB_MAJOR_GRID +Hidden_Checkbox3 sym:chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_GRID +Hidden_More2 sym:chart2:PushButton:TP_AXIS_POSITIONS:PB_MINOR_GRID + +*TabChartTypeDataRange sym:chart2:TabPage:TP_RANGECHOOSER + DataRange sym:chart2:Edit:TP_RANGECHOOSER:ED_RANGE + SelectDataRange sym:chart2:ImageButton:TP_RANGECHOOSER:IB_RANGE + Rows sym:chart2:RadioButton:TP_RANGECHOOSER:RB_DATAROWS + Columns sym:chart2:RadioButton:TP_RANGECHOOSER:RB_DATACOLS + FirstRowAsLabel sym:chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_ROW_ASLABELS + FirstColumnAsLabel sym:chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_COLUMN_ASLABELS +TabDataRangesDataRange TabChartTypeDataRange +TabFormatDataRangesDataRange TabChartTypeDataRange -*TabChartTypeDataSeries sym:chartcontroller.TabPage.914 +*TabChartTypeDataSeries sym:chart2:TabPage:TP_DATA_SOURCE DataRanges sym:CHART2_HID_SCH_DATA_RANGES_LIST - RangeFor sym:chartcontroller.Edit.914.80 - SelectRange sym:chartcontroller.ImageButton.914.90 - Categories sym:chartcontroller.Edit.914.120 - SelectCategories sym:chartcontroller.ImageButton.914.130 - AddButton sym:chartcontroller.PushButton.914.30 - RemoveButton sym:chartcontroller.PushButton.914.40 - MoveUp sym:chartcontroller.PushButton.914.140 - MoveDown sym:chartcontroller.PushButton.914.150 + RangeFor sym:chart2:Edit:TP_DATA_SOURCE:EDT_RANGE + SelectRange sym:chart2:ImageButton:TP_DATA_SOURCE:IMB_RANGE_MAIN + Categories sym:chart2:Edit:TP_DATA_SOURCE:EDT_CATEGORIES + SelectCategories sym:chart2:ImageButton:TP_DATA_SOURCE:IMB_RANGE_CAT + AddButton sym:chart2:PushButton:TP_DATA_SOURCE:BTN_ADD + RemoveButton sym:chart2:PushButton:TP_DATA_SOURCE:BTN_REMOVE + MoveUp sym:chart2:PushButton:TP_DATA_SOURCE:BTN_UP + MoveDown sym:chart2:PushButton:TP_DATA_SOURCE:BTN_DOWN DataSeries sym:CHART2_HID_SCH_SERIES_LIST +TabDataRangesDataSeries TabChartTypeDataSeries +TabFormatDataRangesDataSeries TabChartTypeDataSeries -*TabChartPieOptions sym:chartcontroller.TabPage.909 -Clockwise sym:chartcontroller.CheckBox.909.1 +*TabChartPieOptions sym:chart2:TabPage:TP_POLAROPTIONS +Clockwise sym:chart2:CheckBox:TP_POLAROPTIONS:CB_CLOCKWISE StartingAngle sym:CHART2_HID_SCH_STARTING_ANGLE_DIAL -Degrees sym:chartcontroller.NumericField.909.1 +Degrees sym:chart2:NumericField:TP_POLAROPTIONS:NF_STARTING_ANGLE -*TabChartTypeChartElements sym:chartcontroller.TabPage.912 +*TabChartTypeChartElements sym:chart2:TabPage:TP_WIZARD_TITLEANDOBJECTS Title sym:CHART2_HID_SCH_TITLE_MAIN Subtitle sym:CHART2_HID_SCH_TITLE_SUB TitleXaxis sym:CHART2_HID_SCH_TITLE_X @@ -264,27 +264,27 @@ GridLinesXaxis sym:CHART2_HID_SCH_CB_XGRID GridLinesYaxis sym:CHART2_HID_SCH_CB_YGRID GridLinesZaxis sym:CHART2_HID_SCH_CB_ZGRID -*TabChartTypeChartLocation sym:chartcontroller.TabPage.913 -InsertInSheet sym:chartcontroller.ListBox.913.1 +*TabChartTypeChartLocation sym:chart2:TabPage:TP_LOCATION +InsertInSheet sym:chart2:ListBox:TP_LOCATION:LB_TABLE -*TabCreateOptionGroup sym:dbp.TabPage.19726 -GroupCaption sym:dbp.Edit.19726.3 +*TabCreateOptionGroup sym:extensions:TabPage:RID_PAGE_OPTIONS_FINAL +GroupCaption sym:extensions:Edit:RID_PAGE_OPTIONS_FINAL:ET_NAMEIT -*TabConnections sym:cui.TabPage.17022 +*TabConnections sym:cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS DriverList sym:CUI_HID_OFA_CONNPOOL_DRIVERLIST -ConnectionPoolingEnabled sym:cui.CheckBox.17022.2 -EnablePoolingForThisDriver sym:cui.CheckBox.17022.7 -Timeout sym:cui.NumericField.17022.9 +ConnectionPoolingEnabled sym:cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_POOL_CONNS +EnablePoolingForThisDriver sym:cui:CheckBox:RID_OFAPAGE_CONNPOOLOPTIONS:CB_DRIVERPOOLING +Timeout sym:cui:NumericField:RID_OFAPAGE_CONNPOOLOPTIONS:NF_TIMEOUT -*TabConnection sym:dbu.TabPage.19206 +*TabConnection sym:dbaccess:TabPage:PAGE_CONNECTION dBasePath sym:DBACCESS_HID_DSADMIN_DBASE_PATH SelectPath sym:DBACCESS_HID_DSADMIN_BROWSECONN -Username sym:dbu.Edit.19206.1 -PasswordRequired sym:dbu.CheckBox.19206.1 +Username sym:dbaccess:Edit:PAGE_CONNECTION:ET_USERNAME +PasswordRequired sym:dbaccess:CheckBox:PAGE_CONNECTION:CB_PASSWORD_REQUIRED JDBCDriverClass sym:DBACCESS_HID_DSADMIN_DRIVERCLASS -TestDriver sym:dbu.PushButton.19206.1 +TestDriver sym:dbaccess:PushButton:PAGE_CONNECTION:PB_TESTDRIVERCLASS MySQLODBCDatasource sym:DBACCESS_HID_DSADMIN_MYSQL_ODBC_DATASOURCE -TestConnection sym:dbu.PushButton.19206.2 +TestConnection sym:dbaccess:PushButton:PAGE_CONNECTION:PB_TESTCONNECTION MySQLJDBCDatasource sym:DBACCESS_HID_DSADMIN_MYSQL_DATABASE AdabasDatasource sym:DBACCESS_HID_DSADMIN_ADABAS_DATABASE OracleJDBCDatasource sym:DBACCESS_HID_DSADMIN_ORACLE_DATABASE @@ -297,77 +297,77 @@ TextPath sym:DBACCESS_HID_DSADMIN_FLAT_PATH *TabCopyDatabaseTable sym:DBACCESS_HID_TAB_WIZ_COPYTABLE TableName sym:DBACCESS_HID_TAB_WIZ_TABLENAME_EDIT -DefinitionAndData sym:dbu.RadioButton.19212.1 -Definition sym:dbu.RadioButton.19212.2 -AsTableView sym:dbu.RadioButton.19212.3 -AttachData sym:dbu.RadioButton.19212.4 -CreatePrimaryKey sym:dbu.CheckBox.19212.5 -PrimaryKeyName sym:dbu.Edit.19212.3 +DefinitionAndData sym:dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEFDATA +Definition sym:dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_DEF +AsTableView sym:dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_VIEW +AttachData sym:dbaccess:RadioButton:TAB_WIZ_COPYTABLE:RB_APPENDDATA +CreatePrimaryKey sym:dbaccess:CheckBox:TAB_WIZ_COPYTABLE:CB_PRIMARY_COLUMN +PrimaryKeyName sym:dbaccess:Edit:TAB_WIZ_COPYTABLE:ET_KEYNAME *TabColumnSelect sym:DBACCESS_HID_TAB_WIZ_COLUMN_SELECT -LeftColumNames sym:dbu.MultiListBox.19209.1 -Add sym:dbu.ImageButton.19209.1 -AddAll sym:dbu.ImageButton.19209.3 -Remove sym:dbu.ImageButton.19209.2 -RemoveAll sym:dbu.ImageButton.19209.4 -RightColumNames sym:dbu.MultiListBox.19209.2 +LeftColumNames sym:dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_ORG_COLUMN_NAMES +Add sym:dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_RH +AddAll sym:dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_RH +Remove sym:dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMN_LH +RemoveAll sym:dbaccess:ImageButton:TAB_WIZ_COLUMN_SELECT:IB_COLUMNS_LH +RightColumNames sym:dbaccess:MultiListBox:TAB_WIZ_COLUMN_SELECT:LB_NEW_COLUMN_NAMES *TabCompatibility sym:SW_HID_OPTCOMPATIBILITY_PAGE Options sym:SW_HID_COMPATIBILITY_OPTIONS_BOX -Formatting sym:sw.ListBox.20903.12 -Reset sym:sw.PushButton.20903.15 -Default sym:sw.PushButton.20903.16 +Formatting sym:sw:ListBox:TP_OPTCOMPATIBILITY_PAGE:LB_FORMATTING +Reset sym:sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_RESET +Default sym:sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_DEFAULT *TabComplexTextLayout sym:CUI_HID_OPTIONS_CTL -UseSequenceChecking sym:cui.CheckBox.10252.11 -Logical sym:cui.RadioButton.10252.22 -Visual sym:cui.RadioButton.10252.23 -Numerals sym:cui.ListBox.10252.32 -Restricted sym:cui.CheckBox.10252.12 -TypeAndReplace sym:cui.CheckBox.10252.13 +UseSequenceChecking sym:cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_SEQUENCECHECKING +Logical sym:cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_LOGICAL +Visual sym:cui:RadioButton:RID_SVXPAGE_OPTIONS_CTL:RB_MOVEMENT_VISUAL +Numerals sym:cui:ListBox:RID_SVXPAGE_OPTIONS_CTL:LB_NUMERALS +Restricted sym:cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_RESTRICTED +TypeAndReplace sym:cui:CheckBox:RID_SVXPAGE_OPTIONS_CTL:CB_TYPE_REPLACE *TabCustomizeEvents sym:CUI_HID_SVX_CONFIG_EVENT -SaveIn sym:cui.ListBox.10295.11 +SaveIn sym:cui:ListBox:RID_SVXPAGE_EVENTS:LB_SAVEIN EventListbox sym:CUI_HID_SVX_MACRO_LB_EVENT -AssignMacro sym:cui.PushButton.10295.2 -RemoveMacro sym:cui.PushButton.10295.3 +AssignMacro sym:cui:PushButton:RID_SVXPAGE_EVENTS:PB_ASSIGN +RemoveMacro sym:cui:PushButton:RID_SVXPAGE_EVENTS:PB_DELETE ResetBtn sym:SFX2_HID_TABDLG_RESET_BTN *TabCustomizeMenu sym:CUI_HID_SVX_CONFIG_MENU -Menu sym:cui.ListBox.10292.311 -BtnNew sym:cui.PushButton.10292.312 -MenuBtn sym:cui.MenuButton.10292.314 -AddCommands sym:cui.PushButton.10292.326 -Command sym:cui.MenuButton.10292.318 -BtnUp sym:cui.ImageButton.10292.319 -BtnDown sym:cui.ImageButton.10292.320 -SaveIn sym:cui.ListBox.10292.324 +Menu sym:cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS +BtnNew sym:cui:PushButton:RID_SVXPAGE_MENUS:BTN_NEW +MenuBtn sym:cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE +AddCommands sym:cui:PushButton:RID_SVXPAGE_MENUS:BTN_ADD_COMMANDS +Command sym:cui:MenuButton:RID_SVXPAGE_MENUS:BTN_CHANGE_ENTRY +BtnUp sym:cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP +BtnDown sym:cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN +SaveIn sym:cui:ListBox:RID_SVXPAGE_MENUS:LB_SAVEIN ResetBtn sym:SFX2_HID_TABDLG_RESET_BTN Entries sym:CUI_HID_SVX_CONFIG_MENU_CONTENTS *TabCustomizeToolbars sym:CUI_HID_SVX_CONFIG_TOOLBAR -Menu sym:cui.ListBox.10292.311 +Menu sym:cui:ListBox:RID_SVXPAGE_MENUS:LB_MENUS BtnNew sym:CUI_HID_SVX_NEW_TOOLBAR MenuBtn sym:CUI_HID_SVX_MODIFY_TOOLBAR AddCommands sym:CUI_HID_SVX_NEW_TOOLBAR_ITEM Command sym:CUI_HID_SVX_MODIFY_TOOLBAR_ITEM -BtnUp sym:cui.ImageButton.10292.319 -BtnDown sym:cui.ImageButton.10292.320 +BtnUp sym:cui:ImageButton:RID_SVXPAGE_MENUS:BTN_UP +BtnDown sym:cui:ImageButton:RID_SVXPAGE_MENUS:BTN_DOWN SaveIn sym:CUI_HID_SVX_SAVE_IN ToolbarContents sym:CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS ResetBtn sym:SFX2_HID_TABDLG_RESET_BTN -*TabDatabaseField sym:dbp.TabPage.19725 -YesSaveIt sym:dbp.RadioButton.19725.3 -NoValueForm sym:dbp.RadioButton.19725.4 -Fieldbox sym:dbp.ListBox.19725.4 - -*TabDatabaseValues sym:dbp.TabPage.19724 -YesSaveIt sym:dbp.RadioButton.19725.3 -NoValueForm sym:dbp.RadioButton.19725.4 -Fieldbox sym:dbp.ListBox.19725.4 -WhichValue sym:dbp.Edit.19724.2 -OptionFields sym:dbp.ListBox.19724.3 +*TabDatabaseField sym:extensions:TabPage:RID_PAGE_OPTION_DBFIELD +YesSaveIt sym:extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES +NoValueForm sym:extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_NO +Fieldbox sym:extensions:ListBox:RID_PAGE_OPTION_DBFIELD:LB_STOREINFIELD + +*TabDatabaseValues sym:extensions:TabPage:RID_PAGE_OPTIONVALUES +YesSaveIt sym:extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_YES +NoValueForm sym:extensions:RadioButton:RID_PAGE_OPTION_DBFIELD:RB_STOREINFIELD_NO +Fieldbox sym:extensions:ListBox:RID_PAGE_OPTION_DBFIELD:LB_STOREINFIELD +WhichValue sym:extensions:Edit:RID_PAGE_OPTIONVALUES:ET_OPTIONVALUE +OptionFields sym:extensions:ListBox:RID_PAGE_OPTIONVALUES:LB_RADIOBUTTONS *TabDataControl sym:EXTENSIONS_HID_FM_PROPDLG_TAB_DATA DataField sym:EXTENSIONS_HID_PROP_CONTROLSOURCE @@ -420,7 +420,7 @@ FormLinkDLGButton sym:EXTENSIONS_UID_PROP_DLG_FORMLINKFIELDS OpenQueryDesign sym:EXTENSIONS_UID_PROP_DLG_SQLCOMMAND SortDLGButton sym:EXTENSIONS_UID_PROP_DLG_ORDER -*TabDataPointLayout sym:chartcontroller.TabPage.907 +*TabDataPointLayout sym:chart2:TabPage:TP_LAYOUT BarColumnShape sym:CHART2_HID_SCH_LB_BAR_GEOMETRY *TabDataSeriesLabels sym:CHART2_HID_SCH_DATA_DESCR @@ -439,36 +439,36 @@ RotateDegrees sym:CHART2_HID_SCH_DATALABEL_ROTATION_EDIT +TabDataPointLabels TabDataSeriesLabels -*TabDataSeriesOptions sym:chartcontroller.TabPage.908 -PrimaryYaxis sym:chartcontroller.RadioButton.908.2 -SecondaryYaxis sym:chartcontroller.RadioButton.908.3 -Gap sym:chartcontroller.MetricField.908.4 -Overlap sym:chartcontroller.MetricField.908.5 -ConnectionLines sym:chartcontroller.CheckBox.908.9 -ShowBarsSideBySide sym:chartcontroller.CheckBox.908.10 -LeaveGap sym:chartcontroller.RadioButton.908.13 -AssumeZero sym:chartcontroller.RadioButton.908.14 -ContinueLine sym:chartcontroller.RadioButton.908.15 -IncludeHiddenCells sym:chartcontroller.CheckBox.908.16 - -*TabDataSourceName sym:abp.TabPage.19704 -SourceName sym:abp.Edit.19704.1 +*TabDataSeriesOptions sym:chart2:TabPage:TP_OPTIONS +PrimaryYaxis sym:chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_1 +SecondaryYaxis sym:chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_2 +Gap sym:chart2:MetricField:TP_OPTIONS:MT_GAP +Overlap sym:chart2:MetricField:TP_OPTIONS:MT_OVERLAP +ConnectionLines sym:chart2:CheckBox:TP_OPTIONS:CB_CONNECTOR +ShowBarsSideBySide sym:chart2:CheckBox:TP_OPTIONS:CB_BARS_SIDE_BY_SIDE +LeaveGap sym:chart2:RadioButton:TP_OPTIONS:RB_DONT_PAINT +AssumeZero sym:chart2:RadioButton:TP_OPTIONS:RB_ASSUME_ZERO +ContinueLine sym:chart2:RadioButton:TP_OPTIONS:RB_CONTINUE_LINE +IncludeHiddenCells sym:chart2:CheckBox:TP_OPTIONS:CB_INCLUDE_HIDDEN_CELLS + +*TabDataSourceName sym:extensions:TabPage:RID_PAGE_FINAL +SourceName sym:extensions:Edit:RID_PAGE_FINAL:ET_DATASOURCENAME *TabdBase sym:DBACCESS_HID_DSADMIN_PAGE_DBASE CharSet sym:DBACCESS_HID_DSADMIN_CHARSET DisplayInactiveRecords sym:DBACCESS_HID_DSADMIN_SHOWDELETED Indexes sym:DBACCESS_HID_DSADMIN_DBASE_INDICIES -*TabDefaultFieldSelection sym:dbp.TabPage.19723 -YesFollowing sym:dbp.RadioButton.19723.1 -NoSelected sym:dbp.RadioButton.19723.2 -Selection sym:dbp.ListBox.19723.3 +*TabDefaultFieldSelection sym:extensions:TabPage:RID_PAGE_DEFAULTFIELDSELECTION +YesFollowing sym:extensions:RadioButton:RID_PAGE_DEFAULTFIELDSELECTION:RB_DEFSELECTION_YES +NoSelected sym:extensions:RadioButton:RID_PAGE_DEFAULTFIELDSELECTION:RB_DEFSELECTION_NO +Selection sym:extensions:ListBox:RID_PAGE_DEFAULTFIELDSELECTION:LB_DEFSELECTIONFIELD -*TabDialogs sym:basctl.TabPage.14889 +*TabDialogs sym:basctl:TabPage:RID_TP_DLGS ModuleList sym:BASCTL_HID_BASICIDE_MODULES_TREE -Edit sym:basctl.PushButton.14889.4 -NewModule sym:basctl.PushButton.14889.6 -NewDialog sym:basctl.PushButton.14889.7 -Delete sym:basctl.PushButton.14889.8 +Edit sym:basctl:PushButton:RID_TP_DLGS:RID_PB_EDIT +NewModule sym:basctl:PushButton:RID_TP_DLGS:RID_PB_NEWMOD +NewDialog sym:basctl:PushButton:RID_TP_DLGS:RID_PB_NEWDLG +Delete sym:basctl:PushButton:RID_TP_DLGS:RID_PB_DELETE diff --git a/testautomation/global/win/etab_e_g.win b/testautomation/global/win/etab_e_g.win index 452b18888645..3eba64da8097 100644 --- a/testautomation/global/win/etab_e_g.win +++ b/testautomation/global/win/etab_e_g.win @@ -1,43 +1,43 @@ -*TabEffect sym:sd.TabPage.20871 -Sound sym:sd.ListBox.20871.11 -Play sym:sd.PushButton.20871.12 -AfterAnimation sym:sd.ListBox.20871.14 -Dimcolor sym:sd.ListBox.20871.16 -TextAnimation sym:sd.ListBox.20871.18 -DelayBetweenCharacters sym:sd.MetricField.20871.19 +*TabEffect sym:sd:TabPage:RID_TP_CUSTOMANIMATION_EFFECT +Sound sym:sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_SOUND +Play sym:sd:PushButton:RID_TP_CUSTOMANIMATION_EFFECT:PB_SOUND_PREVIEW +AfterAnimation sym:sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_AFTER_EFFECT +Dimcolor sym:sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:CLB_DIMCOLOR +TextAnimation sym:sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_TEXT_ANIM +DelayBetweenCharacters sym:sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_TEXT_DELAY *TabEmail sym:CUI_HID_OPTIONS_MAIL -EmailProgram sym:cui.Edit.10155.4 -EmailOpen sym:cui.PushButton.10155.5 +EmailProgram sym:cui:Edit:RID_SVXPAGE_INET_MAIL:ED_MAILERURL +EmailOpen sym:cui:PushButton:RID_SVXPAGE_INET_MAIL:PB_MAILERURL *TabEntrance sym:SD_HID_SD_CUSTOMANIMATIONDIALOG_ENTRANCE -Effects sym:sd.ListBox.20874.1 -Speed sym:sd.ComboBox.20874.3 -AutomaticPreview sym:sd.CheckBox.20874.4 +Effects sym:sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS +Speed sym:sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED +AutomaticPreview sym:sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW *TabEmphasis sym:SD_HID_SD_CUSTOMANIMATIONDIALOG_EMPHASIS -Effects sym:sd.ListBox.20874.1 -Speed sym:sd.ComboBox.20874.3 -AutomaticPreview sym:sd.CheckBox.20874.4 +Effects sym:sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS +Speed sym:sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED +AutomaticPreview sym:sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW *TabExit sym:SD_HID_SD_CUSTOMANIMATIONDIALOG_EXIT -Effects sym:sd.ListBox.20874.1 -Speed sym:sd.ComboBox.20874.3 -AutomaticPreview sym:sd.CheckBox.20874.4 +Effects sym:sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS +Speed sym:sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED +AutomaticPreview sym:sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW *TabMotionPaths sym:SD_HID_SD_CUSTOMANIMATIONDIALOG_MOTIONPATH -Effects sym:sd.ListBox.20874.1 -Speed sym:sd.ComboBox.20874.3 -AutomaticPreview sym:sd.CheckBox.20874.4 +Effects sym:sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS +Speed sym:sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED +AutomaticPreview sym:sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW *TabEnvelope sym:SW_HID_ENV_ENV -Addressee sym:sw.MultiLineEdit.22752.2 -Sender sym:sw.CheckBox.22752.10 -SenderText sym:sw.MultiLineEdit.22752.11 -Database sym:sw.ListBox.22752.4 -Table sym:sw.ListBox.22752.6 -Datenbasefield sym:sw.ListBox.22752.9 -Apply sym:sw.ImageButton.22752.7 +Addressee sym:sw:MultiLineEdit:TP_ENV_ENV:EDT_ADDR +Sender sym:sw:CheckBox:TP_ENV_ENV:BOX_SEND +SenderText sym:sw:MultiLineEdit:TP_ENV_ENV:EDT_SEND +Database sym:sw:ListBox:TP_ENV_ENV:LB_DATABASE +Table sym:sw:ListBox:TP_ENV_ENV:LB_TABLE +Datenbasefield sym:sw:ListBox:TP_ENV_ENV:LB_DBFIELD +Apply sym:sw:ImageButton:TP_ENV_ENV:BTN_INSERT Print sym:SW_HID_ENVELOP_PRINT Insert sym:SW_HID_ENVELOP_INSERT Back sym:SFX2_HID_TABDLG_RESET_BTN @@ -70,9 +70,9 @@ PBMouseExited sym:EXTENSIONS_UID_BRWEVT_MOUSEEXITED *TabEventsForm sym:EXTENSIONS_HID_FM_PROPDLG_TAB_EVT -*TabFieldLink sym:dbp.TabPage.19729 -ValueTable sym:dbp.ComboBox.19729.1 -ListTable sym:dbp.ComboBox.19729.2 +*TabFieldLink sym:extensions:TabPage:RID_PAGE_LCW_FIELDLINK +ValueTable sym:extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_VALUELISTFIELD +ListTable sym:extensions:ComboBox:RID_PAGE_LCW_FIELDLINK:CMB_TABLEFIELD *TabFieldProperties sym:DBACCESS_HID_TAB_DESIGN_FIELDCONTROL IntLength sym:DBACCESS_HID_TAB_ENT_LEN @@ -83,108 +83,108 @@ DefaultValue sym:DBACCESS_HID_TAB_ENT_DEFAULT FormatExample sym:DBACCESS_HID_TAB_ENT_FORMAT_SAMPLE BrowseBtm sym:DBACCESS_HID_TAB_ENT_FORMAT -*TabFieldSelection sym:dbp.TabPage.19728 -ExistingFields sym:dbp.ListBox.19728.6 -DisplayField sym:dbp.Edit.19728.4 +*TabFieldSelection sym:extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_FIELD +ExistingFields sym:extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_FIELD:LB_SELECTFIELD +DisplayField sym:extensions:Edit:RID_PAGE_LCW_CONTENTSELECTION_FIELD:ET_DISPLAYEDFIELD *TabFirstStartOnlineUpdate sym:DESKTOP_HID_FIRSTSTART_UPDATE_CHECK -CheckForUpdates sym:dkt.CheckBox.3008.3 +CheckForUpdates sym:desktop:CheckBox:TP_UPDATE_CHECK:CB_UPDATE_CHECK *TabFirstStartLicense sym:DESKTOP_HID_FIRSTSTART_LICENSE -LicenseText sym:dkt.MultiLineEdit.3007.6 -ScrollDown sym:dkt.PushButton.3007.7 +LicenseText sym:desktop:MultiLineEdit:TP_LICENSE:ML_LICENSE +ScrollDown sym:desktop:PushButton:TP_LICENSE:PB_LICENSE_DOWN *TabFirstStartRegistration sym:DESKTOP_HID_FIRSTSTART_REGISTRATION -RegisterNow sym:dkt.RadioButton.3004.5 -RegisterLater sym:dkt.RadioButton.3004.6 -DoNotWantRegister sym:dkt.RadioButton.3004.7 +RegisterNow sym:desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NOW +RegisterLater sym:desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_LATER +DoNotWantRegister sym:desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NEVER *TabFirstStartUser sym:DESKTOP_HID_FIRSTSTART_USER -FirstName sym:dkt.Edit.3006.16 -LastName sym:dkt.Edit.3006.17 -Initials sym:dkt.Edit.3006.19 -FathersName sym:dkt.Edit.3006.18 +FirstName sym:desktop:Edit:TP_USER:ED_USER_FIRST +LastName sym:desktop:Edit:TP_USER:ED_USER_LAST +Initials sym:desktop:Edit:TP_USER:ED_USER_INITIALS +FathersName sym:desktop:Edit:TP_USER:ED_USER_FATHER *TabFirstStartWelcome sym:DESKTOP_HID_FIRSTSTART_WELCOME *TabFont sym:CUI_HID_SVXPAGE_CHAR_NAME -Font sym:cui.ComboBox.10239.424 -Style sym:cui.ComboBox.10239.426 -Size sym:cui.MetricBox.10239.428 -Language sym:cui.ListBox.10239.430 -FontWest sym:cui.ComboBox.10239.102 -StyleWest sym:cui.ComboBox.10239.104 -SizeWest sym:cui.MetricBox.10239.106 -LanguageWest sym:cui.ListBox.10239.108 -FontEast sym:cui.ComboBox.10239.112 -StyleEast sym:cui.ComboBox.10239.114 -SizeEast sym:cui.MetricBox.10239.116 -LanguageEast sym:cui.ListBox.10239.118 -FontCTL sym:cui.ComboBox.10239.122 -StyleCTL sym:cui.ComboBox.10239.124 -SizeCTL sym:cui.MetricBox.10239.126 -LanguageCTL sym:cui.ListBox.10239.128 -Color sym:cui.ListBox.10239.142 +Font sym:cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME_NOCJK +Style sym:cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE_NOCJK +Size sym:cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE_NOCJK +Language sym:cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG_NOCJK +FontWest sym:cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_NAME +StyleWest sym:cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_STYLE +SizeWest sym:cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_SIZE +LanguageWest sym:cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_WEST_LANG +FontEast sym:cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_NAME +StyleEast sym:cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_STYLE +SizeEast sym:cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_SIZE +LanguageEast sym:cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_EAST_LANG +FontCTL sym:cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_NAME +StyleCTL sym:cui:ComboBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_STYLE +SizeCTL sym:cui:MetricBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_SIZE +LanguageCTL sym:cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_CTL_LANG +Color sym:cui:ListBox:RID_SVXPAGE_CHAR_NAME:LB_COLOR2 *TabFontEffects sym:CUI_HID_SVXPAGE_CHAR_EFFECTS -Underline sym:cui.ListBox.10240.228 -Color sym:cui.ListBox.10240.230 -Effects sym:cui.ListBox.10240.205 -StrikeThrough sym:cui.ListBox.10240.226 -IndividualWords sym:cui.CheckBox.10240.231 -Emphasis sym:cui.ListBox.10240.242 -Position sym:cui.ListBox.10240.244 -Outline sym:cui.TriStateBox.10240.208 -Overline sym:cui.ListBox.10240.222 -OverlineColor sym:cui.ListBox.10240.224 -Shadow sym:cui.TriStateBox.10240.209 -Blinking sym:cui.TriStateBox.10240.210 -Relief sym:cui.ListBox.10240.207 -FontColor sym:cui.ListBox.10240.202 -Hidden sym:cui.TriStateBox.10240.211 +Underline sym:cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE +Color sym:cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_UNDERLINE_COLOR +Effects sym:cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EFFECTS2 +StrikeThrough sym:cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_STRIKEOUT +IndividualWords sym:cui:CheckBox:RID_SVXPAGE_CHAR_EFFECTS:CB_INDIVIDUALWORDS +Emphasis sym:cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_EMPHASIS +Position sym:cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_POSITION +Outline sym:cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_OUTLINE +Overline sym:cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE +OverlineColor sym:cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_OVERLINE_COLOR +Shadow sym:cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_SHADOW +Blinking sym:cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_BLINKING +Relief sym:cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_RELIEF +FontColor sym:cui:ListBox:RID_SVXPAGE_CHAR_EFFECTS:LB_FONTCOLOR +Hidden sym:cui:TriStateBox:RID_SVXPAGE_CHAR_EFFECTS:CB_CHARHIDDEN *TabFontPosition sym:CUI_HID_SVXPAGE_CHAR_POSITION -SuperScript sym:cui.RadioButton.10241.301 -Normal sym:cui.RadioButton.10241.302 -Subscript sym:cui.RadioButton.10241.303 -RaiseLower sym:cui.MetricField.10241.305 -RelativeFontSize sym:cui.MetricField.10241.308 -Automatic sym:cui.CheckBox.10241.306 -n0Degree sym:cui.RadioButton.10241.311 -n90Degree sym:cui.RadioButton.10241.312 -n270Degree sym:cui.RadioButton.10241.313 -FitToLine sym:cui.CheckBox.10241.314 -ScaleWith sym:cui.MetricField.10241.316 -Spacing sym:cui.ListBox.10241.321 -SpacingBy sym:cui.MetricField.10241.323 -PairKerning sym:cui.CheckBox.10241.324 -Super sym:cui.RadioButton.10241.301 +SuperScript sym:cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS +Normal sym:cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_NORMALPOS +Subscript sym:cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_LOWPOS +RaiseLower sym:cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_HIGHLOW +RelativeFontSize sym:cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_FONTSIZE +Automatic sym:cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_HIGHLOW +n0Degree sym:cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_0_DEG +n90Degree sym:cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_90_DEG +n270Degree sym:cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_270_DEG +FitToLine sym:cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_FIT_TO_LINE +ScaleWith sym:cui:MetricField:RID_SVXPAGE_CHAR_POSITION:MF_SCALE_WIDTH +Spacing sym:cui:ListBox:RID_SVXPAGE_CHAR_POSITION:LB_KERNING2 +SpacingBy sym:cui:MetricField:RID_SVXPAGE_CHAR_POSITION:ED_KERNING2 +PairKerning sym:cui:CheckBox:RID_SVXPAGE_CHAR_POSITION:CB_PAIRKERNING +Super sym:cui:RadioButton:RID_SVXPAGE_CHAR_POSITION:RB_HIGHPOS *TabFormat3dViewGeometry sym:CHART2_HID_3D_VIEW - AxisRotationXaxis sym:chartcontroller.MetricField.915.1 - AxisRotationYaxis sym:chartcontroller.MetricField.915.2 - AxisRotationZaxis sym:chartcontroller.MetricField.915.3 - Perspective sym:chartcontroller.CheckBox.915.1 + AxisRotationXaxis sym:chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_X_ROTATION + AxisRotationYaxis sym:chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Y_ROTATION + AxisRotationZaxis sym:chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Z_ROTATION + Perspective sym:chart2:CheckBox:TP_3D_SCENEGEOMETRY:CBX_PERSPECTIVE -*TabFormat3dViewAppearance sym:chartcontroller.TabPage.916 - Scheme sym:chartcontroller.ListBox.916.2 - RoundedEdges sym:chartcontroller.CheckBox.916.3 - Shading sym:chartcontroller.CheckBox.916.2 - ObjectBorders sym:chartcontroller.CheckBox.916.1 +*TabFormat3dViewAppearance sym:chart2:TabPage:TP_3D_SCENEAPPEARANCE + Scheme sym:chart2:ListBox:TP_3D_SCENEAPPEARANCE:LB_SCHEME + RoundedEdges sym:chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_ROUNDEDEDGE + Shading sym:chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_SHADING + ObjectBorders sym:chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_OBJECTLINES -*TabFormat3dViewIllumination sym:chartcontroller.TabPage.917 - LightSource1 sym:chartcontroller.ImageButton.917.3 - LightSource2 sym:chartcontroller.ImageButton.917.4 - LightSource3 sym:chartcontroller.ImageButton.917.5 - LightSource4 sym:chartcontroller.ImageButton.917.6 - LightSource5 sym:chartcontroller.ImageButton.917.7 - LightSource6 sym:chartcontroller.ImageButton.917.8 - LightSource7 sym:chartcontroller.ImageButton.917.9 - LightSource8 sym:chartcontroller.ImageButton.917.10 - Color sym:chartcontroller.ListBox.917.2 - ColorSelect sym:chartcontroller.ImageButton.917.2 - AmbientLight sym:chartcontroller.ListBox.917.1 - AmbientLightSelect sym:chartcontroller.ImageButton.917.1 +*TabFormat3dViewIllumination sym:chart2:TabPage:TP_3D_SCENEILLUMINATION + LightSource1 sym:chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_1 + LightSource2 sym:chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_2 + LightSource3 sym:chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_3 + LightSource4 sym:chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_4 + LightSource5 sym:chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_5 + LightSource6 sym:chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_6 + LightSource7 sym:chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_7 + LightSource8 sym:chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_8 + Color sym:chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_LIGHTSOURCE + ColorSelect sym:chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHTSOURCE_COLOR + AmbientLight sym:chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_AMBIENTLIGHT + AmbientLightSelect sym:chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_AMBIENT_COLOR *TabFormatChartTitleAlignment sym:CHART2_HID_SCH_ALIGNMENT AngleKnob sym:CHART2_HID_SCH_ALIGNMENT_CTR_DIAL @@ -194,35 +194,35 @@ Super sym:cui.RadioButton.10241.301 TextDirection2 sym:CHART2_HID_SCH_TEXTDIRECTION_EQUATION *TabFormatChartLine sym:CUI_HID_LINE_LINE - Style sym:cui.ListBox.10051.2 - Color sym:cui.ListBox.10051.1 - Width sym:cui.MetricField.10051.1 - Transparency sym:cui.MetricField.10051.5 - StyleLeft sym:cui.ListBox.10051.3 - WidthLeft sym:cui.MetricField.10051.3 - CenterLeft sym:cui.TriStateBox.10051.4 - StyleRight sym:cui.ListBox.10051.4 - WidthRight sym:cui.MetricField.10051.2 - CenterRight sym:cui.TriStateBox.10051.5 - SynchroniteEnds sym:cui.CheckBox.10051.1 - CornerStyle sym:cui.ListBox.10051.5 - IconSelect sym:cui.MenuButton.10051.26 - IconWidth sym:cui.MetricField.10051.22 - IconHeigth sym:cui.MetricField.10051.23 - KeepRatio sym:cui.CheckBox.10051.24 + Style sym:cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE + Color sym:cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR + Width sym:cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH + Transparency sym:cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT + StyleLeft sym:cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE + WidthLeft sym:cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH + CenterLeft sym:cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START + StyleRight sym:cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE + WidthRight sym:cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH + CenterRight sym:cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END + SynchroniteEnds sym:cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE + CornerStyle sym:cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE + IconSelect sym:cui:MenuButton:RID_SVXPAGE_LINE:MB_SYMBOL_BITMAP + IconWidth sym:cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_WIDTH + IconHeigth sym:cui:MetricField:RID_SVXPAGE_LINE:MF_SYMBOL_HEIGHT + KeepRatio sym:cui:CheckBox:RID_SVXPAGE_LINE:CB_SYMBOL_RATIO +TabFormatChartBorders TabFormatChartLine *TabFormatEnvelope sym:SW_HID_ENV_FMT -AddresseeFromLeft sym:sw.MetricField.22753.14 -AddresseeFromRight sym:sw.MetricField.22753.16 -AddresseeEdit sym:sw.MenuButton.22753.18 -SenderFromLeft sym:sw.MetricField.22753.24 -SenderFromRight sym:sw.MetricField.22753.26 -SenderEdit sym:sw.MenuButton.22753.28 -SizeFormat sym:sw.ListBox.22753.33 -SizeWidth sym:sw.MetricField.22753.35 -SizeHeight sym:sw.MetricField.22753.37 +AddresseeFromLeft sym:sw:MetricField:TP_ENV_FMT:FLD_ADDR_LEFT +AddresseeFromRight sym:sw:MetricField:TP_ENV_FMT:FLD_ADDR_TOP +AddresseeEdit sym:sw:MenuButton:TP_ENV_FMT:BTN_ADDR_EDIT +SenderFromLeft sym:sw:MetricField:TP_ENV_FMT:FLD_SEND_LEFT +SenderFromRight sym:sw:MetricField:TP_ENV_FMT:FLD_SEND_TOP +SenderEdit sym:sw:MenuButton:TP_ENV_FMT:BTN_SEND_EDIT +SizeFormat sym:sw:ListBox:TP_ENV_FMT:BOX_SIZE_FORMAT +SizeWidth sym:sw:MetricField:TP_ENV_FMT:FLD_SIZE_WIDTH +SizeHeight sym:sw:MetricField:TP_ENV_FMT:FLD_SIZE_HEIGHT *TabGeneral sym:DBACCESS_HID_DSADMIN_PAGE_GENERAL DatabaseType sym:DBACCESS_HID_DSADMIN_DSTYPE @@ -353,22 +353,22 @@ Width sym:EXTENSIONS_HID_PROP_WIDTH WordBreak sym:EXTENSIONS_HID_PROP_WORDBREAK *TabGrid sym:SW_HID_TEXTGRID_PAGE -NoGrid sym:sw.RadioButton.20901.2 -LinesGrid sym:sw.RadioButton.20901.3 -CharsGrid sym:sw.RadioButton.20901.4 -LinesPerPage sym:sw.NumericField.20901.8 -TextSize sym:sw.MetricField.20901.11 -CharsPerLine sym:sw.NumericField.20901.13 -RubySize sym:sw.MetricField.20901.16 -RubyBelow sym:sw.CheckBox.20901.17 -Display sym:sw.CheckBox.20901.19 -PrintGrid sym:sw.CheckBox.20901.20 -Color sym:sw.ListBox.20901.22 +NoGrid sym:sw:RadioButton:TP_TEXTGRID_PAGE:RB_NOGRID +LinesGrid sym:sw:RadioButton:TP_TEXTGRID_PAGE:RB_LINESGRID +CharsGrid sym:sw:RadioButton:TP_TEXTGRID_PAGE:RB_CHARSGRID +LinesPerPage sym:sw:NumericField:TP_TEXTGRID_PAGE:NF_LINESPERPAGE +TextSize sym:sw:MetricField:TP_TEXTGRID_PAGE:MF_TEXTSIZE +CharsPerLine sym:sw:NumericField:TP_TEXTGRID_PAGE:NF_CHARSPERLINE +RubySize sym:sw:MetricField:TP_TEXTGRID_PAGE:MF_RUBYSIZE +RubyBelow sym:sw:CheckBox:TP_TEXTGRID_PAGE:CB_RUBYBELOW +Display sym:sw:CheckBox:TP_TEXTGRID_PAGE:CB_DISPLAY +PrintGrid sym:sw:CheckBox:TP_TEXTGRID_PAGE:CB_PRINT +Color sym:sw:ListBox:TP_TEXTGRID_PAGE:LB_COLOR -*TabGroupBoxData sym:dbp.TabPage.19722 -Address sym:.uno:OpenUrl -Names sym:dbp.Edit.19722.1 -AddTo sym:dbp.PushButton.19722.1 -RemoveFrom sym:dbp.PushButton.19722.2 -OptionFields sym:dbp.ListBox.19722.3 +*TabGroupBoxData sym:extensions:TabPage:RID_PAGE_GROUPRADIOSELECTION +Address .uno:OpenUrl +Names sym:extensions:Edit:RID_PAGE_GROUPRADIOSELECTION:ET_RADIOLABELS +AddTo sym:extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETORIGHT +RemoveFrom sym:extensions:PushButton:RID_PAGE_GROUPRADIOSELECTION:PB_MOVETOLEFT +OptionFields sym:extensions:ListBox:RID_PAGE_GROUPRADIOSELECTION:LB_RADIOBUTTONS diff --git a/testautomation/global/win/etab_h_o.win b/testautomation/global/win/etab_h_o.win index b2f3bbb6754a..2d2f072e610e 100644 --- a/testautomation/global/win/etab_h_o.win +++ b/testautomation/global/win/etab_h_o.win @@ -2,47 +2,47 @@ HelpText sym:DBACCESS_HID_TABLE_DESIGN_HELP_WINDOW *TabInternet sym:SFX2_HID_DOCINFORELOAD -DoNotRefreshAutomatically sym:sfx.RadioButton.273.63 -RefreshThisDocument sym:sfx.RadioButton.273.64 -RedirectFromThisDocument sym:sfx.RadioButton.273.65 -TimeReload sym:sfx.NumericField.273.67 -TimeForward sym:sfx.NumericField.273.70 -URL sym:sfx.Edit.273.44 -BrowseURL sym:sfx.PushButton.273.74 -Frame sym:sfx.ComboBox.273.73 - -*TabOOoImprovement sym:cui.TabPage.10302 -ParticipateYes sym:cui.RadioButton.10302.12 -ParticipateNo sym:cui.RadioButton.10302.13 -ShowData sym:cui.PushButton.10302.19 +DoNotRefreshAutomatically sym:sfx2:RadioButton:TP_DOCINFORELOAD:RB_NOAUTOUPDATE +RefreshThisDocument sym:sfx2:RadioButton:TP_DOCINFORELOAD:RB_RELOADUPDATE +RedirectFromThisDocument sym:sfx2:RadioButton:TP_DOCINFORELOAD:RB_FORWARDUPDATE +TimeReload sym:sfx2:NumericField:TP_DOCINFORELOAD:ED_RELOAD +TimeForward sym:sfx2:NumericField:TP_DOCINFORELOAD:ED_FORWARD +URL sym:sfx2:Edit:TP_DOCINFORELOAD:ED_URL +BrowseURL sym:sfx2:PushButton:TP_DOCINFORELOAD:PB_BROWSEURL +Frame sym:sfx2:ComboBox:TP_DOCINFORELOAD:CB_FRAME + +*TabOOoImprovement sym:cui:TabPage:RID_SVXPAGE_IMPROVEMENT +ParticipateYes sym:cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_YES +ParticipateNo sym:cui:RadioButton:RID_SVXPAGE_IMPROVEMENT:RB_NO +ShowData sym:cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA *TabJava sym:CUI_HID_OPTIONS_JAVA -UseJava sym:cui.CheckBox.10253.11 +UseJava sym:cui:CheckBox:RID_SVXPAGE_OPTIONS_JAVA:CB_JAVA_ENABLE JavaList sym:CUI_HID_OPTIONS_JAVA_LIST -Add sym:cui.PushButton.10253.20 -Parameters sym:cui.PushButton.10253.21 -ClassPath sym:cui.PushButton.10253.22 +Add sym:cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_ADD +Parameters sym:cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_PARAMETER +ClassPath sym:cui:PushButton:RID_SVXPAGE_OPTIONS_JAVA:PB_CLASSPATH *TabJapaneseFind sym:CUI_HID_SVXPAGE_JSEARCH_OPTIONS -MatchCase sym:cui.CheckBox.10840.101 -MatchFullHalf sym:cui.CheckBox.10840.102 -MatchHiraganaKatakana sym:cui.CheckBox.10840.103 -MatchContractions sym:cui.CheckBox.10840.104 -MatchMinusDashChoOn sym:cui.CheckBox.10840.105 -MatchRepeatcharacterMarks sym:cui.CheckBox.10840.106 -MatchVariantFormKanji sym:cui.CheckBox.10840.107 -MatchOldKanaForms sym:cui.CheckBox.10840.108 -MatchDiZiDuZu sym:cui.CheckBox.10840.109 -MatchBaVaHaFa sym:cui.CheckBox.10840.110 -MatchTsiThiChiDhiZi sym:cui.CheckBox.10840.111 -MatchHyuFyuByuVyu sym:cui.CheckBox.10840.112 -MatchDeSheZeJe sym:cui.CheckBox.10840.113 -MatchIaIya sym:cui.CheckBox.10840.114 -MatchKiKu sym:cui.CheckBox.10840.115 -PunctuationCharacters sym:cui.CheckBox.10840.201 -WhitespaceCharacters sym:cui.CheckBox.10840.202 -ProlongedSoundmarks sym:cui.CheckBox.10840.203 -MiddleDots sym:cui.CheckBox.10840.204 +MatchCase sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CASE +MatchFullHalf sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_FULL_HALF_WIDTH +MatchHiraganaKatakana sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HIRAGANA_KATAKANA +MatchContractions sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_CONTRACTIONS +MatchMinusDashChoOn sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_MINUS_DASH_CHOON +MatchRepeatcharacterMarks sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_REPEAT_CHAR_MARKS +MatchVariantFormKanji sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_VARIANT_FORM_KANJI +MatchOldKanaForms sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_OLD_KANA_FORMS +MatchDiZiDuZu sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_DIZI_DUZU +MatchBaVaHaFa sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_BAVA_HAFA +MatchTsiThiChiDhiZi sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_TSITHICHI_DHIZI +MatchHyuFyuByuVyu sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_HYUFYU_BYUVYU +MatchDeSheZeJe sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_SESHE_ZEJE +MatchIaIya sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_IAIYA +MatchKiKu sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_KIKU +PunctuationCharacters sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_PUNCTUATION +WhitespaceCharacters sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_WHITESPACES +ProlongedSoundmarks sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_MATCH_PROLONGED_SOUNDMARK +MiddleDots sym:cui:CheckBox:RID_SVXPAGE_JSEARCH_OPTIONS:CB_IGNORE_MIDDLE_DOT *TabJDBC sym:DBACCESS_HID_DSADMIN_PAGE_JDBC JDBCDriverClass sym:DBACCESS_HID_DSADMIN_DRIVERCLASS @@ -61,58 +61,58 @@ Records sym:DBACCESS_HID_DSADMIN_LDAP_ROWCOUNT PostionTop sym:CHART2_HID_SCH_LEGEND_POS_TOP PostionRight sym:CHART2_HID_SCH_LEGEND_POS_RIGHT PostionBottom sym:CHART2_HID_SCH_LEGEND_POS_BOTTOM - TextDirection sym:chartcontroller.ListBox.900.4 + TextDirection sym:chart2:ListBox:TP_LEGEND_POS:LB_LEGEND_TEXTDIR -*TabListBoxData sym:dbp.TabPage.19721 -DataSource sym:dbp.ListBox.19721.1 -Table sym:dbp.ListBox.19721.2 +*TabListBoxData sym:extensions:TabPage:RID_PAGE_TABLESELECTION +DataSource sym:extensions:ListBox:RID_PAGE_TABLESELECTION:LB_DATASOURCE +Table sym:extensions:ListBox:RID_PAGE_TABLESELECTION:LB_TABLE *TabLocalizedOptions sym:CUI_HID_OFAPAGE_AUTOCORR_QUOTE LocalizedOptionsList sym:CUI_HID_OFAPAGE_QUOTE_CLB LocalizedOptions sym:CUI_HID_OFAPAGE_QUOTE_SW_CLB -SingleQuotesReplace sym:cui.CheckBox.17009.57 -SingleQuotesStart sym:cui.PushButton.17009.46 -SingleQuotesEnd sym:cui.PushButton.17009.48 -SingleQuotesDefault sym:cui.PushButton.17009.49 -DoubleQuotesReplace sym:cui.CheckBox.17009.11 -DoubleQuotesStart sym:cui.PushButton.17009.13 -DoubleQuotesEnd sym:cui.PushButton.17009.15 -DoubleQuotesDefault sym:cui.PushButton.17009.50 +SingleQuotesReplace sym:cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_SGL_TYPO +SingleQuotesStart sym:cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STARTQUOTE +SingleQuotesEnd sym:cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_ENDQUOTE +SingleQuotesDefault sym:cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_SGL_STD +DoubleQuotesReplace sym:cui:CheckBox:RID_OFAPAGE_AUTOCORR_QUOTE:CB_TYPO +DoubleQuotesStart sym:cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_STARTQUOTE +DoubleQuotesEnd sym:cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_ENDQUOTE +DoubleQuotesDefault sym:cui:PushButton:RID_OFAPAGE_AUTOCORR_QUOTE:PB_DBL_STD *TabMailMergeEMail sym:SW_HID_TP_MAILCONFIG -YourName sym:sw.Edit.20904.3 -EmailAddress sym:sw.Edit.20904.5 -SendReplies sym:sw.CheckBox.20904.6 -ReplyAddress sym:sw.Edit.20904.8 -ServerName sym:sw.Edit.20904.11 -Port sym:sw.NumericField.20904.13 -UseSecure sym:sw.CheckBox.20904.14 -ServerAuthentication sym:sw.PushButton.20904.16 -TestSettings sym:sw.PushButton.20904.21 +YourName sym:sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME +EmailAddress sym:sw:Edit:TP_MAILCONFIG:ED_ADDRESS +SendReplies sym:sw:CheckBox:TP_MAILCONFIG:CB_REPLYTO +ReplyAddress sym:sw:Edit:TP_MAILCONFIG:ED_REPLYTO +ServerName sym:sw:Edit:TP_MAILCONFIG:ED_SERVER +Port sym:sw:NumericField:TP_MAILCONFIG:NF_PORT +UseSecure sym:sw:CheckBox:TP_MAILCONFIG:CB_SECURE +ServerAuthentication sym:sw:PushButton:TP_MAILCONFIG:PB_AUTHENTICATION +TestSettings sym:sw:PushButton:TP_MAILCONFIG:PB_TEST *TabMailMergeSourceDocument sym:SW_HID_MM_DOCSELECTPAGE -UseTheCurrentDocument sym:sw.RadioButton.22054.2 -CreateANewDocument sym:sw.RadioButton.22054.3 -StartFromExistingDocument sym:sw.RadioButton.22054.4 -StartFromATemplate sym:sw.RadioButton.22054.6 -StartFromRecentlySaved sym:sw.RadioButton.22054.8 -BrowseDocument sym:sw.PushButton.22054.5 -BrowseTemplate sym:sw.PushButton.22054.7 -RecentDocument sym:sw.ListBox.22054.9 +UseTheCurrentDocument sym:sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_CURRENTDOC +CreateANewDocument sym:sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_NEWDOC +StartFromExistingDocument sym:sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADDOC +StartFromATemplate sym:sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADTEMPLATE +StartFromRecentlySaved sym:sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_RECENTDOC +BrowseDocument sym:sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_LOADDOC +BrowseTemplate sym:sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_BROWSETEMPLATE +RecentDocument sym:sw:ListBox:DLG_MM_DOCSELECT_PAGE:LB_RECENTDOC *TabMailMergeDocumentType sym:SW_HID_MM_OUTPUTTYPEPAGE -Letter sym:sw.RadioButton.22055.2 -MailMessage sym:sw.RadioButton.22055.3 +Letter sym:sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_LETTER +MailMessage sym:sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_MAIL *TabMailMergeAddressBlock sym:SW_HID_MM_ADDRESSBLOCKPAGE -SelectAddressListButton sym:sw.PushButton.22056.2 -Addressblock sym:sw.CheckBox.22056.6 -More sym:sw.PushButton.22056.5 -MatchFields sym:sw.PushButton.22056.9 -PreviewAddressBlock sym:sw.ImageButton.22056.11 -PreviewNextAddressBlock sym:sw.ImageButton.22056.12 -MatchFieldsButton sym:sw.PushButton.22056.9 -SuppressLines sym:sw.CheckBox.22056.75 +SelectAddressListButton sym:sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ADDRESSLIST +Addressblock sym:sw:CheckBox:DLG_MM_ADDRESSBLOCK_PAGE:CB_ADDRESS +More sym:sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_SETTINGS +MatchFields sym:sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ASSIGN +PreviewAddressBlock sym:sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_PREVSET +PreviewNextAddressBlock sym:sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_NEXTSET +MatchFieldsButton sym:sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ASSIGN +SuppressLines sym:sw:CheckBox:DLG_MM_ADDRESSBLOCK_PAGE:CB_HIDE_EMPTY_PARA *TabMailMergeGreetingsPage sym:SW_HID_MM_GREETINGSPAGE GreetingPersonalized sym:SW_HID_MM_GREETINGS_CB_PERSONALIZED @@ -123,95 +123,95 @@ GreetingButtonMale sym:SW_HID_MM_GREETINGS_PB_MALE GreetingListBoxFemaleColumn sym:SW_HID_MM_GREETINGS_LB_FEMALECOLUMN GreetingComboBoxFemale sym:SW_HID_MM_GREETINGS_CB_FEMALEFIELD GreetingComboBoxNeutral sym:SW_HID_MM_GREETINGS_CB_NEUTRAL -MatchFields sym:sw.PushButton.22057.18 -PreviewPreviousSalutation sym:sw.ImageButton.22057.20 -PreviewNextSalutation sym:sw.ImageButton.22057.21 +MatchFields sym:sw:PushButton:DLG_MM_GREETINGS_PAGE:PB_ASSIGN +PreviewPreviousSalutation sym:sw:ImageButton:DLG_MM_GREETINGS_PAGE:IB_PREVSET +PreviewNextSalutation sym:sw:ImageButton:DLG_MM_GREETINGS_PAGE:IB_NEXTSET *TabMailMergeLayoutPage sym:SW_HID_MM_LAYOUT_PAGE -LayoutAlignButton sym:sw.CheckBox.22072.12 -LayoutLeftBorder sym:sw.MetricField.22072.4 -LayoutTopBorder sym:sw.MetricField.22072.6 -LayoutTopButton sym:sw.PushButton.22072.9 -LayoutDownButton sym:sw.PushButton.22072.11 +LayoutAlignButton sym:sw:CheckBox:DLG_MM_LAYOUT_PAGE:CB_ALIGN +LayoutLeftBorder sym:sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_LEFT +LayoutTopBorder sym:sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_TOP +LayoutTopButton sym:sw:PushButton:DLG_MM_LAYOUT_PAGE:MF_UP +LayoutDownButton sym:sw:PushButton:DLG_MM_LAYOUT_PAGE:PB_DOWN LayoutScrollPageUp sym:SW_HID_SCRL_PAGEUP LayoutScrollPageDown sym:SW_HID_SCRL_PAGEDOWN LayoutHelpContentNavigation sym:SW_HID_SCRL_NAVI -LayoutZoomListBox sym:sw.ListBox.22072.15 +LayoutZoomListBox sym:sw:ListBox:DLG_MM_LAYOUT_PAGE:LB_ZOOM *TabMailMergeOutputPage sym:SW_HID_MM_OUTPUTPAGE -RBSaveStartDoc sym:sw.RadioButton.22060.3 -RBSaveMergedDoc sym:sw.RadioButton.22060.4 -RBPrintMerged sym:sw.RadioButton.22060.5 -RBSendAsMail sym:sw.RadioButton.22060.6 -PBSaveStartDoc sym:sw.PushButton.22060.8 -RBSaveAsOneDocument sym:sw.RadioButton.22060.12 -RBSaveIndividual sym:sw.RadioButton.22060.13 -RBPrintAll sym:sw.RadioButton.22060.24 -RBSendAll sym:sw.RadioButton.22060.39 -RBStartFrom sym:sw.RadioButton.22060.15 -NFFirstDataSet sym:sw.NumericField.22060.16 -NFLastDataSet sym:sw.NumericField.22060.18 -PBSaveNow sym:sw.PushButton.22060.19 -LBChoosePrinter sym:sw.ListBox.22060.22 -PBPrinterSettings sym:sw.PushButton.22060.23 -PBPrintNow sym:sw.PushButton.22060.26 -LBMailTo sym:sw.ListBox.22060.32 -PBCopyTo sym:sw.PushButton.22060.33 -PBEditSubject sym:sw.Edit.22060.35 -PBSendAs sym:sw.ListBox.22060.37 -EFEditAttachmentName sym:sw.Edit.22060.52 -PBProperties sym:sw.PushButton.22060.38 -PBSendDocuments sym:sw.PushButton.22060.40 +RBSaveStartDoc sym:sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVESTARTDOC +RBSaveMergedDoc sym:sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEMERGEDDOC +RBPrintMerged sym:sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_PRINT +RBSendAsMail sym:sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SENDMAIL +PBSaveStartDoc sym:sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SAVESTARTDOC +RBSaveAsOneDocument sym:sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEASONE +RBSaveIndividual sym:sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEINDIVIDUAL +RBPrintAll sym:sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_PRINTALL +RBSendAll sym:sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SENDALL +RBStartFrom sym:sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_FROM +NFFirstDataSet sym:sw:NumericField:DLG_MM_OUTPUT_PAGE:NF_FROM +NFLastDataSet sym:sw:NumericField:DLG_MM_OUTPUT_PAGE:NF_TO +PBSaveNow sym:sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SAVENOW +LBChoosePrinter sym:sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_PRINT +PBPrinterSettings sym:sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_PRINTERSETTINGS +PBPrintNow sym:sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_PRINTNOW +LBMailTo sym:sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_MAILTO +PBCopyTo sym:sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_COPYTO +PBEditSubject sym:sw:Edit:DLG_MM_OUTPUT_PAGE:ED_SUBJECT +PBSendAs sym:sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_SENDAS +EFEditAttachmentName sym:sw:Edit:DLG_MM_OUTPUT_PAGE:ED_ATTACHMENT +PBProperties sym:sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SENDAS +PBSendDocuments sym:sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SENDDOCUMENTS *TabMailMergePersonalize sym:SW_HID_MM_MERGEPAGE -EditIndividualButton sym:sw.PushButton.22059.3 -SearchDocumentButton sym:sw.Edit.22059.6 -FindButton sym:sw.PushButton.22059.7 -FindWholeWordsButton sym:sw.CheckBox.22059.8 -ToTopCheckBox sym:sw.CheckBox.22059.9 -MatchCaseCheckBox sym:sw.CheckBox.22059.10 +EditIndividualButton sym:sw:PushButton:DLG_MM_MERGE_PAGE:PB_EDIT +SearchDocumentButton sym:sw:Edit:DLG_MM_MERGE_PAGE:ED_FIND +FindButton sym:sw:PushButton:DLG_MM_MERGE_PAGE:PB_FIND +FindWholeWordsButton sym:sw:CheckBox:DLG_MM_MERGE_PAGE:CB_WHOLEWORDS +ToTopCheckBox sym:sw:CheckBox:DLG_MM_MERGE_PAGE:CB_BACKWARDS +MatchCaseCheckBox sym:sw:CheckBox:DLG_MM_MERGE_PAGE:CB_MATCHCASE *TabMailMergePrepare sym:SW_HID_MM_PREPAREMERGEPAGE -FirstRecordButton sym:sw.PushButton.22058.3 -PreviousRecordButton sym:sw.PushButton.22058.4 -SelectRecord sym:sw.NumericField.22058.5 -NextRecordButton sym:sw.PushButton.22058.6 -LastRecordButton sym:sw.PushButton.22058.7 -ExcludeCheckBox sym:sw.CheckBox.22058.8 -EditButton sym:sw.PushButton.22058.10 +FirstRecordButton sym:sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_FIRST +PreviousRecordButton sym:sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_PREV +SelectRecord sym:sw:NumericField:DLG_MM_PREPAREMERGE_PAGE:ED_RECORD +NextRecordButton sym:sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_NEXT +LastRecordButton sym:sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_LAST +ExcludeCheckBox sym:sw:CheckBox:DLG_MM_PREPAREMERGE_PAGE:CB_EXCLUDE +EditButton sym:sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT *TabMediaWiki sym:vnd.com.sun.star.wiki:settings *TabMemory sym:CUI_HID_OFA_TP_MEMORY -UndoSteps sym:cui.NumericField.17150.12 -StarOffice sym:cui.NumericField.17150.18 -MemoryPerObject sym:cui.NumericField.17150.20 -RemoveFromMemoryAfter sym:cui.TimeField.17150.22 -NumberOfObjects sym:cui.NumericField.17150.25 -LoadQuickstarter sym:cui.CheckBox.17150.27 +UndoSteps sym:cui:NumericField:OFA_TP_MEMORY:ED_UNDO +StarOffice sym:cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICCACHE +MemoryPerObject sym:cui:NumericField:OFA_TP_MEMORY:NF_GRAPHICOBJECTCACHE +RemoveFromMemoryAfter sym:cui:TimeField:OFA_TP_MEMORY:TF_GRAPHICOBJECTTIME +NumberOfObjects sym:cui:NumericField:OFA_TP_MEMORY:NF_OLECACHE +LoadQuickstarter sym:cui:CheckBox:OFA_TP_MEMORY:CB_QUICKLAUNCH -*TabMozillaPlugin sym:cui.TabPage.12161 -Enable sym:cui.CheckBox.12161.2 +*TabMozillaPlugin sym:cui:TabPage:RID_SVXPAGE_INET_MOZPLUGIN +Enable sym:cui:CheckBox:RID_SVXPAGE_INET_MOZPLUGIN:CB_MOZPLUGIN_CODE -*TabMySQLJDBC sym:dbu.TabPage.19220 +*TabMySQLJDBC sym:dbaccess:TabPage:PAGE_MYSQL_JDBC HostName sym:DBACCESS_HID_DSADMIN_HOSTNAME PortNumber sym:DBACCESS_HID_DSADMIN_PORTNUMBER -DriverClass sym:dbu.Edit.19220.4 +DriverClass sym:dbaccess:Edit:PAGE_MYSQL_JDBC:ET_JDBCDRIVERCLASS Charset sym:DBACCESS_HID_DSADMIN_CHARSET -TestClass sym:dbu.PushButton.19220.5 +TestClass sym:dbaccess:PushButton:PAGE_MYSQL_JDBC:PB_TESTDRIVERCLASS -*TabMySQLODBC sym:dbu.TabPage.19217 +*TabMySQLODBC sym:dbaccess:TabPage:PAGE_MYSQL_ODBC Charset sym:DBACCESS_HID_DSADMIN_CHARSET -*TabNameMatching sym:dbu.TabPage.19211 +*TabNameMatching sym:dbaccess:TabPage:TAB_WIZ_NAME_MATCHING RightColumnNames sym:DBACCESS_HID_TAB_NAMEMATCHING_COLS_AVAIL LeftColumnNames sym:DBACCESS_HID_TAB_NAMEMATCHING_COLS_ASSIGN -LeftColumnUp sym:dbu.ImageButton.19211.12 -LeftColumnDown sym:dbu.ImageButton.19211.13 -RightColumnUp sym:dbu.ImageButton.19211.14 -RightColumnDown sym:dbu.ImageButton.19211.15 -ColumnAll sym:dbu.PushButton.19211.16 -ColumnNone sym:dbu.PushButton.19211.17 +LeftColumnUp sym:dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP +LeftColumnDown sym:dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN +RightColumnUp sym:dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_UP_RIGHT +RightColumnDown sym:dbaccess:ImageButton:TAB_WIZ_NAME_MATCHING:IB_COLUMN_DOWN_RIGHT +ColumnAll sym:dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_ALL +ColumnNone sym:dbaccess:PushButton:TAB_WIZ_NAME_MATCHING:PB_NONE *TabODBC sym:DBACCESS_HID_DSADMIN_PAGE_ODBC Options sym:DBACCESS_HID_DSADMIN_ODBC_OPTIONS @@ -222,18 +222,18 @@ UseCatalogs sym:DBACCESS_HID_DSADMIN_USECATALOG +TabOfficeView TabAnsichtAllgemein *TabOnlineUpdate sym:CUI_HID_SVX_OPTIONS_ONLINEUPDATE -CheckAutomatically sym:cui.CheckBox.10298.11 -EveryDay sym:cui.RadioButton.10298.12 -EveryWeek sym:cui.RadioButton.10298.13 -EveryMonth sym:cui.RadioButton.10298.14 -CheckNow sym:cui.PushButton.10298.15 -DownloadAutomatically sym:cui.CheckBox.10298.16 -Change sym:cui.PushButton.10298.19 - -*TabOracleJDBC sym:dbu.TabPage.19227 +CheckAutomatically sym:cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTOCHECK +EveryDay sym:cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYDAY +EveryWeek sym:cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYWEEK +EveryMonth sym:cui:RadioButton:RID_SVXPAGE_ONLINEUPDATE:RB_EVERYMONTH +CheckNow sym:cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHECKNOW +DownloadAutomatically sym:cui:CheckBox:RID_SVXPAGE_ONLINEUPDATE:CB_AUTODOWNLOAD +Change sym:cui:PushButton:RID_SVXPAGE_ONLINEUPDATE:PB_CHANGEPATH + +*TabOracleJDBC sym:dbaccess:TabPage:PAGE_ORACLE_JDBC HostName sym:DBACCESS_HID_DSADMIN_HOSTNAME PortNumber sym:DBACCESS_HID_DSADMIN_PORTNUMBER -DriverClass sym:dbu.Edit.19227.4 +DriverClass sym:dbaccess:Edit:PAGE_ORACLE_JDBC:ET_JDBCDRIVERCLASS Charset sym:DBACCESS_HID_DSADMIN_CHARSET -TestClass sym:dbu.PushButton.19227.5 +TestClass sym:dbaccess:PushButton:PAGE_ORACLE_JDBC:PB_TESTDRIVERCLASS diff --git a/testautomation/global/win/etab_p_s.win b/testautomation/global/win/etab_p_s.win index 1f4706a4afb6..cd8aa37097cb 100644 --- a/testautomation/global/win/etab_p_s.win +++ b/testautomation/global/win/etab_p_s.win @@ -1,92 +1,92 @@ *TabPersonalDataMigration sym:DESKTOP_HID_FIRSTSTART_MIGRATION -TransferPersonalData sym:dkt.CheckBox.3005.3 +TransferPersonalData sym:desktop:CheckBox:TP_MIGRATION:CB_MIGRATION *TabPositionAndSize sym:CUI_HID_TRANS_POSITION_SIZE -PositionX sym:cui.MetricField.10087.7 -PositionY sym:cui.MetricField.10087.8 -Width sym:cui.MetricField.10087.17 -Height sym:cui.MetricField.10087.18 -KeepRatio sym:cui.CheckBox.10087.22 -ProtectPosition sym:cui.TriStateBox.10087.45 -ProtectSize sym:cui.TriStateBox.10087.46 -FitWidthText sym:cui.TriStateBox.10087.13 -FitHeightText sym:cui.TriStateBox.10087.12 -AnchorPosition sym:cui.ListBox.10087.40 -Anchor sym:cui.ListBox.10087.35 +PositionX sym:cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_X +PositionY sym:cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_POS_Y +Width sym:cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_WIDTH +Height sym:cui:MetricField:RID_SVXPAGE_POSITION_SIZE:MTR_FLD_HEIGHT +KeepRatio sym:cui:CheckBox:RID_SVXPAGE_POSITION_SIZE:CBX_SCALE +ProtectPosition sym:cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_POSPROTECT +ProtectSize sym:cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_SIZEPROTECT +FitWidthText sym:cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_WIDTH +FitHeightText sym:cui:TriStateBox:RID_SVXPAGE_POSITION_SIZE:TSB_AUTOGROW_HEIGHT +AnchorPosition sym:cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ORIENT +Anchor sym:cui:ListBox:RID_SVXPAGE_POSITION_SIZE:LB_ANCHOR PositionPosition sym:CUI_HID_TPPOSITION_CTRL SizePosition sym:CUI_HID_TPSIZE_CTRL *TabPositionAndSizeWriter sym:CUI_HID_SVXPAGE_SWPOSSIZE -Width sym:cui.MetricField.10288.3 -Height sym:cui.MetricField.10288.5 -KeepRatio sym:cui.CheckBox.10288.6 -Topage sym:cui.RadioButton.10288.9 -Toparagraph sym:cui.RadioButton.10288.10 -Tocharacter sym:cui.RadioButton.10288.11 -Ascharacter sym:cui.RadioButton.10288.12 -ToFrame sym:cui.RadioButton.10288.13 -ProtectPosition sym:cui.TriStateBox.10288.15 -ProtectSize sym:cui.TriStateBox.10288.16 -Horizontal sym:cui.ListBox.10288.19 -Horizontalby sym:cui.MetricField.10288.21 -Horizontalto sym:cui.ListBox.10288.23 -Mirror sym:cui.CheckBox.10288.24 -Vertical sym:cui.ListBox.10288.26 -Verticalby sym:cui.MetricField.10288.28 -Verticalto sym:cui.ListBox.10288.30 -Followtextflow sym:cui.CheckBox.10288.31 +Width sym:cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_WIDTH +Height sym:cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HEIGHT +KeepRatio sym:cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_KEEPRATIO +Topage sym:cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPAGE +Toparagraph sym:cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOPARA +Tocharacter sym:cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOCHAR +Ascharacter sym:cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_ASCHAR +ToFrame sym:cui:RadioButton:RID_SVXPAGE_SWPOSSIZE:RB_TOFRAME +ProtectPosition sym:cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_POSITION +ProtectSize sym:cui:TriStateBox:RID_SVXPAGE_SWPOSSIZE:CB_SIZE +Horizontal sym:cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORI +Horizontalby sym:cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_HORIBY +Horizontalto sym:cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_HORITO +Mirror sym:cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_HORIMIRROR +Vertical sym:cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERT +Verticalby sym:cui:MetricField:RID_SVXPAGE_SWPOSSIZE:MF_VERTBY +Verticalto sym:cui:ListBox:RID_SVXPAGE_SWPOSSIZE:LB_VERTTO +Followtextflow sym:cui:CheckBox:RID_SVXPAGE_SWPOSSIZE:CB_FOLLOW *TabPrintStarOffice sym:SFX2_HID_TP_COMMONPRINTOPTIONS -Printer sym:sfx.RadioButton.2398.3 -PrintToFile sym:sfx.RadioButton.2398.4 -ReduceTransparency sym:sfx.CheckBox.2398.10 -Automatically sym:sfx.RadioButton.2398.11 -NoTransparency sym:sfx.RadioButton.2398.12 -ReduceGradients sym:sfx.CheckBox.2398.20 -GradientStripes sym:sfx.RadioButton.2398.21 -Stripes sym:sfx.NumericField.2398.23 -IntermediateColor sym:sfx.RadioButton.2398.22 -ReduceBitmaps sym:sfx.CheckBox.2398.30 -GoodPrintQuality sym:sfx.RadioButton.2398.31 -NormalPrintQuality sym:sfx.RadioButton.2398.32 -Resolution sym:sfx.RadioButton.2398.33 -IncludeTransparentObjects sym:sfx.CheckBox.2398.34 -DPI sym:sfx.ListBox.2398.35 -ConvertColorsToGrayscale sym:sfx.CheckBox.2398.40 -PaperSize sym:sfx.CheckBox.2398.51 -PaperOrientation sym:sfx.CheckBox.2398.52 -Transparency sym:sfx.CheckBox.2398.53 +Printer sym:sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT +PrintToFile sym:sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTFILEOUTPUT +ReduceTransparency sym:sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCETRANSPARENCY +Automatically sym:sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_AUTO +NoTransparency sym:sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_NONE +ReduceGradients sym:sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEGRADIENTS +GradientStripes sym:sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_STRIPES +Stripes sym:sfx2:NumericField:TP_COMMONPRINTOPTIONS:NF_REDUCEGRADIENTS_STEPCOUNT +IntermediateColor sym:sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_COLOR +ReduceBitmaps sym:sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS +GoodPrintQuality sym:sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_OPTIMAL +NormalPrintQuality sym:sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_NORMAL +Resolution sym:sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_RESOLUTION +IncludeTransparentObjects sym:sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS_TRANSPARENCY +DPI sym:sfx2:ListBox:TP_COMMONPRINTOPTIONS:LB_REDUCEBITMAPS_RESOLUTION +ConvertColorsToGrayscale sym:sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_CONVERTTOGREYSCALES +PaperSize sym:sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERSIZE +PaperOrientation sym:sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERORIENTATION +Transparency sym:sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_TRANSPARENCY *TabPrintCalcOptions sym:SC_HID_SCPAGE_PRINT -SuppressOutput sym:sc.CheckBox.25674.2 -PrintOnly sym:sc.CheckBox.25674.4 +SuppressOutput sym:sc:CheckBox:RID_SCPAGE_PRINT:BTN_SKIPEMPTYPAGES +PrintOnly sym:sc:CheckBox:RID_SCPAGE_PRINT:BTN_SELECTEDSHEETS *TabProxyServer sym:CUI_HID_OPTIONS_PROXY -ProxyServer sym:cui.ListBox.10157.2 -HttpProxy sym:cui.Edit.10157.3 -HttpPort sym:cui.Edit.10157.4 -HttpsProxy sym:cui.Edit.10157.14 -HttpsPort sym:cui.Edit.10157.15 -FtpProxy sym:cui.Edit.10157.5 -FtpPort sym:cui.Edit.10157.6 -NoProxy sym:cui.Edit.10157.11 +ProxyServer sym:cui:ListBox:RID_SVXPAGE_INET_PROXY:LB_PROXYMODE +HttpProxy sym:cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PROXY +HttpPort sym:cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTP_PORT +HttpsProxy sym:cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PROXY +HttpsPort sym:cui:Edit:RID_SVXPAGE_INET_PROXY:ED_HTTPS_PORT +FtpProxy sym:cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PROXY +FtpPort sym:cui:Edit:RID_SVXPAGE_INET_PROXY:ED_FTP_PORT +NoProxy sym:cui:Edit:RID_SVXPAGE_INET_PROXY:ED_NOPROXYFOR -*TabRegisteredDatabase sym:cui.TabPage.17023 +*TabRegisteredDatabase sym:cui:TabPage:RID_SFXPAGE_DBREGISTER RegisteredDatabases sym:CUI_HID_DBPATH_CTL_PATH -NewBtn sym:cui.PushButton.17023.13 -EditBtn sym:cui.PushButton.17023.14 -DeleteBtn sym:cui.PushButton.17023.18 +NewBtn sym:cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_NEW +EditBtn sym:cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_EDIT +DeleteBtn sym:cui:PushButton:RID_SFXPAGE_DBREGISTER:BTN_DELETE *TabSectionIndent sym:SW_HID_SECTION_INDENTS_PAGE -IndentBefore sym:sw.MetricField.20902.3 -IndentAfter sym:sw.MetricField.20902.5 +IndentBefore sym:sw:MetricField:TP_SECTION_INDENTS:MF_BEFORE +IndentAfter sym:sw:MetricField:TP_SECTION_INDENTS:MF_AFTER -*TabSecurity sym:cui.TabPage.10200 -MacroSecurity sym:cui.PushButton.10200.21 -PersistentlySavePasswords sym:cui.CheckBox.10200.14 -Options sym:cui.PushButton.10200.12 -MasterPassword sym:cui.PushButton.10200.18 -ShowPasswords sym:cui.PushButton.10200.15 +*TabSecurity sym:cui:TabPage:RID_SVXPAGE_INET_SECURITY +MacroSecurity sym:cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MACROSEC +PersistentlySavePasswords sym:cui:CheckBox:RID_SVXPAGE_INET_SECURITY:CB_SEC_SAVEPASSWORDS +Options sym:cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_SECURITYOPTIONS +MasterPassword sym:cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_MASTERPASSWORD +ShowPasswords sym:cui:PushButton:RID_SVXPAGE_INET_SECURITY:PB_SEC_CONNECTIONS *TabSecurityProperties sym:SFX2_HID_DOCINFOSECURITY EnterPasswordToOpen sym:SFX2_HID_SECURITYTAB_PASSWORD_TO_OPEN @@ -98,21 +98,21 @@ RecordChanges sym:SFX2_HID_SECURITYTAB_RECORD_CHANGES Protect sym:SFX2_HID_SECURITYTAB_PROTECTION *TabSecurityOptionsAndWarnings sym:CUI_HID_DLG_SECURITY_OPTIONS -SavingOrSendingDocuments sym:cui.CheckBox.10300.13 -SigningDocuments sym:cui.CheckBox.10300.15 -PrintingDocuments sym:cui.CheckBox.10300.17 -CreatingPDFfiles sym:cui.CheckBox.10300.19 -RemovePersonalInformationOnSaving sym:cui.CheckBox.10300.22 -RecommendPasswordProtectionOnSaving sym:cui.CheckBox.10300.24 -CtrlClickRequiredToFollowHyperlinks sym:cui.CheckBox.10300.26 +SavingOrSendingDocuments sym:cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SAVESENDDOCS +SigningDocuments sym:cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_SIGNDOCS +PrintingDocuments sym:cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_PRINTDOCS +CreatingPDFfiles sym:cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CREATEPDF +RemovePersonalInformationOnSaving sym:cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_REMOVEINFO +RecommendPasswordProtectionOnSaving sym:cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_RECOMMENDPWD +CtrlClickRequiredToFollowHyperlinks sym:cui:CheckBox:RID_SVXDLG_SECURITY_OPTIONS:CB_CTRLHYPERLINK *TabSecurityLevel sym:XMLSECURITY_HID_XMLSEC_TP_SECLEVEL -VeryHigh sym:xmlsec.RadioButton.1007.2 -High sym:xmlsec.RadioButton.1007.3 -Medium sym:xmlsec.RadioButton.1007.4 -Low sym:xmlsec.RadioButton.1007.5 +VeryHigh sym:xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_VERYHIGH +High sym:xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_HIGH +Medium sym:xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_MEDIUM +Low sym:xmlsecurity:RadioButton:RID_XMLSECTP_SECLEVEL:RB_LOW -*TabSendAsEmail sym:.uno:MailWindow +*TabSendAsEmail .uno:MailWindow *TabQueries sym:DBACCESS_HID_DSADMIN_QUERYADMINISTRATION Queries sym:DBACCESS_HID_DSADMIN_QUERIES diff --git a/testautomation/global/win/etab_t_z.win b/testautomation/global/win/etab_t_z.win index 6f6553a0fd7c..2863c028e530 100644 --- a/testautomation/global/win/etab_t_z.win +++ b/testautomation/global/win/etab_t_z.win @@ -1,20 +1,20 @@ -*TabTableFieldSelection sym:dbp.TabPage.19730 -ExistingFields sym:dbp.ListBox.19730.7 -SelectedFields sym:dbp.ListBox.19730.8 -AddTo sym:dbp.PushButton.19730.3 -AddAllTo sym:dbp.PushButton.19730.4 -RemoveFrom sym:dbp.PushButton.19730.5 -RemoveAllFrom sym:dbp.PushButton.19730.6 - -*TabTableSelection sym:dbp.TabPage.19727 -TableSelection sym:dbp.ListBox.19727.5 - -*TabTextAnimation sym:sd.TabPage.20873 -GroupText sym:sd.ListBox.20873.2 -AutomaticallyAfter sym:sd.CheckBox.20873.3 -AutomaticallyAfterValue sym:sd.MetricField.20873.4 -AnimateAttachedShape sym:sd.CheckBox.20873.5 -InReverseOrder sym:sd.CheckBox.20873.6 +*TabTableFieldSelection sym:extensions:TabPage:RID_PAGE_GW_FIELDSELECTION +ExistingFields sym:extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_EXISTING_FIELDS +SelectedFields sym:extensions:ListBox:RID_PAGE_GW_FIELDSELECTION:LB_SELECTED_FIELDS +AddTo sym:extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDRIGHT +AddAllTo sym:extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSRIGHT +RemoveFrom sym:extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_FIELDLEFT +RemoveAllFrom sym:extensions:PushButton:RID_PAGE_GW_FIELDSELECTION:PB_ALLFIELDSLEFT + +*TabTableSelection sym:extensions:TabPage:RID_PAGE_LCW_CONTENTSELECTION_TABLE +TableSelection sym:extensions:ListBox:RID_PAGE_LCW_CONTENTSELECTION_TABLE:LB_SELECTTABLE + +*TabTextAnimation sym:sd:TabPage:RID_TP_CUSTOMANIMATION_TEXT +GroupText sym:sd:ListBox:RID_TP_CUSTOMANIMATION_TEXT:LB_GROUP_TEXT +AutomaticallyAfter sym:sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_GROUP_AUTO +AutomaticallyAfterValue sym:sd:MetricField:RID_TP_CUSTOMANIMATION_TEXT:MF_GROUP_AUTO +AnimateAttachedShape sym:sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_ANIMATE_FORM +InReverseOrder sym:sd:CheckBox:RID_TP_CUSTOMANIMATION_TEXT:CBX_REVERSE *TabTextBase sym:DBACCESS_HID_DSADMIN_PAGE_TEXT CVSFiles sym:DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSCSVFILES @@ -29,30 +29,30 @@ Extension sym:DBACCESS_HID_DSADMIN_EXTENSION CharSet sym:DBACCESS_HID_DSADMIN_CHARSET PlainTextFiles sym:DBACCESS_HID_PAGE_DBWIZARD_TEXT_RB_ACCESSTXTFILES -*TabTiming sym:sd.TabPage.20872 -TimingStart sym:sd.ListBox.20872.2 -Delay sym:sd.MetricField.20872.4 -Speed sym:sd.ComboBox.20872.6 -Repeat sym:sd.ComboBox.20872.8 -Rewind sym:sd.CheckBox.20872.9 -TriggerAnimate sym:sd.RadioButton.20872.11 -TriggerStart sym:sd.RadioButton.20872.12 -Shape sym:sd.ListBox.20872.13 +*TabTiming sym:sd:TabPage:RID_TP_CUSTOMANIMATION_DURATION +TimingStart sym:sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_START +Delay sym:sd:MetricField:RID_TP_CUSTOMANIMATION_DURATION:MF_START_DELAY +Speed sym:sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_DURATION +Repeat sym:sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_REPEAT +Rewind sym:sd:CheckBox:RID_TP_CUSTOMANIMATION_DURATION:CBX_REWIND +TriggerAnimate sym:sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_CLICKSEQUENCE +TriggerStart sym:sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_INTERACTIVE +Shape sym:sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_TRIGGER *TabTransparency sym:CUI_HID_AREA_TRANSPARENCE -NoTransparency sym:cui.RadioButton.10054.8 -Transparency sym:cui.RadioButton.10054.9 -Gradient sym:cui.RadioButton.10054.10 -TransparencyPercent sym:cui.MetricField.10054.10 -Type sym:cui.ListBox.10054.3 -CenterX sym:cui.MetricField.10054.4 -CenterY sym:cui.MetricField.10054.5 -Angle sym:cui.MetricField.10054.6 -Border sym:cui.MetricField.10054.7 -StartValue sym:cui.MetricField.10054.8 -EndValue sym:cui.MetricField.10054.9 - -*TabTrendLineType sym:chartcontroller.TabPage.918 +NoTransparency sym:cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF +Transparency sym:cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR +Gradient sym:cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT +TransparencyPercent sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT +Type sym:cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES +CenterX sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X +CenterY sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y +Angle sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE +Border sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER +StartValue sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE +EndValue sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE + +*TabTrendLineType sym:chart2:TabPage:TP_TRENDLINE None sym:CHART2_HID_SCH_TRENDLINE_RB_NONE Linear sym:CHART2_HID_SCH_TRENDLINE_RB_LINEAR Logarithmic sym:CHART2_HID_SCH_TRENDLINE_RB_LOGARITHMIC @@ -63,43 +63,43 @@ ShowCorrelationCoefficient sym:CHART2_HID_SCH_TRENDLINE_SHOW_R_SQUARED *TabTrustedSources sym:XMLSECURITY_HID_XMLSEC_TP_TRUSTSOURCES -SourcesAdd sym:xmlsec.PushButton.1008.3 -SourcesView sym:xmlsec.PushButton.1008.4 -SourcesRemove sym:xmlsec.PushButton.1008.5 -LocationsListBox sym:xmlsec.ListBox.1008.8 -LocationsAdd sym:xmlsec.PushButton.1008.9 -LocationsRemove sym:xmlsec.PushButton.1008.10 +SourcesAdd sym:xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_ADD_TRUSTCERT +SourcesView sym:xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_VIEW_TRUSTCERT +SourcesRemove sym:xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:PB_REMOVE_TRUSTCERT +LocationsListBox sym:xmlsecurity:ListBox:RID_XMLSECTP_TRUSTSOURCES:LB_TRUSTFILELOC +LocationsAdd sym:xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_ADD_TRUSTFILELOC +LocationsRemove sym:xmlsecurity:PushButton:RID_XMLSECTP_TRUSTSOURCES:FL_REMOVE_TRUSTFILELOC *TabType sym:SW_HID_FRM_STD -Width sym:sw.MetricField.20831.28 -Height sym:sw.MetricField.20831.30 -RelativeWidth sym:sw.CheckBox.20831.100 -Automatic sym:sw.CheckBox.20831.46 -RelativeHeight sym:sw.CheckBox.20831.101 -KeepRatio sym:sw.CheckBox.20831.102 -AutoHoehe sym:sw.CheckBox.20831.31 -AnchorAtPage sym:sw.RadioButton.20831.1 -AnchorAtParagraph sym:sw.RadioButton.20831.2 -AnchorAtCharacter sym:sw.RadioButton.20831.3 -AnchorAsCharacter sym:sw.RadioButton.20831.4 -AnchorAtFrame sym:sw.RadioButton.20831.5 -Horizontal sym:sw.ListBox.20831.34 -HorizontalBy sym:sw.MetricField.20831.36 -HorizontalTo sym:sw.ListBox.20831.2 -MirrorOnEvenPages sym:sw.CheckBox.20831.37 -Vertical sym:sw.ListBox.20831.39 -VerticalBy sym:sw.MetricField.20831.41 -VerticalTo sym:sw.ListBox.20831.4 -OriginalSize sym:sw.PushButton.20831.44 -FollowTextflow sym:sw.CheckBox.20831.129 +Width sym:sw:MetricField:TP_FRM_STD:ED_WIDTH +Height sym:sw:MetricField:TP_FRM_STD:ED_HEIGHT +RelativeWidth sym:sw:CheckBox:TP_FRM_STD:CB_REL_WIDTH +Automatic sym:sw:CheckBox:TP_FRM_STD:CB_AUTOWIDTH +RelativeHeight sym:sw:CheckBox:TP_FRM_STD:CB_REL_HEIGHT +KeepRatio sym:sw:CheckBox:TP_FRM_STD:CB_FIXEDRATIO +AutoHoehe sym:sw:CheckBox:TP_FRM_STD:CB_AUTOHEIGHT +AnchorAtPage sym:sw:RadioButton:TP_FRM_STD:RB_ANCHOR_PAGE +AnchorAtParagraph sym:sw:RadioButton:TP_FRM_STD:RB_ANCHOR_PARA +AnchorAtCharacter sym:sw:RadioButton:TP_FRM_STD:RB_ANCHOR_AT_CHAR +AnchorAsCharacter sym:sw:RadioButton:TP_FRM_STD:RB_ANCHOR_AS_CHAR +AnchorAtFrame sym:sw:RadioButton:TP_FRM_STD:RB_ANCHOR_FRAME +Horizontal sym:sw:ListBox:TP_FRM_STD:DLB_HORIZONTAL +HorizontalBy sym:sw:MetricField:TP_FRM_STD:ED_AT_HORZ_POS +HorizontalTo sym:sw:ListBox:TP_FRM_STD:LB_HORI_RELATION +MirrorOnEvenPages sym:sw:CheckBox:TP_FRM_STD:CB_MIRROR +Vertical sym:sw:ListBox:TP_FRM_STD:DLB_VERTICAL +VerticalBy sym:sw:MetricField:TP_FRM_STD:ED_AT_VERT_POS +VerticalTo sym:sw:ListBox:TP_FRM_STD:LB_VERT_RELATION +OriginalSize sym:sw:PushButton:TP_FRM_STD:BT_REALSIZE +FollowTextflow sym:sw:CheckBox:TP_FRM_STD:CB_FOLLOWTEXTFLOW *TabTypeSelect sym:DBACCESS_HID_TAB_WIZ_TYPE_SELECT -ColumnNames sym:dbu.MultiListBox.19210.2 +ColumnNames sym:dbaccess:MultiListBox:TAB_WIZ_TYPE_SELECT:LB_NEW_COLUMN_NAMES ColumnName sym:DBACCESS_HID_TAB_ENT_COLUMNNAME ColumnType sym:DBACCESS_HID_TAB_ENT_TYPE ColumnLength sym:DBACCESS_HID_TAB_ENT_TEXT_LEN -ColumnAutoValue sym:dbu.NumericField.19210.1 -ColumnAuto sym:dbu.PushButton.19210.5 +ColumnAutoValue sym:dbaccess:NumericField:TAB_WIZ_TYPE_SELECT:ET_AUTO +ColumnAuto sym:dbaccess:PushButton:TAB_WIZ_TYPE_SELECT:PB_AUTO *TabWeblog sym:vnd.com.sun.star.blogger:settings @@ -123,16 +123,16 @@ BrowseTemplateForImport sym:FILTER_HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE *TabXMLSecDetails sym:XMLSECURITY_HID_XMLSEC_TP_DETAILS XMLSecDetailsListBox sym:XMLSECURITY_HID_XMLSEC_CTRL_ELEMENTS -XMLSecDetailsEditField sym:xmlsec.MultiLineEdit.1004.2 +XMLSecDetailsEditField sym:xmlsecurity:MultiLineEdit:RID_XMLSECTP_DETAILS:ML_ELEMENT *TabXMLSecGeneral sym:XMLSECURITY_HID_XMLSEC_TP_GENERAL *TabXMLSecCertPath sym:XMLSECURITY_HID_XMLSEC_TP_CERTPATH XMLSecViewSigTree sym:XMLSECURITY_HID_XMLSEC_CTRL_VIEWSIGNATURES -XMLViewCertButton sym:xmlsec.PushButton.1005.55 -XMLSecCertStatus sym:xmlsec.MultiLineEdit.1005.3 +XMLViewCertButton sym:xmlsecurity:PushButton:RID_XMLSECTP_CERTPATH:BTN_VIEWCERT +XMLSecCertStatus sym:xmlsecurity:MultiLineEdit:RID_XMLSECTP_CERTPATH:ML_CERTSTATUS -*TabYErrorBars sym:chartcontroller.TabPage.919 +*TabYErrorBars sym:chart2:TabPage:TP_YERRORBAR MeanValue sym:CHART2_HID_SCH_STATISTIK_MEANVALUE NoFunction sym:CHART2_HID_SCH_STATISTIK_NO_ERROR Variance sym:CHART2_HID_SCH_STATISTIK_VARIANT diff --git a/testautomation/global/win/etoolbox.win b/testautomation/global/win/etoolbox.win index ae52177d7723..0e045925d403 100644 --- a/testautomation/global/win/etoolbox.win +++ b/testautomation/global/win/etoolbox.win @@ -13,8 +13,8 @@ Table sym:EXTENSIONS_HID_BIB_TBX_TABLE SearchKey sym:EXTENSIONS_HID_BIB_TBX_SEARCH AutoFilter sym:EXTENSIONS_HID_BIB_TBX_AUTOFILTER -StandardFilter sym:.uno:FilterCrit -RemoveFilter sym:.uno:RemoveFilterSort +StandardFilter .uno:FilterCrit +RemoveFilter .uno:RemoveFilterSort ColumnArrangement sym:EXTENSIONS_HID_BIB_MAPPINGDLG DataSource sym:EXTENSIONS_HID_BIB_CHANGESOURCE @@ -27,35 +27,35 @@ PrintButton sym:SFX2_HID_HELP_TOOLBOXITEM_PRINT SetBookmarks sym:SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS DisplayHelpAtStartUp sym:SFX2_HID_HELP_ONSTARTUP_BOX -*TB_MacroControls sym:BASCTL_HID_BASICIDE_CONTROLS -CommandButton sym:.uno:InsertPushbutton -CheckBox sym:.uno:CheckBox -Label sym:.uno:InsertFixedText -ListBox sym:.uno:InsertListbox -HScrollBar sym:.uno:HScrollbar -VScrollBar sym:.uno:VScrollbar -HLine sym:.uno:HFixedLine -VLine sym:.uno:VFixedLine -FrameControl sym:.uno:Groupbox -DateField sym:.uno:AddDateField -TimeField sym:.uno:InsertTimeField -NumericField sym:.uno:InsertNumericField -FormattedField sym:.uno:InsertFormattedField -FileControl sym:.uno:InsertFileControl -Properties sym:.uno:ShowPropBrowser -ImageControl sym:.uno:InsertImageControl -OptionButton sym:.uno:Radiobutton -TextField sym:.uno:InsertEdit -ComboBox sym:.uno:Combobox -Progressbar sym:.uno:ProgressBar -CurrencyField sym:.uno:InsertCurrencyField -PatternField sym:.uno:InsertPatternField -SelectMode sym:.uno:SelectMode -Testmode sym:.uno:TestMode +*TB_MacroControls HID_BASICIDE_CONTROLS +CommandButton .uno:InsertPushbutton +CheckBox .uno:Checkbox +Label .uno:InsertFixedText +ListBox .uno:InsertListbox +HScrollBar .uno:HScrollbar +VScrollBar .uno:VScrollbar +HLine .uno:HFixedLine +VLine .uno:VFixedLine +FrameControl .uno:Groupbox +DateField .uno:AddDateField +TimeField .uno:InsertTimeField +NumericField .uno:InsertNumericField +FormattedField .uno:InsertFormattedField +FileControl .uno:InsertFileControl +Properties .uno:ShowPropBrowser +ImageControl .uno:InsertImageControl +OptionButton .uno:Radiobutton +TextField .uno:InsertEdit +ComboBox .uno:Combobox +Progressbar .uno:ProgressBar +CurrencyField .uno:InsertCurrencyField +PatternField .uno:InsertPatternField +SelectMode .uno:SelectMode +Testmode .uno:TestMode -*TB_MacroRecording sym:.uno:MacroRecordingFloat -StopRecording sym:.uno:StopRecording +*TB_MacroRecording .uno:MacroRecordingFloat +StopRecording .uno:StopRecording *TB_Relation sym:DBACCESS_HID_TLB_RELATIONDESIGN -AddTables sym:.uno:AddTable +AddTables .uno:AddTable diff --git a/testautomation/global/win/piloten.win b/testautomation/global/win/piloten.win index a49445436540..24e79c54725a 100644 --- a/testautomation/global/win/piloten.win +++ b/testautomation/global/win/piloten.win @@ -3,54 +3,54 @@ ' ************************************************************************************************ *AutoPilotPraesentation1 sym:SD_HID_SD_AUTOPILOT_PAGE1 -Backbutton sym:sd.PushButton.900.3 -Nextbutton sym:sd.PushButton.900.4 -EmptyPresentation sym:sd.RadioButton.900.11 -FromTemplate sym:sd.RadioButton.900.12 +Backbutton sym:sd:PushButton:DLG_ASS:BUT_LAST +Nextbutton sym:sd:PushButton:DLG_ASS:BUT_NEXT +EmptyPresentation sym:sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY +FromTemplate sym:sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE TemplateRegion sym:SD_HID_SD_AUTOPILOT_REGION TemplateList sym:SD_HID_SD_AUTOPILOT_TEMPLATES -Existingpresentation sym:sd.RadioButton.900.15 -ExistingOpen sym:sd.PushButton.900.17 +Existingpresentation sym:sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN +ExistingOpen sym:sd:PushButton:DLG_ASS:PB_PAGE1_OPEN Existinglist sym:SD_HID_SD_AUTOPILOT_OPEN -Preview sym:sd.CheckBox.900.7 -Startwithwizard sym:sd.CheckBox.900.8 +Preview sym:sd:CheckBox:DLG_ASS:CB_PREVIEW +Startwithwizard sym:sd:CheckBox:DLG_ASS:CB_STARTWITH *AutoPilotPraesentation2 sym:SD_HID_SD_AUTOPILOT_PAGE2 -Backbutton sym:sd.PushButton.900.3 -Nextbutton sym:sd.PushButton.900.4 +Backbutton sym:sd:PushButton:DLG_ASS:BUT_LAST +Nextbutton sym:sd:PushButton:DLG_ASS:BUT_NEXT Background sym:SD_HID_SD_AUTOPILOT_PAGETEMPLATES -Backgroundchoice sym:sd.ListBox.900.33 -Original sym:sd.RadioButton.900.39 -Screen sym:sd.RadioButton.900.35 -Overhead sym:sd.RadioButton.900.37 -Slide sym:sd.RadioButton.900.36 -Paper sym:sd.RadioButton.900.38 -Preview sym:sd.CheckBox.900.7 +Backgroundchoice sym:sd:ListBox:DLG_ASS:LB_PAGE2_LAYOUT +Original sym:sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM5 +Screen sym:sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM1 +Overhead sym:sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM3 +Slide sym:sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM2 +Paper sym:sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM4 +Preview sym:sd:CheckBox:DLG_ASS:CB_PREVIEW *AutoPilotPraesentation3 sym:SD_HID_SD_AUTOPILOT_PAGE3 -Backbutton sym:sd.PushButton.900.3 -Nextbutton sym:sd.PushButton.900.4 -Effect sym:sd.ListBox.900.43 -Speed sym:sd.ListBox.900.45 -Default sym:sd.RadioButton.900.47 -Automatic sym:sd.RadioButton.900.48 -Timebutton sym:sd.TimeField.900.50 -Break sym:sd.TimeField.900.52 -Logo sym:sd.CheckBox.900.53 -Preview sym:sd.CheckBox.900.7 +Backbutton sym:sd:PushButton:DLG_ASS:BUT_LAST +Nextbutton sym:sd:PushButton:DLG_ASS:BUT_NEXT +Effect sym:sd:ListBox:DLG_ASS:LB_PAGE3_EFFECT +Speed sym:sd:ListBox:DLG_ASS:LB_PAGE3_SPEED +Default sym:sd:RadioButton:DLG_ASS:RB_PAGE3_LIVE +Automatic sym:sd:RadioButton:DLG_ASS:RB_PAGE3_KIOSK +Timebutton sym:sd:TimeField:DLG_ASS:TMF_PAGE3_TIME +Break sym:sd:TimeField:DLG_ASS:TMF_PAGE3_BREAK +Logo sym:sd:CheckBox:DLG_ASS:CB_PAGE3_LOGO +Preview sym:sd:CheckBox:DLG_ASS:CB_PREVIEW *AutoPilotPraesentation4 sym:SD_HID_SD_AUTOPILOT_PAGE4 -Backbutton sym:sd.PushButton.900.3 -Nextbutton sym:sd.PushButton.900.4 -AddName sym:sd.Edit.900.23 -AddTopic sym:sd.Edit.900.25 -Askinformation sym:sd.MultiLineEdit.900.27 +Backbutton sym:sd:PushButton:DLG_ASS:BUT_LAST +Nextbutton sym:sd:PushButton:DLG_ASS:BUT_NEXT +AddName sym:sd:Edit:DLG_ASS:EDT_PAGE4_ASKNAME +AddTopic sym:sd:Edit:DLG_ASS:EDT_PAGE4_ASKTOPIC +Askinformation sym:sd:MultiLineEdit:DLG_ASS:EDT_PAGE4_ASKINFORMATION *AutoPilotPraesentation5 sym:SD_HID_SD_AUTOPILOT_PAGE5 -Backbutton sym:sd.PushButton.900.3 -Nextbutton sym:sd.PushButton.900.4 -Summary sym:sd.CheckBox.900.63 -Preview sym:sd.CheckBox.900.7 +Backbutton sym:sd:PushButton:DLG_ASS:BUT_LAST +Nextbutton sym:sd:PushButton:DLG_ASS:BUT_NEXT +Summary sym:sd:CheckBox:DLG_ASS:CB_PAGE5_SUMMARY +Preview sym:sd:CheckBox:DLG_ASS:CB_PREVIEW *AutoPilotEuroKonverter sym:WIZARDS_HID_DLGCONVERT_DIALOG Abbrechen sym:WIZARDS_HID_DLGCONVERT_CBCANCEL diff --git a/testautomation/global/win/reportdesigner.win b/testautomation/global/win/reportdesigner.win index 09af622f7ae9..69b48beb4549 100644 --- a/testautomation/global/win/reportdesigner.win +++ b/testautomation/global/win/reportdesigner.win @@ -20,30 +20,30 @@ SectionWindow sym:REPORTDESIGN_UID_RPT_SECTIONSWINDOW ' HID_ENDMARKER *ReportPageNumber sym:REPORTDESIGN_HID_RPT_PAGENUMBERS_DLG -PageN sym:reportdesign.RadioButton.30769.2 -PageNofM sym:reportdesign.RadioButton.30769.3 -TopOfPage sym:reportdesign.RadioButton.30769.5 -BottomOfpage sym:reportdesign.RadioButton.30769.6 -PageNumberAlignment sym:reportdesign.ListBox.30769.8 -ShowNumberOnFirstPage sym:reportdesign.CheckBox.30769.9 +PageN sym:reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N +PageNofM sym:reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_N_OF_M +TopOfPage sym:reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_TOPPAGE +BottomOfpage sym:reportdesign:RadioButton:RID_PAGENUMBERS:RB_PAGE_BOTTOMPAGE +PageNumberAlignment sym:reportdesign:ListBox:RID_PAGENUMBERS:LST_ALIGNMENT +ShowNumberOnFirstPage sym:reportdesign:CheckBox:RID_PAGENUMBERS:CB_SHOWNUMBERONFIRSTPAGE *ReportDateTime sym:REPORTDESIGN_HID_RPT_DATETIME_DLG -IncludeDate sym:reportdesign.CheckBox.30770.1 -DateFormat sym:reportdesign.ListBox.30770.3 -IncludeTime sym:reportdesign.CheckBox.30770.5 -TimeFormat sym:reportdesign.ListBox.30770.7 +IncludeDate sym:reportdesign:CheckBox:RID_DATETIME_DLG:CB_DATE +DateFormat sym:reportdesign:ListBox:RID_DATETIME_DLG:LB_DATE_TYPE +IncludeTime sym:reportdesign:CheckBox:RID_DATETIME_DLG:CB_TIME +TimeFormat sym:reportdesign:ListBox:RID_DATETIME_DLG:LB_TIME_TYPE *ReportSortingGrouping sym:REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG Groups sym:REPORTDESIGN_HID_RPT_GROUPSBRW FieldExpression sym:REPORTDESIGN_HID_RPT_FIELDEXPRESSION MoveUp sym:REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_UP MoveDown sym:REPORTDESIGN_HID_RPT_GROUPSORT_MOVE_DOWN -Sorting sym:reportdesign.ListBox.30768.17 -GroupHeader sym:reportdesign.ListBox.30768.2 -GroupFooter sym:reportdesign.ListBox.30768.4 -GroupOn sym:reportdesign.ListBox.30768.6 -GroupIntervall sym:reportdesign.NumericField.30768.8 -KeepTogether sym:reportdesign.ListBox.30768.10 +Sorting sym:reportdesign:ListBox:RID_GROUPS_SORTING:LST_ORDER +GroupHeader sym:reportdesign:ListBox:RID_GROUPS_SORTING:LST_HEADERLST +GroupFooter sym:reportdesign:ListBox:RID_GROUPS_SORTING:LST_FOOTERLST +GroupOn sym:reportdesign:ListBox:RID_GROUPS_SORTING:LST_GROUPONLST +GroupIntervall sym:reportdesign:NumericField:RID_GROUPS_SORTING:ED_GROUPINTERVALLST +KeepTogether sym:reportdesign:ListBox:RID_GROUPS_SORTING:LST_KEEPTOGETHERLST *ReportNavigator sym:REPORTDESIGN_HID_RPT_NAVIGATOR_DLG NavigatorTree sym:REPORTDESIGN_HID_REPORT_NAVIGATOR_TREE diff --git a/testautomation/global/win/spadmin.win b/testautomation/global/win/spadmin.win index 851a616be527..9ce75bf11a49 100644 --- a/testautomation/global/win/spadmin.win +++ b/testautomation/global/win/spadmin.win @@ -1,107 +1,107 @@ -*SPRenamePrinterDLG sym:spa.ModalDialog.1003 -EFPrinterName sym:spa.Edit.1003.2 -CBUnidentifiedObject sym:spa.ComboBox.1003.5 - -*SPFontNameDLG sym:spa.ModalDialog.1030 -PBRename sym:spa.PushButton.1030.6 -PBRemove sym:spa.PushButton.1030.3 -PBAdd sym:spa.PushButton.1030.5 -LBFontList sym:spa.ListBox.1030.4 - -*SPFontImportDLG sym:spa.ModalDialog.1065 -PBSelectAll sym:spa.PushButton.1065.6 -LBFontList sym:spa.ListBox.1065.7 -EFFontPath sym:spa.Edit.1065.3 -PBFontPath sym:spa.PushButton.1065.4 -CBCreateSoftlinks sym:spa.CheckBox.1065.18 +*SPRenamePrinterDLG sym:padmin:ModalDialog:RID_STRINGQUERYDLG +EFPrinterName sym:padmin:Edit:RID_STRINGQUERYDLG:RID_STRQRY_EDT_NEWNAME +CBUnidentifiedObject sym:padmin:ComboBox:RID_STRINGQUERYDLG:RID_STRQRY_BOX_NEWNAME + +*SPFontNameDLG sym:padmin:ModalDialog:RID_FONTNAMEDIALOG +PBRename sym:padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_RENAME +PBRemove sym:padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_REMOVE +PBAdd sym:padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_IMPORT +LBFontList sym:padmin:ListBox:RID_FONTNAMEDIALOG:RID_FNTNM_LB_FONTS + +*SPFontImportDLG sym:padmin:ModalDialog:RID_FONTIMPORT_DIALOG +PBSelectAll sym:padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_SELECTALL +LBFontList sym:padmin:ListBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_NEWFONTS +EFFontPath sym:padmin:Edit:RID_FONTIMPORT_DIALOG:RID_FIMP_EDT_FROM +PBFontPath sym:padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_FROM +CBCreateSoftlinks sym:padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_LINKONLY *FilePicker sym:SVT_HID_EXPLORERDLG_FILE -EFFileName sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX -LBFileList sym:fps_office.ListBox.16374.35 -PBSelect sym:fps_office.PushButton.16374.16 -PBUpOneLevel sym:fps_office.MenuButton.16374.14 -PBNewDir sym:fps_office.ImageButton.16374.11 -MBDefaultDir sym:fps_office.MenuButton.16374.15 -TLBStandard sym:SVT_HID_FILEDLG_STANDARD - -*SPPrinterWizard sym:spa.ModalDialog.2000 -TabPWDeviceSelector sym:spa.TabPage.2001 -TabPWDriverSelector sym:spa.TabPage.2002 -TabPWQueueCommand sym:spa.TabPage.2004 -TabPWPrinterName sym:spa.TabPage.2003 -PBBack sym:spa.PushButton.2000.4 -PBNext sym:spa.PushButton.2000.3 - -*TabPWDeviceSelector sym:spa.TabPage.2001 -RBAdd sym:spa.RadioButton.2001.2 -RBFax sym:spa.RadioButton.2001.3 -RBPdf sym:spa.RadioButton.2001.4 -RBImport sym:spa.RadioButton.2001.5 - -*TabPWDriverSelector sym:spa.TabPage.2002 -LBChooseDriver sym:spa.ListBox.2002.2 -PBImport sym:spa.PushButton.2002.3 -PBDelete sym:spa.PushButton.2002.4 - -*TabPWFaxDriverSelector sym:spa.TabPage.2006 -RBDefault sym:spa.RadioButton.2006.2 -RBSelect sym:spa.RadioButton.2006.3 - -*TabPWQueueCommand sym:spa.TabPage.2004 -CBCommand sym:spa.ComboBox.2004.2 -PBHelp sym:spa.PushButton.2004.3 -EFPdfDir sym:spa.Edit.2004.7 -PBPdfDir sym:spa.PushButton.2004.8 - -*TabPWPrinterName sym:spa.TabPage.2003 -EFPrinterName sym:spa.Edit.2003.4 -EFFaxName sym:spa.Edit.2003.5 -CBUseAsDefault sym:spa.CheckBox.2003.7 -CBRemoveFaxNumber sym:spa.CheckBox.2003.8 - -*SPAdmin sym:spa.ModalDialog.1000 -LBPrinters sym:spa.ListBox.1000.4 -PBProperties sym:spa.PushButton.1000.6 -PBRename sym:spa.PushButton.1000.7 -PBDefault sym:spa.PushButton.1000.2 -PBRemove sym:spa.PushButton.1000.3 -PBTestpage sym:spa.PushButton.1000.8 -PBNewPrinter sym:spa.PushButton.1000.19 - -*TabSPACommand sym:spa.TabPage.4006 -EFlpr sym:spa.ComboBox.4006.5 -LBConfigureAs sym:spa.ListBox.4006.8 -PBPdfDir sym:spa.PushButton.4006.17 -EFPdfDir sym:spa.Edit.4006.16 -CBRemoveFaxNumber sym:spa.CheckBox.4006.19 -PBHelp sym:spa.PushButton.4006.4 -PBRemove sym:spa.PushButton.4006.15 - -*TabSPAPaper sym:spa.TabPage.4004 -LBPaperSize sym:spa.ListBox.4004.2 -LBOrientation sym:spa.ListBox.4004.4 -LBDuplex sym:spa.ListBox.4004.6 -LBPaperTray sym:spa.ListBox.4004.8 - -*TabSPADevice sym:spa.TabPage.4003 -LBOption sym:spa.ListBox.4003.4 -LBCurrentValue sym:spa.ListBox.4003.6 -LBColor sym:spa.ListBox.4003.10 - -*TabSPAFontReplacement sym:spa.TabPage.4005 -MLReplacedFonts sym:spa.MultiListBox.4005.2 -CBReplaceFont sym:spa.ComboBox.4005.4 -LBByPrinterFont sym:spa.ListBox.4005.6 -PBAdd sym:spa.PushButton.4005.7 -PBRemove sym:spa.PushButton.4005.8 -CBEnableReplacement sym:spa.CheckBox.4005.9 - -*TabSPAOther sym:spa.TabPage.4002 -MFLeftMargin sym:spa.MetricField.4002.2 -MFTopMargin sym:spa.MetricField.4002.4 -MFRightMargin sym:spa.MetricField.4002.6 -MFBottomMargin sym:spa.MetricField.4002.8 -EFComment sym:spa.Edit.4002.10 -PBDefault sym:spa.PushButton.4002.11 +EFFileName sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX +LBFileList sym:fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE +PBSelect sym:fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN +PBUpOneLevel sym:fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP +PBNewDir sym:fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER +MBDefaultDir sym:fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD +TLBStandard sym:SFX2_HID_FILEDLG_STANDARD + +*SPPrinterWizard sym:padmin:ModalDialog:RID_ADD_PRINTER_DIALOG +TabPWDeviceSelector sym:padmin:TabPage:RID_ADDP_PAGE_CHOOSEDEV +TabPWDriverSelector sym:padmin:TabPage:RID_ADDP_PAGE_CHOOSEDRIVER +TabPWQueueCommand sym:padmin:TabPage:RID_ADDP_PAGE_COMMAND +TabPWPrinterName sym:padmin:TabPage:RID_ADDP_PAGE_NAME +PBBack sym:padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_PREV +PBNext sym:padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_NEXT + +*TabPWDeviceSelector sym:padmin:TabPage:RID_ADDP_PAGE_CHOOSEDEV +RBAdd sym:padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PRINTER +RBFax sym:padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_FAX +RBPdf sym:padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PDF +RBImport sym:padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_OLD + +*TabPWDriverSelector sym:padmin:TabPage:RID_ADDP_PAGE_CHOOSEDRIVER +LBChooseDriver sym:padmin:ListBox:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BOX_DRIVER +PBImport sym:padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_ADD +PBDelete sym:padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_REMOVE + +*TabPWFaxDriverSelector sym:padmin:TabPage:RID_ADDP_PAGE_FAXDRIVER +RBDefault sym:padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_DEFAULT +RBSelect sym:padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_SELECT + +*TabPWQueueCommand sym:padmin:TabPage:RID_ADDP_PAGE_COMMAND +CBCommand sym:padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_COMMAND +PBHelp sym:padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_HELP +EFPdfDir sym:padmin:Edit:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_EDT_PDFDIR +PBPdfDir sym:padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_PDFDIR + +*TabPWPrinterName sym:padmin:TabPage:RID_ADDP_PAGE_NAME +EFPrinterName sym:padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_NAME +EFFaxName sym:padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_FAXNAME +CBUseAsDefault sym:padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_DEFAULT +CBRemoveFaxNumber sym:padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_FAXSWALLOW + +*SPAdmin sym:padmin:ModalDialog:RID_PADIALOG +LBPrinters sym:padmin:ListBox:RID_PADIALOG:RID_PA_LB_DEV +PBProperties sym:padmin:PushButton:RID_PADIALOG:RID_PA_BTN_CONF +PBRename sym:padmin:PushButton:RID_PADIALOG:RID_PA_BTN_RENAME +PBDefault sym:padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD +PBRemove sym:padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL +PBTestpage sym:padmin:PushButton:RID_PADIALOG:RID_PA_TESTPAGE +PBNewPrinter sym:padmin:PushButton:RID_PADIALOG:RID_PA_BTN_ADD + +*TabSPACommand sym:padmin:TabPage:RID_RTS_COMMANDPAGE +EFlpr sym:padmin:ComboBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_COMMANDS +LBConfigureAs sym:padmin:ListBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_LB_CONFIGURE +PBPdfDir sym:padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_PDFDIR +EFPdfDir sym:padmin:Edit:RID_RTS_COMMANDPAGE:RID_RTS_CMD_EDT_PDFDIR +CBRemoveFaxNumber sym:padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BOX_SWALLOWFAXNO +PBHelp sym:padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_HELP +PBRemove sym:padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_REMOVE + +*TabSPAPaper sym:padmin:TabPage:RID_RTS_PAPERPAGE +LBPaperSize sym:padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_PAPER_BOX +LBOrientation sym:padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_ORIENTATION_BOX +LBDuplex sym:padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_DUPLEX_BOX +LBPaperTray sym:padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_SLOT_BOX + +*TabSPADevice sym:padmin:TabPage:RID_RTS_DEVICEPAGE +LBOption sym:padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDKEY_BOX +LBCurrentValue sym:padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDVALUE_BOX +LBColor sym:padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_SPACE_BOX + +*TabSPAFontReplacement sym:padmin:TabPage:RID_RTS_FONTSUBSTPAGE +MLReplacedFonts sym:padmin:MultiListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_SUBST_BOX +CBReplaceFont sym:padmin:ComboBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_FROM_BOX +LBByPrinterFont sym:padmin:ListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_TO_BOX +PBAdd sym:padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ADD_BTN +PBRemove sym:padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_REMOVE_BTN +CBEnableReplacement sym:padmin:CheckBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ENABLE_BTN + +*TabSPAOther sym:padmin:TabPage:RID_RTS_OTHERPAGE +MFLeftMargin sym:padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_LEFTMARGIN_BOX +MFTopMargin sym:padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_TOPMARGIN_BOX +MFRightMargin sym:padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_RIGHTMARGIN_BOX +MFBottomMargin sym:padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_BOTTOMMARGIN_BOX +EFComment sym:padmin:Edit:RID_RTS_OTHERPAGE:RID_RTS_OTHER_COMMENT_EDT +PBDefault sym:padmin:PushButton:RID_RTS_OTHERPAGE:RID_RTS_OTHER_DEFAULT_BTN diff --git a/testautomation/global/win/sys_dial.win b/testautomation/global/win/sys_dial.win index f702445e3a8e..6276bd8da372 100644 --- a/testautomation/global/win/sys_dial.win +++ b/testautomation/global/win/sys_dial.win @@ -1,35 +1,35 @@ ' **** general Printersettings-Dialog ( File/Printer settings ) ' **** -*DruckerEinrichten sym:svt.ModalDialog.16511 -Drucker sym:svt.ListBox.16511.2 -Eigenschaften sym:svt.PushButton.16511.3 +*DruckerEinrichten sym:svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG +Drucker sym:svtools:ListBox:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES +Eigenschaften sym:svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES '************************************************************************ '************ all file-dialogs '************ *GeneralFileDialog sym:SVT_HID_EXPLORERDLG_FILE -UebergeordneterOrdner sym:fps_office.MenuButton.16374.14 -NeuerOrdner sym:fps_office.ImageButton.16374.11 -Standard sym:fps_office.MenuButton.16374.15 -DateiAuswahl sym:SVT_HID_FILEDLG_STANDARD -Dateiname sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX -Dateityp sym:fps_office.ListBox.16374.35 -Oeffnen sym:fps_office.PushButton.16374.16 -Auswaehlen sym:fps_office.PushButton.16374.16 +UebergeordneterOrdner sym:fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP +NeuerOrdner sym:fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER +Standard sym:fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD +DateiAuswahl sym:SFX2_HID_FILEDLG_STANDARD +Dateiname sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX +Dateityp sym:fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE +Oeffnen sym:fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN +Auswaehlen sym:fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN +GrafikEinfuegenDlg GeneralFileDialog -Pfad sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX sym:SVT_HID_FILEDLG_PATH_FILENAME +Pfad sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX sym:SFX2_HID_FILEDLG_PATH_FILENAME Stil sym:SVT_HID_FILEOPEN_IMAGE_TEMPLATE -Verknuepfen sym:SVT_HID_FILEDLG_LINK_CB HID_IMPGRF_CB_LINK -Vorschau sym:SVT_HID_FILEDLG_PREVIEW_CB HID_IMPGRF_CB_PREVIEW -Link sym:SVT_HID_FILEDLG_LINK_CB -Preview sym:SVT_HID_FILEDLG_PREVIEW_CB +Verknuepfen sym:SFX2_HID_FILEDLG_LINK_CB HID_IMPGRF_CB_LINK +Vorschau sym:SFX2_HID_FILEDLG_PREVIEW_CB HID_IMPGRF_CB_PREVIEW +Link sym:SFX2_HID_FILEDLG_LINK_CB +Preview sym:SFX2_HID_FILEDLG_PREVIEW_CB +OeffnenDlg GeneralFileDialog -Pfad sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX sym:SVT_HID_FILEDLG_PATH_FILENAME +Pfad sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX sym:SFX2_HID_FILEDLG_PATH_FILENAME Version sym:SVT_HID_FILEOPEN_VERSION NurLesen sym:SVT_HID_FILEOPEN_READONLY -Einfuegen sym:SVT_HID_FILEDLG_INSERT_BTN +Einfuegen sym:SFX2_HID_FILEDLG_INSERT_BTN Play sym:SVT_HID_FILESAVE_DOPLAY +KonkordanzdateiOeffnen GeneralFileDialog @@ -60,32 +60,32 @@ Selektion sym:SVT_HID_FILESAVE_SELECTION ' **** Hyperlink-File-Dialog ' **** *HyperlinkAuswahlDlg sym:SW_HID_FILEDLG_CHARDLG -UebergeordneterOrdner sym:fps_office.MenuButton.16374.14 -NeuerOrdner sym:fps_office.ImageButton.16374.11 -Standard sym:fps_office.MenuButton.16374.15 -DateiAuswahl sym:SVT_HID_FILEDLG_STANDARD -Dateiname sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX -Dateityp sym:fps_office.ListBox.16374.35 -Oeffnen sym:fps_office.PushButton.16374.16 -NurLesen sym:fps_office.CheckBox.16374.40 +UebergeordneterOrdner sym:fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP +NeuerOrdner sym:fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER +Standard sym:fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD +DateiAuswahl sym:SFX2_HID_FILEDLG_STANDARD +Dateiname sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX +Dateityp sym:fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE +Oeffnen sym:fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN +NurLesen sym:fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_READONLY ' **** general Color-Dialog ( under tools / options / staroffice / color / edit ) ' **** -*FarbeDlg sym:svt.ModalDialog.996 +*FarbeDlg sym:svtools:ModalDialog:DLG_COLOR 'Grundfarben 'BenutzerdefinierteFarben -Cyan sym:svt.MetricField.996.7 -Magenta sym:svt.MetricField.996.8 -Yellow sym:svt.MetricField.996.9 -Key sym:svt.MetricField.996.10 -Rot sym:svt.NumericField.996.1 -Gruen sym:svt.NumericField.996.2 -Blau sym:svt.NumericField.996.3 -Farbton sym:svt.NumericField.996.4 -Saettigung sym:svt.NumericField.996.5 -Hell sym:svt.NumericField.996.6 -Links sym:svt.PushButton.996.1 -Rechts sym:svt.PushButton.996.2 +Cyan sym:svtools:MetricField:DLG_COLOR:NUM_CYAN +Magenta sym:svtools:MetricField:DLG_COLOR:NUM_MAGENTA +Yellow sym:svtools:MetricField:DLG_COLOR:NUM_YELLOW +Key sym:svtools:MetricField:DLG_COLOR:NUM_KEY +Rot sym:svtools:NumericField:DLG_COLOR:NUM_RED +Gruen sym:svtools:NumericField:DLG_COLOR:NUM_GREEN +Blau sym:svtools:NumericField:DLG_COLOR:NUM_BLUE +Farbton sym:svtools:NumericField:DLG_COLOR:NUM_HUE +Saettigung sym:svtools:NumericField:DLG_COLOR:NUM_SATURATION +Hell sym:svtools:NumericField:DLG_COLOR:NUM_LUMINANCE +Links sym:svtools:PushButton:DLG_COLOR:BTN_1 +Rechts sym:svtools:PushButton:DLG_COLOR:BTN_2 *SendMasterDocument sym:SVT_HID_FILESAVE_DIALOG Dateiname sym:SW_HID_SEND_MASTER_CTRL_EDIT_FILEURL @@ -119,15 +119,15 @@ Standard sym:SVT_HID_FILESAVE_DEFAULTDIRECTORY ' **** new folder-dialog ' **** -*NeuerOrdner sym:fps_office.ModalDialog.16375 -OrdnerName sym:fps_office.Edit.16375.11 +*NeuerOrdner sym:fpicker:ModalDialog:DLG_SVT_QUERYFOLDERNAME +OrdnerName sym:fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_NAME ' **** Translationwidow fuer das Ubersetzungstooling ' **** -*TranslationWindow sym:svt.WorkWindow.12348 svtools:FloatingWindow:TT_INLINE_TRANSLATION +*TranslationWindow sym:svtools:WorkWindow:TT_INLINE_TRANSLATION svtools:FloatingWindow:TT_INLINE_TRANSLATION ' **** specal longnames for bas test ' **** author marc.schwanz@sun.com -'*MSC_Special_Dialog MSC_Super_ID -'*MSC_Special_Dialog2 MSC_Super_ID2 -'*MSC_Special_Dialog3 MSC_Super_ID3 +*MSC_Special_Dialog MSC_Super_ID +*MSC_Special_Dialog2 MSC_Super_ID2 +*MSC_Special_Dialog3 MSC_Super_ID3 diff --git a/testautomation/global/win/tab_a_d.win b/testautomation/global/win/tab_a_d.win index 7154a82be35a..a7e585cc0dcb 100644 --- a/testautomation/global/win/tab_a_d.win +++ b/testautomation/global/win/tab_a_d.win @@ -1,42 +1,42 @@ *Active *TabAenderungenWriter sym:SW_HID_REDLINE_OPT -EinfuegenAttribute sym:sw.ListBox.20874.2 -EinfuegenFarbe sym:sw.ListBox.20874.4 -LoeschenAttribute sym:sw.ListBox.20874.7 -LoeschenFarbe sym:sw.ListBox.20874.9 -AendernAttribute sym:sw.ListBox.20874.12 -AendernFarbe sym:sw.ListBox.20874.14 -ZeilenMarkierung sym:sw.ListBox.20874.18 -ZeilenFarbe sym:sw.ListBox.20874.20 - -*TabAenderungenCalc sym:SC_HID_SCPAGE_OPREDLINE sc:TabPage:RID_SCPAGE_OPREDLINE -Aenderungen sym:sc.ListBox.25728.1 -Loeschungen sym:sc.ListBox.25728.2 -Einfuegungen sym:sc.ListBox.25728.3 -Verschiebungen sym:sc.ListBox.25728.4 +EinfuegenAttribute sym:sw:ListBox:TP_REDLINE_OPT:LB_INS_ATTR +EinfuegenFarbe sym:sw:ListBox:TP_REDLINE_OPT:LB_INS_COL +LoeschenAttribute sym:sw:ListBox:TP_REDLINE_OPT:LB_DEL_ATTR +LoeschenFarbe sym:sw:ListBox:TP_REDLINE_OPT:LB_DEL_COL +AendernAttribute sym:sw:ListBox:TP_REDLINE_OPT:LB_CHG_ATTR +AendernFarbe sym:sw:ListBox:TP_REDLINE_OPT:LB_CHG_COL +ZeilenMarkierung sym:sw:ListBox:TP_REDLINE_OPT:LB_MARKPOS +ZeilenFarbe sym:sw:ListBox:TP_REDLINE_OPT:LB_LC_COL + +*TabAenderungenCalc sym:SC_HID_SCPAGE_OPREDLINE sym:sc:TabPage:RID_SCPAGE_OPREDLINE +Aenderungen sym:sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_CONTENT +Loeschungen sym:sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_REMOVE +Einfuegungen sym:sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_INSERT +Verschiebungen sym:sc:ListBox:RID_SCPAGE_OPREDLINE:CLB_MOVE *TabAllgemein sym:CUI_HID_OPTIONS_GENERAL -Firma sym:cui.Edit.12001.11 -VorName sym:cui.Edit.12001.15 -ZuName sym:cui.Edit.12001.16 -NameDesVaters sym:cui.Edit.12001.14 -Strasse sym:cui.Edit.12001.20 -Apartmentnummer sym:cui.Edit.12001.21 -Land sym:cui.Edit.12001.29 -PLZ sym:cui.Edit.12001.23 -Ort sym:cui.Edit.12001.24 -Kuerzel sym:cui.Edit.12001.17 -TelPriv sym:cui.Edit.12001.34 -TelGe sym:cui.Edit.12001.35 -Fax sym:cui.Edit.12001.37 -EMail sym:cui.Edit.12001.38 -Titel sym:cui.Edit.12001.31 -Position sym:cui.Edit.12001.32 -City sym:cui.Edit.12001.25 -Zip sym:cui.Edit.12001.27 -Street sym:cui.Edit.12001.20 -State sym:cui.Edit.12001.26 +Firma sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_COMPANY +VorName sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_FIRSTNAME +ZuName sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_NAME +NameDesVaters sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_FATHERNAME +Strasse sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET +Apartmentnummer sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_APARTMENTNR +Land sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_COUNTRY +PLZ sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_PLZ +Ort sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_CITY +Kuerzel sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_SHORTNAME +TelPriv sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_TELPRIVAT +TelGe sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_TELCOMPANY +Fax sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_FAX +EMail sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_EMAIL +Titel sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_TITLE +Position sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_POSITION +City sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_US_CITY +Zip sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_US_ZIPCODE +Street sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_STREET +State sym:cui:Edit:RID_SFXPAGE_GENERAL:ED_US_STATE Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +TabAllgemeines TabAllgemein @@ -45,314 +45,314 @@ Zurueck sym:SFX2_HID_TABDLG_RESET_BTN NeuesThema sym:CUI_HID_GALLERY_EDIT_MSNAME *TabAnsichtAllgemein sym:CUI_HID_OFA_TP_VIEW -FontScale sym:cui.MetricField.17102.22 -IconStyle sym:cui.ListBox.17102.56 -IconScale sym:cui.ListBox.17102.54 -FontAntiAliasing sym:cui.CheckBox.17102.63 -AAPixel sym:cui.NumericField.17102.64 -VorschauInSchriftlisten sym:cui.CheckBox.17102.60 -SchriftenHistorie sym:cui.CheckBox.17102.62 -UseHardwareAcceleration sym:cui.CheckBox.17102.68 -UseAntiAliasing sym:cui.CheckBox.17102.69 -IconsInMenueAnzeigen sym:cui.ListBox.17102.41 -MausAktion sym:cui.ListBox.17102.34 -MousePositioning sym:cui.ListBox.17102.31 -UseSystemFont sym:cui.CheckBox.17102.57 -Transparency sym:cui.CheckBox.17102.71 -SelectionOpacity sym:cui.MetricField.17102.72 +FontScale sym:cui:MetricField:OFA_TP_VIEW:MF_WINDOWSIZE +IconStyle sym:cui:ListBox:OFA_TP_VIEW:LB_ICONSTYLE +IconScale sym:cui:ListBox:OFA_TP_VIEW:LB_ICONSIZE +FontAntiAliasing sym:cui:CheckBox:OFA_TP_VIEW:CB_FONTANTIALIASING +AAPixel sym:cui:NumericField:OFA_TP_VIEW:NF_AA_POINTLIMIT +VorschauInSchriftlisten sym:cui:CheckBox:OFA_TP_VIEW:CB_FONT_SHOW +SchriftenHistorie sym:cui:CheckBox:OFA_TP_VIEW:CB_FONT_HISTORY +UseHardwareAcceleration sym:cui:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL +UseAntiAliasing sym:cui:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE +IconsInMenueAnzeigen sym:cui:ListBox:OFA_TP_VIEW:LB_MENU_ICONS +MausAktion sym:cui:ListBox:OFA_TP_VIEW:LB_MOUSEMIDDLE +MousePositioning sym:cui:ListBox:OFA_TP_VIEW:LB_MOUSEPOS +UseSystemFont sym:cui:CheckBox:OFA_TP_VIEW:CB_SYSTEM_FONT +Transparency sym:cui:CheckBox:OFA_TP_VIEW:CB_SELECTION +SelectionOpacity sym:cui:MetricField:OFA_TP_VIEW:MF_SELECTION *TabAusnahmen sym:CUI_HID_OFAPAGE_AUTOCORR_EXCEPT -Abkuerzungen sym:cui.Edit.17004.17 -AbkuerzungenListe sym:cui.ListBox.17004.18 -AbkuerzungenNeu sym:cui.PushButton.17004.19 -AbkuerzungenLoeschen sym:cui.PushButton.17004.20 -AbkuerzungenAutomatisch sym:cui.CheckBox.17004.43 -Woerter sym:cui.Edit.17004.22 -WoerterListe sym:cui.ListBox.17004.23 -WoerterNeu sym:cui.PushButton.17004.24 -WoerterLoeschen sym:cui.PushButton.17004.25 -WoerterAutomatisch sym:cui.CheckBox.17004.44 +Abkuerzungen sym:cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_ABBREV +AbkuerzungenListe sym:cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_ABBREV +AbkuerzungenNeu sym:cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWABBREV +AbkuerzungenLoeschen sym:cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELABBREV +AbkuerzungenAutomatisch sym:cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOABBREV +Woerter sym:cui:Edit:RID_OFAPAGE_AUTOCORR_EXCEPT:ED_DOUBLE_CAPS +WoerterListe sym:cui:ListBox:RID_OFAPAGE_AUTOCORR_EXCEPT:LB_DOUBLE_CAPS +WoerterNeu sym:cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_NEWDOUBLECAPS +WoerterLoeschen sym:cui:PushButton:RID_OFAPAGE_AUTOCORR_EXCEPT:PB_DELDOUBLECAPS +WoerterAutomatisch sym:cui:CheckBox:RID_OFAPAGE_AUTOCORR_EXCEPT:CB_AUTOCAPS Zurueck sym:SFX2_HID_TABDLG_RESET_BTN WelcheSprache sym:CUI_HID_AUTOCORR_LANGUAGE *TabAusrichtung sym:CUI_HID_ALIGNMENT -ListeHAusrichtung sym:cui.ListBox.10090.12 -ListeVAusrichtung sym:cui.ListBox.10090.16 -Einzug sym:cui.MetricField.10090.14 -Zeilenumbruch sym:cui.TriStateBox.10090.41 -Silbentrennung sym:cui.TriStateBox.10090.42 -Grad sym:cui.NumericField.10090.24 +ListeHAusrichtung sym:cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_HORALIGN +ListeVAusrichtung sym:cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_VERALIGN +Einzug sym:cui:MetricField:RID_SVXPAGE_ALIGNMENT:ED_INDENT +Zeilenumbruch sym:cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_WRAP +Silbentrennung sym:cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_HYPH +Grad sym:cui:NumericField:RID_SVXPAGE_ALIGNMENT:NF_DEGREES Bezugskante sym:CUI_HID_ALIGNMENT_CTR_BORDER_LOCK -VertikaleAusrichtung sym:cui.TriStateBox.10090.27 -Gestapelt sym:cui.TriStateBox.10090.21 -ShrinkToFit sym:cui.TriStateBox.10090.45 -SetAlignmentOptions sym:cui.ListBox.10090.44 +VertikaleAusrichtung sym:cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_ASIAN_VERTICAL +Gestapelt sym:cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_TXTSTACKED +ShrinkToFit sym:cui:TriStateBox:RID_SVXPAGE_ALIGNMENT:BTN_SHRINK +SetAlignmentOptions sym:cui:ListBox:RID_SVXPAGE_ALIGNMENT:LB_FRAMEDIR AlignmentDial sym:CUI_HID_ALIGNMENT_CTR_DIAL *TabAusrichtungAbsatz sym:CUI_HID_FORMAT_PARAGRAPH_ALIGN -Links sym:cui.RadioButton.10187.30 -Rechts sym:cui.RadioButton.10187.31 -Zentriert sym:cui.RadioButton.10187.32 -Blocksatz sym:cui.RadioButton.10187.33 -LetzteZeile sym:cui.ListBox.10187.50 -EinzelnesWortAustreiben sym:cui.CheckBox.10187.51 -VertikaleTextausrichtung sym:cui.ListBox.10187.36 -TextrasterFangen sym:cui.CheckBox.10187.38 -TextDirection sym:cui.ListBox.10187.92 +Links sym:cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_LEFTALIGN +Rechts sym:cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_RIGHTALIGN +Zentriert sym:cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_CENTERALIGN +Blocksatz sym:cui:RadioButton:RID_SVXPAGE_ALIGN_PARAGRAPH:BTN_JUSTIFYALIGN +LetzteZeile sym:cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_LASTLINE +EinzelnesWortAustreiben sym:cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_EXPAND +VertikaleTextausrichtung sym:cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_VERTALIGN +TextrasterFangen sym:cui:CheckBox:RID_SVXPAGE_ALIGN_PARAGRAPH:CB_SNAP +TextDirection sym:cui:ListBox:RID_SVXPAGE_ALIGN_PARAGRAPH:LB_TEXTDIRECTION *TabBedingung sym:SW_HID_COND_COLL -AlsBedingteVorlage sym:sw.CheckBox.20848.1 +AlsBedingteVorlage sym:sw:CheckBox:TP_CONDCOLL:CB_CONDITION Kontextliste sym:SW_HID_COND_COLL_TABLIST -Absatzvorlagen sym:sw.ListBox.20848.7 -Vorlagen sym:sw.ListBox.20848.8 -Entfernen sym:sw.PushButton.20848.9 -Zuweisen sym:sw.PushButton.20848.10 - -'*TabBeleuchtung HID_PAGE_LIGHT3D svx:TabPage:RID_SVXPAGE_LIGHT3D -'QuellFarbfilter svx:ListBox:RID_SVXPAGE_LIGHT3D:LB_LIGHT_COLOR -'QuellIntensitaet svx:MetricField:RID_SVXPAGE_LIGHT3D:MTR_FLD_LIGHT_INTENSITY +Absatzvorlagen sym:sw:ListBox:TP_CONDCOLL:LB_STYLE +Vorlagen sym:sw:ListBox:TP_CONDCOLL:LB_FILTER +Entfernen sym:sw:PushButton:TP_CONDCOLL:PB_REMOVE +Zuweisen sym:sw:PushButton:TP_CONDCOLL:PB_ASSIGN + +'*TabBeleuchtung HID_PAGE_LIGHT3D sym:svx:TabPage:RID_SVXPAGE_LIGHT3D +'QuellFarbfilter sym:svx:ListBox:RID_SVXPAGE_LIGHT3D:LB_LIGHT_COLOR +'QuellIntensitaet sym:svx:MetricField:RID_SVXPAGE_LIGHT3D:MTR_FLD_LIGHT_INTENSITY 'Richtung -'UmgebungsFarbfilter svx:ListBox:RID_SVXPAGE_LIGHT3D:LB_COLOR -'UmgebungsIntensitaet svx:MetricField:RID_SVXPAGE_LIGHT3D:MTR_FLD_INTENSITY +'UmgebungsFarbfilter sym:svx:ListBox:RID_SVXPAGE_LIGHT3D:LB_COLOR +'UmgebungsIntensitaet sym:svx:MetricField:RID_SVXPAGE_LIGHT3D:MTR_FLD_INTENSITY 'Zurueck sym:SFX2_HID_TABDLG_RESET_BTN *TabBemassung sym:CUI_HID_PAGE_MEASURE -Liniendistanz sym:cui.MetricField.10161.1 -HLUebergang sym:cui.MetricField.10161.2 -HLDistanz sym:cui.MetricField.10161.3 -LinkeHL sym:cui.MetricField.10161.4 -RechteHL sym:cui.MetricField.10161.5 -AnzeigeUnterhalb sym:cui.TriStateBox.10161.1 -AnzeigeParallel sym:cui.TriStateBox.10161.5 -MetrikAnzeigen sym:cui.TriStateBox.10161.2 +Liniendistanz sym:cui:MetricField:RID_SVXPAGE_MEASURE:MTR_LINE_DIST +HLUebergang sym:cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_OVERHANG +HLDistanz sym:cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE_DIST +LinkeHL sym:cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE1_LEN +RechteHL sym:cui:MetricField:RID_SVXPAGE_MEASURE:MTR_FLD_HELPLINE2_LEN +AnzeigeUnterhalb sym:cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_BELOW_REF_EDGE +AnzeigeParallel sym:cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_PARALLEL +MetrikAnzeigen sym:cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_SHOW_UNIT Textposition sym:CUI_HID_MEASURE_CTL_POSITION -AutomatischVertikal sym:cui.TriStateBox.10161.3 -AutomatischHorizontal sym:cui.TriStateBox.10161.4 +AutomatischVertikal sym:cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSV +AutomatischHorizontal sym:cui:TriStateBox:RID_SVXPAGE_MEASURE:TSB_AUTOPOSH *TabBenutzer sym:SFX2_HID_DOCINFOUSER -Info0 sym:sfx.Edit.265.16 -Info1 sym:sfx.Edit.265.18 -Info2 sym:sfx.Edit.265.20 -Info3 sym:sfx.Edit.265.22 -Infofelder sym:sfx.PushButton.265.34 +Info0 sym:sfx2:Edit:TP_DOCINFOUSER:ED_INFO1 +Info1 sym:sfx2:Edit:TP_DOCINFOUSER:ED_INFO2 +Info2 sym:sfx2:Edit:TP_DOCINFOUSER:ED_INFO3 +Info3 sym:sfx2:Edit:TP_DOCINFOUSER:ED_INFO4 +Infofelder sym:sfx2:PushButton:TP_DOCINFOUSER:BTN_EDITLABEL +TabBenutzerdaten TabAllgemein *TabBerechnen sym:SC_HID_SCPAGE_CALC -Iterationen sym:sc.CheckBox.25660.1 -Schritte sym:sc.NumericField.25660.4 -Nachkommastellen sym:sc.NumericField.25660.7 -MinimalerAenderungswert sym:sc.Edit.25660.5 -Standard sym:sc.RadioButton.25660.9 -StarCalc10 sym:sc.RadioButton.25660.10 -Jahr1904 sym:sc.RadioButton.25660.11 -GrossKleinschreibung sym:sc.CheckBox.25660.15 -GenauigkeitWieAngezeigt sym:sc.CheckBox.25660.17 -Suchkriterien sym:sc.CheckBox.25660.18 -RegulaererAusdruck sym:sc.CheckBox.25660.20 -SpaltenZeilenbeschriftung sym:sc.CheckBox.25660.19 -LimitDecimals sym:sc.CheckBox.25660.21 +Iterationen sym:sc:CheckBox:RID_SCPAGE_CALC:BTN_ITERATE +Schritte sym:sc:NumericField:RID_SCPAGE_CALC:ED_STEPS +Nachkommastellen sym:sc:NumericField:RID_SCPAGE_CALC:ED_PREC +MinimalerAenderungswert sym:sc:Edit:RID_SCPAGE_CALC:ED_EPS +Standard sym:sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESTD +StarCalc10 sym:sc:RadioButton:RID_SCPAGE_CALC:BTN_DATESC10 +Jahr1904 sym:sc:RadioButton:RID_SCPAGE_CALC:BTN_DATE1904 +GrossKleinschreibung sym:sc:CheckBox:RID_SCPAGE_CALC:BTN_CASE +GenauigkeitWieAngezeigt sym:sc:CheckBox:RID_SCPAGE_CALC:BTN_CALC +Suchkriterien sym:sc:CheckBox:RID_SCPAGE_CALC:BTN_MATCH +RegulaererAusdruck sym:sc:CheckBox:RID_SCPAGE_CALC:BTN_REGEX +SpaltenZeilenbeschriftung sym:sc:CheckBox:RID_SCPAGE_CALC:BTN_LOOKUP +LimitDecimals sym:sc:CheckBox:RID_SCPAGE_CALC:BTN_GENERAL_PREC *TabBereiche sym:SW_HID_INSERT_SECTION_PAGE -Bereichsliste sym:sw.ComboBox.20885.20 -Geschuetzt sym:sw.CheckBox.20885.10 -Ausblenden sym:sw.CheckBox.20885.8 -BedingungText sym:sw.Edit.20885.13 -Verknuepfung sym:sw.CheckBox.20885.5 -DDE sym:sw.CheckBox.20885.1 -DateiVerknuepfung sym:sw.Edit.20885.16 -Bereich sym:sw.ComboBox.20885.38 -Auswaehlen sym:sw.PushButton.20885.40 -Passwort sym:sw.CheckBox.20885.9 -EnterPasswort sym:sw.PushButton.20885.51 +Bereichsliste sym:sw:ComboBox:TP_INSERT_SECTION:ED_RNAME +Geschuetzt sym:sw:CheckBox:TP_INSERT_SECTION:CB_PROTECT +Ausblenden sym:sw:CheckBox:TP_INSERT_SECTION:CB_HIDE +BedingungText sym:sw:Edit:TP_INSERT_SECTION:ED_CONDITION +Verknuepfung sym:sw:CheckBox:TP_INSERT_SECTION:CB_FILE +DDE sym:sw:CheckBox:TP_INSERT_SECTION:CB_DDE +DateiVerknuepfung sym:sw:Edit:TP_INSERT_SECTION:ED_FILE +Bereich sym:sw:ComboBox:TP_INSERT_SECTION:LB_SUBREG +Auswaehlen sym:sw:PushButton:TP_INSERT_SECTION:PB_FILE +Passwort sym:sw:CheckBox:TP_INSERT_SECTION:CB_PASSWD +EnterPasswort sym:sw:PushButton:TP_INSERT_SECTION:PB_PASSWD *TabBeschreibung sym:SFX2_HID_DOCINFODESC -Titel sym:sfx.Edit.263.10 -Thema sym:sfx.Edit.263.12 -Schluesselwoerter sym:sfx.Edit.263.14 -Beschreibung sym:sfx.MultiLineEdit.263.24 +Titel sym:sfx2:Edit:TP_DOCINFODESC:ED_TITLE +Thema sym:sfx2:Edit:TP_DOCINFODESC:ED_THEMA +Schluesselwoerter sym:sfx2:Edit:TP_DOCINFODESC:ED_KEYWORDS +Beschreibung sym:sfx2:MultiLineEdit:TP_DOCINFODESC:ED_COMMENT -*TabBibliotheken sym:basctl.TabPage.14888 -Bibliothek sym:basctl.ListBox.14888.12 +*TabBibliotheken sym:basctl:TabPage:RID_TP_LIBS +Bibliothek sym:basctl:ListBox:RID_TP_LIBS:RID_LB_BASICS Bibliotheksliste sym:BASCTL_HID_BASICIDE_LIBS_TREE -Bearbeiten sym:basctl.PushButton.14888.4 -Passwort sym:basctl.PushButton.14888.11 -Neu sym:basctl.PushButton.14888.9 -Hinzufuegen sym:basctl.PushButton.14888.10 -Export sym:basctl.PushButton.14888.14 -Loeschen sym:basctl.PushButton.14888.8 +Bearbeiten sym:basctl:PushButton:RID_TP_LIBS:RID_PB_EDIT +Passwort sym:basctl:PushButton:RID_TP_LIBS:RID_PB_PASSWORD +Neu sym:basctl:PushButton:RID_TP_LIBS:RID_PB_NEWLIB +Hinzufuegen sym:basctl:PushButton:RID_TP_LIBS:RID_PB_APPEND +Export sym:basctl:PushButton:RID_TP_LIBS:RID_PB_EXPORT +Loeschen sym:basctl:PushButton:RID_TP_LIBS:RID_PB_DELETE *TabBitmap sym:CUI_HID_AREA_BITMAP 'PixelEditor -Vordergrund sym:cui.ListBox.10058.1 -Hintergrund sym:cui.ListBox.10058.3 -Tabelle sym:cui.ListBox.10058.4 -Hinzufuegen sym:cui.PushButton.10058.1 -Aendern sym:cui.PushButton.10058.3 -Import sym:cui.PushButton.10058.2 -Loeschen sym:cui.PushButton.10058.4 -Oeffnen sym:cui.ImageButton.10058.5 -Speichern sym:cui.ImageButton.10058.6 +Vordergrund sym:cui:ListBox:RID_SVXPAGE_BITMAP:LB_COLOR +Hintergrund sym:cui:ListBox:RID_SVXPAGE_BITMAP:LB_BACKGROUND_COLOR +Tabelle sym:cui:ListBox:RID_SVXPAGE_BITMAP:LB_BITMAPS +Hinzufuegen sym:cui:PushButton:RID_SVXPAGE_BITMAP:BTN_ADD +Aendern sym:cui:PushButton:RID_SVXPAGE_BITMAP:BTN_MODIFY +Import sym:cui:PushButton:RID_SVXPAGE_BITMAP:BTN_IMPORT +Loeschen sym:cui:PushButton:RID_SVXPAGE_BITMAP:BTN_DELETE +Oeffnen sym:cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_LOAD +Speichern sym:cui:ImageButton:RID_SVXPAGE_BITMAP:BTN_SAVE Zurueck sym:SFX2_HID_TABDLG_RESET_BTN *TabDateien sym:CUI_HID_GALLERY_BROWSER -Dateityp sym:cui.ComboBox.10364.1 -Suche sym:cui.PushButton.10364.4 -Dateiliste sym:cui.MultiListBox.10364.1 -Hinzufuegen sym:cui.PushButton.10364.5 -HinzufuegenAlle sym:cui.PushButton.10364.1 -Vorschau sym:cui.CheckBox.10364.3 +Dateityp sym:cui:ComboBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBB_FILETYPE +Suche sym:cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_SEARCH +Dateiliste sym:cui:MultiListBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:LBX_FOUND +Hinzufuegen sym:cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKE +HinzufuegenAlle sym:cui:PushButton:RID_SVXTABPAGE_GALLERYTHEME_FILES:BTN_TAKEALL +Vorschau sym:cui:CheckBox:RID_SVXTABPAGE_GALLERYTHEME_FILES:CBX_PREVIEW *TabDatenbank sym:SW_HID_FLD_DB -Feldtyp sym:sw.ListBox.20864.2 +Feldtyp sym:sw:ListBox:TP_FLD_DB:LB_DBTYPE Datenbankauswahl sym:SW_HID_DB_SELECTION_TLB -Bedingung sym:sw.Edit.20864.8 -Satznummer sym:sw.Edit.20864.9 -AusDatenbank sym:sw.RadioButton.20864.13 -Selbstdefiniert sym:sw.RadioButton.20864.12 -Formatliste sym:sw.ListBox.20864.10 -Zahlenformat sym:sw.ListBox.20864.11 +Bedingung sym:sw:Edit:TP_FLD_DB:ED_DBCONDITION +Satznummer sym:sw:Edit:TP_FLD_DB:ED_DBSETNUMBER +AusDatenbank sym:sw:RadioButton:TP_FLD_DB:RB_DBOWNFORMAT +Selbstdefiniert sym:sw:RadioButton:TP_FLD_DB:RB_DBFORMAT +Formatliste sym:sw:ListBox:TP_FLD_DB:LB_DBFORMAT +Zahlenformat sym:sw:ListBox:TP_FLD_DB:LB_DBNUMFORMAT Einfuegen sym:SW_HID_FIELD_INSERT Schliessen sym:SW_HID_FIELD_CLOSE *TabDirektCursor sym:SW_HID_OPTSHDWCRSR -DirektCursor sym:sw.CheckBox.20870.2 -Absatzausrichtung sym:sw.RadioButton.20870.5 -LinkerAbsatzrand sym:sw.RadioButton.20870.6 -Tabulator sym:sw.RadioButton.20870.7 -TabulatorUndLeerzeichen sym:sw.RadioButton.20870.8 -Zonen_Cursor sym:sw.CheckBox.20870.12 - -Absatzenden sym:sw.CheckBox.20870.5 -Tabulatoren sym:sw.CheckBox.20870.6 -Leerzeichen sym:sw.CheckBox.20870.7 -GeschLeerzeichen sym:sw.CheckBox.20870.8 -WeicheTrenner sym:sw.CheckBox.20870.9 -Umbrueche sym:sw.CheckBox.20870.11 -VersteckteAbsatze sym:sw.CheckBox.20870.36 -FeldVersteckterText sym:sw.CheckBox.20870.10 -VersteckterText sym:sw.CheckBox.20870.61 +DirektCursor sym:sw:CheckBox:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF +Absatzausrichtung sym:sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN +LinkerAbsatzrand sym:sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT +Tabulator sym:sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLTAB +TabulatorUndLeerzeichen sym:sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLSPACE +Zonen_Cursor sym:sw:CheckBox:TP_OPTSHDWCRSR:CB_ALLOW_IN_PROT + +Absatzenden sym:sw:CheckBox:TP_OPTSHDWCRSR:CB_PARA +Tabulatoren sym:sw:CheckBox:TP_OPTSHDWCRSR:CB_TAB +Leerzeichen sym:sw:CheckBox:TP_OPTSHDWCRSR:CB_SPACE +GeschLeerzeichen sym:sw:CheckBox:TP_OPTSHDWCRSR:CB_HSPACE +WeicheTrenner sym:sw:CheckBox:TP_OPTSHDWCRSR:CB_SHYPH +Umbrueche sym:sw:CheckBox:TP_OPTSHDWCRSR:CB_BREAK +VersteckteAbsatze sym:sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN_PARA +FeldVersteckterText sym:sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN +VersteckterText sym:sw:CheckBox:TP_OPTSHDWCRSR:CB_CHAR_HIDDEN *TabDokument sym:SFX2_HID_DOCINFODOC -Dokumentname sym:sfx.Edit.264.51 -Schreibgeschuetzt sym:sfx.CheckBox.264.48 -DigitalSignature sym:sfx.PushButton.264.79 -Loeschen sym:sfx.PushButton.264.62 -BenutzerdatenVerwenden sym:sfx.CheckBox.264.49 - -FileTypeInfo sym:sfx.Edit.264.54 -FileLocationInfo sym:sfx.Edit.264.2 -FileSizeInfo sym:sfx.Edit.264.56 -FileCreatedInfo sym:sfx.Edit.264.8 -FileChangedInfo sym:sfx.Edit.264.4 -FileSignedInfo sym:sfx.Edit.264.77 -FileLastPrintedInfo sym:sfx.Edit.264.59 -FileEditTimeInfo sym:sfx.Edit.264.36 -FileRevisionInfo sym:sfx.Edit.264.38 -FileTemplateinfo sym:sfx.Edit.264.33 +Dokumentname sym:sfx2:Edit:TP_DOCINFODOC:ED_FILE_NAME +Schreibgeschuetzt sym:sfx2:CheckBox:TP_DOCINFODOC:CB_FILE_READONLY +DigitalSignature sym:sfx2:PushButton:TP_DOCINFODOC:BTN_SIGNATURE +Loeschen sym:sfx2:PushButton:TP_DOCINFODOC:BTN_DELETE +BenutzerdatenVerwenden sym:sfx2:CheckBox:TP_DOCINFODOC:CB_USE_USERDATA + +FileTypeInfo sym:sfx2:Edit:TP_DOCINFODOC:FT_FILE_SHOW_TYP +FileLocationInfo sym:sfx2:Edit:TP_DOCINFODOC:FT_FILE_VAL +FileSizeInfo sym:sfx2:Edit:TP_DOCINFODOC:FT_FILE_SHOW_SIZE +FileCreatedInfo sym:sfx2:Edit:TP_DOCINFODOC:FT_CREATE_VAL +FileChangedInfo sym:sfx2:Edit:TP_DOCINFODOC:FT_CHANGE_VAL +FileSignedInfo sym:sfx2:Edit:TP_DOCINFODOC:FT_SIGNED_VAL +FileLastPrintedInfo sym:sfx2:Edit:TP_DOCINFODOC:FT_PRINT_VAL +FileEditTimeInfo sym:sfx2:Edit:TP_DOCINFODOC:FT_TIMELOG_VAL +FileRevisionInfo sym:sfx2:Edit:TP_DOCINFODOC:FT_DOCNO_VAL +FileTemplateinfo sym:sfx2:Edit:TP_DOCINFODOC:FT_TEMPL_VAL *TabDokumentFeldbefehle sym:SW_HID_FLD_DOK -Feldtyp sym:sw.ListBox.20867.48 -Auswahl sym:sw.ListBox.20867.50 -Formatliste sym:sw.ListBox.20867.52 -Zahlenformat sym:sw.ListBox.20867.51 -Editfeld sym:sw.Edit.20867.55 -InhaltFix sym:sw.CheckBox.20867.58 +Feldtyp sym:sw:ListBox:TP_FLD_DOK:LB_DOKTYPE +Auswahl sym:sw:ListBox:TP_FLD_DOK:LB_DOKSELECTION +Formatliste sym:sw:ListBox:TP_FLD_DOK:LB_DOKFORMAT +Zahlenformat sym:sw:ListBox:TP_FLD_DOK:LB_DOKNUMFORMAT +Editfeld sym:sw:Edit:TP_FLD_DOK:ED_DOKVALUE +InhaltFix sym:sw:CheckBox:TP_FLD_DOK:CB_DOKFIXEDCONTENT Einfuegen sym:SW_HID_FIELD_INSERT Schliessen sym:SW_HID_FIELD_CLOSE *TabDokumentinfo sym:SFX2_HID_DOCINFODESC -Beschreibung sym:sfx.MultiLineEdit.263.24 -Schluesselworte sym:sfx.Edit.263.14 -Thema sym:sfx.Edit.263.12 -Titel sym:sfx.Edit.263.10 +Beschreibung sym:sfx2:MultiLineEdit:TP_DOCINFODESC:ED_COMMENT +Schluesselworte sym:sfx2:Edit:TP_DOCINFODESC:ED_KEYWORDS +Thema sym:sfx2:Edit:TP_DOCINFODESC:ED_THEMA +Titel sym:sfx2:Edit:TP_DOCINFODESC:ED_TITLE *TabDokumentInfoFeldbefehle sym:SW_HID_FLD_DOKINF Feldtyp sym:SW_HID_FIELD_DINF_TYPE -Auswahl sym:sw.ListBox.20865.18 -Zahlenformat sym:sw.ListBox.20865.20 -InhaltFix sym:sw.CheckBox.20865.21 +Auswahl sym:sw:ListBox:TP_FLD_DOKINF:LB_DOKINFSELECTION +Zahlenformat sym:sw:ListBox:TP_FLD_DOKINF:LB_DOKINFFORMAT +InhaltFix sym:sw:CheckBox:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT Einfuegen sym:SW_HID_FIELD_INSERT Schliessen sym:SW_HID_FIELD_CLOSE *TabDrehung sym:CUI_HID_TRANS_ANGLE -PositionX sym:cui.MetricField.10048.7 -PositionY sym:cui.MetricField.10048.8 -Winkel sym:cui.MetricField.10048.19 +PositionX sym:cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_X +PositionY sym:cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_POS_Y +Winkel sym:cui:MetricField:RID_SVXPAGE_ANGLE:MTR_FLD_ANGLE Drehpunkt sym:CUI_HID_TPROTATION_CTRL1 Drehwinkel sym:CUI_HID_TPROTATION_CTRL2 -*TabDruckenDraw sym:SD_HID_SD_PRINT_OPTIONS sc:hidspecial:HID_SC_WIN_PREVIEW -Zeichnung sym:sd.CheckBox.549.6 -Notizen sym:sd.CheckBox.549.7 -Handzettel sym:sd.CheckBox.549.8 -Gliederung sym:sd.CheckBox.549.9 -Seitenname sym:sd.CheckBox.549.2 -Datum sym:sd.CheckBox.549.3 -Zeit sym:sd.CheckBox.549.4 -AusgeblendeteSeitenDrucken sym:sd.CheckBox.549.1 -Standard sym:sd.RadioButton.549.1 -AnSeitengroesseAnpassen sym:sd.RadioButton.549.2 -SeitenKacheln sym:sd.RadioButton.549.3 -Prospekt sym:sd.RadioButton.549.4 -Vorderseite sym:sd.CheckBox.549.12 -Rueckseite sym:sd.CheckBox.549.13 -AusDruckereinstellung sym:sd.CheckBox.549.10 -StandardAusgabe sym:sd.RadioButton.549.5 -Graustufen sym:sd.RadioButton.549.6 -SchwarzWeiss sym:sd.RadioButton.549.7 +*TabDruckenDraw sym:SD_HID_SD_PRINT_OPTIONS sym:sc:hidspecial:HID_SC_WIN_PREVIEW +Zeichnung sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_DRAW +Notizen sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_NOTES +Handzettel sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_HANDOUTS +Gliederung sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_OUTLINE +Seitenname sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAGENAME +Datum sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_DATE +Zeit sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_TIME +AusgeblendeteSeitenDrucken sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES +Standard sym:sd:RadioButton:TP_PRINT_OPTIONS:RBT_DEFAULT +AnSeitengroesseAnpassen sym:sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGESIZE +SeitenKacheln sym:sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGETILE +Prospekt sym:sd:RadioButton:TP_PRINT_OPTIONS:RBT_BOOKLET +Vorderseite sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_FRONT +Rueckseite sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_BACK +AusDruckereinstellung sym:sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN +StandardAusgabe sym:sd:RadioButton:TP_PRINT_OPTIONS:RBT_COLOR +Graustufen sym:sd:RadioButton:TP_PRINT_OPTIONS:RBT_GRAYSCALE +SchwarzWeiss sym:sd:RadioButton:TP_PRINT_OPTIONS:RBT_BLACKWHITE *TabDruckenHTML sym:SW_HID_OPTPRINT_PAGE -Grafiken sym:sw.CheckBox.20826.61 -Kontrollfelder sym:sw.CheckBox.20826.69 -Hintergrund sym:sw.CheckBox.20826.79 -SchwarzDrucken sym:sw.CheckBox.20826.87 -Prospekt sym:sw.CheckBox.20826.67 -Keine sym:sw.RadioButton.20826.80 -NurNotizen sym:sw.RadioButton.20826.81 -Dokumentende sym:sw.RadioButton.20826.82 -Seitenende sym:sw.RadioButton.20826.83 -AusDruckereinstellung sym:sw.CheckBox.20826.70 -LeereSeitenDrucken sym:sw.CheckBox.20826.92 -Fax sym:sw.ListBox.20826.86 +Grafiken sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF +Kontrollfelder sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD +Hintergrund sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND +SchwarzDrucken sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT +Prospekt sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT +Keine sym:sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO +NurNotizen sym:sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY +Dokumentende sym:sw:RadioButton:TP_OPTPRINT_PAGE:RB_END +Seitenende sym:sw:RadioButton:TP_OPTPRINT_PAGE:RB_PAGEEND +AusDruckereinstellung sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP +LeereSeitenDrucken sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES +Fax sym:sw:ListBox:TP_OPTPRINT_PAGE:LB_FAX *TabDruckenWriter sym:SW_HID_OPTPRINT_PAGE -Grafiken sym:sw.CheckBox.20826.61 -Kontrollfelder sym:sw.CheckBox.20826.69 -Hintergrund sym:sw.CheckBox.20826.79 -HiddenText sym:sw.CheckBox.20826.93 -TextPlaceholder sym:sw.CheckBox.20826.94 -RightToLeft sym:sw.CheckBox.20826.140 -SchwarzDrucken sym:sw.CheckBox.20826.87 -LinkeSeiten sym:sw.CheckBox.20826.64 -RechteSeiten sym:sw.CheckBox.20826.65 -Prospekt sym:sw.CheckBox.20826.67 -Keine sym:sw.RadioButton.20826.80 -NurNotizen sym:sw.RadioButton.20826.81 -Dokumentende sym:sw.RadioButton.20826.82 -Seitenende sym:sw.RadioButton.20826.83 -AusDruckereinstellung sym:sw.CheckBox.20826.70 -LeereSeitenDrucken sym:sw.CheckBox.20826.92 -Fax sym:sw.ListBox.20826.86 +Grafiken sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF +Kontrollfelder sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD +Hintergrund sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND +HiddenText sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT +TextPlaceholder sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_TEXT_PLACEHOLDER +RightToLeft sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL +SchwarzDrucken sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT +LinkeSeiten sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP +RechteSeiten sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP +Prospekt sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT +Keine sym:sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO +NurNotizen sym:sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY +Dokumentende sym:sw:RadioButton:TP_OPTPRINT_PAGE:RB_END +Seitenende sym:sw:RadioButton:TP_OPTPRINT_PAGE:RB_PAGEEND +AusDruckereinstellung sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP +LeereSeitenDrucken sym:sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES +Fax sym:sw:ListBox:TP_OPTPRINT_PAGE:LB_FAX Zurueck sym:SFX2_HID_TABDLG_RESET_BTN -*TabDruckenMath sym:sm.TabPage.20007 -DruckeTitelzeile sym:sm.CheckBox.20007.11 -DruckeFormeltext sym:sm.CheckBox.20007.12 -DruckeRahmen sym:sm.CheckBox.20007.13 -Originalgroesse sym:sm.RadioButton.20007.21 -DerSeiteAnpassen sym:sm.RadioButton.20007.22 -Skalierung sym:sm.RadioButton.20007.23 -Prozent sym:sm.MetricField.20007.24 -Ignorieren sym:sm.CheckBox.20007.31 +*TabDruckenMath sym:starmath:TabPage:RID_PRINTOPTIONPAGE +DruckeTitelzeile sym:starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_TITLEROW +DruckeFormeltext sym:starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_EQUATION_TEXT +DruckeRahmen sym:starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_FRAME +Originalgroesse sym:starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_ORIGINAL_SIZE +DerSeiteAnpassen sym:starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_FIT_TO_PAGE +Skalierung sym:starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_ZOOM +Prozent sym:starmath:MetricField:RID_PRINTOPTIONPAGE:MF_ZOOM +Ignorieren sym:starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_IGNORE_SPACING *TabDruckerEtiketten sym:SW_HID_LAB_PRT -GanzeSeite sym:sw.RadioButton.22757.1 -EinzelnesEtikett sym:sw.RadioButton.22757.2 -Spalte sym:sw.NumericField.22757.5 -Zeile sym:sw.NumericField.22757.7 -Einrichten sym:sw.PushButton.22757.8 -InhaltSynchronisieren sym:sw.CheckBox.22757.11 +GanzeSeite sym:sw:RadioButton:TP_LAB_PRT:BTN_PAGE +EinzelnesEtikett sym:sw:RadioButton:TP_LAB_PRT:BTN_SINGLE +Spalte sym:sw:NumericField:TP_LAB_PRT:FLD_COL +Zeile sym:sw:NumericField:TP_LAB_PRT:FLD_ROW +Einrichten sym:sw:PushButton:TP_LAB_PRT:BTN_PRTSETUP +InhaltSynchronisieren sym:sw:CheckBox:TP_LAB_PRT:CB_SYNCHRON NeuesDok sym:SW_HID_LABEL_INSERT Zurueck sym:SFX2_HID_TABDLG_RESET_BTN @@ -363,11 +363,11 @@ Art3 sym:SW_HID_ITM_HOR_RGHT Art4 sym:SW_HID_ITM_VER_LEFT Art5 sym:SW_HID_ITM_VER_CNTR Art6 sym:SW_HID_ITM_VER_RGHT -VonObenBedrucken sym:sw.RadioButton.22754.7 -VonUntenBedrucken sym:sw.RadioButton.22754.8 -NachRechts sym:sw.MetricField.22754.10 -NachUnten sym:sw.MetricField.22754.12 -Einrichten sym:sw.PushButton.22754.15 +VonObenBedrucken sym:sw:RadioButton:TP_ENV_PRT:BTN_TOP +VonUntenBedrucken sym:sw:RadioButton:TP_ENV_PRT:BTN_BOTTOM +NachRechts sym:sw:MetricField:TP_ENV_PRT:FLD_RIGHT +NachUnten sym:sw:MetricField:TP_ENV_PRT:FLD_DOWN +Einrichten sym:sw:PushButton:TP_ENV_PRT:BTN_PRTSETUP Drucken sym:SW_HID_ENVELOP_PRINT Zurueck sym:SFX2_HID_TABDLG_RESET_BTN diff --git a/testautomation/global/win/tab_e_g.win b/testautomation/global/win/tab_e_g.win index ef18ae5ebdbe..f3151feda3de 100644 --- a/testautomation/global/win/tab_e_g.win +++ b/testautomation/global/win/tab_e_g.win @@ -1,65 +1,65 @@ -*TabEigenschaften sym:.uno:InsertObjectFloatingFrame -FrameName sym:cui.Edit.32011.4 -Inhalt sym:cui.Edit.32011.6 -Oeffnen sym:cui.PushButton.32011.7 -An sym:cui.RadioButton.32011.13 -Aus sym:cui.RadioButton.32011.14 -Automatisch sym:cui.RadioButton.32011.15 -UmrandungAn sym:cui.RadioButton.32011.18 -UmrandungAus sym:cui.RadioButton.32011.20 -Breite sym:cui.NumericField.32011.10 -Hoehe sym:cui.NumericField.32011.8 -BreiteStandard sym:cui.CheckBox.32011.22 -HoeheStandard sym:cui.CheckBox.32011.22 +*TabEigenschaften .uno:InsertObjectFloatingFrame +FrameName sym:cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_FRAMENAME +Inhalt sym:cui:Edit:MD_INSERT_OBJECT_IFRAME:ED_URL +Oeffnen sym:cui:PushButton:MD_INSERT_OBJECT_IFRAME:BT_FILEOPEN +An sym:cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGON +Aus sym:cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGOFF +Automatisch sym:cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_SCROLLINGAUTO +UmrandungAn sym:cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_ON +UmrandungAus sym:cui:RadioButton:MD_INSERT_OBJECT_IFRAME:RB_FRMBORDER_OFF +Breite sym:cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINWIDTH +Hoehe sym:cui:NumericField:MD_INSERT_OBJECT_IFRAME:NM_MARGINHEIGHT +BreiteStandard sym:cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT +HoeheStandard sym:cui:CheckBox:MD_INSERT_OBJECT_IFRAME:CB_MARGINHEIGHTDEFAULT -*TabEingabehilfe sym:sc.TabPage.697 -EingabehilfenbeiSelektion sym:sc.TriStateBox.697.11 -Titel sym:sc.Edit.697.13 -EingabeHilfe sym:sc.MultiLineEdit.697.15 +*TabEingabehilfe sym:sc:TabPage:TP_VALIDATION_INPUTHELP +EingabehilfenbeiSelektion sym:sc:TriStateBox:TP_VALIDATION_INPUTHELP:TSB_HELP +Titel sym:sc:Edit:TP_VALIDATION_INPUTHELP:EDT_TITLE +EingabeHilfe sym:sc:MultiLineEdit:TP_VALIDATION_INPUTHELP:EDT_INPUTHELP *TabEinzuegeUndAbstaende sym:CUI_HID_FORMAT_PARAGRAPH_STD -Automatisch sym:cui.CheckBox.10006.48 -Vonlinks sym:cui.MetricField.10006.11 -ErsteZeile sym:cui.MetricField.10006.13 -VonRechts sym:cui.MetricField.10006.15 -Oben sym:cui.MetricField.10006.21 -Unten sym:cui.MetricField.10006.23 -Zeilenabstand sym:cui.ListBox.10006.40 -Um sym:cui.MetricField.10006.42 -Von sym:cui.MetricField.10006.43 -Registerhaltigkeit sym:cui.CheckBox.10006.84 +Automatisch sym:cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_AUTO +Vonlinks sym:cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LEFTINDENT +ErsteZeile sym:cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_FLINEINDENT +VonRechts sym:cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_RIGHTINDENT +Oben sym:cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_TOPDIST +Unten sym:cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_BOTTOMDIST +Zeilenabstand sym:cui:ListBox:RID_SVXPAGE_STD_PARAGRAPH:LB_LINEDIST +Um sym:cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTPERCENT +Von sym:cui:MetricField:RID_SVXPAGE_STD_PARAGRAPH:ED_LINEDISTMETRIC +Registerhaltigkeit sym:cui:CheckBox:RID_SVXPAGE_STD_PARAGRAPH:CB_REGISTER *TabEndnoten sym:SW_HID_ENDNOTE_OPTIONS -Numerierung sym:sw.ListBox.21013.10 -BeginnBei sym:sw.NumericField.21013.12 -Davor sym:sw.Edit.21013.46 -Dahinter sym:sw.Edit.21013.48 -Absatz sym:sw.ListBox.21013.30 -Seite sym:sw.ListBox.21013.31 -ZeichenvorlageEndnotenbereich sym:sw.ListBox.21013.50 -ZeichenvorlageTextbereich sym:sw.ListBox.21013.53 +Numerierung sym:sw:ListBox:TP_ENDNOTEOPTION:LB_NUMVIEW +BeginnBei sym:sw:NumericField:TP_ENDNOTEOPTION:FLD_OFFSET +Davor sym:sw:Edit:TP_ENDNOTEOPTION:ED_PREFIX +Dahinter sym:sw:Edit:TP_ENDNOTEOPTION:ED_SUFFIX +Absatz sym:sw:ListBox:TP_ENDNOTEOPTION:LB_PARA_TEMPL +Seite sym:sw:ListBox:TP_ENDNOTEOPTION:LB_PAGE_TEMPL +ZeichenvorlageEndnotenbereich sym:sw:ListBox:TP_ENDNOTEOPTION:LB_TEXT_CHARFMT +ZeichenvorlageTextbereich sym:sw:ListBox:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT *TabErsetzung sym:CUI_HID_OFAPAGE_AUTOCORR_REPLACE -NurText sym:cui.CheckBox.17003.34 -Kuerzel sym:cui.Edit.17003.31 -ErsetzenDurch sym:cui.Edit.17003.32 +NurText sym:cui:CheckBox:RID_OFAPAGE_AUTOCORR_REPLACE:CB_TEXT_ONLY +Kuerzel sym:cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_SHORT +ErsetzenDurch sym:cui:Edit:RID_OFAPAGE_AUTOCORR_REPLACE:ED_REPLACE Liste sym:CUI_HID_OFACTL_AUTOCORR_REPLACE -Neu sym:cui.PushButton.17003.35 -Loeschen sym:cui.PushButton.17003.36 +Neu sym:cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_NEW_REPLACE +Loeschen sym:cui:PushButton:RID_OFAPAGE_AUTOCORR_REPLACE:PB_DELETE_REPLACE Zurueck sym:SFX2_HID_TABDLG_RESET_BTN WelcheSprache sym:CUI_HID_AUTOCORR_LANGUAGE *TabEtiketten sym:SW_HID_LAB_LAB -Adresse sym:sw.CheckBox.22755.2 -Aufschrift sym:sw.MultiLineEdit.22755.3 -Anschrift sym:sw.ListBox.22755.5 -Tabelle sym:sw.ListBox.22755.7 -Datenbankfeld sym:sw.ListBox.22755.18 -Uebernehmen sym:sw.ImageButton.22755.19 -Endlos sym:sw.RadioButton.22755.9 -Bogen sym:sw.RadioButton.22755.10 -Marke sym:sw.ListBox.22755.12 -Typ sym:sw.ListBox.22755.14 +Adresse sym:sw:CheckBox:TP_LAB_LAB:BOX_ADDR +Aufschrift sym:sw:MultiLineEdit:TP_LAB_LAB:EDT_WRITING +Anschrift sym:sw:ListBox:TP_LAB_LAB:LB_DATABASE +Tabelle sym:sw:ListBox:TP_LAB_LAB:LB_TABLE +Datenbankfeld sym:sw:ListBox:TP_LAB_LAB:LB_DBFIELD +Uebernehmen sym:sw:ImageButton:TP_LAB_LAB:BTN_INSERT +Endlos sym:sw:RadioButton:TP_LAB_LAB:BTN_CONT +Bogen sym:sw:RadioButton:TP_LAB_LAB:BTN_SHEET +Marke sym:sw:ListBox:TP_LAB_LAB:BOX_MAKE +Typ sym:sw:ListBox:TP_LAB_LAB:BOX_TYPE NeuesDok sym:SW_HID_LABEL_INSERT Zurueck sym:SFX2_HID_TABDLG_RESET_BTN @@ -71,139 +71,139 @@ Typ sym:SW_HID_BUSINESS_FMT_PAGE_TYPE NeuesDok sym:SW_HID_LABEL_INSERT Zurueck sym:SFX2_HID_TABDLG_RESET_BTN -*TabFangenEinrasten sym:SD_HID_SD_OPTIONS_SNAP sc:hidspecial:HID_SC_WIN_PREVIEW +*TabFangenEinrasten sym:SD_HID_SD_OPTIONS_SNAP sym:sc:hidspecial:HID_SC_WIN_PREVIEW *TabFarben sym:CUI_HID_OPTIONS_COLOR -FarbName sym:cui.Edit.10060.1 -Farbe sym:cui.ListBox.10060.1 -Farbmodell sym:cui.ListBox.10060.2 +FarbName sym:cui:Edit:RID_SVXPAGE_COLOR:EDT_NAME +Farbe sym:cui:ListBox:RID_SVXPAGE_COLOR:LB_COLOR +Farbmodell sym:cui:ListBox:RID_SVXPAGE_COLOR:LB_COLORMODEL R sym:CUI_HID_TPCOLOR_RGB_1 G sym:CUI_HID_TPCOLOR_RGB_2 B sym:CUI_HID_TPCOLOR_RGB_3 C sym:CUI_HID_TPCOLOR_CMYK_1 M sym:CUI_HID_TPCOLOR_CMYK_2 Y sym:CUI_HID_TPCOLOR_CMYK_3 -K sym:cui.MetricField.10060.4 -Aendern sym:cui.PushButton.10060.3 -Hinzufuegen sym:cui.PushButton.10060.1 -Loeschen sym:cui.PushButton.10060.4 -Oeffnen sym:cui.ImageButton.10060.5 -Speichern sym:cui.ImageButton.10060.6 -Bearbeiten sym:cui.PushButton.10060.2 +K sym:cui:MetricField:RID_SVXPAGE_COLOR:MTR_FLD_4 +Aendern sym:cui:PushButton:RID_SVXPAGE_COLOR:BTN_MODIFY +Hinzufuegen sym:cui:PushButton:RID_SVXPAGE_COLOR:BTN_ADD +Loeschen sym:cui:PushButton:RID_SVXPAGE_COLOR:BTN_DELETE +Oeffnen sym:cui:ImageButton:RID_SVXPAGE_COLOR:BTN_LOAD +Speichern sym:cui:ImageButton:RID_SVXPAGE_COLOR:BTN_SAVE +Bearbeiten sym:cui:PushButton:RID_SVXPAGE_COLOR:BTN_WORK_ON *TabFarbverlaeufe sym:CUI_HID_AREA_GRADIENT -Typ sym:cui.ListBox.10059.4 -ZentrumX sym:cui.MetricField.10059.2 -ZentrumY sym:cui.MetricField.10059.3 -Winkel sym:cui.MetricField.10059.1 -Rand sym:cui.MetricField.10059.6 -Von sym:cui.ListBox.10059.1 -Bis sym:cui.ListBox.10059.2 -VonWert sym:cui.MetricField.10059.4 -BisWert sym:cui.MetricField.10059.5 -Tabelle sym:cui.ListBox.10059.3 -Hinzufuegen sym:cui.PushButton.10059.1 -Aendern sym:cui.PushButton.10059.3 -Loeschen sym:cui.PushButton.10059.4 -Oeffnen sym:cui.ImageButton.10059.5 -Speichern sym:cui.ImageButton.10059.6 +Typ sym:cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENT_TYPES +ZentrumX sym:cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_X +ZentrumY sym:cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_CENTER_Y +Winkel sym:cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_ANGLE +Rand sym:cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_BORDER +Von sym:cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_FROM +Bis sym:cui:ListBox:RID_SVXPAGE_GRADIENT:LB_COLOR_TO +VonWert sym:cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_FROM +BisWert sym:cui:MetricField:RID_SVXPAGE_GRADIENT:MTR_COLOR_TO +Tabelle sym:cui:ListBox:RID_SVXPAGE_GRADIENT:LB_GRADIENTS +Hinzufuegen sym:cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_ADD +Aendern sym:cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_MODIFY +Loeschen sym:cui:PushButton:RID_SVXPAGE_GRADIENT:BTN_DELETE +Oeffnen sym:cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_LOAD +Speichern sym:cui:ImageButton:RID_SVXPAGE_GRADIENT:BTN_SAVE -*TabFehlermeldung sym:sc.TabPage.698 -FehlermeldungbeiEingabe sym:sc.TriStateBox.698.21 -Aktion sym:sc.ListBox.698.24 -Titel sym:sc.Edit.698.13 -Fehlermeldung sym:sc.MultiLineEdit.698.25 -Durchsuchen sym:sc.PushButton.698.26 +*TabFehlermeldung sym:sc:TabPage:TP_VALIDATION_ERROR +FehlermeldungbeiEingabe sym:sc:TriStateBox:TP_VALIDATION_ERROR:TSB_SHOW +Aktion sym:sc:ListBox:TP_VALIDATION_ERROR:LB_ACTION +Titel sym:sc:Edit:TP_VALIDATION_ERROR:EDT_TITLE +Fehlermeldung sym:sc:MultiLineEdit:TP_VALIDATION_ERROR:EDT_ERROR +Durchsuchen sym:sc:PushButton:TP_VALIDATION_ERROR:BTN_SEARCH *TabFussEndnoten sym:SW_HID_SECTION_FTNENDNOTES_PAGE -FussnotenAmTextendeSammeln sym:sw.CheckBox.20897.6 -FussnotenNummerNeuStarten sym:sw.CheckBox.20897.7 -FussnotenEigenesFormat sym:sw.CheckBox.20897.11 -FussnotenNummerierung sym:sw.ListBox.20897.37 -FussnotenBeginn sym:sw.NumericField.20897.24 -FussnotenDavor sym:sw.Edit.20897.17 -FussnotenDahinter sym:sw.Edit.20897.18 -EndnotenAmBereichsendeSammeln sym:sw.CheckBox.20897.3 -EndnotenNummerNeuStarten sym:sw.CheckBox.20897.4 -EndnotenEigenesFormat sym:sw.CheckBox.20897.12 -EndnotenNumerierung sym:sw.ListBox.20897.36 -EndnotenBeginn sym:sw.NumericField.20897.23 -EndnotenDavor sym:sw.Edit.20897.14 -EndnotenDahinter sym:sw.Edit.20897.15 +FussnotenAmTextendeSammeln sym:sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND +FussnotenNummerNeuStarten sym:sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM +FussnotenEigenesFormat sym:sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT +FussnotenNummerierung sym:sw:ListBox:TP_SECTION_FTNENDNOTES:LB_FTN_NUMVIEW +FussnotenBeginn sym:sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET +FussnotenDavor sym:sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_PREFIX +FussnotenDahinter sym:sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_SUFFIX +EndnotenAmBereichsendeSammeln sym:sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_AT_TXTEND +EndnotenNummerNeuStarten sym:sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM +EndnotenEigenesFormat sym:sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM_FMT +EndnotenNumerierung sym:sw:ListBox:TP_SECTION_FTNENDNOTES:LB_END_NUMVIEW +EndnotenBeginn sym:sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_END_OFFSET +EndnotenDavor sym:sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_PREFIX +EndnotenDahinter sym:sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_SUFFIX *TabFormatEtiketten sym:SW_HID_LAB_FMT -HAbstand sym:sw.MetricField.22756.3 -VAbstand sym:sw.MetricField.22756.5 -Breite sym:sw.MetricField.22756.7 -Hoehe sym:sw.MetricField.22756.9 -RandLinks sym:sw.MetricField.22756.11 -RandRechts sym:sw.MetricField.22756.13 -Spalten sym:sw.NumericField.22756.15 -Zeilen sym:sw.NumericField.22756.17 +HAbstand sym:sw:MetricField:TP_LAB_FMT:FLD_HDIST +VAbstand sym:sw:MetricField:TP_LAB_FMT:FLD_VDIST +Breite sym:sw:MetricField:TP_LAB_FMT:FLD_WIDTH +Hoehe sym:sw:MetricField:TP_LAB_FMT:FLD_HEIGHT +RandLinks sym:sw:MetricField:TP_LAB_FMT:FLD_LEFT +RandRechts sym:sw:MetricField:TP_LAB_FMT:FLD_UPPER +Spalten sym:sw:NumericField:TP_LAB_FMT:FLD_COLUMNS +Zeilen sym:sw:NumericField:TP_LAB_FMT:FLD_ROWS NeuesDok sym:SW_HID_LABEL_INSERT Zurueck sym:SFX2_HID_TABDLG_RESET_BTN -FormatSpeichern sym:sw.PushButton.22756.19 +FormatSpeichern sym:sw:PushButton:TP_LAB_FMT:PB_SAVE *TabFunktionen sym:SW_HID_FLD_FUNC -Feldtyp sym:sw.ListBox.20868.65 -Formatliste sym:sw.ListBox.20868.69 -Auswahl sym:sw.ListBox.20868.66 -Bedingung sym:sw.Edit.20868.71 -Dann sym:sw.Edit.20868.75 -Sonst sym:sw.Edit.20868.77 -MakroButton sym:sw.PushButton.20868.78 -Namefeld sym:sw.Edit.20868.71 -Hinweis sym:sw.Edit.20868.73 -Makroname sym:sw.Edit.20868.71 -Platzhalter sym:sw.Edit.20868.71 -Texteinfuegen sym:sw.Edit.20868.73 -Wert sym:sw.Edit.20868.73 +Feldtyp sym:sw:ListBox:TP_FLD_FUNC:LB_FUNCTYPE +Formatliste sym:sw:ListBox:TP_FLD_FUNC:LB_FUNCFORMAT +Auswahl sym:sw:ListBox:TP_FLD_FUNC:LB_FUNCSELECTION +Bedingung sym:sw:Edit:TP_FLD_FUNC:ED_FUNCNAME +Dann sym:sw:Edit:TP_FLD_FUNC:ED_FUNCCOND1 +Sonst sym:sw:Edit:TP_FLD_FUNC:ED_FUNCCOND2 +MakroButton sym:sw:PushButton:TP_FLD_FUNC:BT_FUNCMACRO +Namefeld sym:sw:Edit:TP_FLD_FUNC:ED_FUNCNAME +Hinweis sym:sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE +Makroname sym:sw:Edit:TP_FLD_FUNC:ED_FUNCNAME +Platzhalter sym:sw:Edit:TP_FLD_FUNC:ED_FUNCNAME +Texteinfuegen sym:sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE +Wert sym:sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE Einfuegen sym:SW_HID_FIELD_INSERT Schliessen sym:SW_HID_FIELD_CLOSE -AddListEntry sym:sw.PushButton.20868.82 -NewListEntry sym:sw.Edit.20868.81 -EntrysList sym:sw.ListBox.20868.84 -RemoveEntry sym:sw.PushButton.20868.85 -MoveUpEntry sym:sw.PushButton.20868.86 -MoveDownEntry sym:sw.PushButton.20868.87 -EntryName sym:sw.Edit.20868.89 +AddListEntry sym:sw:PushButton:TP_FLD_FUNC:PB_LISTADD +NewListEntry sym:sw:Edit:TP_FLD_FUNC:ED_LISTITEM +EntrysList sym:sw:ListBox:TP_FLD_FUNC:LB_LISTITEMS +RemoveEntry sym:sw:PushButton:TP_FLD_FUNC:PB_LISTREMOVE +MoveUpEntry sym:sw:PushButton:TP_FLD_FUNC:PB_LISTUP +MoveDownEntry sym:sw:PushButton:TP_FLD_FUNC:PB_LISTDOWN +EntryName sym:sw:Edit:TP_FLD_FUNC:ED_LISTNAME *TabFussnote sym:SW_HID_FOOTNOTE_PAGE -HoeheWieSeite sym:sw.RadioButton.20818.1 -HoeheFussnoteOption sym:sw.RadioButton.20818.2 -HoeheFussnote sym:sw.MetricField.20818.3 -AbstandTextkoerper sym:sw.MetricField.20818.5 -Position sym:sw.ListBox.20818.23 -Art sym:sw.ListBox.20818.21 -Breite sym:sw.MetricField.20818.25 -Abstand sym:sw.MetricField.20818.27 +HoeheWieSeite sym:sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE +HoeheFussnoteOption sym:sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT +HoeheFussnote sym:sw:MetricField:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT +AbstandTextkoerper sym:sw:MetricField:TP_FOOTNOTE_PAGE:ED_DIST +Position sym:sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINEPOS +Art sym:sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINETYPE +Breite sym:sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEWIDTH +Abstand sym:sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEDIST *TabFussnoten sym:SW_HID_FOOTNOTE_OPTIONS -Numerierung sym:sw.ListBox.21012.10 -Pro sym:sw.ListBox.21012.11 -BeginnBei sym:sw.NumericField.21012.12 -Absatz sym:sw.ListBox.21012.30 -Seite sym:sw.ListBox.21012.31 -Folgeseite sym:sw.Edit.21012.41 -Beginn sym:sw.Edit.21012.43 -Seitenende sym:sw.RadioButton.21012.1 -Dokumentende sym:sw.RadioButton.21012.2 -Davor sym:sw.Edit.21012.46 -Dahinter sym:sw.Edit.21012.48 -ZeichenvorlageTextbereich sym:sw.ListBox.21012.53 -ZeichenvorlageFussnotenbereich sym:sw.ListBox.21012.50 +Numerierung sym:sw:ListBox:TP_FOOTNOTEOPTION:LB_NUMVIEW +Pro sym:sw:ListBox:TP_FOOTNOTEOPTION:LB_NUMCOUNT +BeginnBei sym:sw:NumericField:TP_FOOTNOTEOPTION:FLD_OFFSET +Absatz sym:sw:ListBox:TP_FOOTNOTEOPTION:LB_PARA_TEMPL +Seite sym:sw:ListBox:TP_FOOTNOTEOPTION:LB_PAGE_TEMPL +Folgeseite sym:sw:Edit:TP_FOOTNOTEOPTION:ED_CONT +Beginn sym:sw:Edit:TP_FOOTNOTEOPTION:ED_CONT_FROM +Seitenende sym:sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_PAGE +Dokumentende sym:sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_CHAPTER +Davor sym:sw:Edit:TP_FOOTNOTEOPTION:ED_PREFIX +Dahinter sym:sw:Edit:TP_FOOTNOTEOPTION:ED_SUFFIX +ZeichenvorlageTextbereich sym:sw:ListBox:TP_FOOTNOTEOPTION:LB_ANCHR_CHARFMT +ZeichenvorlageFussnotenbereich sym:sw:ListBox:TP_FOOTNOTEOPTION:LB_TEXT_CHARFMT *TabFusszeile sym:SVX_HID_FORMAT_FOOTER -FusszeileMitAbstand sym:svx.CheckBox.10026.10 svx:CheckBox:RID_SVXPAGE_FOOTER:CB_FOOTER -Abstand sym:svx.MetricField.10026.12 -Hoehe sym:svx.MetricField.10026.14 -Hoehedynamisch sym:svx.CheckBox.10026.15 -RechterRandFusszeile sym:svx.MetricField.10026.19 -LinkerRandFusszeile sym:svx.MetricField.10026.17 -InhaltLinksRechtsGleich sym:svx.CheckBox.10026.20 -Zusaetze sym:svx.PushButton.10026.40 svx:PushButton:RID_SVXPAGE_FOOTER:PB_BACKGROUND +FusszeileMitAbstand sym:svx:CheckBox:RID_SVXPAGE_FOOTER:CB_TURNON svx:CheckBox:RID_SVXPAGE_FOOTER:CB_FOOTER +Abstand sym:svx:MetricField:RID_SVXPAGE_FOOTER:ED_DIST +Hoehe sym:svx:MetricField:RID_SVXPAGE_FOOTER:ED_HEIGHT +Hoehedynamisch sym:svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN +RechterRandFusszeile sym:svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN +LinkerRandFusszeile sym:svx:MetricField:RID_SVXPAGE_FOOTER:ED_LMARGIN +InhaltLinksRechtsGleich sym:svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED +Zusaetze sym:svx:PushButton:RID_SVXPAGE_FOOTER:BTN_EXTRAS svx:PushButton:RID_SVXPAGE_FOOTER:PB_BACKGROUND Bearbeiten sym:SC_HID_SC_FOOTER_EDIT *TabFusszeileCalc sym:SC_HID_SCPAGE_HFED_FR @@ -211,76 +211,76 @@ LinkerBereich sym:SC_HID_SC_HF_FRL MittlererBereich sym:SC_HID_SC_HF_FRC RechterBereich sym:SC_HID_SC_HF_FRR PredefinedFooter sym:SC_HID_SC_HF_FR_DEFINED -TextAttribute sym:SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT -Datei sym:SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE -Tabelle sym:SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE -Seitennummer sym:SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE -Seitenanzahl sym:SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES -Datum sym:SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE -Zeit sym:SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME -Hoehedynamisch sym:svx.CheckBox.10026.15 +TextAttribute sym:SC_HID_SC_HF_TEXT sym:sc:ImageButton:RID_HFBASE:BTN_TEXT +Datei sym:SC_HID_SC_HF_FILE sym:sc:ImageButton:RID_HFBASE:BTN_FILE +Tabelle sym:SC_HID_SC_HF_TABLE sym:sc:ImageButton:RID_HFBASE:BTN_TABLE +Seitennummer sym:SC_HID_SC_HF_PAGE sym:sc:ImageButton:RID_HFBASE:BTN_PAGE +Seitenanzahl sym:SC_HID_SC_HF_PAGES sym:sc:ImageButton:RID_HFBASE:BTN_PAGES +Datum sym:SC_HID_SC_HF_DATE sym:sc:ImageButton:RID_HFBASE:BTN_DATE +Zeit sym:SC_HID_SC_HF_TIME sym:sc:ImageButton:RID_HFBASE:BTN_TIME +Hoehedynamisch sym:svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN *TabFusszeileCalcLinks sym:SC_HID_SCPAGE_HFED_FL LinkerBereich sym:SC_HID_SC_HF_FLL MittlererBereich sym:SC_HID_SC_HF_FLC RechterBereich sym:SC_HID_SC_HF_FLR PredefinedFooterLeft sym:SC_HID_SC_HF_FL_DEFINED -TextAttribute sym:SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT -Datei sym:SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE -Tabelle sym:SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE -Seitennummer sym:SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE -Seitenanzahl sym:SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES -Datum sym:SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE -Zeit sym:SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME +TextAttribute sym:SC_HID_SC_HF_TEXT sym:sc:ImageButton:RID_HFBASE:BTN_TEXT +Datei sym:SC_HID_SC_HF_FILE sym:sc:ImageButton:RID_HFBASE:BTN_FILE +Tabelle sym:SC_HID_SC_HF_TABLE sym:sc:ImageButton:RID_HFBASE:BTN_TABLE +Seitennummer sym:SC_HID_SC_HF_PAGE sym:sc:ImageButton:RID_HFBASE:BTN_PAGE +Seitenanzahl sym:SC_HID_SC_HF_PAGES sym:sc:ImageButton:RID_HFBASE:BTN_PAGES +Datum sym:SC_HID_SC_HF_DATE sym:sc:ImageButton:RID_HFBASE:BTN_DATE +Zeit sym:SC_HID_SC_HF_TIME sym:sc:ImageButton:RID_HFBASE:BTN_TIME *TabGeschaeft sym:SW_HID_TP_BUSINESS_DATA -Firma sym:sw.Edit.20896.55 -Firma2 sym:sw.Edit.20896.57 -Slogan sym:sw.Edit.20896.59 -Strasse sym:sw.Edit.20896.36 -PLZ sym:sw.Edit.20896.38 -Ort sym:sw.Edit.20896.39 -Land sym:sw.Edit.20896.41 -Bundesland sym:sw.Edit.20896.53 -Position sym:sw.Edit.20896.61 -Telefon sym:sw.Edit.20896.46 -Handy sym:sw.Edit.20896.47 -Fax sym:sw.Edit.20896.49 -Homepage sym:sw.Edit.20896.51 -Email sym:sw.Edit.20896.52 +Firma sym:sw:Edit:TP_BUSINESS_DATA:ED_COMP +Firma2 sym:sw:Edit:TP_BUSINESS_DATA:ED_COMP_EXT +Slogan sym:sw:Edit:TP_BUSINESS_DATA:ED_SLOGAN +Strasse sym:sw:Edit:TP_BUSINESS_DATA:ED_STREET +PLZ sym:sw:Edit:TP_BUSINESS_DATA:ED_ZIP +Ort sym:sw:Edit:TP_BUSINESS_DATA:ED_CITY +Land sym:sw:Edit:TP_BUSINESS_DATA:ED_COUNTRY +Bundesland sym:sw:Edit:TP_BUSINESS_DATA:ED_STATE +Position sym:sw:Edit:TP_BUSINESS_DATA:ED_POSITION +Telefon sym:sw:Edit:TP_BUSINESS_DATA:ED_PHONE +Handy sym:sw:Edit:TP_BUSINESS_DATA:ED_MOBILE +Fax sym:sw:Edit:TP_BUSINESS_DATA:ED_FAX +Homepage sym:sw:Edit:TP_BUSINESS_DATA:ED_WWW +Email sym:sw:Edit:TP_BUSINESS_DATA:ED_MAIL *TabGrafik sym:SW_HID_GRF_EXT -Vertikal sym:sw.CheckBox.20835.47 -Horizontal sym:sw.CheckBox.20835.46 -AufAllenSeiten sym:sw.RadioButton.20835.64 -JedeLinkeSeite sym:sw.RadioButton.20835.65 -JedeRechteSeite sym:sw.RadioButton.20835.66 -Dateiname sym:sw.Edit.20835.54 -Durchsuchen sym:sw.PushButton.20835.53 +Vertikal sym:sw:CheckBox:TP_GRF_EXT:CB_VERT +Horizontal sym:sw:CheckBox:TP_GRF_EXT:CB_HOR +AufAllenSeiten sym:sw:RadioButton:TP_GRF_EXT:RB_MIRROR_ALL_PAGES +JedeLinkeSeite sym:sw:RadioButton:TP_GRF_EXT:RB_MIRROR_LEFT_PAGES +JedeRechteSeite sym:sw:RadioButton:TP_GRF_EXT:RB_MIRROR_RIGHT_PAGES +Dateiname sym:sw:Edit:TP_GRF_EXT:ED_CONNECT +Durchsuchen sym:sw:PushButton:TP_GRF_EXT:PB_BROWSE *TabGrafiken sym:CUI_HID_SVXPAGE_PICK_BMP Auswahl sym:CUI_HID_VALUESET_NUMBMP Optionen sym:SW_HID_NUM_FORMAT_BTN Zurueck sym:SFX2_HID_TABDLG_RESET_BTN -LinkGraphics sym:cui.CheckBox.10218.224 +LinkGraphics sym:cui:CheckBox:RID_SVXPAGE_PICK_BMP:CB_LINKED *TabGrundfarben sym:CUI_HID_OPTIONS_CHART_DEFCOLORS -Farbliste sym:cui.ListBox.10299.2 -Standard sym:cui.PushButton.10299.5 +Farbliste sym:cui:ListBox:RID_OPTPAGE_CHART_DEFCOLORS:LB_CHART_COLOR_LIST +Standard sym:cui:PushButton:RID_OPTPAGE_CHART_DEFCOLORS:PB_RESET_TO_DEFAULT *TabGrundschriften sym:SW_HID_STD_FONT -StandardSchrift sym:sw.ComboBox.20847.91 -Ueberschrift sym:sw.ComboBox.20847.93 -Liste sym:sw.ComboBox.20847.95 -Beschriftung sym:sw.ComboBox.20847.97 -Verzeichnis sym:sw.ComboBox.20847.99 -AktuellesDokument sym:sw.CheckBox.20847.102 -Standard sym:sw.PushButton.20847.101 -StandardSchriftGroesse sym:sw.MetricBox.20847.108 -UeberschriftGroesse sym:sw.MetricBox.20847.109 -ListeGroesse sym:sw.MetricBox.20847.110 -BeschriftungGroesse sym:sw.MetricBox.20847.111 -VerzeichnisGroesse sym:sw.MetricBox.20847.112 +StandardSchrift sym:sw:ComboBox:TP_STD_FONT:LB_STANDARD +Ueberschrift sym:sw:ComboBox:TP_STD_FONT:LB_TITLE +Liste sym:sw:ComboBox:TP_STD_FONT:LB_LIST +Beschriftung sym:sw:ComboBox:TP_STD_FONT:LB_LABEL +Verzeichnis sym:sw:ComboBox:TP_STD_FONT:LB_IDX +AktuellesDokument sym:sw:CheckBox:TP_STD_FONT:CB_DOCONLY +Standard sym:sw:PushButton:TP_STD_FONT:PB_STANDARD +StandardSchriftGroesse sym:sw:MetricBox:TP_STD_FONT:LB_STANDARD_SIZE +UeberschriftGroesse sym:sw:MetricBox:TP_STD_FONT:LB_TITLE_SIZE +ListeGroesse sym:sw:MetricBox:TP_STD_FONT:LB_LIST_SIZE +BeschriftungGroesse sym:sw:MetricBox:TP_STD_FONT:LB_LABEL_SIZE +VerzeichnisGroesse sym:sw:MetricBox:TP_STD_FONT:LB_INDEX_SIZE +TabGrundschriftenAsian TabGrundschriften diff --git a/testautomation/global/win/tab_h_o.win b/testautomation/global/win/tab_h_o.win index b6490e85e6dd..9c249ca2522e 100644 --- a/testautomation/global/win/tab_h_o.win +++ b/testautomation/global/win/tab_h_o.win @@ -1,54 +1,54 @@ *TabHintergrund sym:CUI_HID_BACKGROUND -Als sym:cui.ListBox.10001.1 -Fuer sym:cui.ListBox.10001.32 -FuerAbsatz sym:cui.ListBox.10001.34 +Als sym:cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_SELECTOR +Fuer sym:cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_TBL_BOX +FuerAbsatz sym:cui:ListBox:RID_SVXPAGE_BACKGROUND:LB_PARA_BOX Hintergrundfarbe sym:CUI_HID_BACKGROUND_CTL_BGDCOLORSET -Verknuepfen sym:cui.CheckBox.10001.22 -Vorschau sym:cui.CheckBox.10001.23 -Durchsuchen sym:cui.PushButton.10001.20 -Position sym:cui.RadioButton.10001.27 -Flaeche sym:cui.RadioButton.10001.25 -Kachel sym:cui.RadioButton.10001.26 +Verknuepfen sym:cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_LINK +Vorschau sym:cui:CheckBox:RID_SVXPAGE_BACKGROUND:BTN_PREVIEW +Durchsuchen sym:cui:PushButton:RID_SVXPAGE_BACKGROUND:BTN_BROWSE +Position sym:cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION +Flaeche sym:cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_AREA +Kachel sym:cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_TILE ArtPosition sym:CUI_HID_BACKGROUND_CTL_POSITION -'ArtPosition sym:cui.RadioButton.10001.27 +'ArtPosition sym:cui:RadioButton:RID_SVXPAGE_BACKGROUND:BTN_POSITION 'Muster HID_BACKGROUND_CTL_PATTERNSET 'Musterfarbe HID_BACKGROUND_CTL_PATCOLORSET -*TabHTML sym:cui.TabPage.17000 -Groesse1 sym:cui.NumericField.17000.3 -Groesse2 sym:cui.NumericField.17000.5 -Groesse3 sym:cui.NumericField.17000.7 -Groesse4 sym:cui.NumericField.17000.9 -Groesse5 sym:cui.NumericField.17000.11 -Groesse6 sym:cui.NumericField.17000.13 -Groesse7 sym:cui.NumericField.17000.15 -UnbekannteHTML sym:cui.CheckBox.17000.21 -FontEinstellungen sym:cui.CheckBox.17000.22 -Export sym:cui.ListBox.17000.39 -StarBasic sym:cui.CheckBox.17000.31 -Grafikenkopieren sym:cui.CheckBox.17000.37 -Drucklayout sym:cui.CheckBox.17000.38 -WarnungAnzeigen sym:cui.CheckBox.17000.32 -Zeichensatz sym:cui.ListBox.17000.41 -UseEnglishLocaleForNumbers sym:cui.CheckBox.17000.23 +*TabHTML sym:cui:TabPage:RID_OFAPAGE_HTMLOPT +Groesse1 sym:cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE1 +Groesse2 sym:cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE2 +Groesse3 sym:cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE3 +Groesse4 sym:cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE4 +Groesse5 sym:cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE5 +Groesse6 sym:cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE6 +Groesse7 sym:cui:NumericField:RID_OFAPAGE_HTMLOPT:NF_SIZE7 +UnbekannteHTML sym:cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_UNKNOWN_TAGS +FontEinstellungen sym:cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_IGNORE_FONTNAMES +Export sym:cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_EXPORT +StarBasic sym:cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC +Grafikenkopieren sym:cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_LOCAL_GRF +Drucklayout sym:cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_PRINT_EXTENSION +WarnungAnzeigen sym:cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_STARBASIC_WARNING +Zeichensatz sym:cui:ListBox:RID_OFAPAGE_HTMLOPT:LB_CHARSET +UseEnglishLocaleForNumbers sym:cui:CheckBox:RID_OFAPAGE_HTMLOPT:CB_NUMBERS_ENGLISH_US *TabHyperlinkRahmen sym:SW_HID_FRM_URL -URL sym:sw.Edit.20842.59 -Durchsuchen sym:sw.PushButton.20842.103 -NameText sym:sw.Edit.20842.111 -Frame sym:sw.ComboBox.20842.96 -Server sym:sw.CheckBox.20842.98 -Client sym:sw.CheckBox.20842.99 +URL sym:sw:Edit:TP_FRM_URL:ED_URL +Durchsuchen sym:sw:PushButton:TP_FRM_URL:PB_SEARCH +NameText sym:sw:Edit:TP_FRM_URL:ED_NAME +Frame sym:sw:ComboBox:TP_FRM_URL:CB_FRAME +Server sym:sw:CheckBox:TP_FRM_URL:CB_SERVER +Client sym:sw:CheckBox:TP_FRM_URL:CB_CLIENT *TabHyperlinkZeichen sym:SW_HID_CHAR_URL -URLName sym:sw.Edit.20843.52 -Durchsuchen sym:sw.PushButton.20843.60 -Ereignisse sym:sw.PushButton.20843.59 -Hinweis sym:sw.Edit.20843.64 -Targetframe sym:sw.ComboBox.20843.61 -BesuchterLink sym:sw.ListBox.20843.56 -UnbesuchterLink sym:sw.ListBox.20843.58 -NameText sym:sw.Edit.20843.66 +URLName sym:sw:Edit:TP_CHAR_URL:ED_URL +Durchsuchen sym:sw:PushButton:TP_CHAR_URL:PB_URL +Ereignisse sym:sw:PushButton:TP_CHAR_URL:PB_EVENT +Hinweis sym:sw:Edit:TP_CHAR_URL:ED_TEXT +Targetframe sym:sw:ComboBox:TP_CHAR_URL:LB_TARGET +BesuchterLink sym:sw:ListBox:TP_CHAR_URL:LB_VISITED +UnbesuchterLink sym:sw:ListBox:TP_CHAR_URL:LB_NOT_VISITED +NameText sym:sw:Edit:TP_CHAR_URL:ED_NAME Zurueck sym:SFX2_HID_TABDLG_RESET_BTN *Hyperlink sym:CUI_HID_HYPERLINK_INTERNET @@ -57,182 +57,182 @@ Zurueck sym:CUI_HID_ICCDIALOG_RESET_BTN Uebernehmen sym:CUI_HID_ICCDIALOG_OK_BTN +TabHyperlinkInternet Hyperlink -Internet sym:cui.RadioButton.10228.2 -FTP sym:cui.RadioButton.10228.3 -Telnet sym:cui.RadioButton.10228.4 +Internet sym:cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_INTERNET +FTP sym:cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_FTP +Telnet sym:cui:RadioButton:RID_SVXPAGE_HYPERLINK_INTERNET:RB_LINKTYP_TELNET ZielUrl sym:CUI_HID_HYPERDLG_INET_PATH -Frame sym:cui.ComboBox.10228.32 -Form sym:cui.ListBox.10228.34 -Hinweis sym:cui.Edit.10228.36 -NameText sym:cui.Edit.10228.38 -Ereignisse sym:cui.ImageButton.10228.39 -Loginname sym:cui.Edit.10228.8 -Passwort sym:cui.Edit.10228.10 -AnonymerBenutzer sym:cui.CheckBox.10228.11 -WWWBrowser sym:cui.ImageButton.10228.12 -Target sym:cui.ImageButton.10228.13 +Frame sym:cui:ComboBox:RID_SVXPAGE_HYPERLINK_INTERNET:CB_FRAME +Form sym:cui:ListBox:RID_SVXPAGE_HYPERLINK_INTERNET:LB_FORM +Hinweis sym:cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_INDICATION +NameText sym:cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_TEXT +Ereignisse sym:cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_SCRIPT +Loginname sym:cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_LOGIN +Passwort sym:cui:Edit:RID_SVXPAGE_HYPERLINK_INTERNET:ED_PASSWD +AnonymerBenutzer sym:cui:CheckBox:RID_SVXPAGE_HYPERLINK_INTERNET:CBX_ANONYMOUS +WWWBrowser sym:cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_BROWSE +Target sym:cui:ImageButton:RID_SVXPAGE_HYPERLINK_INTERNET:BTN_TARGET *TabHyperlinkMailUndNews sym:CUI_HID_HYPERLINK_MAIL -EMail sym:cui.RadioButton.10229.2 -News sym:cui.RadioButton.10229.3 +EMail sym:cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_MAIL +News sym:cui:RadioButton:RID_SVXPAGE_HYPERLINK_MAIL:RB_LINKTYP_NEWS Receiver sym:CUI_HID_HYPERDLG_MAIL_PATH -Betreff sym:cui.Edit.10229.7 -Adressbuch sym:cui.ImageButton.10229.8 -Frame sym:cui.ComboBox.10229.32 -Form sym:cui.ListBox.10229.34 -Hinweis sym:cui.Edit.10229.36 -NameText sym:cui.Edit.10229.38 -Ereignisse sym:cui.ImageButton.10229.39 +Betreff sym:cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_SUBJECT +Adressbuch sym:cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_ADRESSBOOK +Frame sym:cui:ComboBox:RID_SVXPAGE_HYPERLINK_MAIL:CB_FRAME +Form sym:cui:ListBox:RID_SVXPAGE_HYPERLINK_MAIL:LB_FORM +Hinweis sym:cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_INDICATION +NameText sym:cui:Edit:RID_SVXPAGE_HYPERLINK_MAIL:ED_TEXT +Ereignisse sym:cui:ImageButton:RID_SVXPAGE_HYPERLINK_MAIL:BTN_SCRIPT Auswahl sym:CUI_HID_ICCDIALOG_CHOICECTRL Zurueck sym:CUI_HID_ICCDIALOG_RESET_BTN Uebernehmen sym:CUI_HID_ICCDIALOG_OK_BTN *TabHyperlinkDokument sym:CUI_HID_HYPERLINK_DOCUMENT Path sym:CUI_HID_HYPERDLG_DOC_PATH -DateiOeffnen sym:cui.ImageButton.10230.4 -Ziel sym:cui.Edit.10230.7 -Target sym:cui.ImageButton.10230.12 -Frame sym:cui.ComboBox.10230.32 -Form sym:cui.ListBox.10230.34 -Hinweis sym:cui.Edit.10230.36 -NameText sym:cui.Edit.10230.38 -Ereignisse sym:cui.ImageButton.10230.39 +DateiOeffnen sym:cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_FILEOPEN +Ziel sym:cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TARGET_DOC +Target sym:cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_BROWSE +Frame sym:cui:ComboBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:CB_FRAME +Form sym:cui:ListBox:RID_SVXPAGE_HYPERLINK_DOCUMENT:LB_FORM +Hinweis sym:cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_INDICATION +NameText sym:cui:Edit:RID_SVXPAGE_HYPERLINK_DOCUMENT:ED_TEXT +Ereignisse sym:cui:ImageButton:RID_SVXPAGE_HYPERLINK_DOCUMENT:BTN_SCRIPT Auswahl sym:CUI_HID_ICCDIALOG_CHOICECTRL Zurueck sym:CUI_HID_ICCDIALOG_RESET_BTN Uebernehmen sym:CUI_HID_ICCDIALOG_OK_BTN *TabHyperlinkNeuesDokument sym:CUI_HID_HYPERLINK_NEWDOCUMENT -SofortBearbeiten sym:cui.RadioButton.10231.2 -SpaeterBearbeiten sym:cui.RadioButton.10231.3 -Datei sym:cui.Edit.10231.5 -Dateityp sym:cui.ListBox.10231.7 -Pfad sym:cui.ImageButton.10231.8 -Frame sym:cui.ComboBox.10231.32 -Form sym:cui.ListBox.10231.34 -Hinweis sym:cui.Edit.10231.36 -NameText sym:cui.Edit.10231.38 -Ereignisse sym:cui.ImageButton.10231.39 +SofortBearbeiten sym:cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITNOW +SpaeterBearbeiten sym:cui:RadioButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:RB_EDITLATER +Datei sym:cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_PATH_NEWDOC +Dateityp sym:cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_DOCUMENT_TYPES +Pfad sym:cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_CREATE +Frame sym:cui:ComboBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:CB_FRAME +Form sym:cui:ListBox:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:LB_FORM +Hinweis sym:cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_INDICATION +NameText sym:cui:Edit:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:ED_TEXT +Ereignisse sym:cui:ImageButton:RID_SVXPAGE_HYPERLINK_NEWDOCUMENT:BTN_SCRIPT Auswahl sym:CUI_HID_ICCDIALOG_CHOICECTRL Zurueck sym:CUI_HID_ICCDIALOG_RESET_BTN Uebernehmen sym:CUI_HID_ICCDIALOG_OK_BTN *TabInhaltCalc sym:SC_HID_SCPAGE_CONTENT -Formeln sym:sc.CheckBox.25717.21 -Nullwerte sym:sc.CheckBox.25717.22 -Notizanzeiger sym:sc.CheckBox.25717.23 -WerteHervorheben sym:sc.CheckBox.25717.24 -Anker sym:sc.CheckBox.25717.25 -Textueberlauf sym:sc.CheckBox.25717.33 -ObjekteGrafiken sym:sc.ListBox.25717.28 -Diagramme sym:sc.ListBox.25717.30 -Zeichenobjekte sym:sc.ListBox.25717.32 -Gitterlinien sym:sc.CheckBox.25717.57 -Farbe sym:sc.ListBox.25717.59 -Seitenumbruch sym:sc.CheckBox.25717.66 -Hilfslinien sym:sc.CheckBox.25717.60 -EinfacheGriffe sym:sc.CheckBox.25717.67 -GrosseGriffe sym:sc.CheckBox.25717.68 -ZeilenUndSpaltenkoepfe sym:sc.CheckBox.25717.51 -HorizontalerBildaufbau sym:sc.CheckBox.25717.52 -VertikalerBildaufbau sym:sc.CheckBox.25717.53 -Tabellenregister sym:sc.CheckBox.25717.54 -Gliederungssymbole sym:sc.CheckBox.25717.55 -Referenzenfarbig sym:sc.CheckBox.25717.75 +Formeln sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_FORMULA +Nullwerte sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_NIL +Notizanzeiger sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_ANNOT +WerteHervorheben sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_VALUE +Anker sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_ANCHOR +Textueberlauf sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_CLIP +ObjekteGrafiken sym:sc:ListBox:RID_SCPAGE_CONTENT:LB_OBJGRF +Diagramme sym:sc:ListBox:RID_SCPAGE_CONTENT:LB_DIAGRAM +Zeichenobjekte sym:sc:ListBox:RID_SCPAGE_CONTENT:LB_DRAW +Gitterlinien sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_GRID +Farbe sym:sc:ListBox:RID_SCPAGE_CONTENT:LB_COLOR +Seitenumbruch sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_PAGEBREAKS +Hilfslinien sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_GUIDELINE +EinfacheGriffe sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_HANDLES +GrosseGriffe sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_BIGHANDLES +ZeilenUndSpaltenkoepfe sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_ROWCOLHEADER +HorizontalerBildaufbau sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_HSCROLL +VertikalerBildaufbau sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_VSCROLL +Tabellenregister sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_TBLREG +Gliederungssymbole sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_OUTLINE +Referenzenfarbig sym:sc:CheckBox:RID_SCPAGE_CONTENT:CB_RFIND *TabInhalteDraw sym:SD_HID_SD_OPTIONS_CONTENTS sym:SD_HID_SD_OPTIONS_SNAP -LinealeSichtbar sym:sd.CheckBox.597.14 -HilfslinienBeimBewegen sym:sd.CheckBox.597.1 -KontrolpunkteImBezierEditor sym:sd.CheckBox.597.2 -KonturFuerIndividuelleObjekte sym:sd.CheckBox.597.15 +LinealeSichtbar sym:sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_RULER +HilfslinienBeimBewegen sym:sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES +KontrolpunkteImBezierEditor sym:sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HANDLES_BEZIER +KonturFuerIndividuelleObjekte sym:sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_MOVE_OUTLINE *TabInhalteHTML sym:SW_HID_CONTENT_OPT -GrafikenUndObjekte sym:sw.CheckBox.20845.1 -Tabellen sym:sw.CheckBox.20845.2 -Zeichnungen sym:sw.CheckBox.20845.3 -Feldnamen sym:sw.CheckBox.20845.4 -Notizen sym:sw.CheckBox.20845.23 -Hilfslinien sym:sw.CheckBox.20845.14 -FarbigeHandles sym:sw.CheckBox.20845.59 -GrosseHandles sym:sw.CheckBox.20845.25 -HorizontaleBildlaufleiste sym:sw.CheckBox.20845.15 -VertikaleBildlaufleiste sym:sw.CheckBox.20845.16 -HorizontalesLineal sym:sw.CheckBox.20845.17 -VertikalesLineal sym:sw.CheckBox.20845.18 -RechtsAusgerichtet sym:sw.CheckBox.20845.24 -WeichesScrollen sym:sw.CheckBox.20845.37 -Lineal sym:sw.CheckBox.20845.12 -HorizontalesLinealMasseinheit sym:sw.ListBox.20845.88 -VertikalesLinealMasseinheit sym:sw.ListBox.20845.89 -Masseinheit sym:sw.ListBox.20845.27 +GrafikenUndObjekte sym:sw:CheckBox:TP_CONTENT_OPT:CB_GRF +Tabellen sym:sw:CheckBox:TP_CONTENT_OPT:CB_TBL +Zeichnungen sym:sw:CheckBox:TP_CONTENT_OPT:CB_DRWFAST +Feldnamen sym:sw:CheckBox:TP_CONTENT_OPT:CB_FIELD +Notizen sym:sw:CheckBox:TP_CONTENT_OPT:CB_POSTIT +Hilfslinien sym:sw:CheckBox:TP_CONTENT_OPT:CB_CROSS +FarbigeHandles sym:sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE +GrosseHandles sym:sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE +HorizontaleBildlaufleiste sym:sw:CheckBox:TP_CONTENT_OPT:CB_HSCROLL +VertikaleBildlaufleiste sym:sw:CheckBox:TP_CONTENT_OPT:CB_VSCROLL +HorizontalesLineal sym:sw:CheckBox:TP_CONTENT_OPT:CB_HRULER +VertikalesLineal sym:sw:CheckBox:TP_CONTENT_OPT:CB_VRULER +RechtsAusgerichtet sym:sw:CheckBox:TP_CONTENT_OPT:CB_VRULER_RIGHT +WeichesScrollen sym:sw:CheckBox:TP_CONTENT_OPT:CB_SMOOTH_SCROLL +Lineal sym:sw:CheckBox:TP_CONTENT_OPT:CB_ANY_RULER +HorizontalesLinealMasseinheit sym:sw:ListBox:TP_CONTENT_OPT:LB_HMETRIC +VertikalesLinealMasseinheit sym:sw:ListBox:TP_CONTENT_OPT:LB_VMETRIC +Masseinheit sym:sw:ListBox:TP_CONTENT_OPT:LB_METRIC *TabInhalteWriter sym:SW_HID_CONTENT_OPT -GrafikenUndObjekte sym:sw.CheckBox.20845.1 -Tabellen sym:sw.CheckBox.20845.2 -Zeichnungen sym:sw.CheckBox.20845.3 -Feldname sym:sw.CheckBox.20845.4 -Notizen sym:sw.CheckBox.20845.23 -Hilfslinien sym:sw.CheckBox.20845.14 -FarbigeHandles sym:sw.CheckBox.20845.59 -GrosseHandles sym:sw.CheckBox.20845.25 -HorizontaleBildlaufleiste sym:sw.CheckBox.20845.15 -VertikaleBildlaufleiste sym:sw.CheckBox.20845.16 -HorizontalesLineal sym:sw.CheckBox.20845.17 -VertikalesLineal sym:sw.CheckBox.20845.18 -RechtsAusgerichtet sym:sw.CheckBox.20845.24 -WeichesScrollen sym:sw.CheckBox.20845.37 -Lineal sym:sw.CheckBox.20845.12 -HorizontalesLinealMasseinheit sym:sw.ListBox.20845.88 -VertikalesLinealMasseinheit sym:sw.ListBox.20845.89 +GrafikenUndObjekte sym:sw:CheckBox:TP_CONTENT_OPT:CB_GRF +Tabellen sym:sw:CheckBox:TP_CONTENT_OPT:CB_TBL +Zeichnungen sym:sw:CheckBox:TP_CONTENT_OPT:CB_DRWFAST +Feldname sym:sw:CheckBox:TP_CONTENT_OPT:CB_FIELD +Notizen sym:sw:CheckBox:TP_CONTENT_OPT:CB_POSTIT +Hilfslinien sym:sw:CheckBox:TP_CONTENT_OPT:CB_CROSS +FarbigeHandles sym:sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE +GrosseHandles sym:sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE +HorizontaleBildlaufleiste sym:sw:CheckBox:TP_CONTENT_OPT:CB_HSCROLL +VertikaleBildlaufleiste sym:sw:CheckBox:TP_CONTENT_OPT:CB_VSCROLL +HorizontalesLineal sym:sw:CheckBox:TP_CONTENT_OPT:CB_HRULER +VertikalesLineal sym:sw:CheckBox:TP_CONTENT_OPT:CB_VRULER +RechtsAusgerichtet sym:sw:CheckBox:TP_CONTENT_OPT:CB_VRULER_RIGHT +WeichesScrollen sym:sw:CheckBox:TP_CONTENT_OPT:CB_SMOOTH_SCROLL +Lineal sym:sw:CheckBox:TP_CONTENT_OPT:CB_ANY_RULER +HorizontalesLinealMasseinheit sym:sw:ListBox:TP_CONTENT_OPT:LB_HMETRIC +VertikalesLinealMasseinheit sym:sw:ListBox:TP_CONTENT_OPT:LB_VMETRIC *TabInitialen sym:SW_HID_DROPCAPS -Anzeigen sym:sw.CheckBox.20810.13 -Anzahl sym:sw.NumericField.20810.2 -AbstandZumText sym:sw.MetricField.20810.6 -Zeilen sym:sw.NumericField.20810.4 -Initialentext sym:sw.Edit.20810.9 -Zeichenvorlage sym:sw.ListBox.20810.11 -GanzesWort sym:sw.CheckBox.20810.16 - -*TabInteraktion sym:.uno:AnimationEffects -AktionBeiMausklick sym:sd.ListBox.787.3 +Anzeigen sym:sw:CheckBox:TP_DROPCAPS:CB_SWITCH +Anzahl sym:sw:NumericField:TP_DROPCAPS:FLD_DROPCAPS +AbstandZumText sym:sw:MetricField:TP_DROPCAPS:FLD_DISTANCE +Zeilen sym:sw:NumericField:TP_DROPCAPS:FLD_LINES +Initialentext sym:sw:Edit:TP_DROPCAPS:EDT_TEXT +Zeichenvorlage sym:sw:ListBox:TP_DROPCAPS:BOX_TEMPLATE +GanzesWort sym:sw:CheckBox:TP_DROPCAPS:CB_WORD + +*TabInteraktion .uno:AnimationEffects +AktionBeiMausklick sym:sd:ListBox:TP_ANIMATION:LB_ACTION ListeSprungZuDokument sym:SD_HID_CTL_ACTION_DLG_2 ListeSprungZuSeiteObjekt sym:SD_HID_CTL_ACTION_DLG_1 -ListeObjektAktion sym:sd.ListBox.787.4 -Durchsuchen sym:sd.PushButton.787.1 -Suchen sym:sd.PushButton.787.2 -Effekt sym:sd.ListBox.787.4 -'Effekt sd:ListBox:TP_ANIMATION:LB_EFFECT -'Langsam sd:RadioButton:TP_ANIMATION:RBT_SLOW -'Schnell sd:RadioButton:TP_ANIMATION:RBT_MEDIUM -'Mittel sd:RadioButton:TP_ANIMATION:RBT_FAST -'KlangbeiObjektausblenden sd:TriStateBox:TP_ANIMATION:TSB_SOUND -Seite sym:sd.Edit.787.2 -Dokument sym:sd.Edit.787.3 -Objekt sym:sd.Edit.787.4 -Makro sym:sd.Edit.787.5 -KlangWahl sym:sd.Edit.787.1 -'KlangVollstaendigAbspielen sd:TriStateBox:TP_ANIMATION:TSB_PLAY_FULL +ListeObjektAktion sym:sd:ListBox:TP_ANIMATION:LB_OLE_ACTION +Durchsuchen sym:sd:PushButton:TP_ANIMATION:BTN_SEARCH +Suchen sym:sd:PushButton:TP_ANIMATION:BTN_SEEK +Effekt sym:sd:ListBox:TP_ANIMATION:LB_OLE_ACTION +'Effekt sym:sd:ListBox:TP_ANIMATION:LB_EFFECT +'Langsam sym:sd:RadioButton:TP_ANIMATION:RBT_SLOW +'Schnell sym:sd:RadioButton:TP_ANIMATION:RBT_MEDIUM +'Mittel sym:sd:RadioButton:TP_ANIMATION:RBT_FAST +'KlangbeiObjektausblenden sym:sd:TriStateBox:TP_ANIMATION:TSB_SOUND +Seite sym:sd:Edit:TP_ANIMATION:EDT_BOOKMARK +Dokument sym:sd:Edit:TP_ANIMATION:EDT_DOCUMENT +Objekt sym:sd:Edit:TP_ANIMATION:EDT_PROGRAM +Makro sym:sd:Edit:TP_ANIMATION:EDT_MACRO +KlangWahl sym:sd:Edit:TP_ANIMATION:EDT_SOUND +'KlangVollstaendigAbspielen sym:sd:TriStateBox:TP_ANIMATION:TSB_PLAY_FULL *TabKapitelnumerierung sym:SW_HID_TP_OUTLINE_NUM -Ebene sym:sw.ListBox.20876.131 -Absatzvorlage sym:sw.ListBox.20876.21 -Zeichenvorlage sym:sw.ListBox.20876.141 -Nummer sym:sw.ListBox.20876.23 -Vollstaendig sym:sw.NumericField.20876.109 -Davor sym:sw.Edit.20876.137 -Dahinter sym:sw.Edit.20876.135 -BeginBei sym:sw.NumericField.20876.41 +Ebene sym:sw:ListBox:TP_OUTLINE_NUM:LB_LEVEL +Absatzvorlage sym:sw:ListBox:TP_OUTLINE_NUM:LB_COLL +Zeichenvorlage sym:sw:ListBox:TP_OUTLINE_NUM:LB_CHARFMT +Nummer sym:sw:ListBox:TP_OUTLINE_NUM:LB_NUMBER +Vollstaendig sym:sw:NumericField:TP_OUTLINE_NUM:NF_ALL_LEVEL +Davor sym:sw:Edit:TP_OUTLINE_NUM:ED_PREFIX +Dahinter sym:sw:Edit:TP_OUTLINE_NUM:ED_SUFFIX +BeginBei sym:sw:NumericField:TP_OUTLINE_NUM:ED_START Form sym:SW_HID_OUTLINE_FORM *TabKopfzeile sym:SVX_HID_FORMAT_HEADER -KopfzeileMitAbstand sym:svx.CheckBox.10027.10 svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEADER -Abstand sym:svx.MetricField.10027.12 -Hoehe sym:svx.MetricField.10027.14 -Hoehedynamisch sym:svx.CheckBox.10027.15 -RechterRandKopfzeile sym:svx.MetricField.10027.19 -LinkerRandKopfzeile sym:svx.MetricField.10027.17 -InhaltLinksRechtsGleich sym:svx.CheckBox.10027.20 -Zusaetze sym:svx.PushButton.10027.40 +KopfzeileMitAbstand sym:svx:CheckBox:RID_SVXPAGE_HEADER:CB_TURNON svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEADER +Abstand sym:svx:MetricField:RID_SVXPAGE_HEADER:ED_DIST +Hoehe sym:svx:MetricField:RID_SVXPAGE_HEADER:ED_HEIGHT +Hoehedynamisch sym:svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN +RechterRandKopfzeile sym:svx:MetricField:RID_SVXPAGE_HEADER:ED_RMARGIN +LinkerRandKopfzeile sym:svx:MetricField:RID_SVXPAGE_HEADER:ED_LMARGIN +InhaltLinksRechtsGleich sym:svx:CheckBox:RID_SVXPAGE_HEADER:CB_SHARED +Zusaetze sym:svx:PushButton:RID_SVXPAGE_HEADER:BTN_EXTRAS Bearbeiten sym:SC_HID_SC_HEADER_EDIT *TabKopfzeileCalc sym:SC_HID_SCPAGE_HFED_HR @@ -240,152 +240,152 @@ LinkerBereich sym:SC_HID_SC_HF_HRL MittlererBereich sym:SC_HID_SC_HF_HRC RechterBereich sym:SC_HID_SC_HF_HRR PredefinedHeader sym:SC_HID_SC_HF_HR_DEFINED -TextAttribute sym:SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT -Datei sym:SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE -Tabelle sym:SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE -Seitennummer sym:SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE -Seitenanzahl sym:SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES -Datum sym:SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE -Zeit sym:SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME +TextAttribute sym:SC_HID_SC_HF_TEXT sym:sc:ImageButton:RID_HFBASE:BTN_TEXT +Datei sym:SC_HID_SC_HF_FILE sym:sc:ImageButton:RID_HFBASE:BTN_FILE +Tabelle sym:SC_HID_SC_HF_TABLE sym:sc:ImageButton:RID_HFBASE:BTN_TABLE +Seitennummer sym:SC_HID_SC_HF_PAGE sym:sc:ImageButton:RID_HFBASE:BTN_PAGE +Seitenanzahl sym:SC_HID_SC_HF_PAGES sym:sc:ImageButton:RID_HFBASE:BTN_PAGES +Datum sym:SC_HID_SC_HF_DATE sym:sc:ImageButton:RID_HFBASE:BTN_DATE +Zeit sym:SC_HID_SC_HF_TIME sym:sc:ImageButton:RID_HFBASE:BTN_TIME *TabKopfzeileCalcLinks sym:SC_HID_SCPAGE_HFED_HL LinkerBereich sym:SC_HID_SC_HF_HLL MittlererBereich sym:SC_HID_SC_HF_HLC RechterBereich sym:SC_HID_SC_HF_HLR PredefinedHeaderLeft sym:SC_HID_SC_HF_HL_DEFINED -TextAttribute sym:SC_HID_SC_HF_TEXT sc:ImageButton:RID_HFBASE:BTN_TEXT -Datei sym:SC_HID_SC_HF_FILE sc:ImageButton:RID_HFBASE:BTN_FILE -Tabelle sym:SC_HID_SC_HF_TABLE sc:ImageButton:RID_HFBASE:BTN_TABLE -Seitennummer sym:SC_HID_SC_HF_PAGE sc:ImageButton:RID_HFBASE:BTN_PAGE -Seitenanzahl sym:SC_HID_SC_HF_PAGES sc:ImageButton:RID_HFBASE:BTN_PAGES -Datum sym:SC_HID_SC_HF_DATE sc:ImageButton:RID_HFBASE:BTN_DATE -Zeit sym:SC_HID_SC_HF_TIME sc:ImageButton:RID_HFBASE:BTN_TIME +TextAttribute sym:SC_HID_SC_HF_TEXT sym:sc:ImageButton:RID_HFBASE:BTN_TEXT +Datei sym:SC_HID_SC_HF_FILE sym:sc:ImageButton:RID_HFBASE:BTN_FILE +Tabelle sym:SC_HID_SC_HF_TABLE sym:sc:ImageButton:RID_HFBASE:BTN_TABLE +Seitennummer sym:SC_HID_SC_HF_PAGE sym:sc:ImageButton:RID_HFBASE:BTN_PAGE +Seitenanzahl sym:SC_HID_SC_HF_PAGES sym:sc:ImageButton:RID_HFBASE:BTN_PAGES +Datum sym:SC_HID_SC_HF_DATE sym:sc:ImageButton:RID_HFBASE:BTN_DATE +Zeit sym:SC_HID_SC_HF_TIME sym:sc:ImageButton:RID_HFBASE:BTN_TIME *TabLaden sym:SW_HID_OPTLOAD_PAGE -Immer sym:sw.RadioButton.20880.12 -AufNachfrage sym:sw.RadioButton.20880.13 -Nie sym:sw.RadioButton.20880.14 -Feldbefehle sym:sw.CheckBox.20880.16 -Diagramme sym:sw.CheckBox.20880.17 -Masseinheit sym:sw.ListBox.20880.19 -Tabulatorenabstand sym:sw.MetricField.20880.22 - -*TabLauftext sym:cui.TabPage.10184 . -Effekt sym:cui.ListBox.10184.1 -NachOben sym:cui.ImageButton.10184.1 -NachLinks sym:cui.ImageButton.10184.2 -NachUnten sym:cui.ImageButton.10184.4 -NachRechts sym:cui.ImageButton.10184.3 -TextSichtbarBeimStarten sym:cui.TriStateBox.10184.1 -TextSichtbarBeimBeenden sym:cui.TriStateBox.10184.2 -Endlos sym:cui.TriStateBox.10184.3 -Anzahl sym:cui.NumericField.10184.1 -Automatisch sym:cui.TriStateBox.10184.5 -Verzoegerung sym:cui.MetricField.10184.2 -Pixel sym:cui.TriStateBox.10184.4 -Schrittweite sym:cui.MetricField.10184.1 +Immer sym:sw:RadioButton:TP_OPTLOAD_PAGE:RB_ALWAYS +AufNachfrage sym:sw:RadioButton:TP_OPTLOAD_PAGE:RB_REQUEST +Nie sym:sw:RadioButton:TP_OPTLOAD_PAGE:RB_NEVER +Feldbefehle sym:sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS +Diagramme sym:sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS +Masseinheit sym:sw:ListBox:TP_OPTLOAD_PAGE:LB_METRIC +Tabulatorenabstand sym:sw:MetricField:TP_OPTLOAD_PAGE:MF_TAB + +*TabLauftext sym:cui:TabPage:RID_SVXPAGE_TEXTANIMATION . +Effekt sym:cui:ListBox:RID_SVXPAGE_TEXTANIMATION:LB_EFFECT +NachOben sym:cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_UP +NachLinks sym:cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_LEFT +NachUnten sym:cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_DOWN +NachRechts sym:cui:ImageButton:RID_SVXPAGE_TEXTANIMATION:BTN_RIGHT +TextSichtbarBeimStarten sym:cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_START_INSIDE +TextSichtbarBeimBeenden sym:cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_STOP_INSIDE +Endlos sym:cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_ENDLESS +Anzahl sym:cui:NumericField:RID_SVXPAGE_TEXTANIMATION:NUM_FLD_COUNT +Automatisch sym:cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_AUTO +Verzoegerung sym:cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_DELAY +Pixel sym:cui:TriStateBox:RID_SVXPAGE_TEXTANIMATION:TSB_PIXEL +Schrittweite sym:cui:MetricField:RID_SVXPAGE_TEXTANIMATION:MTR_FLD_AMOUNT *TabLayoutCalc sym:SC_HID_SCPAGE_LAYOUT -Masseinheit sym:sc.ListBox.25718.62 -Tabulator sym:sc.MetricField.25718.65 -Eingabebestaetigung sym:sc.CheckBox.25718.71 -Eingabetaste sym:sc.CheckBox.25718.73 -FormatierungAusdehnen sym:sc.CheckBox.25718.74 -SelektionNach sym:sc.ListBox.25718.72 -' Referenzenfarbig sc:CheckBox:RID_SCPAGE_LAYOUT:CB_RFIND -Referenzenausdehnen sym:sc.CheckBox.25718.76 -SelektionHervorheben sym:sc.CheckBox.25718.77 -ImmerAktualisieren sym:sc.RadioButton.25718.2 -AufNachfrageAktualisieren sym:sc.RadioButton.25718.3 -NieAktualisieren sym:sc.RadioButton.25718.4 -Druckermasse sym:sc.CheckBox.25718.78 -Ueberschreibwarnung sym:sc.CheckBox.25718.79 +Masseinheit sym:sc:ListBox:RID_SCPAGE_LAYOUT:LB_UNIT +Tabulator sym:sc:MetricField:RID_SCPAGE_LAYOUT:MF_TAB +Eingabebestaetigung sym:sc:CheckBox:RID_SCPAGE_LAYOUT:CB_ALIGN +Eingabetaste sym:sc:CheckBox:RID_SCPAGE_LAYOUT:CB_EDITMODE +FormatierungAusdehnen sym:sc:CheckBox:RID_SCPAGE_LAYOUT:CB_FORMAT +SelektionNach sym:sc:ListBox:RID_SCPAGE_LAYOUT:LB_ALIGN +' Referenzenfarbig sym:sc:CheckBox:RID_SCPAGE_LAYOUT:CB_RFIND +Referenzenausdehnen sym:sc:CheckBox:RID_SCPAGE_LAYOUT:CB_EXPREF +SelektionHervorheben sym:sc:CheckBox:RID_SCPAGE_LAYOUT:CB_MARKHDR +ImmerAktualisieren sym:sc:RadioButton:RID_SCPAGE_LAYOUT:RB_ALWAYS +AufNachfrageAktualisieren sym:sc:RadioButton:RID_SCPAGE_LAYOUT:RB_REQUEST +NieAktualisieren sym:sc:RadioButton:RID_SCPAGE_LAYOUT:RB_NEVER +Druckermasse sym:sc:CheckBox:RID_SCPAGE_LAYOUT:CB_TEXTFMT +Ueberschreibwarnung sym:sc:CheckBox:RID_SCPAGE_LAYOUT:CB_REPLWARN *TabLegende sym:CUI_HID_CAPTION Art sym:CUI_HID_CAPTION_CTL_TYPE -Abstand sym:cui.MetricField.10150.1 -Ansatz sym:cui.ListBox.10150.2 -Laenge sym:cui.MetricField.10150.3 -Position sym:cui.ListBox.10150.3 -Optimal sym:cui.CheckBox.10150.1 +Abstand sym:cui:MetricField:RID_SVXPAGE_CAPTION:MF_ABSTAND +Ansatz sym:cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ +Laenge sym:cui:MetricField:RID_SVXPAGE_CAPTION:MF_LAENGE +Position sym:cui:ListBox:RID_SVXPAGE_CAPTION:LB_ANSATZ_REL +Optimal sym:cui:CheckBox:RID_SVXPAGE_CAPTION:CB_LAENGE *TabLinguistik sym:CUI_HID_OPTIONS_LINGU Sprachmodule sym:CUI_HID_CLB_LINGU_MODULES -SprachmoduleBearbeiten sym:cui.PushButton.12007.113 +SprachmoduleBearbeiten sym:cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_MODULES_EDIT Optionen sym:CUI_HID_CLB_LINGU_OPTIONS -OptionenBearbeiten sym:cui.PushButton.12007.123 +OptionenBearbeiten sym:cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_OPTIONS_EDIT Benutzerwoerterbuch sym:CUI_HID_CLB_EDIT_MODULES_DICS -Neu sym:cui.PushButton.12007.314 -Bearbeiten sym:cui.PushButton.12007.315 -Loeschen sym:cui.PushButton.12007.316 +Neu sym:cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_NEW_DIC +Bearbeiten sym:cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_EDIT_DIC +Loeschen sym:cui:PushButton:RID_SFXPAGE_LINGU:PB_LINGU_DICS_DEL_DIC *TabLinie sym:CUI_HID_LINE_LINE -Breite sym:cui.MetricField.10051.1 -BreiteLinks sym:cui.MetricField.10051.3 -BreiteRechts sym:cui.MetricField.10051.2 -EndenSynchronisieren sym:cui.CheckBox.10051.1 -Farbe sym:cui.ListBox.10051.1 -Stil sym:cui.ListBox.10051.2 -StilLinks sym:cui.ListBox.10051.3 -StilRechts sym:cui.ListBox.10051.4 -Transparenz sym:cui.MetricField.10051.5 -ZentriertLinks sym:cui.TriStateBox.10051.4 -ZentriertRechts sym:cui.TriStateBox.10051.5 -CornerStyle sym:cui.ListBox.10051.5 +Breite sym:cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_LINE_WIDTH +BreiteLinks sym:cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_START_WIDTH +BreiteRechts sym:cui:MetricField:RID_SVXPAGE_LINE:MTR_FLD_END_WIDTH +EndenSynchronisieren sym:cui:CheckBox:RID_SVXPAGE_LINE:CBX_SYNCHRONIZE +Farbe sym:cui:ListBox:RID_SVXPAGE_LINE:LB_COLOR +Stil sym:cui:ListBox:RID_SVXPAGE_LINE:LB_LINE_STYLE +StilLinks sym:cui:ListBox:RID_SVXPAGE_LINE:LB_START_STYLE +StilRechts sym:cui:ListBox:RID_SVXPAGE_LINE:LB_END_STYLE +Transparenz sym:cui:MetricField:RID_SVXPAGE_LINE:MTR_LINE_TRANSPARENT +ZentriertLinks sym:cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_START +ZentriertRechts sym:cui:TriStateBox:RID_SVXPAGE_LINE:TSB_CENTER_END +CornerStyle sym:cui:ListBox:RID_SVXPAGE_LINE:LB_EDGE_STYLE *TabLinienenden sym:CUI_HID_LINE_ENDDEF -Aendern sym:cui.PushButton.10053.2 -Hinzufuegen sym:cui.PushButton.10053.1 -Liste sym:cui.ListBox.10053.1 -Loeschen sym:cui.PushButton.10053.3 -Oeffnen sym:cui.ImageButton.10053.5 -Speichern sym:cui.ImageButton.10053.6 -Textfeld sym:cui.Edit.10053.1 +Aendern sym:cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_MODIFY +Hinzufuegen sym:cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_ADD +Liste sym:cui:ListBox:RID_SVXPAGE_LINEEND_DEF:LB_LINEENDS +Loeschen sym:cui:PushButton:RID_SVXPAGE_LINEEND_DEF:BTN_DELETE +Oeffnen sym:cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_LOAD +Speichern sym:cui:ImageButton:RID_SVXPAGE_LINEEND_DEF:BTN_SAVE +Textfeld sym:cui:Edit:RID_SVXPAGE_LINEEND_DEF:EDT_NAME *TabLinienstile sym:CUI_HID_LINE_DEF -Abstand sym:cui.MetricField.10052.1 -Aendern sym:cui.PushButton.10052.2 -AnLinienbreite sym:cui.CheckBox.10052.1 -AnzahlLinks sym:cui.NumericField.10052.1 -AnzahlRechts sym:cui.NumericField.10052.2 -Hinzufuegen sym:cui.PushButton.10052.1 -LaengeLinks sym:cui.MetricField.10052.3 -LaengeRechts sym:cui.MetricField.10052.4 -Linienstil sym:cui.ListBox.10052.2 -Loeschen sym:cui.PushButton.10052.3 -Oeffnen sym:cui.ImageButton.10052.5 -Speichern sym:cui.ImageButton.10052.6 -TypLinks sym:cui.ListBox.10052.3 -TypRechts sym:cui.ListBox.10052.1 +Abstand sym:cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_DISTANCE +Aendern sym:cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_MODIFY +AnLinienbreite sym:cui:CheckBox:RID_SVXPAGE_LINE_DEF:CBX_SYNCHRONIZE +AnzahlLinks sym:cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_1 +AnzahlRechts sym:cui:NumericField:RID_SVXPAGE_LINE_DEF:NUM_FLD_2 +Hinzufuegen sym:cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_ADD +LaengeLinks sym:cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_1 +LaengeRechts sym:cui:MetricField:RID_SVXPAGE_LINE_DEF:MTR_FLD_LENGTH_2 +Linienstil sym:cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_LINESTYLES +Loeschen sym:cui:PushButton:RID_SVXPAGE_LINE_DEF:BTN_DELETE +Oeffnen sym:cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_LOAD +Speichern sym:cui:ImageButton:RID_SVXPAGE_LINE_DEF:BTN_SAVE +TypLinks sym:cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_1 +TypRechts sym:cui:ListBox:RID_SVXPAGE_LINE_DEF:LB_TYPE_2 *TabLiteraturAllgemein sym:EXTENSIONS_HID_BIB_CONTROL_PAGE -*TabMakro sym:cui.TabPage.10303 +*TabMakro sym:cui:TabPage:RID_SVXPAGE_EVENTASSIGN Ereignis sym:CUI_HID_MACRO_LB_EVENT -Bereich sym:CUI_HID_MACRO_GROUP SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_GROUP -Makroname sym:CUI_HID_MACRO_MACROS SFX2:LISTBOX:RID_SFX_TP_MACROASSIGN:LB_MACROS -Zuweisen sym:cui.PushButton.10303.3 -Aufheben sym:cui.PushButton.10303.4 -Scripttyp sym:cui.ListBox.10303.8 - -*TabMicrosoftOffice97 sym:cui.TabPage.17020 -WinwordBasicLaden sym:cui.CheckBox.17020.1 -WinwordBasicSpeichern sym:cui.CheckBox.17020.2 -ExcelBasicLaden sym:cui.CheckBox.17020.3 -ExecutableCode sym:cui.CheckBox.17020.4 -ExcelBasicSpeichern sym:cui.CheckBox.17020.5 -PowerpointBasicLaden sym:cui.CheckBox.17020.6 -PowerpointBasicSpeichern sym:cui.CheckBox.17020.7 - -*TabMicrosoftOffice2 sym:cui.TabPage.17021 +Bereich sym:CUI_HID_MACRO_GROUP sym:sfx2:ListBox:RID_SFX_TP_MACROASSIGN:LB_GROUP +Makroname sym:CUI_HID_MACRO_MACROS sym:sfx2:ListBox:RID_SFX_TP_MACROASSIGN:LB_MACROS +Zuweisen sym:cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_ASSIGN +Aufheben sym:cui:PushButton:RID_SVXPAGE_EVENTASSIGN:PB_DELETE +Scripttyp sym:cui:ListBox:RID_SVXPAGE_EVENTASSIGN:LB_SCRIPTTYPE + +*TabMicrosoftOffice97 sym:cui:TabPage:RID_OFAPAGE_MSFILTEROPT +WinwordBasicLaden sym:cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_CODE +WinwordBasicSpeichern sym:cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_WBAS_STG +ExcelBasicLaden sym:cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_CODE +ExecutableCode sym:cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_EXECTBL +ExcelBasicSpeichern sym:cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_EBAS_STG +PowerpointBasicLaden sym:cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_CODE +PowerpointBasicSpeichern sym:cui:CheckBox:RID_OFAPAGE_MSFILTEROPT:CB_PBAS_STG + +*TabMicrosoftOffice2 sym:cui:TabPage:RID_OFAPAGE_MSFILTEROPT2 Auswahl sym:CUI_HID_OFAPAGE_MSFLTR2_CLB -*TabModule sym:basctl.TabPage.14887 +*TabModule sym:basctl:TabPage:RID_TP_MODULS Modulliste sym:BASCTL_HID_BASICIDE_MODULES_TREE -Bearbeiten sym:basctl.PushButton.14887.4 -NeuesModul sym:basctl.PushButton.14887.6 -NeuerDialog sym:basctl.PushButton.14887.7 -Loeschen sym:basctl.PushButton.14887.8 +Bearbeiten sym:basctl:PushButton:RID_TP_MODULS:RID_PB_EDIT +NeuesModul sym:basctl:PushButton:RID_TP_MODULS:RID_PB_NEWMOD +NeuerDialog sym:basctl:PushButton:RID_TP_MODULS:RID_PB_NEWDLG +Loeschen sym:basctl:PushButton:RID_TP_MODULS:RID_PB_DELETE *TabNumerierungsart sym:CUI_HID_SVXPAGE_PICK_SINGLE_NUM Auswahl sym:CUI_HID_VALUESET_SINGLENUM @@ -400,26 +400,26 @@ Zurueck sym:SFX2_HID_TABDLG_RESET_BTN +TabGliederung TabNumerierung *TabNumerierungAbsatz sym:SW_HID_NUMPARA -Vorlage sym:sw.ListBox.20873.1 -NumerierungNeuBeginnen sym:sw.TriStateBox.20873.3 sw:CheckBox:TP_NUMPARA:CB_NEW_START -StartWith sym:sw.TriStateBox.20873.4 -NumerierungBeginnenBei sym:sw.NumericField.20873.6 -ZeilenumerierungZeilenMitzaehlen sym:sw.TriStateBox.20873.8 sw:CheckBox:TP_NUMPARA:CB_COUNT_PARA -ZeilenumerierungNeuBeginnen sym:sw.TriStateBox.20873.9 sw:CheckBox:TP_NUMPARA:CB_RESTART_PARACOUNT -ZeilenumerierungBeginnenBei sym:sw.NumericField.20873.11 -OutlineLevel sym:sw.ListBox.20873.13 +Vorlage sym:sw:ListBox:TP_NUMPARA:LB_NUMBER_STYLE +NumerierungNeuBeginnen sym:sw:TriStateBox:TP_NUMPARA:CB_NEW_START SW:CheckBox:TP_NUMPARA:CB_NEW_START +StartWith sym:sw:TriStateBox:TP_NUMPARA:CB_NUMBER_NEW_START +NumerierungBeginnenBei sym:sw:NumericField:TP_NUMPARA:NF_NEW_START +ZeilenumerierungZeilenMitzaehlen sym:sw:TriStateBox:TP_NUMPARA:CB_COUNT_PARA SW:CheckBox:TP_NUMPARA:CB_COUNT_PARA +ZeilenumerierungNeuBeginnen sym:sw:TriStateBox:TP_NUMPARA:CB_RESTART_PARACOUNT SW:CheckBox:TP_NUMPARA:CB_RESTART_PARACOUNT +ZeilenumerierungBeginnenBei sym:sw:NumericField:TP_NUMPARA:NF_RESTART_PARA +OutlineLevel sym:sw:ListBox:TP_NUMPARA:LB_OUTLINE_LEVEL +TabNumerierungKapitelnumerierung TabKapitelnumerierung ' *TabObjekt HID_PAGE_3DATTR -' SegmenteH svx:NumericField:RID_SVXPAGE_3DATTR:NUM_FLD_HORZ_SEGS -' SegmenteV svx:NumericField:RID_SVXPAGE_3DATTR:NUM_FLD_VERT_SEGS -' Tiefe svx:MetricField:RID_SVXPAGE_3DATTR:MTR_FLD_DEPTH -' Doppelseitig svx:TriStateBox:RID_SVXPAGE_3DATTR:TSB_DOUBLE_SIDED -' ObjektGroesseAnpassen svx:CheckBox:RID_SVXPAGE_3DATTR:CBX_AUTO_MODE -' Entfernung svx:MetricField:RID_SVXPAGE_3DATTR:MTR_FLD_DISTANCE +' SegmenteH sym:svx:NumericField:RID_SVXPAGE_3DATTR:NUM_FLD_HORZ_SEGS +' SegmenteV sym:svx:NumericField:RID_SVXPAGE_3DATTR:NUM_FLD_VERT_SEGS +' Tiefe sym:svx:MetricField:RID_SVXPAGE_3DATTR:MTR_FLD_DEPTH +' Doppelseitig sym:svx:TriStateBox:RID_SVXPAGE_3DATTR:TSB_DOUBLE_SIDED +' ObjektGroesseAnpassen sym:svx:CheckBox:RID_SVXPAGE_3DATTR:CBX_AUTO_MODE +' Entfernung sym:svx:MetricField:RID_SVXPAGE_3DATTR:MTR_FLD_DISTANCE ' EntfernungsTyp HID_3DATTR_CTL_DISTANCE -' Brennweite svx:MetricField:RID_SVXPAGE_3DATTR:MTR_FLD_FOCAL_LENGTH +' Brennweite sym:svx:MetricField:RID_SVXPAGE_3DATTR:MTR_FLD_FOCAL_LENGTH ' BrennweiteTyp HID_3DATTR_CTL_FOCALLENGTH *TabOptionen sym:CUI_HID_OFAPAGE_AUTOCORR_OPTIONS @@ -427,63 +427,63 @@ Einstellungen sym:CUI_HID_OFAPAGE_AUTOCORR_CLB *TabOptionenAutokorrektur sym:CUI_HID_OFAPAGE_AUTOFMT_OPTIONS Einstellungen sym:CUI_HID_OFAPAGE_AUTOFORMAT_CLB -Bearbeiten sym:cui.PushButton.17010.61 +Bearbeiten sym:cui:PushButton:RID_OFAPAGE_AUTOFMT_APPLY:PB_EDIT *TabOptionenTeilergebnisse sym:SC_HID_SCPAGE_SUBT_OPTIONS -NeueSeiteBeiGruppenwechsel sym:sc.CheckBox.25633.21 -GrossKleinschreibung sym:sc.CheckBox.25633.22 -BereichVorherNachSortieren sym:sc.CheckBox.25633.23 -FormateEinschliessen sym:sc.CheckBox.25633.33 -BenutzerdefinierteSortierreihenfolge sym:sc.CheckBox.25633.34 -SortierreihenfolgeAnzeige sym:sc.ListBox.25633.35 -Aufsteigend sym:sc.RadioButton.25633.31 -Absteigend sym:sc.RadioButton.25633.32 +NeueSeiteBeiGruppenwechsel sym:sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK +GrossKleinschreibung sym:sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_CASE +BereichVorherNachSortieren sym:sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_SORT +FormateEinschliessen sym:sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_FORMATS +BenutzerdefinierteSortierreihenfolge sym:sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_USERDEF +SortierreihenfolgeAnzeige sym:sc:ListBox:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF +Aufsteigend sym:sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING +Absteigend sym:sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING *TabOptionenNumerierung sym:CUI_HID_SVXPAGE_NUM_OPTIONS -Ebene sym:cui.MultiListBox.10219.152 -Numerierung sym:cui.ListBox.10219.158 -Davor sym:cui.Edit.10219.156 -Dahinter sym:cui.Edit.10219.160 -Zeichenvorlage sym:cui.ListBox.10219.168 -Vollstaendig sym:cui.NumericField.10219.169 -BeginnBei sym:cui.NumericField.10219.171 -FortlaufeneNumerierung sym:cui.CheckBox.10219.188 -Zeichen sym:cui.PushButton.10219.173 -Auswahl sym:cui.MenuButton.10219.184 -Breite sym:cui.MetricField.10219.179 -Hoehe sym:cui.MetricField.10219.181 -Abgleich sym:cui.CheckBox.10219.177 -Ausrichtung sym:cui.ListBox.10219.183 +Ebene sym:cui:MultiListBox:RID_SVXPAGE_NUM_OPTIONS:LB_LEVEL +Numerierung sym:cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_FMT +Davor sym:cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_PREFIX +Dahinter sym:cui:Edit:RID_SVXPAGE_NUM_OPTIONS:ED_SUFFIX +Zeichenvorlage sym:cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_CHARFMT +Vollstaendig sym:cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:NF_ALL_LEVEL +BeginnBei sym:cui:NumericField:RID_SVXPAGE_NUM_OPTIONS:ED_START +FortlaufeneNumerierung sym:cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_SAME_LEVEL +Zeichen sym:cui:PushButton:RID_SVXPAGE_NUM_OPTIONS:PB_BULLET +Auswahl sym:cui:MenuButton:RID_SVXPAGE_NUM_OPTIONS:MB_BITMAP +Breite sym:cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_WIDTH +Hoehe sym:cui:MetricField:RID_SVXPAGE_NUM_OPTIONS:MF_HEIGHT +Abgleich sym:cui:CheckBox:RID_SVXPAGE_NUM_OPTIONS:CB_RATIO +Ausrichtung sym:cui:ListBox:RID_SVXPAGE_NUM_OPTIONS:LB_ORIENT *TabHeaderFooterSlide sym:SD_HID_SD_TABPAGE_HEADERFOOTER_SLIDE -DateTime sym:sd.CheckBox.1000.2 -DateTimeFixed sym:sd.RadioButton.1000.3 -DateTimeFixedText sym:sd.Edit.1000.4 -DateTimeVariable sym:sd.RadioButton.1000.5 -DateTimeFormat sym:sd.ListBox.1000.6 -DateTimeLanguage sym:sd.ListBox.1000.8 -Header sym:sd.CheckBox.1000.22 -HeaderFixedText sym:sd.Edit.1000.24 -Footer sym:sd.CheckBox.1000.10 -FooterFixedText sym:sd.Edit.1000.12 -Slidenumber sym:sd.CheckBox.1000.14 -Donotshowonfirstslide sym:sd.CheckBox.1000.16 -Applytoall sym:sd.PushButton.1000.17 -Apply sym:sd.PushButton.1000.18 +DateTime sym:sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME +DateTimeFixed sym:sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_FIXED +DateTimeFixedText sym:sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_DATETIME_FIXED +DateTimeVariable sym:sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_AUTOMATIC +DateTimeFormat sym:sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_FORMAT +DateTimeLanguage sym:sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_LANGUAGE +Header sym:sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_HEADER +HeaderFixedText sym:sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_HEADER_FIXED +Footer sym:sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_FOOTER +FooterFixedText sym:sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_FOOTER_FIXED +Slidenumber sym:sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_SLIDENUMBER +Donotshowonfirstslide sym:sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_NOTONTITLE +Applytoall sym:sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLYTOALL +Apply sym:sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLY *TabHeaderFooterNotesHandout sym:SD_HID_SD_TABPAGE_HEADERFOOTER_NOTESHANDOUT -Header sym:sd.CheckBox.1000.22 -HeaderFixedText sym:sd.Edit.1000.24 -DateTime sym:sd.CheckBox.1000.2 -DateTimeFixed sym:sd.RadioButton.1000.3 -DateTimeFixedText sym:sd.Edit.1000.4 -DateTimeVariable sym:sd.RadioButton.1000.5 -DateTimeFormat sym:sd.ListBox.1000.6 -DateTimeLanguage sym:sd.ListBox.1000.8 -Footer sym:sd.CheckBox.1000.10 -FooterFixedText sym:sd.Edit.1000.12 -Slidenumber sym:sd.CheckBox.1000.14 -Donotshowonfirstslide sym:sd.CheckBox.1000.16 -Applytoall sym:sd.PushButton.1000.17 -Apply sym:sd.PushButton.1000.18 +Header sym:sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_HEADER +HeaderFixedText sym:sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_HEADER_FIXED +DateTime sym:sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME +DateTimeFixed sym:sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_FIXED +DateTimeFixedText sym:sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_DATETIME_FIXED +DateTimeVariable sym:sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_AUTOMATIC +DateTimeFormat sym:sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_FORMAT +DateTimeLanguage sym:sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_LANGUAGE +Footer sym:sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_FOOTER +FooterFixedText sym:sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_FOOTER_FIXED +Slidenumber sym:sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_SLIDENUMBER +Donotshowonfirstslide sym:sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_NOTONTITLE +Applytoall sym:sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLYTOALL +Apply sym:sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLY diff --git a/testautomation/global/win/tab_p_s.win b/testautomation/global/win/tab_p_s.win index 9701c96c7d23..6b720aa3272d 100644 --- a/testautomation/global/win/tab_p_s.win +++ b/testautomation/global/win/tab_p_s.win @@ -1,287 +1,287 @@ *TabPfade sym:CUI_HID_OPTIONS_PATH -Standard sym:cui.PushButton.12006.14 -Bearbeiten sym:cui.PushButton.12006.13 +Standard sym:cui:PushButton:RID_SFXPAGE_PATH:BTN_STANDARD +Bearbeiten sym:cui:PushButton:RID_SFXPAGE_PATH:BTN_PATH Typ sym:CUI_HID_OPTPATH_CTL_PATH *TabPositionNumerierung sym:CUI_HID_SVXPAGE_NUM_POSITION -Level sym:cui.MultiListBox.10220.152 -Alignment sym:cui.ListBox.10220.255 -NumberFollowedBy sym:cui.ListBox.10220.251 -NumberFollowedByAt sym:cui.MetricField.10220.253 -AlignedAt sym:cui.MetricField.10220.257 -IndentAt sym:cui.MetricField.10220.259 -Ausrichtung sym:cui.ListBox.10220.51 -AbstandTextNumerierung sym:cui.MetricField.10220.164 -Relativ sym:cui.CheckBox.10220.185 -Standard sym:cui.PushButton.10220.187 +Level sym:cui:MultiListBox:RID_SVXPAGE_NUM_POSITION:LB_LEVEL +Alignment sym:cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN_2 +NumberFollowedBy sym:cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_LABEL_FOLLOWED_BY +NumberFollowedByAt sym:cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_LISTTAB +AlignedAt sym:cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_ALIGNED_AT +IndentAt sym:cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_INDENT_AT +Ausrichtung sym:cui:ListBox:RID_SVXPAGE_NUM_POSITION:LB_ALIGN +AbstandTextNumerierung sym:cui:MetricField:RID_SVXPAGE_NUM_POSITION:MF_NUMDIST +Relativ sym:cui:CheckBox:RID_SVXPAGE_NUM_POSITION:CB_RELATIVE +Standard sym:cui:PushButton:RID_SVXPAGE_NUM_POSITION:PB_STANDARD *TabPositionKapitelnumerierung sym:SW_HID_NUM_POSITION -Level sym:sw.MultiListBox.20872.2 -NumberAlignment sym:sw.ListBox.20872.12 -AlignedAt sym:sw.MetricField.20872.5 -AbstandTextNumerierung sym:sw.MetricField.20872.10 -IndentAt sym:sw.MetricField.20872.8 -Relativ sym:sw.CheckBox.20872.6 -Standard sym:sw.PushButton.20872.13 -LabelFollowedBy sym:sw.ListBox.20872.18 -AbstandTextNumerierung2 sym:sw.MetricField.20872.20 -NumberingAlignment sym:sw.ListBox.20872.22 -AlignedAt2 sym:sw.MetricField.20872.24 -IndentAt2 sym:sw.MetricField.20872.26 +Level sym:sw:MultiListBox:TP_NUM_POSITION:LB_LEVEL +NumberAlignment sym:sw:ListBox:TP_NUM_POSITION:LB_ALIGN +AlignedAt sym:sw:MetricField:TP_NUM_POSITION:MF_BORDERDIST +AbstandTextNumerierung sym:sw:MetricField:TP_NUM_POSITION:MF_NUMDIST +IndentAt sym:sw:MetricField:TP_NUM_POSITION:MF_INDENT +Relativ sym:sw:CheckBox:TP_NUM_POSITION:CB_RELATIVE +Standard sym:sw:PushButton:TP_NUM_POSITION:PB_STANDARD +LabelFollowedBy sym:sw:ListBox:TP_NUM_POSITION:LB_LABEL_FOLLOWED_BY +AbstandTextNumerierung2 sym:sw:MetricField:TP_NUM_POSITION:MF_LISTTAB +NumberingAlignment sym:sw:ListBox:TP_NUM_POSITION:LB_ALIGN_2 +AlignedAt2 sym:sw:MetricField:TP_NUM_POSITION:MF_ALIGNED_AT +IndentAt2 sym:sw:MetricField:TP_NUM_POSITION:MF_INDENT_AT *TabPrivat sym:SW_HID_TP_PRIVATE_DATA -Vorname sym:sw.Edit.20895.32 -Nachname sym:sw.Edit.20895.33 -Kuerzel sym:sw.Edit.20895.34 -Strasse sym:sw.Edit.20895.36 -PLZ sym:sw.Edit.20895.38 -Ort sym:sw.Edit.20895.39 -Land sym:sw.Edit.20895.41 -Bundesland sym:sw.Edit.20895.53 -Titel sym:sw.Edit.20895.44 -Beruf sym:sw.Edit.20895.43 -Telefon sym:sw.Edit.20895.46 -Handy sym:sw.Edit.20895.47 -Fax sym:sw.Edit.20895.49 -Homepage sym:sw.Edit.20895.51 -Email sym:sw.Edit.20895.52 +Vorname sym:sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME +Nachname sym:sw:Edit:TP_PRIVATE_DATA:ED_NAME +Kuerzel sym:sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT +Strasse sym:sw:Edit:TP_PRIVATE_DATA:ED_STREET +PLZ sym:sw:Edit:TP_PRIVATE_DATA:ED_ZIP +Ort sym:sw:Edit:TP_PRIVATE_DATA:ED_CITY +Land sym:sw:Edit:TP_PRIVATE_DATA:ED_COUNTRY +Bundesland sym:sw:Edit:TP_PRIVATE_DATA:ED_STATE +Titel sym:sw:Edit:TP_PRIVATE_DATA:ED_TITLE +Beruf sym:sw:Edit:TP_PRIVATE_DATA:ED_PROFESSION +Telefon sym:sw:Edit:TP_PRIVATE_DATA:ED_PHONE +Handy sym:sw:Edit:TP_PRIVATE_DATA:ED_MOBILE +Fax sym:sw:Edit:TP_PRIVATE_DATA:ED_FAX +Homepage sym:sw:Edit:TP_PRIVATE_DATA:ED_WWW +Email sym:sw:Edit:TP_PRIVATE_DATA:ED_MAIL *TabRaster sym:SVX_HID_OPTIONS_GRID -FangrasterBenutzen sym:svx.CheckBox.10152.4 -RasterSichtbar sym:svx.CheckBox.10152.8 -FangenFangbereich sym:svx.MetricField.10152.30 -AchsenSynchronisieren sym:svx.CheckBox.10152.5 -RasterAufloesungXAchse sym:svx.MetricField.10152.12 -RasterAufloesungYAchse sym:svx.MetricField.10152.9 -RasterUnterteilungXAchse sym:svx.NumericField.10152.13 -RasterUnterteilungYAchse sym:svx.NumericField.10152.14 -AnFanglinien sym:svx.CheckBox.10152.25 -AnSeitenraendern sym:svx.CheckBox.10152.26 -AmObjektrahmen sym:svx.CheckBox.10152.27 -AnObjektpunkten sym:svx.CheckBox.10152.28 -BeimErzeugenUndBewegen sym:svx.CheckBox.10152.32 -LaengereKantenlaenge sym:svx.CheckBox.10152.33 -BeimDrehen sym:svx.CheckBox.10152.34 -Punktreduktion sym:svx.MetricField.10152.37 -Winkel sym:svx.MetricField.10152.35 +FangrasterBenutzen sym:svx:CheckBox:RID_SVXPAGE_GRID:CBX_USE_GRIDSNAP +RasterSichtbar sym:svx:CheckBox:RID_SVXPAGE_GRID:CBX_GRID_VISIBLE +FangenFangbereich sym:svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_SNAP_AREA +AchsenSynchronisieren sym:svx:CheckBox:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE +RasterAufloesungXAchse sym:svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_X +RasterAufloesungYAchse sym:svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y +RasterUnterteilungXAchse sym:svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_X +RasterUnterteilungYAchse sym:svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_Y +AnFanglinien sym:svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES +AnSeitenraendern sym:svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER +AmObjektrahmen sym:svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME +AnObjektpunkten sym:svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS +BeimErzeugenUndBewegen sym:svx:CheckBox:RID_SVXPAGE_GRID:CBX_ORTHO +LaengereKantenlaenge sym:svx:CheckBox:RID_SVXPAGE_GRID:CBX_BIGORTHO +BeimDrehen sym:svx:CheckBox:RID_SVXPAGE_GRID:CBX_ROTATE +Punktreduktion sym:svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_BEZ_ANGLE +Winkel sym:svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_ANGLE *TabReferenzen sym:SW_HID_FLD_REF -Feldtyp sym:sw.ListBox.20869.81 -Auswahl sym:sw.ListBox.20869.83 -Formatliste sym:sw.ListBox.20869.85 -Namefeld sym:sw.Edit.20869.88 -Wert sym:sw.Edit.20869.90 +Feldtyp sym:sw:ListBox:TP_FLD_REF:LB_REFTYPE +Auswahl sym:sw:ListBox:TP_FLD_REF:LB_REFSELECTION +Formatliste sym:sw:ListBox:TP_FLD_REF:LB_REFFORMAT +Namefeld sym:sw:Edit:TP_FLD_REF:ED_REFNAME +Wert sym:sw:Edit:TP_FLD_REF:ED_REFVALUE Einfuegen sym:SW_HID_FIELD_INSERT Schliessen sym:SW_HID_FIELD_CLOSE *TabSchatten sym:CUI_HID_AREA_SHADOW -Anzeigen sym:cui.TriStateBox.10061.2 +Anzeigen sym:cui:TriStateBox:RID_SVXPAGE_SHADOW:TSB_SHOW_SHADOW Position sym:CUI_HID_TPSHADOW_CTRL -Entfernung sym:cui.MetricField.10061.1 -Farbe sym:cui.ListBox.10061.10 -Transparenz sym:cui.MetricField.10061.11 +Entfernung sym:cui:MetricField:RID_SVXPAGE_SHADOW:MTR_FLD_DISTANCE +Farbe sym:cui:ListBox:RID_SVXPAGE_SHADOW:LB_SHADOW_COLOR +Transparenz sym:cui:MetricField:RID_SVXPAGE_SHADOW:MTR_SHADOW_TRANSPARENT *TabSchraegstellen sym:CUI_HID_TRANS_SLANT -Radius sym:cui.MetricField.10049.29 -Winkel sym:cui.MetricField.10049.19 +Radius sym:cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_RADIUS +Winkel sym:cui:MetricField:RID_SVXPAGE_SLANT:MTR_FLD_ANGLE *TabSchraffuren sym:CUI_HID_AREA_HATCH -Abstand sym:cui.MetricField.10057.1 -Winkel sym:cui.MetricField.10057.3 +Abstand sym:cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_DISTANCE +Winkel sym:cui:MetricField:RID_SVXPAGE_HATCH:MTR_FLD_ANGLE Definition sym:CUI_HID_TPHATCH_CTRL -Linientyp sym:cui.ListBox.10057.1 -Linienfarbe sym:cui.ListBox.10057.3 -Tabelle sym:cui.ListBox.10057.4 -Hinzufuegen sym:cui.PushButton.10057.1 -Aendern sym:cui.PushButton.10057.3 -Loeschen sym:cui.PushButton.10057.4 -Oeffnen sym:cui.ImageButton.10057.5 -Speichern sym:cui.ImageButton.10057.6 +Linientyp sym:cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_TYPE +Linienfarbe sym:cui:ListBox:RID_SVXPAGE_HATCH:LB_LINE_COLOR +Tabelle sym:cui:ListBox:RID_SVXPAGE_HATCH:LB_HATCHINGS +Hinzufuegen sym:cui:PushButton:RID_SVXPAGE_HATCH:BTN_ADD +Aendern sym:cui:PushButton:RID_SVXPAGE_HATCH:BTN_MODIFY +Loeschen sym:cui:PushButton:RID_SVXPAGE_HATCH:BTN_DELETE +Oeffnen sym:cui:ImageButton:RID_SVXPAGE_HATCH:BTN_LOAD +Speichern sym:cui:ImageButton:RID_SVXPAGE_HATCH:BTN_SAVE *TabSchriftErsetzung sym:CUI_HID_OFA_FONT_SUBSTITUTION -Anwenden sym:cui.CheckBox.10018.21 -Schriftart sym:cui.ComboBox.10018.3 +Anwenden sym:cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_USETABLE +Schriftart sym:cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT1 Liste sym:CUI_HID_OFA_FONT_SUBST_CLB -ErsetzenDurch sym:cui.ComboBox.10018.5 +ErsetzenDurch sym:cui:ComboBox:RID_SVX_FONT_SUBSTITUTION:CB_FONT2 Uebernehmen sym:CUI_HID_OFA_SUBST_APPLY Loeschen sym:CUI_HID_OFA_SUBST_DELETE -Fonts sym:cui.ListBox.10018.24 -NonProportional sym:cui.CheckBox.10018.25 -Size sym:cui.ListBox.10018.27 +Fonts sym:cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTNAME +NonProportional sym:cui:CheckBox:RID_SVX_FONT_SUBSTITUTION:CB_NONPROP +Size sym:cui:ListBox:RID_SVX_FONT_SUBSTITUTION:LB_FONTHEIGHT *TabSeite sym:CUI_HID_FORMAT_PAGE -Links sym:cui.MetricField.10025.11 -Rechts sym:cui.MetricField.10025.13 -Oben sym:cui.MetricField.10025.15 -Unten sym:cui.MetricField.10025.17 -Seitenlayout sym:cui.ListBox.10025.20 -Numerierung sym:cui.ListBox.10025.30 -Papierformat sym:cui.ListBox.10025.50 -Breite sym:cui.MetricField.10025.54 -Hoehe sym:cui.MetricField.10025.56 -Schacht sym:cui.ListBox.10025.58 -Horizontal sym:cui.CheckBox.10025.70 -Vertikal sym:cui.CheckBox.10025.71 -Hoch sym:cui.RadioButton.10025.51 -Quer sym:cui.RadioButton.10025.52 -Einschalten sym:cui.CheckBox.10025.60 -AbsatzVorlage sym:cui.ListBox.10025.62 -Textfluss sym:cui.ListBox.10025.36 -FitObject sym:cui.CheckBox.10025.72 +Links sym:cui:MetricField:RID_SVXPAGE_PAGE:ED_LEFT_MARGIN +Rechts sym:cui:MetricField:RID_SVXPAGE_PAGE:ED_RIGHT_MARGIN +Oben sym:cui:MetricField:RID_SVXPAGE_PAGE:ED_TOP_MARGIN +Unten sym:cui:MetricField:RID_SVXPAGE_PAGE:ED_BOTTOM_MARGIN +Seitenlayout sym:cui:ListBox:RID_SVXPAGE_PAGE:LB_LAYOUT +Numerierung sym:cui:ListBox:RID_SVXPAGE_PAGE:LB_NUMBER_FORMAT +Papierformat sym:cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_SIZE +Breite sym:cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_WIDTH +Hoehe sym:cui:MetricField:RID_SVXPAGE_PAGE:ED_PAPER_HEIGHT +Schacht sym:cui:ListBox:RID_SVXPAGE_PAGE:LB_PAPER_TRAY +Horizontal sym:cui:CheckBox:RID_SVXPAGE_PAGE:CB_HORZ +Vertikal sym:cui:CheckBox:RID_SVXPAGE_PAGE:CB_VERT +Hoch sym:cui:RadioButton:RID_SVXPAGE_PAGE:RB_PORTRAIT +Quer sym:cui:RadioButton:RID_SVXPAGE_PAGE:RB_LANDSCAPE +Einschalten sym:cui:CheckBox:RID_SVXPAGE_PAGE:CB_REGISTER +AbsatzVorlage sym:cui:ListBox:RID_SVXPAGE_PAGE:LB_REGISTER +Textfluss sym:cui:ListBox:RID_SVXPAGE_PAGE:LB_TEXT_FLOW +FitObject sym:cui:CheckBox:RID_SVXPAGE_PAGE:CB_ADAPT *TabSonstigesAllgemein sym:CUI_HID_OFA_TP_MISC -Zweistellig sym:cui.NumericField.17100.42 -Aktivieren sym:cui.CheckBox.17100.13 -Zuruecksetzen sym:cui.PushButton.17100.14 -Tips sym:cui.CheckBox.17100.11 -ExtendedTips sym:cui.CheckBox.17100.12 -StarOfficeDialogeBenutzen sym:cui.CheckBox.17100.55 -DruckenStatus sym:cui.CheckBox.17100.61 -StyleSheet sym:cui.ListBox.17100.16 +Zweistellig sym:cui:NumericField:OFA_TP_MISC:NF_YEARVALUE +Aktivieren sym:cui:CheckBox:OFA_TP_MISC:CB_HELPAGENT +Zuruecksetzen sym:cui:PushButton:OFA_TP_MISC:PB_HELPAGENT_RESET +Tips sym:cui:CheckBox:OFA_TP_MISC:CB_TOOLTIP +ExtendedTips sym:cui:CheckBox:OFA_TP_MISC:CB_EXTHELP +StarOfficeDialogeBenutzen sym:cui:CheckBox:OFA_TP_MISC:CB_FILEDLG +DruckenStatus sym:cui:CheckBox:OFA_TP_MISC:CB_DOCSTATUS +StyleSheet sym:cui:ListBox:OFA_TP_MISC:LB_HELPFORMAT *TabSonstigesDraw sym:SD_HID_SD_OPTIONS_MISC -Schnellbearbeitung sym:sd.CheckBox.599.24 -TextbereichSelektierbar sym:sd.CheckBox.599.9 -SeitenlayoutdialogZeigen sym:sd.CheckBox.599.6 -CacheFuerHintergrund sym:sd.CheckBox.599.25 -KopieBeimVerschieben sym:sd.CheckBox.599.13 -ObjekteImmerVerschiebbar sym:sd.CheckBox.599.19 -SetzenAufKreis sym:sd.CheckBox.599.21 -MitAktuellerSeite sym:sd.CheckBox.599.26 -Praesentationsdialoge sym:sd.CheckBox.599.6 -MitAutopilotStarten sym:sd.CheckBox.599.6 -Masseinheit sym:sd.ListBox.599.1 -Tabulatorabstand sym:sd.MetricField.599.4 -AlleAbsatzabstaendeAddieren sym:sd.CheckBox.599.28 -Zeichnungsmasstab sym:sd.ComboBox.599.29 -Originalbreite sym:sd.MetricField.599.31 -Originalhoehe sym:sd.MetricField.599.33 -UsePrinterMetrics sym:sd.CheckBox.599.40 +Schnellbearbeitung sym:sd:CheckBox:TP_OPTIONS_MISC:CBX_QUICKEDIT +TextbereichSelektierbar sym:sd:CheckBox:TP_OPTIONS_MISC:CBX_PICKTHROUGH +SeitenlayoutdialogZeigen sym:sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE +CacheFuerHintergrund sym:sd:CheckBox:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE +KopieBeimVerschieben sym:sd:CheckBox:TP_OPTIONS_MISC:CBX_COPY +ObjekteImmerVerschiebbar sym:sd:CheckBox:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS +SetzenAufKreis sym:sd:CheckBox:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION +MitAktuellerSeite sym:sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE +Praesentationsdialoge sym:sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE +MitAutopilotStarten sym:sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE +Masseinheit sym:sd:ListBox:TP_OPTIONS_MISC:LB_METRIC +Tabulatorabstand sym:sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_TABSTOP +AlleAbsatzabstaendeAddieren sym:sd:CheckBox:TP_OPTIONS_MISC:CB_MERGE_PARA_DIST +Zeichnungsmasstab sym:sd:ComboBox:TP_OPTIONS_MISC:CB_SCALE +Originalbreite sym:sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_ORIGINAL_WIDTH +Originalhoehe sym:sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_ORIGINAL_HEIGHT +UsePrinterMetrics sym:sd:CheckBox:TP_OPTIONS_MISC:CB_USE_PRINTER_METRICS +TabSonstigesWriter TabLaden *TabSortierkriterien sym:SC_HID_SCPAGE_SORT_FIELDS -SortierenNach sym:sc.ListBox.25610.4 -AnschliessendNach1 sym:sc.ListBox.25610.5 -AnschliessendNach2 sym:sc.ListBox.25610.6 -Aufsteigend1 sym:sc.RadioButton.25610.7 -Absteigend1 sym:sc.RadioButton.25610.10 -Aufsteigend2 sym:sc.RadioButton.25610.8 -Absteigend2 sym:sc.RadioButton.25610.11 -Aufsteigend3 sym:sc.RadioButton.25610.9 -Absteigend3 sym:sc.RadioButton.25610.12 +SortierenNach sym:sc:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT1 +AnschliessendNach1 sym:sc:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT2 +AnschliessendNach2 sym:sc:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT3 +Aufsteigend1 sym:sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP1 +Absteigend1 sym:sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1 +Aufsteigend2 sym:sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP2 +Absteigend2 sym:sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2 +Aufsteigend3 sym:sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP3 +Absteigend3 sym:sc:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3 *TabSortierlisten sym:SC_HID_SCPAGE_USERLISTS -Listen sym:sc.ListBox.25635.1 -Eintraege sym:sc.MultiLineEdit.25635.2 -ListeKopierenAus sym:sc.Edit.25635.3 -Neu sym:sc.PushButton.25635.1 -Loeschen sym:sc.PushButton.25635.3 -Kopieren sym:sc.PushButton.25635.4 -Aendern sym:sc.PushButton.25635.2 -Abbruch sym:sc.PushButton.25635.1 +Listen sym:sc:ListBox:RID_SCPAGE_USERLISTS:LB_LISTS +Eintraege sym:sc:MultiLineEdit:RID_SCPAGE_USERLISTS:ED_ENTRIES +ListeKopierenAus sym:sc:Edit:RID_SCPAGE_USERLISTS:ED_COPYFROM +Neu sym:sc:PushButton:RID_SCPAGE_USERLISTS:BTN_NEW +Loeschen sym:sc:PushButton:RID_SCPAGE_USERLISTS:BTN_REMOVE +Kopieren sym:sc:PushButton:RID_SCPAGE_USERLISTS:BTN_COPY +Aendern sym:sc:PushButton:RID_SCPAGE_USERLISTS:BTN_ADD +Abbruch sym:sc:PushButton:RID_SCPAGE_USERLISTS:BTN_NEW *TabSortierenOptionen sym:SC_HID_SCPAGE_SORT_OPTIONS -GrossKleinschreibungBeachten sym:sc.CheckBox.25611.8 -BereichEnthaeltSpaltenkoepfe sym:sc.CheckBox.25611.9 -FormateEinschliessen sym:sc.CheckBox.25611.10 -SortierergebnisseAusgebenNach sym:sc.CheckBox.25611.11 -AusgabebereichName sym:sc.ListBox.25611.3 -AusgabebereichZellen sym:sc.Edit.25611.4 -BenutzerdefinierteSortierreihenfolge sym:sc.CheckBox.25611.7 -SortierreihenfolgeListe sym:sc.ListBox.25611.2 -VonObenNachUnten sym:sc.RadioButton.25611.12 -VonLinksNachRechts sym:sc.RadioButton.25611.13 -Sprache sym:sc.ListBox.25611.17 -Optionen sym:sc.ListBox.25611.19 +GrossKleinschreibungBeachten sym:sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_CASESENSITIVE +BereichEnthaeltSpaltenkoepfe sym:sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_LABEL +FormateEinschliessen sym:sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_FORMATS +SortierergebnisseAusgebenNach sym:sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_COPYRESULT +AusgabebereichName sym:sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_OUTAREA +AusgabebereichZellen sym:sc:Edit:RID_SCPAGE_SORT_OPTIONS:ED_OUTAREA +BenutzerdefinierteSortierreihenfolge sym:sc:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER +SortierreihenfolgeListe sym:sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER +VonObenNachUnten sym:sc:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_TOP_DOWN +VonLinksNachRechts sym:sc:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_LEFT_RIGHT +Sprache sym:sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_LANGUAGE +Optionen sym:sc:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_ALGORITHM *TabSpalten sym:SW_HID_COLUMN -Anzahl sym:sw.NumericField.20813.2 +Anzahl sym:sw:NumericField:TP_COLUMN:ED_NUMBER ColumnValueset sym:SW_HID_COLUMN_VALUESET -BalanceColumns sym:sw.CheckBox.20813.58 -Spaltenbreite1 sym:sw.MetricField.20813.25 -Spaltenbreite2 sym:sw.MetricField.20813.26 -Spaltenbreite3 sym:sw.MetricField.20813.27 -Spaltenbreite4 sym:sw.MetricField.20813.25 -Spaltenbreite5 sym:sw.MetricField.20813.26 -Spaltenbreite6 sym:sw.MetricField.20813.27 -Spaltenbreite7 sym:sw.MetricField.20813.25 -Spaltenbreite8 sym:sw.MetricField.20813.26 -Spaltenbreite9 sym:sw.MetricField.20813.27 -Vor sym:sw.ImageButton.20813.31 -Zurueck sym:sw.ImageButton.20813.30 -Abstand12 sym:sw.MetricField.20813.46 -Abstand23 sym:sw.MetricField.20813.47 -Abstand34 sym:sw.MetricField.20813.46 -Abstand45 sym:sw.MetricField.20813.47 -Abstand56 sym:sw.MetricField.20813.46 -Abstand67 sym:sw.MetricField.20813.47 -Abstand78 sym:sw.MetricField.20813.46 -Abstand89 sym:sw.MetricField.20813.47 -AutomBreite sym:sw.CheckBox.20813.4 -Art sym:sw.ListBox.20813.34 -Hoehe sym:sw.MetricField.20813.36 -Position sym:sw.ListBox.20813.38 -TextDirection sym:sw.ListBox.20813.61 +BalanceColumns sym:sw:CheckBox:TP_COLUMN:CB_BALANCECOLS +Spaltenbreite1 sym:sw:MetricField:TP_COLUMN:ED_1 +Spaltenbreite2 sym:sw:MetricField:TP_COLUMN:ED_2 +Spaltenbreite3 sym:sw:MetricField:TP_COLUMN:ED_3 +Spaltenbreite4 sym:sw:MetricField:TP_COLUMN:ED_1 +Spaltenbreite5 sym:sw:MetricField:TP_COLUMN:ED_2 +Spaltenbreite6 sym:sw:MetricField:TP_COLUMN:ED_3 +Spaltenbreite7 sym:sw:MetricField:TP_COLUMN:ED_1 +Spaltenbreite8 sym:sw:MetricField:TP_COLUMN:ED_2 +Spaltenbreite9 sym:sw:MetricField:TP_COLUMN:ED_3 +Vor sym:sw:ImageButton:TP_COLUMN:BTN_DOWN +Zurueck sym:sw:ImageButton:TP_COLUMN:BTN_UP +Abstand12 sym:sw:MetricField:TP_COLUMN:ED_DIST1 +Abstand23 sym:sw:MetricField:TP_COLUMN:ED_DIST2 +Abstand34 sym:sw:MetricField:TP_COLUMN:ED_DIST1 +Abstand45 sym:sw:MetricField:TP_COLUMN:ED_DIST2 +Abstand56 sym:sw:MetricField:TP_COLUMN:ED_DIST1 +Abstand67 sym:sw:MetricField:TP_COLUMN:ED_DIST2 +Abstand78 sym:sw:MetricField:TP_COLUMN:ED_DIST1 +Abstand89 sym:sw:MetricField:TP_COLUMN:ED_DIST2 +AutomBreite sym:sw:CheckBox:TP_COLUMN:CB_AUTO_WIDTH +Art sym:sw:ListBox:TP_COLUMN:LB_STYLE +Hoehe sym:sw:MetricField:TP_COLUMN:ED_HEIGHT +Position sym:sw:ListBox:TP_COLUMN:LB_POSITION +TextDirection sym:sw:ListBox:TP_COLUMN:LB_TEXTDIRECTION Zuruecksetzen sym:SFX2_HID_TABDLG_RESET_BTN *TabSpaltenTabelle sym:SW_HID_TABLE_COLUMN -BreiteAnpassen sym:sw.CheckBox.21461.122 -ProportionalAendern sym:sw.CheckBox.21461.123 -VerfuegbarerPlatz sym:sw.MetricField.21461.126 -Spalte1 sym:sw.MetricField.21461.108 -Spalte2 sym:sw.MetricField.21461.110 -Spalte3 sym:sw.MetricField.21461.112 -Spalte4 sym:sw.MetricField.21461.114 -Spalte5 sym:sw.MetricField.21461.116 -Spalte6 sym:sw.MetricField.21461.118 -Zurueck sym:sw.ImageButton.21461.121 -Weiter sym:sw.ImageButton.21461.120 +BreiteAnpassen sym:sw:CheckBox:TP_TABLE_COLUMN:CB_MOD_TBL +ProportionalAendern sym:sw:CheckBox:TP_TABLE_COLUMN:CB_PROP +VerfuegbarerPlatz sym:sw:MetricField:TP_TABLE_COLUMN:ED_SPACE +Spalte1 sym:sw:MetricField:TP_TABLE_COLUMN:COL_MF_1 +Spalte2 sym:sw:MetricField:TP_TABLE_COLUMN:COL_MF_2 +Spalte3 sym:sw:MetricField:TP_TABLE_COLUMN:COL_MF_3 +Spalte4 sym:sw:MetricField:TP_TABLE_COLUMN:COL_MF_4 +Spalte5 sym:sw:MetricField:TP_TABLE_COLUMN:COL_MF_5 +Spalte6 sym:sw:MetricField:TP_TABLE_COLUMN:COL_MF_6 +Zurueck sym:sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_DOWN +Weiter sym:sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP Zuruecksetzen sym:SFX2_HID_TABDLG_RESET_BTN *TabSpeichern sym:CUI_HID_OPTIONS_SAVE -BenutzerspezifischeEinstellungen sym:cui.CheckBox.12000.11 -DokumenteigenschaftenBearbeiten sym:cui.CheckBox.12000.14 -Sicherungskopie sym:cui.CheckBox.12000.15 -AutomatischSpeichern sym:cui.CheckBox.12000.16 -Minuten sym:cui.NumericField.12000.17 -NoPrettyPrinting sym:cui.CheckBox.12000.20 -URLimDateisystem sym:cui.CheckBox.12000.41 -URLimInternet sym:cui.CheckBox.12000.42 -Dokumenttyp sym:cui.ListBox.12000.45 -Filter sym:cui.ListBox.12000.47 -WarnWhenSavingAlienFormat sym:cui.CheckBox.12000.22 -LoadPrinterSettingsWithDocument sym:cui.CheckBox.12000.12 +BenutzerspezifischeEinstellungen sym:cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_SETTINGS +DokumenteigenschaftenBearbeiten sym:cui:CheckBox:RID_SFXPAGE_SAVE:BTN_DOCINFO +Sicherungskopie sym:cui:CheckBox:RID_SFXPAGE_SAVE:BTN_BACKUP +AutomatischSpeichern sym:cui:CheckBox:RID_SFXPAGE_SAVE:BTN_AUTOSAVE +Minuten sym:cui:NumericField:RID_SFXPAGE_SAVE:ED_AUTOSAVE +NoPrettyPrinting sym:cui:CheckBox:RID_SFXPAGE_SAVE:BTN_NOPRETTYPRINTING +URLimDateisystem sym:cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_FSYS +URLimInternet sym:cui:CheckBox:RID_SFXPAGE_SAVE:BTN_RELATIVE_INET +Dokumenttyp sym:cui:ListBox:RID_SFXPAGE_SAVE:LB_APP +Filter sym:cui:ListBox:RID_SFXPAGE_SAVE:LB_FILTER +WarnWhenSavingAlienFormat sym:cui:CheckBox:RID_SFXPAGE_SAVE:BTN_WARNALIENFORMAT +LoadPrinterSettingsWithDocument sym:cui:CheckBox:RID_SFXPAGE_SAVE:CB_LOAD_DOCPRINTER *TabSprachen sym:CUI_HID_OFA_TP_LANGUAGES -UILanguage sym:cui.ListBox.17105.31 -Gebietsschema sym:cui.ListBox.17105.17 -DecimalSeparator sym:cui.CheckBox.17105.28 -StandardWaehrung sym:cui.ListBox.17105.19 -Westlich sym:cui.ListBox.17105.6 -Asiatisch sym:cui.ListBox.17105.8 -AktuellesDokument sym:cui.CheckBox.17105.11 -Aktivieren sym:cui.CheckBox.17105.13 -LanguageComplexScript sym:cui.ListBox.17105.10 -ComplexScriptEnabled sym:cui.CheckBox.17105.15 +UILanguage sym:cui:ListBox:OFA_TP_LANGUAGES:LB_USERINTERFACE +Gebietsschema sym:cui:ListBox:OFA_TP_LANGUAGES:LB_LOCALESETTING +DecimalSeparator sym:cui:CheckBox:OFA_TP_LANGUAGES:CB_DECIMALSEPARATOR +StandardWaehrung sym:cui:ListBox:OFA_TP_LANGUAGES:LB_CURRENCY +Westlich sym:cui:ListBox:OFA_TP_LANGUAGES:LB_WEST_LANG +Asiatisch sym:cui:ListBox:OFA_TP_LANGUAGES:LB_ASIAN_LANG +AktuellesDokument sym:cui:CheckBox:OFA_TP_LANGUAGES:CB_CURRENT_DOC +Aktivieren sym:cui:CheckBox:OFA_TP_LANGUAGES:CB_ASIANSUPPORT +LanguageComplexScript sym:cui:ListBox:OFA_TP_LANGUAGES:LB_COMPLEX_LANG +ComplexScriptEnabled sym:cui:CheckBox:OFA_TP_LANGUAGES:CB_CTLSUPPORT *TabStatistik sym:SW_HID_DOC_STAT -Aktualisieren sym:sw.PushButton.20815.19 +Aktualisieren sym:sw:PushButton:TP_DOC_STAT:PB_PDATE -*TabStatistikCalc sym:sc.TabPage.25683 +*TabStatistikCalc sym:sc:TabPage:RID_SCPAGE_STAT *TabSuche sym:CUI_HID_OPTIONS_SEARCH -SuchenIn sym:cui.ListBox.10160.40 -DienstName sym:cui.Edit.10160.41 -Und sym:cui.RadioButton.10160.43 -Oder sym:cui.RadioButton.10160.44 -Exakt sym:cui.RadioButton.10160.45 -Praefix sym:cui.Edit.10160.46 -Suffix sym:cui.Edit.10160.47 -Trenner sym:cui.Edit.10160.48 -Schreibstil sym:cui.ListBox.10160.49 -Hinzufuegen sym:cui.PushButton.10160.55 -Aendern sym:cui.PushButton.10160.53 -Loeschen sym:cui.PushButton.10160.54 -Neu sym:cui.PushButton.10160.56 +SuchenIn sym:cui:ListBox:RID_SVXPAGE_INET_SEARCH:LB_SEARCH +DienstName sym:cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEARCH_NAME +Und sym:cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_AND +Oder sym:cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_OR +Exakt sym:cui:RadioButton:RID_SVXPAGE_INET_SEARCH:RB_EXACT +Praefix sym:cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_URL +Suffix sym:cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_POSTFIX +Trenner sym:cui:Edit:RID_SVXPAGE_INET_SEARCH:ED_SEPARATOR +Schreibstil sym:cui:ListBox:RID_SVXPAGE_INET_SEARCH:ED_CASE +Hinzufuegen sym:cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_ADD +Aendern sym:cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_CHANGE +Loeschen sym:cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_DELETE +Neu sym:cui:PushButton:RID_SVXPAGE_INET_SEARCH:PB_NEW diff --git a/testautomation/global/win/tab_t_z.win b/testautomation/global/win/tab_t_z.win index 5e5836e1d844..22f9f5c1912a 100644 --- a/testautomation/global/win/tab_t_z.win +++ b/testautomation/global/win/tab_t_z.win @@ -1,401 +1,401 @@ *TabTabelle sym:SW_HID_FORMAT_TABLE -TabellenName sym:sw.Edit.20834.103 -Breite sym:sw.MetricField.20834.1 -Relativ sym:sw.CheckBox.20834.4 -Automatisch sym:sw.RadioButton.20834.14 -Links sym:sw.RadioButton.20834.10 -Rechts sym:sw.RadioButton.20834.11 -Zentriert sym:sw.RadioButton.20834.12 -Vonlinks sym:sw.RadioButton.20834.144 -Manuell sym:sw.RadioButton.20834.13 -NachLinks sym:sw.MetricField.20834.51 -NachRechts sym:sw.MetricField.20834.52 -NachOben sym:sw.MetricField.20834.21 -NachUnten sym:sw.MetricField.20834.23 -TextDirection sym:sw.ListBox.20834.44 +TabellenName sym:sw:Edit:TP_FORMAT_TABLE:ED_NAME +Breite sym:sw:MetricField:TP_FORMAT_TABLE:ED_WIDTH +Relativ sym:sw:CheckBox:TP_FORMAT_TABLE:CB_REL_WIDTH +Automatisch sym:sw:RadioButton:TP_FORMAT_TABLE:RB_FULL +Links sym:sw:RadioButton:TP_FORMAT_TABLE:RB_LEFT +Rechts sym:sw:RadioButton:TP_FORMAT_TABLE:RB_RIGHT +Zentriert sym:sw:RadioButton:TP_FORMAT_TABLE:RB_CENTER +Vonlinks sym:sw:RadioButton:TP_FORMAT_TABLE:RB_FROM_LEFT +Manuell sym:sw:RadioButton:TP_FORMAT_TABLE:RB_FREE +NachLinks sym:sw:MetricField:TP_FORMAT_TABLE:ED_LEFT_DIST +NachRechts sym:sw:MetricField:TP_FORMAT_TABLE:ED_RIGHT_DIST +NachOben sym:sw:MetricField:TP_FORMAT_TABLE:ED_TOP_DIST +NachUnten sym:sw:MetricField:TP_FORMAT_TABLE:ED_BOTTOM_DIST +TextDirection sym:sw:ListBox:TP_FORMAT_TABLE:LB_TEXTDIRECTION *TabTabelleCalc sym:SC_HID_SCPAGE_TABLE -ZeilenSpaltenKoepfe sym:sc.CheckBox.25647.11 -Tabellengitter sym:sc.CheckBox.25647.10 -Notizen sym:sc.CheckBox.25647.12 -GrafikenObjekte sym:sc.CheckBox.25647.14 -Diagramme sym:sc.CheckBox.25647.13 -Zeichenobjekte sym:sc.CheckBox.25647.15 -Formeln sym:sc.CheckBox.25647.16 -Nullwerte sym:sc.CheckBox.25647.17 -SeitenreihenfolgeObenUnten sym:sc.RadioButton.25647.20 -SeitenreihenfolgeLinksRechts sym:sc.RadioButton.25647.21 -ErsteSeitenzahl sym:sc.CheckBox.25647.25 -NummerErsteSeite sym:sc.NumericField.25647.26 -'SkalierungAllesAuf sc:RadioButton:RID_SCPAGE_TABLE:BTN_SCALEALL -SkalierungProzent sym:sc.MetricField.25647.32 -'MaxSeitenzahl sc:RadioButton:RID_SCPAGE_TABLE:BTN_SCALEPAGENUM -AnzahlMaxSeiten sym:sc.NumericField.25647.34 -ScalingMode sym:sc.ListBox.25647.31 -ScalePageWidth sym:sc.NumericField.25647.35 -ScalePageHeight sym:sc.NumericField.25647.36 +ZeilenSpaltenKoepfe sym:sc:CheckBox:RID_SCPAGE_TABLE:BTN_HEADER +Tabellengitter sym:sc:CheckBox:RID_SCPAGE_TABLE:BTN_GRID +Notizen sym:sc:CheckBox:RID_SCPAGE_TABLE:BTN_NOTES +GrafikenObjekte sym:sc:CheckBox:RID_SCPAGE_TABLE:BTN_OBJECTS +Diagramme sym:sc:CheckBox:RID_SCPAGE_TABLE:BTN_CHARTS +Zeichenobjekte sym:sc:CheckBox:RID_SCPAGE_TABLE:BTN_DRAWINGS +Formeln sym:sc:CheckBox:RID_SCPAGE_TABLE:BTN_FORMULAS +Nullwerte sym:sc:CheckBox:RID_SCPAGE_TABLE:BTN_NULLVALS +SeitenreihenfolgeObenUnten sym:sc:RadioButton:RID_SCPAGE_TABLE:BTN_TOPDOWN +SeitenreihenfolgeLinksRechts sym:sc:RadioButton:RID_SCPAGE_TABLE:BTN_LEFTRIGHT +ErsteSeitenzahl sym:sc:CheckBox:RID_SCPAGE_TABLE:BTN_PAGENO +NummerErsteSeite sym:sc:NumericField:RID_SCPAGE_TABLE:ED_PAGENO +'SkalierungAllesAuf sym:sc:RadioButton:RID_SCPAGE_TABLE:BTN_SCALEALL +SkalierungProzent sym:sc:MetricField:RID_SCPAGE_TABLE:ED_SCALEALL +'MaxSeitenzahl sym:sc:RadioButton:RID_SCPAGE_TABLE:BTN_SCALEPAGENUM +AnzahlMaxSeiten sym:sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGENUM +ScalingMode sym:sc:ListBox:RID_SCPAGE_TABLE:LB_SCALEMODE +ScalePageWidth sym:sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEWIDTH +ScalePageHeight sym:sc:NumericField:RID_SCPAGE_TABLE:ED_SCALEPAGEHEIGHT *TabTabelleOptionen sym:SW_HID_OPTTABLE_PAGE -VerschiebenZeile sym:sw.MetricField.20856.112 -VerschiebenSpalte sym:sw.MetricField.20856.114 -EinfuegenZeile sym:sw.MetricField.20856.117 -EinfuegenSpalte sym:sw.MetricField.20856.119 -VerhaltenFix sym:sw.RadioButton.20856.121 -FixProportional sym:sw.RadioButton.20856.122 -Variabel sym:sw.RadioButton.20856.123 +VerschiebenZeile sym:sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWMOVE +VerschiebenSpalte sym:sw:MetricField:TP_OPTTABLE_PAGE:MF_COLMOVE +EinfuegenZeile sym:sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWINSERT +EinfuegenSpalte sym:sw:MetricField:TP_OPTTABLE_PAGE:MF_COLINSERT +VerhaltenFix sym:sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIX +FixProportional sym:sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIXPROP +Variabel sym:sw:RadioButton:TP_OPTTABLE_PAGE:RB_VAR -Ueberschrift sym:sw.CheckBox.20856.101 -Wiederholen sym:sw.CheckBox.20856.102 -NichtTrennen sym:sw.CheckBox.20856.103 -Umrandung sym:sw.CheckBox.20856.104 -AutomatischeZahlenerkennung sym:sw.CheckBox.20856.105 -Zahlenformaterkennung sym:sw.CheckBox.20856.109 -AutomatischeAusrichtung sym:sw.CheckBox.20856.106 +Ueberschrift sym:sw:CheckBox:TP_OPTTABLE_PAGE:CB_HEADER +Wiederholen sym:sw:CheckBox:TP_OPTTABLE_PAGE:CB_REPEAT_HEADER +NichtTrennen sym:sw:CheckBox:TP_OPTTABLE_PAGE:CB_DONT_SPLIT +Umrandung sym:sw:CheckBox:TP_OPTTABLE_PAGE:CB_BORDER +AutomatischeZahlenerkennung sym:sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFORMATTING +Zahlenformaterkennung sym:sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFMT_FORMATTING +AutomatischeAusrichtung sym:sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMALIGNMENT *TabTabulatoren sym:CUI_HID_TABULATOR -AlleLoeschen sym:cui.PushButton.10002.52 -Fuellzeichen1 sym:cui.RadioButton.10002.40 -Fuellzeichen2 sym:cui.RadioButton.10002.41 -Fuellzeichen3 sym:cui.RadioButton.10002.42 -Fuellzeichen4 sym:cui.RadioButton.10002.43 -Fuellzeichen5 sym:cui.RadioButton.10002.44 -FuellzeichenZeichen sym:cui.Edit.10002.45 -Loeschen sym:cui.PushButton.10002.51 -Neu sym:cui.PushButton.10002.50 -Position sym:cui.MetricBox.10002.10 -TypLinks sym:cui.RadioButton.10002.20 -TypRechts sym:cui.RadioButton.10002.22 -TypZentriert sym:cui.RadioButton.10002.24 -TypDezimal sym:cui.RadioButton.10002.26 -TypZeichen sym:cui.Edit.10002.28 +AlleLoeschen sym:cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL +Fuellzeichen1 sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO +Fuellzeichen2 sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS +Fuellzeichen3 sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE +Fuellzeichen4 sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE +Fuellzeichen5 sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER +FuellzeichenZeichen sym:cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER +Loeschen sym:cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL +Neu sym:cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW +Position sym:cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS +TypLinks sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT +TypRechts sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT +TypZentriert sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER +TypDezimal sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL +TypZeichen sym:cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR *TabTabulator sym:CUI_HID_TABULATOR -AlleLoeschen sym:cui.PushButton.10002.52 -Fuellzeichen1 sym:cui.RadioButton.10002.40 -Fuellzeichen2 sym:cui.RadioButton.10002.41 -Fuellzeichen3 sym:cui.RadioButton.10002.42 -Fuellzeichen4 sym:cui.RadioButton.10002.43 -Fuellzeichen5 sym:cui.RadioButton.10002.44 -FuellzeichenZeichen sym:cui.Edit.10002.45 -Loeschen sym:cui.PushButton.10002.51 -Neu sym:cui.PushButton.10002.50 -Position sym:cui.MetricBox.10002.10 -TypLinks sym:cui.RadioButton.10002.20 -TypRechts sym:cui.RadioButton.10002.22 -TypZentriert sym:cui.RadioButton.10002.24 -TypDezimal sym:cui.RadioButton.10002.26 -TypZeichen sym:cui.Edit.10002.28 +AlleLoeschen sym:cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DELALL +Fuellzeichen1 sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_NO +Fuellzeichen2 sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_POINTS +Fuellzeichen3 sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_DASHLINE +Fuellzeichen4 sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_UNDERSCORE +Fuellzeichen5 sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_FILLCHAR_OTHER +FuellzeichenZeichen sym:cui:Edit:RID_SVXPAGE_TABULATOR:ED_FILLCHAR_OTHER +Loeschen sym:cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_DEL +Neu sym:cui:PushButton:RID_SVXPAGE_TABULATOR:BTN_NEW +Position sym:cui:MetricBox:RID_SVXPAGE_TABULATOR:ED_TABPOS +TypLinks sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_LEFT +TypRechts sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_RIGHT +TypZentriert sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_CENTER +TypDezimal sym:cui:RadioButton:RID_SVXPAGE_TABULATOR:BTN_TABTYPE_DECIMAL +TypZeichen sym:cui:Edit:RID_SVXPAGE_TABULATOR:ED_TABTYPE_DECCHAR *TabTastatur sym:CUI_HID_CONFIG_ACCEL Tastatur sym:CUI_HID_ACCELCONFIG_LISTBOX Bereich sym:CUI_HID_CONFIGGROUP_ACC_LISTBOX Funktion sym:CUI_HID_CONFIGFUNCTION_ACC_LISTBOX -Aendern sym:cui.PushButton.10293.3 -Loeschen sym:cui.PushButton.10293.4 -Zuruecksetzen sym:cui.PushButton.10293.20 -Laden sym:cui.PushButton.10293.40 -Speichern sym:cui.PushButton.10293.41 -StarOffice sym:cui.RadioButton.10293.44 -Application sym:cui.RadioButton.10293.45 +Aendern sym:cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_CHANGE +Loeschen sym:cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_ACC_REMOVE +Zuruecksetzen sym:cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_RESET +Laden sym:cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_LOAD +Speichern sym:cui:PushButton:RID_SVXPAGE_KEYBOARD:BTN_SAVE +StarOffice sym:cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_OFFICE +Application sym:cui:RadioButton:RID_SVXPAGE_KEYBOARD:RB_MODULE *TabTeilergebnisseOptionen sym:SC_HID_SCPAGE_SUBT_OPTIONS -NeueSeiteBeiGruppenwechsel sym:sc.CheckBox.25633.21 -GrossKleinschreibungBeachten sym:sc.CheckBox.25633.22 -BereichVorherNachGruppenSortieren sym:sc.CheckBox.25633.23 -FormateEinschliessen sym:sc.CheckBox.25633.33 -BenutzerdefinierteSortierreihenfolge sym:sc.CheckBox.25633.34 -SortierreihenfolgeAnzeige sym:sc.ListBox.25633.35 -Aufsteigend sym:sc.RadioButton.25633.31 -Absteigend sym:sc.RadioButton.25633.32 +NeueSeiteBeiGruppenwechsel sym:sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_PAGEBREAK +GrossKleinschreibungBeachten sym:sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_CASE +BereichVorherNachGruppenSortieren sym:sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_SORT +FormateEinschliessen sym:sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_FORMATS +BenutzerdefinierteSortierreihenfolge sym:sc:CheckBox:RID_SCPAGE_SUBT_OPTIONS:BTN_USERDEF +SortierreihenfolgeAnzeige sym:sc:ListBox:RID_SCPAGE_SUBT_OPTIONS:LB_USERDEF +Aufsteigend sym:sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_ASCENDING +Absteigend sym:sc:RadioButton:RID_SCPAGE_SUBT_OPTIONS:BTN_DESCENDING *TabText sym:CUI_HID_PAGE_TEXTATTR -BreiteAnTextAnpassen sym:cui.TriStateBox.10153.2 -HoeheAnTextAnpassen sym:cui.TriStateBox.10153.1 -AmRahmenAnpassen sym:cui.TriStateBox.10153.3 -Konturfluss sym:cui.TriStateBox.10153.5 -WordWrap sym:cui.TriStateBox.10153.6 -ResizeShape sym:cui.TriStateBox.10153.7 -Links sym:cui.MetricField.10153.1 -Rechts sym:cui.MetricField.10153.2 -Oben sym:cui.MetricField.10153.3 -Unten sym:cui.MetricField.10153.4 +BreiteAnTextAnpassen sym:cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_WIDTH +HoeheAnTextAnpassen sym:cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_HEIGHT +AmRahmenAnpassen sym:cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FIT_TO_SIZE +Konturfluss sym:cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_CONTOUR +WordWrap sym:cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_WORDWRAP_TEXT +ResizeShape sym:cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_AUTOGROW_SIZE +Links sym:cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_LEFT +Rechts sym:cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_RIGHT +Oben sym:cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_TOP +Unten sym:cui:MetricField:RID_SVXPAGE_TEXTATTR:MTR_FLD_BOTTOM AnchorPosition sym:CUI_HID_TEXTATTR_CTL_POSITION -GanzeBreite sym:cui.TriStateBox.10153.4 +GanzeBreite sym:cui:TriStateBox:RID_SVXPAGE_TEXTATTR:TSB_FULL_WIDTH *TabTextfluss sym:CUI_HID_FORMAT_PARAGRAPH_EXT -Automatisch sym:cui.TriStateBox.10007.50 -AbZeichenende sym:cui.NumericField.10007.52 -AbZeichenAnfang sym:cui.NumericField.10007.55 -Trennstellen sym:cui.NumericField.10007.83 -Umbruch sym:cui.TriStateBox.10007.60 -UmbruchTyp sym:cui.ListBox.10007.62 -UmbruchPosition sym:cui.ListBox.10007.64 -MitSeitenvorlage sym:cui.TriStateBox.10007.65 -Vorlage sym:cui.ListBox.10007.66 -AbsatzNichtTrennen sym:cui.TriStateBox.10007.67 -AbsaetzeZusammenhalten sym:cui.TriStateBox.10007.80 -Schusterjungenregelung sym:cui.TriStateBox.10007.68 -SchusterZeilen sym:cui.NumericField.10007.69 -Hurenkinderregelung sym:cui.TriStateBox.10007.71 -HurenkinderZeilen sym:cui.NumericField.10007.72 -Seitenzahl sym:cui.NumericField.10007.76 +Automatisch sym:cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_HYPHEN +AbZeichenende sym:cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENBEFORE +AbZeichenAnfang sym:cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_HYPHENAFTER +Trennstellen sym:cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_MAXHYPH +Umbruch sym:cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGEBREAK +UmbruchTyp sym:cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKTYPE +UmbruchPosition sym:cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_BREAKPOSITION +MitSeitenvorlage sym:cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_PAGECOLL +Vorlage sym:cui:ListBox:RID_SVXPAGE_EXT_PARAGRAPH:LB_PAGECOLL +AbsatzNichtTrennen sym:cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_KEEPTOGETHER +AbsaetzeZusammenhalten sym:cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:CB_KEEPTOGETHER +Schusterjungenregelung sym:cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_WIDOWS +SchusterZeilen sym:cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_WIDOWS +Hurenkinderregelung sym:cui:TriStateBox:RID_SVXPAGE_EXT_PARAGRAPH:BTN_ORPHANS +HurenkinderZeilen sym:cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_ORPHANS +Seitenzahl sym:cui:NumericField:RID_SVXPAGE_EXT_PARAGRAPH:ED_PAGENUM *TabTextflussTabelle sym:SW_HID_TABLE_TEXTFLOW -Umbruch sym:sw.CheckBox.20852.131 -MitSeitenvorlage sym:sw.CheckBox.20852.136 -UeberschriftWiederholen sym:sw.CheckBox.20852.40 -TabelleNichtTrennen sym:sw.CheckBox.20852.145 -MitFolgendemAbsatzZusammenhalten sym:sw.CheckBox.20852.144 -Seite sym:sw.RadioButton.20852.132 -Spalte sym:sw.RadioButton.20852.133 -Davor sym:sw.RadioButton.20852.134 -Danach sym:sw.RadioButton.20852.135 -Seitenvorlage sym:sw.ListBox.20852.137 -Seitennummer sym:sw.NumericField.20852.139 -ZeileTrennen sym:sw.TriStateBox.20852.146 -TextDirection sym:sw.ListBox.20852.44 -VerticalAlignment sym:sw.ListBox.20852.151 +Umbruch sym:sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGEBREAK +MitSeitenvorlage sym:sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGECOLL +UeberschriftWiederholen sym:sw:CheckBox:TP_TABLE_TEXTFLOW:CB_HEADLINE +TabelleNichtTrennen sym:sw:CheckBox:TP_TABLE_TEXTFLOW:CB_SPLIT +MitFolgendemAbsatzZusammenhalten sym:sw:CheckBox:TP_TABLE_TEXTFLOW:CB_KEEP +Seite sym:sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKPAGE +Spalte sym:sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKCOLUMN +Davor sym:sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE +Danach sym:sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER +Seitenvorlage sym:sw:ListBox:TP_TABLE_TEXTFLOW:LB_PAGECOLL +Seitennummer sym:sw:NumericField:TP_TABLE_TEXTFLOW:NF_PAGENUM +ZeileTrennen sym:sw:TriStateBox:TP_TABLE_TEXTFLOW:CB_SPLIT_ROW +TextDirection sym:sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTDIRECTION +VerticalAlignment sym:sw:ListBox:TP_TABLE_TEXTFLOW:LB_VERTORIENT *TabTransparenz sym:CUI_HID_AREA_TRANSPARENCE -KeineTransparenz sym:cui.RadioButton.10054.8 -LineareTransparenz sym:cui.RadioButton.10054.9 -Transparenzverlauf sym:cui.RadioButton.10054.10 -MFLinTransparenz sym:cui.MetricField.10054.10 -TransparenzverlaufTyp sym:cui.ListBox.10054.3 -MFZentrumX sym:cui.MetricField.10054.4 -MFZentrumY sym:cui.MetricField.10054.5 -MFWinkel sym:cui.MetricField.10054.6 -MFRand sym:cui.MetricField.10054.7 -MFStartwert sym:cui.MetricField.10054.8 -MFEndwert sym:cui.MetricField.10054.9 +KeineTransparenz sym:cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_OFF +LineareTransparenz sym:cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_LINEAR +Transparenzverlauf sym:cui:RadioButton:RID_SVXPAGE_TRANSPARENCE:RBT_TRANS_GRADIENT +MFLinTransparenz sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRANSPARENT +TransparenzverlaufTyp sym:cui:ListBox:RID_SVXPAGE_TRANSPARENCE:LB_TRGR_GRADIENT_TYPES +MFZentrumX sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_X +MFZentrumY sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_CENTER_Y +MFWinkel sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_ANGLE +MFRand sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_BORDER +MFStartwert sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_START_VALUE +MFEndwert sym:cui:MetricField:RID_SVXPAGE_TRANSPARENCE:MTR_TRGR_END_VALUE *TabUmlauf sym:SW_HID_FRM_EXT -Kein sym:sw.ImageRadioButton.20849.2 -Links sym:sw.ImageRadioButton.20849.3 -Rechts sym:sw.ImageRadioButton.20849.4 -Parallel sym:sw.ImageRadioButton.20849.5 -Durchlauf sym:sw.ImageRadioButton.20849.6 -Dynamisch sym:sw.ImageRadioButton.20849.7 -AbstaendeLinks sym:sw.MetricField.20849.14 -AbstaendeRechts sym:sw.MetricField.20849.16 sw:MetricField:TP_FRM_EXT:ED_RIGHT_MARGIN -AbstaendeOben sym:sw.MetricField.20849.18 sw:MetricField:TP_FRM_EXT:ED_TOP_MARGIN -AbstaendeUnten sym:sw.MetricField.20849.19 sw:MetricField:TP_FRM_EXT:ED_BOTTOM_MARGIN -ErsterAbsatz sym:sw.CheckBox.20849.8 -ImHintergrund sym:sw.CheckBox.20849.22 -Kontur sym:sw.CheckBox.20849.23 -NurAussen sym:sw.CheckBox.20849.25 +Kein sym:sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP +Links sym:sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_LEFT +Rechts sym:sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_RIGHT +Parallel sym:sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_PARALLEL +Durchlauf sym:sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_THROUGH +Dynamisch sym:sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_IDEAL +AbstaendeLinks sym:sw:MetricField:TP_FRM_WRAP:ED_LEFT_MARGIN +AbstaendeRechts sym:sw:MetricField:TP_FRM_WRAP:ED_RIGHT_MARGIN sw:MetricField:TP_FRM_EXT:ED_RIGHT_MARGIN +AbstaendeOben sym:sw:MetricField:TP_FRM_WRAP:ED_TOP_MARGIN sw:MetricField:TP_FRM_EXT:ED_TOP_MARGIN +AbstaendeUnten sym:sw:MetricField:TP_FRM_WRAP:ED_BOTTOM_MARGIN sw:MetricField:TP_FRM_EXT:ED_BOTTOM_MARGIN +ErsterAbsatz sym:sw:CheckBox:TP_FRM_WRAP:CB_ANCHOR_ONLY +ImHintergrund sym:sw:CheckBox:TP_FRM_WRAP:CB_TRANSPARENT +Kontur sym:sw:CheckBox:TP_FRM_WRAP:CB_OUTLINE +NurAussen sym:sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE *TabUmrandung sym:CUI_HID_BORDER Vorgaben sym:CUI_HID_BORDER_CTL_PRESETS -Stil sym:cui.ListBox.10005.21 -StilFarbe sym:cui.ListBox.10005.22 +Stil sym:cui:ListBox:RID_SVXPAGE_BORDER:LB_LINESTYLE +StilFarbe sym:cui:ListBox:RID_SVXPAGE_BORDER:LB_LINECOLOR Position sym:CUI_HID_BORDER_CTL_SHADOWS -Groesse sym:cui.MetricField.10005.34 -SchattenFarbe sym:cui.ListBox.10005.36 +Groesse sym:cui:MetricField:RID_SVXPAGE_BORDER:ED_SHADOWSIZE +SchattenFarbe sym:cui:ListBox:RID_SVXPAGE_BORDER:LB_SHADOWCOLOR Zurueck sym:SFX2_HID_TABDLG_RESET_BTN Standard sym:SFX2_HID_TABDLG_STANDARD_BTN -Links sym:cui.MetricField.10005.52 -Rechts sym:cui.MetricField.10005.54 -Oben sym:cui.MetricField.10005.56 -Unten sym:cui.MetricField.10005.58 -Synchronisieren sym:cui.CheckBox.10005.59 +Links sym:cui:MetricField:RID_SVXPAGE_BORDER:MF_LEFT +Rechts sym:cui:MetricField:RID_SVXPAGE_BORDER:MF_RIGHT +Oben sym:cui:MetricField:RID_SVXPAGE_BORDER:MF_TOP +Unten sym:cui:MetricField:RID_SVXPAGE_BORDER:MF_BOTTOM +Synchronisieren sym:cui:CheckBox:RID_SVXPAGE_BORDER:CB_SYNC +TabUmrandungChart TabLinie *TabVariablen sym:SW_HID_FLD_VAR -Feldtyp sym:sw.ListBox.20866.27 -Auswahl sym:sw.ListBox.20866.29 -Formatliste sym:sw.ListBox.20866.36 -Zahlenformat sym:sw.ListBox.20866.35 -NameText sym:sw.Edit.20866.31 -Wert sym:sw.Edit.20866.33 -Hinweis sym:sw.Edit.20866.33 -Korrektur sym:sw.Edit.20866.33 -Formel sym:sw.Edit.20866.33 -Unsichtbar sym:sw.CheckBox.20866.40 +Feldtyp sym:sw:ListBox:TP_FLD_VAR:LB_VARTYPE +Auswahl sym:sw:ListBox:TP_FLD_VAR:LB_VARSELECTION +Formatliste sym:sw:ListBox:TP_FLD_VAR:LB_VARFORMAT +Zahlenformat sym:sw:ListBox:TP_FLD_VAR:LB_VARNUMFORMAT +NameText sym:sw:Edit:TP_FLD_VAR:ED_VARNAME +Wert sym:sw:Edit:TP_FLD_VAR:ED_VARVALUE +Hinweis sym:sw:Edit:TP_FLD_VAR:ED_VARVALUE +Korrektur sym:sw:Edit:TP_FLD_VAR:ED_VARVALUE +Formel sym:sw:Edit:TP_FLD_VAR:ED_VARVALUE +Unsichtbar sym:sw:CheckBox:TP_FLD_VAR:CB_VARINVISIBLE Uebernehmen sym:SW_HID_FLDVAR_APPLY Loeschen sym:SW_HID_FLDVAR_DELETE Einfuegen sym:SW_HID_FIELD_INSERT Schliessen sym:SW_HID_FIELD_CLOSE *TabVerbinder sym:CUI_HID_PAGE_CONNECTION -Linie1 sym:cui.MetricField.10191.1 -Linie2 sym:cui.MetricField.10191.2 -Linie3 sym:cui.MetricField.10191.3 -AnfangHorizontal sym:cui.MetricField.10191.4 -AnfangVertikal sym:cui.MetricField.10191.6 -EndeHorizontal sym:cui.MetricField.10191.5 -EndeVertikal sym:cui.MetricField.10191.7 -Typ sym:cui.ListBox.10191.1 +Linie1 sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_1 +Linie2 sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_2 +Linie3 sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_LINE_3 +AnfangHorizontal sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_1 +AnfangVertikal sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_1 +EndeHorizontal sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_HORZ_2 +EndeVertikal sym:cui:MetricField:RID_SVXPAGE_CONNECTION:MTR_FLD_VERT_2 +Typ sym:cui:ListBox:RID_SVXPAGE_CONNECTION:LB_TYPE *TabVerwalten sym:SFX2_HID_MANAGE_STYLES -VorlagenName sym:sfx.Edit.267.2 -Aktualisieren sym:sfx.CheckBox.267.12 -Folgevorlage sym:sfx.ListBox.267.4 -VerknuepftMit sym:sfx.ListBox.267.6 -Bereich sym:sfx.ListBox.267.8 -Enthaelt sym:sfx.MultiLineEdit.267.11 +VorlagenName sym:sfx2:Edit:TP_MANAGE_STYLES:ED_NAME +Aktualisieren sym:sfx2:CheckBox:TP_MANAGE_STYLES:CB_AUTO +Folgevorlage sym:sfx2:ListBox:TP_MANAGE_STYLES:LB_NEXT +VerknuepftMit sym:sfx2:ListBox:TP_MANAGE_STYLES:LB_BASE +Bereich sym:sfx2:ListBox:TP_MANAGE_STYLES:LB_REGION +Enthaelt sym:sfx2:MultiLineEdit:TP_MANAGE_STYLES:ED_DESC Zurueck sym:SFX2_HID_TABDLG_RESET_BTN Standard sym:SFX2_HID_TABDLG_STANDARD_BTN *TabVerzeichnisseVerzeichnis sym:SW_HID_TP_TOX_SELECT -VerzeichnisTyp sym:sw.ListBox.20890.2 -VerzeichnisTitel sym:sw.Edit.20890.15 -VerzeichnisGeschuetzt sym:sw.CheckBox.20890.3 -ErstellenFuer sym:sw.ListBox.20890.7 -AuswertenBis sym:sw.NumericField.20890.9 -ErzeugenAusGliederung sym:sw.CheckBox.20890.11 -ErzeugenAusVorlagen sym:sw.CheckBox.20890.13 -VorlagenAuswahl sym:sw.PushButton.20890.14 -ErzeugenAusMarkierungen sym:sw.CheckBox.20890.21 -ZusammenfassenGleicherEintraege sym:sw.CheckBox.20890.23 -ZusammenfassenMitEff sym:sw.CheckBox.20890.24 -ZusammenfassenMitStrich sym:sw.CheckBox.20890.33 -GrossKlein sym:sw.CheckBox.20890.25 -AutomatischGross sym:sw.CheckBox.20890.26 -EigenerEintrag sym:sw.CheckBox.20890.27 -Konkordanzdatei sym:sw.CheckBox.20890.28 -KonkordanzAuswahl sym:sw.MenuButton.20890.29 -Beschriftungen sym:sw.RadioButton.20890.19 -Objektnamen sym:sw.RadioButton.20890.20 -Kategorie sym:sw.ListBox.20890.106 -Anzeige sym:sw.ListBox.20890.108 -Vorlagen sym:sw.CheckBox.20890.13 -WelcheVorlage sym:sw.PushButton.20890.14 -Tabellen sym:sw.CheckBox.20890.114 -Textrahmen sym:sw.CheckBox.20890.115 -Grafiken sym:sw.CheckBox.20890.116 -OLEObjekte sym:sw.CheckBox.20890.17 -Ursprungskapitel sym:sw.CheckBox.20890.18 +VerzeichnisTyp sym:sw:ListBox:TP_TOX_SELECT:LB_TYPE +VerzeichnisTitel sym:sw:Edit:TP_TOX_SELECT:ED_TITLE +VerzeichnisGeschuetzt sym:sw:CheckBox:TP_TOX_SELECT:CB_READONLY +ErstellenFuer sym:sw:ListBox:TP_TOX_SELECT:LB_AREA +AuswertenBis sym:sw:NumericField:TP_TOX_SELECT:NF_LEVEL +ErzeugenAusGliederung sym:sw:CheckBox:TP_TOX_SELECT:CB_FROMHEADINGS +ErzeugenAusVorlagen sym:sw:CheckBox:TP_TOX_SELECT:CB_ADDSTYLES +VorlagenAuswahl sym:sw:PushButton:TP_TOX_SELECT:PB_ADDSTYLES +ErzeugenAusMarkierungen sym:sw:CheckBox:TP_TOX_SELECT:CB_TOXMARKS +ZusammenfassenGleicherEintraege sym:sw:CheckBox:TP_TOX_SELECT:CB_COLLECTSAME +ZusammenfassenMitEff sym:sw:CheckBox:TP_TOX_SELECT:CB_USEFF +ZusammenfassenMitStrich sym:sw:CheckBox:TP_TOX_SELECT:CB_USE_DASH +GrossKlein sym:sw:CheckBox:TP_TOX_SELECT:CB_CASESENSITIVE +AutomatischGross sym:sw:CheckBox:TP_TOX_SELECT:CB_INITIALCAPS +EigenerEintrag sym:sw:CheckBox:TP_TOX_SELECT:CB_KEYASENTRY +Konkordanzdatei sym:sw:CheckBox:TP_TOX_SELECT:CB_FROMFILE +KonkordanzAuswahl sym:sw:MenuButton:TP_TOX_SELECT:MB_AUTOMARK +Beschriftungen sym:sw:RadioButton:TP_TOX_SELECT:RB_FROMCAPTIONS +Objektnamen sym:sw:RadioButton:TP_TOX_SELECT:RB_FROMOBJECTNAMES +Kategorie sym:sw:ListBox:TP_TOX_SELECT:LB_CAPTIONSEQUENCE +Anzeige sym:sw:ListBox:TP_TOX_SELECT:LB_DISPLAYTYPE +Vorlagen sym:sw:CheckBox:TP_TOX_SELECT:CB_ADDSTYLES +WelcheVorlage sym:sw:PushButton:TP_TOX_SELECT:PB_ADDSTYLES +Tabellen sym:sw:CheckBox:TP_TOX_SELECT:CB_FROMTABLES +Textrahmen sym:sw:CheckBox:TP_TOX_SELECT:CB_FROMFRAMES +Grafiken sym:sw:CheckBox:TP_TOX_SELECT:CB_FROMGRAPHICS +OLEObjekte sym:sw:CheckBox:TP_TOX_SELECT:CB_FROMOLE +Ursprungskapitel sym:sw:CheckBox:TP_TOX_SELECT:CB_LEVELFROMCHAPTER ErzeugenAusObjekt sym:SW_HID_OLE_CHECKLB -EintraegeNumerieren sym:sw.CheckBox.20890.122 -Klammern sym:sw.ListBox.20890.124 -SortLanguage sym:sw.ListBox.20890.146 -SortKeyType sym:sw.ListBox.20890.148 +EintraegeNumerieren sym:sw:CheckBox:TP_TOX_SELECT:CB_SEQUENCE +Klammern sym:sw:ListBox:TP_TOX_SELECT:LB_BRACKET +SortLanguage sym:sw:ListBox:TP_TOX_SELECT:LB_LANGUAGE +SortKeyType sym:sw:ListBox:TP_TOX_SELECT:LB_SORTALG *TabVerzeichnisseEintraege sym:SW_HID_TP_TOX_ENTRY AuswahlEbene sym:SW_HID_INSERT_INDEX_ENTRY_LEVEL_LB -Kapitelnummer sym:sw.PushButton.20891.36 -Kapitelinfo sym:sw.PushButton.20891.38 -Eintragstext sym:sw.PushButton.20891.37 -Tabulator sym:sw.PushButton.20891.40 -Tabulatorposition sym:sw.MetricField.20891.52 -Seitennummer sym:sw.PushButton.20891.39 -Hyperlink sym:sw.PushButton.20891.41 -ZeichenvorlageBearbeiten sym:sw.PushButton.20891.44 -Zeichenvorlage sym:sw.ListBox.20891.48 -ZeichenvorlageAuswahl sym:sw.ListBox.20891.43 -ZeichenvorlageHaupteintraege sym:sw.ListBox.20891.57 -Fuellzeichen sym:sw.ComboBox.20891.46 -AlphabetischesTrennzeichen sym:sw.CheckBox.20891.58 -SchluesselKommasepariert sym:sw.CheckBox.20891.59 -AmRechtenRand sym:sw.CheckBox.20891.53 -PositionTabulatorRelativ sym:sw.CheckBox.20891.54 +Kapitelnummer sym:sw:PushButton:TP_TOX_ENTRY:PB_ENTRYNO +Kapitelinfo sym:sw:PushButton:TP_TOX_ENTRY:PB_CHAPTERINFO +Eintragstext sym:sw:PushButton:TP_TOX_ENTRY:PB_ENTRY +Tabulator sym:sw:PushButton:TP_TOX_ENTRY:PB_TAB +Tabulatorposition sym:sw:MetricField:TP_TOX_ENTRY:MF_TABPOS +Seitennummer sym:sw:PushButton:TP_TOX_ENTRY:PB_PAGENO +Hyperlink sym:sw:PushButton:TP_TOX_ENTRY:PB_HYPERLINK +ZeichenvorlageBearbeiten sym:sw:PushButton:TP_TOX_ENTRY:PB_EDITSTYLE +Zeichenvorlage sym:sw:ListBox:TP_TOX_ENTRY:LB_CHAPTERENTRY +ZeichenvorlageAuswahl sym:sw:ListBox:TP_TOX_ENTRY:LB_CHARSTYLE +ZeichenvorlageHaupteintraege sym:sw:ListBox:TP_TOX_ENTRY:LB_MAIN_ENTRY_STYLE +Fuellzeichen sym:sw:ComboBox:TP_TOX_ENTRY:CB_FILLCHAR +AlphabetischesTrennzeichen sym:sw:CheckBox:TP_TOX_ENTRY:CB_ALPHADELIM +SchluesselKommasepariert sym:sw:CheckBox:TP_TOX_ENTRY:CB_COMMASEPARATED +AmRechtenRand sym:sw:CheckBox:TP_TOX_ENTRY:CB_AUTORIGHT +PositionTabulatorRelativ sym:sw:CheckBox:TP_TOX_ENTRY:CB_RELTOSTYLE Aufbau sym:SW_HID_TOKEN_WINDOW AufbauText sym:SW_HID_TOX_ENTRY_EDIT AufbauAuswahl sym:SW_HID_TOX_ENTRY_BUTTON -AufbauEinfuegen sym:sw.PushButton.20891.120 -AufbauEntfernen sym:sw.PushButton.20891.121 +AufbauEinfuegen sym:sw:PushButton:TP_TOX_ENTRY:PB_AUTHINSERT +AufbauEntfernen sym:sw:PushButton:TP_TOX_ENTRY:PB_AUTHREMOVE *TabVerzeichnisseVorlagen sym:SW_HID_TOX_STYLES_PAGE -ZuordnungStufen sym:sw.ListBox.20892.29 -ZuordnungAbsatzvorlagen sym:sw.ListBox.20892.31 -Standard sym:sw.PushButton.20892.26 -Zuordnen sym:sw.ImageButton.20892.32 -Bearbeiten sym:sw.PushButton.20892.40 +ZuordnungStufen sym:sw:ListBox:TP_TOX_STYLES:LB_LEVEL +ZuordnungAbsatzvorlagen sym:sw:ListBox:TP_TOX_STYLES:LB_PARALAY +Standard sym:sw:PushButton:TP_TOX_STYLES:BT_STD +Zuordnen sym:sw:ImageButton:TP_TOX_STYLES:BT_ASSIGN +Bearbeiten sym:sw:PushButton:TP_TOX_STYLES:BT_EDIT_STYLE *TabVisitenkarten sym:SW_HID_TP_VISITING_CARDS Inhalt sym:SW_HID_BUSINESS_CARD_CONTENT -WelcherAutotext sym:sw.ListBox.20893.5 +WelcherAutotext sym:sw:ListBox:TP_VISITING_CARDS:LB_AUTO_TEXT_GROUP -*TabWerte sym:sc.TabPage.696 -Zulassen sym:sc.ListBox.696.2 -LeerzellenZulassen sym:sc.CheckBox.696.3 -Daten sym:sc.ListBox.696.5 -Wert sym:sc.Edit.696.7 -Minimum sym:sc.Edit.696.7 -Maximum sym:sc.Edit.696.9 -ShowSelectionList sym:sc.CheckBox.696.27 -ListSortEntries sym:sc.CheckBox.696.28 -CriteriaListEntries sym:sc.MultiLineEdit.696.29 -SourceShrink sym:sc.ImageButton.696.88 +*TabWerte sym:sc:TabPage:TP_VALIDATION_VALUES +Zulassen sym:sc:ListBox:TP_VALIDATION_VALUES:LB_ALLOW +LeerzellenZulassen sym:sc:CheckBox:TP_VALIDATION_VALUES:TSB_ALLOW_BLANKS +Daten sym:sc:ListBox:TP_VALIDATION_VALUES:LB_VALUE +Wert sym:sc:Edit:TP_VALIDATION_VALUES:EDT_MIN +Minimum sym:sc:Edit:TP_VALIDATION_VALUES:EDT_MIN +Maximum sym:sc:Edit:TP_VALIDATION_VALUES:EDT_MAX +ShowSelectionList sym:sc:CheckBox:TP_VALIDATION_VALUES:CB_SHOWLIST +ListSortEntries sym:sc:CheckBox:TP_VALIDATION_VALUES:CB_SORTLIST +CriteriaListEntries sym:sc:MultiLineEdit:TP_VALIDATION_VALUES:EDT_LIST +SourceShrink sym:sc:ImageButton:TP_VALIDATION_VALUES:RB_VALIDITY_REF ValidityReset sym:SFX2_HID_TABDLG_RESET_BTN *TabWortergaenzung sym:CUI_HID_OFAPAGE_AUTOCOMPLETE_OPTIONS -WoerterErgaenzen sym:cui.CheckBox.17019.121 -VorschlaegeSammeln sym:cui.CheckBox.17019.122 -AlsTipphilfe sym:cui.CheckBox.17019.125 -MinWortlaenge sym:cui.NumericField.17019.128 -MaxEintraege sym:cui.NumericField.17019.129 -AnnehmenMit sym:cui.ListBox.17019.131 -GesammelteWorte sym:cui.MultiListBox.17019.132 -EintragLoeschen sym:cui.PushButton.17019.133 -AppendSpace sym:cui.CheckBox.17019.123 -KeepList sym:cui.CheckBox.17019.124 +WoerterErgaenzen sym:cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_ACTIV +VorschlaegeSammeln sym:cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_COLLECT +AlsTipphilfe sym:cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_AS_TIP +MinWortlaenge sym:cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MIN_WORDLEN +MaxEintraege sym:cui:NumericField:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:NF_MAX_ENTRIES +AnnehmenMit sym:cui:ListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:DCB_EXPAND_KEY +GesammelteWorte sym:cui:MultiListBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:LB_ENTRIES +EintragLoeschen sym:cui:PushButton:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:PB_ENTRIES +AppendSpace sym:cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_APPEND_SPACE +KeepList sym:cui:CheckBox:RID_OFAPAGE_AUTOCOMPLETE_OPTIONS:CB_REMOVE_LIST *TabZahlen sym:CUI_HID_NUMBERFORMAT -Kategorie sym:cui.ListBox.10041.9 +Kategorie sym:cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CATEGORY ZahlenFormat sym:CUI_HID_NUMBERFORMAT_LB_FORMAT -Sprache sym:cui.ListBox.10041.13 +Sprache sym:cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_LANGUAGE FormatPreview sym:CUI_HID_NUMBERFORMAT_WND_NUMBER_PREVIEW -FormatCode sym:cui.Edit.10041.14 -FuehrendeNullen sym:cui.NumericField.10041.24 -Nachkommastellen sym:cui.NumericField.10041.22 -NegativInRot sym:cui.CheckBox.10041.25 -Tausenderpunkt sym:cui.CheckBox.10041.26 +FormatCode sym:cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_FORMAT +FuehrendeNullen sym:cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_LEADZEROES +Nachkommastellen sym:cui:NumericField:RID_SVXPAGE_NUMBERFORMAT:ED_DECIMALS +NegativInRot sym:cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_NEGRED +Tausenderpunkt sym:cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:BTN_THOUSAND PBHinzufuegen sym:CUI_HID_NUMBERFORMAT_TBI_ADD PBEntfernen sym:CUI_HID_NUMBERFORMAT_TBI_REMOVE PBInfo sym:CUI_HID_NUMBERFORMAT_TBI_INFO -Kommentar sym:cui.Edit.10041.28 +Kommentar sym:cui:Edit:RID_SVXPAGE_NUMBERFORMAT:ED_COMMENT Zurueck sym:SFX2_HID_TABDLG_RESET_BTN -FormatSprache sym:cui.ListBox.10041.33 +FormatSprache sym:cui:ListBox:RID_SVXPAGE_NUMBERFORMAT:LB_CURRENCY Standard sym:SFX2_HID_TABDLG_STANDARD_BTN -Standardformat sym:cui.CheckBox.10041.34 +Standardformat sym:cui:CheckBox:RID_SVXPAGE_NUMBERFORMAT:CB_SOURCEFORMAT *TabZeilennumerierung sym:SW_HID_LINENUMBERING -Einschalten sym:sw.CheckBox.20875.1 -Vorlage sym:sw.ListBox.20875.3 -Format sym:sw.ListBox.20875.5 -Position sym:sw.ListBox.20875.7 -Abstand sym:sw.MetricField.20875.9 -Intervall sym:sw.NumericField.20875.11 -TeilerText sym:sw.Edit.20875.15 -Alle sym:sw.NumericField.20875.17 -Leerzeilen sym:sw.CheckBox.20875.20 -ZeilenInTextrahmen sym:sw.CheckBox.20875.21 +Einschalten sym:sw:CheckBox:TP_LINENUMBERING:CB_NUMBERING_ON +Vorlage sym:sw:ListBox:TP_LINENUMBERING:LB_CHAR_STYLE +Format sym:sw:ListBox:TP_LINENUMBERING:LB_FORMAT +Position sym:sw:ListBox:TP_LINENUMBERING:LB_POS +Abstand sym:sw:MetricField:TP_LINENUMBERING:MF_OFFSET +Intervall sym:sw:NumericField:TP_LINENUMBERING:NF_NUM_INVERVAL +TeilerText sym:sw:Edit:TP_LINENUMBERING:ED_DIVISOR +Alle sym:sw:NumericField:TP_LINENUMBERING:NF_DIV_INTERVAL +Leerzeilen sym:sw:CheckBox:TP_LINENUMBERING:CB_COUNT_EMPTYLINES +ZeilenInTextrahmen sym:sw:CheckBox:TP_LINENUMBERING:CB_COUNT_FRAMELINES *TabZellschutz sym:SC_HID_SCPAGE_PROTECTION -Gesperrt sym:sc.TriStateBox.25607.1 -AllesAusblenden sym:sc.TriStateBox.25607.3 -FormelAusblenden sym:sc.TriStateBox.25607.2 -FuerAusdruckAusblenden sym:sc.TriStateBox.25607.6 +Gesperrt sym:sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_PROTECTED +AllesAusblenden sym:sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_ALL +FormelAusblenden sym:sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_FORMULAR +FuerAusdruckAusblenden sym:sc:TriStateBox:RID_SCPAGE_PROTECTION:BTN_HIDE_PRINT Zurueck sym:SFX2_HID_TABDLG_RESET_BTN Standard sym:SFX2_HID_TABDLG_STANDARD_BTN *TabZuschneiden sym:CUI_HID_SVXPAGE_GRFCROP -Links sym:cui.MetricField.10238.17 -Rechts sym:cui.MetricField.10238.18 -Oben sym:cui.MetricField.10238.19 -Unten sym:cui.MetricField.10238.14 -GroesseBeibehalten sym:cui.RadioButton.10238.23 -MassstabBeibehalten sym:cui.RadioButton.10238.24 -GroesseBreite sym:cui.MetricField.10238.20 -GroesseHoehe sym:cui.MetricField.10238.15 -MassstabBreite sym:cui.MetricField.10238.21 -MassstabHoehe sym:cui.MetricField.10238.16 -Originalgroesse sym:cui.PushButton.10238.22 +Links sym:cui:MetricField:RID_SVXPAGE_GRFCROP:MF_LEFT +Rechts sym:cui:MetricField:RID_SVXPAGE_GRFCROP:MF_RIGHT +Oben sym:cui:MetricField:RID_SVXPAGE_GRFCROP:MF_TOP +Unten sym:cui:MetricField:RID_SVXPAGE_GRFCROP:MF_BOTTOM +GroesseBeibehalten sym:cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_SIZECONST +MassstabBeibehalten sym:cui:RadioButton:RID_SVXPAGE_GRFCROP:RB_ZOOMCONST +GroesseBreite sym:cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTH +GroesseHoehe sym:cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHT +MassstabBreite sym:cui:MetricField:RID_SVXPAGE_GRFCROP:MF_WIDTHZOOM +MassstabHoehe sym:cui:MetricField:RID_SVXPAGE_GRFCROP:MF_HEIGHTZOOM +Originalgroesse sym:cui:PushButton:RID_SVXPAGE_GRFCROP:PB_ORGSIZE *TabZusaetze sym:SW_HID_FRM_ADD -ObjektName sym:sw.Edit.20851.111 -Alternativtext sym:sw.Edit.20851.113 -InhaltSchuetzen sym:sw.CheckBox.20851.119 -PositionSchuetzen sym:sw.CheckBox.20851.120 -GroesseSchuetzen sym:sw.CheckBox.20851.121 -Drucken sym:sw.CheckBox.20851.124 -Editierbar sym:sw.CheckBox.20851.123 -PreviousLink sym:sw.ListBox.20851.115 -NextLink sym:sw.ListBox.20851.117 -TextDirection sym:sw.ListBox.20851.128 +ObjektName sym:sw:Edit:TP_FRM_ADD:ED_NAME +Alternativtext sym:sw:Edit:TP_FRM_ADD:ED_ALT_NAME +InhaltSchuetzen sym:sw:CheckBox:TP_FRM_ADD:CB_PROTECT_CONTENT +PositionSchuetzen sym:sw:CheckBox:TP_FRM_ADD:CB_PROTECT_FRAME +GroesseSchuetzen sym:sw:CheckBox:TP_FRM_ADD:CB_PROTECT_SIZE +Drucken sym:sw:CheckBox:TP_FRM_ADD:CB_PRINT_FRAME +Editierbar sym:sw:CheckBox:TP_FRM_ADD:CB_EDIT_IN_READONLY +PreviousLink sym:sw:ListBox:TP_FRM_ADD:LB_PREV +NextLink sym:sw:ListBox:TP_FRM_ADD:LB_NEXT +TextDirection sym:sw:ListBox:TP_FRM_ADD:LB_TEXTFLOW +TabZusaetzeEtiketten TabDruckerEtiketten -- cgit From 6f52253a00166629e77067f75e2d1f02834fbfba Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 11 Oct 2010 17:35:46 +0200 Subject: CWS changehid: remove some superfluous HIDs; adjust some to necessary changes in the code --- testautomation/global/win/dial_d_h.win | 2 +- testautomation/global/win/dial_i_o.win | 2 +- testautomation/global/win/dokument.win | 2 -- testautomation/global/win/edia_a_c.win | 7 ------- testautomation/global/win/edia_d_h.win | 6 +----- testautomation/global/win/etoolbox.win | 2 +- testautomation/global/win/spadmin.win | 4 ++-- testautomation/global/win/sys_dial.win | 27 +++++++++++---------------- 8 files changed, 17 insertions(+), 35 deletions(-) diff --git a/testautomation/global/win/dial_d_h.win b/testautomation/global/win/dial_d_h.win index 96c2d7a101f1..6a80e4209cbc 100644 --- a/testautomation/global/win/dial_d_h.win +++ b/testautomation/global/win/dial_d_h.win @@ -422,7 +422,7 @@ Durchsuchen sym:sw:PushButton:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR Fussnote sym:sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_FTN Endnote sym:sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE -*Gallerybeamer .uno:Beamer +*Gallerybeamer sym:SVX_HID_GALLERY_BROWSER Anzeige sym:SVX_HID_GALLERY_WINDOW *Gestalter .uno:DesignerDialog diff --git a/testautomation/global/win/dial_i_o.win b/testautomation/global/win/dial_i_o.win index a009dc2452a9..0ab633e402c4 100644 --- a/testautomation/global/win/dial_i_o.win +++ b/testautomation/global/win/dial_i_o.win @@ -312,7 +312,7 @@ ZugeordnetZuButton sym:sc:ImageButton:RID_SCDLG_NAMES:RB_ASSIGN *NavigationsFenster sym:SW_HID_INSERT_CTRL Auswahl sym:SW_HID_NAVI_VS -*Navigator .uno:Navigator +*Navigator sym:SFX2_HID_NAVIGATOR_WINDOW *NavigatorCalc sym:SC_HID_SC_NAVIGATOR NavigatorToolboxCalc sym:SC_HID_SC_NAVIPI_TOOLBOX diff --git a/testautomation/global/win/dokument.win b/testautomation/global/win/dokument.win index 63f5ecca924b..81b8775a085f 100644 --- a/testautomation/global/win/dokument.win +++ b/testautomation/global/win/dokument.win @@ -5,7 +5,6 @@ *DokumentCalc sym:SC_HID_SC_WIN_GRIDWIN *DokumentDraw sym:SD_HID_SDGRAPHICVIEWSHELL sym:SD_HID_SD_WIN_DOCUMENT *DokumentImpress sym:SD_HID_SDDRAWVIEWSHELL sym:SD_HID_SD_WIN_DOCUMENT -*DokumentImpressDiatisch SD_IF_SDSLIDEVIEWSHELL *DokumentImpressGliederungsmodus sym:SD_HID_SDOUTLINEVIEWSHELL *DokumentImpressNotizen .uno:NotesMode *DokumentImpressHandzettel .uno:HandoutMode @@ -30,7 +29,6 @@ Kommandos sym:STARMATH_HID_SMA_COMMAND_WIN_EDIT *DocumentCalc sym:SC_HID_SC_WIN_GRIDWIN *DocumentDraw sym:SD_HID_SDGRAPHICVIEWSHELL sym:SD_HID_SD_WIN_DOCUMENT *DocumentImpress sym:SD_HID_SDDRAWVIEWSHELL sym:SD_HID_SD_WIN_DOCUMENT -*DocumentImpressSlideView SD_IF_SDSLIDEVIEWSHELL *DocumentImpressOutlineView sym:SD_HID_SDOUTLINEVIEWSHELL *DocumentImpressNotesView .uno:NotesMode *DocumentImpressHandoutView .uno:HandoutMode diff --git a/testautomation/global/win/edia_a_c.win b/testautomation/global/win/edia_a_c.win index 638c1058ec1d..7371d9d629fb 100644 --- a/testautomation/global/win/edia_a_c.win +++ b/testautomation/global/win/edia_a_c.win @@ -168,13 +168,6 @@ TextPath sym:WIZARDS_HID_FAXWIZ_TXTPATH CreateFax sym:WIZARDS_HID_OPTCREATEFAX MakeChanges sym:WIZARDS_HID_OPTMAKECHANGES UseAddressDatabase sym:WIZARDS_HID_FILETEMPLATEPATH -BusinessFax RID_TOOLBOX_INSERT -PageDesignBusiness RID_TOOLBOX_INSCELLS -PersonalFax RID_TOOLBOX_INSOBJ -MailView HID_INTERFACE_SFXMAILVIEW -ReturnAddressUseUserData HID_INTERFACE_SFXFRAMESETVIEW -NewReturnAddress HID_INTERFACE_SFXFRAMESETSOURCEVIEW -Street HID_INTERFACE_SFXHELP_VIEWSH SaveAsButton sym:WIZARDS_HID_FAXWIZ_CMDPATH BackButton sym:WIZARDS_HID_FAXWIZARD_BACK NextButton sym:WIZARDS_HID_FAXWIZARD_NEXT diff --git a/testautomation/global/win/edia_d_h.win b/testautomation/global/win/edia_d_h.win index 78333f02ebff..b781c636da3a 100644 --- a/testautomation/global/win/edia_d_h.win +++ b/testautomation/global/win/edia_d_h.win @@ -169,10 +169,6 @@ SelectAFontworkStyle sym:SVX_HID_CTL_FONTWORK_FAVORITES *FontworkCharacterSpacingCustom sym:svx:ModalDialog:RID_SVX_MDLG_FONTWORK_CHARSPACING Value sym:svx:MetricField:RID_SVX_MDLG_FONTWORK_CHARSPACING:MF_VALUE -*FontWorkAlignment FontWork1TBO - -*FontWorkCharacterSpacing FontWork2TBO - *FormatColumn sym:SW_HID_FORMAT_COLUMN ApplyTo sym:sw:ListBox:DLG_COLUMN:LB_APPLY_TO Columns sym:sw:NumericField:TP_COLUMN:ED_NUMBER @@ -446,7 +442,7 @@ Browse sym:UUI_HID_LOGIN_DLG_BROWSE Account sym:UUI_HID_LOGIN_DLG_ACCOUNT UseSystemCredentials sym:UUI_HID_LOGIN_DLG_USE_SYSTEM_CREDENTIALS -*Gallery .uno:Gallery +*Gallery sym:SVX_HID_GALLERY_BROWSER NewTheme sym:SVX_HID_GALLERY_NEWTHEME 'NewThemeName NEW_TITLE_FOR_GALLERY_THEME_EDITFIELD Gallerys sym:SVX_HID_GALLERY_THEMELIST diff --git a/testautomation/global/win/etoolbox.win b/testautomation/global/win/etoolbox.win index 0e045925d403..e32938b1c44e 100644 --- a/testautomation/global/win/etoolbox.win +++ b/testautomation/global/win/etoolbox.win @@ -27,7 +27,7 @@ PrintButton sym:SFX2_HID_HELP_TOOLBOXITEM_PRINT SetBookmarks sym:SFX2_HID_HELP_TOOLBOXITEM_BOOKMARKS DisplayHelpAtStartUp sym:SFX2_HID_HELP_ONSTARTUP_BOX -*TB_MacroControls HID_BASICIDE_CONTROLS +*TB_MacroControls sym:HID_BASICIDE_CONTROLS CommandButton .uno:InsertPushbutton CheckBox .uno:Checkbox Label .uno:InsertFixedText diff --git a/testautomation/global/win/spadmin.win b/testautomation/global/win/spadmin.win index 9ce75bf11a49..09636f210f70 100644 --- a/testautomation/global/win/spadmin.win +++ b/testautomation/global/win/spadmin.win @@ -16,13 +16,13 @@ PBFontPath sym:padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_FROM CBCreateSoftlinks sym:padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_LINKONLY *FilePicker sym:SVT_HID_EXPLORERDLG_FILE -EFFileName sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX +EFFileName sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX LBFileList sym:fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE PBSelect sym:fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN PBUpOneLevel sym:fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP PBNewDir sym:fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER MBDefaultDir sym:fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD -TLBStandard sym:SFX2_HID_FILEDLG_STANDARD +TLBStandard sym:SVT_HID_FILEDLG_STANDARD *SPPrinterWizard sym:padmin:ModalDialog:RID_ADD_PRINTER_DIALOG TabPWDeviceSelector sym:padmin:TabPage:RID_ADDP_PAGE_CHOOSEDEV diff --git a/testautomation/global/win/sys_dial.win b/testautomation/global/win/sys_dial.win index e06b0a6b77ff..b63417e56b9f 100644 --- a/testautomation/global/win/sys_dial.win +++ b/testautomation/global/win/sys_dial.win @@ -11,25 +11,25 @@ Eigenschaften sym:svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES UebergeordneterOrdner sym:fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP NeuerOrdner sym:fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER Standard sym:fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD -DateiAuswahl sym:SFX2_HID_FILEDLG_STANDARD -Dateiname sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX +DateiAuswahl sym:SVT_HID_FILEDLG_STANDARD +Dateiname sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX Dateityp sym:fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE Oeffnen sym:fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN Auswaehlen sym:fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN +GrafikEinfuegenDlg GeneralFileDialog -Pfad sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX sym:SFX2_HID_FILEDLG_PATH_FILENAME +Pfad sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX sym:SFX2_HID_FILEDLG_PATH_FILENAME Stil sym:SVT_HID_FILEOPEN_IMAGE_TEMPLATE -Verknuepfen sym:SFX2_HID_FILEDLG_LINK_CB HID_IMPGRF_CB_LINK -Vorschau sym:SFX2_HID_FILEDLG_PREVIEW_CB HID_IMPGRF_CB_PREVIEW -Link sym:SFX2_HID_FILEDLG_LINK_CB -Preview sym:SFX2_HID_FILEDLG_PREVIEW_CB +Verknuepfen sym:SVT_HID_FILEDLG_LINK_CB HID_IMPGRF_CB_LINK +Vorschau sym:SVT_HID_FILEDLG_PREVIEW_CB HID_IMPGRF_CB_PREVIEW +Link sym:SVT_HID_FILEDLG_LINK_CB +Preview sym:SVT_HID_FILEDLG_PREVIEW_CB +OeffnenDlg GeneralFileDialog -Pfad sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX sym:SFX2_HID_FILEDLG_PATH_FILENAME +Pfad sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX sym:SFX2_HID_FILEDLG_PATH_FILENAME Version sym:SVT_HID_FILEOPEN_VERSION NurLesen sym:SVT_HID_FILEOPEN_READONLY -Einfuegen sym:SFX2_HID_FILEDLG_INSERT_BTN +Einfuegen sym:SVT_HID_FILEDLG_INSERT_BTN Play sym:SVT_HID_FILESAVE_DOPLAY +KonkordanzdateiOeffnen GeneralFileDialog @@ -63,8 +63,8 @@ Selektion sym:SVT_HID_FILESAVE_SELECTION UebergeordneterOrdner sym:fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP NeuerOrdner sym:fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER Standard sym:fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD -DateiAuswahl sym:SFX2_HID_FILEDLG_STANDARD -Dateiname sym:SFX2_HID_FILEDLG_AUTOCOMPLETEBOX +DateiAuswahl sym:SVT_HID_FILEDLG_STANDARD +Dateiname sym:SVT_HID_FILEDLG_AUTOCOMPLETEBOX Dateityp sym:fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE Oeffnen sym:fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN NurLesen sym:fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_READONLY @@ -126,8 +126,3 @@ OrdnerName sym:fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_N ' **** *TranslationWindow sym:svtools:WorkWindow:TT_INLINE_TRANSLATION svtools:FloatingWindow:TT_INLINE_TRANSLATION -' **** specal longnames for bas test -' **** author marc.neumann@oracle.com -*MSC_Special_Dialog MSC_Super_ID -*MSC_Special_Dialog2 MSC_Super_ID2 -*MSC_Special_Dialog3 MSC_Super_ID3 -- cgit From e1b5342bdc0b933e334a24e91ad370b04f9f2f79 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 11 Oct 2010 17:56:12 +0200 Subject: CWS changehid: generate former auto hids into src files --- padmin/source/padialog.src | 64 ++++++++++++++++++++++ padmin/source/rtsetup.src | 38 +++++++++++++ svtools/bmpmaker/bmp.src | 8 +++ svtools/source/contnr/fileview.src | 4 ++ svtools/source/contnr/templwin.src | 2 + svtools/source/dialogs/addresstemplate.src | 5 ++ svtools/source/dialogs/colrdlg.src | 13 +++++ svtools/source/dialogs/printdlg.src | 16 ++++++ svtools/source/dialogs/prnsetup.src | 4 ++ svtools/source/filter.vcl/filter/exportdialog.src | 24 ++++++++ svtools/source/plugapp/testtool.src | 7 +++ .../source/productregistration/registrationdlg.src | 4 ++ svtools/workben/unodialog/roadmapskeleton.src | 5 ++ toolkit/workben/layout/sortdlg.src | 22 ++++++++ ucbhelper/workben/ucbexplorer/ucbexplorer.src | 2 + vcl/source/src/print.src | 28 ++++++++++ 16 files changed, 246 insertions(+) mode change 100755 => 100644 svtools/source/filter.vcl/filter/exportdialog.src diff --git a/padmin/source/padialog.src b/padmin/source/padialog.src index ab09d9155d1b..09ce29a2c682 100644 --- a/padmin/source/padialog.src +++ b/padmin/source/padialog.src @@ -29,6 +29,7 @@ ModalDialog RID_FONTIMPORT_DIALOG { + HelpID = "padmin:ModalDialog:RID_FONTIMPORT_DIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 230 , 185 ); @@ -37,6 +38,7 @@ ModalDialog RID_FONTIMPORT_DIALOG ListBox RID_FIMP_BOX_NEWFONTS { + HelpID = "padmin:ListBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_NEWFONTS"; Border = TRUE; Sort=TRUE; AutoHScroll = TRUE; @@ -58,18 +60,21 @@ ModalDialog RID_FONTIMPORT_DIALOG }; Edit RID_FIMP_EDT_FROM { + HelpID = "padmin:Edit:RID_FONTIMPORT_DIALOG:RID_FIMP_EDT_FROM"; Border = TRUE; Pos = MAP_APPFONT( 10, 97 ); Size = MAP_APPFONT( 130, 12 ); }; PushButton RID_FIMP_BTN_FROM { + HelpID = "padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_FROM"; Pos = MAP_APPFONT( 145, 97 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; }; CheckBox RID_FIMP_BOX_SUBDIRS { + HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_SUBDIRS"; Pos = MAP_APPFONT( 10, 115 ); Size = MAP_APPFONT( 145, 10 ); Text [ en-US ] = "Sea~rch Subdirectories"; @@ -83,6 +88,7 @@ ModalDialog RID_FONTIMPORT_DIALOG CheckBox RID_FIMP_BOX_LINKONLY { + HelpID = "padmin:CheckBox:RID_FONTIMPORT_DIALOG:RID_FIMP_BOX_LINKONLY"; Pos = MAP_APPFONT( 10, 140 ); Size = MAP_APPFONT( 145, 10 ); Text [ en-US ] = "Create ~soft links only"; @@ -100,6 +106,7 @@ ModalDialog RID_FONTIMPORT_DIALOG }; PushButton RID_FIMP_BTN_SELECTALL { + HelpID = "padmin:PushButton:RID_FONTIMPORT_DIALOG:RID_FIMP_BTN_SELECTALL"; Pos = MAP_APPFONT( 175, 44 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Select All"; @@ -146,6 +153,7 @@ ModalDialog RID_FONTIMPORT_DIALOG ModalDialog RID_PADIALOG { + HelpID = "padmin:ModalDialog:RID_PADIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 198 ) ; @@ -160,6 +168,7 @@ ModalDialog RID_PADIALOG }; CheckBox RID_PA_CB_CUPSUSAGE { + HelpID = "padmin:CheckBox:RID_PADIALOG:RID_PA_CB_CUPSUSAGE"; Pos = MAP_APPFONT( 12, 158 ); Size = MAP_APPFONT( 168, 8 ); Text [ en-US ] = "Disable CUPS Support"; @@ -186,6 +195,7 @@ ModalDialog RID_PADIALOG }; ListBox RID_PA_LB_DEV { + HelpID = "padmin:ListBox:RID_PADIALOG:RID_PA_LB_DEV"; Pos = MAP_APPFONT( 12, 15 ); Size = MAP_APPFONT( 168, 80 ); Border = TRUE; @@ -237,30 +247,35 @@ ModalDialog RID_PADIALOG }; PushButton RID_PA_BTN_CONF { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_CONF"; Pos = MAP_APPFONT( 190, 15 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "Properties..."; }; PushButton RID_PA_BTN_RENAME { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_RENAME"; Pos = MAP_APPFONT( 190, 32 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "R~ename..."; }; PushButton RID_PA_BTN_STD { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_STD"; Pos = MAP_APPFONT( 190, 49 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "~Default"; }; PushButton RID_PA_BTN_DEL { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_DEL"; Pos = MAP_APPFONT( 190, 66 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "Remo~ve..."; }; PushButton RID_PA_TESTPAGE { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_TESTPAGE"; Pos = MAP_APPFONT( 190, 83 ); Size = MAP_APPFONT( 60, 12 ); Text [ en-US ] = "Test ~Page"; @@ -268,12 +283,14 @@ ModalDialog RID_PADIALOG PushButton RID_PA_BTN_FONTS { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_FONTS"; Pos = MAP_APPFONT( 80, 181 ); Size = MAP_APPFONT( 70, 12 ); Text [ en-US ] = "Fon~ts..."; }; PushButton RID_PA_BTN_ADD { + HelpID = "padmin:PushButton:RID_PADIALOG:RID_PA_BTN_ADD"; Pos = MAP_APPFONT( 5, 181 ); Size = MAP_APPFONT( 70, 12 ); Text [ en-US ] = "New Printer..."; @@ -292,6 +309,7 @@ ModalDialog RID_PADIALOG ModalDialog RID_STRINGQUERYDLG { + HelpID = "padmin:ModalDialog:RID_STRINGQUERYDLG"; OutputSize = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 10 , 10 ) ; @@ -306,12 +324,14 @@ ModalDialog RID_STRINGQUERYDLG }; Edit RID_STRQRY_EDT_NEWNAME { + HelpID = "padmin:Edit:RID_STRINGQUERYDLG:RID_STRQRY_EDT_NEWNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 23 ) ; Size = MAP_APPFONT ( 130 , 12 ) ; }; ComboBox RID_STRQRY_BOX_NEWNAME { + HelpID = "padmin:ComboBox:RID_STRINGQUERYDLG:RID_STRQRY_BOX_NEWNAME"; Border = TRUE ; DropDown = TRUE; Pos = MAP_APPFONT ( 6 , 23 ) ; @@ -383,6 +403,7 @@ String RID_TXT_TESTPAGE_TIME ModalDialog RID_FONTNAMEDIALOG { + HelpID = "padmin:ModalDialog:RID_FONTNAMEDIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 255 , 110 ) ; @@ -397,24 +418,28 @@ ModalDialog RID_FONTNAMEDIALOG }; PushButton RID_FNTNM_BTN_RENAME { + HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_RENAME"; Pos = MAP_APPFONT( 196, 31 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "Re~name..."; }; PushButton RID_FNTNM_BTN_REMOVE { + HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_REMOVE"; Pos = MAP_APPFONT ( 196 , 48 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; Text [ en-US ] = "~Remove..."; }; PushButton RID_FNTNM_BTN_IMPORT { + HelpID = "padmin:PushButton:RID_FONTNAMEDIALOG:RID_FNTNM_BTN_IMPORT"; Pos = MAP_APPFONT ( 196 , 65 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; Text [ en-US ] = "~Add..."; }; ListBox RID_FNTNM_LB_FONTS { + HelpID = "padmin:ListBox:RID_FONTNAMEDIALOG:RID_FNTNM_LB_FONTS"; Border = TRUE ; Sort = TRUE ; AutoHScroll = TRUE; @@ -541,6 +566,7 @@ String RID_AFMERROR_BOX_TXT ModelessDialog RID_PROGRESS_DLG { + HelpID = "padmin:ModelessDialog:RID_PROGRESS_DLG"; OutputSize = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 10 , 10 ) ; @@ -586,6 +612,7 @@ String RID_OPERATION_CONVERTMETRIC ModalDialog RID_PPDIMPORT_DLG { + HelpID = "padmin:ModalDialog:RID_PPDIMPORT_DLG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 265 , 225 ) ; @@ -606,6 +633,7 @@ ModalDialog RID_PPDIMPORT_DLG }; ComboBox RID_PPDIMP_LB_PATH { + HelpID = "padmin:ComboBox:RID_PPDIMPORT_DLG:RID_PPDIMP_LB_PATH"; Dropdown = TRUE; Border = TRUE; Sort = TRUE; @@ -615,6 +643,7 @@ ModalDialog RID_PPDIMPORT_DLG }; PushButton RID_PPDIMP_BTN_SEARCH { + HelpID = "padmin:PushButton:RID_PPDIMPORT_DLG:RID_PPDIMP_BTN_SEARCH"; Pos = MAP_APPFONT( 145, 15 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "Browse..."; @@ -628,6 +657,7 @@ ModalDialog RID_PPDIMPORT_DLG }; MultiListBox RID_PPDIMP_LB_DRIVER { + HelpID = "padmin:MultiListBox:RID_PPDIMPORT_DLG:RID_PPDIMP_LB_DRIVER"; Border = TRUE; Sort = TRUE; SimpleMode = TRUE; @@ -723,6 +753,7 @@ String RID_TXT_PRINTERADDFAILED ModalDialog RID_ADD_PRINTER_DIALOG { + HelpID = "padmin:ModalDialog:RID_ADD_PRINTER_DIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 240 , 172 ) ; @@ -752,12 +783,14 @@ ModalDialog RID_ADD_PRINTER_DIALOG }; PushButton RID_ADDP_BTN_NEXT { + HelpID = "padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_NEXT"; Pos = MAP_APPFONT( 130, 155 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Next >>"; }; PushButton RID_ADDP_BTN_PREV { + HelpID = "padmin:PushButton:RID_ADD_PRINTER_DIALOG:RID_ADDP_BTN_PREV"; Pos = MAP_APPFONT( 75, 155 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "<< ~Back"; @@ -767,6 +800,7 @@ ModalDialog RID_ADD_PRINTER_DIALOG TabPage RID_ADDP_PAGE_CHOOSEDRIVER { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDRIVER"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -782,6 +816,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER }; ListBox RID_ADDP_CHDRV_BOX_DRIVER { + HelpID = "padmin:ListBox:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BOX_DRIVER"; Pos = MAP_APPFONT( 5, 15 ); Size = MAP_APPFONT( 175, 100 ); Border = TRUE; @@ -789,12 +824,14 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER }; PushButton RID_ADDP_CHDRV_BTN_ADD { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_ADD"; Pos = MAP_APPFONT( 185, 15 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Import..."; }; PushButton RID_ADDP_CHDRV_BTN_REMOVE { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_CHOOSEDRIVER:RID_ADDP_CHDRV_BTN_REMOVE"; Pos = MAP_APPFONT( 185, 32 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Delete"; @@ -807,6 +844,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDRIVER TabPage RID_ADDP_PAGE_CHOOSEDEV { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_CHOOSEDEV"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -822,24 +860,28 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV }; RadioButton RID_ADDP_CHDEV_BTN_PRINTER { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PRINTER"; Pos = MAP_APPFONT ( 40, 40 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "Add a ~printer"; }; RadioButton RID_ADDP_CHDEV_BTN_FAX { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_FAX"; Pos = MAP_APPFONT ( 40, 50 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "Connect a fa~x device"; }; RadioButton RID_ADDP_CHDEV_BTN_PDF { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_PDF"; Pos = MAP_APPFONT ( 40, 60 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "Connect a P~DF converter"; }; RadioButton RID_ADDP_CHDEV_BTN_OLD { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_CHOOSEDEV:RID_ADDP_CHDEV_BTN_OLD"; Pos = MAP_APPFONT ( 40, 70 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "~Import printers from a StarOffice installation"; @@ -848,6 +890,7 @@ TabPage RID_ADDP_PAGE_CHOOSEDEV TabPage RID_ADDP_PAGE_NAME { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_NAME"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -875,12 +918,14 @@ TabPage RID_ADDP_PAGE_NAME }; Edit RID_ADDP_NAME_EDT_NAME { + HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_NAME"; Pos = MAP_APPFONT( 40, 35 ); Size = MAP_APPFONT( 160, 12 ); Border = TRUE; }; Edit RID_ADDP_NAME_EDT_FAXNAME { + HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_FAXNAME"; Pos = MAP_APPFONT( 40, 35 ); Size = MAP_APPFONT( 160, 12 ); Border = TRUE; @@ -888,6 +933,7 @@ TabPage RID_ADDP_PAGE_NAME }; Edit RID_ADDP_NAME_EDT_PDFNAME { + HelpID = "padmin:Edit:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_EDT_PDFNAME"; Pos = MAP_APPFONT( 40, 35 ); Size = MAP_APPFONT( 160, 12 ); Border = TRUE; @@ -895,12 +941,14 @@ TabPage RID_ADDP_PAGE_NAME }; CheckBox RID_ADDP_NAME_BOX_DEFAULT { + HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_DEFAULT"; Pos = MAP_APPFONT( 40, 50 ); Size = MAP_APPFONT( 160, 12 ); Text [ en-US ] = "~Use as default printer"; }; CheckBox RID_ADDP_NAME_BOX_FAXSWALLOW { + HelpID = "padmin:CheckBox:RID_ADDP_PAGE_NAME:RID_ADDP_NAME_BOX_FAXSWALLOW"; Pos = MAP_APPFONT( 40, 50 ); Size = MAP_APPFONT( 160, 12 ); Text [ en-US ] = "Remo~ve fax number from output"; @@ -909,6 +957,7 @@ TabPage RID_ADDP_PAGE_NAME TabPage RID_ADDP_PAGE_COMMAND { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_COMMAND"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -925,12 +974,14 @@ TabPage RID_ADDP_PAGE_COMMAND }; ComboBox RID_ADDP_CMD_BOX_COMMAND { + HelpID = "padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_COMMAND"; Pos = MAP_APPFONT( 10, 30); Size = MAP_APPFONT( 220, 85 ); Border = TRUE; }; ComboBox RID_ADDP_CMD_BOX_PDFCOMMAND { + HelpID = "padmin:ComboBox:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BOX_PDFCOMMAND"; Pos = MAP_APPFONT( 10, 30); Size = MAP_APPFONT( 220, 60 ); Border = TRUE; @@ -943,18 +994,21 @@ TabPage RID_ADDP_PAGE_COMMAND }; Edit RID_ADDP_CMD_EDT_PDFDIR { + HelpID = "padmin:Edit:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_EDT_PDFDIR"; Border = TRUE; Pos = MAP_APPFONT( 10, 104 ); Size = MAP_APPFONT( 190, 12 ); }; PushButton RID_ADDP_CMD_BTN_PDFDIR { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_PDFDIR"; Pos = MAP_APPFONT( 205, 104 ); Size = MAP_APPFONT( 25, 12 ); Text = "~..."; }; PushButton RID_ADDP_CMD_BTN_HELP { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_COMMAND:RID_ADDP_CMD_BTN_HELP"; Pos = MAP_APPFONT( 180, 2 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Help"; @@ -971,6 +1025,7 @@ TabPage RID_ADDP_PAGE_COMMAND TabPage RID_ADDP_PAGE_OLDPRINTERS { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_OLDPRINTERS"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -987,12 +1042,14 @@ TabPage RID_ADDP_PAGE_OLDPRINTERS }; MultiListBox RID_ADDP_OLD_BOX_PRINTERS { + HelpID = "padmin:MultiListBox:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BOX_PRINTERS"; Pos = MAP_APPFONT( 10, 35 ); Size = MAP_APPFONT( 165, 80 ); Border = TRUE; }; PushButton RID_ADDP_OLD_BTN_SELECTALL { + HelpID = "padmin:PushButton:RID_ADDP_PAGE_OLDPRINTERS:RID_ADDP_OLD_BTN_SELECTALL"; Pos = MAP_APPFONT( 180, 35 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Select All"; @@ -1001,6 +1058,7 @@ TabPage RID_ADDP_PAGE_OLDPRINTERS TabPage RID_ADDP_PAGE_FAXDRIVER { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_FAXDRIVER"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -1017,12 +1075,14 @@ TabPage RID_ADDP_PAGE_FAXDRIVER }; RadioButton RID_ADDP_FAXDRV_BTN_DEFAULT { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_DEFAULT"; Pos = MAP_APPFONT( 40,40 ); Size = MAP_APPFONT( 160, 10 ); Text [ en-US ] = "T~he default driver"; }; RadioButton RID_ADDP_FAXDRV_BTN_SELECT { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_FAXDRIVER:RID_ADDP_FAXDRV_BTN_SELECT"; Pos = MAP_APPFONT( 40, 50 ); Size = MAP_APPFONT( 160,24 ); Text [ en-US ] = "A speci~fic driver, to adapt the format to another printer"; @@ -1031,6 +1091,7 @@ TabPage RID_ADDP_PAGE_FAXDRIVER TabPage RID_ADDP_PAGE_PDFDRIVER { + HelpID = "padmin:TabPage:RID_ADDP_PAGE_PDFDRIVER"; Hide = TRUE; Pos = MAP_APPFONT( 0, 30 ); Size = MAP_APPFONT( 240, 120 ); @@ -1047,18 +1108,21 @@ TabPage RID_ADDP_PAGE_PDFDRIVER }; RadioButton RID_ADDP_PDFDRV_BTN_DEFAULT { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_DEFAULT"; Pos = MAP_APPFONT( 40, 40 ); Size = MAP_APPFONT( 160, 10 ); Text [ en-US ] = "T~he default driver"; }; RadioButton RID_ADDP_PDFDRV_BTN_DIST { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_DIST"; Pos = MAP_APPFONT( 40,50 ); Size = MAP_APPFONT( 160, 10 ); Text [ en-US ] = "The Adobe D~istiller(tm) driver"; }; RadioButton RID_ADDP_PDFDRV_BTN_SELECT { + HelpID = "padmin:RadioButton:RID_ADDP_PAGE_PDFDRIVER:RID_ADDP_PDFDRV_BTN_SELECT"; Pos = MAP_APPFONT( 40, 60 ); Size = MAP_APPFONT( 160, 24 ); Text [ en-US ] = "A spec~ific driver, to adapt the format to another printer"; diff --git a/padmin/source/rtsetup.src b/padmin/source/rtsetup.src index e04374a72245..dbb4566a3a27 100644 --- a/padmin/source/rtsetup.src +++ b/padmin/source/rtsetup.src @@ -78,6 +78,7 @@ TabDialog RID_RTS_RTSDIALOG TabPage RID_RTS_PAPERPAGE { + HelpID = "padmin:TabPage:RID_RTS_PAPERPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); FixedText RID_RTS_PAPER_PAPER_TXT @@ -88,6 +89,7 @@ TabPage RID_RTS_PAPERPAGE }; ListBox RID_RTS_PAPER_PAPER_BOX { + HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_PAPER_BOX"; Border = TRUE; DropDown = TRUE; Pos = MAP_APPFONT( 115, 5 ); @@ -101,6 +103,7 @@ TabPage RID_RTS_PAPERPAGE }; ListBox RID_RTS_PAPER_ORIENTATION_BOX { + HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_ORIENTATION_BOX"; Border = TRUE; DropDown = TRUE; Pos = MAP_APPFONT( 115, 20 ); @@ -114,6 +117,7 @@ TabPage RID_RTS_PAPERPAGE }; ListBox RID_RTS_PAPER_DUPLEX_BOX { + HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_DUPLEX_BOX"; Border = TRUE; DropDown = TRUE; Pos = MAP_APPFONT( 115, 35 ); @@ -127,6 +131,7 @@ TabPage RID_RTS_PAPERPAGE }; ListBox RID_RTS_PAPER_SLOT_BOX { + HelpID = "padmin:ListBox:RID_RTS_PAPERPAGE:RID_RTS_PAPER_SLOT_BOX"; Border = TRUE; DropDown = TRUE; Pos = MAP_APPFONT( 115, 50 ); @@ -136,6 +141,7 @@ TabPage RID_RTS_PAPERPAGE TabPage RID_RTS_DEVICEPAGE { + HelpID = "padmin:TabPage:RID_RTS_DEVICEPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); @@ -156,6 +162,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_PPDKEY_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDKEY_BOX"; Border = TRUE; Pos = MAP_APPFONT( 5, 14 ); Size = MAP_APPFONT( 105, 111 ); @@ -168,6 +175,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_PPDVALUE_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_PPDVALUE_BOX"; Border = TRUE; Pos = MAP_APPFONT( 120, 14 ); Size = MAP_APPFONT( 105, 111 ); @@ -181,6 +189,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_LEVEL_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_LEVEL_BOX"; DropDown = TRUE; Pos = MAP_APPFONT( 120, 130 ); Size = MAP_APPFONT( 105, 200 ); @@ -193,6 +202,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_SPACE_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_SPACE_BOX"; DropDown = TRUE; Pos = MAP_APPFONT( 120, 145 ); Size = MAP_APPFONT( 105, 200 ); @@ -205,6 +215,7 @@ TabPage RID_RTS_DEVICEPAGE }; ListBox RID_RTS_DEVICE_DEPTH_BOX { + HelpID = "padmin:ListBox:RID_RTS_DEVICEPAGE:RID_RTS_DEVICE_DEPTH_BOX"; DropDown = TRUE; Pos = MAP_APPFONT( 120, 160 ); Size = MAP_APPFONT( 105, 200 ); @@ -218,11 +229,13 @@ TabPage RID_RTS_DEVICEPAGE TabPage RID_RTS_FONTSUBSTPAGE { + HelpID = "padmin:TabPage:RID_RTS_FONTSUBSTPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); CheckBox RID_RTS_FS_ENABLE_BTN { + HelpID = "padmin:CheckBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ENABLE_BTN"; Pos = MAP_APPFONT( 5, 5 ); Size = MAP_APPFONT( 180, 10 ); Text [ en-US ] = "~Enable font replacement"; @@ -236,6 +249,7 @@ TabPage RID_RTS_FONTSUBSTPAGE }; MultiListBox RID_RTS_FS_SUBST_BOX { + HelpID = "padmin:MultiListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_SUBST_BOX"; AutoHScroll = TRUE; Border = TRUE; Sort = TRUE; @@ -245,12 +259,14 @@ TabPage RID_RTS_FONTSUBSTPAGE }; PushButton RID_RTS_FS_ADD_BTN { + HelpID = "padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_ADD_BTN"; Pos = MAP_APPFONT( 5, 125 ); Size = MAP_APPFONT( 107, 12 ); Text [ en-US ] = "~Add"; }; PushButton RID_RTS_FS_REMOVE_BTN { + HelpID = "padmin:PushButton:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_REMOVE_BTN"; Pos = MAP_APPFONT( 117, 125 ); Size = MAP_APPFONT( 107, 12 ); Text [ en-US ] = "~Remove"; @@ -263,6 +279,7 @@ TabPage RID_RTS_FONTSUBSTPAGE }; ComboBox RID_RTS_FS_FROM_BOX { + HelpID = "padmin:ComboBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_FROM_BOX"; Border = TRUE; DropDown = TRUE; Sort = TRUE; @@ -277,6 +294,7 @@ TabPage RID_RTS_FONTSUBSTPAGE }; ListBox RID_RTS_FS_TO_BOX { + HelpID = "padmin:ListBox:RID_RTS_FONTSUBSTPAGE:RID_RTS_FS_TO_BOX"; Border = TRUE; DropDown = TRUE; Sort = TRUE; @@ -287,11 +305,13 @@ TabPage RID_RTS_FONTSUBSTPAGE TabPage RID_RTS_COMMANDPAGE { + HelpID = "padmin:TabPage:RID_RTS_COMMANDPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); ComboBox RID_RTS_CMD_CB_COMMANDS { + HelpID = "padmin:ComboBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_COMMANDS"; Border = TRUE ; Sort = TRUE ; Dropdown = TRUE; @@ -300,6 +320,7 @@ TabPage RID_RTS_COMMANDPAGE }; CheckBox RID_RTS_CMD_CB_EXTERNAL { + HelpID = "padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_CB_EXTERNAL"; Pos = MAP_APPFONT( 11, 95 ); Size = MAP_APPFONT( 220, 10 ); Text [ en-US ] = "~Use system print dialog, disable %PRODUCTNAME's print dialog"; @@ -313,6 +334,7 @@ TabPage RID_RTS_COMMANDPAGE }; ComboBox RIT_RTS_CMD_CB_QUICKCMD { + HelpID = "padmin:ComboBox:RID_RTS_COMMANDPAGE:RIT_RTS_CMD_CB_QUICKCMD"; Border = TRUE; Sort = TRUE; Dropdown = TRUE; @@ -340,6 +362,7 @@ TabPage RID_RTS_COMMANDPAGE ListBox RID_RTS_CMD_LB_CONFIGURE { + HelpID = "padmin:ListBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_LB_CONFIGURE"; DropDown = true; Border = true; Pos = MAP_APPFONT( 101, 56 ); @@ -354,6 +377,7 @@ TabPage RID_RTS_COMMANDPAGE CheckBox RID_RTS_CMD_BOX_SWALLOWFAXNO { + HelpID = "padmin:CheckBox:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BOX_SWALLOWFAXNO"; Pos = MAP_APPFONT( 11, 146 ); Size = MAP_APPFONT( 130, 8 ); Text [ en-US ] = "~Fax number will be removed from output"; @@ -366,12 +390,14 @@ TabPage RID_RTS_COMMANDPAGE }; Edit RID_RTS_CMD_EDT_PDFDIR { + HelpID = "padmin:Edit:RID_RTS_COMMANDPAGE:RID_RTS_CMD_EDT_PDFDIR"; Border = TRUE; Pos = MAP_APPFONT( 11, 155 ); Size = MAP_APPFONT( 130, 12 ); }; PushButton RID_RTS_CMD_BTN_PDFDIR { + HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_PDFDIR"; Pos = MAP_APPFONT( 146, 155 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; @@ -395,12 +421,14 @@ TabPage RID_RTS_COMMANDPAGE }; PushButton RID_RTS_CMD_BTN_HELP { + HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_HELP"; Pos = MAP_APPFONT( 170, 55 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Help"; }; PushButton RID_RTS_CMD_BTN_REMOVE { + HelpID = "padmin:PushButton:RID_RTS_COMMANDPAGE:RID_RTS_CMD_BTN_REMOVE"; Pos = MAP_APPFONT( 170, 72 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Remove"; @@ -421,6 +449,7 @@ TabPage RID_RTS_COMMANDPAGE TabPage RID_RTS_OTHERPAGE { + HelpID = "padmin:TabPage:RID_RTS_OTHERPAGE"; Hide = TRUE; Size = MAP_APPFONT( 230, 175 ); @@ -432,6 +461,7 @@ TabPage RID_RTS_OTHERPAGE }; MetricField RID_RTS_OTHER_LEFTMARGIN_BOX { + HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_LEFTMARGIN_BOX"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 5 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -448,6 +478,7 @@ TabPage RID_RTS_OTHERPAGE }; MetricField RID_RTS_OTHER_TOPMARGIN_BOX { + HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_TOPMARGIN_BOX"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 20 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -464,6 +495,7 @@ TabPage RID_RTS_OTHERPAGE }; MetricField RID_RTS_OTHER_RIGHTMARGIN_BOX { + HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_RIGHTMARGIN_BOX"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 35 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -480,6 +512,7 @@ TabPage RID_RTS_OTHERPAGE }; MetricField RID_RTS_OTHER_BOTTOMMARGIN_BOX { + HelpID = "padmin:MetricField:RID_RTS_OTHERPAGE:RID_RTS_OTHER_BOTTOMMARGIN_BOX"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 50 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -496,12 +529,14 @@ TabPage RID_RTS_OTHERPAGE }; Edit RID_RTS_OTHER_COMMENT_EDT { + HelpID = "padmin:Edit:RID_RTS_OTHERPAGE:RID_RTS_OTHER_COMMENT_EDT"; Border = TRUE ; Pos = MAP_APPFONT ( 5 , 75 ) ; Size = MAP_APPFONT ( 220 , 12 ) ; }; PushButton RID_RTS_OTHER_DEFAULT_BTN { + HelpID = "padmin:PushButton:RID_RTS_OTHERPAGE:RID_RTS_OTHER_DEFAULT_BTN"; Pos = MAP_APPFONT( 175, 5 ); Size = MAP_APPFONT( 50, 12 ); Text [ en-US ] = "~Default"; @@ -515,6 +550,7 @@ String RID_TXT_QUERYFAXNUMBER ModalDialog RID_RTS_PWDIALOG { + HelpID = "padmin:ModalDialog:RID_RTS_PWDIALOG"; Text [ en-US ] = "Authentication request"; OutputSize = TRUE ; SVLook = TRUE ; @@ -537,6 +573,7 @@ ModalDialog RID_RTS_PWDIALOG }; Edit RID_RTS_PWDIALOG_USER_EDT { + HelpID = "padmin:Edit:RID_RTS_PWDIALOG:RID_RTS_PWDIALOG_USER_EDT"; Pos = MAP_APPFONT( 70, 29 ); Size = MAP_APPFONT( 75, 12 ); Border = TRUE; @@ -549,6 +586,7 @@ ModalDialog RID_RTS_PWDIALOG }; Edit RID_RTS_PWDIALOG_PASS_EDT { + HelpID = "padmin:Edit:RID_RTS_PWDIALOG:RID_RTS_PWDIALOG_PASS_EDT"; Pos = MAP_APPFONT( 70, 44 ); Size = MAP_APPFONT( 75, 12 ); Border = TRUE; diff --git a/svtools/bmpmaker/bmp.src b/svtools/bmpmaker/bmp.src index 7431d2e335a4..30ff9488a805 100644 --- a/svtools/bmpmaker/bmp.src +++ b/svtools/bmpmaker/bmp.src @@ -27,6 +27,7 @@ #include "bmp.hrc" ModalDialog DLG_PATH { + HelpID = "svtools:ModalDialog:DLG_PATH"; OutputSize = TRUE; SVLook = TRUE; Size = MAP_APPFONT( 301, 104 ); @@ -54,36 +55,42 @@ ModalDialog DLG_PATH { Text = "Bitmap-Pfad:"; }; Edit EDT_SRS { + HelpID = "svtools:Edit:DLG_PATH:EDT_SRS"; Border = TRUE; Pos = MAP_APPFONT( 65, 14 ); Size = MAP_APPFONT( 160, 12 ); TabStop = TRUE; }; Edit EDT_RES { + HelpID = "svtools:Edit:DLG_PATH:EDT_RES"; Border = TRUE; Pos = MAP_APPFONT( 65, 29 ); Size = MAP_APPFONT( 160, 12 ); TabStop = TRUE; }; Edit EDT_OUT { + HelpID = "svtools:Edit:DLG_PATH:EDT_OUT"; Border = TRUE; Pos = MAP_APPFONT( 65, 44 ); Size = MAP_APPFONT( 160, 12 ); TabStop = TRUE; }; PushButton BTN_SRS { + HelpID = "svtools:PushButton:DLG_PATH:BTN_SRS"; Pos = MAP_APPFONT( 228, 14 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; TabStop = TRUE; }; PushButton BTN_RES { + HelpID = "svtools:PushButton:DLG_PATH:BTN_RES"; Pos = MAP_APPFONT( 228, 29 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; TabStop = TRUE; }; PushButton BTN_OUT { + HelpID = "svtools:PushButton:DLG_PATH:BTN_OUT"; Pos = MAP_APPFONT( 228, 44 ); Size = MAP_APPFONT( 15, 12 ); Text = "..."; @@ -106,6 +113,7 @@ ModalDialog DLG_PATH { Text = "Sprache"; }; ListBox LB_LANG { + HelpID = "svtools:ListBox:DLG_PATH:LB_LANG"; Border = TRUE; Pos = MAP_APPFONT( 12, 76 ); Size = MAP_APPFONT( 231, 70 ); diff --git a/svtools/source/contnr/fileview.src b/svtools/source/contnr/fileview.src index f40530c10347..bcb282f44615 100644 --- a/svtools/source/contnr/fileview.src +++ b/svtools/source/contnr/fileview.src @@ -110,6 +110,7 @@ Menu RID_FILEVIEW_CONTEXTMENU ModalDialog DLG_SVT_QUERYDELETE { + HelpID = "svtools:ModalDialog:DLG_SVT_QUERYDELETE"; SVLook = TRUE ; OutputSize = TRUE ; Moveable = TRUE ; @@ -142,6 +143,7 @@ ModalDialog DLG_SVT_QUERYDELETE PushButton BTN_YES { + HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_YES"; Pos = MAP_APPFONT ( 6 , 47 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -151,6 +153,7 @@ ModalDialog DLG_SVT_QUERYDELETE PushButton BTN_ALL { + HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_ALL"; Pos = MAP_APPFONT ( 59 , 47 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -160,6 +163,7 @@ ModalDialog DLG_SVT_QUERYDELETE PushButton BTN_NO { + HelpID = "svtools:PushButton:DLG_SVT_QUERYDELETE:BTN_NO"; Pos = MAP_APPFONT ( 112 , 47 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/svtools/source/contnr/templwin.src b/svtools/source/contnr/templwin.src index 048d052c18d8..45f9803539a1 100644 --- a/svtools/source/contnr/templwin.src +++ b/svtools/source/contnr/templwin.src @@ -289,12 +289,14 @@ ModalDialog DLG_DOCTEMPLATE }; PushButton BTN_DOCTEMPLATE_MANAGE { + HelpID = "svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_MANAGE"; Pos = MAP_APPFONT( 6, 230 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "Organi~ze..."; }; PushButton BTN_DOCTEMPLATE_EDIT { + HelpID = "svtools:PushButton:DLG_DOCTEMPLATE:BTN_DOCTEMPLATE_EDIT"; Pos = MAP_APPFONT( 59, 230 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "~Edit"; diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src index 0652dfb9d0f5..cbbb56d220f7 100644 --- a/svtools/source/dialogs/addresstemplate.src +++ b/svtools/source/dialogs/addresstemplate.src @@ -39,6 +39,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE { + HelpID = "svtools:ModalDialog:DLG_ADDRESSBOOKSOURCE"; SVLook = TRUE ; OutputSize = TRUE ; Size = MAP_APPFONT ( 300 , 88 + FIELD_ROW_HEIGHT * FIELD_PAIRS_VISIBLE ) ; @@ -64,6 +65,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE }; ComboBox CB_DATASOURCE { + HelpID = "svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_DATASOURCE"; SVLook = TRUE ; Pos = MAP_APPFONT ( 105, 13 ) ; Size = MAP_APPFONT ( 96, 55 ) ; @@ -73,6 +75,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE }; PushButton PB_ADMINISTATE_DATASOURCES { + HelpID = "svtools:PushButton:DLG_ADDRESSBOOKSOURCE:PB_ADMINISTATE_DATASOURCES"; Text [ en-US ] = "~Address Data Source..."; SVLook = TRUE ; Pos = MAP_APPFONT ( 204, 13 ) ; @@ -90,6 +93,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE }; ComboBox CB_TABLE { + HelpID = "svtools:ComboBox:DLG_ADDRESSBOOKSOURCE:CB_TABLE"; SVLook = TRUE ; Pos = MAP_APPFONT ( 105, 30 ) ; Size = MAP_APPFONT ( 96, 55 ) ; @@ -121,6 +125,7 @@ ModalDialog DLG_ADDRESSBOOKSOURCE }; \ ListBox LB_FIELD_BASE + row * 2 + column \ { \ + HelpID = "svtools:ListBox:DLG_ADDRESSBOOKSOURCE:LB_FIELD_BASE"; SVLook = TRUE; \ Pos = MAP_APPFONT ( 89 + column * 134, RSC_SP_CTRL_GROUP_Y + row * FIELD_ROW_HEIGHT ) ; \ Size = MAP_APPFONT ( 42 , 14 ) ; \ diff --git a/svtools/source/dialogs/colrdlg.src b/svtools/source/dialogs/colrdlg.src index ad9a5c1aa015..a93642b0bd05 100644 --- a/svtools/source/dialogs/colrdlg.src +++ b/svtools/source/dialogs/colrdlg.src @@ -29,6 +29,7 @@ #define DIFF 3 ModalDialog DLG_COLOR { + HelpID = "svtools:ModalDialog:DLG_COLOR"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 165 + DIFF ) ; @@ -93,6 +94,7 @@ ModalDialog DLG_COLOR }; MetricField NUM_CYAN { + HelpID = "svtools:MetricField:DLG_COLOR:NUM_CYAN"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 109 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -106,6 +108,7 @@ ModalDialog DLG_COLOR }; MetricField NUM_MAGENTA { + HelpID = "svtools:MetricField:DLG_COLOR:NUM_MAGENTA"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 122 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -119,6 +122,7 @@ ModalDialog DLG_COLOR }; MetricField NUM_YELLOW { + HelpID = "svtools:MetricField:DLG_COLOR:NUM_YELLOW"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 135 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -132,6 +136,7 @@ ModalDialog DLG_COLOR }; MetricField NUM_KEY { + HelpID = "svtools:MetricField:DLG_COLOR:NUM_KEY"; Border = TRUE ; Pos = MAP_APPFONT ( 42 , 148 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -163,6 +168,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_RED { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_RED"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 122 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -174,6 +180,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_GREEN { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_GREEN"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 135 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -185,6 +192,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_BLUE { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_BLUE"; Border = TRUE ; Pos = MAP_APPFONT ( 106 , 148 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -202,6 +210,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_HUE { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_HUE"; Border = TRUE ; Pos = MAP_APPFONT ( 171 , 122 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -219,6 +228,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_SATURATION { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_SATURATION"; Border = TRUE ; Pos = MAP_APPFONT ( 171 , 135 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -236,6 +246,7 @@ ModalDialog DLG_COLOR }; NumericField NUM_LUMINANCE { + HelpID = "svtools:NumericField:DLG_COLOR:NUM_LUMINANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 171 , 148 + DIFF ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -247,6 +258,7 @@ ModalDialog DLG_COLOR }; PushButton BTN_1 { + HelpID = "svtools:PushButton:DLG_COLOR:BTN_1"; Pos = MAP_APPFONT ( 80 , 109 ) ; Size = MAP_APPFONT ( 17 , 12 ) ; Text = "~<--" ; @@ -254,6 +266,7 @@ ModalDialog DLG_COLOR }; PushButton BTN_2 { + HelpID = "svtools:PushButton:DLG_COLOR:BTN_2"; Pos = MAP_APPFONT ( 100 , 109 ) ; Size = MAP_APPFONT ( 17 , 12 ) ; Text = "--~>" ; diff --git a/svtools/source/dialogs/printdlg.src b/svtools/source/dialogs/printdlg.src index 405accc63344..80c6e465d49a 100644 --- a/svtools/source/dialogs/printdlg.src +++ b/svtools/source/dialogs/printdlg.src @@ -31,6 +31,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG { + HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRINTDLG"; SVLook = TRUE ; OutputSize = TRUE ; Moveable = TRUE ; @@ -50,6 +51,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; ListBox LB_NAMES { + HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRINTDLG:LB_NAMES"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 13 ) ; Size = MAP_APPFONT ( 130 , 80 ) ; @@ -58,6 +60,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; PushButton BTN_PROPERTIES { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_PROPERTIES"; Pos = MAP_APPFONT ( 193 , 12 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Propert~ies..." ; @@ -114,12 +117,14 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; Edit EDT_FAXNO { + HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_FAXNO"; Border = TRUE; Pos = MAP_APPFONT ( 60 , 73 ); Size = MAP_APPFONT ( 188 , 12 ); }; CheckBox CBX_FILEPRINT { + HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_FILEPRINT"; Pos = MAP_APPFONT ( 12 , 73 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "Print to file" ; @@ -132,6 +137,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG /*!!! PushButton BTN_BROWSE { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_BROWSE"; Pos = MAP_APPFONT ( 234 , 75 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~..." ; @@ -146,18 +152,21 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; RadioButton RBT_ALL_SHEETS { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL_SHEETS"; Pos = MAP_APPFONT ( 12 , 102 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "All sheets" ; }; RadioButton RBT_SELECTED_SHEETS { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_SHEETS"; Pos = MAP_APPFONT ( 12 , 115 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Selected sheets" ; }; RadioButton RBT_SELECTED_CELLS { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTED_CELLS"; Pos = MAP_APPFONT ( 12 , 128 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Selected cells" ; @@ -170,24 +179,28 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; RadioButton RBT_ALL { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_ALL"; Pos = MAP_APPFONT ( 12 , 152 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "All pages" ; }; RadioButton RBT_PAGES { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_PAGES"; Pos = MAP_APPFONT ( 12 , 165 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "Pages" ; }; Edit EDT_PAGES { + HelpID = "svtools:Edit:DLG_SVT_PRNDLG_PRINTDLG:EDT_PAGES"; Border = TRUE ; Pos = MAP_APPFONT ( 65 , 164 ) ; Size = MAP_APPFONT ( 52 , 12 ) ; }; RadioButton RBT_SELECTION { + HelpID = "svtools:RadioButton:DLG_SVT_PRNDLG_PRINTDLG:RBT_SELECTION"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 179 ) ; Size = MAP_APPFONT ( 105 , 10 ) ; @@ -213,6 +226,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; NumericField NUM_COPIES { + HelpID = "svtools:NumericField:DLG_SVT_PRNDLG_PRINTDLG:NUM_COPIES"; Border = TRUE ; Pos = MAP_APPFONT ( 201 , 102 ) ; Size = MAP_APPFONT ( 33 , 12 ) ; @@ -226,6 +240,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; CheckBox CBX_COLLATE { + HelpID = "svtools:CheckBox:DLG_SVT_PRNDLG_PRINTDLG:CBX_COLLATE"; Pos = MAP_APPFONT ( 201 , 123 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Co~llate" ; @@ -249,6 +264,7 @@ ModalDialog DLG_SVT_PRNDLG_PRINTDLG }; PushButton BTN_OPTIONS { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRINTDLG:BTN_OPTIONS"; Hide = TRUE ; Pos = MAP_APPFONT ( 6 , 190 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; diff --git a/svtools/source/dialogs/prnsetup.src b/svtools/source/dialogs/prnsetup.src index 1443a35e0f39..afdf7d56864e 100644 --- a/svtools/source/dialogs/prnsetup.src +++ b/svtools/source/dialogs/prnsetup.src @@ -138,6 +138,7 @@ String STR_SVT_PRNDLG_JOBCOUNT ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG { + HelpID = "svtools:ModalDialog:DLG_SVT_PRNDLG_PRNSETUPDLG"; OutputSize = TRUE ; SVLook = TRUE ; Moveable = TRUE ; @@ -157,6 +158,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG }; ListBox LB_NAMES { + HelpID = "svtools:ListBox:DLG_SVT_PRNDLG_PRNSETUPDLG:LB_NAMES"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 12 ) ; Size = MAP_APPFONT ( 125 , 80 ) ; @@ -165,6 +167,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG }; PushButton BTN_PROPERTIES { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_PROPERTIES"; Pos = MAP_APPFONT ( 188 , 12 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Propert~ies..." ; @@ -220,6 +223,7 @@ ModalDialog DLG_SVT_PRNDLG_PRNSETUPDLG }; PushButton BTN_OPTIONS { + HelpID = "svtools:PushButton:DLG_SVT_PRNDLG_PRNSETUPDLG:BTN_OPTIONS"; Pos = MAP_APPFONT ( 5 , 84 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Options..." ; diff --git a/svtools/source/filter.vcl/filter/exportdialog.src b/svtools/source/filter.vcl/filter/exportdialog.src old mode 100755 new mode 100644 index 065fcee6ba18..c9e87989a314 --- a/svtools/source/filter.vcl/filter/exportdialog.src +++ b/svtools/source/filter.vcl/filter/exportdialog.src @@ -34,6 +34,7 @@ String DLG_EXPORT_TITLE ModalDialog DLG_EXPORT { + HelpID = "svtools:ModalDialog:DLG_EXPORT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 178 , 135 ) ; @@ -54,6 +55,7 @@ ModalDialog DLG_EXPORT }; MetricField MF_SIZEX { + HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEX"; Hide = TRUE; Border = TRUE; Size = MAP_APPFONT ( 30, 12 ) ; @@ -68,6 +70,7 @@ ModalDialog DLG_EXPORT }; ListBox LB_SIZEX { + HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEX"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 60, 80 ) ; @@ -90,6 +93,7 @@ ModalDialog DLG_EXPORT }; MetricField MF_SIZEY { + HelpID = "svtools:MetricField:DLG_EXPORT:MF_SIZEY"; Hide = TRUE; Border = TRUE; Size = MAP_APPFONT ( 30, 12 ); @@ -104,6 +108,7 @@ ModalDialog DLG_EXPORT }; ListBox LB_SIZEY { + HelpID = "svtools:ListBox:DLG_EXPORT:LB_SIZEY"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 60, 80 ) ; @@ -126,6 +131,7 @@ ModalDialog DLG_EXPORT }; NumericField NF_RESOLUTION { + HelpID = "svtools:NumericField:DLG_EXPORT:NF_RESOLUTION"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 30, 12 ) ; @@ -137,6 +143,7 @@ ModalDialog DLG_EXPORT }; ListBox LB_RESOLUTION { + HelpID = "svtools:ListBox:DLG_EXPORT:LB_RESOLUTION"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 60, 80 ) ; @@ -157,6 +164,7 @@ ModalDialog DLG_EXPORT }; ListBox LB_COLOR_DEPTH { + HelpID = "svtools:ListBox:DLG_EXPORT:LB_COLOR_DEPTH"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 60, 80 ) ; @@ -225,6 +233,7 @@ ModalDialog DLG_EXPORT }; NumericField NF_COMPRESSION { + HelpID = "svtools:NumericField:DLG_EXPORT:NF_COMPRESSION"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 30, 12 ) ; @@ -260,18 +269,21 @@ ModalDialog DLG_EXPORT }; CheckBox CB_JPG_PREVIEW { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_JPG_PREVIEW"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Preview" ; }; CheckBox CB_INTERLACED { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_INTERLACED"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Interlaced" ; }; CheckBox CB_RLE_ENCODING { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_RLE_ENCODING"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "RLE encoding" ; @@ -284,18 +296,21 @@ ModalDialog DLG_EXPORT }; CheckBox CB_SAVE_TRANSPARENCY { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_SAVE_TRANSPARENCY"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Save transparency" ; }; RadioButton RB_BINARY { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_BINARY"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Binary" ; }; RadioButton RB_TEXT { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_TEXT"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Text" ; @@ -308,12 +323,14 @@ ModalDialog DLG_EXPORT }; CheckBox CB_EPS_PREVIEW_TIFF { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_TIFF"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Image Preview (TIFF)" ; }; CheckBox CB_EPS_PREVIEW_EPSI { + HelpID = "svtools:CheckBox:DLG_EXPORT:CB_EPS_PREVIEW_EPSI"; Hide = TRUE; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "Interchange (EPSI)" ; @@ -326,12 +343,14 @@ ModalDialog DLG_EXPORT }; RadioButton RB_EPS_LEVEL1 { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL1"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Level 1" ; }; RadioButton RB_EPS_LEVEL2 { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_LEVEL2"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Level 2" ; @@ -344,24 +363,28 @@ ModalDialog DLG_EXPORT }; RadioButton RB_EPS_COLOR_FORMAT1 { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT1"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Color" ; }; RadioButton RB_EPS_COLOR_FORMAT2 { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COLOR_FORMAT2"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "Grayscale" ; }; RadioButton RB_EPS_COMPRESSION_LZW { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_LZW"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "LZW encoding" ; }; RadioButton RB_EPS_COMPRESSION_NONE { + HelpID = "svtools:RadioButton:DLG_EXPORT:RB_EPS_COMPRESSION_NONE"; Hide = TRUE; Size = MAP_APPFONT ( 105 , 10 ) ; Text [ en-US ] = "None" ; @@ -413,6 +436,7 @@ ModalDialog DLG_EXPORT }; NumericField NF_ZOOM { + HelpID = "svtools:NumericField:DLG_EXPORT:NF_ZOOM"; Hide = TRUE; Border = TRUE ; Size = MAP_APPFONT ( 30, 12 ) ; diff --git a/svtools/source/plugapp/testtool.src b/svtools/source/plugapp/testtool.src index 9cc52c58f013..e456200943f6 100644 --- a/svtools/source/plugapp/testtool.src +++ b/svtools/source/plugapp/testtool.src @@ -104,6 +104,7 @@ Bitmap TT_SHOW2 { }; WorkWindow TT_INLINE_TRANSLATION { + HelpID = "svtools:WorkWindow:TT_INLINE_TRANSLATION"; SVLook = TRUE; Size = MAP_APPFONT( 2*Control_Border + 4*ButtonWidth + 3*Button_Button, 120 ); Moveable = TRUE; @@ -116,6 +117,7 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "Translation"; }; Edit TT_E_NEW { + HelpID = "svtools:Edit:TT_INLINE_TRANSLATION:TT_E_NEW"; Disable = TRUE; Border = TRUE; Pos = MAP_APPFONT( 7, 16 ); @@ -134,6 +136,7 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "Comment"; }; Edit TT_E_COMMENT { + HelpID = "svtools:Edit:TT_INLINE_TRANSLATION:TT_E_COMMENT"; Disable = TRUE; Border = TRUE; Pos = MAP_APPFONT( 7, 64 ); @@ -142,12 +145,14 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "~Comment"; }; PushButton TT_PB_SELECT { + HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_SELECT"; Pos = MAP_APPFONT( Control_Border, 89 ); Size = MAP_APPFONT( ButtonWidth, 12 ); TabStop = TRUE; Text[ en-US ] = "~Select"; }; PushButton TT_PB_RESTORE { + HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_RESTORE"; Disable = TRUE; Pos = MAP_APPFONT( Control_Border + ButtonWidth + Button_Button, 89 ); Size = MAP_APPFONT( ButtonWidth, 12 ); @@ -155,6 +160,7 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "~Restore"; }; PushButton TT_PB_ACCEPT { + HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_ACCEPT"; Disable = TRUE; Pos = MAP_APPFONT( Control_Border + 2*(ButtonWidth + Button_Button), 89 ); Size = MAP_APPFONT( ButtonWidth, 12 ); @@ -162,6 +168,7 @@ WorkWindow TT_INLINE_TRANSLATION { Text[ en-US ] = "~Accept"; }; PushButton TT_PB_NEXT { + HelpID = "svtools:PushButton:TT_INLINE_TRANSLATION:TT_PB_NEXT"; Pos = MAP_APPFONT( Control_Border + 3*(ButtonWidth + Button_Button), 89 ); Size = MAP_APPFONT( ButtonWidth, 12 ); TabStop = TRUE; diff --git a/svtools/source/productregistration/registrationdlg.src b/svtools/source/productregistration/registrationdlg.src index c4cdcbcbe3ec..64f1063f1ba3 100644 --- a/svtools/source/productregistration/registrationdlg.src +++ b/svtools/source/productregistration/registrationdlg.src @@ -72,6 +72,7 @@ ModalDialog DLG_REGISTRATION_REQUEST RadioButton RB_NOW { + HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NOW"; Pos = MAP_APPFONT ( 33 , 41 ) ; Size = MAP_APPFONT ( 153 , 10 ) ; Text [ en-US ] = "Register now" ; @@ -79,18 +80,21 @@ ModalDialog DLG_REGISTRATION_REQUEST RadioButton RB_LATER { + HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_LATER"; Pos = MAP_APPFONT ( 33 , 54 ) ; Size = MAP_APPFONT ( 153 , 10 ) ; Text [ en-US ] = "Remind me to register later" ; }; RadioButton RB_NEVER { + HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_NEVER"; Pos = MAP_APPFONT ( 33 , 67 ) ; Size = MAP_APPFONT ( 153 , 10 ) ; Text [ en-US ] = "Never register" ; }; RadioButton RB_DONE { + HelpID = "svtools:RadioButton:DLG_REGISTRATION_REQUEST:RB_DONE"; Pos = MAP_APPFONT ( 33 , 80 ) ; Size = MAP_APPFONT ( 153 , 20 ) ; WordBreak = TRUE; diff --git a/svtools/workben/unodialog/roadmapskeleton.src b/svtools/workben/unodialog/roadmapskeleton.src index 797490273b5f..33728c700df6 100644 --- a/svtools/workben/unodialog/roadmapskeleton.src +++ b/svtools/workben/unodialog/roadmapskeleton.src @@ -31,6 +31,7 @@ // ----------------------------------------------------------------------------- ModalDialog DLG_ROADMAP_SKELETON { + HelpID = "svtools:ModalDialog:DLG_ROADMAP_SKELETON"; OutputSize = TRUE ; Moveable = TRUE; Closeable = TRUE ; @@ -61,24 +62,28 @@ ModalDialog DLG_ROADMAP_SKELETON TabPage TP_WELCOME { + HelpID = "svtools:TabPage:TP_WELCOME"; Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); Hide = TRUE; }; TabPage TP_PREPARE { + HelpID = "svtools:TabPage:TP_PREPARE"; Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); Hide = TRUE; }; TabPage TP_SETUP { + HelpID = "svtools:TabPage:TP_SETUP"; Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); Hide = TRUE; }; TabPage TP_FINISH { + HelpID = "svtools:TabPage:TP_FINISH"; Size = MAP_APPFONT( TAB_PAGE_WIDTH, TAB_PAGE_HEIGHT ); Hide = TRUE; }; diff --git a/toolkit/workben/layout/sortdlg.src b/toolkit/workben/layout/sortdlg.src index 5e855962af96..e9e2b7a0a26b 100644 --- a/toolkit/workben/layout/sortdlg.src +++ b/toolkit/workben/layout/sortdlg.src @@ -33,6 +33,7 @@ TabPage RID_SCPAGE_SORT_FIELDS Size = MAP_APPFONT ( 260 , 185 ) ; ListBox LB_SORT1 { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT1"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 19 ) ; Size = MAP_APPFONT ( 154 , 90 ) ; @@ -41,6 +42,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; RadioButton BTN_UP1 { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP1"; Pos = MAP_APPFONT ( 172 , 14 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "~Ascending" ; @@ -48,6 +50,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; RadioButton BTN_DOWN1 { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN1"; Pos = MAP_APPFONT ( 172 , 28 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "~Descending" ; @@ -61,6 +64,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; ListBox LB_SORT2 { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT2"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 60 ) ; Size = MAP_APPFONT ( 154 , 90 ) ; @@ -69,6 +73,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; RadioButton BTN_UP2 { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP2"; Pos = MAP_APPFONT ( 172 , 55 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "A~scending" ; @@ -76,6 +81,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; RadioButton BTN_DOWN2 { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN2"; Pos = MAP_APPFONT ( 172 , 69 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "D~escending" ; @@ -89,6 +95,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; ListBox LB_SORT3 { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_FIELDS:LB_SORT3"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 154 , 90 ) ; @@ -97,6 +104,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; RadioButton BTN_UP3 { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_UP3"; Pos = MAP_APPFONT ( 172 , 96 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "As~cending" ; @@ -104,6 +112,7 @@ TabPage RID_SCPAGE_SORT_FIELDS }; RadioButton BTN_DOWN3 { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_FIELDS:BTN_DOWN3"; Pos = MAP_APPFONT ( 172 , 110 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "Desce~nding" ; @@ -125,6 +134,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox BTN_CASESENSITIVE { + HelpID = "toolkit:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_CASESENSITIVE"; Pos = MAP_APPFONT ( 12 , 6 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "Case ~sensitive" ; @@ -132,6 +142,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; CheckBox BTN_LABEL { + HelpID = "toolkit:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_LABEL"; Pos = MAP_APPFONT ( 12 , 20 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -146,6 +157,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; CheckBox BTN_FORMATS { + HelpID = "toolkit:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_FORMATS"; Pos = MAP_APPFONT ( 12 , 34 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "Include ~formats" ; @@ -153,6 +165,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; CheckBox BTN_NATURALSORT { + HelpID = "toolkit:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_NATURALSORT"; Pos = MAP_APPFONT ( 12 , 48 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ de ] = "Enable ~natural sort" ; @@ -164,6 +177,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; CheckBox BTN_COPYRESULT { + HelpID = "toolkit:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_COPYRESULT"; Pos = MAP_APPFONT ( 12 , 62 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "~Copy sort results to:" ; @@ -171,6 +185,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; ListBox LB_OUTAREA { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_OUTAREA"; Border = TRUE ; Pos = MAP_APPFONT ( 20 , 73 ) ; Size = MAP_APPFONT ( 93 , 90 ) ; @@ -179,6 +194,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; Edit ED_OUTAREA { + HelpID = "toolkit:Edit:RID_SCPAGE_SORT_OPTIONS:ED_OUTAREA"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 119 , 73 ) ; @@ -187,6 +203,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; CheckBox BTN_SORT_USER { + HelpID = "toolkit:CheckBox:RID_SCPAGE_SORT_OPTIONS:BTN_SORT_USER"; Pos = MAP_APPFONT ( 12 , 89 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "Custom sort ~order" ; @@ -194,6 +211,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; ListBox LB_SORT_USER { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_SORT_USER"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 20 , 100 ) ; @@ -209,6 +227,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; ListBox LB_LANGUAGE { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_LANGUAGE"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 129 ) ; Size = MAP_APPFONT ( 101 , 90 ) ; @@ -224,6 +243,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; ListBox LB_ALGORITHM { + HelpID = "toolkit:ListBox:RID_SCPAGE_SORT_OPTIONS:LB_ALGORITHM"; Border = TRUE ; Pos = MAP_APPFONT ( 119 , 129 ) ; Size = MAP_APPFONT ( 132 , 90 ) ; @@ -238,6 +258,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; RadioButton BTN_TOP_DOWN { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_TOP_DOWN"; Pos = MAP_APPFONT ( 12 , 158 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "~Top to bottom (sort rows)" ; @@ -245,6 +266,7 @@ TabPage RID_SCPAGE_SORT_OPTIONS }; RadioButton BTN_LEFT_RIGHT { + HelpID = "toolkit:RadioButton:RID_SCPAGE_SORT_OPTIONS:BTN_LEFT_RIGHT"; Pos = MAP_APPFONT ( 12 , 172 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text [ en-US ] = "L~eft to right (sort columns)" ; diff --git a/ucbhelper/workben/ucbexplorer/ucbexplorer.src b/ucbhelper/workben/ucbexplorer/ucbexplorer.src index 4bee5900eaaf..523813324710 100644 --- a/ucbhelper/workben/ucbexplorer/ucbexplorer.src +++ b/ucbhelper/workben/ucbexplorer/ucbexplorer.src @@ -100,6 +100,7 @@ Bitmap BMP_LINK ModalDialog DLG_STRINGINPUT { + HelpID = "ucbhelper:ModalDialog:DLG_STRINGINPUT"; Border = TRUE ; Moveable = TRUE ; OutputSize = TRUE ; @@ -113,6 +114,7 @@ ModalDialog DLG_STRINGINPUT }; Edit ED_STRINGINPUT_DLG_NAME { + HelpID = "ucbhelper:Edit:DLG_STRINGINPUT:ED_STRINGINPUT_DLG_NAME"; Pos = MAP_APPFONT ( 40 , 16 ) ; Size = MAP_APPFONT ( 110 , 12 ) ; Border = TRUE ; diff --git a/vcl/source/src/print.src b/vcl/source/src/print.src index 010cae338e0e..13ae6b0ead76 100644 --- a/vcl/source/src/print.src +++ b/vcl/source/src/print.src @@ -29,6 +29,7 @@ ModalDialog SV_DLG_PRINT { + HelpID = "vcl:ModalDialog:SV_DLG_PRINT"; Text [en-US] = "Print"; Closeable = TRUE; Sizeable = TRUE; @@ -64,6 +65,7 @@ ModalDialog SV_DLG_PRINT }; NumericField SV_PRINT_PAGE_EDIT { + HelpID = "vcl:NumericField:SV_DLG_PRINT:SV_PRINT_PAGE_EDIT"; Pos = MAP_APPFONT( 5, 140 ); Size = MAP_APPFONT( 30, 12 ); SVLook = TRUE; @@ -80,18 +82,21 @@ ModalDialog SV_DLG_PRINT }; PushButton SV_PRINT_PAGE_FORWARD { + HelpID = "vcl:PushButton:SV_DLG_PRINT:SV_PRINT_PAGE_FORWARD"; Pos = MAP_APPFONT( 95, 140 ); Size = MAP_APPFONT( 15, 12 ); HelpText [en-US] = "Scroll one page forward."; }; PushButton SV_PRINT_PAGE_BACKWARD { + HelpID = "vcl:PushButton:SV_DLG_PRINT:SV_PRINT_PAGE_BACKWARD"; Pos = MAP_APPFONT( 80, 140 ); Size = MAP_APPFONT( 15, 12 ); HelpText [en-US] = "Scroll one page backward."; }; TabControl SV_PRINT_TABCTRL { + HelpID = "vcl:TabControl:SV_DLG_PRINT:SV_PRINT_TABCTRL"; Pos = MAP_APPFONT( 140, 5 ); Size = MAP_APPFONT( 205, 175 ); }; @@ -123,6 +128,7 @@ ModalDialog SV_DLG_PRINT TabPage SV_PRINT_TAB_NUP { + HelpID = "vcl:TabPage:SV_PRINT_TAB_NUP"; Text [en-US] = "Page Layout"; Hide = TRUE; @@ -134,6 +140,7 @@ ModalDialog SV_DLG_PRINT }; RadioButton SV_PRINT_PRT_NUP_DEFAULT_BTN { + HelpID = "vcl:RadioButton:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_DEFAULT_BTN"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 10, 10 ); Text [en-US] = "~Default"; @@ -141,12 +148,14 @@ ModalDialog SV_DLG_PRINT }; RadioButton SV_PRINT_PRT_NUP_BROCHURE_BTN { + HelpID = "vcl:RadioButton:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_BROCHURE_BTN"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 10, 10 ); Text = ""; }; RadioButton SV_PRINT_PRT_NUP_PAGES_BTN { + HelpID = "vcl:RadioButton:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_PAGES_BTN"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 10, 10 ); Text [en-US] = "Pa~ges per sheet"; @@ -154,6 +163,7 @@ ModalDialog SV_DLG_PRINT }; ListBox SV_PRINT_PRT_NUP_PAGES_BOX { + HelpID = "vcl:ListBox:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_PAGES_BOX"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 10, 80 ); Border = TRUE; @@ -180,6 +190,7 @@ ModalDialog SV_DLG_PRINT }; NumericField SV_PRINT_PRT_NUP_COLS_EDT { + HelpID = "vcl:NumericField:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_COLS_EDT"; Pos = MAP_APPFONT( 55, 20 ); Size = MAP_APPFONT( 40, 12 ); Border = TRUE; @@ -198,6 +209,7 @@ ModalDialog SV_DLG_PRINT }; NumericField SV_PRINT_PRT_NUP_ROWS_EDT { + HelpID = "vcl:NumericField:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_ROWS_EDT"; Pos = MAP_APPFONT( 55, 35 ); Size = MAP_APPFONT( 40, 12 ); Border = TRUE; @@ -215,6 +227,7 @@ ModalDialog SV_DLG_PRINT }; MetricField SV_PRINT_PRT_NUP_MARGINS_PAGES_EDT { + HelpID = "vcl:MetricField:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_MARGINS_PAGES_EDT"; Pos = MAP_APPFONT( 55, 95 ); Size = MAP_APPFONT( 40, 12 ); Spin = TRUE; @@ -237,6 +250,7 @@ ModalDialog SV_DLG_PRINT }; MetricField SV_PRINT_PRT_NUP_MARGINS_SHEET_EDT { + HelpID = "vcl:MetricField:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_MARGINS_SHEET_EDT"; Pos = MAP_APPFONT( 155, 95 ); Size = MAP_APPFONT( 40, 12 ); Spin = TRUE; @@ -259,6 +273,7 @@ ModalDialog SV_DLG_PRINT }; ListBox SV_PRINT_PRT_NUP_ORIENTATION_BOX { + HelpID = "vcl:ListBox:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_ORIENTATION_BOX"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 10, 40 ); Border = TRUE; @@ -280,6 +295,7 @@ ModalDialog SV_DLG_PRINT }; ListBox SV_PRINT_PRT_NUP_ORDER_BOX { + HelpID = "vcl:ListBox:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_ORDER_BOX"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 10, 20 ); DropDown = TRUE; @@ -294,6 +310,7 @@ ModalDialog SV_DLG_PRINT }; CheckBox SV_PRINT_PRT_NUP_BORDER_CB { + HelpID = "vcl:CheckBox:SV_PRINT_TAB_NUP:SV_PRINT_PRT_NUP_BORDER_CB"; Pos = MAP_APPFONT( 10, 65 ); Size = MAP_APPFONT( 150, 12 ); Text [en-US] = "Draw a border around each page"; @@ -303,6 +320,7 @@ ModalDialog SV_DLG_PRINT TabPage SV_PRINT_TAB_JOB { + HelpID = "vcl:TabPage:SV_PRINT_TAB_JOB"; Text [en-US] = "General"; Hide = TRUE; @@ -314,6 +332,7 @@ ModalDialog SV_DLG_PRINT }; ListBox SV_PRINT_PRINTERS { + HelpID = "vcl:ListBox:SV_PRINT_TAB_JOB:SV_PRINT_PRINTERS"; Pos = MAP_APPFONT( 5, 5 ); Size = MAP_APPFONT( 100, 80 ); Border = TRUE; @@ -322,6 +341,7 @@ ModalDialog SV_DLG_PRINT }; CheckBox SV_PRINT_DETAILS_BTN { + HelpID = "vcl:CheckBox:SV_PRINT_TAB_JOB:SV_PRINT_DETAILS_BTN"; Pos = MAP_APPFONT( 5, 5 ); Size = MAP_APPFONT( 5, 5 ); Text [en-US] = "Details"; @@ -347,6 +367,7 @@ ModalDialog SV_DLG_PRINT }; PushButton SV_PRINT_PRT_SETUP { + HelpID = "vcl:PushButton:SV_PRINT_TAB_JOB:SV_PRINT_PRT_SETUP"; Pos = MAP_APPFONT( 115, 5 ); Size = MAP_APPFONT( 50, 15 ); Text [en-US] = "Properties..."; @@ -366,6 +387,7 @@ ModalDialog SV_DLG_PRINT }; NumericField SV_PRINT_COPYCOUNT_FIELD { + HelpID = "vcl:NumericField:SV_PRINT_TAB_JOB:SV_PRINT_COPYCOUNT_FIELD"; Pos = MAP_APPFONT( 10, 56 ); Size = MAP_APPFONT( 40, 12 ); Border = TRUE; @@ -382,6 +404,7 @@ ModalDialog SV_DLG_PRINT }; CheckBox SV_PRINT_COLLATE { + HelpID = "vcl:CheckBox:SV_PRINT_TAB_JOB:SV_PRINT_COLLATE"; Pos = MAP_APPFONT( 95, 45 ); Size = MAP_APPFONT( 70, 10 ); Text [en-US] = "Collate"; @@ -411,6 +434,7 @@ ModalDialog SV_DLG_PRINT TabPage SV_PRINT_TAB_OPT { + HelpID = "vcl:TabPage:SV_PRINT_TAB_OPT"; Text [en-US] = "Options"; Hide = TRUE; @@ -422,6 +446,7 @@ ModalDialog SV_DLG_PRINT }; CheckBox SV_PRINT_OPT_TOFILE { + HelpID = "vcl:CheckBox:SV_PRINT_TAB_OPT:SV_PRINT_OPT_TOFILE"; Pos = MAP_APPFONT( 10, 20 ); Size = MAP_APPFONT( 200, 12 ); Text [en-US] = "Print to ~file"; @@ -429,6 +454,7 @@ ModalDialog SV_DLG_PRINT }; CheckBox SV_PRINT_OPT_SINGLEJOBS { + HelpID = "vcl:CheckBox:SV_PRINT_TAB_OPT:SV_PRINT_OPT_SINGLEJOBS"; Pos = MAP_APPFONT( 10, 35 ); Size = MAP_APPFONT( 200, 12 ); Text [en-US] = "~Create single print jobs for collated output"; @@ -436,6 +462,7 @@ ModalDialog SV_DLG_PRINT }; CheckBox SV_PRINT_OPT_REVERSE { + HelpID = "vcl:CheckBox:SV_PRINT_TAB_OPT:SV_PRINT_OPT_REVERSE"; Pos = MAP_APPFONT( 10, 50 ); Size = MAP_APPFONT( 200, 12 ); Text [en-US] = "Print in ~reverse page order"; @@ -446,6 +473,7 @@ ModalDialog SV_DLG_PRINT ModelessDialog SV_DLG_PRINT_PROGRESS { + HelpID = "vcl:ModelessDialog:SV_DLG_PRINT_PROGRESS"; Text [en-US] = "Printing"; Closeable = FALSE; Sizeable = FALSE; -- cgit From b5a190c6d59e6284a5501742e17effdda3f47a52 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 11 Oct 2010 17:56:12 +0200 Subject: CWS changehid: generate former auto hids into src files --- soldep/source/soldlg.src | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/soldep/source/soldlg.src b/soldep/source/soldlg.src index 6a20ea8c7b86..723716a435e5 100644 --- a/soldep/source/soldlg.src +++ b/soldep/source/soldlg.src @@ -32,6 +32,7 @@ // Dialogs ModalDialog RID_SD_DIALOG_NEWPROJECT { + HelpID = "soldep:ModalDialog:RID_SD_DIALOG_NEWPROJECT"; OutputSize = TRUE; Text = "New Project"; PosSize = MAP_SYSFONT(18,18,142,142); @@ -54,6 +55,7 @@ ModalDialog RID_SD_DIALOG_NEWPROJECT Text = "Project Name"; }; Edit EDIT_PRJNAME { + HelpID = "soldep:Edit:RID_SD_DIALOG_NEWPROJECT:EDIT_PRJNAME"; Border = TRUE; PosSize = MAP_SYSFONT(5,20,132,10); }; @@ -62,6 +64,7 @@ ModalDialog RID_SD_DIALOG_NEWPROJECT Text = "Project Short Name"; }; Edit EDIT_PRJSHORT { + HelpID = "soldep:Edit:RID_SD_DIALOG_NEWPROJECT:EDIT_PRJSHORT"; Border = TRUE; PosSize = MAP_SYSFONT(5,40,132,10); }; @@ -70,6 +73,7 @@ ModalDialog RID_SD_DIALOG_NEWPROJECT Text = "Project Depends on"; }; Edit EDIT_PRJDEPS { + HelpID = "soldep:Edit:RID_SD_DIALOG_NEWPROJECT:EDIT_PRJDEPS"; Border = TRUE; PosSize = MAP_SYSFONT(5,60,132,10); }; @@ -77,6 +81,7 @@ ModalDialog RID_SD_DIALOG_NEWPROJECT ModalDialog RID_SD_DIALOG_NEWDIRECTORY { + HelpID = "soldep:ModalDialog:RID_SD_DIALOG_NEWDIRECTORY"; OutputSize = TRUE; Text = "New Directory"; PosSize = MAP_SYSFONT(18,18,142,142); @@ -99,6 +104,7 @@ ModalDialog RID_SD_DIALOG_NEWDIRECTORY Text = "Directory Name ( with projectname )"; }; Edit EDIT_DIRNAME { + HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRNAME"; Border = TRUE; PosSize = MAP_SYSFONT(5,20,132,10); }; @@ -107,6 +113,7 @@ ModalDialog RID_SD_DIALOG_NEWDIRECTORY Text = "Directory Flag"; }; Edit EDIT_DIRFLAG { + HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRFLAG"; Border = TRUE; PosSize = MAP_SYSFONT(5,40,132,10); }; @@ -115,6 +122,7 @@ ModalDialog RID_SD_DIALOG_NEWDIRECTORY Text = "Directory Depends on"; }; Edit EDIT_DIRDEPS { + HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRDEPS"; Border = TRUE; PosSize = MAP_SYSFONT(5,60,132,10); }; @@ -123,6 +131,7 @@ ModalDialog RID_SD_DIALOG_NEWDIRECTORY Text = "What To Do"; }; Edit EDIT_DIRACTION { + HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRACTION"; Border = TRUE; PosSize = MAP_SYSFONT(5,80,132,10); }; @@ -131,6 +140,7 @@ ModalDialog RID_SD_DIALOG_NEWDIRECTORY Text = "Which Environments"; }; Edit EDIT_DIRENV { + HelpID = "soldep:Edit:RID_SD_DIALOG_NEWDIRECTORY:EDIT_DIRENV"; Border = TRUE; PosSize = MAP_SYSFONT(5,100,132,10); }; @@ -139,6 +149,7 @@ ModalDialog RID_SD_DIALOG_NEWDIRECTORY ModalDialog RID_SD_DIALOG_HELP { + HelpID = "soldep:ModalDialog:RID_SD_DIALOG_HELP"; OutputSize = TRUE; Text = "Help"; PosSize = MAP_SYSFONT(18,18,242,242); @@ -153,12 +164,14 @@ ModalDialog RID_SD_DIALOG_HELP DefButton = TRUE; }; MultiLineEdit EDIT_HELP { + HelpID = "soldep:MultiLineEdit:RID_SD_DIALOG_HELP:EDIT_HELP"; Border = TRUE; PosSize = MAP_SYSFONT(5,5,232,213); }; }; ModalDialog DLG_VERSIONSELECT { + HelpID = "soldep:ModalDialog:DLG_VERSIONSELECT"; OutputSize = TRUE; Pos = MAP_APPFONT( 92, 40 ); Size = MAP_APPFONT( 161, 98 ); @@ -166,6 +179,7 @@ ModalDialog DLG_VERSIONSELECT { Moveable = TRUE; Closeable = TRUE; ListBox DLG_VERSIONSELECT_LISTBOX { + HelpID = "soldep:ListBox:DLG_VERSIONSELECT:DLG_VERSIONSELECT_LISTBOX"; Border = TRUE; Pos = MAP_APPFONT( 8, 16 ); Size = MAP_APPFONT( 96, 72 ); @@ -193,6 +207,7 @@ ModalDialog DLG_VERSIONSELECT { Text = "Minor"; }; Edit DLG_MINORSELECT_EDIT { + HelpID = "soldep:Edit:DLG_VERSIONSELECT:DLG_MINORSELECT_EDIT"; Border = TRUE; Pos = MAP_APPFONT( 115, 16 ); Size = MAP_APPFONT( 36, 12 ); @@ -201,6 +216,7 @@ ModalDialog DLG_VERSIONSELECT { }; ModelessDialog DLG_AUTOARRANGE { + HelpID = "soldep:ModelessDialog:DLG_AUTOARRANGE"; OutputSize = TRUE; Pos = MAP_APPFONT( 40, 12 ); Size = MAP_APPFONT( 225, 82 ); @@ -224,6 +240,7 @@ ModelessDialog DLG_AUTOARRANGE { }; ModalDialog DLG_FIND_PROJECT { + HelpID = "soldep:ModalDialog:DLG_FIND_PROJECT"; OutputSize = TRUE; Pos = MAP_APPFONT( 40, 12 ); Size = MAP_APPFONT( 155, 55 ); @@ -232,6 +249,7 @@ ModalDialog DLG_FIND_PROJECT { SVLook = TRUE; ComboBox DLG_FIND_PROJECT_COMBOBOX { + HelpID = "soldep:ComboBox:DLG_FIND_PROJECT:DLG_FIND_PROJECT_COMBOBOX"; Pos = MAP_APPFONT ( 5 , 18 ) ; Size = MAP_APPFONT ( 100 , 90 ) ; TabStop = TRUE ; -- cgit From a8bc280fabb91e1a7282e451feadec79c66d5790 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 11 Oct 2010 17:56:12 +0200 Subject: CWS changehid: generate former auto hids into src files --- basic/source/app/basic.src | 64 ++++++++++++++++++++ desktop/source/app/desktop.src | 1 + .../deployment/gui/dp_gui_dependencydialog.src | 2 + desktop/source/deployment/gui/dp_gui_dialog.src | 3 + desktop/source/deployment/gui/dp_gui_dialog2.src | 4 ++ .../source/deployment/gui/dp_gui_updatedialog.src | 3 + .../deployment/gui/dp_gui_updateinstalldialog.src | 1 + desktop/source/migration/wizard.src | 11 ++++ formula/source/ui/dlg/formdlgs.src | 12 ++++ formula/source/ui/dlg/parawin.src | 17 ++++-- fpicker/source/office/iodlg.src | 15 +++++ framework/source/classes/resource.src | 4 ++ sfx2/source/appl/dde.src | 4 ++ sfx2/source/appl/newhelp.src | 12 ++++ sfx2/source/dialog/alienwarn.src | 1 + sfx2/source/dialog/dinfdlg.src | 41 +++++++++++++ sfx2/source/dialog/dinfedt.src | 4 ++ sfx2/source/dialog/mgetempl.src | 6 ++ sfx2/source/dialog/newstyle.src | 1 + sfx2/source/dialog/passwd.src | 3 + sfx2/source/dialog/printopt.src | 22 +++++++ sfx2/source/dialog/recfloat.src | 1 + sfx2/source/dialog/srchdlg.src | 6 ++ sfx2/source/dialog/templdlg.src | 6 ++ sfx2/source/dialog/versdlg.src | 10 ++++ sfx2/source/doc/doctdlg.src | 5 ++ sfx2/source/doc/docvor.src | 5 ++ sfx2/source/doc/new.src | 14 +++++ svx/source/dialog/bmpmask.src | 15 +++++ svx/source/dialog/contdlg.src | 2 + svx/source/dialog/docrecovery.src | 19 ++++++ svx/source/dialog/fontwork.src | 5 ++ svx/source/dialog/hdft.src | 18 ++++++ svx/source/dialog/imapdlg.src | 4 ++ svx/source/dialog/optgrid.src | 17 ++++++ svx/source/dialog/passwd.src | 3 + svx/source/dialog/rubydialog.src | 14 +++++ svx/source/dialog/srchdlg.src | 30 ++++++++++ svx/source/engine3d/float3d.src | 68 ++++++++++++++++++++++ svx/source/form/datanavi.src | 35 +++++++++++ svx/source/form/fmexpl.src | 2 + svx/source/intro/iso.src | 2 + svx/source/intro/ooo.src | 2 + svx/source/tbxctrls/extrusioncontrols.src | 5 ++ svx/source/tbxctrls/fontworkgallery.src | 5 ++ svx/source/tbxctrls/lboxctrl.src | 1 + .../chinese_dictionarydialog.src | 8 +++ .../chinese_translationdialog.src | 4 ++ uui/source/cookiedg.src | 5 ++ uui/source/fltdlg.src | 1 + uui/source/masterpasscrtdlg.src | 2 + uui/source/masterpassworddlg.src | 1 + uui/source/nameclashdlg.src | 3 + uui/source/newerverwarn.src | 1 + uui/source/passworddlg.src | 2 + uui/source/secmacrowarnings.src | 2 + uui/source/sslwarndlg.src | 2 + uui/source/unknownauthdlg.src | 4 ++ 58 files changed, 556 insertions(+), 4 deletions(-) mode change 100755 => 100644 desktop/source/deployment/gui/dp_gui_dialog.src mode change 100755 => 100644 sfx2/source/dialog/dinfdlg.src mode change 100755 => 100644 uui/source/masterpasscrtdlg.src mode change 100755 => 100644 uui/source/nameclashdlg.src mode change 100755 => 100644 uui/source/passworddlg.src diff --git a/basic/source/app/basic.src b/basic/source/app/basic.src index 0713fd859f56..7f83ba8db2ba 100644 --- a/basic/source/app/basic.src +++ b/basic/source/app/basic.src @@ -29,6 +29,7 @@ #include "resids.hrc" ModalDialog RID_CALLDLG { + HelpID = "basic:ModalDialog:RID_CALLDLG"; PosSize = MAP_SYSFONT (18,18,142,142); SVLook = TRUE; MOVEABLE = TRUE; @@ -43,11 +44,13 @@ ModalDialog RID_CALLDLG { PosSize = MAP_SYSFONT (10,70,120,8); }; Edit RID_RETVAL { + HelpID = "basic:Edit:RID_CALLDLG:RID_RETVAL"; PosSize = MAP_SYSFONT (10,85,120,12); Border = TRUE; TabStop = TRUE; }; ListBox RID_PARAMS { + HelpID = "basic:ListBox:RID_CALLDLG:RID_PARAMS"; PosSize = MAP_SYSFONT (10,25,120,40); TabStop = TRUE; Border = TRUE; @@ -61,6 +64,7 @@ ModalDialog RID_CALLDLG { }; ModalDialog IDD_ABOUT_DIALOG { + HelpID = "basic:ModalDialog:IDD_ABOUT_DIALOG"; Pos = MAP_APPFONT( 58, 17 ); Size = MAP_APPFONT( 155, 106 ); SVLook = TRUE; @@ -107,6 +111,7 @@ ModalDialog IDD_ABOUT_DIALOG { }; ModalDialog IDD_TT_ABOUT_DIALOG { + HelpID = "basic:ModalDialog:IDD_TT_ABOUT_DIALOG"; Pos = MAP_APPFONT( 58, 17 ); Size = MAP_APPFONT( 120, 81 ); SVLook = TRUE; @@ -138,6 +143,7 @@ ModalDialog IDD_TT_ABOUT_DIALOG { }; ModalDialog IDD_FIND_DIALOG { + HelpID = "basic:ModalDialog:IDD_FIND_DIALOG"; Pos = MAP_APPFONT( 69, 30 ); Size = MAP_APPFONT( 185, 70 ); SVLook = TRUE; @@ -150,6 +156,7 @@ ModalDialog IDD_FIND_DIALOG { TEXT[ en-US ] = "~Text"; }; Edit RID_FIND { + HelpID = "basic:Edit:IDD_FIND_DIALOG:RID_FIND"; BORDER = TRUE; Pos = MAP_APPFONT( 40, 8 ); Size = MAP_APPFONT( 135, 12 ); @@ -172,6 +179,7 @@ ModalDialog IDD_FIND_DIALOG { }; ModalDialog IDD_REPLACE_DIALOG { + HelpID = "basic:ModalDialog:IDD_REPLACE_DIALOG"; Pos = MAP_APPFONT( 69, 30 ); Size = MAP_APPFONT( 185, 88 ); SVLook = TRUE; @@ -188,12 +196,14 @@ ModalDialog IDD_REPLACE_DIALOG { TEXT[ en-US ] = "~Replace by"; }; Edit RID_FIND { + HelpID = "basic:Edit:IDD_REPLACE_DIALOG:RID_FIND"; BORDER = TRUE; Pos = MAP_APPFONT( 65, 8 ); Size = MAP_APPFONT( 110, 12 ); TABSTOP = TRUE; }; Edit RID_REPLACE { + HelpID = "basic:Edit:IDD_REPLACE_DIALOG:RID_REPLACE"; BORDER = TRUE; Pos = MAP_APPFONT( 65, 28 ); Size = MAP_APPFONT( 110, 12 ); @@ -718,6 +728,7 @@ Menu RID_HELP { }; }; ModelessDialog IDD_PRINT_DIALOG { + HelpID = "basic:ModelessDialog:IDD_PRINT_DIALOG"; Pos = MAP_APPFONT( 83, 42 ); Size = MAP_APPFONT( 171, 94 ); MOVEABLE = TRUE; @@ -784,6 +795,7 @@ TabDialog IDD_OPTIONS_DLG TabPage RID_TP_GENERIC { + HelpID = "basic:TabPage:RID_TP_GENERIC"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT( 244, 100 ); @@ -793,6 +805,7 @@ TabPage RID_TP_GENERIC { Text[ en-US ] = "Area"; }; ComboBox RID_CB_AREA { + HelpID = "basic:ComboBox:RID_TP_GENERIC:RID_CB_AREA"; HScroll = TRUE; VScroll = TRUE; AutoHScroll = TRUE; @@ -803,12 +816,14 @@ TabPage RID_TP_GENERIC { DropDown = TRUE; }; PushButton RID_PB_NEW_AREA { + HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_NEW_AREA"; Pos = MAP_APPFONT( 144, 12 ); Size = MAP_APPFONT( 40, 12 ); TabStop = TRUE; Text[ en-US ] = "New"; }; PushButton RID_PD_DEL_AREA { + HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PD_DEL_AREA"; Pos = MAP_APPFONT( 188, 12 ); Size = MAP_APPFONT( 40, 12 ); TabStop = TRUE; @@ -820,6 +835,7 @@ TabPage RID_TP_GENERIC { Text[ en-US ] = "Setting"; }; ComboBox RID_CB_VALUE { + HelpID = "basic:ComboBox:RID_TP_GENERIC:RID_CB_VALUE"; HScroll = TRUE; VScroll = TRUE; AutoHScroll = TRUE; @@ -829,6 +845,7 @@ TabPage RID_TP_GENERIC { TabStop = TRUE; }; PushButton RID_PB_SELECT_FILE { + HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_SELECT_FILE"; Pos = MAP_APPFONT( 188, 48 ); Size = MAP_APPFONT( 40, 12 ); TabStop = TRUE; @@ -837,12 +854,14 @@ TabPage RID_TP_GENERIC { Hide = TRUE; }; PushButton RID_PB_NEW_VALUE { + HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_NEW_VALUE"; Pos = MAP_APPFONT( 188, 48 ); Size = MAP_APPFONT( 40, 12 ); TabStop = TRUE; Text[ en-US ] = "New"; }; PushButton RID_PB_DEL_VALUE { + HelpID = "basic:PushButton:RID_TP_GENERIC:RID_PB_DEL_VALUE"; Pos = MAP_APPFONT( 188, 64 ); Size = MAP_APPFONT( 40, 12 ); TabStop = TRUE; @@ -852,6 +871,7 @@ TabPage RID_TP_GENERIC { TabPage RID_TP_PROFILE { + HelpID = "basic:TabPage:RID_TP_PROFILE"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT( 244, 100 ); @@ -861,6 +881,7 @@ TabPage RID_TP_PROFILE { Text[ en-US ] = "Profile"; }; ComboBox RID_CB_PROFILE { + HelpID = "basic:ComboBox:RID_TP_PROFILE:RID_CB_PROFILE"; HScroll = TRUE; VScroll = TRUE; AutoHScroll = TRUE; @@ -871,12 +892,14 @@ TabPage RID_TP_PROFILE { DropDown = TRUE; }; PushButton RID_PB_NEW_PROFILE { + HelpID = "basic:PushButton:RID_TP_PROFILE:RID_PB_NEW_PROFILE"; Pos = MAP_APPFONT( 144, 2 ); Size = MAP_APPFONT( 40, 12 ); TabStop = TRUE; Text[ en-US ] = "New"; }; PushButton RID_PD_DEL_PROFILE { + HelpID = "basic:PushButton:RID_TP_PROFILE:RID_PD_DEL_PROFILE"; Pos = MAP_APPFONT( 188, 2 ); Size = MAP_APPFONT( 40, 12 ); TabStop = TRUE; @@ -898,6 +921,7 @@ TabPage RID_TP_PROFILE { Text[ en-US ] = "Base directory"; }; CheckBox HID_CHECK { + HelpID = "basic:CheckBox:RID_TP_PROFILE:HID_CHECK"; Pos = MAP_APPFONT( 7, 58 ); Size = MAP_APPFONT( 86, 12 ); Text[ en-US ] = "Default HID directory"; @@ -905,52 +929,61 @@ TabPage RID_TP_PROFILE { Hide = FALSE; }; Edit LOG_NAME { + HelpID = "basic:Edit:RID_TP_PROFILE:LOG_NAME"; Border = TRUE; Pos = MAP_APPFONT( 97, 26 ); Size = MAP_APPFONT( 116, 12 ); TabStop = TRUE; }; Edit BASIS_NAME { + HelpID = "basic:Edit:RID_TP_PROFILE:BASIS_NAME"; Border = TRUE; Pos = MAP_APPFONT( 97, 42 ); Size = MAP_APPFONT( 116, 12 ); TabStop = TRUE; }; Edit HID_NAME { + HelpID = "basic:Edit:RID_TP_PROFILE:HID_NAME"; Border = TRUE; Pos = MAP_APPFONT( 97, 58 ); Size = MAP_APPFONT( 116, 12 ); TabStop = TRUE; }; PushButton LOG_SET { + HelpID = "basic:PushButton:RID_TP_PROFILE:LOG_SET"; Pos = MAP_APPFONT( 217, 26 ); Size = MAP_APPFONT( 12, 12 ); TabStop = TRUE; Text[ en-US ] = "..."; }; PushButton BASIS_SET { + HelpID = "basic:PushButton:RID_TP_PROFILE:BASIS_SET"; Pos = MAP_APPFONT( 217, 42 ); Size = MAP_APPFONT( 12, 12 ); TabStop = TRUE; Text[ en-US ] = "..."; }; PushButton HID_SET { + HelpID = "basic:PushButton:RID_TP_PROFILE:HID_SET"; Pos = MAP_APPFONT( 217, 58 ); Size = MAP_APPFONT( 12, 12 ); TabStop = TRUE; Text[ en-US ] = "..."; }; CheckBox CB_AUTORELOAD { + HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_AUTORELOAD"; Pos = MAP_APPFONT( 7, 74 ); Size = MAP_APPFONT( 115, 12 ); Text[ en-US ] = "AutoReload"; }; CheckBox CB_AUTOSAVE { + HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_AUTOSAVE"; Pos = MAP_APPFONT( 7, 87 ); Size = MAP_APPFONT( 115, 12 ); Text[ en-US ] = "Save before execute"; }; CheckBox CB_STOPONSYNTAXERRORS { + HelpID = "basic:CheckBox:RID_TP_PROFILE:CB_STOPONSYNTAXERRORS"; Pos = MAP_APPFONT( 132, 74 ); Size = MAP_APPFONT( 115, 12 ); Text[ en-US ] = "Stop on Syntax Errors"; @@ -958,6 +991,7 @@ TabPage RID_TP_PROFILE { }; TabPage RID_TP_CRASH { + HelpID = "basic:TabPage:RID_TP_CRASH"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT( 244, 100 ); @@ -967,6 +1001,7 @@ TabPage RID_TP_CRASH { Text[ en-US ] = "Crashreport"; }; CheckBox CB_USEPROXY { + HelpID = "basic:CheckBox:RID_TP_CRASH:CB_USEPROXY"; Pos = MAP_APPFONT( 8, 12 ); Size = MAP_APPFONT( 120, 12 ); Text[ en-US ] = "Use Proxy"; @@ -977,6 +1012,7 @@ TabPage RID_TP_CRASH { Text[ en-US ] = "Host"; }; Edit ED_CRHOST { + HelpID = "basic:Edit:RID_TP_CRASH:ED_CRHOST"; Border = TRUE; Pos = MAP_APPFONT( 43+12, 12+13 ); Size = MAP_APPFONT( 80, 12 ); @@ -988,6 +1024,7 @@ TabPage RID_TP_CRASH { Text[ en-US ] = "Port"; }; NumericField NF_CRPORT { + HelpID = "basic:NumericField:RID_TP_CRASH:NF_CRPORT"; Border = TRUE; Pos = MAP_APPFONT( 43+12, 12+13+16 ); Size = MAP_APPFONT( 40, 12 ); @@ -1001,6 +1038,7 @@ TabPage RID_TP_CRASH { Last = 0xffff; }; CheckBox CB_ALLOWCONTACT { + HelpID = "basic:CheckBox:RID_TP_CRASH:CB_ALLOWCONTACT"; Pos = MAP_APPFONT( 8, 12+13+16+16 ); Size = MAP_APPFONT( 120, 12 ); Text[ en-US ] = "Allow Contact"; @@ -1011,6 +1049,7 @@ TabPage RID_TP_CRASH { Text[ en-US ] = "EMail"; }; Edit ED_EMAIL { + HelpID = "basic:Edit:RID_TP_CRASH:ED_EMAIL"; Border = TRUE; Pos = MAP_APPFONT( 43+12, 12+13+16+16+13 ); Size = MAP_APPFONT( 80, 12 ); @@ -1020,6 +1059,7 @@ TabPage RID_TP_CRASH { TabPage RID_TP_MISC { + HelpID = "basic:TabPage:RID_TP_MISC"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT( 244, 100 ); @@ -1034,6 +1074,7 @@ TabPage RID_TP_MISC { Text[ en-US ] = "Host"; }; Edit ED_HOST { + HelpID = "basic:Edit:RID_TP_MISC:ED_HOST"; Border = TRUE; Pos = MAP_APPFONT( 43, 12); Size = MAP_APPFONT( 80, 12 ); @@ -1045,6 +1086,7 @@ TabPage RID_TP_MISC { Text[ en-US ] = "Testtool Port"; }; NumericField NF_TTPORT { + HelpID = "basic:NumericField:RID_TP_MISC:NF_TTPORT"; Border = TRUE; Pos = MAP_APPFONT( 191, 12); Size = MAP_APPFONT( 40, 12 ); @@ -1063,6 +1105,7 @@ TabPage RID_TP_MISC { Text[ en-US ] = "Remote UNO Port"; }; NumericField NF_UNOPORT { + HelpID = "basic:NumericField:RID_TP_MISC:NF_UNOPORT"; Border = TRUE; Pos = MAP_APPFONT( 191, 12+15); Size = MAP_APPFONT( 40, 12 ); @@ -1087,6 +1130,7 @@ TabPage RID_TP_MISC { Text[ en-US ] = "Server Timeout"; }; TimeField SERVER_TIMEOUT { + HelpID = "basic:TimeField:RID_TP_MISC:SERVER_TIMEOUT"; Border = TRUE; Pos = MAP_APPFONT( 83, 50 ); Size = MAP_APPFONT( 40, 12 ); @@ -1102,6 +1146,7 @@ TabPage RID_TP_MISC { Text[ en-US ] = "Max LRU Files"; }; NumericField TF_MAX_LRU { + HelpID = "basic:NumericField:RID_TP_MISC:TF_MAX_LRU"; Border = TRUE; Pos = MAP_APPFONT( 191, 50); Size = MAP_APPFONT( 40, 12 ); @@ -1118,12 +1163,14 @@ TabPage RID_TP_MISC { Text[ en-US ] = "OOo Program Dir"; }; Edit ED_PROGDIR { + HelpID = "basic:Edit:RID_TP_MISC:ED_PROGDIR"; Border = TRUE; Pos = MAP_APPFONT( 83, 50+15 ); Size = MAP_APPFONT( 219-83-4, 12 ); TabStop = TRUE; }; PushButton PB_PROGDIR { + HelpID = "basic:PushButton:RID_TP_MISC:PB_PROGDIR"; Pos = MAP_APPFONT( 219, 50+15 ); Size = MAP_APPFONT( 12, 12 ); TabStop = TRUE; @@ -1133,6 +1180,7 @@ TabPage RID_TP_MISC { TabPage RID_TP_FONT { + HelpID = "basic:TabPage:RID_TP_FONT"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT( 244, 100 ); @@ -1142,6 +1190,7 @@ TabPage RID_TP_FONT { Text[ en-US ] = "Type"; }; ComboBox CB_FONTNAME { + HelpID = "basic:ComboBox:RID_TP_FONT:CB_FONTNAME"; Pos = MAP_APPFONT( 4, 12 ); Size = MAP_APPFONT( 123, 12*4 ); Sort = TRUE; @@ -1153,6 +1202,7 @@ TabPage RID_TP_FONT { Text[ en-US ] = "Typeface"; }; ComboBox CB_FONTSTYLE { + HelpID = "basic:ComboBox:RID_TP_FONT:CB_FONTSTYLE"; Pos = MAP_APPFONT( 131, 12 ); Size = MAP_APPFONT( 65, 12*4 ); AutoHScroll = TRUE; @@ -1163,6 +1213,7 @@ TabPage RID_TP_FONT { Text[ en-US ] = "Size"; }; MetricBox MB_FONTSIZE { + HelpID = "basic:MetricBox:RID_TP_FONT:MB_FONTSIZE"; Pos = MAP_APPFONT( 200, 12 ); Size = MAP_APPFONT( 29, 12*4 ); AutoHScroll = TRUE; @@ -1178,6 +1229,7 @@ TabPage RID_TP_FONT { FloatingWindow IDD_DISPLAY_HID { + HelpID = "basic:FloatingWindow:IDD_DISPLAY_HID"; OutputSize = TRUE; SVLook = TRUE; Size = MAP_APPFONT( 261, 160 ); @@ -1204,6 +1256,7 @@ FloatingWindow IDD_DISPLAY_HID { Text[ en-US ] = "Controls"; }; MultiListBox RID_MLB_CONTROLS { + HelpID = "basic:MultiListBox:IDD_DISPLAY_HID:RID_MLB_CONTROLS"; Border = TRUE; AutoHScroll = TRUE; Pos = MAP_APPFONT( 4, 28 ); @@ -1216,6 +1269,7 @@ FloatingWindow IDD_DISPLAY_HID { Text[ en-US ] = "Slots"; }; MultiListBox RID_MLB_SLOTS { + HelpID = "basic:MultiListBox:IDD_DISPLAY_HID:RID_MLB_SLOTS"; Border = TRUE; AutoHScroll = TRUE; Pos = MAP_APPFONT( 4, 132 ); @@ -1223,12 +1277,14 @@ FloatingWindow IDD_DISPLAY_HID { TabStop = TRUE; }; PushButton RID_PB_KOPIEREN { + HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_KOPIEREN"; Pos = MAP_APPFONT( 216, 28 ); Size = MAP_APPFONT( 40, 12 ); TabStop = TRUE; Text[ en-US ] = "Copy"; }; PushButton RID_PB_BENENNEN { + HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_BENENNEN"; Pos = MAP_APPFONT( 216, 44 ); Size = MAP_APPFONT( 40, 12 ); TabStop = TRUE; @@ -1236,6 +1292,7 @@ FloatingWindow IDD_DISPLAY_HID { Text[ en-US ] = "Name"; }; PushButton RID_PB_SELECTALL { + HelpID = "basic:PushButton:IDD_DISPLAY_HID:RID_PB_SELECTALL"; Pos = MAP_APPFONT( 216, 44 ); Size = MAP_APPFONT( 40, 12 ); TabStop = TRUE; @@ -1356,6 +1413,7 @@ ImageList RID_IMGLST_LAYOUT }; ModelessDialog IDD_EDIT_VAR { + HelpID = "basic:ModelessDialog:IDD_EDIT_VAR"; Pos = MAP_APPFONT( 0, 0 ); Size = MAP_APPFONT( 171, 87 ); Moveable = TRUE; @@ -1386,6 +1444,7 @@ ModelessDialog IDD_EDIT_VAR { Text[ en-US ] = "Previous contents"; }; RadioButton RID_RB_NEW_BOOL_T { + HelpID = "basic:RadioButton:IDD_EDIT_VAR:RID_RB_NEW_BOOL_T"; Hide = TRUE; Pos = MAP_APPFONT( 53, 37 ); Size = MAP_APPFONT( 40, 12 ); @@ -1393,6 +1452,7 @@ ModelessDialog IDD_EDIT_VAR { Text[ en-US ] = "True"; }; RadioButton RID_RB_NEW_BOOL_F { + HelpID = "basic:RadioButton:IDD_EDIT_VAR:RID_RB_NEW_BOOL_F"; Hide = TRUE; Pos = MAP_APPFONT( 98, 37 ); Size = MAP_APPFONT( 40, 12 ); @@ -1400,6 +1460,7 @@ ModelessDialog IDD_EDIT_VAR { Text[ en-US ] = "False"; }; NumericField RID_NF_NEW_INTEGER { + HelpID = "basic:NumericField:IDD_EDIT_VAR:RID_NF_NEW_INTEGER"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT( 53, 37 ); @@ -1414,6 +1475,7 @@ ModelessDialog IDD_EDIT_VAR { SpinSize = 10; }; NumericField RID_NF_NEW_LONG { + HelpID = "basic:NumericField:IDD_EDIT_VAR:RID_NF_NEW_LONG"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT( 53, 37 ); @@ -1428,6 +1490,7 @@ ModelessDialog IDD_EDIT_VAR { SpinSize = 10; }; Edit RID_ED_NEW_STRING { + HelpID = "basic:Edit:IDD_EDIT_VAR:RID_ED_NEW_STRING"; Hide = TRUE; Border = TRUE; Pos = MAP_APPFONT( 53, 37 ); @@ -1449,6 +1512,7 @@ ModelessDialog IDD_EDIT_VAR { }; FloatingWindow LOAD_CONF { + HelpID = "basic:FloatingWindow:LOAD_CONF"; SVLook = TRUE; Pos = MAP_APPFONT( 66, 23 ); Size = MAP_APPFONT( 156, 51 ); diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src index 2f6897adf80e..98ee68685917 100644 --- a/desktop/source/app/desktop.src +++ b/desktop/source/app/desktop.src @@ -159,6 +159,7 @@ InfoBox INFOBOX_CMDLINEHELP ModalDialog DLG_CMDLINEHELP { + HelpID = "desktop:ModalDialog:DLG_CMDLINEHELP"; Text = "Help Message..."; Size = MAP_APPFONT(250, 365); Border = True; diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.src b/desktop/source/deployment/gui/dp_gui_dependencydialog.src index fa7465678326..e7adbce9992b 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.src +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.src @@ -34,6 +34,7 @@ #define LOCAL_LIST_HEIGHT (6 * RSC_BS_CHARHEIGHT) ModalDialog RID_DLG_DEPENDENCIES { + HelpID = "desktop:ModalDialog:RID_DLG_DEPENDENCIES"; Size = MAP_APPFONT( (RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH + RSC_SP_DLG_INNERBORDER_RIGHT), @@ -52,6 +53,7 @@ ModalDialog RID_DLG_DEPENDENCIES { NoLabel = TRUE; }; ListBox RID_DLG_DEPENDENCIES_LIST { + HelpID = "desktop:ListBox:RID_DLG_DEPENDENCIES:RID_DLG_DEPENDENCIES_LIST"; Pos = MAP_APPFONT( RSC_SP_DLG_INNERBORDER_LEFT, (RSC_SP_DLG_INNERBORDER_TOP + LOCAL_TEXT_HEIGHT + diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src old mode 100755 new mode 100644 index 15823288ee20..665dbe5934d7 --- a/desktop/source/deployment/gui/dp_gui_dialog.src +++ b/desktop/source/deployment/gui/dp_gui_dialog.src @@ -169,6 +169,7 @@ String RID_STR_ERROR_MISSING_LICENSE ModalDialog RID_DLG_LICENSE { + HelpID = "desktop:ModalDialog:RID_DLG_LICENSE"; Text [ en-US ] = "Extension Software License Agreement"; Size = MAP_APPFONT(LIC_DLG_WIDTH, LIC_DLG_HEIGHT); @@ -181,6 +182,7 @@ ModalDialog RID_DLG_LICENSE MultiLineEdit ML_LICENSE { + HelpID = "desktop:MultiLineEdit:RID_DLG_LICENSE:ML_LICENSE"; Pos = MAP_APPFONT(COL1_X, ROW1_Y); Size = MAP_APPFONT(BODYWIDTH, ROW1_HEIGHT); Border = TRUE; @@ -230,6 +232,7 @@ ModalDialog RID_DLG_LICENSE }; PushButton PB_LICENSE_DOWN { + HelpID = "desktop:PushButton:RID_DLG_LICENSE:PB_LICENSE_DOWN"; TabStop = TRUE ; Pos = MAP_APPFONT(COL5_X , ROW3_Y) ; Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT) ; diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.src b/desktop/source/deployment/gui/dp_gui_dialog2.src index 7c47365999a0..996c96b1d083 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.src +++ b/desktop/source/deployment/gui/dp_gui_dialog2.src @@ -43,6 +43,7 @@ ModelessDialog RID_DLG_EXTENSION_MANAGER PushButton RID_EM_BTN_ADD { + HelpID = "desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_ADD"; TabStop = TRUE; Text [ en-US ] = "~Add..."; Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); @@ -50,6 +51,7 @@ ModelessDialog RID_DLG_EXTENSION_MANAGER PushButton RID_EM_BTN_CHECK_UPDATES { + HelpID = "desktop:PushButton:RID_DLG_EXTENSION_MANAGER:RID_EM_BTN_CHECK_UPDATES"; TabStop = TRUE; Text [ en-US ] = "Check for ~Updates..."; Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); @@ -131,6 +133,7 @@ ModalDialog RID_DLG_UPDATE_REQUIRED PushButton RID_EM_BTN_CHECK_UPDATES { + HelpID = "desktop:PushButton:RID_DLG_UPDATE_REQUIRED:RID_EM_BTN_CHECK_UPDATES"; TabStop = TRUE; Text [ en-US ] = "Check for ~Updates..."; Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); @@ -138,6 +141,7 @@ ModalDialog RID_DLG_UPDATE_REQUIRED PushButton RID_EM_BTN_CLOSE { + HelpID = "desktop:PushButton:RID_DLG_UPDATE_REQUIRED:RID_EM_BTN_CLOSE"; TabStop = TRUE; DefButton = TRUE; Text [ en-US ] = "Disable all"; diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src index 325d98c88d48..20b7d30988fd 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.src +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.src @@ -86,6 +86,7 @@ ModalDialog RID_DLG_UPDATE { TabStop = TRUE; }; CheckBox RID_DLG_UPDATE_ALL { + HelpID = "desktop:CheckBox:RID_DLG_UPDATE:RID_DLG_UPDATE_ALL"; Disable = TRUE; Pos = MAP_APPFONT( RSC_SP_DLG_INNERBORDER_LEFT, @@ -150,6 +151,7 @@ ModalDialog RID_DLG_UPDATE { Text[en-US] = "Release Notes"; }; MultiLineEdit RID_DLG_UPDATE_DESCRIPTIONS { + HelpID = "desktop:MultiLineEdit:RID_DLG_UPDATE:RID_DLG_UPDATE_DESCRIPTIONS"; Disable = TRUE; Border = TRUE; Pos = MAP_APPFONT( @@ -183,6 +185,7 @@ ModalDialog RID_DLG_UPDATE { Size = MAP_APPFONT(RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT); }; PushButton RID_DLG_UPDATE_OK { + HelpID = "desktop:PushButton:RID_DLG_UPDATE:RID_DLG_UPDATE_OK"; Disable = TRUE; Pos = MAP_APPFONT( (RSC_SP_DLG_INNERBORDER_LEFT + LOCAL_WIDTH - RSC_CD_PUSHBUTTON_WIDTH - diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src index d77dd256582c..f7cc93493b5d 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src @@ -90,6 +90,7 @@ ModalDialog RID_DLG_UPDATEINSTALL { }; MultiLineEdit RID_DLG_UPDATE_INSTALL_INFO { + HelpID = "desktop:MultiLineEdit:RID_DLG_UPDATEINSTALL:RID_DLG_UPDATE_INSTALL_INFO"; Pos = MAP_APPFONT( RSC_SP_DLG_INNERBORDER_LEFT, RSC_SP_DLG_INNERBORDER_TOP + RSC_CD_FIXEDTEXT_HEIGHT + diff --git a/desktop/source/migration/wizard.src b/desktop/source/migration/wizard.src index 9c1ab5496d39..e690e130c74f 100644 --- a/desktop/source/migration/wizard.src +++ b/desktop/source/migration/wizard.src @@ -188,6 +188,7 @@ TabPage TP_LICENSE }; MultiLineEdit ML_LICENSE { + HelpID = "desktop:MultiLineEdit:TP_LICENSE:ML_LICENSE"; PosSize = MAP_APPFONT (MARGINLEFT+INDENT, MARGINTOP + 8*ROWHEIGHT, BODYWIDTH-INDENT , BODYHEIGHT - 8*ROWHEIGHT - 20-2*MARGINBOTTOM) ; Border = TRUE; VScroll = TRUE; @@ -195,6 +196,7 @@ TabPage TP_LICENSE }; PushButton PB_LICENSE_DOWN { + HelpID = "desktop:PushButton:TP_LICENSE:PB_LICENSE_DOWN"; TabStop = TRUE ; Pos = MAP_APPFONT ( TP_WIDTH-MARGINRIGHT-50 , TP_HEIGHT-MARGINBOTTOM-18 ) ; Size = MAP_APPFONT ( 50, 15 ) ; @@ -240,6 +242,7 @@ TabPage TP_MIGRATION CheckBox CB_MIGRATION { + HelpID = "desktop:CheckBox:TP_MIGRATION:CB_MIGRATION"; Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*10); Size = MAP_APPFONT(BODYWIDTH, ROWHEIGHT*2); Check = TRUE; @@ -275,6 +278,7 @@ TabPage TP_UPDATE_CHECK CheckBox CB_UPDATE_CHECK { + HelpID = "desktop:CheckBox:TP_UPDATE_CHECK:CB_UPDATE_CHECK"; Pos = MAP_APPFONT(MARGINLEFT, MARGINTOP+ROWHEIGHT*10); Size = MAP_APPFONT(BODYWIDTH, ROWHEIGHT*2); Check = TRUE; @@ -321,6 +325,7 @@ TabPage TP_USER }; Edit ED_USER_FIRST { + HelpID = "desktop:Edit:TP_USER:ED_USER_FIRST"; Border = TRUE; Pos = MAP_APPFONT(MARGINLEFT+USERINDENT, MARGINTOP+ROWHEIGHT*7); Size = MAP_APPFONT(BODYWIDTH-USERINDENT, EDHEIGHT); @@ -333,6 +338,7 @@ TabPage TP_USER }; Edit ED_USER_LAST { + HelpID = "desktop:Edit:TP_USER:ED_USER_LAST"; Border = TRUE; Pos = MAP_APPFONT(MARGINLEFT+USERINDENT, MARGINTOP+ROWHEIGHT*9); Size = MAP_APPFONT(BODYWIDTH-USERINDENT, EDHEIGHT); @@ -345,6 +351,7 @@ TabPage TP_USER }; Edit ED_USER_INITIALS { + HelpID = "desktop:Edit:TP_USER:ED_USER_INITIALS"; Border = TRUE; Pos = MAP_APPFONT(MARGINLEFT+USERINDENT, MARGINTOP+ROWHEIGHT*11); Size = MAP_APPFONT(INITIALSWIDTH, EDHEIGHT); @@ -359,6 +366,7 @@ TabPage TP_USER }; Edit ED_USER_FATHER { + HelpID = "desktop:Edit:TP_USER:ED_USER_FATHER"; Border = TRUE; Hide = TRUE; Pos = MAP_APPFONT(MARGINLEFT+USERINDENT*2+INITIALSWIDTH+10, MARGINTOP+ROWHEIGHT*11); @@ -391,6 +399,7 @@ TabPage TP_REGISTRATION }; RadioButton RB_REGISTRATION_NOW { + HelpID = "desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NOW"; Text [ en-US ] = "I want to register ~now"; Pos = MAP_APPFONT(MARGINLEFT+INDENT2, ROWHEIGHT*12+2); Size = MAP_APPFONT(BODYWIDTH-INDENT2, RSC_CD_CHECKBOX_HEIGHT); @@ -398,12 +407,14 @@ TabPage TP_REGISTRATION }; RadioButton RB_REGISTRATION_LATER { + HelpID = "desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_LATER"; Text [ en-US ] = "I want to register ~later"; Pos = MAP_APPFONT(MARGINLEFT+INDENT2, ROWHEIGHT*12+2+RB_HEIGHT); Size = MAP_APPFONT(BODYWIDTH-INDENT2, RSC_CD_CHECKBOX_HEIGHT); }; RadioButton RB_REGISTRATION_NEVER { + HelpID = "desktop:RadioButton:TP_REGISTRATION:RB_REGISTRATION_NEVER"; Text [ en-US ] = "I do not want to ~register"; Pos = MAP_APPFONT(MARGINLEFT+INDENT2, ROWHEIGHT*12+2+RB_HEIGHT*2); Size = MAP_APPFONT(BODYWIDTH-INDENT2, RSC_CD_CHECKBOX_HEIGHT); diff --git a/formula/source/ui/dlg/formdlgs.src b/formula/source/ui/dlg/formdlgs.src index c85aa561ced8..935fed8ed2ba 100644 --- a/formula/source/ui/dlg/formdlgs.src +++ b/formula/source/ui/dlg/formdlgs.src @@ -163,6 +163,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL Moveable = TRUE ; TabControl TC_FUNCTION { + HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA_MODAL:TC_FUNCTION"; Pos = MAP_APPFONT ( 6 , 5 ) ; Size = MAP_APPFONT ( 102 , 199 ) ; PageList = @@ -249,6 +250,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL }; CheckBox BTN_MATRIX { + HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA_MODAL:BTN_MATRIX"; Pos = MAP_APPFONT ( 6 , 208 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; @@ -256,12 +258,14 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL }; Edit ED_REF { + HelpID = "formula:Edit:RID_FORMULADLG_FORMULA_MODAL:ED_REF"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 205 ) ; Size = MAP_APPFONT ( 66 , 12 ) ; }; ImageButton RB_REF { + HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA_MODAL:RB_REF"; Pos = MAP_APPFONT ( 144 , 205 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -281,6 +285,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL }; PushButton BTN_BACKWARD { + HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_BACKWARD"; Pos = MAP_APPFONT ( 171 , 208 ) ; Size = MAP_APPFONT ( 45 , 14 ) ; TabStop = TRUE ; @@ -288,6 +293,7 @@ ModalDialog RID_FORMULADLG_FORMULA_MODAL }; PushButton BTN_FORWARD { + HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA_MODAL:BTN_FORWARD"; Pos = MAP_APPFONT ( 219 , 208 ) ; Size = MAP_APPFONT ( 45 , 14 ) ; TabStop = TRUE ; @@ -324,6 +330,7 @@ ModelessDialog RID_FORMULADLG_FORMULA Moveable = TRUE ; TabControl TC_FUNCTION { + HelpID = "formula:TabControl:RID_FORMULADLG_FORMULA:TC_FUNCTION"; Pos = MAP_APPFONT ( 6 , 5 ) ; Size = MAP_APPFONT ( 102 , 199 ) ; PageList = @@ -410,6 +417,7 @@ ModelessDialog RID_FORMULADLG_FORMULA }; CheckBox BTN_MATRIX { + HelpID = "formula:CheckBox:RID_FORMULADLG_FORMULA:BTN_MATRIX"; Pos = MAP_APPFONT ( 6 , 208 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; @@ -417,12 +425,14 @@ ModelessDialog RID_FORMULADLG_FORMULA }; Edit ED_REF { + HelpID = "formula:Edit:RID_FORMULADLG_FORMULA:ED_REF"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 205 ) ; Size = MAP_APPFONT ( 66 , 12 ) ; }; ImageButton RB_REF { + HelpID = "formula:ImageButton:RID_FORMULADLG_FORMULA:RB_REF"; Pos = MAP_APPFONT ( 144 , 205 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = FALSE ; @@ -442,6 +452,7 @@ ModelessDialog RID_FORMULADLG_FORMULA }; PushButton BTN_BACKWARD { + HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA:BTN_BACKWARD"; Pos = MAP_APPFONT ( 171 , 208 ) ; Size = MAP_APPFONT ( 45 , 14 ) ; TabStop = TRUE ; @@ -449,6 +460,7 @@ ModelessDialog RID_FORMULADLG_FORMULA }; PushButton BTN_FORWARD { + HelpID = "formula:PushButton:RID_FORMULADLG_FORMULA:BTN_FORWARD"; Pos = MAP_APPFONT ( 219 , 208 ) ; Size = MAP_APPFONT ( 45 , 14 ) ; TabStop = TRUE ; diff --git a/formula/source/ui/dlg/parawin.src b/formula/source/ui/dlg/parawin.src index eda2bfcecda9..ea0b9b2f480b 100644 --- a/formula/source/ui/dlg/parawin.src +++ b/formula/source/ui/dlg/parawin.src @@ -68,6 +68,7 @@ TabPage RID_FORMULATAB_PARAMETER { + HelpID = "formula:TabPage:RID_FORMULATAB_PARAMETER"; Border = FALSE; Size = MAP_APPFONT( 203, 128 ); DialogControl = TRUE; @@ -119,10 +120,18 @@ TabPage RID_FORMULATAB_PARAMETER HelpId=HID_FORMULA_FAP_BTN_FX4; FXBUTTONBLOCK ( 109 ) }; - Edit ED_ARG1 { ED_ARGBLOCK ( 64 ) }; - Edit ED_ARG2 { ED_ARGBLOCK ( 79 ) }; - Edit ED_ARG3 { ED_ARGBLOCK ( 94 ) }; - Edit ED_ARG4 { ED_ARGBLOCK ( 109 ) }; + Edit ED_ARG1 { ED_ARGBLOCK ( 64 ) + HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG1"; + }; + Edit ED_ARG2 { ED_ARGBLOCK ( 79 ) + HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG2"; + }; + Edit ED_ARG3 { ED_ARGBLOCK ( 94 ) + HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG3"; + }; + Edit ED_ARG4 { ED_ARGBLOCK ( 109 ) + HelpID = "formula:Edit:RID_FORMULATAB_PARAMETER:ED_ARG4"; + }; ImageButton RB_ARG1 { diff --git a/fpicker/source/office/iodlg.src b/fpicker/source/office/iodlg.src index 0b3c27b68071..da2d1cd926b6 100644 --- a/fpicker/source/office/iodlg.src +++ b/fpicker/source/office/iodlg.src @@ -79,12 +79,14 @@ ModalDialog DLG_SVT_EXPLORERFILE }; ImageButton BTN_EXPLORERFILE_NEWFOLDER { + HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_NEWFOLDER"; TabStop = FALSE ; Pos = MAP_APPFONT ( 59 , 6 ) ; QuickHelpText [ en-US ] = "Create New Directory" ; }; ImageButton BTN_EXPLORERFILE_LISTVIEW { + HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_LISTVIEW"; TabStop = FALSE ; Pos = MAP_APPFONT ( 109 , 6 ) ; ButtonImage = Image @@ -99,6 +101,7 @@ ModalDialog DLG_SVT_EXPLORERFILE }; ImageButton BTN_EXPLORERFILE_DETAILSVIEW { + HelpID = "fpicker:ImageButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_DETAILSVIEW"; TabStop = FALSE ; Pos = MAP_APPFONT ( 109 , 6 ) ; ButtonImage = Image @@ -113,6 +116,7 @@ ModalDialog DLG_SVT_EXPLORERFILE }; MenuButton BTN_EXPLORERFILE_UP { + HelpID = "fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_UP"; TabStop = FALSE ; Pos = MAP_APPFONT ( 109 , 6 ) ; QuickHelpText [ en-US ] = "Up One Level" ; @@ -120,6 +124,7 @@ ModalDialog DLG_SVT_EXPLORERFILE MenuButton BTN_EXPLORERFILE_STANDARD { + HelpID = "fpicker:MenuButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_STANDARD"; TabStop = FALSE ; Pos = MAP_APPFONT ( 59 , 6 ) ; QuickHelpText [ en-US ] = "Default Directory" ; @@ -139,6 +144,7 @@ ModalDialog DLG_SVT_EXPLORERFILE }; Edit ED_EXPLORERFILE_FILENAME { + HelpID = "fpicker:Edit:DLG_SVT_EXPLORERFILE:ED_EXPLORERFILE_FILENAME"; Pos = MAP_APPFONT ( 59 , 117 ) ; Size = MAP_APPFONT ( 159 , 12 ) ; Border = TRUE ; @@ -152,6 +158,7 @@ ModalDialog DLG_SVT_EXPLORERFILE }; ListBox LB_EXPLORERFILE_SHARED_LISTBOX { + HelpID = "fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_SHARED_LISTBOX"; Pos = MAP_APPFONT ( 59 , 132 ) ; Size = MAP_APPFONT ( 159 , 40 ) ; DropDown = TRUE ; @@ -166,6 +173,7 @@ ModalDialog DLG_SVT_EXPLORERFILE }; ListBox LB_EXPLORERFILE_FILETYPE { + HelpID = "fpicker:ListBox:DLG_SVT_EXPLORERFILE:LB_EXPLORERFILE_FILETYPE"; Pos = MAP_APPFONT ( 59 , 147 ) ; Size = MAP_APPFONT ( 159 , 80 ) ; DropDown = TRUE ; @@ -175,26 +183,31 @@ ModalDialog DLG_SVT_EXPLORERFILE }; CheckBox CB_EXPLORERFILE_READONLY { + HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_READONLY"; Size = MAP_APPFONT ( 80 , 10 ) ; Text [ en-US ] = "~Read-only" ; }; CheckBox CB_EXPLORERFILE_PASSWORD { + HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_EXPLORERFILE_PASSWORD"; Size = MAP_APPFONT ( 100, 10 ) ; Text [ en-US ] = "Save with password" ; }; CheckBox CB_AUTO_EXTENSION { + HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_AUTO_EXTENSION"; Size = MAP_APPFONT ( 160 , 10 ) ; Text [ en-US ] = "~Automatic file name extension" ; }; CheckBox CB_OPTIONS { + HelpID = "fpicker:CheckBox:DLG_SVT_EXPLORERFILE:CB_OPTIONS"; Size = MAP_APPFONT ( 120 , 10 ) ; Text [ en-US ] = "Edit ~filter settings"; }; PushButton BTN_EXPLORERFILE_OPEN { + HelpID = "fpicker:PushButton:DLG_SVT_EXPLORERFILE:BTN_EXPLORERFILE_OPEN"; Pos = MAP_APPFONT ( 224 , 117 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; DefButton = TRUE ; @@ -243,6 +256,7 @@ ModalDialog DLG_SVT_EXPLORERFILE // QueryFolderNameDialog ---------------------------------------------------------- ModalDialog DLG_SVT_QUERYFOLDERNAME { + HelpID = "fpicker:ModalDialog:DLG_SVT_QUERYFOLDERNAME"; Border = TRUE ; Moveable = TRUE ; OutputSize = TRUE ; @@ -257,6 +271,7 @@ ModalDialog DLG_SVT_QUERYFOLDERNAME }; Edit ED_SVT_QUERYFOLDERNAME_DLG_NAME { + HelpID = "fpicker:Edit:DLG_SVT_QUERYFOLDERNAME:ED_SVT_QUERYFOLDERNAME_DLG_NAME"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 138 , 12 ) ; Border = TRUE ; diff --git a/framework/source/classes/resource.src b/framework/source/classes/resource.src index 2f8e1bdf2f16..e14c57fb555a 100644 --- a/framework/source/classes/resource.src +++ b/framework/source/classes/resource.src @@ -175,6 +175,7 @@ ModalDialog DLG_LICENSE MultiLineEdit ML_LICENSE { + HelpID = "framework:MultiLineEdit:DLG_LICENSE:ML_LICENSE"; PosSize = MAP_APPFONT ( LICENSE_COL_1 , LICENSE_ROW_1 , LICENSE_WIDTH , LICENSE_HEIGHT ) ; Border = TRUE ; VScroll = TRUE ; @@ -221,6 +222,7 @@ ModalDialog DLG_LICENSE PushButton PB_PAGEDOWN { + HelpID = "framework:PushButton:DLG_LICENSE:PB_PAGEDOWN"; TabStop = TRUE ; Pos = MAP_APPFONT ( LICENSE_COL_4 , LICENSE_ROW_3 ) ; Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ; @@ -261,6 +263,7 @@ ModalDialog DLG_LICENSE PushButton PB_ACCEPT { + HelpID = "framework:PushButton:DLG_LICENSE:PB_ACCEPT"; TabStop = TRUE ; Pos = MAP_APPFONT ( LICENSE_COL_4 - PD_WIDTH - OFFSET_IMG , LICENSE_ROW_6 ) ; Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ; @@ -268,6 +271,7 @@ ModalDialog DLG_LICENSE PushButton PB_DECLINE { + HelpID = "framework:PushButton:DLG_LICENSE:PB_DECLINE"; TabStop = TRUE ; Pos = MAP_APPFONT ( LICENSE_COL_4 , LICENSE_ROW_6 ) ; Size = MAP_APPFONT ( PD_WIDTH , PB_HEIGHT ) ; diff --git a/sfx2/source/appl/dde.src b/sfx2/source/appl/dde.src index 22df8eff16ba..18f6517f181c 100644 --- a/sfx2/source/appl/dde.src +++ b/sfx2/source/appl/dde.src @@ -29,6 +29,7 @@ ModalDialog MD_DDE_LINKEDIT { + HelpID = "sfx2:ModalDialog:MD_DDE_LINKEDIT"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 223 , 74 ) ; @@ -42,6 +43,7 @@ ModalDialog MD_DDE_LINKEDIT }; Edit ED_DDE_APP { + HelpID = "sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_APP"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 14 ) ; Size = MAP_APPFONT ( 100 , 12 ) ; @@ -54,6 +56,7 @@ ModalDialog MD_DDE_LINKEDIT }; Edit ED_DDE_TOPIC { + HelpID = "sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_TOPIC"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 32 ) ; Size = MAP_APPFONT ( 100 , 12 ) ; @@ -66,6 +69,7 @@ ModalDialog MD_DDE_LINKEDIT }; Edit ED_DDE_ITEM { + HelpID = "sfx2:Edit:MD_DDE_LINKEDIT:ED_DDE_ITEM"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 50 ) ; Size = MAP_APPFONT ( 100 , 12 ) ; diff --git a/sfx2/source/appl/newhelp.src b/sfx2/source/appl/newhelp.src index 8a2b4f760f7e..88dfed8ad71e 100644 --- a/sfx2/source/appl/newhelp.src +++ b/sfx2/source/appl/newhelp.src @@ -93,12 +93,14 @@ TabPage TP_HELP_INDEX }; ComboBox CB_INDEX { + HelpID = "sfx2:ComboBox:TP_HELP_INDEX:CB_INDEX"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 108 , 97 ) ; }; PushButton PB_OPEN_INDEX { + HelpID = "sfx2:PushButton:TP_HELP_INDEX:PB_OPEN_INDEX"; Pos = MAP_APPFONT ( 64 , 115 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Display" ; @@ -119,6 +121,7 @@ TabPage TP_HELP_SEARCH }; ComboBox ED_SEARCH { + HelpID = "sfx2:ComboBox:TP_HELP_SEARCH:ED_SEARCH"; Border = TRUE ; DropDown = TRUE; Pos = MAP_APPFONT ( 6 , 17 ) ; @@ -126,30 +129,35 @@ TabPage TP_HELP_SEARCH }; PushButton PB_SEARCH { + HelpID = "sfx2:PushButton:TP_HELP_SEARCH:PB_SEARCH"; Pos = MAP_APPFONT ( 101 , 17 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Find"; }; CheckBox CB_FULLWORDS { + HelpID = "sfx2:CheckBox:TP_HELP_SEARCH:CB_FULLWORDS"; Pos = MAP_APPFONT ( 6, 34 ) ; Size = MAP_APPFONT ( 128 , 10 ) ; Text [ en-US ] = "~Complete words only"; }; CheckBox CB_SCOPE { + HelpID = "sfx2:CheckBox:TP_HELP_SEARCH:CB_SCOPE"; Pos = MAP_APPFONT ( 6, 47 ) ; Size = MAP_APPFONT ( 128 , 10 ) ; Text [ en-US ] = "Find in ~headings only"; }; ListBox LB_RESULT { + HelpID = "sfx2:ListBox:TP_HELP_SEARCH:LB_RESULT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 60 ) ; Size = MAP_APPFONT ( 128 , 30 ) ; }; PushButton PB_OPEN_SEARCH { + HelpID = "sfx2:PushButton:TP_HELP_SEARCH:PB_OPEN_SEARCH"; Pos = MAP_APPFONT ( 84 , 182 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Display" ; @@ -170,6 +178,7 @@ TabPage TP_HELP_BOOKMARKS }; ListBox LB_BOOKMARKS { + HelpID = "sfx2:ListBox:TP_HELP_BOOKMARKS:LB_BOOKMARKS"; Border = TRUE ; Sort = TRUE; Pos = MAP_APPFONT ( 6 , 19 ) ; @@ -177,6 +186,7 @@ TabPage TP_HELP_BOOKMARKS }; PushButton PB_BOOKMARKS { + HelpID = "sfx2:PushButton:TP_HELP_BOOKMARKS:PB_BOOKMARKS"; Pos = MAP_APPFONT ( 64 , 119 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Display" ; @@ -337,6 +347,7 @@ String STR_HELP_MENU_TEXT_COPY }; ModalDialog DLG_HELP_ADDBOOKMARK { + HelpID = "sfx2:ModalDialog:DLG_HELP_ADDBOOKMARK"; Size = MAP_APPFONT ( 208 , 43 ) ; Text [ en-US ] = "Add to Bookmarks"; MOVEABLE = TRUE ; @@ -353,6 +364,7 @@ ModalDialog DLG_HELP_ADDBOOKMARK }; Edit ED_BOOKMARK_TITLE { + HelpID = "sfx2:Edit:DLG_HELP_ADDBOOKMARK:ED_BOOKMARK_TITLE"; PosSize = MAP_APPFONT ( 6 , 19 , 140 , 12 ) ; TABSTOP = TRUE ; BORDER = TRUE ; diff --git a/sfx2/source/dialog/alienwarn.src b/sfx2/source/dialog/alienwarn.src index 7aa6f3230778..ae07b28a4f4d 100644 --- a/sfx2/source/dialog/alienwarn.src +++ b/sfx2/source/dialog/alienwarn.src @@ -81,6 +81,7 @@ ModalDialog RID_DLG_ALIEN_WARNING }; CheckBox CB_WARNING_OFF { + HelpID = "sfx2:CheckBox:RID_DLG_ALIEN_WARNING:CB_WARNING_OFF"; Pos = MAP_APPFONT( AW_COL_2, AW_ROW_4 ); Size = MAP_APPFONT( DIALOG_WIDTH-AW_COL_2-RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ); WordBreak = TRUE ; diff --git a/sfx2/source/dialog/dinfdlg.src b/sfx2/source/dialog/dinfdlg.src old mode 100755 new mode 100644 index 53b0f35685cb..c78347e3dba3 --- a/sfx2/source/dialog/dinfdlg.src +++ b/sfx2/source/dialog/dinfdlg.src @@ -53,6 +53,7 @@ TabPage TP_DOCINFODESC }; Edit ED_TITLE { + HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_TITLE"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 6 ) ; Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -68,6 +69,7 @@ TabPage TP_DOCINFODESC }; Edit ED_THEMA { + HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_THEMA"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 21 ) ; Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -83,6 +85,7 @@ TabPage TP_DOCINFODESC }; Edit ED_KEYWORDS { + HelpID = "sfx2:Edit:TP_DOCINFODESC:ED_KEYWORDS"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 36 ) ; Size = MAP_APPFONT ( 184 , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -98,6 +101,7 @@ TabPage TP_DOCINFODESC }; MultiLineEdit ED_COMMENT { + HelpID = "sfx2:MultiLineEdit:TP_DOCINFODESC:ED_COMMENT"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 51 ) ; Size = MAP_APPFONT ( 184 , 128 ) ; @@ -121,6 +125,7 @@ TabPage TP_DOCINFODOC }; Edit ED_FILE_NAME { + HelpID = "sfx2:Edit:TP_DOCINFODOC:ED_FILE_NAME"; Pos = MAP_APPFONT ( 54 , 12 ) ; Size = MAP_APPFONT ( 200 , RSC_CD_TEXTBOX_HEIGHT ) ; Border = TRUE ; @@ -138,11 +143,13 @@ TabPage TP_DOCINFODOC }; Edit FT_FILE_SHOW_TYP { + HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_FILE_SHOW_TYP"; Pos = MAP_APPFONT ( 78 , 37 ) ; Size = MAP_APPFONT ( 106 , RSC_CD_FIXEDTEXT_HEIGHT ) ; }; CheckBox CB_FILE_READONLY { + HelpID = "sfx2:CheckBox:TP_DOCINFODOC:CB_FILE_READONLY"; Pos = MAP_APPFONT ( 163 , 37 ) ; Size = MAP_APPFONT ( 91 , RSC_CD_CHECKBOX_HEIGHT ) ; Text [ en-US ] = "~Read-only" ; @@ -155,6 +162,7 @@ TabPage TP_DOCINFODOC }; Edit FT_FILE_VAL { + HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_FILE_VAL"; Pos = MAP_APPFONT ( 78 , 49 ) ; Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ; }; @@ -166,6 +174,7 @@ TabPage TP_DOCINFODOC }; Edit FT_FILE_SHOW_SIZE { + HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_FILE_SHOW_SIZE"; Pos = MAP_APPFONT ( 78 , 61 ) ; Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ; }; @@ -182,6 +191,7 @@ TabPage TP_DOCINFODOC }; Edit FT_CREATE_VAL { + HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_CREATE_VAL"; Pos = MAP_APPFONT ( 78 , 80 ) ; Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ; }; @@ -193,6 +203,7 @@ TabPage TP_DOCINFODOC }; Edit FT_CHANGE_VAL { + HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_CHANGE_VAL"; Pos = MAP_APPFONT ( 78 , 92 ) ; Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ; }; @@ -204,11 +215,13 @@ TabPage TP_DOCINFODOC }; Edit FT_SIGNED_VAL { + HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_SIGNED_VAL"; Pos = MAP_APPFONT ( 78 , 104 ) ; Size = MAP_APPFONT ( 123 , RSC_CD_FIXEDTEXT_HEIGHT ) ; }; PushButton BTN_SIGNATURE { + HelpID = "sfx2:PushButton:TP_DOCINFODOC:BTN_SIGNATURE"; Pos = MAP_APPFONT ( 204 , 101 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Text [ en-US ] = "Digital Signature..."; @@ -225,6 +238,7 @@ TabPage TP_DOCINFODOC }; Edit FT_PRINT_VAL { + HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_PRINT_VAL"; Pos = MAP_APPFONT ( 78 , 116 ) ; Size = MAP_APPFONT ( 176 , RSC_CD_FIXEDTEXT_HEIGHT ) ; }; @@ -236,6 +250,7 @@ TabPage TP_DOCINFODOC }; Edit FT_TIMELOG_VAL { + HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_TIMELOG_VAL"; Pos = MAP_APPFONT ( 78 , 128 ) ; Size = MAP_APPFONT ( 30 , RSC_CD_FIXEDTEXT_HEIGHT ) ; }; @@ -247,11 +262,13 @@ TabPage TP_DOCINFODOC }; Edit FT_DOCNO_VAL { + HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_DOCNO_VAL"; Pos = MAP_APPFONT ( 78 , 140 ) ; Size = MAP_APPFONT ( 30 , RSC_CD_FIXEDTEXT_HEIGHT ) ; }; PushButton BTN_DELETE { + HelpID = "sfx2:PushButton:TP_DOCINFODOC:BTN_DELETE"; Pos = MAP_APPFONT ( 204 , 150 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; Hide = TRUE; @@ -259,6 +276,7 @@ TabPage TP_DOCINFODOC }; CheckBox CB_USE_USERDATA { + HelpID = "sfx2:CheckBox:TP_DOCINFODOC:CB_USE_USERDATA"; Pos = MAP_APPFONT ( 6 , 152 ) ; Size = MAP_APPFONT ( 192 , RSC_CD_CHECKBOX_HEIGHT ) ; Hide = TRUE; @@ -277,6 +295,7 @@ TabPage TP_DOCINFODOC }; Edit FT_TEMPL_VAL { + HelpID = "sfx2:Edit:TP_DOCINFODOC:FT_TEMPL_VAL"; Pos = MAP_APPFONT ( 78 , 172 ) ; Size = MAP_APPFONT ( 180 , RSC_CD_FIXEDTEXT_HEIGHT ) ; }; @@ -301,6 +320,7 @@ TabPage TP_DOCINFOUSER }; Edit ED_INFO1 { + HelpID = "sfx2:Edit:TP_DOCINFOUSER:ED_INFO1"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 248 , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -314,6 +334,7 @@ TabPage TP_DOCINFOUSER }; Edit ED_INFO2 { + HelpID = "sfx2:Edit:TP_DOCINFOUSER:ED_INFO2"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 43 ) ; Size = MAP_APPFONT ( 248 , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -327,6 +348,7 @@ TabPage TP_DOCINFOUSER }; Edit ED_INFO3 { + HelpID = "sfx2:Edit:TP_DOCINFOUSER:ED_INFO3"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 69 ) ; Size = MAP_APPFONT ( 248 , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -340,6 +362,7 @@ TabPage TP_DOCINFOUSER }; Edit ED_INFO4 { + HelpID = "sfx2:Edit:TP_DOCINFOUSER:ED_INFO4"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 95 ) ; Size = MAP_APPFONT ( 248 , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -347,6 +370,7 @@ TabPage TP_DOCINFOUSER }; PushButton BTN_EDITLABEL { + HelpID = "sfx2:PushButton:TP_DOCINFOUSER:BTN_EDITLABEL"; Pos = MAP_APPFONT ( 194 , 165 ) ; Size = MAP_APPFONT ( 60 , RSC_CD_PUSHBUTTON_HEIGHT ) ; Text [ en-US ] = "~Info fields..." ; @@ -362,6 +386,7 @@ TabPage TP_DOCINFORELOAD Size = MAP_APPFONT ( 260 , 185 ) ; RadioButton RB_NOAUTOUPDATE { + HelpID = "sfx2:RadioButton:TP_DOCINFORELOAD:RB_NOAUTOUPDATE"; TabStop = TRUE ; Pos = MAP_APPFONT( COL_0 , ROW_0 ) ; Size = MAP_APPFONT( COL_7 - COL_1 , RSC_CD_RADIOBUTTON_HEIGHT ) ; @@ -370,6 +395,7 @@ TabPage TP_DOCINFORELOAD RadioButton RB_RELOADUPDATE { + HelpID = "sfx2:RadioButton:TP_DOCINFORELOAD:RB_RELOADUPDATE"; TabStop = TRUE ; Pos = MAP_APPFONT( COL_0, ROW_1 ) ; Size = MAP_APPFONT( COL_7 - COL_1, RSC_CD_RADIOBUTTON_HEIGHT ) ; @@ -383,6 +409,7 @@ TabPage TP_DOCINFORELOAD }; NumericField ED_RELOAD { + HelpID = "sfx2:NumericField:TP_DOCINFORELOAD:ED_RELOAD"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , ROW_2 - ROWDIFF_FT_EDTFLD ) ; Size = MAP_APPFONT ( WIDTH_2 , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -403,6 +430,7 @@ TabPage TP_DOCINFORELOAD RadioButton RB_FORWARDUPDATE { + HelpID = "sfx2:RadioButton:TP_DOCINFORELOAD:RB_FORWARDUPDATE"; TabStop = TRUE ; Pos = MAP_APPFONT( COL_0, ROW_3 ) ; Size = MAP_APPFONT( COL_7 - COL_1, RSC_CD_RADIOBUTTON_HEIGHT ) ; @@ -416,6 +444,7 @@ TabPage TP_DOCINFORELOAD }; NumericField ED_FORWARD { + HelpID = "sfx2:NumericField:TP_DOCINFORELOAD:ED_FORWARD"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , ROW_4 - ROWDIFF_FT_EDTFLD ) ; Size = MAP_APPFONT ( WIDTH_2 , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -441,12 +470,14 @@ TabPage TP_DOCINFORELOAD }; Edit ED_URL { + HelpID = "sfx2:Edit:TP_DOCINFORELOAD:ED_URL"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , ROW_5 - ROWDIFF_FT_EDTFLD ) ; Size = MAP_APPFONT ( COL_5 - COL_2 , RSC_CD_TEXTBOX_HEIGHT ) ; }; PushButton PB_BROWSEURL { + HelpID = "sfx2:PushButton:TP_DOCINFORELOAD:PB_BROWSEURL"; Pos = MAP_APPFONT ( COL_6 , ROW_5 - ROWDIFF_FT_EDTFLD ) ; Size = MAP_APPFONT ( COL_7 - COL_6 , RSC_CD_PUSHBUTTON_HEIGHT ) ; Text = "..." ; @@ -459,6 +490,7 @@ TabPage TP_DOCINFORELOAD }; ComboBox CB_FRAME { + HelpID = "sfx2:ComboBox:TP_DOCINFORELOAD:CB_FRAME"; Pos = MAP_APPFONT ( COL_2 , ROW_6 - ROWDIFF_FT_EDTFLD ) ; Size = MAP_APPFONT ( COL_7 - COL_2 , RSC_CD_DROPDOWN_HEIGHT * 10 ) ; DropDown = TRUE ; @@ -524,6 +556,7 @@ TabPage TP_CUSTOMPROPERTIES }; PushButton BTN_ADD { + HelpID = "sfx2:PushButton:TP_CUSTOMPROPERTIES:BTN_ADD"; Pos = MAP_APPFONT( 204 , 165 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "~Add"; @@ -756,6 +789,7 @@ ModalDialog RID_EDIT_DURATIONS }; CheckBox CB_NEGATIVE { + HelpID = "sfx2:CheckBox:RID_EDIT_DURATIONS:CB_NEGATIVE"; Pos = MAP_APPFONT ( 6 , 21 ) ; Size = MAP_APPFONT ( 60 , RSC_CD_FIXEDTEXT_HEIGHT ) ; Text [ en-US ] = "~Negative" ; @@ -769,6 +803,7 @@ ModalDialog RID_EDIT_DURATIONS }; NumericField ED_YEAR { + HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_YEAR"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 36 ) ; Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ; @@ -789,6 +824,7 @@ ModalDialog RID_EDIT_DURATIONS }; NumericField ED_MONTH { + HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_MONTH"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 50 ) ; Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ; @@ -809,6 +845,7 @@ ModalDialog RID_EDIT_DURATIONS }; NumericField ED_DAY { + HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_DAY"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 64 ) ; Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ; @@ -829,6 +866,7 @@ ModalDialog RID_EDIT_DURATIONS }; NumericField ED_HOUR { + HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_HOUR"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 78 ) ; Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ; @@ -849,6 +887,7 @@ ModalDialog RID_EDIT_DURATIONS }; NumericField ED_MINUTE { + HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_MINUTE"; Border = TRUE ; Pos = MAP_APPFONT ( 70, 92) ; Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ; @@ -869,6 +908,7 @@ ModalDialog RID_EDIT_DURATIONS }; NumericField ED_SECOND { + HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_SECOND"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 106 ) ; Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ; @@ -889,6 +929,7 @@ ModalDialog RID_EDIT_DURATIONS }; NumericField ED_MSECOND { + HelpID = "sfx2:NumericField:RID_EDIT_DURATIONS:ED_MSECOND"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 120 ) ; Size = MAP_APPFONT ( 40, RSC_CD_TEXTBOX_HEIGHT ) ; diff --git a/sfx2/source/dialog/dinfedt.src b/sfx2/source/dialog/dinfedt.src index 7f4875487536..110dccf11c40 100644 --- a/sfx2/source/dialog/dinfedt.src +++ b/sfx2/source/dialog/dinfedt.src @@ -45,24 +45,28 @@ ModalDialog DLG_DOCINFO_EDT }; Edit ED_INFO1 { + HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO1"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 86 , 12 ) ; }; Edit ED_INFO2 { + HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO2"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 29 ) ; Size = MAP_APPFONT ( 86 , 12 ) ; }; Edit ED_INFO3 { + HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO3"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 86 , 12 ) ; }; Edit ED_INFO4 { + HelpID = "sfx2:Edit:DLG_DOCINFO_EDT:ED_INFO4"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 59 ) ; Size = MAP_APPFONT ( 86 , 12 ) ; diff --git a/sfx2/source/dialog/mgetempl.src b/sfx2/source/dialog/mgetempl.src index f07d0873e454..bfa3948d90ac 100644 --- a/sfx2/source/dialog/mgetempl.src +++ b/sfx2/source/dialog/mgetempl.src @@ -44,12 +44,14 @@ TabPage TP_MANAGE_STYLES }; Edit ED_NAME { + HelpID = "sfx2:Edit:TP_MANAGE_STYLES:ED_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 6 ) ; Size = MAP_APPFONT ( 184 , 12 ) ; }; CheckBox CB_AUTO { + HelpID = "sfx2:CheckBox:TP_MANAGE_STYLES:CB_AUTO"; Pos = MAP_APPFONT ( 164 , 8 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Hide = TRUE ; @@ -63,6 +65,7 @@ TabPage TP_MANAGE_STYLES }; ListBox LB_NEXT { + HelpID = "sfx2:ListBox:TP_MANAGE_STYLES:LB_NEXT"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 24 ) ; Size = MAP_APPFONT ( 184 , 65 ) ; @@ -79,6 +82,7 @@ TabPage TP_MANAGE_STYLES }; ListBox LB_BASE { + HelpID = "sfx2:ListBox:TP_MANAGE_STYLES:LB_BASE"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 42 ) ; Size = MAP_APPFONT ( 184 , 65 ) ; @@ -93,6 +97,7 @@ TabPage TP_MANAGE_STYLES }; ListBox LB_REGION { + HelpID = "sfx2:ListBox:TP_MANAGE_STYLES:LB_REGION"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 60 ) ; Size = MAP_APPFONT ( 184 , 64 ) ; @@ -107,6 +112,7 @@ TabPage TP_MANAGE_STYLES }; MultiLineEdit ED_DESC { + HelpID = "sfx2:MultiLineEdit:TP_MANAGE_STYLES:ED_DESC"; Pos = MAP_APPFONT ( 12 , 88 ) ; Size = MAP_APPFONT ( 236 , 85 ) ; ReadOnly = TRUE ; diff --git a/sfx2/source/dialog/newstyle.src b/sfx2/source/dialog/newstyle.src index 90ed1a139cbb..b5954028779b 100644 --- a/sfx2/source/dialog/newstyle.src +++ b/sfx2/source/dialog/newstyle.src @@ -46,6 +46,7 @@ ModalDialog DLG_NEW_STYLE_BY_EXAMPLE }; ComboBox LB_COL { + HelpID = "sfx2:ComboBox:DLG_NEW_STYLE_BY_EXAMPLE:LB_COL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 94 , 92 ) ; TabStop = TRUE ; diff --git a/sfx2/source/dialog/passwd.src b/sfx2/source/dialog/passwd.src index fc58ecfda219..79cbb382ad36 100644 --- a/sfx2/source/dialog/passwd.src +++ b/sfx2/source/dialog/passwd.src @@ -47,6 +47,7 @@ ModalDialog DLG_PASSWD }; Edit ED_PASSWD_USER { + HelpID = "sfx2:Edit:DLG_PASSWD:ED_PASSWD_USER"; Border = TRUE; Pos = MAP_APPFONT( 57, 14 ); Size = MAP_APPFONT( 75, 12 ); @@ -59,6 +60,7 @@ ModalDialog DLG_PASSWD }; Edit ED_PASSWD_PASSWORD { + HelpID = "sfx2:Edit:DLG_PASSWD:ED_PASSWD_PASSWORD"; Border = TRUE; PassWord = TRUE; Pos = MAP_APPFONT( 57, 29 ); @@ -72,6 +74,7 @@ ModalDialog DLG_PASSWD }; Edit ED_PASSWD_CONFIRM { + HelpID = "sfx2:Edit:DLG_PASSWD:ED_PASSWD_CONFIRM"; Border = TRUE; PassWord = TRUE; Pos = MAP_APPFONT( 57, 44 ); diff --git a/sfx2/source/dialog/printopt.src b/sfx2/source/dialog/printopt.src index 4217539a3af8..01650f3e9275 100644 --- a/sfx2/source/dialog/printopt.src +++ b/sfx2/source/dialog/printopt.src @@ -60,6 +60,7 @@ TabPage TP_COMMONPRINTOPTIONS }; RadioButton RB_PRINTEROUTPUT { + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTEROUTPUT"; TabStop = TRUE; Pos = MAP_APPFONT ( 81, 14 ) ; Size = MAP_APPFONT ( 60, 10 ) ; @@ -67,6 +68,7 @@ TabPage TP_COMMONPRINTOPTIONS }; RadioButton RB_PRINTFILEOUTPUT { + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_PRINTFILEOUTPUT"; TabStop = TRUE; Pos = MAP_APPFONT ( 142, 14 ) ; Size = MAP_APPFONT ( 100, 10 ) ; @@ -83,6 +85,7 @@ TabPage TP_COMMONPRINTOPTIONS CheckBox CB_REDUCETRANSPARENCY { + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCETRANSPARENCY"; TabStop = TRUE; Pos = MAP_APPFONT ( 18, 38 ) ; Size = MAP_APPFONT ( 115, 10 ) ; @@ -90,6 +93,7 @@ TabPage TP_COMMONPRINTOPTIONS }; RadioButton RB_REDUCETRANSPARENCY_AUTO { + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_AUTO"; TabStop = TRUE; Pos = MAP_APPFONT ( 28, 51 ) ; Size = MAP_APPFONT ( 105, 10 ) ; @@ -97,6 +101,7 @@ TabPage TP_COMMONPRINTOPTIONS }; RadioButton RB_REDUCETRANSPARENCY_NONE { + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCETRANSPARENCY_NONE"; TabStop = TRUE; Pos = MAP_APPFONT ( 28, 64 ) ; Size = MAP_APPFONT ( 105, 10 ) ; @@ -107,6 +112,7 @@ TabPage TP_COMMONPRINTOPTIONS CheckBox CB_REDUCEGRADIENTS { + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEGRADIENTS"; TabStop = TRUE; Pos = MAP_APPFONT ( 136, 38 ) ; Size = MAP_APPFONT ( 121, 10 ) ; @@ -114,6 +120,7 @@ TabPage TP_COMMONPRINTOPTIONS }; RadioButton RB_REDUCEGRADIENTS_STRIPES { + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_STRIPES"; TabStop = TRUE; Pos = MAP_APPFONT ( 146, 51 ) ; Size = MAP_APPFONT ( 77, 10 ) ; @@ -121,6 +128,7 @@ TabPage TP_COMMONPRINTOPTIONS }; NumericField NF_REDUCEGRADIENTS_STEPCOUNT { + HelpID = "sfx2:NumericField:TP_COMMONPRINTOPTIONS:NF_REDUCEGRADIENTS_STEPCOUNT"; TabStop = TRUE; Border = TRUE ; Pos = MAP_APPFONT ( 224, 49 ) ; @@ -132,6 +140,7 @@ TabPage TP_COMMONPRINTOPTIONS }; RadioButton RB_REDUCEGRADIENTS_COLOR { + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEGRADIENTS_COLOR"; TabStop = TRUE; Pos = MAP_APPFONT ( 146, 64 ) ; Size = MAP_APPFONT ( 108, 10 ) ; @@ -142,6 +151,7 @@ TabPage TP_COMMONPRINTOPTIONS CheckBox CB_REDUCEBITMAPS { + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS"; TabStop = TRUE; Pos = MAP_APPFONT ( 18, 80 ) ; Size = MAP_APPFONT ( 115, 10 ) ; @@ -149,6 +159,7 @@ TabPage TP_COMMONPRINTOPTIONS }; RadioButton RB_REDUCEBITMAPS_OPTIMAL { + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_OPTIMAL"; TabStop = TRUE; Pos = MAP_APPFONT ( 28, 93 ) ; Size = MAP_APPFONT ( 226, 10 ) ; @@ -156,6 +167,7 @@ TabPage TP_COMMONPRINTOPTIONS }; RadioButton RB_REDUCEBITMAPS_NORMAL { + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_NORMAL"; TabStop = TRUE; Pos = MAP_APPFONT ( 28, 106 ) ; Size = MAP_APPFONT ( 226, 10 ) ; @@ -163,6 +175,7 @@ TabPage TP_COMMONPRINTOPTIONS }; RadioButton RB_REDUCEBITMAPS_RESOLUTION { + HelpID = "sfx2:RadioButton:TP_COMMONPRINTOPTIONS:RB_REDUCEBITMAPS_RESOLUTION"; TabStop = TRUE; Pos = MAP_APPFONT ( 28, 119 ) ; Size = MAP_APPFONT ( 52, 10 ) ; @@ -170,6 +183,7 @@ TabPage TP_COMMONPRINTOPTIONS }; ListBox LB_REDUCEBITMAPS_RESOLUTION { + HelpID = "sfx2:ListBox:TP_COMMONPRINTOPTIONS:LB_REDUCEBITMAPS_RESOLUTION"; TabStop = TRUE; Border = TRUE ; Pos = MAP_APPFONT ( 81, 117 ) ; @@ -188,6 +202,7 @@ TabPage TP_COMMONPRINTOPTIONS }; CheckBox CB_REDUCEBITMAPS_TRANSPARENCY { + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_REDUCEBITMAPS_TRANSPARENCY"; TabStop = TRUE; Pos = MAP_APPFONT ( 28, 132 ) ; Size = MAP_APPFONT ( 226, 10 ) ; @@ -198,6 +213,7 @@ TabPage TP_COMMONPRINTOPTIONS CheckBox CB_CONVERTTOGREYSCALES { + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_CONVERTTOGREYSCALES"; TabStop = TRUE; Pos = MAP_APPFONT ( 136, 80 ) ; Size = MAP_APPFONT ( 123, 10 ) ; @@ -214,6 +230,7 @@ TabPage TP_COMMONPRINTOPTIONS }; CheckBox CB_PAPERSIZE { + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERSIZE"; TabStop = TRUE; Pos = MAP_APPFONT ( 12, 159 ) ; Size = MAP_APPFONT ( 123, 10 ) ; @@ -221,6 +238,7 @@ TabPage TP_COMMONPRINTOPTIONS }; CheckBox CB_PAPERORIENTATION { + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_PAPERORIENTATION"; TabStop = TRUE; Pos = MAP_APPFONT ( 12, 172 ) ; Size = MAP_APPFONT ( 123 , 10 ) ; @@ -228,6 +246,7 @@ TabPage TP_COMMONPRINTOPTIONS }; CheckBox CB_TRANSPARENCY { + HelpID = "sfx2:CheckBox:TP_COMMONPRINTOPTIONS:CB_TRANSPARENCY"; TabStop = TRUE; Pos = MAP_APPFONT ( 136, 159 ) ; Size = MAP_APPFONT ( 123, 10 ) ; @@ -241,6 +260,7 @@ TabPage TP_COMMONPRINTOPTIONS ModalDialog RID_WARN_PRINTTRANSPARENCY { + HelpID = "sfx2:ModalDialog:RID_WARN_PRINTTRANSPARENCY"; OutputSize = TRUE ; Size = MAP_APPFONT ( 195 , 85 ) ; Text [ en-US ] = "Warning" ; @@ -266,6 +286,7 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY }; PushButton BTN_PRINTTRANS_NO { + HelpID = "sfx2:PushButton:RID_WARN_PRINTTRANSPARENCY:BTN_PRINTTRANS_NO"; Pos = MAP_APPFONT ( 68 , 48 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~No" ; @@ -278,6 +299,7 @@ ModalDialog RID_WARN_PRINTTRANSPARENCY }; CheckBox CBX_NOPRINTTRANSWARN { + HelpID = "sfx2:CheckBox:RID_WARN_PRINTTRANSPARENCY:CBX_NOPRINTTRANSWARN"; Pos = MAP_APPFONT ( 6 , 68 ) ; Size = MAP_APPFONT ( 183 , 10 ) ; Text [ en-US ] = "~Do not show warning again" ; diff --git a/sfx2/source/dialog/recfloat.src b/sfx2/source/dialog/recfloat.src index 5bdde1f57ab6..d71270d1e312 100644 --- a/sfx2/source/dialog/recfloat.src +++ b/sfx2/source/dialog/recfloat.src @@ -34,6 +34,7 @@ FloatingWindow SID_RECORDING_FLOATWINDOW { + HelpID = "sfx2:FloatingWindow:SID_RECORDING_FLOATWINDOW"; Moveable = TRUE ; Closeable = TRUE ; Hide = TRUE ; diff --git a/sfx2/source/dialog/srchdlg.src b/sfx2/source/dialog/srchdlg.src index 0947f3932981..d1cee69e9157 100644 --- a/sfx2/source/dialog/srchdlg.src +++ b/sfx2/source/dialog/srchdlg.src @@ -52,6 +52,7 @@ ModelessDialog RID_DLG_SEARCH }; ComboBox ED_SEARCH { + HelpID = "sfx2:ComboBox:RID_DLG_SEARCH:ED_SEARCH"; Border = TRUE; Pos = MAP_APPFONT( 6, 14 ); Size = MAP_APPFONT( 150, 50 ); @@ -60,6 +61,7 @@ ModelessDialog RID_DLG_SEARCH }; CheckBox CB_WHOLEWORDS { + HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_WHOLEWORDS"; Pos = MAP_APPFONT( 6, 29 ); Size = MAP_APPFONT( 150, 10 ); Text [ en-US ] = "~Whole words only" ; @@ -67,6 +69,7 @@ ModelessDialog RID_DLG_SEARCH }; CheckBox CB_MATCHCASE { + HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_MATCHCASE"; Pos = MAP_APPFONT( 6, 42 ); Size = MAP_APPFONT( 150, 10 ); Text[ en-US ] = "~Match case"; @@ -74,6 +77,7 @@ ModelessDialog RID_DLG_SEARCH }; CheckBox CB_WRAPAROUND { + HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_WRAPAROUND"; Pos = MAP_APPFONT( 6, 55 ); Size = MAP_APPFONT( 150, 10 ); Text [ en-US ] = "Wrap ~around" ; @@ -81,6 +85,7 @@ ModelessDialog RID_DLG_SEARCH }; CheckBox CB_BACKWARDS { + HelpID = "sfx2:CheckBox:RID_DLG_SEARCH:CB_BACKWARDS"; Pos = MAP_APPFONT( 6, 68 ); Size = MAP_APPFONT( 150, 10 ); Text [ en-US ] = "~Backwards" ; @@ -88,6 +93,7 @@ ModelessDialog RID_DLG_SEARCH }; PushButton PB_FIND { + HelpID = "sfx2:PushButton:RID_DLG_SEARCH:PB_FIND"; Pos = MAP_APPFONT( 162, 6 ); Size = MAP_APPFONT( 50, 14 ); Text [ en-US ] = "~Find" ; diff --git a/sfx2/source/dialog/templdlg.src b/sfx2/source/dialog/templdlg.src index e5b4f1fd9cdf..60979450d9f6 100644 --- a/sfx2/source/dialog/templdlg.src +++ b/sfx2/source/dialog/templdlg.src @@ -78,6 +78,7 @@ ModalDialog RID_STYLECATALOG }; PushButton BT_ORG { + HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_ORG"; Pos = MAP_APPFONT ( 123 , 97 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Organizer..." ; @@ -85,6 +86,7 @@ ModalDialog RID_STYLECATALOG }; PushButton BT_DEL { + HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_DEL"; Pos = MAP_APPFONT ( 123 , 78 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete..." ; @@ -92,6 +94,7 @@ ModalDialog RID_STYLECATALOG }; PushButton BT_EDIT { + HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_EDIT"; Pos = MAP_APPFONT ( 123 , 60 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Modify..." ; @@ -99,6 +102,7 @@ ModalDialog RID_STYLECATALOG }; PushButton BT_NEW { + HelpID = "sfx2:PushButton:RID_STYLECATALOG:BT_NEW"; Pos = MAP_APPFONT ( 123 , 43 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~New..." ; @@ -112,6 +116,7 @@ ModalDialog RID_STYLECATALOG }; ListBox BT_TOOL { + HelpID = "sfx2:ListBox:RID_STYLECATALOG:BT_TOOL"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 110 , 55 ) ; @@ -128,6 +133,7 @@ ModalDialog RID_STYLECATALOG }; ListBox BT_FLIST { + HelpID = "sfx2:ListBox:RID_STYLECATALOG:BT_FLIST"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 114 ) ; Size = MAP_APPFONT ( 110 , 77 ) ; diff --git a/sfx2/source/dialog/versdlg.src b/sfx2/source/dialog/versdlg.src index 60aeb2777542..927c940e6506 100644 --- a/sfx2/source/dialog/versdlg.src +++ b/sfx2/source/dialog/versdlg.src @@ -28,6 +28,7 @@ #include "versdlg.hrc" ModalDialog DLG_VERSIONS { + HelpID = "sfx2:ModalDialog:DLG_VERSIONS"; OutputSize = TRUE ; Size = MAP_APPFONT ( 340 , 184 ) ; SvLook = TRUE ; @@ -41,6 +42,7 @@ ModalDialog DLG_VERSIONS }; PushButton PB_SAVE { + HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_SAVE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 90 , 14 ) ; TabStop = TRUE ; @@ -48,6 +50,7 @@ ModalDialog DLG_VERSIONS }; CheckBox CB_SAVEONCLOSE { + HelpID = "sfx2:CheckBox:DLG_VERSIONS:CB_SAVEONCLOSE"; Pos = MAP_APPFONT ( 108 , 16 ) ; Size = MAP_APPFONT ( 164 , 10 ) ; TabStop = TRUE ; @@ -93,6 +96,7 @@ ModalDialog DLG_VERSIONS }; PushButton PB_OPEN { + HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_OPEN"; Pos = MAP_APPFONT ( 284 , 26 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -100,6 +104,7 @@ ModalDialog DLG_VERSIONS }; PushButton PB_VIEW { + HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_VIEW"; Pos = MAP_APPFONT ( 284 , 43 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -108,6 +113,7 @@ ModalDialog DLG_VERSIONS }; PushButton PB_DELETE { + HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_DELETE"; Pos = MAP_APPFONT ( 284 , 60 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -115,6 +121,7 @@ ModalDialog DLG_VERSIONS }; PushButton PB_COMPARE { + HelpID = "sfx2:PushButton:DLG_VERSIONS:PB_COMPARE"; Pos = MAP_APPFONT ( 284 , 77 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -130,6 +137,7 @@ ModalDialog DLG_VERSIONS }; ModalDialog DLG_COMMENTS { + HelpID = "sfx2:ModalDialog:DLG_COMMENTS"; OutputSize = TRUE ; Size = MAP_APPFONT ( 180 , 118 ) ; SvLook = TRUE ; @@ -148,6 +156,7 @@ ModalDialog DLG_COMMENTS }; MultiLineEdit ME_VERSIONS { + HelpID = "sfx2:MultiLineEdit:DLG_COMMENTS:ME_VERSIONS"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 32 ) ; Size = MAP_APPFONT ( 168 , 60 ) ; @@ -168,6 +177,7 @@ ModalDialog DLG_COMMENTS }; PushButton PB_CLOSE { + HelpID = "sfx2:PushButton:DLG_COMMENTS:PB_CLOSE"; Pos = MAP_APPFONT ( 68 , 98 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sfx2/source/doc/doctdlg.src b/sfx2/source/doc/doctdlg.src index 3192de44c19a..1b50fd56c55e 100644 --- a/sfx2/source/doc/doctdlg.src +++ b/sfx2/source/doc/doctdlg.src @@ -46,6 +46,7 @@ ModalDialog DLG_DOC_TEMPLATE }; Edit ED_NAME { + HelpID = "sfx2:Edit:DLG_DOC_TEMPLATE:ED_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 200 , 12 ) ; @@ -64,6 +65,7 @@ ModalDialog DLG_DOC_TEMPLATE }; ListBox LB_SECTION { + HelpID = "sfx2:ListBox:DLG_DOC_TEMPLATE:LB_SECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 97 , 66 ) ; @@ -76,6 +78,7 @@ ModalDialog DLG_DOC_TEMPLATE }; ListBox LB_STYLESHEETS { + HelpID = "sfx2:ListBox:DLG_DOC_TEMPLATE:LB_STYLESHEETS"; Border = TRUE ; Pos = MAP_APPFONT ( 115 , 56 ) ; Size = MAP_APPFONT ( 97 , 66 ) ; @@ -99,12 +102,14 @@ ModalDialog DLG_DOC_TEMPLATE }; PushButton BT_EDIT { + HelpID = "sfx2:PushButton:DLG_DOC_TEMPLATE:BT_EDIT"; Pos = MAP_APPFONT ( 224 , 62 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Edit" ; }; PushButton BT_ORGANIZE { + HelpID = "sfx2:PushButton:DLG_DOC_TEMPLATE:BT_ORGANIZE"; Pos = MAP_APPFONT ( 224 , 79 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Organizer..." ; diff --git a/sfx2/source/doc/docvor.src b/sfx2/source/doc/docvor.src index d9ef886f59bb..80ebed8b1708 100644 --- a/sfx2/source/doc/docvor.src +++ b/sfx2/source/doc/docvor.src @@ -61,6 +61,7 @@ ModalDialog DLG_ORGANIZE }; PushButton BTN_FILES { + HelpID = "sfx2:PushButton:DLG_ORGANIZE:BTN_FILES"; Pos = MAP_APPFONT ( 205 , 143 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~File..." ; @@ -68,12 +69,14 @@ ModalDialog DLG_ORGANIZE }; PushButton BTN_ADDRESSTEMPLATE { + HelpID = "sfx2:PushButton:DLG_ORGANIZE:BTN_ADDRESSTEMPLATE"; Pos = MAP_APPFONT ( 205 , 124 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Address Book..." ; }; ListBox LB_LEFT_TYP { + HelpID = "sfx2:ListBox:DLG_ORGANIZE:LB_LEFT_TYP"; Border = TRUE ; Pos = MAP_APPFONT ( 3 , 144 ) ; Size = MAP_APPFONT ( 94 , 55 ) ; @@ -88,6 +91,7 @@ ModalDialog DLG_ORGANIZE }; ListBox LB_RIGHT_TYP { + HelpID = "sfx2:ListBox:DLG_ORGANIZE:LB_RIGHT_TYP"; Border = TRUE ; Pos = MAP_APPFONT ( 103 , 144 ) ; Size = MAP_APPFONT ( 94 , 55 ) ; @@ -142,6 +146,7 @@ ModalDialog DLG_ORGANIZE }; MenuButton BTN_EDIT { + HelpID = "sfx2:MenuButton:DLG_ORGANIZE:BTN_EDIT"; Pos = MAP_APPFONT ( 205 , 23 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Commands" ; diff --git a/sfx2/source/doc/new.src b/sfx2/source/doc/new.src index 63c9f49110dd..6737128cce43 100644 --- a/sfx2/source/doc/new.src +++ b/sfx2/source/doc/new.src @@ -59,6 +59,7 @@ ModalDialog DLG_NEW_FILE }; ListBox LB_REGION { + HelpID = "sfx2:ListBox:DLG_NEW_FILE:LB_REGION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 18 ) ; Size = MAP_APPFONT ( 127 , 72 ) ; @@ -80,6 +81,7 @@ ModalDialog DLG_NEW_FILE }; ListBox LB_TEMPLATE { + HelpID = "sfx2:ListBox:DLG_NEW_FILE:LB_TEMPLATE"; Border = TRUE ; Pos = MAP_APPFONT ( 139 , 18 ) ; Size = MAP_APPFONT ( 127 , 72 ) ; @@ -87,6 +89,7 @@ ModalDialog DLG_NEW_FILE }; MoreButton BT_MORE { + HelpID = "sfx2:MoreButton:DLG_NEW_FILE:BT_MORE"; Pos = MAP_APPFONT ( 274 , 70 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~More" ; @@ -103,6 +106,7 @@ ModalDialog DLG_NEW_FILE }; CheckBox BTN_PREVIEW { + HelpID = "sfx2:CheckBox:DLG_NEW_FILE:BTN_PREVIEW"; Pos = MAP_APPFONT ( 6 , 96 ) ; Size = MAP_APPFONT ( 97 , 10 ) ; Text [ en-US ] = "Pre~view" ; @@ -117,6 +121,7 @@ ModalDialog DLG_NEW_FILE }; CheckBox CB_TEXT_STYLE { + HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_TEXT_STYLE"; Pos = MAP_APPFONT ( 6 , 94 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Hide = TRUE; @@ -124,6 +129,7 @@ ModalDialog DLG_NEW_FILE }; CheckBox CB_FRAME_STYLE { + HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_FRAME_STYLE"; Pos = MAP_APPFONT ( 60 , 94 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Hide = TRUE; @@ -131,6 +137,7 @@ ModalDialog DLG_NEW_FILE }; CheckBox CB_PAGE_STYLE { + HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_PAGE_STYLE"; Pos = MAP_APPFONT ( 114 , 94 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Hide = TRUE; @@ -138,6 +145,7 @@ ModalDialog DLG_NEW_FILE }; CheckBox CB_NUM_STYLE { + HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_NUM_STYLE"; Pos = MAP_APPFONT ( 168 , 94 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Hide = TRUE; @@ -145,6 +153,7 @@ ModalDialog DLG_NEW_FILE }; CheckBox CB_MERGE_STYLE { + HelpID = "sfx2:CheckBox:DLG_NEW_FILE:CB_MERGE_STYLE"; Pos = MAP_APPFONT ( 222 , 94 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Hide = TRUE; @@ -152,6 +161,7 @@ ModalDialog DLG_NEW_FILE }; PushButton PB_LOAD_FILE { + HelpID = "sfx2:PushButton:DLG_NEW_FILE:PB_LOAD_FILE"; Pos = MAP_APPFONT ( 274 , 92 ) ; Size = MAP_APPFONT ( 56 , 14 ) ; Hide = TRUE; @@ -170,6 +180,7 @@ ModalDialog DLG_NEW_FILE }; Edit ED_TITLE { + HelpID = "sfx2:Edit:DLG_NEW_FILE:ED_TITLE"; Border = TRUE ; Pos = MAP_APPFONT ( 145 , 121 ) ; Size = MAP_APPFONT ( 175 , 12 ) ; @@ -185,6 +196,7 @@ ModalDialog DLG_NEW_FILE }; Edit ED_THEMA { + HelpID = "sfx2:Edit:DLG_NEW_FILE:ED_THEMA"; Border = TRUE ; Pos = MAP_APPFONT ( 145 , 148 ) ; Size = MAP_APPFONT ( 175 , 12 ) ; @@ -200,6 +212,7 @@ ModalDialog DLG_NEW_FILE }; Edit ED_KEYWORDS { + HelpID = "sfx2:Edit:DLG_NEW_FILE:ED_KEYWORDS"; Border = TRUE ; Pos = MAP_APPFONT ( 145 , 175 ) ; Size = MAP_APPFONT ( 175 , 12 ) ; @@ -215,6 +228,7 @@ ModalDialog DLG_NEW_FILE }; MultiLineEdit ED_DESC { + HelpID = "sfx2:MultiLineEdit:DLG_NEW_FILE:ED_DESC"; Border = TRUE ; Pos = MAP_APPFONT ( 144 , 202 ) ; Size = MAP_APPFONT ( 175 , 32 ) ; diff --git a/svx/source/dialog/bmpmask.src b/svx/source/dialog/bmpmask.src index e65ce8c119aa..a9cd2fe60b2f 100644 --- a/svx/source/dialog/bmpmask.src +++ b/svx/source/dialog/bmpmask.src @@ -78,6 +78,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_1 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_1"; Pos = MAP_APPFONT ( 12 , 50 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -92,6 +93,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_1 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_1"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 48 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -106,6 +108,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_1 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_1"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 48 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -118,6 +121,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_2 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_2"; Pos = MAP_APPFONT ( 12 , 65 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -132,6 +136,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_2 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_2"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 63 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -146,6 +151,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_2 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_2"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 63 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -158,6 +164,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_3 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_3"; Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -172,6 +179,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_3 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_3"; Border = TRUE ; Pos = MAP_APPFONT ( 58, 78 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -186,6 +194,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_3 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_3"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 78 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -198,6 +207,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_4 { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_4"; Pos = MAP_APPFONT ( 12 , 95 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; @@ -212,6 +222,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; MetricField SP_4 { + HelpID = "svx:MetricField:RID_SVXDLG_BMPMASK:SP_4"; Border = TRUE ; Pos = MAP_APPFONT ( 58 , 93 ) ; Size = MAP_APPFONT ( 29 , 12 ) ; @@ -226,6 +237,7 @@ DockingWindow RID_SVXDLG_BMPMASK }; ListBox LB_4 { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_4"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 93 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; @@ -236,6 +248,7 @@ DockingWindow RID_SVXDLG_BMPMASK CheckBox CBX_TRANS { + HelpID = "svx:CheckBox:RID_SVXDLG_BMPMASK:CBX_TRANS"; Pos = MAP_APPFONT ( 12 , 110 ) ; Size = MAP_APPFONT ( 71 , 10 ) ; TabStop = TRUE ; @@ -244,6 +257,7 @@ DockingWindow RID_SVXDLG_BMPMASK PushButton BTN_EXEC { + HelpID = "svx:PushButton:RID_SVXDLG_BMPMASK:BTN_EXEC"; Pos = MAP_APPFONT ( 93 , 6 ) ; Size = MAP_APPFONT ( 64 , 14 ) ; Text [ en-US ] = "~Replace" ; @@ -251,6 +265,7 @@ DockingWindow RID_SVXDLG_BMPMASK ListBox LB_TRANS { + HelpID = "svx:ListBox:RID_SVXDLG_BMPMASK:LB_TRANS"; Border = TRUE ; Pos = MAP_APPFONT ( 93 , 108 ) ; Size = MAP_APPFONT ( 64 , 75 ) ; diff --git a/svx/source/dialog/contdlg.src b/svx/source/dialog/contdlg.src index 1b1923c66eab..bf587b3b1fda 100644 --- a/svx/source/dialog/contdlg.src +++ b/svx/source/dialog/contdlg.src @@ -33,6 +33,7 @@ // RID_SVXDLG_CONTOUR ---------------------------------------------------- FloatingWindow RID_SVXDLG_CONTOUR { + HelpID = "svx:FloatingWindow:RID_SVXDLG_CONTOUR"; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -176,6 +177,7 @@ FloatingWindow RID_SVXDLG_CONTOUR }; MetricField MTF_TOLERANCE { + HelpID = "svx:MetricField:RID_SVXDLG_CONTOUR:MTF_TOLERANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; diff --git a/svx/source/dialog/docrecovery.src b/svx/source/dialog/docrecovery.src index 7c1532b71b55..cf9cf6f0adcf 100644 --- a/svx/source/dialog/docrecovery.src +++ b/svx/source/dialog/docrecovery.src @@ -79,6 +79,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_SAVE }; ListBox LB_SAVE_FILELIST { + HelpID = "svx:ListBox:RID_SVXPAGE_DOCRECOVERY_SAVE:LB_SAVE_FILELIST"; Pos = MAP_APPFONT( SAVE_COL0 , SAVE_ROW4 ); Size = MAP_APPFONT( SAVE_CONTROLWIDTH, SAVE_FILELISTHEIGHT ); Border = TRUE; @@ -193,6 +194,7 @@ TabPage RID_SVXPAGE_DOCRECOVERY_RECOVER }; PushButton BTN_RECOV_NEXT { + HelpID = "svx:PushButton:RID_SVXPAGE_DOCRECOVERY_RECOVER:BTN_RECOV_NEXT"; Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH*2, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "~Start Recovery >"; @@ -300,6 +302,7 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_BROKEN }; ListBox LB_BROKEN_FILELIST { + HelpID = "svx:ListBox:RID_SVX_MDLG_DOCRECOVERY_BROKEN:LB_BROKEN_FILELIST"; Pos = MAP_APPFONT( BROKEN_COL0, BROKEN_ROW2 ); Size = MAP_APPFONT( BROKEN_CONTROLWIDTH, (BROKEN_ROW3-BROKEN_ROW2) ); Border = TRUE; @@ -313,12 +316,14 @@ ModalDialog RID_SVX_MDLG_DOCRECOVERY_BROKEN }; Edit ED_BROKEN_SAVEDIR { + HelpID = "svx:Edit:RID_SVX_MDLG_DOCRECOVERY_BROKEN:ED_BROKEN_SAVEDIR"; Pos = MAP_APPFONT( BROKEN_COL0, BROKEN_ROW5 + 1 ); // center to pushbutton Size = MAP_APPFONT( BROKEN_COL2 - BROKEN_COL0, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; }; PushButton BTN_BROKEN_SAVEDIR { + HelpID = "svx:PushButton:RID_SVX_MDLG_DOCRECOVERY_BROKEN:BTN_BROKEN_SAVEDIR"; Pos = MAP_APPFONT( BROKEN_COL3, BROKEN_ROW5 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text [ en-US ] = "Chan~ge..."; @@ -379,6 +384,7 @@ TabPage RID_SVXPAGE_ERR_REP_WELCOME }; PushButton BTN_RECOV_PREV { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_WELCOME:BTN_RECOV_PREV"; Pos = MAP_APPFONT( RECOV_COL_C, RECOV_ROW9 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "< ~Back"; @@ -437,6 +443,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; Edit ED_ERRSEND_DOCTYPE { + HelpID = "svx:Edit:RID_SVXPAGE_ERR_REP_SEND:ED_ERRSEND_DOCTYPE"; Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW5 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -449,6 +456,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; MultiLineEdit ML_ERRSEND_USING { + HelpID = "svx:MultiLineEdit:RID_SVXPAGE_ERR_REP_SEND:ML_ERRSEND_USING"; Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW8 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, (ERRSEND_ROW12-ERRSEND_ROW8-RSC_SP_CTRL_Y) ); VScroll = TRUE; @@ -457,18 +465,21 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; PushButton BTN_ERRSEND_SHOWREP { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_ERRSEND_SHOWREP"; Pos = MAP_APPFONT( ERRSEND_COL3, ERRSEND_ROW8 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "Show ~Report"; }; PushButton BTN_ERRSEND_OPT { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_ERRSEND_OPT"; Pos = MAP_APPFONT( ERRSEND_COL3, ERRSEND_ROW10 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "~Options..."; }; CheckBox CB_ERRSEND_CONTACT { + HelpID = "svx:CheckBox:RID_SVXPAGE_ERR_REP_SEND:CB_ERRSEND_CONTACT"; Pos = MAP_APPFONT( ERRSEND_COL0, ERRSEND_ROW12 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH2, RSC_CD_CHECKBOX_HEIGHT ); Check = FALSE; @@ -482,6 +493,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; Edit ED_ERRSEND_EMAILADDR { + HelpID = "svx:Edit:RID_SVXPAGE_ERR_REP_SEND:ED_ERRSEND_EMAILADDR"; Pos = MAP_APPFONT( ERRSEND_COL1, ERRSEND_ROW14 ); Size = MAP_APPFONT( ERRSEND_CONTROLWIDTH3, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -493,6 +505,7 @@ TabPage RID_SVXPAGE_ERR_REP_SEND }; PushButton BTN_RECOV_PREV { + HelpID = "svx:PushButton:RID_SVXPAGE_ERR_REP_SEND:BTN_RECOV_PREV"; Pos = MAP_APPFONT( ERRSEND_COL5, ERRSEND_ROW16 ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); Text[ en-US ] = "< ~Back"; @@ -530,6 +543,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS RadioButton BTN_ERROPT_SYSTEM { + HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_SYSTEM"; Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW1 ); Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT ); Text[ en-US ] = "Use ~system settings"; @@ -537,6 +551,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS RadioButton BTN_ERROPT_DIRECT { + HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_DIRECT"; Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW2 ); Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT ); Text[ en-US ] = "Use ~direct connection to the Internet"; @@ -544,6 +559,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS RadioButton BTN_ERROPT_MANUAL { + HelpID = "svx:RadioButton:RID_SVX_MDLG_ERR_REP_OPTIONS:BTN_ERROPT_MANUAL"; Pos = MAP_APPFONT( ERROPT_COLB, ERROPT_ROW3 ); Size = MAP_APPFONT( ERROPT_COLF - ERROPT_COLB, RSC_CD_RADIOBUTTON_HEIGHT ); Text[ en-US ] = "Use ~manual settings"; @@ -558,6 +574,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS Edit ED_ERROPT_PROXYSERVER { + HelpID = "svx:Edit:RID_SVX_MDLG_ERR_REP_OPTIONS:ED_ERROPT_PROXYSERVER"; Pos = MAP_APPFONT( ERROPT_COLC, ERROPT_ROW5 ); Size = MAP_APPFONT( ERROPT_SERVER_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -572,6 +589,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_OPTIONS Edit ED_ERROPT_PROXYPORT { + HelpID = "svx:Edit:RID_SVX_MDLG_ERR_REP_OPTIONS:ED_ERROPT_PROXYPORT"; Pos = MAP_APPFONT( ERROPT_COLC + ERROPT_SERVER_WIDTH + RSC_SP_CTRL_GROUP_X, ERROPT_ROW5 ); Size = MAP_APPFONT( ERROPT_PORT_WIDTH, RSC_CD_TEXTBOX_HEIGHT ); Border = TRUE; @@ -618,6 +636,7 @@ ModalDialog RID_SVX_MDLG_ERR_REP_PREVIEW MultiLineEdit ML_ERRPREVIEW_CONTENT { + HelpID = "svx:MultiLineEdit:RID_SVX_MDLG_ERR_REP_PREVIEW:ML_ERRPREVIEW_CONTENT"; Pos = MAP_APPFONT( ERRPREVIEW_COLA, ERRPREVIEW_ROW0 ); Size = MAP_APPFONT( ERRPREVIEW_COLC - ERRPREVIEW_COLA, ERRPREVIEW_ROW1 - ERRPREVIEW_ROW0 ); VScroll = TRUE; diff --git a/svx/source/dialog/fontwork.src b/svx/source/dialog/fontwork.src index c6239dc5ef09..92d1be8abc97 100644 --- a/svx/source/dialog/fontwork.src +++ b/svx/source/dialog/fontwork.src @@ -164,6 +164,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_DISTANCE { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_DISTANCE"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 85 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -188,6 +189,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_TEXTSTART { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_TEXTSTART"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 100 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -261,6 +263,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_SHADOW_X { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_X"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 144 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -285,6 +288,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; MetricField MTR_FLD_SHADOW_Y { + HelpID = "svx:MetricField:RID_SVXDLG_FONTWORK:MTR_FLD_SHADOW_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 29 , 159 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; @@ -302,6 +306,7 @@ DockingWindow RID_SVXDLG_FONTWORK }; ListBox CLB_SHADOW_COLOR { + HelpID = "svx:ListBox:RID_SVXDLG_FONTWORK:CLB_SHADOW_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 174 ) ; Size = MAP_APPFONT ( 71 , 60 ) ; diff --git a/svx/source/dialog/hdft.src b/svx/source/dialog/hdft.src index e93d18ff351f..1cd402611dc8 100644 --- a/svx/source/dialog/hdft.src +++ b/svx/source/dialog/hdft.src @@ -46,12 +46,14 @@ TabPage RID_SVXPAGE_HEADER Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox CB_TURNON { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_TURNON"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Hea~der on" ; }; CheckBox CB_SHARED { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_SHARED"; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Same ~content left/right" ; @@ -65,6 +67,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_LMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_LMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 46 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -87,6 +90,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_RMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_RMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 62 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -109,6 +113,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_DIST { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_DIST"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 80 ) ; @@ -124,6 +129,7 @@ TabPage RID_SVXPAGE_HEADER }; CheckBox CB_DYNSPACING { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_DYNSPACING"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Hide = TRUE; @@ -137,6 +143,7 @@ TabPage RID_SVXPAGE_HEADER }; MetricField ED_HEIGHT { + HelpID = "svx:MetricField:RID_SVXPAGE_HEADER:ED_HEIGHT"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 96 ) ; @@ -154,6 +161,7 @@ TabPage RID_SVXPAGE_HEADER }; CheckBox CB_HEIGHT_DYN { + HelpID = "svx:CheckBox:RID_SVXPAGE_HEADER:CB_HEIGHT_DYN"; Pos = MAP_APPFONT ( 12 , 112 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~AutoFit height" ; @@ -171,6 +179,7 @@ TabPage RID_SVXPAGE_HEADER }; PushButton BTN_EXTRAS { + HelpID = "svx:PushButton:RID_SVXPAGE_HEADER:BTN_EXTRAS"; Pos = MAP_APPFONT ( 12 , 130 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~More..." ; @@ -185,12 +194,14 @@ TabPage RID_SVXPAGE_FOOTER Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox CB_TURNON { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_TURNON"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~Footer on" ; }; CheckBox CB_SHARED { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_SHARED"; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Same ~content left/right" ; @@ -204,6 +215,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_LMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_LMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 46 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -226,6 +238,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_RMARGIN { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_RMARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 62 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -247,6 +260,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_DIST { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_DIST"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 80 ) ; @@ -262,6 +276,7 @@ TabPage RID_SVXPAGE_FOOTER }; CheckBox CB_DYNSPACING { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_DYNSPACING"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Hide = TRUE; @@ -276,6 +291,7 @@ TabPage RID_SVXPAGE_FOOTER }; MetricField ED_HEIGHT { + HelpID = "svx:MetricField:RID_SVXPAGE_FOOTER:ED_HEIGHT"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 96 ) ; @@ -293,6 +309,7 @@ TabPage RID_SVXPAGE_FOOTER }; CheckBox CB_HEIGHT_DYN { + HelpID = "svx:CheckBox:RID_SVXPAGE_FOOTER:CB_HEIGHT_DYN"; Pos = MAP_APPFONT ( 12 , 112 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "~AutoFit height" ; @@ -311,6 +328,7 @@ TabPage RID_SVXPAGE_FOOTER }; PushButton BTN_EXTRAS { + HelpID = "svx:PushButton:RID_SVXPAGE_FOOTER:BTN_EXTRAS"; Pos = MAP_APPFONT ( 12 , 130 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~More..." ; diff --git a/svx/source/dialog/imapdlg.src b/svx/source/dialog/imapdlg.src index a61a9e34fa5e..d691f5443b5a 100644 --- a/svx/source/dialog/imapdlg.src +++ b/svx/source/dialog/imapdlg.src @@ -32,6 +32,7 @@ // RID_SVXDLG_IMAP ---------------------------------------------------- ModelessDialog RID_SVXDLG_IMAP { + HelpID = "svx:ModelessDialog:RID_SVXDLG_IMAP"; OutputSize = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -193,6 +194,7 @@ ModelessDialog RID_SVXDLG_IMAP }; ComboBox CBB_URL { + HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:CBB_URL"; Pos = MAP_APPFONT ( 39 , 23 ) ; Size = MAP_APPFONT ( 225 , 69 ) ; TabStop = TRUE ; @@ -208,6 +210,7 @@ ModelessDialog RID_SVXDLG_IMAP }; Edit EDT_TEXT { + HelpID = "svx:Edit:RID_SVXDLG_IMAP:EDT_TEXT"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 39 , 41 ) ; @@ -226,6 +229,7 @@ ModelessDialog RID_SVXDLG_IMAP // nur temporaer ComboBox RID_SVXCTL_CBB_TARGET { + HelpID = "svx:ComboBox:RID_SVXDLG_IMAP:RID_SVXCTL_CBB_TARGET"; Border = TRUE ; Sort = TRUE ; Pos = MAP_APPFONT ( 213 , 41 ) ; diff --git a/svx/source/dialog/optgrid.src b/svx/source/dialog/optgrid.src index 8db8d0b54643..2bc7b430f807 100644 --- a/svx/source/dialog/optgrid.src +++ b/svx/source/dialog/optgrid.src @@ -45,6 +45,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_USE_GRIDSNAP { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_USE_GRIDSNAP"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 204 , 10 ) ; TabStop = TRUE ; @@ -52,6 +53,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_GRID_VISIBLE { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_GRID_VISIBLE"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 204 , 10 ) ; TabStop = TRUE ; @@ -77,6 +79,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_DRAW_X { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_X"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 54 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -94,6 +97,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_DRAW_Y { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_DRAW_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 69 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -129,6 +133,7 @@ TabPage RID_SVXPAGE_GRID }; NumericField NUM_FLD_DIVISION_X { + HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_X"; Border = TRUE ; Pos = MAP_APPFONT ( 195 , 54 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; @@ -148,6 +153,7 @@ TabPage RID_SVXPAGE_GRID }; NumericField NUM_FLD_DIVISION_Y { + HelpID = "svx:NumericField:RID_SVXPAGE_GRID:NUM_FLD_DIVISION_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 195 , 69 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; @@ -167,6 +173,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SYNCHRONIZE { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SYNCHRONIZE"; Pos = MAP_APPFONT ( 12 , 84 ) ; Size = MAP_APPFONT ( 127 , 10 ) ; TabStop = TRUE ; @@ -182,6 +189,7 @@ TabPage RID_SVXPAGE_GRID CheckBox CBX_SNAP_HELPLINES { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_HELPLINES"; Pos = MAP_APPFONT ( 12 , 111 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Hide = TRUE; @@ -190,6 +198,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SNAP_BORDER { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_BORDER"; Hide = TRUE; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 125 ) ; @@ -198,6 +207,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SNAP_FRAME { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_FRAME"; Pos = MAP_APPFONT ( 12 , 139 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Hide = TRUE; @@ -206,6 +216,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_SNAP_POINTS { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_SNAP_POINTS"; Pos = MAP_APPFONT ( 12 , 153 ) ; Size = MAP_APPFONT ( 106 , 10 ) ; Hide = TRUE; @@ -221,6 +232,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_SNAP_AREA { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_SNAP_AREA"; Border = TRUE ; Pos = MAP_APPFONT ( 83 , 167 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -252,6 +264,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_ORTHO { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ORTHO"; Pos = MAP_APPFONT ( 136 , 111 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Hide = TRUE; @@ -260,6 +273,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_BIGORTHO { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_BIGORTHO"; Pos = MAP_APPFONT ( 136 , 125 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Hide = TRUE; @@ -268,6 +282,7 @@ TabPage RID_SVXPAGE_GRID }; CheckBox CBX_ROTATE { + HelpID = "svx:CheckBox:RID_SVXPAGE_GRID:CBX_ROTATE"; Pos = MAP_APPFONT ( 136 , 139 ) ; // 136, 111 Size = MAP_APPFONT ( 55 , 10 ) ; @@ -277,6 +292,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_ANGLE { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 194 , 137 ) ; // 190, 111 @@ -302,6 +318,7 @@ TabPage RID_SVXPAGE_GRID }; MetricField MTR_FLD_BEZ_ANGLE { + HelpID = "svx:MetricField:RID_SVXPAGE_GRID:MTR_FLD_BEZ_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 194 , 154 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; diff --git a/svx/source/dialog/passwd.src b/svx/source/dialog/passwd.src index 256628a2caca..821ede7c9357 100644 --- a/svx/source/dialog/passwd.src +++ b/svx/source/dialog/passwd.src @@ -46,6 +46,7 @@ ModalDialog RID_SVXDLG_PASSWORD }; Edit ED_OLD_PASSWD { + HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_OLD_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 71 , 14 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; @@ -65,6 +66,7 @@ ModalDialog RID_SVXDLG_PASSWORD }; Edit ED_NEW_PASSWD { + HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_NEW_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 71 , 43 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; @@ -78,6 +80,7 @@ ModalDialog RID_SVXDLG_PASSWORD }; Edit ED_REPEAT_PASSWD { + HelpID = "svx:Edit:RID_SVXDLG_PASSWORD:ED_REPEAT_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 71 , 59 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; diff --git a/svx/source/dialog/rubydialog.src b/svx/source/dialog/rubydialog.src index 6b83f01fc2ee..e10d4d0e57e2 100644 --- a/svx/source/dialog/rubydialog.src +++ b/svx/source/dialog/rubydialog.src @@ -42,6 +42,7 @@ ModelessDialog RID_SVXDLG_RUBY Closeable = TRUE ; CheckBox CB_AUTO_DETECT { + HelpID = "svx:CheckBox:RID_SVXDLG_RUBY:CB_AUTO_DETECT"; Pos = MAP_APPFONT ( 6, 6 ) ; Size = MAP_APPFONT ( 186 , 12 ) ; Text [ en-US ] = "Automatic detection"; @@ -60,6 +61,7 @@ ModelessDialog RID_SVXDLG_RUBY }; Edit ED_LEFT_1 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_1"; Pos = MAP_APPFONT ( 6 , 30 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Hide = False; @@ -67,42 +69,49 @@ ModelessDialog RID_SVXDLG_RUBY }; Edit ED_RIGHT_1 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_1"; Pos = MAP_APPFONT ( 109 , 30 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_LEFT_2 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_2"; Pos = MAP_APPFONT ( 6 , 42) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_RIGHT_2 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_2"; Pos = MAP_APPFONT ( 109 , 42 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_LEFT_3 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_3"; Pos = MAP_APPFONT ( 6 , 54 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_RIGHT_3 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_3"; Pos = MAP_APPFONT ( 109 , 54 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_LEFT_4 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_LEFT_4"; Pos = MAP_APPFONT ( 6 , 66 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; }; Edit ED_RIGHT_4 { + HelpID = "svx:Edit:RID_SVXDLG_RUBY:ED_RIGHT_4"; Pos = MAP_APPFONT ( 109 , 66 ) ; Size = MAP_APPFONT ( 102 , 12 ) ; Border = TRUE; @@ -122,6 +131,7 @@ ModelessDialog RID_SVXDLG_RUBY }; ListBox LB_ADJUST { + HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_ADJUST"; Pos = MAP_APPFONT ( 6 , 93) ; Size = MAP_APPFONT ( 35 , 60 ) ; DropDown = TRUE; @@ -143,6 +153,7 @@ ModelessDialog RID_SVXDLG_RUBY }; ListBox LB_POSITION { + HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_POSITION"; Pos = MAP_APPFONT ( 43 , 93) ; Size = MAP_APPFONT ( 35 , 60 ) ; DropDown = TRUE; @@ -161,6 +172,7 @@ ModelessDialog RID_SVXDLG_RUBY }; ListBox LB_CHAR_STYLE { + HelpID = "svx:ListBox:RID_SVXDLG_RUBY:LB_CHAR_STYLE"; Pos = MAP_APPFONT ( 80 , 93) ; Size = MAP_APPFONT ( 89 , 60 ) ; DropDown = TRUE; @@ -169,6 +181,7 @@ ModelessDialog RID_SVXDLG_RUBY }; PushButton PB_STYLIST { + HelpID = "svx:PushButton:RID_SVXDLG_RUBY:PB_STYLIST"; Pos = MAP_APPFONT ( 171 , 92 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Styles"; @@ -194,6 +207,7 @@ ModelessDialog RID_SVXDLG_RUBY }; PushButton PB_CLOSE { + HelpID = "svx:PushButton:RID_SVXDLG_RUBY:PB_CLOSE"; Pos = MAP_APPFONT ( 118, 175 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Close"; diff --git a/svx/source/dialog/srchdlg.src b/svx/source/dialog/srchdlg.src index a724edbe28bb..f82d4f06cb88 100644 --- a/svx/source/dialog/srchdlg.src +++ b/svx/source/dialog/srchdlg.src @@ -67,6 +67,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ComboBox ED_SEARCH { + HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_SEARCH"; Pos = MAP_APPFONT ( 6 , 18 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; TabStop = TRUE ; @@ -74,6 +75,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ListBox LB_SEARCH { + HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_SEARCH"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 18 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; @@ -104,6 +106,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ComboBox ED_REPLACE { + HelpID = "svx:ComboBox:RID_SVXDLG_SEARCH:ED_REPLACE"; Pos = MAP_APPFONT ( 6 , 65 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; TabStop = TRUE ; @@ -111,6 +114,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ListBox LB_REPLACE { + HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_REPLACE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 65 ) ; Size = MAP_APPFONT ( 132 , 98 ) ; @@ -135,6 +139,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_SEARCH { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH"; Pos = MAP_APPFONT ( 144 , 9 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Find" ; @@ -143,6 +148,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_SEARCH_ALL { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_SEARCH_ALL"; Pos = MAP_APPFONT ( 144 , 26 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Find ~All" ; @@ -155,6 +161,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_REPLACE { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE"; Pos = MAP_APPFONT ( 144 , 56 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Replace" ; @@ -162,6 +169,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_REPLACE_ALL { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_REPLACE_ALL"; Pos = MAP_APPFONT ( 144 , 73 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Replace A~ll" ; @@ -175,6 +183,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_COMPONENT_1 { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_1"; Pos = MAP_APPFONT ( 144 , 103 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -182,6 +191,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_COMPONENT_2 { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_COMPONENT_2"; Pos = MAP_APPFONT ( 144 , 120 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -189,6 +199,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_MATCH_CASE { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_MATCH_CASE"; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; @@ -196,6 +207,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_WHOLE_WORDS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_WHOLE_WORDS"; Pos = MAP_APPFONT ( 12 , 114 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Whole wor~ds only" ; @@ -208,6 +220,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; MoreButton BTN_MORE { + HelpID = "svx:MoreButton:RID_SVXDLG_SEARCH:BTN_MORE"; Pos = MAP_APPFONT ( 6 , 135 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -236,6 +249,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_SELECTIONS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SELECTIONS"; Pos = MAP_APPFONT ( 12 , 163 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "C~urrent selection only" ; @@ -244,6 +258,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_BACKWARDS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_BACKWARDS"; Pos = MAP_APPFONT ( 12 , 176 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Bac~kwards" ; @@ -252,6 +267,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_REGEXP { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_REGEXP"; Pos = MAP_APPFONT ( 12 , 189 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Regular e~xpressions" ; @@ -260,6 +276,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_SIMILARITY { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_SIMILARITY"; Pos = MAP_APPFONT ( 12 , 204 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; Text [ en-US ] = "S~imilarity search" ; @@ -268,6 +285,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton PB_SIMILARITY { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_SIMILARITY"; Pos = MAP_APPFONT ( 124 , 202 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~..." ; @@ -276,6 +294,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_LAYOUTS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_LAYOUTS"; Pos = MAP_APPFONT ( 12 , 219 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Search for St~yles" ; @@ -284,6 +303,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_NOTES { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_NOTES"; Pos = MAP_APPFONT ( 12 , 232 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; @@ -291,6 +311,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_JAP_MATCH_FULL_HALF_WIDTH { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_MATCH_FULL_HALF_WIDTH"; Pos = MAP_APPFONT ( 12 , 247 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; TabStop = TRUE ; @@ -299,6 +320,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_JAP_SOUNDS_LIKE { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_JAP_SOUNDS_LIKE"; Pos = MAP_APPFONT ( 12 , 260 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; TabStop = TRUE ; @@ -307,6 +329,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton PB_JAP_OPTIONS { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:PB_JAP_OPTIONS"; Pos = MAP_APPFONT ( 124 , 258 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "..." ; @@ -315,6 +338,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_ATTRIBUTE { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_ATTRIBUTE"; Pos = MAP_APPFONT ( 144 , 163 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Attri~butes..." ; @@ -323,6 +347,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_FORMAT { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_FORMAT"; Pos = MAP_APPFONT ( 144 , 180 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "For~mat..." ; @@ -331,6 +356,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; PushButton BTN_NOFORMAT { + HelpID = "svx:PushButton:RID_SVXDLG_SEARCH:BTN_NOFORMAT"; Pos = MAP_APPFONT ( 144 , 197 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~No Format" ; @@ -352,6 +378,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; ListBox LB_CALC_SEARCHIN { + HelpID = "svx:ListBox:RID_SVXDLG_SEARCH:LB_CALC_SEARCHIN"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 283 ) ; Size = MAP_APPFONT ( 63 , 48 ) ; @@ -374,6 +401,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; RadioButton RB_CALC_ROWS { + HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_ROWS"; Pos = MAP_APPFONT ( 75 , 300 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; Text [ en-US ] = "Ro~ws" ; @@ -381,6 +409,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; RadioButton RB_CALC_COLUMNS { + HelpID = "svx:RadioButton:RID_SVXDLG_SEARCH:RB_CALC_COLUMNS"; Pos = MAP_APPFONT ( 75 , 313 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; Text [ en-US ] = "Colu~mns" ; @@ -388,6 +417,7 @@ ModelessDialog RID_SVXDLG_SEARCH }; CheckBox CB_ALL_SHEETS { + HelpID = "svx:CheckBox:RID_SVXDLG_SEARCH:CB_ALL_SHEETS"; Pos = MAP_APPFONT ( 12 , 326 ) ; Size = MAP_APPFONT ( 126 , 10 ) ; Text [ en-US ] = "Search in all sheets" ; diff --git a/svx/source/engine3d/float3d.src b/svx/source/engine3d/float3d.src index 3e80dc9fe485..1947fead5556 100644 --- a/svx/source/engine3d/float3d.src +++ b/svx/source/engine3d/float3d.src @@ -83,6 +83,7 @@ DockingWindow RID_SVXFLOAT_3D ImageButton BTN_GEO { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_GEO"; Pos = MAP_APPFONT ( 4 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -95,6 +96,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_REPRESENTATION { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_REPRESENTATION"; Pos = MAP_APPFONT ( 22 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -107,6 +109,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT"; Pos = MAP_APPFONT ( 40 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -119,6 +122,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEXTURE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEXTURE"; Pos = MAP_APPFONT ( 58 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; ButtonImage = Image @@ -131,6 +135,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_MATERIAL { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MATERIAL"; Pos = MAP_APPFONT ( 76 , BORDER ) ; Size = MAP_APPFONT ( VT_BUTTON_WIDTH , IMG_BUTTON_HEIGHT ) ; TabStop = TRUE ; @@ -144,6 +149,7 @@ DockingWindow RID_SVXFLOAT_3D ImageButton BTN_UPDATE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_UPDATE"; Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH * 2 , BORDER ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -156,6 +162,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_ASSIGN { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_ASSIGN"; Pos = MAP_APPFONT ( WIDTH - BORDER - BUTTON_WIDTH , BORDER ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -169,6 +176,7 @@ DockingWindow RID_SVXFLOAT_3D // Unterer Teil ImageButton BTN_CHANGE_TO_3D { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_CHANGE_TO_3D"; Pos = MAP_APPFONT ( 9 , 200 - BUTTON_HEIGHT ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -182,6 +190,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LATHE_OBJ { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LATHE_OBJ"; Pos = MAP_APPFONT ( 9 + BUTTON_WIDTH + 1 , 200 - BUTTON_HEIGHT ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -195,6 +204,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_PERSPECTIVE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_PERSPECTIVE"; Pos = MAP_APPFONT ( 9 + ( BUTTON_WIDTH + 1 ) * 2 , 200 - BUTTON_HEIGHT ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -234,6 +244,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_PERCENT_DIAGONAL { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_PERCENT_DIAGONAL"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , FIRST_FT_START_Y - 2 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -254,6 +265,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_BACKSCALE { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_BACKSCALE"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1, FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ; @@ -275,6 +287,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_END_ANGLE { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_END_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1, FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ; @@ -297,6 +310,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_DEPTH { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_DEPTH"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1, FIRST_FT_START_Y + 3*FT_OFFSET_NEXT - 2 ) ; @@ -328,6 +342,7 @@ DockingWindow RID_SVXFLOAT_3D }; NumericField NUM_HORIZONTAL { + HelpID = "svx:NumericField:RID_SVXFLOAT_3D:NUM_HORIZONTAL"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + 42, SEGMENTS_START_Y+13-2 ) ; Size = MAP_APPFONT ( 22 , 12 ) ; @@ -347,6 +362,7 @@ DockingWindow RID_SVXFLOAT_3D }; NumericField NUM_VERTICAL { + HelpID = "svx:NumericField:RID_SVXFLOAT_3D:NUM_VERTICAL"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + 114+2 , SEGMENTS_START_Y+13-2 ) ; Size = MAP_APPFONT ( 22 , 12 ) ; @@ -367,6 +383,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_NORMALS_OBJ { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_OBJ"; Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -379,6 +396,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_NORMALS_FLAT { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_FLAT"; Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) , NORMALS_BT_START_Y ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -391,6 +409,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_NORMALS_SPHERE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_SPHERE"; Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) * 2 , NORMALS_BT_START_Y ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -403,6 +422,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_NORMALS_INVERT { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_NORMALS_INVERT"; Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y + IMG_BUTTON_NEXT ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -415,6 +435,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TWO_SIDED_LIGHTING { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TWO_SIDED_LIGHTING"; Pos = MAP_APPFONT ( FT_INDENT + (1+BUTTON_WIDTH) * 2 , NORMALS_BT_START_Y + IMG_BUTTON_NEXT ) ; Size = IMG_BUTTON_SIZE; @@ -428,6 +449,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_DOUBLE_SIDED { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_DOUBLE_SIDED"; Pos = MAP_APPFONT ( FT_INDENT , NORMALS_BT_START_Y + 2*IMG_BUTTON_NEXT ) ; Size = IMG_BUTTON_SIZE; ButtonImage = Image @@ -448,6 +470,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_SHADEMODE { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_SHADEMODE"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 30 ) ; Size = MAP_APPFONT ( 83 , 100 ) ; @@ -468,6 +491,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_SHADOW_3D { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_SHADOW_3D"; Pos = MAP_APPFONT ( FT_INDENT , SHADOW_START_Y + 11 ) ; Size = IMG_BUTTON_SIZE; TabStop = TRUE ; @@ -488,6 +512,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_SLANT { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_SLANT"; Border = TRUE ; Pos = MAP_APPFONT ( 99 , SHADOW_START_Y + 11 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -515,6 +540,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_DISTANCE { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_DISTANCE"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , CAMERA_START_Y + 11 - 2 ) ; @@ -539,6 +565,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_FOCAL_LENGTH { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_FOCAL_LENGTH"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_LONG + 1 , CAMERA_START_Y + 11 + FT_OFFSET_NEXT - 2 ) ; @@ -570,6 +597,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_1 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_1"; Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -582,6 +610,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_2 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_2"; Pos = MAP_APPFONT ( FT_INDENT + 13 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -594,6 +623,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_3 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_3"; Pos = MAP_APPFONT ( FT_INDENT + 2*13 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -606,6 +636,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_4 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_4"; Pos = MAP_APPFONT ( FT_INDENT + 3*13 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -618,6 +649,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_5 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_5"; Pos = MAP_APPFONT ( FT_INDENT , FIRST_FT_START_Y + 26 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -630,6 +662,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_6 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_6"; Pos = MAP_APPFONT ( FT_INDENT + 13, FIRST_FT_START_Y + 26 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -642,6 +675,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_7 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_7"; Pos = MAP_APPFONT ( FT_INDENT + 2*13, FIRST_FT_START_Y + 26 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -654,6 +688,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_8 { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_8"; Pos = MAP_APPFONT ( FT_INDENT +3*13 , FIRST_FT_START_Y + 26 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -666,6 +701,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_1 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_1"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -674,6 +710,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_2 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_2"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -682,6 +719,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_3 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_3"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -690,6 +728,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_4 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_4"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -698,6 +737,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_5 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_5"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -706,6 +746,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_6 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_6"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -714,6 +755,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_7 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_7"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -722,6 +764,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_LIGHT_8 { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_LIGHT_8"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -730,6 +773,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_LIGHT_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_LIGHT_COLOR"; Pos = MAP_APPFONT ( 137 , FIRST_FT_START_Y + 11 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -748,6 +792,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_AMBIENTLIGHT { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_AMBIENTLIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , FIRST_FT_START_Y + 53 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -756,6 +801,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_AMBIENT_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_AMBIENT_COLOR"; Pos = MAP_APPFONT ( 137 , FIRST_FT_START_Y + 53 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; ButtonImage = Image @@ -782,6 +828,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_LUMINANCE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_LUMINANCE"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -795,6 +842,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_COLOR"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, FIRST_FT_START_Y - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -814,6 +862,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_REPLACE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_REPLACE"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -827,6 +876,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_MODULATE { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_MODULATE"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -840,6 +890,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_BLEND { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_BLEND"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH, FIRST_FT_START_Y + IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -859,6 +910,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_OBJECT_X { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_X"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -872,6 +924,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_PARALLEL_X { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_X"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -885,6 +938,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_CIRCLE_X { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_X"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH, FIRST_FT_START_Y + 2*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -904,6 +958,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_OBJECT_Y { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_OBJECT_Y"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -917,6 +972,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_PARALLEL_Y { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_PARALLEL_Y"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + BUTTON_WIDTH, FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -930,6 +986,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_CIRCLE_Y { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_CIRCLE_Y"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 + 2*BUTTON_WIDTH, FIRST_FT_START_Y + 3*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -949,6 +1006,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_TEX_FILTER { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_TEX_FILTER"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y + 4*IMG_BUTTON_NEXT - 2 ) ; Size = IMG_BUTTON_SIZE; @@ -986,6 +1044,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_MAT_FAVORITES { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_FAVORITES"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, FIRST_FT_START_Y - 2 ) ; @@ -1010,6 +1069,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_MAT_COLOR { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ; @@ -1019,6 +1079,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_MAT_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_COLOR"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 72 , FIRST_FT_START_Y + FT_OFFSET_NEXT - 2 ) ; Size = MAP_APPFONT ( 12, 14 ) ; @@ -1038,6 +1099,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_MAT_EMISSION { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_EMISSION"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ; @@ -1047,6 +1109,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_EMISSION_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_EMISSION_COLOR"; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 72 , FIRST_FT_START_Y + 2*FT_OFFSET_NEXT - 2 ) ; Size = MAP_APPFONT ( 12, 14 ) ; @@ -1073,6 +1136,7 @@ DockingWindow RID_SVXFLOAT_3D }; ListBox LB_MAT_SPECULAR { + HelpID = "svx:ListBox:RID_SVXFLOAT_3D:LB_MAT_SPECULAR"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1, SPECULAR_START_Y + 13 - 2 ) ; Size = MAP_APPFONT ( 68 , 100 ) ; @@ -1081,6 +1145,7 @@ DockingWindow RID_SVXFLOAT_3D }; ImageButton BTN_SPECULAR_COLOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_SPECULAR_COLOR"; Pos = MAP_APPFONT ( 137 , SPECULAR_START_Y + 13 - 2 ) ; Size = MAP_APPFONT ( 12, 14 ) ; ButtonImage = Image @@ -1099,6 +1164,7 @@ DockingWindow RID_SVXFLOAT_3D }; MetricField MTR_MAT_SPECULAR_INTENSITY { + HelpID = "svx:MetricField:RID_SVXFLOAT_3D:MTR_MAT_SPECULAR_INTENSITY"; Border = TRUE ; Pos = MAP_APPFONT ( FT_INDENT + FT_WIDTH_SHORT + 1 , SPECULAR_START_Y + 13 + FT_OFFSET_NEXT ) ; @@ -1116,6 +1182,7 @@ DockingWindow RID_SVXFLOAT_3D }; /* ImageButton BTN_MAT_FAVORITES { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_FAVORITES"; Pos = MAP_APPFONT( BORDER, GROUP_PREV_Y+1 ); Size = IMG_BUTTON_SIZE; QuickHelpText = "Material Favoriten" ; @@ -1127,6 +1194,7 @@ DockingWindow RID_SVXFLOAT_3D TabStop = TRUE; }; ImageButton BTN_MAT_EDITOR { + HelpID = "svx:ImageButton:RID_SVXFLOAT_3D:BTN_MAT_EDITOR"; Pos = MAP_APPFONT( BORDER + BUTTON_WIDTH, GROUP_PREV_Y+1 ); Size = IMG_BUTTON_SIZE; QuickHelpText = "Material Editor" ; diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src index 1b300c279312..5d81bf13ac26 100644 --- a/svx/source/form/datanavi.src +++ b/svx/source/form/datanavi.src @@ -34,6 +34,7 @@ TabPage RID_SVX_XFORMS_TABPAGES { + HelpID = "svx:TabPage:RID_SVX_XFORMS_TABPAGES"; Hide = TRUE ; DialogControl = TRUE; Size = MAP_APPFONT ( 63 , 100 ) ; @@ -348,6 +349,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; Edit ED_NAME { + HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_NAME"; Pos = MAP_APPFONT ( 78 , 14 ) ; Size = MAP_APPFONT ( 96 , 12 ) ; Border = TRUE ; @@ -361,12 +363,14 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; Edit ED_DEFAULT { + HelpID = "svx:Edit:RID_SVXDLG_ADD_DATAITEM:ED_DEFAULT"; Pos = MAP_APPFONT ( 78 , 29 ) ; Size = MAP_APPFONT ( 96 , 12 ) ; Border = TRUE ; }; PushButton PB_DEFAULT { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_DEFAULT"; Pos = MAP_APPFONT ( 160 , 29 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -388,6 +392,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; ListBox LB_DATATYPE { + HelpID = "svx:ListBox:RID_SVXDLG_ADD_DATAITEM:LB_DATATYPE"; Pos = MAP_APPFONT ( 78 , 55 ) ; Size = MAP_APPFONT ( 96 , 45 ) ; Border = TRUE ; @@ -395,6 +400,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_REQUIRED { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_REQUIRED"; Pos = MAP_APPFONT ( 6 , 72 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -402,6 +408,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_REQUIRED { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_REQUIRED"; Pos = MAP_APPFONT ( 78 , 70 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -409,6 +416,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_RELEVANT { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_RELEVANT"; Pos = MAP_APPFONT ( 6 , 89 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -416,6 +424,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_RELEVANT { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_RELEVANT"; Pos = MAP_APPFONT ( 78 , 87 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -423,6 +432,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_CONSTRAINT { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CONSTRAINT"; Pos = MAP_APPFONT ( 6 , 106 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -430,6 +440,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_CONSTRAINT { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CONSTRAINT"; Pos = MAP_APPFONT ( 78 , 104 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -437,6 +448,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_READONLY { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_READONLY"; Pos = MAP_APPFONT ( 6 , 123 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -444,6 +456,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_READONLY { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_READONLY"; Pos = MAP_APPFONT ( 78 , 121 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -451,6 +464,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; CheckBox CB_CALCULATE { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_DATAITEM:CB_CALCULATE"; Pos = MAP_APPFONT ( 6 , 140 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -458,6 +472,7 @@ ModalDialog RID_SVXDLG_ADD_DATAITEM }; PushButton PB_CALCULATE { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_DATAITEM:PB_CALCULATE"; Pos = MAP_APPFONT ( 78 , 138 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -574,6 +589,7 @@ ModalDialog RID_SVXDLG_ADD_CONDITION }; MultiLineEdit ED_CONDITION { + HelpID = "svx:MultiLineEdit:RID_SVXDLG_ADD_CONDITION:ED_CONDITION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 198 , 34 ) ; @@ -599,6 +615,7 @@ ModalDialog RID_SVXDLG_ADD_CONDITION }; PushButton PB_EDIT_NAMESPACES { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_CONDITION:PB_EDIT_NAMESPACES"; Pos = MAP_APPFONT ( 132 , 102 ) ; Size = MAP_APPFONT ( 72 , 14 ) ; TabStop = TRUE ; @@ -655,6 +672,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM }; PushButton PB_ADD_NAMESPACE { + HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_ADD_NAMESPACE"; Pos = MAP_APPFONT ( 184 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -662,6 +680,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM }; PushButton PB_EDIT_NAMESPACE { + HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_EDIT_NAMESPACE"; Pos = MAP_APPFONT ( 184 , 31 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -669,6 +688,7 @@ ModalDialog RID_SVXDLG_NAMESPACE_ITEM }; PushButton PB_DELETE_NAMESPACE { + HelpID = "svx:PushButton:RID_SVXDLG_NAMESPACE_ITEM:PB_DELETE_NAMESPACE"; Pos = MAP_APPFONT ( 184 , 48 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -725,6 +745,7 @@ ModalDialog RID_SVXDLG_MANAGE_NAMESPACE }; Edit ED_PREFIX { + HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_PREFIX"; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; Border = TRUE; @@ -738,6 +759,7 @@ ModalDialog RID_SVXDLG_MANAGE_NAMESPACE }; Edit ED_URL { + HelpID = "svx:Edit:RID_SVXDLG_MANAGE_NAMESPACE:ED_URL"; Pos = MAP_APPFONT ( 54 , 14 ) ; Size = MAP_APPFONT ( 150 , 12 ) ; Border = TRUE; @@ -795,6 +817,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; Edit ED_SUBMIT_NAME { + HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_NAME"; Pos = MAP_APPFONT ( 78 , 14 ) ; Size = MAP_APPFONT ( 96 , 12 ) ; Border = TRUE ; @@ -808,6 +831,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; Edit ED_SUBMIT_ACTION { + HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_ACTION"; Pos = MAP_APPFONT ( 78 , 29 ) ; Size = MAP_APPFONT ( 96 , 12 ) ; Border = TRUE ; @@ -821,6 +845,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; ListBox LB_SUBMIT_METHOD { + HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_METHOD"; Pos = MAP_APPFONT ( 78 , 44 ) ; Size = MAP_APPFONT ( 96 , 51 ) ; Border = TRUE ; @@ -835,12 +860,14 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; Edit ED_SUBMIT_REF { + HelpID = "svx:Edit:RID_SVXDLG_ADD_SUBMISSION:ED_SUBMIT_REF"; Pos = MAP_APPFONT ( 78 , 60 ) ; Size = MAP_APPFONT ( 79, 12 ) ; Border = TRUE ; }; PushButton PB_SUBMIT_REF { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_SUBMISSION:PB_SUBMIT_REF"; Pos = MAP_APPFONT ( 159 , 59 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -855,6 +882,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; ListBox LB_SUBMIT_BIND { + HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_BIND"; Pos = MAP_APPFONT ( 78 , 75 ) ; Size = MAP_APPFONT ( 96 , 51 ) ; Border = TRUE ; @@ -869,6 +897,7 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION }; ListBox LB_SUBMIT_REPLACE { + HelpID = "svx:ListBox:RID_SVXDLG_ADD_SUBMISSION:LB_SUBMIT_REPLACE"; Pos = MAP_APPFONT ( 78 , 90 ) ; Size = MAP_APPFONT ( 96 , 51 ) ; Border = TRUE ; @@ -949,12 +978,14 @@ ModalDialog RID_SVXDLG_ADD_MODEL }; Edit ED_INST_NAME { + HelpID = "svx:Edit:RID_SVXDLG_ADD_MODEL:ED_INST_NAME"; Pos = MAP_APPFONT ( 60 , 14 ) ; Size = MAP_APPFONT ( 114 , 12 ) ; Border = TRUE ; }; CheckBox CB_MODIFIES_DOCUMENT { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_MODEL:CB_MODIFIES_DOCUMENT"; Pos = MAP_APPFONT( 6, 32 ); Size = MAP_APPFONT( 168, 16 ); Top = TRUE; @@ -1015,6 +1046,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE }; Edit ED_INST_NAME { + HelpID = "svx:Edit:RID_SVXDLG_ADD_INSTANCE:ED_INST_NAME"; Pos = MAP_APPFONT ( 60 , 14 ) ; Size = MAP_APPFONT ( 144 , 12 ) ; Border = TRUE ; @@ -1028,6 +1060,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE }; ComboBox ED_INST_URL { + HelpID = "svx:ComboBox:RID_SVXDLG_ADD_INSTANCE:ED_INST_URL"; Pos = MAP_APPFONT ( 60 , 29 ) ; Size = MAP_APPFONT ( 127 , 48 ) ; DropDown = TRUE ; @@ -1035,6 +1068,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE }; PushButton PB_FILEPICKER { + HelpID = "svx:PushButton:RID_SVXDLG_ADD_INSTANCE:PB_FILEPICKER"; Pos = MAP_APPFONT ( 190 , 28 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = TRUE ; @@ -1042,6 +1076,7 @@ ModalDialog RID_SVXDLG_ADD_INSTANCE }; CheckBox CB_INST_LINKINST { + HelpID = "svx:CheckBox:RID_SVXDLG_ADD_INSTANCE:CB_INST_LINKINST"; Pos = MAP_APPFONT ( 6 , 44 ) ; Size = MAP_APPFONT ( 198 , 10 ) ; TabStop = TRUE ; diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index 8aca6d9ad86d..b5bdd50239e7 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -307,6 +307,7 @@ ImageList RID_SVXIMGLIST_FMEXPL_HC ModalDialog RID_SVXDLG_SETFORM { + HelpID = "svx:ModalDialog:RID_SVXDLG_SETFORM"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 200 ) ; @@ -345,6 +346,7 @@ ModalDialog RID_SVXDLG_SETFORM }; DockingWindow RID_SVX_FMEXPLORER { + HelpID = "svx:DockingWindow:RID_SVX_FMEXPLORER"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 200 , 200 ) ; diff --git a/svx/source/intro/iso.src b/svx/source/intro/iso.src index ecadfd9d4c6a..7b9067662c7a 100644 --- a/svx/source/intro/iso.src +++ b/svx/source/intro/iso.src @@ -58,6 +58,7 @@ String RID_BUILDVERSION ModalDialog RID_DEFAULTABOUT { + HelpID = "svx:ModalDialog:RID_DEFAULTABOUT"; OutputSize = TRUE ; Size = MAP_APPFONT ( 245 , 260 ) ; Moveable = TRUE ; @@ -78,6 +79,7 @@ ModalDialog RID_DEFAULTABOUT }; MultiLineEdit ABOUT_FTXT_COPYRIGHT { + HelpID = "svx:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 54 , 25 ) ; Size = MAP_APPFONT ( 168 , 51 ) ; diff --git a/svx/source/intro/ooo.src b/svx/source/intro/ooo.src index 49f6f68fd7e4..7f6f0ed6ff47 100644 --- a/svx/source/intro/ooo.src +++ b/svx/source/intro/ooo.src @@ -64,6 +64,7 @@ String RID_BUILDVERSION ModalDialog RID_DEFAULTABOUT { + HelpID = "svx:ModalDialog:RID_DEFAULTABOUT"; OutputSize = TRUE ; Size = MAP_APPFONT ( 245 , 260 ) ; Moveable = TRUE ; @@ -84,6 +85,7 @@ ModalDialog RID_DEFAULTABOUT }; MultiLineEdit ABOUT_FTXT_COPYRIGHT { + HelpID = "svx:MultiLineEdit:RID_DEFAULTABOUT:ABOUT_FTXT_COPYRIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 54 , 25 ) ; Size = MAP_APPFONT ( 168 , 51 ) ; diff --git a/svx/source/tbxctrls/extrusioncontrols.src b/svx/source/tbxctrls/extrusioncontrols.src index 084606439cc3..c7655b9576af 100644 --- a/svx/source/tbxctrls/extrusioncontrols.src +++ b/svx/source/tbxctrls/extrusioncontrols.src @@ -32,6 +32,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DIRECTION"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -202,6 +203,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DIRECTION DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_DEPTH"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -292,6 +294,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_DEPTH DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_LIGHTING"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -608,6 +611,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_LIGHTING DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_EXTRUSION_SURFACE"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -686,6 +690,7 @@ DockingWindow RID_SVXFLOAT_EXTRUSION_SURFACE ModalDialog RID_SVX_MDLG_EXTRUSION_DEPTH { + HelpID = "svx:ModalDialog:RID_SVX_MDLG_EXTRUSION_DEPTH"; OutputSize = TRUE; SVLook = TRUE ; Moveable = TRUE; diff --git a/svx/source/tbxctrls/fontworkgallery.src b/svx/source/tbxctrls/fontworkgallery.src index e5f52158b4b6..98fd8c6cb5df 100644 --- a/svx/source/tbxctrls/fontworkgallery.src +++ b/svx/source/tbxctrls/fontworkgallery.src @@ -37,6 +37,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY { + HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_GALLERY"; OutputSize = TRUE; SVLook = TRUE ; Moveable = TRUE; @@ -94,6 +95,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_GALLERY DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_ALIGNMENT"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -229,6 +231,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_ALIGNMENT DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING { + HelpID = "svx:DockingWindow:RID_SVXFLOAT_FONTWORK_CHARSPACING"; Border = FALSE ; Hide = TRUE ; SVLook = TRUE ; @@ -271,6 +274,7 @@ DockingWindow RID_SVXFLOAT_FONTWORK_CHARSPACING ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING { + HelpID = "svx:ModalDialog:RID_SVX_MDLG_FONTWORK_CHARSPACING"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 139 , 64 ) ; @@ -306,6 +310,7 @@ ModalDialog RID_SVX_MDLG_FONTWORK_CHARSPACING }; MetricField MF_VALUE { + HelpID = "svx:MetricField:RID_SVX_MDLG_FONTWORK_CHARSPACING:MF_VALUE"; Border = FALSE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 32 , 12 ) ; diff --git a/svx/source/tbxctrls/lboxctrl.src b/svx/source/tbxctrls/lboxctrl.src index 18e345675532..4150e07ba249 100644 --- a/svx/source/tbxctrls/lboxctrl.src +++ b/svx/source/tbxctrls/lboxctrl.src @@ -42,6 +42,7 @@ FloatingWindow RID_SVXTBX_UNDO_REDO_CTRL ListBox LB_SVXTBX_UNDO_REDO_CTRL { + HelpID = "svx:ListBox:RID_SVXTBX_UNDO_REDO_CTRL:LB_SVXTBX_UNDO_REDO_CTRL"; Pos = MAP_APPFONT ( 0 , 0 ) ; Size = MAP_APPFONT ( 150 , 60 ) ; Border = TRUE ; diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src index 76ec3f39eb43..46c6a7b341d1 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.src @@ -66,6 +66,7 @@ ModalDialog DLG_CHINESEDICTIONARY { + HelpID = "svx:ModalDialog:DLG_CHINESEDICTIONARY"; //HelpId = ; Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT ); OutputSize = TRUE; @@ -79,6 +80,7 @@ ModalDialog DLG_CHINESEDICTIONARY CheckBox CB_REVERSE { + HelpID = "svx:CheckBox:DLG_CHINESEDICTIONARY:CB_REVERSE"; Pos = MAP_APPFONT ( COL_1, ROW_3 ) ; Size = MAP_APPFONT ( FULL_WIDTH - COL_1 - RSC_SP_DLG_INNERBORDER_RIGHT , RSC_CD_CHECKBOX_HEIGHT ) ; @@ -93,6 +95,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; Edit ED_TERM { + HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_TERM"; Border = TRUE ; Pos = MAP_APPFONT ( COL_1 , ROW_5 ) ; Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -107,6 +110,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; Edit ED_MAPPING { + HelpID = "svx:Edit:DLG_CHINESEDICTIONARY:ED_MAPPING"; Border = TRUE ; Pos = MAP_APPFONT ( COL_2 , ROW_5 ) ; Size = MAP_APPFONT ( COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -120,6 +124,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; ListBox LB_PROPERTY { + HelpID = "svx:ListBox:DLG_CHINESEDICTIONARY:LB_PROPERTY"; Border = TRUE ; Pos = MAP_APPFONT ( COL_3 , ROW_5 ) ; Size = MAP_APPFONT ( REST_COL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -154,6 +159,7 @@ ModalDialog DLG_CHINESEDICTIONARY PushButton PB_ADD { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_ADD"; Pos = MAP_APPFONT( COL_4, ROW_5 ); Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); @@ -161,6 +167,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; PushButton PB_MODIFY { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_MODIFY"; Pos = MAP_APPFONT( COL_4, ROW_5a ); Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); @@ -168,6 +175,7 @@ ModalDialog DLG_CHINESEDICTIONARY }; PushButton PB_DELETE { + HelpID = "svx:PushButton:DLG_CHINESEDICTIONARY:PB_DELETE"; Pos = MAP_APPFONT( COL_4, ROW_5b ); Size = MAP_APPFONT( BUTTONCOL_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ); diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src index 397466a7dc68..b99d3e7c745a 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translationdialog.src @@ -58,6 +58,7 @@ ModalDialog DLG_CHINESETRANSLATION { + HelpID = "svx:ModalDialog:DLG_CHINESETRANSLATION"; //HelpId = ; Size = MAP_APPFONT( FULL_WIDTH, FULL_HEIGHT ); OutputSize = TRUE; @@ -78,6 +79,7 @@ ModalDialog DLG_CHINESETRANSLATION CheckBox CB_USE_VARIANTS { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_USE_VARIANTS"; Pos = MAP_APPFONT( COL_3, ROW_4 ); Size = MAP_APPFONT ( FULL_WIDTH - COL_3 - RSC_SP_DLG_INNERBORDER_RIGHT, RSC_CD_CHECKBOX_HEIGHT ) ; @@ -93,6 +95,7 @@ ModalDialog DLG_CHINESETRANSLATION CheckBox CB_TRANSLATE_COMMONTERMS { + HelpID = "svx:CheckBox:DLG_CHINESETRANSLATION:CB_TRANSLATE_COMMONTERMS"; Pos = MAP_APPFONT( COL_2, ROW_6 ); Size = MAP_APPFONT ( COL_4 - COL_2, RSC_CD_CHECKBOX_HEIGHT ) ; @@ -101,6 +104,7 @@ ModalDialog DLG_CHINESETRANSLATION PushButton PB_EDITTERMS { + HelpID = "svx:PushButton:DLG_CHINESETRANSLATION:PB_EDITTERMS"; Pos = MAP_APPFONT( COL_4, ROW_6-(RSC_CD_PUSHBUTTON_HEIGHT-RSC_CD_CHECKBOX_HEIGHT)/2 ); Size = MAP_APPFONT( EDITBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); diff --git a/uui/source/cookiedg.src b/uui/source/cookiedg.src index 9df0d481d6ae..156da50c160c 100644 --- a/uui/source/cookiedg.src +++ b/uui/source/cookiedg.src @@ -64,18 +64,21 @@ ModalDialog DLG_COOKIES }; RadioButton RB_INFUTURE_SEND { + HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_SEND"; Pos = MAP_APPFONT ( 12 , 171 ) ; Size = MAP_APPFONT ( 52 , 10 ) ; Text [ en-US ] = "~Send" ; }; RadioButton RB_INFUTURE_IGNORE { + HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_IGNORE"; Pos = MAP_APPFONT ( 67 , 171 ) ; Size = MAP_APPFONT ( 52 , 10 ) ; Text [ en-US ] = "I~gnore" ; }; RadioButton RB_INFUTURE_INTERACTIVE { + HelpID = "uui:RadioButton:DLG_COOKIES:RB_INFUTURE_INTERACTIVE"; Pos = MAP_APPFONT ( 122 , 171 ) ; Size = MAP_APPFONT ( 52 , 10 ) ; Text [ en-US ] = "I~nteractive" ; @@ -90,12 +93,14 @@ ModalDialog DLG_COOKIES }; PushButton BTN_COOKIES_CANCEL { + HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_CANCEL"; Pos = MAP_APPFONT ( 186 , 173 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Ignore" ; }; PushButton BTN_COOKIES_OK { + HelpID = "uui:PushButton:DLG_COOKIES:BTN_COOKIES_OK"; Pos = MAP_APPFONT ( 239 , 173 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; DefButton = TRUE ; diff --git a/uui/source/fltdlg.src b/uui/source/fltdlg.src index 84e27cd1be1f..6e25266e95ed 100644 --- a/uui/source/fltdlg.src +++ b/uui/source/fltdlg.src @@ -53,6 +53,7 @@ ModalDialog DLG_FILTER_SELECT ListBox LB_FILTERS { + HelpID = "uui:ListBox:DLG_FILTER_SELECT:LB_FILTERS"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 19 ) ; Size = MAP_APPFONT ( 182 , 175 ) ; diff --git a/uui/source/masterpasscrtdlg.src b/uui/source/masterpasscrtdlg.src old mode 100755 new mode 100644 index 439026d3f6e1..1ed1e9507b96 --- a/uui/source/masterpasscrtdlg.src +++ b/uui/source/masterpasscrtdlg.src @@ -63,6 +63,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT }; Edit ED_MASTERPASSWORD_CRT { + HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_CRT"; Pos = MAP_APPFONT ( COL_0 , ROW_3 ) ; Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; Border = TRUE ; @@ -76,6 +77,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD_CRT }; Edit ED_MASTERPASSWORD_REPEAT { + HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD_CRT:ED_MASTERPASSWORD_REPEAT"; Pos = MAP_APPFONT ( COL_0 , ROW_5 ) ; Size = MAP_APPFONT ( CTRL_WIDTH , RSC_CD_TEXTBOX_HEIGHT ) ; Border = TRUE ; diff --git a/uui/source/masterpassworddlg.src b/uui/source/masterpassworddlg.src index c7bc835d92ee..2919a85ab488 100644 --- a/uui/source/masterpassworddlg.src +++ b/uui/source/masterpassworddlg.src @@ -50,6 +50,7 @@ ModalDialog DLG_UUI_MASTERPASSWORD }; Edit ED_MASTERPASSWORD { + HelpID = "uui:Edit:DLG_UUI_MASTERPASSWORD:ED_MASTERPASSWORD"; Border = TRUE ; Pos = MAP_APPFONT ( 3 , 17 ) ; Size = MAP_APPFONT ( 169 , 13 ) ; diff --git a/uui/source/nameclashdlg.src b/uui/source/nameclashdlg.src old mode 100755 new mode 100644 index de8cdb8e716d..b0e5ab5d15bf --- a/uui/source/nameclashdlg.src +++ b/uui/source/nameclashdlg.src @@ -60,6 +60,7 @@ ModalDialog DLG_SIMPLE_NAME_CLASH Edit EDIT_NEW_NAME { + HelpID = "uui:Edit:DLG_SIMPLE_NAME_CLASH:EDIT_NEW_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( BORDER_OFFSET, DLG_HEIGTH - EDIT_HEIGTH - BTN_HEIGTH - 2*BORDER_OFFSET ) ; Size = MAP_APPFONT ( DLG_WIDTH - 2*BORDER_OFFSET , EDIT_HEIGTH ) ; @@ -67,6 +68,7 @@ ModalDialog DLG_SIMPLE_NAME_CLASH PushButton BTN_OVERWRITE { + HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_OVERWRITE"; Pos = MAP_APPFONT ( DLG_WIDTH - 3*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ; Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ; TabStop = TRUE ; @@ -75,6 +77,7 @@ ModalDialog DLG_SIMPLE_NAME_CLASH PushButton BTN_RENAME { + HelpID = "uui:PushButton:DLG_SIMPLE_NAME_CLASH:BTN_RENAME"; Pos = MAP_APPFONT ( DLG_WIDTH - 2*(BTN_WIDTH + BORDER_OFFSET) , DLG_HEIGTH - BTN_HEIGTH - BORDER_OFFSET ) ; Size = MAP_APPFONT ( BTN_WIDTH, BTN_HEIGTH ) ; TabStop = TRUE ; diff --git a/uui/source/newerverwarn.src b/uui/source/newerverwarn.src index 3de289d69baa..94ee6be7db12 100644 --- a/uui/source/newerverwarn.src +++ b/uui/source/newerverwarn.src @@ -66,6 +66,7 @@ ModalDialog RID_DLG_NEWER_VERSION_WARNING }; PushButton PB_UPDATE { + HelpID = "uui:PushButton:RID_DLG_NEWER_VERSION_WARNING:PB_UPDATE"; Pos = MAP_APPFONT ( COL_3 , ROW_3 ) ; Size = MAP_APPFONT ( RSC_CD_PUSHBUTTON_WIDTH , RSC_CD_PUSHBUTTON_HEIGHT ) ; TabStop = TRUE ; diff --git a/uui/source/passworddlg.src b/uui/source/passworddlg.src old mode 100755 new mode 100644 index 52f8fbfac134..41c90dfabcab --- a/uui/source/passworddlg.src +++ b/uui/source/passworddlg.src @@ -52,6 +52,7 @@ ModalDialog DLG_UUI_PASSWORD Edit ED_PASSWORD { + HelpID = "uui:Edit:DLG_UUI_PASSWORD:ED_PASSWORD"; Pos = MAP_APPFONT( 3, 17 ); Size = MAP_APPFONT( 159, 12 ); Border = TRUE ; @@ -67,6 +68,7 @@ ModalDialog DLG_UUI_PASSWORD Edit ED_CONFIRM_PASSWORD { + HelpID = "uui:Edit:DLG_UUI_PASSWORD:ED_CONFIRM_PASSWORD"; Pos = MAP_APPFONT( 3, 45 ); Size = MAP_APPFONT( 159, 12 ); Border = TRUE ; diff --git a/uui/source/secmacrowarnings.src b/uui/source/secmacrowarnings.src index 6d0039da7746..f19694054281 100644 --- a/uui/source/secmacrowarnings.src +++ b/uui/source/secmacrowarnings.src @@ -74,6 +74,7 @@ ModalDialog RID_XMLSECDLG_MACROWARN }; PushButton PB_VIEWSIGNS { + HelpID = "uui:PushButton:RID_XMLSECDLG_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..."; @@ -87,6 +88,7 @@ ModalDialog RID_XMLSECDLG_MACROWARN }; CheckBox CB_ALWAYSTRUST { + HelpID = "uui:CheckBox:RID_XMLSECDLG_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"; diff --git a/uui/source/sslwarndlg.src b/uui/source/sslwarndlg.src index acae9453a971..b1fe7f54c020 100644 --- a/uui/source/sslwarndlg.src +++ b/uui/source/sslwarndlg.src @@ -59,6 +59,7 @@ ModalDialog DLG_UUI_SSLWARN PushButton PB_VIEW__CERTIFICATE { + HelpID = "uui:PushButton:DLG_UUI_SSLWARN:PB_VIEW__CERTIFICATE"; Pos = MAP_APPFONT( DLG_CTLBTN_CERT_START_X, DLG_CTLBTN_START_Y ); Size = MAP_APPFONT( DLG_CTLBTN_CERT_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); @@ -77,6 +78,7 @@ ModalDialog DLG_UUI_SSLWARN PushButton PB_OK { + HelpID = "uui:PushButton:DLG_UUI_SSLWARN:PB_OK"; Pos = MAP_APPFONT( DLG_CTLBTN_OK_START_X, DLG_CTLBTN_START_Y ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); diff --git a/uui/source/unknownauthdlg.src b/uui/source/unknownauthdlg.src index d20a28a00704..37613939565e 100644 --- a/uui/source/unknownauthdlg.src +++ b/uui/source/unknownauthdlg.src @@ -62,6 +62,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH PushButton PB_VIEW__CERTIFICATE { + HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_VIEW__CERTIFICATE"; Pos = MAP_APPFONT( DLG_TEXT_START_X, RSC_SP_DLG_INNERBORDER_TOP + DLG_TEXT_1_HEIGHT + RSC_SP_CTRL_GROUP_Y ); Size = MAP_APPFONT( 70, RSC_CD_PUSHBUTTON_HEIGHT ); @@ -80,6 +81,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH PushButton PB_OK { + HelpID = "uui:PushButton:DLG_UUI_UNKNOWNAUTH:PB_OK"; Pos = MAP_APPFONT( DLG_CTLBTN_OK_START_X, DLG_CTLBTN_START_Y ); Size = MAP_APPFONT( RSC_CD_PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); @@ -96,6 +98,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH RadioButton RB_ACCEPT_1 { + HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_ACCEPT_1"; Pos = MAP_APPFONT( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y ); Size = MAP_APPFONT( 182, RSC_CD_RADIOBUTTON_HEIGHT ); @@ -106,6 +109,7 @@ ModalDialog DLG_UUI_UNKNOWNAUTH RadioButton RB_DONTACCEPT_2 { + HelpID = "uui:RadioButton:DLG_UUI_UNKNOWNAUTH:RB_DONTACCEPT_2"; Pos = MAP_APPFONT( DLG_TEXT_START_X, DLG_RADIOBTN_START_Y + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT( 182, RSC_CD_RADIOBUTTON_HEIGHT ); -- cgit From 976acf3ed1eafb6101a99b8afad94bd3de1fa80d Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 11 Oct 2010 17:56:12 +0200 Subject: CWS changehid: generate former auto hids into src files --- basctl/source/basicide/brkdlg.src | 5 ++ basctl/source/basicide/macrodlg.src | 9 +++ basctl/source/basicide/moduldlg.src | 23 ++++++ basctl/source/basicide/moptions.src | 3 + basctl/source/basicide/objdlg.src | 1 + basctl/source/dlged/managelang.src | 5 ++ cui/source/customize/acccfg.src | 7 ++ cui/source/customize/cfg.src | 19 +++++ cui/source/customize/eventdlg.src | 3 + cui/source/customize/macropg.src | 5 ++ cui/source/dialogs/SpellDialog.src | 15 ++++ cui/source/dialogs/charmap.src | 3 + cui/source/dialogs/cuiimapdlg.src | 6 ++ cui/source/dialogs/dlgname.src | 6 ++ cui/source/dialogs/fmsearch.src | 8 +++ cui/source/dialogs/gallery.src | 11 +++ cui/source/dialogs/grfflt.src | 8 +++ cui/source/dialogs/hangulhanjadlg.src | 26 +++++++ cui/source/dialogs/hyperdlg.src | 40 +++++++++++ cui/source/dialogs/hyphen.src | 6 ++ cui/source/dialogs/insrc.src | 4 ++ cui/source/dialogs/multipat.src | 3 + cui/source/dialogs/newtabledlg.src | 3 + cui/source/dialogs/postdlg.src | 4 ++ cui/source/dialogs/scriptdlg.src | 7 ++ cui/source/dialogs/showcols.src | 2 + cui/source/dialogs/splitcelldlg.src | 5 ++ cui/source/dialogs/srchxtra.src | 4 ++ cui/source/dialogs/svuidlg.src | 44 ++++++++++++ cui/source/dialogs/tbxform.src | 2 + cui/source/dialogs/thesdlg.src | 4 ++ cui/source/dialogs/zoom.src | 11 +++ cui/source/options/connpooloptions.src | 4 ++ cui/source/options/dbregister.src | 3 + cui/source/options/doclinkdialog.src | 4 ++ cui/source/options/fontsubs.src | 6 ++ cui/source/options/internationaloptions.src | 5 ++ cui/source/options/optaccessibility.src | 9 +++ cui/source/options/optasian.src | 9 +++ cui/source/options/optchart.src | 2 + cui/source/options/optcolor.src | 11 +++ cui/source/options/optctl.src | 6 ++ cui/source/options/optdict.src | 9 +++ cui/source/options/optfltr.src | 9 +++ cui/source/options/optgdlg.src | 34 +++++++++ cui/source/options/optgenrl.src | 20 ++++++ cui/source/options/opthtml.src | 17 +++++ cui/source/options/optimprove.src | 3 + cui/source/options/optinet2.src | 39 ++++++++++ cui/source/options/optjava.src | 12 ++++ cui/source/options/optjsearch.src | 19 +++++ cui/source/options/optlingu.src | 10 +++ cui/source/options/optmemory.src | 6 ++ cui/source/options/optpath.src | 2 + cui/source/options/optsave.src | 13 ++++ cui/source/options/optspell.src | 5 ++ cui/source/options/optupdt.src | 7 ++ cui/source/options/securityoptions.src | 7 ++ cui/source/options/treeopt.src | 1 + cui/source/options/webconninfo.src | 3 + cui/source/tabpages/align.src | 10 +++ cui/source/tabpages/autocdlg.src | 36 ++++++++++ cui/source/tabpages/backgrnd.src | 11 +++ cui/source/tabpages/border.src | 11 +++ cui/source/tabpages/chardlg.src | 49 +++++++++++++ cui/source/tabpages/connect.src | 8 +++ cui/source/tabpages/dstribut.src | 10 +++ cui/source/tabpages/grfpage.src | 11 +++ cui/source/tabpages/labdlg.src | 7 ++ cui/source/tabpages/macroass.src | 4 ++ cui/source/tabpages/measure.src | 12 ++++ cui/source/tabpages/numfmt.src | 10 +++ cui/source/tabpages/numpages.src | 30 ++++++++ cui/source/tabpages/page.src | 18 +++++ cui/source/tabpages/paragrph.src | 38 ++++++++++ cui/source/tabpages/swpossizetabpage.src | 18 +++++ cui/source/tabpages/tabarea.src | 82 ++++++++++++++++++++++ cui/source/tabpages/tabline.src | 37 ++++++++++ cui/source/tabpages/tabstpge.src | 15 ++++ cui/source/tabpages/textanim.src | 14 ++++ cui/source/tabpages/textattr.src | 11 +++ cui/source/tabpages/transfrm.src | 16 +++++ extensions/source/abpilot/abspilot.src | 23 ++++++ extensions/source/bibliography/datman.src | 31 ++++++++ extensions/source/dbpilots/commonpagesdbp.src | 9 +++ extensions/source/dbpilots/dbpilots.src | 3 + extensions/source/dbpilots/gridpages.src | 7 ++ extensions/source/dbpilots/groupboxpages.src | 14 ++++ extensions/source/dbpilots/listcombopages.src | 8 +++ extensions/source/preload/preload.src | 8 +++ extensions/source/propctrlr/formlinkdialog.src | 2 + extensions/source/propctrlr/listselectiondlg.src | 2 + extensions/source/propctrlr/newdatatype.src | 2 + extensions/source/propctrlr/selectlabeldialog.src | 2 + extensions/source/propctrlr/taborder.src | 4 ++ extensions/source/scanner/grid.src | 3 + extensions/source/scanner/sanedlg.src | 17 +++++ xmlsecurity/source/dialogs/certificatechooser.src | 1 + xmlsecurity/source/dialogs/certificateviewer.src | 3 + .../source/dialogs/digitalsignaturesdialog.src | 3 + xmlsecurity/source/dialogs/macrosecurity.src | 10 +++ xmlsecurity/source/dialogs/warnings.src | 3 + 102 files changed, 1190 insertions(+) mode change 100755 => 100644 cui/source/dialogs/thesdlg.src mode change 100755 => 100644 cui/source/options/optinet2.src diff --git a/basctl/source/basicide/brkdlg.src b/basctl/source/basicide/brkdlg.src index 00fd8fbf8968..af7c2a39a70a 100644 --- a/basctl/source/basicide/brkdlg.src +++ b/basctl/source/basicide/brkdlg.src @@ -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.src b/basctl/source/basicide/macrodlg.src index 5037879802b0..1be98005ba06 100644 --- a/basctl/source/basicide/macrodlg.src +++ b/basctl/source/basicide/macrodlg.src @@ -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/moduldlg.src b/basctl/source/basicide/moduldlg.src index a6ac943f29d0..f552bd4a3dfe 100644 --- a/basctl/source/basicide/moduldlg.src +++ b/basctl/source/basicide/moduldlg.src @@ -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... */ @@ -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... */ @@ -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 ef1be222095c..e8558b466652 100644 --- a/basctl/source/basicide/moptions.src +++ b/basctl/source/basicide/moptions.src @@ -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 c8de023dec53..2d7981dd1c28 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/dlged/managelang.src b/basctl/source/dlged/managelang.src index b03421e1aa22..c83af6be6e38 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/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src index 74188426a787..b94ea163e0c7 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.src b/cui/source/customize/cfg.src index 0b2489557053..743aa7009fbc 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/eventdlg.src b/cui/source/customize/eventdlg.src index e8c0e21677ac..8b19a1e79794 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 10d9149233e0..048e02aaad9d 100644 --- a/cui/source/customize/macropg.src +++ b/cui/source/customize/macropg.src @@ -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/dialogs/SpellDialog.src b/cui/source/dialogs/SpellDialog.src index 5a97025f02af..3c3c7a6be3ca 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 3605eee00ed6..8d7f655b179f 100644 --- a/cui/source/dialogs/charmap.src +++ b/cui/source/dialogs/charmap.src @@ -60,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 ; @@ -74,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 ; @@ -128,6 +130,7 @@ 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"; diff --git a/cui/source/dialogs/cuiimapdlg.src b/cui/source/dialogs/cuiimapdlg.src index 9b60adf854ca..05475f880a3c 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 e3e961880dfc..0c6c864005fd 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 186db5a48735..c705f42c5789 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 db0d4bbf3973..f8d035528c71 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 19fac6b9a4cd..0970049622fb 100644 --- a/cui/source/dialogs/grfflt.src +++ b/cui/source/dialogs/grfflt.src @@ -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 ; @@ -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 ; @@ -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 ) ; @@ -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,6 +366,7 @@ 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 ) ; }; diff --git a/cui/source/dialogs/hangulhanjadlg.src b/cui/source/dialogs/hangulhanjadlg.src index 11e2fe415c38..d4736a491490 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/hyperdlg.src b/cui/source/dialogs/hyperdlg.src index 8f9f7a54adbe..29b4b9b5951e 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 ; diff --git a/cui/source/dialogs/hyphen.src b/cui/source/dialogs/hyphen.src index f10e94626f31..39a7cc6fd3d9 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/insrc.src b/cui/source/dialogs/insrc.src index 69f934a29049..f655620bcd54 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 987867492e13..c16c13b9ed7f 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 4bbbd564edd1..f9d3db8c5f0c 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 e1ff3b32d98b..50daaedd58b8 100644 --- a/cui/source/dialogs/postdlg.src +++ b/cui/source/dialogs/postdlg.src @@ -61,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 ) ; @@ -93,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 ; @@ -111,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.src b/cui/source/dialogs/scriptdlg.src index 67a81376d662..bb691045dd21 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 465591e8f0a0..231c32effd7a 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 5326ca2d0e4d..9f07dc55ac38 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 04265a6d6726..8131b4e68a81 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 74a8eae82274..3f737c10dcc8 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 9e9d2fb6eb03..4d6b96445115 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.src b/cui/source/dialogs/thesdlg.src old mode 100755 new mode 100644 index 1aff40881000..8592a9fb50cc --- a/cui/source/dialogs/thesdlg.src +++ b/cui/source/dialogs/thesdlg.src @@ -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 ; @@ -64,12 +65,14 @@ ModalDialog RID_SVXDLG_THESAURUS }; 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" ; @@ -100,6 +103,7 @@ ModalDialog RID_SVXDLG_THESAURUS }; Edit ED_REPL { + HelpID = "cui:Edit:RID_SVXDLG_THESAURUS:ED_REPL"; BORDER = TRUE ; Pos = MAP_APPFONT ( 5 , 184 ) ; Size = MAP_APPFONT ( 225 , 12 ) ; diff --git a/cui/source/dialogs/zoom.src b/cui/source/dialogs/zoom.src index 3abf0f4d557b..56b274ef75ff 100644 --- a/cui/source/dialogs/zoom.src +++ b/cui/source/dialogs/zoom.src @@ -47,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 ; @@ -96,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 ; @@ -127,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/options/connpooloptions.src b/cui/source/options/connpooloptions.src index 08e4f2043a40..e4ac67e16bf2 100644 --- a/cui/source/options/connpooloptions.src +++ b/cui/source/options/connpooloptions.src @@ -35,6 +35,7 @@ TabPage RID_OFAPAGE_CONNPOOLOPTIONS { + HelpID = "cui:TabPage:RID_OFAPAGE_CONNPOOLOPTIONS"; // HelpId = ; OutputSize = TRUE ; Size = MAP_APPFONT ( PAGE_SIZE_X, PAGE_SIZE_Y ) ; @@ -49,6 +50,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 +82,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 +95,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/dbregister.src b/cui/source/options/dbregister.src index 444d4faac22d..9d7c430d2f58 100644 --- a/cui/source/options/dbregister.src +++ b/cui/source/options/dbregister.src @@ -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 f61f23092f37..f421afc56fe0 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 1b5f3298913e..034874388369 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 3acd1ac2766c..b4caafc0feea 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 4d7e1985d838..a9a5ad16869d 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 c9a2c9606c98..d9c81f5b9a6a 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 374828b329c1..af2d7444612a 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.src b/cui/source/options/optcolor.src index 5b4a58bd59c4..73cee3bfdc6f 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 defc62c95011..a9207701fd52 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.src b/cui/source/options/optdict.src index b5d31ce90fe9..ae63c20f4013 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 35659dd71f5b..de6850970ce8 100644 --- a/cui/source/options/optfltr.src +++ b/cui/source/options/optfltr.src @@ -32,6 +32,7 @@ // RID_OFAPAGE_MSFILTEROPT ----------------------------------------------------- TabPage RID_OFAPAGE_MSFILTEROPT { + HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT"; // HelpId = ; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; @@ -46,6 +47,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 +55,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 +70,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 +78,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 +86,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 +101,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 +109,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,6 +120,7 @@ TabPage RID_OFAPAGE_MSFILTEROPT // RID_OFAPAGE_MSFILTEROPT2 ----------------------------------------------------- TabPage RID_OFAPAGE_MSFILTEROPT2 { + HelpID = "cui:TabPage:RID_OFAPAGE_MSFILTEROPT2"; // HelpId = ; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; diff --git a/cui/source/options/optgdlg.src b/cui/source/options/optgdlg.src index dec9c4769481..ed7443ae04b4 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.src b/cui/source/options/optgenrl.src index 6f5fff55892d..bc5721024c1a 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 60db286b192d..dee0d57c7779 100644 --- a/cui/source/options/opthtml.src +++ b/cui/source/options/opthtml.src @@ -32,6 +32,7 @@ // RID_OFAPAGE_HTMLOPT ----------------------------------------------------- TabPage RID_OFAPAGE_HTMLOPT { + HelpID = "cui:TabPage:RID_OFAPAGE_HTMLOPT"; // HelpId = ; OutputSize = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; @@ -45,6 +46,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 +69,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 +92,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 +115,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 +138,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 +161,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 +184,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 +213,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 +221,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 +229,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 +243,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 +258,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 +293,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.src b/cui/source/options/optimprove.src index 003390d4600a..b5bb1e2a84ea 100644 --- a/cui/source/options/optimprove.src +++ b/cui/source/options/optimprove.src @@ -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" ; @@ -105,6 +107,7 @@ TabPage RID_SVXPAGE_IMPROVEMENT }; PushButton PB_SHOWDATA { + HelpID = "cui:PushButton:RID_SVXPAGE_IMPROVEMENT:PB_SHOWDATA"; Pos = MAP_APPFONT ( 12 , 161 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Show Data" ; diff --git a/cui/source/options/optinet2.src b/cui/source/options/optinet2.src old mode 100755 new mode 100644 index 9023dfa52394..f4837b514483 --- 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.src b/cui/source/options/optjava.src index 0d55fd6f64f8..db052d1c5fd8 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 98963647e9c4..463e68881e4c 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 be0378f171e8..ace1f8e193bf 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 557fa6a8d960..5c95cbb53aa6 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.src b/cui/source/options/optpath.src index 6b02abb5764a..6adf8fa875ce 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.src b/cui/source/options/optsave.src index 36fc60e94435..35ca394e2e57 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 e4241d4e4bb4..8072c8ff6e23 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 094e23c2e60a..6b271b91c71c 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/securityoptions.src b/cui/source/options/securityoptions.src index de7d7b23dc37..4e946bfbfd9a 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.src b/cui/source/options/treeopt.src index cba8cd1e411b..b845bf29316d 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.src b/cui/source/options/webconninfo.src index 68560c1ecaa7..86c3a52509f6 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 807bfdb56132..acaa9234b87d 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 2fb063ede772..eded36bdc419 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..." ; @@ -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"; @@ -523,6 +540,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 +559,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 +572,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 +586,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 +600,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 +619,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 +632,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 +666,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 +708,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 +724,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 +747,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 +764,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 +775,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 +801,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 +824,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 7f413f116aff..6d7c74e9b330 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.src b/cui/source/tabpages/border.src index 811f5429aeb7..4fc781943d3a 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/chardlg.src b/cui/source/tabpages/chardlg.src index 9673fc950f3f..60c511a87f61 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 64623b0cee25..d2fe0796bb26 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 18e38fd5236a..2c6e953e6b71 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 74b9e8e5cda0..085e92f2d0c0 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 ed13f2de9b49..1e7da5393a2a 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.src b/cui/source/tabpages/macroass.src index 4f5d78ffe795..9a5bb519d460 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 79c46b13079b..f01c2765ce0e 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 2538b196932c..b3f2d22fd204 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.src b/cui/source/tabpages/numpages.src index 323b5cdd6ba6..e66e3dc2dd98 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 c96b43a5a966..5c919f1df17a 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.src b/cui/source/tabpages/paragrph.src index d52283ceea8f..e7e50842ba1c 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 c5fd8e8816e9..f22227ac8061 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 f5ff6b24ff66..a9e4ccd207a6 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 e850b87c579b..4e40debbee6d 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 3bd0467f2f0c..6a92d21d3ad4 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 3f2bed8b5a52..3ccd6987943f 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 59b0a534472d..c4ae4b5062ce 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 761fdcfb2349..c753402f0440 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/extensions/source/abpilot/abspilot.src b/extensions/source/abpilot/abspilot.src index be177b5f6e19..a612a2051075 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/bibliography/datman.src b/extensions/source/bibliography/datman.src index 0a0643b1b117..461404b2483a 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/dbpilots/commonpagesdbp.src b/extensions/source/dbpilots/commonpagesdbp.src index 41d199a70209..c867313eac2c 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/dbpilots.src b/extensions/source/dbpilots/dbpilots.src index fa96cbead1eb..1cf4bc72d427 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/gridpages.src b/extensions/source/dbpilots/gridpages.src index 5aca75b77d55..fac3a00dda23 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 6b651e848010..b98f6a70f843 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 eb83140de316..7a24abaef60c 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/preload/preload.src b/extensions/source/preload/preload.src index 59805b768adf..2570d5ee81f0 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/propctrlr/formlinkdialog.src b/extensions/source/propctrlr/formlinkdialog.src index f319675d7c42..2f993fc8efca 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/listselectiondlg.src b/extensions/source/propctrlr/listselectiondlg.src index 24a1d7f0a815..84cad0d9c0a9 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/newdatatype.src b/extensions/source/propctrlr/newdatatype.src index 50fbad0be2f1..c732013141e7 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/selectlabeldialog.src b/extensions/source/propctrlr/selectlabeldialog.src index af536befb3bf..357a223bf2b8 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 73f12ff3ff89..a1458f4d4016 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/scanner/grid.src b/extensions/source/scanner/grid.src index e7e8128cbc84..97e438253b42 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/sanedlg.src b/extensions/source/scanner/sanedlg.src index 2c4cc338ab8a..961f0ed39cf1 100644 --- a/extensions/source/scanner/sanedlg.src +++ b/extensions/source/scanner/sanedlg.src @@ -27,6 +27,7 @@ #include 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/xmlsecurity/source/dialogs/certificatechooser.src b/xmlsecurity/source/dialogs/certificatechooser.src index 13ce734e46df..be0585d2bcd8 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 3a9466aeb9a8..637d3a7f45fe 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 87d2de520103..54ef5ce17eeb 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/macrosecurity.src b/xmlsecurity/source/dialogs/macrosecurity.src index 0683606f500c..5a4ab4f12b10 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/warnings.src b/xmlsecurity/source/dialogs/warnings.src index 2e0e697dae1f..bac25c3dd492 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"; -- cgit From 0c6c33ee3925250d74b4f453502e4a040e598cb7 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 11 Oct 2010 17:56:12 +0200 Subject: CWS changehid: generate former auto hids into src files --- sd/source/filter/html/pubdlg.src | 47 ++++++++++++++++++++++ .../ui/animations/CustomAnimationCreateDialog.src | 4 ++ sd/source/ui/animations/CustomAnimationDialog.src | 32 +++++++++++++++ sd/source/ui/app/strings.src | 1 + sd/source/ui/dlg/PaneDockingWindow.src | 3 ++ sd/source/ui/dlg/animobjs.src | 16 ++++++++ sd/source/ui/dlg/brkdlg.src | 1 + sd/source/ui/dlg/copydlg.src | 10 +++++ sd/source/ui/dlg/custsdlg.src | 11 +++++ sd/source/ui/dlg/dlgass.src | 25 ++++++++++++ sd/source/ui/dlg/dlgfield.src | 5 +++ sd/source/ui/dlg/dlgsnap.src | 6 +++ sd/source/ui/dlg/headerfooterdlg.src | 14 +++++++ sd/source/ui/dlg/ins_paste.src | 3 ++ sd/source/ui/dlg/inspagob.src | 2 + sd/source/ui/dlg/layeroptionsdlg.src | 6 +++ sd/source/ui/dlg/masterlayoutdlg.src | 5 +++ sd/source/ui/dlg/morphdlg.src | 3 ++ sd/source/ui/dlg/paragr.src | 3 ++ sd/source/ui/dlg/present.src | 17 ++++++++ sd/source/ui/dlg/prntopts.src | 18 +++++++++ sd/source/ui/dlg/sdpreslt.src | 3 ++ sd/source/ui/dlg/tpaction.src | 9 +++++ sd/source/ui/dlg/tpoption.src | 19 +++++++++ sd/source/ui/dlg/vectdlg.src | 5 +++ sd/source/ui/table/TableDesignPane.src | 1 + 26 files changed, 269 insertions(+) mode change 100755 => 100644 sd/source/ui/app/strings.src mode change 100755 => 100644 sd/source/ui/dlg/PaneDockingWindow.src diff --git a/sd/source/filter/html/pubdlg.src b/sd/source/filter/html/pubdlg.src index 00e9b4af75e4..9aabf8f5e971 100644 --- a/sd/source/filter/html/pubdlg.src +++ b/sd/source/filter/html/pubdlg.src @@ -30,6 +30,7 @@ ModalDialog DLG_PUBLISHING { + HelpID = "sd:ModalDialog:DLG_PUBLISHING"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 272 , 190 ) ; @@ -59,6 +60,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE1_NEW_DESIGN { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE1_NEW_DESIGN"; Pos = MAP_APPFONT( 12, 50 ); Size = MAP_APPFONT( 153, 10 ); Text [ en-US ] = "New design"; @@ -66,6 +68,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE1_OLD_DESIGN { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE1_OLD_DESIGN"; Pos = MAP_APPFONT( 12, 63 ); Size = MAP_APPFONT( 153, 10 ); Text [ en-US ] = "Existing design"; @@ -73,6 +76,7 @@ ModalDialog DLG_PUBLISHING ListBox PAGE1_DESIGNS { + HelpID = "sd:ListBox:DLG_PUBLISHING:PAGE1_DESIGNS"; Border = TRUE ; Pos = MAP_APPFONT ( 21 , 75 ) ; Size = MAP_APPFONT ( 144 , 63 ) ; @@ -82,6 +86,7 @@ ModalDialog DLG_PUBLISHING PushButton PAGE1_DEL_DESIGN { + HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE1_DEL_DESIGN"; Pos = MAP_APPFONT ( 168 , 75 ) ; Size = MAP_APPFONT ( 92 , 14 ) ; TabStop = TRUE ; @@ -120,6 +125,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE2_STANDARD { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_STANDARD"; Pos = MAP_APPFONT( 12, 50 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "Standard H~TML format"; @@ -127,6 +133,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE2_FRAMES { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_FRAMES"; Pos = MAP_APPFONT( 12, 63 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "Standard HTML with ~frames"; @@ -134,6 +141,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE2_KIOSK { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_KIOSK"; Pos = MAP_APPFONT( 12, 76 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "~Automatic"; @@ -141,6 +149,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE2_WEBCAST { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_WEBCAST"; Pos = MAP_APPFONT( 12, 89 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "~WebCast"; @@ -199,6 +208,7 @@ ModalDialog DLG_PUBLISHING CheckBox PAGE2_CONTENT { + HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_CONTENT"; Pos = MAP_APPFONT( 144, 49 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "Create title page"; @@ -213,6 +223,7 @@ ModalDialog DLG_PUBLISHING CheckBox PAGE2_NOTES { + HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_NOTES"; Pos = MAP_APPFONT( 144, 63 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "Show notes"; @@ -231,6 +242,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE2_CHG_DEFAULT { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_DEFAULT"; Pos = MAP_APPFONT ( 144 , 49 ) ; Size = MAP_APPFONT ( 116 , 10 ) ; TabStop = TRUE ; @@ -239,6 +251,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE2_CHG_AUTO { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_CHG_AUTO"; Pos = MAP_APPFONT ( 144 , 63 ) ; Size = MAP_APPFONT ( 116 , 10 ) ; TabStop = TRUE ; @@ -254,6 +267,7 @@ ModalDialog DLG_PUBLISHING TimeField PAGE2_DURATION_TMF { + HelpID = "sd:TimeField:DLG_PUBLISHING:PAGE2_DURATION_TMF"; Pos = MAP_APPFONT ( 196, 76 ) ; Size = MAP_APPFONT ( 48, 12 ) ; Border = TRUE ; @@ -279,6 +293,7 @@ ModalDialog DLG_PUBLISHING CheckBox PAGE2_ENDLESS { + HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE2_ENDLESS"; Pos = MAP_APPFONT ( 154, 91 ); Size = MAP_APPFONT ( 108, 10 ); Text [ en-US ] = "~Endless" ; @@ -297,6 +312,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE2_ASP { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_ASP"; Pos = MAP_APPFONT( 144, 49 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "~Active Server Pages (ASP)"; @@ -304,6 +320,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE2_PERL { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE2_PERL"; Pos = MAP_APPFONT( 144, 63 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "Perl" ; @@ -318,6 +335,7 @@ ModalDialog DLG_PUBLISHING Edit PAGE2_INDEX { + HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_INDEX"; BORDER = TRUE; Pos = MAP_APPFONT( 154, 88 ); Size = MAP_APPFONT( 105, 12 ); @@ -333,6 +351,7 @@ ModalDialog DLG_PUBLISHING Edit PAGE2_URL { + HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_URL"; BORDER = TRUE; Pos = MAP_APPFONT( 154, 116 ); Size = MAP_APPFONT( 105, 12 ); @@ -348,6 +367,7 @@ ModalDialog DLG_PUBLISHING Edit PAGE2_CGI { + HelpID = "sd:Edit:DLG_PUBLISHING:PAGE2_CGI"; BORDER = TRUE; Pos = MAP_APPFONT( 154, 144 ); Size = MAP_APPFONT( 105, 12 ); @@ -382,6 +402,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE3_PNG { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_PNG"; Pos = MAP_APPFONT( 12, 49 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "~PNG"; @@ -389,6 +410,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE3_GIF { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_GIF"; Pos = MAP_APPFONT( 12, 63 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "~GIF"; @@ -396,6 +418,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE3_JPG { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_JPG"; Pos = MAP_APPFONT( 12, 77 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "~JPG"; @@ -403,6 +426,7 @@ ModalDialog DLG_PUBLISHING ComboBox PAGE3_QUALITY { + HelpID = "sd:ComboBox:DLG_PUBLISHING:PAGE3_QUALITY"; Pos = MAP_APPFONT( 18, 91 ); Size = MAP_APPFONT( 28, 70 ); TabStop = TRUE ; @@ -436,6 +460,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE3_RESOLUTION_1 { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_1"; Pos = MAP_APPFONT( 144, 49 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "Low resolution (~640x480 pixels)"; @@ -443,6 +468,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE3_RESOLUTION_2 { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_2"; Pos = MAP_APPFONT( 144, 63 ); Size = MAP_APPFONT( 116, 10 ); Text [ en-US ] = "Medium resolution (~800x600 pixels)"; @@ -450,6 +476,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE3_RESOLUTION_3 { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE3_RESOLUTION_3"; Pos = MAP_APPFONT ( 144, 77 ) ; Size = MAP_APPFONT ( 116 , 10 ) ; Text [ en-US ] = "High resolution (~1024x768 pixels)"; @@ -468,6 +495,7 @@ ModalDialog DLG_PUBLISHING CheckBox PAGE3_SLD_SOUND { + HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE3_SLD_SOUND"; Pos = MAP_APPFONT ( 12, 125 ); Size = MAP_APPFONT ( 252, 10 ); Text [ en-US ] = "~Export sounds when slide advances" ; @@ -475,6 +503,7 @@ ModalDialog DLG_PUBLISHING CheckBox PAGE3_HIDDEN_SLIDES { + HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE3_HIDDEN_SLIDES"; Pos = MAP_APPFONT ( 12, 138 ); Size = MAP_APPFONT ( 252, 10 ); Text [ en-US ] = "Export ~hidden slides" ; @@ -509,6 +538,7 @@ ModalDialog DLG_PUBLISHING Edit PAGE4_AUTHOR { + HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_AUTHOR"; BORDER = TRUE ; Pos = MAP_APPFONT ( 136, 49 ); Size = MAP_APPFONT ( 128, 12 ); @@ -524,6 +554,7 @@ ModalDialog DLG_PUBLISHING Edit PAGE4_EMAIL_EDIT { + HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_EMAIL_EDIT"; BORDER = TRUE ; Pos = MAP_APPFONT ( 136 , 65 ) ; Size = MAP_APPFONT ( 128 , 12 ) ; @@ -539,6 +570,7 @@ ModalDialog DLG_PUBLISHING Edit PAGE4_WWW_EDIT { + HelpID = "sd:Edit:DLG_PUBLISHING:PAGE4_WWW_EDIT"; BORDER = TRUE ; Pos = MAP_APPFONT ( 136, 81 ) ; Size = MAP_APPFONT ( 128, 12 ) ; @@ -554,6 +586,7 @@ ModalDialog DLG_PUBLISHING MultiLineEdit PAGE4_MISC { + HelpID = "sd:MultiLineEdit:DLG_PUBLISHING:PAGE4_MISC"; Border = TRUE ; Pos = MAP_APPFONT ( 136, 97 ) ; Size = MAP_APPFONT ( 128 , 45 ) ; @@ -564,6 +597,7 @@ ModalDialog DLG_PUBLISHING CheckBox PAGE4_DOWNLOAD { + HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE4_DOWNLOAD"; Pos = MAP_APPFONT ( 12 , 149 ) ; Size = MAP_APPFONT ( 252 , 10 ) ; TabStop = TRUE ; @@ -572,6 +606,7 @@ ModalDialog DLG_PUBLISHING CheckBox PAGE4_CREATED { + HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE4_CREATED"; Pos = MAP_APPFONT ( 12 , 152 ) ; Size = MAP_APPFONT ( 252 , 10 ) ; TabStop = TRUE ; @@ -600,6 +635,7 @@ ModalDialog DLG_PUBLISHING CheckBox PAGE5_TEXTONLY { + HelpID = "sd:CheckBox:DLG_PUBLISHING:PAGE5_TEXTONLY"; Pos = MAP_APPFONT ( 12, 50 ); Size = MAP_APPFONT ( 243, 10 ); Text [ en-US ] = "~Text only"; @@ -635,6 +671,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE6_DOCCOLORS { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE6_DOCCOLORS"; Pos = MAP_APPFONT( 12, 50 ); Size = MAP_APPFONT( 246, 10 ); Text [ en-US ] = "~Apply color scheme from document"; @@ -642,6 +679,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE6_DEFAULT { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE6_DEFAULT"; Pos = MAP_APPFONT( 12, 63 ); Size = MAP_APPFONT( 246, 10 ); Text [ en-US ] = "Use ~browser colors"; @@ -649,6 +687,7 @@ ModalDialog DLG_PUBLISHING RadioButton PAGE6_USER { + HelpID = "sd:RadioButton:DLG_PUBLISHING:PAGE6_USER"; Pos = MAP_APPFONT( 12, 76 ); Size = MAP_APPFONT( 246, 10 ); Text [ en-US ] = "~Use custom color scheme"; @@ -656,6 +695,7 @@ ModalDialog DLG_PUBLISHING PushButton PAGE6_TEXT { + HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_TEXT"; Pos = MAP_APPFONT( 21, 89 ); Size = MAP_APPFONT( 72, 14 ); Text [ en-US ] = "Text"; @@ -663,6 +703,7 @@ ModalDialog DLG_PUBLISHING PushButton PAGE6_LINK { + HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_LINK"; Pos = MAP_APPFONT( 21, 106 ); Size = MAP_APPFONT( 72, 14 ); Text [ en-US ] = "Hyper~link"; @@ -670,6 +711,7 @@ ModalDialog DLG_PUBLISHING PushButton PAGE6_ALINK { + HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_ALINK"; Pos = MAP_APPFONT( 21, 123 ); Size = MAP_APPFONT( 72, 14 ); Text [ en-US ] = "Active Li~nk"; @@ -677,6 +719,7 @@ ModalDialog DLG_PUBLISHING PushButton PAGE6_VLINK { + HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_VLINK"; Pos = MAP_APPFONT( 21, 140 ); Size = MAP_APPFONT( 72, 14 ); Text [ en-US ] = "~Visited Link"; @@ -691,6 +734,7 @@ ModalDialog DLG_PUBLISHING PushButton PAGE6_BACK { + HelpID = "sd:PushButton:DLG_PUBLISHING:PAGE6_BACK"; Pos = MAP_APPFONT( 199, 89 ); Size = MAP_APPFONT( 60, 14 ); Text [ en-US ] = "Bac~kground"; @@ -706,6 +750,7 @@ ModalDialog DLG_PUBLISHING PushButton BUT_LAST { + HelpID = "sd:PushButton:DLG_PUBLISHING:BUT_LAST"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 112 , 170 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -715,6 +760,7 @@ ModalDialog DLG_PUBLISHING PushButton BUT_NEXT { + HelpID = "sd:PushButton:DLG_PUBLISHING:BUT_NEXT"; DefButton = TRUE ; OutputSize = TRUE ; Pos = MAP_APPFONT ( 165 , 170 ) ; @@ -758,6 +804,7 @@ ModalDialog DLG_DESIGNNAME Edit EDT_NAME { + HelpID = "sd:Edit:DLG_DESIGNNAME:EDT_NAME"; BORDER = TRUE ; Pos = MAP_APPFONT ( 4, 4 ); Size = MAP_APPFONT ( 152, 14 ); diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.src b/sd/source/ui/animations/CustomAnimationCreateDialog.src index 0f83818fafb3..62abf708d883 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.src +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.src @@ -98,11 +98,13 @@ TabDialog DLG_CUSTOMANIMATION_CREATE TabPage RID_TP_CUSTOMANIMATION_ENTRANCE { + HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_ENTRANCE"; Hide = TRUE; Size = MAP_APPFONT ( 156, 217 ); ListBox LB_EFFECTS { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_ENTRANCE:LB_EFFECTS"; Pos = MAP_APPFONT ( 3 , 3 ) ; Size = MAP_APPFONT( 144, 160 ); OutputSize = TRUE; @@ -121,6 +123,7 @@ TabPage RID_TP_CUSTOMANIMATION_ENTRANCE ComboBox CB_SPEED { + HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CB_SPEED"; Pos = MAP_APPFONT ( 48 , 166 ) ; Size = MAP_APPFONT ( 101, 48 ); TabStop = TRUE ; @@ -130,6 +133,7 @@ TabPage RID_TP_CUSTOMANIMATION_ENTRANCE CheckBox CBX_PREVIEW { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_ENTRANCE:CBX_PREVIEW"; Pos = MAP_APPFONT ( 3 , 181 ) ; Size = MAP_APPFONT ( 143 , 10 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/animations/CustomAnimationDialog.src b/sd/source/ui/animations/CustomAnimationDialog.src index 8232638678e1..f3bb0a6a6889 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.src +++ b/sd/source/ui/animations/CustomAnimationDialog.src @@ -96,6 +96,7 @@ TabDialog DLG_CUSTOMANIMATION TabPage RID_TP_CUSTOMANIMATION_EFFECT { + HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_EFFECT"; Hide = TRUE; Size = MAP_APPFONT ( WIDTH , 159 ); Text [ en-US ] = "Effect"; @@ -120,6 +121,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT ListBox LB_PROPERTY_1 { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_PROPERTY_1"; Pos = MAP_APPFONT ( X2+6 , 14 ) ; Size = MAP_APPFONT ( W2, 100 ); Hide = TRUE; @@ -139,6 +141,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT ListBox LB_PROPERTY_2 { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_PROPERTY_2"; Pos = MAP_APPFONT ( X2+6 , 14 ) ; Size = MAP_APPFONT ( W2, 100 ); Hide = TRUE; @@ -149,6 +152,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT CheckBox CB_SMOOTH_START { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_SMOOTH_START"; Pos = MAP_APPFONT( X1+6, 14 ); Size = MAP_APPFONT ( (W0 / 2) , 10 ) ; Hide = TRUE; @@ -158,6 +162,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT CheckBox CB_SMOOTH_END { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_SMOOTH_END"; Pos = MAP_APPFONT( X1 + (W0 / 2) + 3, 14 ); Size = MAP_APPFONT ( (W0 / 2) , 10 ) ; Hide = TRUE; @@ -167,6 +172,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT CheckBox CB_AUTORESTART { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_EFFECT:CB_AUTORESTART"; Pos = MAP_APPFONT( X1+6, 14 ); Size = MAP_APPFONT ( W0 , 10 ) ; Hide = TRUE; @@ -190,6 +196,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT RadioButton RB_FROM_START { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_FROM_START"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 16 ) ; Size = MAP_APPFONT( W0, 10 ); @@ -201,6 +208,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT RadioButton RB_FROM_LAST { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_FROM_LAST"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 29 ) ; Size = MAP_APPFONT( W0, 10 ); @@ -212,6 +220,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT RadioButton RB_FROM_TIME { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_FROM_TIME"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 42 ) ; Size = MAP_APPFONT( W0, 10 ); @@ -223,6 +232,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT MetricField MF_START_TIME { + HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_START_TIME"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 55 ) ; Size = MAP_APPFONT ( W1, 12 ); @@ -253,6 +263,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT RadioButton RB_STOP_ON_CLICK { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_STOP_ON_CLICK"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 81 ) ; Size = MAP_APPFONT( W0, 10 ); @@ -264,6 +275,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT RadioButton RB_STOP_ON_NEXT_SLIDE { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_STOP_ON_NEXT_SLIDE"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 94 ) ; Size = MAP_APPFONT( W0, 10 ); @@ -275,6 +287,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT RadioButton RB_STOP_AFTER_N_SLIDES { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_EFFECT:RB_STOP_AFTER_N_SLIDES"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 107 ) ; Size = MAP_APPFONT( W0, 10 ); @@ -286,6 +299,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT MetricField MF_STOP_AFTER_SLIDES { + HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_STOP_AFTER_SLIDES"; OutputSize = TRUE; Pos = MAP_APPFONT ( X1 , 55 ) ; Size = MAP_APPFONT ( W1, 12 ); @@ -329,6 +343,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT ListBox LB_SOUND { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_SOUND"; Pos = MAP_APPFONT ( X2 , 3 ) ; Size = MAP_APPFONT ( W2 - 19, 100 ); TabStop = TRUE ; @@ -338,6 +353,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT PushButton PB_SOUND_PREVIEW { + HelpID = "sd:PushButton:RID_TP_CUSTOMANIMATION_EFFECT:PB_SOUND_PREVIEW"; Pos = MAP_APPFONT ( X2 + W2 - 16 , 2 ) ; Size = MAP_APPFONT( 16, 14 ); OutputSize = TRUE; @@ -355,6 +371,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT ListBox LB_AFTER_EFFECT { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_AFTER_EFFECT"; Pos = MAP_APPFONT ( X2 , 18 ) ; Size = MAP_APPFONT ( W2, 100 ); TabStop = TRUE ; @@ -379,6 +396,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT ListBox CLB_DIMCOLOR { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:CLB_DIMCOLOR"; Pos = MAP_APPFONT( X2, 33 ); Size = MAP_APPFONT ( W2, 100 ); TabStop = TRUE ; @@ -397,6 +415,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT ListBox LB_TEXT_ANIM { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_EFFECT:LB_TEXT_ANIM"; Pos = MAP_APPFONT ( X2 , 48 ) ; Size = MAP_APPFONT ( W2, 100 ); TabStop = TRUE ; @@ -422,6 +441,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT MetricField MF_TEXT_DELAY { + HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_EFFECT:MF_TEXT_DELAY"; Pos = MAP_APPFONT ( X2, 64 ) ; Size = MAP_APPFONT ( 42, 12 ); TabStop = TRUE ; @@ -440,6 +460,7 @@ TabPage RID_TP_CUSTOMANIMATION_EFFECT TabPage RID_TP_CUSTOMANIMATION_DURATION { + HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_DURATION"; Hide = TRUE; Size = MAP_APPFONT ( WIDTH , 159 ); Text [ en-US ] = "Timing"; @@ -455,6 +476,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION ListBox LB_START { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_START"; Pos = MAP_APPFONT ( X2 , 3 ) ; Size = MAP_APPFONT ( W2, 48 ); TabStop = TRUE ; @@ -480,6 +502,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION MetricField MF_START_DELAY { + HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_DURATION:MF_START_DELAY"; Pos = MAP_APPFONT ( X2 , 18 ) ; Size = MAP_APPFONT ( W2, 12 ); Border = TRUE ; @@ -506,6 +529,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION ComboBox CB_DURATION { + HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_DURATION"; Pos = MAP_APPFONT ( X2 , 33 ) ; Size = MAP_APPFONT ( W2, 48 ); TabStop = TRUE ; @@ -524,6 +548,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION ComboBox CB_REPEAT { + HelpID = "sd:ComboBox:RID_TP_CUSTOMANIMATION_DURATION:CB_REPEAT"; Pos = MAP_APPFONT ( X2 , 48 ) ; Size = MAP_APPFONT ( W2, 48 ); TabStop = TRUE ; @@ -533,6 +558,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION CheckBox CBX_REWIND { + HelpID = "sd:CheckBox:RID_TP_CUSTOMANIMATION_DURATION:CBX_REWIND"; Pos = MAP_APPFONT ( X0 , 66 ) ; Size = MAP_APPFONT ( W0 , 10 ) ; TabStop = TRUE ; @@ -550,6 +576,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION RadioButton RB_CLICKSEQUENCE { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_CLICKSEQUENCE"; Pos = MAP_APPFONT ( X1+6, 92 ) ; Size = MAP_APPFONT ( W0 , 10 ) ; Text [ en-US ] = "Animate as part of click sequence" ; @@ -558,6 +585,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION RadioButton RB_INTERACTIVE { + HelpID = "sd:RadioButton:RID_TP_CUSTOMANIMATION_DURATION:RB_INTERACTIVE"; Pos = MAP_APPFONT ( X1+6, 105 ) ; Size = MAP_APPFONT ( W0 , 10 ) ; Text [ en-US ] = "Start effect on click of" ; @@ -566,6 +594,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION ListBox LB_TRIGGER { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_DURATION:LB_TRIGGER"; Pos = MAP_APPFONT ( X1+18 , 118 ); Size = MAP_APPFONT ( W2, 80 ); TabStop = TRUE ; @@ -576,6 +605,7 @@ TabPage RID_TP_CUSTOMANIMATION_DURATION TabPage RID_TP_CUSTOMANIMATION_TEXT { + HelpID = "sd:TabPage:RID_TP_CUSTOMANIMATION_TEXT"; Hide = TRUE; Size = MAP_APPFONT ( WIDTH , 159 ); Text [ en-US ] = "Text Animation"; @@ -591,6 +621,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT ListBox LB_GROUP_TEXT { + HelpID = "sd:ListBox:RID_TP_CUSTOMANIMATION_TEXT:LB_GROUP_TEXT"; Pos = MAP_APPFONT ( X2 , 3 ) ; Size = MAP_APPFONT ( W2, 48 ); TabStop = TRUE ; @@ -620,6 +651,7 @@ TabPage RID_TP_CUSTOMANIMATION_TEXT MetricField MF_GROUP_AUTO { + HelpID = "sd:MetricField:RID_TP_CUSTOMANIMATION_TEXT:MF_GROUP_AUTO"; Pos = MAP_APPFONT ( X2 , 18 ) ; Size = MAP_APPFONT ( W2, 12 ); Border = TRUE ; diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src old mode 100755 new mode 100644 index 6399a949a45a..7e87b246d371 --- a/sd/source/ui/app/strings.src +++ b/sd/source/ui/app/strings.src @@ -458,6 +458,7 @@ ModalDialog RID_UNDO_DELETE_WARNING }; CheckBox CB_UNDO_DELETE_DISABLE { + HelpID = "sd:CheckBox:RID_UNDO_DELETE_WARNING:CB_UNDO_DELETE_DISABLE"; Pos = MAP_APPFONT( 39, (4 * 12) + 9 ); Size = MAP_APPFONT( 175, 12 ); Text [ en-US ] = "~Do not show this warning again"; diff --git a/sd/source/ui/dlg/PaneDockingWindow.src b/sd/source/ui/dlg/PaneDockingWindow.src old mode 100755 new mode 100644 index 7754283332cd..a0def1c18ec7 --- a/sd/source/ui/dlg/PaneDockingWindow.src +++ b/sd/source/ui/dlg/PaneDockingWindow.src @@ -29,6 +29,7 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW { + HelpID = "sd:DockingWindow:FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW"; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -44,6 +45,7 @@ DockingWindow FLT_LEFT_PANE_IMPRESS_DOCKING_WINDOW DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW { + HelpID = "sd:DockingWindow:FLT_LEFT_PANE_DRAW_DOCKING_WINDOW"; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; @@ -59,6 +61,7 @@ DockingWindow FLT_LEFT_PANE_DRAW_DOCKING_WINDOW DockingWindow FLT_TOOL_PANEL_DOCKING_WINDOW { + HelpID = "sd:DockingWindow:FLT_TOOL_PANEL_DOCKING_WINDOW"; Border = TRUE ; Hide = TRUE ; SVLook = TRUE ; diff --git a/sd/source/ui/dlg/animobjs.src b/sd/source/ui/dlg/animobjs.src index 58fb31137e34..efbd75ac9003 100644 --- a/sd/source/ui/dlg/animobjs.src +++ b/sd/source/ui/dlg/animobjs.src @@ -59,6 +59,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_FIRST { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_FIRST"; Pos = MAP_APPFONT ( 6 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_WINDSTART ; @@ -66,6 +67,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_REVERSE { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_REVERSE"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_REVERSEPLAY ; @@ -74,6 +76,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_STOP { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_STOP"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH * 2 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_STOP ; @@ -82,6 +85,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_PLAY { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_PLAY"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH * 3 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_PLAY ; @@ -89,6 +93,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_LAST { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_LAST"; Pos = MAP_APPFONT ( 6 + MIN_BUTTON_WIDTH * 4 , 100 ) ; Size = MIN_BUTTON_SIZE Symbol = IMAGEBUTTON_WINDEND ; @@ -96,6 +101,7 @@ DockingWindow FLT_WIN_ANIMATION }; NumericField NUM_FLD_BITMAP { + HelpID = "sd:NumericField:FLT_WIN_ANIMATION:NUM_FLD_BITMAP"; Border = TRUE ; Pos = MAP_APPFONT ( 6 + 3 + MIN_BUTTON_WIDTH * 5 , 100 ) ; Size = MAP_APPFONT ( MIN_BUTTON_WIDTH * 2 , 12 ) ; @@ -112,6 +118,7 @@ DockingWindow FLT_WIN_ANIMATION }; TimeField TIME_FIELD { + HelpID = "sd:TimeField:FLT_WIN_ANIMATION:TIME_FIELD"; Border = TRUE ; Pos = MAP_APPFONT ( 6 + 6 + MIN_BUTTON_WIDTH * 7 , 100 ) ; Size = MAP_APPFONT ( MIN_BUTTON_WIDTH * 2 + 3 , 12 ) ; @@ -134,6 +141,7 @@ DockingWindow FLT_WIN_ANIMATION }; ListBox LB_LOOP_COUNT { + HelpID = "sd:ListBox:FLT_WIN_ANIMATION:LB_LOOP_COUNT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 + 12 + MIN_BUTTON_WIDTH * 9 , 100 ) ; Size = MAP_APPFONT ( MIN_BUTTON_WIDTH * 2 + 3 , 100 ) ; @@ -166,6 +174,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_GET_ONE_OBJECT { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ONE_OBJECT"; Pos = MAP_APPFONT ( 12 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -182,6 +191,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_GET_ALL_OBJECTS { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_GET_ALL_OBJECTS"; Pos = MAP_APPFONT ( 31 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -198,6 +208,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_REMOVE_BITMAP { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_BITMAP"; Pos = MAP_APPFONT ( 60 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -214,6 +225,7 @@ DockingWindow FLT_WIN_ANIMATION }; ImageButton BTN_REMOVE_ALL { + HelpID = "sd:ImageButton:FLT_WIN_ANIMATION:BTN_REMOVE_ALL"; Pos = MAP_APPFONT ( 79 , 132 ) ; Size = MAP_APPFONT ( 16 , 14 ) ; ButtonImage = Image @@ -250,12 +262,14 @@ DockingWindow FLT_WIN_ANIMATION }; RadioButton RBT_GROUP { + HelpID = "sd:RadioButton:FLT_WIN_ANIMATION:RBT_GROUP"; Pos = MAP_APPFONT ( 12 , 167 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; Text [ en-US ] = "Group object" ; }; RadioButton RBT_BITMAP { + HelpID = "sd:RadioButton:FLT_WIN_ANIMATION:RBT_BITMAP"; Pos = MAP_APPFONT ( 12 , 181 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; Text [ en-US ] = "Bitmap object" ; @@ -270,6 +284,7 @@ DockingWindow FLT_WIN_ANIMATION }; ListBox LB_ADJUSTMENT { + HelpID = "sd:ListBox:FLT_WIN_ANIMATION:LB_ADJUSTMENT"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 196 ) ; Size = MAP_APPFONT ( 72 , 100 ) ; @@ -292,6 +307,7 @@ DockingWindow FLT_WIN_ANIMATION }; PushButton BTN_CREATE_GROUP { + HelpID = "sd:PushButton:FLT_WIN_ANIMATION:BTN_CREATE_GROUP"; Pos = MAP_APPFONT ( 107 , 216 ) ; Size = MAP_APPFONT ( 41 , 14 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/brkdlg.src b/sd/source/ui/dlg/brkdlg.src index bf9b2d29c651..a574ab9714ca 100644 --- a/sd/source/ui/dlg/brkdlg.src +++ b/sd/source/ui/dlg/brkdlg.src @@ -28,6 +28,7 @@ #include "brkdlg.hrc" ModalDialog DLG_BREAK { + HelpID = "sd:ModalDialog:DLG_BREAK"; OutputSize = TRUE; SVLook = TRUE; Pos = MAP_APPFONT( 84, 34 ); diff --git a/sd/source/ui/dlg/copydlg.src b/sd/source/ui/dlg/copydlg.src index 6cb04804ea9e..2cb99b4dfd75 100644 --- a/sd/source/ui/dlg/copydlg.src +++ b/sd/source/ui/dlg/copydlg.src @@ -65,6 +65,7 @@ ModalDialog DLG_COPY }; NumericField NUM_FLD_COPIES { + HelpID = "sd:NumericField:DLG_COPY:NUM_FLD_COPIES"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 7 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; @@ -80,6 +81,7 @@ ModalDialog DLG_COPY }; ImageButton BTN_SET_VIEWDATA { + HelpID = "sd:ImageButton:DLG_COPY:BTN_SET_VIEWDATA"; Pos = MAP_APPFONT ( 122 , 6 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; ButtonImage = Image @@ -92,6 +94,7 @@ ModalDialog DLG_COPY }; PushButton BTN_SET_DEFAULT { + HelpID = "sd:PushButton:DLG_COPY:BTN_SET_DEFAULT"; Pos = MAP_APPFONT ( 148 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -99,6 +102,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_ANGLE { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_ANGLE"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 69 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -126,6 +130,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_MOVE_X { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_X"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 37 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -143,6 +148,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_MOVE_Y { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_MOVE_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 53 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -160,6 +166,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_WIDTH { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 98 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -177,6 +184,7 @@ ModalDialog DLG_COPY }; MetricField MTR_FLD_HEIGHT { + HelpID = "sd:MetricField:DLG_COPY:MTR_FLD_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 114 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -230,6 +238,7 @@ ModalDialog DLG_COPY }; ListBox LB_START_COLOR { + HelpID = "sd:ListBox:DLG_COPY:LB_START_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 143 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; @@ -245,6 +254,7 @@ ModalDialog DLG_COPY }; ListBox LB_END_COLOR { + HelpID = "sd:ListBox:DLG_COPY:LB_END_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 76 , 159 ) ; Size = MAP_APPFONT ( 60 , 90 ) ; diff --git a/sd/source/ui/dlg/custsdlg.src b/sd/source/ui/dlg/custsdlg.src index 871781ad5fa3..5d05b63f6287 100644 --- a/sd/source/ui/dlg/custsdlg.src +++ b/sd/source/ui/dlg/custsdlg.src @@ -40,6 +40,7 @@ ModalDialog DLG_CUSTOMSHOW Closeable = TRUE ; PushButton BTN_NEW { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_NEW"; Pos = MAP_APPFONT ( 120 + DIFF , 6 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -47,6 +48,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_EDIT { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_EDIT"; Pos = MAP_APPFONT ( 120 + DIFF , 23 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -54,6 +56,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_REMOVE { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_REMOVE"; Pos = MAP_APPFONT ( 120 + DIFF , 40 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -61,6 +64,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_COPY { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_COPY"; Pos = MAP_APPFONT ( 120 + DIFF , 57 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -74,6 +78,7 @@ ModalDialog DLG_CUSTOMSHOW }; PushButton BTN_STARTSHOW { + HelpID = "sd:PushButton:DLG_CUSTOMSHOW:BTN_STARTSHOW"; Pos = MAP_APPFONT ( 120 + DIFF , 94 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -89,6 +94,7 @@ ModalDialog DLG_CUSTOMSHOW }; ListBox LB_CUSTOMSHOWS { + HelpID = "sd:ListBox:DLG_CUSTOMSHOW:LB_CUSTOMSHOWS"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 102 + DIFF , 86 + DIFF_Y ) ; @@ -96,6 +102,7 @@ ModalDialog DLG_CUSTOMSHOW }; CheckBox CBX_USE_CUSTOMSHOW { + HelpID = "sd:CheckBox:DLG_CUSTOMSHOW:CBX_USE_CUSTOMSHOW"; Pos = MAP_APPFONT ( 6 , 96 + DIFF_Y ) ; Size = MAP_APPFONT ( 112 + DIFF , 12 ) ; TabStop = TRUE ; @@ -138,6 +145,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; Edit EDT_NAME { + HelpID = "sd:Edit:DLG_DEFINE_CUSTOMSHOW:EDT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 38 , 6 ) ; Size = MAP_APPFONT ( 141 , 12 ) ; @@ -145,6 +153,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; MultiListBox LB_PAGES { + HelpID = "sd:MultiListBox:DLG_DEFINE_CUSTOMSHOW:LB_PAGES"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 35 ) ; Size = MAP_APPFONT ( 75 , 75 ) ; @@ -153,6 +162,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; PushButton BTN_ADD { + HelpID = "sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_ADD"; Pos = MAP_APPFONT ( 84 , 67 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~>>" ; @@ -168,6 +178,7 @@ ModalDialog DLG_DEFINE_CUSTOMSHOW }; PushButton BTN_REMOVE { + HelpID = "sd:PushButton:DLG_DEFINE_CUSTOMSHOW:BTN_REMOVE"; Pos = MAP_APPFONT ( 84 , 95 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~<<" ; diff --git a/sd/source/ui/dlg/dlgass.src b/sd/source/ui/dlg/dlgass.src index b4c146eb0df2..6427b9bff297 100644 --- a/sd/source/ui/dlg/dlgass.src +++ b/sd/source/ui/dlg/dlgass.src @@ -48,6 +48,7 @@ ModalDialog DLG_ASS CheckBox CB_PREVIEW { + HelpID = "sd:CheckBox:DLG_ASS:CB_PREVIEW"; Pos = MAP_APPFONT ( 144 , 140 ); Size = MAP_APPFONT ( 122 , 10 ); TabStop = TRUE; @@ -56,6 +57,7 @@ ModalDialog DLG_ASS CheckBox CB_STARTWITH { + HelpID = "sd:CheckBox:DLG_ASS:CB_STARTWITH"; Pos = MAP_APPFONT ( 144 , 154 ); Size = MAP_APPFONT ( 122 , 10 ); TabStop = TRUE; @@ -84,6 +86,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE1_EMPTY { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_EMPTY"; Pos = MAP_APPFONT ( 12 , 48 ); Size = MAP_APPFONT ( 130 , 10 ); TabStop = TRUE; @@ -92,6 +95,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE1_TEMPLATE { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_TEMPLATE"; Pos = MAP_APPFONT ( 12 , 62 ); Size = MAP_APPFONT ( 130 , 10 ); Text [ en-US ] = "~From template"; @@ -99,6 +103,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE1_OPEN { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE1_OPEN"; Pos = MAP_APPFONT ( 12 , 76 ); Size = MAP_APPFONT ( 130 , 10 ); Text [ en-US ] = "O~pen existing presentation"; @@ -106,6 +111,7 @@ ModalDialog DLG_ASS PushButton PB_PAGE1_OPEN { + HelpID = "sd:PushButton:DLG_ASS:PB_PAGE1_OPEN"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 18 , 89 ) ; Size = MAP_APPFONT ( 50 , 18 ) ; @@ -171,6 +177,7 @@ ModalDialog DLG_ASS ListBox LB_PAGE2_LAYOUT { + HelpID = "sd:ListBox:DLG_ASS:LB_PAGE2_LAYOUT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 64 ) ; Size = MAP_APPFONT ( 120 , 40 ) ; @@ -186,6 +193,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM5 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM5"; OutputSize = TRUE; Pos = MAP_APPFONT ( 12 , 121 ); Size = MAP_APPFONT ( 59 , 10 ); @@ -194,6 +202,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM1 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM1"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 75 , 121 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -202,6 +211,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM2 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM2"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 75 , 135 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -211,6 +221,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM3 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM3"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 12 , 135 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -220,6 +231,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE2_MEDIUM4 { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE2_MEDIUM4"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 12 , 149 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; @@ -256,6 +268,7 @@ ModalDialog DLG_ASS ListBox LB_PAGE3_EFFECT { + HelpID = "sd:ListBox:DLG_ASS:LB_PAGE3_EFFECT"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 72 , 48 ); Size = MAP_APPFONT ( 60 , 12 ); @@ -274,6 +287,7 @@ ModalDialog DLG_ASS ListBox LB_PAGE3_SPEED { + HelpID = "sd:ListBox:DLG_ASS:LB_PAGE3_SPEED"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 72 , 64 ); Size = MAP_APPFONT ( 60 , 12 ); @@ -292,6 +306,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE3_LIVE { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE3_LIVE"; OutputSize = TRUE; Pos = MAP_APPFONT ( 12 , 94 ); Size = MAP_APPFONT ( 120 , 10 ); @@ -300,6 +315,7 @@ ModalDialog DLG_ASS RadioButton RB_PAGE3_KIOSK { + HelpID = "sd:RadioButton:DLG_ASS:RB_PAGE3_KIOSK"; OutputSize = TRUE; Pos = MAP_APPFONT ( 12 , 108 ); Size = MAP_APPFONT ( 120 , 10 ); @@ -316,6 +332,7 @@ ModalDialog DLG_ASS TimeField TMF_PAGE3_TIME { + HelpID = "sd:TimeField:DLG_ASS:TMF_PAGE3_TIME"; OutputSize = TRUE; Pos = MAP_APPFONT ( 77 , 122 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; @@ -349,6 +366,7 @@ ModalDialog DLG_ASS TimeField TMF_PAGE3_BREAK { + HelpID = "sd:TimeField:DLG_ASS:TMF_PAGE3_BREAK"; OutputSize = TRUE; Pos = MAP_APPFONT ( 77 , 138 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; @@ -374,6 +392,7 @@ ModalDialog DLG_ASS CheckBox CB_PAGE3_LOGO { + HelpID = "sd:CheckBox:DLG_ASS:CB_PAGE3_LOGO"; OutputSize = TRUE; Pos = MAP_APPFONT ( 21 , 154 ); Size = MAP_APPFONT ( 111 , 10 ); @@ -410,6 +429,7 @@ ModalDialog DLG_ASS }; Edit EDT_PAGE4_ASKNAME { + HelpID = "sd:Edit:DLG_ASS:EDT_PAGE4_ASKNAME"; OutputSize = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 59 ) ; @@ -425,6 +445,7 @@ ModalDialog DLG_ASS }; Edit EDT_PAGE4_ASKTOPIC { + HelpID = "sd:Edit:DLG_ASS:EDT_PAGE4_ASKTOPIC"; OutputSize = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 88 ) ; @@ -440,6 +461,7 @@ ModalDialog DLG_ASS }; MultiLineEdit EDT_PAGE4_ASKINFORMATION { + HelpID = "sd:MultiLineEdit:DLG_ASS:EDT_PAGE4_ASKINFORMATION"; OutputSize = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 117 ) ; @@ -479,6 +501,7 @@ ModalDialog DLG_ASS CheckBox CB_PAGE5_SUMMARY { + HelpID = "sd:CheckBox:DLG_ASS:CB_PAGE5_SUMMARY"; OutputSize = TRUE; Pos = MAP_APPFONT ( 6 , 154 ); Size = MAP_APPFONT ( 132 , 10 ); @@ -505,6 +528,7 @@ ModalDialog DLG_ASS PushButton BUT_LAST { + HelpID = "sd:PushButton:DLG_ASS:BUT_LAST"; OutputSize = TRUE ; Pos = MAP_APPFONT ( 112 , 170 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -514,6 +538,7 @@ ModalDialog DLG_ASS PushButton BUT_NEXT { + HelpID = "sd:PushButton:DLG_ASS:BUT_NEXT"; DefButton = TRUE ; OutputSize = TRUE ; Pos = MAP_APPFONT ( 165 , 170 ) ; diff --git a/sd/source/ui/dlg/dlgfield.src b/sd/source/ui/dlg/dlgfield.src index 5abcd9e8b9b7..cbd1ba56f7cd 100644 --- a/sd/source/ui/dlg/dlgfield.src +++ b/sd/source/ui/dlg/dlgfield.src @@ -28,6 +28,7 @@ #include "dlgfield.hrc" ModalDialog DLG_FIELD_MODIFY { + HelpID = "sd:ModalDialog:DLG_FIELD_MODIFY"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 138 , 154 ) ; @@ -41,6 +42,7 @@ ModalDialog DLG_FIELD_MODIFY }; RadioButton RBT_FIX { + HelpID = "sd:RadioButton:DLG_FIELD_MODIFY:RBT_FIX"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 64 , 10 ) ; TabStop = TRUE ; @@ -48,6 +50,7 @@ ModalDialog DLG_FIELD_MODIFY }; RadioButton RBT_VAR { + HelpID = "sd:RadioButton:DLG_FIELD_MODIFY:RBT_VAR"; Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 64 , 10 ) ; TabStop = TRUE ; @@ -62,6 +65,7 @@ ModalDialog DLG_FIELD_MODIFY ListBox LB_LANGUAGE { + HelpID = "sd:ListBox:DLG_FIELD_MODIFY:LB_LANGUAGE"; Border = TRUE ; Pos = MAP_APPFONT ( 52 , 65 ) ; Size = MAP_APPFONT ( 80 , 70 ) ; @@ -71,6 +75,7 @@ ModalDialog DLG_FIELD_MODIFY ListBox LB_FORMAT { + HelpID = "sd:ListBox:DLG_FIELD_MODIFY:LB_FORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 94 ) ; Size = MAP_APPFONT ( 126 , 54 ) ; diff --git a/sd/source/ui/dlg/dlgsnap.src b/sd/source/ui/dlg/dlgsnap.src index 2cc106db4b75..5d6a5c757be5 100644 --- a/sd/source/ui/dlg/dlgsnap.src +++ b/sd/source/ui/dlg/dlgsnap.src @@ -59,6 +59,7 @@ ModalDialog DLG_SNAPLINE }; PushButton BTN_DELETE { + HelpID = "sd:PushButton:DLG_SNAPLINE:BTN_DELETE"; Pos = MAP_APPFONT ( 88 , 63 ) ; Size = MAP_APPFONT ( 46 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */ @@ -79,6 +80,7 @@ ModalDialog DLG_SNAPLINE }; MetricField MTR_FLD_X { + HelpID = "sd:MetricField:DLG_SNAPLINE:MTR_FLD_X"; Border = TRUE ; Pos = MAP_APPFONT ( 22 , 14 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -102,6 +104,7 @@ ModalDialog DLG_SNAPLINE }; MetricField MTR_FLD_Y { + HelpID = "sd:MetricField:DLG_SNAPLINE:MTR_FLD_Y"; Border = TRUE ; Pos = MAP_APPFONT ( 22 , 30 ) ; Size = MAP_APPFONT ( 54 , 12 ) ; @@ -125,6 +128,7 @@ ModalDialog DLG_SNAPLINE }; ImageRadioButton RB_POINT { + HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_POINT"; Pos = MAP_APPFONT ( 12 , 61 ) ; Size = MAP_APPFONT ( 64 , 16 ) ; Text [ en-US ] = "~Point" ; @@ -137,6 +141,7 @@ ModalDialog DLG_SNAPLINE }; ImageRadioButton RB_VERTICAL { + HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_VERTICAL"; Pos = MAP_APPFONT ( 12 , 81 ) ; Size = MAP_APPFONT ( 64 , 16 ) ; Text [ en-US ] = "~Vertical" ; @@ -149,6 +154,7 @@ ModalDialog DLG_SNAPLINE }; ImageRadioButton RB_HORIZONTAL { + HelpID = "sd:ImageRadioButton:DLG_SNAPLINE:RB_HORIZONTAL"; Pos = MAP_APPFONT ( 12 , 101 ) ; Size = MAP_APPFONT ( 65 , 16 ) ; Text [ en-US ] = "Hori~zontal" ; diff --git a/sd/source/ui/dlg/headerfooterdlg.src b/sd/source/ui/dlg/headerfooterdlg.src index df42ff9b7551..6dccc1cf2b6a 100644 --- a/sd/source/ui/dlg/headerfooterdlg.src +++ b/sd/source/ui/dlg/headerfooterdlg.src @@ -103,6 +103,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_HEADER { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_HEADER"; Pos = MAP_APPFONT ( C1, Y1 ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -119,6 +120,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Edit TB_HEADER_FIXED { + HelpID = "sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_HEADER_FIXED"; Pos = MAP_APPFONT ( C4, Y1 + SPACE_Y + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; @@ -135,6 +137,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_DATETIME { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME"; Pos = MAP_APPFONT ( C1, Y2 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -143,6 +146,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER RadioButton RB_DATETIME_FIXED { + HelpID = "sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_FIXED"; Pos = MAP_APPFONT ( C2, Y2 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + 1 ); Size = MAP_APPFONT ( W2, RSC_CD_RADIOBUTTON_HEIGHT ); TabStop = TRUE ; @@ -151,6 +155,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Edit TB_DATETIME_FIXED { + HelpID = "sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_DATETIME_FIXED"; Pos = MAP_APPFONT ( C4, Y2 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; @@ -159,6 +164,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER RadioButton RB_DATETIME_AUTOMATIC { + HelpID = "sd:RadioButton:RID_SD_TABPAGE_HEADERFOOTER:RB_DATETIME_AUTOMATIC"; Pos = MAP_APPFONT ( C2, Y2 + 3 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT ); Size = MAP_APPFONT ( 80, RSC_CD_RADIOBUTTON_HEIGHT ); TabStop = TRUE ; @@ -167,6 +173,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER ListBox CB_DATETIME_FORMAT { + HelpID = "sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_FORMAT"; Pos = MAP_APPFONT ( C3, Y2 + 4 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT ( W4, 80 ); TabStop = TRUE ; @@ -183,6 +190,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER ListBox CB_DATETIME_LANGUAGE { + HelpID = "sd:ListBox:RID_SD_TABPAGE_HEADERFOOTER:CB_DATETIME_LANGUAGE"; Pos = MAP_APPFONT ( C3 + W4 + SPACE_X, Y2 + 4 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT + RSC_CD_TEXTBOX_HEIGHT + RSC_CD_RADIOBUTTON_HEIGHT ); Size = MAP_APPFONT ( W4, 80 ); TabStop = TRUE ; @@ -199,6 +207,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_FOOTER { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_FOOTER"; Pos = MAP_APPFONT ( C1, Y3 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -215,6 +224,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER Edit TB_FOOTER_FIXED { + HelpID = "sd:Edit:RID_SD_TABPAGE_HEADERFOOTER:TB_FOOTER_FIXED"; Pos = MAP_APPFONT ( C4, Y3 + 2 * SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT + RSC_CD_CHECKBOX_HEIGHT ); Size = MAP_APPFONT ( W3, RSC_CD_TEXTBOX_HEIGHT ); TabStop = TRUE ; @@ -231,6 +241,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_SLIDENUMBER { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_SLIDENUMBER"; Pos = MAP_APPFONT ( C1, Y4 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - C1, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -247,6 +258,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER CheckBox CB_NOTONTITLE { + HelpID = "sd:CheckBox:RID_SD_TABPAGE_HEADERFOOTER:CB_NOTONTITLE"; Pos = MAP_APPFONT ( RSC_SP_TBPG_INNERBORDER_LEFT, Y5 + SPACE_Y + RSC_CD_FIXEDLINE_HEIGHT ); Size = MAP_APPFONT ( W1 - RSC_SP_TBPG_INNERBORDER_LEFT, RSC_CD_CHECKBOX_HEIGHT ); TabStop = TRUE ; @@ -255,6 +267,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER PushButton BT_APPLYTOALL { + HelpID = "sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLYTOALL"; Pos = MAP_APPFONT ( TAB_WIDTH - 7 * SPACE_X - PUSHBUTTON_WIDTH, RSC_SP_TBPG_INNERBORDER_TOP ); Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); TabStop = TRUE ; @@ -263,6 +276,7 @@ TabPage RID_SD_TABPAGE_HEADERFOOTER PushButton BT_APPLY { + HelpID = "sd:PushButton:RID_SD_TABPAGE_HEADERFOOTER:BT_APPLY"; Pos = MAP_APPFONT ( TAB_WIDTH - 7 * SPACE_X - PUSHBUTTON_WIDTH, RSC_SP_TBPG_INNERBORDER_TOP + RSC_CD_PUSHBUTTON_HEIGHT + SPACE_Y ); Size = MAP_APPFONT ( PUSHBUTTON_WIDTH, RSC_CD_PUSHBUTTON_HEIGHT ); TabStop = TRUE ; diff --git a/sd/source/ui/dlg/ins_paste.src b/sd/source/ui/dlg/ins_paste.src index 0b066f096f87..0668e26f1993 100644 --- a/sd/source/ui/dlg/ins_paste.src +++ b/sd/source/ui/dlg/ins_paste.src @@ -29,6 +29,7 @@ ModalDialog DLG_INSERT_PASTE { + HelpID = "sd:ModalDialog:DLG_INSERT_PASTE"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 148 , 90 ) ; @@ -61,6 +62,7 @@ ModalDialog DLG_INSERT_PASTE }; RadioButton RB_BEFORE { + HelpID = "sd:RadioButton:DLG_INSERT_PASTE:RB_BEFORE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 80, 10 ) ; Text [ en-US ] = "~Before" ; @@ -68,6 +70,7 @@ ModalDialog DLG_INSERT_PASTE }; RadioButton RB_AFTER { + HelpID = "sd:RadioButton:DLG_INSERT_PASTE:RB_AFTER"; Pos = MAP_APPFONT ( 12, 27 ) ; Size = MAP_APPFONT ( 80, 10 ) ; Text [ en-US ] = "A~fter" ; diff --git a/sd/source/ui/dlg/inspagob.src b/sd/source/ui/dlg/inspagob.src index 99cfee3de049..70bd99bd2641 100644 --- a/sd/source/ui/dlg/inspagob.src +++ b/sd/source/ui/dlg/inspagob.src @@ -66,6 +66,7 @@ ModalDialog DLG_INSERT_PAGES_OBJS }; CheckBox CBX_LINK { + HelpID = "sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_LINK"; Pos = MAP_APPFONT ( 6 , 100 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; TabStop = TRUE ; @@ -73,6 +74,7 @@ ModalDialog DLG_INSERT_PAGES_OBJS }; CheckBox CBX_CHECK_MASTERS { + HelpID = "sd:CheckBox:DLG_INSERT_PAGES_OBJS:CBX_CHECK_MASTERS"; Pos = MAP_APPFONT ( 6 , 114 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/layeroptionsdlg.src b/sd/source/ui/dlg/layeroptionsdlg.src index e57876093570..ee6a4c6c19d1 100644 --- a/sd/source/ui/dlg/layeroptionsdlg.src +++ b/sd/source/ui/dlg/layeroptionsdlg.src @@ -47,6 +47,7 @@ ModalDialog DLG_INSERT_LAYER Edit EDT_NAME { + HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 188 , 12 ) ; @@ -62,6 +63,7 @@ ModalDialog DLG_INSERT_LAYER Edit EDT_TITLE { + HelpID = "sd:Edit:DLG_INSERT_LAYER:EDT_TITLE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 43 ) ; Size = MAP_APPFONT ( 188 , 12 ) ; @@ -77,6 +79,7 @@ ModalDialog DLG_INSERT_LAYER MultiLineEdit EDT_DESCRIPTION { + HelpID = "sd:MultiLineEdit:DLG_INSERT_LAYER:EDT_DESCRIPTION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 69 ) ; Size = MAP_APPFONT ( 188 , 34 ) ; @@ -87,6 +90,7 @@ ModalDialog DLG_INSERT_LAYER CheckBox CBX_VISIBLE { + HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_VISIBLE"; Pos = MAP_APPFONT ( 6 , 106 ) ; Size = MAP_APPFONT ( 188 , 10 ) ; Text [ en-US ] = "~Visible" ; @@ -95,6 +99,7 @@ ModalDialog DLG_INSERT_LAYER CheckBox CBX_PRINTABLE { + HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_PRINTABLE"; Pos = MAP_APPFONT ( 6 , 119 ) ; Size = MAP_APPFONT ( 188 , 10 ) ; Text [ en-US ] = "~Printable" ; @@ -103,6 +108,7 @@ ModalDialog DLG_INSERT_LAYER CheckBox CBX_LOCKED { + HelpID = "sd:CheckBox:DLG_INSERT_LAYER:CBX_LOCKED"; Pos = MAP_APPFONT ( 6 , 132 ) ; Size = MAP_APPFONT ( 188 , 10 ) ; Text [ en-US ] = "~Locked" ; diff --git a/sd/source/ui/dlg/masterlayoutdlg.src b/sd/source/ui/dlg/masterlayoutdlg.src index 1e862b63cec6..71cf192b5fd4 100644 --- a/sd/source/ui/dlg/masterlayoutdlg.src +++ b/sd/source/ui/dlg/masterlayoutdlg.src @@ -31,6 +31,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT { + HelpID = "sd:ModalDialog:RID_SD_DLG_MASTER_LAYOUT"; Size = MAP_APPFONT( 89 , 92 ); OutputSize = TRUE; SVLook = TRUE; @@ -46,6 +47,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_HEADER { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_HEADER"; Pos = MAP_APPFONT( 6, 16 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; @@ -55,6 +57,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_DATE { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_DATE"; Pos = MAP_APPFONT( 6, 29 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; @@ -64,6 +67,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_FOOTER { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_FOOTER"; Pos = MAP_APPFONT( 6, 42 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; @@ -73,6 +77,7 @@ ModalDialog RID_SD_DLG_MASTER_LAYOUT CheckBox CB_PAGE_NUMBER { + HelpID = "sd:CheckBox:RID_SD_DLG_MASTER_LAYOUT:CB_PAGE_NUMBER"; Pos = MAP_APPFONT( 6, 55 ); Size = MAP_APPFONT( 134 , 10 ); TabStop = TRUE; diff --git a/sd/source/ui/dlg/morphdlg.src b/sd/source/ui/dlg/morphdlg.src index 7bdebec16bf7..026a4fd29609 100644 --- a/sd/source/ui/dlg/morphdlg.src +++ b/sd/source/ui/dlg/morphdlg.src @@ -77,6 +77,7 @@ ModalDialog DLG_MORPH }; MetricField MTF_STEPS { + HelpID = "sd:MetricField:DLG_MORPH:MTF_STEPS"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 14 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -90,6 +91,7 @@ ModalDialog DLG_MORPH }; CheckBox CBX_ATTRIBUTES { + HelpID = "sd:CheckBox:DLG_MORPH:CBX_ATTRIBUTES"; Pos = MAP_APPFONT ( 12 , 29 ) ; Size = MAP_APPFONT ( 121 , 12 ) ; /* ### ACHTUNG: Neuer Text in Resource? Attributierung überblenden : Attributierung ³berblenden */ @@ -98,6 +100,7 @@ ModalDialog DLG_MORPH }; CheckBox CBX_ORIENTATION { + HelpID = "sd:CheckBox:DLG_MORPH:CBX_ORIENTATION"; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 121 , 12 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/paragr.src b/sd/source/ui/dlg/paragr.src index 65ac21c5142f..99a9d4f4c17f 100644 --- a/sd/source/ui/dlg/paragr.src +++ b/sd/source/ui/dlg/paragr.src @@ -113,6 +113,7 @@ TabPage RID_TABPAGE_PARA_NUMBERING TriStateBox CB_NEW_START { + HelpID = "sd:TriStateBox:RID_TABPAGE_PARA_NUMBERING:CB_NEW_START"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; TabStop = TRUE ; @@ -120,6 +121,7 @@ TabPage RID_TABPAGE_PARA_NUMBERING }; TriStateBox CB_NUMBER_NEW_START { + HelpID = "sd:TriStateBox:RID_TABPAGE_PARA_NUMBERING:CB_NUMBER_NEW_START"; Pos = MAP_APPFONT ( 15 , 21 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; Disable = TRUE ; @@ -127,6 +129,7 @@ TabPage RID_TABPAGE_PARA_NUMBERING }; NumericField NF_NEW_START { + HelpID = "sd:NumericField:RID_TABPAGE_PARA_NUMBERING:NF_NEW_START"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 20 ) ; Size = MAP_APPFONT ( 26 , 12 ) ; diff --git a/sd/source/ui/dlg/present.src b/sd/source/ui/dlg/present.src index 74f6db89fe55..73c16148a184 100644 --- a/sd/source/ui/dlg/present.src +++ b/sd/source/ui/dlg/present.src @@ -69,6 +69,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_ALL { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_ALL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 80 , 12 ) ; Text [ en-US ] = "All ~slides" ; @@ -76,6 +77,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_AT_DIA { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_AT_DIA"; Pos = MAP_APPFONT ( 12 , 26 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; Text [ en-US ] = "~From:" ; @@ -83,6 +85,7 @@ ModalDialog DLG_START_PRESENTATION }; ListBox LB_DIAS { + HelpID = "sd:ListBox:DLG_START_PRESENTATION:LB_DIAS"; Border = TRUE ; Pos = MAP_APPFONT ( 82, 24 ) ; Size = MAP_APPFONT ( 111, 80 ) ; @@ -92,6 +95,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_CUSTOMSHOW { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_CUSTOMSHOW"; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 130 , 12 ) ; TabStop = TRUE ; @@ -99,6 +103,7 @@ ModalDialog DLG_START_PRESENTATION }; ListBox LB_CUSTOMSHOW { + HelpID = "sd:ListBox:DLG_START_PRESENTATION:LB_CUSTOMSHOW"; Border = TRUE ; Pos = MAP_APPFONT ( 32, 53 ) ; Size = MAP_APPFONT ( 161, 80 ) ; @@ -114,6 +119,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_STANDARD { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_STANDARD"; Pos = MAP_APPFONT ( 12, 84 ) ; Size = MAP_APPFONT ( 81, 12 ) ; Text [ en-US ] = "~Default" ; @@ -121,6 +127,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_WINDOW { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_WINDOW"; Pos = MAP_APPFONT ( 12 , 96 ) ; Size = MAP_APPFONT ( 81 , 12 ) ; Text [ en-US ] = "~Window" ; @@ -128,6 +135,7 @@ ModalDialog DLG_START_PRESENTATION }; RadioButton RBT_AUTO { + HelpID = "sd:RadioButton:DLG_START_PRESENTATION:RBT_AUTO"; Pos = MAP_APPFONT ( 12 , 108 ) ; Size = MAP_APPFONT ( 81 , 12 ) ; Text [ en-US ] = "A~uto" ; @@ -143,6 +151,7 @@ ModalDialog DLG_START_PRESENTATION */ TimeField TMF_PAUSE { + HelpID = "sd:TimeField:DLG_START_PRESENTATION:TMF_PAUSE"; Pos = MAP_APPFONT ( 32, 120 ) ; Size = MAP_APPFONT ( 50, 12 ) ; Border = TRUE ; @@ -167,6 +176,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_AUTOLOGO { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_AUTOLOGO"; Pos = MAP_APPFONT ( 32 , 138 ) ; Size = MAP_APPFONT ( 61 , 12 ) ; TabStop = TRUE ; @@ -181,6 +191,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_MANUEL { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_MANUEL"; Pos = MAP_APPFONT ( 108 , 84 ) ; Size = MAP_APPFONT ( 139 , 12 ) ; TabStop = TRUE ; @@ -188,6 +199,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_MOUSEPOINTER { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_MOUSEPOINTER"; Pos = MAP_APPFONT ( 108, 96 ) ; Size = MAP_APPFONT ( 139, 12 ) ; Text [ en-US ] = "Mouse pointer ~visible" ; @@ -195,6 +207,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_PEN { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_PEN"; Pos = MAP_APPFONT ( 108, 108 ) ; Size = MAP_APPFONT ( 139, 12 ) ; Text [ en-US ] = "Mouse pointer as ~pen" ; @@ -202,6 +215,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_NAVIGATOR { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_NAVIGATOR"; Pos = MAP_APPFONT ( 108, 120 ) ; Size = MAP_APPFONT ( 139, 12 ) ; TabStop = TRUE ; @@ -209,6 +223,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_ANIMATION_ALLOWED { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_ANIMATION_ALLOWED"; Pos = MAP_APPFONT ( 108, 132 ) ; Size = MAP_APPFONT ( 139, 12 ) ; TabStop = TRUE ; @@ -216,6 +231,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_CHANGE_PAGE { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_CHANGE_PAGE"; Pos = MAP_APPFONT ( 108, 144 ) ; Size = MAP_APPFONT ( 139, 12 ) ; TabStop = TRUE ; @@ -223,6 +239,7 @@ ModalDialog DLG_START_PRESENTATION }; CheckBox CBX_ALWAYS_ON_TOP { + HelpID = "sd:CheckBox:DLG_START_PRESENTATION:CBX_ALWAYS_ON_TOP"; Pos = MAP_APPFONT ( 108, 156 ) ; Size = MAP_APPFONT ( 145, 12 ) ; /* ### ACHTUNG: Neuer Text in Resource? Präsentation immer im ~Vordergrund : Prõsentation immer im ~Vordergrund */ diff --git a/sd/source/ui/dlg/prntopts.src b/sd/source/ui/dlg/prntopts.src index dd2ed2e3f63b..7a4f88068e87 100644 --- a/sd/source/ui/dlg/prntopts.src +++ b/sd/source/ui/dlg/prntopts.src @@ -42,6 +42,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_DRAW { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_DRAW"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; @@ -49,6 +50,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_NOTES { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_NOTES"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -56,6 +58,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_HANDOUTS { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_HANDOUTS"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -63,6 +66,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_OUTLINE { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_OUTLINE"; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -82,6 +86,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_COLOR { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_COLOR"; Pos = MAP_APPFONT ( 136 , 14 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Default" ; @@ -89,6 +94,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_GRAYSCALE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_GRAYSCALE"; Pos = MAP_APPFONT ( 136 , 28 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Gra~yscale" ; @@ -96,6 +102,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_BLACKWHITE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_BLACKWHITE"; Pos = MAP_APPFONT ( 136 , 42 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Black & ~white" ; @@ -109,6 +116,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_PAGENAME { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAGENAME"; Pos = MAP_APPFONT ( 12 , 83 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "~Page name" ; @@ -116,6 +124,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_DATE { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_DATE"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "D~ate" ; @@ -123,6 +132,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_TIME { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_TIME"; Pos = MAP_APPFONT ( 12 , 111 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Ti~me" ; @@ -130,6 +140,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_HIDDEN_PAGES { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_HIDDEN_PAGES"; Pos = MAP_APPFONT ( 12 , 125 ) ; // 120 , 14 Size = MAP_APPFONT ( 90 , 10 ) ; @@ -150,6 +161,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_DEFAULT { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_DEFAULT"; Pos = MAP_APPFONT ( 136 , 83 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -157,6 +169,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_PAGESIZE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGESIZE"; Pos = MAP_APPFONT ( 136 , 97 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; Text [ en-US ] = "~Fit to page" ; @@ -164,6 +177,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_PAGETILE { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_PAGETILE"; Pos = MAP_APPFONT ( 136 , 111 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -171,6 +185,7 @@ TabPage TP_PRINT_OPTIONS }; RadioButton RBT_BOOKLET { + HelpID = "sd:RadioButton:TP_PRINT_OPTIONS:RBT_BOOKLET"; Pos = MAP_APPFONT ( 136, 125 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -178,6 +193,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_FRONT { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_FRONT"; Pos = MAP_APPFONT ( 145 , 139 ) ; Size = MAP_APPFONT ( 53 , 10 ) ; TabStop = TRUE ; @@ -185,6 +201,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_BACK { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_BACK"; Pos = MAP_APPFONT ( 202 , 139 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; @@ -192,6 +209,7 @@ TabPage TP_PRINT_OPTIONS }; CheckBox CBX_PAPERBIN { + HelpID = "sd:CheckBox:TP_PRINT_OPTIONS:CBX_PAPERBIN"; Pos = MAP_APPFONT ( 136 , 153 ) ; Size = MAP_APPFONT ( 118 , 30 ) ; Text [ en-US ] = "Paper tray from printer s~ettings" ; diff --git a/sd/source/ui/dlg/sdpreslt.src b/sd/source/ui/dlg/sdpreslt.src index c8b0ee73b135..f77132642b8a 100644 --- a/sd/source/ui/dlg/sdpreslt.src +++ b/sd/source/ui/dlg/sdpreslt.src @@ -66,6 +66,7 @@ ModalDialog DLG_PRESLT }; CheckBox CBX_MASTER_PAGE { + HelpID = "sd:CheckBox:DLG_PRESLT:CBX_MASTER_PAGE"; Pos = MAP_APPFONT ( 6 , 158 ) ; Size = MAP_APPFONT ( 120 , 12 ) ; TabStop = TRUE ; @@ -73,6 +74,7 @@ ModalDialog DLG_PRESLT }; CheckBox CBX_CHECK_MASTERS { + HelpID = "sd:CheckBox:DLG_PRESLT:CBX_CHECK_MASTERS"; Pos = MAP_APPFONT ( 6 , 170 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; TabStop = TRUE ; @@ -80,6 +82,7 @@ ModalDialog DLG_PRESLT }; PushButton BTN_LOAD { + HelpID = "sd:PushButton:DLG_PRESLT:BTN_LOAD"; Pos = MAP_APPFONT ( 156 , 155 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/tpaction.src b/sd/source/ui/dlg/tpaction.src index 92516026884b..a567afebdf5c 100644 --- a/sd/source/ui/dlg/tpaction.src +++ b/sd/source/ui/dlg/tpaction.src @@ -48,6 +48,7 @@ TabPage TP_ANIMATION }; ListBox LB_ACTION { + HelpID = "sd:ListBox:TP_ANIMATION:LB_ACTION"; Border = TRUE ; Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT , MA_ACTIONLB_TOP ) ; Size = MAP_APPFONT ( 150 - RSC_SP_GRP_INNERBORDER_RIGHT , 79 ) ; @@ -66,6 +67,7 @@ TabPage TP_ANIMATION Edit EDT_SOUND { + HelpID = "sd:Edit:TP_ANIMATION:EDT_SOUND"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT + RSC_SP_CHK_TEXTINDENT) , 12 ) ; @@ -77,6 +79,7 @@ TabPage TP_ANIMATION // schiedlich heissen, da sie eben auch eine unterschiedliche Bedeutung haben PushButton BTN_SEARCH { + HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEARCH"; Pos = MAP_APPFONT ( 247 - 65, MA_Y4 + RSC_CD_CHECKBOX_HEIGHT ) ; Size = MAP_APPFONT ( 65 , 14 ) ; TabStop = TRUE ; @@ -112,6 +115,7 @@ TabPage TP_ANIMATION }; ListBox LB_OLE_ACTION { + HelpID = "sd:ListBox:TP_ANIMATION:LB_OLE_ACTION"; Border = TRUE ; Pos = MAP_APPFONT ( MA_ACTIONLB_LEFT, MA_Y0 + 3 ) ; Size = MAP_APPFONT ( 150 - RSC_SP_GRP_INNERBORDER_RIGHT , 77 ) ; @@ -126,6 +130,7 @@ TabPage TP_ANIMATION }; Edit EDT_BOOKMARK { + HelpID = "sd:Edit:TP_ANIMATION:EDT_BOOKMARK"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -134,6 +139,7 @@ TabPage TP_ANIMATION }; Edit EDT_DOCUMENT { + HelpID = "sd:Edit:TP_ANIMATION:EDT_DOCUMENT"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -142,6 +148,7 @@ TabPage TP_ANIMATION }; Edit EDT_PROGRAM { + HelpID = "sd:Edit:TP_ANIMATION:EDT_PROGRAM"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -150,6 +157,7 @@ TabPage TP_ANIMATION }; Edit EDT_MACRO { + HelpID = "sd:Edit:TP_ANIMATION:EDT_MACRO"; Border = TRUE ; Pos = MAP_APPFONT ( RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT , MA_Y4 + RSC_CD_CHECKBOX_HEIGHT + 1 ) ; Size = MAP_APPFONT ( 247 - 65 - 10 - (RSC_SP_DLG_INNERBORDER_LEFT + RSC_SP_FLGR_INNERBORDER_LEFT) , 12 ) ; @@ -158,6 +166,7 @@ TabPage TP_ANIMATION }; PushButton BTN_SEEK { + HelpID = "sd:PushButton:TP_ANIMATION:BTN_SEEK"; Pos = MAP_APPFONT ( 247 - 65, MA_Y4 + RSC_CD_CHECKBOX_HEIGHT ) ; Size = MAP_APPFONT ( 65 , 14 ) ; TabStop = TRUE ; diff --git a/sd/source/ui/dlg/tpoption.src b/sd/source/ui/dlg/tpoption.src index 96149d4e6a1f..421bae15c476 100644 --- a/sd/source/ui/dlg/tpoption.src +++ b/sd/source/ui/dlg/tpoption.src @@ -45,6 +45,7 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_RULER { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_RULER"; Pos = MAP_APPFONT ( 12 , 83 - 69 ) ; Size = MAP_APPFONT ( 134 , 10 ) ; TabStop = TRUE ; @@ -52,6 +53,7 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_HELPLINES { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HELPLINES"; Pos = MAP_APPFONT ( 12 , 97 - 69 ) ; Size = MAP_APPFONT ( 134 , 10 ) ; TabStop = TRUE ; @@ -59,6 +61,7 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_HANDLES_BEZIER { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_HANDLES_BEZIER"; Pos = MAP_APPFONT ( 12 , 111 - 69 ) ; Size = MAP_APPFONT ( 134 , 10 ) ; TabStop = TRUE ; @@ -66,6 +69,7 @@ TabPage TP_OPTIONS_CONTENTS }; CheckBox CBX_MOVE_OUTLINE { + HelpID = "sd:CheckBox:TP_OPTIONS_CONTENTS:CBX_MOVE_OUTLINE"; Pos = MAP_APPFONT ( 12 , 125 - 69 ) ; Size = MAP_APPFONT ( 134 , 10 ) ; TabStop = TRUE ; @@ -87,6 +91,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_QUICKEDIT { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_QUICKEDIT"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 116 , 10 ) ; TabStop = TRUE ; @@ -94,6 +99,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_PICKTHROUGH { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_PICKTHROUGH"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 116 , 10 ) ; TabStop = TRUE ; @@ -107,6 +113,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_START_WITH_TEMPLATE { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_TEMPLATE"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -120,6 +127,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_MASTERPAGE_CACHE { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_MASTERPAGE_CACHE"; Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -127,6 +135,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_COPY { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_COPY"; Pos = MAP_APPFONT ( 12 , 93 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -134,6 +143,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_MARKED_HIT_MOVES_ALWAYS { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_MARKED_HIT_MOVES_ALWAYS"; Pos = MAP_APPFONT ( 12 , 106 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -141,6 +151,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_CROOK_NO_CONTORTION { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_CROOK_NO_CONTORTION"; Pos = MAP_APPFONT ( 12 , 119 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -155,6 +166,7 @@ TabPage TP_OPTIONS_MISC }; ListBox LB_METRIC { + HelpID = "sd:ListBox:TP_OPTIONS_MISC:LB_METRIC"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 117 ) ; Size = MAP_APPFONT ( 50 , 50 ) ; @@ -169,6 +181,7 @@ TabPage TP_OPTIONS_MISC }; MetricField MTR_FLD_TABSTOP { + HelpID = "sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_TABSTOP"; Border = TRUE ; Pos = MAP_APPFONT ( 206 , 117 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; @@ -192,6 +205,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CBX_START_WITH_ACTUAL_PAGE { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CBX_START_WITH_ACTUAL_PAGE"; Pos = MAP_APPFONT ( 12 , 145 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; TabStop = TRUE ; @@ -205,6 +219,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CB_USE_PRINTER_METRICS { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CB_USE_PRINTER_METRICS"; // This checkbox and the following one will change places when this // one is wired in into the dialog. At the moment exists only for // translation to work on. @@ -214,6 +229,7 @@ TabPage TP_OPTIONS_MISC }; CheckBox CB_MERGE_PARA_DIST { + HelpID = "sd:CheckBox:TP_OPTIONS_MISC:CB_MERGE_PARA_DIST"; Pos = MAP_APPFONT ( 12 , 171 ) ; Size = MAP_APPFONT ( 242, 10 ) ; Text [ en-US ] = "Add ~spacing between paragraphs and tables (in current document)"; @@ -248,6 +264,7 @@ TabPage TP_OPTIONS_MISC }; ComboBox CB_SCALE { + HelpID = "sd:ComboBox:TP_OPTIONS_MISC:CB_SCALE"; Hide = TRUE; Pos = MAP_APPFONT ( 72 , 147 ) ; Size = MAP_APPFONT ( 30 , 70 ) ; @@ -269,6 +286,7 @@ TabPage TP_OPTIONS_MISC }; MetricField MTR_FLD_ORIGINAL_WIDTH { + HelpID = "sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_ORIGINAL_WIDTH"; Hide = TRUE; Border = TRUE ; Pos = MAP_APPFONT ( 206 , 147 ) ; @@ -300,6 +318,7 @@ TabPage TP_OPTIONS_MISC }; MetricField MTR_FLD_ORIGINAL_HEIGHT { + HelpID = "sd:MetricField:TP_OPTIONS_MISC:MTR_FLD_ORIGINAL_HEIGHT"; Hide = TRUE; Border = TRUE ; Pos = MAP_APPFONT ( 206 , 163 ) ; diff --git a/sd/source/ui/dlg/vectdlg.src b/sd/source/ui/dlg/vectdlg.src index 757233d9d33b..f66ba0a9454c 100644 --- a/sd/source/ui/dlg/vectdlg.src +++ b/sd/source/ui/dlg/vectdlg.src @@ -71,6 +71,7 @@ ModalDialog DLG_VECTORIZE PushButton BTN_PREVIEW { + HelpID = "sd:PushButton:DLG_VECTORIZE:BTN_PREVIEW"; Pos = MAP_APPFONT ( 144 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -93,6 +94,7 @@ ModalDialog DLG_VECTORIZE NumericField NM_LAYERS { + HelpID = "sd:NumericField:DLG_VECTORIZE:NM_LAYERS"; Border = TRUE ; Pos = MAP_APPFONT ( 92 , 14 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -116,6 +118,7 @@ ModalDialog DLG_VECTORIZE MetricField MT_REDUCE { + HelpID = "sd:MetricField:DLG_VECTORIZE:MT_REDUCE"; Border = TRUE ; Pos = MAP_APPFONT ( 92 , 29 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -134,6 +137,7 @@ ModalDialog DLG_VECTORIZE CheckBox CB_FILLHOLES { + HelpID = "sd:CheckBox:DLG_VECTORIZE:CB_FILLHOLES"; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 79 , 12 ) ; TabStop = TRUE ; @@ -149,6 +153,7 @@ ModalDialog DLG_VECTORIZE MetricField MT_FILLHOLES { + HelpID = "sd:MetricField:DLG_VECTORIZE:MT_FILLHOLES"; Border = TRUE ; Pos = MAP_APPFONT ( 92 , 59 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; diff --git a/sd/source/ui/table/TableDesignPane.src b/sd/source/ui/table/TableDesignPane.src index 9ce9470ffa2b..c30bf49f6248 100644 --- a/sd/source/ui/table/TableDesignPane.src +++ b/sd/source/ui/table/TableDesignPane.src @@ -112,6 +112,7 @@ Control DLG_TABLEDESIGNPANE ModalDialog DLG_TABLEDESIGNPANE { + HelpID = "sd:ModalDialog:DLG_TABLEDESIGNPANE"; OutputSize = TRUE; SVLook = TRUE ; Moveable = TRUE ; -- cgit From c4da00e11a043e8ae0a280fec2a1976115ba56de Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 11 Oct 2010 17:56:12 +0200 Subject: CWS changehid: generate former auto hids into src files --- starmath/source/smres.src | 56 +++++++++++++++++ sw/source/ui/chrdlg/ccoll.src | 5 ++ sw/source/ui/chrdlg/chardlg.src | 8 +++ sw/source/ui/chrdlg/drpcps.src | 7 +++ sw/source/ui/chrdlg/numpara.src | 8 +++ sw/source/ui/chrdlg/swbreak.src | 6 ++ sw/source/ui/config/mailconfigpage.src | 22 +++++++ sw/source/ui/config/optcomp.src | 3 + sw/source/ui/config/optdlg.src | 80 ++++++++++++++++++++++++ sw/source/ui/config/optload.src | 18 ++++++ sw/source/ui/config/redlopt.src | 8 +++ sw/source/ui/dbui/addresslistdialog.src | 5 ++ sw/source/ui/dbui/createaddresslistdialog.src | 13 ++++ sw/source/ui/dbui/customizeaddresslistdialog.src | 7 +++ sw/source/ui/dbui/dbinsdlg.src | 21 +++++++ sw/source/ui/dbui/dbui.src | 1 + sw/source/ui/dbui/mailmergechildwindow.src | 1 + sw/source/ui/dbui/mailmergewizard.src | 1 + sw/source/ui/dbui/mmaddressblockpage.src | 23 +++++++ sw/source/ui/dbui/mmdocselectpage.src | 8 +++ sw/source/ui/dbui/mmgreetingspage.src | 6 ++ sw/source/ui/dbui/mmlayoutpage.src | 6 ++ sw/source/ui/dbui/mmmergepage.src | 6 ++ sw/source/ui/dbui/mmoutputpage.src | 27 ++++++++ sw/source/ui/dbui/mmoutputtypepage.src | 2 + sw/source/ui/dbui/mmpreparemergepage.src | 7 +++ sw/source/ui/dbui/selectdbtabledialog.src | 1 + sw/source/ui/dialog/abstract.src | 2 + sw/source/ui/dialog/ascfldlg.src | 6 ++ sw/source/ui/dialog/docstdlg.src | 1 + sw/source/ui/dialog/regionsw.src | 42 +++++++++++++ sw/source/ui/dochdl/selglos.src | 1 + sw/source/ui/envelp/envfmt.src | 9 +++ sw/source/ui/envelp/envlop.src | 7 +++ sw/source/ui/envelp/envprt.src | 5 ++ sw/source/ui/envelp/label.src | 44 +++++++++++++ sw/source/ui/envelp/labfmt.src | 11 ++++ sw/source/ui/envelp/labprt.src | 6 ++ sw/source/ui/envelp/mailmrge.src | 27 ++++++++ sw/source/ui/fldui/DropDownFieldDialog.src | 3 + sw/source/ui/fldui/changedb.src | 2 + sw/source/ui/fldui/flddb.src | 8 +++ sw/source/ui/fldui/flddinf.src | 3 + sw/source/ui/fldui/flddok.src | 8 +++ sw/source/ui/fldui/fldfunc.src | 15 +++++ sw/source/ui/fldui/fldref.src | 5 ++ sw/source/ui/fldui/fldvar.src | 9 +++ sw/source/ui/fldui/inpdlg.src | 3 + sw/source/ui/fldui/javaedit.src | 9 +++ sw/source/ui/frmdlg/column.src | 15 +++++ sw/source/ui/frmdlg/cption.src | 13 ++++ sw/source/ui/frmdlg/frmpage.src | 44 +++++++++++++ sw/source/ui/frmdlg/wrap.src | 14 +++++ sw/source/ui/index/cnttab.src | 72 +++++++++++++++++++++ sw/source/ui/index/idxmrk.src | 1 + sw/source/ui/index/multmrk.src | 1 + sw/source/ui/misc/bookmark.src | 2 + sw/source/ui/misc/docfnote.src | 26 ++++++++ sw/source/ui/misc/glosbib.src | 5 ++ sw/source/ui/misc/glossary.src | 13 ++++ sw/source/ui/misc/insfnote.src | 9 +++ sw/source/ui/misc/linenum.src | 11 ++++ sw/source/ui/misc/num.src | 12 ++++ sw/source/ui/misc/outline.src | 10 +++ sw/source/ui/misc/pgfnote.src | 8 +++ sw/source/ui/misc/pggrid.src | 13 ++++ sw/source/ui/misc/srtdlg.src | 23 +++++++ sw/source/ui/table/chartins.src | 6 ++ sw/source/ui/table/colwd.src | 2 + sw/source/ui/table/convert.src | 12 ++++ sw/source/ui/table/instable.src | 9 +++ sw/source/ui/table/mergetbl.src | 2 + sw/source/ui/table/rowht.src | 2 + sw/source/ui/table/splittbl.src | 4 ++ sw/source/ui/table/tabledlg.src | 40 ++++++++++++ sw/source/ui/table/tautofmt.src | 11 ++++ sw/source/ui/uiview/pview.src | 2 + sw/source/ui/utlui/gloslst.src | 1 + sw/source/ui/utlui/unotools.src | 1 + 79 files changed, 966 insertions(+) mode change 100755 => 100644 starmath/source/smres.src mode change 100755 => 100644 sw/source/ui/config/optdlg.src mode change 100755 => 100644 sw/source/ui/uiview/pview.src diff --git a/starmath/source/smres.src b/starmath/source/smres.src old mode 100755 new mode 100644 index 710081687d6e..e608b1c9108d --- a/starmath/source/smres.src +++ b/starmath/source/smres.src @@ -43,6 +43,7 @@ ModalDialog RID_FONTDIALOG { + HelpID = "starmath:ModalDialog:RID_FONTDIALOG"; Moveable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; @@ -57,6 +58,7 @@ ModalDialog RID_FONTDIALOG }; ComboBox 1 { + HelpID = "starmath:ComboBox:RID_FONTDIALOG:1"; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 111 , 60 ) ; TabStop = TRUE ; @@ -65,6 +67,7 @@ ModalDialog RID_FONTDIALOG }; CheckBox 1 { + HelpID = "starmath:CheckBox:RID_FONTDIALOG:1"; TabStop = TRUE ; Pos = MAP_APPFONT ( 60 , 84 ) ; Size = MAP_APPFONT ( 33 , 10 ) ; @@ -72,6 +75,7 @@ ModalDialog RID_FONTDIALOG }; CheckBox 2 { + HelpID = "starmath:CheckBox:RID_FONTDIALOG:2"; TabStop = TRUE ; Pos = MAP_APPFONT ( 60 , 97 ) ; Size = MAP_APPFONT ( 33 , 10 ) ; @@ -122,6 +126,7 @@ ModalDialog RID_FONTSIZEDIALOG }; MetricField 1 { + HelpID = "starmath:MetricField:RID_FONTSIZEDIALOG:1"; Border = TRUE ; Pos = MAP_APPFONT ( 57 , 6 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -142,6 +147,7 @@ ModalDialog RID_FONTSIZEDIALOG }; MetricField 4 { + HelpID = "starmath:MetricField:RID_FONTSIZEDIALOG:4"; Border = TRUE ; Pos = MAP_APPFONT ( 57 , 36 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -163,6 +169,7 @@ ModalDialog RID_FONTSIZEDIALOG }; MetricField 5 { + HelpID = "starmath:MetricField:RID_FONTSIZEDIALOG:5"; Border = TRUE ; Pos = MAP_APPFONT ( 57 , 51 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -184,6 +191,7 @@ ModalDialog RID_FONTSIZEDIALOG }; MetricField 6 { + HelpID = "starmath:MetricField:RID_FONTSIZEDIALOG:6"; Border = TRUE ; Pos = MAP_APPFONT ( 57 , 66 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -205,6 +213,7 @@ ModalDialog RID_FONTSIZEDIALOG }; MetricField 7 { + HelpID = "starmath:MetricField:RID_FONTSIZEDIALOG:7"; Border = TRUE ; Pos = MAP_APPFONT ( 57 , 81 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -226,6 +235,7 @@ ModalDialog RID_FONTSIZEDIALOG }; MetricField 8 { + HelpID = "starmath:MetricField:RID_FONTSIZEDIALOG:8"; Border = TRUE ; Pos = MAP_APPFONT ( 57 , 96 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -259,6 +269,7 @@ ModalDialog RID_FONTSIZEDIALOG }; PushButton 1 { + HelpID = "starmath:PushButton:RID_FONTSIZEDIALOG:1"; TabStop = TRUE ; Pos = MAP_APPFONT ( 114 , 45 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -295,6 +306,7 @@ ModalDialog RID_FONTTYPEDIALOG }; ListBox 1 { + HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:1"; Border = TRUE ; Pos = MAP_APPFONT ( 54 , 18 ) ; Size = MAP_APPFONT ( 150 , 69 ) ; @@ -310,6 +322,7 @@ ModalDialog RID_FONTTYPEDIALOG }; ListBox 2 { + HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:2"; Border = TRUE ; Pos = MAP_APPFONT ( 54 , 33 ) ; Size = MAP_APPFONT ( 150 , 69 ) ; @@ -325,6 +338,7 @@ ModalDialog RID_FONTTYPEDIALOG }; ListBox 3 { + HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:3"; Border = TRUE ; Pos = MAP_APPFONT ( 54 , 48 ) ; Size = MAP_APPFONT ( 150 , 69 ) ; @@ -340,6 +354,7 @@ ModalDialog RID_FONTTYPEDIALOG }; ListBox 4 { + HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:4"; Border = TRUE ; Pos = MAP_APPFONT ( 54 , 63 ) ; Size = MAP_APPFONT ( 150 , 69 ) ; @@ -355,6 +370,7 @@ ModalDialog RID_FONTTYPEDIALOG }; ListBox 5 { + HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:5"; Border = TRUE ; Pos = MAP_APPFONT ( 54 , 96 ) ; Size = MAP_APPFONT ( 150 , 69 ) ; @@ -370,6 +386,7 @@ ModalDialog RID_FONTTYPEDIALOG }; ListBox 6 { + HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:6"; Border = TRUE ; Pos = MAP_APPFONT ( 54 , 111 ) ; Size = MAP_APPFONT ( 150 , 69 ) ; @@ -385,6 +402,7 @@ ModalDialog RID_FONTTYPEDIALOG }; ListBox 7 { + HelpID = "starmath:ListBox:RID_FONTTYPEDIALOG:7"; Border = TRUE ; Pos = MAP_APPFONT ( 54 , 126 ) ; Size = MAP_APPFONT ( 150 , 69 ) ; @@ -406,6 +424,7 @@ ModalDialog RID_FONTTYPEDIALOG }; MenuButton 1 { + HelpID = "starmath:MenuButton:RID_FONTTYPEDIALOG:1"; TabStop = TRUE ; ButtonMenu = Menu , RID_FONTMENU ; Pos = MAP_APPFONT ( 225 , 48 ) ; @@ -414,6 +433,7 @@ ModalDialog RID_FONTTYPEDIALOG }; PushButton 2 { + HelpID = "starmath:PushButton:RID_FONTTYPEDIALOG:2"; TabStop = TRUE ; Pos = MAP_APPFONT ( 225 , 66 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -437,6 +457,7 @@ ModalDialog RID_DISTANCEDIALOG }; MetricField 1 { + HelpID = "starmath:MetricField:RID_DISTANCEDIALOG:1"; Border = TRUE ; TabStop = TRUE ; Left = TRUE ; @@ -457,6 +478,7 @@ ModalDialog RID_DISTANCEDIALOG }; MetricField 2 { + HelpID = "starmath:MetricField:RID_DISTANCEDIALOG:2"; Border = TRUE ; TabStop = TRUE ; Left = TRUE ; @@ -469,6 +491,7 @@ ModalDialog RID_DISTANCEDIALOG }; CheckBox 1 { + HelpID = "starmath:CheckBox:RID_DISTANCEDIALOG:1"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 55 ) ; Size = MAP_APPFONT ( 110 , 12 ) ; @@ -484,6 +507,7 @@ ModalDialog RID_DISTANCEDIALOG }; MetricField 3 { + HelpID = "starmath:MetricField:RID_DISTANCEDIALOG:3"; Border = TRUE ; TabStop = TRUE ; Left = TRUE ; @@ -504,6 +528,7 @@ ModalDialog RID_DISTANCEDIALOG }; MetricField 4 { + HelpID = "starmath:MetricField:RID_DISTANCEDIALOG:4"; Border = TRUE ; TabStop = TRUE ; Left = TRUE ; @@ -529,6 +554,7 @@ ModalDialog RID_DISTANCEDIALOG }; PushButton 1 { + HelpID = "starmath:PushButton:RID_DISTANCEDIALOG:1"; TabStop = TRUE ; Pos = MAP_APPFONT ( 184 , 69 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -536,6 +562,7 @@ ModalDialog RID_DISTANCEDIALOG }; MenuButton 1 { + HelpID = "starmath:MenuButton:RID_DISTANCEDIALOG:1"; TabStop = TRUE ; ButtonMenu = Menu , RID_DISTANCEMENU ; Pos = MAP_APPFONT ( 184 , 51 ) ; @@ -925,6 +952,7 @@ ModalDialog RID_ALIGNDIALOG Text [ en-US ] = "Alignment" ; RadioButton 1 { + HelpID = "starmath:RadioButton:RID_ALIGNDIALOG:1"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 17 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; @@ -932,6 +960,7 @@ ModalDialog RID_ALIGNDIALOG }; RadioButton 2 { + HelpID = "starmath:RadioButton:RID_ALIGNDIALOG:2"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 31 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; @@ -939,6 +968,7 @@ ModalDialog RID_ALIGNDIALOG }; RadioButton 3 { + HelpID = "starmath:RadioButton:RID_ALIGNDIALOG:3"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; @@ -965,6 +995,7 @@ ModalDialog RID_ALIGNDIALOG }; PushButton 1 { + HelpID = "starmath:PushButton:RID_ALIGNDIALOG:1"; TabStop = TRUE ; Pos = MAP_APPFONT ( 83 , 46 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -974,6 +1005,7 @@ ModalDialog RID_ALIGNDIALOG TabPage RID_PRINTOPTIONPAGE { + HelpID = "starmath:TabPage:RID_PRINTOPTIONPAGE"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; @@ -986,6 +1018,7 @@ TabPage RID_PRINTOPTIONPAGE }; CheckBox CB_TITLEROW { + HelpID = "starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_TITLEROW"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; @@ -993,6 +1026,7 @@ TabPage RID_PRINTOPTIONPAGE }; CheckBox CB_EQUATION_TEXT { + HelpID = "starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_EQUATION_TEXT"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; @@ -1000,6 +1034,7 @@ TabPage RID_PRINTOPTIONPAGE }; CheckBox CB_FRAME { + HelpID = "starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_FRAME"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; @@ -1013,6 +1048,7 @@ TabPage RID_PRINTOPTIONPAGE }; RadioButton RB_ORIGINAL_SIZE { + HelpID = "starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_ORIGINAL_SIZE"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 69 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; @@ -1020,6 +1056,7 @@ TabPage RID_PRINTOPTIONPAGE }; RadioButton RB_FIT_TO_PAGE { + HelpID = "starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_FIT_TO_PAGE"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 83 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; @@ -1027,6 +1064,7 @@ TabPage RID_PRINTOPTIONPAGE }; RadioButton RB_ZOOM { + HelpID = "starmath:RadioButton:RID_PRINTOPTIONPAGE:RB_ZOOM"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "~Scaling" ; @@ -1034,6 +1072,7 @@ TabPage RID_PRINTOPTIONPAGE }; MetricField MF_ZOOM { + HelpID = "starmath:MetricField:RID_PRINTOPTIONPAGE:MF_ZOOM"; Border = TRUE ; Pos = MAP_APPFONT ( 18 , 111 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -1054,6 +1093,7 @@ TabPage RID_PRINTOPTIONPAGE }; CheckBox CB_IGNORE_SPACING { + HelpID = "starmath:CheckBox:RID_PRINTOPTIONPAGE:CB_IGNORE_SPACING"; TabStop = TRUE ; Pos = MAP_APPFONT ( 12 , 140 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; @@ -1063,6 +1103,7 @@ TabPage RID_PRINTOPTIONPAGE ModalDialog RID_SYMBOLDIALOG { + HelpID = "starmath:ModalDialog:RID_SYMBOLDIALOG"; OutputSize = TRUE ; SVLook = TRUE ; Closeable = TRUE; // Close Button in Window Leiste explizit einbauen @@ -1078,6 +1119,7 @@ ModalDialog RID_SYMBOLDIALOG }; ListBox 1 { + HelpID = "starmath:ListBox:RID_SYMBOLDIALOG:1"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 92, 57 ) ; @@ -1109,6 +1151,7 @@ ModalDialog RID_SYMBOLDIALOG }; PushButton 2 { + HelpID = "starmath:PushButton:RID_SYMBOLDIALOG:2"; TabStop = TRUE ; Pos = MAP_APPFONT ( 177 , 6 ) ; Size = MAP_APPFONT ( 56 , 14 ) ; @@ -1117,6 +1160,7 @@ ModalDialog RID_SYMBOLDIALOG }; PushButton 3 { + HelpID = "starmath:PushButton:RID_SYMBOLDIALOG:3"; Pos = MAP_APPFONT ( 177 , 24 ) ; Size = MAP_APPFONT ( 56 , 14 ) ; TabStop = TRUE ; @@ -1124,6 +1168,7 @@ ModalDialog RID_SYMBOLDIALOG }; PushButton 1 { + HelpID = "starmath:PushButton:RID_SYMBOLDIALOG:1"; TabStop = TRUE ; Pos = MAP_APPFONT ( 177 , 42 ) ; Size = MAP_APPFONT ( 56 , 14 ) ; @@ -1133,6 +1178,7 @@ ModalDialog RID_SYMBOLDIALOG ModalDialog RID_SYMDEFINEDIALOG { + HelpID = "starmath:ModalDialog:RID_SYMDEFINEDIALOG"; Moveable = TRUE ; OutputSize = TRUE ; SVLook = TRUE ; @@ -1147,6 +1193,7 @@ ModalDialog RID_SYMDEFINEDIALOG }; ComboBox 1 { + HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:1"; Pos = MAP_APPFONT ( 59 , 6 ) ; Size = MAP_APPFONT ( 80 , 100 ) ; TabStop = TRUE ; @@ -1162,6 +1209,7 @@ ModalDialog RID_SYMDEFINEDIALOG }; ComboBox 2 { + HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:2"; Pos = MAP_APPFONT ( 210 , 6 ) ; Size = MAP_APPFONT ( 80 , 100 ) ; TabStop = TRUE ; @@ -1186,6 +1234,7 @@ ModalDialog RID_SYMDEFINEDIALOG }; ComboBox 4 { + HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:4"; Pos = MAP_APPFONT ( 80 , 115 ) ; Size = MAP_APPFONT ( 100 , 100 ) ; TabStop = TRUE ; @@ -1201,6 +1250,7 @@ ModalDialog RID_SYMDEFINEDIALOG }; ComboBox 5 { + HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:5"; Pos = MAP_APPFONT ( 80 , 130 ) ; Size = MAP_APPFONT ( 100 , 100 ) ; TabStop = TRUE ; @@ -1216,6 +1266,7 @@ ModalDialog RID_SYMDEFINEDIALOG }; ListBox 1 { + HelpID = "starmath:ListBox:RID_SYMDEFINEDIALOG:1"; Border = TRUE ; Pos = MAP_APPFONT ( 80 , 145 ) ; Size = MAP_APPFONT ( 100 , 100 ) ; @@ -1232,6 +1283,7 @@ ModalDialog RID_SYMDEFINEDIALOG }; ListBox LB_FONTS_SUBSET { + HelpID = "starmath:ListBox:RID_SYMDEFINEDIALOG:LB_FONTS_SUBSET"; Border = TRUE ; Pos = MAP_APPFONT ( 80 , 160 ) ; Size = MAP_APPFONT ( 100 , 100 ) ; @@ -1248,6 +1300,7 @@ ModalDialog RID_SYMDEFINEDIALOG }; ComboBox 3 { + HelpID = "starmath:ComboBox:RID_SYMDEFINEDIALOG:3"; Border = TRUE; Pos = MAP_APPFONT ( 80 , 175 ) ; Size = MAP_APPFONT ( 100 , 100 ) ; @@ -1314,6 +1367,7 @@ ModalDialog RID_SYMDEFINEDIALOG }; PushButton 1 { + HelpID = "starmath:PushButton:RID_SYMDEFINEDIALOG:1"; TabStop = TRUE ; Pos = MAP_APPFONT ( 305 , 195 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -1321,6 +1375,7 @@ ModalDialog RID_SYMDEFINEDIALOG }; PushButton 2 { + HelpID = "starmath:PushButton:RID_SYMDEFINEDIALOG:2"; TabStop = TRUE ; Pos = MAP_APPFONT ( 245 , 195 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -1328,6 +1383,7 @@ ModalDialog RID_SYMDEFINEDIALOG }; PushButton 3 { + HelpID = "starmath:PushButton:RID_SYMDEFINEDIALOG:3"; TabStop = TRUE ; Pos = MAP_APPFONT ( 185 , 195 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; diff --git a/sw/source/ui/chrdlg/ccoll.src b/sw/source/ui/chrdlg/ccoll.src index eab997761d8d..da20e56d0afd 100644 --- a/sw/source/ui/chrdlg/ccoll.src +++ b/sw/source/ui/chrdlg/ccoll.src @@ -45,6 +45,7 @@ TabPage TP_CONDCOLL }; CheckBox CB_CONDITION { + HelpID = "sw:CheckBox:TP_CONDCOLL:CB_CONDITION"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -84,6 +85,7 @@ TabPage TP_CONDCOLL }; ListBox LB_STYLE { + HelpID = "sw:ListBox:TP_CONDCOLL:LB_STYLE"; Pos = MAP_APPFONT ( 188 , 39 ) ; Size = MAP_APPFONT ( 60 , 108 ) ; TabStop = TRUE ; @@ -94,6 +96,7 @@ TabPage TP_CONDCOLL }; ListBox LB_FILTER { + HelpID = "sw:ListBox:TP_CONDCOLL:LB_FILTER"; Pos = MAP_APPFONT ( 188 , 150 ) ; Size = MAP_APPFONT ( 60 , 50 ) ; DropDown = TRUE ; @@ -104,6 +107,7 @@ TabPage TP_CONDCOLL }; PushButton PB_REMOVE { + HelpID = "sw:PushButton:TP_CONDCOLL:PB_REMOVE"; Pos = MAP_APPFONT ( 129 , 165 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; TabStop = TRUE ; @@ -112,6 +116,7 @@ TabPage TP_CONDCOLL }; PushButton PB_ASSIGN { + HelpID = "sw:PushButton:TP_CONDCOLL:PB_ASSIGN"; Pos = MAP_APPFONT ( 185 , 165 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/chrdlg/chardlg.src b/sw/source/ui/chrdlg/chardlg.src index 8340b4f60669..2117a9024a2a 100644 --- a/sw/source/ui/chrdlg/chardlg.src +++ b/sw/source/ui/chrdlg/chardlg.src @@ -120,6 +120,7 @@ TabPage TP_CHAR_URL }; Edit ED_URL { + HelpID = "sw:Edit:TP_CHAR_URL:ED_URL"; Pos = MAP_APPFONT ( 88 , 15 ) ; Size = MAP_APPFONT ( 104 , 12 ) ; Border = TRUE ; @@ -127,6 +128,7 @@ TabPage TP_CHAR_URL }; PushButton PB_URL { + HelpID = "sw:PushButton:TP_CHAR_URL:PB_URL"; Pos = MAP_APPFONT ( 198 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -140,6 +142,7 @@ TabPage TP_CHAR_URL }; Edit ED_TEXT { + HelpID = "sw:Edit:TP_CHAR_URL:ED_TEXT"; Pos = MAP_APPFONT ( 88 , 31 ) ; Size = MAP_APPFONT ( 104 , 12 ) ; Border = TRUE ; @@ -154,6 +157,7 @@ TabPage TP_CHAR_URL }; Edit ED_NAME { + HelpID = "sw:Edit:TP_CHAR_URL:ED_NAME"; Pos = MAP_APPFONT ( 88 , 47 ) ; Size = MAP_APPFONT ( 104 , 12 ) ; Border = TRUE ; @@ -168,6 +172,7 @@ TabPage TP_CHAR_URL }; ComboBox LB_TARGET { + HelpID = "sw:ComboBox:TP_CHAR_URL:LB_TARGET"; Pos = MAP_APPFONT ( 88 , 63 ) ; Size = MAP_APPFONT ( 104 , 60 ) ; TabStop = TRUE ; @@ -177,6 +182,7 @@ TabPage TP_CHAR_URL }; PushButton PB_EVENT { + HelpID = "sw:PushButton:TP_CHAR_URL:PB_EVENT"; Pos = MAP_APPFONT ( 12 , 79 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -196,6 +202,7 @@ TabPage TP_CHAR_URL }; ListBox LB_VISITED { + HelpID = "sw:ListBox:TP_CHAR_URL:LB_VISITED"; Pos = MAP_APPFONT ( 88 , 113 ) ; Size = MAP_APPFONT ( 104 , 60 ) ; Border = TRUE ; @@ -212,6 +219,7 @@ TabPage TP_CHAR_URL }; ListBox LB_NOT_VISITED { + HelpID = "sw:ListBox:TP_CHAR_URL:LB_NOT_VISITED"; Pos = MAP_APPFONT ( 88 , 129 ) ; Size = MAP_APPFONT ( 104 , 60 ) ; Border = TRUE ; diff --git a/sw/source/ui/chrdlg/drpcps.src b/sw/source/ui/chrdlg/drpcps.src index af8a0d920375..458d83a5d079 100644 --- a/sw/source/ui/chrdlg/drpcps.src +++ b/sw/source/ui/chrdlg/drpcps.src @@ -59,12 +59,14 @@ TabPage TP_DROPCAPS Hide = TRUE ; CheckBox CB_SWITCH { + HelpID = "sw:CheckBox:TP_DROPCAPS:CB_SWITCH"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Display drop caps" ; }; CheckBox CB_WORD { + HelpID = "sw:CheckBox:TP_DROPCAPS:CB_WORD"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "~Whole word" ; @@ -77,6 +79,7 @@ TabPage TP_DROPCAPS }; NumericField FLD_DROPCAPS { + HelpID = "sw:NumericField:TP_DROPCAPS:FLD_DROPCAPS"; Border = TRUE ; First = 1 ; Last = 9 ; @@ -98,6 +101,7 @@ TabPage TP_DROPCAPS }; NumericField FLD_LINES { + HelpID = "sw:NumericField:TP_DROPCAPS:FLD_LINES"; Border = TRUE ; First = 2 ; Last = 9 ; @@ -119,6 +123,7 @@ TabPage TP_DROPCAPS }; MetricField FLD_DISTANCE { + HelpID = "sw:MetricField:TP_DROPCAPS:FLD_DISTANCE"; Border = TRUE ; DecimalDigits = 2 ; First = 0 ; @@ -155,6 +160,7 @@ TabPage TP_DROPCAPS }; Edit EDT_TEXT { + HelpID = "sw:Edit:TP_DROPCAPS:EDT_TEXT"; Border = TRUE ; Left = TRUE ; Pos = MAP_APPFONT ( 143 , 100 ) ; @@ -171,6 +177,7 @@ TabPage TP_DROPCAPS }; ListBox BOX_TEMPLATE { + HelpID = "sw:ListBox:TP_DROPCAPS:BOX_TEMPLATE"; Border = TRUE ; DropDown = TRUE ; Pos = MAP_APPFONT ( 143 , 116 ) ; diff --git a/sw/source/ui/chrdlg/numpara.src b/sw/source/ui/chrdlg/numpara.src index 2c384d5dc7a8..a0747655ee03 100644 --- a/sw/source/ui/chrdlg/numpara.src +++ b/sw/source/ui/chrdlg/numpara.src @@ -51,6 +51,7 @@ TabPage TP_NUMPARA }; ListBox LB_OUTLINE_LEVEL { + HelpID = "sw:ListBox:TP_NUMPARA:LB_OUTLINE_LEVEL"; Pos = MAP_APPFONT ( 130 , 14 ) ; Size = MAP_APPFONT ( 118 , 65 ) ; DropDown = TRUE ; @@ -98,6 +99,7 @@ TabPage TP_NUMPARA }; ListBox LB_NUMBER_STYLE { + HelpID = "sw:ListBox:TP_NUMPARA:LB_NUMBER_STYLE"; Pos = MAP_APPFONT ( 130 , 41 ) ; Size = MAP_APPFONT ( 118 , 65 ) ; DropDown = TRUE ; @@ -109,6 +111,7 @@ TabPage TP_NUMPARA }; TriStateBox CB_NEW_START { + HelpID = "sw:TriStateBox:TP_NUMPARA:CB_NEW_START"; Pos = MAP_APPFONT ( 12 , 58 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; Hide = TRUE ; @@ -117,6 +120,7 @@ TabPage TP_NUMPARA }; TriStateBox CB_NUMBER_NEW_START { + HelpID = "sw:TriStateBox:TP_NUMPARA:CB_NUMBER_NEW_START"; Pos = MAP_APPFONT ( 21 , 73 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; Hide = TRUE ; @@ -125,6 +129,7 @@ TabPage TP_NUMPARA }; NumericField NF_NEW_START { + HelpID = "sw:NumericField:TP_NUMPARA:NF_NEW_START"; Border = TRUE ; Pos = MAP_APPFONT ( 130 , 72 ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -148,6 +153,7 @@ TabPage TP_NUMPARA }; TriStateBox CB_COUNT_PARA { + HelpID = "sw:TriStateBox:TP_NUMPARA:CB_COUNT_PARA"; Pos = MAP_APPFONT ( 12 , 100 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; TabStop = TRUE ; @@ -155,6 +161,7 @@ TabPage TP_NUMPARA }; TriStateBox CB_RESTART_PARACOUNT { + HelpID = "sw:TriStateBox:TP_NUMPARA:CB_RESTART_PARACOUNT"; Pos = MAP_APPFONT ( 12 , 116 ) ; Size = MAP_APPFONT ( 160 , 10 ) ; TabStop = TRUE ; @@ -169,6 +176,7 @@ TabPage TP_NUMPARA }; NumericField NF_RESTART_PARA { + HelpID = "sw:NumericField:TP_NUMPARA:NF_RESTART_PARA"; Border = TRUE ; Pos = MAP_APPFONT ( 130 , 130 ) ; Size = MAP_APPFONT ( 26 , 12 ) ; diff --git a/sw/source/ui/chrdlg/swbreak.src b/sw/source/ui/chrdlg/swbreak.src index 7e71101c63cf..2646ed141fec 100644 --- a/sw/source/ui/chrdlg/swbreak.src +++ b/sw/source/ui/chrdlg/swbreak.src @@ -63,6 +63,7 @@ ModalDialog DLG_BREAK }; RadioButton RB_LINE { + HelpID = "sw:RadioButton:DLG_BREAK:RB_LINE"; Pos = MAP_APPFONT ( 12 , 15 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; Text [ en-US ] = "~Line break" ; @@ -71,6 +72,7 @@ ModalDialog DLG_BREAK }; RadioButton RB_PAGE { + HelpID = "sw:RadioButton:DLG_BREAK:RB_PAGE"; Pos = MAP_APPFONT ( 12 , 39 ) ; Size = MAP_APPFONT ( 63 , 10 ) ; Text [ en-US ] = "~Page break" ; @@ -79,6 +81,7 @@ ModalDialog DLG_BREAK }; RadioButton RB_COL { + HelpID = "sw:RadioButton:DLG_BREAK:RB_COL"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; Text [ en-US ] = "~Column break" ; @@ -100,6 +103,7 @@ ModalDialog DLG_BREAK }; ListBox LB_COLL { + HelpID = "sw:ListBox:DLG_BREAK:LB_COLL"; Pos = MAP_APPFONT ( 12 , 62 ) ; Size = MAP_APPFONT ( 75 , 50 ) ; TabStop = TRUE ; @@ -112,6 +116,7 @@ ModalDialog DLG_BREAK }; CheckBox CB_PAGENUM { + HelpID = "sw:CheckBox:DLG_BREAK:CB_PAGENUM"; Pos = MAP_APPFONT ( 12 , 79 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? Seitennummer ~ändern : Seitennummer ~õndern */ @@ -120,6 +125,7 @@ ModalDialog DLG_BREAK }; NumericField ED_PAGENUM { + HelpID = "sw:NumericField:DLG_BREAK:ED_PAGENUM"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 94 ) ; Size = MAP_APPFONT ( 31 , 12 ) ; diff --git a/sw/source/ui/config/mailconfigpage.src b/sw/source/ui/config/mailconfigpage.src index 1ad1378222c0..726754fa694e 100644 --- a/sw/source/ui/config/mailconfigpage.src +++ b/sw/source/ui/config/mailconfigpage.src @@ -53,6 +53,7 @@ TabPage TP_MAILCONFIG }; Edit ED_DISPLAYNAME { + HelpID = "sw:Edit:TP_MAILCONFIG:ED_DISPLAYNAME"; Pos = MAP_APPFONT ( 88 , 14 ) ; Size = MAP_APPFONT ( 160 , 12 ) ; Border = TRUE; @@ -65,12 +66,14 @@ TabPage TP_MAILCONFIG }; Edit ED_ADDRESS { + HelpID = "sw:Edit:TP_MAILCONFIG:ED_ADDRESS"; Pos = MAP_APPFONT ( 88 , 29 ) ; Size = MAP_APPFONT ( 160 , 12 ) ; Border = TRUE; }; CheckBox CB_REPLYTO { + HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_REPLYTO"; Pos = MAP_APPFONT ( 12 , 45 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text[ en-US ] = "Send replies to ~different e-mail address"; @@ -83,6 +86,7 @@ TabPage TP_MAILCONFIG }; Edit ED_REPLYTO { + HelpID = "sw:Edit:TP_MAILCONFIG:ED_REPLYTO"; Pos = MAP_APPFONT ( 88 , 58 ) ; Size = MAP_APPFONT ( 160 , 12 ) ; Border = TRUE; @@ -101,6 +105,7 @@ TabPage TP_MAILCONFIG }; Edit ED_SERVER { + HelpID = "sw:Edit:TP_MAILCONFIG:ED_SERVER"; Pos = MAP_APPFONT ( 88 , 87 ) ; Size = MAP_APPFONT ( 105 , 12 ) ; Border = TRUE; @@ -114,6 +119,7 @@ TabPage TP_MAILCONFIG }; NumericField NF_PORT { + HelpID = "sw:NumericField:TP_MAILCONFIG:NF_PORT"; Pos = MAP_APPFONT ( 223 , 87 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; Border = TRUE; @@ -127,12 +133,14 @@ TabPage TP_MAILCONFIG }; CheckBox CB_SECURE { + HelpID = "sw:CheckBox:TP_MAILCONFIG:CB_SECURE"; Pos = MAP_APPFONT ( 12 , 104 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text[ en-US ] = "~Use secure connection (SSL)"; }; PushButton PB_AUTHENTICATION { + HelpID = "sw:PushButton:TP_MAILCONFIG:PB_AUTHENTICATION"; Pos = MAP_APPFONT ( 88 , 118 ) ; Size = MAP_APPFONT ( 105 , 14 ) ; Text[ en-US ] = "Server Au~thentication"; @@ -144,6 +152,7 @@ TabPage TP_MAILCONFIG }; PushButton PB_TEST { + HelpID = "sw:PushButton:TP_MAILCONFIG:PB_TEST"; Pos = MAP_APPFONT ( 88 , 164 ) ; Size = MAP_APPFONT ( 105 , 14 ) ; Text[ en-US ] = "Test S~ettings..."; @@ -179,6 +188,7 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS }; MultiLineEdit ED_ERROR { + HelpID = "sw:MultiLineEdit:DLG_MM_TESTACCOUNTSETTINGS:ED_ERROR"; Pos = MAP_APPFONT ( 6 , 79 ) ; Size = MAP_APPFONT ( 238 , 60 ) ; Border = TRUE; @@ -191,6 +201,7 @@ ModalDialog DLG_MM_TESTACCOUNTSETTINGS }; PushButton PB_STOP { + HelpID = "sw:PushButton:DLG_MM_TESTACCOUNTSETTINGS:PB_STOP"; Pos = MAP_APPFONT ( 85 , 156 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "~Stop"; @@ -268,12 +279,14 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION CheckBox CB_AUTHENTICATION { + HelpID = "sw:CheckBox:DLG_MM_SERVERAUTHENTICATION:CB_AUTHENTICATION"; Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 238 , 10 ) ; Text[ en-US ] = "The outgoing mail server (SMTP) requires au~thentication"; }; RadioButton RB_SEP_AUTHENTICATION { + HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SEP_AUTHENTICATION"; Pos = MAP_APPFONT ( 12 , 17 ) ; Size = MAP_APPFONT ( 232 , 10 ) ; Text[ en-US ] = "The outgoing mail server (SMTP) requires ~separate authentication"; @@ -292,6 +305,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION }; Edit ED_USERNAME { + HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_USERNAME"; Pos = MAP_APPFONT ( 78 , 42 ) ; Size = MAP_APPFONT ( 115 , 12 ) ; Border = TRUE; @@ -304,6 +318,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION }; Edit ED_OUTPASSWORD { + HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_OUTPASSWORD"; Pos = MAP_APPFONT ( 78 , 57 ) ; Size = MAP_APPFONT ( 115 , 12 ) ; Border = TRUE; @@ -311,6 +326,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION }; RadioButton RB_SMPTAFTERPOP { + HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_SMPTAFTERPOP"; Pos = MAP_APPFONT ( 12 , 73 ) ; Size = MAP_APPFONT ( 232 , 20 ) ; WordBreak = TRUE; @@ -330,6 +346,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION }; Edit ED_SERVER { + HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_SERVER"; Pos = MAP_APPFONT ( 78 , 108 ) ; Size = MAP_APPFONT ( 115 , 12 ) ; Border = TRUE; @@ -343,6 +360,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION }; NumericField NF_PORT { + HelpID = "sw:NumericField:DLG_MM_SERVERAUTHENTICATION:NF_PORT"; Pos = MAP_APPFONT ( 219 , 108 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; Border = TRUE; @@ -362,12 +380,14 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION }; RadioButton RB_POP3 { + HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_POP3"; Pos = MAP_APPFONT ( 78 , 125 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; Text[ en-US ] = "~POP 3"; }; RadioButton RB_IMAP { + HelpID = "sw:RadioButton:DLG_MM_SERVERAUTHENTICATION:RB_IMAP"; Pos = MAP_APPFONT ( 78 , 138 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; Text[ en-US ] = "~IMAP"; @@ -380,6 +400,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION }; Edit ED_INUSERNAME { + HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INUSERNAME"; Pos = MAP_APPFONT ( 78 , 150 ) ; Size = MAP_APPFONT ( 115 , 12 ) ; Border = TRUE; @@ -392,6 +413,7 @@ ModalDialog DLG_MM_SERVERAUTHENTICATION }; Edit ED_INPASSWORD { + HelpID = "sw:Edit:DLG_MM_SERVERAUTHENTICATION:ED_INPASSWORD"; Pos = MAP_APPFONT ( 78 , 165 ) ; Size = MAP_APPFONT ( 115 , 12 ) ; Border = TRUE; diff --git a/sw/source/ui/config/optcomp.src b/sw/source/ui/config/optcomp.src index 927eadc183a1..bdaa609b26b0 100644 --- a/sw/source/ui/config/optcomp.src +++ b/sw/source/ui/config/optcomp.src @@ -50,6 +50,7 @@ TabPage TP_OPTCOMPATIBILITY_PAGE }; ListBox LB_FORMATTING { + HelpID = "sw:ListBox:TP_OPTCOMPATIBILITY_PAGE:LB_FORMATTING"; Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 118 , 24 ) ; DropDown = TRUE; @@ -70,12 +71,14 @@ TabPage TP_OPTCOMPATIBILITY_PAGE }; PushButton PB_RESET { + HelpID = "sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_RESET"; Pos = MAP_APPFONT ( 125 , 165 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Reset"; }; PushButton PB_DEFAULT { + HelpID = "sw:PushButton:TP_OPTCOMPATIBILITY_PAGE:PB_DEFAULT"; Pos = MAP_APPFONT ( 188 , 165 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Use as ~Default"; diff --git a/sw/source/ui/config/optdlg.src b/sw/source/ui/config/optdlg.src old mode 100755 new mode 100644 index 97f903557bda..b54cd0d16b4e --- a/sw/source/ui/config/optdlg.src +++ b/sw/source/ui/config/optdlg.src @@ -56,18 +56,21 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_CROSS { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_CROSS"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "Guides ~while moving"; }; CheckBox CB_HANDLE { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_HANDLE"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "Sim~ple handles"; }; CheckBox CB_BIGHANDLE { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_BIGHANDLE"; Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "Large handles"; @@ -81,54 +84,63 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_HSCROLL { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_HSCROLL"; Pos = MAP_APPFONT ( 136 , 14 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "H~orizontal scrollbar" ; }; CheckBox CB_VSCROLL { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_VSCROLL"; Pos = MAP_APPFONT ( 136 , 27 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "~Vertical scrollbar" ; }; CheckBox CB_ANY_RULER { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_ANY_RULER"; Pos = MAP_APPFONT ( 136 , 40 ) ; Size = MAP_APPFONT ( 65 , 10 ) ; Text [ en-US ] = "R~uler" ; }; CheckBox CB_HRULER { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_HRULER"; Pos = MAP_APPFONT ( 142 , 53 ) ; Size = MAP_APPFONT ( 62 , 10 ) ; Text [ en-US ] = "Hori~zontal ruler" ; }; ListBox LB_HMETRIC { + HelpID = "sw:ListBox:TP_CONTENT_OPT:LB_HMETRIC"; Pos = MAP_APPFONT ( 206 , 51 ) ; Size = MAP_APPFONT ( 45 , 60 ) ; DropDown = TRUE; }; CheckBox CB_VRULER { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_VRULER"; Pos = MAP_APPFONT ( 142 , 66 ) ; Size = MAP_APPFONT ( 62 , 10 ) ; Text [ en-US ] = "Verti~cal ruler" ; }; CheckBox CB_VRULER_RIGHT { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_VRULER_RIGHT"; Pos = MAP_APPFONT ( 148 , 79 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Right-aligned"; }; ListBox LB_VMETRIC { + HelpID = "sw:ListBox:TP_CONTENT_OPT:LB_VMETRIC"; Pos = MAP_APPFONT ( 206 , 64 ) ; Size = MAP_APPFONT ( 45 , 60 ) ; DropDown = TRUE; }; CheckBox CB_SMOOTH_SCROLL { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_SMOOTH_SCROLL"; Pos = MAP_APPFONT ( 136 , 79 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "S~mooth scroll" ; @@ -142,6 +154,7 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_GRF { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_GRF"; Pos = MAP_APPFONT ( 12 , 67 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "~Graphics and objects" ; @@ -150,24 +163,28 @@ TabPage TP_CONTENT_OPT }; CheckBox CB_TBL { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_TBL"; Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "~Tables " ; }; CheckBox CB_DRWFAST { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_DRWFAST"; Pos = MAP_APPFONT ( 12 , 93 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "Dra~wings and controls" ; }; CheckBox CB_FIELD { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_FIELD"; Pos = MAP_APPFONT ( 12 , 106 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "~Field codes" ; }; CheckBox CB_POSTIT { + HelpID = "sw:CheckBox:TP_CONTENT_OPT:CB_POSTIT"; Pos = MAP_APPFONT ( 12 , 119 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "~Comments" ; @@ -188,6 +205,7 @@ TabPage TP_CONTENT_OPT }; ListBox LB_METRIC { + HelpID = "sw:ListBox:TP_CONTENT_OPT:LB_METRIC"; Pos = MAP_APPFONT ( 199, 133 ) ; Size = MAP_APPFONT ( 50 , 50 ) ; Border = TRUE ; @@ -214,6 +232,7 @@ TabPage TP_OPTPRINT_PAGE }; CheckBox CB_PGRF /*functionally merged with CB_PDRAW*/ { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PGRF"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "~Pictures and objects" ; @@ -224,6 +243,7 @@ TabPage TP_OPTPRINT_PAGE removed, tables now always get printed CheckBox CB_PTAB { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PTAB"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "~Tables" ; @@ -233,6 +253,7 @@ TabPage TP_OPTPRINT_PAGE functionally merged with CB_PGRF (pictures and graphics) CheckBox CB_PDRAW { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PDRAW"; Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Dra~wings" ; @@ -240,30 +261,35 @@ TabPage TP_OPTPRINT_PAGE */ CheckBox CB_CTRLFLD { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_CTRLFLD"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Form control~s" ; }; CheckBox CB_BACKGROUND { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_BACKGROUND"; Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Page ba~ckground" ; }; CheckBox CB_BLACK_FONT { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_BLACK_FONT"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Print text in blac~k" ; }; CheckBox CB_HIDDEN_TEXT { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_HIDDEN_TEXT"; Pos = MAP_APPFONT ( 12 , 66 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Hidden te~xt" ; }; CheckBox CB_TEXT_PLACEHOLDER { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_TEXT_PLACEHOLDER"; Pos = MAP_APPFONT ( 12 , 79 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Text ~placeholder" ; @@ -283,6 +309,7 @@ TabPage TP_OPTPRINT_PAGE }; CheckBox CB_LEFTP { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_LEFTP"; Pos = MAP_APPFONT ( 96 , 14 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "~Left pages" ; @@ -291,6 +318,7 @@ TabPage TP_OPTPRINT_PAGE }; CheckBox CB_RIGHTP { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_RIGHTP"; Pos = MAP_APPFONT ( 96 , 27 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "~Right pages" ; @@ -299,6 +327,7 @@ TabPage TP_OPTPRINT_PAGE removed, noe handled by the new print dialog (i.e. vcl) itself CheckBox CB_REVERSE { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_REVERSE"; Pos = MAP_APPFONT ( 96 , 40 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Re~versed" ; @@ -306,12 +335,14 @@ TabPage TP_OPTPRINT_PAGE */ CheckBox CB_PROSPECT { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT"; Pos = MAP_APPFONT ( 96 , 40 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Broch~ure" ; }; CheckBox CB_PROSPECT_RTL { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PROSPECT_RTL"; Pos = MAP_APPFONT ( 103 , 53 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Right to Left" ; @@ -319,6 +350,7 @@ TabPage TP_OPTPRINT_PAGE }; RadioButton RB_NO { + HelpID = "sw:RadioButton:TP_OPTPRINT_PAGE:RB_NO"; Pos = MAP_APPFONT ( 180 , 14 ) ; Size = MAP_APPFONT ( 74 , 10 ) ; Text [ en-US ] = "~None" ; @@ -327,18 +359,21 @@ TabPage TP_OPTPRINT_PAGE }; RadioButton RB_ONLY { + HelpID = "sw:RadioButton:TP_OPTPRINT_PAGE:RB_ONLY"; Pos = MAP_APPFONT ( 180 , 27 ) ; Size = MAP_APPFONT ( 74 , 10 ) ; Text [ en-US ] = "Comments ~only" ; }; RadioButton RB_END { + HelpID = "sw:RadioButton:TP_OPTPRINT_PAGE:RB_END"; Pos = MAP_APPFONT ( 180 , 40 ) ; Size = MAP_APPFONT ( 74 , 10 ) ; Text [ en-US ] = "End of docu~ment" ; }; RadioButton RB_PAGEEND { + HelpID = "sw:RadioButton:TP_OPTPRINT_PAGE:RB_PAGEEND"; Pos = MAP_APPFONT ( 180 , 53 ) ; Size = MAP_APPFONT ( 74 , 10 ) ; Text [ en-US ] = "~End of page" ; @@ -365,6 +400,7 @@ TabPage TP_OPTPRINT_PAGE }; CheckBox CB_PRINTEMPTYPAGES { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PRINTEMPTYPAGES"; Pos = MAP_APPFONT ( 12 , 106 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; TabStop = TRUE ; @@ -373,6 +409,7 @@ TabPage TP_OPTPRINT_PAGE /* CheckBox CB_SINGLEJOBS { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_SINGLEJOBS"; Pos = MAP_APPFONT ( 12 , 119 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; TabStop = TRUE ; @@ -381,6 +418,7 @@ TabPage TP_OPTPRINT_PAGE */ CheckBox CB_PAPERFROMSETUP { + HelpID = "sw:CheckBox:TP_OPTPRINT_PAGE:CB_PAPERFROMSETUP"; Pos = MAP_APPFONT ( 12 , 119 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; TabStop = TRUE ; @@ -395,6 +433,7 @@ TabPage TP_OPTPRINT_PAGE }; ListBox LB_FAX { + HelpID = "sw:ListBox:TP_OPTPRINT_PAGE:LB_FAX"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 132 ) ; Size = MAP_APPFONT ( 184 , 70 ) ; @@ -437,6 +476,7 @@ TabPage TP_STD_FONT }; MetricBox LB_STANDARD_SIZE { + HelpID = "sw:MetricBox:TP_STD_FONT:LB_STANDARD_SIZE"; Pos = MAP_APPFONT ( 204 , 25 ) ; Size = MAP_APPFONT ( 30 , 60 ) ; Border = TRUE ; @@ -444,6 +484,7 @@ TabPage TP_STD_FONT }; MetricBox LB_TITLE_SIZE { + HelpID = "sw:MetricBox:TP_STD_FONT:LB_TITLE_SIZE"; Pos = MAP_APPFONT ( 204 , 42 ) ; Size = MAP_APPFONT ( 30 , 60 ) ; Border = TRUE ; @@ -451,6 +492,7 @@ TabPage TP_STD_FONT }; MetricBox LB_LIST_SIZE { + HelpID = "sw:MetricBox:TP_STD_FONT:LB_LIST_SIZE"; Pos = MAP_APPFONT ( 204 , 59 ) ; Size = MAP_APPFONT ( 30 , 60 ) ; Border = TRUE ; @@ -458,6 +500,7 @@ TabPage TP_STD_FONT }; MetricBox LB_LABEL_SIZE { + HelpID = "sw:MetricBox:TP_STD_FONT:LB_LABEL_SIZE"; Pos = MAP_APPFONT ( 204 , 76 ) ; Size = MAP_APPFONT ( 30 , 60 ) ; Border = TRUE ; @@ -465,6 +508,7 @@ TabPage TP_STD_FONT }; MetricBox LB_INDEX_SIZE { + HelpID = "sw:MetricBox:TP_STD_FONT:LB_INDEX_SIZE"; Pos = MAP_APPFONT ( 204 , 93 ) ; Size = MAP_APPFONT ( 30 , 60 ) ; Border = TRUE ; @@ -507,6 +551,7 @@ TabPage TP_STD_FONT }; ComboBox LB_STANDARD { + HelpID = "sw:ComboBox:TP_STD_FONT:LB_STANDARD"; Pos = MAP_APPFONT ( 63 , 25 ) ; Size = MAP_APPFONT ( 135 , 73 ) ; TabStop = TRUE ; @@ -515,6 +560,7 @@ TabPage TP_STD_FONT }; ComboBox LB_TITLE { + HelpID = "sw:ComboBox:TP_STD_FONT:LB_TITLE"; Pos = MAP_APPFONT ( 63 , 42 ) ; Size = MAP_APPFONT ( 135, 73 ) ; TabStop = TRUE ; @@ -523,6 +569,7 @@ TabPage TP_STD_FONT }; ComboBox LB_LIST { + HelpID = "sw:ComboBox:TP_STD_FONT:LB_LIST"; Pos = MAP_APPFONT ( 63 , 59 ) ; Size = MAP_APPFONT ( 135 , 73 ) ; TabStop = TRUE ; @@ -531,6 +578,7 @@ TabPage TP_STD_FONT }; ComboBox LB_LABEL { + HelpID = "sw:ComboBox:TP_STD_FONT:LB_LABEL"; Pos = MAP_APPFONT ( 63 , 76 ) ; Size = MAP_APPFONT ( 135 , 73 ) ; TabStop = TRUE ; @@ -539,6 +587,7 @@ TabPage TP_STD_FONT }; ComboBox LB_IDX { + HelpID = "sw:ComboBox:TP_STD_FONT:LB_IDX"; Pos = MAP_APPFONT ( 63 , 94 ) ; Size = MAP_APPFONT ( 135, 73 ) ; TabStop = TRUE ; @@ -547,12 +596,14 @@ TabPage TP_STD_FONT }; CheckBox CB_DOCONLY { + HelpID = "sw:CheckBox:TP_STD_FONT:CB_DOCONLY"; Pos = MAP_APPFONT ( 12 , 111 ) ; Size = MAP_APPFONT ( 147 , 10 ) ; Text [ en-US ] = "C~urrent document only" ; }; PushButton PB_STANDARD { + HelpID = "sw:PushButton:TP_STD_FONT:PB_STANDARD"; Pos = MAP_APPFONT ( 204 , 165 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Default" ; @@ -588,6 +639,7 @@ TabPage TP_OPTTABLE_PAGE }; CheckBox CB_HEADER { + HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_HEADER"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 107 , 10 ) ; TabStop = TRUE ; @@ -595,6 +647,7 @@ TabPage TP_OPTTABLE_PAGE }; CheckBox CB_REPEAT_HEADER { + HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_REPEAT_HEADER"; Pos = MAP_APPFONT ( 21 , 27 ) ; Size = MAP_APPFONT ( 99 , 10 ) ; TabStop = TRUE ; @@ -602,6 +655,7 @@ TabPage TP_OPTTABLE_PAGE }; CheckBox CB_DONT_SPLIT { + HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_DONT_SPLIT"; Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 107 , 10 ) ; TabStop = TRUE ; @@ -609,6 +663,7 @@ TabPage TP_OPTTABLE_PAGE }; CheckBox CB_BORDER { + HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_BORDER"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 107 , 10 ) ; TabStop = TRUE ; @@ -628,6 +683,7 @@ TabPage TP_OPTTABLE_PAGE }; CheckBox CB_NUMFORMATTING { + HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFORMATTING"; Pos = MAP_APPFONT ( 131 , 14 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; TabStop = TRUE ; @@ -635,6 +691,7 @@ TabPage TP_OPTTABLE_PAGE }; CheckBox CB_NUMFMT_FORMATTING { + HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMFMT_FORMATTING"; Pos = MAP_APPFONT ( 140 , 27 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; TabStop = TRUE ; @@ -642,6 +699,7 @@ TabPage TP_OPTTABLE_PAGE }; CheckBox CB_NUMALIGNMENT { + HelpID = "sw:CheckBox:TP_OPTTABLE_PAGE:CB_NUMALIGNMENT"; Pos = MAP_APPFONT ( 140 , 40 ) ; Size = MAP_APPFONT ( 114 , 10 ) ; TabStop = TRUE ; @@ -667,6 +725,7 @@ TabPage TP_OPTTABLE_PAGE }; MetricField MF_ROWMOVE { + HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWMOVE"; Border = TRUE ; Pos = MAP_APPFONT ( 83 , 91 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -689,6 +748,7 @@ TabPage TP_OPTTABLE_PAGE }; MetricField MF_COLMOVE { + HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_COLMOVE"; Border = TRUE ; Pos = MAP_APPFONT ( 83 , 106 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -717,6 +777,7 @@ TabPage TP_OPTTABLE_PAGE }; MetricField MF_ROWINSERT { + HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_ROWINSERT"; Border = TRUE ; Pos = MAP_APPFONT ( 211 , 91 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -739,6 +800,7 @@ TabPage TP_OPTTABLE_PAGE }; MetricField MF_COLINSERT { + HelpID = "sw:MetricField:TP_OPTTABLE_PAGE:MF_COLINSERT"; Border = TRUE ; Pos = MAP_APPFONT ( 211 , 106 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -761,6 +823,7 @@ TabPage TP_OPTTABLE_PAGE }; RadioButton RB_FIX { + HelpID = "sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIX"; Pos = MAP_APPFONT ( 21 , 133 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "~Fixed" ; @@ -774,6 +837,7 @@ TabPage TP_OPTTABLE_PAGE }; RadioButton RB_FIXPROP { + HelpID = "sw:RadioButton:TP_OPTTABLE_PAGE:RB_FIXPROP"; Pos = MAP_APPFONT ( 21 , 151 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "Fi~xed, proportional" ; @@ -787,6 +851,7 @@ TabPage TP_OPTTABLE_PAGE }; RadioButton RB_VAR { + HelpID = "sw:RadioButton:TP_OPTTABLE_PAGE:RB_VAR"; Pos = MAP_APPFONT ( 21 , 169 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "~Variable" ; @@ -820,6 +885,7 @@ TabPage TP_OPTSHDWCRSR }; CheckBox CB_PARA { + HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_PARA"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "Pa~ragraph end" ; @@ -828,48 +894,56 @@ TabPage TP_OPTSHDWCRSR }; CheckBox CB_SHYPH { + HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_SHYPH"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "Custom h~yphens" ; }; CheckBox CB_SPACE { + HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_SPACE"; Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "Spac~es" ; }; CheckBox CB_HSPACE { + HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_HSPACE"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "Non-breaking s~paces" ; }; CheckBox CB_TAB { + HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_TAB"; Pos = MAP_APPFONT ( 12 , 66 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "Ta~bs" ; }; CheckBox CB_BREAK { + HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_BREAK"; Pos = MAP_APPFONT ( 12 , 79 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "Brea~ks" ; }; CheckBox CB_CHAR_HIDDEN { + HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_CHAR_HIDDEN"; Pos = MAP_APPFONT ( 12 , 92 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "Hidden text" ; }; CheckBox CB_FLD_HIDDEN { + HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN"; Pos = MAP_APPFONT ( 12 , 105 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "Fields: Hidden te~xt" ; }; CheckBox CB_FLD_HIDDEN_PARA { + HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_FLD_HIDDEN_PARA"; Pos = MAP_APPFONT ( 12 , 118 ) ; Size = MAP_APPFONT ( 108 , 10 ) ; Text [ en-US ] = "Fields: Hidden p~aragraphs" ; @@ -888,6 +962,7 @@ TabPage TP_OPTSHDWCRSR }; CheckBox CB_SHDWCRSONOFF { + HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_SHDWCRSONOFF"; Pos = MAP_APPFONT ( 136 , 14 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -903,6 +978,7 @@ TabPage TP_OPTSHDWCRSR }; RadioButton RB_SHDWCRSFILLMARGIN { + HelpID = "sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLMARGIN"; Pos = MAP_APPFONT ( 145 , 39 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -911,18 +987,21 @@ TabPage TP_OPTSHDWCRSR }; RadioButton RB_SHDWCRSFILLINDENT { + HelpID = "sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLINDENT"; Pos = MAP_APPFONT ( 145 , 52 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "~Left paragraph margin" ; }; RadioButton RB_SHDWCRSFILLTAB { + HelpID = "sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLTAB"; Pos = MAP_APPFONT ( 145 , 66 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "~Tabs" ; }; RadioButton RB_SHDWCRSFILLSPACE { + HelpID = "sw:RadioButton:TP_OPTSHDWCRSR:RB_SHDWCRSFILLSPACE"; Pos = MAP_APPFONT ( 145 , 79 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Tabs a~nd spaces" ; @@ -935,6 +1014,7 @@ TabPage TP_OPTSHDWCRSR }; CheckBox CB_ALLOW_IN_PROT { + HelpID = "sw:CheckBox:TP_OPTSHDWCRSR:CB_ALLOW_IN_PROT"; Pos = MAP_APPFONT ( 136 , 107 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/config/optload.src b/sw/source/ui/config/optload.src index febd2a6fc35f..be6473632b56 100644 --- a/sw/source/ui/config/optload.src +++ b/sw/source/ui/config/optload.src @@ -53,6 +53,7 @@ TabPage TP_OPTLOAD_PAGE }; RadioButton RB_ALWAYS { + HelpID = "sw:RadioButton:TP_OPTLOAD_PAGE:RB_ALWAYS"; Pos = MAP_APPFONT ( 18 , 26 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; TabStop = TRUE ; @@ -60,6 +61,7 @@ TabPage TP_OPTLOAD_PAGE }; RadioButton RB_REQUEST { + HelpID = "sw:RadioButton:TP_OPTLOAD_PAGE:RB_REQUEST"; Pos = MAP_APPFONT ( 18 , 39 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; TabStop = TRUE ; @@ -67,6 +69,7 @@ TabPage TP_OPTLOAD_PAGE }; RadioButton RB_NEVER { + HelpID = "sw:RadioButton:TP_OPTLOAD_PAGE:RB_NEVER"; Pos = MAP_APPFONT ( 18 , 52 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; TabStop = TRUE ; @@ -80,12 +83,14 @@ TabPage TP_OPTLOAD_PAGE }; CheckBox CB_AUTO_UPDATE_FIELDS { + HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_FIELDS"; Pos = MAP_APPFONT ( 136 , 26) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "~Fields"; }; CheckBox CB_AUTO_UPDATE_CHARTS { + HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_AUTO_UPDATE_CHARTS"; Pos = MAP_APPFONT ( 136 , 39) ; Size = MAP_APPFONT ( 109 , 10 ) ; Text [ en-US ] = "~Charts"; @@ -104,6 +109,7 @@ TabPage TP_OPTLOAD_PAGE }; ListBox LB_METRIC { + HelpID = "sw:ListBox:TP_OPTLOAD_PAGE:LB_METRIC"; Pos = MAP_APPFONT ( 130, 77 ) ; Size = MAP_APPFONT ( 50 , 50 ) ; Border = TRUE ; @@ -118,6 +124,7 @@ TabPage TP_OPTLOAD_PAGE }; MetricField MF_TAB { + HelpID = "sw:MetricField:TP_OPTLOAD_PAGE:MF_TAB"; Border = TRUE ; Pos = MAP_APPFONT ( 130 , 93 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -134,6 +141,7 @@ TabPage TP_OPTLOAD_PAGE }; CheckBox CB_USE_SQUARE_PAGE_MODE { + HelpID = "sw:CheckBox:TP_OPTLOAD_PAGE:CB_USE_SQUARE_PAGE_MODE"; Pos = MAP_APPFONT ( 12 , 111) ; Size = MAP_APPFONT ( 248 , 10 ) ; Text [ en-US ] = "Use square page mode for text grid"; @@ -173,6 +181,7 @@ TabPage TP_OPTCAPTION_PAGE }; ListBox LB_ORDER { + HelpID = "sw:ListBox:TP_OPTCAPTION_PAGE:LB_ORDER"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 141 ) ; Size = MAP_APPFONT ( 106 , 60 ) ; @@ -222,6 +231,7 @@ TabPage TP_OPTCAPTION_PAGE }; ComboBox BOX_CATEGORY { + HelpID = "sw:ComboBox:TP_OPTCAPTION_PAGE:BOX_CATEGORY"; Pos = MAP_APPFONT ( 189 , 14 ) ; Size = MAP_APPFONT ( 59 , 61 ) ; DropDown = TRUE ; @@ -237,6 +247,7 @@ TabPage TP_OPTCAPTION_PAGE }; ListBox BOX_FORMAT { + HelpID = "sw:ListBox:TP_OPTCAPTION_PAGE:BOX_FORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 189 , 29 ) ; Size = MAP_APPFONT ( 59 , 61 ) ; @@ -252,6 +263,7 @@ TabPage TP_OPTCAPTION_PAGE }; Edit ED_NUM_SEP { + HelpID = "sw:Edit:TP_OPTCAPTION_PAGE:ED_NUM_SEP"; Pos = MAP_APPFONT ( 189 , 44 ) ; Size = MAP_APPFONT ( 59 , 12 ) ; Border = TRUE ; @@ -268,6 +280,7 @@ TabPage TP_OPTCAPTION_PAGE }; Edit EDT_TEXT { + HelpID = "sw:Edit:TP_OPTCAPTION_PAGE:EDT_TEXT"; Pos = MAP_APPFONT ( 189 , 59 ) ; Size = MAP_APPFONT ( 59 , 12 ) ; Border = TRUE ; @@ -283,6 +296,7 @@ TabPage TP_OPTCAPTION_PAGE }; ListBox BOX_POS { + HelpID = "sw:ListBox:TP_OPTCAPTION_PAGE:BOX_POS"; Pos = MAP_APPFONT ( 189 , 74 ) ; Size = MAP_APPFONT ( 59 , 61 ) ; DropDown = TRUE ; @@ -304,6 +318,7 @@ TabPage TP_OPTCAPTION_PAGE }; ListBox LB_LEVEL { + HelpID = "sw:ListBox:TP_OPTCAPTION_PAGE:LB_LEVEL"; Border = TRUE ; Pos = MAP_APPFONT ( 189 , 100 ) ; Size = MAP_APPFONT ( 59 , 60 ) ; @@ -322,6 +337,7 @@ TabPage TP_OPTCAPTION_PAGE }; Edit ED_SEPARATOR { + HelpID = "sw:Edit:TP_OPTCAPTION_PAGE:ED_SEPARATOR"; Pos = MAP_APPFONT ( 189 , 115 ) ; Size = MAP_APPFONT ( 59 , 12 ) ; Border = TRUE ; @@ -342,6 +358,7 @@ TabPage TP_OPTCAPTION_PAGE }; ListBox LB_CHARSTYLE { + HelpID = "sw:ListBox:TP_OPTCAPTION_PAGE:LB_CHARSTYLE"; Border = TRUE ; Pos = MAP_APPFONT ( 189 , 141 ) ; Size = MAP_APPFONT ( 59 , 60 ) ; @@ -354,6 +371,7 @@ TabPage TP_OPTCAPTION_PAGE }; CheckBox CB_APPLYBORDER { + HelpID = "sw:CheckBox:TP_OPTCAPTION_PAGE:CB_APPLYBORDER"; Pos = MAP_APPFONT ( 125 , 158 ) ; Size = MAP_APPFONT ( 124 , 10 ) ; Text [ en-US ] = "Apply border and shadow" ; diff --git a/sw/source/ui/config/redlopt.src b/sw/source/ui/config/redlopt.src index 4d6816dcec23..b7ec8c42686d 100644 --- a/sw/source/ui/config/redlopt.src +++ b/sw/source/ui/config/redlopt.src @@ -65,6 +65,7 @@ TabPage TP_REDLINE_OPT }; ListBox LB_INS_ATTR { + HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_INS_ATTR"; Pos = MAP_APPFONT ( 90 , 25 ) ; Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; @@ -92,6 +93,7 @@ TabPage TP_REDLINE_OPT }; ListBox LB_INS_COL { + HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_INS_COL"; Pos = MAP_APPFONT ( 90 , 40 ) ; Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; @@ -118,6 +120,7 @@ TabPage TP_REDLINE_OPT }; ListBox LB_DEL_ATTR { + HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_DEL_ATTR"; Pos = MAP_APPFONT ( 90 , 67 ) ; Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; @@ -131,6 +134,7 @@ TabPage TP_REDLINE_OPT }; ListBox LB_DEL_COL { + HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_DEL_COL"; Pos = MAP_APPFONT ( 90 , 82 ) ; Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; @@ -157,6 +161,7 @@ TabPage TP_REDLINE_OPT }; ListBox LB_CHG_ATTR { + HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_CHG_ATTR"; Pos = MAP_APPFONT ( 90 , 111 ) ; Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; @@ -170,6 +175,7 @@ TabPage TP_REDLINE_OPT }; ListBox LB_CHG_COL { + HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_CHG_COL"; Pos = MAP_APPFONT ( 90 , 126 ) ; Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; @@ -196,6 +202,7 @@ TabPage TP_REDLINE_OPT }; ListBox LB_MARKPOS { + HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_MARKPOS"; Pos = MAP_APPFONT ( 90 , 155 ) ; Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; @@ -217,6 +224,7 @@ TabPage TP_REDLINE_OPT }; ListBox LB_LC_COL { + HelpID = "sw:ListBox:TP_REDLINE_OPT:LB_LC_COL"; Pos = MAP_APPFONT ( 90 , 170 ) ; Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/dbui/addresslistdialog.src b/sw/source/ui/dbui/addresslistdialog.src index 38a82e65ea76..aa815866cf48 100644 --- a/sw/source/ui/dbui/addresslistdialog.src +++ b/sw/source/ui/dbui/addresslistdialog.src @@ -61,30 +61,35 @@ ModalDialog DLG_MM_ADDRESSLISTDIALOG }; PushButton PB_LOADLIST { + HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_LOADLIST"; Pos = MAP_APPFONT ( 194 , 43 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Add..."; }; PushButton PB_CREATELIST { + HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_CREATELIST"; Pos = MAP_APPFONT ( 194 , 60 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Create..."; }; PushButton PB_FILTER { + HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_FILTER"; Pos = MAP_APPFONT ( 194 , 77 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Filter..."; }; PushButton PB_EDIT { + HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_EDIT"; Pos = MAP_APPFONT ( 194 , 94 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "~Edit..."; }; PushButton PB_TABLE { + HelpID = "sw:PushButton:DLG_MM_ADDRESSLISTDIALOG:PB_TABLE"; Pos = MAP_APPFONT ( 194 , 111 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text [ en-US ] = "Change ~Table..."; diff --git a/sw/source/ui/dbui/createaddresslistdialog.src b/sw/source/ui/dbui/createaddresslistdialog.src index b43a373cd047..5f51d6a300fb 100644 --- a/sw/source/ui/dbui/createaddresslistdialog.src +++ b/sw/source/ui/dbui/createaddresslistdialog.src @@ -70,24 +70,28 @@ ModalDialog DLG_MM_CREATEADDRESSLIST }; PushButton PB_NEW { + HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_NEW"; Pos = MAP_APPFONT ( 262 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~New"; }; PushButton PB_DELETE { + HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_DELETE"; Pos = MAP_APPFONT ( 262 , 32 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete"; }; PushButton PB_FIND { + HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_FIND"; Pos = MAP_APPFONT ( 262 , 50 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Find..."; }; PushButton PB_CUSTOMIZE { + HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_CUSTOMIZE"; Pos = MAP_APPFONT ( 262 , 68 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "C~ustomize..."; @@ -100,18 +104,21 @@ ModalDialog DLG_MM_CREATEADDRESSLIST }; PushButton PB_START { + HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_START"; Pos = MAP_APPFONT ( 100 , 180 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; Text = "|<"; }; PushButton PB_PREV { + HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_PREV"; Pos = MAP_APPFONT ( 123 , 180 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; Text = "<"; }; NumericField NF_SETNO { + HelpID = "sw:NumericField:DLG_MM_CREATEADDRESSLIST:NF_SETNO"; Pos = MAP_APPFONT ( 146 , 180 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; Border = TRUE; @@ -125,12 +132,14 @@ ModalDialog DLG_MM_CREATEADDRESSLIST }; PushButton PB_NEXT { + HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_NEXT"; Pos = MAP_APPFONT ( 169 , 180 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; Text = ">"; }; PushButton PB_END { + HelpID = "sw:PushButton:DLG_MM_CREATEADDRESSLIST:PB_END"; Pos = MAP_APPFONT ( 192 , 180 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; Text = ">|"; @@ -185,18 +194,21 @@ ModelessDialog DLG_MM_FIND_ENTRY }; Edit ED_FIND { + HelpID = "sw:Edit:DLG_MM_FIND_ENTRY:ED_FIND"; Pos = MAP_APPFONT ( 6 , 14) ; Size = MAP_APPFONT ( 120 , 12 ) ; Border = TRUE; }; CheckBox CB_FINDONLY { + HelpID = "sw:CheckBox:DLG_MM_FIND_ENTRY:CB_FINDONLY"; Pos = MAP_APPFONT ( 6 , 32 ) ; Size = MAP_APPFONT ( 120 , 10 ) ; Text [ en-US ] = "Find ~only in"; }; ListBox LB_FINDONLY { + HelpID = "sw:ListBox:DLG_MM_FIND_ENTRY:LB_FINDONLY"; Pos = MAP_APPFONT ( 12 , 45 ) ; Size = MAP_APPFONT ( 114 , 50 ) ; Border = TRUE; @@ -204,6 +216,7 @@ ModelessDialog DLG_MM_FIND_ENTRY }; PushButton PB_FIND { + HelpID = "sw:PushButton:DLG_MM_FIND_ENTRY:PB_FIND"; Pos = MAP_APPFONT ( 132 , 3 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; DefButton = TRUE; diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.src b/sw/source/ui/dbui/customizeaddresslistdialog.src index 21e32ecb89c4..29de352b4cf3 100644 --- a/sw/source/ui/dbui/customizeaddresslistdialog.src +++ b/sw/source/ui/dbui/customizeaddresslistdialog.src @@ -50,30 +50,35 @@ ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST }; ListBox LB_FIELDS { + HelpID = "sw:ListBox:DLG_MM_CUSTOMIZE_ADDRESS_LIST:LB_FIELDS"; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 112 , 120 ) ; Border = TRUE; }; PushButton PB_ADD { + HelpID = "sw:PushButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_ADD"; Pos = MAP_APPFONT ( 144 , 3 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add..."; }; PushButton PB_DELETE { + HelpID = "sw:PushButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_DELETE"; Pos = MAP_APPFONT ( 144 , 20 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete"; }; PushButton PB_RENAME { + HelpID = "sw:PushButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_RENAME"; Pos = MAP_APPFONT ( 144 , 37 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Rename..."; }; ImageButton PB_UP { + HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_UP"; Pos = MAP_APPFONT ( 124 , 58 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; SYMBOL = IMAGEBUTTON_ARROW_UP; @@ -81,6 +86,7 @@ ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST }; ImageButton PB_DOWN { + HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZE_ADDRESS_LIST:PB_DOWN"; Pos = MAP_APPFONT ( 124 , 75 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; SYMBOL = IMAGEBUTTON_ARROW_DOWN; @@ -129,6 +135,7 @@ ModalDialog DLG_MM_ADD_RENAME_ENTRY }; Edit ED_FIELDNAME { + HelpID = "sw:Edit:DLG_MM_ADD_RENAME_ENTRY:ED_FIELDNAME"; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 120 , 12 ) ; Border = TRUE; diff --git a/sw/source/ui/dbui/dbinsdlg.src b/sw/source/ui/dbui/dbinsdlg.src index 28e045a3a235..fbbf6785527c 100644 --- a/sw/source/ui/dbui/dbinsdlg.src +++ b/sw/source/ui/dbui/dbinsdlg.src @@ -46,6 +46,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; RadioButton RB_AS_TABLE { + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TABLE"; Pos = MAP_APPFONT ( 80 , 6 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; TabStop = TRUE ; @@ -54,6 +55,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; RadioButton RB_AS_FIELD { + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_FIELD"; Pos = MAP_APPFONT ( 145 , 6 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; TabStop = TRUE ; @@ -61,6 +63,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; RadioButton RB_AS_TEXT { + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_AS_TEXT"; Pos = MAP_APPFONT ( 210 , 6 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; TabStop = TRUE ; @@ -106,6 +109,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; RadioButton RB_DBFMT_FROM_DB { + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_DB"; Pos = MAP_APPFONT ( 15 , 128 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -114,12 +118,14 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; RadioButton RB_DBFMT_FROM_USR { + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_DBFMT_FROM_USR"; Pos = MAP_APPFONT ( 15 , 143 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; TabStop = TRUE ; }; ListBox LB_DBFMT_FROM_USR { + HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DBFMT_FROM_USR"; Border = TRUE ; Pos = MAP_APPFONT ( 30 , 142 ) ; Size = MAP_APPFONT ( 75 , 44 ) ; @@ -130,6 +136,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL /* -------------- Page Text / Fields -------------------------------- */ ListBox LB_TXT_DB_COLUMN { + HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TXT_DB_COLUMN"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 41 ) ; Size = MAP_APPFONT ( 93 , 70 ) ; @@ -138,6 +145,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; ImageButton IB_DBCOL_TOEDIT { + HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_TOEDIT"; Pos = MAP_APPFONT ( 111 , 41 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; TabStop = TRUE ; @@ -153,6 +161,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; MultiLineEdit ED_DB_TEXT { + HelpID = "sw:MultiLineEdit:DLG_AP_INSERT_DB_SEL:ED_DB_TEXT"; Border = TRUE ; Pos = MAP_APPFONT ( 137 , 41 ) ; Size = MAP_APPFONT ( 142 , 70 ) ; @@ -172,6 +181,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; ListBox LB_DB_PARA_COLL { + HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_DB_PARA_COLL"; Border = TRUE ; Pos = MAP_APPFONT ( 182 , 127 ) ; Size = MAP_APPFONT ( 97 , 59 ) ; @@ -183,6 +193,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL /* -------------- Page Table ---------------------------------------- */ ListBox LB_TBL_DB_COLUMN { + HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TBL_DB_COLUMN"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 41 ) ; Size = MAP_APPFONT ( 93 , 70 ) ; @@ -190,6 +201,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; ImageButton IB_DBCOL_ALL_TO { + HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_TO"; Pos = MAP_APPFONT ( 111 , 41 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; TabStop = TRUE ; @@ -204,6 +216,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; ImageButton IB_DBCOL_ONE_TO { + HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_TO"; Pos = MAP_APPFONT ( 111 , 56 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; TabStop = TRUE ; @@ -218,6 +231,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; ImageButton IB_DBCOL_ONE_FROM { + HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ONE_FROM"; Pos = MAP_APPFONT ( 111 , 84 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; TabStop = TRUE ; @@ -232,6 +246,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; ImageButton IB_DBCOL_ALL_FROM { + HelpID = "sw:ImageButton:DLG_AP_INSERT_DB_SEL:IB_DBCOL_ALL_FROM"; Pos = MAP_APPFONT ( 111 , 99 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; TabStop = TRUE ; @@ -253,6 +268,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; ListBox LB_TABLE_COL { + HelpID = "sw:ListBox:DLG_AP_INSERT_DB_SEL:LB_TABLE_COL"; Border = TRUE ; Pos = MAP_APPFONT ( 137 , 41 ) ; Size = MAP_APPFONT ( 75 , 70 ) ; @@ -265,6 +281,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; CheckBox CB_TABLE_HEADON { + HelpID = "sw:CheckBox:DLG_AP_INSERT_DB_SEL:CB_TABLE_HEADON"; Pos = MAP_APPFONT ( 111 , 128 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -273,6 +290,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; RadioButton RB_HEADL_COLNMS { + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_COLNMS"; Pos = MAP_APPFONT ( 120 , 142 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -281,6 +299,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; RadioButton RB_HEADL_EMPTY { + HelpID = "sw:RadioButton:DLG_AP_INSERT_DB_SEL:RB_HEADL_EMPTY"; Pos = MAP_APPFONT ( 120 , 155 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -288,6 +307,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; PushButton PB_TBL_FORMAT { + HelpID = "sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_FORMAT"; Pos = MAP_APPFONT ( 214 , 128 ) ; Size = MAP_APPFONT ( 65 , 12 ) ; Text [ en-US ] = "Pr~operties..." ; @@ -295,6 +315,7 @@ ModalDialog DLG_AP_INSERT_DB_SEL }; PushButton PB_TBL_AUTOFMT { + HelpID = "sw:PushButton:DLG_AP_INSERT_DB_SEL:PB_TBL_AUTOFMT"; Pos = MAP_APPFONT ( 214 , 144 ) ; Size = MAP_APPFONT ( 65 , 12 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/dbui/dbui.src b/sw/source/ui/dbui/dbui.src index f0dba28f75cc..12c67d2644df 100644 --- a/sw/source/ui/dbui/dbui.src +++ b/sw/source/ui/dbui/dbui.src @@ -31,6 +31,7 @@ #include "helpid.h" ModalDialog DLG_DBSELECTION { + HelpID = "sw:ModalDialog:DLG_DBSELECTION"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 168 , 132 ) ; diff --git a/sw/source/ui/dbui/mailmergechildwindow.src b/sw/source/ui/dbui/mailmergechildwindow.src index 3caf5b1a7607..5b5b32a7cc8d 100644 --- a/sw/source/ui/dbui/mailmergechildwindow.src +++ b/sw/source/ui/dbui/mailmergechildwindow.src @@ -258,6 +258,7 @@ ModalDialog DLG_MM_SENDWARNING }; MultiLineEdit ED_DETAILS { + HelpID = "sw:MultiLineEdit:DLG_MM_SENDWARNING:ED_DETAILS"; Pos = MAP_APPFONT ( 40 , 50 ) ; Size = MAP_APPFONT ( 194 , 50 ) ; Border = TRUE; diff --git a/sw/source/ui/dbui/mailmergewizard.src b/sw/source/ui/dbui/mailmergewizard.src index d3da4d7c9945..fc19ee422f8a 100644 --- a/sw/source/ui/dbui/mailmergewizard.src +++ b/sw/source/ui/dbui/mailmergewizard.src @@ -30,6 +30,7 @@ ModalDialog DLG_MAILMERGEWIZARD { + HelpID = "sw:ModalDialog:DLG_MAILMERGEWIZARD"; OutputSize = TRUE ; SVLook = TRUE ; Text [ en-US ] = "Mail Merge Wizard" ; diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src index 238d1cfa1260..43d5b9126eb4 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.src +++ b/sw/source/ui/dbui/mmaddressblockpage.src @@ -63,6 +63,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE }; PushButton PB_ADDRESSLIST { + HelpID = "sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ADDRESSLIST"; Pos = MAP_APPFONT ( 154 , 27 ) ; Size = MAP_APPFONT ( 100 , 14 ) ; Text[ en-US ] = "Select A~ddress List..."; @@ -91,6 +92,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE }; CheckBox CB_ADDRESS { + HelpID = "sw:CheckBox:DLG_MM_ADDRESSBLOCK_PAGE:CB_ADDRESS"; Pos = MAP_APPFONT ( 16 , 66 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text[ en-US ] = "~This document shall contain an address block"; @@ -103,6 +105,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE }; PushButton PB_SETTINGS { + HelpID = "sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_SETTINGS"; Pos = MAP_APPFONT ( 194 , 110 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Group = FALSE; @@ -110,6 +113,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE }; CheckBox CB_HIDE_EMPTY_PARA { + HelpID = "sw:CheckBox:DLG_MM_ADDRESSBLOCK_PAGE:CB_HIDE_EMPTY_PARA"; Pos = MAP_APPFONT ( 24 , 127 ) ; Size = MAP_APPFONT ( 230 , 10 ) ; Text[ en-US ] = "~Suppress lines with just empty fields"; @@ -134,6 +138,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE }; PushButton PB_ASSIGN { + HelpID = "sw:PushButton:DLG_MM_ADDRESSBLOCK_PAGE:PB_ASSIGN"; Pos = MAP_APPFONT ( 194 , 151 ) ; Size = MAP_APPFONT ( 60 , 14 ) ; Text[ en-US ] = "Match ~Fields..."; @@ -169,6 +174,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE }; ImageButton IB_PREVSET { + HelpID = "sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_PREVSET"; Pos = MAP_APPFONT ( 167 , 238 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; SYMBOL = IMAGEBUTTON_PREV; @@ -176,6 +182,7 @@ TabPage DLG_MM_ADDRESSBLOCK_PAGE }; ImageButton IB_NEXTSET { + HelpID = "sw:ImageButton:DLG_MM_ADDRESSBLOCK_PAGE:IB_NEXTSET"; Pos = MAP_APPFONT ( 178 , 238 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; SYMBOL = IMAGEBUTTON_NEXT ; @@ -215,18 +222,21 @@ ModalDialog DLG_MM_SELECTADDRESSBLOCK }; PushButton PB_NEW { + HelpID = "sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_NEW"; Pos = MAP_APPFONT ( 204 , 14 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "~New..."; }; PushButton PB_CUSTOMIZE { + HelpID = "sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_CUSTOMIZE"; Pos = MAP_APPFONT ( 204 , 31 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "~Edit..."; }; PushButton PB_DELETE { + HelpID = "sw:PushButton:DLG_MM_SELECTADDRESSBLOCK:PB_DELETE"; Pos = MAP_APPFONT ( 204 , 48 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Group = FALSE; @@ -241,24 +251,28 @@ ModalDialog DLG_MM_SELECTADDRESSBLOCK }; RadioButton RB_NEVER { + HelpID = "sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_NEVER"; Pos = MAP_APPFONT ( 12 , 131 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "N~ever include the country/region"; }; RadioButton RB_ALWAYS { + HelpID = "sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_ALWAYS"; Pos = MAP_APPFONT ( 12 , 145 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "~Always include the country/region"; }; RadioButton RB_DEPENDENT { + HelpID = "sw:RadioButton:DLG_MM_SELECTADDRESSBLOCK:RB_DEPENDENT"; Pos = MAP_APPFONT ( 12 , 159 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "Only ~include the country/region if it is not:"; }; Edit ED_COUNTRY { + HelpID = "sw:Edit:DLG_MM_SELECTADDRESSBLOCK:ED_COUNTRY"; Pos = MAP_APPFONT ( 18 , 172 ) ; Size = MAP_APPFONT ( 180 , 12 ) ; Border = TRUE; @@ -337,6 +351,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK }; ImageButton IB_INSERTFIELD { + HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_INSERTFIELD"; Pos = MAP_APPFONT ( 80 , 29 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_RIGHT; @@ -348,6 +363,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK }; ImageButton IB_REMOVEFIELD { + HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_REMOVEFIELD"; Pos = MAP_APPFONT ( 80 , 46 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_LEFT; @@ -369,12 +385,14 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK }; MultiLineEdit ED_DRAG { + HelpID = "sw:MultiLineEdit:DLG_MM_CUSTOMIZEADDRESSBLOCK:ED_DRAG"; Pos = MAP_APPFONT ( 106 , 14 ) ; Size = MAP_APPFONT ( 160 , 60 ) ; Border = TRUE; }; ImageButton IB_UP { + HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_UP"; Pos = MAP_APPFONT ( 285 , 14 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_UP; @@ -382,6 +400,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK }; ImageButton IB_LEFT { + HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_LEFT"; Pos = MAP_APPFONT ( 270 , 29 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_LEFT; @@ -389,6 +408,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK }; ImageButton IB_RIGHT { + HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_RIGHT"; Pos = MAP_APPFONT ( 300 , 29 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_RIGHT; @@ -396,6 +416,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK }; ImageButton IB_DOWN { + HelpID = "sw:ImageButton:DLG_MM_CUSTOMIZEADDRESSBLOCK:IB_DOWN"; Pos = MAP_APPFONT ( 285 , 48 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_DOWN; @@ -410,6 +431,7 @@ ModalDialog DLG_MM_CUSTOMIZEADDRESSBLOCK }; ComboBox CB_FIELD { + HelpID = "sw:ComboBox:DLG_MM_CUSTOMIZEADDRESSBLOCK:CB_FIELD"; Pos = MAP_APPFONT ( 106 , 89 ) ; Size = MAP_APPFONT ( 160 , 50 ) ; Border = TRUE; @@ -560,6 +582,7 @@ ModalDialog DLG_MM_ASSIGNFIELDS }; ListBox LB_FIELDS { + HelpID = "sw:ListBox:DLG_MM_ASSIGNFIELDS:LB_FIELDS"; Pos = MAP_APPFONT ( 83 , 4 ) ; Size = MAP_APPFONT ( 74 , 50 ) ; TabStop = TRUE; diff --git a/sw/source/ui/dbui/mmdocselectpage.src b/sw/source/ui/dbui/mmdocselectpage.src index 9bc2077c6619..25ffe0cee67c 100644 --- a/sw/source/ui/dbui/mmdocselectpage.src +++ b/sw/source/ui/dbui/mmdocselectpage.src @@ -47,48 +47,56 @@ TabPage DLG_MM_DOCSELECT_PAGE }; RadioButton RB_CURRENTDOC { + HelpID = "sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_CURRENTDOC"; Pos = MAP_APPFONT ( 12 , 48 ) ; Size = MAP_APPFONT ( 190 , 10 ) ; Text[ en-US ] = "Use the current ~document"; }; RadioButton RB_NEWDOC { + HelpID = "sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_NEWDOC"; Pos = MAP_APPFONT ( 12 , 66 ) ; Size = MAP_APPFONT ( 190 , 10 ) ; Text[ en-US ] = "Create a ne~w document"; }; RadioButton RB_LOADDOC { + HelpID = "sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADDOC"; Pos = MAP_APPFONT ( 12 , 84) ; Size = MAP_APPFONT ( 190 , 10 ) ; Text[ en-US ] = "Start from ~existing document"; }; PushButton PB_LOADDOC { + HelpID = "sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_LOADDOC"; Pos = MAP_APPFONT ( 204 , 80) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "B~rowse..."; }; RadioButton RB_LOADTEMPLATE { + HelpID = "sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_LOADTEMPLATE"; Pos = MAP_APPFONT ( 12 , 103 ) ; Size = MAP_APPFONT ( 190 , 10 ) ; Text[ en-US ] = "Start from a t~emplate"; }; PushButton PB_BROWSETEMPLATE { + HelpID = "sw:PushButton:DLG_MM_DOCSELECT_PAGE:PB_BROWSETEMPLATE"; Pos = MAP_APPFONT ( 204 , 99 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "B~rowse..."; }; RadioButton RB_RECENTDOC { + HelpID = "sw:RadioButton:DLG_MM_DOCSELECT_PAGE:RB_RECENTDOC"; Pos = MAP_APPFONT ( 12 , 120) ; Size = MAP_APPFONT ( 190 , 10 ) ; Text[ en-US ] = "Start fro~m a recently saved starting document"; }; ListBox LB_RECENTDOC { + HelpID = "sw:ListBox:DLG_MM_DOCSELECT_PAGE:LB_RECENTDOC"; Pos = MAP_APPFONT ( 20 , 134 ) ; Size = MAP_APPFONT ( 180 , 50 ) ; DropDown = TRUE; diff --git a/sw/source/ui/dbui/mmgreetingspage.src b/sw/source/ui/dbui/mmgreetingspage.src index a9447034d749..eda855dc5095 100644 --- a/sw/source/ui/dbui/mmgreetingspage.src +++ b/sw/source/ui/dbui/mmgreetingspage.src @@ -144,6 +144,7 @@ TabPage DLG_MM_GREETINGS_PAGE }; CheckBox CB_GREETINGLINE { + HelpID = "sw:CheckBox:DLG_MM_GREETINGS_PAGE:CB_GREETINGLINE"; Pos = MAP_APPFONT ( 12 , 27 ); Size = MAP_APPFONT ( 242 , 10 ); Text[ en-US ] = "This document should contain a salutation"; @@ -163,6 +164,7 @@ TabPage DLG_MM_GREETINGS_PAGE }; PushButton PB_ASSIGN { + HelpID = "sw:PushButton:DLG_MM_GREETINGS_PAGE:PB_ASSIGN"; Pos = MAP_APPFONT ( 204 , 179 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "~Match fields..."; @@ -175,6 +177,7 @@ TabPage DLG_MM_GREETINGS_PAGE }; ImageButton IB_PREVSET { + HelpID = "sw:ImageButton:DLG_MM_GREETINGS_PAGE:IB_PREVSET"; Pos = MAP_APPFONT ( 177 , 204 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; SYMBOL = IMAGEBUTTON_PREV; @@ -182,6 +185,7 @@ TabPage DLG_MM_GREETINGS_PAGE }; ImageButton IB_NEXTSET { + HelpID = "sw:ImageButton:DLG_MM_GREETINGS_PAGE:IB_NEXTSET"; Pos = MAP_APPFONT ( 188 , 204 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; SYMBOL = IMAGEBUTTON_NEXT ; @@ -208,6 +212,7 @@ ModalDialog DLG_MM_MAILBODY Text [ en-US ] = "E-Mail Message"; CheckBox CB_GREETINGLINE { + HelpID = "sw:CheckBox:DLG_MM_MAILBODY:CB_GREETINGLINE"; Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 242 , 10 ) ; Text[ en-US ] = "This e-mail should contain a salutation"; @@ -221,6 +226,7 @@ ModalDialog DLG_MM_MAILBODY }; MultiLineEdit MLE_BODY { + HelpID = "sw:MultiLineEdit:DLG_MM_MAILBODY:MLE_BODY"; Pos = MAP_APPFONT ( 12, 151 ) ; Size = MAP_APPFONT ( 180 , 50 ) ; Border = TRUE; diff --git a/sw/source/ui/dbui/mmlayoutpage.src b/sw/source/ui/dbui/mmlayoutpage.src index 8e012674719d..55750c2de6e4 100644 --- a/sw/source/ui/dbui/mmlayoutpage.src +++ b/sw/source/ui/dbui/mmlayoutpage.src @@ -48,6 +48,7 @@ TabPage DLG_MM_LAYOUT_PAGE }; CheckBox CB_ALIGN { + HelpID = "sw:CheckBox:DLG_MM_LAYOUT_PAGE:CB_ALIGN"; Pos = MAP_APPFONT ( 6 , 40 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text[ en-US ] = "Align to text body"; @@ -60,6 +61,7 @@ TabPage DLG_MM_LAYOUT_PAGE }; MetricField MF_LEFT { + HelpID = "sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_LEFT"; Pos = MAP_APPFONT ( 78 , 52 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; @@ -83,6 +85,7 @@ TabPage DLG_MM_LAYOUT_PAGE }; MetricField MF_TOP { + HelpID = "sw:MetricField:DLG_MM_LAYOUT_PAGE:MF_TOP"; Pos = MAP_APPFONT ( 78 , 67 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; @@ -112,6 +115,7 @@ TabPage DLG_MM_LAYOUT_PAGE }; PushButton MF_UP { + HelpID = "sw:PushButton:DLG_MM_LAYOUT_PAGE:MF_UP"; Pos = MAP_APPFONT ( 68 , 96 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "~Up"; @@ -124,6 +128,7 @@ TabPage DLG_MM_LAYOUT_PAGE }; PushButton PB_DOWN { + HelpID = "sw:PushButton:DLG_MM_LAYOUT_PAGE:PB_DOWN"; Pos = MAP_APPFONT ( 68 , 113 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "~Down"; @@ -143,6 +148,7 @@ TabPage DLG_MM_LAYOUT_PAGE }; ListBox LB_ZOOM { + HelpID = "sw:ListBox:DLG_MM_LAYOUT_PAGE:LB_ZOOM"; Pos = MAP_APPFONT ( 204 , 182 ) ; Size = MAP_APPFONT ( 50 , 50 ) ; Border = TRUE; diff --git a/sw/source/ui/dbui/mmmergepage.src b/sw/source/ui/dbui/mmmergepage.src index d2f55bceb978..a66480abacce 100644 --- a/sw/source/ui/dbui/mmmergepage.src +++ b/sw/source/ui/dbui/mmmergepage.src @@ -49,6 +49,7 @@ TabPage DLG_MM_MERGE_PAGE }; PushButton PB_EDIT { + HelpID = "sw:PushButton:DLG_MM_MERGE_PAGE:PB_EDIT"; Pos = MAP_APPFONT ( 70 , 67 ) ; Size = MAP_APPFONT ( 120 , 14 ) ; Text [ en-US ] = "~Edit individual document..."; @@ -67,30 +68,35 @@ TabPage DLG_MM_MERGE_PAGE }; Edit ED_FIND { + HelpID = "sw:Edit:DLG_MM_MERGE_PAGE:ED_FIND"; Pos = MAP_APPFONT ( 55 ,114 ) ; Size = MAP_APPFONT ( 140 , 12 ) ; Border = TRUE; }; PushButton PB_FIND { + HelpID = "sw:PushButton:DLG_MM_MERGE_PAGE:PB_FIND"; Pos = MAP_APPFONT ( 198 ,113 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Find..."; }; CheckBox CB_WHOLEWORDS { + HelpID = "sw:CheckBox:DLG_MM_MERGE_PAGE:CB_WHOLEWORDS"; Pos = MAP_APPFONT ( 55 , 131 ) ; Size = MAP_APPFONT ( 180 , 10 ) ; Text [ en-US ] = "Whole wor~ds only"; }; CheckBox CB_BACKWARDS { + HelpID = "sw:CheckBox:DLG_MM_MERGE_PAGE:CB_BACKWARDS"; Pos = MAP_APPFONT ( 55 , 144 ) ; Size = MAP_APPFONT ( 180 , 10 ) ; Text [ en-US ] = "Back~wards"; }; CheckBox CB_MATCHCASE { + HelpID = "sw:CheckBox:DLG_MM_MERGE_PAGE:CB_MATCHCASE"; Pos = MAP_APPFONT ( 55 , 157 ) ; Size = MAP_APPFONT ( 180 , 10 ) ; Text [ en-US ] = "Ma~tch case"; diff --git a/sw/source/ui/dbui/mmoutputpage.src b/sw/source/ui/dbui/mmoutputpage.src index efe84e34bfe9..cb3a635af5fb 100644 --- a/sw/source/ui/dbui/mmoutputpage.src +++ b/sw/source/ui/dbui/mmoutputpage.src @@ -48,24 +48,28 @@ TabPage DLG_MM_OUTPUT_PAGE }; RadioButton RB_SAVESTARTDOC { + HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVESTARTDOC"; Pos = MAP_APPFONT ( 45 , 40 ) ; Size = MAP_APPFONT ( 209 , 10 ) ; Text[ en-US ] = "~Save starting document"; }; RadioButton RB_SAVEMERGEDDOC { + HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEMERGEDDOC"; Pos = MAP_APPFONT ( 45 , 53 ) ; Size = MAP_APPFONT ( 209 , 10 ) ; Text[ en-US ] = "Save ~merged document" ; }; RadioButton RB_PRINT { + HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_PRINT"; Pos = MAP_APPFONT ( 45 , 66 ) ; Size = MAP_APPFONT ( 209 , 10 ) ; Text[ en-US ] = "~Print merged document"; }; RadioButton RB_SENDMAIL { + HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SENDMAIL"; Pos = MAP_APPFONT ( 45 , 79 ) ; Size = MAP_APPFONT ( 209 , 10 ) ; Text[ en-US ] = "Send merged document as ~E-Mail"; @@ -77,30 +81,35 @@ TabPage DLG_MM_OUTPUT_PAGE }; PushButton PB_SAVESTARTDOC { + HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SAVESTARTDOC"; Pos = MAP_APPFONT ( 55 , 108 ) ; Size = MAP_APPFONT ( 100 , 14 ) ; Text[ en-US ] = "Save starting ~document"; }; RadioButton RB_SAVEASONE { + HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEASONE"; Pos = MAP_APPFONT ( 45 , 109 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "S~ave as single document"; }; RadioButton RB_SAVEINDIVIDUAL { + HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SAVEINDIVIDUAL"; Pos = MAP_APPFONT ( 45, 123 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "Sa~ve as individual documents"; }; RadioButton RB_FROM { + HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_FROM"; Pos = MAP_APPFONT ( 45 , 137 ) ; Size = MAP_APPFONT ( 30 , 10 ) ; Text[ en-US ] = "~From"; }; NumericField NF_FROM { + HelpID = "sw:NumericField:DLG_MM_OUTPUT_PAGE:NF_FROM"; Pos = MAP_APPFONT ( 78 , 136 ) ; Size = MAP_APPFONT ( 20 , 10 ) ; Border = TRUE; @@ -120,6 +129,7 @@ TabPage DLG_MM_OUTPUT_PAGE }; NumericField NF_TO { + HelpID = "sw:NumericField:DLG_MM_OUTPUT_PAGE:NF_TO"; Pos = MAP_APPFONT ( 124 , 136 ) ; Size = MAP_APPFONT ( 20 , 10 ) ; Border = TRUE; @@ -132,6 +142,7 @@ TabPage DLG_MM_OUTPUT_PAGE }; PushButton PB_SAVENOW { + HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SAVENOW"; Pos = MAP_APPFONT ( 45 , 150 ) ; Size = MAP_APPFONT ( 80 , 14 ) ; Text[ en-US ] = "Save Do~cuments"; @@ -144,6 +155,7 @@ TabPage DLG_MM_OUTPUT_PAGE }; ListBox LB_PRINT { + HelpID = "sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_PRINT"; Pos = MAP_APPFONT ( 45 , 109 ) ; Size = MAP_APPFONT ( 147 , 50 ) ; Border = TRUE; @@ -152,18 +164,21 @@ TabPage DLG_MM_OUTPUT_PAGE }; PushButton PB_PRINTERSETTINGS { + HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_PRINTERSETTINGS"; Pos = MAP_APPFONT ( 198 , 108 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "P~roperties..."; }; RadioButton RB_PRINTALL { + HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_PRINTALL"; Pos = MAP_APPFONT ( 45 , 126 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "Print ~all documents"; }; PushButton PB_PRINTNOW { + HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_PRINTNOW"; Pos = MAP_APPFONT ( 45 , 155 ) ; Size = MAP_APPFONT ( 80 , 14 ) ; Text[ en-US ] = "Prin~t Documents"; @@ -177,6 +192,7 @@ TabPage DLG_MM_OUTPUT_PAGE }; ListBox LB_MAILTO { + HelpID = "sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_MAILTO"; Pos = MAP_APPFONT ( 45 , 109 ) ; Size = MAP_APPFONT ( 147 , 50 ) ; DropDown = TRUE; @@ -184,6 +200,7 @@ TabPage DLG_MM_OUTPUT_PAGE }; PushButton PB_COPYTO { + HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_COPYTO"; Pos = MAP_APPFONT ( 198 , 108 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "~Copy to..."; @@ -196,6 +213,7 @@ TabPage DLG_MM_OUTPUT_PAGE }; Edit ED_SUBJECT { + HelpID = "sw:Edit:DLG_MM_OUTPUT_PAGE:ED_SUBJECT"; Pos = MAP_APPFONT ( 45 , 125 ) ; Size = MAP_APPFONT ( 147 , 12 ) ; Border = TRUE; @@ -208,6 +226,7 @@ TabPage DLG_MM_OUTPUT_PAGE }; ListBox LB_SENDAS { + HelpID = "sw:ListBox:DLG_MM_OUTPUT_PAGE:LB_SENDAS"; Pos = MAP_APPFONT ( 45 , 141 ) ; Size = MAP_APPFONT (147 , 70 ) ; DropDown = TRUE; @@ -231,6 +250,7 @@ TabPage DLG_MM_OUTPUT_PAGE }; PushButton PB_SENDAS { + HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SENDAS"; Pos = MAP_APPFONT ( 198 , 140 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text[ en-US ] = "Pr~operties..."; @@ -243,18 +263,21 @@ TabPage DLG_MM_OUTPUT_PAGE }; Edit ED_ATTACHMENT { + HelpID = "sw:Edit:DLG_MM_OUTPUT_PAGE:ED_ATTACHMENT"; Pos = MAP_APPFONT ( 45 , 168 ) ; Size = MAP_APPFONT ( 147 , 12 ) ; Border = TRUE; }; RadioButton RB_SENDALL { + HelpID = "sw:RadioButton:DLG_MM_OUTPUT_PAGE:RB_SENDALL"; Pos = MAP_APPFONT ( 45 , 184 ) ; Size = MAP_APPFONT ( 153 , 10 ) ; Text[ en-US ] = "S~end all documents"; }; PushButton PB_SENDDOCUMENTS { + HelpID = "sw:PushButton:DLG_MM_OUTPUT_PAGE:PB_SENDDOCUMENTS"; Pos = MAP_APPFONT ( 45 , 212 ) ; Size = MAP_APPFONT ( 80 , 14 ) ; Text[ en-US ] = "Se~nd documents"; @@ -321,6 +344,7 @@ ModalDialog DLG_MM_COPYTO }; Edit ED_CC { + HelpID = "sw:Edit:DLG_MM_COPYTO:ED_CC"; Pos = MAP_APPFONT ( 40 , 15 ) ; Size = MAP_APPFONT ( 204 , 12 ) ; Border = TRUE; @@ -333,6 +357,7 @@ ModalDialog DLG_MM_COPYTO }; Edit ED_BCC { + HelpID = "sw:Edit:DLG_MM_COPYTO:ED_BCC"; Pos = MAP_APPFONT ( 40 , 31 ) ; Size = MAP_APPFONT ( 204 , 12 ) ; Border = TRUE; @@ -396,6 +421,7 @@ ModalDialog DLG_MM_SAVEWARNING }; Edit ED_FILENAME { + HelpID = "sw:Edit:DLG_MM_SAVEWARNING:ED_FILENAME"; Pos = MAP_APPFONT ( 40 , 50 ) ; Size = MAP_APPFONT ( 154 , 12 ) ; Border = TRUE; @@ -439,6 +465,7 @@ ModalDialog DLG_MM_QUERY }; Edit ED_TEXT { + HelpID = "sw:Edit:DLG_MM_QUERY:ED_TEXT"; Pos = MAP_APPFONT ( 40 , 39 ) ; Size = MAP_APPFONT ( 194 , 12 ) ; Border = TRUE; diff --git a/sw/source/ui/dbui/mmoutputtypepage.src b/sw/source/ui/dbui/mmoutputtypepage.src index 3c776ff8fb59..f1b9fda069ce 100644 --- a/sw/source/ui/dbui/mmoutputtypepage.src +++ b/sw/source/ui/dbui/mmoutputtypepage.src @@ -48,12 +48,14 @@ TabPage DLG_MM_OUTPUTTYPE_PAGE }; RadioButton RB_LETTER { + HelpID = "sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_LETTER"; Pos = MAP_APPFONT ( 12 , 43 ) ; Size = MAP_APPFONT ( 240 , 10 ) ; Text[ en-US ] = "~Letter"; }; RadioButton RB_MAIL { + HelpID = "sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_MAIL"; Pos = MAP_APPFONT ( 12 , 57 ) ; Size = MAP_APPFONT ( 240 , 10 ) ; Text[ en-US ] = "~E-mail message"; diff --git a/sw/source/ui/dbui/mmpreparemergepage.src b/sw/source/ui/dbui/mmpreparemergepage.src index eac858b1b814..a94c38bc40fa 100644 --- a/sw/source/ui/dbui/mmpreparemergepage.src +++ b/sw/source/ui/dbui/mmpreparemergepage.src @@ -57,6 +57,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE PushButton PB_FIRST { + HelpID = "sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_FIRST"; Pos = MAP_APPFONT ( 75 , 55 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; Text = "|<" ; @@ -64,6 +65,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE }; PushButton PB_PREV { + HelpID = "sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_PREV"; Pos = MAP_APPFONT ( 98 , 55 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; Text = "<" ; @@ -71,6 +73,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE }; NumericField ED_RECORD { + HelpID = "sw:NumericField:DLG_MM_PREPAREMERGE_PAGE:ED_RECORD"; Pos = MAP_APPFONT ( 121 , 56 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; Border = TRUE ; @@ -83,6 +86,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE }; PushButton PB_NEXT { + HelpID = "sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_NEXT"; Pos = MAP_APPFONT ( 144 , 55 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; Text = ">" ; @@ -90,6 +94,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE }; PushButton PB_LAST { + HelpID = "sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_LAST"; Pos = MAP_APPFONT ( 167 , 55 ) ; Size = MAP_APPFONT ( 20 , 14 ) ; Text = ">|" ; @@ -97,6 +102,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE }; CheckBox CB_EXCLUDE { + HelpID = "sw:CheckBox:DLG_MM_PREPAREMERGE_PAGE:CB_EXCLUDE"; Pos = MAP_APPFONT ( 75, 77 ) ; Size = MAP_APPFONT ( 179 , 10 ) ; Text[ en-US ] = "E~xclude this recipient"; @@ -116,6 +122,7 @@ TabPage DLG_MM_PREPAREMERGE_PAGE }; PushButton PB_EDIT { + HelpID = "sw:PushButton:DLG_MM_PREPAREMERGE_PAGE:PB_EDIT"; Pos = MAP_APPFONT ( 90 , 185 ) ; Size = MAP_APPFONT ( 80 , 14 ) ; Text[ en-US ] = "~Edit Document..."; diff --git a/sw/source/ui/dbui/selectdbtabledialog.src b/sw/source/ui/dbui/selectdbtabledialog.src index 271201463fef..157a05faf9f8 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.src +++ b/sw/source/ui/dbui/selectdbtabledialog.src @@ -54,6 +54,7 @@ ModalDialog DLG_MM_SELECTDBTABLEDDIALOG }; PushButton PB_PREVIEW { + HelpID = "sw:PushButton:DLG_MM_SELECTDBTABLEDDIALOG:PB_PREVIEW"; Pos = MAP_APPFONT ( 6 , 84 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Preview"; diff --git a/sw/source/ui/dialog/abstract.src b/sw/source/ui/dialog/abstract.src index 87f7bfb9174c..5cb877a1549b 100644 --- a/sw/source/ui/dialog/abstract.src +++ b/sw/source/ui/dialog/abstract.src @@ -53,6 +53,7 @@ ModalDialog DLG_INSERT_ABSTRACT }; NumericField NF_LEVEL { + HelpID = "sw:NumericField:DLG_INSERT_ABSTRACT:NF_LEVEL"; Border = TRUE ; Pos = MAP_APPFONT ( 153 , 12 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; @@ -75,6 +76,7 @@ ModalDialog DLG_INSERT_ABSTRACT }; NumericField NF_PARA { + HelpID = "sw:NumericField:DLG_INSERT_ABSTRACT:NF_PARA"; Border = TRUE ; Pos = MAP_APPFONT ( 153 , 27 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; diff --git a/sw/source/ui/dialog/ascfldlg.src b/sw/source/ui/dialog/ascfldlg.src index 6ef0ea42b656..78dc6df5ff15 100644 --- a/sw/source/ui/dialog/ascfldlg.src +++ b/sw/source/ui/dialog/ascfldlg.src @@ -50,6 +50,7 @@ ModalDialog DLG_ASCII_FILTER }; ListBox LB_CHARSET { + HelpID = "sw:ListBox:DLG_ASCII_FILTER:LB_CHARSET"; Pos = MAP_APPFONT ( 80 , 14 ) ; Size = MAP_APPFONT ( 90 , 61 ) ; TabStop = TRUE ; @@ -64,6 +65,7 @@ ModalDialog DLG_ASCII_FILTER }; ListBox LB_FONT { + HelpID = "sw:ListBox:DLG_ASCII_FILTER:LB_FONT"; Pos = MAP_APPFONT ( 80 , 30 ) ; Size = MAP_APPFONT ( 90 , 61 ) ; TabStop = TRUE ; @@ -78,6 +80,7 @@ ModalDialog DLG_ASCII_FILTER }; ListBox LB_LANGUAGE { + HelpID = "sw:ListBox:DLG_ASCII_FILTER:LB_LANGUAGE"; Pos = MAP_APPFONT ( 80 , 46 ) ; Size = MAP_APPFONT ( 90 , 61 ) ; TabStop = TRUE ; @@ -92,6 +95,7 @@ ModalDialog DLG_ASCII_FILTER }; RadioButton RB_CRLF { + HelpID = "sw:RadioButton:DLG_ASCII_FILTER:RB_CRLF"; Pos = MAP_APPFONT ( 80 , 64 ) ; Size = MAP_APPFONT ( 40 , 10 ) ; TabStop = TRUE ; @@ -100,6 +104,7 @@ ModalDialog DLG_ASCII_FILTER }; RadioButton RB_CR { + HelpID = "sw:RadioButton:DLG_ASCII_FILTER:RB_CR"; Pos = MAP_APPFONT ( 121 , 64 ) ; Size = MAP_APPFONT ( 20 , 10 ) ; // TabStop = TRUE ; @@ -107,6 +112,7 @@ ModalDialog DLG_ASCII_FILTER }; RadioButton RB_LF { + HelpID = "sw:RadioButton:DLG_ASCII_FILTER:RB_LF"; Pos = MAP_APPFONT ( 155 , 64 ) ; Size = MAP_APPFONT ( 20 , 10 ) ; // TabStop = TRUE ; diff --git a/sw/source/ui/dialog/docstdlg.src b/sw/source/ui/dialog/docstdlg.src index 4384acbe3fe9..4976a42176a2 100644 --- a/sw/source/ui/dialog/docstdlg.src +++ b/sw/source/ui/dialog/docstdlg.src @@ -140,6 +140,7 @@ TabPage TP_DOC_STAT }; PushButton PB_PDATE { + HelpID = "sw:PushButton:TP_DOC_STAT:PB_PDATE"; Pos = MAP_APPFONT ( 204 , 94 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Update" ; diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src index d798e1acb21a..9b0671af93f8 100644 --- a/sw/source/ui/dialog/regionsw.src +++ b/sw/source/ui/dialog/regionsw.src @@ -102,6 +102,7 @@ ModalDialog MD_EDIT_REGION }; Edit ED_RANAME { + HelpID = "sw:Edit:MD_EDIT_REGION:ED_RANAME"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; @@ -124,6 +125,7 @@ ModalDialog MD_EDIT_REGION }; TriStateBox CB_FILE { + HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_FILE"; Pos = MAP_APPFONT ( 98 , 14 ) ; Size = MAP_APPFONT ( 59 , 10 ) ; TabStop = TRUE ; @@ -131,6 +133,7 @@ ModalDialog MD_EDIT_REGION }; CheckBox CB_DDE { + HelpID = "sw:CheckBox:MD_EDIT_REGION:CB_DDE"; Pos = MAP_APPFONT ( 98 , 28 ) ; Size = MAP_APPFONT ( 30 , 10 ) ; Disable = TRUE ; @@ -152,6 +155,7 @@ ModalDialog MD_EDIT_REGION }; Edit ED_FILE { + HelpID = "sw:Edit:MD_EDIT_REGION:ED_FILE"; Border = TRUE ; Pos = MAP_APPFONT ( 165 , 42 ) ; Size = MAP_APPFONT ( 68 , 12 ) ; @@ -160,6 +164,7 @@ ModalDialog MD_EDIT_REGION }; PushButton PB_FILE { + HelpID = "sw:PushButton:MD_EDIT_REGION:PB_FILE"; Pos = MAP_APPFONT ( 239 , 42 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; TabStop = TRUE ; @@ -175,6 +180,7 @@ ModalDialog MD_EDIT_REGION }; ComboBox LB_SUBREG { + HelpID = "sw:ComboBox:MD_EDIT_REGION:LB_SUBREG"; Pos = MAP_APPFONT ( 165 , 57 ) ; Size = MAP_APPFONT ( 68 , 50 ) ; Disable = TRUE ; @@ -191,6 +197,7 @@ ModalDialog MD_EDIT_REGION }; TriStateBox CB_PROTECT { + HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_PROTECT"; Pos = MAP_APPFONT ( 98 , 86 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; TabStop = TRUE ; @@ -200,6 +207,7 @@ ModalDialog MD_EDIT_REGION }; CheckBox CB_PASSWD { + HelpID = "sw:CheckBox:MD_EDIT_REGION:CB_PASSWD"; Pos = MAP_APPFONT ( 107 , 100 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -207,6 +215,7 @@ ModalDialog MD_EDIT_REGION }; PushButton PB_PASSWD { + HelpID = "sw:PushButton:MD_EDIT_REGION:PB_PASSWD"; Pos = MAP_APPFONT ( 239 , 98 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; TabStop = TRUE ; @@ -221,6 +230,7 @@ ModalDialog MD_EDIT_REGION }; TriStateBox CB_HIDE { + HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_HIDE"; Pos = MAP_APPFONT ( 98 , 127 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; TabStop = TRUE ; @@ -236,6 +246,7 @@ ModalDialog MD_EDIT_REGION }; Edit ED_CONDITION { + HelpID = "sw:Edit:MD_EDIT_REGION:ED_CONDITION"; Border = TRUE ; Pos = MAP_APPFONT ( 165 , 141) ; Size = MAP_APPFONT ( 86 , 12 ) ; @@ -252,6 +263,7 @@ ModalDialog MD_EDIT_REGION }; TriStateBox CB_EDIT_IN_READONLY { + HelpID = "sw:TriStateBox:MD_EDIT_REGION:CB_EDIT_IN_READONLY"; Pos = MAP_APPFONT ( 98 , 170 ) ; Size = MAP_APPFONT ( 156 , 10 ) ; TabStop = TRUE ; @@ -275,6 +287,7 @@ ModalDialog MD_EDIT_REGION }; PushButton PB_OPTIONS { + HelpID = "sw:PushButton:MD_EDIT_REGION:PB_OPTIONS"; Pos = MAP_APPFONT ( 263 , 40 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -283,6 +296,7 @@ ModalDialog MD_EDIT_REGION }; PushButton CB_DISMISS { + HelpID = "sw:PushButton:MD_EDIT_REGION:CB_DISMISS"; Pos = MAP_APPFONT ( 263 , 57 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Disable = TRUE ; @@ -412,6 +426,7 @@ TabPage TP_INSERT_SECTION }; ComboBox ED_RNAME { + HelpID = "sw:ComboBox:TP_INSERT_SECTION:ED_RNAME"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 69 , 140 ) ; TabStop = TRUE ; @@ -427,6 +442,7 @@ TabPage TP_INSERT_SECTION }; CheckBox CB_FILE { + HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_FILE"; Pos = MAP_APPFONT ( 96 , 14 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; TabStop = TRUE ; @@ -434,6 +450,7 @@ TabPage TP_INSERT_SECTION }; CheckBox CB_DDE { + HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_DDE"; Pos = MAP_APPFONT ( 96 , 28) ; Size = MAP_APPFONT ( 60 , 10 ) ; Disable = TRUE ; @@ -455,6 +472,7 @@ TabPage TP_INSERT_SECTION }; Edit ED_FILE { + HelpID = "sw:Edit:TP_INSERT_SECTION:ED_FILE"; Border = TRUE ; Pos = MAP_APPFONT ( 160 , 42 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; @@ -463,6 +481,7 @@ TabPage TP_INSERT_SECTION }; PushButton PB_FILE { + HelpID = "sw:PushButton:TP_INSERT_SECTION:PB_FILE"; Pos = MAP_APPFONT ( 239 , 42 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Disable = TRUE ; @@ -478,6 +497,7 @@ TabPage TP_INSERT_SECTION }; ComboBox LB_SUBREG { + HelpID = "sw:ComboBox:TP_INSERT_SECTION:LB_SUBREG"; Pos = MAP_APPFONT ( 160 , 58 ) ; Size = MAP_APPFONT ( 76 , 50 ) ; DropDown = TRUE ; @@ -494,6 +514,7 @@ TabPage TP_INSERT_SECTION }; CheckBox CB_PROTECT { + HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_PROTECT"; Pos = MAP_APPFONT ( 96 , 87 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -501,6 +522,7 @@ TabPage TP_INSERT_SECTION }; CheckBox CB_PASSWD { + HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_PASSWD"; Pos = MAP_APPFONT ( 105 , 101 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -508,6 +530,7 @@ TabPage TP_INSERT_SECTION }; PushButton PB_PASSWD { + HelpID = "sw:PushButton:TP_INSERT_SECTION:PB_PASSWD"; Pos = MAP_APPFONT ( 239 , 99 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; TabStop = TRUE ; @@ -522,6 +545,7 @@ TabPage TP_INSERT_SECTION }; CheckBox CB_HIDE { + HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_HIDE"; Pos = MAP_APPFONT ( 96 , 128 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; CB_HIDE_TEXT @@ -535,6 +559,7 @@ TabPage TP_INSERT_SECTION }; Edit ED_CONDITION { + HelpID = "sw:Edit:TP_INSERT_SECTION:ED_CONDITION"; Border = TRUE ; Pos = MAP_APPFONT ( 160 , 142 ) ; Size = MAP_APPFONT ( 91 , 12 ) ; @@ -551,6 +576,7 @@ TabPage TP_INSERT_SECTION }; CheckBox CB_EDIT_IN_READONLY { + HelpID = "sw:CheckBox:TP_INSERT_SECTION:CB_EDIT_IN_READONLY"; Pos = MAP_APPFONT ( 96 , 170 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; CB_EDIT_IN_READONLY_TEXT @@ -615,6 +641,7 @@ TabPage TP_SECTION_FTNENDNOTES }; CheckBox CB_FTN_AT_TXTEND { + HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_AT_TXTEND"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; TabStop = TRUE ; @@ -623,6 +650,7 @@ TabPage TP_SECTION_FTNENDNOTES }; CheckBox CB_FTN_NUM { + HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM"; Pos = MAP_APPFONT ( 18 , 29 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -637,6 +665,7 @@ TabPage TP_SECTION_FTNENDNOTES }; NumericField FLD_FTN_OFFSET { + HelpID = "sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_FTN_OFFSET"; Pos = MAP_APPFONT ( 90 , 44 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Spin = TRUE ; @@ -649,6 +678,7 @@ TabPage TP_SECTION_FTNENDNOTES }; CheckBox CB_FTN_NUM_FMT { + HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_FTN_NUM_FMT"; Pos = MAP_APPFONT ( 24 , 61 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -663,6 +693,7 @@ TabPage TP_SECTION_FTNENDNOTES }; Edit ED_FTN_PREFIX { + HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_PREFIX"; Border = TRUE ; Pos = MAP_APPFONT ( 90 , 74 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -672,6 +703,7 @@ TabPage TP_SECTION_FTNENDNOTES }; ListBox LB_FTN_NUMVIEW { + HelpID = "sw:ListBox:TP_SECTION_FTNENDNOTES:LB_FTN_NUMVIEW"; Border = TRUE ; Pos = MAP_APPFONT ( 123 , 74 ) ; Size = MAP_APPFONT ( 62 , 50 ) ; @@ -688,6 +720,7 @@ TabPage TP_SECTION_FTNENDNOTES }; Edit ED_FTN_SUFFIX { + HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_FTN_SUFFIX"; Border = TRUE ; Pos = MAP_APPFONT ( 219 , 74 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -706,6 +739,7 @@ TabPage TP_SECTION_FTNENDNOTES }; CheckBox CB_END_AT_TXTEND { + HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_AT_TXTEND"; Pos = MAP_APPFONT ( 12 , 103 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -713,6 +747,7 @@ TabPage TP_SECTION_FTNENDNOTES }; CheckBox CB_END_NUM { + HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM"; Pos = MAP_APPFONT ( 16 , 118 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -727,6 +762,7 @@ TabPage TP_SECTION_FTNENDNOTES }; NumericField FLD_END_OFFSET { + HelpID = "sw:NumericField:TP_SECTION_FTNENDNOTES:FLD_END_OFFSET"; Pos = MAP_APPFONT ( 90 , 133 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Spin = TRUE ; @@ -739,6 +775,7 @@ TabPage TP_SECTION_FTNENDNOTES }; CheckBox CB_END_NUM_FMT { + HelpID = "sw:CheckBox:TP_SECTION_FTNENDNOTES:CB_END_NUM_FMT"; Pos = MAP_APPFONT ( 24 , 150 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -754,6 +791,7 @@ TabPage TP_SECTION_FTNENDNOTES }; Edit ED_END_PREFIX { + HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_PREFIX"; Border = TRUE ; Pos = MAP_APPFONT ( 90 , 163 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -763,6 +801,7 @@ TabPage TP_SECTION_FTNENDNOTES }; ListBox LB_END_NUMVIEW { + HelpID = "sw:ListBox:TP_SECTION_FTNENDNOTES:LB_END_NUMVIEW"; Border = TRUE ; Pos = MAP_APPFONT ( 123 , 163 ) ; Size = MAP_APPFONT ( 62 , 50 ) ; @@ -780,6 +819,7 @@ TabPage TP_SECTION_FTNENDNOTES }; Edit ED_END_SUFFIX { + HelpID = "sw:Edit:TP_SECTION_FTNENDNOTES:ED_END_SUFFIX"; Border = TRUE ; Pos = MAP_APPFONT ( 219 , 163 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; @@ -811,6 +851,7 @@ TabPage TP_SECTION_INDENTS }; MetricField MF_BEFORE { + HelpID = "sw:MetricField:TP_SECTION_INDENTS:MF_BEFORE"; Border = TRUE ; Pos = MAP_APPFONT ( 135 , 14 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -834,6 +875,7 @@ TabPage TP_SECTION_INDENTS }; MetricField MF_AFTER { + HelpID = "sw:MetricField:TP_SECTION_INDENTS:MF_AFTER"; Border = TRUE ; Pos = MAP_APPFONT ( 135 , 30 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; diff --git a/sw/source/ui/dochdl/selglos.src b/sw/source/ui/dochdl/selglos.src index 0815fa7bdacf..d48e61aea37b 100644 --- a/sw/source/ui/dochdl/selglos.src +++ b/sw/source/ui/dochdl/selglos.src @@ -68,6 +68,7 @@ ModalDialog DLG_SEL_GLOS }; ListBox LB_GLOS { + HelpID = "sw:ListBox:DLG_SEL_GLOS:LB_GLOS"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 140 , 74 ) ; diff --git a/sw/source/ui/envelp/envfmt.src b/sw/source/ui/envelp/envfmt.src index ae0693205b87..5ad5a4b9d6a4 100644 --- a/sw/source/ui/envelp/envfmt.src +++ b/sw/source/ui/envelp/envfmt.src @@ -57,6 +57,7 @@ TabPage TP_ENV_FMT }; MetricField FLD_ADDR_LEFT { + HelpID = "sw:MetricField:TP_ENV_FMT:FLD_ADDR_LEFT"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 25 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -81,6 +82,7 @@ TabPage TP_ENV_FMT }; MetricField FLD_ADDR_TOP { + HelpID = "sw:MetricField:TP_ENV_FMT:FLD_ADDR_TOP"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 41 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -105,6 +107,7 @@ TabPage TP_ENV_FMT }; MenuButton BTN_ADDR_EDIT { + HelpID = "sw:MenuButton:TP_ENV_FMT:BTN_ADDR_EDIT"; Pos = MAP_APPFONT ( 194 , 24 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -132,6 +135,7 @@ TabPage TP_ENV_FMT }; MetricField FLD_SEND_LEFT { + HelpID = "sw:MetricField:TP_ENV_FMT:FLD_SEND_LEFT"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 78 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -156,6 +160,7 @@ TabPage TP_ENV_FMT }; MetricField FLD_SEND_TOP { + HelpID = "sw:MetricField:TP_ENV_FMT:FLD_SEND_TOP"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 94 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -180,6 +185,7 @@ TabPage TP_ENV_FMT }; MenuButton BTN_SEND_EDIT { + HelpID = "sw:MenuButton:TP_ENV_FMT:BTN_SEND_EDIT"; Pos = MAP_APPFONT ( 194 , 77 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Edit" ; @@ -200,6 +206,7 @@ TabPage TP_ENV_FMT }; ListBox BOX_SIZE_FORMAT { + HelpID = "sw:ListBox:TP_ENV_FMT:BOX_SIZE_FORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 120 ) ; Size = MAP_APPFONT ( 40 , 72 ) ; @@ -215,6 +222,7 @@ TabPage TP_ENV_FMT }; MetricField FLD_SIZE_WIDTH { + HelpID = "sw:MetricField:TP_ENV_FMT:FLD_SIZE_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 136 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -239,6 +247,7 @@ TabPage TP_ENV_FMT }; MetricField FLD_SIZE_HEIGHT { + HelpID = "sw:MetricField:TP_ENV_FMT:FLD_SIZE_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 152 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; diff --git a/sw/source/ui/envelp/envlop.src b/sw/source/ui/envelp/envlop.src index c85b6cd1a7ab..2b9a5a084cc8 100644 --- a/sw/source/ui/envelp/envlop.src +++ b/sw/source/ui/envelp/envlop.src @@ -86,6 +86,7 @@ TabPage TP_ENV_ENV }; MultiLineEdit EDT_ADDR { + HelpID = "sw:MultiLineEdit:TP_ENV_ENV:EDT_ADDR"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 124 , 66 ) ; @@ -103,6 +104,7 @@ TabPage TP_ENV_ENV }; ListBox LB_DATABASE { + HelpID = "sw:ListBox:TP_ENV_ENV:LB_DATABASE"; Border = TRUE ; Pos = MAP_APPFONT ( 162 , 17 ) ; Size = MAP_APPFONT ( 82 , 50 ) ; @@ -117,6 +119,7 @@ TabPage TP_ENV_ENV }; ListBox LB_TABLE { + HelpID = "sw:ListBox:TP_ENV_ENV:LB_TABLE"; Border = TRUE ; Pos = MAP_APPFONT ( 162 , 44 ) ; Size = MAP_APPFONT ( 82 , 50 ) ; @@ -125,6 +128,7 @@ TabPage TP_ENV_ENV }; ImageButton BTN_INSERT { + HelpID = "sw:ImageButton:TP_ENV_ENV:BTN_INSERT"; Pos = MAP_APPFONT ( 137 , 71 ) ; Size = MAP_APPFONT ( 18 , 12 ) ; SYMBOL = IMAGEBUTTON_ARROW_LEFT ; @@ -138,6 +142,7 @@ TabPage TP_ENV_ENV }; ListBox LB_DBFIELD { + HelpID = "sw:ListBox:TP_ENV_ENV:LB_DBFIELD"; Border = TRUE ; Pos = MAP_APPFONT ( 162 , 71 ) ; Size = MAP_APPFONT ( 82 , 50 ) ; @@ -146,6 +151,7 @@ TabPage TP_ENV_ENV }; CheckBox BOX_SEND { + HelpID = "sw:CheckBox:TP_ENV_ENV:BOX_SEND"; Pos = MAP_APPFONT ( 6 , 105 ) ; Size = MAP_APPFONT ( 124 , 8 ) ; Text [ en-US ] = "~Sender" ; @@ -153,6 +159,7 @@ TabPage TP_ENV_ENV }; MultiLineEdit EDT_SEND { + HelpID = "sw:MultiLineEdit:TP_ENV_ENV:EDT_SEND"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 116) ; Size = MAP_APPFONT ( 124 , 63 ) ; diff --git a/sw/source/ui/envelp/envprt.src b/sw/source/ui/envelp/envprt.src index ef517a6ca1f5..a12db0d166f9 100644 --- a/sw/source/ui/envelp/envprt.src +++ b/sw/source/ui/envelp/envprt.src @@ -80,6 +80,7 @@ TabPage TP_ENV_PRT }; RadioButton BTN_TOP { + HelpID = "sw:RadioButton:TP_ENV_PRT:BTN_TOP"; Pos = MAP_APPFONT ( 18 , 42 ) ; Size = MAP_APPFONT ( 179 , 10 ) ; Text [ en-US ] = "~Print from top" ; @@ -89,6 +90,7 @@ TabPage TP_ENV_PRT }; RadioButton BTN_BOTTOM { + HelpID = "sw:RadioButton:TP_ENV_PRT:BTN_BOTTOM"; Pos = MAP_APPFONT ( 18 , 56 ) ; Size = MAP_APPFONT ( 179 , 10 ) ; Text [ en-US ] = "Print from ~bottom" ; @@ -103,6 +105,7 @@ TabPage TP_ENV_PRT }; MetricField FLD_RIGHT { + HelpID = "sw:MetricField:TP_ENV_PRT:FLD_RIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 86 , 72 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -127,6 +130,7 @@ TabPage TP_ENV_PRT }; MetricField FLD_DOWN { + HelpID = "sw:MetricField:TP_ENV_PRT:FLD_DOWN"; Border = TRUE ; Pos = MAP_APPFONT ( 86 , 88 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -157,6 +161,7 @@ TabPage TP_ENV_PRT }; PushButton BTN_PRTSETUP { + HelpID = "sw:PushButton:TP_ENV_PRT:BTN_PRTSETUP"; Pos = MAP_APPFONT ( 198 , 114 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/envelp/label.src b/sw/source/ui/envelp/label.src index 40d9560deee7..bd5be722ce46 100644 --- a/sw/source/ui/envelp/label.src +++ b/sw/source/ui/envelp/label.src @@ -110,6 +110,7 @@ TabPage TP_LAB_LAB }; CheckBox BOX_ADDR { + HelpID = "sw:CheckBox:TP_LAB_LAB:BOX_ADDR"; Pos = MAP_APPFONT ( 67 , 14 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; @@ -117,6 +118,7 @@ TabPage TP_LAB_LAB }; MultiLineEdit EDT_WRITING { + HelpID = "sw:MultiLineEdit:TP_LAB_LAB:EDT_WRITING"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 105 , 89 ) ; @@ -134,6 +136,7 @@ TabPage TP_LAB_LAB }; ListBox LB_DATABASE { + HelpID = "sw:ListBox:TP_LAB_LAB:LB_DATABASE"; Border = TRUE ; Pos = MAP_APPFONT ( 149 , 27 ) ; Size = MAP_APPFONT ( 99 , 70 ) ; @@ -148,6 +151,7 @@ TabPage TP_LAB_LAB }; ListBox LB_TABLE { + HelpID = "sw:ListBox:TP_LAB_LAB:LB_TABLE"; Border = TRUE ; Pos = MAP_APPFONT ( 149 , 56 ) ; Size = MAP_APPFONT ( 99 , 70 ) ; @@ -156,6 +160,7 @@ TabPage TP_LAB_LAB }; ImageButton BTN_INSERT { + HelpID = "sw:ImageButton:TP_LAB_LAB:BTN_INSERT"; Pos = MAP_APPFONT ( 124 , 92 ) ; Size = MAP_APPFONT ( 18 , 12 ) ; SYMBOL = IMAGEBUTTON_ARROW_LEFT ; @@ -169,6 +174,7 @@ TabPage TP_LAB_LAB }; ListBox LB_DBFIELD { + HelpID = "sw:ListBox:TP_LAB_LAB:LB_DBFIELD"; Border = TRUE ; Pos = MAP_APPFONT ( 149 , 92 ) ; Size = MAP_APPFONT ( 99 , 70 ) ; @@ -184,6 +190,7 @@ TabPage TP_LAB_LAB }; RadioButton BTN_CONT { + HelpID = "sw:RadioButton:TP_LAB_LAB:BTN_CONT"; Pos = MAP_APPFONT ( 12 , 137 ) ; Size = MAP_APPFONT ( 65 , 10 ) ; TabStop = TRUE ; @@ -192,6 +199,7 @@ TabPage TP_LAB_LAB }; RadioButton BTN_SHEET { + HelpID = "sw:RadioButton:TP_LAB_LAB:BTN_SHEET"; Pos = MAP_APPFONT ( 12 , 153 ) ; Size = MAP_APPFONT ( 65 , 10 ) ; Text [ en-US ] = "~Sheet" ; @@ -205,6 +213,7 @@ TabPage TP_LAB_LAB }; ListBox BOX_MAKE { + HelpID = "sw:ListBox:TP_LAB_LAB:BOX_MAKE"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 136 ) ; Size = MAP_APPFONT ( 124 , 90 ) ; @@ -220,6 +229,7 @@ TabPage TP_LAB_LAB }; ListBox BOX_TYPE { + HelpID = "sw:ListBox:TP_LAB_LAB:BOX_TYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 124 , 152 ) ; Size = MAP_APPFONT ( 124 , 90 ) ; @@ -255,6 +265,7 @@ FloatingWindow DLG_SYNC_BTN Hide = TRUE ; PushButton BTN_SYNC { + HelpID = "sw:PushButton:DLG_SYNC_BTN:BTN_SYNC"; Pos = MAP_APPFONT ( 1 , 1 ) ; Size = MAP_APPFONT ( WIDTH - 1 , HEIGHT - 1 ) ; Text [ en-US ] = "Synchronize Labels" ; @@ -291,6 +302,7 @@ TabPage TP_VISITING_CARDS }; ListBox LB_AUTO_TEXT_GROUP { + HelpID = "sw:ListBox:TP_VISITING_CARDS:LB_AUTO_TEXT_GROUP"; Pos = MAP_APPFONT ( 12 , 164) ; Size = MAP_APPFONT ( 109 , 50 ) ; Border = TRUE ; @@ -332,18 +344,21 @@ TabPage TP_PRIVATE_DATA }; Edit ED_FIRSTNAME { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME"; Pos = MAP_APPFONT ( 105 , 14 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; Border = TRUE ; }; Edit ED_NAME { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_NAME"; Pos = MAP_APPFONT ( 163 , 14 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; Border = TRUE ; }; Edit ED_SHORTCUT { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT"; Pos = MAP_APPFONT ( 221 , 14 ) ; Size = MAP_APPFONT ( 27 , 12 ) ; Border = TRUE ; @@ -356,18 +371,21 @@ TabPage TP_PRIVATE_DATA }; Edit ED_FIRSTNAME_2 { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_FIRSTNAME_2"; Pos = MAP_APPFONT ( 105 , 30 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; Border = TRUE ; }; Edit ED_NAME_2 { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_NAME_2"; Pos = MAP_APPFONT ( 163 , 30 ) ; Size = MAP_APPFONT ( 55 , 12 ) ; Border = TRUE ; }; Edit ED_SHORTCUT_2 { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_SHORTCUT_2"; Pos = MAP_APPFONT ( 221 , 30 ) ; Size = MAP_APPFONT ( 27 , 12 ) ; Border = TRUE ; @@ -380,6 +398,7 @@ TabPage TP_PRIVATE_DATA }; Edit ED_STREET { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_STREET"; Pos = MAP_APPFONT ( 105 , 46 ) ; Size = MAP_APPFONT ( 143 , 12 ) ; Border = TRUE ; @@ -392,12 +411,14 @@ TabPage TP_PRIVATE_DATA }; Edit ED_ZIP { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_ZIP"; Pos = MAP_APPFONT ( 105 , 62 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; Border = TRUE ; }; Edit ED_CITY { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_CITY"; Pos = MAP_APPFONT ( 158 , 62 ) ; Size = MAP_APPFONT ( 90 , 12 ) ; Border = TRUE ; @@ -410,12 +431,14 @@ TabPage TP_PRIVATE_DATA }; Edit ED_COUNTRY { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_COUNTRY"; Pos = MAP_APPFONT ( 105 , 78 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; Border = TRUE ; }; Edit ED_STATE { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_STATE"; Pos = MAP_APPFONT ( 179 , 78 ) ; Size = MAP_APPFONT ( 69 , 12 ) ; Border = TRUE ; @@ -428,12 +451,14 @@ TabPage TP_PRIVATE_DATA }; Edit ED_TITLE { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_TITLE"; Pos = MAP_APPFONT ( 105 , 94 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; Border = TRUE ; }; Edit ED_PROFESSION { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_PROFESSION"; Pos = MAP_APPFONT ( 179 , 94 ) ; Size = MAP_APPFONT ( 69 , 12 ) ; Border = TRUE ; @@ -446,12 +471,14 @@ TabPage TP_PRIVATE_DATA }; Edit ED_PHONE { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_PHONE"; Pos = MAP_APPFONT ( 105 , 110 ) ; Size = MAP_APPFONT ( 71 , 12 ) ; Border = TRUE ; }; Edit ED_MOBILE { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_MOBILE"; Pos = MAP_APPFONT ( 179 , 110 ) ; Size = MAP_APPFONT ( 69 , 12 ) ; Border = TRUE ; @@ -464,6 +491,7 @@ TabPage TP_PRIVATE_DATA }; Edit ED_FAX { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_FAX"; Pos = MAP_APPFONT ( 105 , 126 ) ; Size = MAP_APPFONT ( 143 , 12 ) ; Border = TRUE ; @@ -476,12 +504,14 @@ TabPage TP_PRIVATE_DATA }; Edit ED_WWW { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_WWW"; Pos = MAP_APPFONT ( 105 , 142) ; Size = MAP_APPFONT ( 71 , 12 ) ; Border = TRUE ; }; Edit ED_MAIL { + HelpID = "sw:Edit:TP_PRIVATE_DATA:ED_MAIL"; Pos = MAP_APPFONT ( 179 , 142) ; Size = MAP_APPFONT ( 69 , 12 ) ; Border = TRUE ; @@ -506,6 +536,7 @@ TabPage TP_BUSINESS_DATA }; Edit ED_COMP { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_COMP"; Pos = MAP_APPFONT ( 105 , 14) ; Size = MAP_APPFONT ( 143 , 12 ) ; Border = TRUE ; @@ -518,6 +549,7 @@ TabPage TP_BUSINESS_DATA }; Edit ED_COMP_EXT { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_COMP_EXT"; Pos = MAP_APPFONT ( 105 , 30) ; Size = MAP_APPFONT ( 143 , 12 ) ; Border = TRUE ; @@ -530,6 +562,7 @@ TabPage TP_BUSINESS_DATA }; Edit ED_SLOGAN { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_SLOGAN"; Pos = MAP_APPFONT ( 105 , 46) ; Size = MAP_APPFONT ( 143 , 12 ) ; Border = TRUE ; @@ -542,6 +575,7 @@ TabPage TP_BUSINESS_DATA }; Edit ED_STREET { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_STREET"; Pos = MAP_APPFONT ( 105 , 62) ; Size = MAP_APPFONT ( 143 , 12 ) ; Border = TRUE ; @@ -554,12 +588,14 @@ TabPage TP_BUSINESS_DATA }; Edit ED_ZIP { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_ZIP"; Pos = MAP_APPFONT ( 105 , 78) ; Size = MAP_APPFONT ( 50 , 12 ) ; Border = TRUE ; }; Edit ED_CITY { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_CITY"; Pos = MAP_APPFONT ( 158 , 78) ; Size = MAP_APPFONT ( 90 , 12 ) ; Border = TRUE ; @@ -572,12 +608,14 @@ TabPage TP_BUSINESS_DATA }; Edit ED_COUNTRY { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_COUNTRY"; Pos = MAP_APPFONT ( 105 , 94) ; Size = MAP_APPFONT ( 71 , 12 ) ; Border = TRUE ; }; Edit ED_STATE { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_STATE"; Pos = MAP_APPFONT ( 179 , 94) ; Size = MAP_APPFONT ( 69 , 12 ) ; Border = TRUE ; @@ -590,6 +628,7 @@ TabPage TP_BUSINESS_DATA }; Edit ED_POSITION { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_POSITION"; Pos = MAP_APPFONT ( 105 , 110) ; Size = MAP_APPFONT ( 143 , 12 ) ; Border = TRUE ; @@ -602,12 +641,14 @@ TabPage TP_BUSINESS_DATA }; Edit ED_PHONE { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_PHONE"; Pos = MAP_APPFONT ( 105 , 126) ; Size = MAP_APPFONT ( 71 , 12 ) ; Border = TRUE ; }; Edit ED_MOBILE { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_MOBILE"; Pos = MAP_APPFONT ( 179 , 126) ; Size = MAP_APPFONT ( 69 , 12 ) ; Border = TRUE ; @@ -620,6 +661,7 @@ TabPage TP_BUSINESS_DATA }; Edit ED_FAX { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_FAX"; Pos = MAP_APPFONT ( 105 , 142) ; Size = MAP_APPFONT ( 143 , 12 ) ; Border = TRUE ; @@ -632,12 +674,14 @@ TabPage TP_BUSINESS_DATA }; Edit ED_WWW { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_WWW"; Pos = MAP_APPFONT ( 105 , 158) ; Size = MAP_APPFONT ( 71 , 12 ) ; Border = TRUE ; }; Edit ED_MAIL { + HelpID = "sw:Edit:TP_BUSINESS_DATA:ED_MAIL"; Pos = MAP_APPFONT ( 179 , 158) ; Size = MAP_APPFONT ( 69 , 12 ) ; Border = TRUE ; diff --git a/sw/source/ui/envelp/labfmt.src b/sw/source/ui/envelp/labfmt.src index 890df1220250..58605e3db43d 100644 --- a/sw/source/ui/envelp/labfmt.src +++ b/sw/source/ui/envelp/labfmt.src @@ -61,6 +61,7 @@ TabPage TP_LAB_FMT }; MetricField FLD_HDIST { + HelpID = "sw:MetricField:TP_LAB_FMT:FLD_HDIST"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 17 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -81,6 +82,7 @@ TabPage TP_LAB_FMT }; MetricField FLD_VDIST { + HelpID = "sw:MetricField:TP_LAB_FMT:FLD_VDIST"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 33 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -101,6 +103,7 @@ TabPage TP_LAB_FMT }; MetricField FLD_WIDTH { + HelpID = "sw:MetricField:TP_LAB_FMT:FLD_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 49 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -121,6 +124,7 @@ TabPage TP_LAB_FMT }; MetricField FLD_HEIGHT { + HelpID = "sw:MetricField:TP_LAB_FMT:FLD_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 65 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -141,6 +145,7 @@ TabPage TP_LAB_FMT }; MetricField FLD_LEFT { + HelpID = "sw:MetricField:TP_LAB_FMT:FLD_LEFT"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 81 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -163,6 +168,7 @@ TabPage TP_LAB_FMT }; MetricField FLD_UPPER { + HelpID = "sw:MetricField:TP_LAB_FMT:FLD_UPPER"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 97 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -185,6 +191,7 @@ TabPage TP_LAB_FMT }; NumericField FLD_COLUMNS { + HelpID = "sw:NumericField:TP_LAB_FMT:FLD_COLUMNS"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 113 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -204,6 +211,7 @@ TabPage TP_LAB_FMT }; NumericField FLD_ROWS { + HelpID = "sw:NumericField:TP_LAB_FMT:FLD_ROWS"; Border = TRUE ; Pos = MAP_APPFONT ( 60 , 129 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -216,6 +224,7 @@ TabPage TP_LAB_FMT }; PushButton PB_SAVE { + HelpID = "sw:PushButton:TP_LAB_FMT:PB_SAVE"; Pos = MAP_APPFONT ( 50 , 148 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Save..."; @@ -270,6 +279,7 @@ ModalDialog DLG_SAVE_LABEL }; ComboBox CB_MAKE { + HelpID = "sw:ComboBox:DLG_SAVE_LABEL:CB_MAKE"; Pos = MAP_APPFONT ( 65 , 15 ) ; Size = MAP_APPFONT ( 100 , 50 ) ; Border = TRUE; @@ -284,6 +294,7 @@ ModalDialog DLG_SAVE_LABEL }; Edit ED_TYPE { + HelpID = "sw:Edit:DLG_SAVE_LABEL:ED_TYPE"; Pos = MAP_APPFONT ( 65 , 30 ) ; Size = MAP_APPFONT ( 100 , 12 ) ; Border = TRUE; diff --git a/sw/source/ui/envelp/labprt.src b/sw/source/ui/envelp/labprt.src index 6ace6002d7f6..2a8b4e537bd0 100644 --- a/sw/source/ui/envelp/labprt.src +++ b/sw/source/ui/envelp/labprt.src @@ -37,6 +37,7 @@ TabPage TP_LAB_PRT Hide = TRUE ; RadioButton BTN_PAGE { + HelpID = "sw:RadioButton:TP_LAB_PRT:BTN_PAGE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; TabStop = TRUE ; @@ -45,6 +46,7 @@ TabPage TP_LAB_PRT }; RadioButton BTN_SINGLE { + HelpID = "sw:RadioButton:TP_LAB_PRT:BTN_SINGLE"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "~Single label" ; @@ -58,6 +60,7 @@ TabPage TP_LAB_PRT }; NumericField FLD_COL { + HelpID = "sw:NumericField:TP_LAB_PRT:FLD_COL"; Border = TRUE ; Pos = MAP_APPFONT ( 160 , 27 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; @@ -77,6 +80,7 @@ TabPage TP_LAB_PRT }; NumericField FLD_ROW { + HelpID = "sw:NumericField:TP_LAB_PRT:FLD_ROW"; Border = TRUE ; Pos = MAP_APPFONT ( 224 , 27 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; @@ -89,6 +93,7 @@ TabPage TP_LAB_PRT }; CheckBox CB_SYNCHRON { + HelpID = "sw:CheckBox:TP_LAB_PRT:CB_SYNCHRON"; Pos = MAP_APPFONT ( 12 , 43 ) ; Size = MAP_APPFONT ( 120 , 10 ) ; TabStop = TRUE ; @@ -109,6 +114,7 @@ TabPage TP_LAB_PRT }; PushButton BTN_PRTSETUP { + HelpID = "sw:PushButton:TP_LAB_PRT:BTN_PRTSETUP"; Pos = MAP_APPFONT ( 198 , 70 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src index e73dec9e9e72..a19c36458366 100644 --- a/sw/source/ui/envelp/mailmrge.src +++ b/sw/source/ui/envelp/mailmrge.src @@ -49,6 +49,7 @@ ModalDialog DLG_MAILMERGE }; RadioButton RB_ALL { + HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_ALL"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "~All" ; @@ -56,6 +57,7 @@ ModalDialog DLG_MAILMERGE }; RadioButton RB_MARKED { + HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_MARKED"; Pos = MAP_APPFONT ( 12 , 110 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "~Selected records" ; @@ -63,6 +65,7 @@ ModalDialog DLG_MAILMERGE }; RadioButton RB_FROM { + HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_FROM"; Pos = MAP_APPFONT ( 12 , 123 ) ; Size = MAP_APPFONT ( 33 , 10 ) ; Text [ en-US ] = "~From:" ; @@ -70,6 +73,7 @@ ModalDialog DLG_MAILMERGE }; NumericField NF_FROM { + HelpID = "sw:NumericField:DLG_MAILMERGE:NF_FROM"; Border = TRUE ; Pos = MAP_APPFONT ( 48 , 122 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; @@ -87,6 +91,7 @@ ModalDialog DLG_MAILMERGE }; NumericField NF_TO { + HelpID = "sw:NumericField:DLG_MAILMERGE:NF_TO"; Border = TRUE ; Pos = MAP_APPFONT ( 105 , 122 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; @@ -103,6 +108,7 @@ ModalDialog DLG_MAILMERGE }; RadioButton RB_PRINTER { + HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_PRINTER"; Pos = MAP_APPFONT ( 144 , 97 ) ; Size = MAP_APPFONT ( 53 , 10 ) ; Check = TRUE ; @@ -111,6 +117,7 @@ ModalDialog DLG_MAILMERGE }; RadioButton RB_MAILING { + HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_MAILING"; Pos = MAP_APPFONT ( 200 , 97 ) ; Size = MAP_APPFONT ( 53 , 10 ) ; TabStop = TRUE ; @@ -118,6 +125,7 @@ ModalDialog DLG_MAILMERGE }; RadioButton RB_FILE { + HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_FILE"; Pos = MAP_APPFONT ( 256 , 97 ) ; Size = MAP_APPFONT ( 56 , 10 ) ; TabStop = TRUE ; @@ -125,6 +133,7 @@ ModalDialog DLG_MAILMERGE }; CheckBox CB_SINGLE_JOBS { + HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_SINGLE_JOBS"; Pos = MAP_APPFONT ( 150 , 112 ) ; Size = MAP_APPFONT ( 142 , 10 ) ; TabStop = TRUE ; @@ -138,6 +147,7 @@ ModalDialog DLG_MAILMERGE }; RadioButton RB_SAVE_SINGLE_DOC { + HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_SAVE_SINGLE_DOC"; Pos = MAP_APPFONT ( 150, 139 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; TabStop = TRUE ; @@ -145,6 +155,7 @@ ModalDialog DLG_MAILMERGE }; RadioButton RB_SAVE_INDIVIDUAL { + HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_SAVE_INDIVIDUAL"; Pos = MAP_APPFONT ( 150, 152 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; TabStop = TRUE ; @@ -152,6 +163,7 @@ ModalDialog DLG_MAILMERGE }; CheckBox RB_GENERATE_FROM_DATABASE { + HelpID = "sw:CheckBox:DLG_MAILMERGE:RB_GENERATE_FROM_DATABASE"; Pos = MAP_APPFONT ( 156, 168 ) ; Size = MAP_APPFONT ( 144 , 10 ) ; TabStop = TRUE ; @@ -165,6 +177,7 @@ ModalDialog DLG_MAILMERGE }; ListBox LB_COLUMN { + HelpID = "sw:ListBox:DLG_MAILMERGE:LB_COLUMN"; Border = TRUE ; Pos = MAP_APPFONT ( 205 , 182 ) ; Size = MAP_APPFONT ( 103 , 84 ) ; @@ -179,6 +192,7 @@ ModalDialog DLG_MAILMERGE }; Edit ED_PATH { + HelpID = "sw:Edit:DLG_MAILMERGE:ED_PATH"; Pos = MAP_APPFONT ( 205 , 198 ) ; Size = MAP_APPFONT ( 86 , 12 ) ; Border = TRUE ; @@ -186,6 +200,7 @@ ModalDialog DLG_MAILMERGE }; PushButton PB_PATH { + HelpID = "sw:PushButton:DLG_MAILMERGE:PB_PATH"; Pos = MAP_APPFONT ( 294 , 198 ) ; Size = MAP_APPFONT ( 14 , 12 ) ; // Soll Groesse des Edits haben (12)! @@ -200,6 +215,7 @@ ModalDialog DLG_MAILMERGE }; ListBox LB_FILTER { + HelpID = "sw:ListBox:DLG_MAILMERGE:LB_FILTER"; Border = TRUE ; Pos = MAP_APPFONT ( 205 , 214 ) ; Size = MAP_APPFONT ( 103 , 84 ) ; @@ -209,6 +225,7 @@ ModalDialog DLG_MAILMERGE }; ListBox LB_ADDRESSFLD { + HelpID = "sw:ListBox:DLG_MAILMERGE:LB_ADDRESSFLD"; Border = TRUE ; Pos = MAP_APPFONT ( 220 , 110 ) ; Size = MAP_APPFONT ( 74 , 84 ) ; @@ -226,6 +243,7 @@ ModalDialog DLG_MAILMERGE }; Edit ED_SUBJECT { + HelpID = "sw:Edit:DLG_MAILMERGE:ED_SUBJECT"; Border = TRUE ; Pos = MAP_APPFONT ( 220 , 127 ) ; Size = MAP_APPFONT ( 88 , 12 ) ; @@ -241,6 +259,7 @@ ModalDialog DLG_MAILMERGE }; Edit ED_ATTACH { + HelpID = "sw:Edit:DLG_MAILMERGE:ED_ATTACH"; Border = TRUE ; Pos = MAP_APPFONT ( 220 , 140 ) ; Size = MAP_APPFONT ( 72 , 12 ) ; @@ -250,6 +269,7 @@ ModalDialog DLG_MAILMERGE }; PushButton PB_ATTACH { + HelpID = "sw:PushButton:DLG_MAILMERGE:PB_ATTACH"; Pos = MAP_APPFONT ( 294 , 140 ) ; Size = MAP_APPFONT ( 14 , 12 ) ; // Soll Groesse des Edits haben (12)! @@ -266,6 +286,7 @@ ModalDialog DLG_MAILMERGE }; CheckBox CB_FORMAT_HTML { + HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_HTML"; Pos = MAP_APPFONT ( 220 , 156 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Disable = TRUE ; @@ -275,6 +296,7 @@ ModalDialog DLG_MAILMERGE }; CheckBox CB_FORMAT_RTF { + HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_RTF"; Pos = MAP_APPFONT ( 220 , 169 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Disable = TRUE ; @@ -283,6 +305,7 @@ ModalDialog DLG_MAILMERGE }; CheckBox CB_FORMAT_SW { + HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_SW"; Pos = MAP_APPFONT ( 220, 182 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Disable = TRUE ; @@ -340,6 +363,7 @@ ModalDialog DLG_MERGE_CREATE }; RadioButton RB_THISDOC { + HelpID = "sw:RadioButton:DLG_MERGE_CREATE:RB_THISDOC"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Check = TRUE; @@ -348,6 +372,7 @@ ModalDialog DLG_MERGE_CREATE }; RadioButton RB_TEMPLATE { + HelpID = "sw:RadioButton:DLG_MERGE_CREATE:RB_TEMPLATE"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; TabStop = TRUE ; @@ -387,6 +412,7 @@ ModalDialog DLG_MERGE_FIELD_CONNECTIONS }; RadioButton RB_USEEXISTING { + HelpID = "sw:RadioButton:DLG_MERGE_FIELD_CONNECTIONS:RB_USEEXISTING"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 130 , 10 ) ; Check = TRUE; @@ -395,6 +421,7 @@ ModalDialog DLG_MERGE_FIELD_CONNECTIONS }; RadioButton RB_CREATENEW { + HelpID = "sw:RadioButton:DLG_MERGE_FIELD_CONNECTIONS:RB_CREATENEW"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 130 , 10 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/fldui/DropDownFieldDialog.src b/sw/source/ui/fldui/DropDownFieldDialog.src index 407ee199a8ef..e84b3d73c854 100644 --- a/sw/source/ui/fldui/DropDownFieldDialog.src +++ b/sw/source/ui/fldui/DropDownFieldDialog.src @@ -45,6 +45,7 @@ ModalDialog DLG_FLD_DROPDOWN }; ListBox LB_LISTITEMS { + HelpID = "sw:ListBox:DLG_FLD_DROPDOWN:LB_LISTITEMS"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 115 , 99 ) ; @@ -67,6 +68,7 @@ ModalDialog DLG_FLD_DROPDOWN }; PushButton PB_NEXT { + HelpID = "sw:PushButton:DLG_FLD_DROPDOWN:PB_NEXT"; Pos = MAP_APPFONT ( 139 , 40 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -81,6 +83,7 @@ ModalDialog DLG_FLD_DROPDOWN }; PushButton PB_EDIT { + HelpID = "sw:PushButton:DLG_FLD_DROPDOWN:PB_EDIT"; Pos = MAP_APPFONT ( 139 , 99 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/fldui/changedb.src b/sw/source/ui/fldui/changedb.src index babf0b5bba13..7a67a360eda7 100644 --- a/sw/source/ui/fldui/changedb.src +++ b/sw/source/ui/fldui/changedb.src @@ -31,6 +31,7 @@ ModalDialog DLG_CHANGE_DB { + HelpID = "sw:ModalDialog:DLG_CHANGE_DB"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 286 , 175 ) ; @@ -74,6 +75,7 @@ ModalDialog DLG_CHANGE_DB }; PushButton PB_ADDDB { + HelpID = "sw:PushButton:DLG_CHANGE_DB:PB_ADDDB"; Pos = MAP_APPFONT ( 118 , 90 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Browse..." ; diff --git a/sw/source/ui/fldui/flddb.src b/sw/source/ui/fldui/flddb.src index ce9f3dd8a09a..6e715c455473 100644 --- a/sw/source/ui/fldui/flddb.src +++ b/sw/source/ui/fldui/flddb.src @@ -43,6 +43,7 @@ TabPage TP_FLD_DB }; ListBox LB_DBTYPE { + HelpID = "sw:ListBox:TP_FLD_DB:LB_DBTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 76 , 104 ) ; @@ -67,6 +68,7 @@ TabPage TP_FLD_DB }; Edit ED_DBCONDITION { + HelpID = "sw:Edit:TP_FLD_DB:ED_DBCONDITION"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 137 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; @@ -82,6 +84,7 @@ TabPage TP_FLD_DB }; Edit ED_DBSETNUMBER { + HelpID = "sw:Edit:TP_FLD_DB:ED_DBSETNUMBER"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 167 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; @@ -110,6 +113,7 @@ TabPage TP_FLD_DB }; PushButton PB_ADDDB { + HelpID = "sw:PushButton:TP_FLD_DB:PB_ADDDB"; Pos = MAP_APPFONT ( 198 , 121) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Browse..." ; @@ -117,6 +121,7 @@ TabPage TP_FLD_DB RadioButton RB_DBOWNFORMAT { + HelpID = "sw:RadioButton:TP_FLD_DB:RB_DBOWNFORMAT"; Pos = MAP_APPFONT ( 94 , 153 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Check = TRUE ; @@ -124,12 +129,14 @@ TabPage TP_FLD_DB }; RadioButton RB_DBFORMAT { + HelpID = "sw:RadioButton:TP_FLD_DB:RB_DBFORMAT"; Pos = MAP_APPFONT ( 94 , 166 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "User-defined" ; }; ListBox LB_DBNUMFORMAT { + HelpID = "sw:ListBox:TP_FLD_DB:LB_DBNUMFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 195 , 164 ) ; Size = MAP_APPFONT ( 53 , 60 ) ; @@ -139,6 +146,7 @@ TabPage TP_FLD_DB }; ListBox LB_DBFORMAT { + HelpID = "sw:ListBox:TP_FLD_DB:LB_DBFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 195 , 163 ) ; Size = MAP_APPFONT ( 53 , 60 ) ; diff --git a/sw/source/ui/fldui/flddinf.src b/sw/source/ui/fldui/flddinf.src index 8a3e86c4548b..824345a7162c 100644 --- a/sw/source/ui/fldui/flddinf.src +++ b/sw/source/ui/fldui/flddinf.src @@ -57,6 +57,7 @@ TabPage TP_FLD_DOKINF }; ListBox LB_DOKINFSELECTION { + HelpID = "sw:ListBox:TP_FLD_DOKINF:LB_DOKINFSELECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 16 ) ; Size = MAP_APPFONT ( 76 , 163 ) ; @@ -78,6 +79,7 @@ TabPage TP_FLD_DOKINF }; ListBox LB_DOKINFFORMAT { + HelpID = "sw:ListBox:TP_FLD_DOKINF:LB_DOKINFFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 16 ) ; Size = MAP_APPFONT ( 84 , 148 ) ; @@ -86,6 +88,7 @@ TabPage TP_FLD_DOKINF }; CheckBox CB_DOKINFFIXEDCONTENT { + HelpID = "sw:CheckBox:TP_FLD_DOKINF:CB_DOKINFFIXEDCONTENT"; Pos = MAP_APPFONT ( 170 , 170 ) ; Size = MAP_APPFONT ( 72 , 10 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/fldui/flddok.src b/sw/source/ui/fldui/flddok.src index f566ab716362..fe595268ce85 100644 --- a/sw/source/ui/fldui/flddok.src +++ b/sw/source/ui/fldui/flddok.src @@ -43,6 +43,7 @@ TabPage TP_FLD_DOK }; ListBox LB_DOKTYPE { + HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 76 , 165 ) ; @@ -59,6 +60,7 @@ TabPage TP_FLD_DOK }; ListBox LB_DOKSELECTION { + HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKSELECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 15 ) ; Size = MAP_APPFONT ( 76 , 165 ) ; @@ -73,6 +75,7 @@ TabPage TP_FLD_DOK }; ListBox LB_DOKFORMAT { + HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 151 ) ; @@ -83,6 +86,7 @@ TabPage TP_FLD_DOK }; ListBox LB_DOKNUMFORMAT { + HelpID = "sw:ListBox:TP_FLD_DOK:LB_DOKNUMFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 151 ) ; @@ -100,6 +104,7 @@ TabPage TP_FLD_DOK }; Edit ED_DOKVALUE { + HelpID = "sw:Edit:TP_FLD_DOK:ED_DOKVALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 167 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -109,6 +114,7 @@ TabPage TP_FLD_DOK }; NumericField ED_DOKLEVEL { + HelpID = "sw:NumericField:TP_FLD_DOK:ED_DOKLEVEL"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 167 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -125,6 +131,7 @@ TabPage TP_FLD_DOK }; NumericField ED_DOKDATEOFF { + HelpID = "sw:NumericField:TP_FLD_DOK:ED_DOKDATEOFF"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 167 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -138,6 +145,7 @@ TabPage TP_FLD_DOK }; CheckBox CB_DOKFIXEDCONTENT { + HelpID = "sw:CheckBox:TP_FLD_DOK:CB_DOKFIXEDCONTENT"; Pos = MAP_APPFONT ( 170 , 170 ) ; Size = MAP_APPFONT ( 72 , 10 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/fldui/fldfunc.src b/sw/source/ui/fldui/fldfunc.src index 312299fac02d..538aeb8e1ce3 100644 --- a/sw/source/ui/fldui/fldfunc.src +++ b/sw/source/ui/fldui/fldfunc.src @@ -43,6 +43,7 @@ TabPage TP_FLD_FUNC }; ListBox LB_FUNCTYPE { + HelpID = "sw:ListBox:TP_FLD_FUNC:LB_FUNCTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 76 , 165 ) ; @@ -60,6 +61,7 @@ TabPage TP_FLD_FUNC }; ListBox LB_FUNCSELECTION { + HelpID = "sw:ListBox:TP_FLD_FUNC:LB_FUNCSELECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 14 ) ; Size = MAP_APPFONT ( 76 , 165 ) ; @@ -77,6 +79,7 @@ TabPage TP_FLD_FUNC }; ListBox LB_FUNCFORMAT { + HelpID = "sw:ListBox:TP_FLD_FUNC:LB_FUNCFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 14 ) ; Size = MAP_APPFONT ( 76 , 165 ) ; @@ -91,6 +94,7 @@ TabPage TP_FLD_FUNC }; Edit ED_FUNCNAME { + HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -106,6 +110,7 @@ TabPage TP_FLD_FUNC }; Edit ED_FUNCVALUE { + HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCVALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 41 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -122,6 +127,7 @@ TabPage TP_FLD_FUNC }; Edit ED_FUNCCOND1 { + HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCCOND1"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 41 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -139,6 +145,7 @@ TabPage TP_FLD_FUNC }; Edit ED_FUNCCOND2 { + HelpID = "sw:Edit:TP_FLD_FUNC:ED_FUNCCOND2"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 68 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -148,6 +155,7 @@ TabPage TP_FLD_FUNC }; PushButton BT_FUNCMACRO { + HelpID = "sw:PushButton:TP_FLD_FUNC:BT_FUNCMACRO"; Pos = MAP_APPFONT ( 204 , 165 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Macro..." ; @@ -163,6 +171,7 @@ TabPage TP_FLD_FUNC }; Edit ED_LISTITEM { + HelpID = "sw:Edit:TP_FLD_FUNC:ED_LISTITEM"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -172,6 +181,7 @@ TabPage TP_FLD_FUNC }; PushButton PB_LISTADD { + HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTADD"; Pos = MAP_APPFONT ( 170 , 29 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Hide = TRUE; @@ -186,6 +196,7 @@ TabPage TP_FLD_FUNC }; ListBox LB_LISTITEMS { + HelpID = "sw:ListBox:TP_FLD_FUNC:LB_LISTITEMS"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 57 ) ; Size = MAP_APPFONT ( 83 , 44 ) ; @@ -195,6 +206,7 @@ TabPage TP_FLD_FUNC }; PushButton PB_LISTREMOVE { + HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTREMOVE"; Pos = MAP_APPFONT ( 203 , 104 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Hide = TRUE; @@ -202,6 +214,7 @@ TabPage TP_FLD_FUNC }; PushButton PB_LISTUP { + HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTUP"; Pos = MAP_APPFONT ( 203 , 121 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Hide = TRUE; @@ -209,6 +222,7 @@ TabPage TP_FLD_FUNC }; PushButton PB_LISTDOWN { + HelpID = "sw:PushButton:TP_FLD_FUNC:PB_LISTDOWN"; Pos = MAP_APPFONT ( 203 , 138 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Hide = TRUE; @@ -223,6 +237,7 @@ TabPage TP_FLD_FUNC }; Edit ED_LISTNAME { + HelpID = "sw:Edit:TP_FLD_FUNC:ED_LISTNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 167 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; diff --git a/sw/source/ui/fldui/fldref.src b/sw/source/ui/fldui/fldref.src index 847c9358db69..5a589e276592 100644 --- a/sw/source/ui/fldui/fldref.src +++ b/sw/source/ui/fldui/fldref.src @@ -43,6 +43,7 @@ TabPage TP_FLD_REF }; ListBox LB_REFTYPE { + HelpID = "sw:ListBox:TP_FLD_REF:LB_REFTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 76 , 165 ) ; @@ -58,6 +59,7 @@ TabPage TP_FLD_REF }; ListBox LB_REFSELECTION { + HelpID = "sw:ListBox:TP_FLD_REF:LB_REFSELECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 14 ) ; Size = MAP_APPFONT ( 166 , 73 ) ; @@ -82,6 +84,7 @@ TabPage TP_FLD_REF }; ListBox LB_REFFORMAT { + HelpID = "sw:ListBox:TP_FLD_REF:LB_REFFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 104 ) ; Size = MAP_APPFONT ( 76 , 75 ) ; @@ -98,6 +101,7 @@ TabPage TP_FLD_REF }; Edit ED_REFNAME { + HelpID = "sw:Edit:TP_FLD_REF:ED_REFNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 104 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -114,6 +118,7 @@ TabPage TP_FLD_REF }; Edit ED_REFVALUE { + HelpID = "sw:Edit:TP_FLD_REF:ED_REFVALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 136 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; diff --git a/sw/source/ui/fldui/fldvar.src b/sw/source/ui/fldui/fldvar.src index 7405a2956849..7057096f72ab 100644 --- a/sw/source/ui/fldui/fldvar.src +++ b/sw/source/ui/fldui/fldvar.src @@ -44,6 +44,7 @@ TabPage TP_FLD_VAR }; ListBox LB_VARTYPE { + HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 76 , 135 ) ; @@ -60,6 +61,7 @@ TabPage TP_FLD_VAR }; ListBox LB_VARSELECTION { + HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARSELECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 14 ) ; Size = MAP_APPFONT ( 76 , 135 ) ; @@ -75,6 +77,7 @@ TabPage TP_FLD_VAR }; ListBox LB_VARFORMAT { + HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 123 ) ; @@ -83,6 +86,7 @@ TabPage TP_FLD_VAR }; ListBox LB_VARNUMFORMAT { + HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARNUMFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 170 , 14 ) ; Size = MAP_APPFONT ( 84 , 123 ) ; @@ -91,6 +95,7 @@ TabPage TP_FLD_VAR }; CheckBox CB_VARINVISIBLE { + HelpID = "sw:CheckBox:TP_FLD_VAR:CB_VARINVISIBLE"; Pos = MAP_APPFONT ( 170 , 141 ) ; Size = MAP_APPFONT ( 84 , 10 ) ; Text [ en-US ] = "Invisi~ble" ; @@ -112,6 +117,7 @@ TabPage TP_FLD_VAR }; ListBox LB_VARCHAPTERLEVEL { + HelpID = "sw:ListBox:TP_FLD_VAR:LB_VARCHAPTERLEVEL"; Border = TRUE ; Hide = TRUE ; Pos = MAP_APPFONT ( 208 , 123 ) ; @@ -132,6 +138,7 @@ TabPage TP_FLD_VAR }; Edit ED_VARSEPARATOR { + HelpID = "sw:Edit:TP_FLD_VAR:ED_VARSEPARATOR"; Pos = MAP_APPFONT ( 208 , 138 ) ; Size = MAP_APPFONT ( 46 , 12 ) ; Border = TRUE ; @@ -148,6 +155,7 @@ TabPage TP_FLD_VAR }; Edit ED_VARNAME { + HelpID = "sw:Edit:TP_FLD_VAR:ED_VARNAME"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 166 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; @@ -163,6 +171,7 @@ TabPage TP_FLD_VAR }; Edit ED_VARVALUE { + HelpID = "sw:Edit:TP_FLD_VAR:ED_VARVALUE"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 166 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; diff --git a/sw/source/ui/fldui/inpdlg.src b/sw/source/ui/fldui/inpdlg.src index 8b60525dfe5c..799afe0ceaa8 100644 --- a/sw/source/ui/fldui/inpdlg.src +++ b/sw/source/ui/fldui/inpdlg.src @@ -46,6 +46,7 @@ ModalDialog DLG_FLD_INPUT };*/ Edit ED_LABEL { + HelpID = "sw:Edit:DLG_FLD_INPUT:ED_LABEL"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 115 , 12 ) ; @@ -56,6 +57,7 @@ ModalDialog DLG_FLD_INPUT }; MultiLineEdit ED_EDIT { + HelpID = "sw:MultiLineEdit:DLG_FLD_INPUT:ED_EDIT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 32 ) ; Size = MAP_APPFONT ( 115 , 72 ) ; @@ -83,6 +85,7 @@ ModalDialog DLG_FLD_INPUT }; PushButton PB_NEXT { + HelpID = "sw:PushButton:DLG_FLD_INPUT:PB_NEXT"; Pos = MAP_APPFONT ( 139 , 40 ) ; Size = MAP_APPFONT ( 50 , 15 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/fldui/javaedit.src b/sw/source/ui/fldui/javaedit.src index 45dbf468e7ae..bae88ed1adc5 100644 --- a/sw/source/ui/fldui/javaedit.src +++ b/sw/source/ui/fldui/javaedit.src @@ -33,6 +33,7 @@ // RID_SVXDLG_POSTIT ----------------------------------------------------- ModalDialog DLG_JAVAEDIT { + HelpID = "sw:ModalDialog:DLG_JAVAEDIT"; OutputSize = TRUE ; SvLook = TRUE ; Size = MAP_APPFONT ( 248 , 157 ) ; @@ -45,6 +46,7 @@ ModalDialog DLG_JAVAEDIT }; Edit ED_TYPE { + HelpID = "sw:Edit:DLG_JAVAEDIT:ED_TYPE"; Border = TRUE ; Text = "JavaScript" ; // Nicht uebersetzen!!! @@ -54,6 +56,7 @@ ModalDialog DLG_JAVAEDIT }; RadioButton RB_URL { + HelpID = "sw:RadioButton:DLG_JAVAEDIT:RB_URL"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 55 , 10 ) ; TabStop = TRUE ; @@ -61,6 +64,7 @@ ModalDialog DLG_JAVAEDIT }; Edit ED_URL { + HelpID = "sw:Edit:DLG_JAVAEDIT:ED_URL"; Border = TRUE ; Pos = MAP_APPFONT ( 70 , 27 ) ; Size = MAP_APPFONT ( 87 , 12 ) ; @@ -68,6 +72,7 @@ ModalDialog DLG_JAVAEDIT }; PushButton PB_URL { + HelpID = "sw:PushButton:DLG_JAVAEDIT:PB_URL"; Pos = MAP_APPFONT ( 163 , 26 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; Text = "~..." ; @@ -75,6 +80,7 @@ ModalDialog DLG_JAVAEDIT }; RadioButton RB_EDIT { + HelpID = "sw:RadioButton:DLG_JAVAEDIT:RB_EDIT"; Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 140 , 10 ) ; Text [ en-US ] = "~Text" ; @@ -83,6 +89,7 @@ ModalDialog DLG_JAVAEDIT }; MultiLineEdit ED_EDIT { + HelpID = "sw:MultiLineEdit:DLG_JAVAEDIT:ED_EDIT"; Border = TRUE ; Pos = MAP_APPFONT ( 23 , 54 ) ; Size = MAP_APPFONT ( 155 , 91 ) ; @@ -116,12 +123,14 @@ ModalDialog DLG_JAVAEDIT }; ImageButton BTN_PREV { + HelpID = "sw:ImageButton:DLG_JAVAEDIT:BTN_PREV"; Pos = MAP_APPFONT ( 191 , 60 ) ; Size = MAP_APPFONT ( 24 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_LEFT ; }; ImageButton BTN_NEXT { + HelpID = "sw:ImageButton:DLG_JAVAEDIT:BTN_NEXT"; Pos = MAP_APPFONT ( 217 , 60 ) ; Size = MAP_APPFONT ( 24 , 14 ) ; Symbol = IMAGEBUTTON_ARROW_RIGHT ; diff --git a/sw/source/ui/frmdlg/column.src b/sw/source/ui/frmdlg/column.src index 7f260501cbbe..04e91ce3560a 100644 --- a/sw/source/ui/frmdlg/column.src +++ b/sw/source/ui/frmdlg/column.src @@ -46,6 +46,7 @@ TabPage TP_COLUMN }; NumericField ED_NUMBER { + HelpID = "sw:NumericField:TP_COLUMN:ED_NUMBER"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 24 , 12 ) ; @@ -68,6 +69,7 @@ TabPage TP_COLUMN }; CheckBox CB_BALANCECOLS { + HelpID = "sw:CheckBox:TP_COLUMN:CB_BALANCECOLS"; Pos = MAP_APPFONT ( 7 , 46 ) ; Size = MAP_APPFONT ( 163 , 10 ) ; Hide = TRUE; @@ -93,6 +95,7 @@ TabPage TP_COLUMN }; ImageButton BTN_DOWN { + HelpID = "sw:ImageButton:TP_COLUMN:BTN_DOWN"; Disable = TRUE ; Pos = MAP_APPFONT ( 62 , 69 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; @@ -122,6 +125,7 @@ TabPage TP_COLUMN }; ImageButton BTN_UP { + HelpID = "sw:ImageButton:TP_COLUMN:BTN_UP"; Disable = TRUE ; Pos = MAP_APPFONT ( 238 , 69 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; @@ -137,6 +141,7 @@ TabPage TP_COLUMN }; MetricField ED_1 { + HelpID = "sw:MetricField:TP_COLUMN:ED_1"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 87 , 83 ) ; @@ -155,6 +160,7 @@ TabPage TP_COLUMN }; MetricField ED_2 { + HelpID = "sw:MetricField:TP_COLUMN:ED_2"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 137 , 83 ) ; @@ -173,6 +179,7 @@ TabPage TP_COLUMN }; MetricField ED_3 { + HelpID = "sw:MetricField:TP_COLUMN:ED_3"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 187 , 83 ) ; @@ -198,6 +205,7 @@ TabPage TP_COLUMN }; MetricField ED_DIST1 { + HelpID = "sw:MetricField:TP_COLUMN:ED_DIST1"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 112 , 99 ) ; @@ -216,6 +224,7 @@ TabPage TP_COLUMN }; MetricField ED_DIST2 { + HelpID = "sw:MetricField:TP_COLUMN:ED_DIST2"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 162 , 99 ) ; @@ -234,6 +243,7 @@ TabPage TP_COLUMN }; CheckBox CB_AUTO_WIDTH { + HelpID = "sw:CheckBox:TP_COLUMN:CB_AUTO_WIDTH"; Pos = MAP_APPFONT ( 87 , 115 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; Text [ en-US ] = "Auto~Width" ; @@ -255,6 +265,7 @@ TabPage TP_COLUMN }; ListBox LB_STYLE { + HelpID = "sw:ListBox:TP_COLUMN:LB_STYLE"; Pos = MAP_APPFONT ( 50 , 138 ) ; Size = MAP_APPFONT ( 60 , 66 ) ; TabStop = TRUE ; @@ -273,6 +284,7 @@ TabPage TP_COLUMN }; MetricField ED_HEIGHT { + HelpID = "sw:MetricField:TP_COLUMN:ED_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 50 , 154 ) ; Size = MAP_APPFONT ( 60 , 12 ) ; @@ -297,6 +309,7 @@ TabPage TP_COLUMN }; ListBox LB_POSITION { + HelpID = "sw:ListBox:TP_COLUMN:LB_POSITION"; Pos = MAP_APPFONT ( 50 , 170 ) ; Size = MAP_APPFONT ( 60 , 40 ) ; TabStop = TRUE ; @@ -337,6 +350,7 @@ TabPage TP_COLUMN }; ListBox LB_TEXTDIRECTION { + HelpID = "sw:ListBox:TP_COLUMN:LB_TEXTDIRECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 127 , 149 ) ; Size = MAP_APPFONT ( 127 , 50 ) ; @@ -385,6 +399,7 @@ ModalDialog DLG_COLUMN }; ListBox LB_APPLY_TO { + HelpID = "sw:ListBox:DLG_COLUMN:LB_APPLY_TO"; Pos = MAP_APPFONT ( 260 , 74 ) ; Size = MAP_APPFONT ( 50 , 66 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/frmdlg/cption.src b/sw/source/ui/frmdlg/cption.src index 34c11633f815..c93efab586f1 100644 --- a/sw/source/ui/frmdlg/cption.src +++ b/sw/source/ui/frmdlg/cption.src @@ -61,6 +61,7 @@ ModalDialog DLG_CAPTION }; PushButton BTN_AUTOCAPTION { + HelpID = "sw:PushButton:DLG_CAPTION:BTN_AUTOCAPTION"; Pos = MAP_APPFONT ( 194 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -68,6 +69,7 @@ ModalDialog DLG_CAPTION }; PushButton BTN_OPTION { + HelpID = "sw:PushButton:DLG_CAPTION:BTN_OPTION"; Pos = MAP_APPFONT ( 194 , 80 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -83,6 +85,7 @@ ModalDialog DLG_CAPTION }; Edit EDT_TEXT { + HelpID = "sw:Edit:DLG_CAPTION:EDT_TEXT"; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 182 , 12 ) ; Border = TRUE ; @@ -104,6 +107,7 @@ ModalDialog DLG_CAPTION }; ComboBox BOX_CATEGORY { + HelpID = "sw:ComboBox:DLG_CAPTION:BOX_CATEGORY"; Pos = MAP_APPFONT ( 82 , 46 ) ; Size = MAP_APPFONT ( 106 , 61 ) ; DropDown = TRUE ; @@ -119,6 +123,7 @@ ModalDialog DLG_CAPTION }; ListBox BOX_FORMAT { + HelpID = "sw:ListBox:DLG_CAPTION:BOX_FORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 82 , 63 ) ; Size = MAP_APPFONT ( 106 , 83 ) ; @@ -135,6 +140,7 @@ ModalDialog DLG_CAPTION }; Edit ED_NUM_SEP { + HelpID = "sw:Edit:DLG_CAPTION:ED_NUM_SEP"; Pos = MAP_APPFONT ( 82 , 63 ) ; Size = MAP_APPFONT ( 106 , 12 ) ; Border = TRUE ; @@ -152,6 +158,7 @@ ModalDialog DLG_CAPTION }; Edit EDT_SEP { + HelpID = "sw:Edit:DLG_CAPTION:EDT_SEP"; Pos = MAP_APPFONT ( 82 , 80 ) ; Size = MAP_APPFONT ( 106 , 12 ) ; Border = TRUE ; @@ -168,6 +175,7 @@ ModalDialog DLG_CAPTION }; ListBox BOX_POS { + HelpID = "sw:ListBox:DLG_CAPTION:BOX_POS"; Pos = MAP_APPFONT ( 82 , 97 ) ; Size = MAP_APPFONT ( 106 , 61 ) ; DropDown = TRUE ; @@ -244,6 +252,7 @@ ModalDialog DLG_SEQUENCE_OPTION }; ListBox LB_LEVEL { + HelpID = "sw:ListBox:DLG_SEQUENCE_OPTION:LB_LEVEL"; Border = TRUE ; Pos = MAP_APPFONT ( 65 , 18 ) ; Size = MAP_APPFONT ( 72 , 60 ) ; @@ -262,6 +271,7 @@ ModalDialog DLG_SEQUENCE_OPTION }; Edit ED_SEPARATOR { + HelpID = "sw:Edit:DLG_SEQUENCE_OPTION:ED_SEPARATOR"; Pos = MAP_APPFONT ( 65 , 34 ) ; Size = MAP_APPFONT ( 72 , 12 ) ; Border = TRUE ; @@ -282,6 +292,7 @@ ModalDialog DLG_SEQUENCE_OPTION }; ListBox LB_CHARSTYLE { + HelpID = "sw:ListBox:DLG_SEQUENCE_OPTION:LB_CHARSTYLE"; Border = TRUE ; Pos = MAP_APPFONT ( 65 , 68 ) ; Size = MAP_APPFONT ( 72 , 60 ) ; @@ -294,6 +305,7 @@ ModalDialog DLG_SEQUENCE_OPTION }; CheckBox CB_APPLYBAS { + HelpID = "sw:CheckBox:DLG_SEQUENCE_OPTION:CB_APPLYBAS"; Pos = MAP_APPFONT ( 12 , 84 ) ; Size = MAP_APPFONT ( 136 , 10 ) ; TabStop = TRUE ; @@ -313,6 +325,7 @@ ModalDialog DLG_SEQUENCE_OPTION }; ListBox LB_ORDER { + HelpID = "sw:ListBox:DLG_SEQUENCE_OPTION:LB_ORDER"; Border = TRUE ; Pos = MAP_APPFONT ( 65 , 114 ) ; Size = MAP_APPFONT ( 72 , 60 ) ; diff --git a/sw/source/ui/frmdlg/frmpage.src b/sw/source/ui/frmdlg/frmpage.src index 20a2d1702a46..782607000386 100644 --- a/sw/source/ui/frmdlg/frmpage.src +++ b/sw/source/ui/frmdlg/frmpage.src @@ -243,6 +243,7 @@ TabPage TP_FRM_STD }; MetricField ED_WIDTH { + HelpID = "sw:MetricField:TP_FRM_STD:ED_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( SWFRMPG_COL_3 , SWFRMPG_ROW_1 ) ; Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_3) , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -261,6 +262,7 @@ TabPage TP_FRM_STD }; CheckBox CB_REL_WIDTH { + HelpID = "sw:CheckBox:TP_FRM_STD:CB_REL_WIDTH"; Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_3 ) ; Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_2) , RSC_CD_CHECKBOX_HEIGHT ) ; TabStop = TRUE ; @@ -268,6 +270,7 @@ TabPage TP_FRM_STD }; CheckBox CB_AUTOWIDTH { + HelpID = "sw:CheckBox:TP_FRM_STD:CB_AUTOWIDTH"; Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_4 ) ; Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_2) , RSC_CD_CHECKBOX_HEIGHT ) ; TabStop = TRUE ; @@ -289,6 +292,7 @@ TabPage TP_FRM_STD }; MetricField ED_HEIGHT { + HelpID = "sw:MetricField:TP_FRM_STD:ED_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( SWFRMPG_COL_3 , SWFRMPG_ROW_5 ) ; Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_3) , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -306,6 +310,7 @@ TabPage TP_FRM_STD }; CheckBox CB_REL_HEIGHT { + HelpID = "sw:CheckBox:TP_FRM_STD:CB_REL_HEIGHT"; Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_7 ) ; Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_2) , RSC_CD_CHECKBOX_HEIGHT ) ; TabStop = TRUE ; @@ -313,6 +318,7 @@ TabPage TP_FRM_STD }; CheckBox CB_AUTOHEIGHT { + HelpID = "sw:CheckBox:TP_FRM_STD:CB_AUTOHEIGHT"; Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_8 ) ; Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_2) , RSC_CD_CHECKBOX_HEIGHT ) ; TabStop = TRUE ; @@ -320,6 +326,7 @@ TabPage TP_FRM_STD }; CheckBox CB_FIXEDRATIO { + HelpID = "sw:CheckBox:TP_FRM_STD:CB_FIXEDRATIO"; Pos = MAP_APPFONT ( SWFRMPG_COL_1 , SWFRMPG_ROW_9 ) ; Size = MAP_APPFONT ( (SWFRMPG_COL_4-SWFRMPG_COL_1) , RSC_CD_CHECKBOX_HEIGHT ) ; TabStop = TRUE ; @@ -327,6 +334,7 @@ TabPage TP_FRM_STD }; PushButton BT_REALSIZE { + HelpID = "sw:PushButton:TP_FRM_STD:BT_REALSIZE"; Pos = MAP_APPFONT ( 35 , 86 ) ; Size = MAP_APPFONT ( 70 , 14 ) ; TabStop = TRUE ; @@ -347,30 +355,35 @@ TabPage TP_FRM_STD }; RadioButton RB_ANCHOR_PAGE { + HelpID = "sw:RadioButton:TP_FRM_STD:RB_ANCHOR_PAGE"; Pos = MAP_APPFONT ( 122 , 14 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "To ~page"; }; RadioButton RB_ANCHOR_PARA { + HelpID = "sw:RadioButton:TP_FRM_STD:RB_ANCHOR_PARA"; Pos = MAP_APPFONT ( 122 , 28 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "To paragrap~h"; }; RadioButton RB_ANCHOR_AT_CHAR { + HelpID = "sw:RadioButton:TP_FRM_STD:RB_ANCHOR_AT_CHAR"; Pos = MAP_APPFONT ( 122 , 42 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "To cha~racter"; }; RadioButton RB_ANCHOR_AS_CHAR { + HelpID = "sw:RadioButton:TP_FRM_STD:RB_ANCHOR_AS_CHAR"; Pos = MAP_APPFONT ( 122 , 56 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "~As character" ; }; RadioButton RB_ANCHOR_FRAME { + HelpID = "sw:RadioButton:TP_FRM_STD:RB_ANCHOR_FRAME"; Pos = MAP_APPFONT ( 122 , 70 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "To ~frame"; @@ -395,6 +408,7 @@ TabPage TP_FRM_STD }; ListBox DLB_HORIZONTAL { + HelpID = "sw:ListBox:TP_FRM_STD:DLB_HORIZONTAL"; Pos = MAP_APPFONT ( 49 , SWFRMPG_ROW_11 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; TabStop = TRUE ; @@ -409,6 +423,7 @@ TabPage TP_FRM_STD }; MetricField ED_AT_HORZ_POS { + HelpID = "sw:MetricField:TP_FRM_STD:ED_AT_HORZ_POS"; Border = TRUE ; Pos = MAP_APPFONT ( 123 , SWFRMPG_ROW_11 ) ; Size = MAP_APPFONT ( 35 , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -433,6 +448,7 @@ TabPage TP_FRM_STD }; ListBox LB_HORI_RELATION { + HelpID = "sw:ListBox:TP_FRM_STD:LB_HORI_RELATION"; Pos = MAP_APPFONT ( 183 , SWFRMPG_ROW_11 ) ; Size = MAP_APPFONT ( 65 , 60 ) ; TabStop = TRUE ; @@ -440,6 +456,7 @@ TabPage TP_FRM_STD }; CheckBox CB_MIRROR { + HelpID = "sw:CheckBox:TP_FRM_STD:CB_MIRROR"; Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_13 ) ; Size = MAP_APPFONT ( (260-SWFRMPG_COL_2-1) , RSC_CD_CHECKBOX_HEIGHT ) ; TabStop = TRUE ; @@ -454,6 +471,7 @@ TabPage TP_FRM_STD }; ListBox DLB_VERTICAL { + HelpID = "sw:ListBox:TP_FRM_STD:DLB_VERTICAL"; Pos = MAP_APPFONT ( 49 , SWFRMPG_ROW_14 ) ; Size = MAP_APPFONT ( 50 , 60 ) ; TabStop = TRUE ; @@ -468,6 +486,7 @@ TabPage TP_FRM_STD }; MetricField ED_AT_VERT_POS { + HelpID = "sw:MetricField:TP_FRM_STD:ED_AT_VERT_POS"; Border = TRUE ; Pos = MAP_APPFONT ( 123 , SWFRMPG_ROW_14 ) ; Size = MAP_APPFONT ( 35 , RSC_CD_TEXTBOX_HEIGHT ) ; @@ -492,6 +511,7 @@ TabPage TP_FRM_STD }; ListBox LB_VERT_RELATION { + HelpID = "sw:ListBox:TP_FRM_STD:LB_VERT_RELATION"; Pos = MAP_APPFONT ( 183 , SWFRMPG_ROW_14 ) ; Size = MAP_APPFONT ( 65 , 60 ) ; TabStop = TRUE ; @@ -499,6 +519,7 @@ TabPage TP_FRM_STD }; CheckBox CB_FOLLOWTEXTFLOW { + HelpID = "sw:CheckBox:TP_FRM_STD:CB_FOLLOWTEXTFLOW"; Pos = MAP_APPFONT ( SWFRMPG_COL_2 , SWFRMPG_ROW_16 ) ; Size = MAP_APPFONT ( (260-SWFRMPG_COL_2-1) , RSC_CD_CHECKBOX_HEIGHT ) ; TabStop = TRUE ; @@ -540,6 +561,7 @@ TabPage TP_GRF_EXT }; Edit ED_CONNECT { + HelpID = "sw:Edit:TP_GRF_EXT:ED_CONNECT"; Pos = MAP_APPFONT ( 13 , 109 ) ; Size = MAP_APPFONT ( 200 , 12 ) ; Text [ en-US ] = "[None]" ; @@ -549,6 +571,7 @@ TabPage TP_GRF_EXT }; PushButton PB_BROWSE { + HelpID = "sw:PushButton:TP_GRF_EXT:PB_BROWSE"; Disable = TRUE ; Pos = MAP_APPFONT ( 230 , 109 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; @@ -558,6 +581,7 @@ TabPage TP_GRF_EXT }; CheckBox CB_VERT { + HelpID = "sw:CheckBox:TP_GRF_EXT:CB_VERT"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 48 , 10 ) ; TabStop = TRUE ; @@ -566,6 +590,7 @@ TabPage TP_GRF_EXT }; CheckBox CB_HOR { + HelpID = "sw:CheckBox:TP_GRF_EXT:CB_HOR"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; TabStop = TRUE ; @@ -573,6 +598,7 @@ TabPage TP_GRF_EXT }; RadioButton RB_MIRROR_ALL_PAGES { + HelpID = "sw:RadioButton:TP_GRF_EXT:RB_MIRROR_ALL_PAGES"; Pos = MAP_APPFONT ( 18 , 42 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -580,6 +606,7 @@ TabPage TP_GRF_EXT }; RadioButton RB_MIRROR_LEFT_PAGES { + HelpID = "sw:RadioButton:TP_GRF_EXT:RB_MIRROR_LEFT_PAGES"; Pos = MAP_APPFONT ( 18 , 56 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -587,6 +614,7 @@ TabPage TP_GRF_EXT }; RadioButton RB_MIRROR_RIGHT_PAGES { + HelpID = "sw:RadioButton:TP_GRF_EXT:RB_MIRROR_RIGHT_PAGES"; Pos = MAP_APPFONT ( 18 , 70 ) ; Size = MAP_APPFONT ( 100 , 10 ) ; TabStop = TRUE ; @@ -624,6 +652,7 @@ TabPage TP_FRM_URL }; Edit ED_URL { + HelpID = "sw:Edit:TP_FRM_URL:ED_URL"; Pos = MAP_APPFONT ( 45 , 14 ) ; Size = MAP_APPFONT ( 149 , 12 ) ; Left = TRUE ; @@ -638,6 +667,7 @@ TabPage TP_FRM_URL }; Edit ED_NAME { + HelpID = "sw:Edit:TP_FRM_URL:ED_NAME"; Pos = MAP_APPFONT ( 45 , 30 ) ; Size = MAP_APPFONT ( 149 , 12 ) ; Left = TRUE ; @@ -652,6 +682,7 @@ TabPage TP_FRM_URL }; ComboBox CB_FRAME { + HelpID = "sw:ComboBox:TP_FRM_URL:CB_FRAME"; Pos = MAP_APPFONT ( 45 , 46 ) ; Size = MAP_APPFONT ( 89 , 50 ) ; Left = TRUE ; @@ -660,6 +691,7 @@ TabPage TP_FRM_URL }; PushButton PB_SEARCH { + HelpID = "sw:PushButton:TP_FRM_URL:PB_SEARCH"; Pos = MAP_APPFONT ( 198 , 13 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -673,12 +705,14 @@ TabPage TP_FRM_URL }; CheckBox CB_SERVER { + HelpID = "sw:CheckBox:TP_FRM_URL:CB_SERVER"; Pos = MAP_APPFONT ( 12 , 75 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "~Server-side image map"; }; CheckBox CB_CLIENT { + HelpID = "sw:CheckBox:TP_FRM_URL:CB_CLIENT"; Pos = MAP_APPFONT ( 12 , 89 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "~Client-side image map"; @@ -705,6 +739,7 @@ TabPage TP_FRM_ADD }; Edit ED_NAME { + HelpID = "sw:Edit:TP_FRM_ADD:ED_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 91 , 14 ) ; Size = MAP_APPFONT ( 157 , 12 ) ; @@ -718,6 +753,7 @@ TabPage TP_FRM_ADD }; Edit ED_ALT_NAME { + HelpID = "sw:Edit:TP_FRM_ADD:ED_ALT_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 91 , 30 ) ; Size = MAP_APPFONT ( 157 , 12 ) ; @@ -731,6 +767,7 @@ TabPage TP_FRM_ADD }; ListBox LB_PREV { + HelpID = "sw:ListBox:TP_FRM_ADD:LB_PREV"; Border = TRUE ; Pos = MAP_APPFONT ( 91 , 46 ) ; Size = MAP_APPFONT ( 157 , 50 ) ; @@ -749,6 +786,7 @@ TabPage TP_FRM_ADD }; ListBox LB_NEXT { + HelpID = "sw:ListBox:TP_FRM_ADD:LB_NEXT"; Border = TRUE ; Pos = MAP_APPFONT ( 91 , 62 ) ; Size = MAP_APPFONT ( 157 , 50 ) ; @@ -767,6 +805,7 @@ TabPage TP_FRM_ADD }; CheckBox CB_PROTECT_CONTENT { + HelpID = "sw:CheckBox:TP_FRM_ADD:CB_PROTECT_CONTENT"; Pos = MAP_APPFONT ( 12 , 91 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -774,6 +813,7 @@ TabPage TP_FRM_ADD }; CheckBox CB_PROTECT_FRAME { + HelpID = "sw:CheckBox:TP_FRM_ADD:CB_PROTECT_FRAME"; Pos = MAP_APPFONT ( 12 , 105 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -781,6 +821,7 @@ TabPage TP_FRM_ADD }; CheckBox CB_PROTECT_SIZE { + HelpID = "sw:CheckBox:TP_FRM_ADD:CB_PROTECT_SIZE"; Pos = MAP_APPFONT ( 12 , 119 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -794,6 +835,7 @@ TabPage TP_FRM_ADD }; CheckBox CB_EDIT_IN_READONLY { + HelpID = "sw:CheckBox:TP_FRM_ADD:CB_EDIT_IN_READONLY"; Pos = MAP_APPFONT ( 12 , 146 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -801,6 +843,7 @@ TabPage TP_FRM_ADD }; CheckBox CB_PRINT_FRAME { + HelpID = "sw:CheckBox:TP_FRM_ADD:CB_PRINT_FRAME"; Pos = MAP_APPFONT ( 12 , 160 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -823,6 +866,7 @@ TabPage TP_FRM_ADD }; ListBox LB_TEXTFLOW { + HelpID = "sw:ListBox:TP_FRM_ADD:LB_TEXTFLOW"; Border = TRUE ; Pos = MAP_APPFONT ( 81 , 172 ) ; Size = MAP_APPFONT ( 167 , 50 ) ; diff --git a/sw/source/ui/frmdlg/wrap.src b/sw/source/ui/frmdlg/wrap.src index bd779308178d..a3f23e79624b 100644 --- a/sw/source/ui/frmdlg/wrap.src +++ b/sw/source/ui/frmdlg/wrap.src @@ -44,6 +44,7 @@ TabPage TP_FRM_WRAP }; ImageRadioButton RB_NO_WRAP { + HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_NO_WRAP"; Pos = MAP_APPFONT ( 6 , 14 ) ; Size = MAP_APPFONT ( 40 , 37 ) ; WordBreak = TRUE; @@ -52,6 +53,7 @@ TabPage TP_FRM_WRAP }; ImageRadioButton RB_WRAP_LEFT { + HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_LEFT"; Pos = MAP_APPFONT ( 65 , 14 ) ; Size = MAP_APPFONT ( 40 , 37 ) ; WordBreak = TRUE; @@ -60,6 +62,7 @@ TabPage TP_FRM_WRAP }; ImageRadioButton RB_WRAP_RIGHT { + HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_RIGHT"; Pos = MAP_APPFONT ( 121 , 14 ) ; Size = MAP_APPFONT ( 40 , 37 ) ; WordBreak = TRUE; @@ -68,6 +71,7 @@ TabPage TP_FRM_WRAP }; ImageRadioButton RB_WRAP_PARALLEL { + HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_PARALLEL"; Pos = MAP_APPFONT ( 177 , 14 ) ; Size = MAP_APPFONT ( 40 , 37 ) ; WordBreak = TRUE; @@ -76,6 +80,7 @@ TabPage TP_FRM_WRAP }; ImageRadioButton RB_WRAP_THROUGH { + HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_THROUGH"; Pos = MAP_APPFONT ( 6 , 57 ) ; Size = MAP_APPFONT ( 40 , 37 ) ; WordBreak = TRUE; @@ -84,6 +89,7 @@ TabPage TP_FRM_WRAP }; ImageRadioButton RB_WRAP_IDEAL { + HelpID = "sw:ImageRadioButton:TP_FRM_WRAP:RB_WRAP_IDEAL"; Pos = MAP_APPFONT ( 65 , 57 ) ; Size = MAP_APPFONT ( 40 , 37 ) ; WordBreak = TRUE; @@ -93,18 +99,21 @@ TabPage TP_FRM_WRAP CheckBox CB_ANCHOR_ONLY { + HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_ANCHOR_ONLY"; Pos = MAP_APPFONT ( 139 , 111 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; Text [ en-US ] = "~First paragraph" ; }; CheckBox CB_TRANSPARENT { + HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_TRANSPARENT"; Pos = MAP_APPFONT ( 139 , 125 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; Text [ en-US ] = "In bac~kground" ; }; CheckBox CB_OUTLINE { + HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_OUTLINE"; Pos = MAP_APPFONT ( 139 , 139 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; Hide = TRUE ; @@ -112,6 +121,7 @@ TabPage TP_FRM_WRAP }; CheckBox CB_ONLYOUTSIDE { + HelpID = "sw:CheckBox:TP_FRM_WRAP:CB_ONLYOUTSIDE"; Pos = MAP_APPFONT ( 139 , 153 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; Hide = TRUE ; @@ -138,6 +148,7 @@ TabPage TP_FRM_WRAP }; MetricField ED_LEFT_MARGIN { + HelpID = "sw:MetricField:TP_FRM_WRAP:ED_LEFT_MARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 81 , 111 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -160,6 +171,7 @@ TabPage TP_FRM_WRAP }; MetricField ED_RIGHT_MARGIN { + HelpID = "sw:MetricField:TP_FRM_WRAP:ED_RIGHT_MARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 81 , 127 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -182,6 +194,7 @@ TabPage TP_FRM_WRAP }; MetricField ED_TOP_MARGIN { + HelpID = "sw:MetricField:TP_FRM_WRAP:ED_TOP_MARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 81 , 143 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -204,6 +217,7 @@ TabPage TP_FRM_WRAP }; MetricField ED_BOTTOM_MARGIN { + HelpID = "sw:MetricField:TP_FRM_WRAP:ED_BOTTOM_MARGIN"; Border = TRUE ; Pos = MAP_APPFONT ( 81 , 159 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; diff --git a/sw/source/ui/index/cnttab.src b/sw/source/ui/index/cnttab.src index 68f008b8d5ff..9b97b8931b7f 100644 --- a/sw/source/ui/index/cnttab.src +++ b/sw/source/ui/index/cnttab.src @@ -132,6 +132,7 @@ TabPage TP_TOX_SELECT }; Edit ED_TITLE { + HelpID = "sw:Edit:TP_TOX_SELECT:ED_TITLE"; Pos = MAP_APPFONT ( 45 , 14 ) ; Size = MAP_APPFONT ( 203 , 12 ) ; Border = TRUE; @@ -144,6 +145,7 @@ TabPage TP_TOX_SELECT }; ListBox LB_TYPE { + HelpID = "sw:ListBox:TP_TOX_SELECT:LB_TYPE"; Pos = MAP_APPFONT ( 45 , 30 ) ; Size = MAP_APPFONT ( 80 , 80 ) ; TabStop = TRUE ; @@ -161,6 +163,7 @@ TabPage TP_TOX_SELECT }; CheckBox CB_READONLY { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_READONLY"; Pos = MAP_APPFONT ( 51 , 46 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; Check = TRUE; @@ -180,6 +183,7 @@ TabPage TP_TOX_SELECT }; ListBox LB_AREA { + HelpID = "sw:ListBox:TP_TOX_SELECT:LB_AREA"; Pos = MAP_APPFONT ( 45 , 70 ) ; Size = MAP_APPFONT ( 80 , 12 ) ; TabStop = TRUE ; @@ -198,6 +202,7 @@ TabPage TP_TOX_SELECT }; NumericField NF_LEVEL { + HelpID = "sw:NumericField:TP_TOX_SELECT:NF_LEVEL"; Pos = MAP_APPFONT ( 231 , 72 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; Border = TRUE ; @@ -218,6 +223,7 @@ TabPage TP_TOX_SELECT }; CheckBox CB_FROMHEADINGS { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMHEADINGS"; Pos = MAP_APPFONT ( 12 , 99 ) ; Size = MAP_APPFONT ( 95 , 10 ) ; Check = TRUE; @@ -234,6 +240,7 @@ TabPage TP_TOX_SELECT */ CheckBox CB_ADDSTYLES { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_ADDSTYLES"; Pos = MAP_APPFONT ( 12 , 115 ) ; Size = MAP_APPFONT ( 75 , 10 ) ; Text [ en-US ] = "~Additional Styles"; @@ -244,6 +251,7 @@ TabPage TP_TOX_SELECT }; PushButton PB_ADDSTYLES { + HelpID = "sw:PushButton:TP_TOX_SELECT:PB_ADDSTYLES"; Pos = MAP_APPFONT ( 115 , 114 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Text = "..." ; @@ -251,6 +259,7 @@ TabPage TP_TOX_SELECT }; CheckBox CB_TOXMARKS { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_TOXMARKS"; Pos = MAP_APPFONT ( 12 , 131 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Inde~x marks"; @@ -258,6 +267,7 @@ TabPage TP_TOX_SELECT RadioButton RB_FROMCAPTIONS { + HelpID = "sw:RadioButton:TP_TOX_SELECT:RB_FROMCAPTIONS"; Pos = MAP_APPFONT ( 12 , 98 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Captions"; @@ -270,6 +280,7 @@ TabPage TP_TOX_SELECT }; ListBox LB_CAPTIONSEQUENCE { + HelpID = "sw:ListBox:TP_TOX_SELECT:LB_CAPTIONSEQUENCE"; Pos = MAP_APPFONT ( 55 , 112 ) ; Size = MAP_APPFONT ( 70 , 40 ) ; DropDown = TRUE; @@ -283,6 +294,7 @@ TabPage TP_TOX_SELECT }; ListBox LB_DISPLAYTYPE { + HelpID = "sw:ListBox:TP_TOX_SELECT:LB_DISPLAYTYPE"; Pos = MAP_APPFONT ( 55 , 128 ) ; Size = MAP_APPFONT ( 70 , 40 ) ; DropDown = TRUE; @@ -296,54 +308,63 @@ TabPage TP_TOX_SELECT }; RadioButton RB_FROMOBJECTNAMES { + HelpID = "sw:RadioButton:TP_TOX_SELECT:RB_FROMOBJECTNAMES"; Pos = MAP_APPFONT ( 156 , 98 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; Text [ en-US ] = "Object names"; }; CheckBox CB_COLLECTSAME { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_COLLECTSAME"; Pos = MAP_APPFONT ( 12 , 98 ) ; Size = MAP_APPFONT ( 121 , 10 ) ; Text [ en-US ] = "Combine identical entries"; }; CheckBox CB_USEFF { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_USEFF"; Pos = MAP_APPFONT ( 18 , 111 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; Text [ en-US ] = "Combine identical entries with p or ~pp"; }; CheckBox CB_USE_DASH { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_USE_DASH"; Pos = MAP_APPFONT ( 18 , 124 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; Text [ en-US ] = "Combine with -"; }; CheckBox CB_CASESENSITIVE { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_CASESENSITIVE"; Pos = MAP_APPFONT ( 18 , 137 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; Text [ en-US ] = "Case sensitive"; }; CheckBox CB_INITIALCAPS { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_INITIALCAPS"; Pos = MAP_APPFONT ( 136 , 98 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; Text [ en-US ] = "AutoCapitalize entries"; }; CheckBox CB_KEYASENTRY { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_KEYASENTRY"; Pos = MAP_APPFONT ( 136, 111 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; Text [ en-US ] = "Keys as separate entries"; }; CheckBox CB_FROMFILE { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMFILE"; Pos = MAP_APPFONT ( 136 , 124 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; Text [ en-US ] = "~Concordance file"; }; MenuButton MB_AUTOMARK { + HelpID = "sw:MenuButton:TP_TOX_SELECT:MB_AUTOMARK"; Pos = MAP_APPFONT ( 136 , 137 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -372,30 +393,35 @@ TabPage TP_TOX_SELECT }; CheckBox CB_FROMTABLES { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMTABLES"; Pos = MAP_APPFONT ( 112 , 99 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; Text [ en-US ] = "Tables"; }; CheckBox CB_FROMFRAMES { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMFRAMES"; Pos = MAP_APPFONT ( 182 , 99 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; Text [ en-US ] = "Te~xt frames"; }; CheckBox CB_FROMGRAPHICS { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMGRAPHICS"; Pos = MAP_APPFONT ( 112 , 113 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; Text [ en-US ] = "Graphics"; }; CheckBox CB_FROMOLE { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_FROMOLE"; Pos = MAP_APPFONT ( 182 , 113 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; Text [ en-US ] = "OLE objects"; }; CheckBox CB_LEVELFROMCHAPTER { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_LEVELFROMCHAPTER"; Pos = MAP_APPFONT ( 118 , 127 ) ; Size = MAP_APPFONT ( 103 , 10 ) ; Text [ en-US ] = "Use level from source chapter"; @@ -443,6 +469,7 @@ TabPage TP_TOX_SELECT }; CheckBox CB_SEQUENCE { + HelpID = "sw:CheckBox:TP_TOX_SELECT:CB_SEQUENCE"; Pos = MAP_APPFONT ( 12, 70) ; Size = MAP_APPFONT ( 100, 10 ) ; Text [ en-US ] = "~Number entries"; @@ -455,6 +482,7 @@ TabPage TP_TOX_SELECT }; ListBox LB_BRACKET { + HelpID = "sw:ListBox:TP_TOX_SELECT:LB_BRACKET"; Pos = MAP_APPFONT ( 75, 84) ; Size = MAP_APPFONT ( 40, 50 ) ; Border = TRUE; @@ -495,6 +523,7 @@ TabPage TP_TOX_SELECT }; ListBox LB_LANGUAGE { + HelpID = "sw:ListBox:TP_TOX_SELECT:LB_LANGUAGE"; Pos = MAP_APPFONT ( 47, 164) ; Size = MAP_APPFONT ( 80, 50 ) ; Border = TRUE; @@ -508,6 +537,7 @@ TabPage TP_TOX_SELECT }; ListBox LB_SORTALG { + HelpID = "sw:ListBox:TP_TOX_SELECT:LB_SORTALG"; Pos = MAP_APPFONT ( 201, 164) ; Size = MAP_APPFONT ( 50, 50 ) ; Border = TRUE; @@ -549,6 +579,7 @@ TabPage TP_TOX_ENTRY Size = MAP_APPFONT ( 136, 12 ) ; ImageButton WIN_LEFT_SCROLL { + HelpID = "sw:ImageButton:TP_TOX_ENTRY:WIN_LEFT_SCROLL"; Pos = MAP_APPFONT ( 0, 0 ) ; Size = MAP_APPFONT ( 10, 12 ) ; Symbol = IMAGEBUTTON_ARROW_LEFT; @@ -563,6 +594,7 @@ TabPage TP_TOX_ENTRY }; ImageButton WIN_RIGHT_SCROLL { + HelpID = "sw:ImageButton:TP_TOX_ENTRY:WIN_RIGHT_SCROLL"; Pos = MAP_APPFONT ( 126, 0 ) ; Size = MAP_APPFONT ( 10, 12 ) ; Symbol = IMAGEBUTTON_ARROW_RIGHT; @@ -649,48 +681,56 @@ TabPage TP_TOX_ENTRY }; PushButton PB_ALL_LEVELS { + HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_ALL_LEVELS"; Pos = MAP_APPFONT ( 209 , 14 ) ; Size = MAP_APPFONT ( 40, 14 ) ; Text [ en-US ] = "~All"; }; PushButton PB_ENTRYNO { + HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_ENTRYNO"; Pos = MAP_APPFONT ( 37 , 32 ) ; Size = MAP_APPFONT ( 40, 14 ) ; Text [ en-US ] = "Chapter no."; }; PushButton PB_ENTRY { + HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_ENTRY"; Pos = MAP_APPFONT ( 80, 32 ) ; Size = MAP_APPFONT ( 40, 14 ) ; Text [ en-US ] = "Entry text"; }; PushButton PB_CHAPTERINFO { + HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_CHAPTERINFO"; Pos = MAP_APPFONT ( 123 , 32 ) ; Size = MAP_APPFONT ( 40, 14) ; Text [ en-US ] = "~Chapter info"; }; PushButton PB_PAGENO { + HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_PAGENO"; Pos = MAP_APPFONT ( 166 , 32 ) ; Size = MAP_APPFONT ( 40, 14 ) ; Text [ en-US ] = "Page no."; }; PushButton PB_TAB { + HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_TAB"; Pos = MAP_APPFONT ( 209 ,32 ) ; Size = MAP_APPFONT ( 40, 14 ) ; Text [ en-US ] = "Tab stop"; }; PushButton PB_HYPERLINK { + HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_HYPERLINK"; Pos = MAP_APPFONT ( 209 , 32 ) ; Size = MAP_APPFONT ( 40, 14 ) ; Text [ en-US ] = "H~yperlink"; }; ListBox LB_AUTHFIELD { + HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_AUTHFIELD"; Pos = MAP_APPFONT ( 37 , 33 ) ; Size = MAP_APPFONT ( 59, 60 ) ; DropDown = TRUE; @@ -699,12 +739,14 @@ TabPage TP_TOX_ENTRY }; PushButton PB_AUTHINSERT { + HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_AUTHINSERT"; Pos = MAP_APPFONT ( 99 , 32 ) ; Size = MAP_APPFONT ( 39, 14 ) ; Text [ en-US ] = "~Insert"; }; PushButton PB_AUTHREMOVE { + HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_AUTHREMOVE"; Pos = MAP_APPFONT ( 142 , 32 ) ; Size = MAP_APPFONT ( 39, 14 ) ; Text [ en-US ] = "~Remove"; @@ -717,6 +759,7 @@ TabPage TP_TOX_ENTRY }; ListBox LB_CHARSTYLE { + HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_CHARSTYLE"; Pos = MAP_APPFONT ( 100 , 53 ) ; Size = MAP_APPFONT ( 93, 60 ) ; TabStop = TRUE ; @@ -724,6 +767,7 @@ TabPage TP_TOX_ENTRY }; PushButton PB_EDITSTYLE { + HelpID = "sw:PushButton:TP_TOX_ENTRY:PB_EDITSTYLE"; Pos = MAP_APPFONT ( 199 , 52 ) ; Size = MAP_APPFONT ( 50, 14 ) ; Text [ en-US ] = "~Edit..."; @@ -736,6 +780,7 @@ TabPage TP_TOX_ENTRY }; ComboBox CB_FILLCHAR { + HelpID = "sw:ComboBox:TP_TOX_ENTRY:CB_FILLCHAR"; Pos = MAP_APPFONT ( 100 , 69 ) ; Size = MAP_APPFONT ( 40, 40 ) ; TabStop = TRUE ; @@ -749,6 +794,7 @@ TabPage TP_TOX_ENTRY }; ListBox LB_CHAPTERENTRY { + HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_CHAPTERENTRY"; Pos = MAP_APPFONT ( 100 , 69 ) ; Size = MAP_APPFONT ( 93, 40 ) ; TabStop = TRUE ; @@ -769,6 +815,7 @@ TabPage TP_TOX_ENTRY }; ListBox LB_ENTRY_NO { + HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_ENTRY_NO"; Pos = MAP_APPFONT ( 100 , 69 ) ; Size = MAP_APPFONT ( 93, 40 ) ; TabStop = TRUE ; @@ -788,6 +835,7 @@ TabPage TP_TOX_ENTRY }; NumericField NF_LEVEL_OL { + HelpID = "sw:NumericField:TP_TOX_ENTRY:NF_LEVEL_OL"; Pos = MAP_APPFONT ( 100 , 85 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; Border = TRUE ; @@ -809,6 +857,7 @@ TabPage TP_TOX_ENTRY }; MetricField MF_TABPOS { + HelpID = "sw:MetricField:TP_TOX_ENTRY:MF_TABPOS"; Pos = MAP_APPFONT ( 100 , 85 ) ; Size = MAP_APPFONT ( 40, 12 ) ; Border = TRUE ; @@ -827,6 +876,7 @@ TabPage TP_TOX_ENTRY }; CheckBox CB_AUTORIGHT { + HelpID = "sw:CheckBox:TP_TOX_ENTRY:CB_AUTORIGHT"; Pos = MAP_APPFONT ( 143 , 86 ) ; Size = MAP_APPFONT ( 100, 10 ) ; Text [ en-US ] = "Align right"; @@ -839,6 +889,7 @@ TabPage TP_TOX_ENTRY }; CheckBox CB_RELTOSTYLE { + HelpID = "sw:CheckBox:TP_TOX_ENTRY:CB_RELTOSTYLE"; Pos = MAP_APPFONT ( 37 , 110 ) ; Size = MAP_APPFONT ( 200, 10 ) ; Text [ en-US ] = "Tab position relati~ve to Paragraph Style indent"; @@ -851,6 +902,7 @@ TabPage TP_TOX_ENTRY }; ListBox LB_MAIN_ENTRY_STYLE { + HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_MAIN_ENTRY_STYLE"; Pos = MAP_APPFONT ( 157 , 110 ) ; Size = MAP_APPFONT ( 92, 80 ) ; TabStop = TRUE ; @@ -860,12 +912,14 @@ TabPage TP_TOX_ENTRY CheckBox CB_ALPHADELIM { + HelpID = "sw:CheckBox:TP_TOX_ENTRY:CB_ALPHADELIM"; Pos = MAP_APPFONT ( 37 , 126 ) ; Size = MAP_APPFONT ( 105, 10 ) ; Text [ en-US ] = "Alphabetical delimiter"; }; CheckBox CB_COMMASEPARATED { + HelpID = "sw:CheckBox:TP_TOX_ENTRY:CB_COMMASEPARATED"; Pos = MAP_APPFONT ( 37 , 140 ) ; Size = MAP_APPFONT ( 105, 10 ) ; Text [ en-US ] = "Key separated by commas"; @@ -878,12 +932,14 @@ TabPage TP_TOX_ENTRY }; RadioButton RB_DOCPOS { + HelpID = "sw:RadioButton:TP_TOX_ENTRY:RB_DOCPOS"; Pos = MAP_APPFONT ( 40 , 113) ; Size = MAP_APPFONT ( 94, 10 ) ; Text [ en-US ] = "Document ~position "; }; RadioButton RB_SORTCONTENT { + HelpID = "sw:RadioButton:TP_TOX_ENTRY:RB_SORTCONTENT"; Pos = MAP_APPFONT ( 136 , 113 ) ; Size = MAP_APPFONT ( 90, 10 ) ; Text [ en-US ] = "~Content"; @@ -902,6 +958,7 @@ TabPage TP_TOX_ENTRY }; ListBox LB_FIRSTKEY { + HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_FIRSTKEY"; Pos = MAP_APPFONT ( 60 , 138 ) ; Size = MAP_APPFONT ( 159, 50 ) ; Border = TRUE; @@ -919,6 +976,7 @@ TabPage TP_TOX_ENTRY }; ImageRadioButton RB_SORTUP1 { + HelpID = "sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTUP1"; Pos = MAP_APPFONT ( 222 , 138 ) ; Size = MAP_APPFONT ( 12, 12 ) ; RadioButtonImage = @@ -932,6 +990,7 @@ TabPage TP_TOX_ENTRY }; ImageRadioButton RB_SORTDOWN1 { + HelpID = "sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTDOWN1"; Pos = MAP_APPFONT ( 237 , 138 ) ; Size = MAP_APPFONT ( 12, 12 ) ; RadioButtonImage = @@ -944,6 +1003,7 @@ TabPage TP_TOX_ENTRY }; ImageRadioButton RB_SORTUP2 { + HelpID = "sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTUP2"; Pos = MAP_APPFONT ( 222 , 153 ) ; Size = MAP_APPFONT ( 12, 12 ) ; RadioButtonImage = @@ -957,6 +1017,7 @@ TabPage TP_TOX_ENTRY }; ImageRadioButton RB_SORTDOWN2 { + HelpID = "sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTDOWN2"; Pos = MAP_APPFONT ( 237 , 153 ) ; Size = MAP_APPFONT ( 12, 12 ) ; RadioButtonImage = @@ -969,6 +1030,7 @@ TabPage TP_TOX_ENTRY }; ImageRadioButton RB_SORTUP3 { + HelpID = "sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTUP3"; Pos = MAP_APPFONT ( 222 , 168 ) ; Size = MAP_APPFONT ( 12, 12 ) ; RadioButtonImage = @@ -982,6 +1044,7 @@ TabPage TP_TOX_ENTRY }; ImageRadioButton RB_SORTDOWN3 { + HelpID = "sw:ImageRadioButton:TP_TOX_ENTRY:RB_SORTDOWN3"; Pos = MAP_APPFONT ( 237 ,168 ) ; Size = MAP_APPFONT ( 12, 12 ) ; RadioButtonImage = @@ -1000,6 +1063,7 @@ TabPage TP_TOX_ENTRY }; ListBox LB_SECONDKEY { + HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_SECONDKEY"; Pos = MAP_APPFONT ( 60 , 153 ) ; Size = MAP_APPFONT ( 159, 50 ) ; Border = TRUE; @@ -1013,6 +1077,7 @@ TabPage TP_TOX_ENTRY }; ListBox LB_THIRDKEY { + HelpID = "sw:ListBox:TP_TOX_ENTRY:LB_THIRDKEY"; Pos = MAP_APPFONT ( 60 , 168 ) ; Size = MAP_APPFONT ( 159, 50 ) ; Border = TRUE; @@ -1052,6 +1117,7 @@ TabPage TP_TOX_STYLES }; ListBox LB_LEVEL { + HelpID = "sw:ListBox:TP_TOX_STYLES:LB_LEVEL"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 102 , 131 ) ; @@ -1067,6 +1133,7 @@ TabPage TP_TOX_STYLES }; ListBox LB_PARALAY { + HelpID = "sw:ListBox:TP_TOX_STYLES:LB_PARALAY"; Border = TRUE ; Pos = MAP_APPFONT ( 142 , 25 ) ; Size = MAP_APPFONT ( 101 , 131 ) ; @@ -1076,6 +1143,7 @@ TabPage TP_TOX_STYLES }; PushButton BT_STD { + HelpID = "sw:PushButton:TP_TOX_STYLES:BT_STD"; Pos = MAP_APPFONT ( 64 , 162 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -1083,6 +1151,7 @@ TabPage TP_TOX_STYLES }; ImageButton BT_ASSIGN { + HelpID = "sw:ImageButton:TP_TOX_STYLES:BT_ASSIGN"; Pos = MAP_APPFONT ( 118 , 28 ) ; Size = MAP_APPFONT ( 20 , 12 ) ; TabStop = TRUE ; @@ -1097,6 +1166,7 @@ TabPage TP_TOX_STYLES }; PushButton BT_EDIT_STYLE { + HelpID = "sw:PushButton:TP_TOX_STYLES:BT_EDIT_STYLE"; Pos = MAP_APPFONT ( 193 , 162 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -1136,6 +1206,7 @@ ModalDialog DLG_ADD_IDX_STYLES }; ImageButton PB_LEFT { + HelpID = "sw:ImageButton:DLG_ADD_IDX_STYLES:PB_LEFT"; Pos = MAP_APPFONT ( 12 , 182 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; TabStop = TRUE ; @@ -1150,6 +1221,7 @@ ModalDialog DLG_ADD_IDX_STYLES }; ImageButton PB_RIGHT { + HelpID = "sw:ImageButton:DLG_ADD_IDX_STYLES:PB_RIGHT"; Pos = MAP_APPFONT ( 65 , 182 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/index/idxmrk.src b/sw/source/ui/index/idxmrk.src index 4410f407f2ed..5bd78240e5c5 100644 --- a/sw/source/ui/index/idxmrk.src +++ b/sw/source/ui/index/idxmrk.src @@ -392,6 +392,7 @@ ModalDialog DLG_NEW_USER_IDX }; Edit ED_NAME { + HelpID = "sw:Edit:DLG_NEW_USER_IDX:ED_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 15 ) ; Size = MAP_APPFONT ( 78 , 12 ) ; diff --git a/sw/source/ui/index/multmrk.src b/sw/source/ui/index/multmrk.src index 2182d5170fe5..5ecb1810d811 100644 --- a/sw/source/ui/index/multmrk.src +++ b/sw/source/ui/index/multmrk.src @@ -65,6 +65,7 @@ ModalDialog DLG_MULTMRK }; ListBox LB_TOX { + HelpID = "sw:ListBox:DLG_MULTMRK:LB_TOX"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 37 ) ; Size = MAP_APPFONT ( 100 , 49 ) ; diff --git a/sw/source/ui/misc/bookmark.src b/sw/source/ui/misc/bookmark.src index 2896bf07e3a3..54e4bad5c5cf 100644 --- a/sw/source/ui/misc/bookmark.src +++ b/sw/source/ui/misc/bookmark.src @@ -54,6 +54,7 @@ ModalDialog DLG_INSERT_BOOKMARK }; ComboBox CB_BOOKMARK { + HelpID = "sw:ComboBox:DLG_INSERT_BOOKMARK:CB_BOOKMARK"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 99 , 76 ) ; TABSTOP = TRUE ; @@ -62,6 +63,7 @@ ModalDialog DLG_INSERT_BOOKMARK }; PushButton BT_DELETE { + HelpID = "sw:PushButton:DLG_INSERT_BOOKMARK:BT_DELETE"; Pos = MAP_APPFONT ( 123 , 40 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */ diff --git a/sw/source/ui/misc/docfnote.src b/sw/source/ui/misc/docfnote.src index fbc1ba24393c..5e1b1e4ac71b 100644 --- a/sw/source/ui/misc/docfnote.src +++ b/sw/source/ui/misc/docfnote.src @@ -78,6 +78,7 @@ TabPage TP_FOOTNOTEOPTION }; ListBox LB_NUMVIEW { + HelpID = "sw:ListBox:TP_FOOTNOTEOPTION:LB_NUMVIEW"; Border = TRUE ; Pos = MAP_APPFONT ( 65 , 14 ) ; Size = MAP_APPFONT ( 59 , 72 ) ; @@ -94,6 +95,7 @@ TabPage TP_FOOTNOTEOPTION }; NumericField FLD_OFFSET { + HelpID = "sw:NumericField:TP_FOOTNOTEOPTION:FLD_OFFSET"; Pos = MAP_APPFONT ( 189 , 14 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Spin = TRUE ; @@ -112,6 +114,7 @@ TabPage TP_FOOTNOTEOPTION }; ListBox LB_NUMCOUNT { + HelpID = "sw:ListBox:TP_FOOTNOTEOPTION:LB_NUMCOUNT"; Border = TRUE ; Pos = MAP_APPFONT ( 65 , 29 ) ; Size = MAP_APPFONT ( 59 , 50 ) ; @@ -135,6 +138,7 @@ TabPage TP_FOOTNOTEOPTION }; Edit ED_PREFIX { + HelpID = "sw:Edit:TP_FOOTNOTEOPTION:ED_PREFIX"; Border = TRUE ; Pos = MAP_APPFONT ( 65 , 44 ) ; Size = MAP_APPFONT ( 59 , 12 ) ; @@ -151,6 +155,7 @@ TabPage TP_FOOTNOTEOPTION }; Edit ED_SUFFIX { + HelpID = "sw:Edit:TP_FOOTNOTEOPTION:ED_SUFFIX"; Border = TRUE ; Pos = MAP_APPFONT ( 189 , 44 ) ; Size = MAP_APPFONT ( 59 , 12 ) ; @@ -166,6 +171,7 @@ TabPage TP_FOOTNOTEOPTION }; RadioButton RB_POS_PAGE { + HelpID = "sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_PAGE"; Pos = MAP_APPFONT ( 65 , 62 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text [ en-US ] = "~End of page" ; @@ -174,6 +180,7 @@ TabPage TP_FOOTNOTEOPTION }; RadioButton RB_POS_CHAPTER { + HelpID = "sw:RadioButton:TP_FOOTNOTEOPTION:RB_POS_CHAPTER"; Pos = MAP_APPFONT ( 65 , 75 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text [ en-US ] = "En~d of document" ; @@ -193,6 +200,7 @@ TabPage TP_FOOTNOTEOPTION }; ListBox LB_PARA_TEMPL { + HelpID = "sw:ListBox:TP_FOOTNOTEOPTION:LB_PARA_TEMPL"; Border = TRUE ; Pos = MAP_APPFONT ( 48 , 100 ) ; Size = MAP_APPFONT ( 58 , 80 ) ; @@ -210,6 +218,7 @@ TabPage TP_FOOTNOTEOPTION }; ListBox LB_PAGE_TEMPL { + HelpID = "sw:ListBox:TP_FOOTNOTEOPTION:LB_PAGE_TEMPL"; Border = TRUE ; Pos = MAP_APPFONT ( 48 , 116) ; Size = MAP_APPFONT ( 58 , 80 ) ; @@ -232,6 +241,7 @@ TabPage TP_FOOTNOTEOPTION }; ListBox LB_ANCHR_CHARFMT { + HelpID = "sw:ListBox:TP_FOOTNOTEOPTION:LB_ANCHR_CHARFMT"; Border = TRUE ; Pos = MAP_APPFONT ( 186 , 100 ) ; Size = MAP_APPFONT ( 65 , 72 ) ; @@ -248,6 +258,7 @@ TabPage TP_FOOTNOTEOPTION }; ListBox LB_TEXT_CHARFMT { + HelpID = "sw:ListBox:TP_FOOTNOTEOPTION:LB_TEXT_CHARFMT"; Border = TRUE ; Pos = MAP_APPFONT ( 186 , 116 ) ; Size = MAP_APPFONT ( 65 , 72 ) ; @@ -270,6 +281,7 @@ TabPage TP_FOOTNOTEOPTION }; Edit ED_CONT { + HelpID = "sw:Edit:TP_FOOTNOTEOPTION:ED_CONT"; Border = TRUE ; Pos = MAP_APPFONT ( 88, 145 ) ; Size = MAP_APPFONT ( 160 , 12 ) ; @@ -286,6 +298,7 @@ TabPage TP_FOOTNOTEOPTION }; Edit ED_CONT_FROM { + HelpID = "sw:Edit:TP_FOOTNOTEOPTION:ED_CONT_FROM"; Border = TRUE ; Pos = MAP_APPFONT ( 88 , 161 ) ; Size = MAP_APPFONT ( 160 , 12 ) ; @@ -316,6 +329,7 @@ TabPage TP_ENDNOTEOPTION }; ListBox LB_NUMVIEW { + HelpID = "sw:ListBox:TP_ENDNOTEOPTION:LB_NUMVIEW"; Border = TRUE ; Pos = MAP_APPFONT ( 65 , 14 ) ; Size = MAP_APPFONT ( 59 , 72 ) ; @@ -343,6 +357,7 @@ TabPage TP_ENDNOTEOPTION }; NumericField FLD_OFFSET { + HelpID = "sw:NumericField:TP_ENDNOTEOPTION:FLD_OFFSET"; Pos = MAP_APPFONT ( 189 , 14 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Spin = TRUE ; @@ -361,6 +376,7 @@ TabPage TP_ENDNOTEOPTION }; ListBox LB_NUMCOUNT { + HelpID = "sw:ListBox:TP_ENDNOTEOPTION:LB_NUMCOUNT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 62 , 72 ) ; @@ -376,6 +392,7 @@ TabPage TP_ENDNOTEOPTION }; Edit ED_PREFIX { + HelpID = "sw:Edit:TP_ENDNOTEOPTION:ED_PREFIX"; Pos = MAP_APPFONT ( 65 , 30 ) ; Size = MAP_APPFONT ( 59 , 12 ) ; Border = TRUE ; @@ -392,6 +409,7 @@ TabPage TP_ENDNOTEOPTION }; Edit ED_SUFFIX { + HelpID = "sw:Edit:TP_ENDNOTEOPTION:ED_SUFFIX"; Pos = MAP_APPFONT ( 189 , 30 ) ; Size = MAP_APPFONT ( 59 , 12 ) ; Border = TRUE ; @@ -407,6 +425,7 @@ TabPage TP_ENDNOTEOPTION }; RadioButton RB_POS_PAGE { + HelpID = "sw:RadioButton:TP_ENDNOTEOPTION:RB_POS_PAGE"; Pos = MAP_APPFONT ( 12 , 104 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "End ~of page" ; @@ -415,6 +434,7 @@ TabPage TP_ENDNOTEOPTION }; RadioButton RB_POS_CHAPTER { + HelpID = "sw:RadioButton:TP_ENDNOTEOPTION:RB_POS_CHAPTER"; Pos = MAP_APPFONT ( 12 , 118 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "End of ~document" ; @@ -434,6 +454,7 @@ TabPage TP_ENDNOTEOPTION }; ListBox LB_PARA_TEMPL { + HelpID = "sw:ListBox:TP_ENDNOTEOPTION:LB_PARA_TEMPL"; Border = TRUE ; Pos = MAP_APPFONT ( 51 , 56 ) ; Size = MAP_APPFONT ( 67 , 72 ) ; @@ -451,6 +472,7 @@ TabPage TP_ENDNOTEOPTION }; ListBox LB_PAGE_TEMPL { + HelpID = "sw:ListBox:TP_ENDNOTEOPTION:LB_PAGE_TEMPL"; Border = TRUE ; Pos = MAP_APPFONT ( 51 , 72 ) ; Size = MAP_APPFONT ( 67 , 72 ) ; @@ -472,6 +494,7 @@ TabPage TP_ENDNOTEOPTION }; ListBox LB_ANCHR_CHARFMT { + HelpID = "sw:ListBox:TP_ENDNOTEOPTION:LB_ANCHR_CHARFMT"; Border = TRUE ; Pos = MAP_APPFONT ( 186 , 56 ) ; Size = MAP_APPFONT ( 65 , 72 ) ; @@ -488,6 +511,7 @@ TabPage TP_ENDNOTEOPTION }; ListBox LB_TEXT_CHARFMT { + HelpID = "sw:ListBox:TP_ENDNOTEOPTION:LB_TEXT_CHARFMT"; Border = TRUE ; Pos = MAP_APPFONT ( 186 , 72 ) ; Size = MAP_APPFONT ( 65 , 72 ) ; @@ -511,6 +535,7 @@ TabPage TP_ENDNOTEOPTION }; Edit ED_CONT { + HelpID = "sw:Edit:TP_ENDNOTEOPTION:ED_CONT"; Border = TRUE ; Pos = MAP_APPFONT ( 137 , 101 ) ; Size = MAP_APPFONT ( 114 , 12 ) ; @@ -527,6 +552,7 @@ TabPage TP_ENDNOTEOPTION }; Edit ED_CONT_FROM { + HelpID = "sw:Edit:TP_ENDNOTEOPTION:ED_CONT_FROM"; Border = TRUE ; Pos = MAP_APPFONT ( 137 , 116 ) ; Size = MAP_APPFONT ( 114 , 12 ) ; diff --git a/sw/source/ui/misc/glosbib.src b/sw/source/ui/misc/glosbib.src index 30a4a9e81930..97d83c4fdd90 100644 --- a/sw/source/ui/misc/glosbib.src +++ b/sw/source/ui/misc/glosbib.src @@ -38,6 +38,7 @@ ModalDialog DLG_BIB_BASE Text [ en-US ] = "Edit Categories" ; PushButton PB_NEW { + HelpID = "sw:PushButton:DLG_BIB_BASE:PB_NEW"; Disable = TRUE ; Pos = MAP_APPFONT ( 293 , 66 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -46,6 +47,7 @@ ModalDialog DLG_BIB_BASE }; PushButton PB_DELETE { + HelpID = "sw:PushButton:DLG_BIB_BASE:PB_DELETE"; Pos = MAP_APPFONT ( 293 , 83 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~Löschen : ~L÷schen */ @@ -55,6 +57,7 @@ ModalDialog DLG_BIB_BASE }; PushButton PB_RENAME { + HelpID = "sw:PushButton:DLG_BIB_BASE:PB_RENAME"; Disable = TRUE ; Pos = MAP_APPFONT ( 293 , 100 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; @@ -88,6 +91,7 @@ ModalDialog DLG_BIB_BASE }; Edit ED_NAME { + HelpID = "sw:Edit:DLG_BIB_BASE:ED_NAME"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 159 , 12 ) ; TabStop = TRUE ; @@ -102,6 +106,7 @@ ModalDialog DLG_BIB_BASE }; ListBox LB_PATH { + HelpID = "sw:ListBox:DLG_BIB_BASE:LB_PATH"; Pos = MAP_APPFONT ( 174 , 14 ) ; Size = MAP_APPFONT ( 107 , 50 ) ; DropDown = TRUE ; diff --git a/sw/source/ui/misc/glossary.src b/sw/source/ui/misc/glossary.src index 1988481a1ff0..3dddc5218398 100644 --- a/sw/source/ui/misc/glossary.src +++ b/sw/source/ui/misc/glossary.src @@ -40,6 +40,7 @@ ModalDialog DLG_GLOSSARY Moveable = TRUE ; CheckBox CB_INSERT_TIP { + HelpID = "sw:CheckBox:DLG_GLOSSARY:CB_INSERT_TIP"; Pos = MAP_APPFONT ( 12 , 12 ) ; Size = MAP_APPFONT ( 200 , 12 ) ; TabStop = TRUE ; @@ -54,6 +55,7 @@ ModalDialog DLG_GLOSSARY }; Edit ED_NAME { + HelpID = "sw:Edit:DLG_GLOSSARY:ED_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 55 , 29 ) ; Size = MAP_APPFONT ( 85 , 12 ) ; @@ -70,6 +72,7 @@ ModalDialog DLG_GLOSSARY }; Edit ED_SHORTNAME { + HelpID = "sw:Edit:DLG_GLOSSARY:ED_SHORTNAME"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 203 , 29 ) ; @@ -98,6 +101,7 @@ ModalDialog DLG_GLOSSARY }; CheckBox CB_FILE_REL { + HelpID = "sw:CheckBox:DLG_GLOSSARY:CB_FILE_REL"; Pos = MAP_APPFONT ( 14 , 145 ) ; Size = MAP_APPFONT ( 90 , 12 ) ; TabStop = TRUE ; @@ -105,6 +109,7 @@ ModalDialog DLG_GLOSSARY }; CheckBox CB_NET_REL { + HelpID = "sw:CheckBox:DLG_GLOSSARY:CB_NET_REL"; Pos = MAP_APPFONT ( 109 , 145 ) ; Size = MAP_APPFONT ( 90 , 12 ) ; Text [ en-US ] = "Inte~rnet" ; @@ -122,6 +127,7 @@ ModalDialog DLG_GLOSSARY }; CheckBox CB_SHOW_EXAMPLE { + HelpID = "sw:CheckBox:DLG_GLOSSARY:CB_SHOW_EXAMPLE"; Pos = MAP_APPFONT ( 231 , 145 ) ; Size = MAP_APPFONT ( 82 , 12 ) ; Text [ en-US ] = "Sho~w preview"; @@ -151,6 +157,7 @@ ModalDialog DLG_GLOSSARY }; MenuButton PB_EDIT { + HelpID = "sw:MenuButton:DLG_GLOSSARY:PB_EDIT"; Pos = MAP_APPFONT ( 319 , 60 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "AutoTe~xt" ; @@ -158,6 +165,7 @@ ModalDialog DLG_GLOSSARY }; PushButton PB_BIB { + HelpID = "sw:PushButton:DLG_GLOSSARY:PB_BIB"; Pos = MAP_APPFONT ( 319 , 77 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "C~ategories..." ; @@ -165,6 +173,7 @@ ModalDialog DLG_GLOSSARY }; PushButton PB_PATH { + HelpID = "sw:PushButton:DLG_GLOSSARY:PB_PATH"; Pos = MAP_APPFONT ( 319 , 94 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -308,6 +317,7 @@ ModalDialog DLG_RENAME_GLOS }; Edit ED_ON { + HelpID = "sw:Edit:DLG_RENAME_GLOS:ED_ON"; ReadOnly = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 44 , 12 ) ; @@ -322,6 +332,7 @@ ModalDialog DLG_RENAME_GLOS }; Edit ED_OS { + HelpID = "sw:Edit:DLG_RENAME_GLOS:ED_OS"; ReadOnly = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 200 , 12 ) ; @@ -336,6 +347,7 @@ ModalDialog DLG_RENAME_GLOS }; Edit ED_NN { + HelpID = "sw:Edit:DLG_RENAME_GLOS:ED_NN"; TabStop = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 44 , 27 ) ; @@ -350,6 +362,7 @@ ModalDialog DLG_RENAME_GLOS }; Edit ED_NS { + HelpID = "sw:Edit:DLG_RENAME_GLOS:ED_NS"; TabStop = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 200 , 27 ) ; diff --git a/sw/source/ui/misc/insfnote.src b/sw/source/ui/misc/insfnote.src index 1bf5f77dcb2e..265ee1e095f6 100644 --- a/sw/source/ui/misc/insfnote.src +++ b/sw/source/ui/misc/insfnote.src @@ -31,6 +31,7 @@ // #define DLG_INS_FOOTNOTE 257 ModalDialog DLG_INS_FOOTNOTE { + HelpID = "sw:ModalDialog:DLG_INS_FOOTNOTE"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 160 , 100 ) ; @@ -39,6 +40,7 @@ ModalDialog DLG_INS_FOOTNOTE Moveable = TRUE ; Edit ED_NUMBER_CHAR { + HelpID = "sw:Edit:DLG_INS_FOOTNOTE:ED_NUMBER_CHAR"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 69 , 27 ) ; @@ -71,6 +73,7 @@ ModalDialog DLG_INS_FOOTNOTE }; ImageButton BT_PREV { + HelpID = "sw:ImageButton:DLG_INS_FOOTNOTE:BT_PREV"; Pos = MAP_APPFONT ( 104 , 82 ) ; Size = MAP_APPFONT ( 24 , 14 ) ; TabStop = TRUE ; @@ -79,6 +82,7 @@ ModalDialog DLG_INS_FOOTNOTE }; ImageButton BT_NEXT { + HelpID = "sw:ImageButton:DLG_INS_FOOTNOTE:BT_NEXT"; Pos = MAP_APPFONT ( 130 , 82 ) ; Size = MAP_APPFONT ( 24 , 14 ) ; TabStop = TRUE ; @@ -87,6 +91,7 @@ ModalDialog DLG_INS_FOOTNOTE }; RadioButton RB_NUMBER_AUTO { + HelpID = "sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_AUTO"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "~Automatic" ; @@ -96,6 +101,7 @@ ModalDialog DLG_INS_FOOTNOTE }; RadioButton RB_NUMBER_CHAR { + HelpID = "sw:RadioButton:DLG_INS_FOOTNOTE:RB_NUMBER_CHAR"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 54 , 10 ) ; Text [ en-US ] = "~Character" ; @@ -108,12 +114,14 @@ ModalDialog DLG_INS_FOOTNOTE }; PushButton BT_NUMBER_CHAR { + HelpID = "sw:PushButton:DLG_INS_FOOTNOTE:BT_NUMBER_CHAR"; Pos = MAP_APPFONT ( 69 , 42 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; Text = "..." ; }; RadioButton RB_TYPE_FTN { + HelpID = "sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_FTN"; Pos = MAP_APPFONT ( 12 , 70 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; TabStop = TRUE ; @@ -123,6 +131,7 @@ ModalDialog DLG_INS_FOOTNOTE }; RadioButton RB_TYPE_ENDNOTE { + HelpID = "sw:RadioButton:DLG_INS_FOOTNOTE:RB_TYPE_ENDNOTE"; Pos = MAP_APPFONT ( 12 , 83 ) ; Size = MAP_APPFONT ( 79 , 10 ) ; Text [ en-US ] = "~Endnote" ; diff --git a/sw/source/ui/misc/linenum.src b/sw/source/ui/misc/linenum.src index b82828a86362..1b2db408c761 100644 --- a/sw/source/ui/misc/linenum.src +++ b/sw/source/ui/misc/linenum.src @@ -47,6 +47,7 @@ TabPage TP_LINENUMBERING Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox CB_NUMBERING_ON { + HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_NUMBERING_ON"; Pos = MAP_APPFONT ( 12 , 6 ) ; Size = MAP_APPFONT ( 242 , 8 ) ; TabStop = TRUE ; @@ -60,6 +61,7 @@ TabPage TP_LINENUMBERING }; ListBox LB_CHAR_STYLE { + HelpID = "sw:ListBox:TP_LINENUMBERING:LB_CHAR_STYLE"; Pos = MAP_APPFONT ( 100 , 30 ) ; Size = MAP_APPFONT ( 148 , 80 ) ; TabStop = TRUE ; @@ -74,6 +76,7 @@ TabPage TP_LINENUMBERING }; ListBox LB_FORMAT { + HelpID = "sw:ListBox:TP_LINENUMBERING:LB_FORMAT"; Pos = MAP_APPFONT ( 100 , 44 ) ; Size = MAP_APPFONT ( 148 , 80 ) ; TabStop = TRUE ; @@ -87,6 +90,7 @@ TabPage TP_LINENUMBERING }; ListBox LB_POS { + HelpID = "sw:ListBox:TP_LINENUMBERING:LB_POS"; Pos = MAP_APPFONT ( 100 , 60 ) ; Size = MAP_APPFONT ( 148 , 60 ) ; TabStop = TRUE ; @@ -107,6 +111,7 @@ TabPage TP_LINENUMBERING }; MetricField MF_OFFSET { + HelpID = "sw:MetricField:TP_LINENUMBERING:MF_OFFSET"; Pos = MAP_APPFONT ( 100 , 76 ) ; Size = MAP_APPFONT ( 45 , 12 ) ; Border = TRUE ; @@ -130,6 +135,7 @@ TabPage TP_LINENUMBERING }; NumericField NF_NUM_INVERVAL { + HelpID = "sw:NumericField:TP_LINENUMBERING:NF_NUM_INVERVAL"; Pos = MAP_APPFONT ( 100 , 92 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Border = TRUE ; @@ -163,6 +169,7 @@ TabPage TP_LINENUMBERING }; Edit ED_DIVISOR { + HelpID = "sw:Edit:TP_LINENUMBERING:ED_DIVISOR"; Pos = MAP_APPFONT ( 45 , 121 ) ; Size = MAP_APPFONT ( 76 , 12 ) ; Left = TRUE ; @@ -177,6 +184,7 @@ TabPage TP_LINENUMBERING }; NumericField NF_DIV_INTERVAL { + HelpID = "sw:NumericField:TP_LINENUMBERING:NF_DIV_INTERVAL"; Pos = MAP_APPFONT ( 45 , 137 ) ; Size = MAP_APPFONT ( 30 , 12 ) ; Border = TRUE ; @@ -205,6 +213,7 @@ TabPage TP_LINENUMBERING }; CheckBox CB_COUNT_EMPTYLINES { + HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_COUNT_EMPTYLINES"; Pos = MAP_APPFONT ( 139 , 121 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -212,6 +221,7 @@ TabPage TP_LINENUMBERING }; CheckBox CB_COUNT_FRAMELINES { + HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_COUNT_FRAMELINES"; Pos = MAP_APPFONT ( 139 , 135 ) ; Size = MAP_APPFONT ( 110 , 10 ) ; TabStop = TRUE ; @@ -219,6 +229,7 @@ TabPage TP_LINENUMBERING }; CheckBox CB_RESTART_PAGE { + HelpID = "sw:CheckBox:TP_LINENUMBERING:CB_RESTART_PAGE"; Pos = MAP_APPFONT ( 139 , 149 ); Size = MAP_APPFONT ( 110 , 10 ); TabStop = TRUE; diff --git a/sw/source/ui/misc/num.src b/sw/source/ui/misc/num.src index a89c30bb032a..600175cc4c8d 100644 --- a/sw/source/ui/misc/num.src +++ b/sw/source/ui/misc/num.src @@ -53,6 +53,7 @@ TabPage TP_NUM_POSITION }; MultiListBox LB_LEVEL { + HelpID = "sw:MultiListBox:TP_NUM_POSITION:LB_LEVEL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 26 , 163 ) ; TabStop = TRUE ; @@ -75,6 +76,7 @@ TabPage TP_NUM_POSITION }; MetricField MF_BORDERDIST { + HelpID = "sw:MetricField:TP_NUM_POSITION:MF_BORDERDIST"; Pos = MAP_APPFONT ( 198 , 25 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; @@ -93,6 +95,7 @@ TabPage TP_NUM_POSITION }; CheckBox CB_RELATIVE { + HelpID = "sw:CheckBox:TP_NUM_POSITION:CB_RELATIVE"; Pos = MAP_APPFONT ( 198 , 41 ) ; Size = MAP_APPFONT ( 52 , 10 ) ; Text [ en-US ] = "Relati~ve" ; @@ -105,6 +108,7 @@ TabPage TP_NUM_POSITION }; MetricField MF_INDENT { + HelpID = "sw:MetricField:TP_NUM_POSITION:MF_INDENT"; Pos = MAP_APPFONT ( 198 , 57 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; @@ -129,6 +133,7 @@ TabPage TP_NUM_POSITION }; MetricField MF_NUMDIST { + HelpID = "sw:MetricField:TP_NUM_POSITION:MF_NUMDIST"; Pos = MAP_APPFONT ( 198 , 73 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; @@ -153,6 +158,7 @@ TabPage TP_NUM_POSITION }; ListBox LB_ALIGN { + HelpID = "sw:ListBox:TP_NUM_POSITION:LB_ALIGN"; Pos = MAP_APPFONT ( 198 , 89 ) ; Size = MAP_APPFONT ( 40 , 40 ) ; TabStop = TRUE ; @@ -172,6 +178,7 @@ TabPage TP_NUM_POSITION }; ListBox LB_LABEL_FOLLOWED_BY { + HelpID = "sw:ListBox:TP_NUM_POSITION:LB_LABEL_FOLLOWED_BY"; Pos = MAP_APPFONT ( 198 , 25 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; @@ -192,6 +199,7 @@ TabPage TP_NUM_POSITION }; MetricField MF_LISTTAB { + HelpID = "sw:MetricField:TP_NUM_POSITION:MF_LISTTAB"; Pos = MAP_APPFONT ( 198 , 41 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; @@ -215,6 +223,7 @@ TabPage TP_NUM_POSITION }; ListBox LB_ALIGN_2 { + HelpID = "sw:ListBox:TP_NUM_POSITION:LB_ALIGN_2"; Pos = MAP_APPFONT ( 198 , 57 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; TabStop = TRUE ; @@ -228,6 +237,7 @@ TabPage TP_NUM_POSITION }; MetricField MF_ALIGNED_AT { + HelpID = "sw:MetricField:TP_NUM_POSITION:MF_ALIGNED_AT"; Pos = MAP_APPFONT ( 198 , 73 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; @@ -252,6 +262,7 @@ TabPage TP_NUM_POSITION }; MetricField MF_INDENT_AT { + HelpID = "sw:MetricField:TP_NUM_POSITION:MF_INDENT_AT"; Pos = MAP_APPFONT ( 198 , 89 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Left = TRUE ; @@ -270,6 +281,7 @@ TabPage TP_NUM_POSITION }; PushButton PB_STANDARD { + HelpID = "sw:PushButton:TP_NUM_POSITION:PB_STANDARD"; Pos = MAP_APPFONT ( 198 , 165 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "Default" ; diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src index d7dffb4a000b..85ea42df4861 100644 --- a/sw/source/ui/misc/outline.src +++ b/sw/source/ui/misc/outline.src @@ -65,6 +65,7 @@ ModalDialog DLG_NUM_NAMES }; ListBox LB_FORM { + HelpID = "sw:ListBox:DLG_NUM_NAMES:LB_FORM"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 29 ) ; Size = MAP_APPFONT ( 84 , 42 ) ; @@ -85,6 +86,7 @@ ModalDialog DLG_NUM_NAMES }; Edit ED_FORM { + HelpID = "sw:Edit:DLG_NUM_NAMES:ED_FORM"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 84 , 12 ) ; @@ -211,6 +213,7 @@ TabPage TP_OUTLINE_NUM Hide = TRUE; ListBox LB_LEVEL { + HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_LEVEL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 23 , 129 ) ; TabStop = TRUE ; @@ -233,6 +236,7 @@ TabPage TP_OUTLINE_NUM }; ListBox LB_COLL { + HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_COLL"; Border = TRUE ; Pos = MAP_APPFONT ( 50 , 25 ) ; Size = MAP_APPFONT ( 120 , 75 ) ; @@ -251,6 +255,7 @@ TabPage TP_OUTLINE_NUM }; ListBox LB_NUMBER { + HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_NUMBER"; Pos = MAP_APPFONT ( 104 , 41 ) ; Size = MAP_APPFONT ( 66 , 65 ) ; TabStop = TRUE ; @@ -266,6 +271,7 @@ TabPage TP_OUTLINE_NUM }; ListBox LB_CHARFMT { + HelpID = "sw:ListBox:TP_OUTLINE_NUM:LB_CHARFMT"; TabStop = TRUE ; DropDown = TRUE ; Pos = MAP_APPFONT ( 104 , 57 ) ; @@ -279,6 +285,7 @@ TabPage TP_OUTLINE_NUM }; NumericField NF_ALL_LEVEL { + HelpID = "sw:NumericField:TP_OUTLINE_NUM:NF_ALL_LEVEL"; Border = TRUE ; Pos = MAP_APPFONT ( 104 , 73 ) ; Size = MAP_APPFONT ( 66 , 12 ) ; @@ -308,6 +315,7 @@ TabPage TP_OUTLINE_NUM }; Edit ED_PREFIX { + HelpID = "sw:Edit:TP_OUTLINE_NUM:ED_PREFIX"; Border = TRUE ; Pos = MAP_APPFONT ( 104 , 100 ) ; Size = MAP_APPFONT ( 66 , 12 ) ; @@ -324,6 +332,7 @@ TabPage TP_OUTLINE_NUM }; Edit ED_SUFFIX { + HelpID = "sw:Edit:TP_OUTLINE_NUM:ED_SUFFIX"; Border = TRUE ; Pos = MAP_APPFONT ( 104 , 115 ) ; Size = MAP_APPFONT ( 66 , 12 ) ; @@ -340,6 +349,7 @@ TabPage TP_OUTLINE_NUM }; NumericField ED_START { + HelpID = "sw:NumericField:TP_OUTLINE_NUM:ED_START"; Border = TRUE ; Pos = MAP_APPFONT ( 104 , 131 ) ; Size = MAP_APPFONT ( 66 , 12 ) ; diff --git a/sw/source/ui/misc/pgfnote.src b/sw/source/ui/misc/pgfnote.src index 4ad558da0117..7d74eeb567f3 100644 --- a/sw/source/ui/misc/pgfnote.src +++ b/sw/source/ui/misc/pgfnote.src @@ -35,6 +35,7 @@ TabPage TP_FOOTNOTE_PAGE Hide = TRUE; RadioButton RB_MAXHEIGHT_PAGE { + HelpID = "sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT_PAGE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 132 , 10 ) ; Text [ en-US ] = "~Not larger than page area" ; @@ -43,12 +44,14 @@ TabPage TP_FOOTNOTE_PAGE }; RadioButton RB_MAXHEIGHT { + HelpID = "sw:RadioButton:TP_FOOTNOTE_PAGE:RB_MAXHEIGHT"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 132 , 10 ) ; Text [ en-US ] = "Maximum footnote ~height" ; }; MetricField ED_MAXHEIGHT { + HelpID = "sw:MetricField:TP_FOOTNOTE_PAGE:ED_MAXHEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 148 , 26 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; @@ -75,6 +78,7 @@ TabPage TP_FOOTNOTE_PAGE }; MetricField ED_DIST { + HelpID = "sw:MetricField:TP_FOOTNOTE_PAGE:ED_DIST"; Border = TRUE ; Pos = MAP_APPFONT ( 148 , 42 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; @@ -105,6 +109,7 @@ TabPage TP_FOOTNOTE_PAGE }; ListBox DLB_LINEPOS { + HelpID = "sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINEPOS"; Pos = MAP_APPFONT ( 148 , 71 ) ; Size = MAP_APPFONT ( 57 , 40 ) ; TabStop = TRUE ; @@ -128,6 +133,7 @@ TabPage TP_FOOTNOTE_PAGE }; ListBox DLB_LINETYPE { + HelpID = "sw:ListBox:TP_FOOTNOTE_PAGE:DLB_LINETYPE"; Pos = MAP_APPFONT ( 148 , 87 ) ; Size = MAP_APPFONT ( 57 , 50 ) ; TabStop = TRUE ; @@ -145,6 +151,7 @@ TabPage TP_FOOTNOTE_PAGE }; MetricField ED_LINEWIDTH { + HelpID = "sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEWIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 148 , 103 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; @@ -168,6 +175,7 @@ TabPage TP_FOOTNOTE_PAGE }; MetricField ED_LINEDIST { + HelpID = "sw:MetricField:TP_FOOTNOTE_PAGE:ED_LINEDIST"; Border = TRUE ; Pos = MAP_APPFONT ( 148 , 119 ) ; Size = MAP_APPFONT ( 42 , 12 ) ; diff --git a/sw/source/ui/misc/pggrid.src b/sw/source/ui/misc/pggrid.src index b03ec2a687c1..9fb24c12029f 100644 --- a/sw/source/ui/misc/pggrid.src +++ b/sw/source/ui/misc/pggrid.src @@ -41,24 +41,28 @@ TabPage TP_TEXTGRID_PAGE }; RadioButton RB_NOGRID { + HelpID = "sw:RadioButton:TP_TEXTGRID_PAGE:RB_NOGRID"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text [ en-US ] = "No grid" ; }; RadioButton RB_LINESGRID { + HelpID = "sw:RadioButton:TP_TEXTGRID_PAGE:RB_LINESGRID"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text [ en-US ] = "Grid (lines only)" ; }; RadioButton RB_CHARSGRID { + HelpID = "sw:RadioButton:TP_TEXTGRID_PAGE:RB_CHARSGRID"; Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text [ en-US ] = "Grid (lines and characters)" ; }; CheckBox CB_SNAPTOCHARS { + HelpID = "sw:CheckBox:TP_TEXTGRID_PAGE:CB_SNAPTOCHARS"; Pos = MAP_APPFONT ( 14 , 53 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text [ en-US ] = "~Snap to characters" ; @@ -83,6 +87,7 @@ TabPage TP_TEXTGRID_PAGE }; NumericField NF_LINESPERPAGE { + HelpID = "sw:NumericField:TP_TEXTGRID_PAGE:NF_LINESPERPAGE"; Pos = MAP_APPFONT ( 74 , 80 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; Border = TRUE ; @@ -105,6 +110,7 @@ TabPage TP_TEXTGRID_PAGE }; MetricField MF_TEXTSIZE { + HelpID = "sw:MetricField:TP_TEXTGRID_PAGE:MF_TEXTSIZE"; Pos = MAP_APPFONT ( 216 , 80 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; Border = TRUE ; @@ -128,6 +134,7 @@ TabPage TP_TEXTGRID_PAGE }; NumericField NF_CHARSPERLINE { + HelpID = "sw:NumericField:TP_TEXTGRID_PAGE:NF_CHARSPERLINE"; Pos = MAP_APPFONT ( 74 , 96 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; Border = TRUE ; @@ -151,6 +158,7 @@ TabPage TP_TEXTGRID_PAGE }; MetricField MF_CHARWIDTH { + HelpID = "sw:MetricField:TP_TEXTGRID_PAGE:MF_CHARWIDTH"; Pos = MAP_APPFONT ( 216 , 96 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; Border = TRUE ; @@ -174,6 +182,7 @@ TabPage TP_TEXTGRID_PAGE }; MetricField MF_RUBYSIZE { + HelpID = "sw:MetricField:TP_TEXTGRID_PAGE:MF_RUBYSIZE"; Pos = MAP_APPFONT ( 216 , 96 ) ; Size = MAP_APPFONT ( 35 , 12 ) ; Border = TRUE ; @@ -191,6 +200,7 @@ TabPage TP_TEXTGRID_PAGE }; CheckBox CB_RUBYBELOW { + HelpID = "sw:CheckBox:TP_TEXTGRID_PAGE:CB_RUBYBELOW"; Pos = MAP_APPFONT ( 14 , 112 ) ; Size = MAP_APPFONT ( 237 , 10 ) ; Text [ en-US ] = "Ruby text below/left from base text" ; @@ -203,12 +213,14 @@ TabPage TP_TEXTGRID_PAGE }; CheckBox CB_DISPLAY { + HelpID = "sw:CheckBox:TP_TEXTGRID_PAGE:CB_DISPLAY"; Pos = MAP_APPFONT ( 12 , 139 ) ; Size = MAP_APPFONT ( 118 , 10 ) ; Text [ en-US ] = "Display grid" ; }; CheckBox CB_PRINT { + HelpID = "sw:CheckBox:TP_TEXTGRID_PAGE:CB_PRINT"; Pos = MAP_APPFONT ( 18 , 154 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; Text [ en-US ] = "Print grid" ; @@ -221,6 +233,7 @@ TabPage TP_TEXTGRID_PAGE }; ListBox LB_COLOR { + HelpID = "sw:ListBox:TP_TEXTGRID_PAGE:LB_COLOR"; Pos = MAP_APPFONT ( 191 , 137 ) ; Size = MAP_APPFONT ( 60 , 50 ) ; TabStop = TRUE; diff --git a/sw/source/ui/misc/srtdlg.src b/sw/source/ui/misc/srtdlg.src index a451f920dd76..5bfbc4600e10 100644 --- a/sw/source/ui/misc/srtdlg.src +++ b/sw/source/ui/misc/srtdlg.src @@ -80,6 +80,7 @@ ModalDialog DLG_SORTING }; CheckBox CB_KEY1 { + HelpID = "sw:CheckBox:DLG_SORTING:CB_KEY1"; Pos = MAP_APPFONT ( 12 , 25 ) ; Size = MAP_APPFONT ( 49 , 8 ) ; /* ### ACHTUNG: Neuer Text in Resource? Schlüssel ~1 : Schl³ssel ~1 */ @@ -88,6 +89,7 @@ ModalDialog DLG_SORTING }; NumericField ED_KEY1 { + HelpID = "sw:NumericField:DLG_SORTING:ED_KEY1"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 23 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; @@ -109,6 +111,7 @@ ModalDialog DLG_SORTING }; ListBox DLB_KEY1 { + HelpID = "sw:ListBox:DLG_SORTING:DLB_KEY1"; Pos = MAP_APPFONT ( 96 , 23 ) ; Size = MAP_APPFONT ( 55 , 45 ) ; TabStop = TRUE ; @@ -118,6 +121,7 @@ ModalDialog DLG_SORTING }; RadioButton RB_UP { + HelpID = "sw:RadioButton:DLG_SORTING:RB_UP"; Pos = MAP_APPFONT ( 155 , 23 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "~Ascending" ; @@ -126,6 +130,7 @@ ModalDialog DLG_SORTING }; RadioButton RB_DN { + HelpID = "sw:RadioButton:DLG_SORTING:RB_DN"; Pos = MAP_APPFONT ( 155 , 35 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "~Descending" ; @@ -133,6 +138,7 @@ ModalDialog DLG_SORTING }; CheckBox CB_KEY2 { + HelpID = "sw:CheckBox:DLG_SORTING:CB_KEY2"; Pos = MAP_APPFONT ( 12 , 52 ) ; Size = MAP_APPFONT ( 49 , 8 ) ; /* ### ACHTUNG: Neuer Text in Resource? Schlüssel ~2 : Schl³ssel ~2 */ @@ -140,6 +146,7 @@ ModalDialog DLG_SORTING }; NumericField ED_KEY2 { + HelpID = "sw:NumericField:DLG_SORTING:ED_KEY2"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 50 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; @@ -156,6 +163,7 @@ ModalDialog DLG_SORTING }; ListBox DLB_KEY2 { + HelpID = "sw:ListBox:DLG_SORTING:DLB_KEY2"; Pos = MAP_APPFONT ( 96 , 50 ) ; Size = MAP_APPFONT ( 55 , 45 ) ; TabStop = TRUE ; @@ -165,6 +173,7 @@ ModalDialog DLG_SORTING }; RadioButton RB_UP2 { + HelpID = "sw:RadioButton:DLG_SORTING:RB_UP2"; Pos = MAP_APPFONT ( 155 , 50 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "Ascending" ; @@ -173,6 +182,7 @@ ModalDialog DLG_SORTING }; RadioButton RB_DN2 { + HelpID = "sw:RadioButton:DLG_SORTING:RB_DN2"; Pos = MAP_APPFONT ( 155 , 62 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "Descending" ; @@ -180,6 +190,7 @@ ModalDialog DLG_SORTING }; CheckBox CB_KEY3 { + HelpID = "sw:CheckBox:DLG_SORTING:CB_KEY3"; Pos = MAP_APPFONT ( 12 , 81 ) ; Size = MAP_APPFONT ( 49 , 8 ) ; /* ### ACHTUNG: Neuer Text in Resource? Schlüssel ~3 : Schl³ssel ~3 */ @@ -187,6 +198,7 @@ ModalDialog DLG_SORTING }; NumericField ED_KEY3 { + HelpID = "sw:NumericField:DLG_SORTING:ED_KEY3"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 79 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; @@ -203,6 +215,7 @@ ModalDialog DLG_SORTING }; ListBox DLB_KEY3 { + HelpID = "sw:ListBox:DLG_SORTING:DLB_KEY3"; Pos = MAP_APPFONT ( 96 , 79 ) ; Size = MAP_APPFONT ( 55 , 45 ) ; TabStop = TRUE ; @@ -212,6 +225,7 @@ ModalDialog DLG_SORTING }; RadioButton RB_UP3 { + HelpID = "sw:RadioButton:DLG_SORTING:RB_UP3"; Pos = MAP_APPFONT ( 155 , 79 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "Ascending" ; @@ -220,6 +234,7 @@ ModalDialog DLG_SORTING }; RadioButton RB_DN3 { + HelpID = "sw:RadioButton:DLG_SORTING:RB_DN3"; Pos = MAP_APPFONT ( 155 , 91 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "Descending" ; @@ -233,6 +248,7 @@ ModalDialog DLG_SORTING }; RadioButton RB_COL { + HelpID = "sw:RadioButton:DLG_SORTING:RB_COL"; Pos = MAP_APPFONT ( 12 , 120 ) ; Size = MAP_APPFONT ( 38 , 10 ) ; Text [ en-US ] = "Col~umns" ; @@ -240,6 +256,7 @@ ModalDialog DLG_SORTING }; RadioButton RB_ROW { + HelpID = "sw:RadioButton:DLG_SORTING:RB_ROW"; Pos = MAP_APPFONT ( 12 , 133 ) ; Size = MAP_APPFONT ( 34 , 10 ) ; Text [ en-US ] = "~Rows" ; @@ -254,6 +271,7 @@ ModalDialog DLG_SORTING }; RadioButton RB_TAB { + HelpID = "sw:RadioButton:DLG_SORTING:RB_TAB"; Pos = MAP_APPFONT ( 113 , 120 ) ; Size = MAP_APPFONT ( 44 , 9 ) ; Text [ en-US ] = "~Tabs" ; @@ -262,6 +280,7 @@ ModalDialog DLG_SORTING }; RadioButton RB_TABCH { + HelpID = "sw:RadioButton:DLG_SORTING:RB_TABCH"; Pos = MAP_APPFONT ( 113 , 133 ) ; Size = MAP_APPFONT ( 38 , 10 ) ; Text [ en-US ] = "~Character" ; @@ -269,6 +288,7 @@ ModalDialog DLG_SORTING }; Edit ED_TABCH { + HelpID = "sw:Edit:DLG_SORTING:ED_TABCH"; Border = TRUE ; Pos = MAP_APPFONT ( 180 , 133 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; @@ -291,6 +311,7 @@ ModalDialog DLG_SORTING }; PushButton PB_DELIM { + HelpID = "sw:PushButton:DLG_SORTING:PB_DELIM"; Pos = MAP_APPFONT ( 195 , 133 ) ; Size = MAP_APPFONT ( 12 , 12 ) ; TabStop = TRUE ; @@ -304,6 +325,7 @@ ModalDialog DLG_SORTING }; ListBox LB_LANG { + HelpID = "sw:ListBox:DLG_SORTING:LB_LANG"; Pos = MAP_APPFONT ( 12 , 158 ) ; Size = MAP_APPFONT ( 83 , 61 ) ; TabStop = TRUE ; @@ -318,6 +340,7 @@ ModalDialog DLG_SORTING }; CheckBox CB_CASE { + HelpID = "sw:CheckBox:DLG_SORTING:CB_CASE"; Pos = MAP_APPFONT ( 113 , 159 ) ; Size = MAP_APPFONT ( 147 , 10 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/table/chartins.src b/sw/source/ui/table/chartins.src index 6a3c4fb5b34a..b4cd8fdbeff0 100644 --- a/sw/source/ui/table/chartins.src +++ b/sw/source/ui/table/chartins.src @@ -50,12 +50,14 @@ ModelessDialog DLG_INSERT_CHART }; Edit ED_RANGE { + HelpID = "sw:Edit:DLG_INSERT_CHART:ED_RANGE"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 14 ) ; Size = MAP_APPFONT ( 229 , 12 ) ; }; CheckBox CB_FIRST_ROW { + HelpID = "sw:CheckBox:DLG_INSERT_CHART:CB_FIRST_ROW"; Pos = MAP_APPFONT ( 12 , 32 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; TabStop = TRUE ; @@ -64,6 +66,7 @@ ModelessDialog DLG_INSERT_CHART }; CheckBox CB_FIRST_COL { + HelpID = "sw:CheckBox:DLG_INSERT_CHART:CB_FIRST_COL"; Pos = MAP_APPFONT ( 12 , 46 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; TabStop = TRUE ; @@ -96,6 +99,7 @@ ModelessDialog DLG_INSERT_CHART }; PushButton BT_PREV { + HelpID = "sw:PushButton:DLG_INSERT_CHART:BT_PREV"; Pos = MAP_APPFONT ( 130 , 151 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; // ### ACHTUNG: Neuer Text in Resource? << ~Zurück : << Zurück @@ -106,6 +110,7 @@ ModelessDialog DLG_INSERT_CHART }; PushButton BT_NEXT { + HelpID = "sw:PushButton:DLG_INSERT_CHART:BT_NEXT"; Pos = MAP_APPFONT ( 185 , 151 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Disable = TRUE ; @@ -114,6 +119,7 @@ ModelessDialog DLG_INSERT_CHART }; PushButton BT_FINISH { + HelpID = "sw:PushButton:DLG_INSERT_CHART:BT_FINISH"; Pos = MAP_APPFONT ( 240 , 151 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/table/colwd.src b/sw/source/ui/table/colwd.src index c7be192823f3..fb1505c1cabe 100644 --- a/sw/source/ui/table/colwd.src +++ b/sw/source/ui/table/colwd.src @@ -66,6 +66,7 @@ ModalDialog DLG_COL_WIDTH }; MetricField ED_WIDTH { + HelpID = "sw:MetricField:DLG_COL_WIDTH:ED_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 51 , 30 ) ; Size = MAP_APPFONT ( 38 , 12 ) ; @@ -97,6 +98,7 @@ ModalDialog DLG_COL_WIDTH }; NumericField ED_COL { + HelpID = "sw:NumericField:DLG_COL_WIDTH:ED_COL"; Border = TRUE ; Pos = MAP_APPFONT ( 51 , 14 ) ; Size = MAP_APPFONT ( 38 , 12 ) ; diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src index 9dfffff2280a..c15b4ad4456c 100644 --- a/sw/source/ui/table/convert.src +++ b/sw/source/ui/table/convert.src @@ -39,6 +39,7 @@ ModalDialog DLG_CONV_TEXT_TABLE SVLOOK = TRUE ; RadioButton CB_TAB { + HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_TAB"; Pos = MAP_APPFONT ( 12 , 17 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "~Tabs" ; @@ -48,6 +49,7 @@ ModalDialog DLG_CONV_TEXT_TABLE }; RadioButton CB_SEMI { + HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_SEMI"; Pos = MAP_APPFONT ( 75 , 17 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "~Semicolons" ; @@ -55,6 +57,7 @@ ModalDialog DLG_CONV_TEXT_TABLE }; RadioButton CB_PARA { + HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:CB_PARA"; Pos = MAP_APPFONT ( 12 , 33 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; Text [ en-US ] = "~Paragraph" ; @@ -62,12 +65,14 @@ ModalDialog DLG_CONV_TEXT_TABLE }; RadioButton RB_OTHER { + HelpID = "sw:RadioButton:DLG_CONV_TEXT_TABLE:RB_OTHER"; Pos = MAP_APPFONT ( 75 , 33 ) ; Size = MAP_APPFONT ( 45 , 10 ) ; Text [ en-US ] = "~Other: " ; }; Edit ED_OTHER { + HelpID = "sw:Edit:DLG_CONV_TEXT_TABLE:ED_OTHER"; Border = TRUE ; Left = TRUE ; Pos = MAP_APPFONT ( 123 , 32 ) ; @@ -77,6 +82,7 @@ ModalDialog DLG_CONV_TEXT_TABLE }; CheckBox CB_KEEPCOLUMN { + HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_KEEPCOLUMN"; Pos = MAP_APPFONT ( 12 , 49 ) ; Size = MAP_APPFONT ( 128 , 10 ) ; Check = TRUE; @@ -92,6 +98,7 @@ ModalDialog DLG_CONV_TEXT_TABLE }; CheckBox CB_HEADER { + HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_HEADER"; Pos = MAP_APPFONT ( 12 , 84 ) ; Size = MAP_APPFONT ( 123 , 10 ) ; TabStop = TRUE ; @@ -99,6 +106,7 @@ ModalDialog DLG_CONV_TEXT_TABLE }; CheckBox CB_REPEAT_HEADER { + HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_REPEAT_HEADER"; Pos = MAP_APPFONT ( 22 , 97 ) ; Size = MAP_APPFONT ( 113 , 10 ) ; Text [ en-US ] = "Repeat heading"; @@ -112,6 +120,7 @@ ModalDialog DLG_CONV_TEXT_TABLE }; NumericField NF_REPEAT_HEADER { + HelpID = "sw:NumericField:DLG_CONV_TEXT_TABLE:NF_REPEAT_HEADER"; Border = TRUE ; Pos = MAP_APPFONT ( 191 , 112 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; @@ -130,6 +139,7 @@ ModalDialog DLG_CONV_TEXT_TABLE }; CheckBox CB_DONT_SPLIT { + HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_DONT_SPLIT"; Pos = MAP_APPFONT ( 12 , 126 ) ; Size = MAP_APPFONT ( 123 , 10 ) ; TabStop = TRUE ; @@ -137,6 +147,7 @@ ModalDialog DLG_CONV_TEXT_TABLE }; CheckBox CB_BORDER { + HelpID = "sw:CheckBox:DLG_CONV_TEXT_TABLE:CB_BORDER"; Pos = MAP_APPFONT ( 12 , 139 ) ; Size = MAP_APPFONT ( 123 , 10 ) ; TabStop = TRUE ; @@ -173,6 +184,7 @@ ModalDialog DLG_CONV_TEXT_TABLE }; PushButton BT_AUTOFORMAT { + HelpID = "sw:PushButton:DLG_CONV_TEXT_TABLE:BT_AUTOFORMAT"; Pos = MAP_APPFONT ( 12 , 152 ) ; Size = MAP_APPFONT ( 86 , 14 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/table/instable.src b/sw/source/ui/table/instable.src index 55bb287a1331..d83ba3402e72 100644 --- a/sw/source/ui/table/instable.src +++ b/sw/source/ui/table/instable.src @@ -40,6 +40,7 @@ ModalDialog DLG_INSERT_TABLE Moveable = TRUE ; Edit ED_NAME { + HelpID = "sw:Edit:DLG_INSERT_TABLE:ED_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 53 , 6 ) ; Size = MAP_APPFONT ( 158, 12 ) ; @@ -60,6 +61,7 @@ ModalDialog DLG_INSERT_TABLE }; NumericField ED_COL { + HelpID = "sw:NumericField:DLG_INSERT_TABLE:ED_COL"; Border = TRUE ; Pos = MAP_APPFONT ( 53 , 32 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; @@ -82,6 +84,7 @@ ModalDialog DLG_INSERT_TABLE }; NumericField ED_ROW { + HelpID = "sw:NumericField:DLG_INSERT_TABLE:ED_ROW"; Border = TRUE ; Pos = MAP_APPFONT ( 53 , 48 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; @@ -103,6 +106,7 @@ ModalDialog DLG_INSERT_TABLE }; CheckBox CB_HEADER { + HelpID = "sw:CheckBox:DLG_INSERT_TABLE:CB_HEADER"; Pos = MAP_APPFONT ( 12 , 74 ) ; Size = MAP_APPFONT (113 , 10 ) ; TabStop = TRUE ; @@ -110,6 +114,7 @@ ModalDialog DLG_INSERT_TABLE }; CheckBox CB_REPEAT_HEADER { + HelpID = "sw:CheckBox:DLG_INSERT_TABLE:CB_REPEAT_HEADER"; Pos = MAP_APPFONT ( 21 , 88 ) ; Size = MAP_APPFONT ( 104 , 10 ) ; TabStop = TRUE ; @@ -123,6 +128,7 @@ ModalDialog DLG_INSERT_TABLE }; NumericField NF_REPEAT_HEADER { + HelpID = "sw:NumericField:DLG_INSERT_TABLE:NF_REPEAT_HEADER"; Border = TRUE ; Pos = MAP_APPFONT ( 130 , 104 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; @@ -141,6 +147,7 @@ ModalDialog DLG_INSERT_TABLE }; CheckBox CB_DONT_SPLIT { + HelpID = "sw:CheckBox:DLG_INSERT_TABLE:CB_DONT_SPLIT"; Pos = MAP_APPFONT ( 12 , 118 ) ; Size = MAP_APPFONT ( 113 , 10 ) ; Text [ en-US ] = "Don't split table"; @@ -148,6 +155,7 @@ ModalDialog DLG_INSERT_TABLE }; CheckBox CB_BORDER { + HelpID = "sw:CheckBox:DLG_INSERT_TABLE:CB_BORDER"; Pos = MAP_APPFONT ( 12 , 132 ) ; Size = MAP_APPFONT ( 113 , 10 ) ; TabStop = TRUE ; @@ -155,6 +163,7 @@ ModalDialog DLG_INSERT_TABLE }; PushButton BT_AUTOFORMAT { + HelpID = "sw:PushButton:DLG_INSERT_TABLE:BT_AUTOFORMAT"; Pos = MAP_APPFONT ( 12 , 146 ) ; Size = MAP_APPFONT ( 86 , 14 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/table/mergetbl.src b/sw/source/ui/table/mergetbl.src index 8f75736cf6b2..f88ec62923f4 100644 --- a/sw/source/ui/table/mergetbl.src +++ b/sw/source/ui/table/mergetbl.src @@ -63,6 +63,7 @@ ModalDialog DLG_MERGE_TABLE }; RadioButton RB_MERGE_PREV { + HelpID = "sw:RadioButton:DLG_MERGE_TABLE:RB_MERGE_PREV"; Pos = MAP_APPFONT ( 12 , 15 ) ; Size = MAP_APPFONT ( 130 , 10 ) ; Check = TRUE ; @@ -71,6 +72,7 @@ ModalDialog DLG_MERGE_TABLE }; RadioButton RB_MERGE_NEXT { + HelpID = "sw:RadioButton:DLG_MERGE_TABLE:RB_MERGE_NEXT"; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 130 , 10 ) ; Text [ en-US ] = "Join with ~next table"; diff --git a/sw/source/ui/table/rowht.src b/sw/source/ui/table/rowht.src index f365bf042337..b9abcd05ce94 100644 --- a/sw/source/ui/table/rowht.src +++ b/sw/source/ui/table/rowht.src @@ -59,6 +59,7 @@ ModalDialog DLG_ROW_HEIGHT }; MetricField ED_HEIGHT { + HelpID = "sw:MetricField:DLG_ROW_HEIGHT:ED_HEIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 16 ) ; Size = MAP_APPFONT ( 38 , 12 ) ; @@ -76,6 +77,7 @@ ModalDialog DLG_ROW_HEIGHT }; CheckBox CB_AUTOHEIGHT { + HelpID = "sw:CheckBox:DLG_ROW_HEIGHT:CB_AUTOHEIGHT"; Pos = MAP_APPFONT ( 12 , 34 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? ~dynamisch anpassen : auto. H~öhe */ diff --git a/sw/source/ui/table/splittbl.src b/sw/source/ui/table/splittbl.src index 790675ed8ad0..0ba49f00a271 100644 --- a/sw/source/ui/table/splittbl.src +++ b/sw/source/ui/table/splittbl.src @@ -63,6 +63,7 @@ ModalDialog DLG_SPLIT_TABLE }; RadioButton RB_CNTNT { + HelpID = "sw:RadioButton:DLG_SPLIT_TABLE:RB_CNTNT"; Pos = MAP_APPFONT ( 12 , 15 ) ; Size = MAP_APPFONT ( 130 , 10 ) ; Check = TRUE ; @@ -71,18 +72,21 @@ ModalDialog DLG_SPLIT_TABLE }; RadioButton RB_BOX_PARA { + HelpID = "sw:RadioButton:DLG_SPLIT_TABLE:RB_BOX_PARA"; Pos = MAP_APPFONT ( 12 , 30 ) ; Size = MAP_APPFONT ( 130 , 10 ) ; Text [ en-US ] = "C~ustom heading (apply Style)" ; }; RadioButton RB_BOX_NOPARA { + HelpID = "sw:RadioButton:DLG_SPLIT_TABLE:RB_BOX_NOPARA"; Pos = MAP_APPFONT ( 12 , 45 ) ; Size = MAP_APPFONT ( 130 , 10 ) ; Text [ en-US ] = "Cu~stom heading" ; }; RadioButton RB_BORDER { + HelpID = "sw:RadioButton:DLG_SPLIT_TABLE:RB_BORDER"; Pos = MAP_APPFONT ( 12 , 60 ) ; Size = MAP_APPFONT ( 130 , 10 ) ; Text [ en-US ] = "~No heading" ; diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src index 4243ba1b6c68..79300699bd33 100644 --- a/sw/source/ui/table/tabledlg.src +++ b/sw/source/ui/table/tabledlg.src @@ -98,6 +98,7 @@ TabPage TP_FORMAT_TABLE }; Edit ED_NAME { + HelpID = "sw:Edit:TP_FORMAT_TABLE:ED_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 14 ) ; Size = MAP_APPFONT ( 112 , 12 ) ; @@ -111,6 +112,7 @@ TabPage TP_FORMAT_TABLE }; MetricField ED_WIDTH { + HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_WIDTH"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 30 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -129,6 +131,7 @@ TabPage TP_FORMAT_TABLE }; CheckBox CB_REL_WIDTH { + HelpID = "sw:CheckBox:TP_FORMAT_TABLE:CB_REL_WIDTH"; Pos = MAP_APPFONT ( 118 , 32 ) ; Size = MAP_APPFONT ( 69 , 10 ) ; TabStop = TRUE ; @@ -142,6 +145,7 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_FULL { + HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FULL"; Pos = MAP_APPFONT ( 202 , 14 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; @@ -149,6 +153,7 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_LEFT { + HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_LEFT"; Pos = MAP_APPFONT ( 202 , 28 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "~Left" ; @@ -156,6 +161,7 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_FROM_LEFT { + HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FROM_LEFT"; Pos = MAP_APPFONT ( 202 , 42 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; @@ -163,6 +169,7 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_RIGHT { + HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_RIGHT"; Pos = MAP_APPFONT ( 202 , 56 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "R~ight" ; @@ -170,6 +177,7 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_CENTER { + HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_CENTER"; Pos = MAP_APPFONT ( 202 , 70 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; Text [ en-US ] = "~Center" ; @@ -177,6 +185,7 @@ TabPage TP_FORMAT_TABLE }; RadioButton RB_FREE { + HelpID = "sw:RadioButton:TP_FORMAT_TABLE:RB_FREE"; Pos = MAP_APPFONT ( 202 , 84 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; @@ -202,6 +211,7 @@ TabPage TP_FORMAT_TABLE }; MetricField ED_LEFT_DIST { + HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_LEFT_DIST"; Pos = MAP_APPFONT ( 147 , 59 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; @@ -226,6 +236,7 @@ TabPage TP_FORMAT_TABLE MetricField ED_RIGHT_DIST { + HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_RIGHT_DIST"; Pos = MAP_APPFONT ( 147 , 75 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; @@ -249,6 +260,7 @@ TabPage TP_FORMAT_TABLE }; MetricField ED_TOP_DIST { + HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_TOP_DIST"; Pos = MAP_APPFONT ( 147 , 91 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; Border = TRUE ; @@ -272,6 +284,7 @@ TabPage TP_FORMAT_TABLE }; MetricField ED_BOTTOM_DIST { + HelpID = "sw:MetricField:TP_FORMAT_TABLE:ED_BOTTOM_DIST"; Border = TRUE ; Pos = MAP_APPFONT ( 147 , 107 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -303,6 +316,7 @@ TabPage TP_FORMAT_TABLE }; ListBox LB_TEXTDIRECTION { + HelpID = "sw:ListBox:TP_FORMAT_TABLE:LB_TEXTDIRECTION"; Border = TRUE ; Pos = MAP_APPFONT ( 75 , 136 ) ; Size = MAP_APPFONT ( 176 , 50 ) ; @@ -329,6 +343,7 @@ TabPage TP_TABLE_COLUMN Hide = TRUE; CheckBox CB_MOD_TBL { + HelpID = "sw:CheckBox:TP_TABLE_COLUMN:CB_MOD_TBL"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 180 , 10 ) ; TabStop = TRUE ; @@ -336,6 +351,7 @@ TabPage TP_TABLE_COLUMN }; CheckBox CB_PROP { + HelpID = "sw:CheckBox:TP_TABLE_COLUMN:CB_PROP"; Pos = MAP_APPFONT ( 6 , 20 ) ; Size = MAP_APPFONT ( 180 , 10 ) ; TabStop = TRUE ; @@ -349,6 +365,7 @@ TabPage TP_TABLE_COLUMN }; MetricField ED_SPACE { + HelpID = "sw:MetricField:TP_TABLE_COLUMN:ED_SPACE"; ReadOnly = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 95 , 34 ) ; @@ -365,6 +382,7 @@ TabPage TP_TABLE_COLUMN }; ImageButton COL_BTN_DOWN { + HelpID = "sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_DOWN"; Disable = TRUE ; Pos = MAP_APPFONT ( 12 , 65 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; @@ -373,6 +391,7 @@ TabPage TP_TABLE_COLUMN }; ImageButton COL_BTN_UP { + HelpID = "sw:ImageButton:TP_TABLE_COLUMN:COL_BTN_UP"; Disable = TRUE ; Pos = MAP_APPFONT ( 234 , 65 ) ; Size = MAP_APPFONT ( 10 , 10 ) ; @@ -391,6 +410,7 @@ TabPage TP_TABLE_COLUMN }; MetricField COL_MF_1 { + HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_1"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 13 , 81 ) ; @@ -418,6 +438,7 @@ TabPage TP_TABLE_COLUMN }; MetricField COL_MF_2 { + HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_2"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 52 , 81 ) ; @@ -445,6 +466,7 @@ TabPage TP_TABLE_COLUMN }; MetricField COL_MF_3 { + HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_3"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 91 , 81 ) ; @@ -472,6 +494,7 @@ TabPage TP_TABLE_COLUMN }; MetricField COL_MF_4 { + HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_4"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 130 , 81 ) ; @@ -499,6 +522,7 @@ TabPage TP_TABLE_COLUMN }; MetricField COL_MF_5 { + HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_5"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 169 , 81 ) ; @@ -526,6 +550,7 @@ TabPage TP_TABLE_COLUMN }; MetricField COL_MF_6 { + HelpID = "sw:MetricField:TP_TABLE_COLUMN:COL_MF_6"; Disable = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 208 , 81 ) ; @@ -568,6 +593,7 @@ TabPage TP_TABLE_TEXTFLOW }; CheckBox CB_PAGEBREAK { + HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGEBREAK"; // Disable = TRUE; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 90 , 8 ) ; @@ -577,6 +603,7 @@ TabPage TP_TABLE_TEXTFLOW }; RadioButton RB_BREAKPAGE { + HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKPAGE"; Pos = MAP_APPFONT ( 105 , 14 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; Text [ en-US ] = "~Page" ; @@ -585,6 +612,7 @@ TabPage TP_TABLE_TEXTFLOW }; RadioButton RB_BREAKCOLUMN { + HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_BREAKCOLUMN"; // Disable = TRUE; Pos = MAP_APPFONT ( 178 , 14 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; @@ -593,6 +621,7 @@ TabPage TP_TABLE_TEXTFLOW }; RadioButton RB_PAGEBREAKBEFORE { + HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKBEFORE"; // Disable = TRUE; Pos = MAP_APPFONT ( 105 , 28 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; @@ -602,6 +631,7 @@ TabPage TP_TABLE_TEXTFLOW }; RadioButton RB_PAGEBREAKAFTER { + HelpID = "sw:RadioButton:TP_TABLE_TEXTFLOW:RB_PAGEBREAKAFTER"; // Disable = TRUE; Pos = MAP_APPFONT ( 178 , 28 ) ; Size = MAP_APPFONT ( 70 , 10 ) ; @@ -609,6 +639,7 @@ TabPage TP_TABLE_TEXTFLOW }; CheckBox CB_PAGECOLL { + HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_PAGECOLL"; // Disable = TRUE; Pos = MAP_APPFONT ( 12 , 44 ) ; Size = MAP_APPFONT ( 90 , 10 ) ; @@ -618,6 +649,7 @@ TabPage TP_TABLE_TEXTFLOW }; ListBox LB_PAGECOLL { + HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_PAGECOLL"; Pos = MAP_APPFONT ( 105 , 42 ) ; Size = MAP_APPFONT ( 61 , 50 ) ; TabStop = TRUE ; @@ -631,6 +663,7 @@ TabPage TP_TABLE_TEXTFLOW }; NumericField NF_PAGENUM { + HelpID = "sw:NumericField:TP_TABLE_TEXTFLOW:NF_PAGENUM"; Border = TRUE ; Pos = MAP_APPFONT ( 222 , 42 ) ; Size = MAP_APPFONT ( 26 , 12 ) ; @@ -646,6 +679,7 @@ TabPage TP_TABLE_TEXTFLOW }; CheckBox CB_SPLIT { + HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_SPLIT"; Pos = MAP_APPFONT ( 12 , 58 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -653,6 +687,7 @@ TabPage TP_TABLE_TEXTFLOW }; TriStateBox CB_SPLIT_ROW { + HelpID = "sw:TriStateBox:TP_TABLE_TEXTFLOW:CB_SPLIT_ROW"; Pos = MAP_APPFONT ( 21 , 71 ) ; Size = MAP_APPFONT ( 227 , 10 ) ; TabStop = TRUE ; @@ -660,6 +695,7 @@ TabPage TP_TABLE_TEXTFLOW }; CheckBox CB_KEEP { + HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_KEEP"; Pos = MAP_APPFONT ( 12 , 85 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "~Keep with next paragraph" ; @@ -667,6 +703,7 @@ TabPage TP_TABLE_TEXTFLOW }; CheckBox CB_HEADLINE { + HelpID = "sw:CheckBox:TP_TABLE_TEXTFLOW:CB_HEADLINE"; Pos = MAP_APPFONT ( 12 , 99 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -680,6 +717,7 @@ TabPage TP_TABLE_TEXTFLOW }; NumericField NF_REPEAT_HEADER { + HelpID = "sw:NumericField:TP_TABLE_TEXTFLOW:NF_REPEAT_HEADER"; Border = TRUE ; Pos = MAP_APPFONT ( 131 , 113 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; @@ -704,6 +742,7 @@ TabPage TP_TABLE_TEXTFLOW }; ListBox LB_TEXTDIRECTION { + HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_TEXTDIRECTION"; Pos = MAP_APPFONT ( 85 , 130 ) ; Size = MAP_APPFONT ( 163 , 50 ) ; DropDown = TRUE; @@ -730,6 +769,7 @@ TabPage TP_TABLE_TEXTFLOW }; ListBox LB_VERTORIENT { + HelpID = "sw:ListBox:TP_TABLE_TEXTFLOW:LB_VERTORIENT"; Pos = MAP_APPFONT ( 85 , 162 ) ; Size = MAP_APPFONT ( 61 , 50 ) ; DropDown = TRUE; diff --git a/sw/source/ui/table/tautofmt.src b/sw/source/ui/table/tautofmt.src index 4bc6a62bb591..e338dc9a4b73 100644 --- a/sw/source/ui/table/tautofmt.src +++ b/sw/source/ui/table/tautofmt.src @@ -43,6 +43,7 @@ ModalDialog DLG_AUTOFMT_TABLE }; ListBox LB_FORMAT { + HelpID = "sw:ListBox:DLG_AUTOFMT_TABLE:LB_FORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 65 , 100 ) ; @@ -56,6 +57,7 @@ ModalDialog DLG_AUTOFMT_TABLE }; CheckBox BTN_NUMFORMAT { + HelpID = "sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_NUMFORMAT"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 131 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; @@ -64,6 +66,7 @@ ModalDialog DLG_AUTOFMT_TABLE }; CheckBox BTN_BORDER { + HelpID = "sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_BORDER"; Hide = TRUE ; Pos = MAP_APPFONT ( 12 , 147 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; @@ -72,6 +75,7 @@ ModalDialog DLG_AUTOFMT_TABLE }; CheckBox BTN_FONT { + HelpID = "sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_FONT"; Hide = TRUE ; Pos = MAP_APPFONT ( 85 , 131 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; @@ -80,6 +84,7 @@ ModalDialog DLG_AUTOFMT_TABLE }; CheckBox BTN_PATTERN { + HelpID = "sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_PATTERN"; Hide = TRUE ; Pos = MAP_APPFONT ( 85 , 147 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; @@ -88,6 +93,7 @@ ModalDialog DLG_AUTOFMT_TABLE }; CheckBox BTN_ALIGNMENT { + HelpID = "sw:CheckBox:DLG_AUTOFMT_TABLE:BTN_ALIGNMENT"; Hide = TRUE ; Pos = MAP_APPFONT ( 150 , 131 ) ; Size = MAP_APPFONT ( 60 , 10 ) ; @@ -116,6 +122,7 @@ ModalDialog DLG_AUTOFMT_TABLE }; MoreButton BTN_MORE { + HelpID = "sw:MoreButton:DLG_AUTOFMT_TABLE:BTN_MORE"; Pos = MAP_APPFONT ( 255 , 101 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~More" ; @@ -125,6 +132,7 @@ ModalDialog DLG_AUTOFMT_TABLE }; PushButton BTN_ADD { + HelpID = "sw:PushButton:DLG_AUTOFMT_TABLE:BTN_ADD"; Pos = MAP_APPFONT ( 255 , 64 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add" ; @@ -132,6 +140,7 @@ ModalDialog DLG_AUTOFMT_TABLE }; PushButton BTN_REMOVE { + HelpID = "sw:PushButton:DLG_AUTOFMT_TABLE:BTN_REMOVE"; Pos = MAP_APPFONT ( 255 , 81 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete" ; @@ -139,6 +148,7 @@ ModalDialog DLG_AUTOFMT_TABLE }; PushButton BTN_RENAME { + HelpID = "sw:PushButton:DLG_AUTOFMT_TABLE:BTN_RENAME"; Pos = MAP_APPFONT ( 255 , 123 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -219,6 +229,7 @@ ModalDialog DLG_SWDLG_STRINPUT HelpID = HID_SWDLG_STRINPUT ; Edit ED_INPUT { + HelpID = "sw:Edit:DLG_SWDLG_STRINPUT:ED_INPUT"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 24 ) ; Size = MAP_APPFONT ( 104 , 12 ) ; diff --git a/sw/source/ui/uiview/pview.src b/sw/source/ui/uiview/pview.src old mode 100755 new mode 100644 index 8a6669907705..f2fd88d6d754 --- a/sw/source/ui/uiview/pview.src +++ b/sw/source/ui/uiview/pview.src @@ -54,6 +54,7 @@ ModalDialog DLG_PAGEPREVIEW_ZOOM }; NumericField ED_COL { + HelpID = "sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_COL"; Border = TRUE ; Size = MAP_APPFONT ( 28 , 12 ) ; Pos = MAP_APPFONT ( 48 , 34 ) ; @@ -69,6 +70,7 @@ ModalDialog DLG_PAGEPREVIEW_ZOOM }; NumericField ED_ROW { + HelpID = "sw:NumericField:DLG_PAGEPREVIEW_ZOOM:ED_ROW"; Border = TRUE ; Pos = MAP_APPFONT ( 48 , 13 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; diff --git a/sw/source/ui/utlui/gloslst.src b/sw/source/ui/utlui/gloslst.src index 78f96e85e741..d4140fc64d80 100644 --- a/sw/source/ui/utlui/gloslst.src +++ b/sw/source/ui/utlui/gloslst.src @@ -68,6 +68,7 @@ ModalDialog DLG_GLOSSARY_DECIDE_DLG }; ListBox LB_LIST { + HelpID = "sw:ListBox:DLG_GLOSSARY_DECIDE_DLG:LB_LIST"; Pos = MAP_APPFONT ( 12 , 15 ) ; Size = MAP_APPFONT ( 81 , 40 ) ; TabStop = TRUE ; diff --git a/sw/source/ui/utlui/unotools.src b/sw/source/ui/utlui/unotools.src index ac805c9da947..ac203d035cd6 100644 --- a/sw/source/ui/utlui/unotools.src +++ b/sw/source/ui/utlui/unotools.src @@ -44,6 +44,7 @@ ModalDialog DLG_RENAME_XNAMED }; Edit ED_NEW_NAME { + HelpID = "sw:Edit:DLG_RENAME_XNAMED:ED_NEW_NAME"; Pos = MAP_APPFONT ( 65 , 13 ) ; Size = MAP_APPFONT ( 87 , 12 ) ; Border = TRUE; -- cgit From 1e902f896bae749c3bf20af93caaca06253a2c2a Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 11 Oct 2010 17:56:12 +0200 Subject: CWS changehid: generate former auto hids into src files --- filter/source/flash/impswfdialog.src | 9 +++++ filter/source/pdf/impdialog.src | 65 ++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+) diff --git a/filter/source/flash/impswfdialog.src b/filter/source/flash/impswfdialog.src index 3e38dde68441..83015a3adfeb 100644 --- a/filter/source/flash/impswfdialog.src +++ b/filter/source/flash/impswfdialog.src @@ -29,6 +29,7 @@ ModalDialog DLG_OPTIONS { + HelpID = "filter:ModalDialog:DLG_OPTIONS"; Size = MAP_APPFONT ( 200 , 200 ) ; OutputSize = TRUE ; SVLook = TRUE ; @@ -44,6 +45,7 @@ ModalDialog DLG_OPTIONS }; NumericField NUM_FLD_QUALITY { + HelpID = "filter:NumericField:DLG_OPTIONS:NUM_FLD_QUALITY"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 33 ) ; Size = MAP_APPFONT ( 50 , 12 ) ; @@ -57,6 +59,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_ALL { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_ALL"; Pos = MAP_APPFONT ( 12 , 65 ) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; @@ -69,6 +72,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_MULTIPLE_FILES { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_MULTIPLE_FILES"; Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; @@ -81,6 +85,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_BACKGROUNDS { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_BACKGROUNDS"; Pos = MAP_APPFONT ( 22 , 95 ) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; @@ -93,6 +98,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_BACKGROUND_OBJECTS { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_BACKGROUND_OBJECTS"; Pos = MAP_APPFONT ( 22 , 107) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; @@ -105,6 +111,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_SLIDE_CONTENTS { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_SLIDE_CONTENTS"; Pos = MAP_APPFONT ( 22 , 119 ) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; @@ -117,6 +124,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_SOUND { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_SOUND"; Pos = MAP_APPFONT ( 12 , 134 ) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; @@ -129,6 +137,7 @@ ModalDialog DLG_OPTIONS }; CheckBox BOOL_EXPORT_OLE_AS_JPEG { + HelpID = "filter:CheckBox:DLG_OPTIONS:BOOL_EXPORT_OLE_AS_JPEG"; Pos = MAP_APPFONT ( 12 , 146 ) ; Size = MAP_APPFONT ( 10 , 14 ) ; TabStop = TRUE ; diff --git a/filter/source/pdf/impdialog.src b/filter/source/pdf/impdialog.src index 76e64e87c173..248d7d8491f7 100644 --- a/filter/source/pdf/impdialog.src +++ b/filter/source/pdf/impdialog.src @@ -65,24 +65,28 @@ TabPage RID_PDF_TAB_GENER }; RadioButton RB_ALL { + HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_ALL"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~All"; }; RadioButton RB_RANGE { + HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_RANGE"; Pos = MAP_APPFONT ( 12 , 27 ) ; Size = MAP_APPFONT ( 101 , 10 ) ; Text[ en-US ] = "~Pages"; }; Edit ED_PAGES { + HelpID = "filter:Edit:RID_PDF_TAB_GENER:ED_PAGES"; Border = TRUE ; Pos = MAP_APPFONT ( 116, 26 ) ; Size = MAP_APPFONT ( 48 , 12 ) ; }; RadioButton RB_SELECTION { + HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_SELECTION"; Pos = MAP_APPFONT ( 12 , 40 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Selection"; @@ -95,12 +99,14 @@ TabPage RID_PDF_TAB_GENER }; RadioButton RB_LOSSLESSCOMPRESSION { + HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_LOSSLESSCOMPRESSION"; Pos = MAP_APPFONT ( 12 , 64 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Lossless compression"; }; RadioButton RB_JPEGCOMPRESSION { + HelpID = "filter:RadioButton:RID_PDF_TAB_GENER:RB_JPEGCOMPRESSION"; Pos = MAP_APPFONT ( 12 , 76 ) ; Size = MAP_APPFONT ( 158, 10 ) ; Text[ en-US ] = "~JPEG compression"; @@ -113,6 +119,7 @@ TabPage RID_PDF_TAB_GENER }; MetricField NF_QUALITY { + HelpID = "filter:MetricField:RID_PDF_TAB_GENER:NF_QUALITY"; Border = TRUE ; Pos = MAP_APPFONT ( 116, 88 ) ; Size = MAP_APPFONT ( 48, 12 ) ; @@ -124,6 +131,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_REDUCEIMAGERESOLUTION { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_REDUCEIMAGERESOLUTION"; Pos = MAP_APPFONT ( 12 , 103 ) ; Size = MAP_APPFONT ( 101 , 10 ) ; TabStop = TRUE ; @@ -131,6 +139,7 @@ TabPage RID_PDF_TAB_GENER }; ComboBox CO_REDUCEIMAGERESOLUTION { + HelpID = "filter:ComboBox:RID_PDF_TAB_GENER:CO_REDUCEIMAGERESOLUTION"; Pos = MAP_APPFONT ( 116 , 102 ) ; Size = MAP_APPFONT ( 48 , 50 ) ; TabStop = TRUE ; @@ -152,6 +161,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_PDFA_1B_SELECT { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_PDFA_1B_SELECT"; Pos = MAP_APPFONT ( 12, 128 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -159,6 +169,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_TAGGEDPDF { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_TAGGEDPDF"; Pos = MAP_APPFONT ( 12 , 141 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -166,6 +177,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_EXPORTFORMFIELDS { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTFORMFIELDS"; Pos = MAP_APPFONT ( 12 , 154 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -179,6 +191,7 @@ TabPage RID_PDF_TAB_GENER }; ListBox LB_FORMSFORMAT { + HelpID = "filter:ListBox:RID_PDF_TAB_GENER:LB_FORMSFORMAT"; Border = TRUE ; Pos = MAP_APPFONT ( 126, 166 ) ; Size = MAP_APPFONT ( 38, 48 ) ; @@ -195,6 +208,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_ALLOWDUPLICATEFIELDNAMES { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_ALLOWDUPLICATEFIELDNAMES"; Pos = MAP_APPFONT( 30, 178 ); Size = MAP_APPFONT( 128, 10 ); TabStop = TRUE; @@ -202,6 +216,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_EXPORTBOOKMARKS { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTBOOKMARKS"; Pos = MAP_APPFONT ( 12 , 190 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -209,6 +224,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_EXPORTNOTES { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTES"; Pos = MAP_APPFONT ( 12 , 203 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -216,6 +232,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_EXPORTNOTESPAGES { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTNOTESPAGES"; Pos = MAP_APPFONT ( 12 , 216 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -223,6 +240,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_EXPORTEMPTYPAGES { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EXPORTEMPTYPAGES"; Pos = MAP_APPFONT ( 12 , 229 ) ; Size = MAP_APPFONT ( 158 , 16 ) ; TabStop = TRUE ; @@ -231,6 +249,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_EMBEDSTANDARDFONTS { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_EMBEDSTANDARDFONTS"; Pos = MAP_APPFONT ( 12 , 248 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -238,6 +257,7 @@ TabPage RID_PDF_TAB_GENER }; CheckBox CB_ADDSTREAM { + HelpID = "filter:CheckBox:RID_PDF_TAB_GENER:CB_ADDSTREAM"; Pos = MAP_APPFONT ( 12 , 261 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -263,18 +283,21 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_OPNMODE_PAGEONLY { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_PAGEONLY"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Page only" ; }; RadioButton RB_OPNMODE_OUTLINE { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_OUTLINE"; Pos = MAP_APPFONT ( 12 , 26 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Bookmarks and page" ; }; RadioButton RB_OPNMODE_THUMBS { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_OPNMODE_THUMBS"; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Thumbnails and page" ; @@ -288,6 +311,7 @@ TabPage RID_PDF_TAB_OPNFTR }; NumericField NUM_MAGNF_INITIAL_PAGE { + HelpID = "filter:NumericField:RID_PDF_TAB_OPNFTR:NUM_MAGNF_INITIAL_PAGE"; Pos = MAP_APPFONT( 124, 52 ); Size = MAP_APPFONT( 40, 12 ); Value = 1; @@ -305,6 +329,7 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_MAGNF_DEFAULT { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_DEFAULT"; // see PDF ref v 1.5 tab 8.2, pg. 542 ( /XYZ ) Pos = MAP_APPFONT ( 12 , 80 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; @@ -312,6 +337,7 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_MAGNF_WIND { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIND"; // see PDF ref v 1.5 tab 8.2, pg. 542 ( /Fit ) Pos = MAP_APPFONT ( 12 , 92 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; @@ -319,6 +345,7 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_MAGNF_WIDTH { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_WIDTH"; // see PDF ref v 1.5 tab 8.2, pg. 542 ( /FitH top ) Pos = MAP_APPFONT ( 12 , 104 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; @@ -326,6 +353,7 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_MAGNF_VISIBLE { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_VISIBLE"; // see PDF ref v 1.5 tab 8.2, pg. 542 ( /FitBH top ) Pos = MAP_APPFONT ( 12 , 116 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; @@ -333,6 +361,7 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_MAGNF_ZOOM { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_MAGNF_ZOOM"; // see PDF ref v 1.6 tab 8.2, pg. 551 ( /XYZ left top zoom ) Pos = MAP_APPFONT ( 12 , 128 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; @@ -340,6 +369,7 @@ TabPage RID_PDF_TAB_OPNFTR }; MetricField NUM_MAGNF_ZOOM { + HelpID = "filter:MetricField:RID_PDF_TAB_OPNFTR:NUM_MAGNF_ZOOM"; Pos = MAP_APPFONT( 124, 128 ) ; Size = MAP_APPFONT( 40, 12 ) ; Unit = FUNIT_PERCENT; @@ -358,30 +388,35 @@ TabPage RID_PDF_TAB_OPNFTR }; RadioButton RB_PGLY_DEFAULT { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_DEFAULT"; Pos = MAP_APPFONT ( 12 , 158 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "D~efault" ; }; RadioButton RB_PGLY_SINGPG { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_SINGPG"; Pos = MAP_APPFONT ( 12 , 170 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Single page" ; }; RadioButton RB_PGLY_CONT { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONT"; Pos = MAP_APPFONT ( 12 , 182 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Continuous" ; }; RadioButton RB_PGLY_CONTFAC { + HelpID = "filter:RadioButton:RID_PDF_TAB_OPNFTR:RB_PGLY_CONTFAC"; Pos = MAP_APPFONT ( 12 , 194 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "C~ontinuous facing" ; }; CheckBox CB_PGLY_FIRSTLEFT { + HelpID = "filter:CheckBox:RID_PDF_TAB_OPNFTR:CB_PGLY_FIRSTLEFT"; Pos = MAP_APPFONT ( 22 , 206 ) ; Size = MAP_APPFONT ( 148 , 10 ) ; Text[ en-US ] = "First page is ~left" ; @@ -407,6 +442,7 @@ TabPage RID_PDF_TAB_VPREFER CheckBox CB_WNDOPT_RESINIT { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_RESINIT"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -414,6 +450,7 @@ TabPage RID_PDF_TAB_VPREFER }; CheckBox CB_WNDOPT_CNTRWIN { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_CNTRWIN"; Pos = MAP_APPFONT ( 12 , 26 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -421,12 +458,14 @@ TabPage RID_PDF_TAB_VPREFER }; CheckBox CB_WNDOPT_OPNFULL { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_WNDOPT_OPNFULL"; Pos = MAP_APPFONT ( 12 , 38 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "~Open in full screen mode" ; }; CheckBox CB_DISPDOCTITLE { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_DISPDOCTITLE"; Pos = MAP_APPFONT ( 12 , 50 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -442,6 +481,7 @@ TabPage RID_PDF_TAB_VPREFER }; CheckBox CB_UOP_HIDEVMENUBAR { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVMENUBAR"; Pos = MAP_APPFONT ( 12 , 76 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -449,6 +489,7 @@ TabPage RID_PDF_TAB_VPREFER }; CheckBox CB_UOP_HIDEVTOOLBAR { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVTOOLBAR"; Pos = MAP_APPFONT ( 12 , 88 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -456,6 +497,7 @@ TabPage RID_PDF_TAB_VPREFER }; CheckBox CB_UOP_HIDEVWINCTRL { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_UOP_HIDEVWINCTRL"; Pos = MAP_APPFONT ( 12 , 100 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -471,6 +513,7 @@ TabPage RID_PDF_TAB_VPREFER }; CheckBox CB_TRANSITIONEFFECTS { + HelpID = "filter:CheckBox:RID_PDF_TAB_VPREFER:CB_TRANSITIONEFFECTS"; Pos = MAP_APPFONT ( 12 , 126 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -485,18 +528,21 @@ TabPage RID_PDF_TAB_VPREFER }; RadioButton RB_ALLBOOKMARKLEVELS { + HelpID = "filter:RadioButton:RID_PDF_TAB_VPREFER:RB_ALLBOOKMARKLEVELS"; Pos = MAP_APPFONT ( 12 , 152 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; Text[ en-US ] = "All bookmark levels"; }; RadioButton RB_VISIBLEBOOKMARKLEVELS { + HelpID = "filter:RadioButton:RID_PDF_TAB_VPREFER:RB_VISIBLEBOOKMARKLEVELS"; Pos = MAP_APPFONT ( 12 , 166 ) ; Size = MAP_APPFONT ( 117 , 10 ) ; Text[ en-US ] = "Visible bookmark levels"; }; NumericField NUM_BOOKMARKLEVELS { + HelpID = "filter:NumericField:RID_PDF_TAB_VPREFER:NUM_BOOKMARKLEVELS"; Pos = MAP_APPFONT ( 132 , 165 ) ; Size = MAP_APPFONT ( 32 , 12 ) ; Border = TRUE; @@ -518,6 +564,7 @@ TabPage RID_PDF_TAB_SECURITY ////////////////////////////////////// PushButton BTN_USER_PWD { + HelpID = "filter:PushButton:RID_PDF_TAB_SECURITY:BTN_USER_PWD"; TabStop = TRUE ; Disable = TRUE ; Pos = MAP_APPFONT ( 12, 5 ) ; @@ -553,6 +600,7 @@ TabPage RID_PDF_TAB_SECURITY PushButton BTN_OWNER_PWD { + HelpID = "filter:PushButton:RID_PDF_TAB_SECURITY:BTN_OWNER_PWD"; TabStop = TRUE ; Disable = TRUE ; Pos = MAP_APPFONT ( 12, 45 ) ; @@ -595,18 +643,21 @@ TabPage RID_PDF_TAB_SECURITY }; RadioButton RB_PRINT_NONE { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_NONE"; Pos = MAP_APPFONT ( 18 , 101 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "~Not permitted"; }; RadioButton RB_PRINT_LOWRES { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_LOWRES"; Pos = MAP_APPFONT ( 18 , 112 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "~Low resolution (150 dpi)"; }; RadioButton RB_PRINT_HIGHRES { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_PRINT_HIGHRES"; Pos = MAP_APPFONT ( 18 , 123 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "~High resolution"; @@ -621,24 +672,28 @@ TabPage RID_PDF_TAB_SECURITY }; RadioButton RB_CHANGES_NONE { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_NONE"; Pos = MAP_APPFONT ( 18 , 145 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "No~t permitted"; }; RadioButton RB_CHANGES_INSDEL { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_INSDEL"; Pos = MAP_APPFONT ( 18 , 157 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "~Inserting, deleting, and rotating pages"; }; RadioButton RB_CHANGES_FILLFORM { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_FILLFORM"; Pos = MAP_APPFONT ( 18 , 168 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text[ en-US ] = "~Filling in form fields"; }; RadioButton RB_CHANGES_COMMENT { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_COMMENT"; Pos = MAP_APPFONT ( 18 , 179 ) ; Size = MAP_APPFONT ( 152 , 16 ) ; WordBreak = TRUE ; @@ -646,6 +701,7 @@ TabPage RID_PDF_TAB_SECURITY }; RadioButton RB_CHANGES_ANY_NOCOPY { + HelpID = "filter:RadioButton:RID_PDF_TAB_SECURITY:RB_CHANGES_ANY_NOCOPY"; Pos = MAP_APPFONT ( 18 , 198 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text[ en-US ] = "~Any except extracting pages"; @@ -653,6 +709,7 @@ TabPage RID_PDF_TAB_SECURITY CheckBox CB_ENDAB_COPY { + HelpID = "filter:CheckBox:RID_PDF_TAB_SECURITY:CB_ENDAB_COPY"; Pos = MAP_APPFONT ( 12 , 211 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -661,6 +718,7 @@ TabPage RID_PDF_TAB_SECURITY CheckBox CB_ENAB_ACCESS { + HelpID = "filter:CheckBox:RID_PDF_TAB_SECURITY:CB_ENAB_ACCESS"; Pos = MAP_APPFONT ( 12 , 224 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -679,6 +737,7 @@ TabPage RID_PDF_TAB_LINKS CheckBox CB_EXP_BMRK_TO_DEST { + HelpID = "filter:CheckBox:RID_PDF_TAB_LINKS:CB_EXP_BMRK_TO_DEST"; Pos = MAP_APPFONT ( 6 , 3 ) ; Size = MAP_APPFONT ( 164 , 16 ) ; TabStop = TRUE ; @@ -688,6 +747,7 @@ TabPage RID_PDF_TAB_LINKS CheckBox CB_CNV_OOO_DOCTOPDF { + HelpID = "filter:CheckBox:RID_PDF_TAB_LINKS:CB_CNV_OOO_DOCTOPDF"; Pos = MAP_APPFONT ( 6 , 22 ) ; Size = MAP_APPFONT ( 164 , 16 ) ; TabStop = TRUE ; @@ -697,6 +757,7 @@ TabPage RID_PDF_TAB_LINKS CheckBox CB_ENAB_RELLINKFSYS { + HelpID = "filter:CheckBox:RID_PDF_TAB_LINKS:CB_ENAB_RELLINKFSYS"; Pos = MAP_APPFONT ( 6 , 41 ) ; Size = MAP_APPFONT ( 164 , 16 ) ; TabStop = TRUE ; @@ -713,6 +774,7 @@ TabPage RID_PDF_TAB_LINKS RadioButton CB_VIEW_PDF_DEFAULT { + HelpID = "filter:RadioButton:RID_PDF_TAB_LINKS:CB_VIEW_PDF_DEFAULT"; Pos = MAP_APPFONT ( 12 , 71 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -721,6 +783,7 @@ TabPage RID_PDF_TAB_LINKS RadioButton CB_VIEW_PDF_APPLICATION { + HelpID = "filter:RadioButton:RID_PDF_TAB_LINKS:CB_VIEW_PDF_APPLICATION"; Pos = MAP_APPFONT ( 12 , 84 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -729,6 +792,7 @@ TabPage RID_PDF_TAB_LINKS RadioButton CB_VIEW_PDF_BROWSER { + HelpID = "filter:RadioButton:RID_PDF_TAB_LINKS:CB_VIEW_PDF_BROWSER"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 158 , 10 ) ; TabStop = TRUE ; @@ -782,6 +846,7 @@ TabDialog RID_PDF_EXPORT_DLG ModalDialog RID_PDF_ERROR_DLG { + HelpID = "filter:ModalDialog:RID_PDF_ERROR_DLG"; OutputSize = TRUE; SVLook = TRUE; Moveable = TRUE; -- cgit From 9d0e54189cbe98d57bf4dab926a09d313ac5d874 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Mon, 11 Oct 2010 17:56:12 +0200 Subject: CWS changehid: generate former auto hids into src files --- .../controller/dialogs/dlg_InsertErrorBars.src | 1 + .../controller/dialogs/tp_3D_SceneAppearance.src | 4 ++ .../controller/dialogs/tp_3D_SceneGeometry.src | 6 ++ .../controller/dialogs/tp_3D_SceneIllumination.src | 13 ++++ chart2/source/controller/dialogs/tp_AxisLabel.src | 8 +++ .../source/controller/dialogs/tp_AxisPositions.src | 16 +++++ chart2/source/controller/dialogs/tp_ChartType.src | 14 ++++ chart2/source/controller/dialogs/tp_DataSource.src | 9 +++ chart2/source/controller/dialogs/tp_ErrorBars.src | 1 + .../controller/dialogs/tp_LegendPosition.src | 1 + chart2/source/controller/dialogs/tp_Location.src | 2 + .../source/controller/dialogs/tp_PointGeometry.src | 1 + .../source/controller/dialogs/tp_PolarOptions.src | 4 ++ .../source/controller/dialogs/tp_RangeChooser.src | 7 ++ chart2/source/controller/dialogs/tp_Scale.src | 13 ++++ .../source/controller/dialogs/tp_SeriesToAxis.src | 11 +++ chart2/source/controller/dialogs/tp_Trendline.src | 1 + .../dialogs/tp_Wizard_TitlesAndObjects.src | 1 + sc/source/ui/dbgui/asciiopt.src | 17 +++++ sc/source/ui/dbgui/consdlg.src | 14 ++++ sc/source/ui/dbgui/dapitype.src | 11 +++ sc/source/ui/dbgui/dpgroupdlg.src | 16 +++++ sc/source/ui/dbgui/imoptdlg.src | 6 ++ sc/source/ui/dbgui/pivot.src | 14 ++++ sc/source/ui/dbgui/pvfundlg.src | 23 ++++++ sc/source/ui/dbgui/scendlg.src | 11 +++ sc/source/ui/dbgui/textimportoptions.src | 5 ++ sc/source/ui/dbgui/validate.src | 20 ++++++ sc/source/ui/formdlg/dwfunctr.src | 4 ++ sc/source/ui/miscdlgs/acredlin.src | 2 + sc/source/ui/miscdlgs/conflictsdlg.src | 4 ++ sc/source/ui/miscdlgs/highred.src | 5 ++ sc/source/ui/miscdlgs/instbdlg.src | 10 +++ sc/source/ui/miscdlgs/linkarea.src | 6 ++ sc/source/ui/miscdlgs/protectiondlg.src | 4 ++ sc/source/ui/miscdlgs/retypepassdlg.src | 12 ++++ sc/source/ui/miscdlgs/sharedocdlg.src | 1 + sc/source/ui/pagedlg/hfedtdlg.src | 1 + sc/source/ui/pagedlg/pagedlg.src | 26 +++++++ sc/source/ui/src/attrdlg.src | 4 ++ sc/source/ui/src/autofmt.src | 10 +++ sc/source/ui/src/condfrmt.src | 27 ++++++++ sc/source/ui/src/crnrdlg.src | 9 +++ sc/source/ui/src/dbnamdlg.src | 10 +++ sc/source/ui/src/filter.src | 54 +++++++++++++++ sc/source/ui/src/miscdlgs.src | 81 ++++++++++++++++++++++ sc/source/ui/src/namedlg.src | 10 +++ sc/source/ui/src/opredlin.src | 4 ++ sc/source/ui/src/optdlg.src | 57 +++++++++++++++ sc/source/ui/src/optsolver.src | 35 ++++++++++ sc/source/ui/src/simpref.src | 2 + sc/source/ui/src/solveroptions.src | 4 ++ sc/source/ui/src/solvrdlg.src | 5 ++ sc/source/ui/src/sortdlg.src | 24 +++++++ sc/source/ui/src/subtdlg.src | 8 +++ sc/source/ui/src/tabopdlg.src | 6 ++ 56 files changed, 675 insertions(+) diff --git a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src index f7a61cf1e283..462c81211011 100644 --- a/chart2/source/controller/dialogs/dlg_InsertErrorBars.src +++ b/chart2/source/controller/dialogs/dlg_InsertErrorBars.src @@ -33,6 +33,7 @@ ModalDialog DLG_DATA_YERRORBAR { + HelpID = "chart2:ModalDialog:DLG_DATA_YERRORBAR"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 300 , 156 ) ; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src index df202410109d..47e43e8c45b3 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneAppearance.src @@ -51,6 +51,7 @@ TabPage TP_3D_SCENEAPPEARANCE { + HelpID = "chart2:TabPage:TP_3D_SCENEAPPEARANCE"; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -64,6 +65,7 @@ TabPage TP_3D_SCENEAPPEARANCE }; ListBox LB_SCHEME { + HelpID = "chart2:ListBox:TP_3D_SCENEAPPEARANCE:LB_SCHEME"; Border = TRUE; TabStop = TRUE; DropDown = TRUE; @@ -78,12 +80,14 @@ TabPage TP_3D_SCENEAPPEARANCE CheckBox CB_SHADING { + HelpID = "chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_SHADING"; Pos = MAP_APPFONT ( POS_X_1 , POS_Y_SHADING ) ; Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_LB ) ; Text [ en-US ] = "~Shading" ; }; CheckBox CB_OBJECTLINES { + HelpID = "chart2:CheckBox:TP_3D_SCENEAPPEARANCE:CB_OBJECTLINES"; Pos = MAP_APPFONT ( POS_X_1 , POS_Y_OBJECTLINES ) ; Size = MAP_APPFONT ( WIDTH_FL , HEIGHT_LB ) ; Text [ en-US ] = "~Object borders" ; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src index e27ce72535a4..733212e6652a 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneGeometry.src @@ -77,6 +77,7 @@ TabPage TP_3D_SCENEGEOMETRY CheckBox CBX_RIGHT_ANGLED_AXES { + HelpID = "chart2:CheckBox:TP_3D_SCENEGEOMETRY:CBX_RIGHT_ANGLED_AXES"; Pos = MAP_APPFONT ( POS_X_1 , POS_Y_0 ) ; Size = MAP_APPFONT ( (WIDTH_FT+WIDTH_MF) , HEIGHT_FT ) ; TabStop = TRUE ; @@ -102,18 +103,21 @@ TabPage TP_3D_SCENEGEOMETRY }; MetricField MTR_FLD_X_ROTATION { + HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_X_ROTATION"; Pos = MAP_APPFONT ( POS_X_2 , POS_Y_1-2 ) ; Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ; CUSTOMUNITTEXT_DEGREE }; MetricField MTR_FLD_Y_ROTATION { + HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Y_ROTATION"; Pos = MAP_APPFONT ( POS_X_2 , POS_Y_2-2 ) ; Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ; CUSTOMUNITTEXT_DEGREE }; MetricField MTR_FLD_Z_ROTATION { + HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_Z_ROTATION"; Pos = MAP_APPFONT ( POS_X_2 , POS_Y_3-2 ) ; Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ; CUSTOMUNITTEXT_DEGREE @@ -121,6 +125,7 @@ TabPage TP_3D_SCENEGEOMETRY CheckBox CBX_PERSPECTIVE { + HelpID = "chart2:CheckBox:TP_3D_SCENEGEOMETRY:CBX_PERSPECTIVE"; Pos = MAP_APPFONT ( POS_X_1 , POS_Y_4 ) ; Size = MAP_APPFONT ( WIDTH_FT , HEIGHT_FT ) ; TabStop = TRUE ; @@ -128,6 +133,7 @@ TabPage TP_3D_SCENEGEOMETRY }; MetricField MTR_FLD_PERSPECTIVE { + HelpID = "chart2:MetricField:TP_3D_SCENEGEOMETRY:MTR_FLD_PERSPECTIVE"; Pos = MAP_APPFONT ( POS_X_2 , POS_Y_4-2 ) ; Size = MAP_APPFONT ( WIDTH_MF , HEIGHT_MF ) ; Border = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src index 57f15a1894d7..0b052f4d00c6 100644 --- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src +++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.src @@ -59,6 +59,7 @@ TabPage TP_3D_SCENEILLUMINATION { + HelpID = "chart2:TabPage:TP_3D_SCENEILLUMINATION"; OutputSize = TRUE ; SVLook = TRUE ; Hide = TRUE ; @@ -72,46 +73,55 @@ TabPage TP_3D_SCENEILLUMINATION }; ImageButton BTN_LIGHT_1 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_1"; Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE_BUTTONS ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_2 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_2"; Pos = MAP_APPFONT ( POS_X_0+BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_3 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_3"; Pos = MAP_APPFONT ( POS_X_0+2*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_4 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_4"; Pos = MAP_APPFONT ( POS_X_0+3*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_5 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_5"; Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE_BUTTONS_2 ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_6 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_6"; Pos = MAP_APPFONT ( POS_X_0+1*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS_2 ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_7 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_7"; Pos = MAP_APPFONT ( POS_X_0+2*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS_2 ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ImageButton BTN_LIGHT_8 { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHT_8"; Pos = MAP_APPFONT ( POS_X_0+3*BUTTON_DISTANCE , POS_Y_LIGHTSOURCE_BUTTONS_2 ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; }; ListBox LB_LIGHTSOURCE { + HelpID = "chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_LIGHTSOURCE"; Border = TRUE ; Pos = MAP_APPFONT ( POS_X_0 , POS_Y_LIGHTSOURCE ) ; Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ; @@ -120,6 +130,7 @@ TabPage TP_3D_SCENEILLUMINATION }; ImageButton BTN_LIGHTSOURCE_COLOR { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_LIGHTSOURCE_COLOR"; Pos = MAP_APPFONT ( POS_X_1 , POS_Y_LIGHTSOURCE ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; TabStop = TRUE ; @@ -136,6 +147,7 @@ TabPage TP_3D_SCENEILLUMINATION }; ListBox LB_AMBIENTLIGHT { + HelpID = "chart2:ListBox:TP_3D_SCENEILLUMINATION:LB_AMBIENTLIGHT"; Border = TRUE ; Pos = MAP_APPFONT ( POS_X_0 , POS_Y_AMBIENT ) ; Size = MAP_APPFONT ( WIDTH_LB , HEIGHT_LB ) ; @@ -144,6 +156,7 @@ TabPage TP_3D_SCENEILLUMINATION }; ImageButton BTN_AMBIENT_COLOR { + HelpID = "chart2:ImageButton:TP_3D_SCENEILLUMINATION:BTN_AMBIENT_COLOR"; Pos = MAP_APPFONT ( POS_X_1 , POS_Y_AMBIENT ) ; Size = MAP_APPFONT ( WIDTH_IB , HEIGHT_IB ) ; TabStop = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.src b/chart2/source/controller/dialogs/tp_AxisLabel.src index bcba1926c242..75da7dc5e653 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.src +++ b/chart2/source/controller/dialogs/tp_AxisLabel.src @@ -35,6 +35,7 @@ TabPage TP_AXIS_LABEL CheckBox CB_AXIS_LABEL_SCHOW_DESCR { + HelpID = "chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_SCHOW_DESCR"; Pos = MAP_APPFONT ( 6 , 6 ) ; Size = MAP_APPFONT ( 248 , 12 ) ; @@ -112,6 +113,7 @@ TabPage TP_AXIS_LABEL }; CheckBox CB_AXIS_LABEL_TEXTOVERLAP { + HelpID = "chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTOVERLAP"; Pos = MAP_APPFONT ( 139 , 33 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; TabStop = TRUE ; @@ -120,6 +122,7 @@ TabPage TP_AXIS_LABEL }; CheckBox CB_AXIS_LABEL_TEXTBREAK { + HelpID = "chart2:CheckBox:TP_AXIS_LABEL:CB_AXIS_LABEL_TEXTBREAK"; Pos = MAP_APPFONT ( 139 , 47 ) ; Size = MAP_APPFONT ( 115 , 10 ) ; TabStop = TRUE ; @@ -137,6 +140,7 @@ TabPage TP_AXIS_LABEL }; RadioButton RB_AXIS_LABEL_SIDEBYSIDE { + HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_SIDEBYSIDE"; Pos = MAP_APPFONT ( 12 , 33 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; TabStop = TRUE ; @@ -145,6 +149,7 @@ TabPage TP_AXIS_LABEL }; RadioButton RB_AXIS_LABEL_UPDOWN { + HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_UPDOWN"; Pos = MAP_APPFONT ( 12 , 47 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; TabStop = TRUE ; @@ -153,6 +158,7 @@ TabPage TP_AXIS_LABEL }; RadioButton RB_AXIS_LABEL_DOWNUP { + HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_DOWNUP"; Pos = MAP_APPFONT ( 12 , 61 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; TabStop = TRUE ; @@ -161,6 +167,7 @@ TabPage TP_AXIS_LABEL }; RadioButton RB_AXIS_LABEL_AUTOORDER { + HelpID = "chart2:RadioButton:TP_AXIS_LABEL:RB_AXIS_LABEL_AUTOORDER"; Pos = MAP_APPFONT ( 12 , 75 ) ; Size = MAP_APPFONT ( 112 , 10 ) ; TabStop = TRUE ; @@ -176,6 +183,7 @@ TabPage TP_AXIS_LABEL }; ListBox LB_AXIS_TEXTDIR { + HelpID = "chart2:ListBox:TP_AXIS_LABEL:LB_AXIS_TEXTDIR"; Pos = MAP_APPFONT ( 78 , 154 ) ; Size = MAP_APPFONT ( 170 , 100 ) ; Border = TRUE; diff --git a/chart2/source/controller/dialogs/tp_AxisPositions.src b/chart2/source/controller/dialogs/tp_AxisPositions.src index 8ce1ba39056a..1173b841354a 100644 --- a/chart2/source/controller/dialogs/tp_AxisPositions.src +++ b/chart2/source/controller/dialogs/tp_AxisPositions.src @@ -60,6 +60,7 @@ TabPage TP_AXIS_POSITIONS { + HelpID = "chart2:TabPage:TP_AXIS_POSITIONS"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; @@ -79,6 +80,7 @@ TabPage TP_AXIS_POSITIONS }; ListBox LB_CROSSES_OTHER_AXIS_AT { + HelpID = "chart2:ListBox:TP_AXIS_POSITIONS:LB_CROSSES_OTHER_AXIS_AT"; Border = TRUE ; AutoHScroll = TRUE ; Pos = MAP_APPFONT ( X4 , Y1-2 ) ; @@ -98,6 +100,7 @@ TabPage TP_AXIS_POSITIONS }; SpinField EDT_CROSSES_OTHER_AXIS_AT { + HelpID = "chart2:SpinField:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( X5 , Y1-2 ) ; @@ -106,6 +109,7 @@ TabPage TP_AXIS_POSITIONS }; ComboBox EDT_CROSSES_OTHER_AXIS_AT_CATEGORY { + HelpID = "chart2:ComboBox:TP_AXIS_POSITIONS:EDT_CROSSES_OTHER_AXIS_AT_CATEGORY"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( X5 , Y1-2 ) ; @@ -116,6 +120,7 @@ TabPage TP_AXIS_POSITIONS CheckBox CB_AXIS_BETWEEN_CATEGORIES { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_AXIS_BETWEEN_CATEGORIES"; Hide = TRUE; Pos = MAP_APPFONT ( X2 , Y2 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; @@ -137,6 +142,7 @@ TabPage TP_AXIS_POSITIONS }; ListBox LB_PLACE_LABELS { + HelpID = "chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_LABELS"; Border = TRUE ; AutoHScroll = TRUE ; Pos = MAP_APPFONT ( X4 , Y4-2 ) ; @@ -164,6 +170,7 @@ TabPage TP_AXIS_POSITIONS }; SpinField EDT_AXIS_LABEL_DISTANCE { + HelpID = "chart2:SpinField:TP_AXIS_POSITIONS:EDT_AXIS_LABEL_DISTANCE"; Hide = TRUE; Border = TRUE ; SVLook = TRUE ; @@ -186,12 +193,14 @@ TabPage TP_AXIS_POSITIONS }; CheckBox CB_TICKS_INNER { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_INNER"; Pos = MAP_APPFONT ( XTICK_2 , Y7 ) ; Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "~Inner"; }; CheckBox CB_TICKS_OUTER { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_TICKS_OUTER"; Pos = MAP_APPFONT ( XTICK_3 , Y7 ) ; Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "~Outer"; @@ -205,12 +214,14 @@ TabPage TP_AXIS_POSITIONS }; CheckBox CB_MINOR_INNER { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_INNER"; Pos = MAP_APPFONT ( XTICK_2 , Y8 ); Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "I~nner"; }; CheckBox CB_MINOR_OUTER { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_OUTER"; Pos = MAP_APPFONT ( XTICK_3 , Y8 ) ; Size = MAP_APPFONT ( TICKWIDTH , 10 ) ; Text [ en-US ] = "O~uter"; @@ -232,6 +243,7 @@ TabPage TP_AXIS_POSITIONS }; ListBox LB_PLACE_TICKS { + HelpID = "chart2:ListBox:TP_AXIS_POSITIONS:LB_PLACE_TICKS"; Border = TRUE ; AutoHScroll = TRUE ; Pos = MAP_APPFONT ( X3 , Y9-2 ) ; @@ -259,6 +271,7 @@ TabPage TP_AXIS_POSITIONS }; CheckBox CB_MAJOR_GRID { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MAJOR_GRID"; Hide = TRUE ; Pos = MAP_APPFONT ( X2 , Y11 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; @@ -267,6 +280,7 @@ TabPage TP_AXIS_POSITIONS }; PushButton PB_MAJOR_GRID { + HelpID = "chart2:PushButton:TP_AXIS_POSITIONS:PB_MAJOR_GRID"; Hide = TRUE ; TabStop = TRUE; Pos = MAP_APPFONT ( X3 , Y11-2 ); @@ -275,6 +289,7 @@ TabPage TP_AXIS_POSITIONS }; CheckBox CB_MINOR_GRID { + HelpID = "chart2:CheckBox:TP_AXIS_POSITIONS:CB_MINOR_GRID"; Hide = TRUE ; Pos = MAP_APPFONT ( X2 , Y12 ) ; Size = MAP_APPFONT ( 150 , 10 ) ; @@ -283,6 +298,7 @@ TabPage TP_AXIS_POSITIONS }; PushButton PB_MINOR_GRID { + HelpID = "chart2:PushButton:TP_AXIS_POSITIONS:PB_MINOR_GRID"; Hide = TRUE ; TabStop = TRUE; Pos = MAP_APPFONT ( X3 , Y12-2 ); diff --git a/chart2/source/controller/dialogs/tp_ChartType.src b/chart2/source/controller/dialogs/tp_ChartType.src index c127cc184cba..69c33cd14021 100644 --- a/chart2/source/controller/dialogs/tp_ChartType.src +++ b/chart2/source/controller/dialogs/tp_ChartType.src @@ -99,18 +99,21 @@ TabPage TP_CHARTTYPE CheckBox CB_X_AXIS_CATEGORIES { + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_X_AXIS_CATEGORIES"; Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_VALUE_X_AXIS ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text [ en-US ] = "X axis with Categories" ; }; CheckBox CB_3D_LOOK { + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_3D_LOOK"; Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_3D_LOOK ) ; Size = MAP_APPFONT ( WIDTH_3D , 10 ) ; Text [ en-US ] = "~3D Look" ; }; ListBox LB_3D_SCHEME { + HelpID = "chart2:ListBox:TP_CHARTTYPE:LB_3D_SCHEME"; Border = TRUE; TabStop = TRUE; DropDown = TRUE; @@ -120,12 +123,14 @@ TabPage TP_CHARTTYPE CheckBox CB_STACKED { + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_STACKED"; Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_STACKING ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text [ en-US ] = "~Stack series" ; }; RadioButton RB_STACK_Y { + HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y"; Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+12 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -135,6 +140,7 @@ TabPage TP_CHARTTYPE }; RadioButton RB_STACK_Y_PERCENT { + HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Y_PERCENT"; Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+2*12 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -142,6 +148,7 @@ TabPage TP_CHARTTYPE }; RadioButton RB_STACK_Z { + HelpID = "chart2:RadioButton:TP_CHARTTYPE:RB_STACK_Z"; Pos = MAP_APPFONT ( POS_X_IMAGELIST+RSC_SP_CHK_TEXTINDENT, POS_Y_STACKING+3*12 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -152,6 +159,7 @@ TabPage TP_CHARTTYPE CheckBox CB_SPLINES { + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_SPLINES"; Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES ) ; Size = MAP_APPFONT ( 150 , 10 ) ; Text [ en-US ] = "S~mooth lines" ; @@ -159,6 +167,7 @@ TabPage TP_CHARTTYPE PushButton PB_SPLINE_DIALOG { + HelpID = "chart2:PushButton:TP_CHARTTYPE:PB_SPLINE_DIALOG"; TabStop = TRUE ; Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_SPLINES-6 ) ; Size = MAP_APPFONT ( 12 , 14 ) ; @@ -167,6 +176,7 @@ TabPage TP_CHARTTYPE CheckBox CB_XVALUE_SORTING { + HelpID = "chart2:CheckBox:TP_CHARTTYPE:CB_XVALUE_SORTING"; TabStop = TRUE ; Pos = MAP_APPFONT ( POS_X_IMAGELIST , POS_Y_XVALUE_SORTING ) ; Size = MAP_APPFONT ( WIDTH_XVALUE_SORTING , 10 ) ; @@ -185,6 +195,7 @@ ModalDialog DLG_SPLINE_PROPERTIES Closeable = TRUE; RadioButton RB_SPLINES_CUBIC { + HelpID = "chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_CUBIC"; Pos = MAP_APPFONT ( POS_X_SPLINES_1, POS_Y_SPLINES_2 ) ; Size = MAP_APPFONT ( SPLINES_WIDTH_RADIO , 10 ) ; TabStop = TRUE ; @@ -192,6 +203,7 @@ ModalDialog DLG_SPLINE_PROPERTIES }; RadioButton RB_SPLINES_B { + HelpID = "chart2:RadioButton:DLG_SPLINE_PROPERTIES:RB_SPLINES_B"; Pos = MAP_APPFONT ( POS_X_SPLINES_1, POS_Y_SPLINES_3 ) ; Size = MAP_APPFONT ( SPLINES_WIDTH_RADIO , 10 ) ; TabStop = TRUE ; @@ -213,6 +225,7 @@ ModalDialog DLG_SPLINE_PROPERTIES }; MetricField MF_SPLINE_RESOLUTION { + HelpID = "chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_RESOLUTION"; Border = TRUE ; Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS+SPLINES_WIDTH_METRIC_TEXT+RSC_SP_FLGR_SPACE_X , POS_Y_SPLINES_2-2 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; @@ -236,6 +249,7 @@ ModalDialog DLG_SPLINE_PROPERTIES }; MetricField MF_SPLINE_ORDER { + HelpID = "chart2:MetricField:DLG_SPLINE_PROPERTIES:MF_SPLINE_ORDER"; Border = TRUE ; Pos = MAP_APPFONT ( POS_X_SPLINE_EXTRAS+SPLINES_WIDTH_METRIC_TEXT+RSC_SP_FLGR_SPACE_X , POS_Y_SPLINES_3-2 ) ; Size = MAP_APPFONT ( 25 , 12 ) ; diff --git a/chart2/source/controller/dialogs/tp_DataSource.src b/chart2/source/controller/dialogs/tp_DataSource.src index 3e1f8a51c68a..9173a9c709ab 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.src +++ b/chart2/source/controller/dialogs/tp_DataSource.src @@ -29,6 +29,7 @@ TabPage TP_DATA_SOURCE { + HelpID = "chart2:TabPage:TP_DATA_SOURCE"; Hide = TRUE; Size = MAP_APPFONT ( 248, 140 ); SVLook = TRUE ; @@ -86,6 +87,7 @@ TabPage TP_DATA_SOURCE }; Edit EDT_RANGE { + HelpID = "chart2:Edit:TP_DATA_SOURCE:EDT_RANGE"; Border = TRUE; TabStop = TRUE; Pos = MAP_APPFONT ( 82 , 89 ); @@ -93,6 +95,7 @@ TabPage TP_DATA_SOURCE }; ImageButton IMB_RANGE_MAIN { + HelpID = "chart2:ImageButton:TP_DATA_SOURCE:IMB_RANGE_MAIN"; TabStop = TRUE; Pos = MAP_APPFONT ( 228 , 88 ); Size = MAP_APPFONT ( 14 , 14 ); @@ -118,6 +121,7 @@ TabPage TP_DATA_SOURCE Edit EDT_CATEGORIES { + HelpID = "chart2:Edit:TP_DATA_SOURCE:EDT_CATEGORIES"; Border = TRUE; TabStop = TRUE; Pos = MAP_APPFONT ( 82 , 117 ); @@ -125,6 +129,7 @@ TabPage TP_DATA_SOURCE }; ImageButton IMB_RANGE_CAT { + HelpID = "chart2:ImageButton:TP_DATA_SOURCE:IMB_RANGE_CAT"; TabStop = TRUE; Pos = MAP_APPFONT ( 228 , 116 ); Size = MAP_APPFONT ( 14 , 14 ); @@ -134,6 +139,7 @@ TabPage TP_DATA_SOURCE PushButton BTN_ADD { + HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_ADD"; TabStop = TRUE; Disable = FALSE; Pos = MAP_APPFONT ( 6 , 105 ); @@ -143,6 +149,7 @@ TabPage TP_DATA_SOURCE }; PushButton BTN_REMOVE { + HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_REMOVE"; TabStop = TRUE; Disable = TRUE; Pos = MAP_APPFONT ( 6 , 121 ); @@ -154,6 +161,7 @@ TabPage TP_DATA_SOURCE // Note: Text is only a black triangle symbol PushButton BTN_UP { + HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_UP"; TabStop = TRUE; Disable = TRUE; Pos = MAP_APPFONT ( 64 , 105 ); @@ -163,6 +171,7 @@ TabPage TP_DATA_SOURCE // Note: Text is only a black triangle symbol PushButton BTN_DOWN { + HelpID = "chart2:PushButton:TP_DATA_SOURCE:BTN_DOWN"; TabStop = TRUE; Disable = TRUE; Pos = MAP_APPFONT ( 64 , 121 ); diff --git a/chart2/source/controller/dialogs/tp_ErrorBars.src b/chart2/source/controller/dialogs/tp_ErrorBars.src index aede04751907..b649cb4474c9 100644 --- a/chart2/source/controller/dialogs/tp_ErrorBars.src +++ b/chart2/source/controller/dialogs/tp_ErrorBars.src @@ -30,6 +30,7 @@ TabPage TP_YERRORBAR { + HelpID = "chart2:TabPage:TP_YERRORBAR"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; diff --git a/chart2/source/controller/dialogs/tp_LegendPosition.src b/chart2/source/controller/dialogs/tp_LegendPosition.src index d910a5143293..1ac64330108a 100644 --- a/chart2/source/controller/dialogs/tp_LegendPosition.src +++ b/chart2/source/controller/dialogs/tp_LegendPosition.src @@ -56,6 +56,7 @@ TabPage TP_LEGEND_POS }; ListBox LB_LEGEND_TEXTDIR { + HelpID = "chart2:ListBox:TP_LEGEND_POS:LB_LEGEND_TEXTDIR"; Pos = MAP_APPFONT ( 78 , 14 + RESOURCE_LEGENDPOSITION_HEIGHT + 17 ) ; Size = MAP_APPFONT ( 170 , 100 ) ; Border = TRUE; diff --git a/chart2/source/controller/dialogs/tp_Location.src b/chart2/source/controller/dialogs/tp_Location.src index 6a921103f2e4..be0033d436dd 100644 --- a/chart2/source/controller/dialogs/tp_Location.src +++ b/chart2/source/controller/dialogs/tp_Location.src @@ -45,6 +45,7 @@ TabPage TP_LOCATION { + HelpID = "chart2:TabPage:TP_LOCATION"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT ) ; @@ -65,6 +66,7 @@ TabPage TP_LOCATION }; ListBox LB_TABLE { + HelpID = "chart2:ListBox:TP_LOCATION:LB_TABLE"; Border = TRUE ; DropDown = TRUE ; Pos = MAP_APPFONT ( WIZ_POSX3 , WIZ_POSY2 ) ; diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.src b/chart2/source/controller/dialogs/tp_PointGeometry.src index 39e1e1e9e21d..b6862cba3b77 100644 --- a/chart2/source/controller/dialogs/tp_PointGeometry.src +++ b/chart2/source/controller/dialogs/tp_PointGeometry.src @@ -29,6 +29,7 @@ TabPage TP_LAYOUT { + HelpID = "chart2:TabPage:TP_LAYOUT"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.src b/chart2/source/controller/dialogs/tp_PolarOptions.src index 237fa027b55f..96463a97341b 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.src +++ b/chart2/source/controller/dialogs/tp_PolarOptions.src @@ -30,12 +30,14 @@ TabPage TP_POLAROPTIONS { + HelpID = "chart2:TabPage:TP_POLAROPTIONS"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; CheckBox CB_CLOCKWISE { + HelpID = "chart2:CheckBox:TP_POLAROPTIONS:CB_CLOCKWISE"; Pos = MAP_APPFONT ( 12 , 8 ); Size = MAP_APPFONT ( 248 , 10 ); TabStop = TRUE; @@ -61,6 +63,7 @@ TabPage TP_POLAROPTIONS }; NumericField NF_STARTING_ANGLE { + HelpID = "chart2:NumericField:TP_POLAROPTIONS:NF_STARTING_ANGLE"; Pos = MAP_APPFONT ( 61 , 53 ) ; Size = MAP_APPFONT ( 28 , 12 ) ; Border = TRUE ; @@ -79,6 +82,7 @@ TabPage TP_POLAROPTIONS }; CheckBox CB_INCLUDE_HIDDEN_CELLS_POLAR { + HelpID = "chart2:CheckBox:TP_POLAROPTIONS:CB_INCLUDE_HIDDEN_CELLS_POLAR"; Pos = MAP_APPFONT ( 12 , 104 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; TabStop = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_RangeChooser.src b/chart2/source/controller/dialogs/tp_RangeChooser.src index de07c9763b7d..962722b41c71 100644 --- a/chart2/source/controller/dialogs/tp_RangeChooser.src +++ b/chart2/source/controller/dialogs/tp_RangeChooser.src @@ -37,6 +37,7 @@ TabPage TP_RANGECHOOSER { + HelpID = "chart2:TabPage:TP_RANGECHOOSER"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 248, 140 ) ; @@ -55,18 +56,21 @@ TabPage TP_RANGECHOOSER }; Edit ED_RANGE { + HelpID = "chart2:Edit:TP_RANGECHOOSER:ED_RANGE"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 32 ) ; Size = MAP_APPFONT ( 220 , 12 ) ; }; ImageButton IB_RANGE { + HelpID = "chart2:ImageButton:TP_RANGECHOOSER:IB_RANGE"; Pos = MAP_APPFONT ( 228 , 31 ) ; Size = MAP_APPFONT ( 14 , 14 ) ; TabStop = FALSE ; }; RadioButton RB_DATAROWS { + HelpID = "chart2:RadioButton:TP_RANGECHOOSER:RB_DATAROWS"; Pos = MAP_APPFONT ( 6 , 52 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -74,6 +78,7 @@ TabPage TP_RANGECHOOSER }; RadioButton RB_DATACOLS { + HelpID = "chart2:RadioButton:TP_RANGECHOOSER:RB_DATACOLS"; Pos = MAP_APPFONT ( 6 , 66 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; TabStop = TRUE ; @@ -81,12 +86,14 @@ TabPage TP_RANGECHOOSER }; CheckBox CB_FIRST_ROW_ASLABELS { + HelpID = "chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_ROW_ASLABELS"; Pos = MAP_APPFONT ( 6 , 84 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "~First row as label" ; }; CheckBox CB_FIRST_COLUMN_ASLABELS { + HelpID = "chart2:CheckBox:TP_RANGECHOOSER:CB_FIRST_COLUMN_ASLABELS"; Pos = MAP_APPFONT ( 6 , 98 ) ; Size = MAP_APPFONT ( 236 , 10 ) ; Text [ en-US ] = "F~irst column as label" ; diff --git a/chart2/source/controller/dialogs/tp_Scale.src b/chart2/source/controller/dialogs/tp_Scale.src index b53adeaa512f..9e92e70f6f43 100644 --- a/chart2/source/controller/dialogs/tp_Scale.src +++ b/chart2/source/controller/dialogs/tp_Scale.src @@ -46,6 +46,7 @@ TabPage TP_SCALE { + HelpID = "chart2:TabPage:TP_SCALE"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; @@ -64,6 +65,7 @@ TabPage TP_SCALE }; SpinField EDT_MIN { + HelpID = "chart2:SpinField:TP_SCALE:EDT_MIN"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( X3 , Y1-2 ) ; @@ -72,6 +74,7 @@ TabPage TP_SCALE }; CheckBox CBX_AUTO_MIN { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_MIN"; Pos = MAP_APPFONT ( X4 , Y1-1 ) ; Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ; TabStop = TRUE ; @@ -86,6 +89,7 @@ TabPage TP_SCALE }; SpinField EDT_MAX { + HelpID = "chart2:SpinField:TP_SCALE:EDT_MAX"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( X3 , Y2-2 ) ; @@ -94,6 +98,7 @@ TabPage TP_SCALE }; CheckBox CBX_AUTO_MAX { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_MAX"; Pos = MAP_APPFONT ( X4 , Y2-1 ) ; Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ; TabStop = TRUE ; @@ -107,6 +112,7 @@ TabPage TP_SCALE }; SpinField EDT_STEP_MAIN { + HelpID = "chart2:SpinField:TP_SCALE:EDT_STEP_MAIN"; Border = TRUE ; Pos = MAP_APPFONT ( X3 , Y3-2 ) ; Size = MAP_APPFONT ( EDITWIDTH , 12 ) ; @@ -114,6 +120,7 @@ TabPage TP_SCALE }; CheckBox CBX_AUTO_STEP_MAIN { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_MAIN"; Pos = MAP_APPFONT ( X4 , Y3-1 ) ; Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ; TabStop = TRUE ; @@ -127,6 +134,7 @@ TabPage TP_SCALE }; MetricField MT_STEPHELP { + HelpID = "chart2:MetricField:TP_SCALE:MT_STEPHELP"; Border = TRUE ; Pos = MAP_APPFONT ( X3 , Y4-2 ) ; Size = MAP_APPFONT ( EDITWIDTH , 12 ) ; @@ -143,6 +151,7 @@ TabPage TP_SCALE }; CheckBox CBX_AUTO_STEP_HELP { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_STEP_HELP"; Pos = MAP_APPFONT ( X4 , Y4-1 ) ; Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ; TabStop = TRUE ; @@ -157,6 +166,7 @@ TabPage TP_SCALE }; SpinField EDT_ORIGIN { + HelpID = "chart2:SpinField:TP_SCALE:EDT_ORIGIN"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( X3 , Y5-2 ) ; @@ -165,6 +175,7 @@ TabPage TP_SCALE }; CheckBox CBX_AUTO_ORIGIN { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_AUTO_ORIGIN"; Pos = MAP_APPFONT ( X4 , Y5-1 ) ; Size = MAP_APPFONT ( AUTOCHECKWIDTH , 10 ) ; TabStop = TRUE ; @@ -173,6 +184,7 @@ TabPage TP_SCALE CheckBox CBX_LOGARITHM { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_LOGARITHM"; Pos = MAP_APPFONT ( X2 , Y6 ) ; Size = MAP_APPFONT ( 244 , 10 ) ; TabStop = TRUE ; @@ -181,6 +193,7 @@ TabPage TP_SCALE CheckBox CBX_REVERSE { + HelpID = "chart2:CheckBox:TP_SCALE:CBX_REVERSE"; Pos = MAP_APPFONT ( X2 , Y7 ) ; Size = MAP_APPFONT ( 244 , 10 ) ; TabStop = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_SeriesToAxis.src b/chart2/source/controller/dialogs/tp_SeriesToAxis.src index 994a44ec39ef..844c81bd2e64 100644 --- a/chart2/source/controller/dialogs/tp_SeriesToAxis.src +++ b/chart2/source/controller/dialogs/tp_SeriesToAxis.src @@ -29,6 +29,7 @@ TabPage TP_OPTIONS { + HelpID = "chart2:TabPage:TP_OPTIONS"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; @@ -40,6 +41,7 @@ TabPage TP_OPTIONS }; RadioButton RBT_OPT_AXIS_1 { + HelpID = "chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_1"; Pos = MAP_APPFONT ( 12 , 20 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -47,6 +49,7 @@ TabPage TP_OPTIONS }; RadioButton RBT_OPT_AXIS_2 { + HelpID = "chart2:RadioButton:TP_OPTIONS:RBT_OPT_AXIS_2"; Pos = MAP_APPFONT ( 12 , 34 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -68,6 +71,7 @@ TabPage TP_OPTIONS MetricField MT_OVERLAP { + HelpID = "chart2:MetricField:TP_OPTIONS:MT_OVERLAP"; Border = TRUE ; Pos = MAP_APPFONT ( 63 , 78 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -94,6 +98,7 @@ TabPage TP_OPTIONS MetricField MT_GAP { + HelpID = "chart2:MetricField:TP_OPTIONS:MT_GAP"; Border = TRUE ; Pos = MAP_APPFONT ( 63 , 62 ) ; Size = MAP_APPFONT ( 40 , 12 ) ; @@ -113,6 +118,7 @@ TabPage TP_OPTIONS CheckBox CB_CONNECTOR { + HelpID = "chart2:CheckBox:TP_OPTIONS:CB_CONNECTOR"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; TabStop = TRUE ; @@ -121,6 +127,7 @@ TabPage TP_OPTIONS CheckBox CB_BARS_SIDE_BY_SIDE { + HelpID = "chart2:CheckBox:TP_OPTIONS:CB_BARS_SIDE_BY_SIDE"; Pos = MAP_APPFONT ( 12 , 97 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; TabStop = TRUE ; @@ -143,6 +150,7 @@ TabPage TP_OPTIONS RadioButton RB_DONT_PAINT { + HelpID = "chart2:RadioButton:TP_OPTIONS:RB_DONT_PAINT"; Pos = MAP_APPFONT ( 82 , 127 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -151,6 +159,7 @@ TabPage TP_OPTIONS RadioButton RB_ASSUME_ZERO { + HelpID = "chart2:RadioButton:TP_OPTIONS:RB_ASSUME_ZERO"; Pos = MAP_APPFONT ( 82 , 141 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -159,6 +168,7 @@ TabPage TP_OPTIONS RadioButton RB_CONTINUE_LINE { + HelpID = "chart2:RadioButton:TP_OPTIONS:RB_CONTINUE_LINE"; Pos = MAP_APPFONT ( 82 , 155 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -167,6 +177,7 @@ TabPage TP_OPTIONS CheckBox CB_INCLUDE_HIDDEN_CELLS { + HelpID = "chart2:CheckBox:TP_OPTIONS:CB_INCLUDE_HIDDEN_CELLS"; Pos = MAP_APPFONT ( 12 , 172 ) ; Size = MAP_APPFONT ( 200 , 10 ) ; TabStop = TRUE ; diff --git a/chart2/source/controller/dialogs/tp_Trendline.src b/chart2/source/controller/dialogs/tp_Trendline.src index f7a3fa33a6d8..1a283844a8d1 100644 --- a/chart2/source/controller/dialogs/tp_Trendline.src +++ b/chart2/source/controller/dialogs/tp_Trendline.src @@ -30,6 +30,7 @@ TabPage TP_TRENDLINE { + HelpID = "chart2:TabPage:TP_TRENDLINE"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; diff --git a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src index a17f5655e751..473007f1c32b 100644 --- a/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src +++ b/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src @@ -59,6 +59,7 @@ TabPage TP_WIZARD_TITLEANDOBJECTS { + HelpID = "chart2:TabPage:TP_WIZARD_TITLEANDOBJECTS"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( CHART_WIZARD_PAGEWIDTH , CHART_WIZARD_PAGEHEIGHT ) ; diff --git a/sc/source/ui/dbgui/asciiopt.src b/sc/source/ui/dbgui/asciiopt.src index 9efbfe0f557f..5ddaba95d4df 100644 --- a/sc/source/ui/dbgui/asciiopt.src +++ b/sc/source/ui/dbgui/asciiopt.src @@ -29,6 +29,7 @@ ModalDialog RID_SCDLG_ASCII { + HelpID = "sc:ModalDialog:RID_SCDLG_ASCII"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 320 , 305 ) ; @@ -71,6 +72,7 @@ ModalDialog RID_SCDLG_ASCII ListBox LB_CHARSET { + HelpID = "sc:ListBox:RID_SCDLG_ASCII:LB_CHARSET"; Pos = MAP_APPFONT ( 76 , 14 ) ; Size = MAP_APPFONT ( 130 , 61 ) ; TabStop = TRUE ; @@ -87,6 +89,7 @@ ModalDialog RID_SCDLG_ASCII ListBox LB_CUSTOMLANG { + HelpID = "sc:ListBox:RID_SCDLG_ASCII:LB_CUSTOMLANG"; Pos = MAP_APPFONT ( 76 , 30 ) ; Size = MAP_APPFONT ( 130 , 61 ) ; TabStop = TRUE ; @@ -103,6 +106,7 @@ ModalDialog RID_SCDLG_ASCII NumericField NF_AT_ROW { + HelpID = "sc:NumericField:RID_SCDLG_ASCII:NF_AT_ROW"; Border = TRUE ; SVLook = TRUE ; Pos = MAP_APPFONT ( 76 , 46 ) ; @@ -121,6 +125,7 @@ ModalDialog RID_SCDLG_ASCII }; RadioButton RB_FIXED { + HelpID = "sc:RadioButton:RID_SCDLG_ASCII:RB_FIXED"; Pos = MAP_APPFONT ( 12 , 75 ) ; Size = MAP_APPFONT ( 243 , 10 ) ; Text [ en-US ] = "~Fixed width" ; @@ -128,6 +133,7 @@ ModalDialog RID_SCDLG_ASCII }; RadioButton RB_SEPARATED { + HelpID = "sc:RadioButton:RID_SCDLG_ASCII:RB_SEPARATED"; Pos = MAP_APPFONT ( 12 , 89 ) ; Size = MAP_APPFONT ( 243 , 10 ) ; Text [ en-US ] = "~Separated by" ; @@ -137,6 +143,7 @@ ModalDialog RID_SCDLG_ASCII CheckBox CKB_TAB { + HelpID = "sc:CheckBox:RID_SCDLG_ASCII:CKB_TAB"; Pos = MAP_APPFONT ( 20 , 102 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; TabStop = TRUE ; @@ -144,6 +151,7 @@ ModalDialog RID_SCDLG_ASCII }; CheckBox CKB_COMMA { + HelpID = "sc:CheckBox:RID_SCDLG_ASCII:CKB_COMMA"; Pos = MAP_APPFONT ( 92 , 102 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; TabStop = TRUE ; @@ -151,6 +159,7 @@ ModalDialog RID_SCDLG_ASCII }; CheckBox CKB_OTHER { + HelpID = "sc:CheckBox:RID_SCDLG_ASCII:CKB_OTHER"; Pos = MAP_APPFONT ( 164 , 102 ) ; Size = MAP_APPFONT ( 50 , 10 ) ; TabStop = TRUE ; @@ -158,6 +167,7 @@ ModalDialog RID_SCDLG_ASCII }; Edit ED_OTHER { + HelpID = "sc:Edit:RID_SCDLG_ASCII:ED_OTHER"; Border = TRUE ; Pos = MAP_APPFONT ( 218 , 100 ) ; Size = MAP_APPFONT ( 37 , 12 ) ; @@ -167,6 +177,7 @@ ModalDialog RID_SCDLG_ASCII CheckBox CKB_SEMICOLON { + HelpID = "sc:CheckBox:RID_SCDLG_ASCII:CKB_SEMICOLON"; Pos = MAP_APPFONT ( 20 , 115 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; TabStop = TRUE ; @@ -174,6 +185,7 @@ ModalDialog RID_SCDLG_ASCII }; CheckBox CKB_SPACE { + HelpID = "sc:CheckBox:RID_SCDLG_ASCII:CKB_SPACE"; Pos = MAP_APPFONT ( 92 , 115 ) ; Size = MAP_APPFONT ( 68 , 10 ) ; TabStop = TRUE ; @@ -182,6 +194,7 @@ ModalDialog RID_SCDLG_ASCII CheckBox CB_ASONCE { + HelpID = "sc:CheckBox:RID_SCDLG_ASCII:CB_ASONCE"; Pos = MAP_APPFONT ( 20 , 130 ) ; Size = MAP_APPFONT ( 130 , 10 ) ; TabStop = TRUE ; @@ -190,6 +203,7 @@ ModalDialog RID_SCDLG_ASCII ComboBox CB_TEXTSEP { + HelpID = "sc:ComboBox:RID_SCDLG_ASCII:CB_TEXTSEP"; Pos = MAP_APPFONT ( 218 , 128 ) ; Size = MAP_APPFONT ( 37 , 94 ) ; TabStop = TRUE ; @@ -211,6 +225,7 @@ ModalDialog RID_SCDLG_ASCII CheckBox CB_QUOTED_AS_TEXT { + HelpID = "sc:CheckBox:RID_SCDLG_ASCII:CB_QUOTED_AS_TEXT"; Pos = MAP_APPFONT ( 12 , 158 ) ; Size = MAP_APPFONT ( 130 , 10 ) ; TabStop = TRUE ; @@ -219,6 +234,7 @@ ModalDialog RID_SCDLG_ASCII CheckBox CB_DETECT_SPECIAL_NUMBER { + HelpID = "sc:CheckBox:RID_SCDLG_ASCII:CB_DETECT_SPECIAL_NUMBER"; Pos = MAP_APPFONT ( 12 , 171 ) ; Size = MAP_APPFONT ( 130 , 10 ) ; TabStop = TRUE ; @@ -239,6 +255,7 @@ ModalDialog RID_SCDLG_ASCII }; ListBox LB_TYPE1 { + HelpID = "sc:ListBox:RID_SCDLG_ASCII:LB_TYPE1"; Pos = MAP_APPFONT ( 76 , 198 ) ; Size = MAP_APPFONT ( 60 , 68 ) ; TabStop = TRUE ; diff --git a/sc/source/ui/dbgui/consdlg.src b/sc/source/ui/dbgui/consdlg.src index 0ba15ee43445..4dad5dcb3cee 100644 --- a/sc/source/ui/dbgui/consdlg.src +++ b/sc/source/ui/dbgui/consdlg.src @@ -37,6 +37,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE Closeable = FALSE ; ListBox LB_FUNC { + HelpID = "sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_FUNC"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 17 ) ; Size = MAP_APPFONT ( 212 , 90 ) ; @@ -59,6 +60,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; Edit ED_DATA_AREA { + HelpID = "sc:Edit:RID_SCDLG_CONSOLIDATE:ED_DATA_AREA"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 106 ) ; Size = MAP_APPFONT ( 104 , 12 ) ; @@ -66,6 +68,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; Edit ED_DEST_AREA { + HelpID = "sc:Edit:RID_SCDLG_CONSOLIDATE:ED_DEST_AREA"; Border = TRUE ; Pos = MAP_APPFONT ( 100 , 135 ) ; Size = MAP_APPFONT ( 104 , 12 ) ; @@ -73,6 +76,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; ImageButton RB_DATA_AREA { + HelpID = "sc:ImageButton:RID_SCDLG_CONSOLIDATE:RB_DATA_AREA"; Pos = MAP_APPFONT ( 206 , 105 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = TRUE ; @@ -80,6 +84,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; ImageButton RB_DEST_AREA { + HelpID = "sc:ImageButton:RID_SCDLG_CONSOLIDATE:RB_DEST_AREA"; Pos = MAP_APPFONT ( 206 , 134 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = TRUE ; @@ -87,6 +92,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; ListBox LB_DATA_AREA { + HelpID = "sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_DATA_AREA"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 106 ) ; Size = MAP_APPFONT ( 90 , 90 ) ; @@ -95,6 +101,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; ListBox LB_DEST_AREA { + HelpID = "sc:ListBox:RID_SCDLG_CONSOLIDATE:LB_DEST_AREA"; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 135 ) ; Size = MAP_APPFONT ( 90 , 90 ) ; @@ -103,6 +110,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; MultiListBox LB_CONSAREAS { + HelpID = "sc:MultiListBox:RID_SCDLG_CONSOLIDATE:LB_CONSAREAS"; SimpleMode = TRUE ; Border = TRUE ; Pos = MAP_APPFONT ( 6 , 46 ) ; @@ -135,6 +143,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; CheckBox BTN_BYROW { + HelpID = "sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_BYROW"; Pos = MAP_APPFONT ( 12 , 165 ) ; Size = MAP_APPFONT ( 94 , 10 ) ; Text [ en-US ] = "~Row labels" ; @@ -142,6 +151,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; CheckBox BTN_BYCOL { + HelpID = "sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_BYCOL"; Pos = MAP_APPFONT ( 12 , 179 ) ; Size = MAP_APPFONT ( 94 , 10 ) ; TabStop = TRUE ; @@ -167,6 +177,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; CheckBox BTN_REFS { + HelpID = "sc:CheckBox:RID_SCDLG_CONSOLIDATE:BTN_REFS"; Pos = MAP_APPFONT ( 121 , 165 ) ; Size = MAP_APPFONT ( 94 , 10 ) ; Text [ en-US ] = "~Link to source data" ; @@ -193,6 +204,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; MoreButton BTN_MORE { + HelpID = "sc:MoreButton:RID_SCDLG_CONSOLIDATE:BTN_MORE"; Pos = MAP_APPFONT ( 224 , 134 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -201,6 +213,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; PushButton BTN_REMOVE { + HelpID = "sc:PushButton:RID_SCDLG_CONSOLIDATE:BTN_REMOVE"; Pos = MAP_APPFONT ( 224 , 114 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Delete" ; @@ -208,6 +221,7 @@ ModelessDialog RID_SCDLG_CONSOLIDATE }; PushButton BTN_ADD { + HelpID = "sc:PushButton:RID_SCDLG_CONSOLIDATE:BTN_ADD"; Pos = MAP_APPFONT ( 224 , 96 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; Text [ en-US ] = "~Add" ; diff --git a/sc/source/ui/dbgui/dapitype.src b/sc/source/ui/dbgui/dapitype.src index 5cf1dacad819..84b1c1c6068f 100644 --- a/sc/source/ui/dbgui/dapitype.src +++ b/sc/source/ui/dbgui/dapitype.src @@ -58,6 +58,7 @@ ModalDialog RID_SCDLG_DAPITYPE }; RadioButton BTN_SELECTION { + HelpID = "sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_SELECTION"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 164 , 10 ) ; TabStop = TRUE ; @@ -65,6 +66,7 @@ ModalDialog RID_SCDLG_DAPITYPE }; RadioButton BTN_DATABASE { + HelpID = "sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_DATABASE"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 164 , 10 ) ; TabStop = TRUE ; @@ -72,6 +74,7 @@ ModalDialog RID_SCDLG_DAPITYPE }; RadioButton BTN_EXTERNAL { + HelpID = "sc:RadioButton:RID_SCDLG_DAPITYPE:BTN_EXTERNAL"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 164 , 10 ) ; TabStop = TRUE ; @@ -125,6 +128,7 @@ ModalDialog RID_SCDLG_DAPISERVICE }; ListBox LB_SERVICE { + HelpID = "sc:ListBox:RID_SCDLG_DAPISERVICE:LB_SERVICE"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 12 ) ; Size = MAP_APPFONT ( 120 , 80 ) ; @@ -139,6 +143,7 @@ ModalDialog RID_SCDLG_DAPISERVICE }; Edit ED_SOURCE { + HelpID = "sc:Edit:RID_SCDLG_DAPISERVICE:ED_SOURCE"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 28 ) ; Size = MAP_APPFONT ( 120 , 12 ) ; @@ -152,6 +157,7 @@ ModalDialog RID_SCDLG_DAPISERVICE }; Edit ED_NAME { + HelpID = "sc:Edit:RID_SCDLG_DAPISERVICE:ED_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 44 ) ; Size = MAP_APPFONT ( 120 , 12 ) ; @@ -165,6 +171,7 @@ ModalDialog RID_SCDLG_DAPISERVICE }; Edit ED_USER { + HelpID = "sc:Edit:RID_SCDLG_DAPISERVICE:ED_USER"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 60 ) ; Size = MAP_APPFONT ( 120 , 12 ) ; @@ -178,6 +185,7 @@ ModalDialog RID_SCDLG_DAPISERVICE }; Edit ED_PASSWD { + HelpID = "sc:Edit:RID_SCDLG_DAPISERVICE:ED_PASSWD"; Border = TRUE ; Pos = MAP_APPFONT ( 56 , 76 ) ; Size = MAP_APPFONT ( 120 , 12 ) ; @@ -233,6 +241,7 @@ ModalDialog RID_SCDLG_DAPIDATA }; ListBox LB_DATABASE { + HelpID = "sc:ListBox:RID_SCDLG_DAPIDATA:LB_DATABASE"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 12 ) ; Size = MAP_APPFONT ( 110 , 80 ) ; @@ -248,6 +257,7 @@ ModalDialog RID_SCDLG_DAPIDATA }; ComboBox CB_OBJECT { + HelpID = "sc:ComboBox:RID_SCDLG_DAPIDATA:CB_OBJECT"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 28 ) ; Size = MAP_APPFONT ( 110 , 80 ) ; @@ -263,6 +273,7 @@ ModalDialog RID_SCDLG_DAPIDATA }; ListBox LB_OBJTYPE { + HelpID = "sc:ListBox:RID_SCDLG_DAPIDATA:LB_OBJTYPE"; Border = TRUE ; Pos = MAP_APPFONT ( 66 , 44 ) ; Size = MAP_APPFONT ( 110 , 80 ) ; diff --git a/sc/source/ui/dbgui/dpgroupdlg.src b/sc/source/ui/dbgui/dpgroupdlg.src index f9a5ac589af5..84a27faf867c 100644 --- a/sc/source/ui/dbgui/dpgroupdlg.src +++ b/sc/source/ui/dbgui/dpgroupdlg.src @@ -46,6 +46,7 @@ ModalDialog RID_SCDLG_DPNUMGROUP }; RadioButton RB_AUTOSTART { + HelpID = "sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOSTART"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -53,6 +54,7 @@ ModalDialog RID_SCDLG_DPNUMGROUP }; RadioButton RB_MANSTART { + HelpID = "sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANSTART"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -60,6 +62,7 @@ ModalDialog RID_SCDLG_DPNUMGROUP }; Edit ED_START { + HelpID = "sc:Edit:RID_SCDLG_DPNUMGROUP:ED_START"; Pos = MAP_APPFONT ( 94 , 26 ) ; Size = MAP_APPFONT ( 58 , 12 ) ; TabStop = TRUE ; @@ -73,6 +76,7 @@ ModalDialog RID_SCDLG_DPNUMGROUP }; RadioButton RB_AUTOEND { + HelpID = "sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_AUTOEND"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -80,6 +84,7 @@ ModalDialog RID_SCDLG_DPNUMGROUP }; RadioButton RB_MANEND { + HelpID = "sc:RadioButton:RID_SCDLG_DPNUMGROUP:RB_MANEND"; Pos = MAP_APPFONT ( 12 , 67 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -87,6 +92,7 @@ ModalDialog RID_SCDLG_DPNUMGROUP }; Edit ED_END { + HelpID = "sc:Edit:RID_SCDLG_DPNUMGROUP:ED_END"; Pos = MAP_APPFONT ( 94 , 65 ) ; Size = MAP_APPFONT ( 58 , 12 ) ; TabStop = TRUE ; @@ -100,6 +106,7 @@ ModalDialog RID_SCDLG_DPNUMGROUP }; Edit ED_BY { + HelpID = "sc:Edit:RID_SCDLG_DPNUMGROUP:ED_BY"; Pos = MAP_APPFONT ( 94 , 92 ) ; Size = MAP_APPFONT ( 58 , 12 ) ; TabStop = TRUE ; @@ -146,6 +153,7 @@ ModalDialog RID_SCDLG_DPDATEGROUP }; RadioButton RB_AUTOSTART { + HelpID = "sc:RadioButton:RID_SCDLG_DPDATEGROUP:RB_AUTOSTART"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -153,6 +161,7 @@ ModalDialog RID_SCDLG_DPDATEGROUP }; RadioButton RB_MANSTART { + HelpID = "sc:RadioButton:RID_SCDLG_DPDATEGROUP:RB_MANSTART"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -160,6 +169,7 @@ ModalDialog RID_SCDLG_DPDATEGROUP }; DateField ED_START { + HelpID = "sc:DateField:RID_SCDLG_DPDATEGROUP:ED_START"; Pos = MAP_APPFONT ( 94 , 26 ) ; Size = MAP_APPFONT ( 58 , 12 ) ; TabStop = TRUE ; @@ -173,6 +183,7 @@ ModalDialog RID_SCDLG_DPDATEGROUP }; RadioButton RB_AUTOEND { + HelpID = "sc:RadioButton:RID_SCDLG_DPDATEGROUP:RB_AUTOEND"; Pos = MAP_APPFONT ( 12 , 53 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -180,6 +191,7 @@ ModalDialog RID_SCDLG_DPDATEGROUP }; RadioButton RB_MANEND { + HelpID = "sc:RadioButton:RID_SCDLG_DPDATEGROUP:RB_MANEND"; Pos = MAP_APPFONT ( 12 , 67 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -187,6 +199,7 @@ ModalDialog RID_SCDLG_DPDATEGROUP }; DateField ED_END { + HelpID = "sc:DateField:RID_SCDLG_DPDATEGROUP:ED_END"; Pos = MAP_APPFONT ( 94 , 65 ) ; Size = MAP_APPFONT ( 58 , 12 ) ; TabStop = TRUE ; @@ -200,6 +213,7 @@ ModalDialog RID_SCDLG_DPDATEGROUP }; RadioButton RB_NUMDAYS { + HelpID = "sc:RadioButton:RID_SCDLG_DPDATEGROUP:RB_NUMDAYS"; Pos = MAP_APPFONT ( 12 , 94 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -207,6 +221,7 @@ ModalDialog RID_SCDLG_DPDATEGROUP }; RadioButton RB_UNITS { + HelpID = "sc:RadioButton:RID_SCDLG_DPDATEGROUP:RB_UNITS"; Pos = MAP_APPFONT ( 12 , 110 ) ; Size = MAP_APPFONT ( 80 , 10 ) ; TabStop = TRUE ; @@ -214,6 +229,7 @@ ModalDialog RID_SCDLG_DPDATEGROUP }; NumericField ED_NUMDAYS { + HelpID = "sc:NumericField:RID_SCDLG_DPDATEGROUP:ED_NUMDAYS"; Pos = MAP_APPFONT ( 94, 92 ) ; Size = MAP_APPFONT ( 35, 12 ) ; TabStop = TRUE ; diff --git a/sc/source/ui/dbgui/imoptdlg.src b/sc/source/ui/dbgui/imoptdlg.src index 914f2d1fb027..e83f3a9c9dac 100644 --- a/sc/source/ui/dbgui/imoptdlg.src +++ b/sc/source/ui/dbgui/imoptdlg.src @@ -45,6 +45,7 @@ ModalDialog RID_SCDLG_IMPORTOPT }; ComboBox ED_FIELDSEP { + HelpID = "sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_FIELDSEP"; Pos = MAP_APPFONT ( 70 , 30 ) ; Size = MAP_APPFONT ( 121 , 60 ) ; DropDown = TRUE ; @@ -57,6 +58,7 @@ ModalDialog RID_SCDLG_IMPORTOPT }; ComboBox ED_TEXTSEP { + HelpID = "sc:ComboBox:RID_SCDLG_IMPORTOPT:ED_TEXTSEP"; Pos = MAP_APPFONT ( 70 , 46 ) ; Size = MAP_APPFONT ( 121 , 60 ) ; DropDown = TRUE ; @@ -69,6 +71,7 @@ ModalDialog RID_SCDLG_IMPORTOPT }; ListBox DDLB_FONT { + HelpID = "sc:ListBox:RID_SCDLG_IMPORTOPT:DDLB_FONT"; Border = TRUE; Sort = TRUE; DropDown = TRUE ; @@ -77,6 +80,7 @@ ModalDialog RID_SCDLG_IMPORTOPT }; ListBox LB_FONT { + HelpID = "sc:ListBox:RID_SCDLG_IMPORTOPT:LB_FONT"; Border = TRUE; Sort = TRUE; DropDown = FALSE ; @@ -91,6 +95,7 @@ ModalDialog RID_SCDLG_IMPORTOPT }; CheckBox CB_FIXEDWIDTH { + HelpID = "sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_FIXEDWIDTH"; Pos = MAP_APPFONT( 12, 80 ); Size = MAP_APPFONT( 172, 10 ); Hide = TRUE; @@ -98,6 +103,7 @@ ModalDialog RID_SCDLG_IMPORTOPT }; CheckBox CB_SAVESHOWN { + HelpID = "sc:CheckBox:RID_SCDLG_IMPORTOPT:CB_SAVESHOWN"; Pos = MAP_APPFONT( 12, 66 ); Size = MAP_APPFONT( 172, 10 ); TabStop = TRUE; diff --git a/sc/source/ui/dbgui/pivot.src b/sc/source/ui/dbgui/pivot.src index 2379d15d3eac..763f03fe82bf 100644 --- a/sc/source/ui/dbgui/pivot.src +++ b/sc/source/ui/dbgui/pivot.src @@ -137,6 +137,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; PushButton BTN_REMOVE { + HelpID = "sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_REMOVE"; Pos = MAP_APPFONT ( 280 , 63 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -144,6 +145,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; PushButton BTN_OPTIONS { + HelpID = "sc:PushButton:RID_SCDLG_PIVOT_LAYOUT:BTN_OPTIONS"; Pos = MAP_APPFONT ( 280 , 80 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -151,6 +153,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; MoreButton BTN_MORE { + HelpID = "sc:MoreButton:RID_SCDLG_PIVOT_LAYOUT:BTN_MORE"; Pos = MAP_APPFONT ( 280 , 170 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -185,6 +188,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; Edit ED_INAREA { + HelpID = "sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_INAREA"; Border = TRUE ; Pos = MAP_APPFONT ( 73 , 201 ) ; Size = MAP_APPFONT ( 100 , 12 ) ; @@ -193,6 +197,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; ImageButton RB_INAREA { + HelpID = "sc:ImageButton:RID_SCDLG_PIVOT_LAYOUT:RB_INAREA"; Pos = MAP_APPFONT ( 177 , 200 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = TRUE ; @@ -209,6 +214,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; ListBox LB_OUTAREA { + HelpID = "sc:ListBox:RID_SCDLG_PIVOT_LAYOUT:LB_OUTAREA"; Border = TRUE ; Pos = MAP_APPFONT ( 73 , 219 ) ; Size = MAP_APPFONT ( 75 , 90 ) ; @@ -218,6 +224,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; Edit ED_OUTAREA { + HelpID = "sc:Edit:RID_SCDLG_PIVOT_LAYOUT:ED_OUTAREA"; Border = TRUE ; Pos = MAP_APPFONT ( 152 , 219 ) ; Size = MAP_APPFONT ( 100 , 12 ) ; @@ -226,6 +233,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; ImageButton RB_OUTAREA { + HelpID = "sc:ImageButton:RID_SCDLG_PIVOT_LAYOUT:RB_OUTAREA"; Pos = MAP_APPFONT ( 256 , 218 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; TabStop = TRUE ; @@ -234,6 +242,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; CheckBox BTN_IGNEMPTYROWS { + HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_IGNEMPTYROWS"; Pos = MAP_APPFONT ( 12 , 237 ) ; Size = MAP_APPFONT ( 124 , 10 ) ; TabStop = TRUE ; @@ -242,6 +251,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; CheckBox BTN_DETECTCAT { + HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_DETECTCAT"; Pos = MAP_APPFONT ( 142 , 237 ) ; Size = MAP_APPFONT ( 124 , 10 ) ; TabStop = TRUE ; @@ -250,6 +260,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; CheckBox BTN_TOTALCOL { + HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALCOL"; Pos = MAP_APPFONT ( 12 , 251 ) ; Size = MAP_APPFONT ( 124 , 10 ) ; TabStop = TRUE ; @@ -258,6 +269,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; CheckBox BTN_TOTALROW { + HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_TOTALROW"; Pos = MAP_APPFONT ( 142 , 251 ) ; Size = MAP_APPFONT ( 124 , 10 ) ; TabStop = TRUE ; @@ -266,6 +278,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; CheckBox BTN_FILTER { + HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_FILTER"; Pos = MAP_APPFONT ( 12 , 265 ) ; Size = MAP_APPFONT ( 124 , 10 ) ; TabStop = TRUE ; @@ -274,6 +287,7 @@ ModelessDialog RID_SCDLG_PIVOT_LAYOUT }; CheckBox BTN_DRILLDOWN { + HelpID = "sc:CheckBox:RID_SCDLG_PIVOT_LAYOUT:BTN_DRILLDOWN"; Pos = MAP_APPFONT ( 142 , 265 ) ; Size = MAP_APPFONT ( 124 , 10 ) ; TabStop = TRUE ; diff --git a/sc/source/ui/dbgui/pvfundlg.src b/sc/source/ui/dbgui/pvfundlg.src index ed00f6a65fa5..d5203f2a89ac 100644 --- a/sc/source/ui/dbgui/pvfundlg.src +++ b/sc/source/ui/dbgui/pvfundlg.src @@ -64,6 +64,7 @@ ModalDialog RID_SCDLG_DPDATAFIELD }; MultiListBox LB_FUNC { + HelpID = "sc:MultiListBox:RID_SCDLG_DPDATAFIELD:LB_FUNC"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 140 , 65 ) ; @@ -96,6 +97,7 @@ ModalDialog RID_SCDLG_DPDATAFIELD }; ListBox LB_TYPE { + HelpID = "sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_TYPE"; Pos = MAP_APPFONT( 75, 110 ); Size = MAP_APPFONT( 77, 120 ); TabStop = TRUE; @@ -122,6 +124,7 @@ ModalDialog RID_SCDLG_DPDATAFIELD }; ListBox LB_BASEFIELD { + HelpID = "sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_BASEFIELD"; Pos = MAP_APPFONT( 75, 126 ); Size = MAP_APPFONT( 77, 120 ); TabStop = TRUE; @@ -136,6 +139,7 @@ ModalDialog RID_SCDLG_DPDATAFIELD }; ListBox LB_BASEITEM { + HelpID = "sc:ListBox:RID_SCDLG_DPDATAFIELD:LB_BASEITEM"; Pos = MAP_APPFONT( 75, 142 ); Size = MAP_APPFONT( 77, 120 ); TabStop = TRUE; @@ -168,6 +172,7 @@ ModalDialog RID_SCDLG_DPDATAFIELD }; MoreButton BTN_MORE { + HelpID = "sc:MoreButton:RID_SCDLG_DPDATAFIELD:BTN_MORE"; Pos = MAP_APPFONT ( 164 , 79 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -191,6 +196,7 @@ ModalDialog RID_SCDLG_PIVOTSUBT Hide = TRUE ; RadioButton RB_NONE { + HelpID = "sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_NONE"; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 140 , 10 ) ; Text [ en-US ] = "~None" ; @@ -198,6 +204,7 @@ ModalDialog RID_SCDLG_PIVOTSUBT }; RadioButton RB_AUTO { + HelpID = "sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_AUTO"; Pos = MAP_APPFONT ( 12 , 28 ) ; Size = MAP_APPFONT ( 140 , 10 ) ; Text [ en-US ] = "~Automatic" ; @@ -205,6 +212,7 @@ ModalDialog RID_SCDLG_PIVOTSUBT }; RadioButton RB_USER { + HelpID = "sc:RadioButton:RID_SCDLG_PIVOTSUBT:RB_USER"; Pos = MAP_APPFONT ( 12 , 42 ) ; Size = MAP_APPFONT ( 140 , 10 ) ; Text [ en-US ] = "~User-defined" ; @@ -212,6 +220,7 @@ ModalDialog RID_SCDLG_PIVOTSUBT }; MultiListBox LB_FUNC { + HelpID = "sc:MultiListBox:RID_SCDLG_PIVOTSUBT:LB_FUNC"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 56 ) ; Size = MAP_APPFONT ( 140 , 65 ) ; @@ -227,6 +236,7 @@ ModalDialog RID_SCDLG_PIVOTSUBT }; CheckBox CB_SHOWALL { + HelpID = "sc:CheckBox:RID_SCDLG_PIVOTSUBT:CB_SHOWALL"; Pos = MAP_APPFONT ( 6 , 127 ) ; Size = MAP_APPFONT ( 152 , 10 ) ; Text [ en-US ] = "Show it~ems without data"; @@ -264,6 +274,7 @@ ModalDialog RID_SCDLG_PIVOTSUBT }; PushButton BTN_OPTIONS { + HelpID = "sc:PushButton:RID_SCDLG_PIVOTSUBT:BTN_OPTIONS"; Pos = MAP_APPFONT ( 164 , 135 ) ; Size = MAP_APPFONT ( 50 , 14 ) ; TabStop = TRUE ; @@ -290,6 +301,7 @@ ModalDialog RID_SCDLG_DPSUBTOTAL_OPT }; ListBox LB_SORT_BY { + HelpID = "sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SORT_BY"; Pos = MAP_APPFONT( 12, 26 ); Size = MAP_APPFONT( 96, 120 ); TabStop = TRUE; @@ -298,6 +310,7 @@ ModalDialog RID_SCDLG_DPSUBTOTAL_OPT }; RadioButton RB_SORT_ASC { + HelpID = "sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_ASC"; Pos = MAP_APPFONT( 114, 14 ); Size = MAP_APPFONT( 84, 10 ); TabStop = TRUE; @@ -305,6 +318,7 @@ ModalDialog RID_SCDLG_DPSUBTOTAL_OPT }; RadioButton RB_SORT_DESC { + HelpID = "sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_DESC"; Pos = MAP_APPFONT( 114, 28 ); Size = MAP_APPFONT( 84, 10 ); TabStop = TRUE; @@ -312,6 +326,7 @@ ModalDialog RID_SCDLG_DPSUBTOTAL_OPT }; RadioButton RB_SORT_MAN { + HelpID = "sc:RadioButton:RID_SCDLG_DPSUBTOTAL_OPT:RB_SORT_MAN"; Pos = MAP_APPFONT( 114, 42 ); Size = MAP_APPFONT( 84, 10 ); TabStop = TRUE; @@ -331,6 +346,7 @@ ModalDialog RID_SCDLG_DPSUBTOTAL_OPT }; ListBox LB_LAYOUT { + HelpID = "sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_LAYOUT"; Pos = MAP_APPFONT( 84, 67 ); Size = MAP_APPFONT( 114, 120 ); TabStop = TRUE; @@ -345,6 +361,7 @@ ModalDialog RID_SCDLG_DPSUBTOTAL_OPT }; CheckBox CB_LAYOUT_EMPTY { + HelpID = "sc:CheckBox:RID_SCDLG_DPSUBTOTAL_OPT:CB_LAYOUT_EMPTY"; Pos = MAP_APPFONT( 12, 85 ); Size = MAP_APPFONT( 186, 10 ); TabStop = TRUE; @@ -358,6 +375,7 @@ ModalDialog RID_SCDLG_DPSUBTOTAL_OPT }; CheckBox CB_SHOW { + HelpID = "sc:CheckBox:RID_SCDLG_DPSUBTOTAL_OPT:CB_SHOW"; Pos = MAP_APPFONT( 12, 112 ); Size = MAP_APPFONT( 70, 10 ); TabStop = TRUE; @@ -365,6 +383,7 @@ ModalDialog RID_SCDLG_DPSUBTOTAL_OPT }; NumericField NF_SHOW { + HelpID = "sc:NumericField:RID_SCDLG_DPSUBTOTAL_OPT:NF_SHOW"; Pos = MAP_APPFONT( 84, 110 ); Size = MAP_APPFONT( 30, 12 ); TabStop = TRUE; @@ -390,6 +409,7 @@ ModalDialog RID_SCDLG_DPSUBTOTAL_OPT }; ListBox LB_SHOW_FROM { + HelpID = "sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SHOW_FROM"; Pos = MAP_APPFONT( 84, 126 ); Size = MAP_APPFONT( 114, 50 ); TabStop = TRUE; @@ -409,6 +429,7 @@ ModalDialog RID_SCDLG_DPSUBTOTAL_OPT }; ListBox LB_SHOW_USING { + HelpID = "sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_SHOW_USING"; Pos = MAP_APPFONT( 84, 142 ); Size = MAP_APPFONT( 114, 120 ); TabStop = TRUE; @@ -436,6 +457,7 @@ ModalDialog RID_SCDLG_DPSUBTOTAL_OPT }; ListBox LB_HIERARCHY { + HelpID = "sc:ListBox:RID_SCDLG_DPSUBTOTAL_OPT:LB_HIERARCHY"; Pos = MAP_APPFONT( 84, 222 ); Size = MAP_APPFONT( 114, 120 ); TabStop = TRUE; @@ -483,6 +505,7 @@ ModalDialog RID_SCDLG_DPSHOWDETAIL }; ListBox LB_DIMS { + HelpID = "sc:ListBox:RID_SCDLG_DPSHOWDETAIL:LB_DIMS"; Pos = MAP_APPFONT( 6, 30 ); Size = MAP_APPFONT( 132, 80 ); TabStop = TRUE; diff --git a/sc/source/ui/dbgui/scendlg.src b/sc/source/ui/dbgui/scendlg.src index 40cfeb01b8ff..f7c3d29b8365 100644 --- a/sc/source/ui/dbgui/scendlg.src +++ b/sc/source/ui/dbgui/scendlg.src @@ -29,6 +29,7 @@ #include "scendlg.hrc" ModalDialog RID_SCDLG_NEWSCENARIO { + HelpID = "sc:ModalDialog:RID_SCDLG_NEWSCENARIO"; OutputSize = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 165 ) ; @@ -55,6 +56,7 @@ ModalDialog RID_SCDLG_NEWSCENARIO }; MultiLineEdit ED_COMMENT { + HelpID = "sc:MultiLineEdit:RID_SCDLG_NEWSCENARIO:ED_COMMENT"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 43 ) ; Size = MAP_APPFONT ( 183 , 46 ) ; @@ -65,6 +67,7 @@ ModalDialog RID_SCDLG_NEWSCENARIO }; Edit ED_NAME { + HelpID = "sc:Edit:RID_SCDLG_NEWSCENARIO:ED_NAME"; Border = TRUE ; Pos = MAP_APPFONT ( 12 , 14 ) ; Size = MAP_APPFONT ( 183 , 12 ) ; @@ -72,12 +75,14 @@ ModalDialog RID_SCDLG_NEWSCENARIO }; CheckBox CB_SHOWFRAME { + HelpID = "sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_SHOWFRAME"; Pos = MAP_APPFONT ( 12 , 107 ) ; Size = MAP_APPFONT ( 109 , 10 ) ; Text [ en-US ] = "~Display border"; }; ListBox LB_COLOR { + HelpID = "sc:ListBox:RID_SCDLG_NEWSCENARIO:LB_COLOR"; Border = TRUE ; Pos = MAP_APPFONT ( 125 , 105 ) ; Size = MAP_APPFONT ( 70 , 86 ) ; @@ -86,6 +91,7 @@ ModalDialog RID_SCDLG_NEWSCENARIO }; CheckBox CB_PRINTFRAME { + HelpID = "sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_PRINTFRAME"; Hide = TRUE ; Pos = MAP_APPFONT ( 121 , 243 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; @@ -93,6 +99,7 @@ ModalDialog RID_SCDLG_NEWSCENARIO }; CheckBox CB_TWOWAY { + HelpID = "sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_TWOWAY"; Pos = MAP_APPFONT ( 12 , 121 ) ; Size = MAP_APPFONT ( 183 , 10 ) ; /* ### ACHTUNG: Neuer Text in Resource? Zurückkopieren : Zur³ckkopieren */ @@ -100,6 +107,7 @@ ModalDialog RID_SCDLG_NEWSCENARIO }; CheckBox CB_ATTRIB { + HelpID = "sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_ATTRIB"; Hide = TRUE ; Pos = MAP_APPFONT ( 20 , 243 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; @@ -107,6 +115,7 @@ ModalDialog RID_SCDLG_NEWSCENARIO }; CheckBox CB_VALUE { + HelpID = "sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_VALUE"; Hide = TRUE ; Pos = MAP_APPFONT ( 230 , 243 ) ; Size = MAP_APPFONT ( 83 , 10 ) ; @@ -114,12 +123,14 @@ ModalDialog RID_SCDLG_NEWSCENARIO }; CheckBox CB_COPYALL { + HelpID = "sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_COPYALL"; Pos = MAP_APPFONT ( 12 , 135 ) ; Size = MAP_APPFONT ( 183 , 10 ) ; Text [ en-US ] = "Copy ~entire sheet" ; }; CheckBox CB_PROTECT { + HelpID = "sc:CheckBox:RID_SCDLG_NEWSCENARIO:CB_PROTECT"; Pos = MAP_APPFONT ( 12 , 149 ) ; Size = MAP_APPFONT ( 183 , 10 ) ; Text [ en-US ] = "~Prevent changes" ; diff --git a/sc/source/ui/dbgui/textimportoptions.src b/sc/source/ui/dbgui/textimportoptions.src index 69e2d69b3142..7305986b3bec 100644 --- a/sc/source/ui/dbgui/textimportoptions.src +++ b/sc/source/ui/dbgui/textimportoptions.src @@ -32,6 +32,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS { + HelpID = "sc:ModalDialog:RID_SCDLG_TEXT_IMPORT_OPTIONS"; Text [ en-US ] = "Import Options" ; Size = MAP_APPFONT ( 230 , 101 ) ; Moveable = TRUE ; @@ -67,6 +68,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS RadioButton RB_AUTOMATIC { + HelpID = "sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_AUTOMATIC"; Pos = MAP_APPFONT( 12, 20 ) ; Size = MAP_APPFONT( 159, 10 ) ; TabStop = TRUE ; @@ -76,6 +78,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS RadioButton RB_CUSTOM { + HelpID = "sc:RadioButton:RID_SCDLG_TEXT_IMPORT_OPTIONS:RB_CUSTOM"; Pos = MAP_APPFONT( 12, 34 ) ; Size = MAP_APPFONT( 159, 10 ) ; TabStop = TRUE ; @@ -85,6 +88,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS ListBox LB_CUSTOM_LANG { + HelpID = "sc:ListBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:LB_CUSTOM_LANG"; Pos = MAP_APPFONT( 20, 50 ) ; Size = MAP_APPFONT( 140, 120 ) ; TabStop = TRUE ; @@ -101,6 +105,7 @@ ModalDialog RID_SCDLG_TEXT_IMPORT_OPTIONS CheckBox BTN_CONVERT_DATE { + HelpID = "sc:CheckBox:RID_SCDLG_TEXT_IMPORT_OPTIONS:BTN_CONVERT_DATE"; Pos = MAP_APPFONT( 12, 86 ); Size = MAP_APPFONT( 159, 10 ); TabStop = TRUE ; diff --git a/sc/source/ui/dbgui/validate.src b/sc/source/ui/dbgui/validate.src index c861fbc200cb..9f4b27fb9967 100644 --- a/sc/source/ui/dbgui/validate.src +++ b/sc/source/ui/dbgui/validate.src @@ -67,6 +67,7 @@ TabDialog TAB_DLG_VALIDATION //-->Added by PengYunQuan for Validity Cell Range Picker TabPage TP_VALIDATION_VALUES { + HelpID = "sc:TabPage:TP_VALIDATION_VALUES"; Hide = TRUE ; SVLook = TRUE ; Size = MAP_APPFONT ( 260 , 185 ) ; @@ -82,6 +83,7 @@ TabPage TP_VALIDATION_VALUES }; ListBox LB_ALLOW { + HelpID = "sc:ListBox:TP_VALIDATION_VALUES:LB_ALLOW"; Border = TRUE ; // base - - if( base == NULL || suffix == NULL ) - return; - if( strlen(suffix) == 0 ) - return; - if( (strlen(suffix)+1) > strlen(base) ) - return; - char * pos=strstr( base, suffix); - if( pos && (pos-1 >= base) && ( *(pos-1) == '.') ) - if( *(pos+strlen(suffix)) == '\0' ) //only if at end of base - *(pos-1)= '\0'; - return; -} - -int level = 0; -char levelbuffer[512]; - -void adjust_levelbuffer() -{ - int i; - for(i=0; i(ptr)), ptr = NULL; -} - -void makestring(char** newstr, char* oldstr) -{ - alloc_cnt++; - adjust_levelbuffer(); - if ( bVerbose ) - fprintf(stdout,"%sinfo: makestring on line %d\n",levelbuffer,__LINE__); - strcpy( (*newstr=(char*)malloc(strlen(oldstr)+1)), oldstr); - if( *newstr==NULL ) { - fprintf( stderr, - "error: cannot malloc for makestring() alloc_cnt==%d \n", alloc_cnt); - exit(1); - } -} - -#ifndef WNT -int strcmpi(char const * stra, char const * strb) -{ - // like strcmp() but case insensitive - size_t i; - char a,b; - for(i=0; ;i++){ - a = (char) tolower(stra[i]); - b = (char) tolower(strb[i]); - if( a < b ) - return -1; - if( a > b ) - return 1; - if( a == '\0' && b == '\0' ) - return 0; - } -} -#endif - -/* variables for listfile ( with project + pathname of src file ) */ -char* listfilename; -#define MAXSRCFILES 2048 -char* filename_tab[MAXSRCFILES]; -char* project_tab[MAXSRCFILES]; -int tab_entries = 0; -//int fileno = 0; /* currently used filenumber */ - -/* globale variablen */ -FILE* outfile; -char const *filename = ""; //incl. path -//char *basename = ""; -char const *project = ""; -char const *subpath = ""; //from project name downwards like source\ui\xxx.src - -int firstprint = 1; - -int in_define = 0; - -class ident_ring -{ - #define MAXRING 2 - //nicht aendern wg externer Abfrage ->size() == 2 - - char* ring[MAXRING]; - int ringpos; - int last; - int broken; -public: - ident_ring() { - last = ringpos = -1; - for(int i=0; i' -#define TOK_OPENPAREN '(' -#define TOK_CLOSEPAREN ')' -#define TOK_PLUS '+' -#define TOK_MINUS '-' -#define TOK_STAR '*' -#define TOK_SLASH '/' -// -#define TOK_POSorSIZE 146 -#define TOK_POSSIZE 147 -#define TOK_TEXTTAG 148 -#define TOK_IDNUM 149 -// -#define TOK_EXTRADATA 151 -#define TOK_TEXT 152 -#define TOK_MESSAGE 153 -#define TOK_HELPTEXT 154 -#define TOK_TRUE 155 -#define TOK_FALSE 156 -// -#define TOK_RESID 180 -// -#define TOK_STRING 190 -// -#define TOK_INVALID (-1) - -token lasttoken = TOK_INVALID; - - - - -#define UNDEF (-1) - -char *globalID = const_cast< char * >(""); -char const *globalKLASSE = NULL; - -void reset_globalID() { - // - if( globalID && (strlen(globalID) > 0 ) ) { - freestring( globalID ); - globalID = const_cast< char * >(""); - } -} - - -//-------------------------------------------------------------------- -class resource -{ -private: - resource ( const resource& ); //copy-ctor soll keiner benutzen - void operator=( const resource& ); // zuweisung auch nicht -public: - resource(); - ~resource(); -public: - int lineno; - token lasttoken; //before opening { - char const *klasse ; - char *localID; - char *helpID; - int residfound; -}; - -resource *ares ; /* aktuell bearbeitete resource */ - -resource::~resource() -{ - if( klasse != NULL ) freestring(klasse); - if( localID != NULL ) freestring(localID); - if( helpID != NULL ) freestring(helpID); - -} - -resource::resource() -{ - lineno = UNDEF; - lasttoken= TOK_INVALID; - klasse = NULL ; - localID = NULL ; - helpID = NULL ; - residfound= 0; -} - -int residfound = 0; // "Identifier = " auf momentanem level gefunden - -#define MAXSTACK 32 -resource* stack[MAXSTACK]; /* resource stack */ -#define EMPTYSTACK (-1) -int stackptr = EMPTYSTACK; - -void push_resource( resource* r ) -{ - stackptr++; - if( stackptr >= MAXSTACK ) { - fprintf( stderr, "error: resource stack is full %d \n", stackptr); - exit(1); - } - stack[ stackptr ] = r; -} - -resource* pop_resource() -{ - if( stackptr < 0 ) { - fprintf( stderr, "error: pop resource from empty stack \n"); - exit(1); - } - return stack[ stackptr-- ]; -} - -/* forward */ -int eat_comment(); -int eat_cpp_comment(); - -/*===================================================*/ -// -// '+' im identifier wg basic\source\classes\sb.src -// -// '<' im identifier wg sc subtdlg.src -// -// '&' im identifier wg scerror.src so2..nocode.src svxerr.src scwarngs.src - - -//string (\"[^"]*\") alter einfacher string ohne " - -%} - -/* 89012 */ -%option never-interactive - - -simple ([^\n\"]*) -%p 7000 -string \"{simple}((((\\\\)*(\\\"))?){simple})*\" - -%x MACRO_STATE - -%x EXCLUDE_STATE -resfilelist ([Ff][Ii][Ll][Ee][Ll][Ii][Ss][Tt]) -resstringlist ([Ss][Tt][Rr][Ii][Nn][Gg][Ll][Ii][Ss][Tt]) -resstring ([Ss][Tt][Rr][Ii][Nn][Gg]) - -identifier ([a-z_A-Z]+[a-z_A-Z<+&0-9]*) -number (([0-9]+)|(0x[0-9a-fA-F]+)) -residentifier ([Ii][Dd][Ee][Nn][Tt][Ii][Ff][Ii][Ee][Rr]) -w ([ \t\n]*) -wspecial ([\\ \t\n]*) -texttag (([Tt][Ii][Tt][Ll][Ee])|([Tt][Ee][Xx][Tt])|([Mm][Ee][Ss][Ss][Aa][Gg][Ee])) -qhelptag (([Qq][Uu][Ii][Cc][Kk])?([Hh][Ee][Ll][Pp][Tt][Ee][Xx][Tt])) -langtag ([a-zA-Z_]+) -helptag ([Hh][Ee][Ll][Pp][Ii][Dd]) -helpid ([a-zA-Z_0-9]+) -num2tag (([Pp][Oo][Ss])|([Ss][Ii][Zz][Ee])) -num4tag (([Pp][Oo][Ss][Ss][Ii][Zz][Ee])) - -%% -[ \t] { - /* forget whitespace */; - } - -^[ \t]*#include.*\.src[">].* { - char NewFile[255]; //long names??? - int i, j, GetIt; - - GetIt = 0; - j = 0; - nInputFileDepth++; -// nicht schoen aber geht... - for (i = 0; yytext[i+1] != 0; i++) - { - if ( GetIt == 1 ) - { - if ( yytext[i] == '"' || yytext[i] == '>' ) - GetIt = 0; - else - NewFile[j++] = yytext[i]; - } - if ( yytext[i] == '"' || yytext[i] == '<' ) - GetIt = 1; - } - NewFile[j] = '\0'; - FILE* pFile = NULL; - pFile = fopen( NewFile, "r" ); - if( pFile == NULL ) { - fprintf( stdout, "warning: could not open inputfile %s \n", NewFile ); - // try the new *_tmpl.src version instead - // this hack was introduced to allow localisation of included src files - const char* sStrTmpl = "_tmpl"; - j -= 4; - for ( i = 0 ; i <5 ; i++,j++ ) - { - NewFile[j+5] = NewFile[j]; - NewFile[j] = sStrTmpl[i]; - } - NewFile[j+4] = '\0'; - fprintf( stderr, "trying inputfile %s \n", NewFile ); - pFile = fopen( NewFile, "r" ); - if( pFile == NULL ) { - fprintf( stderr, "error: could not open inputfile %s \n", NewFile ); - exit(1); - } - } - InputFiles[ nInputFileDepth ] = yy_create_buffer( pFile, YY_BUF_SIZE ); - yy_switch_to_buffer( InputFiles[ nInputFileDepth ] ); - - if ( bVerbose ) - fprintf( stdout, "%s //ATTENTION!! %s gets included here\n", yytext, NewFile ); - fprintf( outfile, "// %s //ATTENTION!! %s gets included here\n\n", yytext, NewFile ); - } - -^[ \t]*#include.* { - fprintf( outfile, "%s\n\n", yytext ); - } - -^[ \t]*#(if|ifdef|ifndef|elif).* { - ; - } - -^[ \t]*#else { - ; - } -^[ \t]*#endif { - ; - } - -^[ \t]*#(undef|error|pragma).* { - ; - } - -^[ \t]*#define { - fprintf( outfile, "%s", yytext ); - BEGIN MACRO_STATE; - } - -"/*" { - eat_comment(); - } - -"//" { - eat_cpp_comment(); - } - -\n { - fprintf( outfile, "%s\n", yytext ); - BEGIN INITIAL; - } - -\\\n { - fprintf( outfile, "\\\n" ); - ;/* macro schadet nicht, koennte gebraucht werden */ - } - - -. { - fprintf( outfile, "%s", yytext ); - ;/* ignore all this unused input */ - } - -";" {ring->set_zero(); lasttoken = TOK_SEMICOLON; } -"=" {ring->set_zero(); lasttoken = TOK_EQUAL; } -"[" {ring->set_broken(); lasttoken = TOK_OPENBRACKET; } -"]" {ring->set_broken(); lasttoken = TOK_CLOSEBRACKET; } - - -"{" { - exclude_bracelevel += 1; - if ( bVerbose ) - fprintf( stdout,"info: lev %d : found {\n", exclude_bracelevel ); - } - - -\\\n | -"{" { - // define continues - // or a brace opens a block - - if( in_define && !strcmp(yytext,"\\\n") ) { - - if( in_define++ == 1 ) - ;// keep on working - else - goto blockend; - } - - level++; - if( ares != NULL ){ - if( level > 1 ) - dotappend( globalID, ares->localID ); - ares->residfound = residfound; - push_resource( ares ); - } - ares = new resource; - - residfound = 0; - ares->residfound = 0; - - ares->lineno = yylineno; - ares->lasttoken = lasttoken; - if( ring->size() == 2 ) { - ares->klasse = ring->extract_last(); - ares->localID = ring->extract_actual(); - } else if(ring->size() == 1) { - ares->klasse = ring->extract_actual(); - } - if( level==1 ){ //Ausnahme: Resource auf Ebene 1 - globalID= ares->localID; - ares->localID = NULL; - globalKLASSE= ares->klasse; - } - - if ( bVerbose ) - fprintf(stdout,"info: { level: %d\n", level); - - lasttoken = TOK_OPENBRACE; - ring->set_zero(); - } - -"}" { - //----------------------------- - exclude_bracelevel -= 1; - if ( bVerbose ) - fprintf( stdout,"info: lev %d : found }\n", exclude_bracelevel ); - if( exclude_bracelevel==1 ) { - BEGIN INITIAL; - exclude_bracelevel=0; - } - } - - -\n | -"}" { - if ( bVerbose ) - fprintf(stdout,"info: } level: %d\n",level); - - if( !strcmp(yytext,"}") ) - ; - else if( in_define && (!strcmp(yytext,"\n") )) { - if( in_define==1 ) { - //no continuation line for #define - in_define=0; - goto blockend; - } - else { - //there was a continuation line for #define - in_define=0; - } - } - else - goto blockend; - - // ares ausgeben - if( ares != NULL ) { - - #define LEER "leer" - char const * globklasse = - globalKLASSE==NULL ? LEER:globalKLASSE; - char const * local = - ares->localID==NULL ? LEER:ares->localID; - char const * klasse = - ares->klasse==NULL ? LEER:ares->klasse; - char const * glob = - globalID==NULL ? LEER:globalID; - - - //wg. Starview-Klasse String in ehdl.c und doc.c - // wenn generierte C++-Quellen compiliert werden - // - //if( !strcmp(globklasse,"String" )) globklasse = "string"; - //if( !strcmp(klasse,"String" )) klasse = "string"; - - - //--------------------------------------------------- - // generate the body of a new C main program, - // which is filled with printf statements - // to compute (via preproseccor & compiler) - // the codenumbers for resource names like menu$RID_SVX$xyz - - if( firstprint ) { - firstprint=0; - fprintf(outfile, "#include \"starview.hid\" \n\n"); - fprintf(outfile, " int main() { \n\n\n"); - } - - char globunder[256]; - strcpy(globunder,glob); - dot2underline( globunder ); - char const * globsuffix = strrchr(glob,'.'); - globsuffix = globsuffix==NULL ? glob:globsuffix+1; - - if( ares->helpID ) { - fprintf( outfile,"\n\t printf(\"%s \\t %cs %cs \\n\",\n", - ares->helpID,'%','%'); - fprintf(outfile,"\t\"HelpID\", (%s) ); \n", ares->helpID); - } - else if( ares->localID ) { - fprintf( outfile,"\n\t printf(\"%s:%s:%s:%s \\t %cs %cu %cs %cu \\n\",\n", - project,klasse,globunder,local,'%','%','%','%'); - fprintf( outfile,"\t\"Norm %s\", (%s), \"%s\", (%s) );\n", - globklasse,globsuffix, klasse,local); - } - else if( (strcmpi("MenuItem",klasse)==0) || - (strcmpi("ToolBoxItem",klasse)==0) ) { - ; //no output (99% is a separator) - } - else { - fprintf( outfile,"\n\t printf(\"%s:%s:%s \\t %cs %cu %cs \\n\",\n", - project,klasse,globunder,'%','%','%'); - fprintf( outfile,"\t\"Norm %s\", (%s), \"%s\" );\n", - globklasse,globsuffix, klasse); - } - - delete ares; - } - - - // ein level zurueck - if( level == 1) { - reset_globalID(); - globalKLASSE = NULL; - } - level--; - ares = pop_resource(); - residfound = ares->residfound; - dotsubtract( globalID, ares->localID ); - - - // - lasttoken = TOK_CLOSEBRACE; - ring->set_zero(); - blockend: ; - } - -"," {ring->set_broken(); lasttoken = TOK_KOMMA; } - -"<" {ring->set_broken(); lasttoken = TOK_LESS; } -">" {ring->set_broken(); lasttoken = TOK_GREATER; } - -"(" {ring->set_broken(); lasttoken = TOK_OPENPAREN; } -")" {ring->set_broken(); lasttoken = TOK_CLOSEPAREN; } -"+" {ring->set_broken(); lasttoken = TOK_PLUS; } -"-" {ring->set_broken(); lasttoken = TOK_MINUS; } -"*" {ring->set_broken(); lasttoken = TOK_STAR; } -"/" {ring->set_broken(); lasttoken = TOK_SLASH; } - - -{helptag}{w}"="{w}{helpid}{w}";" { - - // extract text for helpid and put to ares - char* pos = strchr(yytext,'='); - size_t offset = strspn(pos+1," \t\n"); - char* start = pos+1+offset; - size_t offset2= strcspn( start, "; \t\n"); - char* end = start+offset2; - *end = '\0'; - char *helpid; - makestring( &helpid, start ); - ares->helpID = helpid; - } - -{residentifier}{w}"="[ \t\n]*({identifier}|{number}) { - ring->set_zero(); - lasttoken = TOK_RESID; - residfound=1; - - //extract resource id and store as localID - char *after = strrchr(yytext,'='); - char *resid = after + strspn(after,"= \t\n"); - char *localID; - makestring( &localID, resid ); - ares->localID = localID; - } - -{resfilelist} | -{resstring} | -{resstringlist} { - BEGIN EXCLUDE_STATE; - exclude_bracelevel = 1; - if ( bVerbose ) - fprintf( stdout,"info: lev %d : found exclusion\n", exclude_bracelevel ); - } - -^[ \t]*#define | -{number} | -{identifier} { - /* identifier/number in einem ring ablegen */ - char *identifier; - char *def=strstr(yytext,"#define"); - if( def ) { - in_define = 1; - makestring( &identifier, def+1 ); - } - else - makestring( &identifier, yytext ); - ring->set( identifier ); - lasttoken = TOK_IDNUM; - - } -{string} { - ring->set_broken(); - lasttoken = TOK_STRING; - if ( bVerbose ) - fprintf(stdout, "%6s %11s %8d %s \n",project,filename,yylineno, yytext); - } - - -. { if ( bVerbose ) fprintf( stdout,"warning: unused input on line %d of %s \n%s\n", - yylineno, filename, yytext); - } - -\n { - ; //do nothing, ignore - } - - -%% - - -void makeversion( char* version ) -{ - char const *pos = strpbrk( Revision, "0123456789." ); - size_t siz = strspn( pos, "0123456789." ); - if( pos && siz ) { - strncpy(version, pos, siz); - strcat( version, " "); - } - else - strcpy( version," unknown " ); -} - -int main( int argc, char* argv[] ) -{ - static char const *Compiler = "HID-Compiler "; - static char const *Author = "OG "; - static char HIDCompiler[100]; - static char Version[100]; - - // check for switches given on the command line - if ( ( argc > 0 ) && ( 0 == strcmp( argv[0], "-verbose" ) ) ) - { - bVerbose = true; - for ( size_t i=0; i -# for a copy of the LGPLv3 License. -# -#************************************************************************* - -PRJ=.. - -PRJNAME=soltools -TARGET=hidc -TARGETTYPE=CUI -LIBTARGET=no -NO_DEFAULT_STL=TRUE -INCPRE=$(MISC) - -# --- Settings ----------------------------------------------------- - -.INCLUDE : $(PRJ)$/util$/makefile.pmk -.INCLUDE : settings.mk -.INCLUDE : libs.mk -CDEFS+= -DYY_NEVER_INTERACTIVE=1 - -UWINAPILIB=$(0) - -# --- Files -------------------------------------------------------- - -# HID compiler -APP1TARGET= $(TARGET) -APP1OBJS= $(OBJ)$/wrap_hidclex.obj -APP1DEPN= $(OBJ)$/wrap_hidclex.obj -APP1LIBSALCPPRT= - -DEPOBJFILES=$(APP1OBJS) - -# --- Targets ------------------------------------------------------ - -.INCLUDE : target.mk - -$(MISC)$/%_yy.cxx : %lex.l - flex -l -8 -o$@ $< - -$(OBJ)$/wrap_hidclex.obj: $(MISC)$/hidc_yy.cxx diff --git a/soltools/HIDCompiler/wrap_hidclex.cxx b/soltools/HIDCompiler/wrap_hidclex.cxx deleted file mode 100644 index 1eb79e80a5da..000000000000 --- a/soltools/HIDCompiler/wrap_hidclex.cxx +++ /dev/null @@ -1,31 +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 - * - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_soltools.hxx" - -#include "hidc_yy.cxx" diff --git a/soltools/prj/build.lst b/soltools/prj/build.lst index 73611addf782..578723b0e09d 100644 --- a/soltools/prj/build.lst +++ b/soltools/prj/build.lst @@ -10,5 +10,4 @@ so soltools\javadep nmake - all so_jvdep so_mkdep so_adjvis.u NULL so soltools\support nmake - all so_supp so_mkdep so_adjvis.u NULL so soltools\giparser nmake - all so_gip so_supp so_adjvis.u NULL so soltools\adjustvisibility nmake - u so_adjvis so_mkdep NULL -so soltools\HIDCompiler nmake - all so_hidc so_mkdep so_adjvis.u so_wunistd.n NULL so soltools\testhxx nmake - all so_testhxx so_mkdep NULL diff --git a/soltools/prj/d.lst b/soltools/prj/d.lst index ee3ae5e2f907..970805f5d60c 100644 --- a/soltools/prj/d.lst +++ b/soltools/prj/d.lst @@ -8,6 +8,4 @@ ..\%__SRC%\bin\cpp.exe %_DEST%\bin%_EXT%\cpplcc.exe ..\%__SRC%\bin\cpp %_DEST%\bin%_EXT%\cpp.lcc ..\%__SRC%\inc\unistd.h %_DEST%\inc%_EXT%\unistd.h -..\%__SRC%\bin\hidc.exe %_DEST%\bin%_EXT%\hidc.exe -..\%__SRC%\bin\hidc %_DEST%\bin%_EXT%\hidc ..\%__SRC%\bin\testhxx* %_DEST%\bin%_EXT%\testhxx* -- cgit From 208f94977e78bef698f46faf1c42b479cd1fca6a Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 22 Oct 2010 10:43:28 +0200 Subject: CWS changehid: some residues of hid.lst removed --- instsetoo_native/util/makefile.mk | 1 - scp2/source/testtool/file_testtool.scp | 7 ------- 2 files changed, 8 deletions(-) diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 19a6214f8dc6..fceadbfdca65 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -28,7 +28,6 @@ PRJ=.. PRJNAME=instsetoo_native TARGET=util -GEN_HID2=TRUE .INCLUDE: settings.mk .INCLUDE: $(SOLARINCDIR)$/rtlbootstrap.mk diff --git a/scp2/source/testtool/file_testtool.scp b/scp2/source/testtool/file_testtool.scp index 86faf16faefc..3b30c157fa36 100644 --- a/scp2/source/testtool/file_testtool.scp +++ b/scp2/source/testtool/file_testtool.scp @@ -46,13 +46,6 @@ File gid_File_Bin_Testtool Name = "testtool.bin"; End -File gid_File_Hid_Testtool - BIN_FILE_BODY; - Dir = gid_Dir_Program; - Styles = (PACKED); - Name = "hid.lst"; -End - File gid_File_Config_Testtool BIN_FILE_BODY; Dir = gid_Dir_Program; -- cgit From 8409cfd0c4842fae1e087f8c932748f9305871a8 Mon Sep 17 00:00:00 2001 From: Mathias Bauer Date: Fri, 22 Oct 2010 10:48:39 +0200 Subject: CWS changehid: #i113152#: arguments shall be checked only for plugins --- sw/source/ui/shells/textsh.cxx | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sw/source/ui/shells/textsh.cxx b/sw/source/ui/shells/textsh.cxx index 2e39e1ebd6d4..52b60c66d178 100644 --- a/sw/source/ui/shells/textsh.cxx +++ b/sw/source/ui/shells/textsh.cxx @@ -292,17 +292,13 @@ void SwTextShell::ExecInsert(SfxRequest &rReq) pName = &aName; } - SFX_REQUEST_ARG( rReq, pClassItem, SfxStringItem, FN_PARAM_1, sal_False ); SFX_REQUEST_ARG( rReq, pClassLocationItem, SfxStringItem, FN_PARAM_2, sal_False ); SFX_REQUEST_ARG( rReq, pCommandsItem, SfxStringItem, FN_PARAM_3, sal_False ); //TODO/LATER: recording currently not working, need code for Commandlist svt::EmbeddedObjectRef xObj; - if( pClassItem || pClassLocationItem || pCommandsItem ) + if( nSlot == SID_INSERT_PLUGIN && ( pClassLocationItem || pCommandsItem ) ) { - String sClass; String sClassLocation; - if(pClassItem) - sClass = pClassItem->GetValue(); if(pClassLocationItem) sClassLocation = pClassLocationItem->GetValue(); -- cgit From c49e6e217ac08a7a5b7620ed56b2ece63496fc35 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Fri, 22 Oct 2010 11:17:15 +0200 Subject: automationdev300m87: #i115106 - excluded tests due to #i115138 --- .../optional/includes/global/export_graphic_2.inc | 29 ++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/testautomation/graphics/optional/includes/global/export_graphic_2.inc b/testautomation/graphics/optional/includes/global/export_graphic_2.inc index 3beefb13dd64..1e9d6e04f631 100644 --- a/testautomation/graphics/optional/includes/global/export_graphic_2.inc +++ b/testautomation/graphics/optional/includes/global/export_graphic_2.inc @@ -32,6 +32,9 @@ '\****************************************************************************** testcase tPNG + warnlog( "#i115138 - Loading test document freezes the office" ) + goto endsub + dim x as integer dim i as integer dim iWaitIndex as integer @@ -73,6 +76,10 @@ endcase 'tPNG '------------------------------------------------------------------------------- testcase tSVM + warnlog( "#i115138 - Loading test document freezes the office" ) + goto endsub + + dim x as integer dim i as integer dim sFilter as string @@ -238,6 +245,10 @@ endcase 'tSVM '------------------------------------------------------------------------------- testcase tPDF + warnlog( "#i115138 - Loading test document freezes the office" ) + goto endsub + + dim sPath as string dim sTemp as string dim iFileSize(12) as long @@ -589,6 +600,9 @@ endcase 'tPDF_Creator '------------------------------------------------------------------------------- testcase tSVG + warnlog( "#i115138 - Loading test document freezes the office" ) + goto endsub + dim x as integer dim i as integer dim sFilter as string @@ -654,6 +668,9 @@ endcase 'tSVG '------------------------------------------------------------------------------- testcase tBMP + warnlog( "#i115138 - Loading test document freezes the office" ) + goto endsub + dim x as integer dim i as integer dim bTemp as boolean @@ -821,6 +838,9 @@ endcase 'tBMP '------------------------------------------------------------------------------- testcase tEMF + warnlog( "#i115138 - Loading test document freezes the office" ) + goto endsub + dim x as integer dim i as integer dim sFilter as string @@ -952,6 +972,9 @@ endcase 'tEMF '------------------------------------------------------------------------------- testcase tMET + warnlog( "#i115138 - Loading test document freezes the office" ) + goto endsub + dim x as integer dim i as integer dim iWaitIndex as integer @@ -1145,6 +1168,9 @@ endcase 'tMET '------------------------------------------------------------------------------- testcase tSWF + warnlog( "#i115138 - Loading test document freezes the office" ) + goto endsub + dim sFilter as string dim sExt as string dim x as integer @@ -1170,6 +1196,9 @@ endcase 'tSWF '------------------------------------------------------------------------------ testcase tWMF + warnlog( "#i115138 - Loading test document freezes the office" ) + goto endsub + dim x as integer dim i as integer dim iWaitIndex as integer -- cgit From da7df05c51249ed49bf25d539aab97aa7a1f2aef Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 25 Oct 2010 09:04:05 +0200 Subject: automationdev300m87: #i115106 - Incorrect count in colors, we lost four, chenged single line if-statements, reformatted according to coding guidelines. --- .../optional/includes/options_loadsave_general.inc | 103 +++++++-- .../optional/includes/options_ooo_colors.inc | 15 +- .../optional/includes/options_ooo_general.inc | 252 +++++++++++++-------- 3 files changed, 249 insertions(+), 121 deletions(-) mode change 100755 => 100644 testautomation/framework/optional/includes/options_loadsave_general.inc mode change 100755 => 100644 testautomation/framework/optional/includes/options_ooo_colors.inc mode change 100755 => 100644 testautomation/framework/optional/includes/options_ooo_general.inc diff --git a/testautomation/framework/optional/includes/options_loadsave_general.inc b/testautomation/framework/optional/includes/options_loadsave_general.inc old mode 100755 new mode 100644 index 84c41e906df6..d320fb6a6d72 --- a/testautomation/framework/optional/includes/options_loadsave_general.inc +++ b/testautomation/framework/optional/includes/options_loadsave_general.inc @@ -63,6 +63,7 @@ testcase tLoadSaveGeneral printlog( " - " & DokumentTyp.getSelText) next i endif + for i=1 to AppCount Dokumenttyp.Select(i) lsSave(2+i) = Dokumenttyp.GetSelText @@ -70,18 +71,55 @@ testcase tLoadSaveGeneral next i printlog " - invert/change settings" - if lbSave(13) then BenutzerspezifischeEinstellungen.UnCheck else BenutzerspezifischeEinstellungen.Check - if lbSave(1) then DokumenteigenschaftenBearbeiten.Uncheck else DokumenteigenschaftenBearbeiten.Check - if lbSave(2) then Sicherungskopie.Uncheck else Sicherungskopie.Check - if lbSave(3) then AutomatischSpeichern.Uncheck else AutomatischSpeichern.Check + if lbSave(13) then + BenutzerspezifischeEinstellungen.UnCheck + else + BenutzerspezifischeEinstellungen.Check + endif + + if lbSave(1) then + DokumenteigenschaftenBearbeiten.Uncheck + else + DokumenteigenschaftenBearbeiten.Check + endif + + if lbSave(2) then + Sicherungskopie.Uncheck + else + Sicherungskopie.Check + endif + + if lbSave(3) then + AutomatischSpeichern.Uncheck + else + AutomatischSpeichern.Check + endif + if AutomatischSpeichern.IsChecked then lsSave(1) = Minuten.GetText Minuten.SetText "23" endif - if lbSave(10) then NoPrettyPrinting.Uncheck else NoPrettyPrinting.Check - if lbSave(11) then URLimDateisystem.Uncheck else URLimDateisystem.Check - if lbSave(12) then URLimInternet.Uncheck else URLimInternet.Check + + if lbSave(10) then + NoPrettyPrinting.Uncheck + else + NoPrettyPrinting.Check + endif + + if lbSave(11) then + URLimDateisystem.Uncheck + else + URLimDateisystem.Check + endif + + if lbSave(12) then + URLimInternet.Uncheck + else + URLimInternet.Check + endif + printlog( "Setting filters for documenttypes: Select third item from every list" ) + for i=1 to AppCount Dokumenttyp.Select(i) Filter.Select(3) @@ -90,8 +128,7 @@ testcase tLoadSaveGeneral printlog " - close options-dlg with OK" kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - sleep(3) + hCloseDialog( ExtrasOptionenDlg, "ok" ) printlog " - exit/restart StarOffice" ExitRestartTheOffice @@ -103,15 +140,19 @@ testcase tLoadSaveGeneral if BenutzerspezifischeEinstellungen.IsChecked = lbSave ( 13 ) then Warnlog "'Load user setting with document' => changes not saved" endif + if DokumenteigenschaftenBearbeiten.IsChecked = lbSave ( 1 ) then Warnlog "'Edit document properties before saving' => changes not saved" endif + if Sicherungskopie.IsChecked = lbSave ( 2 ) then Warnlog "'Create backup copy' => changes not saved" endif + if AutomatischSpeichern.IsChecked = lbSave ( 3 ) then printlog "AutoSave => changes not saved" endif + if AutomatischSpeichern.IsChecked then if Minuten.GetText <> "23" then Warnlog "Minutes for AutoSave => changes not saved" @@ -120,18 +161,20 @@ testcase tLoadSaveGeneral if NoPrettyPrinting.IsChecked = lbSave ( 10 ) then Warnlog "no pretty printing => changes not saved" endif + if URLimDateisystem.IsChecked = lbSave ( 11 ) then Warnlog "URL: File system => changes not saved" endif + if URLimInternet.IsChecked = lbSave ( 12 ) then Warnlog "URL: Internet => changes not saved" endif - + printlog( "Verifying filters for documenttypes: Select third item from every list" ) for i=1 to AppCount Dokumenttyp.Select(i) - printlog( "Doctype: " & Dokumenttyp.getSelText() & " has filter: " & Filter.getSelText() ) - + printlog( "Doctype: " & Dokumenttyp.getSelText() & " has filter: " & Filter.getSelText() ) + if Filter.GetSelIndex <> 3 then warnlog( "#i79150# some options in Tools/Options->Load/Save->General are not saved" ) endif @@ -146,6 +189,7 @@ testcase tLoadSaveGeneral NoPrettyPrinting.Uncheck URLimDateisystem.Uncheck URLimInternet.Uncheck + for i=1 to AppCount Dokumenttyp.Select(i) Filter.Select(4) @@ -154,8 +198,7 @@ testcase tLoadSaveGeneral printlog " - close options-dlg with OK" kontext "extrasoptionendlg" - ExtrasOptionenDlg.OK - Sleep (1) + hCloseDialog( ExtrasOptionenDlg, "ok" ) printlog " - react on messageboxes for loosing settings after changing default-filters" kontext "FilterWarning" @@ -166,7 +209,7 @@ testcase tLoadSaveGeneral i = AppCount + 1 endif next i - Sleep (3) + WaitSlot() printlog " - check second changes" ToolsOptions @@ -175,27 +218,35 @@ testcase tLoadSaveGeneral if BenutzerspezifischeEinstellungen.IsChecked <> FALSE then Warnlog "'Load user setting with document' => changes not saved" endif + if DokumenteigenschaftenBearbeiten.IsChecked <> TRUE then Warnlog "'Edit document properties before saving' => changes not saved" endif + if Sicherungskopie.IsChecked <> FALSE then Warnlog "'Create backup copy' => changes not saved" endif + if AutomatischSpeichern.IsChecked <> TRUE then Warnlog "AutoSave => changes not saved" endif + if Minuten.GetText <> "1" then Warnlog "Minutes for AutoSave => changes not saved" endif + if NoPrettyPrinting.IsChecked <> FALSE then Warnlog "no pretty printing => changes not saved" endif + if URLimDateisystem.IsChecked <> FALSE then Warnlog "URL: File system => changes not saved" endif + if URLimInternet.IsChecked <> FALSE then Warnlog "URL: Internet => changes not saved" endif + for i=1 to AppCount Dokumenttyp.Select(i) if Filter.GetSelIndex <> 4 then @@ -207,26 +258,33 @@ testcase tLoadSaveGeneral if lbSave ( 13 ) = FALSE then BenutzerspezifischeEinstellungen.UnCheck else BenutzerspezifischeEinstellungen.Check endif + if lbSave ( 1 ) = FALSE then DokumenteigenschaftenBearbeiten.UnCheck else DokumenteigenschaftenBearbeiten.Check endif if lbSave ( 2 ) = FALSE then Sicherungskopie.Uncheck else Sicherungskopie.Check endif + AutomatischSpeichern.Check Minuten.SetText lsSave ( 1 ) + if lbSave ( 3 ) = FALSE then AutomatischSpeichern.Uncheck else AutomatischSpeichern.Check endif + if lbSave ( 10 ) = FALSE then NoPrettyPrinting.Uncheck else NoPrettyPrinting.Check endif + if lbSave ( 11 ) = FALSE then URLimDateisystem.UnCheck else URLimDateisystem.Check endif + if lbSave ( 12 ) = FALSE then URLimInternet.UnCheck else URLimInternet.Check endif + for i=1 to AppCount Dokumenttyp.Select(i) if Dokumenttyp.GetSelText <> lsSave ( 2 + i ) then @@ -236,8 +294,8 @@ testcase tLoadSaveGeneral next i kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - Sleep (3) + hCloseDialog( ExtrasOptionenDlg, "ok" ) + printlog " - check settings" ToolsOptions @@ -246,29 +304,37 @@ testcase tLoadSaveGeneral if BenutzerspezifischeEinstellungen.IsChecked <> lbSave ( 13 ) then Warnlog "'Load user setting with document' => changes not saved" endif + if DokumenteigenschaftenBearbeiten.IsChecked <> lbSave ( 1 ) then Warnlog "'Edit document properties before saving' => changes not saved" endif + if Sicherungskopie.IsChecked <> lbSave ( 2 ) then Warnlog "'Create backup copy' => changes not saved" endif + if AutomatischSpeichern.IsChecked <> lbSave ( 3 ) then Warnlog "AutoSave => changes not saved" endif + if AutomatischSpeichern.IsChecked then if Minuten.GetText <> lsSave( 1 ) then Warnlog "Minutes for AutoSave => changes not saved" endif endif + if NoPrettyPrinting.IsChecked <> lbSave ( 10 ) then Warnlog "no pretty printing => changes not saved" endif + if URLimDateisystem.IsChecked <> lbSave ( 11 ) then Warnlog "URL: File system => changes not saved" endif + if URLimInternet.IsChecked <> lbSave ( 12 ) then Warnlog "URL: Internet => changes not saved" endif + for i=1 to AppCount Dokumenttyp.Select(i) if Dokumenttyp.GetSelText <> lsSave ( 2 + i ) then @@ -280,5 +346,6 @@ testcase tLoadSaveGeneral next i kontext "extrasoptionendlg" - ExtrasOptionenDlg.OK + hCloseDialog( ExtrasOptionenDlg, "ok" ) + endcase diff --git a/testautomation/framework/optional/includes/options_ooo_colors.inc b/testautomation/framework/optional/includes/options_ooo_colors.inc old mode 100755 new mode 100644 index 6d1db18179c2..f7c68095e198 --- a/testautomation/framework/optional/includes/options_ooo_colors.inc +++ b/testautomation/framework/optional/includes/options_ooo_colors.inc @@ -40,8 +40,8 @@ testcase tOOoColors dim currentColor(4) as String dim chColor(4) as String - const DEFAULT_COLOR_COUNT = 103 - const CHANGED_COLOR_COUNT = 104 + const DEFAULT_COLOR_COUNT = 99 + const CHANGED_COLOR_COUNT = 100 const USER_COLOR = "TT-Test-Color" myColor(1) = USER_COLOR @@ -106,8 +106,7 @@ testcase tOOoColors printlog( "Close the Tools/Options dialog with OK" ) Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - WaitSlot( 2000 ) + hCloseDialog( ExtrasOptionenDlg, "ok" ) else warnlog( "Tools/Options dialog not open" ) endif @@ -163,9 +162,7 @@ testcase tOOoColors printlog( "Close options dialog with OK" ) Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - WaitSlot( 2000 ) - + hCloseDialog( ExtrasOptionenDlg, "ok" ) else warnlog( "Tools/Options dialog not open" ) endif @@ -196,9 +193,7 @@ testcase tOOoColors printlog( "Close options dialog with OK" ) Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - WaitSlot( 2000 ) - + hCloseDialog( ExtrasOptionenDlg, "ok" ) else warnlog( "Tools/Options dialog not open" ) endif diff --git a/testautomation/framework/optional/includes/options_ooo_general.inc b/testautomation/framework/optional/includes/options_ooo_general.inc old mode 100755 new mode 100644 index c973feade8ae..311f5bf8543d --- a/testautomation/framework/optional/includes/options_ooo_general.inc +++ b/testautomation/framework/optional/includes/options_ooo_general.inc @@ -33,99 +33,165 @@ testcase tOOoGeneral - dim lsSave (4) as String - dim lbSave (3) as Boolean - - hNewDocument - - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - - printlog " - save old data" - lsSave ( 1 ) = Zweistellig.GetText - lbSave ( 1 ) = Aktivieren.IsChecked - Aktivieren.Check - if gPlatgroup = "w95" then - lbSave (2) = StarOfficeDialogeBenutzen.IsChecked - end if - lbSave ( 3 ) = DruckenStatus.IsChecked - lsSave ( 3 ) = StyleSheet.GetSelText - - printlog " - invert/change data" - Zweistellig.SetText "1950" - Zuruecksetzen.Click - if gPlatgroup = "w95" then - if lbSave (2) = TRUE then StarOfficeDialogeBenutzen.Uncheck else StarOfficeDialogeBenutzen.Check - end if - If lbSave ( 3 ) = TRUE then DruckenStatus.Uncheck else DruckenStatus.Check - StyleSheet.Select 3 - - Kontext "ExtrasOptionenDlg" - - hCloseDialog( ExtrasOptionenDlg, "ok" ) - hCloseDocument - - printlog " - exit/restart StarOffice" - ExitRestartTheOffice - - printlog " - check data" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - - if Zweistellig.GetText <> "1950" then Warnlog "Year ( 2 digits ) => changes not saved: '" + Zweistellig.GetText +"' #i29810" - if Aktivieren.IsChecked <> TRUE then Warnlog "Enable HelpAgent => changes not saved" - Zuruecksetzen.Click - if gPlatgroup = "w95" then - if StarOfficeDialogeBenutzen.IsChecked = lbSave (2) then Warnlog "Use StarOffice dialogs => changes not saved!" - end if - If DruckenStatus.IsChecked = lbSave ( 3 ) then Warnlog "Printing sets 'Document modified' status => changes not saved!" - - printlog " - 2. change data" - Zweistellig.SetText "1800" - DruckenStatus.UnCheck - - Kontext "ExtrasOptionenDlg" - hCloseDialog( ExtrasOptionenDlg, "ok" ) - - printlog " - check data" - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - - if Zweistellig.GetText <> "1800" then Warnlog "Year ( 2 digits ) => changes not saved : '" + Zweistellig.GetText +"'" - If DruckenStatus.IsChecked <> FALSE then Warnlog "Printing sets 'Document modified' status => changes not saved!" - if StyleSheet.GetSelIndex <> 3 then Warnlog "Style sheet for StarOffice Help => changes not saved!" - - printlog " - reset to saved data" - Zweistellig.SetText lsSave ( 1 ) - Aktivieren.Check - Zuruecksetzen.Click - if lbSave (1) = TRUE then Aktivieren.Check else Aktivieren.Uncheck - if gPlatgroup = "w95" then - if lbSave (2) = TRUE then StarOfficeDialogeBenutzen.Check else StarOfficeDialogeBenutzen.UnCheck - end if - If lbSave(3)= TRUE then DruckenStatus.Check else DruckenStatus.UnCheck - StyleSheet.Select lsSave(3) - - Kontext "ExtrasOptionenDlg" - hCloseDialog( ExtrasOptionenDlg, "ok" ) - - ToolsOptions - hToolsOptions ( "StarOffice", "General" ) - - printlog " - check the reset data" - if Zweistellig.GetText <> lsSave ( 1 ) then Warnlog "Year ( 2 digits ) => changes not saved" - if Aktivieren.IsChecked <> lbSave (1) then Warnlog "Enable HelpAgent => changes not saved" - Aktivieren.Check - Zuruecksetzen.Click - if lbSave (1) = TRUE then Aktivieren.Check else Aktivieren.Uncheck - if gPlatgroup = "w95" then - if StarOfficeDialogeBenutzen.IsChecked <> lbSave (2) then Warnlog "Use StarOffice dialogs => changes not saved!" - end if - If DruckenStatus.IsChecked <> lbSave(3) then Warnlog "Printing sets 'Document modified' status => changes not saved!" - if StyleSheet.GetSelText <> lsSave (3) then Warnlog "Style sheet for StarOffice Help => changes not saved!" - - Kontext "ExtrasOptionenDlg" - hCloseDialog( ExtrasOptionenDlg, "ok" ) + dim lsSave (4) as String + dim lbSave (3) as Boolean + + hNewDocument + + ToolsOptions + hToolsOptions ( "StarOffice", "General" ) + + printlog " - save old data" + lsSave ( 1 ) = Zweistellig.GetText + lbSave ( 1 ) = Aktivieren.IsChecked + Aktivieren.Check + + if gPlatgroup = "w95" then + lbSave (2) = StarOfficeDialogeBenutzen.IsChecked + endif + + lbSave ( 3 ) = DruckenStatus.IsChecked + lsSave ( 3 ) = StyleSheet.GetSelText + + printlog " - invert/change data" + Zweistellig.SetText "1950" + Zuruecksetzen.Click + + if gPlatgroup = "w95" then + if lbSave (2) then + StarOfficeDialogeBenutzen.Uncheck + else + StarOfficeDialogeBenutzen.Check + endif + endif + + If lbSave ( 3 ) then + DruckenStatus.Uncheck + else + DruckenStatus.Check + endif + + StyleSheet.Select 3 + + Kontext "ExtrasOptionenDlg" + hCloseDialog( ExtrasOptionenDlg, "ok" ) + hCloseDocument + + printlog " - exit/restart StarOffice" + ExitRestartTheOffice + + printlog " - check data" + ToolsOptions + hToolsOptions ( "StarOffice", "General" ) + + if Zweistellig.GetText <> "1950" then + Warnlog "#i29810# - Year ( 2 digits ) => changes not saved: " + Zweistellig.GetText + endif + + if not Aktivieren.IsChecked then + Warnlog "Enable HelpAgent => changes not saved" + endif + + Zuruecksetzen.Click + + if gPlatgroup = "w95" then + if StarOfficeDialogeBenutzen.IsChecked = lbSave (2) then + Warnlog "Use StarOffice dialogs => changes not saved!" + endif + endif + + If DruckenStatus.IsChecked = lbSave ( 3 ) then + Warnlog "Printing sets 'Document modified' status => changes not saved!" + endif + + printlog " - 2. change data" + Zweistellig.SetText "1800" + DruckenStatus.UnCheck + + Kontext "ExtrasOptionenDlg" + hCloseDialog( ExtrasOptionenDlg, "ok" ) + + printlog " - check data" + ToolsOptions + hToolsOptions ( "StarOffice", "General" ) + + if ( Zweistellig.GetText <> "1800" ) then + Warnlog( "#i29810# - Year ( 2 digits ) => changes not saved : " & Zweistellig.GetText() ) + endif + + If DruckenStatus.IsChecked then + Warnlog "Printing sets 'Document modified' status => changes not saved!" + endif + + if StyleSheet.GetSelIndex <> 3 then + Warnlog "Style sheet for StarOffice Help => changes not saved!" + endif + + printlog " - reset to saved data" + Zweistellig.SetText lsSave ( 1 ) + Aktivieren.Check + Zuruecksetzen.Click + + if lbSave (1) then + Aktivieren.Check + else + Aktivieren.Uncheck + endif + + if gPlatgroup = "w95" then + if lbSave (2) then + StarOfficeDialogeBenutzen.Check + else + StarOfficeDialogeBenutzen.UnCheck + endif + endif + + If lbSave(3) then + DruckenStatus.Check + else + DruckenStatus.UnCheck + endif + + StyleSheet.Select lsSave(3) + + Kontext "ExtrasOptionenDlg" + hCloseDialog( ExtrasOptionenDlg, "ok" ) + + ToolsOptions + hToolsOptions ( "StarOffice", "General" ) + + printlog " - check the reset data" + if Zweistellig.GetText <> lsSave ( 1 ) then + Warnlog "Year ( 2 digits ) => changes not saved" + endif + + if Aktivieren.IsChecked <> lbSave (1) then + Warnlog "Enable HelpAgent => changes not saved" + endif + + Aktivieren.Check + Zuruecksetzen.Click + + if lbSave (1) then + Aktivieren.Check else Aktivieren.Uncheck + endif + + if gPlatgroup = "w95" then + if StarOfficeDialogeBenutzen.IsChecked <> lbSave (2) then + Warnlog "Use StarOffice dialogs => changes not saved!" + endif + endif + + If DruckenStatus.IsChecked <> lbSave(3) then + Warnlog "Printing sets 'Document modified' status => changes not saved!" + endif + + if StyleSheet.GetSelText <> lsSave (3) then + Warnlog "Style sheet for StarOffice Help => changes not saved!" + endif + + Kontext "ExtrasOptionenDlg" + hCloseDialog( ExtrasOptionenDlg, "ok" ) endcase -- cgit From de686c051df3c34b585252b200abbdfc05e7004c Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Mon, 25 Oct 2010 09:26:54 +0200 Subject: automationdev300m87#i115106#excluded testcases touched by known issue --- .../writer/optional/includes/contextmenu/w_contextmenu1.inc | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc index 4e399309d018..75db278c25ef 100644 --- a/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc +++ b/testautomation/writer/optional/includes/contextmenu/w_contextmenu1.inc @@ -177,6 +177,8 @@ endcase testcase tPickGraphic + Warnlog "#i115132#Missing .uno Slots in context menus" + goto endsub printlog "Open context menu on not focussed graphic" Call hNewDocument Printlog " Set zoom to 100%" @@ -258,6 +260,9 @@ endcase testcase tHyperlinkEdit + Warnlog "#i115132#Missing .uno Slots in context menus" + goto endsub + printlog "Context menu on hyperlinks" printlog " Open a new text document" CALL hNewDocument @@ -380,6 +385,9 @@ endcase testcase tPickDrawingObjects + Warnlog "#i115132#Missing .uno Slots in context menus" + goto endsub + printlog "Context menu on drawing objects" printlog " Open a new text document" Call hNewDocument -- cgit From 08c3ac4f141b76b854c08ea8924de6abd8818016 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Mon, 25 Oct 2010 10:15:22 +0200 Subject: automationdev300m87#i115106#uses hFileOpenLocally to open document --- testautomation/writer/optional/includes/undo/w_undo_history_4.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testautomation/writer/optional/includes/undo/w_undo_history_4.inc b/testautomation/writer/optional/includes/undo/w_undo_history_4.inc index 506c1e1e4335..568d6cd3d295 100755 --- a/testautomation/writer/optional/includes/undo/w_undo_history_4.inc +++ b/testautomation/writer/optional/includes/undo/w_undo_history_4.inc @@ -290,7 +290,7 @@ testcase tUndoSpellcheck '/// Spellcheck(Autocheck/Spellcheck) printlog "- Spellcheck: Autocheck" '/// new document /// - hfileOpen (gTesttoolpath + "writer\optional\input\undo\spellcheck_undo.odt") + Call hfileOpenLocally (gTesttoolpath + "writer\optional\input\undo\spellcheck_undo.odt") '/// Type "This is a testp" Call wTypeKeys ( "" ) 'This is a testp -- cgit From e884f01f281f3ce8b847a0ace0661f32d6c2dfc1 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Mon, 25 Oct 2010 10:30:37 +0200 Subject: automationdev300m87#i115106#uses hFileOpenLocally to open document --- testautomation/writer/optional/includes/number/w_207_.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testautomation/writer/optional/includes/number/w_207_.inc b/testautomation/writer/optional/includes/number/w_207_.inc index f356f1e21e4e..4bc525553f56 100644 --- a/testautomation/writer/optional/includes/number/w_207_.inc +++ b/testautomation/writer/optional/includes/number/w_207_.inc @@ -111,7 +111,7 @@ testcase tToolsNumbering12 Call hCloseDocument printlog " - load previous saved document" - hFileOpenLocally( ExportFileName ) + hFileOpen( ExportFileName ) printlog " - close document" hFileCloseAll() -- cgit From a2c684d93741f296f57b3cddc9e338366e2a2118 Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Mon, 25 Oct 2010 10:33:34 +0200 Subject: automationdev300m87#i115106#added neccessary wait --- testautomation/writer/optional/includes/shortcut/w_shortcuts.inc | 3 +++ 1 file changed, 3 insertions(+) mode change 100755 => 100644 testautomation/writer/optional/includes/shortcut/w_shortcuts.inc diff --git a/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc b/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc old mode 100755 new mode 100644 index 0bd84118edc5..22d64c36ed43 --- a/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc +++ b/testautomation/writer/optional/includes/shortcut/w_shortcuts.inc @@ -779,6 +779,7 @@ testcase tShortcutPasteUnformattedText Kontext Active.Setpage TabFont Kontext "TabFont" + wait 500 DefaultSize = Size.GetSelIndex Size.Select 14 ' Size 20 DefaultStyle = Style.GetSelIndex @@ -824,6 +825,7 @@ testcase tShortcutPasteUnformattedText Kontext Active.Setpage TabFont Kontext "TabFont" + wait 500 if Size.GetSelIndex <> 14 then Warnlog "formatted word has lost its size" endif @@ -842,6 +844,7 @@ testcase tShortcutPasteUnformattedText Kontext Active.Setpage TabFont Kontext "TabFont" + wait 500 if Size.GetSelIndex <> DefaultSize then Warnlog "formatted word has no default size" endif -- cgit From 04e7b56866d1cb4c8135e5d3e277397e4a774dbc Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Mon, 25 Oct 2010 10:45:44 +0200 Subject: automationdev300m87#i115106#uses now hFileOpenLocally --- .../writer/optional/includes/spellcheck/w_spellcheck.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc index bc73cd945b95..a6dd6c18b997 100644 --- a/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc +++ b/testautomation/writer/optional/includes/spellcheck/w_spellcheck.inc @@ -58,7 +58,7 @@ testcase tToolsSpellcheckWithShortcut exit sub end if - call hFileOpen (TheFile,false) + call hFileOpenLocally (TheFile,false) printlog " Insert some faulty text" @@ -149,7 +149,7 @@ testcase tToolsSpellcheckCorrect PrintLog "- Tools / Spellcheck without text" printlog " Open document where the formatting is set to the language we wish to test." - call hFileOpen (TheFile,false) + call hFileOpenLocally (TheFile,false) printlog " Insert some faulty text" @@ -284,7 +284,7 @@ testcase tToolsSpellcheck1Mistake end select printlog " Open document where the formatting is set to the language we wish to test." - call hFileOpen (TheFile,false) + call hFileOpenLocally (TheFile,false) '/// Insert a sentence with one definded mistake and execute spellcheck /// @@ -741,7 +741,7 @@ testcase tToolsSpellcheckAutomatic PrintLog "- Tools / Spellcheck / AutoSpellcheck" printlog " Open document where the formatting is set to the language we wish to test." - call hFileOpen (TheFile,false) + call hFileOpenLocally (TheFile,false) '/// Enable Auto-Spellcheck in options @@ -1288,7 +1288,7 @@ testcase tToolsThesaurus end select printlog "Open new preformatted-writerdocument" - call hFileOpen (TheFile,false) + call hFileOpenLocally (TheFile,false) printlog "- Thesaurus without a word" @@ -1322,7 +1322,7 @@ testcase tToolsThesaurus wait 500 printlog " Open new preformatted-document where the formatting is set to the language we wish to test." - call hFileOpen (TheFile,false) + call hFileOpenLocally (TheFile,false) Call wTypeKeys sWordInitial @@ -1444,7 +1444,7 @@ testcase tToolsThesaurusSynonyms end select printlog "Open new preformatted-writerdocument" - call hFileOpen (TheFile,false) + call hFileOpenLocally (TheFile,false) Call wTypeKeys sWordInitial Call wTypeKeys "" -- cgit From d5e725a9b522706f4226c871648a489e15acf1bc Mon Sep 17 00:00:00 2001 From: "Helge Delfs [hde]" Date: Mon, 25 Oct 2010 11:04:49 +0200 Subject: automationdev300m87#i115106#replaced hFileOpenLocally with hFileOpen --- testautomation/writer/optional/includes/textframes/w_textframes2.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testautomation/writer/optional/includes/textframes/w_textframes2.inc b/testautomation/writer/optional/includes/textframes/w_textframes2.inc index 5f58ba252aa6..4fca2bdbddb6 100644 --- a/testautomation/writer/optional/includes/textframes/w_textframes2.inc +++ b/testautomation/writer/optional/includes/textframes/w_textframes2.inc @@ -1075,7 +1075,7 @@ testcase tTextframes_31 Sleep 2 '/// Check if the frame is non-editable - hFileOpenLocally( sTestFile ) + hFileOpen( sTestFile ) Call wTypeKeys ( "" ) @@ -1132,7 +1132,7 @@ testcase tTextframes_32 Sleep 2 '/// Check if the text can be inputed into frame - hFileOpenLocally( sTestFile ) + hFileOpen( sTestFile ) Call wTypeKeys "" Wait 500 -- cgit From 1207af1d5a3b8a1fe79668ebf8784c3d5a41828f Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Mon, 25 Oct 2010 11:43:52 +0200 Subject: automationdev300m87: #i115106 - Re-enabled tRecentDocuments. --- testautomation/spreadsheet/required/includes/c_upd_filemenu.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc index 38c25d41bde5..ea8efd09dd2c 100644 --- a/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc +++ b/testautomation/spreadsheet/required/includes/c_upd_filemenu.inc @@ -358,10 +358,10 @@ endcase testcase tFileRecentDocuments -if gPlatform = "lin" then - warnlog "#110649# Due to bug this testcase is not available" - goto endsub -end if +'if gPlatform = "lin" then +' warnlog "#110649# Due to bug this testcase is not available" +' goto endsub +'end if dim sTestFile as string -- cgit From 079d1f1a1ad006d8997019739a0dcdd9560029a9 Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Mon, 25 Oct 2010 14:05:39 +0200 Subject: #i115106# fix modified file and conflict from m89 --- .../optional/includes/global/g_spellcheck.inc | 54 +++++---------------- testautomation/graphics/required/input/recht_1.odp | Bin 13365 -> 15116 bytes 2 files changed, 11 insertions(+), 43 deletions(-) diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc index a514db14d783..8e52eedee576 100644 --- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc +++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc @@ -86,50 +86,18 @@ testcase tiToolsSpellcheckCheck_AlwaysIgnore end if sleep 2 - PrintLog "- Spellcheck with correct text" - select case iSprache - case 01 : hTextrahmenErstellen ("This is a text without any error.",10,10,50,20) - case 33 : hTextrahmenErstellen ("Il nous faut donc un de temps pour examiner avec soin tous les dossiers.",10,10,70,20) - case 34 : hTextrahmenErstellen ("Este es un chico muy importante.",10,10,50,20) - case 36 : hTextrahmenErstellen ("akit a b�r�s�g vagy a szab�lys�rt�si hat�s�g a eltiltott",10,10,70,20) - case 39 : hTextrahmenErstellen ("La ringraziamo per l'interesse mostrato a collaborare con la firma.",10,10,70,20) - case 46 : hTextrahmenErstellen ("Det varierar vad som behandlas och ur vilket perspektiv.",10,10,50,20) - case 49 : hTextrahmenErstellen ("Dies ist ein Text ohne Fehler.",10,10,50,20) - case 50 : hTextrahmenErstellen ("To je besedilo brez napake.",10,10,50,20) - case 55 : hTextrahmenErstellen ("Esta poderia ser a resposta para suas preces?",10,10,50,20) - case else : - if bAsianLan then - printlog "For the language " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-) will use english instaed" - ' there was smth wrong, try to find out : - kontext - if active.exists then - printlog "ERROR: active: '"+active.gettext+"'" - active.ok - end if - hTextrahmenErstellen ("This is a text without any error.",10,10,50,20) - else - Warnlog "For the language " + iSprache +" nothing is prepared yet: insert text here" - hTextrahmenErstellen ("This is a text without any error.",10,10,50,20) - end if - end select - ToolsSpellcheck - WaitSlot (2000) - Kontext "Active" - if active.exists(5) then - printlog "Message: spellchecking has finished?: '" + active.gettext + "'" - Active.OK - else - errorLog "Spellcheck started :" - Kontext "Spellcheck" - if Spellcheck.exists then - errorlog " - spellcheck came up and will be closed now" - Spellcheck.Close - else - printlog "spellcheck didn't come up" - end if - end if - WaitSlot (2000) + printlog "Close dialog 'Edit Custom Dictionary'." + BenutzerwoerterbuchBearbeiten.Close + Kontext "ExtrasOptionenDlg" + printlog "Close the Option dialog." + ExtrasOptionenDlg.OK + + printlog "Close document" Call hCloseDocument + + ' remove the word again from the dictionary + delete_word_from_dictionary(sWrongWord,"IgnoreAllList") + endcase 'tiToolsSpellcheckCorrect '------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ diff --git a/testautomation/graphics/required/input/recht_1.odp b/testautomation/graphics/required/input/recht_1.odp index 998668d43966..fbad5296d1b1 100755 Binary files a/testautomation/graphics/required/input/recht_1.odp and b/testautomation/graphics/required/input/recht_1.odp differ -- cgit From 999314ef0ca6fcfab46ae1f169f6eb3c6e16b055 Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Mon, 25 Oct 2010 14:20:31 +0200 Subject: #i115106# fix modified file and conflict from m89 --- .../optional/includes/global/g_spellcheck.inc | 125 --------------------- 1 file changed, 125 deletions(-) diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc index 8e52eedee576..6dd730b29ba8 100644 --- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc +++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc @@ -100,131 +100,6 @@ testcase tiToolsSpellcheckCheck_AlwaysIgnore endcase 'tiToolsSpellcheckCorrect -'------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ -testcase tiToolsSpellcheckError - if iSprache = 48 then - qaerrorlog "This test is not adapted for polish, 48." - goto endsub - endif - Dim Fehler$ - Dim Sprachenname$ - Dim Dummy$ - Dim FehlerText$ - Dim i as integer - - printlog "New document" - Call hNewDocument - printlog "Selecting language case: " & iSprache - select case iSprache - case 01 : FehlerText$ = "Thatt is a failure test." : Fehler$ = "Thatt" : Sprachenname$ = "English (US)" - case 34 : FehlerText$ = "Ezte es un chico muy importante." : Fehler$ = "Ezte" : Sprachenname$ = "Niederlaendisch" - case 33 : FehlerText$ = "Ler nous faut donc un de temps pour examiner." : Fehler$ = "Ler" : Sprachenname$ = "Franzoesisch" - case 36 : FehlerText$ = "Boszniai americkai kontingens háromnegyedesek – mintegy négyezer katona – magyarországi telepítése egy éven belül megtörténhet" : Fehler$ = "tellepítésel" : Sprachenname$ = "Ungarisch" - case 39 : FehlerText$ = "Ringrarziamo per l'interessa mostrato a collaborare con la firma." : Fehler$ = "Ringrarziamo" : Sprachenname$ = "Italienisch" - case 46 : FehlerText$ = "Detd varierar vad som behandlas och ur vilket perspektiv." : Fehler$ = "Detd" : Sprachenname$ = "Schwedisch" - case 49 : FehlerText$ = "Diees ist ein Fehler." : Fehler$ = "Diees" : Sprachenname$ = "Deutsch" - case 50 : FehlerText$ = "Toje napaka, ker manjka presledek." : Fehler$ = "Toje" : Sprachenname$ = "Slovenš�?ina" - case 55 : FehlerText$ = "Eesta poderia ser a resposta para suas preces?": Fehler$ = "Eesta" : Sprachenname$ = "Portugiesisch" - case else : - if bAsianLan then - printlog "For the language " + iSprache +" nothing is prepared yet, but is AsianLan, so OK :-) using english" - FehlerText$ = "Thatt is a failure test." - Fehler$ = "Thatt" - Sprachenname$ = "English (US)" - call hSetSpellHypLanguage - else - Warnlog "For the language " + iSprache +" nothing is prepared yet: insert text here" - end if - end select - printlog "Error Text taken for testing is: " & FehlerText$ - sleep 2 - - printlog "Delete ignore word list" - if (not wIgnorierenlisteLoeschen) then - qaErrorLog "Can't get into Dictionary lists" - goto endsub - end if - printlog "Setting doc language to english" - ToolsOptions - Kontext "ExtrasOptionenDlg" - hToolsOptions("LANGUAGESETTINGS","Languages") - Westlich.Select 34 - Kontext "ExtrasOptionenDlg" - ExtrasOptionenDlg.OK - printlog "Create 1 textbox with 1 spelling error (test replace always)" - hTextrahmenErstellen (FehlerText$,30,30,90,40) - - hTypeKeys "" - printlog "Call 'Tools->Spellcheck->Check'" - ToolsSpellcheck - printlog "Spellcheck dialog has to come up, wrong word is selected." - Kontext "Spellcheck" - if Spellcheck.Exists then - printlog "There has to be at least ONE suggestion." - if (Suggestions.GetItemCount < 1) then - printlog "If no suggestion avilable:" - warnlog " - no suggestion for the language: "+DictionaryLanguage.GetSelIndex+" '"+DictionaryLanguage.GetSelText+"' , press check button..." - printlog "+ press button 'Check word'" - Pruefen.click - if (Suggestions.GetItemCount < 1) then - warnlog " STILL no suggestions :-( errors will follow " - else - printlog " - now suggestion for the language: "+DictionaryLanguage.GetSelIndex+" '"+DictionaryLanguage.GetSelText+"'" + Suggestions.GetItemCount - end if - end if - Dummy$=Suggestions.GetItemText (1) - printlog "Select first spellcheck suggestion (click it!)." - Suggestions.Select (1) - printlog "Check if textfield 'word' has changed to selected word." - if (Suggestions.GetSelText <> Dummy$) Then - Warnlog "Suggestion not used" - else - Printlog "Suggestion is used" - end if - sleep 1 - kontext "Spellcheck" - printlog "click button 'Always replace'" - ChangeAll.Click - printlog "spellcheck dialog has to disappear and" - printlog "There has to come up only one active: 'Spellcheck of entire document has been completed [OK]'" - Kontext "Active" - if Active.Exists(5) then - Printlog "Message: Spellchecking has finished?: '" + active.gettext + "'" - Active.OK - else - Printlog "'Change All' seems to have worked correctly." - Kontext "Spellcheck" - Spellcheck.Close - Kontext "Active" - if active.exists(5) then - Printlog "Spellcheck dialog closed'" + active.gettext + "'" - Active.OK - else - Printlog "Spellcheck dialog closed'" - end if - end if - else - Warnlog " Error not recognized by the Spellchecker" - if active.exists(5) then - Kontext "Active" - printlog "Message: spellchecking has finished?: '" + active.gettext + "'" - Active.OK - end if - end if - - printlog "Close dialog 'Edit Custom Dictionary'." - BenutzerwoerterbuchBearbeiten.Close - Kontext "ExtrasOptionenDlg" - printlog "Close the Option dialog." - ExtrasOptionenDlg.OK - - printlog "Close document" - Call hCloseDocument - - ' remove the word again from the dictionary - delete_word_from_dictionary(sWrongWord,"IgnoreAllList") - -endcase 'tiToolsSpellcheckCheck '------------------------------------------------------------------------------- testcase tiToolsSpellcheckCheck_Change -- cgit From eccd3b2a1b578600d9d53356d043906a6ae271c9 Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Mon, 25 Oct 2010 15:57:35 +0200 Subject: #i115106# fix modified file and conflict from m89 --- .../graphics/optional/includes/global/g_spellcheck.inc | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/testautomation/graphics/optional/includes/global/g_spellcheck.inc b/testautomation/graphics/optional/includes/global/g_spellcheck.inc index 6dd730b29ba8..e1f02de039cc 100644 --- a/testautomation/graphics/optional/includes/global/g_spellcheck.inc +++ b/testautomation/graphics/optional/includes/global/g_spellcheck.inc @@ -56,8 +56,7 @@ testcase tiToolsSpellcheckCheck_AlwaysIgnore sExt = ".odp" endif - Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt) - call fMakeDocumentWritable() + Call hFileOpenLocally (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt) sleep(1) @@ -98,6 +97,7 @@ testcase tiToolsSpellcheckCheck_AlwaysIgnore ' remove the word again from the dictionary delete_word_from_dictionary(sWrongWord,"IgnoreAllList") + kill (convertPath(gOfficePath+"user/work/"+"recht_"+iSprache+sExt)) endcase 'tiToolsSpellcheckCorrect '------------------------------------------------------------------------------- @@ -124,9 +124,7 @@ testcase tiToolsSpellcheckCheck_Change sExt = ".odp" endif - Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt) - - call fMakeDocumentWritable + Call hFileOpenLocally (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt) ' Perform the test now: printlog "Call Tools->Spellcheck" @@ -170,6 +168,7 @@ testcase tiToolsSpellcheckCheck_Change printlog "Close document" Call hCloseDocument + kill (convertPath(gOfficePath+"user/work/"+"recht_"+iSprache+sExt)) endcase 'tiToolsSpellcheckCheck_Change '------------------------------------------------------------------------------- @@ -198,9 +197,7 @@ testcase tiToolsSpellcheckCheck_ChangeAll sExt = ".odp" endif - Call hFileOpen (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt) - - call fMakeDocumentWritable() + Call hFileOpenLocally (gTesttoolpath + "graphics\required\input\recht_"+iSprache+sExt) ' Perform the test now: printlog "Call Tools->Spellcheck" @@ -216,6 +213,7 @@ testcase tiToolsSpellcheckCheck_ChangeAll printlog "Close document" Call hCloseDocument + kill (convertPath(gOfficePath+"user/work/"+"recht_"+iSprache+sExt)) endcase 'tiToolsSpellcheckCheck_ChangeAll -- cgit From f928dde9b40906d4813c9acd140a80340adaa8ec Mon Sep 17 00:00:00 2001 From: Thorsten Bosbach Date: Mon, 25 Oct 2010 17:00:01 +0200 Subject: #i115106# math part --- testautomation/math/optional/includes/m_101_.inc | 27 ++---------------------- 1 file changed, 2 insertions(+), 25 deletions(-) mode change 100755 => 100644 testautomation/math/optional/includes/m_101_.inc diff --git a/testautomation/math/optional/includes/m_101_.inc b/testautomation/math/optional/includes/m_101_.inc old mode 100755 new mode 100644 index 989857403546..58582452dc63 --- a/testautomation/math/optional/includes/m_101_.inc +++ b/testautomation/math/optional/includes/m_101_.inc @@ -302,7 +302,7 @@ function TBOloadFormulaFromFile () as string '///+ take formula out of command window /// '///+ save it into a variable /// '/// close dokument /// - Call hFileOpen ( ConvertPath(gTesttoolPath + "math/optional/input/101_1.sxm") ) + Call hFileOpenLocally ( ConvertPath(gTesttoolPath + "math/optional/input/101_1.sxm") ) kontext "dokumentwriter" try EditSelectAllMath @@ -344,8 +344,7 @@ testcase tFilePrint goto endsub endif - Call hFileOpen ( ConvertPath(gTesttoolPath + "math/optional/input/101_2.sxw") ) - TBOmakeWriteable() + Call hFileOpenLocally ( ConvertPath(gTesttoolPath + "math/optional/input/101_2.sxw") ) '/// find the translated formula in the document and get the language it belongs to ///' '///+ compare it to the officelanguage ///' @@ -581,28 +580,6 @@ testcase tFilePrint endcase -function TBOmakeWriteable() - ' check if writeable! (especially for HTML Doks!!) - sleep (3) - try - UseBindings - FormatStyleBold - sleep 2 - FormatStyleBold - catch - '/// make document writeable :-)///' - kontext "Funktionsleiste" - printlog "ReadOnly, changed it to writeable." - Bearbeiten.click - kontext - if active.exists (5) then - Printlog " active, accessrights ?!: '"+active.GetText+"'" - active.yes - endif - endcatch - sleep (3) -end function - function isCheckedWarnAlienFormat (optional bChange as boolean) dim uno dim ap -- cgit From ad312005bd3480e78f82824a95589e0673c56d93 Mon Sep 17 00:00:00 2001 From: "Joerg Skottke [jsk]" Date: Tue, 26 Oct 2010 09:02:24 +0200 Subject: automationdev300m87: #i112208# - Turned off verbosity in hFileOpenLocally() --- testautomation/global/tools/includes/required/t_files.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/testautomation/global/tools/includes/required/t_files.inc b/testautomation/global/tools/includes/required/t_files.inc index ee75fb99bd80..d734cd3f05a7 100644 --- a/testautomation/global/tools/includes/required/t_files.inc +++ b/testautomation/global/tools/includes/required/t_files.inc @@ -624,16 +624,17 @@ function hFileOpenLocally( byVal sSourcePath as string ) as boolean sTargetPath = hFileGetLocalPath( sSourcePath ) ' The path + file ' For debugging purposes set global variable gVerbose to TRUE - - printlog( CFN & "Copying file" ) - printlog( CFN & "From: " & sSourcePath ) - printlog( CFN & "To..: " & sTargetPath ) + if ( gVerbose ) then + printlog( CFN & "Copying file" ) + printlog( CFN & "From: " & sSourcePath ) + printlog( CFN & "To..: " & sTargetPath ) + endif ' Copy the file from anywhere to the local user directory if it does not ' exist. This behavior was discussed on IRC if ( FileExists( sTargetPath ) ) then - 'printlog( CFN & "Re-using existing local copy of workfile" ) - warnlog( CFN & "Target file exists, it has not been deleted by prior test" ) + printlog( CFN & "Re-using existing local copy of workfile" ) + 'warnlog( CFN & "Target file exists, it has not been deleted by prior test" ) endif FileCopy( sSourcePath, sTargetPath ) -- cgit From d5d2a1cffc728100f8119252ff26f95949e6d35c Mon Sep 17 00:00:00 2001 From: Vladimir Glazunov Date: Wed, 27 Oct 2010 14:20:22 +0200 Subject: #i115204#,#i115131# HDU: avoid problem on systems with older fontconfig libs,ignore fonts worse than outline fonts --- vcl/unx/source/fontmanager/fontconfig.cxx | 43 +++++++++++++++++++++---------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/vcl/unx/source/fontmanager/fontconfig.cxx b/vcl/unx/source/fontmanager/fontconfig.cxx index ecb4aa54549b..434263db352e 100644 --- a/vcl/unx/source/fontmanager/fontconfig.cxx +++ b/vcl/unx/source/fontmanager/fontconfig.cxx @@ -454,20 +454,33 @@ void FontCfgWrapper::addFontSet( FcSetName eSetName ) for( int i = 0; i < pOrig->nfont; ++i ) { FcPattern* pOrigPattern = pOrig->fonts[i]; - // create a pattern to find eventually better alternatives - FcPattern* pTestPattern = FcPatternDuplicate( pOrigPattern ); - FcPatternAddBool( pTestPattern, FC_OUTLINE, FcTrue ); - // TODO: use pattern->ImplFontAttr->pattern to filter out - // all attribute that are not interesting for finding dupes - FcPatternDel( pTestPattern, FC_FONTVERSION ); - FcPatternDel( pTestPattern, FC_CHARSET ); - FcPatternDel( pTestPattern, FC_FILE ); - // find the font face for the dupe-search pattern - FcResult eFcResult = FcResultMatch; - FcPattern* pBetterPattern = FcFontMatch( FcConfigGetCurrent(), pTestPattern, &eFcResult ); - FcPatternDestroy( pTestPattern ); - if( eFcResult != FcResultMatch ) + // #i115131# ignore non-outline fonts + FcBool bOutline = FcFalse; + FcResult eOutRes = FcPatternGetBool( pOrigPattern, FC_OUTLINE, 0, &bOutline ); + if( (eOutRes != FcResultMatch) || (bOutline == FcFalse) ) continue; + // create a pattern to find eventually better alternatives + FcPattern* pBetterPattern = pOrigPattern; + if( m_nFcVersion > 20400 ) // #i115204# avoid trouble with old FC versions + { + FcPattern* pTestPattern = FcPatternDuplicate( pOrigPattern ); + FcPatternAddBool( pTestPattern, FC_OUTLINE, FcTrue ); + // TODO: ignore all attributes that are not interesting for finding dupes + // e.g. by using pattern->ImplFontAttr->pattern conversion + FcPatternDel( pTestPattern, FC_FONTVERSION ); + FcPatternDel( pTestPattern, FC_CHARSET ); + FcPatternDel( pTestPattern, FC_FILE ); + // find the font face for the dupe-search pattern + FcResult eFcResult = FcResultMatch; + pBetterPattern = FcFontMatch( FcConfigGetCurrent(), pTestPattern, &eFcResult ); + FcPatternDestroy( pTestPattern ); + if( eFcResult != FcResultMatch ) + continue; + // #i115131# double check results and eventually ignore them + eOutRes = FcPatternGetBool( pBetterPattern, FC_OUTLINE, 0, &bOutline ); + if( (eOutRes != FcResultMatch) || (bOutline == FcFalse) ) + continue; + } // insert best found pattern for the dupe-search pattern // TODO: skip inserting patterns that are already known in the target fontset FcPatternReference( pBetterPattern ); @@ -773,7 +786,10 @@ int PrintFontManager::countFontconfigFonts( std::hash_mapgetAtom( ATOM_FAMILYNAME, OStringToOUString( OString( (sal_Char*)family ), RTL_TEXTENCODING_UTF8 ), sal_True ); PrintFont* pUpdate = aFonts.front(); @@ -1103,6 +1119,7 @@ bool PrintFontManager::getFontOptions( ImplFontOptions& rOptions) const { #ifndef ENABLE_FONTCONFIG + (void)rInfo;(void)nSize;(void)subcallback;(void)rOptions; return false; #else // ENABLE_FONTCONFIG FontCfgWrapper& rWrapper = FontCfgWrapper::get(); -- cgit From 035b8335dc769f1d4537d2b645ab9ad17c4891a8 Mon Sep 17 00:00:00 2001 From: Release Engineering Date: Wed, 27 Oct 2010 15:18:34 +0200 Subject: DEV300 --- solenv/inc/minor.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/solenv/inc/minor.mk b/solenv/inc/minor.mk index 2454e766cb65..a2e06a2dd244 100644 --- a/solenv/inc/minor.mk +++ b/solenv/inc/minor.mk @@ -1,5 +1,5 @@ RSCVERSION=300 -RSCREVISION=300m90(Build:9536) -BUILD=9536 -LAST_MINOR=m90 +RSCREVISION=300m91(Build:9538) +BUILD=9538 +LAST_MINOR=m91 SOURCEVERSION=DEV300 -- cgit From 213c9f9662001c25bf37b8e35ec779a39b764d8e Mon Sep 17 00:00:00 2001 From: Vladimir Glazunov Date: Thu, 28 Oct 2010 18:44:08 +0200 Subject: #i10000# regenerated configure --- configure | 27563 +++++++++++++++++++++++++++++++++++++----------------------- 1 file changed, 17253 insertions(+), 10310 deletions(-) diff --git a/configure b/configure index f1ebbbce9e46..51b890a6f002 100755 --- a/configure +++ b/configure @@ -1,416 +1,82 @@ #! /bin/sh # From configure.in Revision: 1.290 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.65. -# -# -# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, -# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# +# Generated by GNU Autoconf 2.59. # +# Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation # gives unlimited permission to copy, distribute and modify it. -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - -if test "x$CONFIG_SHELL" = x; then - as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then : - emulate sh - NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on \${1+\"\$@\"}, which - # is contrary to our usage. Disable this feature. - alias -g '\${1+\"\$@\"}'='\"\$@\"' - setopt NO_GLOB_SUBST -else - case \`(set -o) 2>/dev/null\` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi -" - as_required="as_fn_return () { (exit \$1); } -as_fn_success () { as_fn_return 0; } -as_fn_failure () { as_fn_return 1; } -as_fn_ret_success () { return 0; } -as_fn_ret_failure () { return 1; } - -exitcode=0 -as_fn_success || { exitcode=1; echo as_fn_success failed.; } -as_fn_failure && { exitcode=1; echo as_fn_failure succeeded.; } -as_fn_ret_success || { exitcode=1; echo as_fn_ret_success failed.; } -as_fn_ret_failure && { exitcode=1; echo as_fn_ret_failure succeeded.; } -if ( set x; as_fn_ret_success y && test x = \"\$1\" ); then : - -else - exitcode=1; echo positional parameters were not saved. -fi -test x\$exitcode = x0 || exit 1" - as_suggested=" as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO - as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO - eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" && - test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1 -test \$(( 1 + 1 )) = 2 || exit 1" - if (eval "$as_required") 2>/dev/null; then : - as_have_required=yes -else - as_have_required=no -fi - if test x$as_have_required = xyes && (eval "$as_suggested") 2>/dev/null; then : - -else - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -as_found=false -for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - as_found=: - case $as_dir in #( - /*) - for as_base in sh bash ksh sh5; do - # Try only shells that exist, to save several forks. - as_shell=$as_dir/$as_base - if { test -f "$as_shell" || test -f "$as_shell.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$as_shell"; } 2>/dev/null; then : - CONFIG_SHELL=$as_shell as_have_required=yes - if { $as_echo "$as_bourne_compatible""$as_suggested" | as_run=a "$as_shell"; } 2>/dev/null; then : - break 2 -fi -fi - done;; - esac - as_found=false -done -$as_found || { if { test -f "$SHELL" || test -f "$SHELL.exe"; } && - { $as_echo "$as_bourne_compatible""$as_required" | as_run=a "$SHELL"; } 2>/dev/null; then : - CONFIG_SHELL=$SHELL as_have_required=yes -fi; } -IFS=$as_save_IFS - - - if test "x$CONFIG_SHELL" != x; then : - # We cannot yet assume a decent shell, so we have to provide a - # neutralization value for shells without unset; and this also - # works around shells that cannot unset nonexistent variables. - BASH_ENV=/dev/null - ENV=/dev/null - (unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV - export CONFIG_SHELL - exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} -fi - - if test x$as_have_required = xno; then : - $as_echo "$0: This script requires a shell more modern than all" - $as_echo "$0: the shells that I found on your system." - if test x${ZSH_VERSION+set} = xset ; then - $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" - $as_echo "$0: be upgraded to zsh 4.3.4 or later." + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var else - $as_echo "$0: Please tell bug-autoconf@gnu.org about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." - fi - exit 1 -fi -fi -fi -SHELL=${CONFIG_SHELL-/bin/sh} -export SHELL -# Unset more variables known to interfere with behavior of common tools. -CLICOLOR_FORCE= GREP_OPTIONS= -unset CLICOLOR_FORCE GREP_OPTIONS - -## --------------------- ## -## M4sh Shell Functions. ## -## --------------------- ## -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" - - -} # as_fn_mkdir_p -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - - -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. -as_fn_error () -{ - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 + $as_unset $as_var fi - $as_echo "$as_me: error: $1" >&2 - as_fn_exit $as_status -} # as_fn_error +done -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr else as_expr=false fi -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then as_basename=basename else as_basename=false fi -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi -as_me=`$as_basename -- "$0" || +# Name of the executable. +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + +# PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -418,107 +84,146 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2 + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac - as_lineno_1=$LINENO as_lineno_1a=$LINENO - as_lineno_2=$LINENO as_lineno_2a=$LINENO - eval 'test "x$as_lineno_1'$as_run'" != "x$as_lineno_2'$as_run'" && - test "x`expr $as_lineno_1'$as_run' + 1`" = "x$as_lineno_2'$as_run'"' || { - # Blame Lee E. McMahon (1931-1989) for sed's syntax. :-) - sed -n ' - p - /[$]LINENO/= - ' <$as_myself | + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | sed ' - s/[$]LINENO.*/&-/ - t lineno - b - :lineno N - :loop - s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, t loop - s/-\n.*// + s,-$,, + s,^['$as_cr_digits']*\n,, ' >$as_me.lineno && - chmod +x "$as_me.lineno" || - { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; } + chmod +x $as_me.lineno || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } # Don't try to exec as it changes $[0], causing all sort of problems # (the dirname of $[0] is not the place where we might find the - # original and so on. Autoconf is especially sensitive to this). - . "./$as_me.lineno" + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno # Exit status is that of the last command. exit } -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; esac -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null + as_expr=false fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links as_ln_s='cp -p' + else + as_ln_s='ln -s' fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null +rm -f conf$$ conf$$.exe conf$$.file if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' + as_mkdir_p=: else test -d ./-p && rmdir ./-p as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -527,25 +232,38 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" -test -n "$DJDIR" || exec 7<&0 &1 +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH + # Name of the host. # hostname on some systems (SVR3.2, Linux) returns a bogus exit status, # so uname gets run too. ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` +exec 6>&1 + # # Initializations. # ac_default_prefix=/usr/local -ac_clean_files= ac_config_libobj_dir=. -LIBOBJS= cross_compiling=no subdirs= MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} + +# Maximum number of lines to put in a shell here document. +# This variable seems obsolete. It should probably be removed, and +# only ac_max_sed_lines should be used. +: ${ac_max_here_lines=38} # Identity of this package. PACKAGE_NAME= @@ -553,663 +271,50 @@ PACKAGE_TARNAME= PACKAGE_VERSION= PACKAGE_STRING= PACKAGE_BUGREPORT= -PACKAGE_URL= # Factoring default headers for most tests. ac_includes_default="\ #include -#ifdef HAVE_SYS_TYPES_H +#if HAVE_SYS_TYPES_H # include #endif -#ifdef HAVE_SYS_STAT_H +#if HAVE_SYS_STAT_H # include #endif -#ifdef STDC_HEADERS +#if STDC_HEADERS # include # include #else -# ifdef HAVE_STDLIB_H +# if HAVE_STDLIB_H # include # endif #endif -#ifdef HAVE_STRING_H -# if !defined STDC_HEADERS && defined HAVE_MEMORY_H +#if HAVE_STRING_H +# if !STDC_HEADERS && HAVE_MEMORY_H # include # endif # include #endif -#ifdef HAVE_STRINGS_H +#if HAVE_STRINGS_H # include #endif -#ifdef HAVE_INTTYPES_H +#if HAVE_INTTYPES_H # include +#else +# if HAVE_STDINT_H +# include +# endif #endif -#ifdef HAVE_STDINT_H -# include -#endif -#ifdef HAVE_UNISTD_H +#if HAVE_UNISTD_H # include #endif" -ac_subst_vars='LTLIBOBJS -LIBOBJS -BUILD_TYPE -LOCAL_SOLVER -nodep -VERBOSE -ENABLE_LAYOUT -ENABLE_STATIC_GTK -UNIXWRAPPERNAME -OOO_VENDOR -ABOUT_BITMAPS -INTRO_BITMAPS -WITH_DICT -WITH_POOR_HELP_LOCALIZATIONS -WITH_LANG -OOO_JUNIT_JAR -ANT_LIB -ANT_HOME -ANT -XINERAMA_LINK -USE_XINERAMA -SCPDEFS -WITHOUT_AFMS -WITHOUT_PPDS -WITH_FONTS -ENABLE_KAB -ENABLE_EVOAB2 -GOBJECT_LIBS -GOBJECT_CFLAGS -ENABLE_LOCKDOWN -KDE4_LIBS -KDE4_CFLAGS -MOC4 -KDE_LIBS -KDE_CFLAGS -MOC -COMMONS_LOGGING_JAR -COMMONS_HTTPCLIENT_JAR -COMMONS_LANG_JAR -COMMONS_CODEC_JAR -SYSTEM_APACHE_COMMONS -LIBSERIALIZER_JAR -LIBFONTS_JAR -LIBREPOSITORY_JAR -LIBFORMULA_JAR -LIBLOADER_JAR -LIBLAYOUT_JAR -LIBBASE_JAR -JFREEREPORT_JAR -FLUTE_JAR -LIBXML_JAR -SAC_JAR -SYSTEM_JFREEREPORT -ENABLE_REPORTBUILDER -SERVLETAPI_JAR -SYSTEM_SERVLETAPI -ENABLE_MEDIAWIKI -SYSTEM_POPPLER -ENABLE_PDFIMPORT -POPPLER_LIBS -POPPLER_CFLAGS -ENABLE_PRESENTER_SCREEN -ENABLE_MINIMIZER -ENABLE_PRESENTER_EXTRA_UI -ENABLE_OPENGL -SYSTEM_CAIRO -BUILD_PIXMAN -ENABLE_CAIRO -CAIRO_LIBS -CAIRO_CFLAGS -ENABLE_GSTREAMER -GSTREAMER_LIBS -GSTREAMER_CFLAGS -ENABLE_SYSTRAY_GTK -ENABLE_DBUS -ENABLE_GIO -GIO_LIBS -GIO_CFLAGS -DBUS_LIBS -DBUS_CFLAGS -GTK_LIBS -GTK_CFLAGS -ENABLE_GNOMEVFS -GNOMEVFS_LIBS -GNOMEVFS_CFLAGS -ENABLE_GCONF -GCONF_LIBS -GCONF_CFLAGS -ENABLE_KDE4 -ENABLE_KDE -ENABLE_GTK -ZIP_HOME -UNZIP -ZIP -ASM_HOME -ML_EXE -CYGWIN_PATH -GNUPATCH -GNUCP -PATCH -FLEX -BISON -NSIS_PATH -DIRECTXSDK_LIB -DIRECTXSDK_HOME -WINDOWS_VISTA_PSDK -PSDK_HOME -SYSTEM_LIBC -HAVE_READDIR_R -HAVE_GETOPT -SYSTEM_LIBTEXTCAT_DATA -SYSTEM_LIBTEXTCAT -SYSTEM_LPSOLVE -SYSTEM_MYTHES -MYTHES_LIBS -MYTHES_CFLAGS -HYPHEN_LIB -SYSTEM_HYPH -SYSTEM_HUNSPELL -HUNSPELL_LIBS -HUNSPELL_CFLAGS -SYSTEM_REDLAND -REDLAND_LIBS -REDLAND_CFLAGS -AGG_VERSION -SYSTEM_AGG -AGG_LIBS -AGG_CFLAGS -ENABLE_AGG -SYSTEM_OPENSSL -OPENSSL_LIBS -OPENSSL_CFLAGS -NEON_VERSION -SYSTEM_NEON -NEON_LIBS -NEON_CFLAGS -DISABLE_NEON -ENABLE_RANDR -XRANDR_DLOPEN -XRANDR_LIBS -XRANDR_CFLAGS -XRENDER_LINK -SYSTEM_XRENDER_HEADERS -DISABLE_XAW -XAU_LIBS -XLIB -XINC -X_EXTRA_LIBS -X_LIBS -X_PRE_LIBS -X_CFLAGS -XMKMF -SYSTEM_GRAPHITE -ENABLE_GRAPHITE -GRAPHITE_LIBS -GRAPHITE_CFLAGS -SYSTEM_ICU -SYSTEM_GENCMN -SYSTEM_GENCCODE -SYSTEM_GENBRK -SYSTEM_SANE_HEADER -MOZ_LDAP_CFLAGS -MOZ_LIB_XPCOM -MOZ_LIB -MOZ_INC -MOZ_FLAVOUR -SYSTEM_MOZILLA -MOZILLABUILD -ENABLE_NSS_MODULE -BUILD_MOZAB -MOZLIBREQ_LIBS -MOZLIBREQ_CFLAGS -MOZGTK2_LIBS -MOZGTK2_CFLAGS -MOZILLA_TOOLKIT -MOZILLA_VERSION -MOZILLAXPCOM_LIBS -MOZILLAXPCOM_CFLAGS -NSPR_LIB -MOZ_NSPR_LIBS -MOZ_NSPR_CFLAGS -NSS_LIB -MOZ_NSS_LIBS -MOZ_NSS_CFLAGS -WITH_OPENLDAP -WITH_LDAP -WITH_MOZILLA -SYSTEM_ODBC_HEADERS -SYSTEM_VIGRA -SYSTEM_BOOST -SYSTEM_MDDS -CURL_LIBS -CURL_CFLAGS -SYSTEM_CURL -CURLCONFIG -SAXON_JAR -SYSTEM_SAXON -SERIALIZER_JAR -BSH_JAR -SYSTEM_BSH -HSQLDB_JAR -SYSTEM_HSQLDB -SYSTEM_MYSQL_CPPCONN -LIBMYSQL_PATH -MYSQL_DEFINES -MYSQL_LIB -MYSQL_INC -SYSTEM_MYSQL -MYSQLCONFIG -ENABLE_MYSQLC -LUCENE_ANALYZERS_JAR -LUCENE_CORE_JAR -SYSTEM_LUCENE -DB_JAR -DB_INCLUDES -DB_VERSION -SYSTEM_DB -HOME -PYTHON_LIBS -PYTHON_CFLAGS -SYSTEM_PYTHON -BZIP2 -pkgpyexecdir -pyexecdir -pkgpythondir -pythondir -PYTHON_PLATFORM -PYTHON_EXEC_PREFIX -PYTHON_PREFIX -PYTHON_VERSION -PYTHON -SYSTEM_LIBXML -LIBXML_LIBS -LIBXML_CFLAGS -SYSTEM_LIBXSLT -XSLTPROC -LIBXSLT_LIBS -LIBXSLT_CFLAGS -USE_FT_EMBOLDEN -FREETYPE_LIBS -FREETYPE_CFLAGS -SYSTEM_CPPUNIT -CPPUNIT_LIBS -CPPUNIT_CFLAGS -SYSTEM_LIBWPD -LIBWPD_LIBS -LIBWPD_CFLAGS -PKG_CONFIG -SYSTEM_EXPAT -SYSTEM_JPEG -SYSTEM_ZLIB -SYSTEM_STDLIBS -BUILD_UNOWINREG -MINGWSTRIP -MINGWCXX -BUILD_STAX -GPERF -PKGFORMAT -RPM -BUILD_EPM -PKGMK -DPKG -EPM -BUILD_DMAKE -DMAKE -JAVAIFLAGS -JAVAFLAGS -JDK -JAVA_HOME -JAVAAOTCOMPILER -AWTLIB -JAVADOC -JAVACISGCJ -JAVACOMPILER -JAVAINTERPRETER -SOLAR_JAVA -BUILD_VER_STRING -ALLOC -HAVE_GCC_VISIBILITY_FEATURE -CCACHE -USE_CCACHE -USE_SYSTEM_STL -STLPORT_VER -STLPORT4 -EXCEPTIONS -MINGW_GXXDLL -MINGW_GCCDLL -MINGW_SHARED_GXXLIB -MINGW_GCCLIB_EH -MINGW_SHARED_GCCLIB -MINGW_CLIB_DIR -MINGW_BACKWARD_INCLUDE_PATH -MINGW_LIB_INCLUDE_PATH -GXX_INCLUDE_PATH -CRYPT_LINK -PAM_LINK -NEW_SHADOW_API -PAM -VBA_EXTENSION -ENABLE_VBA -LFS_CFLAGS -WORDS_BIGENDIAN -SIZEOF_LONG -CXXCPP -ac_ct_CXX -CXXFLAGS -CXX -CPP -FRAME_HOME -CSC_PATH -MIDL_PATH -USE_MINGW -COMEX -MSPDB_PATH -PERL -HAVE_LD_HASH_STYLE -_cc -GNUMAKE -ENABLE_PCH -HAVE_LD_BSYMBOLIC_FUNCTIONS -GCCVER -COMPATH -OBJEXT -EXEEXT -ac_ct_CC -CPPFLAGS -LDFLAGS -CFLAGS -CC -GCC_HOME -SHELLPATH -WITH_MINGWIN -THES_SYSTEM_DIR -HYPH_SYSTEM_DIR -DICT_SYSTEM_DIR -SYSTEM_DICTS -WITH_MYSPELL_DICTS -ENABLE_RPATH -DISABLE_ATL -DISABLE_ACTIVEX -ENABLE_DIRECTX -WITH_BINFILTER -DO_FETCH_TARBALLS -TARFILE_LOCATION -ENABLE_FONTCONFIG -ENABLE_CUPS -DISABLE_STRIP -ENABLE_SYMBOLS -PROEXT -PROFULLSWITCH -PRODUCT -ENABLE_DEBUG -ENABLE_WERROR -VC_STANDARD -ENABLE_CRASHDUMP -PTHREAD_LIBS -PTHREAD_CFLAGS -OSVERSION -GNUTAR -target_os -target_vendor -target_cpu -target -host_os -host_vendor -host_cpu -host -build_os -build_vendor -build_cpu -build -SOURCEVERSION -UPD -_solenv -LOCAL_SOLENV -SED -AWK -EGREP -GREP -target_alias -host_alias -build_alias -LIBS -ECHO_T -ECHO_N -ECHO_C -DEFS -mandir -localedir -libdir -psdir -pdfdir -dvidir -htmldir -infodir -docdir -oldincludedir -includedir -localstatedir -sharedstatedir -sysconfdir -datadir -datarootdir -libexecdir -sbindir -bindir -program_transform_name -prefix -exec_prefix -PACKAGE_URL -PACKAGE_BUGREPORT -PACKAGE_STRING -PACKAGE_VERSION -PACKAGE_TARNAME -PACKAGE_NAME -PATH_SEPARATOR -SHELL' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS EGREP AWK SED LOCAL_SOLENV _solenv UPD SOURCEVERSION build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os GNUTAR OSVERSION PTHREAD_CFLAGS PTHREAD_LIBS ENABLE_CRASHDUMP VC_STANDARD ENABLE_WERROR ENABLE_DEBUG PRODUCT PROFULLSWITCH PROEXT ENABLE_SYMBOLS DISABLE_STRIP ENABLE_CUPS ENABLE_FONTCONFIG TARFILE_LOCATION DO_FETCH_TARBALLS WITH_BINFILTER ENABLE_DIRECTX DISABLE_ACTIVEX DISABLE_ATL ENABLE_RPATH WITH_MYSPELL_DICTS SYSTEM_DICTS DICT_SYSTEM_DIR HYPH_SYSTEM_DIR THES_SYSTEM_DIR WITH_MINGWIN SHELLPATH GCC_HOME CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT COMPATH GCCVER HAVE_LD_BSYMBOLIC_FUNCTIONS ENABLE_PCH GNUMAKE _cc HAVE_LD_HASH_STYLE PERL MSPDB_PATH COMEX USE_MINGW MIDL_PATH CSC_PATH FRAME_HOME CPP CXX CXXFLAGS ac_ct_CXX CXXCPP SIZEOF_LONG WORDS_BIGENDIAN LFS_CFLAGS ENABLE_VBA VBA_EXTENSION PAM NEW_SHADOW_API PAM_LINK CRYPT_LINK GXX_INCLUDE_PATH MINGW_LIB_INCLUDE_PATH MINGW_BACKWARD_INCLUDE_PATH MINGW_CLIB_DIR MINGW_SHARED_GCCLIB MINGW_GCCLIB_EH MINGW_SHARED_GXXLIB MINGW_GCCDLL MINGW_GXXDLL EXCEPTIONS STLPORT4 STLPORT_VER USE_SYSTEM_STL USE_CCACHE CCACHE HAVE_GCC_VISIBILITY_FEATURE ALLOC BUILD_VER_STRING SOLAR_JAVA JAVAINTERPRETER JAVACOMPILER JAVACISGCJ JAVADOC AWTLIB JAVAAOTCOMPILER JAVA_HOME JDK JAVAFLAGS JAVAIFLAGS DMAKE BUILD_DMAKE EPM DPKG PKGMK BUILD_EPM RPM PKGFORMAT GPERF BUILD_STAX MINGWCXX ac_ct_MINGWCXX MINGWSTRIP ac_ct_MINGWSTRIP BUILD_UNOWINREG SYSTEM_STDLIBS SYSTEM_ZLIB SYSTEM_JPEG SYSTEM_EXPAT PKG_CONFIG LIBWPD_CFLAGS LIBWPD_LIBS SYSTEM_LIBWPD CPPUNIT_CFLAGS CPPUNIT_LIBS SYSTEM_CPPUNIT FREETYPE_CFLAGS FREETYPE_LIBS USE_FT_EMBOLDEN LIBXSLT_CFLAGS LIBXSLT_LIBS XSLTPROC SYSTEM_LIBXSLT LIBXML_CFLAGS LIBXML_LIBS SYSTEM_LIBXML PYTHON PYTHON_VERSION PYTHON_PREFIX PYTHON_EXEC_PREFIX PYTHON_PLATFORM pythondir pkgpythondir pyexecdir pkgpyexecdir BZIP2 SYSTEM_PYTHON PYTHON_CFLAGS PYTHON_LIBS HOME SYSTEM_DB DB_VERSION DB_INCLUDES DB_JAR SYSTEM_LUCENE LUCENE_CORE_JAR LUCENE_ANALYZERS_JAR ENABLE_MYSQLC MYSQLCONFIG SYSTEM_MYSQL MYSQL_INC MYSQL_LIB MYSQL_DEFINES LIBMYSQL_PATH SYSTEM_MYSQL_CPPCONN SYSTEM_HSQLDB HSQLDB_JAR SYSTEM_BSH BSH_JAR SERIALIZER_JAR SYSTEM_SAXON SAXON_JAR CURLCONFIG SYSTEM_CURL CURL_CFLAGS CURL_LIBS SYSTEM_MDDS SYSTEM_BOOST SYSTEM_VIGRA SYSTEM_ODBC_HEADERS WITH_MOZILLA WITH_LDAP WITH_OPENLDAP MOZ_NSS_CFLAGS MOZ_NSS_LIBS NSS_LIB MOZ_NSPR_CFLAGS MOZ_NSPR_LIBS NSPR_LIB MOZILLAXPCOM_CFLAGS MOZILLAXPCOM_LIBS MOZILLA_VERSION MOZILLA_TOOLKIT MOZGTK2_CFLAGS MOZGTK2_LIBS MOZLIBREQ_CFLAGS MOZLIBREQ_LIBS BUILD_MOZAB ENABLE_NSS_MODULE MOZILLABUILD SYSTEM_MOZILLA MOZ_FLAVOUR MOZ_INC MOZ_LIB MOZ_LIB_XPCOM MOZ_LDAP_CFLAGS SYSTEM_SANE_HEADER SYSTEM_GENBRK SYSTEM_GENCCODE SYSTEM_GENCMN SYSTEM_ICU GRAPHITE_CFLAGS GRAPHITE_LIBS ENABLE_GRAPHITE SYSTEM_GRAPHITE X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS XINC XLIB XAU_LIBS DISABLE_XAW SYSTEM_XRENDER_HEADERS XRENDER_LINK XRANDR_CFLAGS XRANDR_LIBS XRANDR_DLOPEN ENABLE_RANDR DISABLE_NEON NEON_CFLAGS NEON_LIBS SYSTEM_NEON NEON_VERSION OPENSSL_CFLAGS OPENSSL_LIBS SYSTEM_OPENSSL ENABLE_AGG AGG_CFLAGS AGG_LIBS SYSTEM_AGG AGG_VERSION REDLAND_CFLAGS REDLAND_LIBS SYSTEM_REDLAND HUNSPELL_CFLAGS HUNSPELL_LIBS SYSTEM_HUNSPELL SYSTEM_HYPH HYPHEN_LIB MYTHES_CFLAGS MYTHES_LIBS SYSTEM_MYTHES SYSTEM_LPSOLVE SYSTEM_LIBTEXTCAT SYSTEM_LIBTEXTCAT_DATA HAVE_GETOPT HAVE_READDIR_R SYSTEM_LIBC PSDK_HOME WINDOWS_VISTA_PSDK DIRECTXSDK_HOME DIRECTXSDK_LIB NSIS_PATH BISON FLEX PATCH GNUCP GNUPATCH CYGWIN_PATH ML_EXE ASM_HOME ZIP UNZIP ZIP_HOME ENABLE_GTK ENABLE_KDE ENABLE_KDE4 GCONF_CFLAGS GCONF_LIBS ENABLE_GCONF GNOMEVFS_CFLAGS GNOMEVFS_LIBS ENABLE_GNOMEVFS GTK_CFLAGS GTK_LIBS DBUS_CFLAGS DBUS_LIBS GIO_CFLAGS GIO_LIBS ENABLE_GIO ENABLE_DBUS ENABLE_SYSTRAY_GTK GSTREAMER_CFLAGS GSTREAMER_LIBS ENABLE_GSTREAMER CAIRO_CFLAGS CAIRO_LIBS ENABLE_CAIRO BUILD_PIXMAN SYSTEM_CAIRO ENABLE_OPENGL ENABLE_PRESENTER_EXTRA_UI ENABLE_MINIMIZER ENABLE_PRESENTER_SCREEN POPPLER_CFLAGS POPPLER_LIBS ENABLE_PDFIMPORT SYSTEM_POPPLER ENABLE_MEDIAWIKI SYSTEM_SERVLETAPI SERVLETAPI_JAR ENABLE_REPORTBUILDER SYSTEM_JFREEREPORT SAC_JAR LIBXML_JAR FLUTE_JAR JFREEREPORT_JAR LIBBASE_JAR LIBLAYOUT_JAR LIBLOADER_JAR LIBFORMULA_JAR LIBREPOSITORY_JAR LIBFONTS_JAR LIBSERIALIZER_JAR SYSTEM_APACHE_COMMONS COMMONS_CODEC_JAR COMMONS_LANG_JAR COMMONS_HTTPCLIENT_JAR COMMONS_LOGGING_JAR MOC KDE_CFLAGS KDE_LIBS MOC4 KDE4_CFLAGS KDE4_LIBS ENABLE_LOCKDOWN GOBJECT_CFLAGS GOBJECT_LIBS ENABLE_EVOAB2 ENABLE_KAB WITH_FONTS WITHOUT_PPDS WITHOUT_AFMS SCPDEFS USE_XINERAMA XINERAMA_LINK ANT ANT_HOME ANT_LIB OOO_JUNIT_JAR WITH_LANG WITH_POOR_HELP_LOCALIZATIONS WITH_DICT INTRO_BITMAPS ABOUT_BITMAPS OOO_VENDOR UNIXWRAPPERNAME ENABLE_STATIC_GTK ENABLE_LAYOUT VERBOSE nodep LOCAL_SOLVER BUILD_TYPE LIBOBJS LTLIBOBJS' ac_subst_files='' -ac_user_opts=' -enable_option_checking -with_gnu_patch -with_agg -with_gnu_cp -enable_graphite -with_system_graphite -enable_ldap -enable_fetch_external -with_external_tar -with_openldap -enable_lockdown -enable_vba -with_vba_package_format -enable_pch -enable_mozilla -with_fonts -with_ppds -with_afms -enable_epm -with_epm -with_package_format -enable_odk -enable_mathmldtd -enable_evolution2 -with_system_stdlibs -enable_cups -enable_fontconfig -enable_directx -enable_activex -enable_atl -enable_symbols -enable_strip_solver -enable_werror -enable_debug -enable_dbgutil -enable_crashdump -enable_cl_standard -enable_gtk -enable_gstreamer -enable_systray -enable_cairo -with_system_cairo -enable_opengl -enable_dbus -enable_gconf -enable_gnome_vfs -enable_gio -enable_static_gtk -enable_layout -enable_build_mozilla -with_mozilla_version -with_mozilla_toolkit -enable_nss_module -enable_kde -enable_kdeab -enable_kde4 -enable_binfilter -enable_rpath -enable_pam -enable_pam_link -enable_crypt_link -enable_xrender_link -enable_randr -enable_randr_link -with_myspell_dicts -with_system_dicts -with_external_dict_dir -with_external_hyph_dir -with_external_thes_dir -with_system_libs -with_system_headers -with_system_jars -with_system_zlib -with_system_openssl -with_system_jpeg -with_system_expat -with_system_libwpd -with_system_libxml -with_system_python -with_system_icu -with_system_poppler -with_system_db -with_system_lucene -with_lucene_core_jar -with_lucene_analyzers_jar -enable_mysql_connector -with_system_mysql -with_libmysql_path -with_system_mysql_cppconn -with_system_hsqldb -with_hsqldb_jar -with_system_beanshell -with_beanshell_jar -enable_presenter_extra_ui -enable_minimizer -enable_presenter_console -enable_pdfimport -enable_wiki_publisher -with_commons_codec_jar -with_commons_lang_jar -with_commons_httpclient_jar -with_commons_logging_jar -with_servlet_api_jar -enable_report_builder -with_system_jfreereport -with_sac_jar -with_libxml_jar -with_flute_jar -with_jfreereport_jar -with_liblayout_jar -with_libloader_jar -with_libformula_jar -with_librepository_jar -with_libfonts_jar -with_libserializer_jar -with_libbase_jar -with_system_saxon -with_saxon_jar -with_system_libxslt -with_system_odbc -with_system_sane -with_system_xrender -with_system_curl -with_system_boost -with_system_mdds -with_system_vigra -enable_neon -enable_Xaw -with_system_neon -with_system_agg -with_system_hunspell -with_system_mythes -with_system_altlinuxhyph -with_system_lpsolve -with_system_libtextcat -with_external_libtextcat_data -with_system_cppunit -with_system_redland -with_system_mozilla -with_stlport -with_jdk_home -with_gxx_include_path -with_java -enable_gcjaot -with_ant_home -with_junit -with_perl_home -with_cl_home -with_mspdb_path -with_midl_path -with_csc_path -with_nsis_path -with_frame_home -with_psdk_home -with_directx_home -with_mozilla_build -with_local_solenv -with_local_solver -enable_check_only -enable_ccache_skip -with_lang -with_poor_help_localizations -with_dict -with_intro_bitmaps -with_about_bitmaps -with_vendor -with_unix_wrapper -with_asm_home -with_os_version -with_unzip_home -with_zip_home -with_mingwin -with_build_version -with_alloc -enable_verbose -enable_dependency_tracking -enable_largefile -with_x -' - ac_precious_vars='build_alias -host_alias -target_alias -CC -CFLAGS -LDFLAGS -LIBS -CPPFLAGS -CPP -CXX -CXXFLAGS -CCC -CXXCPP -XMKMF' - # Initialize some variables set by options. ac_init_help= ac_init_version=false -ac_unrecognized_opts= -ac_unrecognized_sep= # The variables have the same names as the options, with # dashes changed to underlines. cache_file=/dev/null @@ -1232,48 +337,34 @@ x_libraries=NONE # and all the variables that are supposed to be based on exec_prefix # by default will actually change. # Use braces instead of parens because sh, perl, etc. also accept them. -# (The list follows the same order as the GNU Coding Standards.) bindir='${exec_prefix}/bin' sbindir='${exec_prefix}/sbin' libexecdir='${exec_prefix}/libexec' -datarootdir='${prefix}/share' -datadir='${datarootdir}' +datadir='${prefix}/share' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +libdir='${exec_prefix}/lib' includedir='${prefix}/include' oldincludedir='/usr/include' -docdir='${datarootdir}/doc/${PACKAGE}' -infodir='${datarootdir}/info' -htmldir='${docdir}' -dvidir='${docdir}' -pdfdir='${docdir}' -psdir='${docdir}' -libdir='${exec_prefix}/lib' -localedir='${datarootdir}/locale' -mandir='${datarootdir}/man' +infodir='${prefix}/info' +mandir='${prefix}/man' ac_prev= -ac_dashdash= for ac_option do # If the previous option needs an argument, assign it. if test -n "$ac_prev"; then - eval $ac_prev=\$ac_option + eval "$ac_prev=\$ac_option" ac_prev= continue fi - case $ac_option in - *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; - *) ac_optarg=yes ;; - esac + ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'` # Accept the important Cygnus configure options, so we can diagnose typos. - case $ac_dashdash$ac_option in - --) - ac_dashdash=yes ;; + case $ac_option in -bindir | --bindir | --bindi | --bind | --bin | --bi) ac_prev=bindir ;; @@ -1295,59 +386,33 @@ do --config-cache | -C) cache_file=config.cache ;; - -datadir | --datadir | --datadi | --datad) + -datadir | --datadir | --datadi | --datad | --data | --dat | --da) ac_prev=datadir ;; - -datadir=* | --datadir=* | --datadi=* | --datad=*) + -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \ + | --da=*) datadir=$ac_optarg ;; - -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ - | --dataroo | --dataro | --datar) - ac_prev=datarootdir ;; - -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ - | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) - datarootdir=$ac_optarg ;; - -disable-* | --disable-*) - ac_useropt=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--disable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval enable_$ac_useropt=no ;; - - -docdir | --docdir | --docdi | --doc | --do) - ac_prev=docdir ;; - -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) - docdir=$ac_optarg ;; - - -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) - ac_prev=dvidir ;; - -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) - dvidir=$ac_optarg ;; + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + eval "enable_$ac_feature=no" ;; -enable-* | --enable-*) - ac_useropt=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid feature name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"enable_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--enable-$ac_useropt_orig" - ac_unrecognized_sep=', ';; + expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *) ac_optarg=yes ;; esac - eval enable_$ac_useropt=\$ac_optarg ;; + eval "enable_$ac_feature='$ac_optarg'" ;; -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ @@ -1374,12 +439,6 @@ do -host=* | --host=* | --hos=* | --ho=*) host_alias=$ac_optarg ;; - -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) - ac_prev=htmldir ;; - -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ - | --ht=*) - htmldir=$ac_optarg ;; - -includedir | --includedir | --includedi | --included | --include \ | --includ | --inclu | --incl | --inc) ac_prev=includedir ;; @@ -1404,16 +463,13 @@ do | --libexe=* | --libex=* | --libe=*) libexecdir=$ac_optarg ;; - -localedir | --localedir | --localedi | --localed | --locale) - ac_prev=localedir ;; - -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) - localedir=$ac_optarg ;; - -localstatedir | --localstatedir | --localstatedi | --localstated \ - | --localstate | --localstat | --localsta | --localst | --locals) + | --localstate | --localstat | --localsta | --localst \ + | --locals | --local | --loca | --loc | --lo) ac_prev=localstatedir ;; -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ - | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + | --localstate=* | --localstat=* | --localsta=* | --localst=* \ + | --locals=* | --local=* | --loca=* | --loc=* | --lo=*) localstatedir=$ac_optarg ;; -mandir | --mandir | --mandi | --mand | --man | --ma | --m) @@ -1478,16 +534,6 @@ do | --progr-tra=* | --program-tr=* | --program-t=*) program_transform_name=$ac_optarg ;; - -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) - ac_prev=pdfdir ;; - -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) - pdfdir=$ac_optarg ;; - - -psdir | --psdir | --psdi | --psd | --ps) - ac_prev=psdir ;; - -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) - psdir=$ac_optarg ;; - -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) silent=yes ;; @@ -1538,36 +584,26 @@ do ac_init_version=: ;; -with-* | --with-*) - ac_useropt=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--with-$ac_useropt_orig" - ac_unrecognized_sep=', ';; + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package| sed 's/-/_/g'` + case $ac_option in + *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;; + *) ac_optarg=yes ;; esac - eval with_$ac_useropt=\$ac_optarg ;; + eval "with_$ac_package='$ac_optarg'" ;; -without-* | --without-*) - ac_useropt=`expr "x$ac_option" : 'x-*without-\(.*\)'` + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` # Reject names that are not valid shell variable names. - expr "x$ac_useropt" : ".*[^-+._$as_cr_alnum]" >/dev/null && - as_fn_error "invalid package name: $ac_useropt" - ac_useropt_orig=$ac_useropt - ac_useropt=`$as_echo "$ac_useropt" | sed 's/[-+.]/_/g'` - case $ac_user_opts in - *" -"with_$ac_useropt" -"*) ;; - *) ac_unrecognized_opts="$ac_unrecognized_opts$ac_unrecognized_sep--without-$ac_useropt_orig" - ac_unrecognized_sep=', ';; - esac - eval with_$ac_useropt=no ;; + expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/-/_/g'` + eval "with_$ac_package=no" ;; --x) # Obsolete; use --with-x. @@ -1587,25 +623,26 @@ do | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) x_libraries=$ac_optarg ;; - -*) as_fn_error "unrecognized option: \`$ac_option' -Try \`$0 --help' for more information." + -*) { echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; *=*) ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` # Reject names that are not valid shell variable names. - case $ac_envvar in #( - '' | [0-9]* | *[!_$as_cr_alnum]* ) - as_fn_error "invalid variable name: \`$ac_envvar'" ;; - esac - eval $ac_envvar=\$ac_optarg + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` + eval "$ac_envvar='$ac_optarg'" export $ac_envvar ;; *) # FIXME: should be removed in autoconf 3.0. - $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && - $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} ;; @@ -1614,36 +651,31 @@ done if test -n "$ac_prev"; then ac_option=--`echo $ac_prev | sed 's/_/-/g'` - as_fn_error "missing argument to $ac_option" -fi - -if test -n "$ac_unrecognized_opts"; then - case $enable_option_checking in - no) ;; - fatal) as_fn_error "unrecognized options: $ac_unrecognized_opts" ;; - *) $as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2 ;; - esac + { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } fi -# Check all directory arguments for consistency. -for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ - datadir sysconfdir sharedstatedir localstatedir includedir \ - oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir +# Be sure to have absolute paths. +for ac_var in exec_prefix prefix do - eval ac_val=\$$ac_var - # Remove trailing slashes. + eval ac_val=$`echo $ac_var` case $ac_val in - */ ) - ac_val=`expr "X$ac_val" : 'X\(.*[^/]\)' \| "X$ac_val" : 'X\(.*\)'` - eval $ac_var=\$ac_val;; + [\\/$]* | ?:[\\/]* | NONE | '' ) ;; + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; esac - # Be sure to have absolute directory names. +done + +# Be sure to have absolute paths. +for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \ + localstatedir libdir includedir oldincludedir infodir mandir +do + eval ac_val=$`echo $ac_var` case $ac_val in - [\\/$]* | ?:[\\/]* ) continue;; - NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + [\\/$]* | ?:[\\/]* ) ;; + *) { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; };; esac - as_fn_error "expected an absolute directory name for --$ac_var: $ac_val" done # There might be people who depend on the old broken behavior: `$host' @@ -1657,7 +689,7 @@ target=$target_alias if test "x$host_alias" != x; then if test "x$build_alias" = x; then cross_compiling=maybe - $as_echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. If a cross compiler is detected then cross compile mode will be used." >&2 elif test "x$build_alias" != "x$host_alias"; then cross_compiling=yes @@ -1670,72 +702,86 @@ test -n "$host_alias" && ac_tool_prefix=$host_alias- test "$silent" = yes && exec 6>/dev/null -ac_pwd=`pwd` && test -n "$ac_pwd" && -ac_ls_di=`ls -di .` && -ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || - as_fn_error "working directory cannot be determined" -test "X$ac_ls_di" = "X$ac_pwd_ls_di" || - as_fn_error "pwd does not report name of working directory" - - # Find the source files, if location was not specified. if test -z "$srcdir"; then ac_srcdir_defaulted=yes - # Try the directory containing this script, then the parent directory. - ac_confdir=`$as_dirname -- "$as_myself" || -$as_expr X"$as_myself" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_myself" : 'X\(//\)[^/]' \| \ - X"$as_myself" : 'X\(//\)$' \| \ - X"$as_myself" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_myself" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + # Try the directory containing this script, then its parent. + ac_confdir=`(dirname "$0") 2>/dev/null || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` srcdir=$ac_confdir - if test ! -r "$srcdir/$ac_unique_file"; then + if test ! -r $srcdir/$ac_unique_file; then srcdir=.. fi else ac_srcdir_defaulted=no fi -if test ! -r "$srcdir/$ac_unique_file"; then - test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." - as_fn_error "cannot find sources ($ac_unique_file) in $srcdir" -fi -ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" -ac_abs_confdir=`( - cd "$srcdir" && test -r "./$ac_unique_file" || as_fn_error "$ac_msg" - pwd)` -# When building in place, set srcdir=. -if test "$ac_abs_confdir" = "$ac_pwd"; then - srcdir=. -fi -# Remove unnecessary trailing slashes from srcdir. -# Double slashes in file names in object file debugging info -# mess up M-x gdb in Emacs. -case $srcdir in -*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; -esac -for ac_var in $ac_precious_vars; do - eval ac_env_${ac_var}_set=\${${ac_var}+set} - eval ac_env_${ac_var}_value=\$${ac_var} - eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} - eval ac_cv_env_${ac_var}_value=\$${ac_var} -done +if test ! -r $srcdir/$ac_unique_file; then + if test "$ac_srcdir_defaulted" = yes; then + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2 + { (exit 1); exit 1; }; } + else + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } + fi +fi +(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null || + { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2 + { (exit 1); exit 1; }; } +srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'` +ac_env_build_alias_set=${build_alias+set} +ac_env_build_alias_value=$build_alias +ac_cv_env_build_alias_set=${build_alias+set} +ac_cv_env_build_alias_value=$build_alias +ac_env_host_alias_set=${host_alias+set} +ac_env_host_alias_value=$host_alias +ac_cv_env_host_alias_set=${host_alias+set} +ac_cv_env_host_alias_value=$host_alias +ac_env_target_alias_set=${target_alias+set} +ac_env_target_alias_value=$target_alias +ac_cv_env_target_alias_set=${target_alias+set} +ac_cv_env_target_alias_value=$target_alias +ac_env_CC_set=${CC+set} +ac_env_CC_value=$CC +ac_cv_env_CC_set=${CC+set} +ac_cv_env_CC_value=$CC +ac_env_CFLAGS_set=${CFLAGS+set} +ac_env_CFLAGS_value=$CFLAGS +ac_cv_env_CFLAGS_set=${CFLAGS+set} +ac_cv_env_CFLAGS_value=$CFLAGS +ac_env_LDFLAGS_set=${LDFLAGS+set} +ac_env_LDFLAGS_value=$LDFLAGS +ac_cv_env_LDFLAGS_set=${LDFLAGS+set} +ac_cv_env_LDFLAGS_value=$LDFLAGS +ac_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_env_CPPFLAGS_value=$CPPFLAGS +ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set} +ac_cv_env_CPPFLAGS_value=$CPPFLAGS +ac_env_CPP_set=${CPP+set} +ac_env_CPP_value=$CPP +ac_cv_env_CPP_set=${CPP+set} +ac_cv_env_CPP_value=$CPP +ac_env_CXX_set=${CXX+set} +ac_env_CXX_value=$CXX +ac_cv_env_CXX_set=${CXX+set} +ac_cv_env_CXX_value=$CXX +ac_env_CXXFLAGS_set=${CXXFLAGS+set} +ac_env_CXXFLAGS_value=$CXXFLAGS +ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set} +ac_cv_env_CXXFLAGS_value=$CXXFLAGS +ac_env_CXXCPP_set=${CXXCPP+set} +ac_env_CXXCPP_value=$CXXCPP +ac_cv_env_CXXCPP_set=${CXXCPP+set} +ac_cv_env_CXXCPP_value=$CXXCPP # # Report the --help message. @@ -1764,11 +810,14 @@ Configuration: -n, --no-create do not create output files --srcdir=DIR find the sources in DIR [configure dir or \`..'] +_ACEOF + + cat <<_ACEOF Installation directories: --prefix=PREFIX install architecture-independent files in PREFIX - [$ac_default_prefix] + [$ac_default_prefix] --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX - [PREFIX] + [PREFIX] By default, \`make install' will install all the files in \`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify @@ -1778,25 +827,18 @@ for instance \`--prefix=\$HOME'. For better control, use the options below. Fine tuning of the installation directories: - --bindir=DIR user executables [EPREFIX/bin] - --sbindir=DIR system admin executables [EPREFIX/sbin] - --libexecdir=DIR program executables [EPREFIX/libexec] - --sysconfdir=DIR read-only single-machine data [PREFIX/etc] - --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] - --localstatedir=DIR modifiable single-machine data [PREFIX/var] - --libdir=DIR object code libraries [EPREFIX/lib] - --includedir=DIR C header files [PREFIX/include] - --oldincludedir=DIR C header files for non-gcc [/usr/include] - --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] - --datadir=DIR read-only architecture-independent data [DATAROOTDIR] - --infodir=DIR info documentation [DATAROOTDIR/info] - --localedir=DIR locale-dependent data [DATAROOTDIR/locale] - --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR documentation root [DATAROOTDIR/doc/PACKAGE] - --htmldir=DIR html documentation [DOCDIR] - --dvidir=DIR dvi documentation [DOCDIR] - --pdfdir=DIR pdf documentation [DOCDIR] - --psdir=DIR ps documentation [DOCDIR] + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --datadir=DIR read-only architecture-independent data [PREFIX/share] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --infodir=DIR info documentation [PREFIX/info] + --mandir=DIR man documentation [PREFIX/man] _ACEOF cat <<\_ACEOF @@ -1817,7 +859,6 @@ if test -n "$ac_init_help"; then cat <<\_ACEOF Optional Features: - --disable-option-checking ignore unrecognized --enable/--with options --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-graphite Enables the compilation of Graphite smart font rendering @@ -2419,975 +1460,165 @@ Some influential environment variables: CFLAGS C compiler flags LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - LIBS libraries to pass to the linker, e.g. -l - CPPFLAGS (Objective) C/C++ preprocessor flags, e.g. -I if - you have headers in a nonstandard directory + CPPFLAGS C/C++ preprocessor flags, e.g. -I if you have + headers in a nonstandard directory CPP C preprocessor CXX C++ compiler command CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor - XMKMF Path to xmkmf, Makefile generator for X Window System Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to the package provider. _ACEOF -ac_status=$? fi if test "$ac_init_help" = "recursive"; then # If there are subdirs, report their specific --help. + ac_popdir=`pwd` for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue - test -d "$ac_dir" || - { cd "$srcdir" && ac_pwd=`pwd` && srcdir=. && test -d "$ac_dir"; } || - continue + test -d $ac_dir || continue ac_builddir=. -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi case $srcdir in - .) # We are building in place. + .) # No --srcdir option. We are building in place. ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; +esac + +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix - - cd "$ac_dir" || { ac_status=$?; continue; } - # Check for guested configure. - if test -f "$ac_srcdir/configure.gnu"; then - echo && - $SHELL "$ac_srcdir/configure.gnu" --help=recursive - elif test -f "$ac_srcdir/configure"; then - echo && - $SHELL "$ac_srcdir/configure" --help=recursive +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac + + cd $ac_dir + # Check for guested configure; otherwise get Cygnus style configure. + if test -f $ac_srcdir/configure.gnu; then + echo + $SHELL $ac_srcdir/configure.gnu --help=recursive + elif test -f $ac_srcdir/configure; then + echo + $SHELL $ac_srcdir/configure --help=recursive + elif test -f $ac_srcdir/configure.ac || + test -f $ac_srcdir/configure.in; then + echo + $ac_configure --help else - $as_echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 - fi || ac_status=$? - cd "$ac_pwd" || { ac_status=$?; break; } + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi + cd $ac_popdir done fi -test -n "$ac_init_help" && exit $ac_status +test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -configure -generated by GNU Autoconf 2.65 -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This configure script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it. _ACEOF - exit + exit 0 fi +exec 5>config.log +cat >&5 <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. -## ------------------------ ## -## Autoconf initialization. ## -## ------------------------ ## +It was created by $as_me, which was +generated by GNU Autoconf 2.59. Invocation command line was + + $ $0 $@ -# ac_fn_c_try_compile LINENO -# -------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_compile () +_ACEOF { - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## - ac_retval=1 -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` -} # ac_fn_c_try_compile +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +hostinfo = `(hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval +_ASUNAME -} # ac_fn_c_try_link +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done -# ac_fn_c_try_cpp LINENO -# ---------------------- -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { - test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 +} >&5 - ac_retval=1 -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval - -} # ac_fn_c_try_cpp - -# ac_fn_c_try_run LINENO -# ---------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_c_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval - -} # ac_fn_c_try_run - -# ac_fn_cxx_try_compile LINENO -# ---------------------------- -# Try to compile conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_compile () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext - if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_compile - -# ac_fn_cxx_try_cpp LINENO -# ------------------------ -# Try to preprocess conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_cpp () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_cpp conftest.$ac_ext" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_cpp conftest.$ac_ext") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } >/dev/null && { - test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" || - test ! -s conftest.err - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_cpp - -# ac_fn_c_compute_int LINENO EXPR VAR INCLUDES -# -------------------------------------------- -# Tries to find the compile-time value of EXPR in a program that includes -# INCLUDES, setting VAR accordingly. Returns whether the value could be -# computed -ac_fn_c_compute_int () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if test "$cross_compiling" = yes; then - # Depending upon the size, compute the lo and hi bounds. -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) >= 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_lo=0 ac_mid=0 - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_hi=$ac_mid; break -else - as_fn_arith $ac_mid + 1 && ac_lo=$as_val - if test $ac_lo -le $ac_mid; then - ac_lo= ac_hi= - break - fi - as_fn_arith 2 '*' $ac_mid + 1 && ac_mid=$as_val -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) < 0)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_hi=-1 ac_mid=-1 - while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) >= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_lo=$ac_mid; break -else - as_fn_arith '(' $ac_mid ')' - 1 && ac_hi=$as_val - if test $ac_mid -le $ac_hi; then - ac_lo= ac_hi= - break - fi - as_fn_arith 2 '*' $ac_mid && ac_mid=$as_val -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - done -else - ac_lo= ac_hi= -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -# Binary search between lo and hi bounds. -while test "x$ac_lo" != "x$ac_hi"; do - as_fn_arith '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo && ac_mid=$as_val - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -int -main () -{ -static int test_array [1 - 2 * !(($2) <= $ac_mid)]; -test_array [0] = 0 - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_hi=$ac_mid -else - as_fn_arith '(' $ac_mid ')' + 1 && ac_lo=$as_val -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -done -case $ac_lo in #(( -?*) eval "$3=\$ac_lo"; ac_retval=0 ;; -'') ac_retval=1 ;; -esac - else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -static long int longval () { return $2; } -static unsigned long int ulongval () { return $2; } -#include -#include -int -main () -{ - - FILE *f = fopen ("conftest.val", "w"); - if (! f) - return 1; - if (($2) < 0) - { - long int i = longval (); - if (i != ($2)) - return 1; - fprintf (f, "%ld", i); - } - else - { - unsigned long int i = ulongval (); - if (i != ($2)) - return 1; - fprintf (f, "%lu", i); - } - /* Do not output a trailing newline, as this causes \r\n confusion - on some platforms. */ - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -if ac_fn_c_try_run "$LINENO"; then : - echo >>conftest.val; read $3 &5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_header_compile - -# ac_fn_c_check_header_mongrel LINENO HEADER VAR INCLUDES -# ------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_c_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_header_mongrel - -# ac_fn_cxx_try_link LINENO -# ------------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_cxx_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_cxx_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - $as_test_x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_link - -# ac_fn_c_check_func LINENO FUNC VAR -# ---------------------------------- -# Tests whether FUNC exists, setting the cache variable VAR accordingly -ac_fn_c_check_func () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -/* Define $2 to an innocuous variant, in case declares $2. - For example, HP-UX 11i declares gettimeofday. */ -#define $2 innocuous_$2 - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $2 (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $2 - -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ -#ifdef __cplusplus -extern "C" -#endif -char $2 (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined __stub_$2 || defined __stub___$2 -choke me -#endif - -int -main () -{ -return $2 (); - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - eval "$3=yes" -else - eval "$3=no" -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_func - -# ac_fn_cxx_check_header_mongrel LINENO HEADER VAR INCLUDES -# --------------------------------------------------------- -# Tests whether HEADER exists, giving a warning if it cannot be compiled using -# the include files in INCLUDES and setting the cache variable VAR -# accordingly. -ac_fn_cxx_check_header_mongrel () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -else - # Is the header compilable? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 usability" >&5 -$as_echo_n "checking $2 usability... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$4 -#include <$2> -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_header_compiler=yes -else - ac_header_compiler=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_compiler" >&5 -$as_echo "$ac_header_compiler" >&6; } - -# Is the header present? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking $2 presence" >&5 -$as_echo_n "checking $2 presence... " >&6; } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include <$2> -_ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - ac_header_preproc=yes -else - ac_header_preproc=no -fi -rm -f conftest.err conftest.$ac_ext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_header_preproc" >&5 -$as_echo "$ac_header_preproc" >&6; } - -# So? What about this header? -case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in #(( - yes:no: ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&5 -$as_echo "$as_me: WARNING: $2: accepted by the compiler, rejected by the preprocessor!" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; - no:yes:* ) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: present but cannot be compiled" >&5 -$as_echo "$as_me: WARNING: $2: present but cannot be compiled" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: check for missing prerequisite headers?" >&5 -$as_echo "$as_me: WARNING: $2: check for missing prerequisite headers?" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: see the Autoconf documentation" >&5 -$as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&5 -$as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 -$as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} - ;; -esac - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5 -$as_echo_n "checking for $2... " >&6; } -if { as_var=$3; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - eval "$3=\$ac_header_compiler" -fi -eval ac_res=\$$3 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -fi - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_cxx_check_header_mongrel - -# ac_fn_cxx_try_run LINENO -# ------------------------ -# Try to link conftest.$ac_ext, and return whether this succeeded. Assumes -# that executables *can* be run. -ac_fn_cxx_try_run () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { ac_try='./conftest$ac_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then : - ac_retval=0 -else - $as_echo "$as_me: program exited with status $ac_status" >&5 - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=$ac_status -fi - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - as_fn_set_status $ac_retval - -} # ac_fn_cxx_try_run - -# ac_fn_c_check_member LINENO AGGR MEMBER VAR INCLUDES -# ---------------------------------------------------- -# Tries to find if the field MEMBER exists in type AGGR, after including -# INCLUDES, setting cache variable VAR accordingly. -ac_fn_c_check_member () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2.$3" >&5 -$as_echo_n "checking for $2.$3... " >&6; } -if { as_var=$4; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$5 -int -main () -{ -static $2 ac_aggr; -if (ac_aggr.$3) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$4=yes" -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -$5 -int -main () -{ -static $2 ac_aggr; -if (sizeof ac_aggr.$3) -return 0; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - eval "$4=yes" -else - eval "$4=no" -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -eval ac_res=\$$4 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } - eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;} - -} # ac_fn_c_check_member -cat >config.log <<_ACEOF -This file contains any messages produced by compilers while -running configure, to aid debugging if configure makes a mistake. - -It was created by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was - - $ $0 $@ - -_ACEOF -exec 5>>config.log -{ -cat <<_ASUNAME -## --------- ## -## Platform. ## -## --------- ## - -hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` -uname -m = `(uname -m) 2>/dev/null || echo unknown` -uname -r = `(uname -r) 2>/dev/null || echo unknown` -uname -s = `(uname -s) 2>/dev/null || echo unknown` -uname -v = `(uname -v) 2>/dev/null || echo unknown` - -/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` -/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` - -/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` -/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` -/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` -/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` -/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` -/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` -/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` - -_ASUNAME - -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - $as_echo "PATH: $as_dir" - done -IFS=$as_save_IFS - -} >&5 - -cat >&5 <<_ACEOF +cat >&5 <<_ACEOF ## ----------- ## @@ -3405,6 +1636,7 @@ _ACEOF ac_configure_args= ac_configure_args0= ac_configure_args1= +ac_sep= ac_must_keep_next=false for ac_pass in 1 2 do @@ -3415,13 +1647,13 @@ do -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil) continue ;; - *\'*) - ac_arg=`$as_echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; esac case $ac_pass in - 1) as_fn_append ac_configure_args0 " '$ac_arg'" ;; + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; 2) - as_fn_append ac_configure_args1 " '$ac_arg'" + ac_configure_args1="$ac_configure_args1 '$ac_arg'" if test $ac_must_keep_next = true; then ac_must_keep_next=false # Got value, back to normal. else @@ -3437,19 +1669,21 @@ do -* ) ac_must_keep_next=true ;; esac fi - as_fn_append ac_configure_args " '$ac_arg'" + ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'" + # Get rid of the leading space. + ac_sep=" " ;; esac done done -{ ac_configure_args0=; unset ac_configure_args0;} -{ ac_configure_args1=; unset ac_configure_args1;} +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } # When interrupted or exit'd, cleanup temporary files, and complete # config.log. We remove comments because anyway the quotes in there # would cause problems or look ugly. -# WARNING: Use '\'' to represent an apostrophe within the trap. -# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +# WARNING: Be sure not to use single quotes in there, as some shells, +# such as our DU 5.0 friend, will then `close' the trap. trap 'exit_status=$? # Save into config.log some information that might help in debugging. { @@ -3462,35 +1696,20 @@ trap 'exit_status=$? _ASBOX echo # The following way of writing the cache mishandles newlines in values, -( - for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done +{ (set) 2>&1 | - case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( - *${as_nl}ac_space=\ *) + case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in + *ac_space=\ *) sed -n \ - "s/'\''/'\''\\\\'\'''\''/g; - s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" - ;; #( + "s/'"'"'/'"'"'\\\\'"'"''"'"'/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p" + ;; *) - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; - esac | - sort -) + esac; +} echo cat <<\_ASBOX @@ -3501,28 +1720,22 @@ _ASBOX echo for ac_var in $ac_subst_vars do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo if test -n "$ac_subst_files"; then cat <<\_ASBOX -## ------------------- ## -## File substitutions. ## -## ------------------- ## +## ------------- ## +## Output files. ## +## ------------- ## _ASBOX echo for ac_var in $ac_subst_files do - eval ac_val=\$$ac_var - case $ac_val in - *\'\''*) ac_val=`$as_echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; - esac - $as_echo "$ac_var='\''$ac_val'\''" + eval ac_val=$`echo $ac_var` + echo "$ac_var='"'"'$ac_val'"'"'" done | sort echo fi @@ -3534,26 +1747,26 @@ _ASBOX ## ----------- ## _ASBOX echo - cat confdefs.h + sed "/^$/d" confdefs.h | sort echo fi test "$ac_signal" != 0 && - $as_echo "$as_me: caught signal $ac_signal" - $as_echo "$as_me: exit $exit_status" + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" } >&5 - rm -f core *.core core.conftest.* && - rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + rm -f core *.core && + rm -rf conftest* confdefs* conf$$* $ac_clean_files && exit $exit_status -' 0 + ' 0 for ac_signal in 1 2 13 15; do - trap 'ac_signal='$ac_signal'; as_fn_exit 1' $ac_signal + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal done ac_signal=0 # confdefs.h avoids OS command line length limits that DEFS can exceed. -rm -f -r conftest* confdefs.h - -$as_echo "/* confdefs.h */" > confdefs.h +rm -rf conftest* confdefs.h +# AIX cpp loses on an empty file, so make sure it contains at least a newline. +echo >confdefs.h # Predefined preprocessor variables. @@ -3561,1217 +1774,1218 @@ cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" _ACEOF + cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" _ACEOF + cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" _ACEOF + cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" _ACEOF -cat >>confdefs.h <<_ACEOF -#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" -_ACEOF cat >>confdefs.h <<_ACEOF -#define PACKAGE_URL "$PACKAGE_URL" +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" _ACEOF # Let the site file select an alternate cache file if it wants to. -# Prefer an explicitly selected file to automatically selected ones. -ac_site_file1=NONE -ac_site_file2=NONE -if test -n "$CONFIG_SITE"; then - ac_site_file1=$CONFIG_SITE -elif test "x$prefix" != xNONE; then - ac_site_file1=$prefix/share/config.site - ac_site_file2=$prefix/etc/config.site -else - ac_site_file1=$ac_default_prefix/share/config.site - ac_site_file2=$ac_default_prefix/etc/config.site -fi -for ac_site_file in "$ac_site_file1" "$ac_site_file2" -do - test "x$ac_site_file" = xNONE && continue - if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading site script $ac_site_file" >&5 -$as_echo "$as_me: loading site script $ac_site_file" >&6;} +# Prefer explicitly selected file to automatically selected ones. +if test -z "$CONFIG_SITE"; then + if test "x$prefix" != xNONE; then + CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site" + else + CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site" + fi +fi +for ac_site_file in $CONFIG_SITE; do + if test -r "$ac_site_file"; then + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} sed 's/^/| /' "$ac_site_file" >&5 . "$ac_site_file" fi done if test -r "$cache_file"; then - # Some versions of bash will fail to source /dev/null (special files - # actually), so we avoid doing that. DJGPP emulates it as a regular file. - if test /dev/null != "$cache_file" && test -f "$cache_file"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: loading cache $cache_file" >&5 -$as_echo "$as_me: loading cache $cache_file" >&6;} + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +echo "$as_me: loading cache $cache_file" >&6;} case $cache_file in - [\\/]* | ?:[\\/]* ) . "$cache_file";; - *) . "./$cache_file";; + [\\/]* | ?:[\\/]* ) . $cache_file;; + *) . ./$cache_file;; esac fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: creating cache $cache_file" >&5 -$as_echo "$as_me: creating cache $cache_file" >&6;} + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +echo "$as_me: creating cache $cache_file" >&6;} >$cache_file fi # Check that the precious variables saved in the cache have kept the same # value. ac_cache_corrupted=false -for ac_var in $ac_precious_vars; do +for ac_var in `(set) 2>&1 | + sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do eval ac_old_set=\$ac_cv_env_${ac_var}_set eval ac_new_set=\$ac_env_${ac_var}_set - eval ac_old_val=\$ac_cv_env_${ac_var}_value - eval ac_new_val=\$ac_env_${ac_var}_value + eval ac_old_val="\$ac_cv_env_${ac_var}_value" + eval ac_new_val="\$ac_env_${ac_var}_value" case $ac_old_set,$ac_new_set in set,) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} ac_cache_corrupted=: ;; ,set) - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' was not set in the previous run" >&5 -$as_echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} ac_cache_corrupted=: ;; ,);; *) if test "x$ac_old_val" != "x$ac_new_val"; then - # differences in whitespace do not lead to failure. - ac_old_val_w=`echo x $ac_old_val` - ac_new_val_w=`echo x $ac_new_val` - if test "$ac_old_val_w" != "$ac_new_val_w"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: \`$ac_var' has changed since the previous run:" >&5 -$as_echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} - ac_cache_corrupted=: - else - { $as_echo "$as_me:${as_lineno-$LINENO}: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&5 -$as_echo "$as_me: warning: ignoring whitespace changes in \`$ac_var' since the previous run:" >&2;} - eval $ac_var=\$ac_old_val - fi - { $as_echo "$as_me:${as_lineno-$LINENO}: former value: \`$ac_old_val'" >&5 -$as_echo "$as_me: former value: \`$ac_old_val'" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: current value: \`$ac_new_val'" >&5 -$as_echo "$as_me: current value: \`$ac_new_val'" >&2;} + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: fi;; esac # Pass precious variables to config.status. if test "$ac_new_set" = set; then case $ac_new_val in - *\'*) ac_arg=$ac_var=`$as_echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *" "*|*" "*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*) + ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; *) ac_arg=$ac_var=$ac_new_val ;; esac case " $ac_configure_args " in *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. - *) as_fn_append ac_configure_args " '$ac_arg'" ;; + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; esac fi done if $ac_cache_corrupted; then - { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: error: changes in the environment can compromise the build" >&5 -$as_echo "$as_me: error: changes in the environment can compromise the build" >&2;} - as_fn_error "run \`make distclean' and/or \`rm $cache_file' and start over" "$LINENO" 5 + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } fi -## -------------------- ## -## Main body of script. ## -## -------------------- ## -ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + + + + + + + + + + + + + + + + echo "$@" >config.parms -# Check whether --with-gnu-patch was given. -if test "${with_gnu_patch+set}" = set; then : - withval=$with_gnu_patch; -fi +# Check whether --with-gnu-patch or --without-gnu-patch was given. +if test "${with_gnu_patch+set}" = set; then + withval="$with_gnu_patch" +fi; + +# Check whether --with-agg or --without-agg was given. +if test "${with_agg+set}" = set; then + withval="$with_agg" -# Check whether --with-agg was given. -if test "${with_agg+set}" = set; then : - withval=$with_agg; else with_agg=yes -fi +fi; +# Check whether --with-gnu-cp or --without-gnu-cp was given. +if test "${with_gnu_cp+set}" = set; then + withval="$with_gnu_cp" -# Check whether --with-gnu-cp was given. -if test "${with_gnu_cp+set}" = set; then : - withval=$with_gnu_cp; -fi - -# Check whether --enable-graphite was given. -if test "${enable_graphite+set}" = set; then : - enableval=$enable_graphite; -fi +fi; +# Check whether --enable-graphite or --disable-graphite was given. +if test "${enable_graphite+set}" = set; then + enableval="$enable_graphite" +fi; -# Check whether --with-system-graphite was given. -if test "${with_system_graphite+set}" = set; then : - withval=$with_system_graphite; -fi +# Check whether --with-system-graphite or --without-system-graphite was given. +if test "${with_system_graphite+set}" = set; then + withval="$with_system_graphite" -# Check whether --enable-ldap was given. -if test "${enable_ldap+set}" = set; then : - enableval=$enable_ldap; -fi +fi; +# Check whether --enable-ldap or --disable-ldap was given. +if test "${enable_ldap+set}" = set; then + enableval="$enable_ldap" -# Check whether --enable-fetch-external was given. -if test "${enable_fetch_external+set}" = set; then : - enableval=$enable_fetch_external; -fi +fi; +# Check whether --enable-fetch-external or --disable-fetch-external was given. +if test "${enable_fetch_external+set}" = set; then + enableval="$enable_fetch_external" +fi; -# Check whether --with-external-tar was given. -if test "${with_external_tar+set}" = set; then : - withval=$with_external_tar; TARFILE_LOCATION="$withval" +# Check whether --with-external-tar or --without-external-tar was given. +if test "${with_external_tar+set}" = set; then + withval="$with_external_tar" + TARFILE_LOCATION="$withval" -fi +fi; +# Check whether --with-openldap or --without-openldap was given. +if test "${with_openldap+set}" = set; then + withval="$with_openldap" -# Check whether --with-openldap was given. -if test "${with_openldap+set}" = set; then : - withval=$with_openldap; -fi +fi; +# Check whether --enable-lockdown or --disable-lockdown was given. +if test "${enable_lockdown+set}" = set; then + enableval="$enable_lockdown" -# Check whether --enable-lockdown was given. -if test "${enable_lockdown+set}" = set; then : - enableval=$enable_lockdown; -fi +fi; +# Check whether --enable-vba or --disable-vba was given. +if test "${enable_vba+set}" = set; then + enableval="$enable_vba" -# Check whether --enable-vba was given. -if test "${enable_vba+set}" = set; then : - enableval=$enable_vba; -fi +fi; +# Check whether --with-vba-package-format or --without-vba-package-format was given. +if test "${with_vba_package_format+set}" = set; then + withval="$with_vba_package_format" -# Check whether --with-vba-package-format was given. -if test "${with_vba_package_format+set}" = set; then : - withval=$with_vba_package_format; -fi +fi; +# Check whether --enable-pch or --disable-pch was given. +if test "${enable_pch+set}" = set; then + enableval="$enable_pch" -# Check whether --enable-pch was given. -if test "${enable_pch+set}" = set; then : - enableval=$enable_pch; -fi +fi; +# Check whether --enable-mozilla or --disable-mozilla was given. +if test "${enable_mozilla+set}" = set; then + enableval="$enable_mozilla" -# Check whether --enable-mozilla was given. -if test "${enable_mozilla+set}" = set; then : - enableval=$enable_mozilla; else enable_mozilla="yes" -fi +fi; +# Check whether --with-fonts or --without-fonts was given. +if test "${with_fonts+set}" = set; then + withval="$with_fonts" -# Check whether --with-fonts was given. -if test "${with_fonts+set}" = set; then : - withval=$with_fonts; -fi +fi; +# Check whether --with-ppds or --without-ppds was given. +if test "${with_ppds+set}" = set; then + withval="$with_ppds" -# Check whether --with-ppds was given. -if test "${with_ppds+set}" = set; then : - withval=$with_ppds; -fi +fi; +# Check whether --with-afms or --without-afms was given. +if test "${with_afms+set}" = set; then + withval="$with_afms" -# Check whether --with-afms was given. -if test "${with_afms+set}" = set; then : - withval=$with_afms; -fi +fi; +# Check whether --enable-epm or --disable-epm was given. +if test "${enable_epm+set}" = set; then + enableval="$enable_epm" -# Check whether --enable-epm was given. -if test "${enable_epm+set}" = set; then : - enableval=$enable_epm; else enable_epm="yes" -fi +fi; +# Check whether --with-epm or --without-epm was given. +if test "${with_epm+set}" = set; then + withval="$with_epm" -# Check whether --with-epm was given. -if test "${with_epm+set}" = set; then : - withval=$with_epm; -fi +fi; +# Check whether --with-package-format or --without-package-format was given. +if test "${with_package_format+set}" = set; then + withval="$with_package_format" -# Check whether --with-package-format was given. -if test "${with_package_format+set}" = set; then : - withval=$with_package_format; -fi +fi; +# Check whether --enable-odk or --disable-odk was given. +if test "${enable_odk+set}" = set; then + enableval="$enable_odk" -# Check whether --enable-odk was given. -if test "${enable_odk+set}" = set; then : - enableval=$enable_odk; else enable_odk="yes" -fi +fi; +# Check whether --enable-mathmldtd or --disable-mathmldtd was given. +if test "${enable_mathmldtd+set}" = set; then + enableval="$enable_mathmldtd" -# Check whether --enable-mathmldtd was given. -if test "${enable_mathmldtd+set}" = set; then : - enableval=$enable_mathmldtd; else enable_mathmldtd="yes" -fi +fi; +# Check whether --enable-evolution2 or --disable-evolution2 was given. +if test "${enable_evolution2+set}" = set; then + enableval="$enable_evolution2" -# Check whether --enable-evolution2 was given. -if test "${enable_evolution2+set}" = set; then : - enableval=$enable_evolution2; -fi +fi; +# Check whether --with-system-stdlibs or --without-system-stdlibs was given. +if test "${with_system_stdlibs+set}" = set; then + withval="$with_system_stdlibs" -# Check whether --with-system-stdlibs was given. -if test "${with_system_stdlibs+set}" = set; then : - withval=$with_system_stdlibs; -fi +fi; +# Check whether --enable-cups or --disable-cups was given. +if test "${enable_cups+set}" = set; then + enableval="$enable_cups" -# Check whether --enable-cups was given. -if test "${enable_cups+set}" = set; then : - enableval=$enable_cups; else enable_cups=yes -fi +fi; +# Check whether --enable-fontconfig or --disable-fontconfig was given. +if test "${enable_fontconfig+set}" = set; then + enableval="$enable_fontconfig" -# Check whether --enable-fontconfig was given. -if test "${enable_fontconfig+set}" = set; then : - enableval=$enable_fontconfig; else enable_fontconfig=yes -fi +fi; +# Check whether --enable-directx or --disable-directx was given. +if test "${enable_directx+set}" = set; then + enableval="$enable_directx" -# Check whether --enable-directx was given. -if test "${enable_directx+set}" = set; then : - enableval=$enable_directx; else enable_directx=yes -fi +fi; +# Check whether --enable-activex or --disable-activex was given. +if test "${enable_activex+set}" = set; then + enableval="$enable_activex" -# Check whether --enable-activex was given. -if test "${enable_activex+set}" = set; then : - enableval=$enable_activex; -fi +fi; +# Check whether --enable-atl or --disable-atl was given. +if test "${enable_atl+set}" = set; then + enableval="$enable_atl" -# Check whether --enable-atl was given. -if test "${enable_atl+set}" = set; then : - enableval=$enable_atl; -fi +fi; +# Check whether --enable-symbols or --disable-symbols was given. +if test "${enable_symbols+set}" = set; then + enableval="$enable_symbols" -# Check whether --enable-symbols was given. -if test "${enable_symbols+set}" = set; then : - enableval=$enable_symbols; -fi +fi; +# Check whether --enable-strip-solver or --disable-strip-solver was given. +if test "${enable_strip_solver+set}" = set; then + enableval="$enable_strip_solver" -# Check whether --enable-strip-solver was given. -if test "${enable_strip_solver+set}" = set; then : - enableval=$enable_strip_solver; -fi +fi; +# Check whether --enable-werror or --disable-werror was given. +if test "${enable_werror+set}" = set; then + enableval="$enable_werror" -# Check whether --enable-werror was given. -if test "${enable_werror+set}" = set; then : - enableval=$enable_werror; -fi +fi; +# Check whether --enable-debug or --disable-debug was given. +if test "${enable_debug+set}" = set; then + enableval="$enable_debug" -# Check whether --enable-debug was given. -if test "${enable_debug+set}" = set; then : - enableval=$enable_debug; -fi +fi; +# Check whether --enable-dbgutil or --disable-dbgutil was given. +if test "${enable_dbgutil+set}" = set; then + enableval="$enable_dbgutil" -# Check whether --enable-dbgutil was given. -if test "${enable_dbgutil+set}" = set; then : - enableval=$enable_dbgutil; -fi +fi; +# Check whether --enable-crashdump or --disable-crashdump was given. +if test "${enable_crashdump+set}" = set; then + enableval="$enable_crashdump" -# Check whether --enable-crashdump was given. -if test "${enable_crashdump+set}" = set; then : - enableval=$enable_crashdump; -fi +fi; +# Check whether --enable-cl-standard or --disable-cl-standard was given. +if test "${enable_cl_standard+set}" = set; then + enableval="$enable_cl_standard" -# Check whether --enable-cl-standard was given. -if test "${enable_cl_standard+set}" = set; then : - enableval=$enable_cl_standard; -fi +fi; +# Check whether --enable-gtk or --disable-gtk was given. +if test "${enable_gtk+set}" = set; then + enableval="$enable_gtk" -# Check whether --enable-gtk was given. -if test "${enable_gtk+set}" = set; then : - enableval=$enable_gtk; else enable_gtk=yes -fi +fi; +# Check whether --enable-gstreamer or --disable-gstreamer was given. +if test "${enable_gstreamer+set}" = set; then + enableval="$enable_gstreamer" -# Check whether --enable-gstreamer was given. -if test "${enable_gstreamer+set}" = set; then : - enableval=$enable_gstreamer; else enable_gstreamer=yes -fi +fi; +# Check whether --enable-systray or --disable-systray was given. +if test "${enable_systray+set}" = set; then + enableval="$enable_systray" -# Check whether --enable-systray was given. -if test "${enable_systray+set}" = set; then : - enableval=$enable_systray; else enable_systray=yes -fi +fi; +# Check whether --enable-cairo or --disable-cairo was given. +if test "${enable_cairo+set}" = set; then + enableval="$enable_cairo" -# Check whether --enable-cairo was given. -if test "${enable_cairo+set}" = set; then : - enableval=$enable_cairo; else enable_cairo=no -fi +fi; +# Check whether --with-system-cairo or --without-system-cairo was given. +if test "${with_system_cairo+set}" = set; then + withval="$with_system_cairo" -# Check whether --with-system-cairo was given. -if test "${with_system_cairo+set}" = set; then : - withval=$with_system_cairo; -fi +fi; +# Check whether --enable-opengl or --disable-opengl was given. +if test "${enable_opengl+set}" = set; then + enableval="$enable_opengl" -# Check whether --enable-opengl was given. -if test "${enable_opengl+set}" = set; then : - enableval=$enable_opengl; else enable_opengl=no -fi +fi; +# Check whether --enable-dbus or --disable-dbus was given. +if test "${enable_dbus+set}" = set; then + enableval="$enable_dbus" -# Check whether --enable-dbus was given. -if test "${enable_dbus+set}" = set; then : - enableval=$enable_dbus; else enable_dbus=no -fi +fi; +# Check whether --enable-gconf or --disable-gconf was given. +if test "${enable_gconf+set}" = set; then + enableval="$enable_gconf" -# Check whether --enable-gconf was given. -if test "${enable_gconf+set}" = set; then : - enableval=$enable_gconf; else enable_gconf=yes -fi +fi; +# Check whether --enable-gnome-vfs or --disable-gnome-vfs was given. +if test "${enable_gnome_vfs+set}" = set; then + enableval="$enable_gnome_vfs" -# Check whether --enable-gnome-vfs was given. -if test "${enable_gnome_vfs+set}" = set; then : - enableval=$enable_gnome_vfs; else enable_gnome_vfs=yes -fi +fi; +# Check whether --enable-gio or --disable-gio was given. +if test "${enable_gio+set}" = set; then + enableval="$enable_gio" -# Check whether --enable-gio was given. -if test "${enable_gio+set}" = set; then : - enableval=$enable_gio; else enable_gio=no -fi +fi; +# Check whether --enable-static-gtk or --disable-static-gtk was given. +if test "${enable_static_gtk+set}" = set; then + enableval="$enable_static_gtk" -# Check whether --enable-static-gtk was given. -if test "${enable_static_gtk+set}" = set; then : - enableval=$enable_static_gtk; -fi +fi; +# Check whether --enable-layout or --disable-layout was given. +if test "${enable_layout+set}" = set; then + enableval="$enable_layout" -# Check whether --enable-layout was given. -if test "${enable_layout+set}" = set; then : - enableval=$enable_layout; -fi +fi; +# Check whether --enable-build-mozilla or --disable-build-mozilla was given. +if test "${enable_build_mozilla+set}" = set; then + enableval="$enable_build_mozilla" -# Check whether --enable-build-mozilla was given. -if test "${enable_build_mozilla+set}" = set; then : - enableval=$enable_build_mozilla; -fi +fi; +# Check whether --with-mozilla-version or --without-mozilla-version was given. +if test "${with_mozilla_version+set}" = set; then + withval="$with_mozilla_version" -# Check whether --with-mozilla-version was given. -if test "${with_mozilla_version+set}" = set; then : - withval=$with_mozilla_version; -fi +fi; +# Check whether --with-mozilla-toolkit or --without-mozilla-toolkit was given. +if test "${with_mozilla_toolkit+set}" = set; then + withval="$with_mozilla_toolkit" -# Check whether --with-mozilla-toolkit was given. -if test "${with_mozilla_toolkit+set}" = set; then : - withval=$with_mozilla_toolkit; -fi +fi; +# Check whether --enable-nss_module or --disable-nss_module was given. +if test "${enable_nss_module+set}" = set; then + enableval="$enable_nss_module" -# Check whether --enable-nss_module was given. -if test "${enable_nss_module+set}" = set; then : - enableval=$enable_nss_module; else enable_nss_module=yes -fi +fi; +# Check whether --enable-kde or --disable-kde was given. +if test "${enable_kde+set}" = set; then + enableval="$enable_kde" -# Check whether --enable-kde was given. -if test "${enable_kde+set}" = set; then : - enableval=$enable_kde; -fi +fi; +# Check whether --enable-kdeab or --disable-kdeab was given. +if test "${enable_kdeab+set}" = set; then + enableval="$enable_kdeab" -# Check whether --enable-kdeab was given. -if test "${enable_kdeab+set}" = set; then : - enableval=$enable_kdeab; else if test "$enable_kde" = "yes"; then enable_kdeab=yes; fi -fi +fi; +# Check whether --enable-kde4 or --disable-kde4 was given. +if test "${enable_kde4+set}" = set; then + enableval="$enable_kde4" -# Check whether --enable-kde4 was given. -if test "${enable_kde4+set}" = set; then : - enableval=$enable_kde4; -fi +fi; +# Check whether --enable-binfilter or --disable-binfilter was given. +if test "${enable_binfilter+set}" = set; then + enableval="$enable_binfilter" -# Check whether --enable-binfilter was given. -if test "${enable_binfilter+set}" = set; then : - enableval=$enable_binfilter; else if ! test -d ./binfilter; then enable_binfilter=no; fi -fi +fi; +# Check whether --enable-rpath or --disable-rpath was given. +if test "${enable_rpath+set}" = set; then + enableval="$enable_rpath" -# Check whether --enable-rpath was given. -if test "${enable_rpath+set}" = set; then : - enableval=$enable_rpath; -fi +fi; +# Check whether --enable-pam or --disable-pam was given. +if test "${enable_pam+set}" = set; then + enableval="$enable_pam" -# Check whether --enable-pam was given. -if test "${enable_pam+set}" = set; then : - enableval=$enable_pam; -fi +fi; +# Check whether --enable-pam-link or --disable-pam-link was given. +if test "${enable_pam_link+set}" = set; then + enableval="$enable_pam_link" -# Check whether --enable-pam-link was given. -if test "${enable_pam_link+set}" = set; then : - enableval=$enable_pam_link; -fi +fi; +# Check whether --enable-crypt-link or --disable-crypt-link was given. +if test "${enable_crypt_link+set}" = set; then + enableval="$enable_crypt_link" -# Check whether --enable-crypt-link was given. -if test "${enable_crypt_link+set}" = set; then : - enableval=$enable_crypt_link; else enable_crypt_link=yes -fi +fi; +# Check whether --enable-xrender-link or --disable-xrender-link was given. +if test "${enable_xrender_link+set}" = set; then + enableval="$enable_xrender_link" -# Check whether --enable-xrender-link was given. -if test "${enable_xrender_link+set}" = set; then : - enableval=$enable_xrender_link; -fi +fi; +# Check whether --enable-randr or --disable-randr was given. +if test "${enable_randr+set}" = set; then + enableval="$enable_randr" -# Check whether --enable-randr was given. -if test "${enable_randr+set}" = set; then : - enableval=$enable_randr; else enable_randr=yes -fi +fi; +# Check whether --enable-randr-link or --disable-randr-link was given. +if test "${enable_randr_link+set}" = set; then + enableval="$enable_randr_link" -# Check whether --enable-randr-link was given. -if test "${enable_randr_link+set}" = set; then : - enableval=$enable_randr_link; else enable_randr_link=yes -fi - - -# Check whether --with-myspell-dicts was given. -if test "${with_myspell_dicts+set}" = set; then : - withval=$with_myspell_dicts; -fi - - -# Check whether --with-system-dicts was given. -if test "${with_system_dicts+set}" = set; then : - withval=$with_system_dicts; -fi +fi; +# Check whether --with-myspell-dicts or --without-myspell-dicts was given. +if test "${with_myspell_dicts+set}" = set; then + withval="$with_myspell_dicts" -# Check whether --with-external-dict-dir was given. -if test "${with_external_dict_dir+set}" = set; then : - withval=$with_external_dict_dir; -fi +fi; +# Check whether --with-system-dicts or --without-system-dicts was given. +if test "${with_system_dicts+set}" = set; then + withval="$with_system_dicts" -# Check whether --with-external-hyph-dir was given. -if test "${with_external_hyph_dir+set}" = set; then : - withval=$with_external_hyph_dir; -fi +fi; +# Check whether --with-external-dict-dir or --without-external-dict-dir was given. +if test "${with_external_dict_dir+set}" = set; then + withval="$with_external_dict_dir" -# Check whether --with-external-thes-dir was given. -if test "${with_external_thes_dir+set}" = set; then : - withval=$with_external_thes_dir; -fi +fi; +# Check whether --with-external-hyph-dir or --without-external-hyph-dir was given. +if test "${with_external_hyph_dir+set}" = set; then + withval="$with_external_hyph_dir" -# Check whether --with-system-libs was given. -if test "${with_system_libs+set}" = set; then : - withval=$with_system_libs; -fi +fi; +# Check whether --with-external-thes-dir or --without-external-thes-dir was given. +if test "${with_external_thes_dir+set}" = set; then + withval="$with_external_thes_dir" -# Check whether --with-system-headers was given. -if test "${with_system_headers+set}" = set; then : - withval=$with_system_headers; -fi +fi; +# Check whether --with-system-libs or --without-system-libs was given. +if test "${with_system_libs+set}" = set; then + withval="$with_system_libs" -# Check whether --with-system-jars was given. -if test "${with_system_jars+set}" = set; then : - withval=$with_system_jars; -fi +fi; +# Check whether --with-system-headers or --without-system-headers was given. +if test "${with_system_headers+set}" = set; then + withval="$with_system_headers" -# Check whether --with-system-zlib was given. -if test "${with_system_zlib+set}" = set; then : - withval=$with_system_zlib; -fi +fi; +# Check whether --with-system-jars or --without-system-jars was given. +if test "${with_system_jars+set}" = set; then + withval="$with_system_jars" -# Check whether --with-system-openssl was given. -if test "${with_system_openssl+set}" = set; then : - withval=$with_system_openssl; -fi +fi; +# Check whether --with-system-zlib or --without-system-zlib was given. +if test "${with_system_zlib+set}" = set; then + withval="$with_system_zlib" -# Check whether --with-system-jpeg was given. -if test "${with_system_jpeg+set}" = set; then : - withval=$with_system_jpeg; -fi +fi; +# Check whether --with-system-openssl or --without-system-openssl was given. +if test "${with_system_openssl+set}" = set; then + withval="$with_system_openssl" -# Check whether --with-system-expat was given. -if test "${with_system_expat+set}" = set; then : - withval=$with_system_expat; -fi +fi; +# Check whether --with-system-jpeg or --without-system-jpeg was given. +if test "${with_system_jpeg+set}" = set; then + withval="$with_system_jpeg" -# Check whether --with-system-libwpd was given. -if test "${with_system_libwpd+set}" = set; then : - withval=$with_system_libwpd; -fi +fi; +# Check whether --with-system-expat or --without-system-expat was given. +if test "${with_system_expat+set}" = set; then + withval="$with_system_expat" -# Check whether --with-system-libxml was given. -if test "${with_system_libxml+set}" = set; then : - withval=$with_system_libxml; -fi +fi; +# Check whether --with-system-libwpd or --without-system-libwpd was given. +if test "${with_system_libwpd+set}" = set; then + withval="$with_system_libwpd" -# Check whether --with-system-python was given. -if test "${with_system_python+set}" = set; then : - withval=$with_system_python; -fi +fi; +# Check whether --with-system-libxml or --without-system-libxml was given. +if test "${with_system_libxml+set}" = set; then + withval="$with_system_libxml" -# Check whether --with-system-icu was given. -if test "${with_system_icu+set}" = set; then : - withval=$with_system_icu; -fi +fi; +# Check whether --with-system-python or --without-system-python was given. +if test "${with_system_python+set}" = set; then + withval="$with_system_python" -# Check whether --with-system-poppler was given. -if test "${with_system_poppler+set}" = set; then : - withval=$with_system_poppler; -fi +fi; +# Check whether --with-system-icu or --without-system-icu was given. +if test "${with_system_icu+set}" = set; then + withval="$with_system_icu" -# Check whether --with-system-db was given. -if test "${with_system_db+set}" = set; then : - withval=$with_system_db; -fi +fi; +# Check whether --with-system-poppler or --without-system-poppler was given. +if test "${with_system_poppler+set}" = set; then + withval="$with_system_poppler" -# Check whether --with-system-lucene was given. -if test "${with_system_lucene+set}" = set; then : - withval=$with_system_lucene; -fi +fi; +# Check whether --with-system-db or --without-system-db was given. +if test "${with_system_db+set}" = set; then + withval="$with_system_db" -# Check whether --with-lucene-core-jar was given. -if test "${with_lucene_core_jar+set}" = set; then : - withval=$with_lucene_core_jar; LUCENE_CORE_JAR="$withval" +fi; -fi +# Check whether --with-system-lucene or --without-system-lucene was given. +if test "${with_system_lucene+set}" = set; then + withval="$with_system_lucene" +fi; -# Check whether --with-lucene-analyzers-jar was given. -if test "${with_lucene_analyzers_jar+set}" = set; then : - withval=$with_lucene_analyzers_jar; LUCENE_ANALYZERS_JAR="$withval" +# Check whether --with-lucene-core-jar or --without-lucene-core-jar was given. +if test "${with_lucene_core_jar+set}" = set; then + withval="$with_lucene_core_jar" + LUCENE_CORE_JAR="$withval" -fi +fi; -# Check whether --enable-mysql-connector was given. -if test "${enable_mysql_connector+set}" = set; then : - enableval=$enable_mysql_connector; -fi +# Check whether --with-lucene-analyzers-jar or --without-lucene-analyzers-jar was given. +if test "${with_lucene_analyzers_jar+set}" = set; then + withval="$with_lucene_analyzers_jar" + LUCENE_ANALYZERS_JAR="$withval" +fi; +# Check whether --enable-mysql-connector or --disable-mysql-connector was given. +if test "${enable_mysql_connector+set}" = set; then + enableval="$enable_mysql_connector" -# Check whether --with-system-mysql was given. -if test "${with_system_mysql+set}" = set; then : - withval=$with_system_mysql; -fi +fi; +# Check whether --with-system-mysql or --without-system-mysql was given. +if test "${with_system_mysql+set}" = set; then + withval="$with_system_mysql" -# Check whether --with-libmysql-path was given. -if test "${with_libmysql_path+set}" = set; then : - withval=$with_libmysql_path; -fi +fi; +# Check whether --with-libmysql-path or --without-libmysql-path was given. +if test "${with_libmysql_path+set}" = set; then + withval="$with_libmysql_path" -# Check whether --with-system-mysql-cppconn was given. -if test "${with_system_mysql_cppconn+set}" = set; then : - withval=$with_system_mysql_cppconn; -fi +fi; +# Check whether --with-system-mysql-cppconn or --without-system-mysql-cppconn was given. +if test "${with_system_mysql_cppconn+set}" = set; then + withval="$with_system_mysql_cppconn" -# Check whether --with-system-hsqldb was given. -if test "${with_system_hsqldb+set}" = set; then : - withval=$with_system_hsqldb; -fi +fi; +# Check whether --with-system-hsqldb or --without-system-hsqldb was given. +if test "${with_system_hsqldb+set}" = set; then + withval="$with_system_hsqldb" -# Check whether --with-hsqldb-jar was given. -if test "${with_hsqldb_jar+set}" = set; then : - withval=$with_hsqldb_jar; HSQLDB_JAR="$withval" +fi; -fi +# Check whether --with-hsqldb-jar or --without-hsqldb-jar was given. +if test "${with_hsqldb_jar+set}" = set; then + withval="$with_hsqldb_jar" + HSQLDB_JAR="$withval" +fi; -# Check whether --with-system-beanshell was given. -if test "${with_system_beanshell+set}" = set; then : - withval=$with_system_beanshell; -fi +# Check whether --with-system-beanshell or --without-system-beanshell was given. +if test "${with_system_beanshell+set}" = set; then + withval="$with_system_beanshell" +fi; -# Check whether --with-beanshell-jar was given. -if test "${with_beanshell_jar+set}" = set; then : - withval=$with_beanshell_jar; BSH_JAR="$withval" +# Check whether --with-beanshell-jar or --without-beanshell-jar was given. +if test "${with_beanshell_jar+set}" = set; then + withval="$with_beanshell_jar" + BSH_JAR="$withval" -fi +fi; +# Check whether --enable-presenter-extra-ui or --disable-presenter-extra-ui was given. +if test "${enable_presenter_extra_ui+set}" = set; then + enableval="$enable_presenter_extra_ui" -# Check whether --enable-presenter-extra-ui was given. -if test "${enable_presenter_extra_ui+set}" = set; then : - enableval=$enable_presenter_extra_ui; else enable_presenter_extra_ui=no -fi - -# Check whether --enable-minimizer was given. -if test "${enable_minimizer+set}" = set; then : - enableval=$enable_minimizer; -fi - -# Check whether --enable-presenter-console was given. -if test "${enable_presenter_console+set}" = set; then : - enableval=$enable_presenter_console; -fi - -# Check whether --enable-pdfimport was given. -if test "${enable_pdfimport+set}" = set; then : - enableval=$enable_pdfimport; -fi - -# Check whether --enable-wiki-publisher was given. -if test "${enable_wiki_publisher+set}" = set; then : - enableval=$enable_wiki_publisher; -fi - - -# Check whether --with-commons-codec-jar was given. -if test "${with_commons_codec_jar+set}" = set; then : - withval=$with_commons_codec_jar; COMMONS_CODEC_JAR="$withval" - -fi - - -# Check whether --with-commons-lang-jar was given. -if test "${with_commons_lang_jar+set}" = set; then : - withval=$with_commons_lang_jar; COMMONS_LANG_JAR="$withval" - -fi - - -# Check whether --with-commons-httpclient-jar was given. -if test "${with_commons_httpclient_jar+set}" = set; then : - withval=$with_commons_httpclient_jar; COMMONS_HTTPCLIENT_JAR="$withval" - -fi - - -# Check whether --with-commons-logging-jar was given. -if test "${with_commons_logging_jar+set}" = set; then : - withval=$with_commons_logging_jar; COMMONS_LOGGING_JAR="$withval" - -fi +fi; +# Check whether --enable-minimizer or --disable-minimizer was given. +if test "${enable_minimizer+set}" = set; then + enableval="$enable_minimizer" +fi; +# Check whether --enable-presenter-console or --disable-presenter-console was given. +if test "${enable_presenter_console+set}" = set; then + enableval="$enable_presenter_console" -# Check whether --with-servlet-api-jar was given. -if test "${with_servlet_api_jar+set}" = set; then : - withval=$with_servlet_api_jar; SERVLETAPI_JAR="$withval" - -fi - -# Check whether --enable-report-builder was given. -if test "${enable_report_builder+set}" = set; then : - enableval=$enable_report_builder; -fi +fi; +# Check whether --enable-pdfimport or --disable-pdfimport was given. +if test "${enable_pdfimport+set}" = set; then + enableval="$enable_pdfimport" +fi; +# Check whether --enable-wiki-publisher or --disable-wiki-publisher was given. +if test "${enable_wiki_publisher+set}" = set; then + enableval="$enable_wiki_publisher" -# Check whether --with-system-jfreereport was given. -if test "${with_system_jfreereport+set}" = set; then : - withval=$with_system_jfreereport; -fi - +fi; -# Check whether --with-sac-jar was given. -if test "${with_sac_jar+set}" = set; then : - withval=$with_sac_jar; SAC_JAR="$withval" +# Check whether --with-commons-codec-jar or --without-commons-codec-jar was given. +if test "${with_commons_codec_jar+set}" = set; then + withval="$with_commons_codec_jar" + COMMONS_CODEC_JAR="$withval" -fi +fi; +# Check whether --with-commons-lang-jar or --without-commons-lang-jar was given. +if test "${with_commons_lang_jar+set}" = set; then + withval="$with_commons_lang_jar" + COMMONS_LANG_JAR="$withval" -# Check whether --with-libxml-jar was given. -if test "${with_libxml_jar+set}" = set; then : - withval=$with_libxml_jar; LIBXML_JAR="$withval" +fi; -fi +# Check whether --with-commons-httpclient-jar or --without-commons-httpclient-jar was given. +if test "${with_commons_httpclient_jar+set}" = set; then + withval="$with_commons_httpclient_jar" + COMMONS_HTTPCLIENT_JAR="$withval" +fi; -# Check whether --with-flute-jar was given. -if test "${with_flute_jar+set}" = set; then : - withval=$with_flute_jar; FLUTE_JAR="$withval" +# Check whether --with-commons-logging-jar or --without-commons-logging-jar was given. +if test "${with_commons_logging_jar+set}" = set; then + withval="$with_commons_logging_jar" + COMMONS_LOGGING_JAR="$withval" -fi +fi; +# Check whether --with-servlet-api-jar or --without-servlet-api-jar was given. +if test "${with_servlet_api_jar+set}" = set; then + withval="$with_servlet_api_jar" + SERVLETAPI_JAR="$withval" -# Check whether --with-jfreereport-jar was given. -if test "${with_jfreereport_jar+set}" = set; then : - withval=$with_jfreereport_jar; JFREEREPORT_JAR="$withval" +fi; +# Check whether --enable-report-builder or --disable-report-builder was given. +if test "${enable_report_builder+set}" = set; then + enableval="$enable_report_builder" -fi +fi; +# Check whether --with-system-jfreereport or --without-system-jfreereport was given. +if test "${with_system_jfreereport+set}" = set; then + withval="$with_system_jfreereport" -# Check whether --with-liblayout-jar was given. -if test "${with_liblayout_jar+set}" = set; then : - withval=$with_liblayout_jar; LIBLAYOUT_JAR="$withval" +fi; -fi +# Check whether --with-sac-jar or --without-sac-jar was given. +if test "${with_sac_jar+set}" = set; then + withval="$with_sac_jar" + SAC_JAR="$withval" +fi; -# Check whether --with-libloader-jar was given. -if test "${with_libloader_jar+set}" = set; then : - withval=$with_libloader_jar; LIBLOADER_JAR="$withval" +# Check whether --with-libxml-jar or --without-libxml-jar was given. +if test "${with_libxml_jar+set}" = set; then + withval="$with_libxml_jar" + LIBXML_JAR="$withval" -fi +fi; +# Check whether --with-flute-jar or --without-flute-jar was given. +if test "${with_flute_jar+set}" = set; then + withval="$with_flute_jar" + FLUTE_JAR="$withval" -# Check whether --with-libloader-jar was given. -if test "${with_libloader_jar+set}" = set; then : - withval=$with_libloader_jar; LIBLOADER_JAR="$withval" +fi; -fi +# Check whether --with-jfreereport-jar or --without-jfreereport-jar was given. +if test "${with_jfreereport_jar+set}" = set; then + withval="$with_jfreereport_jar" + JFREEREPORT_JAR="$withval" +fi; -# Check whether --with-libformula-jar was given. -if test "${with_libformula_jar+set}" = set; then : - withval=$with_libformula_jar; LIBFORMULA_JAR="$withval" +# Check whether --with-liblayout-jar or --without-liblayout-jar was given. +if test "${with_liblayout_jar+set}" = set; then + withval="$with_liblayout_jar" + LIBLAYOUT_JAR="$withval" -fi +fi; +# Check whether --with-libloader-jar or --without-libloader-jar was given. +if test "${with_libloader_jar+set}" = set; then + withval="$with_libloader_jar" + LIBLOADER_JAR="$withval" -# Check whether --with-librepository-jar was given. -if test "${with_librepository_jar+set}" = set; then : - withval=$with_librepository_jar; LIBREPOSITORY_JAR="$withval" +fi; -fi +# Check whether --with-libloader-jar or --without-libloader-jar was given. +if test "${with_libloader_jar+set}" = set; then + withval="$with_libloader_jar" + LIBLOADER_JAR="$withval" +fi; -# Check whether --with-libfonts-jar was given. -if test "${with_libfonts_jar+set}" = set; then : - withval=$with_libfonts_jar; LIBFONTS_JAR="$withval" +# Check whether --with-libformula-jar or --without-libformula-jar was given. +if test "${with_libformula_jar+set}" = set; then + withval="$with_libformula_jar" + LIBFORMULA_JAR="$withval" -fi +fi; +# Check whether --with-librepository-jar or --without-librepository-jar was given. +if test "${with_librepository_jar+set}" = set; then + withval="$with_librepository_jar" + LIBREPOSITORY_JAR="$withval" -# Check whether --with-libserializer-jar was given. -if test "${with_libserializer_jar+set}" = set; then : - withval=$with_libserializer_jar; LIBSERIALIZER_JAR="$withval" +fi; -fi +# Check whether --with-libfonts-jar or --without-libfonts-jar was given. +if test "${with_libfonts_jar+set}" = set; then + withval="$with_libfonts_jar" + LIBFONTS_JAR="$withval" +fi; -# Check whether --with-libbase-jar was given. -if test "${with_libbase_jar+set}" = set; then : - withval=$with_libbase_jar; LIBBASE_JAR="$withval" +# Check whether --with-libserializer-jar or --without-libserializer-jar was given. +if test "${with_libserializer_jar+set}" = set; then + withval="$with_libserializer_jar" + LIBSERIALIZER_JAR="$withval" -fi +fi; +# Check whether --with-libbase-jar or --without-libbase-jar was given. +if test "${with_libbase_jar+set}" = set; then + withval="$with_libbase_jar" + LIBBASE_JAR="$withval" -# Check whether --with-system-saxon was given. -if test "${with_system_saxon+set}" = set; then : - withval=$with_system_saxon; -fi +fi; +# Check whether --with-system-saxon or --without-system-saxon was given. +if test "${with_system_saxon+set}" = set; then + withval="$with_system_saxon" -# Check whether --with-saxon-jar was given. -if test "${with_saxon_jar+set}" = set; then : - withval=$with_saxon_jar; SAXON_JAR="$withval" +fi; -fi +# Check whether --with-saxon-jar or --without-saxon-jar was given. +if test "${with_saxon_jar+set}" = set; then + withval="$with_saxon_jar" + SAXON_JAR="$withval" +fi; -# Check whether --with-system-libxslt was given. -if test "${with_system_libxslt+set}" = set; then : - withval=$with_system_libxslt; -fi +# Check whether --with-system-libxslt or --without-system-libxslt was given. +if test "${with_system_libxslt+set}" = set; then + withval="$with_system_libxslt" +fi; -# Check whether --with-system-odbc was given. -if test "${with_system_odbc+set}" = set; then : - withval=$with_system_odbc; -fi +# Check whether --with-system-odbc or --without-system-odbc was given. +if test "${with_system_odbc+set}" = set; then + withval="$with_system_odbc" +fi; -# Check whether --with-system-sane was given. -if test "${with_system_sane+set}" = set; then : - withval=$with_system_sane; -fi +# Check whether --with-system-sane or --without-system-sane was given. +if test "${with_system_sane+set}" = set; then + withval="$with_system_sane" +fi; -# Check whether --with-system-xrender was given. -if test "${with_system_xrender+set}" = set; then : - withval=$with_system_xrender; -fi +# Check whether --with-system-xrender or --without-system-xrender was given. +if test "${with_system_xrender+set}" = set; then + withval="$with_system_xrender" +fi; -# Check whether --with-system-curl was given. -if test "${with_system_curl+set}" = set; then : - withval=$with_system_curl; -fi +# Check whether --with-system-curl or --without-system-curl was given. +if test "${with_system_curl+set}" = set; then + withval="$with_system_curl" +fi; -# Check whether --with-system-boost was given. -if test "${with_system_boost+set}" = set; then : - withval=$with_system_boost; -fi +# Check whether --with-system-boost or --without-system-boost was given. +if test "${with_system_boost+set}" = set; then + withval="$with_system_boost" +fi; -# Check whether --with-system-mdds was given. -if test "${with_system_mdds+set}" = set; then : - withval=$with_system_mdds; -fi +# Check whether --with-system-mdds or --without-system-mdds was given. +if test "${with_system_mdds+set}" = set; then + withval="$with_system_mdds" +fi; -# Check whether --with-system-vigra was given. -if test "${with_system_vigra+set}" = set; then : - withval=$with_system_vigra; -fi +# Check whether --with-system-vigra or --without-system-vigra was given. +if test "${with_system_vigra+set}" = set; then + withval="$with_system_vigra" -# Check whether --enable-neon was given. -if test "${enable_neon+set}" = set; then : - enableval=$enable_neon; -fi +fi; +# Check whether --enable-neon or --disable-neon was given. +if test "${enable_neon+set}" = set; then + enableval="$enable_neon" -# Check whether --enable-Xaw was given. -if test "${enable_Xaw+set}" = set; then : - enableval=$enable_Xaw; -fi +fi; +# Check whether --enable-Xaw or --disable-Xaw was given. +if test "${enable_Xaw+set}" = set; then + enableval="$enable_Xaw" +fi; -# Check whether --with-system-neon was given. -if test "${with_system_neon+set}" = set; then : - withval=$with_system_neon; -fi +# Check whether --with-system-neon or --without-system-neon was given. +if test "${with_system_neon+set}" = set; then + withval="$with_system_neon" +fi; -# Check whether --with-system-agg was given. -if test "${with_system_agg+set}" = set; then : - withval=$with_system_agg; -fi +# Check whether --with-system-agg or --without-system-agg was given. +if test "${with_system_agg+set}" = set; then + withval="$with_system_agg" +fi; -# Check whether --with-system-hunspell was given. -if test "${with_system_hunspell+set}" = set; then : - withval=$with_system_hunspell; -fi +# Check whether --with-system-hunspell or --without-system-hunspell was given. +if test "${with_system_hunspell+set}" = set; then + withval="$with_system_hunspell" +fi; -# Check whether --with-system-mythes was given. -if test "${with_system_mythes+set}" = set; then : - withval=$with_system_mythes; -fi +# Check whether --with-system-mythes or --without-system-mythes was given. +if test "${with_system_mythes+set}" = set; then + withval="$with_system_mythes" +fi; -# Check whether --with-system-altlinuxhyph was given. -if test "${with_system_altlinuxhyph+set}" = set; then : - withval=$with_system_altlinuxhyph; -fi +# Check whether --with-system-altlinuxhyph or --without-system-altlinuxhyph was given. +if test "${with_system_altlinuxhyph+set}" = set; then + withval="$with_system_altlinuxhyph" +fi; -# Check whether --with-system-lpsolve was given. -if test "${with_system_lpsolve+set}" = set; then : - withval=$with_system_lpsolve; -fi +# Check whether --with-system-lpsolve or --without-system-lpsolve was given. +if test "${with_system_lpsolve+set}" = set; then + withval="$with_system_lpsolve" +fi; -# Check whether --with-system-libtextcat was given. -if test "${with_system_libtextcat+set}" = set; then : - withval=$with_system_libtextcat; -fi +# Check whether --with-system-libtextcat or --without-system-libtextcat was given. +if test "${with_system_libtextcat+set}" = set; then + withval="$with_system_libtextcat" +fi; -# Check whether --with-external-libtextcat-data was given. -if test "${with_external_libtextcat_data+set}" = set; then : - withval=$with_external_libtextcat_data; -fi +# Check whether --with-external-libtextcat-data or --without-external-libtextcat-data was given. +if test "${with_external_libtextcat_data+set}" = set; then + withval="$with_external_libtextcat_data" +fi; -# Check whether --with-system-cppunit was given. -if test "${with_system_cppunit+set}" = set; then : - withval=$with_system_cppunit; -fi +# Check whether --with-system-cppunit or --without-system-cppunit was given. +if test "${with_system_cppunit+set}" = set; then + withval="$with_system_cppunit" +fi; -# Check whether --with-system-redland was given. -if test "${with_system_redland+set}" = set; then : - withval=$with_system_redland; -fi +# Check whether --with-system-redland or --without-system-redland was given. +if test "${with_system_redland+set}" = set; then + withval="$with_system_redland" +fi; -# Check whether --with-system-mozilla was given. -if test "${with_system_mozilla+set}" = set; then : - withval=$with_system_mozilla; WITH_SYSTEM_MOZILLA=$withval +# Check whether --with-system-mozilla or --without-system-mozilla was given. +if test "${with_system_mozilla+set}" = set; then + withval="$with_system_mozilla" + WITH_SYSTEM_MOZILLA=$withval else WITH_SYSTEM_MOZILLA=no -fi - +fi; -# Check whether --with-stlport was given. -if test "${with_stlport+set}" = set; then : - withval=$with_stlport; WITH_STLPORT=$withval +# Check whether --with-stlport or --without-stlport was given. +if test "${with_stlport+set}" = set; then + withval="$with_stlport" + WITH_STLPORT=$withval else WITH_STLPORT=auto -fi - +fi; -# Check whether --with-jdk-home was given. -if test "${with_jdk_home+set}" = set; then : - withval=$with_jdk_home; -fi +# Check whether --with-jdk-home or --without-jdk-home was given. +if test "${with_jdk_home+set}" = set; then + withval="$with_jdk_home" +fi; -# Check whether --with-gxx_include_path was given. -if test "${with_gxx_include_path+set}" = set; then : - withval=$with_gxx_include_path; -fi +# Check whether --with-gxx_include_path or --without-gxx_include_path was given. +if test "${with_gxx_include_path+set}" = set; then + withval="$with_gxx_include_path" +fi; -# Check whether --with-java was given. -if test "${with_java+set}" = set; then : - withval=$with_java; if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi +# Check whether --with-java or --without-java was given. +if test "${with_java+set}" = set; then + withval="$with_java" + if test "$withval" = "yes"; then WITH_JAVA=java; else WITH_JAVA=$withval; fi else WITH_JAVA=java -fi +fi; +# Check whether --enable-gcjaot or --disable-gcjaot was given. +if test "${enable_gcjaot+set}" = set; then + enableval="$enable_gcjaot" -# Check whether --enable-gcjaot was given. -if test "${enable_gcjaot+set}" = set; then : - enableval=$enable_gcjaot; -fi +fi; +# Check whether --with-ant-home or --without-ant-home was given. +if test "${with_ant_home+set}" = set; then + withval="$with_ant_home" -# Check whether --with-ant-home was given. -if test "${with_ant_home+set}" = set; then : - withval=$with_ant_home; -fi +fi; +# Check whether --with-junit or --without-junit was given. +if test "${with_junit+set}" = set; then + withval="$with_junit" -# Check whether --with-junit was given. -if test "${with_junit+set}" = set; then : - withval=$with_junit; else with_junit=yes -fi +fi; +# Check whether --with-perl-home or --without-perl-home was given. +if test "${with_perl_home+set}" = set; then + withval="$with_perl_home" -# Check whether --with-perl-home was given. -if test "${with_perl_home+set}" = set; then : - withval=$with_perl_home; -fi - +fi; -# Check whether --with-cl-home was given. -if test "${with_cl_home+set}" = set; then : - withval=$with_cl_home; -fi +# Check whether --with-cl-home or --without-cl-home was given. +if test "${with_cl_home+set}" = set; then + withval="$with_cl_home" +fi; -# Check whether --with-mspdb-path was given. -if test "${with_mspdb_path+set}" = set; then : - withval=$with_mspdb_path; -fi +# Check whether --with-mspdb-path or --without-mspdb-path was given. +if test "${with_mspdb_path+set}" = set; then + withval="$with_mspdb_path" +fi; -# Check whether --with-midl-path was given. -if test "${with_midl_path+set}" = set; then : - withval=$with_midl_path; -fi +# Check whether --with-midl-path or --without-midl-path was given. +if test "${with_midl_path+set}" = set; then + withval="$with_midl_path" +fi; -# Check whether --with-csc-path was given. -if test "${with_csc_path+set}" = set; then : - withval=$with_csc_path; -fi +# Check whether --with-csc-path or --without-csc-path was given. +if test "${with_csc_path+set}" = set; then + withval="$with_csc_path" +fi; -# Check whether --with-nsis-path was given. -if test "${with_nsis_path+set}" = set; then : - withval=$with_nsis_path; -fi +# Check whether --with-nsis-path or --without-nsis-path was given. +if test "${with_nsis_path+set}" = set; then + withval="$with_nsis_path" +fi; -# Check whether --with-frame-home was given. -if test "${with_frame_home+set}" = set; then : - withval=$with_frame_home; -fi +# Check whether --with-frame-home or --without-frame-home was given. +if test "${with_frame_home+set}" = set; then + withval="$with_frame_home" +fi; -# Check whether --with-psdk-home was given. -if test "${with_psdk_home+set}" = set; then : - withval=$with_psdk_home; -fi +# Check whether --with-psdk-home or --without-psdk-home was given. +if test "${with_psdk_home+set}" = set; then + withval="$with_psdk_home" +fi; -# Check whether --with-directx-home was given. -if test "${with_directx_home+set}" = set; then : - withval=$with_directx_home; -fi +# Check whether --with-directx-home or --without-directx-home was given. +if test "${with_directx_home+set}" = set; then + withval="$with_directx_home" +fi; -# Check whether --with-mozilla-build was given. -if test "${with_mozilla_build+set}" = set; then : - withval=$with_mozilla_build; MOZILLABUILD=$withval -fi +# Check whether --with-mozilla-build or --without-mozilla-build was given. +if test "${with_mozilla_build+set}" = set; then + withval="$with_mozilla_build" + MOZILLABUILD=$withval +fi; +# Check whether --with-local-solenv or --without-local-solenv was given. +if test "${with_local_solenv+set}" = set; then + withval="$with_local_solenv" -# Check whether --with-local-solenv was given. -if test "${with_local_solenv+set}" = set; then : - withval=$with_local_solenv; -fi +fi; +# Check whether --with-local-solver or --without-local-solver was given. +if test "${with_local_solver+set}" = set; then + withval="$with_local_solver" -# Check whether --with-local-solver was given. -if test "${with_local_solver+set}" = set; then : - withval=$with_local_solver; -fi +fi; +# Check whether --enable-check-only or --disable-check-only was given. +if test "${enable_check_only+set}" = set; then + enableval="$enable_check_only" -# Check whether --enable-check-only was given. -if test "${enable_check_only+set}" = set; then : - enableval=$enable_check_only; -fi +fi; +# Check whether --enable-ccache-skip or --disable-ccache-skip was given. +if test "${enable_ccache_skip+set}" = set; then + enableval="$enable_ccache_skip" -# Check whether --enable-ccache-skip was given. -if test "${enable_ccache_skip+set}" = set; then : - enableval=$enable_ccache_skip; else enable_ccache_skip=auto -fi - +fi; -# Check whether --with-lang was given. -if test "${with_lang+set}" = set; then : - withval=$with_lang; -fi +# Check whether --with-lang or --without-lang was given. +if test "${with_lang+set}" = set; then + withval="$with_lang" +fi; -# Check whether --with-poor-help-localizations was given. -if test "${with_poor_help_localizations+set}" = set; then : - withval=$with_poor_help_localizations; -fi +# Check whether --with-poor-help-localizations or --without-poor-help-localizations was given. +if test "${with_poor_help_localizations+set}" = set; then + withval="$with_poor_help_localizations" +fi; -# Check whether --with-dict was given. -if test "${with_dict+set}" = set; then : - withval=$with_dict; -fi +# Check whether --with-dict or --without-dict was given. +if test "${with_dict+set}" = set; then + withval="$with_dict" +fi; -# Check whether --with-intro-bitmaps was given. -if test "${with_intro_bitmaps+set}" = set; then : - withval=$with_intro_bitmaps; -fi +# Check whether --with-intro-bitmaps or --without-intro-bitmaps was given. +if test "${with_intro_bitmaps+set}" = set; then + withval="$with_intro_bitmaps" +fi; -# Check whether --with-about-bitmaps was given. -if test "${with_about_bitmaps+set}" = set; then : - withval=$with_about_bitmaps; -fi +# Check whether --with-about-bitmaps or --without-about-bitmaps was given. +if test "${with_about_bitmaps+set}" = set; then + withval="$with_about_bitmaps" +fi; -# Check whether --with-vendor was given. -if test "${with_vendor+set}" = set; then : - withval=$with_vendor; -fi +# Check whether --with-vendor or --without-vendor was given. +if test "${with_vendor+set}" = set; then + withval="$with_vendor" +fi; -# Check whether --with-unix-wrapper was given. -if test "${with_unix_wrapper+set}" = set; then : - withval=$with_unix_wrapper; -fi +# Check whether --with-unix-wrapper or --without-unix-wrapper was given. +if test "${with_unix_wrapper+set}" = set; then + withval="$with_unix_wrapper" +fi; -# Check whether --with-asm-home was given. -if test "${with_asm_home+set}" = set; then : - withval=$with_asm_home; -fi +# Check whether --with-asm-home or --without-asm-home was given. +if test "${with_asm_home+set}" = set; then + withval="$with_asm_home" +fi; -# Check whether --with-os-version was given. -if test "${with_os_version+set}" = set; then : - withval=$with_os_version; -fi +# Check whether --with-os-version or --without-os-version was given. +if test "${with_os_version+set}" = set; then + withval="$with_os_version" +fi; -# Check whether --with-unzip-home was given. -if test "${with_unzip_home+set}" = set; then : - withval=$with_unzip_home; -fi +# Check whether --with-unzip-home or --without-unzip-home was given. +if test "${with_unzip_home+set}" = set; then + withval="$with_unzip_home" +fi; -# Check whether --with-zip-home was given. -if test "${with_zip_home+set}" = set; then : - withval=$with_zip_home; -fi +# Check whether --with-zip-home or --without-zip-home was given. +if test "${with_zip_home+set}" = set; then + withval="$with_zip_home" +fi; -# Check whether --with-mingwin was given. -if test "${with_mingwin+set}" = set; then : - withval=$with_mingwin; WITH_MINGWIN=$withval +# Check whether --with-mingwin or --without-mingwin was given. +if test "${with_mingwin+set}" = set; then + withval="$with_mingwin" + WITH_MINGWIN=$withval else WITH_MINGWIN=0 -fi - - -# Check whether --with-build-version was given. -if test "${with_build_version+set}" = set; then : - withval=$with_build_version; with_build_version=$withval -fi +fi; +# Check whether --with-build-version or --without-build-version was given. +if test "${with_build_version+set}" = set; then + withval="$with_build_version" + with_build_version=$withval +fi; -# Check whether --with-alloc was given. -if test "${with_alloc+set}" = set; then : - withval=$with_alloc; -fi +# Check whether --with-alloc or --without-alloc was given. +if test "${with_alloc+set}" = set; then + withval="$with_alloc" -# Check whether --enable-verbose was given. -if test "${enable_verbose+set}" = set; then : - enableval=$enable_verbose; -fi +fi; +# Check whether --enable-verbose or --disable-verbose was given. +if test "${enable_verbose+set}" = set; then + enableval="$enable_verbose" -# Check whether --enable-dependency-tracking was given. -if test "${enable_dependency_tracking+set}" = set; then : - enableval=$enable_dependency_tracking; -fi +fi; +# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given. +if test "${enable_dependency_tracking+set}" = set; then + enableval="$enable_dependency_tracking" +fi; BUILD_TYPE="OOo" @@ -4794,148 +3008,33 @@ echo "" echo "********************************************************************" echo "* *" echo "* Checking the platform pre-requisites. *" -echo "* *" -echo "********************************************************************" -echo "" -cat /dev/null > warn -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5 -$as_echo_n "checking for grep that handles long lines and -e... " >&6; } -if test "${ac_cv_path_GREP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test -z "$GREP"; then - ac_path_GREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in grep ggrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue -# Check for GNU ac_path_GREP and select it if it is found. - # Check for GNU $ac_path_GREP -case `"$ac_path_GREP" --version 2>&1` in -*GNU*) - ac_cv_path_GREP="$ac_path_GREP" ac_path_GREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'GREP' >> "conftest.nl" - "$ac_path_GREP" -e 'GREP$' -e '-(cannot match)-' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_GREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_GREP="$ac_path_GREP" - ac_path_GREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_GREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_GREP"; then - as_fn_error "no acceptable grep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_GREP=$GREP -fi - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_GREP" >&5 -$as_echo "$ac_cv_path_GREP" >&6; } - GREP="$ac_cv_path_GREP" - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5 -$as_echo_n "checking for egrep... " >&6; } -if test "${ac_cv_path_EGREP+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if echo a | $GREP -E '(a|b)' >/dev/null 2>&1 - then ac_cv_path_EGREP="$GREP -E" - else - if test -z "$EGREP"; then - ac_path_EGREP_found=false - # Loop through the user's path and test for each of PROGNAME-LIST - as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH$PATH_SEPARATOR/usr/xpg4/bin -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - for ac_prog in egrep; do - for ac_exec_ext in '' $ac_executable_extensions; do - ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext" - { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue -# Check for GNU ac_path_EGREP and select it if it is found. - # Check for GNU $ac_path_EGREP -case `"$ac_path_EGREP" --version 2>&1` in -*GNU*) - ac_cv_path_EGREP="$ac_path_EGREP" ac_path_EGREP_found=:;; -*) - ac_count=0 - $as_echo_n 0123456789 >"conftest.in" - while : - do - cat "conftest.in" "conftest.in" >"conftest.tmp" - mv "conftest.tmp" "conftest.in" - cp "conftest.in" "conftest.nl" - $as_echo 'EGREP' >> "conftest.nl" - "$ac_path_EGREP" 'EGREP$' < "conftest.nl" >"conftest.out" 2>/dev/null || break - diff "conftest.out" "conftest.nl" >/dev/null 2>&1 || break - as_fn_arith $ac_count + 1 && ac_count=$as_val - if test $ac_count -gt ${ac_path_EGREP_max-0}; then - # Best one so far, save it but keep looking for a better one - ac_cv_path_EGREP="$ac_path_EGREP" - ac_path_EGREP_max=$ac_count - fi - # 10*(2^10) chars as input seems more than enough - test $ac_count -gt 10 && break - done - rm -f conftest.in conftest.tmp conftest.nl conftest.out;; -esac - - $ac_path_EGREP_found && break 3 - done - done - done -IFS=$as_save_IFS - if test -z "$ac_cv_path_EGREP"; then - as_fn_error "no acceptable egrep could be found in $PATH$PATH_SEPARATOR/usr/xpg4/bin" "$LINENO" 5 - fi -else - ac_cv_path_EGREP=$EGREP -fi - - fi +echo "* *" +echo "********************************************************************" +echo "" +cat /dev/null > warn +echo "$as_me:$LINENO: checking for egrep" >&5 +echo $ECHO_N "checking for egrep... $ECHO_C" >&6 +if test "${ac_cv_prog_egrep+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if echo a | (grep -E '(a|b)') >/dev/null 2>&1 + then ac_cv_prog_egrep='grep -E' + else ac_cv_prog_egrep='egrep' + fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_path_EGREP" >&5 -$as_echo "$ac_cv_path_EGREP" >&6; } - EGREP="$ac_cv_path_EGREP" +echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5 +echo "${ECHO_T}$ac_cv_prog_egrep" >&6 + EGREP=$ac_cv_prog_egrep for ac_prog in gawk mawk nawk awk do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_AWK+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$AWK"; then ac_cv_prog_AWK="$AWK" # Let the user override the test. @@ -4945,37 +3044,35 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_AWK="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done fi fi AWK=$ac_cv_prog_AWK if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$AWK" && break done # Extract the first word of "$AWK", so it can be a program name with args. set dummy $AWK; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_AWK+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $AWK in [\\/]* | ?:[\\/]*) @@ -4987,41 +3084,42 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_AWK="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi AWK=$ac_cv_path_AWK + if test -n "$AWK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5 -$as_echo "$AWK" >&6; } + echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$AWK"; then - as_fn_error "install awk to run this script" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: install awk to run this script" >&5 +echo "$as_me: error: install awk to run this script" >&2;} + { (exit 1); exit 1; }; } fi for ac_prog in sed do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SED+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_SED+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $SED in [\\/]* | ?:[\\/]*) @@ -5033,46 +3131,47 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SED="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi SED=$ac_cv_path_SED + if test -n "$SED"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SED" >&5 -$as_echo "$SED" >&6; } + echo "$as_me:$LINENO: result: $SED" >&5 +echo "${ECHO_T}$SED" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$SED" && break done if test -z "$SED"; then - as_fn_error "install sed to run this script" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: install sed to run this script" >&5 +echo "$as_me: error: install sed to run this script" >&2;} + { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for solenv environment" >&5 -$as_echo_n "checking for solenv environment... " >&6; } +echo "$as_me:$LINENO: checking for solenv environment" >&5 +echo $ECHO_N "checking for solenv environment... $ECHO_C" >&6 if test -z "$with_local_solenv"; then LOCAL_SOLENV="DEFAULT" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5 -$as_echo "default" >&6; } + echo "$as_me:$LINENO: result: default" >&5 +echo "${ECHO_T}default" >&6 else LOCAL_SOLENV=$with_local_solenv - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_local_solenv" >&5 -$as_echo "$with_local_solenv" >&6; } + echo "$as_me:$LINENO: result: $with_local_solenv" >&5 +echo "${ECHO_T}$with_local_solenv" >&6 fi @@ -5090,134 +3189,110 @@ if test -e $_solenv/inc/minor.mk; then SOURCEVERSION="`grep SOURCEVERSION= $_solenv/inc/minor.mk | $AWK -F"=" '{ print $2 }'`" else - as_fn_error "$_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&5 +echo "$as_me: error: $_solenv/inc/minor.mk missing but needed for architecture/os detecion and proper environment script generation..." >&2;} + { (exit 1); exit 1; }; } fi ac_aux_dir= -for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do - for ac_t in install-sh install.sh shtool; do - if test -f "$ac_dir/$ac_t"; then - ac_aux_dir=$ac_dir - ac_install_sh="$ac_aux_dir/$ac_t -c" - break 2 - fi - done +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f $ac_dir/shtool; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi done if test -z "$ac_aux_dir"; then - as_fn_error "cannot find install-sh, install.sh, or shtool in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5 +echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;} + { (exit 1); exit 1; }; } fi - -# These three variables are undocumented and unsupported, -# and are intended to be withdrawn in a future Autoconf release. -# They can cause serious problems if a builder's source tree is in a directory -# whose full name contains unusual characters. -ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. -ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. -ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. - +ac_config_guess="$SHELL $ac_aux_dir/config.guess" +ac_config_sub="$SHELL $ac_aux_dir/config.sub" +ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure. # Make sure we can run config.sub. -$SHELL "$ac_aux_dir/config.sub" sun4 >/dev/null 2>&1 || - as_fn_error "cannot run $SHELL $ac_aux_dir/config.sub" "$LINENO" 5 - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5 -$as_echo_n "checking build system type... " >&6; } -if test "${ac_cv_build+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_build_alias=$build_alias -test "x$ac_build_alias" = x && - ac_build_alias=`$SHELL "$ac_aux_dir/config.guess"` -test "x$ac_build_alias" = x && - as_fn_error "cannot guess build type; you must specify one" "$LINENO" 5 -ac_cv_build=`$SHELL "$ac_aux_dir/config.sub" $ac_build_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $ac_build_alias failed" "$LINENO" 5 - -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_build" >&5 -$as_echo "$ac_cv_build" >&6; } -case $ac_cv_build in -*-*-*) ;; -*) as_fn_error "invalid value of canonical build" "$LINENO" 5;; -esac +$ac_config_sub sun4 >/dev/null 2>&1 || + { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5 +echo "$as_me: error: cannot run $ac_config_sub" >&2;} + { (exit 1); exit 1; }; } + +echo "$as_me:$LINENO: checking build system type" >&5 +echo $ECHO_N "checking build system type... $ECHO_C" >&6 +if test "${ac_cv_build+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_build_alias=$build_alias +test -z "$ac_cv_build_alias" && + ac_cv_build_alias=`$ac_config_guess` +test -z "$ac_cv_build_alias" && + { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5 +echo "$as_me: error: cannot guess build type; you must specify one" >&2;} + { (exit 1); exit 1; }; } +ac_cv_build=`$ac_config_sub $ac_cv_build_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;} + { (exit 1); exit 1; }; } + +fi +echo "$as_me:$LINENO: result: $ac_cv_build" >&5 +echo "${ECHO_T}$ac_cv_build" >&6 build=$ac_cv_build -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_build -shift -build_cpu=$1 -build_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -build_os=$* -IFS=$ac_save_IFS -case $build_os in *\ *) build_os=`echo "$build_os" | sed 's/ /-/g'`;; esac +build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5 -$as_echo_n "checking host system type... " >&6; } -if test "${ac_cv_host+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking host system type" >&5 +echo $ECHO_N "checking host system type... $ECHO_C" >&6 +if test "${ac_cv_host+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test "x$host_alias" = x; then - ac_cv_host=$ac_cv_build -else - ac_cv_host=`$SHELL "$ac_aux_dir/config.sub" $host_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $host_alias failed" "$LINENO" 5 -fi + ac_cv_host_alias=$host_alias +test -z "$ac_cv_host_alias" && + ac_cv_host_alias=$ac_cv_build_alias +ac_cv_host=`$ac_config_sub $ac_cv_host_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;} + { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_host" >&5 -$as_echo "$ac_cv_host" >&6; } -case $ac_cv_host in -*-*-*) ;; -*) as_fn_error "invalid value of canonical host" "$LINENO" 5;; -esac +echo "$as_me:$LINENO: result: $ac_cv_host" >&5 +echo "${ECHO_T}$ac_cv_host" >&6 host=$ac_cv_host -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_host -shift -host_cpu=$1 -host_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -host_os=$* -IFS=$ac_save_IFS -case $host_os in *\ *) host_os=`echo "$host_os" | sed 's/ /-/g'`;; esac +host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking target system type" >&5 -$as_echo_n "checking target system type... " >&6; } -if test "${ac_cv_target+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - if test "x$target_alias" = x; then - ac_cv_target=$ac_cv_host +echo "$as_me:$LINENO: checking target system type" >&5 +echo $ECHO_N "checking target system type... $ECHO_C" >&6 +if test "${ac_cv_target+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_target=`$SHELL "$ac_aux_dir/config.sub" $target_alias` || - as_fn_error "$SHELL $ac_aux_dir/config.sub $target_alias failed" "$LINENO" 5 -fi + ac_cv_target_alias=$target_alias +test "x$ac_cv_target_alias" = "x" && + ac_cv_target_alias=$ac_cv_host_alias +ac_cv_target=`$ac_config_sub $ac_cv_target_alias` || + { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_target_alias failed" >&5 +echo "$as_me: error: $ac_config_sub $ac_cv_target_alias failed" >&2;} + { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_target" >&5 -$as_echo "$ac_cv_target" >&6; } -case $ac_cv_target in -*-*-*) ;; -*) as_fn_error "invalid value of canonical target" "$LINENO" 5;; -esac +echo "$as_me:$LINENO: result: $ac_cv_target" >&5 +echo "${ECHO_T}$ac_cv_target" >&6 target=$ac_cv_target -ac_save_IFS=$IFS; IFS='-' -set x $ac_cv_target -shift -target_cpu=$1 -target_vendor=$2 -shift; shift -# Remember, the first character of IFS is used to create $*, -# except with old shells: -target_os=$* -IFS=$ac_save_IFS -case $target_os in *\ *) target_os=`echo "$target_os" | sed 's/ /-/g'`;; esac +target_cpu=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +target_vendor=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +target_os=`echo $ac_cv_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` # The aliases save the names the user supplied, while $host etc. @@ -5226,22 +3301,23 @@ test -n "$target_alias" && test "$program_prefix$program_suffix$program_transform_name" = \ NONENONEs,x,x, && program_prefix=${target_alias}- - if test "$build" != "$host" -o "$build" != "$target" \ -o "$host" != "$target"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cross-compiling by any means is not supported (yet)!" >&5 -$as_echo "$as_me: WARNING: cross-compiling by any means is not supported (yet)!" >&2;} + { echo "$as_me:$LINENO: WARNING: cross-compiling by any means is not supported (yet)!" >&5 +echo "$as_me: WARNING: cross-compiling by any means is not supported (yet)!" >&2;} echo "cross-compiling by any means is not supported (yet)!" >> warn fi if echo "$build_os" | grep cygwin; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Cygwin version" >&5 -$as_echo_n "checking Cygwin version... " >&6; } + echo "$as_me:$LINENO: checking Cygwin version" >&5 +echo $ECHO_N "checking Cygwin version... $ECHO_C" >&6 CygwinVer=`uname -r` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CygwinVer" >&5 -$as_echo "$CygwinVer" >&6; } + echo "$as_me:$LINENO: result: $CygwinVer" >&5 +echo "${ECHO_T}$CygwinVer" >&6 if test "`echo $CygwinVer | $AWK -F . '{ print $1$2 }'`" -lt "15"; then - as_fn_error "You need at least Cygwin V1.5.x" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: You need at least Cygwin V1.5.x" >&5 +echo "$as_me: error: You need at least Cygwin V1.5.x" >&2;} + { (exit 1); exit 1; }; } fi else CygwinVer="false" @@ -5259,10 +3335,10 @@ case "$build_os" in _os=SunOS # Extract the first word of "gtar", so it can be a program name with args. set dummy gtar; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GNUTAR+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GNUTAR+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $GNUTAR in [\\/]* | ?:[\\/]*) @@ -5275,51 +3351,56 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GNUTAR="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi GNUTAR=$ac_cv_path_GNUTAR + if test -n "$GNUTAR"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5 -$as_echo "$GNUTAR" >&6; } + echo "$as_me:$LINENO: result: $GNUTAR" >&5 +echo "${ECHO_T}$GNUTAR" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$GNUTAR"; then - as_fn_error "gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&5 +echo "$as_me: error: gtar (gnu tar) not found but needed. Install it (SUN Freeware package)." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Solaris operating system release" >&5 -$as_echo_n "checking the Solaris operating system release... " >&6; } + echo "$as_me:$LINENO: checking the Solaris operating system release" >&5 +echo $ECHO_N "checking the Solaris operating system release... $ECHO_C" >&6 _os_release=`echo $build_os | $SED -e s/solaris2\.//` if test "$_os_release" -lt "6"; then - as_fn_error "use solaris >= 6 to build OpenOffice.org" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: use solaris >= 6 to build OpenOffice.org" >&5 +echo "$as_me: error: use solaris >= 6 to build OpenOffice.org" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($_os_release)" >&5 -$as_echo "ok ($_os_release)" >&6; } + echo "$as_me:$LINENO: result: ok ($_os_release)" >&5 +echo "${ECHO_T}ok ($_os_release)" >&6 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the processor type" >&5 -$as_echo_n "checking the processor type... " >&6; } + echo "$as_me:$LINENO: checking the processor type" >&5 +echo $ECHO_N "checking the processor type... $ECHO_C" >&6 if test "$build_cpu" = "sparc" -o "$build_cpu" = "i386"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok ($build_cpu)" >&5 -$as_echo "ok ($build_cpu)" >&6; } + echo "$as_me:$LINENO: result: ok ($build_cpu)" >&5 +echo "${ECHO_T}ok ($build_cpu)" >&6 else - as_fn_error "only sparc and i386 processors are supported" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: only sparc and i386 processors are supported" >&5 +echo "$as_me: error: only sparc and i386 processors are supported" >&2;} + { (exit 1); exit 1; }; } fi ;; linux-gnu*|k*bsd*-gnu*) @@ -5353,8 +3434,8 @@ $as_echo "ok ($build_cpu)" >&6; } test_gstreamer=no _os=Darwin if test "$enable_systray" = "yes" && test "$enable_gtk" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&5 -$as_echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&2;} + { echo "$as_me:$LINENO: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&5 +echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >&2;} echo "Disabling gtk-quickstarter - not supported on Mac. Use --disable-systray" >>warn enable_systray=no fi @@ -5377,17 +3458,17 @@ $as_echo "$as_me: WARNING: Disabling gtk-quickstarter - not supported on Mac. Us test_randr=yes test_freetype=yes test_gstreamer=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the FreeBSD operating system release" >&5 -$as_echo_n "checking the FreeBSD operating system release... " >&6; } + echo "$as_me:$LINENO: checking the FreeBSD operating system release" >&5 +echo $ECHO_N "checking the FreeBSD operating system release... $ECHO_C" >&6 if test -n "$with_os_version"; then OSVERSION="$with_os_version" else OSVERSION=`/sbin/sysctl -n kern.osreldate` fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found OSVERSION=$OSVERSION" >&5 -$as_echo "found OSVERSION=$OSVERSION" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which thread library to use" >&5 -$as_echo_n "checking which thread library to use... " >&6; } + echo "$as_me:$LINENO: result: found OSVERSION=$OSVERSION" >&5 +echo "${ECHO_T}found OSVERSION=$OSVERSION" >&6 + echo "$as_me:$LINENO: checking which thread library to use" >&5 +echo $ECHO_N "checking which thread library to use... $ECHO_C" >&6 if test "$OSVERSION" -lt "500016"; then PTHREAD_CFLAGS="-D_THREAD_SAFE" PTHREAD_LIBS="-pthread" @@ -5398,8 +3479,8 @@ $as_echo_n "checking which thread library to use... " >&6; } PTHREAD_CFLAGS="" PTHREAD_LIBS="-pthread" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PTHREAD_LIBS" >&5 -$as_echo "$PTHREAD_LIBS" >&6; } + echo "$as_me:$LINENO: result: $PTHREAD_LIBS" >&5 +echo "${ECHO_T}$PTHREAD_LIBS" >&6 _os=FreeBSD ;; osf) @@ -5430,7 +3511,9 @@ $as_echo "$PTHREAD_LIBS" >&6; } _os=AIX ;; *) - as_fn_error "$_os operating system is not suitable to build OpenOffice.org!" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: $_os operating system is not suitable to build OpenOffice.org!" >&5 +echo "$as_me: error: $_os operating system is not suitable to build OpenOffice.org!" >&2;} + { (exit 1); exit 1; }; } ;; esac @@ -5438,17 +3521,17 @@ esac -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable crashdump feature" >&5 -$as_echo_n "checking whether to enable crashdump feature... " >&6; } +echo "$as_me:$LINENO: checking whether to enable crashdump feature" >&5 +echo $ECHO_N "checking whether to enable crashdump feature... $ECHO_C" >&6 if test "$enable_crashdump" = "yes"; then ENABLE_CRASHDUMP="TRUE" BUILD_TYPE="$BUILD_TYPE CRASHREP" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_CRASHDUMP="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi @@ -5457,88 +3540,90 @@ if test "$_os" = "WINNT"; then fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use the standard non-optimizing compiler" >&5 -$as_echo_n "checking whether to use the standard non-optimizing compiler... " >&6; } + echo "$as_me:$LINENO: checking whether to use the standard non-optimizing compiler" >&5 +echo $ECHO_N "checking whether to use the standard non-optimizing compiler... $ECHO_C" >&6 if test "$enable_cl_standard" = "" -o "$enable_cl_standard" = "no"; then VC_STANDARD="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 else VC_STANDARD="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to turn warnings to errors" >&5 -$as_echo_n "checking whether to turn warnings to errors... " >&6; } +echo "$as_me:$LINENO: checking whether to turn warnings to errors" >&5 +echo $ECHO_N "checking whether to turn warnings to errors... $ECHO_C" >&6 if test -n "$enable_werror" && test "$enable_werror" != "no"; then ENABLE_WERROR="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Turning warnings to errors has no effect in modules or" >&5 -$as_echo "$as_me: WARNING: Turning warnings to errors has no effect in modules or" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: on platforms where it has been disabled explicitely" >&5 -$as_echo "$as_me: WARNING: on platforms where it has been disabled explicitely" >&2;} + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + { echo "$as_me:$LINENO: WARNING: Turning warnings to errors has no effect in modules or" >&5 +echo "$as_me: WARNING: Turning warnings to errors has no effect in modules or" >&2;} + { echo "$as_me:$LINENO: WARNING: on platforms where it has been disabled explicitely" >&5 +echo "$as_me: WARNING: on platforms where it has been disabled explicitely" >&2;} echo "Turning warnings to errors has no effect in modules or on platforms where it has been disabled explicitely" >> warn else ENABLE_WERROR="FALSE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to do a debug build" >&5 -$as_echo_n "checking whether to do a debug build... " >&6; } +echo "$as_me:$LINENO: checking whether to do a debug build" >&5 +echo $ECHO_N "checking whether to do a debug build... $ECHO_C" >&6 if test -n "$enable_debug" && test "$enable_debug" != "no"; then ENABLE_DEBUG="TRUE" if test -z "$enable_symbols"; then enable_symbols="yes" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_DEBUG="FALSE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with additional debug utilities" >&5 -$as_echo_n "checking whether to build with additional debug utilities... " >&6; } +echo "$as_me:$LINENO: checking whether to build with additional debug utilities" >&5 +echo $ECHO_N "checking whether to build with additional debug utilities... $ECHO_C" >&6 if test -n "$enable_dbgutil" && test "$enable_dbgutil" != "no"; then PROEXT="" PRODUCT="" PROFULLSWITCH="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else PRODUCT="full" PROFULLSWITCH="product=full" PROEXT=".pro" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, full product build" >&5 -$as_echo "no, full product build" >&6; } + echo "$as_me:$LINENO: result: no, full product build" >&5 +echo "${ECHO_T}no, full product build" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include symbols into final build" >&5 -$as_echo_n "checking whether to include symbols into final build... " >&6; } +echo "$as_me:$LINENO: checking whether to include symbols into final build" >&5 +echo $ECHO_N "checking whether to include symbols into final build... $ECHO_C" >&6 if test -n "$enable_symbols" && test "$enable_symbols" != "no"; then if test "$enable_symbols" = "yes" -o "$enable_symbols" = "TRUE"; then ENABLE_SYMBOLS="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else if test "$enable_symbols" = "SMALL" -o "$enable_symbols" = "small"; then ENABLE_SYMBOLS="SMALL" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, small ones" >&5 -$as_echo "yes, small ones" >&6; } + echo "$as_me:$LINENO: result: yes, small ones" >&5 +echo "${ECHO_T}yes, small ones" >&6 else if test "$enable_symbols" != "no" ; then echo enable symbols is: $enable_symbols - as_fn_error "--enable-symbols only accepts yes, TRUE or SMALL as parameter." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&5 +echo "$as_me: error: --enable-symbols only accepts yes, TRUE or SMALL as parameter." >&2;} + { (exit 1); exit 1; }; } else ENABLE_SYMBOLS= fi @@ -5546,20 +3631,22 @@ $as_echo "yes, small ones" >&6; } fi else ENABLE_SYMBOLS= - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to strip the solver or not." >&5 -$as_echo_n "checking whether to strip the solver or not.... " >&6; } +echo "$as_me:$LINENO: checking whether to strip the solver or not." >&5 +echo $ECHO_N "checking whether to strip the solver or not.... $ECHO_C" >&6 if test -n "$enable_strip_solver"; then if test "$enable_strip_solver" = "yes"; then DISABLE_STRIP= else if test "$enable_strip_solver" = "no"; then DISABLE_STRIP="TRUE" else - as_fn_error "--disable-strip-solver only accepts yes or no as parameter." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: --disable-strip-solver only accepts yes or no as parameter." >&5 +echo "$as_me: error: --disable-strip-solver only accepts yes or no as parameter." >&2;} + { (exit 1); exit 1; }; } fi fi else @@ -5571,29 +3658,29 @@ else fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable native CUPS support" >&5 -$as_echo_n "checking whether to enable native CUPS support... " >&6; } +echo "$as_me:$LINENO: checking whether to enable native CUPS support" >&5 +echo $ECHO_N "checking whether to enable native CUPS support... $ECHO_C" >&6 if test "$test_cups" = "yes" -a \( "$enable_cups" = "yes" -o "$enable_cups" = "TRUE" \) ; then ENABLE_CUPS="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_CUPS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable fontconfig support" >&5 -$as_echo_n "checking whether to enable fontconfig support... " >&6; } +echo "$as_me:$LINENO: checking whether to enable fontconfig support" >&5 +echo $ECHO_N "checking whether to enable fontconfig support... $ECHO_C" >&6 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a \( "$enable_fontconfig" = "yes" -o "$enable_fontconfig" = "TRUE" \); then ENABLE_FONTCONFIG="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_FONTCONFIG="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi @@ -5608,124 +3695,124 @@ if test -z "$enable_fetch_external" || test "$enable_fetch_external" = "yes" \ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5 -$as_echo_n "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... " >&6; } +echo "$as_me:$LINENO: checking whether to enable filters for legacy binary file formats (StarOffice 5.2)" >&5 +echo $ECHO_N "checking whether to enable filters for legacy binary file formats (StarOffice 5.2)... $ECHO_C" >&6 if test "$enable_binfilter" = "no"; then WITH_BINFILTER="NO" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 else WITH_BINFILTER="YES" BUILD_TYPE="$BUILD_TYPE BINFILTER" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use DirectX" >&5 -$as_echo_n "checking whether to use DirectX... " >&6; } + echo "$as_me:$LINENO: checking whether to use DirectX" >&5 +echo $ECHO_N "checking whether to use DirectX... $ECHO_C" >&6 if test "$enable_directx" = "yes" -o "$enable_directx" = "TRUE" -o "$enable_directx" = ""; then ENABLE_DIRECTX="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_DIRECTX="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ActiveX" >&5 -$as_echo_n "checking whether to use ActiveX... " >&6; } + echo "$as_me:$LINENO: checking whether to use ActiveX" >&5 +echo $ECHO_N "checking whether to use ActiveX... $ECHO_C" >&6 if test "$enable_activex" = "yes" -o "$enable_activex" = "TRUE" -o "$enable_activex" = ""; then DISABLE_ACTIVEX="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else DISABLE_ACTIVEX="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use ATL" >&5 -$as_echo_n "checking whether to use ATL... " >&6; } + echo "$as_me:$LINENO: checking whether to use ATL" >&5 +echo $ECHO_N "checking whether to use ATL... $ECHO_C" >&6 if test "$enable_atl" = "yes" -o "$enable_atl" = "TRUE" -o "$enable_atl" = ""; then DISABLE_ATL="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else DISABLE_ATL="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use RPATH in shared libraries" >&5 -$as_echo_n "checking whether to use RPATH in shared libraries... " >&6; } +echo "$as_me:$LINENO: checking whether to use RPATH in shared libraries" >&5 +echo $ECHO_N "checking whether to use RPATH in shared libraries... $ECHO_C" >&6 if test "$enable_rpath" = "no"; then ENABLE_RPATH="no" else ENABLE_RPATH="yes" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ENABLE_RPATH" >&5 -$as_echo "$ENABLE_RPATH" >&6; } +echo "$as_me:$LINENO: result: $ENABLE_RPATH" >&5 +echo "${ECHO_T}$ENABLE_RPATH" >&6 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include MySpell dictionaries" >&5 -$as_echo_n "checking whether to include MySpell dictionaries... " >&6; } +echo "$as_me:$LINENO: checking whether to include MySpell dictionaries" >&5 +echo $ECHO_N "checking whether to include MySpell dictionaries... $ECHO_C" >&6 if test -z "$with_myspell_dicts" || test "$with_myspell_dicts" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 WITH_MYSPELL_DICTS=YES BUILD_TYPE="$BUILD_TYPE DICTIONARIES" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITH_MYSPELL_DICTS=NO fi if test "$WITH_MYSPELL_DICTS" = "NO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dicts from external paths" >&5 -$as_echo_n "checking whether to use dicts from external paths... " >&6; } + echo "$as_me:$LINENO: checking whether to use dicts from external paths" >&5 +echo $ECHO_N "checking whether to use dicts from external paths... $ECHO_C" >&6 if test -n "$with_system_dicts" -a "$with_system_dicts" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 SYSTEM_DICTS=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for spelling dictionary directory" >&5 -$as_echo_n "checking for spelling dictionary directory... " >&6; } + echo "$as_me:$LINENO: checking for spelling dictionary directory" >&5 +echo $ECHO_N "checking for spelling dictionary directory... $ECHO_C" >&6 if test -n "$with_external_dict_dir"; then DICT_SYSTEM_DIR=file://$with_external_dict_dir else DICT_SYSTEM_DIR=file:///usr/share/hunspell fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DICT_SYSTEM_DIR" >&5 -$as_echo "$DICT_SYSTEM_DIR" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hyphenation patterns directory" >&5 -$as_echo_n "checking for hyphenation patterns directory... " >&6; } + echo "$as_me:$LINENO: result: $DICT_SYSTEM_DIR" >&5 +echo "${ECHO_T}$DICT_SYSTEM_DIR" >&6 + echo "$as_me:$LINENO: checking for hyphenation patterns directory" >&5 +echo $ECHO_N "checking for hyphenation patterns directory... $ECHO_C" >&6 if test -n "$with_external_hyph_dir"; then HYPH_SYSTEM_DIR=file://$with_external_hyph_dir else HYPH_SYSTEM_DIR=file:///usr/share/hyphen fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HYPH_SYSTEM_DIR" >&5 -$as_echo "$HYPH_SYSTEM_DIR" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for thesaurus directory" >&5 -$as_echo_n "checking for thesaurus directory... " >&6; } + echo "$as_me:$LINENO: result: $HYPH_SYSTEM_DIR" >&5 +echo "${ECHO_T}$HYPH_SYSTEM_DIR" >&6 + echo "$as_me:$LINENO: checking for thesaurus directory" >&5 +echo $ECHO_N "checking for thesaurus directory... $ECHO_C" >&6 if test -n "$with_external_thes_dir"; then THES_SYSTEM_DIR=file://$with_external_thes_dir else THES_SYSTEM_DIR=file:///usr/share/mythes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $THES_SYSTEM_DIR" >&5 -$as_echo "$THES_SYSTEM_DIR" >&6; } + echo "$as_me:$LINENO: result: $THES_SYSTEM_DIR" >&5 +echo "${ECHO_T}$THES_SYSTEM_DIR" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 SYSTEM_DICTS=NO fi fi @@ -5735,12 +3822,16 @@ fi if test $_os = "WINNT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Windows build environment sanity" >&5 -$as_echo_n "checking Windows build environment sanity... " >&6; } + echo "$as_me:$LINENO: checking Windows build environment sanity" >&5 +echo $ECHO_N "checking Windows build environment sanity... $ECHO_C" >&6 if test -L $AWK -o -L `which awk` -o -L `which tar` -o -L `which gunzip` ; then - as_fn_error "$AWK, awk, tar or gunzip is a cygwin symlink! + { { echo "$as_me:$LINENO: error: $AWK, awk, tar or gunzip is a cygwin symlink! +Native windows programs cannot use cygwin symlinks. Remove the symbolic +link, and copy the program to the name of the link." >&5 +echo "$as_me: error: $AWK, awk, tar or gunzip is a cygwin symlink! Native windows programs cannot use cygwin symlinks. Remove the symbolic -link, and copy the program to the name of the link." "$LINENO" 5 +link, and copy the program to the name of the link." >&2;} + { (exit 1); exit 1; }; } fi CC=`echo $CC | $SED "s/^guw.exe //"` CXX=`echo $CXX | $SED "s/^guw.exe //"` @@ -5755,29 +3846,31 @@ link, and copy the program to the name of the link." "$LINENO" 5 CXX="g++ -mno-cygwin" fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6 fi if test "$_os" = "WINNT" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cygwin gcc/g++" >&5 -$as_echo_n "checking for cygwin gcc/g++... " >&6; } + echo "$as_me:$LINENO: checking for cygwin gcc/g++" >&5 +echo $ECHO_N "checking for cygwin gcc/g++... $ECHO_C" >&6 if which gcc > /dev/null && which g++ > /dev/null ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - as_fn_error "cygwin gcc and g++ are needed, please install them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cygwin gcc and g++ are needed, please install them." >&5 +echo "$as_me: error: cygwin gcc and g++ are needed, please install them." >&2;} + { (exit 1); exit 1; }; } fi fi # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SHELLPATH+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_SHELLPATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $SHELLPATH in [\\/]* | ?:[\\/]*) @@ -5789,45 +3882,46 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SHELLPATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi SHELLPATH=$ac_cv_path_SHELLPATH + if test -n "$SHELLPATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SHELLPATH" >&5 -$as_echo "$SHELLPATH" >&6; } + echo "$as_me:$LINENO: result: $SHELLPATH" >&5 +echo "${ECHO_T}$SHELLPATH" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$SHELLPATH"; then - as_fn_error "bash not found in \$PATH" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: bash not found in \$PATH" >&5 +echo "$as_me: error: bash not found in \$PATH" >&2;} + { (exit 1); exit 1; }; } else SHELLPATH=`echo $SHELLPATH | $SED -n "s/\/bash$//p"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc home" >&5 -$as_echo_n "checking gcc home... " >&6; } +echo "$as_me:$LINENO: checking gcc home" >&5 +echo $ECHO_N "checking gcc home... $ECHO_C" >&6 if test -z "$with_gcc_home"; then GCC_HOME=`which gcc | $SED -e s,/bin/gcc,,` else GCC_HOME="$with_gcc_home" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCC_HOME" >&5 -$as_echo "$GCC_HOME" >&6; } +echo "$as_me:$LINENO: result: $GCC_HOME" >&5 +echo "${ECHO_T}$GCC_HOME" >&6 save_CC=$CC @@ -5848,10 +3942,10 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args. set dummy ${ac_tool_prefix}gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -5861,37 +3955,35 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$ac_cv_prog_CC"; then ac_ct_CC=$CC # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -5901,50 +3993,39 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="gcc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi + CC=$ac_ct_CC else CC="$ac_cv_prog_CC" fi if test -z "$CC"; then - if test -n "$ac_tool_prefix"; then - # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args. set dummy ${ac_tool_prefix}cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -5954,37 +4035,77 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="${ac_tool_prefix}cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - +fi +if test -z "$ac_cv_prog_CC"; then + ac_ct_CC=$CC + # Extract the first word of "cc", so it can be a program name with args. +set dummy cc; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_CC"; then + ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_CC="cc" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 fi +done +done + +fi +fi +ac_ct_CC=$ac_cv_prog_ac_ct_CC +if test -n "$ac_ct_CC"; then + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + + CC=$ac_ct_CC +else + CC="$ac_cv_prog_CC" +fi + fi if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -5995,19 +4116,18 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then ac_prog_rejected=yes continue fi ac_cv_prog_CC="cc" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done if test $ac_prog_rejected = yes; then # We found a bogon in the path, so make sure we never use it. @@ -6025,25 +4145,24 @@ fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$CC"; then if test -n "$ac_tool_prefix"; then - for ac_prog in cl.exe + for ac_prog in cl do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. @@ -6053,41 +4172,39 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CC="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done fi fi CC=$ac_cv_prog_CC if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$CC" && break done fi if test -z "$CC"; then ac_ct_CC=$CC - for ac_prog in cl.exe + for ac_prog in cl do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CC"; then ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test. @@ -6097,78 +4214,66 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CC="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done fi fi ac_ct_CC=$ac_cv_prog_ac_ct_CC if test -n "$ac_ct_CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CC" >&5 -$as_echo "$ac_ct_CC" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CC" >&5 +echo "${ECHO_T}$ac_ct_CC" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CC" && break done - if test "x$ac_ct_CC" = x; then - CC="" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CC=$ac_ct_CC - fi + CC=$ac_ct_CC fi fi -test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "no acceptable C compiler found in \$PATH -See \`config.log' for more details." "$LINENO" 5; } +test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&5 +echo "$as_me: error: no acceptable C compiler found in \$PATH +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err +echo "$as_me:$LINENO:" \ + "checking for C compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -6180,109 +4285,112 @@ main () } _ACEOF ac_clean_files_save=$ac_clean_files -ac_clean_files="$ac_clean_files a.out a.out.dSYM a.exe b.out" +ac_clean_files="$ac_clean_files a.out a.exe b.out" # Try to create an executable without -o first, disregard a.out. # It will help us diagnose broken compilers, and finding out an intuition # of exeext. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler works" >&5 -$as_echo_n "checking whether the C compiler works... " >&6; } -ac_link_default=`$as_echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` - -# The possible output files: -ac_files="a.out conftest.exe conftest a.exe a_out.exe b.out conftest.*" - -ac_rmfiles= -for ac_file in $ac_files -do - case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; - * ) ac_rmfiles="$ac_rmfiles $ac_file";; - esac -done -rm -f $ac_rmfiles - -if { { ac_try="$ac_link_default" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link_default") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - # Autoconf-2.13 could set the ac_cv_exeext variable to `no'. -# So ignore a value of `no', otherwise this would lead to `EXEEXT = no' -# in a Makefile. We should not override ac_cv_exeext if it was cached, -# so that the user can short-circuit this test for compilers unknown to -# Autoconf. -for ac_file in $ac_files '' +echo "$as_me:$LINENO: checking for C compiler default output file name" >&5 +echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6 +ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'` +if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5 + (eval $ac_link_default) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + # Find the output, starting from the most likely. This scheme is +# not robust to junk in `.', hence go to wildcards (a.*) only as a last +# resort. + +# Be careful to initialize this variable, since it used to be cached. +# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile. +ac_cv_exeext= +# b.out is created by i960 compilers. +for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) + ;; + conftest.$ac_ext ) + # This is the source file. ;; [ab].out ) # We found the default executable, but exeext='' is most # certainly right. break;; *.* ) - if test "${ac_cv_exeext+set}" = set && test "$ac_cv_exeext" != no; - then :; else - ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` - fi - # We set ac_cv_exeext here because the later test for it is not - # safe: cross compilers may not add the suffix if given an `-o' - # argument, so we may need to know it at that point already. - # Even if this section looks crufty: it has the advantage of - # actually working. + ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + # FIXME: I believe we export ac_cv_exeext for Libtool, + # but it would be cool to find out if it's true. Does anybody + # maintain Libtool? --akim. + export ac_cv_exeext break;; * ) break;; esac done -test "$ac_cv_exeext" = no && ac_cv_exeext= - else - ac_file='' -fi -if test -z "$ac_file"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -$as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "C compiler cannot create executables -See \`config.log' for more details." "$LINENO" 5; }; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +{ { echo "$as_me:$LINENO: error: C compiler cannot create executables +See \`config.log' for more details." >&5 +echo "$as_me: error: C compiler cannot create executables +See \`config.log' for more details." >&2;} + { (exit 77); exit 77; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler default output file name" >&5 -$as_echo_n "checking for C compiler default output file name... " >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_file" >&5 -$as_echo "$ac_file" >&6; } + ac_exeext=$ac_cv_exeext +echo "$as_me:$LINENO: result: $ac_file" >&5 +echo "${ECHO_T}$ac_file" >&6 + +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:$LINENO: checking whether the C compiler works" >&5 +echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6 +# FIXME: These cross compiler hacks should be removed for Autoconf 3.0 +# If not cross compiling, check that we can run a simple program. +if test "$cross_compiling" != yes; then + if { ac_try='./$ac_file' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + cross_compiling=no + else + if test "$cross_compiling" = maybe; then + cross_compiling=yes + else + { { echo "$as_me:$LINENO: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run C compiled programs. +If you meant to cross compile, use \`--host'. +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } + fi + fi +fi +echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 -rm -f -r a.out a.out.dSYM a.exe conftest$ac_cv_exeext b.out +rm -f a.out a.exe conftest$ac_cv_exeext b.out ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of executables" >&5 -$as_echo_n "checking for suffix of executables... " >&6; } -if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 +# Check the compiler produces executables we can run. If not, either +# the compiler is broken, or we cross compile. +echo "$as_me:$LINENO: checking whether we are cross compiling" >&5 +echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6 +echo "$as_me:$LINENO: result: $cross_compiling" >&5 +echo "${ECHO_T}$cross_compiling" >&6 + +echo "$as_me:$LINENO: checking for suffix of executables" >&5 +echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6 +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then # If both `conftest.exe' and `conftest' are `present' (well, observable) # catch `conftest.exe'. For instance with Cygwin, `ls conftest' will # work properly (i.e., refer to `conftest.exe'), while it won't with @@ -6290,90 +4398,38 @@ $as_echo "$ac_try_echo"; } >&5 for ac_file in conftest.exe conftest conftest.*; do test -f "$ac_file" || continue case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM | *.o | *.obj ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;; *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'` + export ac_cv_exeext break;; * ) break;; esac done else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of executables: cannot compile and link -See \`config.log' for more details." "$LINENO" 5; } + { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of executables: cannot compile and link +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi -rm -f conftest conftest$ac_cv_exeext -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5 -$as_echo "$ac_cv_exeext" >&6; } + +rm -f conftest$ac_cv_exeext +echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5 +echo "${ECHO_T}$ac_cv_exeext" >&6 rm -f conftest.$ac_ext EXEEXT=$ac_cv_exeext ac_exeext=$EXEEXT -cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -FILE *f = fopen ("conftest.out", "w"); - return ferror (f) || fclose (f) != 0; - - ; - return 0; -} -_ACEOF -ac_clean_files="$ac_clean_files conftest.out" -# Check that the compiler produces executables we can run. If not, either -# the compiler is broken, or we cross compile. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are cross compiling" >&5 -$as_echo_n "checking whether we are cross compiling... " >&6; } -if test "$cross_compiling" != yes; then - { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } - if { ac_try='./conftest$ac_cv_exeext' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - cross_compiling=no - else - if test "$cross_compiling" = maybe; then - cross_compiling=yes - else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run C compiled programs. -If you meant to cross compile, use \`--host'. -See \`config.log' for more details." "$LINENO" 5; } - fi - fi -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $cross_compiling" >&5 -$as_echo "$cross_compiling" >&6; } - -rm -f conftest.$ac_ext conftest$ac_cv_exeext conftest.out -ac_clean_files=$ac_clean_files_save -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5 -$as_echo_n "checking for suffix of object files... " >&6; } -if test "${ac_cv_objext+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for suffix of object files" >&5 +echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6 +if test "${ac_cv_objext+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -6385,46 +4441,45 @@ main () } _ACEOF rm -f conftest.o conftest.obj -if { { ac_try="$ac_compile" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compile") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; then : - for ac_file in conftest.o conftest.obj conftest.*; do - test -f "$ac_file" || continue; +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then + for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do case $ac_file in - *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.map | *.inf | *.dSYM ) ;; + *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;; *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'` break;; esac done else - $as_echo "$as_me: failed program was:" >&5 + echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 -{ { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot compute suffix of object files: cannot compile -See \`config.log' for more details." "$LINENO" 5; } +{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute suffix of object files: cannot compile +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi + rm -f conftest.$ac_cv_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_objext" >&5 -$as_echo "$ac_cv_objext" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_objext" >&5 +echo "${ECHO_T}$ac_cv_objext" >&6 OBJEXT=$ac_cv_objext ac_objext=$OBJEXT -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5 -$as_echo_n "checking whether we are using the GNU C compiler... " >&6; } -if test "${ac_cv_c_compiler_gnu+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6 +if test "${ac_cv_c_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -6438,49 +4493,55 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else - ac_compiler_gnu=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_c_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_compiler_gnu" >&5 -$as_echo "$ac_cv_c_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GCC=yes -else - GCC= -fi +echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6 +GCC=`test $ac_compiler_gnu = yes && echo yes` ac_test_CFLAGS=${CFLAGS+set} ac_save_CFLAGS=$CFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5 -$as_echo_n "checking whether $CC accepts -g... " >&6; } -if test "${ac_cv_prog_cc_g+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_save_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - ac_cv_prog_cc_g=no - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} +CFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5 +echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -else - CFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -6491,34 +4552,39 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_g=yes else - ac_c_werror_flag=$ac_save_c_werror_flag - CFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +ac_cv_prog_cc_g=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_c_werror_flag=$ac_save_c_werror_flag +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_g" >&5 -$as_echo "$ac_cv_prog_cc_g" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_g" >&6 if test "$ac_test_CFLAGS" = set; then CFLAGS=$ac_save_CFLAGS elif test $ac_cv_prog_cc_g = yes; then @@ -6534,14 +4600,18 @@ else CFLAGS= fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5 -$as_echo_n "checking for $CC option to accept ISO C89... " >&6; } -if test "${ac_cv_prog_cc_c89+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5 +echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6 +if test "${ac_cv_prog_cc_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - ac_cv_prog_cc_c89=no + ac_cv_prog_cc_stdc=no ac_save_CC=$CC -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include @@ -6569,17 +4639,12 @@ static char *f (char * (*g) (char **, int), char **p, ...) /* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has function prototypes and stuff, but not '\xHH' hex character constants. These don't provoke an error unfortunately, instead are silently treated - as 'x'. The following induces an error, until -std is added to get + as 'x'. The following induces an error, until -std1 is added to get proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an array size at least. It's necessary to write '\x00'==0 to get something - that's true only with -std. */ + that's true only with -std1. */ int osf4_cc_array ['\x00' == 0 ? 1 : -1]; -/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters - inside strings and character constants. */ -#define FOO(x) 'x' -int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1]; - int test (int i, double x); struct s1 {int (*f) (int a);}; struct s2 {int (*f) (double a);}; @@ -6589,42 +4654,210 @@ char **argv; int main () { -return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; +return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1]; + ; + return 0; +} +_ACEOF +# Don't try gcc -ansi; that turns off useful extensions and +# breaks some systems' header files. +# AIX -qlanglvl=ansi +# Ultrix and OSF/1 -std1 +# HP-UX 10.20 and later -Ae +# HP-UX older versions -Aa -D_HPUX_SOURCE +# SVR4 -Xc -D__EXTENSIONS__ +for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" +do + CC="$ac_save_CC $ac_arg" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_prog_cc_stdc=$ac_arg +break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext +done +rm -f conftest.$ac_ext conftest.$ac_objext +CC=$ac_save_CC + +fi + +case "x$ac_cv_prog_cc_stdc" in + x|xno) + echo "$as_me:$LINENO: result: none needed" >&5 +echo "${ECHO_T}none needed" >&6 ;; + *) + echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5 +echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6 + CC="$CC $ac_cv_prog_cc_stdc" ;; +esac + +# Some people use a C++ compiler to compile C. Since we use `exit', +# in C++ we need to declare it. In case someone uses the same compiler +# for both compiling C and C++ we need to have the C++ compiler decide +# the declaration of exit, since it's the most demanding environment. +cat >conftest.$ac_ext <<_ACEOF +#ifndef __cplusplus + choke me +#endif +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +#include +int +main () +{ +exit (42); + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +continue +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +int +main () +{ +exit (42); ; return 0; } _ACEOF -for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \ - -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__" -do - CC="$ac_save_CC $ac_arg" - if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_prog_cc_c89=$ac_arg +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext - test "x$ac_cv_prog_cc_c89" != "xno" && break +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext done -rm -f conftest.$ac_ext -CC=$ac_save_CC - +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h fi -# AC_CACHE_VAL -case "x$ac_cv_prog_cc_c89" in - x) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none needed" >&5 -$as_echo "none needed" >&6; } ;; - xno) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: unsupported" >&5 -$as_echo "unsupported" >&6; } ;; - *) - CC="$CC $ac_cv_prog_cc_c89" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cc_c89" >&5 -$as_echo "$ac_cv_prog_cc_c89" >&6; } ;; -esac -if test "x$ac_cv_prog_cc_c89" != xno; then : -fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -6639,10 +4872,10 @@ if test "$COMPATH" = "." ; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_COMPATH+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_COMPATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $COMPATH in [\\/]* | ?:[\\/]*) @@ -6654,29 +4887,28 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_COMPATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi COMPATH=$ac_cv_path_COMPATH + if test -n "$COMPATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $COMPATH" >&5 -$as_echo "$COMPATH" >&6; } + echo "$as_me:$LINENO: result: $COMPATH" >&5 +echo "${ECHO_T}$COMPATH" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$COMPATH" && break done @@ -6686,18 +4918,22 @@ COMPATH=`echo $COMPATH | $SED "s@/[Bb][Ii][Nn]\\\$@@"`; GCCVER=20995 if test \( "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes" \) -a "$GCC" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU gcc compiler version" >&5 -$as_echo_n "checking the GNU gcc compiler version... " >&6; } + echo "$as_me:$LINENO: checking the GNU gcc compiler version" >&5 +echo $ECHO_N "checking the GNU gcc compiler version... $ECHO_C" >&6 _gcc_version=`$CC -dumpversion` _gcc_major=`echo $_gcc_version | $AWK -F. '{ print \$1 }'` GCCVER=`echo $_gcc_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$_gcc_major" -lt "3"; then - as_fn_error "found version \"$_gcc_version\", use version 3+ of the gcc compiler" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&5 +echo "$as_me: error: found version \"$_gcc_version\", use version 3+ of the gcc compiler" >&2;} + { (exit 1); exit 1; }; } else if test "$GCCVER" -eq "030203"; then if test "$ENABLE_SYMBOLS" = "SMALL"; then - as_fn_error "version \"$_gcc_version\" gives internal error with small." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: version \"$_gcc_version\" gives internal error with small." >&5 +echo "$as_me: error: version \"$_gcc_version\" gives internal error with small." >&2;} + { (exit 1); exit 1; }; } fi fi fi @@ -6710,35 +4946,43 @@ $as_echo_n "checking the GNU gcc compiler version... " >&6; } fi fi if test "$GCCVER" -ge "040100" ; then - as_fn_error "You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly" >&5 +echo "$as_me: error: You need to use the gcc-4.0 compiler (gcc $_gcc_version won't work with the MacOSX10.4u.sdk) - set CC accordingly" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: implicitly using CC=$CC" >&5 -$as_echo "implicitly using CC=$CC" >&6; } + echo "$as_me:$LINENO: result: implicitly using CC=$CC" >&5 +echo "${ECHO_T}implicitly using CC=$CC" >&6 fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (gcc $_gcc_version)" >&5 -$as_echo "checked (gcc $_gcc_version)" >&6; } + echo "$as_me:$LINENO: result: checked (gcc $_gcc_version)" >&5 +echo "${ECHO_T}checked (gcc $_gcc_version)" >&6 fi if test "$_os" = "SunOS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking gcc linker" >&5 -$as_echo_n "checking gcc linker... " >&6; } + echo "$as_me:$LINENO: checking gcc linker" >&5 +echo $ECHO_N "checking gcc linker... $ECHO_C" >&6 if $CC -Wl,--version 2>&1 |head -n 1| grep -v GNU > /dev/null;then - as_fn_error "failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&5 +echo "$as_me: error: failed (not GNU ld). Use GNU ld instead of Sun ld on Solaris" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok (GNU ld)" >&5 -$as_echo "ok (GNU ld)" >&6; } + echo "$as_me:$LINENO: result: ok (GNU ld)" >&5 +echo "${ECHO_T}ok (GNU ld)" >&6 fi fi HAVE_LD_BSYMBOLIC_FUNCTIONS= if test "$GCC" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -Bsymbolic-functions linker support " >&5 -$as_echo_n "checking for -Bsymbolic-functions linker support ... " >&6; } + echo "$as_me:$LINENO: checking for -Bsymbolic-functions linker support " >&5 +echo $ECHO_N "checking for -Bsymbolic-functions linker support ... $ECHO_C" >&6 bsymbolic_functions_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,-Bsymbolic-functions -Wl,--dynamic-list-cpp-new -Wl,--dynamic-list-cpp-typeinfo" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -6753,47 +4997,72 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then HAVE_LD_BSYMBOLIC_FUNCTIONS=TRUE +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "z$HAVE_LD_BSYMBOLIC_FUNCTIONS" = "zTRUE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found " >&5 -$as_echo "found " >&6; } + echo "$as_me:$LINENO: result: found " >&5 +echo "${ECHO_T}found " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found " >&5 -$as_echo "not found " >&6; } + echo "$as_me:$LINENO: result: not found " >&5 +echo "${ECHO_T}not found " >&6 fi LDFLAGS=$bsymbolic_functions_ldflags_save fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pch feature" >&5 -$as_echo_n "checking whether to enable pch feature... " >&6; } +echo "$as_me:$LINENO: checking whether to enable pch feature" >&5 +echo $ECHO_N "checking whether to enable pch feature... $ECHO_C" >&6 if test -n "$enable_pch" && test "$enable_pch" != "no"; then if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then ENABLE_PCH="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 elif test "$GCC" = "yes" -a "$GCCVER" -gt "030400"; then ENABLE_PCH="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_PCH="" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Precompiled header not yet supported for your platform/compiler" >&5 -$as_echo "$as_me: WARNING: Precompiled header not yet supported for your platform/compiler" >&2;} + { echo "$as_me:$LINENO: WARNING: Precompiled header not yet supported for your platform/compiler" >&5 +echo "$as_me: WARNING: Precompiled header not yet supported for your platform/compiler" >&2;} fi else ENABLE_PCH="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU make" >&5 -$as_echo_n "checking for GNU make... " >&6; } +echo "$as_me:$LINENO: checking for GNU make" >&5 +echo $ECHO_N "checking for GNU make... $ECHO_C" >&6 for a in "$MAKE" $GNUMAKE make gmake gnumake; do $a --version 2> /dev/null | grep GNU 2>&1 > /dev/null if test $? -eq 0; then @@ -6801,36 +5070,40 @@ for a in "$MAKE" $GNUMAKE make gmake gnumake; do break fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE" >&5 -$as_echo "$GNUMAKE" >&6; } +echo "$as_me:$LINENO: result: $GNUMAKE" >&5 +echo "${ECHO_T}$GNUMAKE" >&6 if test -z "$GNUMAKE"; then - as_fn_error "not found. install GNU make." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not found. install GNU make." >&5 +echo "$as_me: error: not found. install GNU make." >&2;} + { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU make version" >&5 -$as_echo_n "checking the GNU make version... " >&6; } +echo "$as_me:$LINENO: checking the GNU make version" >&5 +echo $ECHO_N "checking the GNU make version... $ECHO_C" >&6 _make_version=`$GNUMAKE --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _make_longver=`echo $_make_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` if test "$_make_longver" -ge "037901" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE $_make_version" >&5 -$as_echo "$GNUMAKE $_make_version" >&6; } + echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 +echo "${ECHO_T}$GNUMAKE $_make_version" >&6 else if test "$_os" = "Darwin"; then if test "$_make_longver" -ge "037900" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUMAKE $_make_version" >&5 -$as_echo "$GNUMAKE $_make_version" >&6; } + echo "$as_me:$LINENO: result: $GNUMAKE $_make_version" >&5 +echo "${ECHO_T}$GNUMAKE $_make_version" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5 -$as_echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&2;} + { echo "$as_me:$LINENO: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&5 +echo "$as_me: WARNING: failed ($GNUMAKE $_make_version need 3.79.0+)" >&2;} fi else - as_fn_error "failed ($GNUMAKE $_make_version need 3.79.1+)" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&5 +echo "$as_me: error: failed ($GNUMAKE $_make_version need 3.79.1+)" >&2;} + { (exit 1); exit 1; }; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU tar" >&5 -$as_echo_n "checking for GNU tar... " >&6; } +echo "$as_me:$LINENO: checking for GNU tar" >&5 +echo $ECHO_N "checking for GNU tar... $ECHO_C" >&6 for a in $GNUTAR gtar gnutar tar; do $a --version 2> /dev/null | grep GNU 2>&1 > /dev/null if test $? -eq 0; then @@ -6838,10 +5111,12 @@ for a in $GNUTAR gtar gnutar tar; do break fi done -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUTAR" >&5 -$as_echo "$GNUTAR" >&6; } +echo "$as_me:$LINENO: result: $GNUTAR" >&5 +echo "${ECHO_T}$GNUTAR" >&6 if test -z "$GNUTAR"; then - as_fn_error "not found. install GNU tar." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not found. install GNU tar." >&5 +echo "$as_me: error: not found. install GNU tar." >&2;} + { (exit 1); exit 1; }; } fi @@ -6852,10 +5127,10 @@ if test "$_os" = "SunOS"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path__cc+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path__cc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $_cc in [\\/]* | ?:[\\/]*) @@ -6867,58 +5142,65 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi _cc=$ac_cv_path__cc + if test -n "$_cc"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cc" >&5 -$as_echo "$_cc" >&6; } + echo "$as_me:$LINENO: result: $_cc" >&5 +echo "${ECHO_T}$_cc" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$_cc" && break done COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the SunStudio C/C++ compiler version" >&5 -$as_echo_n "checking the SunStudio C/C++ compiler version... " >&6; } + echo "$as_me:$LINENO: checking the SunStudio C/C++ compiler version" >&5 +echo $ECHO_N "checking the SunStudio C/C++ compiler version... $ECHO_C" >&6 _sunstudio_string=`$CC -V 2>&1 | grep '^cc' | sed -e 's/.* C //'` _sunstudio_version=`echo $_sunstudio_string | $AWK '{ print $1 }'` _sunstudio_major=`echo $_sunstudio_version | $AWK -F. '{ print $1 }'` if test "$_sunstudio_major" != "5"; then - as_fn_error "found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5 +echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;} + { (exit 1); exit 1; }; } else _sunstudio_minor=`echo $_sunstudio_version | $AWK -F. '{ if ($2 == 5) print "true"; else if ($2 == 7) print "true"; else if ($2 == 8) print "true"; else if ($2 == 9) print "true"; else print "false" }'` if test "$_sunstudio_minor" = "false"; then - as_fn_error "found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&5 +echo "$as_me: error: found version \"$_sunstudio_version\", use version 5.5, 5.7, 5.8 or 5.9 of the SunStudio C/C++ compiler" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5 -$as_echo "checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 fi fi fi fi if test "$GCC" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for --hash-style=both linker support " >&5 -$as_echo_n "checking for --hash-style=both linker support ... " >&6; } + echo "$as_me:$LINENO: checking for --hash-style=both linker support " >&5 +echo $ECHO_N "checking for --hash-style=both linker support ... $ECHO_C" >&6 hash_style_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -Wl,--hash-style=both" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -6933,19 +5215,43 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then HAVE_LD_HASH_STYLE=TRUE else - HAVE_LD_HASH_STYLE=FALSE + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +HAVE_LD_HASH_STYLE=FALSE fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext if test "z$HAVE_LD_HASH_STYLE" = "zTRUE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found " >&5 -$as_echo "found " >&6; } + echo "$as_me:$LINENO: result: found " >&5 +echo "${ECHO_T}found " >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found " >&5 -$as_echo "not found " >&6; } + echo "$as_me:$LINENO: result: not found " >&5 +echo "${ECHO_T}not found " >&6 fi LDFLAGS=$hash_style_ldflags_save fi @@ -6957,10 +5263,10 @@ if test "$_os" = "OSF1"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path__cc+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path__cc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $_cc in [\\/]* | ?:[\\/]*) @@ -6972,44 +5278,45 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path__cc="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi _cc=$ac_cv_path__cc + if test -n "$_cc"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_cc" >&5 -$as_echo "$_cc" >&6; } + echo "$as_me:$LINENO: result: $_cc" >&5 +echo "${ECHO_T}$_cc" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$_cc" && break done COMPATH=`echo $_cc | $SED -n "s/\/bin\/cc//p"` - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ******* $_cc , $COMPATH" >&5 -$as_echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Compaq C compiler version" >&5 -$as_echo_n "checking the Compaq C compiler version... " >&6; } + { echo "$as_me:$LINENO: WARNING: ******* $_cc , $COMPATH" >&5 +echo "$as_me: WARNING: ******* $_cc , $COMPATH" >&2;} + echo "$as_me:$LINENO: checking the Compaq C compiler version" >&5 +echo $ECHO_N "checking the Compaq C compiler version... $ECHO_C" >&6 _compaqc_version=`$CC -V 2>&1 | $AWK '{ print $3 }'` _compaqc_major=`echo $_compaqc_version | $AWK -F. '{ print $1 }'` if test "$_compaqc_major" != "T6"; then - as_fn_error "found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&5 +echo "$as_me: error: found version \"$_compaqc_version\", use version 6 of the Compaq C compiler" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5 -$as_echo "checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 fi fi fi @@ -7017,10 +5324,10 @@ fi if test -z "$with_perl_home"; then # Extract the first word of "perl", so it can be a program name with args. set dummy perl; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PERL+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PERL+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PERL in [\\/]* | ?:[\\/]*) @@ -7032,29 +5339,28 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PERL="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi PERL=$ac_cv_path_PERL + if test -n "$PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PERL" >&5 -$as_echo "$PERL" >&6; } + echo "$as_me:$LINENO: result: $PERL" >&5 +echo "${ECHO_T}$PERL" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - else if test "$_os" = "WINNT"; then with_perl_home=`cygpath -u "$with_perl_home"` @@ -7063,38 +5369,46 @@ else if test -x "$_perl_path"; then PERL=$_perl_path else - as_fn_error "$_perl_path not found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: $_perl_path not found" >&5 +echo "$as_me: error: $_perl_path not found" >&2;} + { (exit 1); exit 1; }; } fi fi if test "$PERL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Perl version" >&5 -$as_echo_n "checking the Perl version... " >&6; } + echo "$as_me:$LINENO: checking the Perl version" >&5 +echo $ECHO_N "checking the Perl version... $ECHO_C" >&6 ${PERL} -e "exit($]);" _perl_version=$? if test "$_perl_version" -lt 5; then - as_fn_error "found Perl version \"$_perl_version\", use version 5 of Perl" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&5 +echo "$as_me: error: found Perl version \"$_perl_version\", use version 5 of Perl" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (perl $_perl_version)" >&5 -$as_echo "checked (perl $_perl_version)" >&6; } + echo "$as_me:$LINENO: result: checked (perl $_perl_version)" >&5 +echo "${ECHO_T}checked (perl $_perl_version)" >&6 else - as_fn_error "Perl not found, install version 5 of Perl" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Perl not found, install version 5 of Perl" >&5 +echo "$as_me: error: Perl not found, install version 5 of Perl" >&2;} + { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for required Perl modules" >&5 -$as_echo_n "checking for required Perl modules... " >&6; } +echo "$as_me:$LINENO: checking for required Perl modules" >&5 +echo $ECHO_N "checking for required Perl modules... $ECHO_C" >&6 if `$PERL -e 'use Archive::Zip;'`; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: all modules found" >&5 -$as_echo "all modules found" >&6; } + echo "$as_me:$LINENO: result: all modules found" >&5 +echo "${ECHO_T}all modules found" >&6 else - as_fn_error "Failed to find some modules" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Failed to find some modules" >&5 +echo "$as_me: error: Failed to find some modules" >&2;} + { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" != "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for friendly registry keys" >&5 -$as_echo_n "checking for friendly registry keys... " >&6; } + echo "$as_me:$LINENO: checking for friendly registry keys" >&5 +echo $ECHO_N "checking for friendly registry keys... $ECHO_C" >&6 # VS.Net 2003, VS.Net 2005 if test -z "$with_cl_home"; then vctest=`./oowintool --msvc-productdir`; @@ -7104,8 +5418,8 @@ $as_echo_n "checking for friendly registry keys... " >&6; } else with_cl_home=`cygpath -u "$with_cl_home"` fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: done" >&5 -$as_echo "done" >&6; } + echo "$as_me:$LINENO: result: done" >&5 +echo "${ECHO_T}done" >&6 if test -n "$with_mspdb_path";then with_mspdb_path=`cygpath -u "$with_mspdb_path"` @@ -7126,10 +5440,10 @@ $as_echo "done" >&6; } if test -z "$MSPDB_PATH";then # Extract the first word of "mspdb80.dll", so it can be a program name with args. set dummy mspdb80.dll; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSPDB_PATH+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSPDB_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $MSPDB_PATH in [\\/]* | ?:[\\/]*) @@ -7141,35 +5455,34 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi MSPDB_PATH=$ac_cv_path_MSPDB_PATH + if test -n "$MSPDB_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSPDB_PATH" >&5 -$as_echo "$MSPDB_PATH" >&6; } + echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 +echo "${ECHO_T}$MSPDB_PATH" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - # Extract the first word of "mspdb71.dll", so it can be a program name with args. set dummy mspdb71.dll; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MSPDB_PATH+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MSPDB_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $MSPDB_PATH in [\\/]* | ?:[\\/]*) @@ -7181,50 +5494,51 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MSPDB_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi MSPDB_PATH=$ac_cv_path_MSPDB_PATH + if test -n "$MSPDB_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MSPDB_PATH" >&5 -$as_echo "$MSPDB_PATH" >&6; } + echo "$as_me:$LINENO: result: $MSPDB_PATH" >&5 +echo "${ECHO_T}$MSPDB_PATH" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - MSPDB_PATH=`dirname "$MSPDB_PATH"` fi if test -z "$MSPDB_PATH"; then - as_fn_error "You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&5 +echo "$as_me: error: You need a mspdb71.dll/mspdb80.dll, make sure it's in the path or use --with-mspdb-path" >&2;} + { (exit 1); exit 1; }; } fi MSPDB_PATH=`cygpath -d "$MSPDB_PATH"` MSPDB_PATH=`cygpath -u "$MSPDB_PATH"` PATH="$MSPDB_PATH:$PATH" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Microsoft C/C++ Compiler" >&5 -$as_echo_n "checking the Microsoft C/C++ Compiler... " >&6; } + echo "$as_me:$LINENO: checking the Microsoft C/C++ Compiler" >&5 +echo $ECHO_N "checking the Microsoft C/C++ Compiler... $ECHO_C" >&6 if test -x "$with_cl_home/bin/cl.exe"; then CC="$with_cl_home/bin/cl.exe" else # Extract the first word of "cl.exe", so it can be a program name with args. set dummy cl.exe; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $CC in [\\/]* | ?:[\\/]*) @@ -7236,41 +5550,40 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi CC=$ac_cv_path_CC + if test -n "$CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CC" >&5 -$as_echo "$CC" >&6; } + echo "$as_me:$LINENO: result: $CC" >&5 +echo "${ECHO_T}$CC" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -e "$CC"; then # This gives us a posix path with 8.3 filename restrictions CC=`cygpath -d "$CC"` CC=`cygpath -u "$CC"` # Remove /cl.exe from CC case insensitive - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($CC)" >&5 -$as_echo "found ($CC)" >&6; } + echo "$as_me:$LINENO: result: found ($CC)" >&5 +echo "${ECHO_T}found ($CC)" >&6 COMPATH=`echo $CC | $SED 's@\/[Bb][Ii][Nn]\/[cC][lL]\.[eE][xX][eE]@@'` export INCLUDE=`cygpath -d "$COMPATH/Include"` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Version of Microsoft C/C++ Compiler" >&5 -$as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; } + echo "$as_me:$LINENO: checking the Version of Microsoft C/C++ Compiler" >&5 +echo $ECHO_N "checking the Version of Microsoft C/C++ Compiler... $ECHO_C" >&6 CCNUMVER=`$CC 2>&1 | $AWK "/Microsoft/ && /..\\...\\...../ { x = match( \\\$0, /..\\...\\...../ ) CCversion = substr( \\\$0, RSTART, RLENGTH) @@ -7279,42 +5592,48 @@ $as_echo_n "checking the Version of Microsoft C/C++ Compiler... " >&6; } printf (\"%04d\",vertoken[i] ) } }"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found Compiler version $CCNUMVER." >&5 -$as_echo "found Compiler version $CCNUMVER." >&6; } + echo "$as_me:$LINENO: result: found Compiler version $CCNUMVER." >&5 +echo "${ECHO_T}found Compiler version $CCNUMVER." >&6 if test "$CCNUMVER" -ge "001500000000"; then COMEX=12 MSVSVER=2008 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2008 / VS 9.0." >&5 -$as_echo "found .NET 2008 / VS 9.0." >&6; } + echo "$as_me:$LINENO: result: found .NET 2008 / VS 9.0." >&5 +echo "${ECHO_T}found .NET 2008 / VS 9.0." >&6 elif test "$CCNUMVER" -ge "001400000000"; then COMEX=11 MSVSVER=2005 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2005." >&5 -$as_echo "found .NET 2005." >&6; } + echo "$as_me:$LINENO: result: found .NET 2005." >&5 +echo "${ECHO_T}found .NET 2005." >&6 elif test "$CCNUMVER" -ge "001300102240"; then COMEX=10 MSVSVER=2003 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found .NET 2003." >&5 -$as_echo "found .NET 2003." >&6; } + echo "$as_me:$LINENO: result: found .NET 2003." >&5 +echo "${ECHO_T}found .NET 2003." >&6 else - as_fn_error "Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&5 +echo "$as_me: error: Compiler too old. Use Microsoft C/C++ .NET 2003/2005 compiler." >&2;} + { (exit 1); exit 1; }; } fi else - as_fn_error "Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&5 +echo "$as_me: error: Microsoft C/C++ Compiler not found. Use --with-cl-home or set path to cl.exe." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the Mingwin32 C++ Compiler" >&5 -$as_echo_n "checking the Mingwin32 C++ Compiler... " >&6; } + echo "$as_me:$LINENO: checking the Mingwin32 C++ Compiler" >&5 +echo $ECHO_N "checking the Mingwin32 C++ Compiler... $ECHO_C" >&6 if test `$CC -dumpmachine | $SED -e 's/^.*-//'` = "mingw32"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found." >&5 -$as_echo "found." >&6; } + echo "$as_me:$LINENO: result: found." >&5 +echo "${ECHO_T}found." >&6 if $CC -dumpspecs | grep -q "mno-cygwin"; then USE_MINGW="cygwin" else USE_MINGW="pure-mingw" fi else - as_fn_error "Mingwin32 C++ Compiler not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Mingwin32 C++ Compiler not found." >&5 +echo "$as_me: error: Mingwin32 C++ Compiler not found." >&2;} + { (exit 1); exit 1; }; } fi fi fi @@ -7326,10 +5645,10 @@ if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then # Extract the first word of "midl.exe", so it can be a program name with args. set dummy midl.exe; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MIDL_PATH+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MIDL_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $MIDL_PATH in [\\/]* | ?:[\\/]*) @@ -7341,29 +5660,28 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MIDL_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi MIDL_PATH=$ac_cv_path_MIDL_PATH + if test -n "$MIDL_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MIDL_PATH" >&5 -$as_echo "$MIDL_PATH" >&6; } + echo "$as_me:$LINENO: result: $MIDL_PATH" >&5 +echo "${ECHO_T}$MIDL_PATH" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -n "$MIDL_PATH";then MIDL_PATH=`dirname "$MIDL_PATH"` fi @@ -7389,7 +5707,9 @@ fi fi fi if test ! -x "$MIDL_PATH/midl.exe"; then - as_fn_error "midl.exe not found. Make sure it's in the path or use --with-midl-path" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&5 +echo "$as_me: error: midl.exe not found. Make sure it's in the path or use --with-midl-path" >&2;} + { (exit 1); exit 1; }; } fi # Convert to posix path with 8.3 filename restrictions ( No spaces ) MIDL_PATH=`cygpath -d "$MIDL_PATH"` @@ -7397,10 +5717,10 @@ fi # Extract the first word of "csc.exe", so it can be a program name with args. set dummy csc.exe; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CSC_PATH+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_CSC_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $CSC_PATH in [\\/]* | ?:[\\/]*) @@ -7412,29 +5732,28 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CSC_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi CSC_PATH=$ac_cv_path_CSC_PATH + if test -n "$CSC_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CSC_PATH" >&5 -$as_echo "$CSC_PATH" >&6; } + echo "$as_me:$LINENO: result: $CSC_PATH" >&5 +echo "${ECHO_T}$CSC_PATH" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -n "$CSC_PATH";then CSC_PATH=`dirname "$CSC_PATH"` fi @@ -7450,14 +5769,16 @@ fi fi fi if test ! -x "$CSC_PATH/csc.exe"; then - as_fn_error "csc.exe not found. Make sure it's in the path or use --with-csc-path" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&5 +echo "$as_me: error: csc.exe not found. Make sure it's in the path or use --with-csc-path" >&2;} + { (exit 1); exit 1; }; } fi # Convert to posix path with 8.3 filename restrictions ( No spaces ) CSC_PATH=`cygpath -d "$CSC_PATH"` CSC_PATH=`cygpath -u "$CSC_PATH"` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking .NET Framework" >&5 -$as_echo_n "checking .NET Framework... " >&6; } + echo "$as_me:$LINENO: checking .NET Framework" >&5 +echo $ECHO_N "checking .NET Framework... $ECHO_C" >&6 if test -n "$with_frame_home"; then with_frame_home=`cygpath -u "$with_frame_home"` fi @@ -7479,10 +5800,12 @@ $as_echo_n "checking .NET Framework... " >&6; } fi fi if test ! -f "$FRAME_HOME/lib/mscoree.lib"; then - as_fn_error "mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&5 +echo "$as_me: error: mscoree.lib (.NET Framework) not found. Make sure you use --with-frame-home" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 # Convert to posix path with 8.3 filename restrictions ( No spaces ) FRAME_HOME=`cygpath -d "$FRAME_HOME"` FRAME_HOME=`cygpath -u "$FRAME_HOME"` @@ -7498,15 +5821,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : - $as_echo_n "(cached) " >&6 + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -7520,7 +5843,11 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef __STDC__ # include @@ -7529,24 +5856,68 @@ do #endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -7556,7 +5927,7 @@ rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok; then break fi @@ -7568,8 +5939,8 @@ fi else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } +echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -7579,7 +5950,11 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef __STDC__ # include @@ -7588,24 +5963,68 @@ do #endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -7615,13 +6034,14 @@ rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - +if $ac_preproc_ok; then + : else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi ac_ext=c @@ -7631,12 +6051,16 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5 -$as_echo_n "checking for ANSI C header files... " >&6; } -if test "${ac_cv_header_stdc+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for ANSI C header files" >&5 +echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6 +if test "${ac_cv_header_stdc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include #include @@ -7651,23 +6075,51 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_header_stdc=yes else - ac_cv_header_stdc=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_stdc=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $ac_cv_header_stdc = yes; then # SunOS 4.x string.h does not declare mem*, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "memchr" >/dev/null 2>&1; then : - + $EGREP "memchr" >/dev/null 2>&1; then + : else ac_cv_header_stdc=no fi @@ -7677,14 +6129,18 @@ fi if test $ac_cv_header_stdc = yes; then # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "free" >/dev/null 2>&1; then : - + $EGREP "free" >/dev/null 2>&1; then + : else ac_cv_header_stdc=no fi @@ -7694,13 +6150,16 @@ fi if test $ac_cv_header_stdc = yes; then # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. - if test "$cross_compiling" = yes; then : + if test "$cross_compiling" = yes; then : else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include -#include #if ((' ' & 0x0FF) == 0x020) # define ISLOWER(c) ('a' <= (c) && (c) <= 'z') # define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) @@ -7720,50 +6179,61 @@ main () for (i = 0; i < 256; i++) if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) - return 2; - return 0; + exit(2); + exit (0); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - ac_cv_header_stdc=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_header_stdc=no fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5 -$as_echo "$ac_cv_header_stdc" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5 +echo "${ECHO_T}$ac_cv_header_stdc" >&6 if test $ac_cv_header_stdc = yes; then -$as_echo "#define STDC_HEADERS 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define STDC_HEADERS 1 +_ACEOF fi fi if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +if test -n "$ac_tool_prefix"; then + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -7773,41 +6243,39 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -7817,77 +6285,64 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CXX" && break done +test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi + CXX=$ac_ct_CXX fi - fi -fi + # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err +echo "$as_me:$LINENO:" \ + "checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -7901,34 +6356,55 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else - ac_compiler_gnu=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi +echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +CXXFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cxx_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -7939,80 +6415,176 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_prog_cxx_g=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +#include int main () { - +exit (42); ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +continue +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration int main () { - +exit (42); ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -ac_ext=cpp +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5 -$as_echo_n "checking how to run the C++ preprocessor... " >&6; } +echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5 +echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6 if test -z "$CXXCPP"; then - if test "${ac_cv_prog_CXXCPP+set}" = set; then : - $as_echo_n "(cached) " >&6 + if test "${ac_cv_prog_CXXCPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else # Double quotes because CXXCPP needs to be expanded for CXXCPP in "$CXX -E" "/lib/cpp" @@ -8026,7 +6598,11 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef __STDC__ # include @@ -8035,24 +6611,68 @@ do #endif Syntax error _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -8062,7 +6682,7 @@ rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok; then break fi @@ -8074,8 +6694,8 @@ fi else ac_cv_prog_CXXCPP=$CXXCPP fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5 -$as_echo "$CXXCPP" >&6; } +echo "$as_me:$LINENO: result: $CXXCPP" >&5 +echo "${ECHO_T}$CXXCPP" >&6 ac_preproc_ok=false for ac_cxx_preproc_warn_flag in '' yes do @@ -8085,7 +6705,11 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef __STDC__ # include @@ -8094,24 +6718,68 @@ do #endif Syntax error _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -8121,13 +6789,14 @@ rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - +if $ac_preproc_ok; then + : else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C++ preprocessor \"$CXXCPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } + { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi ac_ext=c @@ -8145,15 +6814,15 @@ ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C preprocessor" >&5 -$as_echo_n "checking how to run the C preprocessor... " >&6; } +echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5 +echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= fi if test -z "$CPP"; then - if test "${ac_cv_prog_CPP+set}" = set; then : - $as_echo_n "(cached) " >&6 + if test "${ac_cv_prog_CPP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else # Double quotes because CPP needs to be expanded for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp" @@ -8167,7 +6836,11 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef __STDC__ # include @@ -8176,24 +6849,68 @@ do #endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -8203,7 +6920,7 @@ rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : +if $ac_preproc_ok; then break fi @@ -8215,8 +6932,8 @@ fi else ac_cv_prog_CPP=$CPP fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPP" >&5 -$as_echo "$CPP" >&6; } +echo "$as_me:$LINENO: result: $CPP" >&5 +echo "${ECHO_T}$CPP" >&6 ac_preproc_ok=false for ac_c_preproc_warn_flag in '' yes do @@ -8226,7 +6943,11 @@ do # exists even on freestanding compilers. # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. "Syntax error" is here to catch this case. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #ifdef __STDC__ # include @@ -8235,24 +6956,68 @@ do #endif Syntax error _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + : else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Broken: fails on valid input. continue fi rm -f conftest.err conftest.$ac_ext - # OK, works on sane cases. Now check whether nonexistent headers + # OK, works on sane cases. Now check whether non-existent headers # can be detected and how. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # Broken: success on invalid input. continue else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + # Passes both tests. ac_preproc_ok=: break @@ -8262,13 +7027,14 @@ rm -f conftest.err conftest.$ac_ext done # Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped. rm -f conftest.err conftest.$ac_ext -if $ac_preproc_ok; then : - +if $ac_preproc_ok; then + : else - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "C preprocessor \"$CPP\" fails sanity check -See \`config.log' for more details." "$LINENO" 5; } + { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&5 +echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi ac_ext=c @@ -8281,16 +7047,70 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi # On IRIX 5.3, sys/types and inttypes.h are conflicting. + + + + + + + + + for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h -do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` -ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default -" -eval as_val=\$$as_ac_Header - if test "x$as_val" = x""yes; then : +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF fi @@ -8298,288 +7118,678 @@ fi done -# The cast to long int works around a bug in the HP C Compiler -# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects -# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. -# This bug is HP SR number 8606223364. -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of long" >&5 -$as_echo_n "checking size of long... " >&6; } -if test "${ac_cv_sizeof_long+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for long" >&5 +echo $ECHO_N "checking for long... $ECHO_C" >&6 +if test "${ac_cv_type_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((long *) 0) + return 0; +if (sizeof (long)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_long=yes else - if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (long))" "ac_cv_sizeof_long" "$ac_includes_default"; then : + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_long=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_long" >&5 +echo "${ECHO_T}$ac_cv_type_long" >&6 +echo "$as_me:$LINENO: checking size of long" >&5 +echo $ECHO_N "checking size of long... $ECHO_C" >&6 +if test "${ac_cv_sizeof_long+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test "$ac_cv_type_long" = yes; then - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -{ as_fn_set_status 77 -as_fn_error "cannot compute sizeof (long) -See \`config.log' for more details." "$LINENO" 5; }; } - else - ac_cv_sizeof_long=0 - fi -fi + # The cast to unsigned long works around a bug in the HP C Compiler + # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects + # declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. + # This bug is HP SR number 8606223364. + if test "$cross_compiling" = yes; then + # Depending upon the size, compute the lo and hi bounds. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (long))) >= 0)]; +test_array [0] = 0 -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_long" >&5 -$as_echo "$ac_cv_sizeof_long" >&6; } + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=0 ac_mid=0 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_lo=`expr $ac_mid + 1` + if test $ac_lo -le $ac_mid; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -cat >>confdefs.h <<_ACEOF -#define SIZEOF_LONG $ac_cv_sizeof_long +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ _ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (long))) < 0)]; +test_array [0] = 0 + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=-1 ac_mid=-1 + while :; do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +static int test_array [1 - 2 * !(((long) (sizeof (long))) >= $ac_mid)]; +test_array [0] = 0 -SIZEOF_LONG=$ac_cv_sizeof_long + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_lo=$ac_mid; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5 -$as_echo_n "checking whether byte ordering is bigendian... " >&6; } -if test "${ac_cv_c_bigendian+set}" = set; then : - $as_echo_n "(cached) " >&6 +ac_hi=`expr '(' $ac_mid ')' - 1` + if test $ac_mid -le $ac_hi; then + ac_lo= ac_hi= + break + fi + ac_mid=`expr 2 '*' $ac_mid` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + done else - ac_cv_c_bigendian=unknown - # See if we're dealing with a universal compiler. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#ifndef __APPLE_CC__ - not a universal capable compiler - #endif - typedef int dummy; - -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - - # Check for potential -arch flags. It is not universal unless - # there are at least two -arch flags with different values. - ac_arch= - ac_prev= - for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do - if test -n "$ac_prev"; then - case $ac_word in - i?86 | x86_64 | ppc | ppc64) - if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then - ac_arch=$ac_word - else - ac_cv_c_bigendian=universal - break - fi - ;; - esac - ac_prev= - elif test "x$ac_word" = "x-arch"; then - ac_prev=arch - fi - done + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_lo= ac_hi= +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - if test $ac_cv_c_bigendian = unknown; then - # See if sys/param.h defines the BYTE_ORDER macro. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +# Binary search between lo and hi bounds. +while test "x$ac_lo" != "x$ac_hi"; do + ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo` + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include - #include - +$ac_includes_default int main () { -#if ! (defined BYTE_ORDER && defined BIG_ENDIAN \ - && defined LITTLE_ENDIAN && BYTE_ORDER && BIG_ENDIAN \ - && LITTLE_ENDIAN) - bogus endian macros - #endif +static int test_array [1 - 2 * !(((long) (sizeof (long))) <= $ac_mid)]; +test_array [0] = 0 ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include - #include +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_hi=$ac_mid +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_lo=`expr '(' $ac_mid ')' + 1` +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +case $ac_lo in +?*) ac_cv_sizeof_long=$ac_lo;; +'') { { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (long), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } ;; +esac +else + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +long longval () { return (long) (sizeof (long)); } +unsigned long ulongval () { return (long) (sizeof (long)); } +#include +#include int main () { -#if BYTE_ORDER != BIG_ENDIAN - not big endian - #endif + + FILE *f = fopen ("conftest.val", "w"); + if (! f) + exit (1); + if (((long) (sizeof (long))) < 0) + { + long i = longval (); + if (i != ((long) (sizeof (long)))) + exit (1); + fprintf (f, "%ld\n", i); + } + else + { + unsigned long i = ulongval (); + if (i != ((long) (sizeof (long)))) + exit (1); + fprintf (f, "%lu\n", i); + } + exit (ferror (f) || fclose (f) != 0); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_c_bigendian=yes +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_sizeof_long=`cat conftest.val` else - ac_cv_c_bigendian=no + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: cannot compute sizeof (long), 77 +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot compute sizeof (long), 77 +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # See if defines _LITTLE_ENDIAN or _BIG_ENDIAN (e.g., Solaris). - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +fi +rm -f conftest.val +else + ac_cv_sizeof_long=0 +fi +fi +echo "$as_me:$LINENO: result: $ac_cv_sizeof_long" >&5 +echo "${ECHO_T}$ac_cv_sizeof_long" >&6 +cat >>confdefs.h <<_ACEOF +#define SIZEOF_LONG $ac_cv_sizeof_long +_ACEOF + + +SIZEOF_LONG=$ac_cv_sizeof_long + +echo "$as_me:$LINENO: checking whether byte ordering is bigendian" >&5 +echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6 +if test "${ac_cv_c_bigendian+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + # See if sys/param.h defines the BYTE_ORDER macro. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include +#include int main () { -#if ! (defined _LITTLE_ENDIAN || defined _BIG_ENDIAN) - bogus endian macros - #endif +#if !BYTE_ORDER || !BIG_ENDIAN || !LITTLE_ENDIAN + bogus endian macros +#endif ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - # It does; now see whether it defined to _BIG_ENDIAN or not. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + # It does; now see whether it defined to BIG_ENDIAN or not. +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include +#include int main () { -#ifndef _BIG_ENDIAN - not big endian - #endif +#if BYTE_ORDER != BIG_ENDIAN + not big endian +#endif ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_bigendian=yes else - ac_cv_c_bigendian=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_c_bigendian=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - fi - if test $ac_cv_c_bigendian = unknown; then - # Compile a test program. - if test "$cross_compiling" = yes; then : - # Try to guess by grepping values from an object file. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -short int ascii_mm[] = - { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; - short int ascii_ii[] = - { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; - int use_ascii (int i) { - return ascii_mm[i] + ascii_ii[i]; - } - short int ebcdic_ii[] = - { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; - short int ebcdic_mm[] = - { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; - int use_ebcdic (int i) { - return ebcdic_mm[i] + ebcdic_ii[i]; - } - extern int foo; +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +# It does not; compile a test program. +if test "$cross_compiling" = yes; then + # try to guess the endianness by grepping values into an object file + ac_cv_c_bigendian=unknown + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 }; +short ascii_ii[] = { 0x694C, 0x5454, 0x656C, 0x6E45, 0x6944, 0x6E61, 0 }; +void _ascii () { char *s = (char *) ascii_mm; s = (char *) ascii_ii; } +short ebcdic_ii[] = { 0x89D3, 0xE3E3, 0x8593, 0x95C5, 0x89C4, 0x9581, 0 }; +short ebcdic_mm[] = { 0xC2C9, 0xC785, 0x95C4, 0x8981, 0x95E2, 0xA8E2, 0 }; +void _ebcdic () { char *s = (char *) ebcdic_mm; s = (char *) ebcdic_ii; } int main () { -return use_ascii (foo) == use_ebcdic (foo); + _ascii (); _ebcdic (); ; return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - if grep BIGenDianSyS conftest.$ac_objext >/dev/null; then - ac_cv_c_bigendian=yes - fi - if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then - if test "$ac_cv_c_bigendian" = unknown; then - ac_cv_c_bigendian=no - else - # finding both strings is unlikely to happen, but who knows? - ac_cv_c_bigendian=unknown - fi - fi +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + if grep BIGenDianSyS conftest.$ac_objext >/dev/null ; then + ac_cv_c_bigendian=yes +fi +if grep LiTTleEnDian conftest.$ac_objext >/dev/null ; then + if test "$ac_cv_c_bigendian" = unknown; then + ac_cv_c_bigendian=no + else + # finding both strings is unlikely to happen, but who knows? + ac_cv_c_bigendian=unknown + fi +fi +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -$ac_includes_default int main () { - - /* Are we little or big endian? From Harbison&Steele. */ - union - { - long int l; - char c[sizeof (long int)]; - } u; - u.l = 1; - return u.c[sizeof (long int) - 1] == 1; - - ; - return 0; + /* Are we little or big endian? From Harbison&Steele. */ + union + { + long l; + char c[sizeof (long)]; + } u; + u.l = 1; + exit (u.c[sizeof (long) - 1] == 1); } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_c_bigendian=no else - ac_cv_c_bigendian=yes + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +ac_cv_c_bigendian=yes fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_bigendian" >&5 -$as_echo "$ac_cv_c_bigendian" >&6; } - case $ac_cv_c_bigendian in #( - yes) - $as_echo "#define WORDS_BIGENDIAN 1" >>confdefs.h -;; #( - no) - ;; #( - universal) - -$as_echo "#define AC_APPLE_UNIVERSAL_BUILD 1" >>confdefs.h +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_c_bigendian" >&5 +echo "${ECHO_T}$ac_cv_c_bigendian" >&6 +case $ac_cv_c_bigendian in + yes) - ;; #( - *) - as_fn_error "unknown endianness - presetting ac_cv_c_bigendian=no (or yes) will help" "$LINENO" 5 ;; - esac +cat >>confdefs.h <<\_ACEOF +#define WORDS_BIGENDIAN 1 +_ACEOF + ;; + no) + ;; + *) + { { echo "$as_me:$LINENO: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&5 +echo "$as_me: error: unknown endianness +presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} + { (exit 1); exit 1; }; } ;; +esac WORDS_BIGENDIAN=$ac_cv_c_bigendian -# Check whether --enable-largefile was given. -if test "${enable_largefile+set}" = set; then : - enableval=$enable_largefile; -fi +# Check whether --enable-largefile or --disable-largefile was given. +if test "${enable_largefile+set}" = set; then + enableval="$enable_largefile" +fi; if test "$enable_largefile" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special C compiler options needed for large files" >&5 -$as_echo_n "checking for special C compiler options needed for large files... " >&6; } -if test "${ac_cv_sys_largefile_CC+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for special C compiler options needed for large files" >&5 +echo $ECHO_N "checking for special C compiler options needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_largefile_CC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_cv_sys_largefile_CC=no if test "$GCC" != yes; then ac_save_CC=$CC while :; do - # IRIX 6.2 and later do not support large files by default, - # so use the C compiler's -n32 option if that helps. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + # IRIX 6.2 and later do not support large files by default, + # so use the C compiler's -n32 option if that helps. + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -8598,34 +7808,89 @@ main () return 0; } _ACEOF - if ac_fn_c_try_compile "$LINENO"; then : + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext - CC="$CC -n32" - if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.err conftest.$ac_objext + CC="$CC -n32" + rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_sys_largefile_CC=' -n32'; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext +rm -f conftest.err conftest.$ac_objext break done CC=$ac_save_CC rm -f conftest.$ac_ext fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_largefile_CC" >&5 -$as_echo "$ac_cv_sys_largefile_CC" >&6; } +echo "$as_me:$LINENO: result: $ac_cv_sys_largefile_CC" >&5 +echo "${ECHO_T}$ac_cv_sys_largefile_CC" >&6 if test "$ac_cv_sys_largefile_CC" != no; then CC=$CC$ac_cv_sys_largefile_CC fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _FILE_OFFSET_BITS value needed for large files" >&5 -$as_echo_n "checking for _FILE_OFFSET_BITS value needed for large files... " >&6; } -if test "${ac_cv_sys_file_offset_bits+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for _FILE_OFFSET_BITS value needed for large files" >&5 +echo $ECHO_N "checking for _FILE_OFFSET_BITS value needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_file_offset_bits+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cv_sys_file_offset_bits=no + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -8644,11 +7909,40 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_file_offset_bits=no; break +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _FILE_OFFSET_BITS 64 #include @@ -8668,33 +7962,60 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_sys_file_offset_bits=64; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_file_offset_bits=unknown +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_file_offset_bits" >&5 -$as_echo "$ac_cv_sys_file_offset_bits" >&6; } -case $ac_cv_sys_file_offset_bits in #( - no | unknown) ;; - *) +echo "$as_me:$LINENO: result: $ac_cv_sys_file_offset_bits" >&5 +echo "${ECHO_T}$ac_cv_sys_file_offset_bits" >&6 +if test "$ac_cv_sys_file_offset_bits" != no; then + cat >>confdefs.h <<_ACEOF #define _FILE_OFFSET_BITS $ac_cv_sys_file_offset_bits _ACEOF -;; -esac -rm -rf conftest* - if test $ac_cv_sys_file_offset_bits = unknown; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for _LARGE_FILES value needed for large files" >&5 -$as_echo_n "checking for _LARGE_FILES value needed for large files... " >&6; } -if test "${ac_cv_sys_large_files+set}" = set; then : - $as_echo_n "(cached) " >&6 + +fi +rm -f conftest* + echo "$as_me:$LINENO: checking for _LARGE_FILES value needed for large files" >&5 +echo $ECHO_N "checking for _LARGE_FILES value needed for large files... $ECHO_C" >&6 +if test "${ac_cv_sys_large_files+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else while :; do - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + ac_cv_sys_large_files=no + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include /* Check that off_t can represent 2**63 - 1 correctly. @@ -8713,11 +8034,40 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - ac_cv_sys_large_files=no; break +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #define _LARGE_FILES 1 #include @@ -8737,26 +8087,48 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_sys_large_files=1; break +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cv_sys_large_files=unknown +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext break done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sys_large_files" >&5 -$as_echo "$ac_cv_sys_large_files" >&6; } -case $ac_cv_sys_large_files in #( - no | unknown) ;; - *) +echo "$as_me:$LINENO: result: $ac_cv_sys_large_files" >&5 +echo "${ECHO_T}$ac_cv_sys_large_files" >&6 +if test "$ac_cv_sys_large_files" != no; then + cat >>confdefs.h <<_ACEOF #define _LARGE_FILES $ac_cv_sys_large_files _ACEOF -;; -esac -rm -rf conftest* - fi + +fi +rm -f conftest* fi if test -n "$ac_cv_sys_file_offset_bits"; then @@ -8767,42 +8139,44 @@ if test -n "$ac_cv_sys_large_files" && test "$ac_cv_sys_large_files" != "no"; th fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to disable vba feature" >&5 -$as_echo_n "checking whether to disable vba feature... " >&6; } +echo "$as_me:$LINENO: checking whether to disable vba feature" >&5 +echo $ECHO_N "checking whether to disable vba feature... $ECHO_C" >&6 if test -n "$enable_vba" && test "$enable_vba" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_VBA=NO else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_VBA=YES fi if test "$ENABLE_VBA" = "YES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to package the vba compatibility api" >&5 -$as_echo_n "checking how to package the vba compatibility api... " >&6; } + echo "$as_me:$LINENO: checking how to package the vba compatibility api" >&5 +echo $ECHO_N "checking how to package the vba compatibility api... $ECHO_C" >&6 if test -n "$with_vba_package_format"; then if test "$with_vba_package_format" = "extn"; then VBA_EXTENSION=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: result: uno extension" >&5 -$as_echo "uno extension" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: --with-vba-package-format=extn can cause problems" >&5 -$as_echo "$as_me: WARNING: --with-vba-package-format=extn can cause problems" >&2;} + echo "$as_me:$LINENO: result: uno extension" >&5 +echo "${ECHO_T}uno extension" >&6 + { echo "$as_me:$LINENO: WARNING: --with-vba-package-format=extn can cause problems" >&5 +echo "$as_me: WARNING: --with-vba-package-format=extn can cause problems" >&2;} else if test "$with_vba_package_format" = "builtin"; then VBA_EXTENSION=NO - { $as_echo "$as_me:${as_lineno-$LINENO}: result: build into installset" >&5 -$as_echo "build into installset" >&6; } + echo "$as_me:$LINENO: result: build into installset" >&5 +echo "${ECHO_T}build into installset" >&6 else - as_fn_error "unknown packaging method" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: unknown packaging method" >&5 +echo "$as_me: error: unknown packaging method" >&2;} + { (exit 1); exit 1; }; } fi fi else VBA_EXTENSION=NO - { $as_echo "$as_me:${as_lineno-$LINENO}: result: defaulting to build into installset" >&5 -$as_echo "defaulting to build into installset" >&6; } + echo "$as_me:$LINENO: result: defaulting to build into installset" >&5 +echo "${ECHO_T}defaulting to build into installset" >&6 fi else VBA_EXTENSION=NO @@ -8812,74 +8186,379 @@ fi if test "$test_cups" = "yes" -a "$ENABLE_CUPS" = "TRUE" ; then - ac_fn_c_check_header_mongrel "$LINENO" "cups/cups.h" "ac_cv_header_cups_cups_h" "$ac_includes_default" -if test "x$ac_cv_header_cups_cups_h" = x""yes; then : + if test "${ac_cv_header_cups_cups_h+set}" = set; then + echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6 +if test "${ac_cv_header_cups_cups_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking cups/cups.h usability" >&5 +echo $ECHO_N "checking cups/cups.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking cups/cups.h presence" >&5 +echo $ECHO_N "checking cups/cups.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: cups/cups.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: cups/cups.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: cups/cups.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: cups/cups.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: cups/cups.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: cups/cups.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: cups/cups.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: cups/cups.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: cups/cups.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for cups/cups.h" >&5 +echo $ECHO_N "checking for cups/cups.h... $ECHO_C" >&6 +if test "${ac_cv_header_cups_cups_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_cups_cups_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_cups_cups_h" >&5 +echo "${ECHO_T}$ac_cv_header_cups_cups_h" >&6 +fi +if test $ac_cv_header_cups_cups_h = yes; then + : else - as_fn_error "cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&5 +echo "$as_me: error: cups/cups.h could not be found. libcupsys2-dev or cups???-devel missing?" >&2;} + { (exit 1); exit 1; }; } fi fi if test "$_os" = "Linux" -o "$_os" = "FreeBSD" -o "$_os" = "GNU"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable pam support" >&5 -$as_echo_n "checking whether to enable pam support... " >&6; } + echo "$as_me:$LINENO: checking whether to enable pam support" >&5 +echo $ECHO_N "checking whether to enable pam support... $ECHO_C" >&6 if test -z "$enable_pam" || test "$enable_pam" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 PAM=YES - ac_fn_c_check_header_mongrel "$LINENO" "security/pam_appl.h" "ac_cv_header_security_pam_appl_h" "$ac_includes_default" -if test "x$ac_cv_header_security_pam_appl_h" = x""yes; then : + if test "${ac_cv_header_security_pam_appl_h+set}" = set; then + echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 +echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6 +if test "${ac_cv_header_security_pam_appl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 +echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking security/pam_appl.h usability" >&5 +echo $ECHO_N "checking security/pam_appl.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking security/pam_appl.h presence" >&5 +echo $ECHO_N "checking security/pam_appl.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: security/pam_appl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: security/pam_appl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: security/pam_appl.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: security/pam_appl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: security/pam_appl.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: security/pam_appl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: security/pam_appl.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: security/pam_appl.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for security/pam_appl.h" >&5 +echo $ECHO_N "checking for security/pam_appl.h... $ECHO_C" >&6 +if test "${ac_cv_header_security_pam_appl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_security_pam_appl_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_security_pam_appl_h" >&5 +echo "${ECHO_T}$ac_cv_header_security_pam_appl_h" >&6 +fi +if test $ac_cv_header_security_pam_appl_h = yes; then + : else - as_fn_error "pam_appl.h could not be found. libpam-dev or pam-devel missing?" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&5 +echo "$as_me: error: pam_appl.h could not be found. libpam-dev or pam-devel missing?" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to link to libpam" >&5 -$as_echo_n "checking whether to link to libpam... " >&6; } + echo "$as_me:$LINENO: checking whether to link to libpam" >&5 +echo $ECHO_N "checking whether to link to libpam... $ECHO_C" >&6 if test -n "$enable_pam_link" -a "$enable_pam_link" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 PAM_LINK=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pam_start in -lpam" >&5 -$as_echo_n "checking for pam_start in -lpam... " >&6; } -if test "${ac_cv_lib_pam_pam_start+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for pam_start in -lpam" >&5 +echo $ECHO_N "checking for pam_start in -lpam... $ECHO_C" >&6 +if test "${ac_cv_lib_pam_pam_start+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lpam $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char pam_start (); int main () { -return pam_start (); +pam_start (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_pam_pam_start=yes else - ac_cv_lib_pam_pam_start=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_pam_pam_start=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pam_pam_start" >&5 -$as_echo "$ac_cv_lib_pam_pam_start" >&6; } -if test "x$ac_cv_lib_pam_pam_start" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_pam_pam_start" >&5 +echo "${ECHO_T}$ac_cv_lib_pam_pam_start" >&6 +if test $ac_cv_lib_pam_pam_start = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBPAM 1 _ACEOF @@ -8887,17 +8566,19 @@ _ACEOF LIBS="-lpam $LIBS" else - as_fn_error "libpam not found or functional" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libpam not found or functional" >&5 +echo "$as_me: error: libpam not found or functional" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dynamically open it" >&5 -$as_echo "no, dynamically open it" >&6; } + echo "$as_me:$LINENO: result: no, dynamically open it" >&5 +echo "${ECHO_T}no, dynamically open it" >&6 PAM_LINK=NO fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 PAM=NO PAM_LINK=NO @@ -8908,11 +8589,11 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: checking how many arguments getspnam_r() takes" >&5 -$as_echo_n "checking how many arguments getspnam_r() takes... " >&6; } + echo "$as_me:$LINENO: checking how many arguments getspnam_r() takes" >&5 +echo $ECHO_N "checking how many arguments getspnam_r() takes... $ECHO_C" >&6 - if test "${ac_cv_func_which_getspnam_r+set}" = set; then : - $as_echo_n "(cached) " >&6 + if test "${ac_cv_func_which_getspnam_r+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else @@ -8929,7 +8610,11 @@ ac_cv_func_which_getspnam_r=unknown # netdb.h is not declaring the function, and the compiler is thereby # assuming an implicit prototype. In which case, we're out of luck. # -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -8946,10 +8631,35 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_which_getspnam_r=no +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext # # FIVE ARGUMENTS @@ -8957,7 +8667,11 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext if test "$ac_cv_func_which_getspnam_r" = "unknown"; then -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -8976,10 +8690,35 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_which_getspnam_r=five +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -8989,7 +8728,11 @@ fi if test "$ac_cv_func_which_getspnam_r" = "unknown"; then -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -9008,10 +8751,35 @@ main () return 0; } _ACEOF -if ac_fn_c_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_func_which_getspnam_r=four +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext fi @@ -9022,28 +8790,30 @@ fi case "$ac_cv_func_which_getspnam_r" in five) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: five" >&5 -$as_echo "five" >&6; } + echo "$as_me:$LINENO: result: five" >&5 +echo "${ECHO_T}five" >&6 NEW_SHADOW_API=YES ;; four) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: four" >&5 -$as_echo "four" >&6; } + echo "$as_me:$LINENO: result: four" >&5 +echo "${ECHO_T}four" >&6 ;; no) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot find function declaration in shadow.h" >&5 -$as_echo "cannot find function declaration in shadow.h" >&6; } + echo "$as_me:$LINENO: result: cannot find function declaration in shadow.h" >&5 +echo "${ECHO_T}cannot find function declaration in shadow.h" >&6 ;; unknown) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: can't tell" >&5 -$as_echo "can't tell" >&6; } + echo "$as_me:$LINENO: result: can't tell" >&5 +echo "${ECHO_T}can't tell" >&6 ;; *) - as_fn_error "internal error" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: internal error" >&5 +echo "$as_me: error: internal error" >&2;} + { (exit 1); exit 1; }; } ;; esac @@ -9062,49 +8832,78 @@ fi if test "$_os" = "Linux"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to link to libcrypt" >&5 -$as_echo_n "checking whether to link to libcrypt... " >&6; } + echo "$as_me:$LINENO: checking whether to link to libcrypt" >&5 +echo $ECHO_N "checking whether to link to libcrypt... $ECHO_C" >&6 if test -n "$enable_crypt_link" -a "$enable_crypt_link" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 CRYPT_LINK=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for crypt in -lcrypt" >&5 -$as_echo_n "checking for crypt in -lcrypt... " >&6; } -if test "${ac_cv_lib_crypt_crypt+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for crypt in -lcrypt" >&5 +echo $ECHO_N "checking for crypt in -lcrypt... $ECHO_C" >&6 +if test "${ac_cv_lib_crypt_crypt+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lcrypt $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char crypt (); int main () { -return crypt (); +crypt (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_crypt_crypt=yes else - ac_cv_lib_crypt_crypt=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_crypt_crypt=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_crypt_crypt" >&5 -$as_echo "$ac_cv_lib_crypt_crypt" >&6; } -if test "x$ac_cv_lib_crypt_crypt" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_crypt_crypt" >&5 +echo "${ECHO_T}$ac_cv_lib_crypt_crypt" >&6 +if test $ac_cv_lib_crypt_crypt = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBCRYPT 1 _ACEOF @@ -9112,12 +8911,14 @@ _ACEOF LIBS="-lcrypt $LIBS" else - as_fn_error "libcrypt not found or functional" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libcrypt not found or functional" >&5 +echo "$as_me: error: libcrypt not found or functional" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dynamically open it" >&5 -$as_echo "no, dynamically open it" >&6; } + echo "$as_me:$LINENO: result: no, dynamically open it" >&5 +echo "${ECHO_T}no, dynamically open it" >&6 CRYPT_LINK=NO fi fi @@ -9136,24 +8937,20 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then fi if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu -if test -z "$CXX"; then - if test -n "$CCC"; then - CXX=$CCC - else - if test -n "$ac_tool_prefix"; then - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC +if test -n "$ac_tool_prefix"; then + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args. set dummy $ac_tool_prefix$ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$CXX"; then ac_cv_prog_CXX="$CXX" # Let the user override the test. @@ -9163,41 +8960,39 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_CXX="$ac_tool_prefix$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done fi fi CXX=$ac_cv_prog_CXX if test -n "$CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5 -$as_echo "$CXX" >&6; } + echo "$as_me:$LINENO: result: $CXX" >&5 +echo "${ECHO_T}$CXX" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$CXX" && break done fi if test -z "$CXX"; then ac_ct_CXX=$CXX - for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC + for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_CXX"; then ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test. @@ -9207,77 +9002,64 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_CXX="$ac_prog" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done fi fi ac_ct_CXX=$ac_cv_prog_ac_ct_CXX if test -n "$ac_ct_CXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5 -$as_echo "$ac_ct_CXX" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5 +echo "${ECHO_T}$ac_ct_CXX" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ac_ct_CXX" && break done +test -n "$ac_ct_CXX" || ac_ct_CXX="g++" - if test "x$ac_ct_CXX" = x; then - CXX="g++" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - CXX=$ac_ct_CXX - fi -fi - - fi + CXX=$ac_ct_CXX fi + + # Provide some information about the compiler. -$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5 -set X $ac_compile -ac_compiler=$2 -for ac_option in --version -v -V -qversion; do - { { ac_try="$ac_compiler $ac_option >&5" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_compiler $ac_option >&5") 2>conftest.err +echo "$as_me:$LINENO:" \ + "checking for C++ compiler version" >&5 +ac_compiler=`set X $ac_compile; echo $2` +{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 + (eval $ac_compiler --version &5) 2>&5 ac_status=$? - if test -s conftest.err; then - sed '10a\ -... rest of stderr output deleted ... - 10q' conftest.err >conftest.er1 - cat conftest.er1 >&5 - fi - rm -f conftest.er1 conftest.err - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } -done + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v &5\"") >&5 + (eval $ac_compiler -v &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } +{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V &5\"") >&5 + (eval $ac_compiler -V &5) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5 -$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; } -if test "${ac_cv_cxx_compiler_gnu+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6 +if test "${ac_cv_cxx_compiler_gnu+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -9291,34 +9073,55 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_compiler_gnu=yes else - ac_compiler_gnu=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_compiler_gnu=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext ac_cv_cxx_compiler_gnu=$ac_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5 -$as_echo "$ac_cv_cxx_compiler_gnu" >&6; } -if test $ac_compiler_gnu = yes; then - GXX=yes -else - GXX= -fi +echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5 +echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6 +GXX=`test $ac_compiler_gnu = yes && echo yes` ac_test_CXXFLAGS=${CXXFLAGS+set} ac_save_CXXFLAGS=$CXXFLAGS -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5 -$as_echo_n "checking whether $CXX accepts -g... " >&6; } -if test "${ac_cv_prog_cxx_g+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - ac_save_cxx_werror_flag=$ac_cxx_werror_flag - ac_cxx_werror_flag=yes - ac_cv_prog_cxx_g=no - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext +CXXFLAGS="-g" +echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5 +echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6 +if test "${ac_cv_prog_cxx_g+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -9329,64 +9132,160 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_prog_cxx_g=yes else - CXXFLAGS="" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_prog_cxx_g=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5 +echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6 +if test "$ac_test_CXXFLAGS" = set; then + CXXFLAGS=$ac_save_CXXFLAGS +elif test $ac_cv_prog_cxx_g = yes; then + if test "$GXX" = yes; then + CXXFLAGS="-g -O2" + else + CXXFLAGS="-g" + fi +else + if test "$GXX" = yes; then + CXXFLAGS="-O2" + else + CXXFLAGS= + fi +fi +for ac_declaration in \ + '' \ + 'extern "C" void std::exit (int) throw (); using std::exit;' \ + 'extern "C" void std::exit (int); using std::exit;' \ + 'extern "C" void exit (int) throw ();' \ + 'extern "C" void exit (int);' \ + 'void exit (int);' +do + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration +#include int main () { - +exit (42); ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - ac_cxx_werror_flag=$ac_save_cxx_werror_flag - CXXFLAGS="-g" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +continue +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_declaration int main () { - +exit (42); ; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - ac_cv_prog_cxx_g=yes -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_cxx_werror_flag=$ac_save_cxx_werror_flag -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5 -$as_echo "$ac_cv_prog_cxx_g" >&6; } -if test "$ac_test_CXXFLAGS" = set; then - CXXFLAGS=$ac_save_CXXFLAGS -elif test $ac_cv_prog_cxx_g = yes; then - if test "$GXX" = yes; then - CXXFLAGS="-g -O2" - else - CXXFLAGS="-g" - fi +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + break else - if test "$GXX" = yes; then - CXXFLAGS="-O2" - else - CXXFLAGS= - fi + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +done +rm -f conftest* +if test -n "$ac_declaration"; then + echo '#ifdef __cplusplus' >>confdefs.h + echo $ac_declaration >>confdefs.h + echo '#endif' >>confdefs.h fi + ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9396,8 +9295,8 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi if test "$GXX" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the GNU C++ compiler version" >&5 -$as_echo_n "checking the GNU C++ compiler version... " >&6; } + echo "$as_me:$LINENO: checking the GNU C++ compiler version" >&5 +echo $ECHO_N "checking the GNU C++ compiler version... $ECHO_C" >&6 _gpp_version=`$CXX -dumpversion` _gpp_majmin=`echo $_gpp_version | $AWK -F. '{ print \$1*100+\$2 }'` @@ -9411,26 +9310,33 @@ $as_echo_n "checking the GNU C++ compiler version... " >&6; } fi fi if test "$_gpp_majmin" -ge "401" ; then - as_fn_error "You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly" >&5 +echo "$as_me: error: You need to use the g++-4.0 compiler (g++ $_gpp_version won't work with the MacOSX10.4u.sdk) - set CXX accordingly" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: implicitly using CXX=$CXX" >&5 -$as_echo "implicitly using CXX=$CXX" >&6; } + echo "$as_me:$LINENO: result: implicitly using CXX=$CXX" >&5 +echo "${ECHO_T}implicitly using CXX=$CXX" >&6 fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (g++ $_gpp_version)" >&5 -$as_echo "checked (g++ $_gpp_version)" >&6; } + echo "$as_me:$LINENO: result: checked (g++ $_gpp_version)" >&5 +echo "${ECHO_T}checked (g++ $_gpp_version)" >&6 fi if test "$_gpp_majmin" = "304"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX has the enum bug" >&5 -$as_echo_n "checking whether $CXX has the enum bug... " >&6; } -if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + echo "$as_me:$LINENO: checking whether $CXX has the enum bug" >&5 +echo $ECHO_N "checking whether $CXX has the enum bug... $ECHO_C" >&6 +if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ extern "C" void abort (void); @@ -9455,24 +9361,39 @@ main (void) } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - as_fn_error "your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." "$LINENO" 5 -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + { { echo "$as_me:$LINENO: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&5 +echo "$as_me: error: your version of the GNU C++ compile has a bug which prevents OpenOffice.org from being compiled correctly - please check http://gcc.gnu.org/ml/gcc-patches/2004-07/msg00968.html for details." >&2;} + { (exit 1); exit 1; }; } +else + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi fi # Removed the special FreeBSD treatment. The problem was that with_gxx_include_path # often contains an i386 which is expanded as a macro. Solved in stlport. if test "$GXX" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for g++ include path" >&5 -$as_echo_n "checking for g++ include path... " >&6; } + echo "$as_me:$LINENO: checking for g++ include path" >&5 +echo $ECHO_N "checking for g++ include path... $ECHO_C" >&6 if test -z "$with_gxx_include_path"; then with_gxx_include_path=`echo "#include " | $CXX -E -xc++ - | $SED -n '/.*1*"\(.*\)\/cstring".*/s//\1/p' | head -n 1` if test "$with_gxx_include_path" = "/usr/libexec/(null)/include"; then @@ -9490,18 +9411,18 @@ $as_echo_n "checking for g++ include path... " >&6; } fi if test -z "$with_gxx_include_path"; then with_gxx_include_path="NO_GXX_INCLUDE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no g++ includes" >&5 -$as_echo "no g++ includes" >&6; } + echo "$as_me:$LINENO: result: no g++ includes" >&5 +echo "${ECHO_T}no g++ includes" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_gxx_include_path" >&5 -$as_echo "$with_gxx_include_path" >&6; } + echo "$as_me:$LINENO: result: $with_gxx_include_path" >&5 +echo "${ECHO_T}$with_gxx_include_path" >&6 fi GXX_INCLUDE_PATH="$with_gxx_include_path" if test "$WITH_MINGWIN" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mingwin runtime include path" >&5 -$as_echo_n "checking for mingwin runtime include path... " >&6; } + echo "$as_me:$LINENO: checking for mingwin runtime include path" >&5 +echo $ECHO_N "checking for mingwin runtime include path... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #include #include @@ -9519,16 +9440,16 @@ _ACEOF fi if test -z "$_mingw_lib_include_path"; then _mingw_lib_include_path="NO_LIB_INCLUDE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no mingwin runtime includes" >&5 -$as_echo "no mingwin runtime includes" >&6; } + echo "$as_me:$LINENO: result: no mingwin runtime includes" >&5 +echo "${ECHO_T}no mingwin runtime includes" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_mingw_lib_include_path" >&5 -$as_echo "$_mingw_lib_include_path" >&6; } + echo "$as_me:$LINENO: result: $_mingw_lib_include_path" >&5 +echo "${ECHO_T}$_mingw_lib_include_path" >&6 fi MINGW_LIB_INCLUDE_PATH="$_mingw_lib_include_path" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mingwin c++ backward include path" >&5 -$as_echo_n "checking for mingwin c++ backward include path... " >&6; } + echo "$as_me:$LINENO: checking for mingwin c++ backward include path" >&5 +echo $ECHO_N "checking for mingwin c++ backward include path... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #include _ACEOF @@ -9537,57 +9458,57 @@ _ACEOF if test -n "$_mingw_backward_include_path"; then _mingw_backward_include_path=`cygpath -d $_mingw_backward_include_path` _mingw_backward_include_path=`cygpath -u $_mingw_backward_include_path` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_mingw_backward_include_path" >&5 -$as_echo "$_mingw_backward_include_path" >&6; } + echo "$as_me:$LINENO: result: $_mingw_backward_include_path" >&5 +echo "${ECHO_T}$_mingw_backward_include_path" >&6 else _mingw_backward_include_path="NO_BACKWARD_INCLUDE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no mingwin c++ backward includes" >&5 -$as_echo "no mingwin c++ backward includes" >&6; } + echo "$as_me:$LINENO: result: no mingwin c++ backward includes" >&5 +echo "${ECHO_T}no mingwin c++ backward includes" >&6 fi MINGW_BACKWARD_INCLUDE_PATH="$_mingw_backward_include_path" mingw_crtbegin=`$CC -print-file-name=crtbegin.o` MINGW_CLIB_DIR=`dirname $mingw_crtbegin` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dynamic libgcc" >&5 -$as_echo_n "checking whether to use dynamic libgcc... " >&6; } + echo "$as_me:$LINENO: checking whether to use dynamic libgcc" >&5 +echo $ECHO_N "checking whether to use dynamic libgcc... $ECHO_C" >&6 if test -e "$MINGW_CLIB_DIR/libgcc_s.a"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic libgcc name" >&5 -$as_echo_n "checking dynamic libgcc name... " >&6; } + echo "$as_me:$LINENO: checking dynamic libgcc name" >&5 +echo $ECHO_N "checking dynamic libgcc name... $ECHO_C" >&6 MINGW_GCCDLL_pattern=`nm $MINGW_CLIB_DIR/libgcc_s.a | sed -ne 's@.* _libgcc\(.*\)_dll_iname@libgcc\1.dll@p' | uniq | sed -e 's@_@?@g'` MINGW_GCCDLL=`cd $COMPATH/bin && ls $MINGW_GCCDLL_pattern 2>/dev/null` if test -n "$MINGW_GCCDLL"; then MINGW_SHARED_GCCLIB=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: result: use $MINGW_GCCDLL" >&5 -$as_echo "use $MINGW_GCCDLL" >&6; } + echo "$as_me:$LINENO: result: use $MINGW_GCCDLL" >&5 +echo "${ECHO_T}use $MINGW_GCCDLL" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test -e "$MINGW_CLIB_DIR/libgcc_eh.a"; then MINGW_GCCLIB_EH=YES fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use dynamic libstdc++" >&5 -$as_echo_n "checking whether to use dynamic libstdc++... " >&6; } + echo "$as_me:$LINENO: checking whether to use dynamic libstdc++" >&5 +echo $ECHO_N "checking whether to use dynamic libstdc++... $ECHO_C" >&6 if test -e "$MINGW_CLIB_DIR/libstdc++_s.a" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic libstdc++ name" >&5 -$as_echo_n "checking dynamic libstdc++ name... " >&6; } + echo "$as_me:$LINENO: checking dynamic libstdc++ name" >&5 +echo $ECHO_N "checking dynamic libstdc++ name... $ECHO_C" >&6 MINGW_GXXDLL_pattern=`nm $MINGW_CLIB_DIR/libstdc++_s.a | sed -ne 's@.* _libstdc__\(.*\)_dll_iname@libstdc++\1.dll@p' | uniq | sed -e 's@_@?@g'` MINGW_GXXDLL=`cd $COMPATH/bin && ls $MINGW_GXXDLL_pattern 2>/dev/null` if test -n "$MINGW_GXXDLL"; then MINGW_SHARED_GXXLIB=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: result: use $MINGW_GXXDLL" >&5 -$as_echo "use $MINGW_GXXDLL" >&6; } + echo "$as_me:$LINENO: result: use $MINGW_GXXDLL" >&5 +echo "${ECHO_T}use $MINGW_GXXDLL" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi MINGW_CLIB_DIR=`cygpath $MINGW_CLIB_DIR` @@ -9600,36 +9521,36 @@ fi if test "$_os" = "SunOS"; then if test "$CC" = "cc"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking SunStudio C++ Compiler" >&5 -$as_echo_n "checking SunStudio C++ Compiler... " >&6; } + echo "$as_me:$LINENO: checking SunStudio C++ Compiler" >&5 +echo $ECHO_N "checking SunStudio C++ Compiler... $ECHO_C" >&6 if test "$CXX" != "CC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SunStudio C++ was not found" >&5 -$as_echo "$as_me: WARNING: SunStudio C++ was not found" >&2;} + { echo "$as_me:$LINENO: WARNING: SunStudio C++ was not found" >&5 +echo "$as_me: WARNING: SunStudio C++ was not found" >&2;} echo "SunStudio C++ was not found" >> warn else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5 -$as_echo "checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 fi fi fi if test "$_os" = "OSF1"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Compaq C++ compiler version" >&5 -$as_echo_n "checking Compaq C++ compiler version... " >&6; } + echo "$as_me:$LINENO: checking Compaq C++ compiler version" >&5 +echo $ECHO_N "checking Compaq C++ compiler version... $ECHO_C" >&6 _compaqcxx_version=`$CXX -V 2>&1 | $AWK '{ print $3 }'` _compaqcxx_major=`echo $_compaqcxx_version | $AWK -F. '{ print $1 }'` if test "$_compaqcxx_major" != "V6"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5 -$as_echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;} + { echo "$as_me:$LINENO: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&5 +echo "$as_me: WARNING: found version \"$_compaqc_version\", use version 6 of the Compaq C++ compiler" >&2;} echo "found version $_compaqc_version, use version 6 of the Compaq C++ compiler" >> warn else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5 -$as_echo "checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking exception type" >&5 -$as_echo_n "checking exception type... " >&6; } -ac_ext=cpp +echo "$as_me:$LINENO: checking exception type" >&5 +echo $ECHO_N "checking exception type... $ECHO_C" >&6 +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -9637,7 +9558,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test "$WITH_MINGWIN" = "yes"; then -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -9652,18 +9577,42 @@ _Unwind_SjLj_RaiseException() return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then exceptions_type="sjlj" else - exceptions_type="dwarf2" + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +exceptions_type="dwarf2" fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $exceptions_type" >&5 -$as_echo "$exceptions_type" >&6; } +echo "$as_me:$LINENO: result: $exceptions_type" >&5 +echo "${ECHO_T}$exceptions_type" >&6 ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -9676,8 +9625,8 @@ EXCEPTIONS="$exceptions_type" if test "$_os" = "SunOS"; then _temp=`showrev -p | $AWK -F" " '{ print $2 }'` if test "$_os_release" = "7"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for patch 106327-06 or greater" >&5 -$as_echo_n "checking for patch 106327-06 or greater... " >&6; } + echo "$as_me:$LINENO: checking for patch 106327-06 or greater" >&5 +echo $ECHO_N "checking for patch 106327-06 or greater... $ECHO_C" >&6 _patch=`echo $_temp | $AWK '/106327-06/ { print "found" }'` _patch="false" for i in $_temp @@ -9691,15 +9640,15 @@ $as_echo_n "checking for patch 106327-06 or greater... " >&6; } fi done if test "$_patch" = "found"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5 -$as_echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;} + { echo "$as_me:$LINENO: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&5 +echo "$as_me: WARNING: patch 106327-06 not found, please install compiler patch 106327-06 or greater" >&2;} echo "patch 106327-06 not found, please install compiler patch 106327-06 or greater" >> warn fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for patch 106950-11 or greater" >&5 -$as_echo_n "checking for patch 106950-11 or greater... " >&6; } + echo "$as_me:$LINENO: checking for patch 106950-11 or greater" >&5 +echo $ECHO_N "checking for patch 106950-11 or greater... $ECHO_C" >&6 _patch=`echo $_temp | $AWK '/106950-11/ { print "found" }'` _patch="false" for i in $_temp @@ -9713,17 +9662,17 @@ $as_echo_n "checking for patch 106950-11 or greater... " >&6; } fi done if test "$_patch" = "found"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5 -$as_echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;} + { echo "$as_me:$LINENO: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&5 +echo "$as_me: WARNING: patch 106950-11 not found, please install linker patch 106950-11 or greater" >&2;} echo "patch 106950-11 not found, please install linker patch 106950-11 or greater" >> warn fi else if test "$_os_release" = "6"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for patch 105591-09 or greater" >&5 -$as_echo_n "checking for patch 105591-09 or greater... " >&6; } + echo "$as_me:$LINENO: checking for patch 105591-09 or greater" >&5 +echo $ECHO_N "checking for patch 105591-09 or greater... $ECHO_C" >&6 _patch=`echo $_temp | $AWK '/105591-09/ { print "found" }'` _patch="false" for i in $_temp @@ -9737,15 +9686,15 @@ $as_echo_n "checking for patch 105591-09 or greater... " >&6; } fi done if test "$_patch" = "found"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5 -$as_echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;} + { echo "$as_me:$LINENO: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&5 +echo "$as_me: WARNING: patch 105591-09 not found, please install compiler patch 105591-09 or greater" >&2;} echo "patch 105591-09 not found, please install compiler patch 105591-09 or greater" >> warn fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for patch 107733-08 or greater" >&5 -$as_echo_n "checking for patch 107733-08 or greater... " >&6; } + echo "$as_me:$LINENO: checking for patch 107733-08 or greater" >&5 +echo $ECHO_N "checking for patch 107733-08 or greater... $ECHO_C" >&6 _patch=`echo $_temp | $AWK '/107733-08/ { print "found" }'` _patch="false" for i in $_temp @@ -9759,19 +9708,19 @@ $as_echo_n "checking for patch 107733-08 or greater... " >&6; } fi done if test "$_patch" = "found"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5 -$as_echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;} + { echo "$as_me:$LINENO: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&5 +echo "$as_me: WARNING: patch 107733-06 not found, please install linker patch 107733-08 or greater" >&2;} echo "patch 107733-06 not found, please install linker patch 107733-08 or greater" >> warn fi fi fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking what the default STL should be" >&5 -$as_echo_n "checking what the default STL should be... " >&6; } + echo "$as_me:$LINENO: checking what the default STL should be" >&5 +echo $ECHO_N "checking what the default STL should be... $ECHO_C" >&6 DEFAULT_TO_STLPORT="no" if test "$_os" = "Linux"; then case "$build_cpu" in @@ -9798,100 +9747,134 @@ $as_echo_n "checking what the default STL should be... " >&6; } DEFAULT_TO_STLPORT="yes" fi if test "$DEFAULT_TO_STLPORT" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: stlport" >&5 -$as_echo "stlport" >&6; } + echo "$as_me:$LINENO: result: stlport" >&5 +echo "${ECHO_T}stlport" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5 -$as_echo "system" >&6; } + echo "$as_me:$LINENO: result: system" >&5 +echo "${ECHO_T}system" >&6 fi if test "$WITH_STLPORT" = "auto"; then WITH_STLPORT=$DEFAULT_TO_STLPORT fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STL providing headers" >&5 -$as_echo_n "checking for STL providing headers... " >&6; } + echo "$as_me:$LINENO: checking for STL providing headers" >&5 +echo $ECHO_N "checking for STL providing headers... $ECHO_C" >&6 STLPORT4="" USE_SYSTEM_STL="" if test "$WITH_STLPORT" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using internal stlport." >&5 -$as_echo "using internal stlport." >&6; } + echo "$as_me:$LINENO: result: using internal stlport." >&5 +echo "${ECHO_T}using internal stlport." >&6 if test "$DEFAULT_TO_STLPORT" != "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 -$as_echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} + { echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 +echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} echo "using stlport. Warning, breaks your ABI compatability!" >>warn fi elif test "$WITH_STLPORT" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: using system STL" >&5 -$as_echo "using system STL" >&6; } + echo "$as_me:$LINENO: result: using system STL" >&5 +echo "${ECHO_T}using system STL" >&6 USE_SYSTEM_STL="YES" if test "$DEFAULT_TO_STLPORT" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5 -$as_echo "$as_me: WARNING: using system STL. Warning, breaks your ABI compatability!" >&2;} + { echo "$as_me:$LINENO: WARNING: using system STL. Warning, breaks your ABI compatability!" >&5 +echo "$as_me: WARNING: using system STL. Warning, breaks your ABI compatability!" >&2;} echo "using system STL. Warning, breaks your ABI compatability!" >>warn fi else STLPORT4=$WITH_STLPORT if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ $STLPORT4/stlport/hash_map _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5 -$as_echo "checked." >&6; } +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + echo "$as_me:$LINENO: result: checked." >&5 +echo "${ECHO_T}checked." >&6 else - as_fn_error "STLport headers not found." "$LINENO" 5 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { { echo "$as_me:$LINENO: error: STLport headers not found." >&5 +echo "$as_me: error: STLport headers not found." >&2;} + { (exit 1); exit 1; }; } fi rm -f conftest.err conftest.$ac_ext else if test -f "$STLPORT4/stlport/hash_map"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5 -$as_echo "checked." >&6; } + echo "$as_me:$LINENO: result: checked." >&5 +echo "${ECHO_T}checked." >&6 else - as_fn_error "STLport headers not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: STLport headers not found." >&5 +echo "$as_me: error: STLport headers not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test "$_os" != "WINNT" -o "$WITH_MINGWIN" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for STLport libraries" >&5 -$as_echo_n "checking for STLport libraries... " >&6; } + echo "$as_me:$LINENO: checking for STLport libraries" >&5 +echo $ECHO_N "checking for STLport libraries... $ECHO_C" >&6 if test "$_os" = "SunOS"; then if test -f "$STLPORT4/lib/libstlport_sunpro.so"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5 -$as_echo "checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 elif test -f "$STLPORT4/lib/libstlport.so"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5 -$as_echo "checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 STLPORT_VER=500 else - as_fn_error "STLport libraries not found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 +echo "$as_me: error: STLport libraries not found" >&2;} + { (exit 1); exit 1; }; } fi elif test "$_os" = "Darwin"; then if test -f "$STLPORT4/lib/libstlport_gcc.dylib"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5 -$as_echo "checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 elif test -f "$STLPORT4/lib/libstlport.dylib"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5 -$as_echo "checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 STLPORT_VER=500 else - as_fn_error "STLport libraries not found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 +echo "$as_me: error: STLport libraries not found" >&2;} + { (exit 1); exit 1; }; } fi else if test -f "$STLPORT4/lib/libstlport_gcc.so"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5 -$as_echo "checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 elif test -f "$STLPORT4/lib/libstlport.so"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked" >&5 -$as_echo "checked" >&6; } + echo "$as_me:$LINENO: result: checked" >&5 +echo "${ECHO_T}checked" >&6 STLPORT_VER=500 else - as_fn_error "STLport libraries not found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: STLport libraries not found" >&5 +echo "$as_me: error: STLport libraries not found" >&2;} + { (exit 1); exit 1; }; } fi fi fi if test "$DEFAULT_TO_STLPORT" != "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 -$as_echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} + { echo "$as_me:$LINENO: WARNING: using stlport. Warning, breaks your ABI compatability!" >&5 +echo "$as_me: WARNING: using stlport. Warning, breaks your ABI compatability!" >&2;} echo "using stlport. Warning, breaks your ABI compatability!" >>warn fi fi @@ -9907,11 +9890,15 @@ fi if test "$GCC" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fvisibility=hidden" >&5 -$as_echo_n "checking whether $CC supports -fvisibility=hidden... " >&6; } + echo "$as_me:$LINENO: checking whether $CC supports -fvisibility=hidden" >&5 +echo $ECHO_N "checking whether $CC supports -fvisibility=hidden... $ECHO_C" >&6 save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -fvisibility=hidden" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -9922,47 +9909,72 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then HAVE_GCC_VISIBILITY_FEATURE=TRUE +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext CFLAGS=$save_CFLAGS if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi # =================================================================== # use --ccache-skip? # =================================================================== -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are allowed and able to use --ccache-skip" >&5 -$as_echo_n "checking whether we are allowed and able to use --ccache-skip... " >&6; } +echo "$as_me:$LINENO: checking whether we are allowed and able to use --ccache-skip" >&5 +echo $ECHO_N "checking whether we are allowed and able to use --ccache-skip... $ECHO_C" >&6 if test "$_os" != "Darwin" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: only used on Mac currently, skipping" >&5 -$as_echo "only used on Mac currently, skipping" >&6; } + echo "$as_me:$LINENO: result: only used on Mac currently, skipping" >&5 +echo "${ECHO_T}only used on Mac currently, skipping" >&6 elif test "$enable_ccache_skip" = "no" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no - diabled explicitly" >&5 -$as_echo "no - diabled explicitly" >&6; } + echo "$as_me:$LINENO: result: no - diabled explicitly" >&5 +echo "${ECHO_T}no - diabled explicitly" >&6 elif test "$enable_ccache_skip" = "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes - enabled explicitly, skipping checks" >&5 -$as_echo "yes - enabled explicitly, skipping checks" >&6; } + echo "$as_me:$LINENO: result: yes - enabled explicitly, skipping checks" >&5 +echo "${ECHO_T}yes - enabled explicitly, skipping checks" >&6 USE_CCACHE=YES elif test "$enable_ccache_skip" = "auto" ; then # checking for ccache presence/version - { $as_echo "$as_me:${as_lineno-$LINENO}: result: probing..." >&5 -$as_echo "probing..." >&6; } + echo "$as_me:$LINENO: result: probing..." >&5 +echo "${ECHO_T}probing..." >&6 # Extract the first word of "ccache", so it can be a program name with args. set dummy ccache; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CCACHE+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_CCACHE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $CCACHE in [\\/]* | ?:[\\/]*) @@ -9974,44 +9986,43 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CCACHE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_CCACHE" && ac_cv_path_CCACHE="not_found" ;; esac fi CCACHE=$ac_cv_path_CCACHE + if test -n "$CCACHE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CCACHE" >&5 -$as_echo "$CCACHE" >&6; } + echo "$as_me:$LINENO: result: $CCACHE" >&5 +echo "${ECHO_T}$CCACHE" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$CCACHE" = "not_found" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: not enabling --ccache-skip (ccache not found)" >&5 -$as_echo "$as_me: not enabling --ccache-skip (ccache not found)" >&6;} + { echo "$as_me:$LINENO: not enabling --ccache-skip (ccache not found)" >&5 +echo "$as_me: not enabling --ccache-skip (ccache not found)" >&6;} else # check ccache version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether version of ccache is suitable" >&5 -$as_echo_n "checking whether version of ccache is suitable... " >&6; } + echo "$as_me:$LINENO: checking whether version of ccache is suitable" >&5 +echo $ECHO_N "checking whether version of ccache is suitable... $ECHO_C" >&6 CCACHE_VERSION=`"$CCACHE" -V | "$AWK" '/^ccache version/{print $3}'` if test "$CCACHE_VERSION" = "2.4_OOo"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ccache is actually used for the build" >&5 -$as_echo_n "checking whether ccache is actually used for the build... " >&6; } - ac_ext=cpp + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking whether ccache is actually used for the build" >&5 +echo $ECHO_N "checking whether ccache is actually used for the build... $ECHO_C" >&6 + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -10019,7 +10030,11 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS --ccache-skip -O2" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -10030,20 +10045,44 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then use_ccache=yes else - use_ccache=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +use_ccache=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test $use_ccache = yes ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, will enable --ccache-skip" >&5 -$as_echo "yes, will enable --ccache-skip" >&6; } + echo "$as_me:$LINENO: result: yes, will enable --ccache-skip" >&5 +echo "${ECHO_T}yes, will enable --ccache-skip" >&6 USE_CCACHE=YES else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, will not enable --ccache-skip" >&5 -$as_echo "no, will not enable --ccache-skip" >&6; } + echo "$as_me:$LINENO: result: no, will not enable --ccache-skip" >&5 +echo "${ECHO_T}no, will not enable --ccache-skip" >&6 fi CXXFLAGS=$save_CXXFLAGS ac_ext=c @@ -10053,27 +10092,33 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip" >&5 -$as_echo "$as_me: ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip" >&6;} + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { echo "$as_me:$LINENO: ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip" >&5 +echo "$as_me: ccache version $CCACHE_VERSION not accepted. See description for --enable-ccache-skip" >&6;} fi fi else - as_fn_error "invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" >&5 +echo "$as_me: error: invalid option to --enable-ccache-skip. Valid values are \"auto\", \"yes\" and \"no\"" >&2;} + { (exit 1); exit 1; }; } fi if test "$USE_SYSTEM_STL" = "YES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if hash_map will be in __gnu_cxx namespace" >&5 -$as_echo_n "checking if hash_map will be in __gnu_cxx namespace... " >&6; } - ac_ext=cpp + echo "$as_me:$LINENO: checking if hash_map will be in __gnu_cxx namespace" >&5 +echo $ECHO_N "checking if hash_map will be in __gnu_cxx namespace... $ECHO_C" >&6 + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include using namespace __gnu_cxx; @@ -10086,42 +10131,72 @@ hash_map t; return 0; return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cxx_have_ext_hash_map=yes else - ac_cv_cxx_have_ext_hash_map=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_cxx_have_ext_hash_map=no fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test "$ac_cv_cxx_have_ext_hash_map" = "no"; then - as_fn_error "Can't find hash_map. Try with --with-stlport" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Can't find hash_map. Try with --with-stlport" >&5 +echo "$as_me: error: Can't find hash_map. Try with --with-stlport" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_have_ext_hash_map" >&5 -$as_echo "$ac_cv_cxx_have_ext_hash_map" >&6; } + echo "$as_me:$LINENO: result: $ac_cv_cxx_have_ext_hash_map" >&5 +echo "${ECHO_T}$ac_cv_cxx_have_ext_hash_map" >&6 fi if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if STL headers are visibility safe" >&5 -$as_echo_n "checking if STL headers are visibility safe... " >&6; } + echo "$as_me:$LINENO: checking if STL headers are visibility safe" >&5 +echo $ECHO_N "checking if STL headers are visibility safe... $ECHO_C" >&6 -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include _ACEOF if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | - $EGREP "visibility push" >/dev/null 2>&1; then : + $EGREP "visibility push" >/dev/null 2>&1; then stlvisok=yes else stlvisok=no fi rm -f conftest* - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $stlvisok" >&5 -$as_echo "$stlvisok" >&6; } + echo "$as_me:$LINENO: result: $stlvisok" >&5 +echo "${ECHO_T}$stlvisok" >&6 if test "$stlvisok" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&5 -$as_echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&2;} + { echo "$as_me:$LINENO: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&5 +echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabling visibility" >&2;} echo "Your gcc STL headers are not visibility safe. Disabling visibility" >> warn unset HAVE_GCC_VISIBILITY_FEATURE fi @@ -10131,9 +10206,13 @@ $as_echo "$as_me: WARNING: Your gcc STL headers are not visibility safe. Disabli sharedlink_ldflags_save=$LDFLAGS LDFLAGS="$LDFLAGS -fvisibility-inlines-hidden -fpic -shared" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5 -$as_echo_n "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + echo "$as_me:$LINENO: checking if gcc is -fvisibility-inlines-hidden safe with STL headers" >&5 +echo $ECHO_N "checking if gcc is -fvisibility-inlines-hidden safe with STL headers... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include using namespace std; @@ -10146,19 +10225,43 @@ istringstream strm( "test" ); return 0; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then $EGREP -q unresolvable conftest.err; if test $? -eq 0; then gccvisok=no; else gccvisok=yes; fi else - gccvisok=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +gccvisok=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisok" >&5 -$as_echo "$gccvisok" >&6; } +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + echo "$as_me:$LINENO: result: $gccvisok" >&5 +echo "${ECHO_T}$gccvisok" >&6 if test "$gccvisok" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&5 -$as_echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&2;} + { echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&5 +echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >&2;} echo "Your gcc is not -fvisibility-inlines-hidden safe. Disabling visibility" >> warn unset HAVE_GCC_VISIBILITY_FEATURE fi @@ -10167,8 +10270,8 @@ $as_echo "$as_me: WARNING: Your gcc is not -fvisibility-inlines-hidden safe. Dis fi if test "$HAVE_GCC_VISIBILITY_FEATURE" = "TRUE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5 -$as_echo_n "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... " >&6; } + echo "$as_me:$LINENO: checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)" >&5 +echo $ECHO_N "checking if gcc has a visibility bug with class-level attributes (GCC bug 26905)... $ECHO_C" >&6 cat >visibility.cxx <<_ACEOF #pragma GCC visibility push(hidden) struct __attribute__ ((visibility ("default"))) TestStruct { @@ -10196,11 +10299,11 @@ _ACEOF fi rm -f visibility.s - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gccvisbroken" >&5 -$as_echo "$gccvisbroken" >&6; } + echo "$as_me:$LINENO: result: $gccvisbroken" >&5 +echo "${ECHO_T}$gccvisbroken" >&6 if test "$gccvisbroken" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&5 -$as_echo "$as_me: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&2;} + { echo "$as_me:$LINENO: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&5 +echo "$as_me: WARNING: Your gcc is not -fvisibility=hidden safe. Disabling visibility" >&2;} echo "Your gcc is not -fvisibility=hidden safe. Disabling visibility" >> warn unset HAVE_GCC_VISIBILITY_FEATURE fi @@ -10216,20 +10319,112 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which memory allocator to use" >&5 -$as_echo_n "checking which memory allocator to use... " >&6; } +echo "$as_me:$LINENO: checking which memory allocator to use" >&5 +echo $ECHO_N "checking which memory allocator to use... $ECHO_C" >&6 if test "$with_alloc" = "system"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5 -$as_echo "system" >&6; } + echo "$as_me:$LINENO: result: system" >&5 +echo "${ECHO_T}system" >&6 ALLOC="SYS_ALLOC"; - for ac_func in malloc realloc calloc free -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : + + + + +for ac_func in malloc realloc calloc free +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -10237,48 +10432,79 @@ done fi if test "$with_alloc" = "tcmalloc"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: tcmalloc" >&5 -$as_echo "tcmalloc" >&6; } + echo "$as_me:$LINENO: result: tcmalloc" >&5 +echo "${ECHO_T}tcmalloc" >&6 if ! echo $build_cpu | grep -E 'i[3456]86' 2>/dev/null >/dev/null; then - as_fn_error "tcmalloc only available/usable on ix86" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: tcmalloc only available/usable on ix86" >&5 +echo "$as_me: error: tcmalloc only available/usable on ix86" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ltcmalloc" >&5 -$as_echo_n "checking for malloc in -ltcmalloc... " >&6; } -if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for malloc in -ltcmalloc" >&5 +echo $ECHO_N "checking for malloc in -ltcmalloc... $ECHO_C" >&6 +if test "${ac_cv_lib_tcmalloc_malloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ltcmalloc $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char malloc (); int main () { -return malloc (); +malloc (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_tcmalloc_malloc=yes else - ac_cv_lib_tcmalloc_malloc=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_tcmalloc_malloc=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tcmalloc_malloc" >&5 -$as_echo "$ac_cv_lib_tcmalloc_malloc" >&6; } -if test "x$ac_cv_lib_tcmalloc_malloc" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_tcmalloc_malloc" >&5 +echo "${ECHO_T}$ac_cv_lib_tcmalloc_malloc" >&6 +if test $ac_cv_lib_tcmalloc_malloc = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBTCMALLOC 1 _ACEOF @@ -10286,54 +10512,85 @@ _ACEOF LIBS="-ltcmalloc $LIBS" else - as_fn_error "tcmalloc not found or functional. Install the Google Profiling Tools" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&5 +echo "$as_me: error: tcmalloc not found or functional. Install the Google Profiling Tools" >&2;} + { (exit 1); exit 1; }; } fi ALLOC="TCMALLOC"; fi if test "$with_alloc" = "jemalloc"; then if test "$_os" != "FreeBSD" -o "$_os" != "NetBSD"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: jemalloc" >&5 -$as_echo "jemalloc" >&6; } + echo "$as_me:$LINENO: result: jemalloc" >&5 +echo "${ECHO_T}jemalloc" >&6 save_CFLAGS=$CFLAGS CFLAGS="$CFLAGS -pthread" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for malloc in -ljemalloc" >&5 -$as_echo_n "checking for malloc in -ljemalloc... " >&6; } -if test "${ac_cv_lib_jemalloc_malloc+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for malloc in -ljemalloc" >&5 +echo $ECHO_N "checking for malloc in -ljemalloc... $ECHO_C" >&6 +if test "${ac_cv_lib_jemalloc_malloc+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljemalloc $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char malloc (); int main () { -return malloc (); +malloc (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_jemalloc_malloc=yes else - ac_cv_lib_jemalloc_malloc=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_jemalloc_malloc=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jemalloc_malloc" >&5 -$as_echo "$ac_cv_lib_jemalloc_malloc" >&6; } -if test "x$ac_cv_lib_jemalloc_malloc" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_jemalloc_malloc" >&5 +echo "${ECHO_T}$ac_cv_lib_jemalloc_malloc" >&6 +if test $ac_cv_lib_jemalloc_malloc = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBJEMALLOC 1 _ACEOF @@ -10341,23 +10598,117 @@ _ACEOF LIBS="-ljemalloc $LIBS" else - as_fn_error "jemalloc not found or functional. Install the jemalloc allocator." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: jemalloc not found or functional. Install the jemalloc allocator." >&5 +echo "$as_me: error: jemalloc not found or functional. Install the jemalloc allocator." >&2;} + { (exit 1); exit 1; }; } fi ALLOC="JEMALLOC"; CFLAGS=$save_CFLAGS else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: system" >&5 -$as_echo "system" >&6; } + echo "$as_me:$LINENO: result: system" >&5 +echo "${ECHO_T}system" >&6 ALLOC="SYS_ALLOC"; - for ac_func in malloc realloc calloc free -do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` -ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" -eval as_val=\$$as_ac_var - if test "x$as_val" = x""yes; then : + + + + +for ac_func in malloc realloc calloc free +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF fi @@ -10366,38 +10717,38 @@ done fi fi if test "$with_alloc" = "internal" -o -z "$with_alloc"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to add custom build version" >&5 -$as_echo_n "checking whether to add custom build version... " >&6; } +echo "$as_me:$LINENO: checking whether to add custom build version" >&5 +echo $ECHO_N "checking whether to add custom build version... $ECHO_C" >&6 if test "z$with_build_version" != "z"; then BUILD_VER_STRING=$with_build_version - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $BUILD_VER_STRING" >&5 -$as_echo "yes, $BUILD_VER_STRING" >&6; } + echo "$as_me:$LINENO: result: yes, $BUILD_VER_STRING" >&5 +echo "${ECHO_T}yes, $BUILD_VER_STRING" >&6 else BUILD_VER_STRING= - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build with Java support" >&5 -$as_echo_n "checking whether to build with Java support... " >&6; } +echo "$as_me:$LINENO: checking whether to build with Java support" >&5 +echo $ECHO_N "checking whether to build with Java support... $ECHO_C" >&6 if test "$WITH_JAVA" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 SOLAR_JAVA="TRUE" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 SOLAR_JAVA="" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: building without java will mean some features will not be available" >&5 -$as_echo "$as_me: WARNING: building without java will mean some features will not be available" >&2;} + { echo "$as_me:$LINENO: WARNING: building without java will mean some features will not be available" >&5 +echo "$as_me: WARNING: building without java will mean some features will not be available" >&2;} echo "building without java will mean some features will not be available" >>warn fi @@ -10424,10 +10775,10 @@ if test "$SOLAR_JAVA" != ""; then if test -z "$with_jdk_home"; then # Extract the first word of "$WITH_JAVA", so it can be a program name with args. set dummy $WITH_JAVA; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_JAVAINTERPRETER+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $JAVAINTERPRETER in [\\/]* | ?:[\\/]*) @@ -10439,35 +10790,36 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JAVAINTERPRETER="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi JAVAINTERPRETER=$ac_cv_path_JAVAINTERPRETER + if test -n "$JAVAINTERPRETER"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAINTERPRETER" >&5 -$as_echo "$JAVAINTERPRETER" >&6; } + echo "$as_me:$LINENO: result: $JAVAINTERPRETER" >&5 +echo "${ECHO_T}$JAVAINTERPRETER" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - else _java_path="$with_jdk_home/bin/$WITH_JAVA" if test -x "$_java_path"; then JAVAINTERPRETER=$_java_path else - as_fn_error "$_java_path not found set with_jdk_home" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: $_java_path not found set with_jdk_home" >&5 +echo "$as_me: error: $_java_path not found set with_jdk_home" >&2;} + { (exit 1); exit 1; }; } fi fi if test "$_os" = "WINNT"; then @@ -10477,26 +10829,28 @@ fi JAVAINTERPRETER=`cygpath -d "$JAVAINTERPRETER"` JAVAINTERPRETER=`cygpath -u "$JAVAINTERPRETER"` elif test "$_os" = "Darwin"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to pass -d32 to Java interpreter" >&5 -$as_echo_n "checking whether to pass -d32 to Java interpreter... " >&6; } + echo "$as_me:$LINENO: checking whether to pass -d32 to Java interpreter" >&5 +echo $ECHO_N "checking whether to pass -d32 to Java interpreter... $ECHO_C" >&6 if "$JAVAINTERPRETER" -d32 >&5 2>&5; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 JAVAIFLAGS=-d32 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi fi if test "$SOLAR_JAVA" != ""; then _gij_longver=0 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the installed JDK" >&5 -$as_echo_n "checking the installed JDK... " >&6; } + echo "$as_me:$LINENO: checking the installed JDK" >&5 +echo $ECHO_N "checking the installed JDK... $ECHO_C" >&6 if test -n "$JAVAINTERPRETER"; then if test `$JAVAINTERPRETER -version 2>&1 | grep -c "Kaffe"` -gt 0; then - as_fn_error "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5 +echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;} + { (exit 1); exit 1; }; } # dnl Kaffe specific tests # KAFFE_VER=`$JAVAINTERPRETER -version 2>&1 | $EGREP " Version:" | $SED -r "s/.* Version: ([[0-9\.]]*).*/\1/"` # if test -z "$KAFFE_VER"; then @@ -10516,13 +10870,15 @@ $as_echo_n "checking the installed JDK... " >&6; } # JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` elif test `$JAVAINTERPRETER --version 2>&1 | grep -c "GNU libgcj"` -gt 0; then JDK=gcj - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (gcj)" >&5 -$as_echo "checked (gcj)" >&6; } + echo "$as_me:$LINENO: result: checked (gcj)" >&5 +echo "${ECHO_T}checked (gcj)" >&6 _gij_version=`$JAVAINTERPRETER --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _gij_longver=`echo $_gij_version | $AWK -F. '{ print \$1*10000+\$2*100+\$3 }'` elif test `$JAVAINTERPRETER -version 2>&1 | awk '{ print }' | grep -c "BEA"` -gt 0; then - as_fn_error "No valid check available. Please check the block for your desired java in configure.in" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: No valid check available. Please check the block for your desired java in configure.in" >&5 +echo "$as_me: error: No valid check available. Please check the block for your desired java in configure.in" >&2;} + { (exit 1); exit 1; }; } # JDK=bea # # dnl BEA JDK specific tests @@ -10552,15 +10908,20 @@ $as_echo "checked (gcj)" >&6; } _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` if test "$_jdk_ver" -lt 10500; then - as_fn_error "IBM JDK is too old, you need at least 1.5" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: IBM JDK is too old, you need at least 1.5" >&5 +echo "$as_me: error: IBM JDK is too old, you need at least 1.5" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (IBM JDK $_jdk)" >&5 -$as_echo "checked (IBM JDK $_jdk)" >&6; } + echo "$as_me:$LINENO: result: checked (IBM JDK $_jdk)" >&5 +echo "${ECHO_T}checked (IBM JDK $_jdk)" >&6 if test "$with_jdk_home" = ""; then - as_fn_error "In order to successfully build OpenOffice.org using the IBM JDK, -you must use the \"--with-jdk-home\" configure option explicitly" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: In order to successfully build OpenOffice.org using the IBM JDK, +you must use the \"--with-jdk-home\" configure option explicitly" >&5 +echo "$as_me: error: In order to successfully build OpenOffice.org using the IBM JDK, +you must use the \"--with-jdk-home\" configure option explicitly" >&2;} + { (exit 1); exit 1; }; } fi JAVA_HOME=$with_jdk_home @@ -10572,10 +10933,12 @@ you must use the \"--with-jdk-home\" configure option explicitly" "$LINENO" 5 _jdk_ver=`echo "$_jdk" | $AWK -F. '{ print (($1 * 100) + $2) * 100 + $3;}'` if test "$_jdk_ver" -lt 10500; then - as_fn_error "JDK is too old, you need at least 1.5" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: JDK is too old, you need at least 1.5" >&5 +echo "$as_me: error: JDK is too old, you need at least 1.5" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (JDK $_jdk)" >&5 -$as_echo "checked (JDK $_jdk)" >&6; } + echo "$as_me:$LINENO: result: checked (JDK $_jdk)" >&5 +echo "${ECHO_T}checked (JDK $_jdk)" >&6 JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*java,,p"` if test "$_os" = "WINNT"; then JAVA_HOME=`echo $JAVA_HOME | $SED "s,\.[eE][xX][eE]$,,"` @@ -10585,7 +10948,9 @@ $as_echo "checked (JDK $_jdk)" >&6; } fi fi else - as_fn_error "JAVA not found. You need at least jdk-1.5, or gcj-4" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&5 +echo "$as_me: error: JAVA not found. You need at least jdk-1.5, or gcj-4" >&2;} + { (exit 1); exit 1; }; } fi else JAVA_HOME=NO_JAVA_HOME ; export JAVA_HOME @@ -10605,10 +10970,10 @@ if test "$SOLAR_JAVA" != ""; then if test -z "$with_jdk_home"; then # Extract the first word of "$javacompiler", so it can be a program name with args. set dummy $javacompiler; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_JAVACOMPILER+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_JAVACOMPILER+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $JAVACOMPILER in [\\/]* | ?:[\\/]*) @@ -10620,29 +10985,28 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JAVACOMPILER="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi JAVACOMPILER=$ac_cv_path_JAVACOMPILER + if test -n "$JAVACOMPILER"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVACOMPILER" >&5 -$as_echo "$JAVACOMPILER" >&6; } + echo "$as_me:$LINENO: result: $JAVACOMPILER" >&5 +echo "${ECHO_T}$JAVACOMPILER" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - else _javac_path="$with_jdk_home/bin/$javacompiler" if test -x "$_javac_path"; then @@ -10650,7 +11014,9 @@ fi fi fi if test -z "$JAVACOMPILER"; then - as_fn_error "$javacompiler not found set with_jdk_home" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: $javacompiler not found set with_jdk_home" >&5 +echo "$as_me: error: $javacompiler not found set with_jdk_home" >&2;} + { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then if test x`echo "$JAVACOMPILER" | grep -i '\.exe$'` = x; then @@ -10666,11 +11032,11 @@ fi fi if test `$JAVACOMPILER -version 2>&1 | grep -c "Eclipse Java Compiler"` -gt 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking re-checking JDK" >&5 -$as_echo_n "checking re-checking JDK... " >&6; } + echo "$as_me:$LINENO: checking re-checking JDK" >&5 +echo $ECHO_N "checking re-checking JDK... $ECHO_C" >&6 JDK=gcj - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked (ecj)" >&5 -$as_echo "checked (ecj)" >&6; } + echo "$as_me:$LINENO: result: checked (ecj)" >&5 +echo "${ECHO_T}checked (ecj)" >&6 #TODO: what's to do here? some switch to do 1.5 compiling? JAVAFLAGS="-source 1.5 -target 1.5" _gij_longver="40200" @@ -10689,10 +11055,10 @@ if test "$SOLAR_JAVA" != ""; then if test -z "$with_jdk_home"; then # Extract the first word of "javadoc", so it can be a program name with args. set dummy javadoc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_JAVADOC+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_JAVADOC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $JAVADOC in [\\/]* | ?:[\\/]*) @@ -10704,29 +11070,28 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi JAVADOC=$ac_cv_path_JAVADOC + if test -n "$JAVADOC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5 -$as_echo "$JAVADOC" >&6; } + echo "$as_me:$LINENO: result: $JAVADOC" >&5 +echo "${ECHO_T}$JAVADOC" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - else _javadoc_path="$with_jdk_home/bin/javadoc" if test "$_os" = "OS2"; then @@ -10739,10 +11104,10 @@ fi else # Extract the first word of "javadoc", so it can be a program name with args. set dummy javadoc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_JAVADOC+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_JAVADOC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $JAVADOC in [\\/]* | ?:[\\/]*) @@ -10754,33 +11119,34 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JAVADOC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi JAVADOC=$ac_cv_path_JAVADOC + if test -n "$JAVADOC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVADOC" >&5 -$as_echo "$JAVADOC" >&6; } + echo "$as_me:$LINENO: result: $JAVADOC" >&5 +echo "${ECHO_T}$JAVADOC" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi fi if test -z "$JAVADOC"; then - as_fn_error "$_javadoc_path not found set with_jdk_home" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: $_javadoc_path not found set with_jdk_home" >&5 +echo "$as_me: error: $_javadoc_path not found set with_jdk_home" >&2;} + { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then if test x`echo "$JAVADOC" | grep -i '\.exe$'` = x; then @@ -10812,33 +11178,37 @@ class findhome } } _ACEOF - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if javac works" >&5 -$as_echo_n "checking if javac works... " >&6; } + echo "$as_me:$LINENO: checking if javac works" >&5 +echo $ECHO_N "checking if javac works... $ECHO_C" >&6 javac_cmd="$JAVACOMPILER findhome.java 1>&2" - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$javac_cmd\""; } >&5 + { (eval echo "$as_me:$LINENO: \"$javac_cmd\"") >&5 (eval $javac_cmd) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } if test $? = 0 && test -f ./findhome.class ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: javac works" >&5 -$as_echo "javac works" >&6; } + echo "$as_me:$LINENO: result: javac works" >&5 +echo "${ECHO_T}javac works" >&6 else echo "configure: javac test failed" >&5 cat findhome.java >&5 - as_fn_error "javac does not work - java projects will not build!" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: javac does not work - java projects will not build!" >&5 +echo "$as_me: error: javac does not work - java projects will not build!" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if gij knows its java.home" >&5 -$as_echo_n "checking if gij knows its java.home... " >&6; } + echo "$as_me:$LINENO: checking if gij knows its java.home" >&5 +echo $ECHO_N "checking if gij knows its java.home... $ECHO_C" >&6 JAVA_HOME=`$JAVAINTERPRETER findhome` if test $? = 0 && test "$JAVA_HOME" != "" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVA_HOME" >&5 -$as_echo "$JAVA_HOME" >&6; } + echo "$as_me:$LINENO: result: $JAVA_HOME" >&5 +echo "${ECHO_T}$JAVA_HOME" >&6 else echo "configure: java test failed" >&5 cat findhome.java >&5 - as_fn_error "gij does not know its java.home - use --with-jdk-home" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: gij does not know its java.home - use --with-jdk-home" >&5 +echo "$as_me: error: gij does not know its java.home - use --with-jdk-home" >&2;} + { (exit 1); exit 1; }; } fi else JAVA_HOME=`echo $JAVAINTERPRETER | $SED -n "s,//*bin//*$WITH_JAVA,,p"` @@ -10860,10 +11230,10 @@ $as_echo "$JAVA_HOME" >&6; } JAVA_HOME=$(readlink $JAVACOMPILER) else # else warn - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5 -$as_echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5 -$as_echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;} + { echo "$as_me:$LINENO: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&5 +echo "$as_me: WARNING: JAVA_HOME is set to /usr - this is very likely to be incorrect" >&2;} + { echo "$as_me:$LINENO: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&5 +echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >&2;} echo "JAVA_HOME is set to /usr - this is very likely to be incorrect" >> warn echo "if this is the case, please inform the correct JAVA_HOME with --with-jdk-home" >> warn fi @@ -10885,12 +11255,12 @@ $as_echo "$as_me: WARNING: if this is the case, please inform the correct JAVA_H JAVA_HOME_OK="NO" fi if test "$JAVA_HOME_OK" = "NO"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5 -$as_echo "$as_me: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&5 -$as_echo "$as_me: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&2;} - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&5 -$as_echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&2;} + { echo "$as_me:$LINENO: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&5 +echo "$as_me: WARNING: JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >&2;} + { echo "$as_me:$LINENO: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&5 +echo "$as_me: WARNING: attempted to find JAVA_HOME automatically, but apparently it failed" >&2;} + { echo "$as_me:$LINENO: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&5 +echo "$as_me: WARNING: in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >&2;} echo "JAVA_HOME was not explicitly informed with --with-jdk-home. the configure script" >> warn echo "attempted to find JAVA_HOME automatically, but apparently it failed" >> warn echo "in case JAVA_HOME is incorrectly set, some projects with not be built correctly" >> warn @@ -10903,59 +11273,225 @@ fi AWTLIB= if test "$SOLAR_JAVA" != ""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jawt lib name" >&5 -$as_echo_n "checking for jawt lib name... " >&6; } + echo "$as_me:$LINENO: checking for jawt lib name" >&5 +echo $ECHO_N "checking for jawt lib name... $ECHO_C" >&6 if test "$JDK" = "gcj"; then save_CFLAGS=$CFLAGS save_LDFLAGS=$LDFLAGS CFLAGS="$CFLAGS -I$JAVA_HOME/include" LDFLAGS="$LDFLAGS -L$JAVA_HOME/lib -lgcj" exec 6>/dev/null # no output - ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default" -if test "x$ac_cv_header_jni_h" = x""yes; then : + if test "${ac_cv_header_jni_h+set}" = set; then + echo "$as_me:$LINENO: checking for jni.h" >&5 +echo $ECHO_N "checking for jni.h... $ECHO_C" >&6 +if test "${ac_cv_header_jni_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +echo "${ECHO_T}$ac_cv_header_jni_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking jni.h usability" >&5 +echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking jni.h presence" >&5 +echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for jni.h" >&5 +echo $ECHO_N "checking for jni.h... $ECHO_C" >&6 +if test "${ac_cv_header_jni_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - as_fn_error "jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" "$LINENO" 5 + ac_cv_header_jni_h=$ac_header_preproc fi +echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +echo "${ECHO_T}$ac_cv_header_jni_h" >&6 +fi +if test $ac_cv_header_jni_h = yes; then + : +else + { { echo "$as_me:$LINENO: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&5 +echo "$as_me: error: jni.h could not be found. Mismatch between gcc and libgcj or libgcj-devel missing?" >&2;} + { (exit 1); exit 1; }; } +fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -lgcjawt" >&5 -$as_echo_n "checking for JAWT_GetAWT in -lgcjawt... " >&6; } -if test "${ac_cv_lib_gcjawt_JAWT_GetAWT+set}" = set; then : - $as_echo_n "(cached) " >&6 + + echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lgcjawt" >&5 +echo $ECHO_N "checking for JAWT_GetAWT in -lgcjawt... $ECHO_C" >&6 +if test "${ac_cv_lib_gcjawt_JAWT_GetAWT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lgcjawt $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char JAWT_GetAWT (); int main () { -return JAWT_GetAWT (); +JAWT_GetAWT (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_gcjawt_JAWT_GetAWT=yes else - ac_cv_lib_gcjawt_JAWT_GetAWT=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_gcjawt_JAWT_GetAWT=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5 -$as_echo "$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6; } -if test "x$ac_cv_lib_gcjawt_JAWT_GetAWT" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_gcjawt_JAWT_GetAWT" >&5 +echo "${ECHO_T}$ac_cv_lib_gcjawt_JAWT_GetAWT" >&6 +if test $ac_cv_lib_gcjawt_JAWT_GetAWT = yes; then AWTLIB="-lgcjawt -lgcj" fi @@ -10974,93 +11510,287 @@ fi LD_LIBRARY_PATH=$JAVA_HOME/jre/bin:$JAVA_HOME/jre/bin/classic:$JAVA_HOME/jre/bin/xawt:$LD_LIBRARY_PATH export LD_LIBRARY_PATH exec 6>/dev/null # no output - ac_fn_c_check_header_mongrel "$LINENO" "jni.h" "ac_cv_header_jni_h" "$ac_includes_default" -if test "x$ac_cv_header_jni_h" = x""yes; then : + if test "${ac_cv_header_jni_h+set}" = set; then + echo "$as_me:$LINENO: checking for jni.h" >&5 +echo $ECHO_N "checking for jni.h... $ECHO_C" >&6 +if test "${ac_cv_header_jni_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +echo "${ECHO_T}$ac_cv_header_jni_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking jni.h usability" >&5 +echo $ECHO_N "checking jni.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking jni.h presence" >&5 +echo $ECHO_N "checking jni.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: jni.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: jni.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: jni.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: jni.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: jni.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: jni.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: jni.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: jni.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: jni.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: jni.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for jni.h" >&5 +echo $ECHO_N "checking for jni.h... $ECHO_C" >&6 +if test "${ac_cv_header_jni_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_jni_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_jni_h" >&5 +echo "${ECHO_T}$ac_cv_header_jni_h" >&6 +fi +if test $ac_cv_header_jni_h = yes; then + : else - as_fn_error "jni.h could not be found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: jni.h could not be found." >&5 +echo "$as_me: error: jni.h could not be found." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -ljawt" >&5 -$as_echo_n "checking for JAWT_GetAWT in -ljawt... " >&6; } -if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for JAWT_GetAWT in -ljawt" >&5 +echo $ECHO_N "checking for JAWT_GetAWT in -ljawt... $ECHO_C" >&6 +if test "${ac_cv_lib_jawt_JAWT_GetAWT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljawt $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char JAWT_GetAWT (); int main () { -return JAWT_GetAWT (); +JAWT_GetAWT (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_jawt_JAWT_GetAWT=yes else - ac_cv_lib_jawt_JAWT_GetAWT=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_jawt_JAWT_GetAWT=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5 -$as_echo "$ac_cv_lib_jawt_JAWT_GetAWT" >&6; } -if test "x$ac_cv_lib_jawt_JAWT_GetAWT" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_jawt_JAWT_GetAWT" >&5 +echo "${ECHO_T}$ac_cv_lib_jawt_JAWT_GetAWT" >&6 +if test $ac_cv_lib_jawt_JAWT_GetAWT = yes; then AWTLIB="-ljawt" fi if test -z "$AWTLIB"; then LDFLAGS="$LDFLAGS -L$JAVA_HOME/jre/bin/xawt -ljawt" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JAWT_GetAWT in -lmawt" >&5 -$as_echo_n "checking for JAWT_GetAWT in -lmawt... " >&6; } -if test "${ac_cv_lib_mawt_JAWT_GetAWT+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for JAWT_GetAWT in -lmawt" >&5 +echo $ECHO_N "checking for JAWT_GetAWT in -lmawt... $ECHO_C" >&6 +if test "${ac_cv_lib_mawt_JAWT_GetAWT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmawt $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char JAWT_GetAWT (); int main () { -return JAWT_GetAWT (); +JAWT_GetAWT (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_mawt_JAWT_GetAWT=yes else - ac_cv_lib_mawt_JAWT_GetAWT=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_mawt_JAWT_GetAWT=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5 -$as_echo "$ac_cv_lib_mawt_JAWT_GetAWT" >&6; } -if test "x$ac_cv_lib_mawt_JAWT_GetAWT" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_mawt_JAWT_GetAWT" >&5 +echo "${ECHO_T}$ac_cv_lib_mawt_JAWT_GetAWT" >&6 +if test $ac_cv_lib_mawt_JAWT_GetAWT = yes; then AWTLIB="-L$JAVA_HOME/jre/bin/xawt -ljawt -lmawt" fi @@ -11073,24 +11803,24 @@ fi if test -z "$AWTLIB"; then AWTLIB=-ljawt fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWTLIB" >&5 -$as_echo "$AWTLIB" >&6; } + echo "$as_me:$LINENO: result: $AWTLIB" >&5 +echo "${ECHO_T}$AWTLIB" >&6 fi if test "$SOLAR_JAVA" != ""; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable gcj aot compilation" >&5 -$as_echo_n "checking whether to enable gcj aot compilation... " >&6; } + echo "$as_me:$LINENO: checking whether to enable gcj aot compilation" >&5 +echo $ECHO_N "checking whether to enable gcj aot compilation... $ECHO_C" >&6 if test -n "$enable_gcjaot" && test "$enable_gcjaot" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 if test `echo $WITH_JAVA | grep -c "gij"` -eq 0; then gcjaot="gcj" else gcjaot=`echo $WITH_JAVA | $SED -e "s/gij/gcj/g"` fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $gcjaot" >&5 -$as_echo "$gcjaot" >&6; } + echo "$as_me:$LINENO: result: $gcjaot" >&5 +echo "${ECHO_T}$gcjaot" >&6 if test -n "$with_jdk_home"; then _javac_path="$with_jdk_home/bin/$gcjaot" if test -x "$_javac_path"; then @@ -11100,10 +11830,10 @@ $as_echo "$gcjaot" >&6; } if test -z "$JAVAAOTCOMPILER"; then # Extract the first word of "$gcjaot", so it can be a program name with args. set dummy $gcjaot; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_JAVAAOTCOMPILER+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_JAVAAOTCOMPILER+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $JAVAAOTCOMPILER in [\\/]* | ?:[\\/]*) @@ -11115,37 +11845,36 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_JAVAAOTCOMPILER="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi JAVAAOTCOMPILER=$ac_cv_path_JAVAAOTCOMPILER + if test -n "$JAVAAOTCOMPILER"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $JAVAAOTCOMPILER" >&5 -$as_echo "$JAVAAOTCOMPILER" >&6; } + echo "$as_me:$LINENO: result: $JAVAAOTCOMPILER" >&5 +echo "${ECHO_T}$JAVAAOTCOMPILER" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$JAVAAOTCOMPILER"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $gcjaot not found, set with_jdk_home" >&5 -$as_echo "$as_me: WARNING: $gcjaot not found, set with_jdk_home" >&2;} + { echo "$as_me:$LINENO: WARNING: $gcjaot not found, set with_jdk_home" >&5 +echo "$as_me: WARNING: $gcjaot not found, set with_jdk_home" >&2;} fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi @@ -11162,10 +11891,10 @@ fi # Extract the first word of "dmake", so it can be a program name with args. set dummy dmake; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_DMAKE+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_DMAKE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $DMAKE in [\\/]* | ?:[\\/]*) @@ -11177,36 +11906,35 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DMAKE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_DMAKE" && ac_cv_path_DMAKE="no" ;; esac fi DMAKE=$ac_cv_path_DMAKE + if test -n "$DMAKE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DMAKE" >&5 -$as_echo "$DMAKE" >&6; } + echo "$as_me:$LINENO: result: $DMAKE" >&5 +echo "${ECHO_T}$DMAKE" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$DMAKE" = "no"; then BUILD_DMAKE=YES echo "dmake will be built on ./bootstrap" else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the found dmake is the right dmake" >&5 -$as_echo_n "checking whether the found dmake is the right dmake... " >&6; } + echo "$as_me:$LINENO: checking whether the found dmake is the right dmake" >&5 +echo $ECHO_N "checking whether the found dmake is the right dmake... $ECHO_C" >&6 # we need to find out whether that dmake we found is "our" dmake # or the dmake from Sun's SunStudio Compiler which is something # different @@ -11215,48 +11943,48 @@ $as_echo_n "checking whether the found dmake is the right dmake... " >&6; } $DMAKE -V 2>/dev/null | grep 'dmake .* Version .*' >/dev/null if test $? -eq 0; then BUILD_DMAKE=NO - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the dmake version" >&5 -$as_echo_n "checking the dmake version... " >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking the dmake version" >&5 +echo $ECHO_N "checking the dmake version... $ECHO_C" >&6 DMAKE_VERSION=`$DMAKE -V | $AWK '$3 == "Version" {print $4}'` if test "`echo $DMAKE_VERSION | cut -d'.' -f1`" -gt "4"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 4.11" >&5 -$as_echo "OK, >= 4.11" >&6; } + echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 +echo "${ECHO_T}OK, >= 4.11" >&6 elif test "`echo $DMAKE_VERSION | cut -d'.' -f1`" = "4" && \ test "`echo $DMAKE_VERSION | cut -d'.' -f2`" -ge "11"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 4.11" >&5 -$as_echo "OK, >= 4.11" >&6; } + echo "$as_me:$LINENO: result: OK, >= 4.11" >&5 +echo "${ECHO_T}OK, >= 4.11" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old. >= 4.11 is needed" >&5 -$as_echo "too old. >= 4.11 is needed" >&6; } + echo "$as_me:$LINENO: result: too old. >= 4.11 is needed" >&5 +echo "${ECHO_T}too old. >= 4.11 is needed" >&6 echo "A newer dmake will be built on ./bootstrap" BUILD_DMAKE=YES fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 echo "dmake will be built on ./bootstrap" BUILD_DMAKE=YES fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable EPM for packing" >&5 -$as_echo_n "checking whether to enable EPM for packing... " >&6; } +echo "$as_me:$LINENO: checking whether to enable EPM for packing" >&5 +echo $ECHO_N "checking whether to enable EPM for packing... $ECHO_C" >&6 if test "$enable_epm" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 if test "$_os" != "WINNT"; then if test -n "$with_epm"; then EPM=$with_epm else # Extract the first word of "epm", so it can be a program name with args. set dummy epm; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_EPM+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_EPM+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $EPM in [\\/]* | ?:[\\/]*) @@ -11268,30 +11996,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_EPM="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_EPM" && ac_cv_path_EPM="no" ;; esac fi EPM=$ac_cv_path_EPM + if test -n "$EPM"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EPM" >&5 -$as_echo "$EPM" >&6; } + echo "$as_me:$LINENO: result: $EPM" >&5 +echo "${ECHO_T}$EPM" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$EPM" = "no" || test "$EPM" = "internal"; then echo "EPM will be built." @@ -11299,38 +12026,44 @@ fi BUILD_TYPE="$BUILD_TYPE EPM" else # Gentoo has some epm which is something different... - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the found epm is the right epm" >&5 -$as_echo_n "checking whether the found epm is the right epm... " >&6; } + echo "$as_me:$LINENO: checking whether the found epm is the right epm" >&5 +echo $ECHO_N "checking whether the found epm is the right epm... $ECHO_C" >&6 if $EPM | grep "ESP Package Manager" >/dev/null 2>/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - as_fn_error "no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&5 +echo "$as_me: error: no. Install ESP Package Manager (www.easysw.com/epm) and/or specify the path to the right epm" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking epm version" >&5 -$as_echo_n "checking epm version... " >&6; } + echo "$as_me:$LINENO: checking epm version" >&5 +echo $ECHO_N "checking epm version... $ECHO_C" >&6 EPM_VERSION=`$EPM | grep 'ESP Package Manager' | cut -d' ' -f4 | $SED -e s/v//` if test "`echo $EPM_VERSION | cut -d'.' -f1`" -gt "3" || \ test "`echo $EPM_VERSION | cut -d'.' -f1`" -eq "3" -a "`echo $EPM_VERSION | cut -d'.' -f2`" -ge "7"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK, >= 3.7" >&5 -$as_echo "OK, >= 3.7" >&6; } + echo "$as_me:$LINENO: result: OK, >= 3.7" >&5 +echo "${ECHO_T}OK, >= 3.7" >&6 BUILD_EPM=NO if test "$_os" = "Darwin"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which PackageMaker EPM thinks to use" >&5 -$as_echo_n "checking which PackageMaker EPM thinks to use... " >&6; } + echo "$as_me:$LINENO: checking which PackageMaker EPM thinks to use" >&5 +echo $ECHO_N "checking which PackageMaker EPM thinks to use... $ECHO_C" >&6 _pm=`strings $EPM | grep PackageMaker | cut -d" " -f1` if test "$_pm" = "/Developer/Applications/PackageMaker.app/Contents/MacOS/PackageMaker"; then - as_fn_error "$_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5 +echo "$as_me: error: $_pm; PackageMaker expected in wrong path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;} + { (exit 1); exit 1; }; } elif test "$_pm" = "/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $_pm, ok" >&5 -$as_echo "$_pm, ok" >&6; } + echo "$as_me:$LINENO: result: $_pm, ok" >&5 +echo "${ECHO_T}$_pm, ok" >&6 else # we never should get here, but go safe - as_fn_error "$_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&5 +echo "$as_me: error: $_pm; PackageMaker expected in unknown path. Either patch your epm with the right path (/Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker) or use internal patched epm (--with-epm=internal)" >&2;} + { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: too old. epm >= 3.7 is required." >&5 -$as_echo "too old. epm >= 3.7 is required." >&6; } + echo "$as_me:$LINENO: result: too old. epm >= 3.7 is required." >&5 +echo "${ECHO_T}too old. epm >= 3.7 is required." >&6 echo "EPM will be built." BUILD_EPM=YES BUILD_TYPE="$BUILD_TYPE EPM" @@ -11339,8 +12072,8 @@ $as_echo "too old. epm >= 3.7 is required." >&6; } fi # test which package format to use - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which package format to use" >&5 -$as_echo_n "checking which package format to use... " >&6; } + echo "$as_me:$LINENO: checking which package format to use" >&5 +echo $ECHO_N "checking which package format to use... $ECHO_C" >&6 # defaults case "$_os" in @@ -11376,7 +12109,9 @@ $as_echo_n "checking which package format to use... " >&6; } # we never should get here since we check the arciecture/os at the beginning, # but go sure... *) - as_fn_error "unknown system" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: unknown system" >&5 +echo "$as_me: error: unknown system" >&2;} + { (exit 1); exit 1; }; } esac if test -n "$with_package_format"; then for i in $with_package_format; do @@ -11384,7 +12119,25 @@ $as_echo_n "checking which package format to use... " >&6; } aix | bsd | deb | inst | tardist | osx | pkg | rpm | setld | native | portable | archive | dmg | installed | msi) ;; *) - as_fn_error "unsupported format $i. Supported by EPM are: + { { echo "$as_me:$LINENO: error: unsupported format $i. Supported by EPM are: +aix - AIX software distribution +bsd - FreeBSD, NetBSD, or OpenBSD software distribution +depot or swinstall - HP-UX software distribution +deb - Debian software distribution +inst or tardist - IRIX software distribution +osx - MacOS X software distribution +pkg - Solaris software distribution +rpm - RedHat software distribution +setld - Tru64 (setld) software distribution +native - \"Native\" software distribution for the platform +portable - Portable software distribution +OOo additionally supports: +archive - .tar.gz or .zip +dmg - Mac OS X .dmg +installed - installation tree +msi - Windows .msi + " >&5 +echo "$as_me: error: unsupported format $i. Supported by EPM are: aix - AIX software distribution bsd - FreeBSD, NetBSD, or OpenBSD software distribution depot or swinstall - HP-UX software distribution @@ -11401,17 +12154,18 @@ archive - .tar.gz or .zip dmg - Mac OS X .dmg installed - installation tree msi - Windows .msi - " "$LINENO" 5 + " >&2;} + { (exit 1); exit 1; }; } ;; esac done PKGFORMAT="$with_package_format" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGFORMAT" >&5 -$as_echo "$PKGFORMAT" >&6; } + echo "$as_me:$LINENO: result: $PKGFORMAT" >&5 +echo "${ECHO_T}$PKGFORMAT" >&6 if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for rpm" >&5 -$as_echo_n "checking for rpm... " >&6; } + echo "$as_me:$LINENO: checking for rpm" >&5 +echo $ECHO_N "checking for rpm... $ECHO_C" >&6 for a in "$RPM" rpmbuild rpm; do $a --usage >/dev/null 2> /dev/null if test $? -eq 0; then @@ -11426,22 +12180,26 @@ $as_echo_n "checking for rpm... " >&6; } fi done if test -z "$RPM" ; then - as_fn_error "not found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not found" >&5 +echo "$as_me: error: not found" >&2;} + { (exit 1); exit 1; }; } elif "$RPM" --usage 2>&1 | $EGREP -- -bb >/dev/null; then RPM_PATH=`which $RPM` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RPM_PATH" >&5 -$as_echo "$RPM_PATH" >&6; } + echo "$as_me:$LINENO: result: $RPM_PATH" >&5 +echo "${ECHO_T}$RPM_PATH" >&6 else - as_fn_error "cannot build packages. Try installing rpmbuild." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot build packages. Try installing rpmbuild." >&5 +echo "$as_me: error: cannot build packages. Try installing rpmbuild." >&2;} + { (exit 1); exit 1; }; } fi fi if echo "$PKGFORMAT" | $EGREP deb 2>&1 >/dev/null; then # Extract the first word of "dpkg", so it can be a program name with args. set dummy dpkg; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_DPKG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_DPKG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $DPKG in [\\/]* | ?:[\\/]*) @@ -11453,76 +12211,81 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_DPKG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_DPKG" && ac_cv_path_DPKG="no" ;; esac fi DPKG=$ac_cv_path_DPKG + if test -n "$DPKG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DPKG" >&5 -$as_echo "$DPKG" >&6; } + echo "$as_me:$LINENO: result: $DPKG" >&5 +echo "${ECHO_T}$DPKG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$DPKG" = "no"; then - as_fn_error "dpkg needed for deb creation. Install dpkg." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: dpkg needed for deb creation. Install dpkg." >&5 +echo "$as_me: error: dpkg needed for deb creation. Install dpkg." >&2;} + { (exit 1); exit 1; }; } fi fi if echo "PKGFORMAT" | $EGREP osx 2>&1 >/dev/null; then if test "$_os" = "Darwin"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PackageMaker availability" >&5 -$as_echo_n "checking for PackageMaker availability... " >&6; } + echo "$as_me:$LINENO: checking for PackageMaker availability" >&5 +echo $ECHO_N "checking for PackageMaker availability... $ECHO_C" >&6 if ! test -x /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker; then - as_fn_error "not installed. Please install Apples Dev Tools" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not installed. Please install Apples Dev Tools" >&5 +echo "$as_me: error: not installed. Please install Apples Dev Tools" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6 fi else - as_fn_error "PackageMaker needed to build OSX packages and you are not on OSX..." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&5 +echo "$as_me: error: PackageMaker needed to build OSX packages and you are not on OSX..." >&2;} + { (exit 1); exit 1; }; } fi fi if echo "$PKGFORMAT" | $EGREP rpm 2>&1 >/dev/null || \ echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then if test "$EPM" != "no" && test "$EPM" != "internal"; then if test "`echo $EPM_VERSION | cut -d'.' -f1`" -lt "4"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether epm is patched for OOos needs" >&5 -$as_echo_n "checking whether epm is patched for OOos needs... " >&6; } + echo "$as_me:$LINENO: checking whether epm is patched for OOos needs" >&5 +echo $ECHO_N "checking whether epm is patched for OOos needs... $ECHO_C" >&6 if grep "Patched for OpenOffice.org" $EPM >/dev/null 2>/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 if echo "$PKGFORMAT" | grep -q rpm; then _pt="rpm" - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the rpms will need to be installed with --nodeps" >&5 -$as_echo "$as_me: WARNING: the rpms will need to be installed with --nodeps" >&2;} + { echo "$as_me:$LINENO: WARNING: the rpms will need to be installed with --nodeps" >&5 +echo "$as_me: WARNING: the rpms will need to be installed with --nodeps" >&2;} echo "the rpms will need to be installed with --nodeps" >> warn else _pt="pkg" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: the ${_pt}s will not be relocateable" >&5 -$as_echo "$as_me: WARNING: the ${_pt}s will not be relocateable" >&2;} + { echo "$as_me:$LINENO: WARNING: the ${_pt}s will not be relocateable" >&5 +echo "$as_me: WARNING: the ${_pt}s will not be relocateable" >&2;} echo "the ${_pt}s will not be relocateable" >> warn - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: if you want to make sure installation without --nodeps and + { echo "$as_me:$LINENO: WARNING: if you want to make sure installation without --nodeps and relocation will work, you need to patch your epm with the patch in epm/epm-3.7.patch or build with --with-epm=internal which will build a suitable epm" >&5 -$as_echo "$as_me: WARNING: if you want to make sure installation without --nodeps and +echo "$as_me: WARNING: if you want to make sure installation without --nodeps and relocation will work, you need to patch your epm with the patch in epm/epm-3.7.patch or build with --with-epm=internal which will build a suitable epm" >&2;} @@ -11533,10 +12296,10 @@ $as_echo "$as_me: WARNING: if you want to make sure installation without --nodep if echo "$PKGFORMAT" | $EGREP pkg 2>&1 >/dev/null; then # Extract the first word of "pkgmk", so it can be a program name with args. set dummy pkgmk; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKGMK+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKGMK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKGMK in [\\/]* | ?:[\\/]*) @@ -11548,32 +12311,33 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKGMK="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKGMK" && ac_cv_path_PKGMK="no" ;; esac fi PKGMK=$ac_cv_path_PKGMK + if test -n "$PKGMK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKGMK" >&5 -$as_echo "$PKGMK" >&6; } + echo "$as_me:$LINENO: result: $PKGMK" >&5 +echo "${ECHO_T}$PKGMK" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$PKGMK" = "no"; then - as_fn_error "pkgmk needed for Solaris pkg creation. Install it." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: pkgmk needed for Solaris pkg creation. Install it." >&5 +echo "$as_me: error: pkgmk needed for Solaris pkg creation. Install it." >&2;} + { (exit 1); exit 1; }; } fi fi @@ -11581,8 +12345,8 @@ fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 EPM=NO PKGFORMAT=native fi @@ -11591,10 +12355,10 @@ fi # Extract the first word of "gperf", so it can be a program name with args. set dummy gperf; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GPERF+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GPERF+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $GPERF in [\\/]* | ?:[\\/]*) @@ -11606,87 +12370,95 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GPERF="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi GPERF=$ac_cv_path_GPERF + if test -n "$GPERF"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPERF" >&5 -$as_echo "$GPERF" >&6; } + echo "$as_me:$LINENO: result: $GPERF" >&5 +echo "${ECHO_T}$GPERF" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$GPERF"; then - as_fn_error "gperf not found but needed. Install it." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: gperf not found but needed. Install it." >&5 +echo "$as_me: error: gperf not found but needed. Install it." >&2;} + { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking gperf version" >&5 -$as_echo_n "checking gperf version... " >&6; } +echo "$as_me:$LINENO: checking gperf version" >&5 +echo $ECHO_N "checking gperf version... $ECHO_C" >&6 if test "`$GPERF --version | $EGREP ^GNU\ gperf | $AWK '{ print $3 }' | cut -d. -f1`" -ge "3"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else - as_fn_error "too old, you need at least 3.0.0" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: too old, you need at least 3.0.0" >&5 +echo "$as_me: error: too old, you need at least 3.0.0" >&2;} + { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the stax" >&5 -$as_echo_n "checking whether to build the stax... " >&6; } +echo "$as_me:$LINENO: checking whether to build the stax" >&5 +echo $ECHO_N "checking whether to build the stax... $ECHO_C" >&6 if test -f "./stax/download/jsr173_1.0_api.jar"; then BUILD_STAX=NO - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, will use the prebuilt stax/download/jsr173_1.0_api.jar" >&5 -$as_echo "no, will use the prebuilt stax/download/jsr173_1.0_api.jar" >&6; } + echo "$as_me:$LINENO: result: no, will use the prebuilt stax/download/jsr173_1.0_api.jar" >&5 +echo "${ECHO_T}no, will use the prebuilt stax/download/jsr173_1.0_api.jar" >&6 else BUILD_STAX=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the ODK" >&5 -$as_echo_n "checking whether to build the ODK... " >&6; } +echo "$as_me:$LINENO: checking whether to build the ODK" >&5 +echo $ECHO_N "checking whether to build the ODK... $ECHO_C" >&6 if test "z$enable_odk" = "z" -o "$enable_odk" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 if test "$WITH_JAVA" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for external/unowinreg/unowinreg.dll" >&5 -$as_echo_n "checking for external/unowinreg/unowinreg.dll... " >&6; } + echo "$as_me:$LINENO: checking for external/unowinreg/unowinreg.dll" >&5 +echo $ECHO_N "checking for external/unowinreg/unowinreg.dll... $ECHO_C" >&6 if ! test -f "./external/unowinreg/unowinreg.dll"; then HAVE_UNOWINREG_DLL=no else HAVE_UNOWINREG_DLL=yes fi if test "$HAVE_UNOWINREG_DLL" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 BUILD_UNOWINREG=NO else if test "$_os" = "WINNT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found, will be built" >&5 -$as_echo "not found, will be built" >&6; } + echo "$as_me:$LINENO: result: not found, will be built" >&5 +echo "${ECHO_T}not found, will be built" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: not found, will be cross-built using mingw32" >&5 -$as_echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;} + { echo "$as_me:$LINENO: WARNING: not found, will be cross-built using mingw32" >&5 +echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;} fi BUILD_UNOWINREG=YES fi if test "$_os" != "WINNT" && test "$BUILD_UNOWINREG" = "YES"; then if test -z "$WITH_MINGWIN" || test "$WITH_MINGWIN" = "0"; then - as_fn_error "for rebuilding unowinreg.dll you need the mingw32 C++ compiler. + { { echo "$as_me:$LINENO: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler. + Specify mingw32 g++ executable name with --with-mingwin. + Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and + put it into external/unowinreg" >&5 +echo "$as_me: error: for rebuilding unowinreg.dll you need the mingw32 C++ compiler. Specify mingw32 g++ executable name with --with-mingwin. Or use prebuilt one from http://tools.openoffice.org/unowinreg_prebuild/680/ and - put it into external/unowinreg" "$LINENO" 5 + put it into external/unowinreg" >&2;} + { (exit 1); exit 1; }; } fi if echo "$WITH_MINGWIN" | $EGREP -q "/"; then if ! test -x "$WITH_MINGWIN"; then MINGWCXX=false; else MINGWCXX=`basename $WITH_MINGWIN`; fi @@ -11694,10 +12466,10 @@ $as_echo "$as_me: WARNING: not found, will be cross-built using mingw32" >&2;} if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}$WITH_MINGWIN", so it can be a program name with args. set dummy ${ac_tool_prefix}$WITH_MINGWIN; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_MINGWCXX+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_MINGWCXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$MINGWCXX"; then ac_cv_prog_MINGWCXX="$MINGWCXX" # Let the user override the test. @@ -11707,37 +12479,35 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MINGWCXX="${ac_tool_prefix}$WITH_MINGWIN" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done fi fi MINGWCXX=$ac_cv_prog_MINGWCXX if test -n "$MINGWCXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MINGWCXX" >&5 -$as_echo "$MINGWCXX" >&6; } + echo "$as_me:$LINENO: result: $MINGWCXX" >&5 +echo "${ECHO_T}$MINGWCXX" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$ac_cv_prog_MINGWCXX"; then ac_ct_MINGWCXX=$MINGWCXX # Extract the first word of "$WITH_MINGWIN", so it can be a program name with args. set dummy $WITH_MINGWIN; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_MINGWCXX+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_MINGWCXX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_MINGWCXX"; then ac_cv_prog_ac_ct_MINGWCXX="$ac_ct_MINGWCXX" # Let the user override the test. @@ -11747,53 +12517,47 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MINGWCXX="$WITH_MINGWIN" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done + test -z "$ac_cv_prog_ac_ct_MINGWCXX" && ac_cv_prog_ac_ct_MINGWCXX="false" fi fi ac_ct_MINGWCXX=$ac_cv_prog_ac_ct_MINGWCXX if test -n "$ac_ct_MINGWCXX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MINGWCXX" >&5 -$as_echo "$ac_ct_MINGWCXX" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_MINGWCXX" >&5 +echo "${ECHO_T}$ac_ct_MINGWCXX" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "x$ac_ct_MINGWCXX" = x; then - MINGWCXX="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - MINGWCXX=$ac_ct_MINGWCXX - fi + MINGWCXX=$ac_ct_MINGWCXX else MINGWCXX="$ac_cv_prog_MINGWCXX" fi fi if test "$MINGWCXX" = "false"; then - as_fn_error "specified MinGW32 C++ cross-compiler not found. Install it or correct name." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&5 +echo "$as_me: error: specified MinGW32 C++ cross-compiler not found. Install it or correct name." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the MinGW32 cross C++ compiler" >&5 -$as_echo_n "checking whether we are using the MinGW32 cross C++ compiler... " >&6; } + echo "$as_me:$LINENO: checking whether we are using the MinGW32 cross C++ compiler" >&5 +echo $ECHO_N "checking whether we are using the MinGW32 cross C++ compiler... $ECHO_C" >&6 if ! echo "`$MINGWCXX -dumpmachine`" | grep -q mingw32; then - as_fn_error "no" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no" >&5 +echo "$as_me: error: no" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi if echo "$WITH_MINGWIN" | $EGREP -q "/"; then if ! test -x "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`"; then MINGSTRIP=false; else MINGWSTRIP=$(basename $(echo $WITH_MINGWIN | $SED -e s/g++/strip/)); fi @@ -11801,10 +12565,10 @@ $as_echo "yes" >&6; } if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args. set dummy ${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_MINGWSTRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$MINGWSTRIP"; then ac_cv_prog_MINGWSTRIP="$MINGWSTRIP" # Let the user override the test. @@ -11814,37 +12578,35 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_MINGWSTRIP="${ac_tool_prefix}`echo $WITH_MINGWIN | $SED -e s/g++/strip/`" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done fi fi MINGWSTRIP=$ac_cv_prog_MINGWSTRIP if test -n "$MINGWSTRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MINGWSTRIP" >&5 -$as_echo "$MINGWSTRIP" >&6; } + echo "$as_me:$LINENO: result: $MINGWSTRIP" >&5 +echo "${ECHO_T}$MINGWSTRIP" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test -z "$ac_cv_prog_MINGWSTRIP"; then ac_ct_MINGWSTRIP=$MINGWSTRIP # Extract the first word of "`echo $WITH_MINGWIN | $SED -e s/g++/strip/`", so it can be a program name with args. set dummy `echo $WITH_MINGWIN | $SED -e s/g++/strip/`; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_prog_ac_ct_MINGWSTRIP+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_prog_ac_ct_MINGWSTRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else if test -n "$ac_ct_MINGWSTRIP"; then ac_cv_prog_ac_ct_MINGWSTRIP="$ac_ct_MINGWSTRIP" # Let the user override the test. @@ -11854,47 +12616,39 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_prog_ac_ct_MINGWSTRIP="`echo $WITH_MINGWIN | $SED -e s/g++/strip/`" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done + test -z "$ac_cv_prog_ac_ct_MINGWSTRIP" && ac_cv_prog_ac_ct_MINGWSTRIP="false" fi fi ac_ct_MINGWSTRIP=$ac_cv_prog_ac_ct_MINGWSTRIP if test -n "$ac_ct_MINGWSTRIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MINGWSTRIP" >&5 -$as_echo "$ac_ct_MINGWSTRIP" >&6; } + echo "$as_me:$LINENO: result: $ac_ct_MINGWSTRIP" >&5 +echo "${ECHO_T}$ac_ct_MINGWSTRIP" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "x$ac_ct_MINGWSTRIP" = x; then - MINGWSTRIP="false" - else - case $cross_compiling:$ac_tool_warned in -yes:) -{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 -$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} -ac_tool_warned=yes ;; -esac - MINGWSTRIP=$ac_ct_MINGWSTRIP - fi + MINGWSTRIP=$ac_ct_MINGWSTRIP else MINGWSTRIP="$ac_cv_prog_MINGWSTRIP" fi fi if test "$MINGWSTRIP" = "false"; then - as_fn_error "MinGW32 binutils needed. Install them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: MinGW32 binutils needed. Install them." >&5 +echo "$as_me: error: MinGW32 binutils needed. Install them." >&2;} + { (exit 1); exit 1; }; } fi - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -11912,37 +12666,66 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # do not make sense here (and 'd make the check fail) save_LIBS=$LIBS LIBS="" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lkernel32" >&5 -$as_echo_n "checking for main in -lkernel32... " >&6; } -if test "${ac_cv_lib_kernel32_main+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for main in -lkernel32" >&5 +echo $ECHO_N "checking for main in -lkernel32... $ECHO_C" >&6 +if test "${ac_cv_lib_kernel32_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lkernel32 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int main () { -return main (); +main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_kernel32_main=yes else - ac_cv_lib_kernel32_main=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_kernel32_main=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_kernel32_main" >&5 -$as_echo "$ac_cv_lib_kernel32_main" >&6; } -if test "x$ac_cv_lib_kernel32_main" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_kernel32_main" >&5 +echo "${ECHO_T}$ac_cv_lib_kernel32_main" >&6 +if test $ac_cv_lib_kernel32_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBKERNEL32 1 _ACEOF @@ -11952,51 +12735,218 @@ _ACEOF fi ac_cv_lib_kernel32=ac_cv_lib_kernel32_main - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ladvapi32" >&5 -$as_echo_n "checking for main in -ladvapi32... " >&6; } -if test "${ac_cv_lib_advapi32_main+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for main in -ladvapi32" >&5 +echo $ECHO_N "checking for main in -ladvapi32... $ECHO_C" >&6 +if test "${ac_cv_lib_advapi32_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ladvapi32 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int main () { -return main (); +main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_advapi32_main=yes else - ac_cv_lib_advapi32_main=no -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -LIBS=$ac_check_lib_save_LIBS + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_advapi32_main=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +echo "$as_me:$LINENO: result: $ac_cv_lib_advapi32_main" >&5 +echo "${ECHO_T}$ac_cv_lib_advapi32_main" >&6 +if test $ac_cv_lib_advapi32_main = yes; then + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBADVAPI32 1 +_ACEOF + + LIBS="-ladvapi32 $LIBS" + +fi +ac_cv_lib_advapi32=ac_cv_lib_advapi32_main + + if test "${ac_cv_header_windows_h+set}" = set; then + echo "$as_me:$LINENO: checking for windows.h" >&5 +echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 +if test "${ac_cv_header_windows_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 +echo "${ECHO_T}$ac_cv_header_windows_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking windows.h usability" >&5 +echo $ECHO_N "checking windows.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking windows.h presence" >&5 +echo $ECHO_N "checking windows.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: windows.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: windows.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: windows.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: windows.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: windows.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: windows.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: windows.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: windows.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: windows.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: windows.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for windows.h" >&5 +echo $ECHO_N "checking for windows.h... $ECHO_C" >&6 +if test "${ac_cv_header_windows_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_windows_h=$ac_header_preproc fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_advapi32_main" >&5 -$as_echo "$ac_cv_lib_advapi32_main" >&6; } -if test "x$ac_cv_lib_advapi32_main" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_LIBADVAPI32 1 -_ACEOF - - LIBS="-ladvapi32 $LIBS" +echo "$as_me:$LINENO: result: $ac_cv_header_windows_h" >&5 +echo "${ECHO_T}$ac_cv_header_windows_h" >&6 fi -ac_cv_lib_advapi32=ac_cv_lib_advapi32_main - - ac_fn_cxx_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" -if test "x$ac_cv_header_windows_h" = x""yes; then : - +if test $ac_cv_header_windows_h = yes; then + : else - as_fn_error "windows.h missing" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: windows.h missing" >&5 +echo "$as_me: error: windows.h missing" >&2;} + { (exit 1); exit 1; }; } fi @@ -12015,24 +12965,24 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi BUILD_TYPE="$BUILD_TYPE ODK" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 BUILD_UNOWINREG=NO fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to provide libstdc++/libgcc_s in the installset" >&5 -$as_echo_n "checking whether to provide libstdc++/libgcc_s in the installset... " >&6; } +echo "$as_me:$LINENO: checking whether to provide libstdc++/libgcc_s in the installset" >&5 +echo $ECHO_N "checking whether to provide libstdc++/libgcc_s in the installset... $ECHO_C" >&6 if test -n "$with_system_stdlibs" -o -n "$with_system_libs" && \ test "$with_system_stdlibs" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 SYSTEM_STDLIBS=YES else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 SYSTEM_STDLIBS=NO fi @@ -12040,189 +12990,690 @@ fi if test "$_os" = "Darwin" && test "$with_system_zlib" != "no"; then with_system_zlib=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which zlib to use" >&5 -$as_echo_n "checking which zlib to use... " >&6; } +echo "$as_me:$LINENO: checking which zlib to use" >&5 +echo $ECHO_N "checking which zlib to use... $ECHO_C" >&6 if test -n "$with_system_zlib" -o -n "$with_system_libs" && \ test "$with_system_zlib" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_ZLIB=YES - ac_fn_c_check_header_mongrel "$LINENO" "zlib.h" "ac_cv_header_zlib_h" "$ac_includes_default" -if test "x$ac_cv_header_zlib_h" = x""yes; then : + if test "${ac_cv_header_zlib_h+set}" = set; then + echo "$as_me:$LINENO: checking for zlib.h" >&5 +echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 +if test "${ac_cv_header_zlib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking zlib.h usability" >&5 +echo $ECHO_N "checking zlib.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking zlib.h presence" >&5 +echo $ECHO_N "checking zlib.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: zlib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: zlib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: zlib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: zlib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: zlib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: zlib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: zlib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: zlib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: zlib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: zlib.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for zlib.h" >&5 +echo $ECHO_N "checking for zlib.h... $ECHO_C" >&6 +if test "${ac_cv_header_zlib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_zlib_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_zlib_h" >&5 +echo "${ECHO_T}$ac_cv_header_zlib_h" >&6 +fi +if test $ac_cv_header_zlib_h = yes; then + : else - as_fn_error "zlib.h not found. install zlib" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: zlib.h not found. install zlib" >&5 +echo "$as_me: error: zlib.h not found. install zlib" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for deflate in -lz" >&5 -$as_echo_n "checking for deflate in -lz... " >&6; } -if test "${ac_cv_lib_z_deflate+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for deflate in -lz" >&5 +echo $ECHO_N "checking for deflate in -lz... $ECHO_C" >&6 +if test "${ac_cv_lib_z_deflate+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lz $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char deflate (); int main () { -return deflate (); +deflate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_z_deflate=yes else - ac_cv_lib_z_deflate=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_z_deflate=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_z_deflate" >&5 -$as_echo "$ac_cv_lib_z_deflate" >&6; } -if test "x$ac_cv_lib_z_deflate" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_z_deflate" >&5 +echo "${ECHO_T}$ac_cv_lib_z_deflate" >&6 +if test $ac_cv_lib_z_deflate = yes; then ZLIB=-lz else - as_fn_error "zlib not found or functional" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: zlib not found or functional" >&5 +echo "$as_me: error: zlib not found or functional" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_ZLIB=NO BUILD_TYPE="$BUILD_TYPE ZLIB" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which jpeg to use" >&5 -$as_echo_n "checking which jpeg to use... " >&6; } +echo "$as_me:$LINENO: checking which jpeg to use" >&5 +echo $ECHO_N "checking which jpeg to use... $ECHO_C" >&6 if test -n "$with_system_jpeg" -o -n "$with_system_libs" && \ test "$with_system_jpeg" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_JPEG=YES - ac_fn_c_check_header_mongrel "$LINENO" "jpeglib.h" "ac_cv_header_jpeglib_h" "$ac_includes_default" -if test "x$ac_cv_header_jpeglib_h" = x""yes; then : + if test "${ac_cv_header_jpeglib_h+set}" = set; then + echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 +if test "${ac_cv_header_jpeglib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking jpeglib.h usability" >&5 +echo $ECHO_N "checking jpeglib.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking jpeglib.h presence" >&5 +echo $ECHO_N "checking jpeglib.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: jpeglib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: jpeglib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: jpeglib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: jpeglib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: jpeglib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: jpeglib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: jpeglib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: jpeglib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: jpeglib.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for jpeglib.h" >&5 +echo $ECHO_N "checking for jpeglib.h... $ECHO_C" >&6 +if test "${ac_cv_header_jpeglib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_jpeglib_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_jpeglib_h" >&5 +echo "${ECHO_T}$ac_cv_header_jpeglib_h" >&6 + +fi +if test $ac_cv_header_jpeglib_h = yes; then + : else - as_fn_error "jpeg.h not found. install libjpeg" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: jpeg.h not found. install libjpeg" >&5 +echo "$as_me: error: jpeg.h not found. install libjpeg" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg_resync_to_restart in -ljpeg" >&5 -$as_echo_n "checking for jpeg_resync_to_restart in -ljpeg... " >&6; } -if test "${ac_cv_lib_jpeg_jpeg_resync_to_restart+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for jpeg_resync_to_restart in -ljpeg" >&5 +echo $ECHO_N "checking for jpeg_resync_to_restart in -ljpeg... $ECHO_C" >&6 +if test "${ac_cv_lib_jpeg_jpeg_resync_to_restart+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ljpeg $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char jpeg_resync_to_restart (); int main () { -return jpeg_resync_to_restart (); +jpeg_resync_to_restart (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_jpeg_jpeg_resync_to_restart=yes else - ac_cv_lib_jpeg_jpeg_resync_to_restart=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_jpeg_jpeg_resync_to_restart=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5 -$as_echo "$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6; } -if test "x$ac_cv_lib_jpeg_jpeg_resync_to_restart" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_jpeg_jpeg_resync_to_restart" >&5 +echo "${ECHO_T}$ac_cv_lib_jpeg_jpeg_resync_to_restart" >&6 +if test $ac_cv_lib_jpeg_jpeg_resync_to_restart = yes; then JPEG3RDLIB=-ljpeg else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking jpeg library not found or fuctional" >&5 -$as_echo_n "checking jpeg library not found or fuctional... " >&6; } + echo "$as_me:$LINENO: checking jpeg library not found or fuctional" >&5 +echo $ECHO_N "checking jpeg library not found or fuctional... $ECHO_C" >&6 fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_JPEG=NO BUILD_TYPE="$BUILD_TYPE JPEG" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which expat to use" >&5 -$as_echo_n "checking which expat to use... " >&6; } +echo "$as_me:$LINENO: checking which expat to use" >&5 +echo $ECHO_N "checking which expat to use... $ECHO_C" >&6 if test -n "$with_system_expat" -o -n "$with_system_libs" && \ test "$with_system_expat" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_EXPAT=YES - ac_fn_c_check_header_mongrel "$LINENO" "expat.h" "ac_cv_header_expat_h" "$ac_includes_default" -if test "x$ac_cv_header_expat_h" = x""yes; then : + if test "${ac_cv_header_expat_h+set}" = set; then + echo "$as_me:$LINENO: checking for expat.h" >&5 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 +if test "${ac_cv_header_expat_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking expat.h usability" >&5 +echo $ECHO_N "checking expat.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking expat.h presence" >&5 +echo $ECHO_N "checking expat.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: expat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: expat.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: expat.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: expat.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: expat.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: expat.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: expat.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: expat.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: expat.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: expat.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for expat.h" >&5 +echo $ECHO_N "checking for expat.h... $ECHO_C" >&6 +if test "${ac_cv_header_expat_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_expat_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_expat_h" >&5 +echo "${ECHO_T}$ac_cv_header_expat_h" >&6 +fi +if test $ac_cv_header_expat_h = yes; then + : else - as_fn_error "expat.h not found. install expat" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: expat.h not found. install expat" >&5 +echo "$as_me: error: expat.h not found. install expat" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML_ParserCreate in -lexpat" >&5 -$as_echo_n "checking for XML_ParserCreate in -lexpat... " >&6; } -if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for XML_ParserCreate in -lexpat" >&5 +echo $ECHO_N "checking for XML_ParserCreate in -lexpat... $ECHO_C" >&6 +if test "${ac_cv_lib_expat_XML_ParserCreate+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lexpat $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XML_ParserCreate (); int main () { -return XML_ParserCreate (); +XML_ParserCreate (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_expat_XML_ParserCreate=yes else - ac_cv_lib_expat_XML_ParserCreate=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_expat_XML_ParserCreate=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 -$as_echo "$ac_cv_lib_expat_XML_ParserCreate" >&6; } -if test "x$ac_cv_lib_expat_XML_ParserCreate" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_expat_XML_ParserCreate" >&5 +echo "${ECHO_T}$ac_cv_lib_expat_XML_ParserCreate" >&6 +if test $ac_cv_lib_expat_XML_ParserCreate = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBEXPAT 1 _ACEOF @@ -12230,24 +13681,24 @@ _ACEOF LIBS="-lexpat $LIBS" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: expat library not found or functional." >&5 -$as_echo "expat library not found or functional." >&6; } + echo "$as_me:$LINENO: result: expat library not found or functional." >&5 +echo "${ECHO_T}expat library not found or functional." >&6 fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_EXPAT=NO BUILD_TYPE="$BUILD_TYPE EXPAT" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libwpd to use" >&5 -$as_echo_n "checking which libwpd to use... " >&6; } +echo "$as_me:$LINENO: checking which libwpd to use" >&5 +echo $ECHO_N "checking which libwpd to use... $ECHO_C" >&6 if test -n "$with_system_libwpd" -o -n "$with_system_libs" && \ test "$with_system_libwpd" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_LIBWPD=YES succeeded=no @@ -12255,10 +13706,10 @@ $as_echo "external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -12270,30 +13721,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -12304,25 +13754,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libwpd-0.8 " >&5 -$as_echo_n "checking for libwpd-0.8 ... " >&6; } + echo "$as_me:$LINENO: checking for libwpd-0.8 " >&5 +echo $ECHO_N "checking for libwpd-0.8 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "libwpd-0.8 " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBWPD_CFLAGS" >&5 -$as_echo_n "checking LIBWPD_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking LIBWPD_CFLAGS" >&5 +echo $ECHO_N "checking LIBWPD_CFLAGS... $ECHO_C" >&6 LIBWPD_CFLAGS=`$PKG_CONFIG --cflags "libwpd-0.8 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBWPD_CFLAGS" >&5 -$as_echo "$LIBWPD_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $LIBWPD_CFLAGS" >&5 +echo "${ECHO_T}$LIBWPD_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBWPD_LIBS" >&5 -$as_echo_n "checking LIBWPD_LIBS... " >&6; } + echo "$as_me:$LINENO: checking LIBWPD_LIBS" >&5 +echo $ECHO_N "checking LIBWPD_LIBS... $ECHO_C" >&6 LIBWPD_LIBS=`$PKG_CONFIG --libs "libwpd-0.8 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBWPD_LIBS" >&5 -$as_echo "$LIBWPD_LIBS" >&6; } + echo "$as_me:$LINENO: result: $LIBWPD_LIBS" >&5 +echo "${ECHO_T}$LIBWPD_LIBS" >&6 else LIBWPD_CFLAGS="" LIBWPD_LIBS="" @@ -12343,12 +13793,14 @@ $as_echo "$LIBWPD_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libwpd-0.8 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_LIBWPD=NO BUILD_TYPE="$BUILD_TYPE LIBWPD" fi @@ -12356,12 +13808,12 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which cppunit to use" >&5 -$as_echo_n "checking which cppunit to use... " >&6; } +echo "$as_me:$LINENO: checking which cppunit to use" >&5 +echo $ECHO_N "checking which cppunit to use... $ECHO_C" >&6 if test -n "$with_system_cppunit" -o -n "$with_system_libs" && \ test "$with_system_cppunit" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_CPPUNIT=YES # might work for earlier, too but go sure. We didn't have # a system-cppunit before the first version using a proper cppunit @@ -12372,10 +13824,10 @@ $as_echo "external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -12387,30 +13839,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -12421,25 +13872,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cppunit >= 1.12.1 " >&5 -$as_echo_n "checking for cppunit >= 1.12.1 ... " >&6; } + echo "$as_me:$LINENO: checking for cppunit >= 1.12.1 " >&5 +echo $ECHO_N "checking for cppunit >= 1.12.1 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "cppunit >= 1.12.1 " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CPPUNIT_CFLAGS" >&5 -$as_echo_n "checking CPPUNIT_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking CPPUNIT_CFLAGS" >&5 +echo $ECHO_N "checking CPPUNIT_CFLAGS... $ECHO_C" >&6 CPPUNIT_CFLAGS=`$PKG_CONFIG --cflags "cppunit >= 1.12.1 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_CFLAGS" >&5 -$as_echo "$CPPUNIT_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $CPPUNIT_CFLAGS" >&5 +echo "${ECHO_T}$CPPUNIT_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CPPUNIT_LIBS" >&5 -$as_echo_n "checking CPPUNIT_LIBS... " >&6; } + echo "$as_me:$LINENO: checking CPPUNIT_LIBS" >&5 +echo $ECHO_N "checking CPPUNIT_LIBS... $ECHO_C" >&6 CPPUNIT_LIBS=`$PKG_CONFIG --libs "cppunit >= 1.12.1 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CPPUNIT_LIBS" >&5 -$as_echo "$CPPUNIT_LIBS" >&6; } + echo "$as_me:$LINENO: result: $CPPUNIT_LIBS" >&5 +echo "${ECHO_T}$CPPUNIT_LIBS" >&6 else CPPUNIT_CFLAGS="" CPPUNIT_LIBS="" @@ -12460,12 +13911,14 @@ $as_echo "$CPPUNIT_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (cppunit >= 1.12.1 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_CPPUNIT=NO BUILD_TYPE="$BUILD_TYPE CPPUNIT" fi @@ -12474,18 +13927,18 @@ fi if test "$test_freetype" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether freetype is available" >&5 -$as_echo_n "checking whether freetype is available... " >&6; } + echo "$as_me:$LINENO: checking whether freetype is available" >&5 +echo $ECHO_N "checking whether freetype is available... $ECHO_C" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -12497,30 +13950,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -12531,25 +13983,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for freetype2 >= 2.0 " >&5 -$as_echo_n "checking for freetype2 >= 2.0 ... " >&6; } + echo "$as_me:$LINENO: checking for freetype2 >= 2.0 " >&5 +echo $ECHO_N "checking for freetype2 >= 2.0 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "freetype2 >= 2.0 " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_CFLAGS" >&5 -$as_echo_n "checking FREETYPE_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking FREETYPE_CFLAGS" >&5 +echo $ECHO_N "checking FREETYPE_CFLAGS... $ECHO_C" >&6 FREETYPE_CFLAGS=`$PKG_CONFIG --cflags "freetype2 >= 2.0 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_CFLAGS" >&5 -$as_echo "$FREETYPE_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $FREETYPE_CFLAGS" >&5 +echo "${ECHO_T}$FREETYPE_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking FREETYPE_LIBS" >&5 -$as_echo_n "checking FREETYPE_LIBS... " >&6; } + echo "$as_me:$LINENO: checking FREETYPE_LIBS" >&5 +echo $ECHO_N "checking FREETYPE_LIBS... $ECHO_C" >&6 FREETYPE_LIBS=`$PKG_CONFIG --libs "freetype2 >= 2.0 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FREETYPE_LIBS" >&5 -$as_echo "$FREETYPE_LIBS" >&6; } + echo "$as_me:$LINENO: result: $FREETYPE_LIBS" >&5 +echo "${ECHO_T}$FREETYPE_LIBS" >&6 else FREETYPE_CFLAGS="" FREETYPE_LIBS="" @@ -12570,7 +14022,9 @@ $as_echo "$FREETYPE_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (freetype2 >= 2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi fi @@ -12583,43 +14037,71 @@ if test "$test_freetype" = "yes"; then save_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $FREETYPE_CFLAGS" LDFLAGS="$LDFLAGS $FREETYPE_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5 -$as_echo_n "checking for FT_GlyphSlot_Embolden in -lfreetype... " >&6; } -if test "${ac_cv_lib_freetype_FT_GlyphSlot_Embolden+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for FT_GlyphSlot_Embolden in -lfreetype" >&5 +echo $ECHO_N "checking for FT_GlyphSlot_Embolden in -lfreetype... $ECHO_C" >&6 +if test "${ac_cv_lib_freetype_FT_GlyphSlot_Embolden+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lfreetype $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char FT_GlyphSlot_Embolden (); int main () { -return FT_GlyphSlot_Embolden (); +FT_GlyphSlot_Embolden (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_freetype_FT_GlyphSlot_Embolden=yes else - ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_freetype_FT_GlyphSlot_Embolden=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5 -$as_echo "$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6; } -if test "x$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&5 +echo "${ECHO_T}$ac_cv_lib_freetype_FT_GlyphSlot_Embolden" >&6 +if test $ac_cv_lib_freetype_FT_GlyphSlot_Embolden = yes; then USE_FT_EMBOLDEN="YES" else USE_FT_EMBOLDEN="NO" @@ -12652,26 +14134,26 @@ if test -n "$with_system_libxml" -o -n "$with_system_libs" && \ fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libxslt to use" >&5 -$as_echo_n "checking which libxslt to use... " >&6; } +echo "$as_me:$LINENO: checking which libxslt to use" >&5 +echo $ECHO_N "checking which libxslt to use... $ECHO_C" >&6 if test -n "$with_system_libxslt" -o -n "$with_system_libs" -o \ "$_os" = "Darwin" && \ test "$with_system_libxslt" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_LIBXSLT=YES if test "$_os" = "Darwin"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_CFLAGS" >&5 -$as_echo_n "checking LIBXSLT_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 +echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6 LIBXSLT_CFLAGS=`xslt-config --cflags` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_CFLAGS" >&5 -$as_echo "$LIBXSLT_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_LIBS" >&5 -$as_echo_n "checking LIBXSLT_LIBS... " >&6; } + echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 +echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6 + echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 +echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6 LIBXSLT_LIBS=`xslt-config --libs` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_LIBS" >&5 -$as_echo "$LIBXSLT_LIBS" >&6; } + echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 +echo "${ECHO_T}$LIBXSLT_LIBS" >&6 else @@ -12681,10 +14163,10 @@ $as_echo "$LIBXSLT_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -12696,30 +14178,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -12730,25 +14211,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxslt" >&5 -$as_echo_n "checking for libxslt... " >&6; } + echo "$as_me:$LINENO: checking for libxslt" >&5 +echo $ECHO_N "checking for libxslt... $ECHO_C" >&6 if $PKG_CONFIG --exists "libxslt" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_CFLAGS" >&5 -$as_echo_n "checking LIBXSLT_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking LIBXSLT_CFLAGS" >&5 +echo $ECHO_N "checking LIBXSLT_CFLAGS... $ECHO_C" >&6 LIBXSLT_CFLAGS=`$PKG_CONFIG --cflags "libxslt"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_CFLAGS" >&5 -$as_echo "$LIBXSLT_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $LIBXSLT_CFLAGS" >&5 +echo "${ECHO_T}$LIBXSLT_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXSLT_LIBS" >&5 -$as_echo_n "checking LIBXSLT_LIBS... " >&6; } + echo "$as_me:$LINENO: checking LIBXSLT_LIBS" >&5 +echo $ECHO_N "checking LIBXSLT_LIBS... $ECHO_C" >&6 LIBXSLT_LIBS=`$PKG_CONFIG --libs "libxslt"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXSLT_LIBS" >&5 -$as_echo "$LIBXSLT_LIBS" >&6; } + echo "$as_me:$LINENO: result: $LIBXSLT_LIBS" >&5 +echo "${ECHO_T}$LIBXSLT_LIBS" >&6 else LIBXSLT_CFLAGS="" LIBXSLT_LIBS="" @@ -12769,7 +14250,9 @@ $as_echo "$LIBXSLT_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libxslt) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi fi @@ -12777,10 +14260,10 @@ $as_echo "$LIBXSLT_LIBS" >&6; } # Extract the first word of "xsltproc", so it can be a program name with args. set dummy xsltproc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_XSLTPROC+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XSLTPROC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $XSLTPROC in [\\/]* | ?:[\\/]*) @@ -12792,36 +14275,37 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_XSLTPROC" && ac_cv_path_XSLTPROC="no" ;; esac fi XSLTPROC=$ac_cv_path_XSLTPROC + if test -n "$XSLTPROC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 -$as_echo "$XSLTPROC" >&6; } + echo "$as_me:$LINENO: result: $XSLTPROC" >&5 +echo "${ECHO_T}$XSLTPROC" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$XSLTPROC" = "no"; then - as_fn_error "xsltproc is required" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: xsltproc is required" >&5 +echo "$as_me: error: xsltproc is required" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_LIBXSLT=NO BUILD_TYPE="$BUILD_TYPE LIBXSLT" fi @@ -12830,25 +14314,25 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libxml to use" >&5 -$as_echo_n "checking which libxml to use... " >&6; } +echo "$as_me:$LINENO: checking which libxml to use" >&5 +echo $ECHO_N "checking which libxml to use... $ECHO_C" >&6 if test -n "$with_system_libxml" -o -n "$with_system_libs" -o \ "$_os" = "Darwin" && \ test "$with_system_libxml" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_LIBXML=YES if test "$_os" = "Darwin"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_CFLAGS" >&5 -$as_echo_n "checking LIBXML_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 +echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6 LIBXML_CFLAGS=`xml2-config --cflags` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_CFLAGS" >&5 -$as_echo "$LIBXML_CFLAGS" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_LIBS" >&5 -$as_echo_n "checking LIBXML_LIBS... " >&6; } + echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 +echo "${ECHO_T}$LIBXML_CFLAGS" >&6 + echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 +echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6 LIBXML_LIBS=`xml2-config --libs` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_LIBS" >&5 -$as_echo "$LIBXML_LIBS" >&6; } + echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 +echo "${ECHO_T}$LIBXML_LIBS" >&6 else @@ -12858,10 +14342,10 @@ $as_echo "$LIBXML_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -12873,30 +14357,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -12907,25 +14390,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxml-2.0 >= 2.0" >&5 -$as_echo_n "checking for libxml-2.0 >= 2.0... " >&6; } + echo "$as_me:$LINENO: checking for libxml-2.0 >= 2.0" >&5 +echo $ECHO_N "checking for libxml-2.0 >= 2.0... $ECHO_C" >&6 if $PKG_CONFIG --exists "libxml-2.0 >= 2.0" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_CFLAGS" >&5 -$as_echo_n "checking LIBXML_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking LIBXML_CFLAGS" >&5 +echo $ECHO_N "checking LIBXML_CFLAGS... $ECHO_C" >&6 LIBXML_CFLAGS=`$PKG_CONFIG --cflags "libxml-2.0 >= 2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_CFLAGS" >&5 -$as_echo "$LIBXML_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $LIBXML_CFLAGS" >&5 +echo "${ECHO_T}$LIBXML_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBXML_LIBS" >&5 -$as_echo_n "checking LIBXML_LIBS... " >&6; } + echo "$as_me:$LINENO: checking LIBXML_LIBS" >&5 +echo $ECHO_N "checking LIBXML_LIBS... $ECHO_C" >&6 LIBXML_LIBS=`$PKG_CONFIG --libs "libxml-2.0 >= 2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBXML_LIBS" >&5 -$as_echo "$LIBXML_LIBS" >&6; } + echo "$as_me:$LINENO: result: $LIBXML_LIBS" >&5 +echo "${ECHO_T}$LIBXML_LIBS" >&6 else LIBXML_CFLAGS="" LIBXML_LIBS="" @@ -12946,15 +14429,17 @@ $as_echo "$LIBXML_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libxml-2.0 >= 2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi fi BUILD_TYPE="$BUILD_TYPE LIBXMLSEC" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_LIBXML=NO BUILD_TYPE="$BUILD_TYPE LIBXML2 LIBXMLSEC" fi @@ -12962,27 +14447,27 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which python to use" >&5 -$as_echo_n "checking which python to use... " >&6; } +echo "$as_me:$LINENO: checking which python to use" >&5 +echo $ECHO_N "checking which python to use... $ECHO_C" >&6 if test "$_os" = "Darwin" && test "$with_system_python" != "no"; then with_system_python=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: compiling against MacOSX10.4u.sdk (python version 2.3)" >&5 -$as_echo "compiling against MacOSX10.4u.sdk (python version 2.3)" >&6; } + echo "$as_me:$LINENO: result: compiling against MacOSX10.4u.sdk (python version 2.3)" >&5 +echo "${ECHO_T}compiling against MacOSX10.4u.sdk (python version 2.3)" >&6 PYTHON_CFLAGS="-I/Developer/SDKs/MacOSX10.4u.sdk/System/Library/Frameworks/Python.framework/Versions/2.3/include/python2.3" PYTHON_LIBS="-framework Python" elif test -n "$with_system_python" -o -n "$with_system_libs" && \ test "$with_system_python" != "no"; then with_system_python=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 if test -n "$PYTHON"; then # If the user set $PYTHON, use it and don't search something else. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $PYTHON version >= 2.2" >&5 -$as_echo_n "checking whether $PYTHON version >= 2.2... " >&6; } + echo "$as_me:$LINENO: checking whether $PYTHON version >= 2.2" >&5 +echo $ECHO_N "checking whether $PYTHON version >= 2.2... $ECHO_C" >&6 prog="import sys, string # split strings by '.' and convert to numeric. Append some zeros # because we need at least 4 digits for the hex conversion. @@ -12994,20 +14479,23 @@ sys.exit(sys.hexversion < minverhex)" ($PYTHON -c "$prog") >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + (exit $ac_status); }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - as_fn_error "too old" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: too old" >&5 +echo "$as_me: error: too old" >&2;} + { (exit 1); exit 1; }; } fi + am_display_PYTHON=$PYTHON else # Otherwise, try each interpreter until we find one that satisfies # VERSION. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a Python interpreter with version >= 2.2" >&5 -$as_echo_n "checking for a Python interpreter with version >= 2.2... " >&6; } -if test "${am_cv_pathless_PYTHON+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for a Python interpreter with version >= 2.2" >&5 +echo $ECHO_N "checking for a Python interpreter with version >= 2.2... $ECHO_C" >&6 +if test "${am_cv_pathless_PYTHON+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else for am_cv_pathless_PYTHON in python python2 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do @@ -13023,23 +14511,24 @@ sys.exit(sys.hexversion < minverhex)" ($am_cv_pathless_PYTHON -c "$prog") >&5 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then : + (exit $ac_status); }; then break fi + done fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_pathless_PYTHON" >&5 -$as_echo "$am_cv_pathless_PYTHON" >&6; } +echo "$as_me:$LINENO: result: $am_cv_pathless_PYTHON" >&5 +echo "${ECHO_T}$am_cv_pathless_PYTHON" >&6 # Set $PYTHON to the absolute path of $am_cv_pathless_PYTHON. if test "$am_cv_pathless_PYTHON" = none; then PYTHON=: else # Extract the first word of "$am_cv_pathless_PYTHON", so it can be a program name with args. set dummy $am_cv_pathless_PYTHON; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PYTHON+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PYTHON+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PYTHON in [\\/]* | ?:[\\/]*) @@ -13051,48 +14540,49 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PYTHON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi PYTHON=$ac_cv_path_PYTHON + if test -n "$PYTHON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PYTHON" >&5 -$as_echo "$PYTHON" >&6; } + echo "$as_me:$LINENO: result: $PYTHON" >&5 +echo "${ECHO_T}$PYTHON" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi am_display_PYTHON=$am_cv_pathless_PYTHON fi if test "$PYTHON" = :; then - as_fn_error "no suitable Python interpreter found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 +echo "$as_me: error: no suitable Python interpreter found" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON version" >&5 -$as_echo_n "checking for $am_display_PYTHON version... " >&6; } -if test "${am_cv_python_version+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for $am_display_PYTHON version" >&5 +echo $ECHO_N "checking for $am_display_PYTHON version... $ECHO_C" >&6 +if test "${am_cv_python_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_version=`$PYTHON -c "import sys; print sys.version[:3]"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_version" >&5 -$as_echo "$am_cv_python_version" >&6; } +echo "$as_me:$LINENO: result: $am_cv_python_version" >&5 +echo "${ECHO_T}$am_cv_python_version" >&6 PYTHON_VERSION=$am_cv_python_version @@ -13103,30 +14593,30 @@ $as_echo "$am_cv_python_version" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON platform" >&5 -$as_echo_n "checking for $am_display_PYTHON platform... " >&6; } -if test "${am_cv_python_platform+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for $am_display_PYTHON platform" >&5 +echo $ECHO_N "checking for $am_display_PYTHON platform... $ECHO_C" >&6 +if test "${am_cv_python_platform+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_platform=`$PYTHON -c "import sys; print sys.platform"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_platform" >&5 -$as_echo "$am_cv_python_platform" >&6; } +echo "$as_me:$LINENO: result: $am_cv_python_platform" >&5 +echo "${ECHO_T}$am_cv_python_platform" >&6 PYTHON_PLATFORM=$am_cv_python_platform - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON script directory" >&5 -$as_echo_n "checking for $am_display_PYTHON script directory... " >&6; } -if test "${am_cv_python_pythondir+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for $am_display_PYTHON script directory" >&5 +echo $ECHO_N "checking for $am_display_PYTHON script directory... $ECHO_C" >&6 +if test "${am_cv_python_pythondir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_pythondir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(0,0,prefix='$PYTHON_PREFIX')" 2>/dev/null || echo "$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pythondir" >&5 -$as_echo "$am_cv_python_pythondir" >&6; } +echo "$as_me:$LINENO: result: $am_cv_python_pythondir" >&5 +echo "${ECHO_T}$am_cv_python_pythondir" >&6 pythondir=$am_cv_python_pythondir @@ -13134,16 +14624,16 @@ $as_echo "$am_cv_python_pythondir" >&6; } pkgpythondir=\${pythondir}/$PACKAGE - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $am_display_PYTHON extension module directory" >&5 -$as_echo_n "checking for $am_display_PYTHON extension module directory... " >&6; } -if test "${am_cv_python_pyexecdir+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for $am_display_PYTHON extension module directory" >&5 +echo $ECHO_N "checking for $am_display_PYTHON extension module directory... $ECHO_C" >&6 +if test "${am_cv_python_pyexecdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else am_cv_python_pyexecdir=`$PYTHON -c "from distutils import sysconfig; print sysconfig.get_python_lib(1,0,prefix='$PYTHON_EXEC_PREFIX')" 2>/dev/null || echo "${PYTHON_EXEC_PREFIX}/lib/python${PYTHON_VERSION}/site-packages"` fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_python_pyexecdir" >&5 -$as_echo "$am_cv_python_pyexecdir" >&6; } +echo "$as_me:$LINENO: result: $am_cv_python_pyexecdir" >&5 +echo "${ECHO_T}$am_cv_python_pyexecdir" >&6 pyexecdir=$am_cv_python_pyexecdir @@ -13165,11 +14655,149 @@ if test "$with_system_python" = "yes" ; then SYSTEM_PYTHON=YES save_CPPFLAGS="$CPPFLAGS" CPPFLAGS="$CPPFLAGS $PYTHON_CFLAGS" - ac_fn_c_check_header_mongrel "$LINENO" "Python.h" "ac_cv_header_Python_h" "$ac_includes_default" -if test "x$ac_cv_header_Python_h" = x""yes; then : + if test "${ac_cv_header_Python_h+set}" = set; then + echo "$as_me:$LINENO: checking for Python.h" >&5 +echo $ECHO_N "checking for Python.h... $ECHO_C" >&6 +if test "${ac_cv_header_Python_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 +echo "${ECHO_T}$ac_cv_header_Python_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking Python.h usability" >&5 +echo $ECHO_N "checking Python.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking Python.h presence" >&5 +echo $ECHO_N "checking Python.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: Python.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: Python.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: Python.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: Python.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: Python.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: Python.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: Python.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: Python.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: Python.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: Python.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for Python.h" >&5 +echo $ECHO_N "checking for Python.h... $ECHO_C" >&6 +if test "${ac_cv_header_Python_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_Python_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_Python_h" >&5 +echo "${ECHO_T}$ac_cv_header_Python_h" >&6 +fi +if test $ac_cv_header_Python_h = yes; then + : else - as_fn_error "Python headers not found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Python headers not found" >&5 +echo "$as_me: error: Python headers not found" >&2;} + { (exit 1); exit 1; }; } fi @@ -13177,8 +14805,8 @@ fi else SYSTEM_PYTHON=NO BUILD_TYPE="$BUILD_TYPE PYTHON" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 # Embedded python dies without Home set if test "z$HOME" = "z"; then export HOME=""; @@ -13187,10 +14815,10 @@ $as_echo "internal" >&6; } if test -z "$BZIP2"; then # Extract the first word of "bzip2", so it can be a program name with args. set dummy bzip2; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_BZIP2+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_BZIP2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $BZIP2 in [\\/]* | ?:[\\/]*) @@ -13202,31 +14830,32 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_BZIP2="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi BZIP2=$ac_cv_path_BZIP2 + if test -n "$BZIP2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BZIP2" >&5 -$as_echo "$BZIP2" >&6; } + echo "$as_me:$LINENO: result: $BZIP2" >&5 +echo "${ECHO_T}$BZIP2" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$BZIP2"; then - as_fn_error "the internal Python module has a .tar.bz2. You need bzip2" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: the internal Python module has a .tar.bz2. You need bzip2" >&5 +echo "$as_me: error: the internal Python module has a .tar.bz2. You need bzip2" >&2;} + { (exit 1); exit 1; }; } fi fi fi @@ -13236,27 +14865,121 @@ fi HOME=`echo $HOME | sed 's:\\\\:/:g'` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which db to use" >&5 -$as_echo_n "checking which db to use... " >&6; } +echo "$as_me:$LINENO: checking which db to use" >&5 +echo $ECHO_N "checking which db to use... $ECHO_C" >&6 if test -n "$with_system_db" -o -n "$with_system_libs" && \ test "$with_system_db" != "no"; then SYSTEM_DB=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } - ac_fn_c_check_header_compile "$LINENO" "db.h" "ac_cv_header_db_h" " + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 + echo "$as_me:$LINENO: checking for db.h" >&5 +echo $ECHO_N "checking for db.h... $ECHO_C" >&6 +if test "${ac_cv_header_db_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ + + + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_db_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 -" -if test "x$ac_cv_header_db_h" = x""yes; then : +ac_cv_header_db_h=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_header_db_h" >&5 +echo "${ECHO_T}$ac_cv_header_db_h" >&6 +if test $ac_cv_header_db_h = yes; then DB_INCLUDES=/usr/include else CFLAGS=-I/usr/include/db4 - ac_fn_c_check_header_compile "$LINENO" "db4/db.h" "ac_cv_header_db4_db_h" "+ -" -if test "x$ac_cv_header_db4_db_h" = x""yes; then : + echo "$as_me:$LINENO: checking for db4/db.h" >&5 +echo $ECHO_N "checking for db4/db.h... $ECHO_C" >&6 +if test "${ac_cv_header_db4_db_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ ++ + +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_header_db4_db_h=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_header_db4_db_h=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_header_db4_db_h" >&5 +echo "${ECHO_T}$ac_cv_header_db4_db_h" >&6 +if test $ac_cv_header_db4_db_h = yes; then DB_INCLUDES=/usr/include/db4 else - as_fn_error "no. install the db4 libraries" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no. install the db4 libraries" >&5 +echo "$as_me: error: no. install the db4 libraries" >&2;} + { (exit 1); exit 1; }; } fi @@ -13264,15 +14987,20 @@ fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether db is at least 4.1" >&5 -$as_echo_n "checking whether db is at least 4.1... " >&6; } - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } + echo "$as_me:$LINENO: checking whether db is at least 4.1" >&5 +echo $ECHO_N "checking whether db is at least 4.1... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -13283,47 +15011,91 @@ int main(int argc, char **argv) { } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - as_fn_error "no. you need at least db 4.1" "$LINENO" 5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: no. you need at least db 4.1" >&5 +echo "$as_me: error: no. you need at least db 4.1" >&2;} + { (exit 1); exit 1; }; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ldb" >&5 -$as_echo_n "checking for main in -ldb... " >&6; } -if test "${ac_cv_lib_db_main+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for main in -ldb" >&5 +echo $ECHO_N "checking for main in -ldb... $ECHO_C" >&6 +if test "${ac_cv_lib_db_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldb $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int main () { -return main (); +main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_db_main=yes else - ac_cv_lib_db_main=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_db_main=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_db_main" >&5 -$as_echo "$ac_cv_lib_db_main" >&6; } -if test "x$ac_cv_lib_db_main" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_db_main" >&5 +echo "${ECHO_T}$ac_cv_lib_db_main" >&6 +if test $ac_cv_lib_db_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBDB 1 _ACEOF @@ -13331,14 +15103,16 @@ _ACEOF LIBS="-ldb $LIBS" else - as_fn_error "db not installed or functional" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: db not installed or functional" >&5 +echo "$as_me: error: db not installed or functional" >&2;} + { (exit 1); exit 1; }; } fi ac_cv_lib_db=ac_cv_lib_db_main SCPDEFS="$SCPDEFS -DSYSTEM_DB" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_DB=NO BUILD_TYPE="$BUILD_TYPE BERKELEYDB" fi @@ -13347,70 +15121,78 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which lucene to use" >&5 -$as_echo_n "checking which lucene to use... " >&6; } +echo "$as_me:$LINENO: checking which lucene to use" >&5 +echo $ECHO_N "checking which lucene to use... $ECHO_C" >&6 if test -n "$with_system_lucene" -o -n "$with_system_libs" && \ test "$with_system_lucene" != "no" && test "$with_system_jars" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_LUCENE=YES if test -z $LUCENE_CORE_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-core-2.3.jar" >&5 -$as_echo_n "checking for /usr/share/java/lucene-core-2.3.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core-2.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-core-2.3.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_lucene_core_2_3_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene-core-2.3.jar"; then ac_cv_file__usr_share_java_lucene_core_2_3_jar=yes else ac_cv_file__usr_share_java_lucene_core_2_3_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_lucene_core_2_3_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_core_2_3_jar" >&6 +if test $ac_cv_file__usr_share_java_lucene_core_2_3_jar = yes; then LUCENE_CORE_JAR=/usr/share/java/lucene-core-2.3.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-core.jar" >&5 -$as_echo_n "checking for /usr/share/java/lucene-core.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_lucene_core_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/lucene-core.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-core.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_lucene_core_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene-core.jar"; then ac_cv_file__usr_share_java_lucene_core_jar=yes else ac_cv_file__usr_share_java_lucene_core_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_core_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_lucene_core_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_lucene_core_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_core_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_core_jar" >&6 +if test $ac_cv_file__usr_share_java_lucene_core_jar = yes; then LUCENE_CORE_JAR=/usr/share/java/lucene-core.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene.jar" >&5 -$as_echo_n "checking for /usr/share/java/lucene.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/lucene.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_lucene_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene.jar"; then ac_cv_file__usr_share_java_lucene_jar=yes else ac_cv_file__usr_share_java_lucene_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_lucene_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_lucene_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_jar" >&6 +if test $ac_cv_file__usr_share_java_lucene_jar = yes; then LUCENE_CORE_JAR=/usr/share/java/lucene.jar else - as_fn_error "lucene-core.jar replacement not found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: lucene-core.jar replacement not found" >&5 +echo "$as_me: error: lucene-core.jar replacement not found" >&2;} + { (exit 1); exit 1; }; } fi @@ -13423,71 +15205,79 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LUCENE_CORE_JAR" >&5 -$as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 +echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$LUCENE_CORE_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "lucene-core.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: lucene-core.jar not found." >&5 +echo "$as_me: error: lucene-core.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z $LUCENE_ANALYZERS_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5 -$as_echo_n "checking for /usr/share/java/lucene-analyzers-2.3.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/lucene-analyzers-2.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-analyzers-2.3.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene-analyzers-2.3.jar"; then ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=yes else ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar" >&6 +if test $ac_cv_file__usr_share_java_lucene_analyzers_2_3_jar = yes; then LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-analyzers-2.3.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5 -$as_echo_n "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/lucene-contrib/lucene-analyzers.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/lucene-contrib/lucene-analyzers.jar"; then ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=yes else ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar" >&6 +if test $ac_cv_file__usr_share_java_lucene_contrib_lucene_analyzers_jar = yes; then LUCENE_ANALYZERS_JAR=/usr/share/java/lucene-contrib/lucene-analyzers.jar else - as_fn_error "lucene-analyzers.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: lucene-analyzers.jar replacement not found." >&5 +echo "$as_me: error: lucene-analyzers.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -13496,33 +15286,35 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LUCENE_CORE_JAR" >&5 -$as_echo_n "checking for $LUCENE_CORE_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$LUCENE_CORE_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $LUCENE_CORE_JAR" >&5 +echo $ECHO_N "checking for $LUCENE_CORE_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$LUCENE_CORE_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "lucene-analyzers.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: lucene-analyzers.jar not found." >&5 +echo "$as_me: error: lucene-analyzers.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether lucene is version 2.x" >&5 -$as_echo_n "checking whether lucene is version 2.x... " >&6; } + echo "$as_me:$LINENO: checking whether lucene is version 2.x" >&5 +echo $ECHO_N "checking whether lucene is version 2.x... $ECHO_C" >&6 export LUCENE_CORE_JAR if $PERL -e 'use Archive::Zip; my $file = "$ENV{'LUCENE_CORE_JAR'}"; @@ -13533,15 +15325,17 @@ $as_echo_n "checking whether lucene is version 2.x... " >&6; } } else { exit 1; }'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - as_fn_error "no, you need lucene 2" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no, you need lucene 2" >&5 +echo "$as_me: error: no, you need lucene 2" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_LUCENE=NO BUILD_TYPE="$BUILD_TYPE LUCENE" fi @@ -13549,42 +15343,44 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the MySQL Connector extension" >&5 -$as_echo_n "checking whether to build the MySQL Connector extension... " >&6; } +echo "$as_me:$LINENO: checking whether to build the MySQL Connector extension" >&5 +echo $ECHO_N "checking whether to build the MySQL Connector extension... $ECHO_C" >&6 if test -n "$enable_mysql_connector" -a "$enable_mysql_connector" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_MYSQLC=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysqlc module" >&5 -$as_echo_n "checking for mysqlc module... " >&6; } + echo "$as_me:$LINENO: checking for mysqlc module" >&5 +echo $ECHO_N "checking for mysqlc module... $ECHO_C" >&6 if test -d mysqlc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else - as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { (exit 1); exit 1; }; } fi BUILD_TYPE="$BUILD_TYPE MYSQLC" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_MYSQLC=NO fi if test "$ENABLE_MYSQLC" = "YES"; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysql pre-requisites" >&5 -$as_echo_n "checking for mysql pre-requisites... " >&6; } +echo "$as_me:$LINENO: checking for mysql pre-requisites" >&5 +echo $ECHO_N "checking for mysql pre-requisites... $ECHO_C" >&6 if test -n "$with_system_mysql" -o -n "$with_system_libs" && \ test "$with_system_mysql" != "no" && test "$with_system_libs" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external MySQL" >&5 -$as_echo "external MySQL" >&6; } + echo "$as_me:$LINENO: result: external MySQL" >&5 +echo "${ECHO_T}external MySQL" >&6 SYSTEM_MYSQL=YES # Extract the first word of "mysql_config", so it can be a program name with args. set dummy mysql_config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MYSQLCONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MYSQLCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $MYSQLCONFIG in [\\/]* | ?:[\\/]*) @@ -13596,68 +15392,73 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MYSQLCONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi MYSQLCONFIG=$ac_cv_path_MYSQLCONFIG + if test -n "$MYSQLCONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYSQLCONFIG" >&5 -$as_echo "$MYSQLCONFIG" >&6; } + echo "$as_me:$LINENO: result: $MYSQLCONFIG" >&5 +echo "${ECHO_T}$MYSQLCONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MySQL version" >&5 -$as_echo_n "checking MySQL version... " >&6; } + echo "$as_me:$LINENO: checking MySQL version" >&5 +echo $ECHO_N "checking MySQL version... $ECHO_C" >&6 MYSQL_VERSION=`$MYSQLCONFIG --version` MYSQL_MAJOR=`$MYSQLCONFIG --version | cut -d"." -f1` if test "$MYSQL_MAJOR" -ge "5"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else - as_fn_error "too old, use 5.0.x or 5.1.x" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: too old, use 5.0.x or 5.1.x" >&5 +echo "$as_me: error: too old, use 5.0.x or 5.1.x" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for MySQL Client library" >&5 -$as_echo_n "checking for MySQL Client library... " >&6; } + echo "$as_me:$LINENO: checking for MySQL Client library" >&5 +echo $ECHO_N "checking for MySQL Client library... $ECHO_C" >&6 MYSQL_INC=`$MYSQLCONFIG --include` MYSQL_LIB=`$MYSQLCONFIG --libs` MYSQL_DEFINES=`$MYSQLCONFIG --cflags | sed -e s,$MYSQL_INC,,` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: includes $MYSQL_INC, libraries $MYSQL_LIB" >&5 -$as_echo "includes $MYSQL_INC, libraries $MYSQL_LIB" >&6; } + echo "$as_me:$LINENO: result: includes $MYSQL_INC, libraries $MYSQL_LIB" >&5 +echo "${ECHO_T}includes $MYSQL_INC, libraries $MYSQL_LIB" >&6 else SYSTEM_MYSQL=NO if test -n "$with_libmysql_path"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external Connector/C (libmysql)" >&5 -$as_echo "external Connector/C (libmysql)" >&6; } + echo "$as_me:$LINENO: result: external Connector/C (libmysql)" >&5 +echo "${ECHO_T}external Connector/C (libmysql)" >&6 LIBMYSQL=libmysql.so if test "$_os" = "Darwin"; then LIBMYSQL=libmysql.dylib elif test "$_os" = "WINNT"; then LIBMYSQL=libmysql.dll fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBMYSQL" >&5 -$as_echo_n "checking for $LIBMYSQL... " >&6; } + echo "$as_me:$LINENO: checking for $LIBMYSQL" >&5 +echo $ECHO_N "checking for $LIBMYSQL... $ECHO_C" >&6 if test -e "$with_libmysql_path/lib/$LIBMYSQL"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found." >&5 -$as_echo "found." >&6; } + echo "$as_me:$LINENO: result: found." >&5 +echo "${ECHO_T}found." >&6 LIBMYSQL_PATH=$with_libmysql_path else - as_fn_error "not found. Please specify proper path in --with-libmysql-path." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not found. Please specify proper path in --with-libmysql-path." >&5 +echo "$as_me: error: not found. Please specify proper path in --with-libmysql-path." >&2;} + { (exit 1); exit 1; }; } fi else - as_fn_error "not given. Please specify either --with-system-mysql or --with-libmysql-path" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not given. Please specify either --with-system-mysql or --with-libmysql-path" >&5 +echo "$as_me: error: not given. Please specify either --with-system-mysql or --with-libmysql-path" >&2;} + { (exit 1); exit 1; }; } fi fi @@ -13666,7 +15467,7 @@ fi -ac_ext=cpp +ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -13674,58 +15475,225 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu # FIXME! # who thought this too-generic cppconn dir was a good idea? -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking MySQL Connector/C++" >&5 -$as_echo_n "checking MySQL Connector/C++... " >&6; } +echo "$as_me:$LINENO: checking MySQL Connector/C++" >&5 +echo $ECHO_N "checking MySQL Connector/C++... $ECHO_C" >&6 if test -n "$with_system_mysql_cppconn" -o -n "$with_system_libs" && \ test "$with_system_mysql_cppconn" != "no" && test "$with_system_libs" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_MYSQL_CPPCONN=YES - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_fn_cxx_check_header_mongrel "$LINENO" "mysql_driver.h" "ac_cv_header_mysql_driver_h" "$ac_includes_default" -if test "x$ac_cv_header_mysql_driver_h" = x""yes; then : + if test "${ac_cv_header_mysql_driver_h+set}" = set; then + echo "$as_me:$LINENO: checking for mysql_driver.h" >&5 +echo $ECHO_N "checking for mysql_driver.h... $ECHO_C" >&6 +if test "${ac_cv_header_mysql_driver_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_mysql_driver_h" >&5 +echo "${ECHO_T}$ac_cv_header_mysql_driver_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking mysql_driver.h usability" >&5 +echo $ECHO_N "checking mysql_driver.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking mysql_driver.h presence" >&5 +echo $ECHO_N "checking mysql_driver.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: mysql_driver.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: mysql_driver.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: mysql_driver.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: mysql_driver.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: mysql_driver.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: mysql_driver.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: mysql_driver.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: mysql_driver.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: mysql_driver.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for mysql_driver.h" >&5 +echo $ECHO_N "checking for mysql_driver.h... $ECHO_C" >&6 +if test "${ac_cv_header_mysql_driver_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_mysql_driver_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_mysql_driver_h" >&5 +echo "${ECHO_T}$ac_cv_header_mysql_driver_h" >&6 +fi +if test $ac_cv_header_mysql_driver_h = yes; then + : else - as_fn_error "mysql_driver.h not found. install MySQL C++ Connectivity" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: mysql_driver.h not found. install MySQL C++ Connectivity" >&5 +echo "$as_me: error: mysql_driver.h not found. install MySQL C++ Connectivity" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmysqlcppconn" >&5 -$as_echo_n "checking for main in -lmysqlcppconn... " >&6; } -if test "${ac_cv_lib_mysqlcppconn_main+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for main in -lmysqlcppconn" >&5 +echo $ECHO_N "checking for main in -lmysqlcppconn... $ECHO_C" >&6 +if test "${ac_cv_lib_mysqlcppconn_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmysqlcppconn $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int main () { -return main (); +main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_mysqlcppconn_main=yes else - ac_cv_lib_mysqlcppconn_main=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_mysqlcppconn_main=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mysqlcppconn_main" >&5 -$as_echo "$ac_cv_lib_mysqlcppconn_main" >&6; } -if test "x$ac_cv_lib_mysqlcppconn_main" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_mysqlcppconn_main" >&5 +echo "${ECHO_T}$ac_cv_lib_mysqlcppconn_main" >&6 +if test $ac_cv_lib_mysqlcppconn_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBMYSQLCPPCONN 1 _ACEOF @@ -13733,18 +15701,25 @@ _ACEOF LIBS="-lmysqlcppconn $LIBS" else - as_fn_error "MySQL C++ Connectivity lib not found or functional" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: MySQL C++ Connectivity lib not found or functional" >&5 +echo "$as_me: error: MySQL C++ Connectivity lib not found or functional" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking version" >&5 -$as_echo_n "checking version... " >&6; } - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } + echo "$as_me:$LINENO: checking version" >&5 +echo $ECHO_N "checking version... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -13761,17 +15736,32 @@ int main(int argc, char **argv) { } _ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else - as_fn_error "not suitable, we need >= 1.0.6" "$LINENO" 5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: not suitable, we need >= 1.0.6" >&5 +echo "$as_me: error: not suitable, we need >= 1.0.6" >&2;} + { (exit 1); exit 1; }; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -13779,15 +15769,17 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mysqlcppconn module" >&5 -$as_echo_n "checking for mysqlcppconn module... " >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 + echo "$as_me:$LINENO: checking for mysqlcppconn module" >&5 +echo $ECHO_N "checking for mysqlcppconn module... $ECHO_C" >&6 if test -d mysqlcppconn; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else - as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { (exit 1); exit 1; }; } fi BUILD_TYPE="$BUILD_TYPE MYSQLCPPCONN" SYSTEM_MYSQL_CPPCONN=NO @@ -13801,42 +15793,44 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which hsqldb to use" >&5 -$as_echo_n "checking which hsqldb to use... " >&6; } +echo "$as_me:$LINENO: checking which hsqldb to use" >&5 +echo $ECHO_N "checking which hsqldb to use... $ECHO_C" >&6 if test -n "$with_system_hsqldb" -o -n "$with_system_libs" && \ test "$with_system_hsqldb" != "no" && test "$with_system_jars" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_HSQLDB=YES if test -z $HSQLDB_JAR; then HSQLDB_JAR=/usr/share/java/hsqldb.jar fi - as_ac_File=`$as_echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $HSQLDB_JAR" >&5 -$as_echo_n "checking for $HSQLDB_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$HSQLDB_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $HSQLDB_JAR" >&5 +echo $ECHO_N "checking for $HSQLDB_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$HSQLDB_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "hsqldb.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: hsqldb.jar not found." >&5 +echo "$as_me: error: hsqldb.jar not found." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether hsqldb is 1.8.0.x" >&5 -$as_echo_n "checking whether hsqldb is 1.8.0.x... " >&6; } + echo "$as_me:$LINENO: checking whether hsqldb is 1.8.0.x" >&5 +echo $ECHO_N "checking whether hsqldb is 1.8.0.x... $ECHO_C" >&6 export HSQLDB_JAR if $PERL -e 'use Archive::Zip; my $file = "$ENV{'HSQLDB_JAR'}"; @@ -13859,57 +15853,61 @@ $as_echo_n "checking whether hsqldb is 1.8.0.x... " >&6; } } else { exit 1; }'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - as_fn_error "no, you need hsqldb >= 1.8.0.9 but < 1.8.1" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no, you need hsqldb >= 1.8.0.9 but < 1.8.1" >&5 +echo "$as_me: error: no, you need hsqldb >= 1.8.0.9 but < 1.8.1" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_HSQLDB=NO BUILD_TYPE="$BUILD_TYPE HSQLDB" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which beanshell to use" >&5 -$as_echo_n "checking which beanshell to use... " >&6; } +echo "$as_me:$LINENO: checking which beanshell to use" >&5 +echo $ECHO_N "checking which beanshell to use... $ECHO_C" >&6 if test -n "$with_system_beanshell" -o -n "$with_system_libs" && \ test "$with_system_beanshell" != "no" && test "$with_system_jars" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_BSH=YES if test -z $BSH_JAR; then BSH_JAR=/usr/share/java/bsh.jar fi - as_ac_File=`$as_echo "ac_cv_file_$BSH_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $BSH_JAR" >&5 -$as_echo_n "checking for $BSH_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$BSH_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $BSH_JAR" >&5 +echo $ECHO_N "checking for $BSH_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$BSH_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "bsh.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: bsh.jar not found." >&5 +echo "$as_me: error: bsh.jar not found." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_BSH=NO BUILD_TYPE="$BUILD_TYPE BSH" fi @@ -13917,70 +15915,78 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which saxon to use" >&5 -$as_echo_n "checking which saxon to use... " >&6; } +echo "$as_me:$LINENO: checking which saxon to use" >&5 +echo $ECHO_N "checking which saxon to use... $ECHO_C" >&6 if test -n "$with_system_saxon" -o -n "$with_system_libs" && \ test "$with_system_saxon" != "no" && test "$with_system_jars" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_SAXON=YES if test -z $SAXON_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/saxon9.jar" >&5 -$as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/saxon9.jar"; then ac_cv_file__usr_share_java_saxon9_jar=yes else ac_cv_file__usr_share_java_saxon9_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_saxon9_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6 +if test $ac_cv_file__usr_share_java_saxon9_jar = yes; then SAXON_JAR=/usr/share/java/saxon9.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/saxon.jar" >&5 -$as_echo_n "checking for /usr/share/java/saxon.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_saxon_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/saxon.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/saxon.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_saxon_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/saxon.jar"; then ac_cv_file__usr_share_java_saxon_jar=yes else ac_cv_file__usr_share_java_saxon_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_saxon_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_saxon_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_saxon_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon_jar" >&6 +if test $ac_cv_file__usr_share_java_saxon_jar = yes; then SAXON_JAR=/usr/share/java/saxon.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/saxon9.jar" >&5 -$as_echo_n "checking for /usr/share/java/saxon9.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/saxon9.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/saxon9.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_saxon9_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/saxon9.jar"; then ac_cv_file__usr_share_java_saxon9_jar=yes else ac_cv_file__usr_share_java_saxon9_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_saxon9_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_saxon9_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_saxon9_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_saxon9_jar" >&6 +if test $ac_cv_file__usr_share_java_saxon9_jar = yes; then SAXON_JAR=/usr/share/java/saxon9.jar else - as_fn_error "saxon.jar replacement not found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: saxon.jar replacement not found" >&5 +echo "$as_me: error: saxon.jar replacement not found" >&2;} + { (exit 1); exit 1; }; } fi @@ -13993,62 +15999,66 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SAXON_JAR" >&5 -$as_echo_n "checking for $SAXON_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$SAXON_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $SAXON_JAR" >&5 +echo $ECHO_N "checking for $SAXON_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$SAXON_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "saxon.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: saxon.jar replacement not found." >&5 +echo "$as_me: error: saxon.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -n "$SERIALIZER_JAR"; then - as_ac_File=`$as_echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SERIALIZER_JAR" >&5 -$as_echo_n "checking for $SERIALIZER_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$SERIALIZER_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $SERIALIZER_JAR" >&5 +echo $ECHO_N "checking for $SERIALIZER_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$SERIALIZER_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "serializer.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: serializer.jar not found." >&5 +echo "$as_me: error: serializer.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if saxon works" >&5 -$as_echo_n "checking if saxon works... " >&6; } + echo "$as_me:$LINENO: checking if saxon works" >&5 +echo $ECHO_N "checking if saxon works... $ECHO_C" >&6 cat > saxontest.java <<_ACEOF import javax.xml.transform.TransformerFactory; import javax.xml.transform.Transformer; @@ -14089,36 +16099,40 @@ _ACEOF _ACEOF javac_cmd="$JAVACOMPILER -cp $SAXON_JAR saxontest.java 1>&2" - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$javac_cmd\""; } >&5 + { (eval echo "$as_me:$LINENO: \"$javac_cmd\"") >&5 (eval $javac_cmd) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } if test $? = 0 && test -f ./saxontest.class ; then java_cmd="$JAVAINTERPRETER -cp $SAXON_JAR:. saxontest saxontest.xsl 1>&2" - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$java_cmd\""; } >&5 + { (eval echo "$as_me:$LINENO: \"$java_cmd\"") >&5 (eval $java_cmd) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } if test $? = 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else cat saxontest.java >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error "Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb" "$LINENO" 5 + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb" >&5 +echo "$as_me: error: Non-functional saxon jar, e.g. crippled saxon-he instead of saxonb" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 cat saxontest.java >&5 - as_fn_error "saxontest could not be compiled, non-functional saxon jar" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: saxontest could not be compiled, non-functional saxon jar" >&5 +echo "$as_me: error: saxontest could not be compiled, non-functional saxon jar" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_SAXON=NO NEED_SAXON=TRUE fi @@ -14132,20 +16146,20 @@ fi if test "$_os" = "Darwin" && test "$with_system_curl" != "no"; then with_system_curl=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which curl to use" >&5 -$as_echo_n "checking which curl to use... " >&6; } +echo "$as_me:$LINENO: checking which curl to use" >&5 +echo $ECHO_N "checking which curl to use... $ECHO_C" >&6 if test -n "$with_system_curl" -o -n "$with_system_libs" && \ test "$with_system_curl" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_CURL=YES # Extract the first word of "curl-config", so it can be a program name with args. set dummy curl-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CURLCONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_CURLCONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $CURLCONFIG in [\\/]* | ?:[\\/]*) @@ -14157,49 +16171,52 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CURLCONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi CURLCONFIG=$ac_cv_path_CURLCONFIG + if test -n "$CURLCONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURLCONFIG" >&5 -$as_echo "$CURLCONFIG" >&6; } + echo "$as_me:$LINENO: result: $CURLCONFIG" >&5 +echo "${ECHO_T}$CURLCONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$CURLCONFIG"; then - as_fn_error "install curl to run this script" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: install curl to run this script" >&5 +echo "$as_me: error: install curl to run this script" >&2;} + { (exit 1); exit 1; }; } fi # check curl version - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether curl is >= 7.13.1" >&5 -$as_echo_n "checking whether curl is >= 7.13.1... " >&6; } + echo "$as_me:$LINENO: checking whether curl is >= 7.13.1" >&5 +echo $ECHO_N "checking whether curl is >= 7.13.1... $ECHO_C" >&6 if test "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $1 }'`" -gt "7" -a \ "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $2 }'`" -gt "13" -a \ "`$CURLCONFIG --version | $AWK -F' ' '{print $2}' | $AWK -F. '{ print $3 }'`" -gt "1"; then - as_fn_error "no, you need at least curl 7.13,1" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no, you need at least curl 7.13,1" >&5 +echo "$as_me: error: no, you need at least curl 7.13,1" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi CURL_LIBS=`$CURLCONFIG --libs` CURL_CFLAGS=`$CURLCONFIG --cflags` else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_CURL=NO BUILD_TYPE="$BUILD_TYPE CURL" fi @@ -14207,84 +16224,640 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mdds to use" >&5 -$as_echo_n "checking which mdds to use... " >&6; } +echo "$as_me:$LINENO: checking which mdds to use" >&5 +echo $ECHO_N "checking which mdds to use... $ECHO_C" >&6 if test -n "$with_system_mdds" -o -n "$with_system_headers" && \ test "$with_system_mdds" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_MDDS=YES - ac_ext=cpp + ac_ext=cc +ac_cpp='$CXXCPP $CPPFLAGS' +ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + + if test "${ac_cv_header_mdds_flat_segment_tree_hpp+set}" = set; then + echo "$as_me:$LINENO: checking for mdds/flat_segment_tree.hpp" >&5 +echo $ECHO_N "checking for mdds/flat_segment_tree.hpp... $ECHO_C" >&6 +if test "${ac_cv_header_mdds_flat_segment_tree_hpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_mdds_flat_segment_tree_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_mdds_flat_segment_tree_hpp" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking mdds/flat_segment_tree.hpp usability" >&5 +echo $ECHO_N "checking mdds/flat_segment_tree.hpp usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking mdds/flat_segment_tree.hpp presence" >&5 +echo $ECHO_N "checking mdds/flat_segment_tree.hpp presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: present but cannot be compiled" >&5 +echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: mdds/flat_segment_tree.hpp: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: mdds/flat_segment_tree.hpp: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for mdds/flat_segment_tree.hpp" >&5 +echo $ECHO_N "checking for mdds/flat_segment_tree.hpp... $ECHO_C" >&6 +if test "${ac_cv_header_mdds_flat_segment_tree_hpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_mdds_flat_segment_tree_hpp=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_mdds_flat_segment_tree_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_mdds_flat_segment_tree_hpp" >&6 + +fi +if test $ac_cv_header_mdds_flat_segment_tree_hpp = yes; then + : +else + { { echo "$as_me:$LINENO: error: mdds/flat_segment_tree.hpp not found. install mdds" >&5 +echo "$as_me: error: mdds/flat_segment_tree.hpp not found. install mdds" >&2;} + { (exit 1); exit 1; }; } +fi + + + ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + +else + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 + BUILD_TYPE="$BUILD_TYPE MDDS" + SYSTEM_MDDS=NO +fi + + +echo "$as_me:$LINENO: checking which boost to use" >&5 +echo $ECHO_N "checking which boost to use... $ECHO_C" >&6 +if test -n "$with_system_boost" -o -n "$with_system_headers" && \ + test "$with_system_boost" != "no"; then + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 + SYSTEM_BOOST=YES + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_fn_cxx_check_header_mongrel "$LINENO" "mdds/flat_segment_tree.hpp" "ac_cv_header_mdds_flat_segment_tree_hpp" "$ac_includes_default" -if test "x$ac_cv_header_mdds_flat_segment_tree_hpp" = x""yes; then : + if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then + echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 +echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6 +if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking boost/shared_ptr.hpp usability" >&5 +echo $ECHO_N "checking boost/shared_ptr.hpp usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking boost/shared_ptr.hpp presence" >&5 +echo $ECHO_N "checking boost/shared_ptr.hpp presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: boost/shared_ptr.hpp: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for boost/shared_ptr.hpp" >&5 +echo $ECHO_N "checking for boost/shared_ptr.hpp... $ECHO_C" >&6 +if test "${ac_cv_header_boost_shared_ptr_hpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_boost_shared_ptr_hpp=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_boost_shared_ptr_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_shared_ptr_hpp" >&6 + +fi +if test $ac_cv_header_boost_shared_ptr_hpp = yes; then + : +else + { { echo "$as_me:$LINENO: error: boost/shared_ptr.hpp not found. install boost" >&5 +echo "$as_me: error: boost/shared_ptr.hpp not found. install boost" >&2;} + { (exit 1); exit 1; }; } +fi + + + if test "${ac_cv_header_boost_spirit_include_classic_core_hpp+set}" = set; then + echo "$as_me:$LINENO: checking for boost/spirit/include/classic_core.hpp" >&5 +echo $ECHO_N "checking for boost/spirit/include/classic_core.hpp... $ECHO_C" >&6 +if test "${ac_cv_header_boost_spirit_include_classic_core_hpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_include_classic_core_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_spirit_include_classic_core_hpp" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking boost/spirit/include/classic_core.hpp usability" >&5 +echo $ECHO_N "checking boost/spirit/include/classic_core.hpp usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 +# Is the header present? +echo "$as_me:$LINENO: checking boost/spirit/include/classic_core.hpp presence" >&5 +echo $ECHO_N "checking boost/spirit/include/classic_core.hpp presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi else - as_fn_error "mdds/flat_segment_tree.hpp not found. install mdds" "$LINENO" 5 + ac_cpp_err=yes fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: present but cannot be compiled" >&5 +echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/spirit/include/classic_core.hpp: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: boost/spirit/include/classic_core.hpp: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for boost/spirit/include/classic_core.hpp" >&5 +echo $ECHO_N "checking for boost/spirit/include/classic_core.hpp... $ECHO_C" >&6 +if test "${ac_cv_header_boost_spirit_include_classic_core_hpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_boost_spirit_include_classic_core_hpp=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_boost_spirit_include_classic_core_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_spirit_include_classic_core_hpp" >&6 +fi +if test $ac_cv_header_boost_spirit_include_classic_core_hpp = yes; then + : else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } - BUILD_TYPE="$BUILD_TYPE MDDS" - SYSTEM_MDDS=NO + { { echo "$as_me:$LINENO: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.36" >&5 +echo "$as_me: error: boost/spirit/include/classic_core.hpp not found. install boost >= 1.36" >&2;} + { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which boost to use" >&5 -$as_echo_n "checking which boost to use... " >&6; } -if test -n "$with_system_boost" -o -n "$with_system_headers" && \ - test "$with_system_boost" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } - SYSTEM_BOOST=YES - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu + if test "${ac_cv_header_boost_function_hpp+set}" = set; then + echo "$as_me:$LINENO: checking for boost/function.hpp" >&5 +echo $ECHO_N "checking for boost/function.hpp... $ECHO_C" >&6 +if test "${ac_cv_header_boost_function_hpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_boost_function_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_function_hpp" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking boost/function.hpp usability" >&5 +echo $ECHO_N "checking boost/function.hpp usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - ac_fn_cxx_check_header_mongrel "$LINENO" "boost/shared_ptr.hpp" "ac_cv_header_boost_shared_ptr_hpp" "$ac_includes_default" -if test "x$ac_cv_header_boost_shared_ptr_hpp" = x""yes; then : +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 +# Is the header present? +echo "$as_me:$LINENO: checking boost/function.hpp presence" >&5 +echo $ECHO_N "checking boost/function.hpp presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi else - as_fn_error "boost/shared_ptr.hpp not found. install boost" "$LINENO" 5 + ac_cpp_err=yes fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 - ac_fn_cxx_check_header_mongrel "$LINENO" "boost/spirit/include/classic_core.hpp" "ac_cv_header_boost_spirit_include_classic_core_hpp" "$ac_includes_default" -if test "x$ac_cv_header_boost_spirit_include_classic_core_hpp" = x""yes; then : - +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: boost/function.hpp: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: boost/function.hpp: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/function.hpp: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: boost/function.hpp: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: boost/function.hpp: present but cannot be compiled" >&5 +echo "$as_me: WARNING: boost/function.hpp: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/function.hpp: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: boost/function.hpp: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/function.hpp: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: boost/function.hpp: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/function.hpp: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: boost/function.hpp: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/function.hpp: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: boost/function.hpp: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: boost/function.hpp: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: boost/function.hpp: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for boost/function.hpp" >&5 +echo $ECHO_N "checking for boost/function.hpp... $ECHO_C" >&6 +if test "${ac_cv_header_boost_function_hpp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else - as_fn_error "boost/spirit/include/classic_core.hpp not found. install boost >= 1.36" "$LINENO" 5 + ac_cv_header_boost_function_hpp=$ac_header_preproc fi +echo "$as_me:$LINENO: result: $ac_cv_header_boost_function_hpp" >&5 +echo "${ECHO_T}$ac_cv_header_boost_function_hpp" >&6 - - ac_fn_cxx_check_header_mongrel "$LINENO" "boost/function.hpp" "ac_cv_header_boost_function_hpp" "$ac_includes_default" -if test "x$ac_cv_header_boost_function_hpp" = x""yes; then : - +fi +if test $ac_cv_header_boost_function_hpp = yes; then + : else - as_fn_error "boost/function.hpp not found. install boost" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: boost/function.hpp not found. install boost" >&5 +echo "$as_me: error: boost/function.hpp not found. install boost" >&2;} + { (exit 1); exit 1; }; } fi save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS -fno-exceptions" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether boost/function.hpp compiles with -fno-exceptions" >&5 -$as_echo_n "checking whether boost/function.hpp compiles with -fno-exceptions... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + echo "$as_me:$LINENO: checking whether boost/function.hpp compiles with -fno-exceptions" >&5 +echo $ECHO_N "checking whether boost/function.hpp compiles with -fno-exceptions... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -14296,18 +16869,44 @@ main () return 0; } _ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_cxx_boost_no_exceptons_broken=no else - ac_cv_cxx_boost_no_exceptons_broken=yes + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_cxx_boost_no_exceptons_broken=yes fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext if test "$ac_cv_cxx_boost_no_exceptons_broken" = "yes"; then - as_fn_error "no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" >&5 +echo "$as_me: error: no, see https://bugzilla.redhat.com/show_bug.cgi?id=477131" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi CXXFLAGS=$save_CXXFLAGS ac_ext=c @@ -14317,31 +16916,169 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 BUILD_TYPE="$BUILD_TYPE BOOST" SYSTEM_BOOST=NO fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which vigra to use" >&5 -$as_echo_n "checking which vigra to use... " >&6; } +echo "$as_me:$LINENO: checking which vigra to use" >&5 +echo $ECHO_N "checking which vigra to use... $ECHO_C" >&6 if test -n "$with_system_vigra" -o -n "$with_system_headers" && \ test "$with_system_vigra" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_VIGRA=YES - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - ac_fn_cxx_check_header_mongrel "$LINENO" "vigra/copyimage.hxx" "ac_cv_header_vigra_copyimage_hxx" "$ac_includes_default" -if test "x$ac_cv_header_vigra_copyimage_hxx" = x""yes; then : + if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then + echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 +echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6 +if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking vigra/copyimage.hxx usability" >&5 +echo $ECHO_N "checking vigra/copyimage.hxx usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking vigra/copyimage.hxx presence" >&5 +echo $ECHO_N "checking vigra/copyimage.hxx presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: vigra/copyimage.hxx: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for vigra/copyimage.hxx" >&5 +echo $ECHO_N "checking for vigra/copyimage.hxx... $ECHO_C" >&6 +if test "${ac_cv_header_vigra_copyimage_hxx+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_vigra_copyimage_hxx=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_vigra_copyimage_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_vigra_copyimage_hxx" >&6 +fi +if test $ac_cv_header_vigra_copyimage_hxx = yes; then + : else - as_fn_error "vigra/copyimage.hxx not found. install vigra" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: vigra/copyimage.hxx not found. install vigra" >&5 +echo "$as_me: error: vigra/copyimage.hxx not found. install vigra" >&2;} + { (exit 1); exit 1; }; } fi @@ -14352,150 +17089,457 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 BUILD_TYPE="$BUILD_TYPE VIGRA" SYSTEM_VIGRA=NO fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which odbc headers to use" >&5 -$as_echo_n "checking which odbc headers to use... " >&6; } +echo "$as_me:$LINENO: checking which odbc headers to use" >&5 +echo $ECHO_N "checking which odbc headers to use... $ECHO_C" >&6 if test -n "$with_system_odbc_headers" -o -n "$with_system_headers" && \ test "$with_system_odbc_headers" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_ODBC_HEADERS=YES - ac_fn_c_check_header_mongrel "$LINENO" "sqlext.h" "ac_cv_header_sqlext_h" "$ac_includes_default" -if test "x$ac_cv_header_sqlext_h" = x""yes; then : + if test "${ac_cv_header_sqlext_h+set}" = set; then + echo "$as_me:$LINENO: checking for sqlext.h" >&5 +echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6 +if test "${ac_cv_header_sqlext_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 +echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking sqlext.h usability" >&5 +echo $ECHO_N "checking sqlext.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking sqlext.h presence" >&5 +echo $ECHO_N "checking sqlext.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sqlext.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sqlext.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sqlext.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sqlext.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sqlext.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sqlext.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sqlext.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sqlext.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sqlext.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sqlext.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for sqlext.h" >&5 +echo $ECHO_N "checking for sqlext.h... $ECHO_C" >&6 +if test "${ac_cv_header_sqlext_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_sqlext_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_sqlext_h" >&5 +echo "${ECHO_T}$ac_cv_header_sqlext_h" >&6 +fi +if test $ac_cv_header_sqlext_h = yes; then + : else - as_fn_error "odbc not found. install odbc" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: odbc not found. install odbc" >&5 +echo "$as_me: error: odbc not found. install odbc" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_ODBC_HEADERS=NO BUILD_TYPE="$BUILD_TYPE UNIXODBC" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5 -$as_echo_n "checking whether to enable build of Mozilla/Mozilla NSS-using components... " >&6; } +echo "$as_me:$LINENO: checking whether to enable build of Mozilla/Mozilla NSS-using components" >&5 +echo $ECHO_N "checking whether to enable build of Mozilla/Mozilla NSS-using components... $ECHO_C" >&6 if test "$enable_mozilla" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITH_MOZILLA=NO ENABLE_NSS_MODULE=NO else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 WITH_MOZILLA=YES fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Mozilla addressbook connectivity" >&5 -$as_echo_n "checking whether to build Mozilla addressbook connectivity... " >&6; } +echo "$as_me:$LINENO: checking whether to build Mozilla addressbook connectivity" >&5 +echo $ECHO_N "checking whether to build Mozilla addressbook connectivity... $ECHO_C" >&6 if test "$enable_mozilla" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 elif test "$with_system_mozilla" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, not possible with system-mozilla" >&5 -$as_echo "no, not possible with system-mozilla" >&6; } + echo "$as_me:$LINENO: result: no, not possible with system-mozilla" >&5 +echo "${ECHO_T}no, not possible with system-mozilla" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build XML Security support" >&5 -$as_echo_n "checking whether to build XML Security support... " >&6; } +echo "$as_me:$LINENO: checking whether to build XML Security support" >&5 +echo $ECHO_N "checking whether to build XML Security support... $ECHO_C" >&6 if test "$enable_mozilla" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, since Mozilla (NSS) disabled but needed" >&5 -$as_echo "no, since Mozilla (NSS) disabled but needed" >&6; } + echo "$as_me:$LINENO: result: no, since Mozilla (NSS) disabled but needed" >&5 +echo "${ECHO_T}no, since Mozilla (NSS) disabled but needed" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build LDAP configuration backend" >&5 -$as_echo_n "checking whether to build LDAP configuration backend... " >&6; } +echo "$as_me:$LINENO: checking whether to build LDAP configuration backend" >&5 +echo $ECHO_N "checking whether to build LDAP configuration backend... $ECHO_C" >&6 if test -z "$enable_ldap" || test "$enable_ldap" = "yes"; then if test "$enable_mozilla" = "yes" || test "$with_openldap" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 WITH_LDAP=YES else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no. Either Mozilla or OpenLDAP needed" >&5 -$as_echo "no. Either Mozilla or OpenLDAP needed" >&6; } + echo "$as_me:$LINENO: result: no. Either Mozilla or OpenLDAP needed" >&5 +echo "${ECHO_T}no. Either Mozilla or OpenLDAP needed" >&6 WITH_LDAP=NO fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITH_LDAP=NO fi if test "$WITH_LDAP" = "YES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which LDAP SDK to use" >&5 -$as_echo_n "checking which LDAP SDK to use... " >&6; } + echo "$as_me:$LINENO: checking which LDAP SDK to use" >&5 +echo $ECHO_N "checking which LDAP SDK to use... $ECHO_C" >&6 if test -n "$with_openldap" && test "$with_openldap" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OpenLDAP" >&5 -$as_echo "OpenLDAP" >&6; } + echo "$as_me:$LINENO: result: OpenLDAP" >&5 +echo "${ECHO_T}OpenLDAP" >&6 WITH_OPENLDAP=YES - for ac_header in ldap.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "ldap.h" "ac_cv_header_ldap_h" "$ac_includes_default" -if test "x$ac_cv_header_ldap_h" = x""yes; then : + +for ac_header in ldap.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking $ac_header usability" >&5 +echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking $ac_header presence" >&5 +echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include <$ac_header> +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5 +echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: $ac_header: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: $ac_header: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + eval "$as_ac_Header=\$ac_header_preproc" +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 + +fi +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_LDAP_H 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF else - as_fn_error "ldap.h not found. install openldap libs" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: ldap.h not found. install openldap libs" >&5 +echo "$as_me: error: ldap.h not found. install openldap libs" >&2;} + { (exit 1); exit 1; }; } fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_simple_bind_s in -lldap" >&5 -$as_echo_n "checking for ldap_simple_bind_s in -lldap... " >&6; } -if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for ldap_simple_bind_s in -lldap" >&5 +echo $ECHO_N "checking for ldap_simple_bind_s in -lldap... $ECHO_C" >&6 +if test "${ac_cv_lib_ldap_ldap_simple_bind_s+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lldap $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char ldap_simple_bind_s (); int main () { -return ldap_simple_bind_s (); +ldap_simple_bind_s (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_ldap_ldap_simple_bind_s=yes else - ac_cv_lib_ldap_ldap_simple_bind_s=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_ldap_ldap_simple_bind_s=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5 -$as_echo "$ac_cv_lib_ldap_ldap_simple_bind_s" >&6; } -if test "x$ac_cv_lib_ldap_ldap_simple_bind_s" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_simple_bind_s" >&5 +echo "${ECHO_T}$ac_cv_lib_ldap_ldap_simple_bind_s" >&6 +if test $ac_cv_lib_ldap_ldap_simple_bind_s = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLDAP 1 _ACEOF @@ -14503,48 +17547,79 @@ _ACEOF LIBS="-lldap $LIBS" else - as_fn_error "openldap lib not found or functional" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5 +echo "$as_me: error: openldap lib not found or functional" >&2;} + { (exit 1); exit 1; }; } fi # rumours say that OpenLDAP doesn't have that function. I looked and # it has it. Test for it to be sure - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_set_option in -lldap" >&5 -$as_echo_n "checking for ldap_set_option in -lldap... " >&6; } -if test "${ac_cv_lib_ldap_ldap_set_option+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for ldap_set_option in -lldap" >&5 +echo $ECHO_N "checking for ldap_set_option in -lldap... $ECHO_C" >&6 +if test "${ac_cv_lib_ldap_ldap_set_option+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lldap $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char ldap_set_option (); int main () { -return ldap_set_option (); +ldap_set_option (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_ldap_ldap_set_option=yes else - ac_cv_lib_ldap_ldap_set_option=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_ldap_ldap_set_option=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ldap_ldap_set_option" >&5 -$as_echo "$ac_cv_lib_ldap_ldap_set_option" >&6; } -if test "x$ac_cv_lib_ldap_ldap_set_option" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_ldap_ldap_set_option" >&5 +echo "${ECHO_T}$ac_cv_lib_ldap_ldap_set_option" >&6 +if test $ac_cv_lib_ldap_ldap_set_option = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLDAP 1 _ACEOF @@ -14552,12 +17627,14 @@ _ACEOF LIBS="-lldap $LIBS" else - as_fn_error "openldap lib not found or functional" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: openldap lib not found or functional" >&5 +echo "$as_me: error: openldap lib not found or functional" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Netscape/Mozilla" >&5 -$as_echo "Netscape/Mozilla" >&6; } + echo "$as_me:$LINENO: result: Netscape/Mozilla" >&5 +echo "${ECHO_T}Netscape/Mozilla" >&6 # TODO. Actually do a sanity check and check for # LDAP_OPT_SIZELIMIT and LDAP_X_OPT_CONNECT_TIMEOUT WITH_OPENLDAP=NO @@ -14566,16 +17643,16 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mozilla to use" >&5 -$as_echo_n "checking which mozilla to use... " >&6; } +echo "$as_me:$LINENO: checking which mozilla to use" >&5 +echo $ECHO_N "checking which mozilla to use... $ECHO_C" >&6 if test -n "$with_system_mozilla" && test "$with_system_mozilla" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_MOZILLA=YES ENABLE_NSS_MODULE=NO enable_nss_module=no - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Mozilla flavour to use" >&5 -$as_echo_n "checking which Mozilla flavour to use... " >&6; } + echo "$as_me:$LINENO: checking which Mozilla flavour to use" >&5 +echo $ECHO_N "checking which Mozilla flavour to use... $ECHO_C" >&6 if test -n "$with_system_mozilla" && test "$with_system_mozilla" = "libxul"; then MOZ_FLAVOUR=libxul elif test -n "$with_system_mozilla" && test "$with_system_mozilla" = "xulrunner"; then @@ -14590,8 +17667,8 @@ $as_echo_n "checking which Mozilla flavour to use... " >&6; } MOZ_FLAVOUR=libxul fi tmp=`echo $MOZ_FLAVOUR | $PERL -e 'print ucfirst();'` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $tmp" >&5 -$as_echo "$tmp" >&6; } + echo "$as_me:$LINENO: result: $tmp" >&5 +echo "${ECHO_T}$tmp" >&6 succeeded=no @@ -14599,10 +17676,10 @@ $as_echo "$tmp" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -14614,30 +17691,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -14648,25 +17724,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nss" >&5 -$as_echo_n "checking for nss... " >&6; } + echo "$as_me:$LINENO: checking for nss" >&5 +echo $ECHO_N "checking for nss... $ECHO_C" >&6 if $PKG_CONFIG --exists "nss" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_CFLAGS" >&5 -$as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 +echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6 MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "nss"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_CFLAGS" >&5 -$as_echo "$MOZ_NSS_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 +echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_LIBS" >&5 -$as_echo_n "checking MOZ_NSS_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 +echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6 MOZ_NSS_LIBS=`$PKG_CONFIG --libs "nss"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_LIBS" >&5 -$as_echo "$MOZ_NSS_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 +echo "${ECHO_T}$MOZ_NSS_LIBS" >&6 else MOZ_NSS_CFLAGS="" MOZ_NSS_LIBS="" @@ -14697,10 +17773,10 @@ $as_echo "$MOZ_NSS_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -14712,30 +17788,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -14746,25 +17821,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZ_FLAVOUR-nss " >&5 -$as_echo_n "checking for $MOZ_FLAVOUR-nss ... " >&6; } + echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nss " >&5 +echo $ECHO_N "checking for $MOZ_FLAVOUR-nss ... $ECHO_C" >&6 if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nss " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_CFLAGS" >&5 -$as_echo_n "checking MOZ_NSS_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MOZ_NSS_CFLAGS" >&5 +echo $ECHO_N "checking MOZ_NSS_CFLAGS... $ECHO_C" >&6 MOZ_NSS_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nss "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_CFLAGS" >&5 -$as_echo "$MOZ_NSS_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSS_CFLAGS" >&5 +echo "${ECHO_T}$MOZ_NSS_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSS_LIBS" >&5 -$as_echo_n "checking MOZ_NSS_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MOZ_NSS_LIBS" >&5 +echo $ECHO_N "checking MOZ_NSS_LIBS... $ECHO_C" >&6 MOZ_NSS_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nss "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSS_LIBS" >&5 -$as_echo "$MOZ_NSS_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSS_LIBS" >&5 +echo "${ECHO_T}$MOZ_NSS_LIBS" >&6 else MOZ_NSS_CFLAGS="" MOZ_NSS_LIBS="" @@ -14785,7 +17860,9 @@ $as_echo "$MOZ_NSS_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nss ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi else @@ -14800,10 +17877,10 @@ $as_echo "$MOZ_NSS_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -14815,30 +17892,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -14849,25 +17925,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for nspr " >&5 -$as_echo_n "checking for nspr ... " >&6; } + echo "$as_me:$LINENO: checking for nspr " >&5 +echo $ECHO_N "checking for nspr ... $ECHO_C" >&6 if $PKG_CONFIG --exists "nspr " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_CFLAGS" >&5 -$as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 +echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6 MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "nspr "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_CFLAGS" >&5 -$as_echo "$MOZ_NSPR_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 +echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_LIBS" >&5 -$as_echo_n "checking MOZ_NSPR_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 +echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6 MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "nspr "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_LIBS" >&5 -$as_echo "$MOZ_NSPR_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 +echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6 else MOZ_NSPR_CFLAGS="" MOZ_NSPR_LIBS="" @@ -14888,7 +17964,9 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi NSPR_LIB="-L`$PKG_CONFIG --variable=libdir nspr`" @@ -14900,10 +17978,10 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -14915,30 +17993,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -14949,25 +18026,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZ_FLAVOUR-nspr " >&5 -$as_echo_n "checking for $MOZ_FLAVOUR-nspr ... " >&6; } + echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-nspr " >&5 +echo $ECHO_N "checking for $MOZ_FLAVOUR-nspr ... $ECHO_C" >&6 if $PKG_CONFIG --exists "$MOZ_FLAVOUR-nspr " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_CFLAGS" >&5 -$as_echo_n "checking MOZ_NSPR_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MOZ_NSPR_CFLAGS" >&5 +echo $ECHO_N "checking MOZ_NSPR_CFLAGS... $ECHO_C" >&6 MOZ_NSPR_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-nspr "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_CFLAGS" >&5 -$as_echo "$MOZ_NSPR_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSPR_CFLAGS" >&5 +echo "${ECHO_T}$MOZ_NSPR_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZ_NSPR_LIBS" >&5 -$as_echo_n "checking MOZ_NSPR_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MOZ_NSPR_LIBS" >&5 +echo $ECHO_N "checking MOZ_NSPR_LIBS... $ECHO_C" >&6 MOZ_NSPR_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-nspr "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZ_NSPR_LIBS" >&5 -$as_echo "$MOZ_NSPR_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZ_NSPR_LIBS" >&5 +echo "${ECHO_T}$MOZ_NSPR_LIBS" >&6 else MOZ_NSPR_CFLAGS="" MOZ_NSPR_LIBS="" @@ -14988,7 +18065,9 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements ($MOZ_FLAVOUR-nspr ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi fi @@ -15000,10 +18079,10 @@ $as_echo "$MOZ_NSPR_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15015,30 +18094,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -15049,25 +18127,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZ_FLAVOUR-xpcom" >&5 -$as_echo_n "checking for $MOZ_FLAVOUR-xpcom... " >&6; } + echo "$as_me:$LINENO: checking for $MOZ_FLAVOUR-xpcom" >&5 +echo $ECHO_N "checking for $MOZ_FLAVOUR-xpcom... $ECHO_C" >&6 if $PKG_CONFIG --exists "$MOZ_FLAVOUR-xpcom" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_CFLAGS" >&5 -$as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 +echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6 MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "$MOZ_FLAVOUR-xpcom"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_CFLAGS" >&5 -$as_echo "$MOZILLAXPCOM_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 +echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_LIBS" >&5 -$as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 +echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6 MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "$MOZ_FLAVOUR-xpcom"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_LIBS" >&5 -$as_echo "$MOZILLAXPCOM_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 +echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6 else MOZILLAXPCOM_CFLAGS="" MOZILLAXPCOM_LIBS="" @@ -15102,10 +18180,10 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15117,30 +18195,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -15151,25 +18228,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxul " >&5 -$as_echo_n "checking for libxul ... " >&6; } + echo "$as_me:$LINENO: checking for libxul " >&5 +echo $ECHO_N "checking for libxul ... $ECHO_C" >&6 if $PKG_CONFIG --exists "libxul " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_CFLAGS" >&5 -$as_echo_n "checking MOZILLAXPCOM_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MOZILLAXPCOM_CFLAGS" >&5 +echo $ECHO_N "checking MOZILLAXPCOM_CFLAGS... $ECHO_C" >&6 MOZILLAXPCOM_CFLAGS=`$PKG_CONFIG --cflags "libxul "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_CFLAGS" >&5 -$as_echo "$MOZILLAXPCOM_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZILLAXPCOM_CFLAGS" >&5 +echo "${ECHO_T}$MOZILLAXPCOM_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZILLAXPCOM_LIBS" >&5 -$as_echo_n "checking MOZILLAXPCOM_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MOZILLAXPCOM_LIBS" >&5 +echo $ECHO_N "checking MOZILLAXPCOM_LIBS... $ECHO_C" >&6 MOZILLAXPCOM_LIBS=`$PKG_CONFIG --libs "libxul "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLAXPCOM_LIBS" >&5 -$as_echo "$MOZILLAXPCOM_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZILLAXPCOM_LIBS" >&5 +echo "${ECHO_T}$MOZILLAXPCOM_LIBS" >&6 else MOZILLAXPCOM_CFLAGS="" MOZILLAXPCOM_LIBS="" @@ -15190,7 +18267,9 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libxul ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi MOZ_INC=`$PKG_CONFIG --variable=includedir libxul` @@ -15208,43 +18287,72 @@ $as_echo "$MOZILLAXPCOM_LIBS" >&6; } save_LIBS="$LIBS" CPPFLAGS="$CPPFLAGS $MOZ_NSS_CFLAGS" LDFLAGS="$LDFLAGS $MOZ_NSS_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5 -$as_echo_n "checking for PK11_GetCertFromPrivateKey in -lnss3... " >&6; } -if test "${ac_cv_lib_nss3_PK11_GetCertFromPrivateKey+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for PK11_GetCertFromPrivateKey in -lnss3" >&5 +echo $ECHO_N "checking for PK11_GetCertFromPrivateKey in -lnss3... $ECHO_C" >&6 +if test "${ac_cv_lib_nss3_PK11_GetCertFromPrivateKey+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnss3 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char PK11_GetCertFromPrivateKey (); int main () { -return PK11_GetCertFromPrivateKey (); +PK11_GetCertFromPrivateKey (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=yes else - ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_nss3_PK11_GetCertFromPrivateKey=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5 -$as_echo "$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6; } -if test "x$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&5 +echo "${ECHO_T}$ac_cv_lib_nss3_PK11_GetCertFromPrivateKey" >&6 +if test $ac_cv_lib_nss3_PK11_GetCertFromPrivateKey = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBNSS3 1 _ACEOF @@ -15252,9 +18360,13 @@ _ACEOF LIBS="-lnss3 $LIBS" else - as_fn_error "PK11_GetCertFromPrivateKey missing but needed. + { { echo "$as_me:$LINENO: error: PK11_GetCertFromPrivateKey missing but needed. +See https://bugzilla.mozilla.org/show_bug.cgi?id=262274. +Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" >&5 +echo "$as_me: error: PK11_GetCertFromPrivateKey missing but needed. See https://bugzilla.mozilla.org/show_bug.cgi?id=262274. -Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" "$LINENO" 5 +Fixed since nss 3.9.3 (contained by e.g. mozilla >= 1.7.5)" >&2;} + { (exit 1); exit 1; }; } fi LDFLAGS="$save_LDFLAGS" @@ -15263,16 +18375,20 @@ fi MOZ_LIB_XPCOM=$MOZILLAXPCOM_LIBS if test "$WITH_LDAP" != "NO" && test "$WITH_OPENLDAP" != "YES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $tmp was compiled with --enable-ldap" >&5 -$as_echo_n "checking whether $tmp was compiled with --enable-ldap... " >&6; } + echo "$as_me:$LINENO: checking whether $tmp was compiled with --enable-ldap" >&5 +echo $ECHO_N "checking whether $tmp was compiled with --enable-ldap... $ECHO_C" >&6 if test -d "$MOZ_INC/ldap"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 MOZ_LDAP_CFLAGS="-I$MOZ_INC" else - as_fn_error "no. + { { echo "$as_me:$LINENO: error: no. Could not find LDAP header include files in $MOZ_INC/ldap. -Please recompile $tmp with --enable-ldap or use --with-openldap." "$LINENO" 5 +Please recompile $tmp with --enable-ldap or use --with-openldap." >&5 +echo "$as_me: error: no. +Could not find LDAP header include files in $MOZ_INC/ldap. +Please recompile $tmp with --enable-ldap or use --with-openldap." >&2;} + { (exit 1); exit 1; }; } fi fi @@ -15283,48 +18399,48 @@ Please recompile $tmp with --enable-ldap or use --with-openldap." "$LINENO" 5 fi elif test "$enable_mozilla" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 WITH_MOZILLA=NO ENABLE_NSS_MODULE=NO enable_nss_module=no else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_MOZILLA=NO BUILD_TYPE="$BUILD_TYPE MOZ" if test -z "$with_mozilla_version"; then MOZILLA_VERSION= else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which mozilla version to build" >&5 -$as_echo_n "checking which mozilla version to build... " >&6; } + echo "$as_me:$LINENO: checking which mozilla version to build" >&5 +echo $ECHO_N "checking which mozilla version to build... $ECHO_C" >&6 MOZILLA_VERSION=$with_mozilla_version enable_build_mozilla=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLA_VERSION" >&5 -$as_echo "$MOZILLA_VERSION" >&6; } + echo "$as_me:$LINENO: result: $MOZILLA_VERSION" >&5 +echo "${ECHO_T}$MOZILLA_VERSION" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for toolkit mozilla should use" >&5 -$as_echo_n "checking for toolkit mozilla should use... " >&6; } +echo "$as_me:$LINENO: checking for toolkit mozilla should use" >&5 +echo $ECHO_N "checking for toolkit mozilla should use... $ECHO_C" >&6 if test -z "$with_mozilla_toolkit"; then if test "$_os" != "WINNT" ; then if test "$_os" = "Darwin" ; then MOZILLA_TOOLKIT=mac - { $as_echo "$as_me:${as_lineno-$LINENO}: result: mac" >&5 -$as_echo "mac" >&6; } + echo "$as_me:$LINENO: result: mac" >&5 +echo "${ECHO_T}mac" >&6 else MOZILLA_TOOLKIT=gtk2 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: gtk2" >&5 -$as_echo "gtk2" >&6; } + echo "$as_me:$LINENO: result: gtk2" >&5 +echo "${ECHO_T}gtk2" >&6 fi fi else MOZILLA_TOOLKIT=$with_mozilla_toolkit enable_build_mozilla=1 - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZILLA_TOOLKIT" >&5 -$as_echo "$MOZILLA_TOOLKIT" >&6; } + echo "$as_me:$LINENO: result: $MOZILLA_TOOLKIT" >&5 +echo "${ECHO_T}$MOZILLA_TOOLKIT" >&6 fi #if test "$_os" = "Darwin" && test "$MOZILLA_TOOLKIT" != "gtk2"; then # #only gtk2 toolkit supported - xlib or cocoa nees glib1 and libIDL1 - the latter is not @@ -15341,55 +18457,63 @@ else enable_build_mozilla= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build Mozilla/SeaMonkey" >&5 -$as_echo_n "checking whether to build Mozilla/SeaMonkey... " >&6; } +echo "$as_me:$LINENO: checking whether to build Mozilla/SeaMonkey" >&5 +echo $ECHO_N "checking whether to build Mozilla/SeaMonkey... $ECHO_C" >&6 if test -n "$enable_build_mozilla"; then BUILD_MOZAB="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else BUILD_MOZAB="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build provided NSS module" >&5 -$as_echo_n "checking whether to build provided NSS module... " >&6; } +echo "$as_me:$LINENO: checking whether to build provided NSS module" >&5 +echo $ECHO_N "checking whether to build provided NSS module... $ECHO_C" >&6 if test "$enable_nss_module" != "no"; then ENABLE_NSS_MODULE="YES" BUILD_TYPE="$BUILD_TYPE NSS" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 if test "$_os" = "WINNT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mozilla build tooling" >&5 -$as_echo_n "checking for Mozilla build tooling... " >&6; } + echo "$as_me:$LINENO: checking for Mozilla build tooling" >&5 +echo $ECHO_N "checking for Mozilla build tooling... $ECHO_C" >&6 if test -z "$MOZILLABUILD" ; then -as_fn_error "Mozilla build tooling not found. +{ { echo "$as_me:$LINENO: error: Mozilla build tooling not found. +Use the --with-mozilla-build option after installling the tools obtained +from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" >&5 +echo "$as_me: error: Mozilla build tooling not found. Use the --with-mozilla-build option after installling the tools obtained -from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" "$LINENO" 5 +from http://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32" >&2;} + { (exit 1); exit 1; }; } else if test \( "$WITH_MINGWIN" = "yes" \) ; then if test ! -d "$MOZILLABUILD" ; then -as_fn_error "Mozilla build tooling incomplete!" "$LINENO" 5 +{ { echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5 +echo "$as_me: error: Mozilla build tooling incomplete!" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6 fi else if test ! -d "$MOZILLABUILD/moztools" \ -o ! -d "$MOZILLABUILD/msys" ; then -as_fn_error "Mozilla build tooling incomplete!" "$LINENO" 5 +{ { echo "$as_me:$LINENO: error: Mozilla build tooling incomplete!" >&5 +echo "$as_me: error: Mozilla build tooling incomplete!" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6 fi fi fi fi else ENABLE_NSS_MODULE="NO" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi if test "$BUILD_MOZAB" = "TRUE"; then @@ -15397,11 +18521,13 @@ if test "$BUILD_MOZAB" = "TRUE"; then if test "$WITH_MINGWIN" != "yes"; then # compiling with MSVC. Only supported platform here is MSVS2005 at the moment. if test "$MSVSVER" != "2005"; then - as_fn_error "Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&5 +echo "$as_me: error: Building SeaMonkey is supported with Microsoft Visual Studio .NET 2005 only." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5 -$as_echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&2;} + { echo "$as_me:$LINENO: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&5 +echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and likely to break." >&2;} echo "Building SeaMonkey with mingwin is not tested, and likely to break." >> warn fi fi @@ -15411,59 +18537,65 @@ $as_echo "$as_me: WARNING: Building SeaMonkey with mingwin is not tested, and li fi MOZILLA_SOURCE_VERSION="seamonkey-${MOZILLA_VERSION}.source" MOZILLA_FETCH_FILE=`grep $MOZILLA_SOURCE_VERSION ooo.lst` - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mozilla sources" >&5 -$as_echo_n "checking for mozilla sources... " >&6; } + echo "$as_me:$LINENO: checking for mozilla sources" >&5 +echo $ECHO_N "checking for mozilla sources... $ECHO_C" >&6 if test -z "$MOZILLA_FETCH_FILE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6 HAVE_MOZILLA_TARBALL=n else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $MOZILLA_FETCH_FILE" >&5 -$as_echo_n "checking for $MOZILLA_FETCH_FILE... " >&6; } + echo "$as_me:$LINENO: checking for $MOZILLA_FETCH_FILE" >&5 +echo $ECHO_N "checking for $MOZILLA_FETCH_FILE... $ECHO_C" >&6 if test ! -e "$TARFILE_LOCATION/$MOZILLA_FETCH_FILE"; then if test -z "$DO_FETCH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: will be fetched" >&5 -$as_echo "will be fetched" >&6; } + echo "$as_me:$LINENO: result: will be fetched" >&5 +echo "${ECHO_T}will be fetched" >&6 HAVE_MOZILLA_TARBALL=y else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not found" >&5 -$as_echo "not found" >&6; } + echo "$as_me:$LINENO: result: not found" >&5 +echo "${ECHO_T}not found" >&6 HAVE_MOZILLA_TARBALL=n fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 HAVE_MOZILLA_TARBALL=y fi fi if test "$HAVE_MOZILLA_TARBALL" != "y"; then - as_fn_error "Mozilla/SeaMonkey source archive not found. -Use \"./fetch_tarballs.sh ooo.lst\" to download." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Mozilla/SeaMonkey source archive not found. +Use \"./fetch_tarballs.sh ooo.lst\" to download." >&5 +echo "$as_me: error: Mozilla/SeaMonkey source archive not found. +Use \"./fetch_tarballs.sh ooo.lst\" to download." >&2;} + { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for moztools binaries" >&5 -$as_echo_n "checking for moztools binaries... " >&6; } + echo "$as_me:$LINENO: checking for moztools binaries" >&5 +echo $ECHO_N "checking for moztools binaries... $ECHO_C" >&6 if test ! -e "$TARFILE_LOCATION/vc8-moztools.zip" ; then - as_fn_error "The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip -(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip +(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&5 +echo "$as_me: error: The following file is missing in $TARFILE_LOCATION: vc8-moztools.zip +(from ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc8/)" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 -$as_echo "ok" >&6; } + echo "$as_me:$LINENO: result: ok" >&5 +echo "${ECHO_T}ok" >&6 fi elif test "$_os" = "Darwin"; then if test "$MOZILLA_TOOLKIT" = "gtk2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether mozilla can be built..." >&5 -$as_echo "$as_me: checking whether mozilla can be built..." >&6;} + { echo "$as_me:$LINENO: checking whether mozilla can be built..." >&5 +echo "$as_me: checking whether mozilla can be built..." >&6;} succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15475,30 +18607,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -15509,25 +18640,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5 -$as_echo_n "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... " >&6; } + echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" >&5 +echo $ECHO_N "checking for gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8... $ECHO_C" >&6 if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZGTK2_CFLAGS" >&5 -$as_echo_n "checking MOZGTK2_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MOZGTK2_CFLAGS" >&5 +echo $ECHO_N "checking MOZGTK2_CFLAGS... $ECHO_C" >&6 MOZGTK2_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZGTK2_CFLAGS" >&5 -$as_echo "$MOZGTK2_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZGTK2_CFLAGS" >&5 +echo "${ECHO_T}$MOZGTK2_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZGTK2_LIBS" >&5 -$as_echo_n "checking MOZGTK2_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MOZGTK2_LIBS" >&5 +echo $ECHO_N "checking MOZGTK2_LIBS... $ECHO_C" >&6 MOZGTK2_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 libIDL-2.0 >= 0.8"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZGTK2_LIBS" >&5 -$as_echo "$MOZGTK2_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZGTK2_LIBS" >&5 +echo "${ECHO_T}$MOZGTK2_LIBS" >&6 else MOZGTK2_CFLAGS="" MOZGTK2_LIBS="" @@ -15546,10 +18677,12 @@ $as_echo "$MOZGTK2_LIBS" >&6; } fi if test $succeeded = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: OK - can build mozilla" >&5 -$as_echo "$as_me: OK - can build mozilla" >&6;} + { echo "$as_me:$LINENO: OK - can build mozilla" >&5 +echo "$as_me: OK - can build mozilla" >&6;} else - as_fn_error "Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&5 +echo "$as_me: error: Prerequisites to build mozilla not met. Either use the precompiled mozilla binaries or install the missing packages" >&2;} + { (exit 1); exit 1; }; } fi else @@ -15559,10 +18692,10 @@ $as_echo "$as_me: OK - can build mozilla" >&6;} if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15574,30 +18707,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -15608,25 +18740,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libIDL-2.0 >= 0.6.3" >&5 -$as_echo_n "checking for libIDL-2.0 >= 0.6.3... " >&6; } + echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.6.3" >&5 +echo $ECHO_N "checking for libIDL-2.0 >= 0.6.3... $ECHO_C" >&6 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.6.3" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5 -$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.6.3"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5 -$as_echo "$MOZLIBREQ_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5 -$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.6.3"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5 -$as_echo "$MOZLIBREQ_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -15651,7 +18783,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } fi if test -z "$MOZIDL"; then - as_fn_error "libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." >&5 +echo "$as_me: error: libIDL 0.6.3 or newer is needed to build mozilla with mac toolkit." >&2;} + { (exit 1); exit 1; }; } fi fi else @@ -15663,10 +18797,10 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15678,30 +18812,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -15712,25 +18845,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0" >&5 -$as_echo_n "checking for gtk+-2.0... " >&6; } + echo "$as_me:$LINENO: checking for gtk+-2.0" >&5 +echo $ECHO_N "checking for gtk+-2.0... $ECHO_C" >&6 if $PKG_CONFIG --exists "gtk+-2.0" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5 -$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5 -$as_echo "$MOZLIBREQ_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5 -$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5 -$as_echo "$MOZLIBREQ_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -15755,7 +18888,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } fi if test -z "$MOZGTK"; then - as_fn_error "GTK2 is needed to build mozilla." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: GTK2 is needed to build mozilla." >&5 +echo "$as_me: error: GTK2 is needed to build mozilla." >&2;} + { (exit 1); exit 1; }; } fi succeeded=no @@ -15763,10 +18898,10 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15778,30 +18913,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -15812,25 +18946,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libIDL-2.0 >= 0.8.0" >&5 -$as_echo_n "checking for libIDL-2.0 >= 0.8.0... " >&6; } + echo "$as_me:$LINENO: checking for libIDL-2.0 >= 0.8.0" >&5 +echo $ECHO_N "checking for libIDL-2.0 >= 0.8.0... $ECHO_C" >&6 if $PKG_CONFIG --exists "libIDL-2.0 >= 0.8.0" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5 -$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libIDL-2.0 >= 0.8.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5 -$as_echo "$MOZLIBREQ_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5 -$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libIDL-2.0 >= 0.8.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5 -$as_echo "$MOZLIBREQ_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -15855,7 +18989,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } fi if test -z "$MOZIDL"; then - as_fn_error "libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&5 +echo "$as_me: error: libIDL >= 0.8.0 is needed when using GTK2 to build mozilla." >&2;} + { (exit 1); exit 1; }; } fi else @@ -15864,10 +19000,10 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15879,30 +19015,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -15913,25 +19048,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+ >= 1.2.3" >&5 -$as_echo_n "checking for gtk+ >= 1.2.3... " >&6; } + echo "$as_me:$LINENO: checking for gtk+ >= 1.2.3" >&5 +echo $ECHO_N "checking for gtk+ >= 1.2.3... $ECHO_C" >&6 if $PKG_CONFIG --exists "gtk+ >= 1.2.3" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5 -$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "gtk+ >= 1.2.3"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5 -$as_echo "$MOZLIBREQ_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5 -$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "gtk+ >= 1.2.3"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5 -$as_echo "$MOZLIBREQ_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -15956,7 +19091,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } fi if test -z "$MOZGTK"; then - as_fn_error "gtk 1.2 is needed when not using GTK2 to build mozilla." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&5 +echo "$as_me: error: gtk 1.2 is needed when not using GTK2 to build mozilla." >&2;} + { (exit 1); exit 1; }; } fi succeeded=no @@ -15964,10 +19101,10 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -15979,30 +19116,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -16013,25 +19149,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5 -$as_echo_n "checking for libidl >= 0.6.3 libidl <= 0.6.8... " >&6; } + echo "$as_me:$LINENO: checking for libidl >= 0.6.3 libidl <= 0.6.8" >&5 +echo $ECHO_N "checking for libidl >= 0.6.3 libidl <= 0.6.8... $ECHO_C" >&6 if $PKG_CONFIG --exists "libidl >= 0.6.3 libidl <= 0.6.8" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_CFLAGS" >&5 -$as_echo_n "checking MOZLIBREQ_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_CFLAGS" >&5 +echo $ECHO_N "checking MOZLIBREQ_CFLAGS... $ECHO_C" >&6 MOZLIBREQ_CFLAGS=`$PKG_CONFIG --cflags "libidl >= 0.6.3 libidl <= 0.6.8"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_CFLAGS" >&5 -$as_echo "$MOZLIBREQ_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_CFLAGS" >&5 +echo "${ECHO_T}$MOZLIBREQ_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MOZLIBREQ_LIBS" >&5 -$as_echo_n "checking MOZLIBREQ_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MOZLIBREQ_LIBS" >&5 +echo $ECHO_N "checking MOZLIBREQ_LIBS... $ECHO_C" >&6 MOZLIBREQ_LIBS=`$PKG_CONFIG --libs "libidl >= 0.6.3 libidl <= 0.6.8"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOZLIBREQ_LIBS" >&5 -$as_echo "$MOZLIBREQ_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MOZLIBREQ_LIBS" >&5 +echo "${ECHO_T}$MOZLIBREQ_LIBS" >&6 else MOZLIBREQ_CFLAGS="" MOZLIBREQ_LIBS="" @@ -16056,7 +19192,9 @@ $as_echo "$MOZLIBREQ_LIBS" >&6; } fi if test -z "$MOZIDL"; then - as_fn_error "libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&5 +echo "$as_me: error: libIDL 0.6.3 - 0.6.8 is needed when not using GTK2 to build mozilla." >&2;} + { (exit 1); exit 1; }; } fi fi fi @@ -16076,61 +19214,225 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which sane header to use" >&5 -$as_echo_n "checking which sane header to use... " >&6; } +echo "$as_me:$LINENO: checking which sane header to use" >&5 +echo $ECHO_N "checking which sane header to use... $ECHO_C" >&6 if test -n "$with_system_sane_header" -o -n "$with_system_headers" && \ test "$with_system_sane_header" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_SANE_HEADER=YES - ac_fn_c_check_header_mongrel "$LINENO" "sane/sane.h" "ac_cv_header_sane_sane_h" "$ac_includes_default" -if test "x$ac_cv_header_sane_sane_h" = x""yes; then : + if test "${ac_cv_header_sane_sane_h+set}" = set; then + echo "$as_me:$LINENO: checking for sane/sane.h" >&5 +echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6 +if test "${ac_cv_header_sane_sane_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 +echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking sane/sane.h usability" >&5 +echo $ECHO_N "checking sane/sane.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking sane/sane.h presence" >&5 +echo $ECHO_N "checking sane/sane.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: sane/sane.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: sane/sane.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: sane/sane.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: sane/sane.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: sane/sane.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: sane/sane.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: sane/sane.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: sane/sane.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: sane/sane.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for sane/sane.h" >&5 +echo $ECHO_N "checking for sane/sane.h... $ECHO_C" >&6 +if test "${ac_cv_header_sane_sane_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_sane_sane_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_sane_sane_h" >&5 +echo "${ECHO_T}$ac_cv_header_sane_sane_h" >&6 +fi +if test $ac_cv_header_sane_sane_h = yes; then + : else - as_fn_error "sane not found. install sane" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: sane not found. install sane" >&5 +echo "$as_me: error: sane not found. install sane" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_SANE_HEADER=NO BUILD_TYPE="$BUILD_TYPE SANE" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which icu to use" >&5 -$as_echo_n "checking which icu to use... " >&6; } +echo "$as_me:$LINENO: checking which icu to use" >&5 +echo $ECHO_N "checking which icu to use... $ECHO_C" >&6 if test -n "$with_system_icu" -o -n "$with_system_libs" && \ test "$with_system_icu" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_ICU=YES - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unicode/rbbi.h" >&5 -$as_echo_n "checking for unicode/rbbi.h... " >&6; } - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + echo "$as_me:$LINENO: checking for unicode/rbbi.h" >&5 +echo $ECHO_N "checking for unicode/rbbi.h... $ECHO_C" >&6 + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ unicode/rbbi.h _ACEOF -if ac_fn_cxx_try_cpp "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked." >&5 -$as_echo "checked." >&6; } +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi else - as_fn_error "icu headers not found." "$LINENO" 5 + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + echo "$as_me:$LINENO: result: checked." >&5 +echo "${ECHO_T}checked." >&6 +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + { { echo "$as_me:$LINENO: error: icu headers not found." >&5 +echo "$as_me: error: icu headers not found." >&2;} + { (exit 1); exit 1; }; } fi rm -f conftest.err conftest.$ac_ext # Extract the first word of "genbrk", so it can be a program name with args. set dummy genbrk; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SYSTEM_GENBRK+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_SYSTEM_GENBRK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $SYSTEM_GENBRK in [\\/]* | ?:[\\/]*) @@ -16143,38 +19445,39 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SYSTEM_GENBRK="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi SYSTEM_GENBRK=$ac_cv_path_SYSTEM_GENBRK + if test -n "$SYSTEM_GENBRK"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENBRK" >&5 -$as_echo "$SYSTEM_GENBRK" >&6; } + echo "$as_me:$LINENO: result: $SYSTEM_GENBRK" >&5 +echo "${ECHO_T}$SYSTEM_GENBRK" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$SYSTEM_GENBRK"; then - as_fn_error "\\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&5 +echo "$as_me: error: \\"genbrk\\" not found in \$PATH, install the icu development tool \\"genbrk\"\" >&2;} + { (exit 1); exit 1; }; } fi # Extract the first word of "genccode", so it can be a program name with args. set dummy genccode; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SYSTEM_GENCCODE+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_SYSTEM_GENCCODE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $SYSTEM_GENCCODE in [\\/]* | ?:[\\/]*) @@ -16187,38 +19490,39 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SYSTEM_GENCCODE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi SYSTEM_GENCCODE=$ac_cv_path_SYSTEM_GENCCODE + if test -n "$SYSTEM_GENCCODE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENCCODE" >&5 -$as_echo "$SYSTEM_GENCCODE" >&6; } + echo "$as_me:$LINENO: result: $SYSTEM_GENCCODE" >&5 +echo "${ECHO_T}$SYSTEM_GENCCODE" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$SYSTEM_GENCCODE"; then - as_fn_error "\\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&5 +echo "$as_me: error: \\"genccode\\" not found in \$PATH, install the icu development tool \\"genccode\"\" >&2;} + { (exit 1); exit 1; }; } fi # Extract the first word of "gencmn", so it can be a program name with args. set dummy gencmn; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_SYSTEM_GENCMN+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_SYSTEM_GENCMN+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $SYSTEM_GENCMN in [\\/]* | ?:[\\/]*) @@ -16231,41 +19535,47 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_SYSTEM_GENCMN="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi SYSTEM_GENCMN=$ac_cv_path_SYSTEM_GENCMN + if test -n "$SYSTEM_GENCMN"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_GENCMN" >&5 -$as_echo "$SYSTEM_GENCMN" >&6; } + echo "$as_me:$LINENO: result: $SYSTEM_GENCMN" >&5 +echo "${ECHO_T}$SYSTEM_GENCMN" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$SYSTEM_GENCMN"; then - as_fn_error "\\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&5 +echo "$as_me: error: \\"gencmn\\" not found in \$PATH, install the icu development tool \\"gencmn\"\" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking ICU version" >&5 -$as_echo_n "checking ICU version... " >&6; } - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + echo "$as_me:$LINENO: checking ICU version" >&5 +echo $ECHO_N "checking ICU version... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -16278,16 +19588,31 @@ int main(int argc, char **argv) { } _ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else - as_fn_error "not suitable, only >= 4.0 supported currently" "$LINENO" 5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: not suitable, only >= 4.0 supported currently" >&5 +echo "$as_me: error: not suitable, only >= 4.0 supported currently" >&2;} + { (exit 1); exit 1; }; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -16295,8 +19620,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_ICU=NO BUILD_TYPE="$BUILD_TYPE ICU" fi @@ -16306,18 +19631,18 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable graphite support" >&5 -$as_echo_n "checking whether to enable graphite support... " >&6; } +echo "$as_me:$LINENO: checking whether to enable graphite support" >&5 +echo $ECHO_N "checking whether to enable graphite support... $ECHO_C" >&6 if test "$_os" = "WINNT" -o "$_os" = "Linux" && test "z$enable_graphite" = "z" -o "$enable_graphite" != "no" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_GRAPHITE="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which graphite to use" >&5 -$as_echo_n "checking which graphite to use... " >&6; } + echo "$as_me:$LINENO: checking which graphite to use" >&5 +echo $ECHO_N "checking which graphite to use... $ECHO_C" >&6 if test -n "$with_system_graphite" -o -n "$with_system_libs" && \ test "$with_system_graphite" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_GRAPHITE=YES succeeded=no @@ -16325,10 +19650,10 @@ $as_echo "external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -16340,30 +19665,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -16374,25 +19698,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for silgraphite " >&5 -$as_echo_n "checking for silgraphite ... " >&6; } + echo "$as_me:$LINENO: checking for silgraphite " >&5 +echo $ECHO_N "checking for silgraphite ... $ECHO_C" >&6 if $PKG_CONFIG --exists "silgraphite " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GRAPHITE_CFLAGS" >&5 -$as_echo_n "checking GRAPHITE_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking GRAPHITE_CFLAGS" >&5 +echo $ECHO_N "checking GRAPHITE_CFLAGS... $ECHO_C" >&6 GRAPHITE_CFLAGS=`$PKG_CONFIG --cflags "silgraphite "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GRAPHITE_CFLAGS" >&5 -$as_echo "$GRAPHITE_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GRAPHITE_CFLAGS" >&5 +echo "${ECHO_T}$GRAPHITE_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GRAPHITE_LIBS" >&5 -$as_echo_n "checking GRAPHITE_LIBS... " >&6; } + echo "$as_me:$LINENO: checking GRAPHITE_LIBS" >&5 +echo $ECHO_N "checking GRAPHITE_LIBS... $ECHO_C" >&6 GRAPHITE_LIBS=`$PKG_CONFIG --libs "silgraphite "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GRAPHITE_LIBS" >&5 -$as_echo "$GRAPHITE_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GRAPHITE_LIBS" >&5 +echo "${ECHO_T}$GRAPHITE_LIBS" >&6 else GRAPHITE_CFLAGS="" GRAPHITE_LIBS="" @@ -16413,18 +19737,20 @@ $as_echo "$GRAPHITE_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (silgraphite ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_GRAPHITE=NO BUILD_TYPE="$BUILD_TYPE GRAPHITE" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi @@ -16434,13 +19760,15 @@ fi if test "$_os" = "Darwin"; then if test "x$with_x" = "xyes"; then - as_fn_error "X11 build is no longer supported on MacOSX, please use the native aqua build" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&5 +echo "$as_me: error: X11 build is no longer supported on MacOSX, please use the native aqua build" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /System/Library/Frameworks/AppKit.framework" >&5 -$as_echo_n "checking for /System/Library/Frameworks/AppKit.framework... " >&6; } + echo "$as_me:$LINENO: checking for /System/Library/Frameworks/AppKit.framework" >&5 +echo $ECHO_N "checking for /System/Library/Frameworks/AppKit.framework... $ECHO_C" >&6 if test -d "/System/Library/Frameworks/AppKit.framework/"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 x_includes="no_x_includes" x_libraries="no_x_libraries" enable_gtk=no @@ -16448,7 +19776,9 @@ $as_echo "yes" >&6; } ENABLE_CUPS="" else - as_fn_error "No AppKit.framewrok found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: No AppKit.framewrok found" >&5 +echo "$as_me: error: No AppKit.framewrok found" >&2;} + { (exit 1); exit 1; }; } fi fi fi @@ -16460,47 +19790,44 @@ elif test "$_os" = "OS2" ; then echo "Do Nothing for _os = OS2. Don't check for X11." : elif test "$_os" != "WINNT" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for X" >&5 -$as_echo_n "checking for X... " >&6; } + echo "$as_me:$LINENO: checking for X" >&5 +echo $ECHO_N "checking for X... $ECHO_C" >&6 -# Check whether --with-x was given. -if test "${with_x+set}" = set; then : - withval=$with_x; -fi +# Check whether --with-x or --without-x was given. +if test "${with_x+set}" = set; then + withval="$with_x" +fi; # $have_x is `yes', `no', `disabled', or empty when we do not yet know. if test "x$with_x" = xno; then # The user explicitly disabled X. have_x=disabled else - case $x_includes,$x_libraries in #( - *\'*) as_fn_error "cannot use X directory names containing '" "$LINENO" 5;; #( - *,NONE | NONE,*) if test "${ac_cv_have_x+set}" = set; then : - $as_echo_n "(cached) " >&6 + if test "x$x_includes" != xNONE && test "x$x_libraries" != xNONE; then + # Both variables are already set. + have_x=yes + else + if test "${ac_cv_have_x+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else # One or both of the vars are not set, and there is no cached value. ac_x_includes=no ac_x_libraries=no -rm -f -r conftest.dir +rm -fr conftest.dir if mkdir conftest.dir; then cd conftest.dir + # Make sure to not put "make" in the Imakefile rules, since we grep it out. cat >Imakefile <<'_ACEOF' -incroot: - @echo incroot='${INCROOT}' -usrlibdir: - @echo usrlibdir='${USRLIBDIR}' -libdir: - @echo libdir='${LIBDIR}' -_ACEOF - if (export CC; ${XMKMF-xmkmf}) >/dev/null 2>/dev/null && test -f Makefile; then +acfindx: + @echo 'ac_im_incroot="${INCROOT}"; ac_im_usrlibdir="${USRLIBDIR}"; ac_im_libdir="${LIBDIR}"' +_ACEOF + if (xmkmf) >/dev/null 2>/dev/null && test -f Makefile; then # GNU make sometimes prints "make[1]: Entering...", which would confuse us. - for ac_var in incroot usrlibdir libdir; do - eval "ac_im_$ac_var=\`\${MAKE-make} $ac_var 2>/dev/null | sed -n 's/^$ac_var=//p'\`" - done + eval `${MAKE-make} acfindx 2>/dev/null | grep -v make` # Open Windows xmkmf reportedly sets LIBDIR instead of USRLIBDIR. - for ac_extension in a so sl dylib la dll; do - if test ! -f "$ac_im_usrlibdir/libX11.$ac_extension" && - test -f "$ac_im_libdir/libX11.$ac_extension"; then + for ac_extension in a so sl; do + if test ! -f $ac_im_usrlibdir/libX11.$ac_extension && + test -f $ac_im_libdir/libX11.$ac_extension; then ac_im_usrlibdir=$ac_im_libdir; break fi done @@ -16508,41 +19835,37 @@ _ACEOF # bogus both because they are the default anyway, and because # using them would break gcc on systems where it needs fixed includes. case $ac_im_incroot in - /usr/include) ac_x_includes= ;; + /usr/include) ;; *) test -f "$ac_im_incroot/X11/Xos.h" && ac_x_includes=$ac_im_incroot;; esac case $ac_im_usrlibdir in - /usr/lib | /usr/lib64 | /lib | /lib64) ;; + /usr/lib | /lib) ;; *) test -d "$ac_im_usrlibdir" && ac_x_libraries=$ac_im_usrlibdir ;; esac fi cd .. - rm -f -r conftest.dir + rm -fr conftest.dir fi # Standard set of common directories for X headers. # Check X11 before X11Rn because it is often a symlink to the current release. ac_x_header_dirs=' /usr/X11/include -/usr/X11R7/include /usr/X11R6/include /usr/X11R5/include /usr/X11R4/include /usr/include/X11 -/usr/include/X11R7 /usr/include/X11R6 /usr/include/X11R5 /usr/include/X11R4 /usr/local/X11/include -/usr/local/X11R7/include /usr/local/X11R6/include /usr/local/X11R5/include /usr/local/X11R4/include /usr/local/include/X11 -/usr/local/include/X11R7 /usr/local/include/X11R6 /usr/local/include/X11R5 /usr/local/include/X11R4 @@ -16562,18 +19885,42 @@ ac_x_header_dirs=' /usr/openwin/share/include' if test "$ac_x_includes" = no; then - # Guess where to find include files, by looking for Xlib.h. + # Guess where to find include files, by looking for Intrinsic.h. # First, try using that file with no special directory specified. - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include _ACEOF -if ac_fn_c_try_cpp "$LINENO"; then : +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then # We can compile using X headers with no special include directory. ac_x_includes= else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + for ac_dir in $ac_x_header_dirs; do - if test -r "$ac_dir/X11/Xlib.h"; then + if test -r "$ac_dir/X11/Intrinsic.h"; then ac_x_includes=$ac_dir break fi @@ -16587,76 +19934,102 @@ if test "$ac_x_libraries" = no; then # See if we find them without any special options. # Don't add to $LIBS permanently. ac_save_LIBS=$LIBS - LIBS="-lX11 $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + LIBS="-lXt $LIBS" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -#include +#include int main () { -XrmInitialize () +XtMalloc (0) ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then LIBS=$ac_save_LIBS # We can link X programs with no special library path. ac_x_libraries= else - LIBS=$ac_save_LIBS -for ac_dir in `$as_echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +LIBS=$ac_save_LIBS +for ac_dir in `echo "$ac_x_includes $ac_x_header_dirs" | sed s/include/lib/g` do # Don't even attempt the hair of trying to link an X program! - for ac_extension in a so sl dylib la dll; do - if test -r "$ac_dir/libX11.$ac_extension"; then + for ac_extension in a so sl; do + if test -r $ac_dir/libXt.$ac_extension; then ac_x_libraries=$ac_dir break 2 fi done done fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi # $ac_x_libraries = no -case $ac_x_includes,$ac_x_libraries in #( - no,* | *,no | *\'*) - # Didn't find X, or a directory has "'" in its name. - ac_cv_have_x="have_x=no";; #( - *) - # Record where we found X for the cache. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$ac_x_includes'\ - ac_x_libraries='$ac_x_libraries'" -esac +if test "$ac_x_includes" = no || test "$ac_x_libraries" = no; then + # Didn't find X anywhere. Cache the known absence of X. + ac_cv_have_x="have_x=no" +else + # Record where we found X for the cache. + ac_cv_have_x="have_x=yes \ + ac_x_includes=$ac_x_includes ac_x_libraries=$ac_x_libraries" fi -;; #( - *) have_x=yes;; - esac +fi + + fi eval "$ac_cv_have_x" fi # $with_x != no if test "$have_x" != yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_x" >&5 -$as_echo "$have_x" >&6; } + echo "$as_me:$LINENO: result: $have_x" >&5 +echo "${ECHO_T}$have_x" >&6 no_x=yes else # If each of the values was on the command line, it overrides each guess. test "x$x_includes" = xNONE && x_includes=$ac_x_includes test "x$x_libraries" = xNONE && x_libraries=$ac_x_libraries # Update the cache value to reflect the command line values. - ac_cv_have_x="have_x=yes\ - ac_x_includes='$x_includes'\ - ac_x_libraries='$x_libraries'" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: libraries $x_libraries, headers $x_includes" >&5 -$as_echo "libraries $x_libraries, headers $x_includes" >&6; } + ac_cv_have_x="have_x=yes \ + ac_x_includes=$x_includes ac_x_libraries=$x_libraries" + echo "$as_me:$LINENO: result: libraries $x_libraries, headers $x_includes" >&5 +echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6 fi if test "$no_x" = yes; then # Not all programs may use this symbol, but it does not hurt to define it. -$as_echo "#define X_DISPLAY_MISSING 1" >>confdefs.h +cat >>confdefs.h <<\_ACEOF +#define X_DISPLAY_MISSING 1 +_ACEOF X_CFLAGS= X_PRE_LIBS= X_LIBS= X_EXTRA_LIBS= else @@ -16669,12 +20042,16 @@ else X_LIBS="$X_LIBS -L$x_libraries" # For Solaris; some versions of Sun CC require a space after -R and # others require no space. Words are not sufficient . . . . - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -R must be followed by a space" >&5 -$as_echo_n "checking whether -R must be followed by a space... " >&6; } - ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" - ac_xsave_c_werror_flag=$ac_c_werror_flag - ac_c_werror_flag=yes - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + case `(uname -sr) 2>/dev/null` in + "SunOS 5"*) + echo "$as_me:$LINENO: checking whether -R must be followed by a space" >&5 +echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6 + ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -16685,13 +20062,48 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - X_LIBS="$X_LIBS -R$x_libraries" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_nospace=yes else - LIBS="$ac_xsave_LIBS -R $x_libraries" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_R_nospace=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test $ac_R_nospace = yes; then + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + X_LIBS="$X_LIBS -R$x_libraries" + else + LIBS="$ac_xsave_LIBS -R $x_libraries" + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int @@ -16702,21 +20114,48 @@ main () return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - X_LIBS="$X_LIBS -R $x_libraries" +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_R_space=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: neither works" >&5 -$as_echo "neither works" >&6; } -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_R_space=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext - ac_c_werror_flag=$ac_xsave_c_werror_flag - LIBS=$ac_xsave_LIBS +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext + if test $ac_R_space = yes; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + X_LIBS="$X_LIBS -R $x_libraries" + else + echo "$as_me:$LINENO: result: neither works" >&5 +echo "${ECHO_T}neither works" >&6 + fi + fi + LIBS=$ac_xsave_LIBS + esac fi # Check for system-dependent libraries X programs must link with. @@ -16730,112 +20169,196 @@ rm -f core conftest.err conftest.$ac_objext \ # libraries were built with DECnet support. And Karl Berry says # the Alpha needs dnet_stub (dnet does not exist). ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XOpenDisplay (); int main () { -return XOpenDisplay (); +XOpenDisplay (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : - +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + : else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet... " >&6; } -if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6 +if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -return dnet_ntoa (); +dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_dnet_dnet_ntoa=yes else - ac_cv_lib_dnet_dnet_ntoa=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dnet_dnet_ntoa=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_dnet_ntoa" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6 +if test $ac_cv_lib_dnet_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet" fi if test $ac_cv_lib_dnet_dnet_ntoa = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dnet_ntoa in -ldnet_stub" >&5 -$as_echo_n "checking for dnet_ntoa in -ldnet_stub... " >&6; } -if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for dnet_ntoa in -ldnet_stub" >&5 +echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6 +if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldnet_stub $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char dnet_ntoa (); int main () { -return dnet_ntoa (); +dnet_ntoa (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_dnet_stub_dnet_ntoa=yes else - ac_cv_lib_dnet_stub_dnet_ntoa=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dnet_stub_dnet_ntoa=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 -$as_echo "$ac_cv_lib_dnet_stub_dnet_ntoa" >&6; } -if test "x$ac_cv_lib_dnet_stub_dnet_ntoa" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5 +echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6 +if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub" fi fi fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS="$ac_xsave_LIBS" # msh@cis.ufl.edu says -lnsl (and -lsocket) are needed for his 386/AT, @@ -16846,90 +20369,232 @@ rm -f core conftest.err conftest.$ac_objext \ # on Irix 5.2, according to T.E. Dickey. # The functions gethostbyname, getservbyname, and inet_addr are # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking. - ac_fn_c_check_func "$LINENO" "gethostbyname" "ac_cv_func_gethostbyname" -if test "x$ac_cv_func_gethostbyname" = x""yes; then : + echo "$as_me:$LINENO: checking for gethostbyname" >&5 +echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6 +if test "${ac_cv_func_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define gethostbyname to an innocuous variant, in case declares gethostbyname. + For example, HP-UX 11i declares gettimeofday. */ +#define gethostbyname innocuous_gethostbyname + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char gethostbyname (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef gethostbyname + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char gethostbyname (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_gethostbyname) || defined (__stub___gethostbyname) +choke me +#else +char (*f) () = gethostbyname; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != gethostbyname; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_gethostbyname=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_func_gethostbyname=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $ac_cv_func_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6 if test $ac_cv_func_gethostbyname = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lnsl" >&5 -$as_echo_n "checking for gethostbyname in -lnsl... " >&6; } -if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for gethostbyname in -lnsl" >&5 +echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6 +if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lnsl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char gethostbyname (); int main () { -return gethostbyname (); +gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_nsl_gethostbyname=yes else - ac_cv_lib_nsl_gethostbyname=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_nsl_gethostbyname=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_nsl_gethostbyname" >&5 -$as_echo "$ac_cv_lib_nsl_gethostbyname" >&6; } -if test "x$ac_cv_lib_nsl_gethostbyname" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_nsl_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6 +if test $ac_cv_lib_nsl_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl" fi if test $ac_cv_lib_nsl_gethostbyname = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gethostbyname in -lbsd" >&5 -$as_echo_n "checking for gethostbyname in -lbsd... " >&6; } -if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for gethostbyname in -lbsd" >&5 +echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6 +if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lbsd $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char gethostbyname (); int main () { -return gethostbyname (); +gethostbyname (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_bsd_gethostbyname=yes else - ac_cv_lib_bsd_gethostbyname=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_bsd_gethostbyname=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_bsd_gethostbyname" >&5 -$as_echo "$ac_cv_lib_bsd_gethostbyname" >&6; } -if test "x$ac_cv_lib_bsd_gethostbyname" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_bsd_gethostbyname" >&5 +echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6 +if test $ac_cv_lib_bsd_gethostbyname = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd" fi @@ -16943,147 +20608,489 @@ fi # variants that don't use the name server (or something). -lsocket # must be given before -lnsl if both are needed. We assume that # if connect needs -lnsl, so does gethostbyname. - ac_fn_c_check_func "$LINENO" "connect" "ac_cv_func_connect" -if test "x$ac_cv_func_connect" = x""yes; then : + echo "$as_me:$LINENO: checking for connect" >&5 +echo $ECHO_N "checking for connect... $ECHO_C" >&6 +if test "${ac_cv_func_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define connect to an innocuous variant, in case declares connect. + For example, HP-UX 11i declares gettimeofday. */ +#define connect innocuous_connect + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char connect (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif +#undef connect + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char connect (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_connect) || defined (__stub___connect) +choke me +#else +char (*f) () = connect; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != connect; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_connect=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_connect=no fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_connect" >&5 +echo "${ECHO_T}$ac_cv_func_connect" >&6 if test $ac_cv_func_connect = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for connect in -lsocket" >&5 -$as_echo_n "checking for connect in -lsocket... " >&6; } -if test "${ac_cv_lib_socket_connect+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for connect in -lsocket" >&5 +echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6 +if test "${ac_cv_lib_socket_connect+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lsocket $X_EXTRA_LIBS $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char connect (); int main () { -return connect (); +connect (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_socket_connect=yes else - ac_cv_lib_socket_connect=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_socket_connect=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_socket_connect" >&5 -$as_echo "$ac_cv_lib_socket_connect" >&6; } -if test "x$ac_cv_lib_socket_connect" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_socket_connect" >&5 +echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6 +if test $ac_cv_lib_socket_connect = yes; then X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS" fi fi # Guillermo Gomez says -lposix is necessary on A/UX. - ac_fn_c_check_func "$LINENO" "remove" "ac_cv_func_remove" -if test "x$ac_cv_func_remove" = x""yes; then : + echo "$as_me:$LINENO: checking for remove" >&5 +echo $ECHO_N "checking for remove... $ECHO_C" >&6 +if test "${ac_cv_func_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define remove to an innocuous variant, in case declares remove. + For example, HP-UX 11i declares gettimeofday. */ +#define remove innocuous_remove + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char remove (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef remove + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char remove (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_remove) || defined (__stub___remove) +choke me +#else +char (*f) () = remove; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != remove; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_remove=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_func_remove=no +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext fi +echo "$as_me:$LINENO: result: $ac_cv_func_remove" >&5 +echo "${ECHO_T}$ac_cv_func_remove" >&6 if test $ac_cv_func_remove = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for remove in -lposix" >&5 -$as_echo_n "checking for remove in -lposix... " >&6; } -if test "${ac_cv_lib_posix_remove+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for remove in -lposix" >&5 +echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6 +if test "${ac_cv_lib_posix_remove+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lposix $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char remove (); int main () { -return remove (); +remove (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_posix_remove=yes else - ac_cv_lib_posix_remove=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_posix_remove=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_posix_remove" >&5 -$as_echo "$ac_cv_lib_posix_remove" >&6; } -if test "x$ac_cv_lib_posix_remove" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_posix_remove" >&5 +echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6 +if test $ac_cv_lib_posix_remove = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix" fi fi # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay. - ac_fn_c_check_func "$LINENO" "shmat" "ac_cv_func_shmat" -if test "x$ac_cv_func_shmat" = x""yes; then : + echo "$as_me:$LINENO: checking for shmat" >&5 +echo $ECHO_N "checking for shmat... $ECHO_C" >&6 +if test "${ac_cv_func_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define shmat to an innocuous variant, in case declares shmat. + For example, HP-UX 11i declares gettimeofday. */ +#define shmat innocuous_shmat +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char shmat (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef shmat + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char shmat (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_shmat) || defined (__stub___shmat) +choke me +#else +char (*f) () = shmat; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != shmat; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_func_shmat=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_func_shmat=no fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_func_shmat" >&5 +echo "${ECHO_T}$ac_cv_func_shmat" >&6 if test $ac_cv_func_shmat = no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shmat in -lipc" >&5 -$as_echo_n "checking for shmat in -lipc... " >&6; } -if test "${ac_cv_lib_ipc_shmat+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for shmat in -lipc" >&5 +echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6 +if test "${ac_cv_lib_ipc_shmat+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lipc $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char shmat (); int main () { -return shmat (); +shmat (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_ipc_shmat=yes else - ac_cv_lib_ipc_shmat=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_ipc_shmat=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ipc_shmat" >&5 -$as_echo "$ac_cv_lib_ipc_shmat" >&6; } -if test "x$ac_cv_lib_ipc_shmat" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_ipc_shmat" >&5 +echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6 +if test $ac_cv_lib_ipc_shmat = yes; then X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc" fi @@ -17099,43 +21106,71 @@ fi # These have to be linked with before -lX11, unlike the other # libraries we check for below, so use a different variable. # John Interrante, Karl Berry - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for IceConnectionNumber in -lICE" >&5 -$as_echo_n "checking for IceConnectionNumber in -lICE... " >&6; } -if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for IceConnectionNumber in -lICE" >&5 +echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6 +if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lICE $X_EXTRA_LIBS $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char IceConnectionNumber (); int main () { -return IceConnectionNumber (); +IceConnectionNumber (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_ICE_IceConnectionNumber=yes else - ac_cv_lib_ICE_IceConnectionNumber=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_ICE_IceConnectionNumber=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 -$as_echo "$ac_cv_lib_ICE_IceConnectionNumber" >&6; } -if test "x$ac_cv_lib_ICE_IceConnectionNumber" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5 +echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6 +if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE" fi @@ -17152,92 +21187,154 @@ fi x_libraries="default_x_libraries" fi if test -z "$x_libraries"; then - as_fn_error "No X libraries found" "$LINENO" 5 # Exit + { { echo "$as_me:$LINENO: error: No X libraries found" >&5 +echo "$as_me: error: No X libraries found" >&2;} + { (exit 1); exit 1; }; } # Exit fi if test -z "$x_includes"; then - as_fn_error "No X includes found" "$LINENO" 5 # Exit + { { echo "$as_me:$LINENO: error: No X includes found" >&5 +echo "$as_me: error: No X includes found" >&2;} + { (exit 1); exit 1; }; } # Exit fi CFLAGS=$X_CFLAGS LDFLAGS="$X_LDFLAGS $X_LIBS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XOpenDisplay in -lX11" >&5 -$as_echo_n "checking for XOpenDisplay in -lX11... " >&6; } -if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for XOpenDisplay in -lX11" >&5 +echo $ECHO_N "checking for XOpenDisplay in -lX11... $ECHO_C" >&6 +if test "${ac_cv_lib_X11_XOpenDisplay+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lX11 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XOpenDisplay (); int main () { -return XOpenDisplay (); +XOpenDisplay (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_X11_XOpenDisplay=yes else - ac_cv_lib_X11_XOpenDisplay=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_X11_XOpenDisplay=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_X11_XOpenDisplay" >&5 -$as_echo "$ac_cv_lib_X11_XOpenDisplay" >&6; } -if test "x$ac_cv_lib_X11_XOpenDisplay" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_X11_XOpenDisplay" >&5 +echo "${ECHO_T}$ac_cv_lib_X11_XOpenDisplay" >&6 +if test $ac_cv_lib_X11_XOpenDisplay = yes; then x_libs="-lX11 $X_EXTRA_LIBS" else - as_fn_error "X Development libraries not found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: X Development libraries not found" >&5 +echo "$as_me: error: X Development libraries not found" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XauDisposeAuth in -lXau" >&5 -$as_echo_n "checking for XauDisposeAuth in -lXau... " >&6; } -if test "${ac_cv_lib_Xau_XauDisposeAuth+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for XauDisposeAuth in -lXau" >&5 +echo $ECHO_N "checking for XauDisposeAuth in -lXau... $ECHO_C" >&6 +if test "${ac_cv_lib_Xau_XauDisposeAuth+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXau $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XauDisposeAuth (); int main () { -return XauDisposeAuth (); +XauDisposeAuth (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_Xau_XauDisposeAuth=yes else - ac_cv_lib_Xau_XauDisposeAuth=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_Xau_XauDisposeAuth=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5 -$as_echo "$ac_cv_lib_Xau_XauDisposeAuth" >&6; } -if test "x$ac_cv_lib_Xau_XauDisposeAuth" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_Xau_XauDisposeAuth" >&5 +echo "${ECHO_T}$ac_cv_lib_Xau_XauDisposeAuth" >&6 +if test $ac_cv_lib_Xau_XauDisposeAuth = yes; then XAU_LIBS="-lXau" fi @@ -17269,110 +21366,384 @@ fi if test "$_os" != "WINNT" -a "$_os" != "OS2" -a "$_os" != "Darwin"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use Xaw" >&5 -$as_echo_n "checking whether to use Xaw... " >&6; } + echo "$as_me:$LINENO: checking whether to use Xaw" >&5 +echo $ECHO_N "checking whether to use Xaw... $ECHO_C" >&6 if test "$enable_Xaw" = "no"; then DISABLE_XAW=TRUE - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - for ac_header in X11/Composite.h -do : - ac_fn_c_check_header_compile "$LINENO" "X11/Composite.h" "ac_cv_header_X11_Composite_h" "#include -" -if test "x$ac_cv_header_X11_Composite_h" = x""yes; then : + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + +for ac_header in X11/Composite.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_X11_COMPOSITE_H 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF else - as_fn_error "Xt include headers not found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Xt include headers not found" >&5 +echo "$as_me: error: Xt include headers not found" >&2;} + { (exit 1); exit 1; }; } fi done else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - for ac_header in X11/Xaw/Label.h -do : - ac_fn_c_check_header_compile "$LINENO" "X11/Xaw/Label.h" "ac_cv_header_X11_Xaw_Label_h" "#include -" -if test "x$ac_cv_header_X11_Xaw_Label_h" = x""yes; then : + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + +for ac_header in X11/Xaw/Label.h +do +as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_header" >&5 +echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6 +if eval "test \"\${$as_ac_Header+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +#include <$ac_header> +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_Header=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_Header=no" +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6 +if test `eval echo '${'$as_ac_Header'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_X11_XAW_LABEL_H 1 +#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1 _ACEOF else - as_fn_error "Xaw include headers not found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Xaw include headers not found" >&5 +echo "$as_me: error: Xaw include headers not found" >&2;} + { (exit 1); exit 1; }; } fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lXaw" >&5 -$as_echo_n "checking for main in -lXaw... " >&6; } -if test "${ac_cv_lib_Xaw_main+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for main in -lXaw" >&5 +echo $ECHO_N "checking for main in -lXaw... $ECHO_C" >&6 +if test "${ac_cv_lib_Xaw_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXaw $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int main () { -return main (); +main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_Xaw_main=yes else - ac_cv_lib_Xaw_main=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_Xaw_main=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xaw_main" >&5 -$as_echo "$ac_cv_lib_Xaw_main" >&6; } -if test "x$ac_cv_lib_Xaw_main" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_Xaw_main" >&5 +echo "${ECHO_T}$ac_cv_lib_Xaw_main" >&6 +if test $ac_cv_lib_Xaw_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXAW 1 _ACEOF - LIBS="-lXaw $LIBS" + LIBS="-lXaw $LIBS" + +else + { { echo "$as_me:$LINENO: error: Xaw library not found or functional" >&5 +echo "$as_me: error: Xaw library not found or functional" >&2;} + { (exit 1); exit 1; }; } +fi + + fi +fi + + + + +if test "$ENABLE_FONTCONFIG" = "TRUE" ; then + if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then + echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 +echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6 +if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 +echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking fontconfig/fontconfig.h usability" >&5 +echo $ECHO_N "checking fontconfig/fontconfig.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 +# Is the header present? +echo "$as_me:$LINENO: checking fontconfig/fontconfig.h presence" >&5 +echo $ECHO_N "checking fontconfig/fontconfig.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi else - as_fn_error "Xaw library not found or functional" "$LINENO" 5 + ac_cpp_err=yes fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - fi + ac_header_preproc=no fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: fontconfig/fontconfig.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for fontconfig/fontconfig.h" >&5 +echo $ECHO_N "checking for fontconfig/fontconfig.h... $ECHO_C" >&6 +if test "${ac_cv_header_fontconfig_fontconfig_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_fontconfig_fontconfig_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_fontconfig_fontconfig_h" >&5 +echo "${ECHO_T}$ac_cv_header_fontconfig_fontconfig_h" >&6 - - -if test "$ENABLE_FONTCONFIG" = "TRUE" ; then - ac_fn_c_check_header_mongrel "$LINENO" "fontconfig/fontconfig.h" "ac_cv_header_fontconfig_fontconfig_h" "$ac_includes_default" -if test "x$ac_cv_header_fontconfig_fontconfig_h" = x""yes; then : - +fi +if test $ac_cv_header_fontconfig_fontconfig_h = yes; then + : else - as_fn_error "fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&5 +echo "$as_me: error: fontconfig/fontconfig.h could not be found. libfontconfig1-dev or fontconfig???-devel missing?" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether fontconfig is >= 2.2.0" >&5 -$as_echo_n "checking whether fontconfig is >= 2.2.0... " >&6; } - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } + echo "$as_me:$LINENO: checking whether fontconfig is >= 2.2.0" >&5 +echo $ECHO_N "checking whether fontconfig is >= 2.2.0... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -17383,89 +21754,271 @@ int main(int argc, char **argv) { } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - as_fn_error "no, fontconfig >= 2.2.0 needed" "$LINENO" 5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: no, fontconfig >= 2.2.0 needed" >&5 +echo "$as_me: error: no, fontconfig >= 2.2.0 needed" >&2;} + { (exit 1); exit 1; }; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to link to Xrender" >&5 -$as_echo_n "checking whether to link to Xrender... " >&6; } +echo "$as_me:$LINENO: checking whether to link to Xrender" >&5 +echo $ECHO_N "checking whether to link to Xrender... $ECHO_C" >&6 if test -n "$enable_xrender_link" -a "$enable_xrender_link" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 XRENDER_LINK=YES with_system_xrender_headers=yes else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, dynamically open it" >&5 -$as_echo "no, dynamically open it" >&6; } + echo "$as_me:$LINENO: result: no, dynamically open it" >&5 +echo "${ECHO_T}no, dynamically open it" >&6 XRENDER_LINK=NO fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which Xrender headers to use" >&5 -$as_echo_n "checking which Xrender headers to use... " >&6; } +echo "$as_me:$LINENO: checking which Xrender headers to use" >&5 +echo $ECHO_N "checking which Xrender headers to use... $ECHO_C" >&6 if test -n "$with_system_xrender_headers" -o -n "$with_system_headers" && \ test "$with_system_xrender_headers" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_XRENDER_HEADERS=YES - ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xrender.h" "ac_cv_header_X11_extensions_Xrender_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_extensions_Xrender_h" = x""yes; then : + if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then + echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking X11/extensions/Xrender.h usability" >&5 +echo $ECHO_N "checking X11/extensions/Xrender.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking X11/extensions/Xrender.h presence" >&5 +echo $ECHO_N "checking X11/extensions/Xrender.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: X11/extensions/Xrender.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for X11/extensions/Xrender.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrender.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_Xrender_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_X11_extensions_Xrender_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrender_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrender_h" >&6 +fi +if test $ac_cv_header_X11_extensions_Xrender_h = yes; then + : else - as_fn_error "Xrender not found. install X" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Xrender not found. install X" >&5 +echo "$as_me: error: Xrender not found. install X" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_XRENDER_HEADERS=NO BUILD_TYPE="$BUILD_TYPE X11_EXTENSIONS" fi if test "$XRENDER_LINK" = "YES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRenderQueryVersion in -lXrender" >&5 -$as_echo_n "checking for XRenderQueryVersion in -lXrender... " >&6; } -if test "${ac_cv_lib_Xrender_XRenderQueryVersion+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for XRenderQueryVersion in -lXrender" >&5 +echo $ECHO_N "checking for XRenderQueryVersion in -lXrender... $ECHO_C" >&6 +if test "${ac_cv_lib_Xrender_XRenderQueryVersion+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXrender $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XRenderQueryVersion (); int main () { -return XRenderQueryVersion (); +XRenderQueryVersion (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_Xrender_XRenderQueryVersion=yes else - ac_cv_lib_Xrender_XRenderQueryVersion=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_Xrender_XRenderQueryVersion=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5 -$as_echo "$ac_cv_lib_Xrender_XRenderQueryVersion" >&6; } -if test "x$ac_cv_lib_Xrender_XRenderQueryVersion" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_Xrender_XRenderQueryVersion" >&5 +echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryVersion" >&6 +if test $ac_cv_lib_Xrender_XRenderQueryVersion = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXRENDER 1 _ACEOF @@ -17473,20 +22026,22 @@ _ACEOF LIBS="-lXrender $LIBS" else - as_fn_error "libXrender not found or functional" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libXrender not found or functional" >&5 +echo "$as_me: error: libXrender not found or functional" >&2;} + { (exit 1); exit 1; }; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable RandR support" >&5 -$as_echo_n "checking whether to enable RandR support... " >&6; } +echo "$as_me:$LINENO: checking whether to enable RandR support" >&5 +echo $ECHO_N "checking whether to enable RandR support... $ECHO_C" >&6 if test "$test_randr" = "yes" -a \( "$enable_randr" = "yes" -o "$enable_randr" = "TRUE" \) ; then if test -z "$enable_randr_link" -o "$enable_randr_link" = "no"; then XRANDR_DLOPEN="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: resorting to dlopen libXrandr at runtime" >&5 -$as_echo "resorting to dlopen libXrandr at runtime" >&6; } + echo "$as_me:$LINENO: result: resorting to dlopen libXrandr at runtime" >&5 +echo "${ECHO_T}resorting to dlopen libXrandr at runtime" >&6 else XRANDR_DLOPEN="FALSE" @@ -17495,10 +22050,10 @@ $as_echo "resorting to dlopen libXrandr at runtime" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -17510,30 +22065,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -17544,25 +22098,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xrandr >= 1.2" >&5 -$as_echo_n "checking for xrandr >= 1.2... " >&6; } + echo "$as_me:$LINENO: checking for xrandr >= 1.2" >&5 +echo $ECHO_N "checking for xrandr >= 1.2... $ECHO_C" >&6 if $PKG_CONFIG --exists "xrandr >= 1.2" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking XRANDR_CFLAGS" >&5 -$as_echo_n "checking XRANDR_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking XRANDR_CFLAGS" >&5 +echo $ECHO_N "checking XRANDR_CFLAGS... $ECHO_C" >&6 XRANDR_CFLAGS=`$PKG_CONFIG --cflags "xrandr >= 1.2"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XRANDR_CFLAGS" >&5 -$as_echo "$XRANDR_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $XRANDR_CFLAGS" >&5 +echo "${ECHO_T}$XRANDR_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking XRANDR_LIBS" >&5 -$as_echo_n "checking XRANDR_LIBS... " >&6; } + echo "$as_me:$LINENO: checking XRANDR_LIBS" >&5 +echo $ECHO_N "checking XRANDR_LIBS... $ECHO_C" >&6 XRANDR_LIBS=`$PKG_CONFIG --libs "xrandr >= 1.2"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XRANDR_LIBS" >&5 -$as_echo "$XRANDR_LIBS" >&6; } + echo "$as_me:$LINENO: result: $XRANDR_LIBS" >&5 +echo "${ECHO_T}$XRANDR_LIBS" >&6 else XRANDR_CFLAGS="" XRANDR_LIBS="" @@ -17587,52 +22141,219 @@ $as_echo "$XRANDR_LIBS" >&6; } fi if test "$ENABLE_RANDR" != "TRUE"; then - ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xrandr.h" "ac_cv_header_X11_extensions_Xrandr_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_extensions_Xrandr_h" = x""yes; then : + if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then + echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h usability" >&5 +echo $ECHO_N "checking X11/extensions/Xrandr.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking X11/extensions/Xrandr.h presence" >&5 +echo $ECHO_N "checking X11/extensions/Xrandr.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: X11/extensions/Xrandr.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for X11/extensions/Xrandr.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xrandr.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_Xrandr_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_X11_extensions_Xrandr_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xrandr_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xrandr_h" >&6 +fi +if test $ac_cv_header_X11_extensions_Xrandr_h = yes; then + : else - as_fn_error "X11/extensions/Xrandr.h could not be found. X11 dev missing?" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&5 +echo "$as_me: error: X11/extensions/Xrandr.h could not be found. X11 dev missing?" >&2;} + { (exit 1); exit 1; }; } fi XRANDR_CFLAGS=" " - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XRRQueryExtension in -lXrandr" >&5 -$as_echo_n "checking for XRRQueryExtension in -lXrandr... " >&6; } -if test "${ac_cv_lib_Xrandr_XRRQueryExtension+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for XRRQueryExtension in -lXrandr" >&5 +echo $ECHO_N "checking for XRRQueryExtension in -lXrandr... $ECHO_C" >&6 +if test "${ac_cv_lib_Xrandr_XRRQueryExtension+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXrandr $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XRRQueryExtension (); int main () { -return XRRQueryExtension (); +XRRQueryExtension (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_Xrandr_XRRQueryExtension=yes else - ac_cv_lib_Xrandr_XRRQueryExtension=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_Xrandr_XRRQueryExtension=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5 -$as_echo "$ac_cv_lib_Xrandr_XRRQueryExtension" >&6; } -if test "x$ac_cv_lib_Xrandr_XRRQueryExtension" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_Xrandr_XRRQueryExtension" >&5 +echo "${ECHO_T}$ac_cv_lib_Xrandr_XRRQueryExtension" >&6 +if test $ac_cv_lib_Xrandr_XRRQueryExtension = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXRANDR 1 _ACEOF @@ -17640,51 +22361,53 @@ _ACEOF LIBS="-lXrandr $LIBS" else - as_fn_error "libXrandr not found or functional" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libXrandr not found or functional" >&5 +echo "$as_me: error: libXrandr not found or functional" >&2;} + { (exit 1); exit 1; }; } fi XRANDR_LIBS="-lXrandr " ENABLE_RANDR="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: enabling RandR support" >&5 -$as_echo "enabling RandR support" >&6; } + echo "$as_me:$LINENO: result: enabling RandR support" >&5 +echo "${ECHO_T}enabling RandR support" >&6 fi fi else ENABLE_RANDR="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use neon" >&5 -$as_echo_n "checking whether to use neon... " >&6; } +echo "$as_me:$LINENO: checking whether to use neon" >&5 +echo $ECHO_N "checking whether to use neon... $ECHO_C" >&6 if test "$enable_neon" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 DISABLE_NEON=TRUE else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which neon to use" >&5 -$as_echo_n "checking which neon to use... " >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 +echo "$as_me:$LINENO: checking which neon to use" >&5 +echo $ECHO_N "checking which neon to use... $ECHO_C" >&6 if test -n "$with_system_neon" -o -n "$with_system_libs" && \ test "$with_system_neon" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -17696,30 +22419,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -17730,25 +22452,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for neon >= 0.24.0" >&5 -$as_echo_n "checking for neon >= 0.24.0... " >&6; } + echo "$as_me:$LINENO: checking for neon >= 0.24.0" >&5 +echo $ECHO_N "checking for neon >= 0.24.0... $ECHO_C" >&6 if $PKG_CONFIG --exists "neon >= 0.24.0" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking NEON_CFLAGS" >&5 -$as_echo_n "checking NEON_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking NEON_CFLAGS" >&5 +echo $ECHO_N "checking NEON_CFLAGS... $ECHO_C" >&6 NEON_CFLAGS=`$PKG_CONFIG --cflags "neon >= 0.24.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NEON_CFLAGS" >&5 -$as_echo "$NEON_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $NEON_CFLAGS" >&5 +echo "${ECHO_T}$NEON_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking NEON_LIBS" >&5 -$as_echo_n "checking NEON_LIBS... " >&6; } + echo "$as_me:$LINENO: checking NEON_LIBS" >&5 +echo $ECHO_N "checking NEON_LIBS... $ECHO_C" >&6 NEON_LIBS=`$PKG_CONFIG --libs "neon >= 0.24.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NEON_LIBS" >&5 -$as_echo "$NEON_LIBS" >&6; } + echo "$as_me:$LINENO: result: $NEON_LIBS" >&5 +echo "${ECHO_T}$NEON_LIBS" >&6 else NEON_CFLAGS="" NEON_LIBS="" @@ -17769,15 +22491,17 @@ $as_echo "$NEON_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "you need neon >= 0.24.x for system-neon" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: you need neon >= 0.24.x for system-neon" >&5 +echo "$as_me: error: you need neon >= 0.24.x for system-neon" >&2;} + { (exit 1); exit 1; }; } fi NEON_VERSION="`$PKG_CONFIG --modversion neon | $SED 's/\.//g'`" NEON_CFLAGS="$NEON_CFLAGS -DSYSTEM_NEON -DUSE_DAV_LOCKS=1" SYSTEM_NEON=YES else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_NEON=NO NEON_LIBS=-lneon NEON_CFLAGS= @@ -17792,12 +22516,12 @@ fi if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then with_system_openssl=yes fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libssl to use" >&5 -$as_echo_n "checking which libssl to use... " >&6; } +echo "$as_me:$LINENO: checking which libssl to use" >&5 +echo $ECHO_N "checking which libssl to use... $ECHO_C" >&6 if test -n "$with_system_openssl" -o -n "$with_system_libs" && \ test "$with_system_openssl" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 # Mac OS builds should get out without extra stuff is the Mac porters' # wish. And pkg-config is although Xcode ships a .pc for openssl if test "$_os" = "Darwin"; then @@ -17810,10 +22534,10 @@ $as_echo "external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -17825,30 +22549,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -17859,25 +22582,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for openssl " >&5 -$as_echo_n "checking for openssl ... " >&6; } + echo "$as_me:$LINENO: checking for openssl " >&5 +echo $ECHO_N "checking for openssl ... $ECHO_C" >&6 if $PKG_CONFIG --exists "openssl " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking OPENSSL_CFLAGS" >&5 -$as_echo_n "checking OPENSSL_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking OPENSSL_CFLAGS" >&5 +echo $ECHO_N "checking OPENSSL_CFLAGS... $ECHO_C" >&6 OPENSSL_CFLAGS=`$PKG_CONFIG --cflags "openssl "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_CFLAGS" >&5 -$as_echo "$OPENSSL_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $OPENSSL_CFLAGS" >&5 +echo "${ECHO_T}$OPENSSL_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking OPENSSL_LIBS" >&5 -$as_echo_n "checking OPENSSL_LIBS... " >&6; } + echo "$as_me:$LINENO: checking OPENSSL_LIBS" >&5 +echo $ECHO_N "checking OPENSSL_LIBS... $ECHO_C" >&6 OPENSSL_LIBS=`$PKG_CONFIG --libs "openssl "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL_LIBS" >&5 -$as_echo "$OPENSSL_LIBS" >&6; } + echo "$as_me:$LINENO: result: $OPENSSL_LIBS" >&5 +echo "${ECHO_T}$OPENSSL_LIBS" >&6 else OPENSSL_CFLAGS="" OPENSSL_LIBS="" @@ -17898,14 +22621,16 @@ $as_echo "$OPENSSL_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (openssl ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi fi SYSTEM_OPENSSL=YES else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_OPENSSL=NO BUILD_TYPE="$BUILD_TYPE OPENSSL" fi @@ -17913,33 +22638,33 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable agg" >&5 -$as_echo_n "checking whether to enable agg... " >&6; } +echo "$as_me:$LINENO: checking whether to enable agg" >&5 +echo $ECHO_N "checking whether to enable agg... $ECHO_C" >&6 if test "$with_agg" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_AGG=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which AGG to use" >&5 -$as_echo_n "checking which AGG to use... " >&6; } + echo "$as_me:$LINENO: checking which AGG to use" >&5 +echo $ECHO_N "checking which AGG to use... $ECHO_C" >&6 if test -n "$with_system_agg" -o -n "$with_system_libs" && \ test "$with_system_agg" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -17951,30 +22676,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -17985,25 +22709,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libagg >= 2.3" >&5 -$as_echo_n "checking for libagg >= 2.3... " >&6; } + echo "$as_me:$LINENO: checking for libagg >= 2.3" >&5 +echo $ECHO_N "checking for libagg >= 2.3... $ECHO_C" >&6 if $PKG_CONFIG --exists "libagg >= 2.3" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking AGG_CFLAGS" >&5 -$as_echo_n "checking AGG_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking AGG_CFLAGS" >&5 +echo $ECHO_N "checking AGG_CFLAGS... $ECHO_C" >&6 AGG_CFLAGS=`$PKG_CONFIG --cflags "libagg >= 2.3"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AGG_CFLAGS" >&5 -$as_echo "$AGG_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $AGG_CFLAGS" >&5 +echo "${ECHO_T}$AGG_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking AGG_LIBS" >&5 -$as_echo_n "checking AGG_LIBS... " >&6; } + echo "$as_me:$LINENO: checking AGG_LIBS" >&5 +echo $ECHO_N "checking AGG_LIBS... $ECHO_C" >&6 AGG_LIBS=`$PKG_CONFIG --libs "libagg >= 2.3"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AGG_LIBS" >&5 -$as_echo "$AGG_LIBS" >&6; } + echo "$as_me:$LINENO: result: $AGG_LIBS" >&5 +echo "${ECHO_T}$AGG_LIBS" >&6 else AGG_CFLAGS="" AGG_LIBS="" @@ -18024,11 +22748,13 @@ $as_echo "$AGG_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (libagg >= 2.3) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking agg version" >&5 -$as_echo_n "checking agg version... " >&6; } + echo "$as_me:$LINENO: checking agg version" >&5 +echo $ECHO_N "checking agg version... $ECHO_C" >&6 # workaround; if AGG_CFLAGS is empty (broken libagg.pc in 2.3), add /usr/include/agg2 anyway # (/usr/include gets stripped from pkg-config output) if test -z "$AGG_CFLAGS" || test "$AGG_CFLAGS" = " "; then @@ -18040,21 +22766,23 @@ $as_echo_n "checking agg version... " >&6; } $PKG_CONFIG --modversion libagg | grep -q 2.4; then # 2.4's libagg.pc.in still contains 2.3 :/ if $EGREP -q "Version 2.4" `echo $AGG_INCDIR`/agg_basics.h; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.4" >&5 -$as_echo "2.4" >&6; } + echo "$as_me:$LINENO: result: 2.4" >&5 +echo "${ECHO_T}2.4" >&6 AGG_VERSION=2400 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.3" >&5 -$as_echo "2.3" >&6; } + echo "$as_me:$LINENO: result: 2.3" >&5 +echo "${ECHO_T}2.3" >&6 AGG_VERSION=2300 fi SYSTEM_AGG=YES else - as_fn_error "only agg 2.3 and 2.4 are supported" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: only agg 2.3 and 2.4 are supported" >&5 +echo "$as_me: error: only agg 2.3 and 2.4 are supported" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_AGG=NO AGG_VERSION=2300 BUILD_TYPE="$BUILD_TYPE AGG" @@ -18063,12 +22791,12 @@ $as_echo "internal" >&6; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which redland library to use" >&5 -$as_echo_n "checking which redland library to use... " >&6; } +echo "$as_me:$LINENO: checking which redland library to use" >&5 +echo $ECHO_N "checking which redland library to use... $ECHO_C" >&6 if test -n "$with_system_redland" -o -n "$with_system_libs" && \ test "$with_system_redland" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_REDLAND=YES succeeded=no @@ -18076,10 +22804,10 @@ $as_echo "external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -18091,30 +22819,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -18125,25 +22852,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for redland >= 1.0.8" >&5 -$as_echo_n "checking for redland >= 1.0.8... " >&6; } + echo "$as_me:$LINENO: checking for redland >= 1.0.8" >&5 +echo $ECHO_N "checking for redland >= 1.0.8... $ECHO_C" >&6 if $PKG_CONFIG --exists "redland >= 1.0.8" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking REDLAND_CFLAGS" >&5 -$as_echo_n "checking REDLAND_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking REDLAND_CFLAGS" >&5 +echo $ECHO_N "checking REDLAND_CFLAGS... $ECHO_C" >&6 REDLAND_CFLAGS=`$PKG_CONFIG --cflags "redland >= 1.0.8"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $REDLAND_CFLAGS" >&5 -$as_echo "$REDLAND_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $REDLAND_CFLAGS" >&5 +echo "${ECHO_T}$REDLAND_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking REDLAND_LIBS" >&5 -$as_echo_n "checking REDLAND_LIBS... " >&6; } + echo "$as_me:$LINENO: checking REDLAND_LIBS" >&5 +echo $ECHO_N "checking REDLAND_LIBS... $ECHO_C" >&6 REDLAND_LIBS=`$PKG_CONFIG --libs "redland >= 1.0.8"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $REDLAND_LIBS" >&5 -$as_echo "$REDLAND_LIBS" >&6; } + echo "$as_me:$LINENO: result: $REDLAND_LIBS" >&5 +echo "${ECHO_T}$REDLAND_LIBS" >&6 else REDLAND_CFLAGS="" REDLAND_LIBS="" @@ -18164,26 +22891,28 @@ $as_echo "$REDLAND_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (redland >= 1.0.8) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (redland >= 1.0.8) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (redland >= 1.0.8) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 BUILD_TYPE="$BUILD_TYPE REDLAND" SYSTEM_REDLAND=NO fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libhunspell to use" >&5 -$as_echo_n "checking which libhunspell to use... " >&6; } +echo "$as_me:$LINENO: checking which libhunspell to use" >&5 +echo $ECHO_N "checking which libhunspell to use... $ECHO_C" >&6 if test -n "$with_system_hunspell" -o -n "$with_system_libs" && \ test "$with_system_hunspell" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_HUNSPELL=YES - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -18195,10 +22924,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -18210,30 +22939,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -18244,25 +22972,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hunspell" >&5 -$as_echo_n "checking for hunspell... " >&6; } + echo "$as_me:$LINENO: checking for hunspell" >&5 +echo $ECHO_N "checking for hunspell... $ECHO_C" >&6 if $PKG_CONFIG --exists "hunspell" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking HUNSPELL_CFLAGS" >&5 -$as_echo_n "checking HUNSPELL_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking HUNSPELL_CFLAGS" >&5 +echo $ECHO_N "checking HUNSPELL_CFLAGS... $ECHO_C" >&6 HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HUNSPELL_CFLAGS" >&5 -$as_echo "$HUNSPELL_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $HUNSPELL_CFLAGS" >&5 +echo "${ECHO_T}$HUNSPELL_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking HUNSPELL_LIBS" >&5 -$as_echo_n "checking HUNSPELL_LIBS... " >&6; } + echo "$as_me:$LINENO: checking HUNSPELL_LIBS" >&5 +echo $ECHO_N "checking HUNSPELL_LIBS... $ECHO_C" >&6 HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HUNSPELL_LIBS" >&5 -$as_echo "$HUNSPELL_LIBS" >&6; } + echo "$as_me:$LINENO: result: $HUNSPELL_LIBS" >&5 +echo "${ECHO_T}$HUNSPELL_LIBS" >&6 else HUNSPELL_CFLAGS="" HUNSPELL_LIBS="" @@ -18274,29 +23002,303 @@ $as_echo "$HUNSPELL_LIBS" >&6; } - else - echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." - echo "*** See http://www.freedesktop.org/software/pkgconfig" - fi - fi + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HUNSPELL_PC="TRUE" + else + HUNSPELL_PC="" + fi + + if test "$HUNSPELL_PC" != "TRUE"; then + if test "${ac_cv_header_hunspell_hxx+set}" = set; then + echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 +echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6 +if test "${ac_cv_header_hunspell_hxx+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking hunspell.hxx usability" >&5 +echo $ECHO_N "checking hunspell.hxx usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking hunspell.hxx presence" >&5 +echo $ECHO_N "checking hunspell.hxx presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: hunspell.hxx: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: present but cannot be compiled" >&5 +echo "$as_me: WARNING: hunspell.hxx: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: hunspell.hxx: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: hunspell.hxx: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: hunspell.hxx: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: hunspell.hxx: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for hunspell.hxx" >&5 +echo $ECHO_N "checking for hunspell.hxx... $ECHO_C" >&6 +if test "${ac_cv_header_hunspell_hxx+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_hunspell_hxx=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_hunspell_hxx" >&6 + +fi +if test $ac_cv_header_hunspell_hxx = yes; then + : +else + + if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then + echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 +echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6 +if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking hunspell/hunspell.hxx usability" >&5 +echo $ECHO_N "checking hunspell/hunspell.hxx usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 - if test $succeeded = yes; then - HUNSPELL_PC="TRUE" +# Is the header present? +echo "$as_me:$LINENO: checking hunspell/hunspell.hxx presence" >&5 +echo $ECHO_N "checking hunspell/hunspell.hxx presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag else - HUNSPELL_PC="" + ac_cpp_err= fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 - if test "$HUNSPELL_PC" != "TRUE"; then - ac_fn_cxx_check_header_mongrel "$LINENO" "hunspell.hxx" "ac_cv_header_hunspell_hxx" "$ac_includes_default" -if test "x$ac_cv_header_hunspell_hxx" = x""yes; then : + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: hunspell/hunspell.hxx: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for hunspell/hunspell.hxx" >&5 +echo $ECHO_N "checking for hunspell/hunspell.hxx... $ECHO_C" >&6 +if test "${ac_cv_header_hunspell_hunspell_hxx+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else + ac_cv_header_hunspell_hunspell_hxx=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_hunspell_hunspell_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_hunspell_hunspell_hxx" >&6 - ac_fn_cxx_check_header_mongrel "$LINENO" "hunspell/hunspell.hxx" "ac_cv_header_hunspell_hunspell_hxx" "$ac_includes_default" -if test "x$ac_cv_header_hunspell_hunspell_hxx" = x""yes; then : +fi +if test $ac_cv_header_hunspell_hunspell_hxx = yes; then HUNSPELL_CFLAGS=-I/usr/include/hunspell else - as_fn_error "hunspell headers not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: hunspell headers not found." >&5 +echo "$as_me: error: hunspell headers not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -18304,37 +23306,66 @@ fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lhunspell" >&5 -$as_echo_n "checking for main in -lhunspell... " >&6; } -if test "${ac_cv_lib_hunspell_main+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for main in -lhunspell" >&5 +echo $ECHO_N "checking for main in -lhunspell... $ECHO_C" >&6 +if test "${ac_cv_lib_hunspell_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhunspell $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int main () { -return main (); +main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_hunspell_main=yes else - ac_cv_lib_hunspell_main=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_hunspell_main=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hunspell_main" >&5 -$as_echo "$ac_cv_lib_hunspell_main" >&6; } -if test "x$ac_cv_lib_hunspell_main" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_hunspell_main" >&5 +echo "${ECHO_T}$ac_cv_lib_hunspell_main" >&6 +if test $ac_cv_lib_hunspell_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBHUNSPELL 1 _ACEOF @@ -18342,7 +23373,9 @@ _ACEOF LIBS="-lhunspell $LIBS" else - as_fn_error "hunspell library not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: hunspell library not found." >&5 +echo "$as_me: error: hunspell library not found." >&2;} + { (exit 1); exit 1; }; } fi HUNSPELL_LIBS=-lhunspell @@ -18354,8 +23387,8 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_HUNSPELL=NO BUILD_TYPE="$BUILD_TYPE HUNSPELL" fi @@ -18363,175 +23396,506 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which altlinuxhyph to use" >&5 -$as_echo_n "checking which altlinuxhyph to use... " >&6; } +echo "$as_me:$LINENO: checking which altlinuxhyph to use" >&5 +echo $ECHO_N "checking which altlinuxhyph to use... $ECHO_C" >&6 if test -n "$with_system_altlinuxhyph" -o -n "$with_system_libs" && \ test "$with_system_altlinuxhyph" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_HYPH=YES - ac_fn_c_check_header_mongrel "$LINENO" "hyphen.h" "ac_cv_header_hyphen_h" "$ac_includes_default" -if test "x$ac_cv_header_hyphen_h" = x""yes; then : + if test "${ac_cv_header_hyphen_h+set}" = set; then + echo "$as_me:$LINENO: checking for hyphen.h" >&5 +echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6 +if test "${ac_cv_header_hyphen_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 +echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking hyphen.h usability" >&5 +echo $ECHO_N "checking hyphen.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking hyphen.h presence" >&5 +echo $ECHO_N "checking hyphen.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: hyphen.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: hyphen.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: hyphen.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: hyphen.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: hyphen.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: hyphen.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: hyphen.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: hyphen.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: hyphen.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: hyphen.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for hyphen.h" >&5 +echo $ECHO_N "checking for hyphen.h... $ECHO_C" >&6 +if test "${ac_cv_header_hyphen_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_hyphen_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_hyphen_h" >&5 +echo "${ECHO_T}$ac_cv_header_hyphen_h" >&6 +fi +if test $ac_cv_header_hyphen_h = yes; then + : else - as_fn_error "altlinuxhyph headers not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: altlinuxhyph headers not found." >&5 +echo "$as_me: error: altlinuxhyph headers not found." >&2;} + { (exit 1); exit 1; }; } fi - ac_fn_c_check_member "$LINENO" "struct _HyphenDict" "cset" "ac_cv_member_struct__HyphenDict_cset" "#include -" -if test "x$ac_cv_member_struct__HyphenDict_cset" = x""yes; then : + echo "$as_me:$LINENO: checking for struct _HyphenDict.cset" >&5 +echo $ECHO_N "checking for struct _HyphenDict.cset... $ECHO_C" >&6 +if test "${ac_cv_member_struct__HyphenDict_cset+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +static struct _HyphenDict ac_aggr; +if (ac_aggr.cset) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct__HyphenDict_cset=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include + +int +main () +{ +static struct _HyphenDict ac_aggr; +if (sizeof ac_aggr.cset) +return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_member_struct__HyphenDict_cset=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 +ac_cv_member_struct__HyphenDict_cset=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_member_struct__HyphenDict_cset" >&5 +echo "${ECHO_T}$ac_cv_member_struct__HyphenDict_cset" >&6 +if test $ac_cv_member_struct__HyphenDict_cset = yes; then + : else - as_fn_error "no. You are sure you have altlinuyhyph headers?" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no. You are sure you have altlinuyhyph headers?" >&5 +echo "$as_me: error: no. You are sure you have altlinuyhyph headers?" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5 -$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyphen... " >&6; } -if test "${ac_cv_lib_hyphen_hnj_hyphen_hyphenate2+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyphen" >&5 +echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyphen... $ECHO_C" >&6 +if test "${ac_cv_lib_hyphen_hnj_hyphen_hyphenate2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhyphen $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char hnj_hyphen_hyphenate2 (); int main () { -return hnj_hyphen_hyphenate2 (); +hnj_hyphen_hyphenate2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=yes else - ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_hyphen_hnj_hyphen_hyphenate2=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5 -$as_echo "$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6; } -if test "x$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&5 +echo "${ECHO_T}$ac_cv_lib_hyphen_hnj_hyphen_hyphenate2" >&6 +if test $ac_cv_lib_hyphen_hnj_hyphen_hyphenate2 = yes; then HYPHEN_LIB=-lhyphen else - as_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 +echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} + { (exit 1); exit 1; }; } fi if test -z "$HYPHEN_LIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5 -$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhyph... " >&6; } -if test "${ac_cv_lib_hyph_hnj_hyphen_hyphenate2+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhyph" >&5 +echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhyph... $ECHO_C" >&6 +if test "${ac_cv_lib_hyph_hnj_hyphen_hyphenate2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhyph $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char hnj_hyphen_hyphenate2 (); int main () { -return hnj_hyphen_hyphenate2 (); +hnj_hyphen_hyphenate2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_hyph_hnj_hyphen_hyphenate2=yes else - ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_hyph_hnj_hyphen_hyphenate2=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5 -$as_echo "$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6; } -if test "x$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&5 +echo "${ECHO_T}$ac_cv_lib_hyph_hnj_hyphen_hyphenate2" >&6 +if test $ac_cv_lib_hyph_hnj_hyphen_hyphenate2 = yes; then HYPHEN_LIB=-lhyph else - as_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 +echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z "$HYPHEN_LIB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5 -$as_echo_n "checking for hnj_hyphen_hyphenate2 in -lhnj... " >&6; } -if test "${ac_cv_lib_hnj_hnj_hyphen_hyphenate2+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for hnj_hyphen_hyphenate2 in -lhnj" >&5 +echo $ECHO_N "checking for hnj_hyphen_hyphenate2 in -lhnj... $ECHO_C" >&6 +if test "${ac_cv_lib_hnj_hnj_hyphen_hyphenate2+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lhnj $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char hnj_hyphen_hyphenate2 (); int main () { -return hnj_hyphen_hyphenate2 (); +hnj_hyphen_hyphenate2 (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_hnj_hnj_hyphen_hyphenate2=yes else - ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_hnj_hnj_hyphen_hyphenate2=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5 -$as_echo "$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6; } -if test "x$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&5 +echo "${ECHO_T}$ac_cv_lib_hnj_hnj_hyphen_hyphenate2" >&6 +if test $ac_cv_lib_hnj_hnj_hyphen_hyphenate2 = yes; then HYPHEN_LIB=-lhnj else - as_fn_error "altlinuxhyph library not found or too old." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: altlinuxhyph library not found or too old." >&5 +echo "$as_me: error: altlinuxhyph library not found or too old." >&2;} + { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_HYPH=NO BUILD_TYPE="$BUILD_TYPE HYPHEN" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which mythes to use" >&5 -$as_echo_n "checking which mythes to use... " >&6; } +echo "$as_me:$LINENO: checking which mythes to use" >&5 +echo $ECHO_N "checking which mythes to use... $ECHO_C" >&6 if test -n "$with_system_mythes" && test "$with_system_mythes" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_MYTHES=YES - ac_ext=cpp + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -18543,10 +23907,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -18558,30 +23922,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -18592,25 +23955,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mythes" >&5 -$as_echo_n "checking for mythes... " >&6; } + echo "$as_me:$LINENO: checking for mythes" >&5 +echo $ECHO_N "checking for mythes... $ECHO_C" >&6 if $PKG_CONFIG --exists "mythes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MYTHES_CFLAGS" >&5 -$as_echo_n "checking MYTHES_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking MYTHES_CFLAGS" >&5 +echo $ECHO_N "checking MYTHES_CFLAGS... $ECHO_C" >&6 MYTHES_CFLAGS=`$PKG_CONFIG --cflags "mythes"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYTHES_CFLAGS" >&5 -$as_echo "$MYTHES_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $MYTHES_CFLAGS" >&5 +echo "${ECHO_T}$MYTHES_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking MYTHES_LIBS" >&5 -$as_echo_n "checking MYTHES_LIBS... " >&6; } + echo "$as_me:$LINENO: checking MYTHES_LIBS" >&5 +echo $ECHO_N "checking MYTHES_LIBS... $ECHO_C" >&6 MYTHES_LIBS=`$PKG_CONFIG --libs "mythes"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MYTHES_LIBS" >&5 -$as_echo "$MYTHES_LIBS" >&6; } + echo "$as_me:$LINENO: result: $MYTHES_LIBS" >&5 +echo "${ECHO_T}$MYTHES_LIBS" >&6 else MYTHES_CFLAGS="" MYTHES_LIBS="" @@ -18635,45 +23998,212 @@ $as_echo "$MYTHES_LIBS" >&6; } fi if test "$MYTHES_PKGCONFIG" = "no"; then - ac_fn_cxx_check_header_mongrel "$LINENO" "mythes.hxx" "ac_cv_header_mythes_hxx" "$ac_includes_default" -if test "x$ac_cv_header_mythes_hxx" = x""yes; then : + if test "${ac_cv_header_mythes_hxx+set}" = set; then + echo "$as_me:$LINENO: checking for mythes.hxx" >&5 +echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6 +if test "${ac_cv_header_mythes_hxx+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking mythes.hxx usability" >&5 +echo $ECHO_N "checking mythes.hxx usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking mythes.hxx presence" >&5 +echo $ECHO_N "checking mythes.hxx presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_cxx_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_cxx_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: mythes.hxx: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: mythes.hxx: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: mythes.hxx: present but cannot be compiled" >&5 +echo "$as_me: WARNING: mythes.hxx: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: mythes.hxx: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: mythes.hxx: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: mythes.hxx: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: mythes.hxx: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: mythes.hxx: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for mythes.hxx" >&5 +echo $ECHO_N "checking for mythes.hxx... $ECHO_C" >&6 +if test "${ac_cv_header_mythes_hxx+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_mythes_hxx=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_mythes_hxx" >&5 +echo "${ECHO_T}$ac_cv_header_mythes_hxx" >&6 +fi +if test $ac_cv_header_mythes_hxx = yes; then + : else - as_fn_error "mythes.hxx headers not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: mythes.hxx headers not found." >&5 +echo "$as_me: error: mythes.hxx headers not found." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmythes-1.2" >&5 -$as_echo_n "checking for main in -lmythes-1.2... " >&6; } -if test "${ac_cv_lib_mythes_1_2_main+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for main in -lmythes-1.2" >&5 +echo $ECHO_N "checking for main in -lmythes-1.2... $ECHO_C" >&6 +if test "${ac_cv_lib_mythes_1_2_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmythes-1.2 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int main () { -return main (); +main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_mythes_1_2_main=yes else - ac_cv_lib_mythes_1_2_main=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_mythes_1_2_main=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mythes_1_2_main" >&5 -$as_echo "$ac_cv_lib_mythes_1_2_main" >&6; } -if test "x$ac_cv_lib_mythes_1_2_main" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_1_2_main" >&5 +echo "${ECHO_T}$ac_cv_lib_mythes_1_2_main" >&6 +if test $ac_cv_lib_mythes_1_2_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBMYTHES_1_2 1 _ACEOF @@ -18685,37 +24215,65 @@ else fi if test "$MYTHES_FOUND" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lmythes" >&5 -$as_echo_n "checking for main in -lmythes... " >&6; } -if test "${ac_cv_lib_mythes_main+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for main in -lmythes" >&5 +echo $ECHO_N "checking for main in -lmythes... $ECHO_C" >&6 +if test "${ac_cv_lib_mythes_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lmythes $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int main () { -return main (); +main (); ; return 0; } _ACEOF -if ac_fn_cxx_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_cxx_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_mythes_main=yes else - ac_cv_lib_mythes_main=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_mythes_main=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_mythes_main" >&5 -$as_echo "$ac_cv_lib_mythes_main" >&6; } -if test "x$ac_cv_lib_mythes_main" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_mythes_main" >&5 +echo "${ECHO_T}$ac_cv_lib_mythes_main" >&6 +if test $ac_cv_lib_mythes_main = yes; then MYTHES_FOUND=yes else MYTHES_FOUND=no @@ -18723,7 +24281,9 @@ fi fi if test "$MYTHES_FOUND" = "no"; then - as_fn_error "mythes library not found!." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: mythes library not found!." >&5 +echo "$as_me: error: mythes library not found!." >&2;} + { (exit 1); exit 1; }; } fi fi ac_ext=c @@ -18733,68 +24293,235 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $ ac_compiler_gnu=$ac_cv_c_compiler_gnu else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } - SYSTEM_MYTHES=NO - BUILD_TYPE="$BUILD_TYPE MYTHES" + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 + SYSTEM_MYTHES=NO + BUILD_TYPE="$BUILD_TYPE MYTHES" +fi + + + + +echo "$as_me:$LINENO: checking which lpsolve to use" >&5 +echo $ECHO_N "checking which lpsolve to use... $ECHO_C" >&6 +if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \ + test "$with_system_lpsolve" != "no"; then + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 + SYSTEM_LPSOLVE=YES + if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then + echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 +echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6 +if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking lpsolve/lp_lib.h usability" >&5 +echo $ECHO_N "checking lpsolve/lp_lib.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking lpsolve/lp_lib.h presence" >&5 +echo $ECHO_N "checking lpsolve/lp_lib.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: lpsolve/lp_lib.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for lpsolve/lp_lib.h" >&5 +echo $ECHO_N "checking for lpsolve/lp_lib.h... $ECHO_C" >&6 +if test "${ac_cv_header_lpsolve_lp_lib_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_lpsolve_lp_lib_h=$ac_header_preproc fi +echo "$as_me:$LINENO: result: $ac_cv_header_lpsolve_lp_lib_h" >&5 +echo "${ECHO_T}$ac_cv_header_lpsolve_lp_lib_h" >&6 - - - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which lpsolve to use" >&5 -$as_echo_n "checking which lpsolve to use... " >&6; } -if test -n "$with_system_lpsolve" -o -n "$with_system_libs" && \ - test "$with_system_lpsolve" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } - SYSTEM_LPSOLVE=YES - ac_fn_c_check_header_mongrel "$LINENO" "lpsolve/lp_lib.h" "ac_cv_header_lpsolve_lp_lib_h" "$ac_includes_default" -if test "x$ac_cv_header_lpsolve_lp_lib_h" = x""yes; then : - +fi +if test $ac_cv_header_lpsolve_lp_lib_h = yes; then + : else - as_fn_error "lpsolve headers not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: lpsolve headers not found." >&5 +echo "$as_me: error: lpsolve headers not found." >&2;} + { (exit 1); exit 1; }; } fi # some systems need this. Like Ubuntu.... - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for floor in -lm" >&5 -$as_echo_n "checking for floor in -lm... " >&6; } -if test "${ac_cv_lib_m_floor+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for floor in -lm" >&5 +echo $ECHO_N "checking for floor in -lm... $ECHO_C" >&6 +if test "${ac_cv_lib_m_floor+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lm $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char floor (); int main () { -return floor (); +floor (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_m_floor=yes else - ac_cv_lib_m_floor=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_m_floor=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_floor" >&5 -$as_echo "$ac_cv_lib_m_floor" >&6; } -if test "x$ac_cv_lib_m_floor" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_m_floor" >&5 +echo "${ECHO_T}$ac_cv_lib_m_floor" >&6 +if test $ac_cv_lib_m_floor = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBM 1 _ACEOF @@ -18803,43 +24530,72 @@ _ACEOF fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5 -$as_echo_n "checking for dlopen in -ldl... " >&6; } -if test "${ac_cv_lib_dl_dlopen+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5 +echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6 +if test "${ac_cv_lib_dl_dlopen+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ldl $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char dlopen (); int main () { -return dlopen (); +dlopen (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_dl_dlopen=yes else - ac_cv_lib_dl_dlopen=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_dl_dlopen=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5 -$as_echo "$ac_cv_lib_dl_dlopen" >&6; } -if test "x$ac_cv_lib_dl_dlopen" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5 +echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6 +if test $ac_cv_lib_dl_dlopen = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBDL 1 _ACEOF @@ -18848,43 +24604,72 @@ _ACEOF fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for make_lp in -llpsolve55" >&5 -$as_echo_n "checking for make_lp in -llpsolve55... " >&6; } -if test "${ac_cv_lib_lpsolve55_make_lp+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for make_lp in -llpsolve55" >&5 +echo $ECHO_N "checking for make_lp in -llpsolve55... $ECHO_C" >&6 +if test "${ac_cv_lib_lpsolve55_make_lp+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-llpsolve55 $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char make_lp (); int main () { -return make_lp (); +make_lp (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_lpsolve55_make_lp=yes else - ac_cv_lib_lpsolve55_make_lp=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_lpsolve55_make_lp=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_lpsolve55_make_lp" >&5 -$as_echo "$ac_cv_lib_lpsolve55_make_lp" >&6; } -if test "x$ac_cv_lib_lpsolve55_make_lp" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_lpsolve55_make_lp" >&5 +echo "${ECHO_T}$ac_cv_lib_lpsolve55_make_lp" >&6 +if test $ac_cv_lib_lpsolve55_make_lp = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBLPSOLVE55 1 _ACEOF @@ -18892,68 +24677,237 @@ _ACEOF LIBS="-llpsolve55 $LIBS" else - as_fn_error "lpsolve library not found or too old." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: lpsolve library not found or too old." >&5 +echo "$as_me: error: lpsolve library not found or too old." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_LPSOLVE=NO BUILD_TYPE="$BUILD_TYPE LPSOLVE" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libtextcat to use" >&5 -$as_echo_n "checking which libtextcat to use... " >&6; } +echo "$as_me:$LINENO: checking which libtextcat to use" >&5 +echo $ECHO_N "checking which libtextcat to use... $ECHO_C" >&6 if test -n "$with_system_libtextcat" && test "$with_system_libtextcat" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_LIBTEXTCAT=YES - ac_fn_c_check_header_mongrel "$LINENO" "libtextcat/textcat.h" "ac_cv_header_libtextcat_textcat_h" "$ac_includes_default" -if test "x$ac_cv_header_libtextcat_textcat_h" = x""yes; then : + if test "${ac_cv_header_libtextcat_textcat_h+set}" = set; then + echo "$as_me:$LINENO: checking for libtextcat/textcat.h" >&5 +echo $ECHO_N "checking for libtextcat/textcat.h... $ECHO_C" >&6 +if test "${ac_cv_header_libtextcat_textcat_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_libtextcat_textcat_h" >&5 +echo "${ECHO_T}$ac_cv_header_libtextcat_textcat_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking libtextcat/textcat.h usability" >&5 +echo $ECHO_N "checking libtextcat/textcat.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 +# Is the header present? +echo "$as_me:$LINENO: checking libtextcat/textcat.h presence" >&5 +echo $ECHO_N "checking libtextcat/textcat.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: libtextcat/textcat.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: libtextcat/textcat.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: libtextcat/textcat.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: libtextcat/textcat.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: libtextcat/textcat.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: libtextcat/textcat.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: libtextcat/textcat.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: libtextcat/textcat.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: libtextcat/textcat.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: libtextcat/textcat.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: libtextcat/textcat.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: libtextcat/textcat.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: libtextcat/textcat.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: libtextcat/textcat.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: libtextcat/textcat.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: libtextcat/textcat.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for libtextcat/textcat.h" >&5 +echo $ECHO_N "checking for libtextcat/textcat.h... $ECHO_C" >&6 +if test "${ac_cv_header_libtextcat_textcat_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_libtextcat_textcat_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_libtextcat_textcat_h" >&5 +echo "${ECHO_T}$ac_cv_header_libtextcat_textcat_h" >&6 + +fi +if test $ac_cv_header_libtextcat_textcat_h = yes; then + : else - as_fn_error "libtextcat headers not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libtextcat headers not found." >&5 +echo "$as_me: error: libtextcat headers not found." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for special_textcat_Init in -ltextcat" >&5 -$as_echo_n "checking for special_textcat_Init in -ltextcat... " >&6; } -if test "${ac_cv_lib_textcat_special_textcat_Init+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for special_textcat_Init in -ltextcat" >&5 +echo $ECHO_N "checking for special_textcat_Init in -ltextcat... $ECHO_C" >&6 +if test "${ac_cv_lib_textcat_special_textcat_Init+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-ltextcat $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char special_textcat_Init (); int main () { -return special_textcat_Init (); +special_textcat_Init (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_textcat_special_textcat_Init=yes else - ac_cv_lib_textcat_special_textcat_Init=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_textcat_special_textcat_Init=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_textcat_special_textcat_Init" >&5 -$as_echo "$ac_cv_lib_textcat_special_textcat_Init" >&6; } -if test "x$ac_cv_lib_textcat_special_textcat_Init" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_textcat_special_textcat_Init" >&5 +echo "${ECHO_T}$ac_cv_lib_textcat_special_textcat_Init" >&6 +if test $ac_cv_lib_textcat_special_textcat_Init = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBTEXTCAT 1 _ACEOF @@ -18961,94 +24915,217 @@ _ACEOF LIBS="-ltextcat $LIBS" else - as_fn_error "libtextcat library not found or not suitable. libtextcat typically needs to be patched" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libtextcat library not found or not suitable. libtextcat typically needs to be patched" >&5 +echo "$as_me: error: libtextcat library not found or not suitable. libtextcat typically needs to be patched" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_LIBTEXTCAT=NO BUILD_TYPE="$BUILD_TYPE LIBTEXTCAT" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which libtextcat data directory to use" >&5 -$as_echo_n "checking which libtextcat data directory to use... " >&6; } +echo "$as_me:$LINENO: checking which libtextcat data directory to use" >&5 +echo $ECHO_N "checking which libtextcat data directory to use... $ECHO_C" >&6 if test -n "$with_system_libtextcat_data" && test "$with_system_libtextcat_data" != "no"; then if test "$with_system_libtextcat_data" = "yes"; then SYSTEM_LIBTEXTCAT_DATA=file:///usr/share/libtextcat else SYSTEM_LIBTEXTCAT_DATA=file://$with_system_libtextcat_data fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $SYSTEM_LIBTEXTCAT_DATA" >&5 -$as_echo "$SYSTEM_LIBTEXTCAT_DATA" >&6; } + echo "$as_me:$LINENO: result: $SYSTEM_LIBTEXTCAT_DATA" >&5 +echo "${ECHO_T}$SYSTEM_LIBTEXTCAT_DATA" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 BUILD_TYPE="$BUILD_TYPE LIBTEXTCATDATA" fi if test "$_os" = "Linux"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether libc is >= 2.1.1" >&5 -$as_echo_n "checking whether libc is >= 2.1.1... " >&6; } + echo "$as_me:$LINENO: checking whether libc is >= 2.1.1" >&5 +echo $ECHO_N "checking whether libc is >= 2.1.1... $ECHO_C" >&6 exec 6>/dev/null # no output - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnu_get_libc_version in -lc" >&5 -$as_echo_n "checking for gnu_get_libc_version in -lc... " >&6; } -if test "${ac_cv_lib_c_gnu_get_libc_version+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for gnu_get_libc_version in -lc" >&5 +echo $ECHO_N "checking for gnu_get_libc_version in -lc... $ECHO_C" >&6 +if test "${ac_cv_lib_c_gnu_get_libc_version+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lc $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char gnu_get_libc_version (); int main () { -return gnu_get_libc_version (); +gnu_get_libc_version (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_c_gnu_get_libc_version=yes else - ac_cv_lib_c_gnu_get_libc_version=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_c_gnu_get_libc_version=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_gnu_get_libc_version" >&5 -$as_echo "$ac_cv_lib_c_gnu_get_libc_version" >&6; } -if test "x$ac_cv_lib_c_gnu_get_libc_version" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_c_gnu_get_libc_version" >&5 +echo "${ECHO_T}$ac_cv_lib_c_gnu_get_libc_version" >&6 +if test $ac_cv_lib_c_gnu_get_libc_version = yes; then HAVE_LIBC=yes; export HAVE_LIBC fi exec 6>&1 # output on again if test "$HAVE_LIBC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - as_fn_error "no, upgrade libc" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no, upgrade libc" >&5 +echo "$as_me: error: no, upgrade libc" >&2;} + { (exit 1); exit 1; }; } fi fi if test "$_os" != "WNT"; then - for ac_func in getopt -do : - ac_fn_c_check_func "$LINENO" "getopt" "ac_cv_func_getopt" -if test "x$ac_cv_func_getopt" = x""yes; then : + +for ac_func in getopt +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_GETOPT 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF HAVE_GETOPT=YES else @@ -19056,12 +25133,103 @@ else fi done - for ac_func in readdir_r -do : - ac_fn_c_check_func "$LINENO" "readdir_r" "ac_cv_func_readdir_r" -if test "x$ac_cv_func_readdir_r" = x""yes; then : + +for ac_func in readdir_r +do +as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $ac_func" >&5 +echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 +if eval "test \"\${$as_ac_var+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +/* Define $ac_func to an innocuous variant, in case declares $ac_func. + For example, HP-UX 11i declares gettimeofday. */ +#define $ac_func innocuous_$ac_func + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with char $ac_func (); below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef $ac_func + +/* Override any gcc2 internal prototype to avoid an error. */ +#ifdef __cplusplus +extern "C" +{ +#endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ +char $ac_func (); +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined (__stub_$ac_func) || defined (__stub___$ac_func) +choke me +#else +char (*f) () = $ac_func; +#endif +#ifdef __cplusplus +} +#endif + +int +main () +{ +return f != $ac_func; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + eval "$as_ac_var=yes" +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +eval "$as_ac_var=no" +fi +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 +if test `eval echo '${'$as_ac_var'}'` = yes; then cat >>confdefs.h <<_ACEOF -#define HAVE_READDIR_R 1 +#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 _ACEOF HAVE_READDIR_R=YES else @@ -19082,8 +25250,8 @@ fi if test \( "$_os" = "WINNT" \) ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PSDK files" >&5 -$as_echo_n "checking for PSDK files... " >&6; } + echo "$as_me:$LINENO: checking for PSDK files" >&5 +echo $ECHO_N "checking for PSDK files... $ECHO_C" >&6 if test -z "$with_psdk_home"; then # This first line will detect a February 2003 Microsoft Platform SDK PSDK_HOME=`./oowintool --psdk-home` @@ -19104,12 +25272,19 @@ $as_echo_n "checking for PSDK files... " >&6; } PSDK_HOME=`echo $PSDK_HOME | $SED 's/\/$//'` # Problem with current PSDK (iz 49865) if test -f "$PSDK_HOME/Lib/libcp.lib"; then - as_fn_error " + { { echo "$as_me:$LINENO: error: + +Some modules do not build correctly with MS Platform SDK - April 2005 +Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found. +Remove/rename/backup that file and restart configure. Details about this +problem can be found in issue 49856." >&5 +echo "$as_me: error: Some modules do not build correctly with MS Platform SDK - April 2005 Edition if the library ($PSDK_HOME/Lib/libcp.lib) is found. Remove/rename/backup that file and restart configure. Details about this -problem can be found in issue 49856." "$LINENO" 5 +problem can be found in issue 49856." >&2;} + { (exit 1); exit 1; }; } fi # WIndows SDK has different headers if test \( -f "$PSDK_HOME/Include/adoint.h" \) \ @@ -19125,36 +25300,41 @@ problem can be found in issue 49856." "$LINENO" 5 HAVE_PSDK_LIB="no" fi if test "$HAVE_PSDK_H" = "no" -o "$HAVE_PSDK_LIB" = "no"; then - as_fn_error "Some (all?) PSDK files not found, please check if all needed Platform SDKs -are installed or use --with-psdk-home ." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs +are installed or use --with-psdk-home ." >&5 +echo "$as_me: error: Some (all?) PSDK files not found, please check if all needed Platform SDKs +are installed or use --with-psdk-home ." >&2;} + { (exit 1); exit 1; }; } fi if test ! -x "$PSDK_HOME/bin/msiinfo.exe" \ -o ! -x "$PSDK_HOME/bin/msidb.exe" \ -o ! -x "$PSDK_HOME/bin/uuidgen.exe" \ -o ! -x "$PSDK_HOME/bin/msitran.exe" ; then - as_fn_error "Some (all) files of the Windows Installer SDK are missing, please install." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Some (all) files of the Windows Installer SDK are missing, please install." >&5 +echo "$as_me: error: Some (all) files of the Windows Installer SDK are missing, please install." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: SDK files found ...)" >&5 -$as_echo "SDK files found ...)" >&6; } + echo "$as_me:$LINENO: result: SDK files found ...)" >&5 +echo "${ECHO_T}SDK files found ...)" >&6 if echo $PSDK_HOME | grep "v6.1" >/dev/null 2>/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5 -$as_echo "Found Windows SDK 6.1 ($PSDK_HOME)" >&6; } + echo "$as_me:$LINENO: result: Found Windows SDK 6.1 ($PSDK_HOME)" >&5 +echo "${ECHO_T}Found Windows SDK 6.1 ($PSDK_HOME)" >&6 WINDOWS_VISTA_PSDK=TRUE elif echo $PSDK_HOME | grep "v6.0" >/dev/null 2>/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5 -$as_echo "Found Windows SDK 6.0 ($PSDK_HOME)" >&6; } + echo "$as_me:$LINENO: result: Found Windows SDK 6.0 ($PSDK_HOME)" >&5 +echo "${ECHO_T}Found Windows SDK 6.0 ($PSDK_HOME)" >&6 WINDOWS_VISTA_PSDK=TRUE else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5 -$as_echo "Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6; } + echo "$as_me:$LINENO: result: Found Legacy Windows Platform SDK ($PSDK_HOME)" >&5 +echo "${ECHO_T}Found Legacy Windows Platform SDK ($PSDK_HOME)" >&6 fi fi if test \( "$_os" = "WINNT" \) ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DirectX SDK files" >&5 -$as_echo_n "checking for DirectX SDK files... " >&6; } + echo "$as_me:$LINENO: checking for DirectX SDK files" >&5 +echo $ECHO_N "checking for DirectX SDK files... $ECHO_C" >&6 if test -z "$with_directx_home"; then if test -n "$DXSDK_DIR"; then DIRECTXSDK_HOME=`cygpath -d "$DXSDK_DIR"` @@ -19186,15 +25366,17 @@ $as_echo_n "checking for DirectX SDK files... " >&6; } fi if test -n "$ENABLE_DIRECTX"; then if test "$HAVE_DIRECTXSDK_H" = "yes" -a "$HAVE_DIRECTXSDK_LIB" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - as_fn_error "DirectX SDK files not found, please use --with-directx-home or -disable-directx." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&5 +echo "$as_me: error: DirectX SDK files not found, please use --with-directx-home or -disable-directx." >&2;} + { (exit 1); exit 1; }; } fi else DIRECTXSDK_HOME="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: disabled" >&5 -$as_echo "disabled" >&6; } + echo "$as_me:$LINENO: result: disabled" >&5 +echo "${ECHO_T}disabled" >&6 fi fi @@ -19202,14 +25384,14 @@ fi NSIS_PATH="" if test "$_os" = "WINNT" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSIS" >&5 -$as_echo_n "checking for NSIS... " >&6; } + echo "$as_me:$LINENO: checking for NSIS" >&5 +echo $ECHO_N "checking for NSIS... $ECHO_C" >&6 # Extract the first word of "nsis.exe", so it can be a program name with args. set dummy nsis.exe; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_NSIS_PATH+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_NSIS_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $NSIS_PATH in [\\/]* | ?:[\\/]*) @@ -19221,29 +25403,28 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_NSIS_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi NSIS_PATH=$ac_cv_path_NSIS_PATH + if test -n "$NSIS_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NSIS_PATH" >&5 -$as_echo "$NSIS_PATH" >&6; } + echo "$as_me:$LINENO: result: $NSIS_PATH" >&5 +echo "${ECHO_T}$NSIS_PATH" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -n "$NSIS_PATH"; then NSIS_PATH=`dirname "$NSIS_PATH"` fi @@ -19258,24 +25439,24 @@ fi NSIS_PATH="$nsistest" fi if test -z "$NSIS_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: NSIS not found, no self contained installer will be build." >&5 -$as_echo "$as_me: WARNING: NSIS not found, no self contained installer will be build." >&2;} + { echo "$as_me:$LINENO: WARNING: NSIS not found, no self contained installer will be build." >&5 +echo "$as_me: WARNING: NSIS not found, no self contained installer will be build." >&2;} echo "NSIS not found, no self contained installer will be build." >> warn else NSIS_PATH=`cygpath -d "$NSIS_PATH"` NSIS_PATH=`cygpath -u "$NSIS_PATH"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($NSIS_PATH)" >&5 -$as_echo "found ($NSIS_PATH)" >&6; } + echo "$as_me:$LINENO: result: found ($NSIS_PATH)" >&5 +echo "${ECHO_T}found ($NSIS_PATH)" >&6 fi fi # Extract the first word of "bison", so it can be a program name with args. set dummy bison; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_BISON+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_BISON+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $BISON in [\\/]* | ?:[\\/]*) @@ -19287,56 +25468,59 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_BISON="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi BISON=$ac_cv_path_BISON + if test -n "$BISON"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $BISON" >&5 -$as_echo "$BISON" >&6; } + echo "$as_me:$LINENO: result: $BISON" >&5 +echo "${ECHO_T}$BISON" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$BISON"; then - as_fn_error "no bison found in \$PATH, install bison" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no bison found in \$PATH, install bison" >&5 +echo "$as_me: error: no bison found in \$PATH, install bison" >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking the bison version" >&5 -$as_echo_n "checking the bison version... " >&6; } + echo "$as_me:$LINENO: checking the bison version" >&5 +echo $ECHO_N "checking the bison version... $ECHO_C" >&6 _bison_version=`$BISON --version | grep GNU | $SED -e 's@^[^0-9]*@@' -e 's@ .*@@' -e 's@,.*@@'`; _bison_longver=`echo $_bison_version | $AWK -F. '{ print \$1*1000+\$2}'` # Accept newer than 1.875 or older(equal) than 1.75 if test "$_bison_longver" -ge 1875 -o "$_bison_longver" -le 1075; then if test "$_bison_version" = "1.875" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: suspect ($BISON $_bison_version)" >&5 -$as_echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;} + { echo "$as_me:$LINENO: WARNING: suspect ($BISON $_bison_version)" >&5 +echo "$as_me: WARNING: suspect ($BISON $_bison_version)" >&2;} echo "Suspect ($BISON $_bison_version) suggest upgrade" >> warn else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: checked ($BISON $_bison_version)" >&5 -$as_echo "checked ($BISON $_bison_version)" >&6; } + echo "$as_me:$LINENO: result: checked ($BISON $_bison_version)" >&5 +echo "${ECHO_T}checked ($BISON $_bison_version)" >&6 fi else - as_fn_error "failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&5 +echo "$as_me: error: failed ($BISON $_bison_version need 1.875+ (or 1.75 and older))" >&2;} + { (exit 1); exit 1; }; } fi fi # Extract the first word of "flex", so it can be a program name with args. set dummy flex; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_FLEX+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_FLEX+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $FLEX in [\\/]* | ?:[\\/]*) @@ -19348,38 +25532,39 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_FLEX="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi FLEX=$ac_cv_path_FLEX + if test -n "$FLEX"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FLEX" >&5 -$as_echo "$FLEX" >&6; } + echo "$as_me:$LINENO: result: $FLEX" >&5 +echo "${ECHO_T}$FLEX" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$FLEX"; then - as_fn_error "no flex found in \$PATH, install flex" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no flex found in \$PATH, install flex" >&5 +echo "$as_me: error: no flex found in \$PATH, install flex" >&2;} + { (exit 1); exit 1; }; } fi # Extract the first word of "patch", so it can be a program name with args. set dummy patch; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PATCH+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PATCH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PATCH in [\\/]* | ?:[\\/]*) @@ -19391,31 +25576,32 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PATCH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi PATCH=$ac_cv_path_PATCH + if test -n "$PATCH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PATCH" >&5 -$as_echo "$PATCH" >&6; } + echo "$as_me:$LINENO: result: $PATCH" >&5 +echo "${ECHO_T}$PATCH" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$PATCH"; then - as_fn_error "\\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&5 +echo "$as_me: error: \\"patch\\" not found in \$PATH, install the development tool named\\"patch\"\" >&2;} + { (exit 1); exit 1; }; } fi if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then @@ -19425,17 +25611,21 @@ if test "$_os" = "SunOS" -o "$_os" = "FreeBSD" -o "$_os" = "Darwin"; then if test -x "$with_gnu_patch"; then GNUPATCH=$with_gnu_patch else - as_fn_error "--with-gnu-patch did not point to an executable" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: --with-gnu-patch did not point to an executable" >&5 +echo "$as_me: error: --with-gnu-patch did not point to an executable" >&2;} + { (exit 1); exit 1; }; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GNUPATCH is GNU patch" >&5 -$as_echo_n "checking whether $GNUPATCH is GNU patch... " >&6; } + echo "$as_me:$LINENO: checking whether $GNUPATCH is GNU patch" >&5 +echo $ECHO_N "checking whether $GNUPATCH is GNU patch... $ECHO_C" >&6 if $GNUPATCH --version | grep "Free Software Foundation" >/dev/null 2>/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - as_fn_error "no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&5 +echo "$as_me: error: no, GNU patch needed. install or specify with --with-gnu-patch=/path/to/it" >&2;} + { (exit 1); exit 1; }; } fi @@ -19444,10 +25634,10 @@ $as_echo "yes" >&6; } do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_GNUCP+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_GNUCP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $GNUCP in [\\/]* | ?:[\\/]*) @@ -19459,59 +25649,64 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_GNUCP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi GNUCP=$ac_cv_path_GNUCP + if test -n "$GNUCP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNUCP" >&5 -$as_echo "$GNUCP" >&6; } + echo "$as_me:$LINENO: result: $GNUCP" >&5 +echo "${ECHO_T}$GNUCP" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$GNUCP" && break done if test -z $GNUCP; then - as_fn_error "Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&5 +echo "$as_me: error: Neither gnucp nor cp found. Install GNU cp and/or specify --with-gnu-cp=/path/to/it" >&2;} + { (exit 1); exit 1; }; } fi else if test -x "$with_gnu_cp"; then GNUCP=$with_gnu_cp else - as_fn_error "--with-gnu-cp did not point to an executable" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: --with-gnu-cp did not point to an executable" >&5 +echo "$as_me: error: --with-gnu-cp did not point to an executable" >&2;} + { (exit 1); exit 1; }; } fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $GNUCP is GNU cp" >&5 -$as_echo_n "checking whether $GNUCP is GNU cp... " >&6; } + echo "$as_me:$LINENO: checking whether $GNUCP is GNU cp" >&5 +echo $ECHO_N "checking whether $GNUCP is GNU cp... $ECHO_C" >&6 if $GNUCP --version 2>/dev/null | grep "Free Software Foundation" >/dev/null 2>/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else if $GNUCP --version 2>/dev/null | grep "GNU fileutils" >/dev/null 2>/dev/null; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else if test "$_os" = "Darwin"; then GNUCP='' - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no gnucp found - using the system's cp command" >&5 -$as_echo "no gnucp found - using the system's cp command" >&6; } + echo "$as_me:$LINENO: result: no gnucp found - using the system's cp command" >&5 +echo "${ECHO_T}no gnucp found - using the system's cp command" >&6 else - as_fn_error "no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&5 +echo "$as_me: error: no, GNU cp needed. install or specify with --with-gnu-cp=/path/to/it" >&2;} + { (exit 1); exit 1; }; } fi fi fi @@ -19524,10 +25719,10 @@ if test "$_os" = "WINNT"; then CYGWIN_PATH="" # Extract the first word of "bash", so it can be a program name with args. set dummy bash; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_CYGWIN_PATH+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_CYGWIN_PATH+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $CYGWIN_PATH in [\\/]* | ?:[\\/]*) @@ -19539,29 +25734,28 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_CYGWIN_PATH="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi CYGWIN_PATH=$ac_cv_path_CYGWIN_PATH + if test -n "$CYGWIN_PATH"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CYGWIN_PATH" >&5 -$as_echo "$CYGWIN_PATH" >&6; } + echo "$as_me:$LINENO: result: $CYGWIN_PATH" >&5 +echo "${ECHO_T}$CYGWIN_PATH" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - CYGWIN_PATH=`dirname "$CYGWIN_PATH"` fi if test -z "$CYGWIN_PATH"; then @@ -19570,18 +25764,18 @@ fi if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking ml.exe assembler path" >&5 -$as_echo_n "checking ml.exe assembler path... " >&6; } + echo "$as_me:$LINENO: checking ml.exe assembler path" >&5 +echo $ECHO_N "checking ml.exe assembler path... $ECHO_C" >&6 if test -n "$with_asm_home"; then with_asm_home=`cygpath -u "$with_asm_home"` fi if test ! -x "$with_asm_home/ml.exe"; then # Extract the first word of "ml.exe", so it can be a program name with args. set dummy ml.exe; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ML_EXE+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ML_EXE+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $ML_EXE in [\\/]* | ?:[\\/]*) @@ -19593,43 +25787,44 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ML_EXE="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi ML_EXE=$ac_cv_path_ML_EXE + if test -n "$ML_EXE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ML_EXE" >&5 -$as_echo "$ML_EXE" >&6; } + echo "$as_me:$LINENO: result: $ML_EXE" >&5 +echo "${ECHO_T}$ML_EXE" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test -z "$ML_EXE"; then if test -x "$with_cl_home/bin/ml.exe"; then with_asm_home=$with_cl_home/bin - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found ($with_asm_home)" >&5 -$as_echo "found ($with_asm_home)" >&6; } + echo "$as_me:$LINENO: result: found ($with_asm_home)" >&5 +echo "${ECHO_T}found ($with_asm_home)" >&6 else - as_fn_error "Configure did not find ml.exe assembler." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Configure did not find ml.exe assembler." >&5 +echo "$as_me: error: Configure did not find ml.exe assembler." >&2;} + { (exit 1); exit 1; }; } fi else with_asm_home="ASM_IN_PATH" fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ASM_HOME" >&5 -$as_echo "$ASM_HOME" >&6; } + echo "$as_me:$LINENO: result: $ASM_HOME" >&5 +echo "${ECHO_T}$ASM_HOME" >&6 else with_asm_home="NO_ASM_HOME" fi @@ -19649,10 +25844,10 @@ if test -n "$with_zip_home" ; then else # Extract the first word of "zip", so it can be a program name with args. set dummy zip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ZIP+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ZIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $ZIP in [\\/]* | ?:[\\/]*) @@ -19664,35 +25859,34 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ZIP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi ZIP=$ac_cv_path_ZIP + if test -n "$ZIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ZIP" >&5 -$as_echo "$ZIP" >&6; } + echo "$as_me:$LINENO: result: $ZIP" >&5 +echo "${ECHO_T}$ZIP" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - # Extract the first word of "unzip", so it can be a program name with args. set dummy unzip; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_UNZIP+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_UNZIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $UNZIP in [\\/]* | ?:[\\/]*) @@ -19704,69 +25898,84 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_UNZIP="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi UNZIP=$ac_cv_path_UNZIP + if test -n "$UNZIP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNZIP" >&5 -$as_echo "$UNZIP" >&6; } + echo "$as_me:$LINENO: result: $UNZIP" >&5 +echo "${ECHO_T}$UNZIP" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - ZIP_HOME=`dirname "$ZIP"` fi if test -z "$ZIP" -o -z "$UNZIP"; then - as_fn_error "Zip/Unzip are required to build, please install or use --with-zip-home" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&5 +echo "$as_me: error: Zip/Unzip are required to build, please install or use --with-zip-home" >&2;} + { (exit 1); exit 1; }; } fi if test "$_os" = "WINNT"; then if test -n "`$ZIP -h | grep -i WinNT`" ; then -as_fn_error "$ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." "$LINENO" 5 +{ { echo "$as_me:$LINENO: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&5 +echo "$as_me: error: $ZIP found in the path is not the required cygwin version of Info-ZIPs zip.exe." >&2;} + { (exit 1); exit 1; }; } fi fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for unicows.dll" >&5 -$as_echo_n "checking for unicows.dll... " >&6; } + echo "$as_me:$LINENO: checking for unicows.dll" >&5 +echo $ECHO_N "checking for unicows.dll... $ECHO_C" >&6 if test -x ./external/unicows/unicows.dll; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - as_fn_error "The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/. + { { echo "$as_me:$LINENO: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/. +Get it from the Microsoft site and put it into external/unicows. +(Note: Microsoft seems to enjoy changing the exact location of this file. You +may have to search Microsoft's website.) Last time it was seen at: +." >&5 +echo "$as_me: error: The Microsoft Layer for Unicode (unicows.dll) is missing in external/unicows/. Get it from the Microsoft site and put it into external/unicows. (Note: Microsoft seems to enjoy changing the exact location of this file. You may have to search Microsoft's website.) Last time it was seen at: -." "$LINENO" 5 +." >&2;} + { (exit 1); exit 1; }; } fi fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbghelp.dll" >&5 -$as_echo_n "checking for dbghelp.dll... " >&6; } + echo "$as_me:$LINENO: checking for dbghelp.dll" >&5 +echo $ECHO_N "checking for dbghelp.dll... $ECHO_C" >&6 if test -x ./external/dbghelp/dbghelp.dll; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - as_fn_error "dbghelp.dll is missing in external/dbghelp/. + { { echo "$as_me:$LINENO: error: dbghelp.dll is missing in external/dbghelp/. +Get it from the Microsoft site and put it into external/dbghelp. +(Note: Microsoft seems to enjoy changing the exact location of this file. You +may have to search Microsoft's website.) Last time it was seen at: +." >&5 +echo "$as_me: error: dbghelp.dll is missing in external/dbghelp/. Get it from the Microsoft site and put it into external/dbghelp. (Note: Microsoft seems to enjoy changing the exact location of this file. You may have to search Microsoft's website.) Last time it was seen at: -." "$LINENO" 5 +." >&2;} + { (exit 1); exit 1; }; } fi fi @@ -19774,21 +25983,28 @@ if test "$_os" = "WINNT" -a "$WITH_MINGWIN" != "yes"; then if ./oowintool --msvc-copy-dlls ./external/msvcp ; then : else - as_fn_error "oowintool failed to copy CRT" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: oowintool failed to copy CRT" >&5 +echo "$as_me: error: oowintool failed to copy CRT" >&2;} + { (exit 1); exit 1; }; } fi fi if test "$_os" = "WINNT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gdiplus.dll" >&5 -$as_echo_n "checking for gdiplus.dll... " >&6; } + echo "$as_me:$LINENO: checking for gdiplus.dll" >&5 +echo $ECHO_N "checking for gdiplus.dll... $ECHO_C" >&6 if test -x ./external/gdiplus/gdiplus.dll; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else - as_fn_error "gdiplus.dll is missing in external/gdiplus/. + { { echo "$as_me:$LINENO: error: gdiplus.dll is missing in external/gdiplus/. Get it from the Microsoft site and put it into external/gdiplus. You may have to search Microsoft's website. Last time it was seen at: -." "$LINENO" 5 +." >&5 +echo "$as_me: error: gdiplus.dll is missing in external/gdiplus/. +Get it from the Microsoft site and put it into external/gdiplus. +You may have to search Microsoft's website. Last time it was seen at: +." >&2;} + { (exit 1); exit 1; }; } fi fi @@ -19798,11 +26014,11 @@ fi if test "$_os" = "WINNT"; then if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for instmsia.exe/instmsiw.exe" >&5 -$as_echo_n "checking for instmsia.exe/instmsiw.exe... " >&6; } + echo "$as_me:$LINENO: checking for instmsia.exe/instmsiw.exe" >&5 +echo $ECHO_N "checking for instmsia.exe/instmsiw.exe... $ECHO_C" >&6 if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found" >&5 -$as_echo "found" >&6; } + echo "$as_me:$LINENO: result: found" >&5 +echo "${ECHO_T}found" >&6 else MSIAPATH=`/bin/find "$COMPATH/.." -iname instmsia.exe | head -n 1` MSIWPATH=`/bin/find "$COMPATH/.." -iname instmsiw.exe | head -n 1` @@ -19811,21 +26027,27 @@ $as_echo "found" >&6; } cp "$MSIWPATH" ./external/msi/ && chmod +x ./external/msi/instmsiw.exe && MSIWCOPY="OK" fi if test -z "$MSIACOPY" -o -z "$MSIWCOPY"; then - as_fn_error "instmsia.exe and/or instmsiw.exe are/is missing in the default location. + { { echo "$as_me:$LINENO: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location. +These programs are part of the Visual Studio installation and should be found in a +directory similar to: +\"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\" +As the automatic detection fails please copy the files to external/msi/." >&5 +echo "$as_me: error: instmsia.exe and/or instmsiw.exe are/is missing in the default location. These programs are part of the Visual Studio installation and should be found in a directory similar to: \"c:\\Program Files\\Microsoft Visual Studio .NET 2003\\Common7\\Tools\\Deployment\\MsiRedist\\\" -As the automatic detection fails please copy the files to external/msi/." "$LINENO" 5 +As the automatic detection fails please copy the files to external/msi/." >&2;} + { (exit 1); exit 1; }; } else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: found and copied" >&5 -$as_echo "found and copied" >&6; } + echo "$as_me:$LINENO: result: found and copied" >&5 +echo "${ECHO_T}found and copied" >&6 fi fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which VCLplugs shall be built" >&5 -$as_echo_n "checking which VCLplugs shall be built... " >&6; } +echo "$as_me:$LINENO: checking which VCLplugs shall be built" >&5 +echo $ECHO_N "checking which VCLplugs shall be built... $ECHO_C" >&6 ENABLE_GTK="" if test "x$enable_gtk" = "xyes"; then ENABLE_GTK="TRUE" @@ -19848,31 +26070,31 @@ fi if test -z "$R"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $R" >&5 -$as_echo "$R" >&6; } + echo "$as_me:$LINENO: result: $R" >&5 +echo "${ECHO_T}$R" >&6 fi ENABLE_GCONF="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GConf support" >&5 -$as_echo_n "checking whether to enable GConf support... " >&6; } +echo "$as_me:$LINENO: checking whether to enable GConf support" >&5 +echo $ECHO_N "checking whether to enable GConf support... $ECHO_C" >&6 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$_os" != "OS2" -a "$enable_gconf" = "yes"; then ENABLE_GCONF="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -19884,30 +26106,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -19918,25 +26139,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gconf-2.0 " >&5 -$as_echo_n "checking for gconf-2.0 ... " >&6; } + echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 +echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "gconf-2.0 " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_CFLAGS" >&5 -$as_echo_n "checking GCONF_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 +echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6 GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_CFLAGS" >&5 -$as_echo "$GCONF_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 +echo "${ECHO_T}$GCONF_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_LIBS" >&5 -$as_echo_n "checking GCONF_LIBS... " >&6; } + echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 +echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6 GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_LIBS" >&5 -$as_echo "$GCONF_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 +echo "${ECHO_T}$GCONF_LIBS" >&6 else GCONF_CFLAGS="" GCONF_LIBS="" @@ -19957,33 +26178,35 @@ $as_echo "$GCONF_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi ENABLE_GNOMEVFS="" -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GNOME VFS support" >&5 -$as_echo_n "checking whether to enable GNOME VFS support... " >&6; } +echo "$as_me:$LINENO: checking whether to enable GNOME VFS support" >&5 +echo $ECHO_N "checking whether to enable GNOME VFS support... $ECHO_C" >&6 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gnome_vfs" = "yes"; then ENABLE_GNOMEVFS="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -19995,30 +26218,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -20029,25 +26251,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnome-vfs-2.0 >= 2.6.0 " >&5 -$as_echo_n "checking for gnome-vfs-2.0 >= 2.6.0 ... " >&6; } + echo "$as_me:$LINENO: checking for gnome-vfs-2.0 >= 2.6.0 " >&5 +echo $ECHO_N "checking for gnome-vfs-2.0 >= 2.6.0 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "gnome-vfs-2.0 >= 2.6.0 " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOMEVFS_CFLAGS" >&5 -$as_echo_n "checking GNOMEVFS_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking GNOMEVFS_CFLAGS" >&5 +echo $ECHO_N "checking GNOMEVFS_CFLAGS... $ECHO_C" >&6 GNOMEVFS_CFLAGS=`$PKG_CONFIG --cflags "gnome-vfs-2.0 >= 2.6.0 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOMEVFS_CFLAGS" >&5 -$as_echo "$GNOMEVFS_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GNOMEVFS_CFLAGS" >&5 +echo "${ECHO_T}$GNOMEVFS_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GNOMEVFS_LIBS" >&5 -$as_echo_n "checking GNOMEVFS_LIBS... " >&6; } + echo "$as_me:$LINENO: checking GNOMEVFS_LIBS" >&5 +echo $ECHO_N "checking GNOMEVFS_LIBS... $ECHO_C" >&6 GNOMEVFS_LIBS=`$PKG_CONFIG --libs "gnome-vfs-2.0 >= 2.6.0 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GNOMEVFS_LIBS" >&5 -$as_echo "$GNOMEVFS_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GNOMEVFS_LIBS" >&5 +echo "${ECHO_T}$GNOMEVFS_LIBS" >&6 else GNOMEVFS_CFLAGS="" GNOMEVFS_LIBS="" @@ -20068,7 +26290,9 @@ $as_echo "$GNOMEVFS_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (gnome-vfs-2.0 >= 2.6.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi if test "$ENABLE_GCONF" != "TRUE"; then @@ -20078,10 +26302,10 @@ $as_echo "$GNOMEVFS_LIBS" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -20093,30 +26317,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -20127,25 +26350,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gconf-2.0 " >&5 -$as_echo_n "checking for gconf-2.0 ... " >&6; } + echo "$as_me:$LINENO: checking for gconf-2.0 " >&5 +echo $ECHO_N "checking for gconf-2.0 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "gconf-2.0 " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_CFLAGS" >&5 -$as_echo_n "checking GCONF_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking GCONF_CFLAGS" >&5 +echo $ECHO_N "checking GCONF_CFLAGS... $ECHO_C" >&6 GCONF_CFLAGS=`$PKG_CONFIG --cflags "gconf-2.0 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_CFLAGS" >&5 -$as_echo "$GCONF_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GCONF_CFLAGS" >&5 +echo "${ECHO_T}$GCONF_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GCONF_LIBS" >&5 -$as_echo_n "checking GCONF_LIBS... " >&6; } + echo "$as_me:$LINENO: checking GCONF_LIBS" >&5 +echo $ECHO_N "checking GCONF_LIBS... $ECHO_C" >&6 GCONF_LIBS=`$PKG_CONFIG --libs "gconf-2.0 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GCONF_LIBS" >&5 -$as_echo "$GCONF_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GCONF_LIBS" >&5 +echo "${ECHO_T}$GCONF_LIBS" >&6 else GCONF_CFLAGS="" GCONF_LIBS="" @@ -20166,13 +26389,15 @@ $as_echo "$GCONF_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (gconf-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi @@ -20190,10 +26415,10 @@ if test "$test_gtk" = "yes"; then if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -20205,30 +26430,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -20239,25 +26463,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5 -$as_echo_n "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... " >&6; } + echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " >&5 +echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_CFLAGS" >&5 -$as_echo_n "checking GTK_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking GTK_CFLAGS" >&5 +echo $ECHO_N "checking GTK_CFLAGS... $ECHO_C" >&6 GTK_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_CFLAGS" >&5 -$as_echo "$GTK_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GTK_CFLAGS" >&5 +echo "${ECHO_T}$GTK_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GTK_LIBS" >&5 -$as_echo_n "checking GTK_LIBS... " >&6; } + echo "$as_me:$LINENO: checking GTK_LIBS" >&5 +echo $ECHO_N "checking GTK_LIBS... $ECHO_C" >&6 GTK_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gdk-pixbuf-xlib-2.0 >= 2.2 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GTK_LIBS" >&5 -$as_echo "$GTK_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GTK_LIBS" >&5 +echo "${ECHO_T}$GTK_LIBS" >&6 else GTK_CFLAGS="" GTK_LIBS="" @@ -20278,7 +26502,9 @@ $as_echo "$GTK_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&5 +echo "$as_me: error: requirements to build the gtk-plugin not met. Use --disable-gtk or install the missing packages" >&2;} + { (exit 1); exit 1; }; } fi BUILD_TYPE="$BUILD_TYPE GTK" @@ -20288,22 +26514,22 @@ $as_echo "$GTK_LIBS" >&6; } BUILD_TYPE="$BUILD_TYPE SYSTRAY_GTK" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable DBUS support" >&5 -$as_echo_n "checking whether to enable DBUS support... " >&6; } + echo "$as_me:$LINENO: checking whether to enable DBUS support" >&5 +echo $ECHO_N "checking whether to enable DBUS support... $ECHO_C" >&6 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_dbus" = "yes"; then ENABLE_DBUS="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -20315,30 +26541,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -20349,25 +26574,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dbus-glib-1 >= 0.70 " >&5 -$as_echo_n "checking for dbus-glib-1 >= 0.70 ... " >&6; } + echo "$as_me:$LINENO: checking for dbus-glib-1 >= 0.70 " >&5 +echo $ECHO_N "checking for dbus-glib-1 >= 0.70 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "dbus-glib-1 >= 0.70 " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_CFLAGS" >&5 -$as_echo_n "checking DBUS_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking DBUS_CFLAGS" >&5 +echo $ECHO_N "checking DBUS_CFLAGS... $ECHO_C" >&6 DBUS_CFLAGS=`$PKG_CONFIG --cflags "dbus-glib-1 >= 0.70 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_CFLAGS" >&5 -$as_echo "$DBUS_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $DBUS_CFLAGS" >&5 +echo "${ECHO_T}$DBUS_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking DBUS_LIBS" >&5 -$as_echo_n "checking DBUS_LIBS... " >&6; } + echo "$as_me:$LINENO: checking DBUS_LIBS" >&5 +echo $ECHO_N "checking DBUS_LIBS... $ECHO_C" >&6 DBUS_LIBS=`$PKG_CONFIG --libs "dbus-glib-1 >= 0.70 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBUS_LIBS" >&5 -$as_echo "$DBUS_LIBS" >&6; } + echo "$as_me:$LINENO: result: $DBUS_LIBS" >&5 +echo "${ECHO_T}$DBUS_LIBS" >&6 else DBUS_CFLAGS="" DBUS_LIBS="" @@ -20388,33 +26613,37 @@ $as_echo "$DBUS_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (dbus-glib-1 >= 0.70 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable GIO support" >&5 -$as_echo_n "checking whether to enable GIO support... " >&6; } + echo "$as_me:$LINENO: checking whether to enable GIO support" >&5 +echo $ECHO_N "checking whether to enable GIO support... $ECHO_C" >&6 if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$enable_gio" = "yes"; then if test "$ENABLE_GNOMEVFS" = "TRUE" ; then - as_fn_error "please use --enable-gio only together with --disable-gnome-vfs." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: please use --enable-gio only together with --disable-gnome-vfs." >&5 +echo "$as_me: error: please use --enable-gio only together with --disable-gnome-vfs." >&2;} + { (exit 1); exit 1; }; } fi ENABLE_GIO="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -20426,30 +26655,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -20460,25 +26688,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gio-2.0 " >&5 -$as_echo_n "checking for gio-2.0 ... " >&6; } + echo "$as_me:$LINENO: checking for gio-2.0 " >&5 +echo $ECHO_N "checking for gio-2.0 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "gio-2.0 " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GIO_CFLAGS" >&5 -$as_echo_n "checking GIO_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking GIO_CFLAGS" >&5 +echo $ECHO_N "checking GIO_CFLAGS... $ECHO_C" >&6 GIO_CFLAGS=`$PKG_CONFIG --cflags "gio-2.0 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_CFLAGS" >&5 -$as_echo "$GIO_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GIO_CFLAGS" >&5 +echo "${ECHO_T}$GIO_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GIO_LIBS" >&5 -$as_echo_n "checking GIO_LIBS... " >&6; } + echo "$as_me:$LINENO: checking GIO_LIBS" >&5 +echo $ECHO_N "checking GIO_LIBS... $ECHO_C" >&6 GIO_LIBS=`$PKG_CONFIG --libs "gio-2.0 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GIO_LIBS" >&5 -$as_echo "$GIO_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GIO_LIBS" >&5 +echo "${ECHO_T}$GIO_LIBS" >&6 else GIO_CFLAGS="" GIO_LIBS="" @@ -20499,12 +26727,14 @@ $as_echo "$GIO_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (gio-2.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi @@ -20522,8 +26752,8 @@ GSTREAMER_LIBS="" ENABLE_GSTREAMER="" if test "$test_gstreamer" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the GStreamer media backend" >&5 -$as_echo_n "checking whether to build the GStreamer media backend... " >&6; } + echo "$as_me:$LINENO: checking whether to build the GStreamer media backend" >&5 +echo $ECHO_N "checking whether to build the GStreamer media backend... $ECHO_C" >&6 if test "x$enable_gstreamer" != "xno" ; then succeeded=no @@ -20531,10 +26761,10 @@ $as_echo_n "checking whether to build the GStreamer media backend... " >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -20546,30 +26776,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -20580,25 +26809,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 " >&5 -$as_echo_n "checking for gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ... " >&6; } + echo "$as_me:$LINENO: checking for gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 " >&5 +echo $ECHO_N "checking for gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSTREAMER_CFLAGS" >&5 -$as_echo_n "checking GSTREAMER_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking GSTREAMER_CFLAGS" >&5 +echo $ECHO_N "checking GSTREAMER_CFLAGS... $ECHO_C" >&6 GSTREAMER_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSTREAMER_CFLAGS" >&5 -$as_echo "$GSTREAMER_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GSTREAMER_CFLAGS" >&5 +echo "${ECHO_T}$GSTREAMER_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GSTREAMER_LIBS" >&5 -$as_echo_n "checking GSTREAMER_LIBS... " >&6; } + echo "$as_me:$LINENO: checking GSTREAMER_LIBS" >&5 +echo $ECHO_N "checking GSTREAMER_LIBS... $ECHO_C" >&6 GSTREAMER_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= 2.4 gthread-2.0 gstreamer-0.10 gstreamer-interfaces-0.10 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GSTREAMER_LIBS" >&5 -$as_echo "$GSTREAMER_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GSTREAMER_LIBS" >&5 +echo "${ECHO_T}$GSTREAMER_LIBS" >&6 else GSTREAMER_CFLAGS="" GSTREAMER_LIBS="" @@ -20619,15 +26848,17 @@ $as_echo "$GSTREAMER_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages" >&5 +echo "$as_me: error: requirements to build the GStreamer media backend not met. Use --disable-gstreamer or install the missing packages" >&2;} + { (exit 1); exit 1; }; } fi ENABLE_GSTREAMER="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi @@ -20642,18 +26873,18 @@ SYSTEM_CAIRO="" if test "$test_cairo" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use cairo" >&5 -$as_echo_n "checking whether to use cairo... " >&6; } + echo "$as_me:$LINENO: checking whether to use cairo" >&5 +echo $ECHO_N "checking whether to use cairo... $ECHO_C" >&6 if test "x$enable_cairo" != "xno" ; then ENABLE_CAIRO="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which cairo to use" >&5 -$as_echo_n "checking which cairo to use... " >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking which cairo to use" >&5 +echo $ECHO_N "checking which cairo to use... $ECHO_C" >&6 if test -n "$with_system_cairo" -o -n "$with_system_libs" && \ test "$with_system_cairo" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_CAIRO=YES @@ -20662,10 +26893,10 @@ $as_echo "external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -20677,30 +26908,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -20711,25 +26941,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for cairo >= 1.0.2 " >&5 -$as_echo_n "checking for cairo >= 1.0.2 ... " >&6; } + echo "$as_me:$LINENO: checking for cairo >= 1.0.2 " >&5 +echo $ECHO_N "checking for cairo >= 1.0.2 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "cairo >= 1.0.2 " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CAIRO_CFLAGS" >&5 -$as_echo_n "checking CAIRO_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5 +echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6 CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo >= 1.0.2 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAIRO_CFLAGS" >&5 -$as_echo "$CAIRO_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5 +echo "${ECHO_T}$CAIRO_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking CAIRO_LIBS" >&5 -$as_echo_n "checking CAIRO_LIBS... " >&6; } + echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5 +echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6 CAIRO_LIBS=`$PKG_CONFIG --libs "cairo >= 1.0.2 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CAIRO_LIBS" >&5 -$as_echo "$CAIRO_LIBS" >&6; } + echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5 +echo "${ECHO_T}$CAIRO_LIBS" >&6 else CAIRO_CFLAGS="" CAIRO_LIBS="" @@ -20750,22 +26980,31 @@ $as_echo "$CAIRO_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (cairo >= 1.0.2 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi if test "$_os" != "WINNT" -a "$_os" != "Darwin" -a "$ENABLE_FONTCONFIG" != "TRUE" ; then - as_fn_error "Cairo library requires fontconfig." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Cairo library requires fontconfig." >&5 +echo "$as_me: error: Cairo library requires fontconfig." >&2;} + { (exit 1); exit 1; }; } fi if test "$with_system_xrender_headers" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether Xrender.h defines PictStandardA8" >&5 -$as_echo_n "checking whether Xrender.h defines PictStandardA8... " >&6; } - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + echo "$as_me:$LINENO: checking whether Xrender.h defines PictStandardA8" >&5 +echo $ECHO_N "checking whether Xrender.h defines PictStandardA8... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -20779,28 +27018,43 @@ int main(int argc, char **argv) { } _ACEOF -if ac_fn_c_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - as_fn_error "no, X headers too old." "$LINENO" 5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: no, X headers too old." >&5 +echo "$as_me: error: no, X headers too old." >&2;} + { (exit 1); exit 1; }; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - fi else BUILD_TYPE="$BUILD_TYPE CAIRO" if test "$build_cpu" != "x86_64"; then BUILD_PIXMAN=YES fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi fi @@ -20811,52 +27065,219 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the OpenGL Transitions component" >&5 -$as_echo_n "checking whether to build the OpenGL Transitions component... " >&6; } +echo "$as_me:$LINENO: checking whether to build the OpenGL Transitions component" >&5 +echo $ECHO_N "checking whether to build the OpenGL Transitions component... $ECHO_C" >&6 ENABLE_OPENGL= if test "x$enable_opengl" != "xno" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ac_fn_c_check_header_mongrel "$LINENO" "GL/gl.h" "ac_cv_header_GL_gl_h" "$ac_includes_default" -if test "x$ac_cv_header_GL_gl_h" = x""yes; then : + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + if test "${ac_cv_header_GL_gl_h+set}" = set; then + echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 +if test "${ac_cv_header_GL_gl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking GL/gl.h usability" >&5 +echo $ECHO_N "checking GL/gl.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking GL/gl.h presence" >&5 +echo $ECHO_N "checking GL/gl.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: GL/gl.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: GL/gl.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: GL/gl.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: GL/gl.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: GL/gl.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: GL/gl.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: GL/gl.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: GL/gl.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: GL/gl.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for GL/gl.h" >&5 +echo $ECHO_N "checking for GL/gl.h... $ECHO_C" >&6 +if test "${ac_cv_header_GL_gl_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_GL_gl_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_GL_gl_h" >&5 +echo "${ECHO_T}$ac_cv_header_GL_gl_h" >&6 +fi +if test $ac_cv_header_GL_gl_h = yes; then + : else - as_fn_error "OpenGL headers not found" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: OpenGL headers not found" >&5 +echo "$as_me: error: OpenGL headers not found" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lGL" >&5 -$as_echo_n "checking for main in -lGL... " >&6; } -if test "${ac_cv_lib_GL_main+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for main in -lGL" >&5 +echo $ECHO_N "checking for main in -lGL... $ECHO_C" >&6 +if test "${ac_cv_lib_GL_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lGL $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int main () { -return main (); +main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_GL_main=yes else - ac_cv_lib_GL_main=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_GL_main=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GL_main" >&5 -$as_echo "$ac_cv_lib_GL_main" >&6; } -if test "x$ac_cv_lib_GL_main" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_GL_main" >&5 +echo "${ECHO_T}$ac_cv_lib_GL_main" >&6 +if test $ac_cv_lib_GL_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBGL 1 _ACEOF @@ -20864,40 +27285,71 @@ _ACEOF LIBS="-lGL $LIBS" else - as_fn_error "libGL not installed or functional" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libGL not installed or functional" >&5 +echo "$as_me: error: libGL not installed or functional" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lGLU" >&5 -$as_echo_n "checking for main in -lGLU... " >&6; } -if test "${ac_cv_lib_GLU_main+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for main in -lGLU" >&5 +echo $ECHO_N "checking for main in -lGLU... $ECHO_C" >&6 +if test "${ac_cv_lib_GLU_main+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lGLU $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ int main () { -return main (); +main (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_GLU_main=yes else - ac_cv_lib_GLU_main=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_GLU_main=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_GLU_main" >&5 -$as_echo "$ac_cv_lib_GLU_main" >&6; } -if test "x$ac_cv_lib_GLU_main" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_GLU_main" >&5 +echo "${ECHO_T}$ac_cv_lib_GLU_main" >&6 +if test $ac_cv_lib_GLU_main = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBGLU 1 _ACEOF @@ -20905,69 +27357,71 @@ _ACEOF LIBS="-lGLU $LIBS" else - as_fn_error "libGLU not installed or functional" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libGLU not installed or functional" >&5 +echo "$as_me: error: libGLU not installed or functional" >&2;} + { (exit 1); exit 1; }; } fi ENABLE_OPENGL=TRUE else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build extra presenter ui" >&5 -$as_echo_n "checking whether to build extra presenter ui... " >&6; } +echo "$as_me:$LINENO: checking whether to build extra presenter ui" >&5 +echo $ECHO_N "checking whether to build extra presenter ui... $ECHO_C" >&6 if test -n "$enable_presenter_extra_ui" -a "$enable_presenter_extra_ui" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_PRESENTER_EXTRA_UI=YES else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_PRESENTER_EXTRA_UI=NO fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Presentation Minimizer extension" >&5 -$as_echo_n "checking whether to build the Presentation Minimizer extension... " >&6; } +echo "$as_me:$LINENO: checking whether to build the Presentation Minimizer extension" >&5 +echo $ECHO_N "checking whether to build the Presentation Minimizer extension... $ECHO_C" >&6 if test -n "$enable_minimizer" -a "$enable_minimizer" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_MINIMIZER=YES else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_MINIMIZER=NO fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Presenter Screen extension" >&5 -$as_echo_n "checking whether to build the Presenter Screen extension... " >&6; } +echo "$as_me:$LINENO: checking whether to build the Presenter Screen extension" >&5 +echo $ECHO_N "checking whether to build the Presenter Screen extension... $ECHO_C" >&6 if test -n "$enable_presenter_console" -a "$enable_presenter_screen" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_PRESENTER_SCREEN=YES else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_PRESENTER_SCREEN=NO fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the PDF Import extension" >&5 -$as_echo_n "checking whether to build the PDF Import extension... " >&6; } +echo "$as_me:$LINENO: checking whether to build the PDF Import extension" >&5 +echo $ECHO_N "checking whether to build the PDF Import extension... $ECHO_C" >&6 if test -n "$enable_pdfimport" -a "$enable_pdfimport" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_PDFIMPORT=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which pdf backend to use" >&5 -$as_echo_n "checking which pdf backend to use... " >&6; } + echo "$as_me:$LINENO: checking which pdf backend to use" >&5 +echo $ECHO_N "checking which pdf backend to use... $ECHO_C" >&6 if test -n "$with_system_poppler" -o -n "$with_system_libs" && \ test "$with_system_poppler" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_POPPLER=YES succeeded=no @@ -20975,10 +27429,10 @@ $as_echo "external" >&6; } if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -20990,30 +27444,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -21024,25 +27477,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for poppler >= 0.8.0 " >&5 -$as_echo_n "checking for poppler >= 0.8.0 ... " >&6; } + echo "$as_me:$LINENO: checking for poppler >= 0.8.0 " >&5 +echo $ECHO_N "checking for poppler >= 0.8.0 ... $ECHO_C" >&6 if $PKG_CONFIG --exists "poppler >= 0.8.0 " ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking POPPLER_CFLAGS" >&5 -$as_echo_n "checking POPPLER_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking POPPLER_CFLAGS" >&5 +echo $ECHO_N "checking POPPLER_CFLAGS... $ECHO_C" >&6 POPPLER_CFLAGS=`$PKG_CONFIG --cflags "poppler >= 0.8.0 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POPPLER_CFLAGS" >&5 -$as_echo "$POPPLER_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $POPPLER_CFLAGS" >&5 +echo "${ECHO_T}$POPPLER_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking POPPLER_LIBS" >&5 -$as_echo_n "checking POPPLER_LIBS... " >&6; } + echo "$as_me:$LINENO: checking POPPLER_LIBS" >&5 +echo $ECHO_N "checking POPPLER_LIBS... $ECHO_C" >&6 POPPLER_LIBS=`$PKG_CONFIG --libs "poppler >= 0.8.0 "` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $POPPLER_LIBS" >&5 -$as_echo "$POPPLER_LIBS" >&6; } + echo "$as_me:$LINENO: result: $POPPLER_LIBS" >&5 +echo "${ECHO_T}$POPPLER_LIBS" >&6 else POPPLER_CFLAGS="" POPPLER_LIBS="" @@ -21063,26 +27516,30 @@ $as_echo "$POPPLER_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (poppler >= 0.8.0 ) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_POPPLER=NO BUILD_TYPE="$BUILD_TYPE XPDF" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xpdf module" >&5 -$as_echo_n "checking for xpdf module... " >&6; } + echo "$as_me:$LINENO: checking for xpdf module" >&5 +echo $ECHO_N "checking for xpdf module... $ECHO_C" >&6 if test -d ./xpdf; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else - as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_PDFIMPORT=NO fi @@ -21091,76 +27548,82 @@ fi if test "$ENABLE_PRESENTER_SCREEN" = "YES" -o "$ENABLE_MINIMIZER" = "YES" -o "$ENABLE_PDFIMPORT" = "YES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sdext module" >&5 -$as_echo_n "checking for sdext module... " >&6; } + echo "$as_me:$LINENO: checking for sdext module" >&5 +echo $ECHO_N "checking for sdext module... $ECHO_C" >&6 if test -d ./sdext; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else - as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { (exit 1); exit 1; }; } fi BUILD_TYPE="$BUILD_TYPE SDEXT" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Wiki Publisher extension" >&5 -$as_echo_n "checking whether to build the Wiki Publisher extension... " >&6; } +echo "$as_me:$LINENO: checking whether to build the Wiki Publisher extension" >&5 +echo $ECHO_N "checking whether to build the Wiki Publisher extension... $ECHO_C" >&6 if test -n "$enable_wiki_publisher" -a "$enable_wiki_publisher" != "no" && test "$WITH_JAVA" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for swext module" >&5 -$as_echo_n "checking for swext module... " >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + echo "$as_me:$LINENO: checking for swext module" >&5 +echo $ECHO_N "checking for swext module... $ECHO_C" >&6 if test -d ./swext; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else - as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { (exit 1); exit 1; }; } fi ENABLE_MEDIAWIKI=YES BUILD_TYPE="$BUILD_TYPE SWEXT" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_MEDIAWIKI=NO fi if test "$ENABLE_MEDIAWIKI" = "YES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Servlet API Jar to use" >&5 -$as_echo_n "checking which Servlet API Jar to use... " >&6; } + echo "$as_me:$LINENO: checking which Servlet API Jar to use" >&5 +echo $ECHO_N "checking which Servlet API Jar to use... $ECHO_C" >&6 if test -n "$with_system_servlet_api"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 SYSTEM_SERVLETAPI=YES if test -z "$SERVLETAPI_JAR"; then SERVLETAPI_JAR=/usr/share/java/servlet-api.jar fi - as_ac_File=`$as_echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SERVLETAPI_JAR" >&5 -$as_echo_n "checking for $SERVLETAPI_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$SERVLETAPI_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $SERVLETAPI_JAR" >&5 +echo $ECHO_N "checking for $SERVLETAPI_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$SERVLETAPI_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "servlet-api.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: servlet-api.jar not found." >&5 +echo "$as_me: error: servlet-api.jar not found." >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_SERVLETAPI=NO BUILD_TYPE="$BUILD_TYPE TOMCAT" fi @@ -21168,93 +27631,103 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the Report Builder extension" >&5 -$as_echo_n "checking whether to build the Report Builder extension... " >&6; } +echo "$as_me:$LINENO: checking whether to build the Report Builder extension" >&5 +echo $ECHO_N "checking whether to build the Report Builder extension... $ECHO_C" >&6 if test -n "$enable_report_builder" -a "$enable_report_builder" != "no" && test "$WITH_JAVA" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 ENABLE_REPORTBUILDER=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for reportbuilder module" >&5 -$as_echo_n "checking for reportbuilder module... " >&6; } + echo "$as_me:$LINENO: checking for reportbuilder module" >&5 +echo $ECHO_N "checking for reportbuilder module... $ECHO_C" >&6 if test -d ./reportbuilder; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else - as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which jfreereport libs to use" >&5 -$as_echo_n "checking which jfreereport libs to use... " >&6; } + echo "$as_me:$LINENO: checking which jfreereport libs to use" >&5 +echo $ECHO_N "checking which jfreereport libs to use... $ECHO_C" >&6 if test "$with_system_jfreereport" = "yes"; then SYSTEM_JFREEREPORT=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 if test -z $SAC_JAR; then SAC_JAR=/usr/share/java/sac.jar fi - as_ac_File=`$as_echo "ac_cv_file_$SAC_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $SAC_JAR" >&5 -$as_echo_n "checking for $SAC_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$SAC_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $SAC_JAR" >&5 +echo $ECHO_N "checking for $SAC_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$SAC_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "sac.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: sac.jar not found." >&5 +echo "$as_me: error: sac.jar not found." >&2;} + { (exit 1); exit 1; }; } fi if test -z $LIBXML_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libxml-1.0.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/libxml-1.0.0.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_libxml_1_0_0_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/libxml-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libxml-1.0.0.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_libxml_1_0_0_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/libxml-1.0.0.jar"; then ac_cv_file__usr_share_java_libxml_1_0_0_jar=yes else ac_cv_file__usr_share_java_libxml_1_0_0_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libxml_1_0_0_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_1_0_0_jar" >&6 +if test $ac_cv_file__usr_share_java_libxml_1_0_0_jar = yes; then LIBXML_JAR=/usr/share/java/libxml-1.0.0.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libxml.jar" >&5 -$as_echo_n "checking for /usr/share/java/libxml.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_libxml_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/libxml.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libxml.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_libxml_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/libxml.jar"; then ac_cv_file__usr_share_java_libxml_jar=yes else ac_cv_file__usr_share_java_libxml_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libxml_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libxml_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libxml_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libxml_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libxml_jar" >&6 +if test $ac_cv_file__usr_share_java_libxml_jar = yes; then LIBXML_JAR=/usr/share/java/libxml.jar else - as_fn_error "libxml.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libxml.jar replacement not found." >&5 +echo "$as_me: error: libxml.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -21263,71 +27736,79 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBXML_JAR" >&5 -$as_echo_n "checking for $LIBXML_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$LIBXML_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $LIBXML_JAR" >&5 +echo $ECHO_N "checking for $LIBXML_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$LIBXML_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "libxml.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libxml.jar not found." >&5 +echo "$as_me: error: libxml.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z $FLUTE_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/flute-1.3.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/flute-1.3.0.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_flute_1_3_0_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/flute-1.3.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flute-1.3.0.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_flute_1_3_0_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/flute-1.3.0.jar"; then ac_cv_file__usr_share_java_flute_1_3_0_jar=yes else ac_cv_file__usr_share_java_flute_1_3_0_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_flute_1_3_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_flute_1_3_0_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_1_3_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_1_3_0_jar" >&6 +if test $ac_cv_file__usr_share_java_flute_1_3_0_jar = yes; then FLUTE_JAR=/usr/share/java/flute-1.3.0.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/flute.jar" >&5 -$as_echo_n "checking for /usr/share/java/flute.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_flute_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/flute.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flute.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_flute_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/flute.jar"; then ac_cv_file__usr_share_java_flute_jar=yes else ac_cv_file__usr_share_java_flute_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_flute_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_flute_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_flute_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flute_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flute_jar" >&6 +if test $ac_cv_file__usr_share_java_flute_jar = yes; then FLUTE_JAR=/usr/share/java/flute.jar else - as_fn_error "flute-1.3.0.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: flute-1.3.0.jar replacement not found." >&5 +echo "$as_me: error: flute-1.3.0.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -21336,71 +27817,79 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $FLUTE_JAR" >&5 -$as_echo_n "checking for $FLUTE_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$FLUTE_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $FLUTE_JAR" >&5 +echo $ECHO_N "checking for $FLUTE_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$FLUTE_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "flute-1.3.0.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: flute-1.3.0.jar not found." >&5 +echo "$as_me: error: flute-1.3.0.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z $JFREEREPORT_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5 -$as_echo_n "checking for /usr/share/java/flow-engine-0.9.2.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_flow_engine_0_9_2_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine-0.9.2.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flow-engine-0.9.2.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_flow_engine_0_9_2_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/flow-engine-0.9.2.jar"; then ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=yes else ac_cv_file__usr_share_java_flow_engine_0_9_2_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flow_engine_0_9_2_jar" >&6 +if test $ac_cv_file__usr_share_java_flow_engine_0_9_2_jar = yes; then JFREEREPORT_JAR=/usr/share/java/flow-engine-0.9.2.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/flow-engine.jar" >&5 -$as_echo_n "checking for /usr/share/java/flow-engine.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_flow_engine_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/flow-engine.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/flow-engine.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_flow_engine_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/flow-engine.jar"; then ac_cv_file__usr_share_java_flow_engine_jar=yes else ac_cv_file__usr_share_java_flow_engine_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_flow_engine_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_flow_engine_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_flow_engine_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_flow_engine_jar" >&6 +if test $ac_cv_file__usr_share_java_flow_engine_jar = yes; then JFREEREPORT_JAR=/usr/share/java/flow-engine.jar else - as_fn_error "jfreereport.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: jfreereport.jar replacement not found." >&5 +echo "$as_me: error: jfreereport.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -21409,71 +27898,79 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $JFREEREPORT_JAR" >&5 -$as_echo_n "checking for $JFREEREPORT_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$JFREEREPORT_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $JFREEREPORT_JAR" >&5 +echo $ECHO_N "checking for $JFREEREPORT_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$JFREEREPORT_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "jfreereport.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: jfreereport.jar not found." >&5 +echo "$as_me: error: jfreereport.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z $LIBLAYOUT_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/liblayout-0.2.9.jar" >&5 -$as_echo_n "checking for /usr/share/java/liblayout-0.2.9.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_liblayout_0_2_9_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/liblayout-0.2.9.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/liblayout-0.2.9.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_liblayout_0_2_9_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/liblayout-0.2.9.jar"; then ac_cv_file__usr_share_java_liblayout_0_2_9_jar=yes else ac_cv_file__usr_share_java_liblayout_0_2_9_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_0_2_9_jar" >&6 +if test $ac_cv_file__usr_share_java_liblayout_0_2_9_jar = yes; then LIBLAYOUT_JAR=/usr/share/java/liblayout-0.2.9.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/liblayout.jar" >&5 -$as_echo_n "checking for /usr/share/java/liblayout.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_liblayout_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/liblayout.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/liblayout.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_liblayout_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/liblayout.jar"; then ac_cv_file__usr_share_java_liblayout_jar=yes else ac_cv_file__usr_share_java_liblayout_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_liblayout_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_liblayout_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_liblayout_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_liblayout_jar" >&6 +if test $ac_cv_file__usr_share_java_liblayout_jar = yes; then LIBLAYOUT_JAR=/usr/share/java/liblayout.jar else - as_fn_error "liblayout.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: liblayout.jar replacement not found." >&5 +echo "$as_me: error: liblayout.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -21482,71 +27979,79 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBLAYOUT_JAR" >&5 -$as_echo_n "checking for $LIBLAYOUT_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$LIBLAYOUT_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $LIBLAYOUT_JAR" >&5 +echo $ECHO_N "checking for $LIBLAYOUT_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$LIBLAYOUT_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "liblayout.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: liblayout.jar not found." >&5 +echo "$as_me: error: liblayout.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z $LIBLOADER_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libloader-1.0.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/libloader-1.0.0.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_libloader_1_0_0_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/libloader-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libloader-1.0.0.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_libloader_1_0_0_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/libloader-1.0.0.jar"; then ac_cv_file__usr_share_java_libloader_1_0_0_jar=yes else ac_cv_file__usr_share_java_libloader_1_0_0_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libloader_1_0_0_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_1_0_0_jar" >&6 +if test $ac_cv_file__usr_share_java_libloader_1_0_0_jar = yes; then LIBLOADER_JAR=/usr/share/java/libloader-1.0.0.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libloader.jar" >&5 -$as_echo_n "checking for /usr/share/java/libloader.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_libloader_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/libloader.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libloader.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_libloader_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/libloader.jar"; then ac_cv_file__usr_share_java_libloader_jar=yes else ac_cv_file__usr_share_java_libloader_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libloader_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libloader_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libloader_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libloader_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libloader_jar" >&6 +if test $ac_cv_file__usr_share_java_libloader_jar = yes; then LIBLOADER_JAR=/usr/share/java/libloader.jar else - as_fn_error "libloader.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libloader.jar replacement not found." >&5 +echo "$as_me: error: libloader.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -21555,71 +28060,79 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBLOADER_JAR" >&5 -$as_echo_n "checking for $LIBLOADER_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$LIBLOADER_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $LIBLOADER_JAR" >&5 +echo $ECHO_N "checking for $LIBLOADER_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$LIBLOADER_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "libloader.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libloader.jar not found." >&5 +echo "$as_me: error: libloader.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z $LIBFORMULA_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libformula-0.2.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/libformula-0.2.0.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_libformula_0_2_0_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/libformula-0.2.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libformula-0.2.0.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_libformula_0_2_0_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/libformula-0.2.0.jar"; then ac_cv_file__usr_share_java_libformula_0_2_0_jar=yes else ac_cv_file__usr_share_java_libformula_0_2_0_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libformula_0_2_0_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_0_2_0_jar" >&6 +if test $ac_cv_file__usr_share_java_libformula_0_2_0_jar = yes; then LIBFORMULA_JAR=/usr/share/java/libformula-0.2.0.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libformula.jar" >&5 -$as_echo_n "checking for /usr/share/java/libformula.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_libformula_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/libformula.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libformula.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_libformula_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/libformula.jar"; then ac_cv_file__usr_share_java_libformula_jar=yes else ac_cv_file__usr_share_java_libformula_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libformula_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libformula_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libformula_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libformula_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libformula_jar" >&6 +if test $ac_cv_file__usr_share_java_libformula_jar = yes; then LIBFORMULA_JAR=/usr/share/java/libformula.jar else - as_fn_error "libformula.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libformula.jar replacement not found." >&5 +echo "$as_me: error: libformula.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -21628,71 +28141,79 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBFORMULA_JAR" >&5 -$as_echo_n "checking for $LIBFORMULA_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$LIBFORMULA_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $LIBFORMULA_JAR" >&5 +echo $ECHO_N "checking for $LIBFORMULA_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$LIBFORMULA_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "libformula.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libformula.jar not found." >&5 +echo "$as_me: error: libformula.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z $LIBREPOSITORY_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/librepository-1.0.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/librepository-1.0.0.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_librepository_1_0_0_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/librepository-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/librepository-1.0.0.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_librepository_1_0_0_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/librepository-1.0.0.jar"; then ac_cv_file__usr_share_java_librepository_1_0_0_jar=yes else ac_cv_file__usr_share_java_librepository_1_0_0_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_librepository_1_0_0_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_1_0_0_jar" >&6 +if test $ac_cv_file__usr_share_java_librepository_1_0_0_jar = yes; then LIBREPOSITORY_JAR=/usr/share/java/librepository-1.0.0.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/librepository.jar" >&5 -$as_echo_n "checking for /usr/share/java/librepository.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_librepository_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/librepository.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/librepository.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_librepository_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/librepository.jar"; then ac_cv_file__usr_share_java_librepository_jar=yes else ac_cv_file__usr_share_java_librepository_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_librepository_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_librepository_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_librepository_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_librepository_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_librepository_jar" >&6 +if test $ac_cv_file__usr_share_java_librepository_jar = yes; then LIBREPOSITORY_JAR=/usr/share/java/librepository.jar else - as_fn_error "librepository.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: librepository.jar replacement not found." >&5 +echo "$as_me: error: librepository.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -21701,71 +28222,79 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBREPOSITORY_JAR" >&5 -$as_echo_n "checking for $LIBREPOSITORY_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$LIBREPOSITORY_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $LIBREPOSITORY_JAR" >&5 +echo $ECHO_N "checking for $LIBREPOSITORY_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$LIBREPOSITORY_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "librepository.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: librepository.jar not found." >&5 +echo "$as_me: error: librepository.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z $LIBFONTS_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libfonts-1.0.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/libfonts-1.0.0.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_libfonts_1_0_0_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/libfonts-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libfonts-1.0.0.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_libfonts_1_0_0_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/libfonts-1.0.0.jar"; then ac_cv_file__usr_share_java_libfonts_1_0_0_jar=yes else ac_cv_file__usr_share_java_libfonts_1_0_0_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_1_0_0_jar" >&6 +if test $ac_cv_file__usr_share_java_libfonts_1_0_0_jar = yes; then LIBFONTS_JAR=/usr/share/java/libfonts-1.0.0.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libfonts.jar" >&5 -$as_echo_n "checking for /usr/share/java/libfonts.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_libfonts_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/libfonts.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libfonts.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_libfonts_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/libfonts.jar"; then ac_cv_file__usr_share_java_libfonts_jar=yes else ac_cv_file__usr_share_java_libfonts_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libfonts_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libfonts_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libfonts_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libfonts_jar" >&6 +if test $ac_cv_file__usr_share_java_libfonts_jar = yes; then LIBFONTS_JAR=/usr/share/java/libfonts.jar else - as_fn_error "libfonts.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libfonts.jar replacement not found." >&5 +echo "$as_me: error: libfonts.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -21774,71 +28303,79 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBFONTS_JAR" >&5 -$as_echo_n "checking for $LIBFONTS_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$LIBFONTS_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $LIBFONTS_JAR" >&5 +echo $ECHO_N "checking for $LIBFONTS_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$LIBFONTS_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "libfonts.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libfonts.jar not found." >&5 +echo "$as_me: error: libfonts.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z $LIBSERIALIZER_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libserializer-1.0.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/libserializer-1.0.0.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_libserializer_1_0_0_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/libserializer-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libserializer-1.0.0.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_libserializer_1_0_0_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/libserializer-1.0.0.jar"; then ac_cv_file__usr_share_java_libserializer_1_0_0_jar=yes else ac_cv_file__usr_share_java_libserializer_1_0_0_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libserializer_1_0_0_jar" >&6 +if test $ac_cv_file__usr_share_java_libserializer_1_0_0_jar = yes; then LIBSERIALIZER_JAR=/usr/share/java/libserializer-1.0.0.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libserializer.jar" >&5 -$as_echo_n "checking for /usr/share/java/libserializer.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_libserializer_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/libserializer.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libserializer.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_libserializer_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/libserializer.jar"; then ac_cv_file__usr_share_java_libserializer_jar=yes else ac_cv_file__usr_share_java_libserializer_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libserializer_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libserializer_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libserializer_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libserializer_jar" >&6 +if test $ac_cv_file__usr_share_java_libserializer_jar = yes; then LIBSERIALIZER_JAR=/usr/share/java/libserializer.jar else - as_fn_error "libserializer.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libserializer.jar replacement not found." >&5 +echo "$as_me: error: libserializer.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -21847,72 +28384,80 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBSERIALIZER_JAR" >&5 -$as_echo_n "checking for $LIBSERIALIZER_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$LIBSERIALIZER_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $LIBSERIALIZER_JAR" >&5 +echo $ECHO_N "checking for $LIBSERIALIZER_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$LIBSERIALIZER_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "libserializer.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libserializer.jar not found." >&5 +echo "$as_me: error: libserializer.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z $LIBBASE_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libbase-1.0.0.jar" >&5 -$as_echo_n "checking for /usr/share/java/libbase-1.0.0.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_libbase_1_0_0_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/libbase-1.0.0.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libbase-1.0.0.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_libbase_1_0_0_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/libbase-1.0.0.jar"; then ac_cv_file__usr_share_java_libbase_1_0_0_jar=yes else ac_cv_file__usr_share_java_libbase_1_0_0_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libbase_1_0_0_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libbase_1_0_0_jar" >&6 +if test $ac_cv_file__usr_share_java_libbase_1_0_0_jar = yes; then LIBBASE_JAR=/usr/share/java/libbase-1.0.0.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/libbase.jar" >&5 -$as_echo_n "checking for /usr/share/java/libbase.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_libbase_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/libbase.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/libbase.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_libbase_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/libbase.jar"; then ac_cv_file__usr_share_java_libbase_jar=yes else ac_cv_file__usr_share_java_libbase_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_libbase_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_libbase_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_libbase_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_libbase_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_libbase_jar" >&6 +if test $ac_cv_file__usr_share_java_libbase_jar = yes; then LIBBASE_JAR=/usr/share/java/libbase.jar else - as_fn_error "libbase.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libbase.jar replacement not found." >&5 +echo "$as_me: error: libbase.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -21921,50 +28466,54 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LIBBASE_JAR" >&5 -$as_echo_n "checking for $LIBBASE_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$LIBBASE_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $LIBBASE_JAR" >&5 +echo $ECHO_N "checking for $LIBBASE_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$LIBBASE_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "libbase.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: libbase.jar not found." >&5 +echo "$as_me: error: libbase.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jfreereport module" >&5 -$as_echo_n "checking for jfreereport module... " >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 + echo "$as_me:$LINENO: checking for jfreereport module" >&5 +echo $ECHO_N "checking for jfreereport module... $ECHO_C" >&6 if test -d ./jfreereport; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: OK" >&5 -$as_echo "OK" >&6; } + echo "$as_me:$LINENO: result: OK" >&5 +echo "${ECHO_T}OK" >&6 else - as_fn_error "not existing. get it (did you get the -extensions tarball?)" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: not existing. get it (did you get the -extensions tarball?)" >&5 +echo "$as_me: error: not existing. get it (did you get the -extensions tarball?)" >&2;} + { (exit 1); exit 1; }; } fi SYSTEM_JFREEREPORT=NO BUILD_TYPE="$BUILD_TYPE JFREEREPORT" fi BUILD_TYPE="$BUILD_TYPE REPORTBUILDER" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_REPORTBUILDER=NO SYSTEM_JFREEREPORT=NO fi @@ -21985,52 +28534,58 @@ fi # this has to be here because both the wiki publisher and the SRB use # commons-logging if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking which Apache commons-* libs to use" >&5 -$as_echo_n "checking which Apache commons-* libs to use... " >&6; } + echo "$as_me:$LINENO: checking which Apache commons-* libs to use" >&5 +echo $ECHO_N "checking which Apache commons-* libs to use... $ECHO_C" >&6 if test "$with_system_apache_commons" = "yes"; then SYSTEM_APACHE_COMMONS=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: result: external" >&5 -$as_echo "external" >&6; } + echo "$as_me:$LINENO: result: external" >&5 +echo "${ECHO_T}external" >&6 if test "$ENABLE_MEDIAWIKI" = "YES"; then if test -z $COMMONS_CODEC_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-codec-1.3.jar" >&5 -$as_echo_n "checking for /usr/share/java/commons-codec-1.3.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_commons_codec_1_3_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/commons-codec-1.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-codec-1.3.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_codec_1_3_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/commons-codec-1.3.jar"; then ac_cv_file__usr_share_java_commons_codec_1_3_jar=yes else ac_cv_file__usr_share_java_commons_codec_1_3_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_commons_codec_1_3_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_codec_1_3_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_codec_1_3_jar = yes; then COMMONS_CODEC_JAR=/usr/share/java/commons-codec-1.3.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-codec.jar" >&5 -$as_echo_n "checking for /usr/share/java/commons-codec.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_commons_codec_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/commons-codec.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-codec.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_codec_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/commons-codec.jar"; then ac_cv_file__usr_share_java_commons_codec_jar=yes else ac_cv_file__usr_share_java_commons_codec_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_codec_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_commons_codec_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_commons_codec_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_codec_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_codec_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_codec_jar = yes; then COMMONS_CODEC_JAR=/usr/share/java/commons-codec.jar else - as_fn_error "commons-codec.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: commons-codec.jar replacement not found." >&5 +echo "$as_me: error: commons-codec.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -22039,71 +28594,79 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_CODEC_JAR" >&5 -$as_echo_n "checking for $COMMONS_CODEC_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$COMMONS_CODEC_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $COMMONS_CODEC_JAR" >&5 +echo $ECHO_N "checking for $COMMONS_CODEC_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$COMMONS_CODEC_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "commons-codec.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: commons-codec.jar not found." >&5 +echo "$as_me: error: commons-codec.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z $COMMONS_LANG_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-lang-2.3.jar" >&5 -$as_echo_n "checking for /usr/share/java/commons-lang-2.3.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_commons_lang_2_3_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/commons-lang-2.3.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-lang-2.3.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_lang_2_3_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/commons-lang-2.3.jar"; then ac_cv_file__usr_share_java_commons_lang_2_3_jar=yes else ac_cv_file__usr_share_java_commons_lang_2_3_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_commons_lang_2_3_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_lang_2_3_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_lang_2_3_jar = yes; then COMMONS_LANG_JAR=/usr/share/java/commons-lang-2.3.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-lang.jar" >&5 -$as_echo_n "checking for /usr/share/java/commons-lang.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_commons_lang_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/commons-lang.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-lang.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_lang_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/commons-lang.jar"; then ac_cv_file__usr_share_java_commons_lang_jar=yes else ac_cv_file__usr_share_java_commons_lang_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_lang_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_commons_lang_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_commons_lang_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_lang_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_lang_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_lang_jar = yes; then COMMONS_LANG_JAR=/usr/share/java/commons-lang.jar else - as_fn_error "commons-lang.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: commons-lang.jar replacement not found." >&5 +echo "$as_me: error: commons-lang.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -22112,71 +28675,79 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_LANG_JAR" >&5 -$as_echo_n "checking for $COMMONS_LANG_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$COMMONS_LANG_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $COMMONS_LANG_JAR" >&5 +echo $ECHO_N "checking for $COMMONS_LANG_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$COMMONS_LANG_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "commons-lang.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: commons-lang.jar not found." >&5 +echo "$as_me: error: commons-lang.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi if test -z $COMMONS_HTTPCLIENT_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-httpclient-3.1.jar" >&5 -$as_echo_n "checking for /usr/share/java/commons-httpclient-3.1.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_commons_httpclient_3_1_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/commons-httpclient-3.1.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-httpclient-3.1.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_httpclient_3_1_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/commons-httpclient-3.1.jar"; then ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=yes else ac_cv_file__usr_share_java_commons_httpclient_3_1_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_httpclient_3_1_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_httpclient_3_1_jar = yes; then COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient-3.1.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-httpclient.jar" >&5 -$as_echo_n "checking for /usr/share/java/commons-httpclient.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_commons_httpclient_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/commons-httpclient.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-httpclient.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_httpclient_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/commons-httpclient.jar"; then ac_cv_file__usr_share_java_commons_httpclient_jar=yes else ac_cv_file__usr_share_java_commons_httpclient_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_httpclient_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_commons_httpclient_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_commons_httpclient_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_httpclient_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_httpclient_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_httpclient_jar = yes; then COMMONS_HTTPCLIENT_JAR=/usr/share/java/commons-httpclient.jar else - as_fn_error "commons-httpclient.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: commons-httpclient.jar replacement not found." >&5 +echo "$as_me: error: commons-httpclient.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -22185,72 +28756,80 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_HTTPCLIENT_JAR" >&5 -$as_echo_n "checking for $COMMONS_HTTPCLIENT_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$COMMONS_HTTPCLIENT_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $COMMONS_HTTPCLIENT_JAR" >&5 +echo $ECHO_N "checking for $COMMONS_HTTPCLIENT_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$COMMONS_HTTPCLIENT_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "commons-httpclient.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: commons-httpclient.jar not found." >&5 +echo "$as_me: error: commons-httpclient.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi fi if test "$ENABLE_MEDIAWIKI" = "YES" -o "$ENABLE_REPORTBUILDER" = "YES"; then if test -z $COMMONS_LOGGING_JAR; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5 -$as_echo_n "checking for /usr/share/java/commons-logging-1.1.1.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_commons_logging_1_1_1_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging-1.1.1.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-logging-1.1.1.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_logging_1_1_1_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/commons-logging-1.1.1.jar"; then ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=yes else ac_cv_file__usr_share_java_commons_logging_1_1_1_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_1_1_1_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_logging_1_1_1_jar = yes; then COMMONS_LOGGING_JAR=/usr/share/java/commons-logging-1.1.1.jar else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /usr/share/java/commons-logging.jar" >&5 -$as_echo_n "checking for /usr/share/java/commons-logging.jar... " >&6; } -if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then : - $as_echo_n "(cached) " >&6 + echo "$as_me:$LINENO: checking for /usr/share/java/commons-logging.jar" >&5 +echo $ECHO_N "checking for /usr/share/java/commons-logging.jar... $ECHO_C" >&6 +if test "${ac_cv_file__usr_share_java_commons_logging_jar+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "/usr/share/java/commons-logging.jar"; then ac_cv_file__usr_share_java_commons_logging_jar=yes else ac_cv_file__usr_share_java_commons_logging_jar=no fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5 -$as_echo "$ac_cv_file__usr_share_java_commons_logging_jar" >&6; } -if test "x$ac_cv_file__usr_share_java_commons_logging_jar" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_file__usr_share_java_commons_logging_jar" >&5 +echo "${ECHO_T}$ac_cv_file__usr_share_java_commons_logging_jar" >&6 +if test $ac_cv_file__usr_share_java_commons_logging_jar = yes; then COMMONS_LOGGING_JAR=/usr/share/java/commons-logging.jar else - as_fn_error "commons-logging.jar replacement not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: commons-logging.jar replacement not found." >&5 +echo "$as_me: error: commons-logging.jar replacement not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -22259,35 +28838,37 @@ fi fi else - as_ac_File=`$as_echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $COMMONS_LOGGING_JAR" >&5 -$as_echo_n "checking for $COMMONS_LOGGING_JAR... " >&6; } -if { as_var=$as_ac_File; eval "test \"\${$as_var+set}\" = set"; }; then : - $as_echo_n "(cached) " >&6 + as_ac_File=`echo "ac_cv_file_$COMMONS_LOGGING_JAR" | $as_tr_sh` +echo "$as_me:$LINENO: checking for $COMMONS_LOGGING_JAR" >&5 +echo $ECHO_N "checking for $COMMONS_LOGGING_JAR... $ECHO_C" >&6 +if eval "test \"\${$as_ac_File+set}\" = set"; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else test "$cross_compiling" = yes && - as_fn_error "cannot check for file existence when cross compiling" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} + { (exit 1); exit 1; }; } if test -r "$COMMONS_LOGGING_JAR"; then eval "$as_ac_File=yes" else eval "$as_ac_File=no" fi fi -eval ac_res=\$$as_ac_File - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5 -$as_echo "$ac_res" >&6; } -eval as_val=\$$as_ac_File - if test "x$as_val" = x""yes; then : - +echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_File'}'`" >&5 +echo "${ECHO_T}`eval echo '${'$as_ac_File'}'`" >&6 +if test `eval echo '${'$as_ac_File'}'` = yes; then + : else - as_fn_error "commons-logging.jar not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: commons-logging.jar not found." >&5 +echo "$as_me: error: commons-logging.jar not found." >&2;} + { (exit 1); exit 1; }; } fi fi fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: internal" >&5 -$as_echo "internal" >&6; } + echo "$as_me:$LINENO: result: internal" >&5 +echo "${ECHO_T}internal" >&6 SYSTEM_APACHE_COMMONS=NO BUILD_TYPE="$BUILD_TYPE APACHE_COMMONS TOMCAT" fi @@ -22339,8 +28920,8 @@ if test "$test_kde" = "yes" -a "$ENABLE_KDE" = "TRUE" ; then kde_test_include="ksharedptr.h" kde_test_library="libkdeui.so" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt headers" >&5 -$as_echo_n "checking for Qt headers... " >&6; } + echo "$as_me:$LINENO: checking for Qt headers" >&5 +echo $ECHO_N "checking for Qt headers... $ECHO_C" >&6 qt_incdir="no" for kde_check in $qt_incdirs ; do if test -r "$kde_check/$qt_test_include" ; then @@ -22348,15 +28929,18 @@ $as_echo_n "checking for Qt headers... " >&6; } break fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_incdir" >&5 -$as_echo "$qt_incdir" >&6; } + echo "$as_me:$LINENO: result: $qt_incdir" >&5 +echo "${ECHO_T}$qt_incdir" >&6 if test "x$qt_incdir" = "xno" ; then - as_fn_error "Qt headers not found. Please specify the root of -your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Qt headers not found. Please specify the root of +your Qt installation by exporting QTDIR before running \"configure\"." >&5 +echo "$as_me: error: Qt headers not found. Please specify the root of +your Qt installation by exporting QTDIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt libraries" >&5 -$as_echo_n "checking for Qt libraries... " >&6; } + echo "$as_me:$LINENO: checking for Qt libraries" >&5 +echo $ECHO_N "checking for Qt libraries... $ECHO_C" >&6 qt_libdir="no" for qt_check in $qt_libdirs ; do if test -r "$qt_check/$qt_test_library" ; then @@ -22364,19 +28948,22 @@ $as_echo_n "checking for Qt libraries... " >&6; } break fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_libdir" >&5 -$as_echo "$qt_libdir" >&6; } + echo "$as_me:$LINENO: result: $qt_libdir" >&5 +echo "${ECHO_T}$qt_libdir" >&6 if test "x$qt_libdir" = "xno" ; then - as_fn_error "Qt libraries not found. Please specify the root of -your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Qt libraries not found. Please specify the root of +your Qt installation by exporting QTDIR before running \"configure\"." >&5 +echo "$as_me: error: Qt libraries not found. Please specify the root of +your Qt installation by exporting QTDIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } fi # Extract the first word of "moc", so it can be a program name with args. set dummy moc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MOC+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MOC+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $MOC in [\\/]* | ?:[\\/]*) @@ -22389,37 +28976,39 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MOC="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="no" ;; esac fi MOC=$ac_cv_path_MOC + if test -n "$MOC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC" >&5 -$as_echo "$MOC" >&6; } + echo "$as_me:$LINENO: result: $MOC" >&5 +echo "${ECHO_T}$MOC" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$MOC" = "no" ; then - as_fn_error "Qt Meta Object Compiler not found. Please specify -the root of your Qt installation by exporting QTDIR before running \"configure\"." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify +the root of your Qt installation by exporting QTDIR before running \"configure\"." >&5 +echo "$as_me: error: Qt Meta Object Compiler not found. Please specify +the root of your Qt installation by exporting QTDIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE headers" >&5 -$as_echo_n "checking for KDE headers... " >&6; } + echo "$as_me:$LINENO: checking for KDE headers" >&5 +echo $ECHO_N "checking for KDE headers... $ECHO_C" >&6 kde_incdir="no" for kde_check in $kde_incdirs ; do if test -r "$kde_check/$kde_test_include" ; then @@ -22427,15 +29016,18 @@ $as_echo_n "checking for KDE headers... " >&6; } break fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_incdir" >&5 -$as_echo "$kde_incdir" >&6; } + echo "$as_me:$LINENO: result: $kde_incdir" >&5 +echo "${ECHO_T}$kde_incdir" >&6 if test "x$kde_incdir" = "xno" ; then - as_fn_error "KDE headers not found. Please specify the root of -your KDE installation by exporting KDEDIR before running \"configure\"." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: KDE headers not found. Please specify the root of +your KDE installation by exporting KDEDIR before running \"configure\"." >&5 +echo "$as_me: error: KDE headers not found. Please specify the root of +your KDE installation by exporting KDEDIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE libraries" >&5 -$as_echo_n "checking for KDE libraries... " >&6; } + echo "$as_me:$LINENO: checking for KDE libraries" >&5 +echo $ECHO_N "checking for KDE libraries... $ECHO_C" >&6 kde_libdir="no" for kde_check in $kde_libdirs ; do if test -r "$kde_check/$kde_test_library" ; then @@ -22443,11 +29035,14 @@ $as_echo_n "checking for KDE libraries... " >&6; } break fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_libdir" >&5 -$as_echo "$kde_libdir" >&6; } + echo "$as_me:$LINENO: result: $kde_libdir" >&5 +echo "${ECHO_T}$kde_libdir" >&6 if test "x$kde_libdir" = "xno" ; then - as_fn_error "KDE libraries not found. Please specify the root of -your KDE installation by exporting KDEDIR before running \"configure\"." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: KDE libraries not found. Please specify the root of +your KDE installation by exporting KDEDIR before running \"configure\"." >&5 +echo "$as_me: error: KDE libraries not found. Please specify the root of +your KDE installation by exporting KDEDIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } fi KDE_CFLAGS="-I$qt_incdir -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" @@ -22487,8 +29082,8 @@ if test "$test_kde4" = "yes" -a "$ENABLE_KDE4" = "TRUE" ; then kde_test_include="ksharedptr.h" kde_test_library="libkdeui.so" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 headers" >&5 -$as_echo_n "checking for Qt4 headers... " >&6; } + echo "$as_me:$LINENO: checking for Qt4 headers" >&5 +echo $ECHO_N "checking for Qt4 headers... $ECHO_C" >&6 qt_header_dir="no" for inc_dir in $qt_incdirs ; do if test -r "$inc_dir/$qt_test_include" ; then @@ -22497,14 +29092,16 @@ $as_echo_n "checking for Qt4 headers... " >&6; } fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_header_dir" >&5 -$as_echo "$qt_header_dir" >&6; } + echo "$as_me:$LINENO: result: $qt_header_dir" >&5 +echo "${ECHO_T}$qt_header_dir" >&6 if test "x$qt_header_dir" = "xno" ; then - as_fn_error "Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&5 +echo "$as_me: error: Qt4 headers not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Qt4 libraries" >&5 -$as_echo_n "checking for Qt4 libraries... " >&6; } + echo "$as_me:$LINENO: checking for Qt4 libraries" >&5 +echo $ECHO_N "checking for Qt4 libraries... $ECHO_C" >&6 qt_lib_dir="no" for lib_dir in $qt_libdirs ; do if test -r "$lib_dir/$qt_test_library" ; then @@ -22513,19 +29110,21 @@ $as_echo_n "checking for Qt4 libraries... " >&6; } fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $qt_lib_dir" >&5 -$as_echo "$qt_lib_dir" >&6; } + echo "$as_me:$LINENO: result: $qt_lib_dir" >&5 +echo "${ECHO_T}$qt_lib_dir" >&6 if test "x$qt_lib_dir" = "xno" ; then - as_fn_error "Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&5 +echo "$as_me: error: Qt4 libraries not found. Please specify the root of your Qt4 installation by exporting QT4DIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } fi # Extract the first word of "moc", so it can be a program name with args. set dummy moc; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_MOC4+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_MOC4+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $MOC4 in [\\/]* | ?:[\\/]*) @@ -22538,37 +29137,39 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_MOC4="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_MOC4" && ac_cv_path_MOC4="no" ;; esac fi MOC4=$ac_cv_path_MOC4 + if test -n "$MOC4"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MOC4" >&5 -$as_echo "$MOC4" >&6; } + echo "$as_me:$LINENO: result: $MOC4" >&5 +echo "${ECHO_T}$MOC4" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - if test "$MOC4" = "no" ; then - as_fn_error "Qt Meta Object Compiler not found. Please specify -the root of your Qt installation by exporting QT4DIR before running \"configure\"." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Qt Meta Object Compiler not found. Please specify +the root of your Qt installation by exporting QT4DIR before running \"configure\"." >&5 +echo "$as_me: error: Qt Meta Object Compiler not found. Please specify +the root of your Qt installation by exporting QT4DIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE4 headers" >&5 -$as_echo_n "checking for KDE4 headers... " >&6; } + echo "$as_me:$LINENO: checking for KDE4 headers" >&5 +echo $ECHO_N "checking for KDE4 headers... $ECHO_C" >&6 kde_incdir="no" for kde_check in $kde_incdirs ; do if test -r "$kde_check/$kde_test_include" ; then @@ -22576,14 +29177,16 @@ $as_echo_n "checking for KDE4 headers... " >&6; } break fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_incdir" >&5 -$as_echo "$kde_incdir" >&6; } + echo "$as_me:$LINENO: result: $kde_incdir" >&5 +echo "${ECHO_T}$kde_incdir" >&6 if test "x$kde_incdir" = "xno" ; then - as_fn_error "KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&5 +echo "$as_me: error: KDE4 headers not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for KDE4 libraries" >&5 -$as_echo_n "checking for KDE4 libraries... " >&6; } + echo "$as_me:$LINENO: checking for KDE4 libraries" >&5 +echo $ECHO_N "checking for KDE4 libraries... $ECHO_C" >&6 kde_libdir="no" for kde_check in $kde_libdirs ; do if test -r "$kde_check/$kde_test_library" ; then @@ -22592,10 +29195,12 @@ $as_echo_n "checking for KDE4 libraries... " >&6; } fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $kde_libdir" >&5 -$as_echo "$kde_libdir" >&6; } + echo "$as_me:$LINENO: result: $kde_libdir" >&5 +echo "${ECHO_T}$kde_libdir" >&6 if test "x$kde_libdir" = "xno" ; then - as_fn_error "KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&5 +echo "$as_me: error: KDE4 libraries not found. Please specify the root of your KDE4 installation by exporting KDE4DIR before running \"configure\"." >&2;} + { (exit 1); exit 1; }; } fi KDE4_CFLAGS="`pkg-config --cflags QtCore` `pkg-config --cflags QtGui` -I$kde_incdir -DQT_CLEAN_NAMESPACE -DQT_THREAD_SUPPORT" @@ -22605,34 +29210,34 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable the lockdown pieces" >&5 -$as_echo_n "checking whether to enable the lockdown pieces... " >&6; } +echo "$as_me:$LINENO: checking whether to enable the lockdown pieces" >&5 +echo $ECHO_N "checking whether to enable the lockdown pieces... $ECHO_C" >&6 ENABLE_LOCKDOWN="" if test -n "$enable_lockdown" && test "$enable_lockdown" != "no"; then ENABLE_LOCKDOWN=YES - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable evolution 2 support" >&5 -$as_echo_n "checking whether to enable evolution 2 support... " >&6; } +echo "$as_me:$LINENO: checking whether to enable evolution 2 support" >&5 +echo $ECHO_N "checking whether to enable evolution 2 support... $ECHO_C" >&6 if test "$enable_evolution2" = "yes" -o "$enable_evolution2" = "TRUE"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=no if test -z "$PKG_CONFIG"; then # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_PKG_CONFIG+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $PKG_CONFIG in [\\/]* | ?:[\\/]*) @@ -22644,30 +29249,29 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" ;; esac fi PKG_CONFIG=$ac_cv_path_PKG_CONFIG + if test -n "$PKG_CONFIG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5 -$as_echo "$PKG_CONFIG" >&6; } + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - fi if test "$PKG_CONFIG" = "no" ; then @@ -22678,25 +29282,25 @@ fi else PKG_CONFIG_MIN_VERSION=0.9.0 if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gobject-2.0" >&5 -$as_echo_n "checking for gobject-2.0... " >&6; } + echo "$as_me:$LINENO: checking for gobject-2.0" >&5 +echo $ECHO_N "checking for gobject-2.0... $ECHO_C" >&6 if $PKG_CONFIG --exists "gobject-2.0" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 succeeded=yes - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GOBJECT_CFLAGS" >&5 -$as_echo_n "checking GOBJECT_CFLAGS... " >&6; } + echo "$as_me:$LINENO: checking GOBJECT_CFLAGS" >&5 +echo $ECHO_N "checking GOBJECT_CFLAGS... $ECHO_C" >&6 GOBJECT_CFLAGS=`$PKG_CONFIG --cflags "gobject-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_CFLAGS" >&5 -$as_echo "$GOBJECT_CFLAGS" >&6; } + echo "$as_me:$LINENO: result: $GOBJECT_CFLAGS" >&5 +echo "${ECHO_T}$GOBJECT_CFLAGS" >&6 - { $as_echo "$as_me:${as_lineno-$LINENO}: checking GOBJECT_LIBS" >&5 -$as_echo_n "checking GOBJECT_LIBS... " >&6; } + echo "$as_me:$LINENO: checking GOBJECT_LIBS" >&5 +echo $ECHO_N "checking GOBJECT_LIBS... $ECHO_C" >&6 GOBJECT_LIBS=`$PKG_CONFIG --libs "gobject-2.0"` - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GOBJECT_LIBS" >&5 -$as_echo "$GOBJECT_LIBS" >&6; } + echo "$as_me:$LINENO: result: $GOBJECT_LIBS" >&5 +echo "${ECHO_T}$GOBJECT_LIBS" >&6 else GOBJECT_CFLAGS="" GOBJECT_LIBS="" @@ -22717,25 +29321,27 @@ $as_echo "$GOBJECT_LIBS" >&6; } if test $succeeded = yes; then : else - as_fn_error "Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5 +echo "$as_me: error: Library requirements (gobject-2.0) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;} + { (exit 1); exit 1; }; } fi ENABLE_EVOAB2="TRUE" else ENABLE_EVOAB2="" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable KDE address book support" >&5 -$as_echo_n "checking whether to enable KDE address book support... " >&6; } +echo "$as_me:$LINENO: checking whether to enable KDE address book support" >&5 +echo $ECHO_N "checking whether to enable KDE address book support... $ECHO_C" >&6 if test "$enable_kdeab" = "yes" && test "$enable_kde" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - ac_ext=cpp + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 + ac_ext=cc ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' @@ -22743,15 +29349,20 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu save_CXXFLAGS=$CXXFLAGS CXXFLAGS="$CXXFLAGS $KDE_CFLAGS" - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether KDE is between 3.2 and 3.6" >&5 -$as_echo_n "checking whether KDE is between 3.2 and 3.6... " >&6; } - if test "$cross_compiling" = yes; then : - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error "cannot run test program while cross compiling -See \`config.log' for more details." "$LINENO" 5; } -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext + echo "$as_me:$LINENO: checking whether KDE is between 3.2 and 3.6" >&5 +echo $ECHO_N "checking whether KDE is between 3.2 and 3.6... $ECHO_C" >&6 + if test "$cross_compiling" = yes; then + { { echo "$as_me:$LINENO: error: cannot run test program while cross compiling +See \`config.log' for more details." >&5 +echo "$as_me: error: cannot run test program while cross compiling +See \`config.log' for more details." >&2;} + { (exit 1); exit 1; }; } +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ #include @@ -22762,16 +29373,31 @@ int main(int argc, char **argv) { } _ACEOF -if ac_fn_cxx_try_run "$LINENO"; then : - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } +rm -f conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && { ac_try='./conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - as_fn_error "KDE version too old or too recent, please use another version of KDE or disable KDE address book support" "$LINENO" 5 + echo "$as_me: program exited with status $ac_status" >&5 +echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +( exit $ac_status ) +{ { echo "$as_me:$LINENO: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&5 +echo "$as_me: error: KDE version too old or too recent, please use another version of KDE or disable KDE address book support" >&2;} + { (exit 1); exit 1; }; } fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ - conftest.$ac_objext conftest.beam conftest.$ac_ext +rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext fi - CXXFLAGS=$save_CXXFLAGS ac_ext=c ac_cpp='$CPP $CPPFLAGS' @@ -22781,67 +29407,67 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu ENABLE_KAB=TRUE else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 ENABLE_KAB= fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include MathMLDTD" >&5 -$as_echo_n "checking whether to include MathMLDTD... " >&6; } +echo "$as_me:$LINENO: checking whether to include MathMLDTD" >&5 +echo $ECHO_N "checking whether to include MathMLDTD... $ECHO_C" >&6 if test -n "$enable_mathmldtd"; then if test "$enable_mathmldtd" = "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 BUILD_TYPE="$BUILD_TYPE MATHMLDTD" fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 SCPDEFS="$SCPDEFS -DWITHOUT_MATHMLDTD" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include third-party fonts" >&5 -$as_echo_n "checking whether to include third-party fonts... " >&6; } +echo "$as_me:$LINENO: checking whether to include third-party fonts" >&5 +echo $ECHO_N "checking whether to include third-party fonts... $ECHO_C" >&6 if test "$with_fonts" != "no" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 WITH_FONTS=YES BUILD_TYPE="$BUILD_TYPE MORE_FONTS" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITH_FONTS=NO SCPDEFS="$SCPDEFS -DWITHOUT_FONTS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include PPDs" >&5 -$as_echo_n "checking whether to include PPDs... " >&6; } +echo "$as_me:$LINENO: checking whether to include PPDs" >&5 +echo $ECHO_N "checking whether to include PPDs... $ECHO_C" >&6 if test "$with_ppds" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITHOUT_PPDS=YES SCPDEFS="$SCPDEFS -DWITHOUT_PPDS" fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to include AFMs" >&5 -$as_echo_n "checking whether to include AFMs... " >&6; } +echo "$as_me:$LINENO: checking whether to include AFMs" >&5 +echo $ECHO_N "checking whether to include AFMs... $ECHO_C" >&6 if test "$with_afms" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 BUILD_TYPE="$BUILD_TYPE AFMS" else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 WITHOUT_AFMS=YES SCPDEFS="$SCPDEFS -DWITHOUT_AFMS" fi @@ -22849,13 +29475,13 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether and how to use Xinerama" >&5 -$as_echo_n "checking whether and how to use Xinerama... " >&6; } +echo "$as_me:$LINENO: checking whether and how to use Xinerama" >&5 +echo $ECHO_N "checking whether and how to use Xinerama... $ECHO_C" >&6 if test "$_os" = "Darwin"; then USE_XINERAMA=YES XINERAMA_LINK=dynamic - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then if test -e "$XLIB/libXinerama.so" -a -e "$XLIB/libXinerama.a"; then # we have both versions, let the user decide but use the dynamic one @@ -22885,13 +29511,151 @@ elif test "$_os" = "Linux" -o "$_os" = "FreeBSD"; then XINERAMA_LINK=none fi if test "$USE_XINERAMA" = "YES"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, with $XINERAMA_LINK linking" >&5 -$as_echo "yes, with $XINERAMA_LINK linking" >&6; } - ac_fn_c_check_header_mongrel "$LINENO" "X11/extensions/Xinerama.h" "ac_cv_header_X11_extensions_Xinerama_h" "$ac_includes_default" -if test "x$ac_cv_header_X11_extensions_Xinerama_h" = x""yes; then : + echo "$as_me:$LINENO: result: yes, with $XINERAMA_LINK linking" >&5 +echo "${ECHO_T}yes, with $XINERAMA_LINK linking" >&6 + if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then + echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +fi +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6 +else + # Is the header compilable? +echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h usability" >&5 +echo $ECHO_N "checking X11/extensions/Xinerama.h usability... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +#include +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_header_compiler=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_header_compiler=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_compiler" >&5 +echo "${ECHO_T}$ac_header_compiler" >&6 + +# Is the header present? +echo "$as_me:$LINENO: checking X11/extensions/Xinerama.h presence" >&5 +echo $ECHO_N "checking X11/extensions/Xinerama.h presence... $ECHO_C" >&6 +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +#include +_ACEOF +if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5 + (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } >/dev/null; then + if test -s conftest.err; then + ac_cpp_err=$ac_c_preproc_warn_flag + ac_cpp_err=$ac_cpp_err$ac_c_werror_flag + else + ac_cpp_err= + fi +else + ac_cpp_err=yes +fi +if test -z "$ac_cpp_err"; then + ac_header_preproc=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_header_preproc=no +fi +rm -f conftest.err conftest.$ac_ext +echo "$as_me:$LINENO: result: $ac_header_preproc" >&5 +echo "${ECHO_T}$ac_header_preproc" >&6 + +# So? What about this header? +case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: accepted by the compiler, rejected by the preprocessor!" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: present but cannot be compiled" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: check for missing prerequisite headers?" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: see the Autoconf documentation" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: section \"Present But Cannot Be Compiled\"" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: section \"Present But Cannot Be Compiled\"" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: proceeding with the preprocessor's result" >&2;} + { echo "$as_me:$LINENO: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&5 +echo "$as_me: WARNING: X11/extensions/Xinerama.h: in the future, the compiler will take precedence" >&2;} + ( + cat <<\_ASBOX +## ------------------------------------------ ## +## Report this to the AC_PACKAGE_NAME lists. ## +## ------------------------------------------ ## +_ASBOX + ) | + sed "s/^/$as_me: WARNING: /" >&2 + ;; +esac +echo "$as_me:$LINENO: checking for X11/extensions/Xinerama.h" >&5 +echo $ECHO_N "checking for X11/extensions/Xinerama.h... $ECHO_C" >&6 +if test "${ac_cv_header_X11_extensions_Xinerama_h+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + ac_cv_header_X11_extensions_Xinerama_h=$ac_header_preproc +fi +echo "$as_me:$LINENO: result: $ac_cv_header_X11_extensions_Xinerama_h" >&5 +echo "${ECHO_T}$ac_cv_header_X11_extensions_Xinerama_h" >&6 +fi +if test $ac_cv_header_X11_extensions_Xinerama_h = yes; then + : else - as_fn_error "Xinerama header not found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Xinerama header not found." >&5 +echo "$as_me: error: Xinerama header not found." >&2;} + { (exit 1); exit 1; }; } fi @@ -22902,43 +29666,72 @@ fi if test "$_os" = "Linux"; then XINERAMA_EXTRA_LIBS="$XINERAMA_EXTRA_LIBS -ldl" fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XineramaIsActive in -lXinerama" >&5 -$as_echo_n "checking for XineramaIsActive in -lXinerama... " >&6; } -if test "${ac_cv_lib_Xinerama_XineramaIsActive+set}" = set; then : - $as_echo_n "(cached) " >&6 + +echo "$as_me:$LINENO: checking for XineramaIsActive in -lXinerama" >&5 +echo $ECHO_N "checking for XineramaIsActive in -lXinerama... $ECHO_C" >&6 +if test "${ac_cv_lib_Xinerama_XineramaIsActive+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS LIBS="-lXinerama $XINERAMA_EXTRA_LIBS $LIBS" -cat confdefs.h - <<_ACEOF >conftest.$ac_ext +cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF /* end confdefs.h. */ -/* Override any GCC internal prototype to avoid an error. - Use char because int might match the return type of a GCC - builtin and then its argument prototype would still apply. */ +/* Override any gcc2 internal prototype to avoid an error. */ #ifdef __cplusplus extern "C" #endif +/* We use char because int might match the return type of a gcc2 + builtin and then its argument prototype would still apply. */ char XineramaIsActive (); int main () { -return XineramaIsActive (); +XineramaIsActive (); ; return 0; } _ACEOF -if ac_fn_c_try_link "$LINENO"; then : +rm -f conftest.$ac_objext conftest$ac_exeext +if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 + (eval $ac_link) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest$ac_exeext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then ac_cv_lib_Xinerama_XineramaIsActive=yes else - ac_cv_lib_Xinerama_XineramaIsActive=no + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_lib_Xinerama_XineramaIsActive=no fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext +rm -f conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5 -$as_echo "$ac_cv_lib_Xinerama_XineramaIsActive" >&6; } -if test "x$ac_cv_lib_Xinerama_XineramaIsActive" = x""yes; then : +echo "$as_me:$LINENO: result: $ac_cv_lib_Xinerama_XineramaIsActive" >&5 +echo "${ECHO_T}$ac_cv_lib_Xinerama_XineramaIsActive" >&6 +if test $ac_cv_lib_Xinerama_XineramaIsActive = yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBXINERAMA 1 _ACEOF @@ -22946,16 +29739,18 @@ _ACEOF LIBS="-lXinerama $LIBS" else - as_fn_error "Xinerama not functional?" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Xinerama not functional?" >&5 +echo "$as_me: error: Xinerama not functional?" >&2;} + { (exit 1); exit 1; }; } fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, libXinerama not found or wrong architecture." >&5 -$as_echo "no, libXinerama not found or wrong architecture." >&6; } + echo "$as_me:$LINENO: result: no, libXinerama not found or wrong architecture." >&5 +echo "${ECHO_T}no, libXinerama not found or wrong architecture." >&6 fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi @@ -22969,10 +29764,10 @@ if test -z "$with_ant_home"; then do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ANT+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ANT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $ANT in [\\/]* | ?:[\\/]*) @@ -22984,29 +29779,28 @@ for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi ANT=$ac_cv_path_ANT + if test -n "$ANT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5 -$as_echo "$ANT" >&6; } + echo "$as_me:$LINENO: result: $ANT" >&5 +echo "${ECHO_T}$ANT" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ANT" && break done @@ -23018,10 +29812,10 @@ else do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; ac_word=$2 -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 -$as_echo_n "checking for $ac_word... " >&6; } -if test "${ac_cv_path_ANT+set}" = set; then : - $as_echo_n "(cached) " >&6 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_ANT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 else case $ANT in [\\/]* | ?:[\\/]*) @@ -23034,29 +29828,28 @@ for as_dir in $as_dummy do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. - for ac_exec_ext in '' $ac_executable_extensions; do - if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then ac_cv_path_ANT="$as_dir/$ac_word$ac_exec_ext" - $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done - done -IFS=$as_save_IFS +done ;; esac fi ANT=$ac_cv_path_ANT + if test -n "$ANT"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ANT" >&5 -$as_echo "$ANT" >&6; } + echo "$as_me:$LINENO: result: $ANT" >&5 +echo "${ECHO_T}$ANT" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi - test -n "$ANT" && break done @@ -23065,7 +29858,9 @@ done fi if test -z "$ANT"; then - as_fn_error "Ant not found - Make sure it's in the path or use --with-ant-home" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&5 +echo "$as_me: error: Ant not found - Make sure it's in the path or use --with-ant-home" >&2;} + { (exit 1); exit 1; }; } else # resolve relative or absolute symlink while test -h "$ANT"; do @@ -23083,8 +29878,8 @@ else export ANT_HOME fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $ANT works" >&5 -$as_echo_n "checking if $ANT works... " >&6; } + echo "$as_me:$LINENO: checking if $ANT works" >&5 +echo $ECHO_N "checking if $ANT works... $ECHO_C" >&6 cat > conftest.java << EOF public class conftest { int testmethod(int a, int b) { @@ -23108,14 +29903,14 @@ EOF else ant_cmd="$ANT -buildfile conftest.xml 1>&2" fi - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ant_cmd\""; } >&5 + { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5 (eval $ant_cmd) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } if test $? = 0 && test -f ./conftest.class ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Ant works" >&5 -$as_echo "Ant works" >&6; } + echo "$as_me:$LINENO: result: Ant works" >&5 +echo "${ECHO_T}Ant works" >&6 if test -z "$WITH_ANT_HOME"; then ANT_HOME=`$ANT -diagnostics | $EGREP "ant.home :" | $SED -e "s#ant.home : ##g"` if test -z "$ANT_HOME"; then @@ -23128,8 +29923,8 @@ $as_echo "Ant works" >&6; } echo "configure: Ant test failed" >&5 cat conftest.java >&5 cat conftest.xml >&5 - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ant does not work - Some Java projects will not build!" >&5 -$as_echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >&2;} + { echo "$as_me:$LINENO: WARNING: Ant does not work - Some Java projects will not build!" >&5 +echo "$as_me: WARNING: Ant does not work - Some Java projects will not build!" >&2;} ANT_HOME="" echo "Ant does not work - Some Java projects will not build!" >>warn fi @@ -23142,8 +29937,8 @@ fi if test "$ANT_HOME" != "NO_ANT_HOME"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking Ant lib directory" >&5 -$as_echo_n "checking Ant lib directory... " >&6; } + echo "$as_me:$LINENO: checking Ant lib directory" >&5 +echo $ECHO_N "checking Ant lib directory... $ECHO_C" >&6 if test -f $ANT_HOME/lib/ant.jar; then ANT_LIB="$ANT_HOME/lib" else @@ -23159,14 +29954,16 @@ $as_echo_n "checking Ant lib directory... " >&6; } if test -f $ANT_HOME/lib/ant/ant.jar; then ANT_LIB="$ANT_HOME/lib/ant" else - as_fn_error "Ant libraries not found!" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: Ant libraries not found!" >&5 +echo "$as_me: error: Ant libraries not found!" >&2;} + { (exit 1); exit 1; }; } fi fi fi fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Ant lib directory found." >&5 -$as_echo "Ant lib directory found." >&6; } + echo "$as_me:$LINENO: result: Ant lib directory found." >&5 +echo "${ECHO_T}Ant lib directory found." >&6 fi fi @@ -23178,8 +29975,8 @@ if test "$ENABLE_MEDIAWIKI" = "YES"; then fi ant_minminor1=`echo $ant_minver | cut -d"." -f2` -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ant is >= $ant_minver" >&5 -$as_echo_n "checking whether ant is >= $ant_minver... " >&6; } +echo "$as_me:$LINENO: checking whether ant is >= $ant_minver" >&5 +echo $ECHO_N "checking whether ant is >= $ant_minver... $ECHO_C" >&6 ant_version=`$ANT -version | $AWK '{ print $4; }'` ant_version_major=`echo $ant_version | cut -d. -f1` ant_version_minor=`echo $ant_version | cut -d. -f2` @@ -23187,18 +29984,20 @@ echo "configure: ant_version $ant_version " >&5 echo "configure: ant_version_major $ant_version_major " >&5 echo "configure: ant_version_minor $ant_version_minor " >&5 if test "$ant_version_major" -ge "2"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5 -$as_echo "yes, $ant_version" >&6; } + echo "$as_me:$LINENO: result: yes, $ant_version" >&5 +echo "${ECHO_T}yes, $ant_version" >&6 elif test "$ant_version_major" = "1" && test "$ant_version_minor" -ge "$ant_minminor1"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, $ant_version" >&5 -$as_echo "yes, $ant_version" >&6; } + echo "$as_me:$LINENO: result: yes, $ant_version" >&5 +echo "${ECHO_T}yes, $ant_version" >&6 else - as_fn_error "no, you need at least ant >= $ant_minver" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no, you need at least ant >= $ant_minver" >&5 +echo "$as_me: error: no, you need at least ant >= $ant_minver" >&2;} + { (exit 1); exit 1; }; } fi if test "$ENABLE_MEDIAWIKI" = "YES"; then -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ant supports mapper type=\"regexp\"" >&5 -$as_echo_n "checking whether ant supports mapper type=\"regexp\"... " >&6; } +echo "$as_me:$LINENO: checking whether ant supports mapper type=\"regexp\"" >&5 +echo $ECHO_N "checking whether ant supports mapper type=\"regexp\"... $ECHO_C" >&6 rm -rf confdir mkdir confdir cat > conftest.java << EOF @@ -23230,29 +30029,31 @@ EOF else ant_cmd="$ANT -buildfile conftest.xml 1>&2" fi - { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ant_cmd\""; } >&5 + { (eval echo "$as_me:$LINENO: \"$ant_cmd\"") >&5 (eval $ant_cmd) 2>&5 ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } if test $? = 0 && test -f ./conftest.class ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 rm -rf confdir else echo "configure: Ant test failed" >&5 cat conftest.java >&5 cat conftest.xml >&5 rm -rf confdir - as_fn_error "no. Did you install ant-apache-regexp?" "$LINENO" 5 + { { echo "$as_me:$LINENO: error: no. Did you install ant-apache-regexp?" >&5 +echo "$as_me: error: no. Did you install ant-apache-regexp?" >&2;} + { (exit 1); exit 1; }; } fi fi rm -f conftest* core core.* *.core OOO_JUNIT_JAR= if test "$SOLAR_JAVA" != "" && test "$with_junit" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JUnit 4" >&5 -$as_echo_n "checking for JUnit 4... " >&6; } + echo "$as_me:$LINENO: checking for JUnit 4" >&5 +echo $ECHO_N "checking for JUnit 4... $ECHO_C" >&6 if test "$with_junit" == "yes"; then if test -e /usr/share/java/junit4.jar; then OOO_JUNIT_JAR=/usr/share/java/junit4.jar @@ -23268,184 +30069,188 @@ $as_echo_n "checking for JUnit 4... " >&6; } "$JAVA_HOME/bin/jar" tf "$OOO_JUNIT_JAR" 2>&5 | \ grep org/junit/Before.class > /dev/null 2>&5 if test $? -eq 0; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OOO_JUNIT_JAR" >&5 -$as_echo "$OOO_JUNIT_JAR" >&6; } + echo "$as_me:$LINENO: result: $OOO_JUNIT_JAR" >&5 +echo "${ECHO_T}$OOO_JUNIT_JAR" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - as_fn_error "cannot find JUnit 4 jar; please install one in the default + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 + { { echo "$as_me:$LINENO: error: cannot find JUnit 4 jar; please install one in the default location (/usr/share/java), specify its pathname via ---with-junit=..., or disable it via --without-junit" "$LINENO" 5 +--with-junit=..., or disable it via --without-junit" >&5 +echo "$as_me: error: cannot find JUnit 4 jar; please install one in the default +location (/usr/share/java), specify its pathname via +--with-junit=..., or disable it via --without-junit" >&2;} + { (exit 1); exit 1; }; } fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which languages to be built" >&5 -$as_echo_n "checking which languages to be built... " >&6; } +echo "$as_me:$LINENO: checking which languages to be built" >&5 +echo $ECHO_N "checking which languages to be built... $ECHO_C" >&6 WITH_LANG="$with_lang" if test -z "$WITH_LANG"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: en-US" >&5 -$as_echo "en-US" >&6; } + echo "$as_me:$LINENO: result: en-US" >&5 +echo "${ECHO_T}en-US" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_LANG" >&5 -$as_echo "$WITH_LANG" >&6; } + echo "$as_me:$LINENO: result: $WITH_LANG" >&5 +echo "${ECHO_T}$WITH_LANG" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which languages have poor help localizations" >&5 -$as_echo_n "checking which languages have poor help localizations... " >&6; } +echo "$as_me:$LINENO: checking which languages have poor help localizations" >&5 +echo $ECHO_N "checking which languages have poor help localizations... $ECHO_C" >&6 WITH_POOR_HELP_LOCALIZATIONS="$with_poor_help_localizations" if test -z "$WITH_POOR_HELP_LOCALIZATIONS"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5 -$as_echo "$WITH_POOR_HELP_LOCALIZATIONS" >&6; } + echo "$as_me:$LINENO: result: $WITH_POOR_HELP_LOCALIZATIONS" >&5 +echo "${ECHO_T}$WITH_POOR_HELP_LOCALIZATIONS" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking which dictionaries to include" >&5 -$as_echo_n "checking which dictionaries to include... " >&6; } +echo "$as_me:$LINENO: checking which dictionaries to include" >&5 +echo $ECHO_N "checking which dictionaries to include... $ECHO_C" >&6 if test -z "$with_dict"; then WITH_DICT=,ALL, - { $as_echo "$as_me:${as_lineno-$LINENO}: result: ALL" >&5 -$as_echo "ALL" >&6; } + echo "$as_me:$LINENO: result: ALL" >&5 +echo "${ECHO_T}ALL" >&6 else WITH_DICT=","$with_dict"," - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_dict" >&5 -$as_echo "$with_dict" >&6; } + echo "$as_me:$LINENO: result: $with_dict" >&5 +echo "${ECHO_T}$with_dict" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional 'intro' bitmaps" >&5 -$as_echo_n "checking for additional 'intro' bitmaps... " >&6; } +echo "$as_me:$LINENO: checking for additional 'intro' bitmaps" >&5 +echo $ECHO_N "checking for additional 'intro' bitmaps... $ECHO_C" >&6 INTRO_BITMAPS= if test -z "$with_intro_bitmaps" -o "$with_intro_bitmaps" = "no" ; then INTRO_BITMAPS= - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 else for bitmap in `echo $with_intro_bitmaps | tr ',' ' '` ; do case "$bitmap" in *.bmp) ;; - *) bitmap= ; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Intro bitmaps should be .bmp files!" >&5 -$as_echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;; + *) bitmap= ; { echo "$as_me:$LINENO: WARNING: Intro bitmaps should be .bmp files!" >&5 +echo "$as_me: WARNING: Intro bitmaps should be .bmp files!" >&2;} ;; esac if test -n "$bitmap" ; then INTRO_BITMAPS="$INTRO_BITMAPS $bitmap" fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTRO_BITMAPS" >&5 -$as_echo "$INTRO_BITMAPS" >&6; } + echo "$as_me:$LINENO: result: $INTRO_BITMAPS" >&5 +echo "${ECHO_T}$INTRO_BITMAPS" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for additional 'about' bitmaps" >&5 -$as_echo_n "checking for additional 'about' bitmaps... " >&6; } +echo "$as_me:$LINENO: checking for additional 'about' bitmaps" >&5 +echo $ECHO_N "checking for additional 'about' bitmaps... $ECHO_C" >&6 ABOUT_BITMAPS= if test -z "$with_about_bitmaps" -o "$with_about_bitmaps" = "no" ; then ABOUT_BITMAPS= - { $as_echo "$as_me:${as_lineno-$LINENO}: result: none" >&5 -$as_echo "none" >&6; } + echo "$as_me:$LINENO: result: none" >&5 +echo "${ECHO_T}none" >&6 else for bitmap in `echo $with_about_bitmaps | tr ',' ' '` ; do case "$bitmap" in *.bmp) ;; - *) bitmap= ; { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: About bitmaps should be .bmp files!" >&5 -$as_echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;; + *) bitmap= ; { echo "$as_me:$LINENO: WARNING: About bitmaps should be .bmp files!" >&5 +echo "$as_me: WARNING: About bitmaps should be .bmp files!" >&2;} ;; esac if test -n "$bitmap" ; then ABOUT_BITMAPS="$ABOUT_BITMAPS $bitmap" fi done - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ABOUT_BITMAPS" >&5 -$as_echo "$ABOUT_BITMAPS" >&6; } + echo "$as_me:$LINENO: result: $ABOUT_BITMAPS" >&5 +echo "${ECHO_T}$ABOUT_BITMAPS" >&6 fi OOO_VENDOR= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for vendor" >&5 -$as_echo_n "checking for vendor... " >&6; } +echo "$as_me:$LINENO: checking for vendor" >&5 +echo $ECHO_N "checking for vendor... $ECHO_C" >&6 if test -z "$with_vendor" -o "$with_vendor" = "no" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -$as_echo "not set" >&6; } + echo "$as_me:$LINENO: result: not set" >&5 +echo "${ECHO_T}not set" >&6 else OOO_VENDOR="$with_vendor" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OOO_VENDOR" >&5 -$as_echo "$OOO_VENDOR" >&6; } + echo "$as_me:$LINENO: result: $OOO_VENDOR" >&5 +echo "${ECHO_T}$OOO_VENDOR" >&6 fi UNIXWRAPPERNAME= -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for UNIX wrapper name" >&5 -$as_echo_n "checking for UNIX wrapper name... " >&6; } +echo "$as_me:$LINENO: checking for UNIX wrapper name" >&5 +echo $ECHO_N "checking for UNIX wrapper name... $ECHO_C" >&6 if test -z "$with_unix_wrapper" -o "$with_unix_wrapper" = "no" -o "$with_unix_wrapper" = "yes" ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -$as_echo "not set" >&6; } + echo "$as_me:$LINENO: result: not set" >&5 +echo "${ECHO_T}not set" >&6 else UNIXWRAPPERNAME="$with_unix_wrapper" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UNIXWRAPPERNAME" >&5 -$as_echo "$UNIXWRAPPERNAME" >&6; } + echo "$as_me:$LINENO: result: $UNIXWRAPPERNAME" >&5 +echo "${ECHO_T}$UNIXWRAPPERNAME" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to statically link to Gtk" >&5 -$as_echo_n "checking whether to statically link to Gtk... " >&6; } +echo "$as_me:$LINENO: checking whether to statically link to Gtk" >&5 +echo $ECHO_N "checking whether to statically link to Gtk... $ECHO_C" >&6 if test -n "$enable_static_gtk" && test "$enable_static_gtk" != "no"; then ENABLE_STATIC_GTK="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_STATIC_GTK="FALSE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use layout dialogs" >&5 -$as_echo_n "checking whether to use layout dialogs... " >&6; } +echo "$as_me:$LINENO: checking whether to use layout dialogs" >&5 +echo $ECHO_N "checking whether to use layout dialogs... $ECHO_C" >&6 if test -n "$enable_layout" && test "$enable_layout" != "no"; then ENABLE_LAYOUT="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 else ENABLE_LAYOUT="FALSE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 fi # =================================================================== # De- or increase default verbosity of build process # =================================================================== -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking build verbosity" >&5 -$as_echo_n "checking build verbosity... " >&6; } +echo "$as_me:$LINENO: checking build verbosity" >&5 +echo $ECHO_N "checking build verbosity... $ECHO_C" >&6 if test -n "$enable_verbose"; then if test "$enable_verbose" = "yes"; then VERBOSE="TRUE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: high" >&5 -$as_echo "high" >&6; } + echo "$as_me:$LINENO: result: high" >&5 +echo "${ECHO_T}high" >&6 fi if test "$enable_verbose" = "no"; then VERBOSE="FALSE" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: low" >&5 -$as_echo "low" >&6; } + echo "$as_me:$LINENO: result: low" >&5 +echo "${ECHO_T}low" >&6 fi else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: not set" >&5 -$as_echo "not set" >&6; } + echo "$as_me:$LINENO: result: not set" >&5 +echo "${ECHO_T}not set" >&6 fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable dependency tracking" >&5 -$as_echo_n "checking whether to enable dependency tracking... " >&6; } +echo "$as_me:$LINENO: checking whether to enable dependency tracking" >&5 +echo $ECHO_N "checking whether to enable dependency tracking... $ECHO_C" >&6 if test "$enable_dependency_tracking" = "no"; then nodep=TRUE - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } + echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6 fi @@ -23456,20 +30261,22 @@ echo "* *" echo "********************************************************************" if test -z "$COMPATH"; then - as_fn_error "No compiler found." "$LINENO" 5 + { { echo "$as_me:$LINENO: error: No compiler found." >&5 +echo "$as_me: error: No compiler found." >&2;} + { (exit 1); exit 1; }; } fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking solver path" >&5 -$as_echo_n "checking solver path... " >&6; } +echo "$as_me:$LINENO: checking solver path" >&5 +echo $ECHO_N "checking solver path... $ECHO_C" >&6 if test -z "$with_local_solver"; then LOCAL_SOLVER="DEFAULT" - { $as_echo "$as_me:${as_lineno-$LINENO}: result: default" >&5 -$as_echo "default" >&6; } + echo "$as_me:$LINENO: result: default" >&5 +echo "${ECHO_T}default" >&6 else LOCAL_SOLVER=$with_local_solver - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $with_local_solver" >&5 -$as_echo "$with_local_solver" >&6; } + echo "$as_me:$LINENO: result: $with_local_solver" >&5 +echo "${ECHO_T}$with_local_solver" >&6 fi @@ -23478,8 +30285,7 @@ fi # make sure config.guess is +x; we execute config.guess, so it has to be so; chmod +x ./config.guess -ac_config_files="$ac_config_files set_soenv Makefile" - + ac_config_files="$ac_config_files set_soenv Makefile" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure # tests run on this system so they can be shared between configure @@ -23498,59 +30304,39 @@ _ACEOF # The following way of writing the cache mishandles newlines in values, # but we know of no workaround that is simple, portable, and efficient. -# So, we kill variables containing newlines. +# So, don't put newlines in cache variables' values. # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. -( - for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do - eval ac_val=\$$ac_var - case $ac_val in #( - *${as_nl}*) - case $ac_var in #( - *_cv_*) { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cache variable $ac_var contains a newline" >&5 -$as_echo "$as_me: WARNING: cache variable $ac_var contains a newline" >&2;} ;; - esac - case $ac_var in #( - _ | IFS | as_nl) ;; #( - BASH_ARGV | BASH_SOURCE) eval $ac_var= ;; #( - *) { eval $ac_var=; unset $ac_var;} ;; - esac ;; - esac - done - +{ (set) 2>&1 | - case $as_nl`(ac_space=' '; set) 2>&1` in #( - *${as_nl}ac_space=\ *) - # `set' does not quote correctly, so add quotes: double-quote - # substitution turns \\\\ into \\, and sed turns \\ into \. + case `(ac_space=' '; set | grep ac_space) 2>&1` in + *ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). sed -n \ "s/'/'\\\\''/g; s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" - ;; #( + ;; *) # `set' quotes correctly as required by POSIX, so do not add quotes. - sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + sed -n \ + "s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p" ;; - esac | - sort -) | + esac; +} | sed ' - /^ac_cv_env_/b end t clear - :clear + : clear s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ t end - s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ - :end' >>confcache -if diff "$cache_file" confcache >/dev/null 2>&1; then :; else - if test -w "$cache_file"; then - test "x$cache_file" != "x/dev/null" && - { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5 -$as_echo "$as_me: updating cache $cache_file" >&6;} + /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + : end' >>confcache +if diff $cache_file confcache >/dev/null 2>&1; then :; else + if test -w $cache_file; then + test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file" cat confcache >$cache_file else - { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5 -$as_echo "$as_me: not updating unwritable cache $cache_file" >&6;} + echo "not updating unwritable cache $cache_file" fi fi rm -f confcache @@ -23559,54 +30345,63 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix # Let make expand exec_prefix. test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/; +s/:*\${srcdir}:*/:/; +s/:*@srcdir@:*/:/; +s/^\([^=]*=[ ]*\):*/\1/; +s/:*$//; +s/^[^=]*=[ ]*$//; +}' +fi + # Transform confdefs.h into DEFS. # Protect against shell expansion while executing Makefile rules. # Protect against Makefile macro expansion. # # If the first sed substitution is executed (which looks for macros that -# take arguments), then branch to the quote section. Otherwise, +# take arguments), then we branch to the quote section. Otherwise, # look for a macro that doesn't take arguments. -ac_script=' -:mline -/\\$/{ - N - s,\\\n,, - b mline -} +cat >confdef2opt.sed <<\_ACEOF t clear -:clear -s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g +: clear +s,^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\),-D\1=\2,g t quote -s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g +s,^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\),-D\1=\2,g t quote -b any -:quote -s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g -s/\[/\\&/g -s/\]/\\&/g -s/\$/$$/g -H -:any -${ - g - s/^\n// - s/\n/ /g - p -} -' -DEFS=`sed -n "$ac_script" confdefs.h` +d +: quote +s,[ `~#$^&*(){}\\|;'"<>?],\\&,g +s,\[,\\&,g +s,\],\\&,g +s,\$,$$,g +p +_ACEOF +# We use echo to avoid assuming a particular line-breaking character. +# The extra dot is to prevent the shell from consuming trailing +# line-breaks from the sub-command output. A line-break within +# single-quotes doesn't work because, if this script is created in a +# platform that uses two characters for line-breaks (e.g., DOS), tr +# would break. +ac_LF_and_DOT=`echo; echo .` +DEFS=`sed -n -f confdef2opt.sed confdefs.h | tr "$ac_LF_and_DOT" ' .'` +rm -f confdef2opt.sed ac_libobjs= ac_ltlibobjs= for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue # 1. Remove the extension, and $U if already installed. - ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' - ac_i=`$as_echo "$ac_i" | sed "$ac_script"` - # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR - # will be set to the directory where LIBOBJS objects are built. - as_fn_append ac_libobjs " \${LIBOBJDIR}$ac_i\$U.$ac_objext" - as_fn_append ac_ltlibobjs " \${LIBOBJDIR}$ac_i"'$U.lo' + ac_i=`echo "$ac_i" | + sed 's/\$U\././;s/\.o$//;s/\.obj$//'` + # 2. Add them. + ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo' done LIBOBJS=$ac_libobjs @@ -23614,15 +30409,12 @@ LTLIBOBJS=$ac_ltlibobjs - : ${CONFIG_STATUS=./config.status} -ac_write_fail=0 ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ $as_echo "$as_me:${as_lineno-$LINENO}: creating $CONFIG_STATUS" >&5 -$as_echo "$as_me: creating $CONFIG_STATUS" >&6;} -as_write_fail=0 -cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF #! $SHELL # Generated by $as_me. # Run this file to recreate the current configuration. @@ -23632,252 +30424,81 @@ cat >$CONFIG_STATUS <<_ASEOF || as_write_fail=1 debug=false ac_cs_recheck=false ac_cs_silent=false - SHELL=\${CONFIG_SHELL-$SHELL} -export SHELL -_ASEOF -cat >>$CONFIG_STATUS <<\_ASEOF || as_write_fail=1 -## -------------------- ## -## M4sh Initialization. ## -## -------------------- ## - -# Be more Bourne compatible -DUALCASE=1; export DUALCASE # for MKS sh -if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then : +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be Bourne compatible +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then emulate sh NULLCMD=: - # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which # is contrary to our usage. Disable this feature. alias -g '${1+"$@"}'='"$@"' - setopt NO_GLOB_SUBST -else - case `(set -o) 2>/dev/null` in #( - *posix*) : - set -o posix ;; #( - *) : - ;; -esac -fi - - -as_nl=' -' -export as_nl -# Printing a long string crashes Solaris 7 /usr/bin/printf. -as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\' -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo -as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo -# Prefer a ksh shell builtin over an external printf program on Solaris, -# but without wasting forks for bash or zsh. -if test -z "$BASH_VERSION$ZSH_VERSION" \ - && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='print -r --' - as_echo_n='print -rn --' -elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then - as_echo='printf %s\n' - as_echo_n='printf %s' -else - if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then - as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"' - as_echo_n='/usr/ucb/echo -n' - else - as_echo_body='eval expr "X$1" : "X\\(.*\\)"' - as_echo_n_body='eval - arg=$1; - case $arg in #( - *"$as_nl"*) - expr "X$arg" : "X\\(.*\\)$as_nl"; - arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;; - esac; - expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl" - ' - export as_echo_n_body - as_echo_n='sh -c $as_echo_n_body as_echo' - fi - export as_echo_body - as_echo='sh -c $as_echo_body as_echo' +elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then + set -o posix fi +DUALCASE=1; export DUALCASE # for MKS sh -# The user is always right. -if test "${PATH_SEPARATOR+set}" != set; then - PATH_SEPARATOR=: - (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && { - (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 || - PATH_SEPARATOR=';' - } +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false fi -# IFS -# We need space, tab and new line, in precisely that order. Quoting is -# there to prevent editors from complaining about space-tab. -# (If _AS_PATH_WALK were called with IFS unset, it would disable word -# splitting by setting IFS to empty value.) -IFS=" "" $as_nl" - -# Find who we are. Look in the path if we contain no directory separator. -case $0 in #(( - *[\\/]* ) as_myself=$0 ;; - *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -for as_dir in $PATH -do - IFS=$as_save_IFS - test -z "$as_dir" && as_dir=. - test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break - done -IFS=$as_save_IFS - - ;; -esac -# We did not find ourselves, most probably we were run as `sh COMMAND' -# in which case we are not to be found in the path. -if test "x$as_myself" = x; then - as_myself=$0 -fi -if test ! -f "$as_myself"; then - $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 - exit 1 -fi - -# Unset variables that we do not need and which cause bugs (e.g. in -# pre-3.0 UWIN ksh). But do not cause bugs in bash 2.01; the "|| exit 1" -# suppresses any "Segmentation fault" message there. '((' could -# trigger a bug in pdksh 5.2.14. -for as_var in BASH_ENV ENV MAIL MAILPATH -do eval test x\${$as_var+set} = xset \ - && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || : -done +# Work around bugs in pre-3.0 UWIN ksh. +$as_unset ENV MAIL MAILPATH PS1='$ ' PS2='> ' PS4='+ ' # NLS nuisances. -LC_ALL=C -export LC_ALL -LANGUAGE=C -export LANGUAGE - -# CDPATH. -(unset CDPATH) >/dev/null 2>&1 && unset CDPATH - - -# as_fn_error ERROR [LINENO LOG_FD] -# --------------------------------- -# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are -# provided, also output the error to LOG_FD, referencing LINENO. Then exit the -# script with status $?, using 1 if that was 0. -as_fn_error () -{ - as_status=$?; test $as_status -eq 0 && as_status=1 - if test "$3"; then - as_lineno=${as_lineno-"$2"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - $as_echo "$as_me:${as_lineno-$LINENO}: error: $1" >&$3 +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + $as_unset $as_var fi - $as_echo "$as_me: error: $1" >&2 - as_fn_exit $as_status -} # as_fn_error - - -# as_fn_set_status STATUS -# ----------------------- -# Set $? to STATUS, without forking. -as_fn_set_status () -{ - return $1 -} # as_fn_set_status - -# as_fn_exit STATUS -# ----------------- -# Exit the shell with STATUS, even in a "trap 0" or "set -e" context. -as_fn_exit () -{ - set +e - as_fn_set_status $1 - exit $1 -} # as_fn_exit - -# as_fn_unset VAR -# --------------- -# Portably unset VAR. -as_fn_unset () -{ - { eval $1=; unset $1;} -} -as_unset=as_fn_unset -# as_fn_append VAR VALUE -# ---------------------- -# Append the text in VALUE to the end of the definition contained in VAR. Take -# advantage of any shell optimizations that allow amortized linear growth over -# repeated appends, instead of the typical quadratic growth present in naive -# implementations. -if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then : - eval 'as_fn_append () - { - eval $1+=\$2 - }' -else - as_fn_append () - { - eval $1=\$$1\$2 - } -fi # as_fn_append - -# as_fn_arith ARG... -# ------------------ -# Perform arithmetic evaluation on the ARGs, and store the result in the -# global $as_val. Take advantage of shells that can avoid forks. The arguments -# must be portable across $(()) and expr. -if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then : - eval 'as_fn_arith () - { - as_val=$(( $* )) - }' -else - as_fn_arith () - { - as_val=`expr "$@" || test $? -eq 1` - } -fi # as_fn_arith - +done -if expr a : '\(a\)' >/dev/null 2>&1 && - test "X`expr 00001 : '.*\(...\)'`" = X001; then +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1; then as_expr=expr else as_expr=false fi -if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then +if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then as_basename=basename else as_basename=false fi -if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then - as_dirname=dirname -else - as_dirname=false -fi -as_me=`$as_basename -- "$0" || +# Name of the executable. +as_me=`$as_basename "$0" || $as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ X"$0" : 'X\(//\)$' \| \ - X"$0" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X/"$0" | - sed '/^.*\/\([^/][^/]*\)\/*$/{ - s//\1/ - q - } - /^X\/\(\/\/\)$/{ - s//\1/ - q - } - /^X\/\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` + X"$0" : 'X\(/\)$' \| \ + . : '\(.\)' 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; } + /^X\/\(\/\/\)$/{ s//\1/; q; } + /^X\/\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + +# PATH needs CR, and LINENO needs CR and PATH. # Avoid depending upon Character Ranges. as_cr_letters='abcdefghijklmnopqrstuvwxyz' as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' @@ -23885,123 +30506,148 @@ as_cr_Letters=$as_cr_letters$as_cr_LETTERS as_cr_digits='0123456789' as_cr_alnum=$as_cr_Letters$as_cr_digits -ECHO_C= ECHO_N= ECHO_T= -case `echo -n x` in #((((( --n*) - case `echo 'xy\c'` in - *c*) ECHO_T=' ';; # ECHO_T is single tab character. - xy) ECHO_C='\c';; - *) echo `echo ksh88 bug on AIX 6.1` > /dev/null - ECHO_T=' ';; - esac;; -*) - ECHO_N='-n';; +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" || { + # Find who we are. Look in the path if we contain no path at all + # relative or not. + case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done + + ;; + esac + # We did not find ourselves, most probably we were run as `sh COMMAND' + # in which case we are not to be found in the path. + if test "x$as_myself" = x; then + as_myself=$0 + fi + if test ! -f "$as_myself"; then + { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5 +echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;} + { (exit 1); exit 1; }; } + fi + case $CONFIG_SHELL in + '') + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for as_base in sh bash ksh sh5; do + case $as_dir in + /*) + if ("$as_dir/$as_base" -c ' + as_lineno_1=$LINENO + as_lineno_2=$LINENO + as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null` + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x$as_lineno_3" = "x$as_lineno_2" ') 2>/dev/null; then + $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; } + $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; } + CONFIG_SHELL=$as_dir/$as_base + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$0" ${1+"$@"} + fi;; + esac + done +done +;; + esac + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line before each line; the second 'sed' does the real + # work. The second script uses 'N' to pair each line-number line + # with the numbered line, and appends trailing '-' during + # substitution so that $LINENO is not a special case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # second 'sed' script. Blame Lee E. McMahon for sed's syntax. :-) + sed '=' <$as_myself | + sed ' + N + s,$,-, + : loop + s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3, + t loop + s,-$,, + s,^['$as_cr_digits']*\n,, + ' >$as_me.lineno && + chmod +x $as_me.lineno || + { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5 +echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;} + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensible to this). + . ./$as_me.lineno + # Exit status is that of the last command. + exit +} + + +case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in + *c*,-n*) ECHO_N= ECHO_C=' +' ECHO_T=' ' ;; + *c*,* ) ECHO_N=-n ECHO_C= ECHO_T= ;; + *) ECHO_N= ECHO_C='\c' ECHO_T= ;; esac -rm -f conf$$ conf$$.exe conf$$.file -if test -d conf$$.dir; then - rm -f conf$$.dir/conf$$.file +if expr a : '\(a\)' >/dev/null 2>&1; then + as_expr=expr else - rm -f conf$$.dir - mkdir conf$$.dir 2>/dev/null + as_expr=false fi -if (echo >conf$$.file) 2>/dev/null; then - if ln -s conf$$.file conf$$ 2>/dev/null; then - as_ln_s='ln -s' - # ... but there are two gotchas: - # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. - # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. - # In both cases, we have to default to `cp -p'. - ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || - as_ln_s='cp -p' - elif ln conf$$.file conf$$ 2>/dev/null; then - as_ln_s=ln - else + +rm -f conf$$ conf$$.exe conf$$.file +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + # We could just check for DJGPP; but this test a) works b) is more generic + # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04). + if test -f conf$$.exe; then + # Don't use ln at all; we don't have any links as_ln_s='cp -p' + else + as_ln_s='ln -s' fi +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln else as_ln_s='cp -p' fi -rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file -rmdir conf$$.dir 2>/dev/null - - -# as_fn_mkdir_p -# ------------- -# Create "$as_dir" as a directory, including parents if necessary. -as_fn_mkdir_p () -{ - - case $as_dir in #( - -*) as_dir=./$as_dir;; - esac - test -d "$as_dir" || eval $as_mkdir_p || { - as_dirs= - while :; do - case $as_dir in #( - *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'( - *) as_qdir=$as_dir;; - esac - as_dirs="'$as_qdir' $as_dirs" - as_dir=`$as_dirname -- "$as_dir" || -$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$as_dir" : 'X\(//\)[^/]' \| \ - X"$as_dir" : 'X\(//\)$' \| \ - X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$as_dir" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - test -d "$as_dir" && break - done - test -z "$as_dirs" || eval "mkdir $as_dirs" - } || test -d "$as_dir" || as_fn_error "cannot create directory $as_dir" - +rm -f conf$$ conf$$.exe conf$$.file -} # as_fn_mkdir_p if mkdir -p . 2>/dev/null; then - as_mkdir_p='mkdir -p "$as_dir"' + as_mkdir_p=: else test -d ./-p && rmdir ./-p as_mkdir_p=false fi -if test -x / >/dev/null 2>&1; then - as_test_x='test -x' -else - if ls -dL / >/dev/null 2>&1; then - as_ls_L_option=L - else - as_ls_L_option= - fi - as_test_x=' - eval sh -c '\'' - if test -d "$1"; then - test -d "$1/."; - else - case $1 in #( - -*)set "./$1";; - esac; - case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #(( - ???[sx]*):;;*)false;;esac;fi - '\'' sh - ' -fi -as_executable_p=$as_test_x +as_executable_p="test -f" # Sed expression to map a string onto a valid CPP name. as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" @@ -24010,20 +30656,31 @@ as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" +# IFS +# We need space, tab and new line, in precisely that order. +as_nl=' +' +IFS=" $as_nl" + +# CDPATH. +$as_unset CDPATH + exec 6>&1 -## ----------------------------------- ## -## Main body of $CONFIG_STATUS script. ## -## ----------------------------------- ## -_ASEOF -test $as_write_fail = 0 && chmod +x $CONFIG_STATUS || ac_write_fail=1 - -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Save the log message, to keep $0 and so on meaningful, and to + +# Open the log real soon, to keep \$[0] and so on meaningful, and to # report actual input values of CONFIG_FILES etc. instead of their -# values after options handling. -ac_log=" +# values after options handling. Logging --version etc. is OK. +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX +} >&5 +cat >&5 <<_CSEOF + This file was extended by $as_me, which was -generated by GNU Autoconf 2.65. Invocation command line was +generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES CONFIG_HEADERS = $CONFIG_HEADERS @@ -24031,111 +30688,124 @@ generated by GNU Autoconf 2.65. Invocation command line was CONFIG_COMMANDS = $CONFIG_COMMANDS $ $0 $@ -on `(hostname || uname -n) 2>/dev/null | sed 1q` -" - +_CSEOF +echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5 +echo >&5 _ACEOF -case $ac_config_files in *" -"*) set x $ac_config_files; shift; ac_config_files=$*;; -esac +# Files that config.status was made for. +if test -n "$ac_config_files"; then + echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS +fi +if test -n "$ac_config_headers"; then + echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS +fi +if test -n "$ac_config_links"; then + echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS +fi -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -# Files that config.status was made for. -config_files="$ac_config_files" +if test -n "$ac_config_commands"; then + echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS +fi -_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 ac_cs_usage="\ -\`$as_me' instantiates files and other configuration actions -from templates according to the current configuration. Unless the files -and actions are specified as TAGs, all are instantiated by default. +\`$as_me' instantiates files from templates according to the +current configuration. -Usage: $0 [OPTION]... [TAG]... +Usage: $0 [OPTIONS] [FILE]... -h, --help print this help, then exit - -V, --version print version number and configuration settings, then exit - --config print configuration, then exit - -q, --quiet, --silent - do not print progress messages + -V, --version print version number, then exit + -q, --quiet do not print progress messages -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions - --file=FILE[:TEMPLATE] - instantiate the configuration file FILE + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE Configuration files: $config_files -Report bugs to the package provider." - +Report bugs to ." _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" + +cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ config.status -configured by $0, generated by GNU Autoconf 2.65, - with options \\"\$ac_cs_config\\" +configured by $0, generated by GNU Autoconf 2.59, + with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" -Copyright (C) 2009 Free Software Foundation, Inc. +Copyright (C) 2003 Free Software Foundation, Inc. This config.status script is free software; the Free Software Foundation gives unlimited permission to copy, distribute and modify it." - -ac_pwd='$ac_pwd' -srcdir='$srcdir' -AWK='$AWK' -test -n "\$AWK" || AWK=awk +srcdir=$srcdir _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# The default lists apply if the user does not specify any file. +cat >>$CONFIG_STATUS <<\_ACEOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. ac_need_defaults=: while test $# != 0 do case $1 in --*=*) - ac_option=`expr "X$1" : 'X\([^=]*\)='` - ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_option=`expr "x$1" : 'x\([^=]*\)='` + ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'` ac_shift=: ;; - *) + -*) ac_option=$1 ac_optarg=$2 ac_shift=shift ;; + *) # This is not an option, so the user has probably given explicit + # arguments. + ac_option=$1 + ac_need_defaults=false;; esac case $ac_option in # Handling of the options. +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) ac_cs_recheck=: ;; - --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) - $as_echo "$ac_cs_version"; exit ;; - --config | --confi | --conf | --con | --co | --c ) - $as_echo "$ac_cs_config"; exit ;; - --debug | --debu | --deb | --de | --d | -d ) + --version | --vers* | -V ) + echo "$ac_cs_version"; exit 0 ;; + --he | --h) + # Conflict between --help and --header + { { echo "$as_me:$LINENO: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: ambiguous option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; };; + --help | --hel | -h ) + echo "$ac_cs_usage"; exit 0 ;; + --debug | --d* | -d ) debug=: ;; --file | --fil | --fi | --f ) $ac_shift - case $ac_optarg in - *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;; - esac - as_fn_append CONFIG_FILES " '$ac_optarg'" + CONFIG_FILES="$CONFIG_FILES $ac_optarg" + ac_need_defaults=false;; + --header | --heade | --head | --hea ) + $ac_shift + CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg" ac_need_defaults=false;; - --he | --h | --help | --hel | -h ) - $as_echo "$ac_cs_usage"; exit ;; -q | -quiet | --quiet | --quie | --qui | --qu | --q \ | -silent | --silent | --silen | --sile | --sil | --si | --s) ac_cs_silent=: ;; # This is an error. - -*) as_fn_error "unrecognized option: \`$1' -Try \`$0 --help' for more information." ;; + -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&5 +echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2;} + { (exit 1); exit 1; }; } ;; - *) as_fn_append ac_config_targets " $1" - ac_need_defaults=false ;; + *) ac_config_targets="$ac_config_targets $1" ;; esac shift @@ -24149,45 +30819,31 @@ if $ac_cs_silent; then fi _ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<_ACEOF if \$ac_cs_recheck; then - set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion - shift - \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6 - CONFIG_SHELL='$SHELL' - export CONFIG_SHELL - exec "\$@" + echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion fi _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -exec 5>>config.log -{ - echo - sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX -## Running $as_me. ## -_ASBOX - $as_echo "$ac_log" -} >&5 -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# Handling of arguments. + + +cat >>$CONFIG_STATUS <<\_ACEOF for ac_config_target in $ac_config_targets do - case $ac_config_target in - "set_soenv") CONFIG_FILES="$CONFIG_FILES set_soenv" ;; - "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; - - *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;; + case "$ac_config_target" in + # Handling of arguments. + "set_soenv" ) CONFIG_FILES="$CONFIG_FILES set_soenv" ;; + "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; esac done - # If the user did not use the arguments to specify the items to instantiate, # then the envvar interface is used. Set only those that are not. # We use the long form for the default assignment because of an extremely @@ -24197,403 +30853,694 @@ if $ac_need_defaults; then fi # Have a temporary directory for convenience. Make it in the build tree -# simply because there is no reason against having it here, and in addition, +# simply because there is no reason to put it here, and in addition, # creating and moving files from /tmp can sometimes cause problems. -# Hook for its removal unless debugging. -# Note that there is a small window in which the directory will not be cleaned: -# after its creation but before its name has been assigned to `$tmp'. +# Create a temporary directory, and hook for its removal unless debugging. $debug || { - tmp= - trap 'exit_status=$? - { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status -' 0 - trap 'as_fn_exit 1' 1 2 13 15 + trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 } + # Create a (secure) tmp directory for tmp files. { - tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" } || { - tmp=./conf$$-$RANDOM - (umask 077 && mkdir "$tmp") -} || as_fn_error "cannot create a temporary directory in ." "$LINENO" 5 - -# Set up the scripts for CONFIG_FILES section. -# No need to generate them if there are no CONFIG_FILES. -# This happens for instance with `./config.status config.h'. -if test -n "$CONFIG_FILES"; then - - -ac_cr=`echo X | tr X '\015'` -# On cygwin, bash can eat \r inside `` if the user requested igncr. -# But we know of no other shell where ac_cr would be empty at this -# point, so we can use a bashism as a fallback. -if test "x$ac_cr" = x; then - eval ac_cr=\$\'\\r\' -fi -ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' /dev/null` -if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then - ac_cs_awk_cr='\r' -else - ac_cs_awk_cr=$ac_cr -fi - -echo 'BEGIN {' >"$tmp/subs1.awk" && -_ACEOF - - -{ - echo "cat >conf$$subs.awk <<_ACEOF" && - echo "$ac_subst_vars" | sed 's/.*/&!$&$ac_delim/' && - echo "_ACEOF" -} >conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 -ac_delim_num=`echo "$ac_subst_vars" | grep -c '$'` -ac_delim='%!_!# ' -for ac_last_try in false false false false false :; do - . ./conf$$subs.sh || - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - - ac_delim_n=`sed -n "s/.*$ac_delim\$/X/p" conf$$subs.awk | grep -c X` - if test $ac_delim_n = $ac_delim_num; then - break - elif $ac_last_try; then - as_fn_error "could not make $CONFIG_STATUS" "$LINENO" 5 - else - ac_delim="$ac_delim!$ac_delim _$ac_delim!! " - fi -done -rm -f conf$$subs.sh - -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -cat >>"\$tmp/subs1.awk" <<\\_ACAWK && -_ACEOF -sed -n ' -h -s/^/S["/; s/!.*/"]=/ -p -g -s/^[^!]*!// -:repl -t repl -s/'"$ac_delim"'$// -t delim -:nl -h -s/\(.\{148\}\)..*/\1/ -t more1 -s/["\\]/\\&/g; s/^/"/; s/$/\\n"\\/ -p -n -b repl -:more1 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t nl -:delim -h -s/\(.\{148\}\)..*/\1/ -t more2 -s/["\\]/\\&/g; s/^/"/; s/$/"/ -p -b -:more2 -s/["\\]/\\&/g; s/^/"/; s/$/"\\/ -p -g -s/.\{148\}// -t delim -' >$CONFIG_STATUS || ac_write_fail=1 -rm -f conf$$subs.awk -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -_ACAWK -cat >>"\$tmp/subs1.awk" <<_ACAWK && - for (key in S) S_is_set[key] = 1 - FS = "" - -} + tmp=./confstat$$-$RANDOM + (umask 077 && mkdir $tmp) +} || { - line = $ 0 - nfields = split(line, field, "@") - substed = 0 - len = length(field[1]) - for (i = 2; i < nfields; i++) { - key = field[i] - keylen = length(key) - if (S_is_set[key]) { - value = S[key] - line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3) - len += length(value) + length(field[++i]) - substed = 1 - } else - len += 1 + keylen - } - - print line + echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } } -_ACAWK _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then - sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g" -else - cat -fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \ - || as_fn_error "could not setup config files machinery" "$LINENO" 5 -_ACEOF - -# VPATH may cause trouble with some makes, so we remove $(srcdir), -# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and -# trailing colons and then remove the whole line if VPATH becomes empty -# (actually we leave an empty line to preserve line numbers). -if test "x$srcdir" = x.; then - ac_vpsub='/^[ ]*VPATH[ ]*=/{ -s/:*\$(srcdir):*/:/ -s/:*\${srcdir}:*/:/ -s/:*@srcdir@:*/:/ -s/^\([^=]*=[ ]*\):*/\1/ -s/:*$// -s/^[^=]*=[ ]*$// -}' -fi -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -fi # test -n "$CONFIG_FILES" +cat >>$CONFIG_STATUS <<_ACEOF +# +# CONFIG_FILES section. +# -eval set X " :F $CONFIG_FILES " -shift -for ac_tag -do - case $ac_tag in - :[FHLC]) ac_mode=$ac_tag; continue;; - esac - case $ac_mode$ac_tag in - :[FHL]*:*);; - :L* | :C*:*) as_fn_error "invalid tag \`$ac_tag'" "$LINENO" 5;; - :[FH]-) ac_tag=-:-;; - :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; - esac - ac_save_IFS=$IFS - IFS=: - set x $ac_tag - IFS=$ac_save_IFS - shift - ac_file=$1 - shift +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "\$CONFIG_FILES"; then + # Protect against being on the right side of a sed subst in config.status. + sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g; + s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF +s,@SHELL@,$SHELL,;t t +s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t +s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t +s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t +s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t +s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t +s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t +s,@exec_prefix@,$exec_prefix,;t t +s,@prefix@,$prefix,;t t +s,@program_transform_name@,$program_transform_name,;t t +s,@bindir@,$bindir,;t t +s,@sbindir@,$sbindir,;t t +s,@libexecdir@,$libexecdir,;t t +s,@datadir@,$datadir,;t t +s,@sysconfdir@,$sysconfdir,;t t +s,@sharedstatedir@,$sharedstatedir,;t t +s,@localstatedir@,$localstatedir,;t t +s,@libdir@,$libdir,;t t +s,@includedir@,$includedir,;t t +s,@oldincludedir@,$oldincludedir,;t t +s,@infodir@,$infodir,;t t +s,@mandir@,$mandir,;t t +s,@build_alias@,$build_alias,;t t +s,@host_alias@,$host_alias,;t t +s,@target_alias@,$target_alias,;t t +s,@DEFS@,$DEFS,;t t +s,@ECHO_C@,$ECHO_C,;t t +s,@ECHO_N@,$ECHO_N,;t t +s,@ECHO_T@,$ECHO_T,;t t +s,@LIBS@,$LIBS,;t t +s,@EGREP@,$EGREP,;t t +s,@AWK@,$AWK,;t t +s,@SED@,$SED,;t t +s,@LOCAL_SOLENV@,$LOCAL_SOLENV,;t t +s,@_solenv@,$_solenv,;t t +s,@UPD@,$UPD,;t t +s,@SOURCEVERSION@,$SOURCEVERSION,;t t +s,@build@,$build,;t t +s,@build_cpu@,$build_cpu,;t t +s,@build_vendor@,$build_vendor,;t t +s,@build_os@,$build_os,;t t +s,@host@,$host,;t t +s,@host_cpu@,$host_cpu,;t t +s,@host_vendor@,$host_vendor,;t t +s,@host_os@,$host_os,;t t +s,@target@,$target,;t t +s,@target_cpu@,$target_cpu,;t t +s,@target_vendor@,$target_vendor,;t t +s,@target_os@,$target_os,;t t +s,@GNUTAR@,$GNUTAR,;t t +s,@OSVERSION@,$OSVERSION,;t t +s,@PTHREAD_CFLAGS@,$PTHREAD_CFLAGS,;t t +s,@PTHREAD_LIBS@,$PTHREAD_LIBS,;t t +s,@ENABLE_CRASHDUMP@,$ENABLE_CRASHDUMP,;t t +s,@VC_STANDARD@,$VC_STANDARD,;t t +s,@ENABLE_WERROR@,$ENABLE_WERROR,;t t +s,@ENABLE_DEBUG@,$ENABLE_DEBUG,;t t +s,@PRODUCT@,$PRODUCT,;t t +s,@PROFULLSWITCH@,$PROFULLSWITCH,;t t +s,@PROEXT@,$PROEXT,;t t +s,@ENABLE_SYMBOLS@,$ENABLE_SYMBOLS,;t t +s,@DISABLE_STRIP@,$DISABLE_STRIP,;t t +s,@ENABLE_CUPS@,$ENABLE_CUPS,;t t +s,@ENABLE_FONTCONFIG@,$ENABLE_FONTCONFIG,;t t +s,@TARFILE_LOCATION@,$TARFILE_LOCATION,;t t +s,@DO_FETCH_TARBALLS@,$DO_FETCH_TARBALLS,;t t +s,@WITH_BINFILTER@,$WITH_BINFILTER,;t t +s,@ENABLE_DIRECTX@,$ENABLE_DIRECTX,;t t +s,@DISABLE_ACTIVEX@,$DISABLE_ACTIVEX,;t t +s,@DISABLE_ATL@,$DISABLE_ATL,;t t +s,@ENABLE_RPATH@,$ENABLE_RPATH,;t t +s,@WITH_MYSPELL_DICTS@,$WITH_MYSPELL_DICTS,;t t +s,@SYSTEM_DICTS@,$SYSTEM_DICTS,;t t +s,@DICT_SYSTEM_DIR@,$DICT_SYSTEM_DIR,;t t +s,@HYPH_SYSTEM_DIR@,$HYPH_SYSTEM_DIR,;t t +s,@THES_SYSTEM_DIR@,$THES_SYSTEM_DIR,;t t +s,@WITH_MINGWIN@,$WITH_MINGWIN,;t t +s,@SHELLPATH@,$SHELLPATH,;t t +s,@GCC_HOME@,$GCC_HOME,;t t +s,@CC@,$CC,;t t +s,@CFLAGS@,$CFLAGS,;t t +s,@LDFLAGS@,$LDFLAGS,;t t +s,@CPPFLAGS@,$CPPFLAGS,;t t +s,@ac_ct_CC@,$ac_ct_CC,;t t +s,@EXEEXT@,$EXEEXT,;t t +s,@OBJEXT@,$OBJEXT,;t t +s,@COMPATH@,$COMPATH,;t t +s,@GCCVER@,$GCCVER,;t t +s,@HAVE_LD_BSYMBOLIC_FUNCTIONS@,$HAVE_LD_BSYMBOLIC_FUNCTIONS,;t t +s,@ENABLE_PCH@,$ENABLE_PCH,;t t +s,@GNUMAKE@,$GNUMAKE,;t t +s,@_cc@,$_cc,;t t +s,@HAVE_LD_HASH_STYLE@,$HAVE_LD_HASH_STYLE,;t t +s,@PERL@,$PERL,;t t +s,@MSPDB_PATH@,$MSPDB_PATH,;t t +s,@COMEX@,$COMEX,;t t +s,@USE_MINGW@,$USE_MINGW,;t t +s,@MIDL_PATH@,$MIDL_PATH,;t t +s,@CSC_PATH@,$CSC_PATH,;t t +s,@FRAME_HOME@,$FRAME_HOME,;t t +s,@CPP@,$CPP,;t t +s,@CXX@,$CXX,;t t +s,@CXXFLAGS@,$CXXFLAGS,;t t +s,@ac_ct_CXX@,$ac_ct_CXX,;t t +s,@CXXCPP@,$CXXCPP,;t t +s,@SIZEOF_LONG@,$SIZEOF_LONG,;t t +s,@WORDS_BIGENDIAN@,$WORDS_BIGENDIAN,;t t +s,@LFS_CFLAGS@,$LFS_CFLAGS,;t t +s,@ENABLE_VBA@,$ENABLE_VBA,;t t +s,@VBA_EXTENSION@,$VBA_EXTENSION,;t t +s,@PAM@,$PAM,;t t +s,@NEW_SHADOW_API@,$NEW_SHADOW_API,;t t +s,@PAM_LINK@,$PAM_LINK,;t t +s,@CRYPT_LINK@,$CRYPT_LINK,;t t +s,@GXX_INCLUDE_PATH@,$GXX_INCLUDE_PATH,;t t +s,@MINGW_LIB_INCLUDE_PATH@,$MINGW_LIB_INCLUDE_PATH,;t t +s,@MINGW_BACKWARD_INCLUDE_PATH@,$MINGW_BACKWARD_INCLUDE_PATH,;t t +s,@MINGW_CLIB_DIR@,$MINGW_CLIB_DIR,;t t +s,@MINGW_SHARED_GCCLIB@,$MINGW_SHARED_GCCLIB,;t t +s,@MINGW_GCCLIB_EH@,$MINGW_GCCLIB_EH,;t t +s,@MINGW_SHARED_GXXLIB@,$MINGW_SHARED_GXXLIB,;t t +s,@MINGW_GCCDLL@,$MINGW_GCCDLL,;t t +s,@MINGW_GXXDLL@,$MINGW_GXXDLL,;t t +s,@EXCEPTIONS@,$EXCEPTIONS,;t t +s,@STLPORT4@,$STLPORT4,;t t +s,@STLPORT_VER@,$STLPORT_VER,;t t +s,@USE_SYSTEM_STL@,$USE_SYSTEM_STL,;t t +s,@USE_CCACHE@,$USE_CCACHE,;t t +s,@CCACHE@,$CCACHE,;t t +s,@HAVE_GCC_VISIBILITY_FEATURE@,$HAVE_GCC_VISIBILITY_FEATURE,;t t +s,@ALLOC@,$ALLOC,;t t +s,@BUILD_VER_STRING@,$BUILD_VER_STRING,;t t +s,@SOLAR_JAVA@,$SOLAR_JAVA,;t t +s,@JAVAINTERPRETER@,$JAVAINTERPRETER,;t t +s,@JAVACOMPILER@,$JAVACOMPILER,;t t +s,@JAVACISGCJ@,$JAVACISGCJ,;t t +s,@JAVADOC@,$JAVADOC,;t t +s,@AWTLIB@,$AWTLIB,;t t +s,@JAVAAOTCOMPILER@,$JAVAAOTCOMPILER,;t t +s,@JAVA_HOME@,$JAVA_HOME,;t t +s,@JDK@,$JDK,;t t +s,@JAVAFLAGS@,$JAVAFLAGS,;t t +s,@JAVAIFLAGS@,$JAVAIFLAGS,;t t +s,@DMAKE@,$DMAKE,;t t +s,@BUILD_DMAKE@,$BUILD_DMAKE,;t t +s,@EPM@,$EPM,;t t +s,@DPKG@,$DPKG,;t t +s,@PKGMK@,$PKGMK,;t t +s,@BUILD_EPM@,$BUILD_EPM,;t t +s,@RPM@,$RPM,;t t +s,@PKGFORMAT@,$PKGFORMAT,;t t +s,@GPERF@,$GPERF,;t t +s,@BUILD_STAX@,$BUILD_STAX,;t t +s,@MINGWCXX@,$MINGWCXX,;t t +s,@ac_ct_MINGWCXX@,$ac_ct_MINGWCXX,;t t +s,@MINGWSTRIP@,$MINGWSTRIP,;t t +s,@ac_ct_MINGWSTRIP@,$ac_ct_MINGWSTRIP,;t t +s,@BUILD_UNOWINREG@,$BUILD_UNOWINREG,;t t +s,@SYSTEM_STDLIBS@,$SYSTEM_STDLIBS,;t t +s,@SYSTEM_ZLIB@,$SYSTEM_ZLIB,;t t +s,@SYSTEM_JPEG@,$SYSTEM_JPEG,;t t +s,@SYSTEM_EXPAT@,$SYSTEM_EXPAT,;t t +s,@PKG_CONFIG@,$PKG_CONFIG,;t t +s,@LIBWPD_CFLAGS@,$LIBWPD_CFLAGS,;t t +s,@LIBWPD_LIBS@,$LIBWPD_LIBS,;t t +s,@SYSTEM_LIBWPD@,$SYSTEM_LIBWPD,;t t +s,@CPPUNIT_CFLAGS@,$CPPUNIT_CFLAGS,;t t +s,@CPPUNIT_LIBS@,$CPPUNIT_LIBS,;t t +s,@SYSTEM_CPPUNIT@,$SYSTEM_CPPUNIT,;t t +s,@FREETYPE_CFLAGS@,$FREETYPE_CFLAGS,;t t +s,@FREETYPE_LIBS@,$FREETYPE_LIBS,;t t +s,@USE_FT_EMBOLDEN@,$USE_FT_EMBOLDEN,;t t +s,@LIBXSLT_CFLAGS@,$LIBXSLT_CFLAGS,;t t +s,@LIBXSLT_LIBS@,$LIBXSLT_LIBS,;t t +s,@XSLTPROC@,$XSLTPROC,;t t +s,@SYSTEM_LIBXSLT@,$SYSTEM_LIBXSLT,;t t +s,@LIBXML_CFLAGS@,$LIBXML_CFLAGS,;t t +s,@LIBXML_LIBS@,$LIBXML_LIBS,;t t +s,@SYSTEM_LIBXML@,$SYSTEM_LIBXML,;t t +s,@PYTHON@,$PYTHON,;t t +s,@PYTHON_VERSION@,$PYTHON_VERSION,;t t +s,@PYTHON_PREFIX@,$PYTHON_PREFIX,;t t +s,@PYTHON_EXEC_PREFIX@,$PYTHON_EXEC_PREFIX,;t t +s,@PYTHON_PLATFORM@,$PYTHON_PLATFORM,;t t +s,@pythondir@,$pythondir,;t t +s,@pkgpythondir@,$pkgpythondir,;t t +s,@pyexecdir@,$pyexecdir,;t t +s,@pkgpyexecdir@,$pkgpyexecdir,;t t +s,@BZIP2@,$BZIP2,;t t +s,@SYSTEM_PYTHON@,$SYSTEM_PYTHON,;t t +s,@PYTHON_CFLAGS@,$PYTHON_CFLAGS,;t t +s,@PYTHON_LIBS@,$PYTHON_LIBS,;t t +s,@HOME@,$HOME,;t t +s,@SYSTEM_DB@,$SYSTEM_DB,;t t +s,@DB_VERSION@,$DB_VERSION,;t t +s,@DB_INCLUDES@,$DB_INCLUDES,;t t +s,@DB_JAR@,$DB_JAR,;t t +s,@SYSTEM_LUCENE@,$SYSTEM_LUCENE,;t t +s,@LUCENE_CORE_JAR@,$LUCENE_CORE_JAR,;t t +s,@LUCENE_ANALYZERS_JAR@,$LUCENE_ANALYZERS_JAR,;t t +s,@ENABLE_MYSQLC@,$ENABLE_MYSQLC,;t t +s,@MYSQLCONFIG@,$MYSQLCONFIG,;t t +s,@SYSTEM_MYSQL@,$SYSTEM_MYSQL,;t t +s,@MYSQL_INC@,$MYSQL_INC,;t t +s,@MYSQL_LIB@,$MYSQL_LIB,;t t +s,@MYSQL_DEFINES@,$MYSQL_DEFINES,;t t +s,@LIBMYSQL_PATH@,$LIBMYSQL_PATH,;t t +s,@SYSTEM_MYSQL_CPPCONN@,$SYSTEM_MYSQL_CPPCONN,;t t +s,@SYSTEM_HSQLDB@,$SYSTEM_HSQLDB,;t t +s,@HSQLDB_JAR@,$HSQLDB_JAR,;t t +s,@SYSTEM_BSH@,$SYSTEM_BSH,;t t +s,@BSH_JAR@,$BSH_JAR,;t t +s,@SERIALIZER_JAR@,$SERIALIZER_JAR,;t t +s,@SYSTEM_SAXON@,$SYSTEM_SAXON,;t t +s,@SAXON_JAR@,$SAXON_JAR,;t t +s,@CURLCONFIG@,$CURLCONFIG,;t t +s,@SYSTEM_CURL@,$SYSTEM_CURL,;t t +s,@CURL_CFLAGS@,$CURL_CFLAGS,;t t +s,@CURL_LIBS@,$CURL_LIBS,;t t +s,@SYSTEM_MDDS@,$SYSTEM_MDDS,;t t +s,@SYSTEM_BOOST@,$SYSTEM_BOOST,;t t +s,@SYSTEM_VIGRA@,$SYSTEM_VIGRA,;t t +s,@SYSTEM_ODBC_HEADERS@,$SYSTEM_ODBC_HEADERS,;t t +s,@WITH_MOZILLA@,$WITH_MOZILLA,;t t +s,@WITH_LDAP@,$WITH_LDAP,;t t +s,@WITH_OPENLDAP@,$WITH_OPENLDAP,;t t +s,@MOZ_NSS_CFLAGS@,$MOZ_NSS_CFLAGS,;t t +s,@MOZ_NSS_LIBS@,$MOZ_NSS_LIBS,;t t +s,@NSS_LIB@,$NSS_LIB,;t t +s,@MOZ_NSPR_CFLAGS@,$MOZ_NSPR_CFLAGS,;t t +s,@MOZ_NSPR_LIBS@,$MOZ_NSPR_LIBS,;t t +s,@NSPR_LIB@,$NSPR_LIB,;t t +s,@MOZILLAXPCOM_CFLAGS@,$MOZILLAXPCOM_CFLAGS,;t t +s,@MOZILLAXPCOM_LIBS@,$MOZILLAXPCOM_LIBS,;t t +s,@MOZILLA_VERSION@,$MOZILLA_VERSION,;t t +s,@MOZILLA_TOOLKIT@,$MOZILLA_TOOLKIT,;t t +s,@MOZGTK2_CFLAGS@,$MOZGTK2_CFLAGS,;t t +s,@MOZGTK2_LIBS@,$MOZGTK2_LIBS,;t t +s,@MOZLIBREQ_CFLAGS@,$MOZLIBREQ_CFLAGS,;t t +s,@MOZLIBREQ_LIBS@,$MOZLIBREQ_LIBS,;t t +s,@BUILD_MOZAB@,$BUILD_MOZAB,;t t +s,@ENABLE_NSS_MODULE@,$ENABLE_NSS_MODULE,;t t +s,@MOZILLABUILD@,$MOZILLABUILD,;t t +s,@SYSTEM_MOZILLA@,$SYSTEM_MOZILLA,;t t +s,@MOZ_FLAVOUR@,$MOZ_FLAVOUR,;t t +s,@MOZ_INC@,$MOZ_INC,;t t +s,@MOZ_LIB@,$MOZ_LIB,;t t +s,@MOZ_LIB_XPCOM@,$MOZ_LIB_XPCOM,;t t +s,@MOZ_LDAP_CFLAGS@,$MOZ_LDAP_CFLAGS,;t t +s,@SYSTEM_SANE_HEADER@,$SYSTEM_SANE_HEADER,;t t +s,@SYSTEM_GENBRK@,$SYSTEM_GENBRK,;t t +s,@SYSTEM_GENCCODE@,$SYSTEM_GENCCODE,;t t +s,@SYSTEM_GENCMN@,$SYSTEM_GENCMN,;t t +s,@SYSTEM_ICU@,$SYSTEM_ICU,;t t +s,@GRAPHITE_CFLAGS@,$GRAPHITE_CFLAGS,;t t +s,@GRAPHITE_LIBS@,$GRAPHITE_LIBS,;t t +s,@ENABLE_GRAPHITE@,$ENABLE_GRAPHITE,;t t +s,@SYSTEM_GRAPHITE@,$SYSTEM_GRAPHITE,;t t +s,@X_CFLAGS@,$X_CFLAGS,;t t +s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t +s,@X_LIBS@,$X_LIBS,;t t +s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t +s,@XINC@,$XINC,;t t +s,@XLIB@,$XLIB,;t t +s,@XAU_LIBS@,$XAU_LIBS,;t t +s,@DISABLE_XAW@,$DISABLE_XAW,;t t +s,@SYSTEM_XRENDER_HEADERS@,$SYSTEM_XRENDER_HEADERS,;t t +s,@XRENDER_LINK@,$XRENDER_LINK,;t t +s,@XRANDR_CFLAGS@,$XRANDR_CFLAGS,;t t +s,@XRANDR_LIBS@,$XRANDR_LIBS,;t t +s,@XRANDR_DLOPEN@,$XRANDR_DLOPEN,;t t +s,@ENABLE_RANDR@,$ENABLE_RANDR,;t t +s,@DISABLE_NEON@,$DISABLE_NEON,;t t +s,@NEON_CFLAGS@,$NEON_CFLAGS,;t t +s,@NEON_LIBS@,$NEON_LIBS,;t t +s,@SYSTEM_NEON@,$SYSTEM_NEON,;t t +s,@NEON_VERSION@,$NEON_VERSION,;t t +s,@OPENSSL_CFLAGS@,$OPENSSL_CFLAGS,;t t +s,@OPENSSL_LIBS@,$OPENSSL_LIBS,;t t +s,@SYSTEM_OPENSSL@,$SYSTEM_OPENSSL,;t t +s,@ENABLE_AGG@,$ENABLE_AGG,;t t +s,@AGG_CFLAGS@,$AGG_CFLAGS,;t t +s,@AGG_LIBS@,$AGG_LIBS,;t t +s,@SYSTEM_AGG@,$SYSTEM_AGG,;t t +s,@AGG_VERSION@,$AGG_VERSION,;t t +s,@REDLAND_CFLAGS@,$REDLAND_CFLAGS,;t t +s,@REDLAND_LIBS@,$REDLAND_LIBS,;t t +s,@SYSTEM_REDLAND@,$SYSTEM_REDLAND,;t t +s,@HUNSPELL_CFLAGS@,$HUNSPELL_CFLAGS,;t t +s,@HUNSPELL_LIBS@,$HUNSPELL_LIBS,;t t +s,@SYSTEM_HUNSPELL@,$SYSTEM_HUNSPELL,;t t +s,@SYSTEM_HYPH@,$SYSTEM_HYPH,;t t +s,@HYPHEN_LIB@,$HYPHEN_LIB,;t t +s,@MYTHES_CFLAGS@,$MYTHES_CFLAGS,;t t +s,@MYTHES_LIBS@,$MYTHES_LIBS,;t t +s,@SYSTEM_MYTHES@,$SYSTEM_MYTHES,;t t +s,@SYSTEM_LPSOLVE@,$SYSTEM_LPSOLVE,;t t +s,@SYSTEM_LIBTEXTCAT@,$SYSTEM_LIBTEXTCAT,;t t +s,@SYSTEM_LIBTEXTCAT_DATA@,$SYSTEM_LIBTEXTCAT_DATA,;t t +s,@HAVE_GETOPT@,$HAVE_GETOPT,;t t +s,@HAVE_READDIR_R@,$HAVE_READDIR_R,;t t +s,@SYSTEM_LIBC@,$SYSTEM_LIBC,;t t +s,@PSDK_HOME@,$PSDK_HOME,;t t +s,@WINDOWS_VISTA_PSDK@,$WINDOWS_VISTA_PSDK,;t t +s,@DIRECTXSDK_HOME@,$DIRECTXSDK_HOME,;t t +s,@DIRECTXSDK_LIB@,$DIRECTXSDK_LIB,;t t +s,@NSIS_PATH@,$NSIS_PATH,;t t +s,@BISON@,$BISON,;t t +s,@FLEX@,$FLEX,;t t +s,@PATCH@,$PATCH,;t t +s,@GNUCP@,$GNUCP,;t t +s,@GNUPATCH@,$GNUPATCH,;t t +s,@CYGWIN_PATH@,$CYGWIN_PATH,;t t +s,@ML_EXE@,$ML_EXE,;t t +s,@ASM_HOME@,$ASM_HOME,;t t +s,@ZIP@,$ZIP,;t t +s,@UNZIP@,$UNZIP,;t t +s,@ZIP_HOME@,$ZIP_HOME,;t t +s,@ENABLE_GTK@,$ENABLE_GTK,;t t +s,@ENABLE_KDE@,$ENABLE_KDE,;t t +s,@ENABLE_KDE4@,$ENABLE_KDE4,;t t +s,@GCONF_CFLAGS@,$GCONF_CFLAGS,;t t +s,@GCONF_LIBS@,$GCONF_LIBS,;t t +s,@ENABLE_GCONF@,$ENABLE_GCONF,;t t +s,@GNOMEVFS_CFLAGS@,$GNOMEVFS_CFLAGS,;t t +s,@GNOMEVFS_LIBS@,$GNOMEVFS_LIBS,;t t +s,@ENABLE_GNOMEVFS@,$ENABLE_GNOMEVFS,;t t +s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t +s,@GTK_LIBS@,$GTK_LIBS,;t t +s,@DBUS_CFLAGS@,$DBUS_CFLAGS,;t t +s,@DBUS_LIBS@,$DBUS_LIBS,;t t +s,@GIO_CFLAGS@,$GIO_CFLAGS,;t t +s,@GIO_LIBS@,$GIO_LIBS,;t t +s,@ENABLE_GIO@,$ENABLE_GIO,;t t +s,@ENABLE_DBUS@,$ENABLE_DBUS,;t t +s,@ENABLE_SYSTRAY_GTK@,$ENABLE_SYSTRAY_GTK,;t t +s,@GSTREAMER_CFLAGS@,$GSTREAMER_CFLAGS,;t t +s,@GSTREAMER_LIBS@,$GSTREAMER_LIBS,;t t +s,@ENABLE_GSTREAMER@,$ENABLE_GSTREAMER,;t t +s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t +s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t +s,@ENABLE_CAIRO@,$ENABLE_CAIRO,;t t +s,@BUILD_PIXMAN@,$BUILD_PIXMAN,;t t +s,@SYSTEM_CAIRO@,$SYSTEM_CAIRO,;t t +s,@ENABLE_OPENGL@,$ENABLE_OPENGL,;t t +s,@ENABLE_PRESENTER_EXTRA_UI@,$ENABLE_PRESENTER_EXTRA_UI,;t t +s,@ENABLE_MINIMIZER@,$ENABLE_MINIMIZER,;t t +s,@ENABLE_PRESENTER_SCREEN@,$ENABLE_PRESENTER_SCREEN,;t t +s,@POPPLER_CFLAGS@,$POPPLER_CFLAGS,;t t +s,@POPPLER_LIBS@,$POPPLER_LIBS,;t t +s,@ENABLE_PDFIMPORT@,$ENABLE_PDFIMPORT,;t t +s,@SYSTEM_POPPLER@,$SYSTEM_POPPLER,;t t +s,@ENABLE_MEDIAWIKI@,$ENABLE_MEDIAWIKI,;t t +s,@SYSTEM_SERVLETAPI@,$SYSTEM_SERVLETAPI,;t t +s,@SERVLETAPI_JAR@,$SERVLETAPI_JAR,;t t +s,@ENABLE_REPORTBUILDER@,$ENABLE_REPORTBUILDER,;t t +s,@SYSTEM_JFREEREPORT@,$SYSTEM_JFREEREPORT,;t t +s,@SAC_JAR@,$SAC_JAR,;t t +s,@LIBXML_JAR@,$LIBXML_JAR,;t t +s,@FLUTE_JAR@,$FLUTE_JAR,;t t +s,@JFREEREPORT_JAR@,$JFREEREPORT_JAR,;t t +s,@LIBBASE_JAR@,$LIBBASE_JAR,;t t +s,@LIBLAYOUT_JAR@,$LIBLAYOUT_JAR,;t t +s,@LIBLOADER_JAR@,$LIBLOADER_JAR,;t t +s,@LIBFORMULA_JAR@,$LIBFORMULA_JAR,;t t +s,@LIBREPOSITORY_JAR@,$LIBREPOSITORY_JAR,;t t +s,@LIBFONTS_JAR@,$LIBFONTS_JAR,;t t +s,@LIBSERIALIZER_JAR@,$LIBSERIALIZER_JAR,;t t +s,@SYSTEM_APACHE_COMMONS@,$SYSTEM_APACHE_COMMONS,;t t +s,@COMMONS_CODEC_JAR@,$COMMONS_CODEC_JAR,;t t +s,@COMMONS_LANG_JAR@,$COMMONS_LANG_JAR,;t t +s,@COMMONS_HTTPCLIENT_JAR@,$COMMONS_HTTPCLIENT_JAR,;t t +s,@COMMONS_LOGGING_JAR@,$COMMONS_LOGGING_JAR,;t t +s,@MOC@,$MOC,;t t +s,@KDE_CFLAGS@,$KDE_CFLAGS,;t t +s,@KDE_LIBS@,$KDE_LIBS,;t t +s,@MOC4@,$MOC4,;t t +s,@KDE4_CFLAGS@,$KDE4_CFLAGS,;t t +s,@KDE4_LIBS@,$KDE4_LIBS,;t t +s,@ENABLE_LOCKDOWN@,$ENABLE_LOCKDOWN,;t t +s,@GOBJECT_CFLAGS@,$GOBJECT_CFLAGS,;t t +s,@GOBJECT_LIBS@,$GOBJECT_LIBS,;t t +s,@ENABLE_EVOAB2@,$ENABLE_EVOAB2,;t t +s,@ENABLE_KAB@,$ENABLE_KAB,;t t +s,@WITH_FONTS@,$WITH_FONTS,;t t +s,@WITHOUT_PPDS@,$WITHOUT_PPDS,;t t +s,@WITHOUT_AFMS@,$WITHOUT_AFMS,;t t +s,@SCPDEFS@,$SCPDEFS,;t t +s,@USE_XINERAMA@,$USE_XINERAMA,;t t +s,@XINERAMA_LINK@,$XINERAMA_LINK,;t t +s,@ANT@,$ANT,;t t +s,@ANT_HOME@,$ANT_HOME,;t t +s,@ANT_LIB@,$ANT_LIB,;t t +s,@OOO_JUNIT_JAR@,$OOO_JUNIT_JAR,;t t +s,@WITH_LANG@,$WITH_LANG,;t t +s,@WITH_POOR_HELP_LOCALIZATIONS@,$WITH_POOR_HELP_LOCALIZATIONS,;t t +s,@WITH_DICT@,$WITH_DICT,;t t +s,@INTRO_BITMAPS@,$INTRO_BITMAPS,;t t +s,@ABOUT_BITMAPS@,$ABOUT_BITMAPS,;t t +s,@OOO_VENDOR@,$OOO_VENDOR,;t t +s,@UNIXWRAPPERNAME@,$UNIXWRAPPERNAME,;t t +s,@ENABLE_STATIC_GTK@,$ENABLE_STATIC_GTK,;t t +s,@ENABLE_LAYOUT@,$ENABLE_LAYOUT,;t t +s,@VERBOSE@,$VERBOSE,;t t +s,@nodep@,$nodep,;t t +s,@LOCAL_SOLVER@,$LOCAL_SOLVER,;t t +s,@BUILD_TYPE@,$BUILD_TYPE,;t t +s,@LIBOBJS@,$LIBOBJS,;t t +s,@LTLIBOBJS@,$LTLIBOBJS,;t t +CEOF - case $ac_mode in - :L) ac_source=$1;; - :[FH]) - ac_file_inputs= - for ac_f - do - case $ac_f in - -) ac_f="$tmp/stdin";; - *) # Look for the file first in the build tree, then in the source tree - # (if the path is not absolute). The absolute path cannot be DOS-style, - # because $ac_f cannot contain `:'. - test -f "$ac_f" || - case $ac_f in - [\\/$]*) false;; - *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; - esac || - as_fn_error "cannot find input file: \`$ac_f'" "$LINENO" 5;; - esac - case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac - as_fn_append ac_file_inputs " '$ac_f'" - done +_ACEOF - # Let's still pretend it is `configure' which instantiates (i.e., don't - # use $as_me), people would be surprised to read: - # /* config.h. Generated by config.status. */ - configure_input='Generated from '` - $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g' - `' by configure.' - if test x"$ac_file" != x-; then - configure_input="$ac_file. $configure_input" - { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5 -$as_echo "$as_me: creating $ac_file" >&6;} + cat >>$CONFIG_STATUS <<\_ACEOF + # Split the substitutions into bite-sized pieces for seds with + # small command number limits, like on Digital OSF/1 and HP-UX. + ac_max_sed_lines=48 + ac_sed_frag=1 # Number of current file. + ac_beg=1 # First line for current file. + ac_end=$ac_max_sed_lines # Line after last line for current file. + ac_more_lines=: + ac_sed_cmds= + while $ac_more_lines; do + if test $ac_beg -gt 1; then + sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag + else + sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag fi - # Neutralize special characters interpreted by sed in replacement strings. - case $configure_input in #( - *\&* | *\|* | *\\* ) - ac_sed_conf_input=`$as_echo "$configure_input" | - sed 's/[\\\\&|]/\\\\&/g'`;; #( - *) ac_sed_conf_input=$configure_input;; - esac + if test ! -s $tmp/subs.frag; then + ac_more_lines=false + else + # The purpose of the label and of the branching condition is to + # speed up the sed processing (if there are no `@' at all, there + # is no need to browse any of the substitutions). + # These are the two extra sed commands mentioned above. + (echo ':t + /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed + if test -z "$ac_sed_cmds"; then + ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed" + else + ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed" + fi + ac_sed_frag=`expr $ac_sed_frag + 1` + ac_beg=$ac_end + ac_end=`expr $ac_end + $ac_max_sed_lines` + fi + done + if test -z "$ac_sed_cmds"; then + ac_sed_cmds=cat + fi +fi # test -n "$CONFIG_FILES" - case $ac_tag in - *:-:* | *:-) cat >"$tmp/stdin" \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 ;; - esac - ;; +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue + # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in". + case $ac_file in + - | *:- | *:-:* ) # input from stdin + cat >$tmp/stdin + ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'` + ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;; + * ) ac_file_in=$ac_file.in ;; esac - ac_dir=`$as_dirname -- "$ac_file" || + # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories. + ac_dir=`(dirname "$ac_file") 2>/dev/null || $as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ X"$ac_file" : 'X\(//\)[^/]' \| \ X"$ac_file" : 'X\(//\)$' \| \ - X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || -$as_echo X"$ac_file" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q'` - as_dir="$ac_dir"; as_fn_mkdir_p + X"$ac_file" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + { if $as_mkdir_p; then + mkdir -p "$ac_dir" + else + as_dir="$ac_dir" + as_dirs= + while test ! -d "$as_dir"; do + as_dirs="$as_dir $as_dirs" + as_dir=`(dirname "$as_dir") 2>/dev/null || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| \ + . : '\(.\)' 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; } + /^X\(\/\/\)[^/].*/{ s//\1/; q; } + /^X\(\/\/\)$/{ s//\1/; q; } + /^X\(\/\).*/{ s//\1/; q; } + s/.*/./; q'` + done + test ! -n "$as_dirs" || mkdir $as_dirs + fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5 +echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. -case "$ac_dir" in -.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; -*) - ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'` - # A ".." for each directory in $ac_dir_suffix. - ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'` - case $ac_top_builddir_sub in - "") ac_top_builddir_sub=. ac_top_build_prefix= ;; - *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; - esac ;; -esac -ac_abs_top_builddir=$ac_pwd -ac_abs_builddir=$ac_pwd$ac_dir_suffix -# for backward compatibility: -ac_top_builddir=$ac_top_build_prefix +if test "$ac_dir" != .; then + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A "../" for each directory in $ac_dir_suffix. + ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'` +else + ac_dir_suffix= ac_top_builddir= +fi case $srcdir in - .) # We are building in place. + .) # No --srcdir option. We are building in place. ac_srcdir=. - ac_top_srcdir=$ac_top_builddir_sub - ac_abs_top_srcdir=$ac_pwd ;; - [\\/]* | ?:[\\/]* ) # Absolute name. + if test -z "$ac_top_builddir"; then + ac_top_srcdir=. + else + ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'` + fi ;; + [\\/]* | ?:[\\/]* ) # Absolute path. ac_srcdir=$srcdir$ac_dir_suffix; - ac_top_srcdir=$srcdir - ac_abs_top_srcdir=$srcdir ;; - *) # Relative name. - ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix - ac_top_srcdir=$ac_top_build_prefix$srcdir - ac_abs_top_srcdir=$ac_pwd/$srcdir ;; + ac_top_srcdir=$srcdir ;; + *) # Relative path. + ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_builddir$srcdir ;; esac -ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix +# Do not use `cd foo && pwd` to compute absolute paths, because +# the directories may not exist. +case `pwd` in +.) ac_abs_builddir="$ac_dir";; +*) + case "$ac_dir" in + .) ac_abs_builddir=`pwd`;; + [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";; + *) ac_abs_builddir=`pwd`/"$ac_dir";; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_builddir=${ac_top_builddir}.;; +*) + case ${ac_top_builddir}. in + .) ac_abs_top_builddir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;; + *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_srcdir=$ac_srcdir;; +*) + case $ac_srcdir in + .) ac_abs_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;; + *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;; + esac;; +esac +case $ac_abs_builddir in +.) ac_abs_top_srcdir=$ac_top_srcdir;; +*) + case $ac_top_srcdir in + .) ac_abs_top_srcdir=$ac_abs_builddir;; + [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;; + *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;; + esac;; +esac - case $ac_mode in - :F) - # - # CONFIG_FILE - # -_ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 -# If the template does not know about datarootdir, expand it. -# FIXME: This hack should be removed a few years after 2.60. -ac_datarootdir_hack=; ac_datarootdir_seen= -ac_sed_dataroot=' -/datarootdir/ { - p - q -} -/@datadir@/p -/@docdir@/p -/@infodir@/p -/@localedir@/p -/@mandir@/p' -case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in -*datarootdir*) ac_datarootdir_seen=yes;; -*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 -$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} -_ACEOF -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 - ac_datarootdir_hack=' - s&@datadir@&$datadir&g - s&@docdir@&$docdir&g - s&@infodir@&$infodir&g - s&@localedir@&$localedir&g - s&@mandir@&$mandir&g - s&\\\${datarootdir}&$datarootdir&g' ;; -esac + if test x"$ac_file" != x-; then + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + rm -f "$ac_file" + fi + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + if test x"$ac_file" = x-; then + configure_input= + else + configure_input="$ac_file. " + fi + configure_input=$configure_input"Generated from `echo $ac_file_in | + sed 's,.*/,,'` by configure." + + # First look for the input files in the build tree, otherwise in the + # src tree. + ac_file_inputs=`IFS=: + for f in $ac_file_in; do + case $f in + -) echo $tmp/stdin ;; + [\\/$]*) + # Absolute (can't be DOS-style, as IFS=:) + test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + echo "$f";; + *) # Relative + if test -f "$f"; then + # Build tree + echo "$f" + elif test -f "$srcdir/$f"; then + # Source tree + echo "$srcdir/$f" + else + # /dev/null tree + { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5 +echo "$as_me: error: cannot find input file: $f" >&2;} + { (exit 1); exit 1; }; } + fi;; + esac + done` || { (exit 1); exit 1; } _ACEOF - -# Neutralize VPATH when `$srcdir' = `.'. -# Shell code in configure.ac might set extrasub. -# FIXME: do we really want to maintain this feature? -cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 -ac_sed_extra="$ac_vpsub +cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub $extrasub _ACEOF -cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 +cat >>$CONFIG_STATUS <<\_ACEOF :t /@[a-zA-Z_][a-zA-Z_0-9]*@/!b -s|@configure_input@|$ac_sed_conf_input|;t t -s&@top_builddir@&$ac_top_builddir_sub&;t t -s&@top_build_prefix@&$ac_top_build_prefix&;t t -s&@srcdir@&$ac_srcdir&;t t -s&@abs_srcdir@&$ac_abs_srcdir&;t t -s&@top_srcdir@&$ac_top_srcdir&;t t -s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t -s&@builddir@&$ac_builddir&;t t -s&@abs_builddir@&$ac_abs_builddir&;t t -s&@abs_top_builddir@&$ac_abs_top_builddir&;t t -$ac_datarootdir_hack -" -eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 - -test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && - { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && - { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&5 -$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' -which seems to be undefined. Please make sure it is defined." >&2;} - - rm -f "$tmp/stdin" - case $ac_file in - -) cat "$tmp/out" && rm -f "$tmp/out";; - *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";; - esac \ - || as_fn_error "could not create $ac_file" "$LINENO" 5 - ;; - - - - esac +s,@configure_input@,$configure_input,;t t +s,@srcdir@,$ac_srcdir,;t t +s,@abs_srcdir@,$ac_abs_srcdir,;t t +s,@top_srcdir@,$ac_top_srcdir,;t t +s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t +s,@builddir@,$ac_builddir,;t t +s,@abs_builddir@,$ac_abs_builddir,;t t +s,@top_builddir@,$ac_top_builddir,;t t +s,@abs_top_builddir@,$ac_abs_top_builddir,;t t +" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out + rm -f $tmp/stdin + if test x"$ac_file" != x-; then + mv $tmp/out $ac_file + else + cat $tmp/out + rm -f $tmp/out + fi -done # for ac_tag +done +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF -as_fn_exit 0 +{ (exit 0); exit 0; } _ACEOF +chmod +x $CONFIG_STATUS ac_clean_files=$ac_clean_files_save -test $ac_write_fail = 0 || - as_fn_error "write failure creating $CONFIG_STATUS" "$LINENO" 5 - # configure is writing to config.log, and then calls config.status. # config.status does its own redirection, appending to config.log. @@ -24613,11 +31560,7 @@ if test "$no_create" != yes; then exec 5>>config.log # Use ||, not &&, to avoid exiting from the if with $? = 1, which # would make configure fail if this is the last instruction. - $ac_cs_success || as_fn_exit $? -fi -if test -n "$ac_unrecognized_opts" && test "$enable_option_checking" != no; then - { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: unrecognized options: $ac_unrecognized_opts" >&5 -$as_echo "$as_me: WARNING: unrecognized options: $ac_unrecognized_opts" >&2;} + $ac_cs_success || { (exit 1); exit 1; } fi -- cgit